diff -Nru zeroc-ice-3.7.1/allTests.py zeroc-ice-3.7.2/allTests.py
--- zeroc-ice-3.7.1/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "scripts"))
diff -Nru zeroc-ice-3.7.1/certs/makecerts.py zeroc-ice-3.7.2/certs/makecerts.py
--- zeroc-ice-3.7.1/certs/makecerts.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/certs/makecerts.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 import os, sys, socket, getopt
 
diff -Nru zeroc-ice-3.7.1/CHANGELOG-3.7.md zeroc-ice-3.7.2/CHANGELOG-3.7.md
--- zeroc-ice-3.7.1/CHANGELOG-3.7.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/CHANGELOG-3.7.md	2019-02-05 18:03:04.000000000 +0000
@@ -8,28 +8,204 @@
 applications to this release, and the manual for complete details on a
 particular aspect of Ice.
 
-- [Changes in Ice 3.7.1](#changes-in-ice-371)
+- [Changes in Ice 3.7.2](#changes-in-ice-372)
   * [General Changes](#general-changes)
   * [C++ Changes](#c-changes)
-  * [C# Changes](#c%23-changes)
+  * [C# Changes](#c-changes-1)
   * [Java Changes](#java-changes)
   * [JavaScript Changes](#javascript-changes)
   * [MATLAB Changes](#matlab-changes)
   * [Objective-C Changes](#objective-c-changes)
   * [PHP Changes](#php-changes)
   * [Python Changes](#python-changes)
-  * [Ruby Changes](#ruby-changes)
-- [Changes in Ice 3.7.0](#changes-in-ice-370)
+- [Changes in Ice 3.7.1](#changes-in-ice-371)
   * [General Changes](#general-changes-1)
-  * [C++ Changes](#c-changes-1)
-  * [C# Changes](#c%23-changes-1)
+  * [C++ Changes](#c-changes-2)
+  * [C# Changes](#c-changes-3)
   * [Java Changes](#java-changes-1)
   * [JavaScript Changes](#javascript-changes-1)
+  * [MATLAB Changes](#matlab-changes-1)
   * [Objective-C Changes](#objective-c-changes-1)
   * [PHP Changes](#php-changes-1)
   * [Python Changes](#python-changes-1)
+  * [Ruby Changes](#ruby-changes)
+- [Changes in Ice 3.7.0](#changes-in-ice-370)
+  * [General Changes](#general-changes-2)
+  * [C++ Changes](#c-changes-4)
+  * [C# Changes](#c-changes-5)
+  * [Java Changes](#java-changes-2)
+  * [JavaScript Changes](#javascript-changes-2)
+  * [Objective-C Changes](#objective-c-changes-2)
+  * [PHP Changes](#php-changes-2)
+  * [Python Changes](#python-changes-2)
   * [Ruby Changes](#ruby-changes-1)
 
+# Changes in Ice 3.7.2
+
+These are the changes since Ice 3.7.1.
+
+## General Changes
+
+- Add support for TLS 1.3 to IceSSL.
+
+- Add support for reading Ice properties from the HKCU Windows registry hive. Previously
+  you could only read properties from the HKLM Windows registry hive.
+
+## C++ Changes
+
+- Fixed a bug where the callback set with the `IceUtil::CtrlCHandler` was not
+  cleared on destruction of the `CtrlCHandler` object. Variables captured by the
+  callback were therefore not released until static destruction. This fix
+  ensures that the destruction of the `CtrlCHandler` object clears the
+  callback.
+
+- Fixed a debug assert in the Windows SChannel IceSSL implementation which would
+  occur in rare circumstances where SChannel returned `SEC_E_INCOMPLETE_MESSAGE`
+  with a `cbBuffer` value of 0. This occurred when running the JavaScript tests
+  with Firefox and using a C++ debug build.
+
+- Fixed a bug in the syslog logger that caused the program name to not be correctly
+  displayed with log messages.
+
+- Fixed an IceStorm bug that prevented topics from being restored from the database
+  when there was multiple topics.
+
+- Added support for systemd `Type=Notify` to `Ice::Service`. Services
+  started without the `--daemon` command-line option send notifications
+  to systemd using the `sd_notify` API.
+
+- Added systemd journal logger. This logger is enabled by setting the
+  `Ice.UseSystemdJournal` property to a value of 1 or greater.
+
+- Fixed memory leak in the Ice iAP transport where the `EASession` object wasn't
+  correctly released. Thanks to @astreube on GitHub for reporting this bug and
+  suggesting a fix.
+
+- Fixed a bug in the Windows build system that disabled wildcard expansion for
+  Slice compiler command line arguments.
+
+- Fixed a bug in the code that parses command line options that caused short command
+  line options to be incorrectly parsed when multiple short command line options
+  are specified together.
+
+- Fixed a bug in IceGrid that could result in an infinite loop when `Ice.ChangeUser` is
+  set and the call to `getpwnam_r` fails with `ERANGE`.
+
+- Fixed SChannel initialization to use a global mutex to avoid crashes occurring with
+  latest SChannel updates. See: https://github.com/zeroc-ice/ice/issues/242
+
+- Add support to build Ice in C++17 mode.
+
+- Add support for ARM builds with RHELP and CentOS.
+
+- Allow users to configure the adapter created by `icegridadmin` when run in server mode.
+  Thanks to Michael Dorner for the pull request: https://github.com/zeroc-ice/ice/pull/58
+
+## C# Changes
+
+- Fixed metrics bug where remote invocations for `flushBatchRequests` weren't
+  counted.
+
+- Add ability to build .NET Core assemblies with strong name.
+
+- Add Android, iOS and UWP platform support to Ice for .NET Core. The Ice test
+  suite now works with Xamarin and runs on Android, iOS and UWP.
+
+- Fixed marshaling code: removed unsafe code used in ByteBuffer that was
+  causing problems with mono on Android.
+
+- Fixed a bug in `slice2cs` that could result in generated code using
+  invalid namespace qualification for a type.
+  See: https://github.com/zeroc-ice/ice/issues/122
+
+- Removed dependency on the Ice Builder Visual Studio Extension for C# source builds.
+
+- You can now map Slice modules to custom C# namespaces using the `cs:namespace`
+  metadata directive.
+
+## Java Changes
+
+- Fixed Android IceSSL issue that caused SSL connections to hang
+  with Android >= 8.0.
+
+- Fixed metrics bug where remote invocations for `flushBatchRequests` weren't
+  counted.
+
+- Improved Javadoc support for the Java mapping (and not Java-Compat). Internal
+  classes and methods with public or protected visibility are now excluded or
+  tagged `@hidden`. Since `@hidden` requires javadoc 9 or greater, javadoc is no
+  longer generated with javadoc 8.
+  The new Gradle target `alljavadoc` generates a complete API reference for all
+  Ice components (Ice, IceSSL, IceGrid, IceStorm, Glacier2, etc.).
+
+- IceGrid GUI settings are now stored in the operating system application data
+  directory `%LOCALAPPDATA%/ZeroC` for Windows, `~/Library/Application Support/ZeroC`
+  for macOS and `~/.ZeroC` for Linux. Previous settings are automatically migrated to the
+  new location without user intervention.
+
+- Add support to build IceGrid GUI with OpenJFX and Java 11 JDK.
+
+- Fixed a bug in the IceGrid GUI that could cause IceGrid GUI to hang after a login
+  failure.
+
+## JavaScript Changes
+
+- Add TypeScript declaration files for Ice for JavaScript.
+
+- The Slice to JavaScript compiler can now generate TypeScript declaration files
+  for JavaScript generated code using the `--typescript` command line option.
+
+- Fixed generated code for sequences of interface by value types. The generated
+  sequence helper must use `Ice.Value` as the element type for the sequence
+  and not a class with the name of the interface when the element type is an
+  interface by value.
+
+- Add missing `OutputStream.writeException` method.
+
+- Update JavaScript build system to Babel 7 and gulp 4.0. Support for building
+  Ice for JavaScript with NodeJS 4 and NodeJS 5 has been removed.
+
+- Fixed a bug in Slice-to-JavaScript compiler that resulted in incorrect generated
+  code for classes containing a data member of type `Value`. Thanks to Daniel Lytkin
+  for the bug report and fix. See https://github.com/zeroc-ice/ice/pull/203
+
+## MATLAB Changes
+
+- Fixed a bug that caused the code generated by `slice2matlab` to throw a type
+  conversion exception. This affected classes or structs containing a dictionary
+  mapped to a structure array.
+
+- Add support for `IceSSL::ConnectionInfo`.
+
+## Objective-C Changes
+
+- Fixed a bug in Slice-to-Objective-C compiler that resulted in incorrect generated
+  code for classes containing a data member of type `Value`.
+
+## PHP Changes
+
+- Fixed build failure when building with the Debug configuration on Windows.
+
+- Fixed a bug that caused the generated code to reference undefined variables
+  when included (using `require` or `require_once`) from a static method.
+
+## Python Changes
+
+- Add support for unmarshaling sequences of basic types using the [buffer
+  protocol][1]. This can be enabled using the metadata `python:array.array`,
+  `python:numpy.ndarray` or `python:memoryview:<factory>`. The first two enable
+  mapping to the `array.array` and `numpy.ndarray` types respectively and the
+  last one allows to specify a custom Python factory function responsible for
+  creating the sequence from a `memoryview` object.
+
+- Add `python:default`, `python:list` and `python:tuple` metadata which are
+  equivalent to `python:seq:default`, `python:seq:list` and `python:seq:tuple`
+  respectively.
+
+- Fixed Python segfault that could occur because of a KeyboardInterrupt.
+
+- Add support to build Ice for Python using Python 3.7.
+
 # Changes in Ice 3.7.1
 
 These are the changes since Ice 3.7.0.
@@ -731,3 +907,5 @@
 
 - Fixed a bug that prevented the data members of `IceSSL::ConnectionInfo` from
   being defined correctly.
+
+[1]: https://docs.python.org/3/c-api/buffer.html
diff -Nru zeroc-ice-3.7.1/config/icebuilder.props zeroc-ice-3.7.2/config/icebuilder.props
--- zeroc-ice-3.7.1/config/icebuilder.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/icebuilder.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <IceVersion>3.7.1</IceVersion>
-    <IceIntVersion>30701</IceIntVersion>
+    <IceVersion>3.7.2</IceVersion>
+    <IceIntVersion>30702</IceIntVersion>
     <IceVersionMM>3.7</IceVersionMM>
     <IceSoVersion>37</IceSoVersion>
-    <IceJSONVersion>3.7.1</IceJSONVersion>
+    <IceJSONVersion>3.7.2</IceJSONVersion>
   </PropertyGroup>
 </Project>
diff -Nru zeroc-ice-3.7.1/config/ice.common.targets zeroc-ice-3.7.2/config/ice.common.targets
--- zeroc-ice-3.7.1/config/ice.common.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/ice.common.targets	2019-02-05 18:03:04.000000000 +0000
@@ -3,8 +3,8 @@
     <!-- Custom task to download files -->
     <!-- Nuget executable -->
     <PropertyGroup>
-      <NugetExe>$(MSBuildThisFileDirectory)NuGet.exe</NugetExe>
-      <NugetURL>https://dist.nuget.org/win-x86-commandline/v4.6.2/nuget.exe</NugetURL>
+      <NugetExe>$(MSBuildThisFileDirectory)NuGet-4.9.2.exe</NugetExe>
+      <NugetURL>https://dist.nuget.org/win-x86-commandline/v4.9.2/nuget.exe</NugetURL>
     </PropertyGroup>
 
     <!-- Download nuget.exe if not present -->
diff -Nru zeroc-ice-3.7.1/config/iphoneos-SDKSettings.plist zeroc-ice-3.7.2/config/iphoneos-SDKSettings.plist
--- zeroc-ice-3.7.1/config/iphoneos-SDKSettings.plist	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/iphoneos-SDKSettings.plist	2019-02-05 18:03:04.000000000 +0000
@@ -18,6 +18,6 @@
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<key>Version</key>
-	<string>3.7.1</string>
+	<string>3.7.2</string>
 </dict>
 </plist>
diff -Nru zeroc-ice-3.7.1/config/iphonesimulator-SDKSettings.plist zeroc-ice-3.7.2/config/iphonesimulator-SDKSettings.plist
--- zeroc-ice-3.7.1/config/iphonesimulator-SDKSettings.plist	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/iphonesimulator-SDKSettings.plist	2019-02-05 18:03:04.000000000 +0000
@@ -18,6 +18,6 @@
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<key>Version</key>
-	<string>3.7.1</string>
+	<string>3.7.2</string>
 </dict>
 </plist>
diff -Nru zeroc-ice-3.7.1/config/macosx-SDKSettings.plist zeroc-ice-3.7.2/config/macosx-SDKSettings.plist
--- zeroc-ice-3.7.1/config/macosx-SDKSettings.plist	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/macosx-SDKSettings.plist	2019-02-05 18:03:04.000000000 +0000
@@ -18,6 +18,6 @@
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<key>Version</key>
-	<string>3.7.1</string>
+	<string>3.7.2</string>
 </dict>
 </plist>
diff -Nru zeroc-ice-3.7.1/config/Make.project.rules zeroc-ice-3.7.2/config/Make.project.rules
--- zeroc-ice-3.7.1/config/Make.project.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/Make.project.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # $(call project,[$1])
@@ -240,12 +235,12 @@
 ifneq ($(and $4,$(filter-out undefined,$(origin mksoname))),)
 $2/$(call mksoname,$1,$3,$4): $2/$(call mkshlibfilename,$1,$3,$4)
 	@$(RM) $$@ ; ln -s $$(<F) $$@
+endif
 
 ifneq ($(and $3,$(filter-out undefined,$(origin mkshlibname))),)
 $2/$(call mkshlibname,$1,$3,$4): $2/$(call mkshlibnametarget,$1,$3,$4)
 	@$(RM) $$@ ; ln -s $$(<F) $$@
 endif
-endif
 
 endef
 
@@ -261,6 +256,7 @@
 $(DESTDIR)$5/$(call mksoname,$1,$3,$4): $(DESTDIR)$5/$(call mkshlibfilename,$1,$3,$4) \
 					$2/$(call mksoname,$1,$3,$4)
 	@$(RM) $$@ ; ln -s $$(<F) $$@
+endif
 
 ifneq ($(and $(filter yes,$6),$3,$(filter-out undefined,$(origin mkshlibname))),)
 $(DESTDIR)$5/$(call mkshlibname,$1,$3,$4): $(DESTDIR)$5/$(call mkshlibnametarget,$1,$3,$4) \
@@ -268,8 +264,6 @@
 	@$(RM) $$@ ; ln -s $$(<F) $$@
 endif
 
-endif
-
 endef
 
 # $(call get-shared-library-targets,$1=libname,$2=libdir,$3=version,$4=soversion,$5=devinstall)
@@ -1021,17 +1015,17 @@
                             $(call rpath-ldflag,$1),\
                             $(call rpath-ldflag,$(loader_path)/$(call relpathfromdir,$(patsubst $(lang_srcdir)/%,%,$2))/$1)),\
                         $(call rpath-ldflag,$(loader_path)))
-make-shared-dep-ldflags = $(if $($1_targetdir),$(call make-rpath-ldflag,$($1_targetdir),$($2_targetdir)) -L$($1_targetdir)) -l$($1_targetname)
+make-shared-dep-ldflags = $(if $($1_targetdir),$(call make-rpath-ldflag,$($1_targetdir),$($2_targetdir)) -L$($1_targetdir)) $(if $($1_targetname),-l$($1_targetname))
 else
 # Add rpath with $(embedded_runpath_prefix) if linking with library installed in different directory.
 make-rpath-ldflag = $(if $(filter-out $1,$2),\
                         $(if $(filter $(prefix)/%,$1),\
                             $(call rpath-ldflag,$(patsubst $(prefix)/%,$(embedded_runpath_prefix)/%,$1)),\
                             $(call rpath-ldflag,$1)))
-make-shared-dep-ldflags = $(call make-rpath-ldflag,$($1_installdir),$($2_installdir)) $(if $($1_targetdir),-L$($1_targetdir)) -l$($1_targetname)
+make-shared-dep-ldflags = $(call make-rpath-ldflag,$($1_installdir),$($2_installdir)) $(if $($1_targetdir),-L$($1_targetdir)) $(if $($1_targetname),-l$($1_targetname))
 endif
 else
-make-shared-dep-ldflags = $(if $($1_targetdir),-L$($1_targetdir)) -l$($1_targetname)
+make-shared-dep-ldflags = $(if $($1_targetdir),-L$($1_targetdir)) $(if $($1_targetname),-l$($1_targetname))
 endif
 
 make-static-dep-ldflags = $(if $($1_targetdir),\
@@ -1117,6 +1111,8 @@
 static_targetrule       = $(if $(filter-out program,$($1_target)),static)
 static_cppflags         += $(strip $(call make-lib-cppflags,$4)) -DICE_STATIC_LIBS
 static_ldflags          += $$(call make-ldflags,$$(call get-all-deps,$4),make-static-dep-ldflags,$4,runique)\
+                           $$(call make-ldflags,$4,make-lib-ldflags,$4,unique)\
+                           $$(call make-ldflags,$4,make-system-lib-ldflags,$4,unique)\
                            $$(call make-ldflags,$$(call get-all-deps,$4),make-lib-ldflags,$4,unique)\
                            $$(call make-ldflags,$$(call get-all-deps,$4),make-system-lib-ldflags,$4,unique)
 
diff -Nru zeroc-ice-3.7.1/config/makeprops.py zeroc-ice-3.7.2/config/makeprops.py
--- zeroc-ice-3.7.1/config/makeprops.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/makeprops.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, shutil, re, signal, time, pprint
 
@@ -22,14 +17,9 @@
 contentHandler = None
 propertyClasses = {}
 
-commonPreamble = """// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// **********************************************************************
 """
 commonPreamble = commonPreamble + "// Generated by " + progname + " from file %(inputfile)s, " + time.ctime()
 commonPreamble = commonPreamble + """
@@ -123,6 +113,10 @@
 """
 
 jsPreamble = commonPreamble + """
+/* eslint comma-dangle: "off" */
+/* eslint array-bracket-newline: "off" */
+/* eslint no-useless-escape: "off" */
+
 const Ice = require("../Ice/Property").Ice;
 const %(classname)s = {};
 const Property = Ice.Property;
@@ -560,10 +554,8 @@
     def startFiles(self):
         self.srcFile = open(self.className + ".js", "w")
         self.srcFile.write(jsPreamble % {'inputfile' : self.inputfile, 'classname' : self.className})
-        self.srcFile.write("/* jshint -W044*/\n\n");
 
     def closeFiles(self):
-        self.srcFile.write("/* jshint +W044*/\n\n");
         self.srcFile.write("%s.validProps =\n" % (self.className))
         self.srcFile.write("[\n")
         for s in self.sections:
diff -Nru zeroc-ice-3.7.1/config/Make.rules zeroc-ice-3.7.2/config/Make.rules
--- zeroc-ice-3.7.1/config/Make.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/Make.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Select an installation base directory. The directory will be created
@@ -103,7 +98,7 @@
 supported-languages     ?= cpp $(if $(filter %/dotnet,$(dotnet)),csharp) java java-compat python js ruby php $(if $(filter Darwin,$(os)),objective-c)
 supported-configs       ?= shared
 
-version                 = 3.7.1
+version                 = 3.7.2
 mmversion               = 3.7
 soversion               = 37
 
@@ -171,3 +166,17 @@
 lmdb_home               := $(LMDB_HOME)
 
 $(foreach l,$(thirdparties),$(eval $(call make-lib,$l)))
+
+#
+# When building on Sierra, use clang from the Xcode macOS X SDK instead of relying on the
+# command line tools. Outdated Security.framework system headers are used otherwise with
+# the command line compiler (no TLS1.3 enum support).
+#
+ifeq ($(os),Darwin)
+ifneq ($(filter 16.%,$(shell uname -r)),)
+macosx_cc                       = xcrun -sdk macosx clang
+macosx_cxx                      = xcrun -sdk macosx clang++
+macosx_cppflags                 += -I/usr/local/include
+macosx_ldflags                  += -L/usr/local/lib
+endif
+endif
diff -Nru zeroc-ice-3.7.1/config/Make.rules.AIX zeroc-ice-3.7.2/config/Make.rules.AIX
--- zeroc-ice-3.7.1/config/Make.rules.AIX	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/Make.rules.AIX	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 supported-platforms = ppc ppc64
 
diff -Nru zeroc-ice-3.7.1/config/Make.rules.Darwin zeroc-ice-3.7.2/config/Make.rules.Darwin
--- zeroc-ice-3.7.1/config/Make.rules.Darwin	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/Make.rules.Darwin	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 supported-platforms             = macosx iphoneos iphonesimulator
 
@@ -33,12 +28,21 @@
 # If building objects for a shared library, enable fPIC
 shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC) -fvisibility=hidden
 
-cppflags        = -Wall -Wdeprecated -Wstrict-prototypes -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g)
+cppflags        = -Wall -Wextra -Wshadow -Wshadow-all -Wredundant-decls \
+                  -Wdeprecated -Wstrict-prototypes -Werror -pthread \
+                  $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g)
+
 ifeq ($(MAXWARN),yes)
-    cppflags	+= -Wextra -Wshadow -Wredundant-decls -Wweak-vtables
+    cppflags	+=  -Wweak-vtables
+endif
+
+# -Wshadow issues false warnings with clang 3.x (Apple LLVM 9.0)
+ifeq ($(shell clang -v 2>&1 | sed -ne 's/.*version \([0-9]*\)\.\([0-9]*\).*/\1\2/p'),90)
+    cppflags    := $(filter-out -Wshadow -Wshadow-all,$(cppflags))
 endif
 
 nodeprecatedwarnings-cppflags := -Wno-deprecated-declarations
+nounusedparameter-cppflags    := -Wno-unused-parameter
 
 loader_path     = @loader_path
 
@@ -49,7 +53,7 @@
 mklib           = $(or $($7_ar),$(AR)) -static -no_warning_for_no_symbols -o $1 $2
 
 # $(call mkshlib,$1=target,$2=objects,$3=libname,$4=version,$5=soversion,$6=ldflags,$7=platform)
-mkshlib         = $(or $($7_cxx),$(CXX)) -dynamiclib $(if $5,-install_name @rpath/$(call mksoname,$3,$4,$5))\
+mkshlib         = $(or $($7_cxx),$(CXX)) -dynamiclib $(if $5,-install_name @rpath/$(call mkshlibfilename,$3,$4,$5))\
                   $(if $4,-current_version $(call machoversion,$4) -compatibility_version \
                      $(call machoversion,$(if $(filter $4,$(version)),$(compatversion),$4))) \
                   -o $1 $2 $6
@@ -60,8 +64,7 @@
 #
 # $(call mkxxx,$1=libname,$2=version,$3=soversion)
 #
-mksoname          = lib$1$(if $3,.$3).dylib
-mkshlibfilename   = lib$1$(if $2,.$2).dylib
+mkshlibfilename   = lib$1$(if $3,.$3).dylib
 mkshlibname       = lib$1.dylib
 mkshlibnametarget = $(mkshlibfilename)
 
diff -Nru zeroc-ice-3.7.1/config/Make.rules.Linux zeroc-ice-3.7.2/config/Make.rules.Linux
--- zeroc-ice-3.7.1/config/Make.rules.Linux	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/Make.rules.Linux	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,10 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-linux_id                        = $(if $(wildcard /etc/os-release),$(shell . /etc/os-release && echo $${ID}),)
+known_distributions             := centos rhel fedora debian ubuntu amzn sles
+linux_ids                       := $(if $(wildcard /etc/os-release),$(shell . /etc/os-release && echo $${ID} $${ID_LIKE}),)
+linux_id                        := $(word 1,$(or $(filter $(known_distributions),$(linux_ids)),$(linux_ids)))
 is-bin-program                  = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program))
 
 ifneq ($(OECORE_SDK_VERSION),)
@@ -38,7 +35,7 @@
 # distribution from $(OECORE_TARGET_SYSROOT) on the build platform.
 ice_bindir[$(build-platform)]   = $(if $(ice_system_install),$(OECORE_NATIVE_SYSROOT)/usr/bin)
 
-else ifneq ($(filter centos rhel fedora,$(linux_id)),)
+else ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64 i%86,$(shell uname -m))),)
 
 #
 # MultiLib Linux (x64 libraries go in the lib64 directory, x86 executable names are suffixed with 32)
@@ -56,7 +53,7 @@
 x64_cppflags            := $(call opt-cppflags,x86_64) -m64
 x64_ldflags             := $(call opt-ldflags,x86_64) -m64
 x64_targetdir           = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64))
-x64_installdir          = $(if $(and $(filter-out $($1_target),program),$(filter-out %64,$5)),64)
+x64_installdir          = $(if $(and $(filter-out $($1_target),program),$(if $5,$(filter-out %64,$5),true)),64)
 
 x86_cppflags            := $(call opt-cppflags,i386) -m32
 x86_ldflags             := $(call opt-ldflags,i386) -m32
@@ -127,12 +124,12 @@
 
 build-platform                  = $(if $(filter arm%,$(shell uname -m)),arm,$(shell uname -m))
 supported-platforms             = $(build-platform)
-lib-suffix                      = $(if $(filter x86_64,$(build-platform)),64,)
+lib-suffix                      = $(if $(filter %64,$(build-platform)),64,)
 
 $(build-platform)_cppflags      := $(call opt-cppflags,$(build-platform))
 $(build-platform)_ldflags       := $(call opt-ldflags,$(build-platform))
 $(build-platform)_targetdir     = $(if $(filter %/build,$5),/$(build-platform),$(if $(filter-out $($1_target),program),$(lib-suffix)))
-$(build-platform)_installdir    = $(if $(and $(filter-out $($1_target),program),$(filter-out %$(lib-suffix),$($1_installdir))),$(lib-suffix))
+$(build-platform)_installdir    = $(if $(and $(filter-out $($1_target),program),$(if $5,$(filter-out %$(lib-suffix),$5),true)),$(lib-suffix))
 
 endif
 
@@ -148,13 +145,16 @@
         -pie $(if $(filter yes,$(new_dtags)),-Wl$(comma)--enable-new-dtags,-Wl$(comma)--disable-new-dtags) \
         $$(call unique,$$(foreach d,$($4_dependencies),$$(call make-rpath-link-ldflags,$$d,$($4_dependencies)))))
 
-cppflags        = -Wall -Wdeprecated -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-DNDEBUG,-g)
+cppflags        = -Wall -Wextra -Wredundant-decls -Wshadow -Wdeprecated -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-DNDEBUG,-g)
 ldflags         = -pthread
-ifeq ($(MAXWARN),yes)
-    cppflags    += -Wextra -Wshadow -Wredundant-decls
+
+# -Wshadow is too strict with gcc 4
+ifeq ($(shell $(CXX) -dumpversion | cut -f1 -d\.),4)
+    cppflags    := $(filter-out -Wshadow,$(cppflags))
 endif
 
 nodeprecatedwarnings-cppflags := -Wno-deprecated-declarations
+nounusedparameter-cppflags    := -Wno-unused-parameter
 
 loader_path     = \$$ORIGIN
 
@@ -188,6 +188,9 @@
 
 IceUtil_system_libs                             = -lrt $(if $(filter yes,$(libbacktrace)),-lbacktrace)
 Ice_system_libs                                 = -ldl -lcrypto $(IceUtil_system_libs)
+ifeq ($(shell pkg-config --exists libsystemd 2> /dev/null && echo yes),yes)
+Ice_system_libs                                 += $(shell pkg-config --libs libsystemd)
+endif
 IceSSL_system_libs                              = -lssl -lcrypto
 Glacier2CryptPermissionsVerifier_system_libs    = -lcrypt
 
diff -Nru zeroc-ice-3.7.1/config/Make.tests.rules zeroc-ice-3.7.2/config/Make.tests.rules
--- zeroc-ice-3.7.1/config/Make.tests.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/Make.tests.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # $(call test,[$1])
diff -Nru zeroc-ice-3.7.1/config/Make.xcodesdk.rules zeroc-ice-3.7.2/config/Make.xcodesdk.rules
--- zeroc-ice-3.7.1/config/Make.xcodesdk.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/Make.xcodesdk.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Xcode configuration to build Xcode sdks for Ice.
@@ -62,8 +57,9 @@
 	           -project "$1/$$(call $1_project,$2,$3)" \
 	           -configuration "$$(call $1_configuration,$2,$3)" \
 		   -scheme "$$(call $1_scheme,$2,$3)" \
-		   $(if $(ICE_BIN_DIST),ADDITIONAL_SDKS=$(sdkdir)/$2.sdk) \
-		   $(if $(V),,-quiet) SYMROOT=./build \
+		   $(if $(ICE_BIN_DIST),HEADER_SEARCH_PATHS=../../Ice\ ../../include\ $(sdkdir)/$2.sdk/usr/include \
+                   LIBRARY_SEARCH_PATHS=$(sdkdir)/$2.sdk/usr/lib) \
+		   $(if $(V),,-quiet) SYMROOT=./build-$2-$3 OBJROOT=./objs-$2-$3 \
 		   clean build
 
 $1[$2-$3]_clean:
@@ -72,7 +68,7 @@
 	           -project "$1/$$(call $1_project,$2,$3)" \
 	           -configuration "$$(call $1_configuration,$2,$3)" \
 		   -scheme "$$(call $1_scheme,$2,$3)" \
-		   $(if $(V),,-quiet) SYMROOT=./build \
+		   $(if $(V),,-quiet) SYMROOT=./build-$2-$3 OBJROOT=./objs-$2-$3 \
 		   clean
 
 $1:: $1[$2-$3]
@@ -84,6 +80,7 @@
 # $(call make-xcode-project,$1=project)
 #
 define make-xcode-project
+
 #
 # Define per-<platform-config> rules for this component.
 #
diff -Nru zeroc-ice-3.7.1/config/PropertyNames.xml zeroc-ice-3.7.2/config/PropertyNames.xml
--- zeroc-ice-3.7.1/config/PropertyNames.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/config/PropertyNames.xml	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,5 @@
 <?xml version="1.0"?>
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 
 <!--
 This file defines the valid properties that are used by various Ice
@@ -401,6 +392,7 @@
         <property name="TCP.SndSize" />
         <property name="UseApplicationClassLoader" />
         <property name="UseSyslog" />
+        <property name="UseSystemdJournal" />
         <property name="Warn.AMICallback" />
         <property name="Warn.Connections" />
         <property name="Warn.Datagrams" />
@@ -410,7 +402,7 @@
         <property name="Warn.UnusedProperties" />
         <property name="CacheMessageBuffers" />
         <property name="ThreadInterruptSafe" />
-        <property name="Voip" />
+        <property name="Voip" deprecated="true" />
     </section>
 
     <section name="IceMX">
@@ -475,6 +467,7 @@
         <property name="Host" />
         <property name="Port" />
         <property name="InstanceName" />
+        <property name="Server" class="objectadapter" />
         <property name="Discovery.Address" />
         <property name="Discovery.Interface" />
         <property name="Discovery.Lookup" />
diff -Nru zeroc-ice-3.7.1/cpp/allTests.py zeroc-ice-3.7.2/cpp/allTests.py
--- zeroc-ice-3.7.1/cpp/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/cpp/config/ice_ca.cnf zeroc-ice-3.7.2/cpp/config/ice_ca.cnf
--- zeroc-ice-3.7.1/cpp/config/ice_ca.cnf	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/config/ice_ca.cnf	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # ZeroC base OpenSSL configuration file.
diff -Nru zeroc-ice-3.7.1/cpp/config/Make.rules zeroc-ice-3.7.2/cpp/config/Make.rules
--- zeroc-ice-3.7.1/cpp/config/Make.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/config/Make.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # ----------------------------------------------------------------------
 # Don't change anything below this line!
diff -Nru zeroc-ice-3.7.1/cpp/config/Make.xcodesdk.rules zeroc-ice-3.7.2/cpp/config/Make.xcodesdk.rules
--- zeroc-ice-3.7.1/cpp/config/Make.xcodesdk.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/config/Make.xcodesdk.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 include $(top_srcdir)/config/Make.xcodesdk.rules
 
diff -Nru zeroc-ice-3.7.1/cpp/config/templates.xml zeroc-ice-3.7.2/cpp/config/templates.xml
--- zeroc-ice-3.7.1/cpp/config/templates.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/config/templates.xml	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,4 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 
 <icegrid>
   <application name="Templates">
diff -Nru zeroc-ice-3.7.1/cpp/doxygen/config-cpp11 zeroc-ice-3.7.2/cpp/doxygen/config-cpp11
--- zeroc-ice-3.7.1/cpp/doxygen/config-cpp11	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/doxygen/config-cpp11	2019-02-05 18:03:04.000000000 +0000
@@ -32,7 +32,7 @@
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Ice C++11 API Reference"
+PROJECT_NAME           = "Ice 3.7 C++11 API Reference"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
diff -Nru zeroc-ice-3.7.1/cpp/doxygen/config-cpp98 zeroc-ice-3.7.2/cpp/doxygen/config-cpp98
--- zeroc-ice-3.7.1/cpp/doxygen/config-cpp98	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/doxygen/config-cpp98	2019-02-05 18:03:04.000000000 +0000
@@ -32,7 +32,7 @@
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Ice C++98 API Reference"
+PROJECT_NAME           = "Ice 3.7 C++98 API Reference"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
diff -Nru zeroc-ice-3.7.1/cpp/include/Glacier2/Application.h zeroc-ice-3.7.2/cpp/include/Glacier2/Application.h
--- zeroc-ice-3.7.1/cpp/include/Glacier2/Application.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Glacier2/Application.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_APPLICATION_H
 #define GLACIER2_APPLICATION_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Glacier2/Config.h zeroc-ice-3.7.2/cpp/include/Glacier2/Config.h
--- zeroc-ice-3.7.1/cpp/include/Glacier2/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Glacier2/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_CONFIG_H
 #define GLACIER2_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Glacier2/Glacier2.h zeroc-ice-3.7.2/cpp/include/Glacier2/Glacier2.h
--- zeroc-ice-3.7.1/cpp/include/Glacier2/Glacier2.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Glacier2/Glacier2.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_H
 #define GLACIER2_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Glacier2/NullPermissionsVerifier.h zeroc-ice-3.7.2/cpp/include/Glacier2/NullPermissionsVerifier.h
--- zeroc-ice-3.7.1/cpp/include/Glacier2/NullPermissionsVerifier.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Glacier2/NullPermissionsVerifier.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_NULL_PERMISSIONS_VERIFIER_H
 #define GLACIER2_NULL_PERMISSIONS_VERIFIER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Glacier2/SessionHelper.h zeroc-ice-3.7.2/cpp/include/Glacier2/SessionHelper.h
--- zeroc-ice-3.7.1/cpp/include/Glacier2/SessionHelper.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Glacier2/SessionHelper.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_SESSION_HELPER_H
 #define GLACIER2_SESSION_HELPER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Application.h zeroc-ice-3.7.2/cpp/include/Ice/Application.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Application.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Application.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_APPLICATION_H
 #define ICE_APPLICATION_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/AsyncResultF.h zeroc-ice-3.7.2/cpp/include/Ice/AsyncResultF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/AsyncResultF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/AsyncResultF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ASYNC_RESULT_F_H
 #define ICE_ASYNC_RESULT_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/AsyncResult.h zeroc-ice-3.7.2/cpp/include/Ice/AsyncResult.h
--- zeroc-ice-3.7.1/cpp/include/Ice/AsyncResult.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/AsyncResult.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ASYNC_RESULT_H
 #define ICE_ASYNC_RESULT_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/BatchRequestInterceptor.h zeroc-ice-3.7.2/cpp/include/Ice/BatchRequestInterceptor.h
--- zeroc-ice-3.7.1/cpp/include/Ice/BatchRequestInterceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/BatchRequestInterceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BATCH_REQUEST_INTERCEPTOR_H
 #define ICE_BATCH_REQUEST_INTERCEPTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/BatchRequestQueueF.h zeroc-ice-3.7.2/cpp/include/Ice/BatchRequestQueueF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/BatchRequestQueueF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/BatchRequestQueueF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BATCH_REQUEST_QUEUE_F_H
 #define ICE_BATCH_REQUEST_QUEUE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Buffer.h zeroc-ice-3.7.2/cpp/include/Ice/Buffer.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Buffer.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Buffer.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BUFFER_H
 #define ICE_BUFFER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/CommunicatorAsync.h zeroc-ice-3.7.2/cpp/include/Ice/CommunicatorAsync.h
--- zeroc-ice-3.7.1/cpp/include/Ice/CommunicatorAsync.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/CommunicatorAsync.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_COMMUNICATOR_ASYNC_H
 #define ICE_COMMUNICATOR_ASYNC_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Comparable.h zeroc-ice-3.7.2/cpp/include/Ice/Comparable.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Comparable.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Comparable.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_COMPARABLE_H
 #define ICE_COMPARABLE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Config.h zeroc-ice-3.7.2/cpp/include/Ice/Config.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONFIG_H
 #define ICE_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ConnectionAsync.h zeroc-ice-3.7.2/cpp/include/Ice/ConnectionAsync.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ConnectionAsync.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ConnectionAsync.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_ASYNC_H
 #define ICE_CONNECTION_ASYNC_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ConnectionIF.h zeroc-ice-3.7.2/cpp/include/Ice/ConnectionIF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ConnectionIF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ConnectionIF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTIONI_F_H
 #define ICE_CONNECTIONI_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ConsoleUtil.h zeroc-ice-3.7.2/cpp/include/Ice/ConsoleUtil.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ConsoleUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ConsoleUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONSOLE_UTIL_H
 #define ICE_CONSOLE_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/DefaultValueFactory.h zeroc-ice-3.7.2/cpp/include/Ice/DefaultValueFactory.h
--- zeroc-ice-3.7.1/cpp/include/Ice/DefaultValueFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/DefaultValueFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DEFAULT_VALUE_FACTORY_H
 #define ICE_DEFAULT_VALUE_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Dispatcher.h zeroc-ice-3.7.2/cpp/include/Ice/Dispatcher.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Dispatcher.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Dispatcher.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DISPATCHER_H
 #define ICE_DISPATCHER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/DispatchInterceptor.h zeroc-ice-3.7.2/cpp/include/Ice/DispatchInterceptor.h
--- zeroc-ice-3.7.1/cpp/include/Ice/DispatchInterceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/DispatchInterceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DISPATCH_INTERCEPTOR_H
 #define ICE_DISPATCH_INTERCEPTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/DynamicLibraryF.h zeroc-ice-3.7.2/cpp/include/Ice/DynamicLibraryF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/DynamicLibraryF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/DynamicLibraryF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DYNAMIC_LIBRARY_F_H
 #define ICE_DYNAMIC_LIBRARY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/DynamicLibrary.h zeroc-ice-3.7.2/cpp/include/Ice/DynamicLibrary.h
--- zeroc-ice-3.7.1/cpp/include/Ice/DynamicLibrary.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/DynamicLibrary.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DYNAMIC_LIBRARY_H
 #define ICE_DYNAMIC_LIBRARY_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Exception.h zeroc-ice-3.7.2/cpp/include/Ice/Exception.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Exception.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Exception.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_EXCEPTION_H
 #define ICE_EXCEPTION_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ExceptionHelpers.h zeroc-ice-3.7.2/cpp/include/Ice/ExceptionHelpers.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ExceptionHelpers.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ExceptionHelpers.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_EXCEPTION_HELPERS_H
 #define ICE_EXCEPTION_HELPERS_H
@@ -21,7 +16,7 @@
 class LocalException;
 
 /**
- * Helper template for local exceptions.
+ * Helper template for the implementation of Ice::LocalException. It implements ice_id.
  * \headerfile Ice/Ice.h
  */
 template<typename T, typename B> class LocalExceptionHelper : public IceUtil::ExceptionHelper<T, B>
@@ -30,10 +25,6 @@
 
     using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
 
-    /**
-     * Obtains the Slice type ID of this exception.
-     * @return The fully-scoped type ID.
-     */
     virtual std::string ice_id() const override
     {
         return T::ice_staticId();
@@ -41,7 +32,7 @@
 };
 
 /**
- * Helper template for user exceptions.
+ * Helper template for the implementation of Ice::UserException. It implements ice_id.
  * \headerfile Ice/Ice.h
  */
 template<typename T, typename B> class UserExceptionHelper : public IceUtil::ExceptionHelper<T, B>
@@ -50,10 +41,6 @@
 
     using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
 
-    /**
-     * Obtains the Slice type ID of this exception.
-     * @return The fully-scoped type ID.
-     */
     virtual std::string ice_id() const override
     {
         return T::ice_staticId();
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/FactoryTable.h zeroc-ice-3.7.2/cpp/include/Ice/FactoryTable.h
--- zeroc-ice-3.7.1/cpp/include/Ice/FactoryTable.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/FactoryTable.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_FACTORYTABLE_H
 #define ICE_FACTORYTABLE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/FactoryTableInit.h zeroc-ice-3.7.2/cpp/include/Ice/FactoryTableInit.h
--- zeroc-ice-3.7.1/cpp/include/Ice/FactoryTableInit.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/FactoryTableInit.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_FACTORYTABLEINIT_H
 #define ICE_FACTORYTABLEINIT_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Format.h zeroc-ice-3.7.2/cpp/include/Ice/Format.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Format.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Format.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_FORMAT_H
 #define ICE_FORMAT_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Functional.h zeroc-ice-3.7.2/cpp/include/Ice/Functional.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Functional.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Functional.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_FUNCTIONAL_H
 #define ICE_FUNCTIONAL_H
 
-#   if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC)
+#ifndef ICE_CPP11_MAPPING
 
 #include <IceUtil/Functional.h>
 #include <Ice/Handle.h>
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/GCObject.h zeroc-ice-3.7.2/cpp/include/Ice/GCObject.h
--- zeroc-ice-3.7.1/cpp/include/Ice/GCObject.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/GCObject.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GC_OBJECT_H
 #define ICE_GC_OBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Handle.h zeroc-ice-3.7.2/cpp/include/Ice/Handle.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Handle.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Handle.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_HANDLE_H
 #define ICE_HANDLE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Ice.h zeroc-ice-3.7.2/cpp/include/Ice/Ice.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Ice.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Ice.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ICE_H
 #define ICE_ICE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/IconvStringConverter.h zeroc-ice-3.7.2/cpp/include/Ice/IconvStringConverter.h
--- zeroc-ice-3.7.1/cpp/include/Ice/IconvStringConverter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/IconvStringConverter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ICONV_STRING_CONVERTER
 #define ICE_ICONV_STRING_CONVERTER
@@ -18,13 +13,13 @@
 #ifndef _WIN32
 
 #include <Ice/StringConverter.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/ThreadException.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #include <algorithm>
 #include <iconv.h>
 #include <langinfo.h>
-#include <string.h> // For strerror
 
 #if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
 //
@@ -289,9 +284,8 @@
 
     if(count == size_t(-1))
     {
-        throw Ice::IllegalConversionException(__FILE__,
-                                              __LINE__,
-                                              errno != 0 ? strerror(errno) : "Unknown error");
+        throw Ice::IllegalConversionException(__FILE__, __LINE__,
+                                              errno == 0 ? "Unknown error" : IceUtilInternal::errorToString(errno));
     }
     return reinterpret_cast<Ice::Byte*>(outbuf);
 }
@@ -345,9 +339,8 @@
 
     if(count == size_t(-1))
     {
-        throw Ice::IllegalConversionException(__FILE__,
-                                              __LINE__,
-                                              errno != 0 ? strerror(errno) : "Unknown error");
+        throw Ice::IllegalConversionException(__FILE__,  __LINE__,
+                                              errno == 0 ? "Unknown error" : IceUtilInternal::errorToString(errno));
     }
 
     target.resize(target.size() - (outbytesleft / sizeof(charT)));
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/IncomingAsyncF.h zeroc-ice-3.7.2/cpp/include/Ice/IncomingAsyncF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/IncomingAsyncF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/IncomingAsyncF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INCOMING_ASYNC_F_H
 #define ICE_INCOMING_ASYNC_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/IncomingAsync.h zeroc-ice-3.7.2/cpp/include/Ice/IncomingAsync.h
--- zeroc-ice-3.7.1/cpp/include/Ice/IncomingAsync.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/IncomingAsync.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INCOMING_ASYNC_H
 #define ICE_INCOMING_ASYNC_H
@@ -45,6 +40,12 @@
 namespace IceInternal
 {
 
+// TODO: fix this warning
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(push)
+#   pragma warning(disable:4239)
+#endif
+
 //
 // We need virtual inheritance from AMDCallback, because we use multiple
 // inheritance from Ice::AMDCallback for generated AMD code.
@@ -118,6 +119,10 @@
     const ResponseHandlerPtr _responseHandlerCopy;
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(pop)
+#endif
+
 }
 
 #ifndef ICE_CPP11_MAPPING
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Incoming.h zeroc-ice-3.7.2/cpp/include/Ice/Incoming.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Incoming.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Incoming.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INCOMING_H
 #define ICE_INCOMING_H
@@ -83,7 +78,7 @@
     void exception(const std::string&, bool);
 #if defined(_MSC_VER) && (_MSC_VER == 1500)
     //
-    // COMPILERFIX VC90 get confused with overloads above
+    // COMPILERFIX v90 get confused with overloads above
     // when passing a const char* as first argument.
     //
     void exception(const char* msg, bool amd)
@@ -107,7 +102,7 @@
 
 #if defined(_MSC_VER) && (_MSC_VER == 1500)
     //
-    // COMPILERFIX VC90 get confused with overloads above
+    // COMPILERFIX v90 get confused with overloads above
     // when passing a const char* as first argument.
     //
     void handleException(const char* msg, bool amd)
@@ -145,6 +140,12 @@
     DispatchInterceptorCallbacks _interceptorCBs;
 };
 
+// TODO: fix this warning
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(push)
+#   pragma warning(disable:4239)
+#endif
+
 class ICE_API Incoming : public IncomingBase
 {
 public:
@@ -215,6 +216,10 @@
     IncomingAsyncPtr _inAsync;
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(pop)
+#endif
+
 }
 
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Initialize.h zeroc-ice-3.7.2/cpp/include/Ice/Initialize.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Initialize.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Initialize.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INITIALIZE_H
 #define ICE_INITIALIZE_H
@@ -298,6 +293,12 @@
     Instrumentation::CommunicatorObserverPtr observer;
 
 #ifdef ICE_CPP11_MAPPING
+
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wdocumentation" // param/return is not recognized for std::function data members
+#endif
+
     /**
      * Called whenever the communicator starts a new thread.
      */
@@ -343,6 +344,11 @@
      * @param size The number of bytes consumed by the requests currently in the queue.
      */
     std::function<void(const Ice::BatchRequest& req, int count, int size)> batchRequestInterceptor;
+
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#endif
+
 #else
     /**
      * The thread hook for the communicator.
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/InputStream.h zeroc-ice-3.7.2/cpp/include/Ice/InputStream.h
--- zeroc-ice-3.7.1/cpp/include/Ice/InputStream.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/InputStream.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INPUT_STREAM_H
 #define ICE_INPUT_STREAM_H
@@ -62,7 +57,7 @@
      * @param addr The target address.
      * @param v The unmarshaled value.
      */
-    typedef void (*PatchFunc)(void*, const ValuePtr&);
+    typedef void (*PatchFunc)(void* addr, const ValuePtr& v);
 
     /**
      * Constructs a stream using the latest encoding version but without a communicator.
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/InstanceF.h zeroc-ice-3.7.2/cpp/include/Ice/InstanceF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/InstanceF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/InstanceF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INSTANCE_F_H
 #define ICE_INSTANCE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/InterfaceByValue.h zeroc-ice-3.7.2/cpp/include/Ice/InterfaceByValue.h
--- zeroc-ice-3.7.1/cpp/include/Ice/InterfaceByValue.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/InterfaceByValue.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INTERFACE_BY_VALUE_H
 #define ICE_INTERFACE_BY_VALUE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/LocalObjectF.h zeroc-ice-3.7.2/cpp/include/Ice/LocalObjectF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/LocalObjectF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/LocalObjectF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_LOCAL_OBJECT_F_H
 #define ICE_LOCAL_OBJECT_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/LocalObject.h zeroc-ice-3.7.2/cpp/include/Ice/LocalObject.h
--- zeroc-ice-3.7.1/cpp/include/Ice/LocalObject.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/LocalObject.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_LOCAL_OBJECT_H
 #define ICE_LOCAL_OBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/LoggerUtil.h zeroc-ice-3.7.2/cpp/include/Ice/LoggerUtil.h
--- zeroc-ice-3.7.1/cpp/include/Ice/LoggerUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/LoggerUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_LOGGER_UTIL_H
 #define ICE_LOGGER_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/MetricsAdminI.h zeroc-ice-3.7.2/cpp/include/Ice/MetricsAdminI.h
--- zeroc-ice-3.7.1/cpp/include/Ice/MetricsAdminI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/MetricsAdminI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_METRICSADMIN_I_H
 #define ICE_METRICSADMIN_I_H
@@ -325,7 +320,14 @@
         }
     }
 
-    MetricsMapT(const MetricsMapT& other) : MetricsMapI(other), _destroyed(false)
+    MetricsMapT(const MetricsMapT& other)
+        :
+#ifndef ICE_CPP11_MAPPING
+        IceUtil::Shared(),
+#endif
+        MetricsMapI(other),
+        IceUtil::Mutex(),
+        _destroyed(false)
     {
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/MetricsFunctional.h zeroc-ice-3.7.2/cpp/include/Ice/MetricsFunctional.h
--- zeroc-ice-3.7.1/cpp/include/Ice/MetricsFunctional.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/MetricsFunctional.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_METRICSFUNCTIONAL_H
 #define ICE_METRICSFUNCTIONAL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/MetricsObserverI.h zeroc-ice-3.7.2/cpp/include/Ice/MetricsObserverI.h
--- zeroc-ice-3.7.1/cpp/include/Ice/MetricsObserverI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/MetricsObserverI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEMX_METRICSOBSERVER_I_H
 #define ICEMX_METRICSOBSERVER_I_H
@@ -132,6 +127,20 @@
                                                                                                 memberFn)));
         }
 
+#if ICE_CPLUSPLUS >= 201703L
+        //
+        // Since C++17 the noexcept-specification is part of the function type and we need a separate
+        // overload to handle memberFn being noexcept
+        //
+        template<typename I, typename O, typename Y> void
+        add(const std::string& name, O (Helper::*getFn)() const, Y (I::*memberFn)() const noexcept)
+        {
+            _attributes.insert(typename std::map<std::string,
+                               Resolver*>::value_type(name, new MemberFunctionResolver<I, O, Y>(name, getFn,
+                                                                                                memberFn)));
+        }
+#endif
+
     private:
 
         template<typename Y> class HelperMemberResolver : public Resolver
@@ -317,7 +326,7 @@
 };
 ICE_DEFINE_PTR(UpdaterPtr, Updater);
 
-template<typename T> class UpdaterT : public Updater
+template<typename T> class UpdaterT ICE_FINAL : public Updater
 {
 public:
 
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/NativePropertiesAdmin.h zeroc-ice-3.7.2/cpp/include/Ice/NativePropertiesAdmin.h
--- zeroc-ice-3.7.1/cpp/include/Ice/NativePropertiesAdmin.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/NativePropertiesAdmin.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROPERTIES_ADMIN_H
 #define ICE_PROPERTIES_ADMIN_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ObjectF.h zeroc-ice-3.7.2/cpp/include/Ice/ObjectF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ObjectF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ObjectF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OBJECT_F_H
 #define ICE_OBJECT_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Object.h zeroc-ice-3.7.2/cpp/include/Ice/Object.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Object.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Object.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OBJECT_H
 #define ICE_OBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ObserverHelper.h zeroc-ice-3.7.2/cpp/include/Ice/ObserverHelper.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ObserverHelper.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ObserverHelper.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OBSERVERHELPER_H
 #define ICE_OBSERVERHELPER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Optional.h zeroc-ice-3.7.2/cpp/include/Ice/Optional.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Optional.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Optional.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Ice::optional is a placeholder for std::optional:
@@ -554,6 +549,10 @@
     return contained_val();
   }
 
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning(disable:4702) // unreachable code
+#endif
   constexpr T const& value() const {
     return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
   }
@@ -562,6 +561,10 @@
     return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
   }
 
+#ifdef _MSC_VER
+#   pragma warning(pop)
+#endif
+
 # endif
 
 # if OPTIONAL_HAS_THIS_RVALUE_REFS == 1
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/OutgoingAsyncF.h zeroc-ice-3.7.2/cpp/include/Ice/OutgoingAsyncF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/OutgoingAsyncF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/OutgoingAsyncF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OUTGOING_ASYNC_F_H
 #define ICE_OUTGOING_ASYNC_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/OutgoingAsync.h zeroc-ice-3.7.2/cpp/include/Ice/OutgoingAsync.h
--- zeroc-ice-3.7.1/cpp/include/Ice/OutgoingAsync.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/OutgoingAsync.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OUTGOING_ASYNC_H
 #define ICE_OUTGOING_ASYNC_H
@@ -585,7 +580,7 @@
                 this->_is.startEncapsulation();
                 R v = this->_read(&this->_is);
                 this->_is.endEncapsulation();
-                this->_promise.set_value(v);
+                this->_promise.set_value(std::move(v));
             }
             else
             {
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/OutputStream.h zeroc-ice-3.7.2/cpp/include/Ice/OutputStream.h
--- zeroc-ice-3.7.1/cpp/include/Ice/OutputStream.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/OutputStream.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OUTPUT_STREAM_H
 #define ICE_OUTPUT_STREAM_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Protocol.h zeroc-ice-3.7.2/cpp/include/Ice/Protocol.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Protocol.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Protocol.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROTOCOL_H
 #define ICE_PROTOCOL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ProxyFactoryF.h zeroc-ice-3.7.2/cpp/include/Ice/ProxyFactoryF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ProxyFactoryF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ProxyFactoryF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROXY_FACTORY_F_H
 #define ICE_PROXY_FACTORY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ProxyF.h zeroc-ice-3.7.2/cpp/include/Ice/ProxyF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ProxyF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ProxyF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROXY_F_H
 #define ICE_PROXY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Proxy.h zeroc-ice-3.7.2/cpp/include/Ice/Proxy.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Proxy.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Proxy.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROXY_H
 #define ICE_PROXY_H
@@ -41,7 +36,7 @@
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
 //
-// COMPILERFIX VC90 and VC100 get confused with namespaces and complains that
+// COMPILERFIX v90 and v100 get confused with namespaces and complains that
 // ::Ice::noExplicitContext isn't defined in IceProxy namespace.
 //
 namespace IceProxy
@@ -1620,8 +1615,6 @@
     return r;
 }
 
-ICE_API ::std::ostream& operator<<(::std::ostream&, const Ice::ObjectPrx&);
-
 }
 
 #else // C++98 mapping
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ProxyHandle.h zeroc-ice-3.7.2/cpp/include/Ice/ProxyHandle.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ProxyHandle.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ProxyHandle.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROXY_HANDLE_H
 #define ICE_PROXY_HANDLE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ReferenceF.h zeroc-ice-3.7.2/cpp/include/Ice/ReferenceF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ReferenceF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ReferenceF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REFERENCE_F_H
 #define ICE_REFERENCE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/RegisterPlugins.h zeroc-ice-3.7.2/cpp/include/Ice/RegisterPlugins.h
--- zeroc-ice-3.7.1/cpp/include/Ice/RegisterPlugins.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/RegisterPlugins.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REGISTER_PLUGINS_H
 #define ICE_REGISTER_PLUGINS_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/RequestHandlerF.h zeroc-ice-3.7.2/cpp/include/Ice/RequestHandlerF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/RequestHandlerF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/RequestHandlerF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REQUEST_HANDLER_F_H
 #define ICE_REQUEST_HANDLER_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ResponseHandlerF.h zeroc-ice-3.7.2/cpp/include/Ice/ResponseHandlerF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ResponseHandlerF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ResponseHandlerF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RESPONSE_HANDLER_F_H
 #define ICE_RESPONSE_HANDLER_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ServantManagerF.h zeroc-ice-3.7.2/cpp/include/Ice/ServantManagerF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ServantManagerF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ServantManagerF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SERVANT_MANAGER_F_H
 #define ICE_SERVANT_MANAGER_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Service.h zeroc-ice-3.7.2/cpp/include/Ice/Service.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Service.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Service.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SERVICE_H
 #define ICE_SERVICE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/SHA1.h zeroc-ice-3.7.2/cpp/include/Ice/SHA1.h
--- zeroc-ice-3.7.1/cpp/include/Ice/SHA1.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/SHA1.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SHA1_H
 #define ICE_SHA1_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/SliceChecksums.h zeroc-ice-3.7.2/cpp/include/Ice/SliceChecksums.h
--- zeroc-ice-3.7.1/cpp/include/Ice/SliceChecksums.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/SliceChecksums.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SLICE_CHECKSUM_H
 #define ICE_SLICE_CHECKSUM_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/SlicedDataF.h zeroc-ice-3.7.2/cpp/include/Ice/SlicedDataF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/SlicedDataF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/SlicedDataF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SLICED_DATA_F_H
 #define ICE_SLICED_DATA_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/SlicedData.h zeroc-ice-3.7.2/cpp/include/Ice/SlicedData.h
--- zeroc-ice-3.7.1/cpp/include/Ice/SlicedData.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/SlicedData.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SLICED_DATA_H
 #define ICE_SLICED_DATA_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/StreamHelpers.h zeroc-ice-3.7.2/cpp/include/Ice/StreamHelpers.h
--- zeroc-ice-3.7.1/cpp/include/Ice/StreamHelpers.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/StreamHelpers.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STREAM_HELPERS_H
 #define ICE_STREAM_HELPERS_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/StringConverter.h zeroc-ice-3.7.2/cpp/include/Ice/StringConverter.h
--- zeroc-ice-3.7.1/cpp/include/Ice/StringConverter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/StringConverter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STRING_CONVERTER_H
 #define ICE_STRING_CONVERTER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ThreadPoolF.h zeroc-ice-3.7.2/cpp/include/Ice/ThreadPoolF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ThreadPoolF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ThreadPoolF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_THREAD_POOL_F_H
 #define ICE_THREAD_POOL_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/UniquePtr.h zeroc-ice-3.7.2/cpp/include/Ice/UniquePtr.h
--- zeroc-ice-3.7.1/cpp/include/Ice/UniquePtr.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/UniquePtr.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UNIQUE_PTR_H
 #define ICE_UNIQUE_PTR_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/UniqueRef.h zeroc-ice-3.7.2/cpp/include/Ice/UniqueRef.h
--- zeroc-ice-3.7.1/cpp/include/Ice/UniqueRef.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/UniqueRef.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UNIQUE_REF_H
 #define ICE_UNIQUE_REF_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/UserExceptionFactory.h zeroc-ice-3.7.2/cpp/include/Ice/UserExceptionFactory.h
--- zeroc-ice-3.7.1/cpp/include/Ice/UserExceptionFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/UserExceptionFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_USER_EXCEPTION_FACTORY_H
 #define ICE_USER_EXCEPTION_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/UUID.h zeroc-ice-3.7.2/cpp/include/Ice/UUID.h
--- zeroc-ice-3.7.1/cpp/include/Ice/UUID.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/UUID.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UUID_H
 #define ICE_UUID_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/ValueF.h zeroc-ice-3.7.2/cpp/include/Ice/ValueF.h
--- zeroc-ice-3.7.1/cpp/include/Ice/ValueF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/ValueF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_VALUE_F_H
 #define ICE_VALUE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/include/Ice/Value.h zeroc-ice-3.7.2/cpp/include/Ice/Value.h
--- zeroc-ice-3.7.1/cpp/include/Ice/Value.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/Ice/Value.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_VALUE_H
 #define ICE_VALUE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceBox/Config.h zeroc-ice-3.7.2/cpp/include/IceBox/Config.h
--- zeroc-ice-3.7.1/cpp/include/IceBox/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceBox/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEBOX_CONFIG_H
 #define ICEBOX_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceBT/IceBT.h zeroc-ice-3.7.2/cpp/include/IceBT/IceBT.h
--- zeroc-ice-3.7.1/cpp/include/IceBT/IceBT.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceBT/IceBT.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_ICE_BT_H
 #define ICE_BT_ICE_BT_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceBT/Makefile zeroc-ice-3.7.2/cpp/include/IceBT/Makefile
--- zeroc-ice-3.7.1/cpp/include/IceBT/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceBT/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir      = ../..
-
-include $(top_srcdir)/config/Make.rules
-
-install::
-	@if test ! -d $(DESTDIR)$(install_includedir)/IceBT ; \
-	then \
-	    echo "Creating $(DESTDIR)$(install_includedir)/IceBT..." ; \
-	    $(call mkdir,$(DESTDIR)$(install_includedir)/IceBT) ; \
-	fi
-
-	@for i in *.h ; \
-	do \
-	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/IceBT/$$i ; \
-	    chmod a+r $(DESTDIR)$(install_includedir)/IceBT/$$i ; \
-	done
diff -Nru zeroc-ice-3.7.1/cpp/include/IceBT/Plugin.h zeroc-ice-3.7.2/cpp/include/IceBT/Plugin.h
--- zeroc-ice-3.7.1/cpp/include/IceBT/Plugin.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceBT/Plugin.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_PLUGIN_H
 #define ICE_BT_PLUGIN_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceGrid/Config.h zeroc-ice-3.7.2/cpp/include/IceGrid/Config.h
--- zeroc-ice-3.7.1/cpp/include/IceGrid/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceGrid/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_CONFIG_H
 #define ICE_GRID_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceGrid/IceGrid.h zeroc-ice-3.7.2/cpp/include/IceGrid/IceGrid.h
--- zeroc-ice-3.7.1/cpp/include/IceGrid/IceGrid.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceGrid/IceGrid.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_H
 #define ICEGRID_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceGrid/ReplicaGroupFilter.h zeroc-ice-3.7.2/cpp/include/IceGrid/ReplicaGroupFilter.h
--- zeroc-ice-3.7.1/cpp/include/IceGrid/ReplicaGroupFilter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceGrid/ReplicaGroupFilter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_H
 #define ICEGRID_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceIAP/IceIAP.h zeroc-ice-3.7.2/cpp/include/IceIAP/IceIAP.h
--- zeroc-ice-3.7.1/cpp/include/IceIAP/IceIAP.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceIAP/IceIAP.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_IAP_ICE_IAP_H
 #define ICE_IAP_ICE_IAP_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IcePatch2/ClientUtil.h zeroc-ice-3.7.2/cpp/include/IcePatch2/ClientUtil.h
--- zeroc-ice-3.7.1/cpp/include/IcePatch2/ClientUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IcePatch2/ClientUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PATCH2_CLIENT_UTIL_H
 #define ICE_PATCH2_CLIENT_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IcePatch2/Config.h zeroc-ice-3.7.2/cpp/include/IcePatch2/Config.h
--- zeroc-ice-3.7.1/cpp/include/IcePatch2/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IcePatch2/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PATCH2_CONFIG_H
 #define ICE_PATCH2_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IcePatch2/IcePatch2.h zeroc-ice-3.7.2/cpp/include/IcePatch2/IcePatch2.h
--- zeroc-ice-3.7.1/cpp/include/IcePatch2/IcePatch2.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IcePatch2/IcePatch2.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IcePatch2/Config.h>
 #include <IcePatch2/FileInfo.h>
diff -Nru zeroc-ice-3.7.1/cpp/include/IceSSL/Config.h zeroc-ice-3.7.2/cpp/include/IceSSL/Config.h
--- zeroc-ice-3.7.1/cpp/include/IceSSL/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceSSL/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_CONFIG_H
 #define ICESSL_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceSSL/IceSSL.h zeroc-ice-3.7.2/cpp/include/IceSSL/IceSSL.h
--- zeroc-ice-3.7.1/cpp/include/IceSSL/IceSSL.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceSSL/IceSSL.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_ICESSL_H
 #define ICESSL_ICESSL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceSSL/OpenSSL.h zeroc-ice-3.7.2/cpp/include/IceSSL/OpenSSL.h
--- zeroc-ice-3.7.1/cpp/include/IceSSL/OpenSSL.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceSSL/OpenSSL.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_OPENSSL_H
 #define ICESSL_OPENSSL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceSSL/Plugin.h zeroc-ice-3.7.2/cpp/include/IceSSL/Plugin.h
--- zeroc-ice-3.7.1/cpp/include/IceSSL/Plugin.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceSSL/Plugin.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_PLUGIN_H
 #define ICESSL_PLUGIN_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceSSL/SChannel.h zeroc-ice-3.7.2/cpp/include/IceSSL/SChannel.h
--- zeroc-ice-3.7.1/cpp/include/IceSSL/SChannel.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceSSL/SChannel.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SCHANNEL_H
 #define ICESSL_SCHANNEL_H
 
+#ifdef _WIN32
+
 #include <IceSSL/Plugin.h>
 
 #include <wincrypt.h>
@@ -71,3 +68,5 @@
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/include/IceSSL/SecureTransport.h zeroc-ice-3.7.2/cpp/include/IceSSL/SecureTransport.h
--- zeroc-ice-3.7.1/cpp/include/IceSSL/SecureTransport.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceSSL/SecureTransport.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SECURE_TRANSPORT_H
 #define ICESSL_SECURE_TRANSPORT_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/Plugin.h>
 #include <Security/Security.h>
 
@@ -71,3 +68,5 @@
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/include/IceSSL/UWP.h zeroc-ice-3.7.2/cpp/include/IceSSL/UWP.h
--- zeroc-ice-3.7.1/cpp/include/IceSSL/UWP.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceSSL/UWP.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UWP_H
 #define ICESSL_UWP_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceStorm/Config.h zeroc-ice-3.7.2/cpp/include/IceStorm/Config.h
--- zeroc-ice-3.7.1/cpp/include/IceStorm/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceStorm/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STORM_CONFIG_H
 #define ICE_STORM_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Atomic.h zeroc-ice-3.7.2/cpp/include/IceUtil/Atomic.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Atomic.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Atomic.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_ATOMIC_H
 #define ICE_UTIL_ATOMIC_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Cond.h zeroc-ice-3.7.2/cpp/include/IceUtil/Cond.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Cond.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Cond.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_COND_H
 #define ICE_UTIL_COND_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Config.h zeroc-ice-3.7.2/cpp/include/IceUtil/Config.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_CONFIG_H
 #define ICE_UTIL_CONFIG_H
@@ -97,13 +92,19 @@
 #   endif
 #endif
 
+#if defined(_MSVC_LANG)
+#   define ICE_CPLUSPLUS _MSVC_LANG
+#else
+#   define ICE_CPLUSPLUS __cplusplus
+#endif
+
 //
 // Check for C++ 11 support
 //
 // For GCC, we recognize --std=c++0x only for GCC version 4.5 and greater,
 // as C++11 support in prior releases was too limited.
 //
-#if (__cplusplus >= 201103) || \
+#if (ICE_CPLUSPLUS >= 201103) || \
     ((defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__* 100) + __GNUC_MINOR__) >= 405)) || \
     (defined(_MSC_VER) && (_MSC_VER >= 1900))
 #   define ICE_CPP11_COMPILER
@@ -116,12 +117,14 @@
 #   error "you need a C++11 capable compiler to use the C++11 mapping"
 #endif
 
-#if defined(ICE_CPP11_COMPILER) && (!defined(_MSC_VER) || (_MSC_VER >= 1900))
+#if defined(ICE_CPP11_COMPILER)
 #   define ICE_NOEXCEPT noexcept
 #   define ICE_NOEXCEPT_FALSE noexcept(false)
+#   define ICE_FINAL final
 #else
 #   define ICE_NOEXCEPT throw()
 #   define ICE_NOEXCEPT_FALSE /**/
+#   define ICE_FINAL /**/
 #endif
 
 //
@@ -158,12 +161,6 @@
 #   define ICE_HAS_THREAD_SAFE_LOCAL_STATIC
 #endif
 
-#if defined(_MSVC_LANG)
-#   define ICE_CPLUSPLUS _MSVC_LANG
-#else
-#   define ICE_CPLUSPLUS __cplusplus
-#endif
-
 //
 // Compiler extensions to export and import symbols: see the documentation
 // for Visual Studio, Solaris Studio and GCC.
@@ -225,6 +222,12 @@
 #   define ICE_DEPRECATED_API(msg) /**/
 #endif
 
+#if defined(__clang__) || defined(__GNUC__)
+#   define ICE_MAYBE_UNUSED __attribute__((unused))
+#else
+#   define ICE_MAYBE_UNUSED /**/
+#endif
+
 #ifdef _WIN32
 #   include <windows.h>
 
@@ -270,8 +273,8 @@
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.7.1" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30701      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.7.2" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30702      // AABBCC, with AA=major, BB=minor, CC=patch
 #define ICE_SO_VERSION "37"      // "ABC", with A=major, B=minor, C=patch
 
 #if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/ConsoleUtil.h zeroc-ice-3.7.2/cpp/include/IceUtil/ConsoleUtil.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/ConsoleUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/ConsoleUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_CONSOLE_UTIL_H
 #define ICE_UTIL_CONSOLE_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/CountDownLatch.h zeroc-ice-3.7.2/cpp/include/IceUtil/CountDownLatch.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/CountDownLatch.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/CountDownLatch.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_COUNT_DOWN_LATCH_H
 #define ICE_UTIL_COUNT_DOWN_LATCH_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/CtrlCHandler.h zeroc-ice-3.7.2/cpp/include/IceUtil/CtrlCHandler.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/CtrlCHandler.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/CtrlCHandler.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_CTRL_C_HANDLER_H
 #define ICE_UTIL_CTRL_C_HANDLER_H
@@ -18,7 +13,7 @@
 
 /**
  * Invoked when a signal occurs. The callback must not raise exceptions.
- * On Unix/POSIX, the callback is NOT a signal handler and can call
+ * On Linux and macOS, the callback is NOT a signal handler and can call
  * functions that are not async-signal safe.
  * @param sig The signal number that occurred.
  */
@@ -29,43 +24,36 @@
 #endif
 
 /**
- * Provides a portable way to handle CTRL+C and CTRL+C like signals.
- * On Unix/POSIX, the CtrlCHandler handles SIGHUP, SIGINT and SIGTERM.
+ * Provides a portable way to handle Ctrl-C and Ctrl-C like signals.
+ * On Linux and macOS, the CtrlCHandler handles SIGHUP, SIGINT and SIGTERM.
  * On Windows, it is essentially a wrapper for SetConsoleCtrlHandler().
  *
- * In a process, only one CtrlCHandler can exist at a given time:
- * the CtrlCHandler constructor raises CtrlCHandlerException if
- * you attempt to create a second CtrlCHandler.
- * On Unix/POSIX, it is essential to create the CtrlCHandler before
- * creating any thread, as the CtrlCHandler constructor masks (blocks)
- * SIGHUP, SIGINT and SIGTERM; by default, threads created later will
- * inherit this signal mask.
- *
- * When a CTRL+C or CTRL+C like signal is sent to the process, the
- * user-registered callback is called in a separate thread; it is
- * given the signal number. The callback must not raise exceptions.
- * On Unix/POSIX, the callback is NOT a signal handler and can call
- * functions that are not async-signal safe.
- *
- * The CtrCHandler destructor "unregisters" the callback. However
- * on Unix/POSIX it does not restore the old signal mask in any
- * thread, so SIGHUP, SIGINT and SIGTERM remain blocked.
- *
- * \headerfile IceUtil/CtrlCHandler.h
+ * \headerfile Ice/Ice.h
  */
-//
-// TODO: Maybe the behavior on Windows should be the same? Now we
-// just restore the default behavior (TerminateProcess).
-//
 class ICE_API CtrlCHandler
 {
 public:
 
-    /**
-     * Initializes the relevant signals.
-     * @param cb The signal callback.
+     /**
+     * Registers a callback function that handles Ctrl-C like signals.
+     * On Linux and macOS, this constructor masks the SIGHUP, SIGINT and SIGTERM
+     * signals and then creates a thread that waits for these signals using sigwait.
+     * On Windows, this constructor calls SetConsoleCtrlCHandler to register a handler
+     * routine that calls the supplied callback function.
+     * Only a single CtrlCHandler object can exist in a process at a give time.
+     * @param cb The callback function to invoke when a signal is received.
      */
     explicit CtrlCHandler(CtrlCHandlerCallback cb = ICE_NULLPTR);
+
+     /**
+     * Unregisters the callback function.
+     * On Linux and macOS, this destructor joins and terminates the thread created
+     * by the constructor but does not "unmask" SIGHUP, SIGINT and SIGTERM. As a result,
+     * these signals are ignored after this destructor completes.
+     * On Windows, this destructor unregisters the SetConsoleCtrlHandler handler
+     * routine, and as a result a Ctrl-C or similar signal will terminate the application
+     * after this destructor completes.
+     */
     ~CtrlCHandler();
 
     /**
@@ -77,15 +65,15 @@
 
     /**
      * Obtains the signal callback.
-     * @return The callback, or nil if no callback is currently set.
+     * @return The callback.
      */
     CtrlCHandlerCallback getCallback() const;
 };
 
 /**
- * Raised by CtrlCHandler.
+ * Raised by the CtrlCHandler constructor if another CtrlCHandler already exists.
  *
- * \headerfile IceUtil/CtrlCHandler.h
+ * \headerfile Ice/Ice.h
  */
 class ICE_API CtrlCHandlerException : public ExceptionHelper<CtrlCHandlerException>
 {
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/DisableWarnings.h zeroc-ice-3.7.2/cpp/include/IceUtil/DisableWarnings.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/DisableWarnings.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/DisableWarnings.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_DISABLEWARNINGS_H
 #define ICE_UTIL_DISABLEWARNINGS_H
 
 //
-// This header file disables or makes non-fatal various compiler warnings that
-// we don't want.
+// This header file disables various compiler warnings that we don't want.
 //
 // IMPORTANT: Do *not* include this header file in another public header file!
 //            Doing this may potentially disable the warnings in the source
@@ -25,11 +19,11 @@
 //
 #if defined(_MSC_VER)
 #    define _CRT_SECURE_NO_DEPRECATE 1  // C4996 '<C function>' was declared deprecated
-#    pragma warning( 4 : 4996 ) // C4996 '<function>' was declared deprecated
-#    pragma warning( 4 : 4800 ) // C4800 forcing value to bool 'true' or 'false' (performance warning)
+#    pragma warning(disable:4996) // C4996 '<function>' was declared deprecated
+#    pragma warning(disable:4800) // C4800 forcing value to bool 'true' or 'false' (performance warning)
 
 #    if (_MSC_VER < 1700)
-#       pragma warning( 4 : 4355 ) // C4355 'this' : used in base member initializer list
+#       pragma warning(disable:4355) // C4355 'this' : used in base member initializer list
 #    endif
 #endif
 
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Exception.h zeroc-ice-3.7.2/cpp/include/IceUtil/Exception.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Exception.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Exception.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_EXCEPTION_H
 #define ICE_UTIL_EXCEPTION_H
@@ -18,35 +13,97 @@
 namespace IceUtil
 {
 
+/**
+ * Abstract base class for all Ice exceptions. Use the Ice::Exception alias instead
+ * of IceUtil::Exception.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API Exception : public std::exception
 {
 public:
 
+    /**
+     * Constructs the exception. Equivalent to Exception(nullptr, 0).
+     */
     Exception();
-    Exception(const char*, int);
+
+    /**
+     * Constructs the exception.
+     * @param file The file where this exception is constructed.
+     * @param line The line where this exception is constructed.
+     */
+    Exception(const char* file, int line);
+
 #ifndef ICE_CPP11_COMPILER
     virtual ~Exception() throw() = 0;
 #endif
+
+    /**
+     * Returns the type ID of this exception. This corresponds to the Slice
+     * type ID for Slice-defined exceptions, and to a similar fully scoped name
+     * for other exceptions. For example "::IceUtil::SyscallException".
+     * @return The type ID of this exception
+     */
     virtual std::string ice_id() const = 0;
-    virtual void ice_print(std::ostream&) const;
+
+    /**
+     * Outputs a description of this exception to a stream.
+     * @param os The output stream.
+     */
+    virtual void ice_print(std::ostream& os) const;
+
+    /**
+     * Returns a description of this exception.
+     * @return The description.
+     */
     virtual const char* what() const ICE_NOEXCEPT;
 #ifdef ICE_CPP11_MAPPING
+
+    /**
+     * Returns a shallow polymorphic copy of this exception.
+     * @return A unique_ptr to the new shallow copy.
+     */
     std::unique_ptr<Exception> ice_clone() const;
 #else
+    /**
+     * Returns a shallow polymorphic copy of this exception.
+     * @return A pointer to the new shallow copy. The caller owns the returned object.
+     */
     virtual Exception* ice_clone() const = 0;
+
     ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.")
     std::string ice_name() const;
 #endif
+
+    /**
+     * Throws this exception.
+     */
     virtual void ice_throw() const = 0;
 
+    /**
+     * Returns the name of the file where this exception was constructed.
+     * @return The file name.
+     */
     const char* ice_file() const;
+
+    /**
+     * Returns the line number where this exception was constructed.
+     * @return The line number.
+     */
     int ice_line() const;
+
+    /**
+     * Returns the stack trace at the point this exception was constructed
+     * @return The stack trace as a string.
+     */
     std::string ice_stackTrace() const;
 
 protected:
 
 #ifdef ICE_CPP11_MAPPING
+    /// \cond INTERNAL
     virtual Exception* ice_cloneImpl() const = 0;
+    /// \endcond
 #endif
 
 private:
@@ -61,6 +118,11 @@
 
 #ifdef ICE_CPP11_MAPPING
 
+/**
+ * Helper template for the implementation of Ice::Exception.
+ * It implements ice_clone and ice_throw.
+ * \headerfile Ice/Ice.h
+ */
 template<typename E, typename B = Exception>
 class ExceptionHelper : public B
 {
@@ -80,14 +142,20 @@
 
 protected:
 
+    /// \cond INTERNAL
     virtual Exception* ice_cloneImpl() const override
     {
         return new E(static_cast<const E&>(*this));
     }
+    /// \endcond
 };
 
 #else // C++98 mapping
 
+/**
+ * Helper template for the implementation of Ice::Exception. It implements ice_throw.
+ * \headerfile Ice/Ice.h
+ */
 template<typename E>
 class ExceptionHelper : public Exception
 {
@@ -109,6 +177,11 @@
 
 #endif
 
+/**
+ * This exception indicates an attempt to dereference a null IceUtil::Handle or
+ * IceInternal::Handle.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API NullHandleException : public ExceptionHelper<NullHandleException>
 {
 public:
@@ -121,6 +194,12 @@
 #endif
 };
 
+/**
+ * This exception indicates that a function was called with an illegal parameter
+ * value. It is used only by the Slice to C++98 mapping; std::invalid_argument is
+ * used by the Slice to C++11 mapping.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API IllegalArgumentException : public ExceptionHelper<IllegalArgumentException>
 {
 public:
@@ -139,6 +218,10 @@
     virtual IllegalArgumentException* ice_clone() const;
 #endif
 
+    /**
+     * Provides the reason this exception was thrown.
+     * @return The reason.
+     */
     std::string reason() const;
 
 private:
@@ -146,9 +229,10 @@
     const std::string _reason;
 };
 
-//
-// IllegalConversionException is raised to report a string conversion error
-//
+/**
+ * This exception indicates the failure of a string conversion.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API IllegalConversionException : public ExceptionHelper<IllegalConversionException>
 {
 public:
@@ -167,6 +251,10 @@
     virtual IllegalConversionException* ice_clone() const;
 #endif
 
+    /**
+     * Provides the reason this exception was thrown.
+     * @return The reason.
+     */
     std::string reason() const;
 
 private:
@@ -174,6 +262,10 @@
     const std::string _reason;
 };
 
+/**
+ * This exception indicates the failure of a system call.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API SyscallException : public ExceptionHelper<SyscallException>
 {
 public:
@@ -191,6 +283,10 @@
     virtual SyscallException* ice_clone() const;
 #endif
 
+    /**
+     * Provides the error number returned by the system call.
+     * @return The error number.
+     */
     int error() const;
 
 private:
@@ -205,6 +301,11 @@
 
 #else // C++98 mapping
 
+/**
+* Helper template for the implementation of SyscallException. It implements
+* ice_throw.
+* \headerfile Ice/Ice.h
+*/
 template<typename E>
 class SyscallExceptionHelper : public SyscallException
 {
@@ -223,6 +324,10 @@
 
 #endif
 
+/**
+ * This exception indicates the failure to lock a file.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API FileLockException : public ExceptionHelper<FileLockException>
 {
 public:
@@ -240,7 +345,16 @@
     virtual FileLockException* ice_clone() const;
 #endif
 
+    /**
+     * Returns the path to the file.
+     * @return The file path.
+     */
     std::string path() const;
+
+    /**
+     * Returns the error number for the failed locking attempt.
+     * @return The error number.
+     */
     int error() const;
 
 private:
@@ -249,6 +363,11 @@
     std::string _path;
 };
 
+/**
+ * This exception indicates an IceUtil::Optional is not set.
+ * Used only by the Slice to C++98 mapping.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API OptionalNotSetException : public ExceptionHelper<OptionalNotSetException>
 {
 public:
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/FileUtil.h zeroc-ice-3.7.2/cpp/include/IceUtil/FileUtil.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/FileUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/FileUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_FILE_UTIL_H
 #define ICE_FILE_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Functional.h zeroc-ice-3.7.2/cpp/include/IceUtil/Functional.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Functional.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Functional.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_FUNCTIONAL_H
 #define ICE_UTIL_FUNCTIONAL_H
 
+#ifndef ICE_CPP11_MAPPING
+
 #include <IceUtil/Handle.h>
 #include <functional>
 
@@ -386,3 +383,5 @@
 }
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Handle.h zeroc-ice-3.7.2/cpp/include/IceUtil/Handle.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Handle.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Handle.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_HANDLE_H
 #define ICE_UTIL_HANDLE_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/IceUtil.h zeroc-ice-3.7.2/cpp/include/IceUtil/IceUtil.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/IceUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/IceUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_ICE_UTIL_H
 #define ICE_UTIL_ICE_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/InputUtil.h zeroc-ice-3.7.2/cpp/include/IceUtil/InputUtil.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/InputUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/InputUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_INPUT_UTIL_H
 #define ICE_UTIL_INPUT_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Iterator.h zeroc-ice-3.7.2/cpp/include/IceUtil/Iterator.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Iterator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Iterator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_ITERATOR_H
 #define ICE_UTIL_ITERATOR_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Lock.h zeroc-ice-3.7.2/cpp/include/IceUtil/Lock.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Lock.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Lock.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_LOCK_H
 #define ICE_UTIL_LOCK_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Monitor.h zeroc-ice-3.7.2/cpp/include/IceUtil/Monitor.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Monitor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Monitor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_MONITOR_H
 #define ICE_UTIL_MONITOR_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Mutex.h zeroc-ice-3.7.2/cpp/include/IceUtil/Mutex.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Mutex.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Mutex.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_MUTEX_H
 #define ICE_UTIL_MUTEX_H
@@ -235,9 +230,8 @@
     }
 
     //
-    // Enable mutex error checking in debug builds
+    // Enable mutex error checking
     //
-#ifndef NDEBUG
     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
     assert(rc == 0);
     if(rc != 0)
@@ -245,7 +239,6 @@
         pthread_mutexattr_destroy(&attr);
         throw ThreadSyscallException(__FILE__, __LINE__, rc);
     }
-#endif
 
     //
     // If system has support for priority inheritance we set the protocol
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/MutexProtocol.h zeroc-ice-3.7.2/cpp/include/IceUtil/MutexProtocol.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/MutexProtocol.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/MutexProtocol.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_MUTEX_PROTOCOL_H
 #define ICE_UTIL_MUTEX_PROTOCOL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/MutexPtrLock.h zeroc-ice-3.7.2/cpp/include/IceUtil/MutexPtrLock.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/MutexPtrLock.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/MutexPtrLock.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_MUTEX_PTR_LOCK_H
 #define ICE_UTIL_MUTEX_PTR_LOCK_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/MutexPtrTryLock.h zeroc-ice-3.7.2/cpp/include/IceUtil/MutexPtrTryLock.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/MutexPtrTryLock.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/MutexPtrTryLock.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
 #define ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Optional.h zeroc-ice-3.7.2/cpp/include/IceUtil/Optional.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Optional.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Optional.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_OPTIONAL_H
 #define ICE_UTIL_OPTIONAL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Options.h zeroc-ice-3.7.2/cpp/include/IceUtil/Options.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Options.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Options.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_OPTIONS_H
 #define ICE_UTIL_OPTIONS_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/OutputUtil.h zeroc-ice-3.7.2/cpp/include/IceUtil/OutputUtil.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/OutputUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/OutputUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_OUTPUT_UTIL_H
 #define ICE_UTIL_OUTPUT_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/PopDisableWarnings.h zeroc-ice-3.7.2/cpp/include/IceUtil/PopDisableWarnings.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/PopDisableWarnings.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/PopDisableWarnings.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // No pragma once as this file can be included several times in a translation
 // unit
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/PushDisableWarnings.h zeroc-ice-3.7.2/cpp/include/IceUtil/PushDisableWarnings.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/PushDisableWarnings.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/PushDisableWarnings.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // No pragma once as this file can be included several times in a translation
 // unit
@@ -23,6 +18,13 @@
 #elif defined(__clang__)
 #   pragma clang diagnostic push
 #   pragma clang diagnostic ignored "-Wredundant-decls" // expected when using forward Slice declarations
+#   pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync" // see zeroc-ice/ice issue #211
+
+#   if (__clang_major__ >= 4)
+#       pragma clang diagnostic ignored "-Wshadow-field-in-constructor" // expected in some generated header files
+#   else
+#       pragma clang diagnostic ignored "-Wshadow-all" // expected in some generated header files
+#   endif
 
 #elif defined(__GNUC__)
 #   pragma GCC diagnostic push
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Random.h zeroc-ice-3.7.2/cpp/include/IceUtil/Random.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Random.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Random.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_RANDOM_H
 #define ICE_UTIL_RANDOM_H
@@ -13,12 +8,48 @@
 #include <IceUtil/Config.h>
 #include <IceUtil/Exception.h>
 
+#ifdef ICE_CPP11_COMPILER
+#   include <algorithm>
+#   include <random>
+#else
+#   include <functional>
+#endif
+
 namespace IceUtilInternal
 {
 
 ICE_API void generateRandom(char*, size_t);
 ICE_API unsigned int random(int = 0);
 
+#ifdef ICE_CPP11_COMPILER
+
+template<class T>
+void shuffle(T first, T last)
+{
+    std::random_device rd;
+    std::mt19937 rng(rd());
+    std::shuffle(first, last, rng);
+}
+
+#else
+
+struct RandomNumberGenerator : public std::unary_function<std::ptrdiff_t, std::ptrdiff_t>
+{
+    std::ptrdiff_t operator()(std::ptrdiff_t d)
+    {
+        return IceUtilInternal::random(static_cast<int>(d));
+    }
+};
+
+template<class T>
+void shuffle(T first, T last)
+{
+    RandomNumberGenerator rng;
+    random_shuffle(first, last, rng);
+}
+
+#endif
+
 }
 
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/RecMutex.h zeroc-ice-3.7.2/cpp/include/IceUtil/RecMutex.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/RecMutex.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/RecMutex.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_RMUTEX_H
 #define ICE_UTIL_RMUTEX_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/ResourceConfig.h zeroc-ice-3.7.2/cpp/include/IceUtil/ResourceConfig.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/ResourceConfig.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/ResourceConfig.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_RESOURCE_CONFIG_H
 #define ICE_UTIL_RESOURCE_CONFIG_H
 
 #include "winver.h"
 
-#define ICE_VERSION 3,7,1,0
-#define ICE_STRING_VERSION "3.7.1\0"
+#define ICE_VERSION 3,7,2,0
+#define ICE_STRING_VERSION "3.7.2\0"
 #define ICE_SO_VERSION "37\0"
 #define ICE_COMPANY_NAME "ZeroC, Inc.\0"
-#define ICE_COPYRIGHT "\251 2003-2018 ZeroC, Inc.\0"
+#define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
 #define ICE_PRODUCT_NAME "Ice\0"
 
 #ifdef ICE_CPP11_MAPPING
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/ScannerConfig.h zeroc-ice-3.7.2/cpp/include/IceUtil/ScannerConfig.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/ScannerConfig.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/ScannerConfig.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_SCANNER_CONFIG_H
 #define ICE_UTIL_SCANNER_CONFIG_H
@@ -13,7 +8,7 @@
 #include <IceUtil/Config.h> // Required by generated Scanners.
 
 //
-// COMPILERFIX: VC compilers does not provide stdint.h header until VC100
+// COMPILERFIX: VC compilers does not provide stdint.h header until v100
 // the header must be included before that macros for integral types
 // in flex generated Scanners are defined.
 //
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/ScopedArray.h zeroc-ice-3.7.2/cpp/include/IceUtil/ScopedArray.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/ScopedArray.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/ScopedArray.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_SCOPED_ARRAY_H
 #define ICE_UTIL_SCOPED_ARRAY_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Shared.h zeroc-ice-3.7.2/cpp/include/IceUtil/Shared.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Shared.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Shared.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_SHARED_H
 #define ICE_UTIL_SHARED_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/StopWatch.h zeroc-ice-3.7.2/cpp/include/IceUtil/StopWatch.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/StopWatch.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/StopWatch.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_STOPWATCH_H
 #define ICE_UTIL_STOPWATCH_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/StringConverter.h zeroc-ice-3.7.2/cpp/include/IceUtil/StringConverter.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/StringConverter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/StringConverter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_STRING_CONVERTER_H
 #define ICE_UTIL_STRING_CONVERTER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/StringUtil.h zeroc-ice-3.7.2/cpp/include/IceUtil/StringUtil.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/StringUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/StringUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_STRING_UTIL_H
 #define ICE_UTIL_STRING_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/ThreadException.h zeroc-ice-3.7.2/cpp/include/IceUtil/ThreadException.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/ThreadException.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/ThreadException.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_THREAD_EXCEPTION_H
 #define ICE_UTIL_THREAD_EXCEPTION_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Thread.h zeroc-ice-3.7.2/cpp/include/IceUtil/Thread.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Thread.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Thread.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_THREAD_H
 #define ICE_UTIL_THREAD_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Time.h zeroc-ice-3.7.2/cpp/include/IceUtil/Time.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Time.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Time.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_TIME_H
 #define ICE_UTIL_TIME_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/Timer.h zeroc-ice-3.7.2/cpp/include/IceUtil/Timer.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/Timer.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/Timer.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_TIMER_H
 #define ICE_UTIL_TIMER_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/UndefSysMacros.h zeroc-ice-3.7.2/cpp/include/IceUtil/UndefSysMacros.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/UndefSysMacros.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/UndefSysMacros.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_UNDEF_SYS_MACROS_H
 #define ICE_UTIL_UNDEF_SYS_MACROS_H
diff -Nru zeroc-ice-3.7.1/cpp/include/IceUtil/UUID.h zeroc-ice-3.7.2/cpp/include/IceUtil/UUID.h
--- zeroc-ice-3.7.1/cpp/include/IceUtil/UUID.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/include/IceUtil/UUID.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_UUID_H
 #define ICE_UTIL_UUID_H
diff -Nru zeroc-ice-3.7.1/cpp/Makefile zeroc-ice-3.7.2/cpp/Makefile
--- zeroc-ice-3.7.1/cpp/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 top_srcdir      := ..
-lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
+lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST))))))
 
 include $(top_srcdir)/config/Make.rules
 include $(lang_srcdir)/config/Make.rules
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/ice.cpp.props zeroc-ice-3.7.2/cpp/msbuild/ice.cpp.props
--- zeroc-ice-3.7.1/cpp/msbuild/ice.cpp.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/ice.cpp.props	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,7 @@
 
   <!-- Visual Studio 2010 doesn't set DefaultPlatformToolset -->
   <PropertyGroup>
-    <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And  '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+    <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
   </PropertyGroup>
 
   <!--
@@ -67,9 +67,9 @@
   -->
   <ItemDefinitionGroup>
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>_CONSOLE;_WIN32_WINNT=0x601;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4121;4250;4251;4275;4324</DisableSpecificWarnings>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <TreatWarningAsError>true</TreatWarningAsError>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -213,6 +213,20 @@
     </Link>
   </ItemDefinitionGroup>
 
+  <!-- Disable additional warnings with VS2013 -->
+  <ItemDefinitionGroup Condition="'$(DefaultPlatformToolset)'=='v120'">
+    <ClCompile>
+       <DisableSpecificWarnings>%(DisableSpecificWarnings);4127;4505;4512</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <!-- Disable additional warnings with VS2010 -->
+  <ItemDefinitionGroup Condition="'$(DefaultPlatformToolset)'=='v100'">
+    <ClCompile>
+       <DisableSpecificWarnings>%(DisableSpecificWarnings);4127;4428;4505;4512</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <ItemDefinitionGroup Condition="'$(DefaultPlatformToolset)'!='v100'">
     <Link>
       <!--
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/ice.proj zeroc-ice-3.7.2/cpp/msbuild/ice.proj
--- zeroc-ice-3.7.1/cpp/msbuild/ice.proj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/ice.proj	2019-02-05 18:03:04.000000000 +0000
@@ -34,7 +34,7 @@
         <IceConfiguration Condition="$(Configuration.Contains('Debug'))">Debug</IceConfiguration>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(DefaultPlatformToolset)' == 'v140' OR '$(DefaultPlatformToolset)' == 'v120'">
+    <PropertyGroup Condition="'$(DefaultPlatformToolset)' == 'v141' OR '$(DefaultPlatformToolset)' == 'v140' OR '$(DefaultPlatformToolset)' == 'v120'">
         <OpenSSL>yes</OpenSSL>
     </PropertyGroup>
 
@@ -299,6 +299,8 @@
                  Properties="Configuration=Release;Platform=x64;PackageDirectory=zeroc.ice.$(DefaultPlatformToolset);DefaultBuild=$(DefaultBuild)"
                  Condition="'$(Platform)|$(Configuration)' == 'x64|Release' or '$(BuildAllConfigurations)' == 'yes'"/>
 
+        <Copy SourceFiles="$(MSBuildThisFileDirectory)THIRD_PARTY_LICENSE.txt"
+              DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\THIRD_PARTY_LICENSE.txt" />
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE"
               DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\ICE_LICENSE.txt" />
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE"
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/ice.test.sln zeroc-ice-3.7.2/cpp/msbuild/ice.test.sln
--- zeroc-ice-3.7.1/cpp/msbuild/ice.test.sln	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/ice.test.sln	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\acm\msbuild\client\client.vcxproj", "{CD25A05C-228D-473F-A86F-6C2DD22085B4}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -561,18 +561,6 @@
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "condvar", "condvar", "{02851CB5-EB65-415A-B525-7CDDD838EB60}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "workqueue", "..\test\IceUtil\condvar\msbuild\workqueue\workqueue.vcxproj", "{6859C86F-E845-4CC3-9667-549638D1BBE4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "match", "..\test\IceUtil\condvar\msbuild\match\match.vcxproj", "{7AAF5067-EBBB-46BA-934B-0337EE844B69}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IceBox", "IceBox", "{C6F0A150-0CFC-42B4-B24C-79D9FCA26E07}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IceSSL", "IceSSL", "{8DC4FC60-61F2-4D58-8DB1-615460DEF993}"
@@ -1201,6 +1189,16 @@
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scope", "scope", "{C167C995-BD18-4BF1-828E-66F7FA0A6BE6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\scope\msbuild\client\client.vcxproj", "{A19DC61B-84AE-4983-9B4C-4F4A338178C5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\scope\msbuild\server\server.vcxproj", "{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "persistent", "persistent", "{372EA6E7-43FD-49F2-A7CB-FC863BAD9E14}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\IceStorm\persistent\msbuild\client\client.vcxproj", "{7D48DD81-247D-467E-B94C-D23EC94BDAB0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Cpp11-Debug|Win32 = Cpp11-Debug|Win32
@@ -2665,38 +2663,6 @@
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|Win32.Build.0 = Release|Win32
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.ActiveCfg = Release|x64
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.Build.0 = Release|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|Win32.Build.0 = Debug|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|x64.ActiveCfg = Debug|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|x64.Build.0 = Debug|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|Win32.ActiveCfg = Release|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|Win32.Build.0 = Release|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|x64.ActiveCfg = Release|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|x64.Build.0 = Release|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|Win32.Build.0 = Debug|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|x64.ActiveCfg = Debug|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|x64.Build.0 = Debug|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|Win32.ActiveCfg = Release|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|Win32.Build.0 = Release|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|x64.ActiveCfg = Release|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|x64.Build.0 = Release|x64
 		{DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
 		{DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
 		{DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
@@ -4149,6 +4115,50 @@
 		{4D76D578-E858-485E-8498-9FC604B3B069}.Release|Win32.Build.0 = Release|Win32
 		{4D76D578-E858-485E-8498-9FC604B3B069}.Release|x64.ActiveCfg = Release|x64
 		{4D76D578-E858-485E-8498-9FC604B3B069}.Release|x64.Build.0 = Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|Win32.Build.0 = Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|x64.ActiveCfg = Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|x64.Build.0 = Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|Win32.ActiveCfg = Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|Win32.Build.0 = Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|x64.ActiveCfg = Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|x64.Build.0 = Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|Win32.Build.0 = Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|x64.ActiveCfg = Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|x64.Build.0 = Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|Win32.ActiveCfg = Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|Win32.Build.0 = Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.ActiveCfg = Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.Build.0 = Release|x64
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|Win32.Build.0 = Debug|Win32
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|x64.ActiveCfg = Debug|x64
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|x64.Build.0 = Debug|x64
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|Win32.ActiveCfg = Release|Win32
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|Win32.Build.0 = Release|Win32
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|x64.ActiveCfg = Release|x64
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4295,9 +4305,6 @@
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD} = {47D78666-F196-4700-B4B7-D83B75EA23DC}
 		{DE878A39-59DE-4F36-B669-68C84D60C93B} = {39AA1944-6915-43F5-B219-EC2DA22F6CBC}
 		{74127AED-9D17-4789-8B2F-9CCD660E7204} = {DE878A39-59DE-4F36-B669-68C84D60C93B}
-		{02851CB5-EB65-415A-B525-7CDDD838EB60} = {39AA1944-6915-43F5-B219-EC2DA22F6CBC}
-		{6859C86F-E845-4CC3-9667-549638D1BBE4} = {02851CB5-EB65-415A-B525-7CDDD838EB60}
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69} = {02851CB5-EB65-415A-B525-7CDDD838EB60}
 		{D1E54325-2E34-4A50-B2EC-4B77C15DB20C} = {4CE3B59A-59E3-4182-82BE-A92BD4FC9657}
 		{DE360450-9BF9-42FB-98FD-3D29C5CAF6DA} = {D1E54325-2E34-4A50-B2EC-4B77C15DB20C}
 		{D6C3E453-ED0B-41CA-84E6-7D07D8867A2D} = {D1E54325-2E34-4A50-B2EC-4B77C15DB20C}
@@ -4445,5 +4452,13 @@
 		{AD44358A-B409-469F-9ED3-3E3B677A2A51} = {A9044FF2-2C83-4CB3-922F-2EBC3DF78EEB}
 		{86FA255C-ED2F-44E3-989B-F9291165D3E1} = {AD44358A-B409-469F-9ED3-3E3B677A2A51}
 		{4D76D578-E858-485E-8498-9FC604B3B069} = {AD44358A-B409-469F-9ED3-3E3B677A2A51}
+		{C167C995-BD18-4BF1-828E-66F7FA0A6BE6} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC}
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5} = {C167C995-BD18-4BF1-828E-66F7FA0A6BE6}
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2} = {C167C995-BD18-4BF1-828E-66F7FA0A6BE6}
+		{372EA6E7-43FD-49F2-A7CB-FC863BAD9E14} = {CEF4EDB3-7782-4B65-9D97-55783C166F4D}
+		{7D48DD81-247D-467E-B94C-D23EC94BDAB0} = {372EA6E7-43FD-49F2-A7CB-FC863BAD9E14}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E6FDB68A-64BA-4577-ABCD-40A01257F8AB}
 	EndGlobalSection
 EndGlobal
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/ice.testuwp.sln zeroc-ice-3.7.2/cpp/msbuild/ice.testuwp.sln
--- zeroc-ice-3.7.1/cpp/msbuild/ice.testuwp.sln	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/ice.testuwp.sln	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2D52604F-E2AD-4586-BBD7-BD13536C702C}"
 EndProject
@@ -380,7 +380,7 @@
 		{9BA8E20C-9624-4370-B1AB-BD696C853951} = {9BA8E20C-9624-4370-B1AB-BD696C853951}
 		{4F70E110-D2EE-4626-BD53-39C49F159C81} = {4F70E110-D2EE-4626-BD53-39C49F159C81}
 		{651CD011-09F7-481E-8260-36D2FA3A6788} = {651CD011-09F7-481E-8260-36D2FA3A6788}
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342} = {5B0C8615-BB38-41DE-A2B7-EC0835C0D342}
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000} = {5B0C8615-BB38-41DE-A2B7-EC0835000000}
 		{564F5319-FD59-450B-889D-748ACCC4887C} = {564F5319-FD59-450B-889D-748ACCC4887C}
 		{3082831B-0F5B-45FA-B208-4B3EB15C7213} = {3082831B-0F5B-45FA-B208-4B3EB15C7213}
 		{6D739820-348B-4143-A473-E9D47B48A35D} = {6D739820-348B-4143-A473-E9D47B48A35D}
@@ -441,6 +441,8 @@
 		{C51733CE-9792-4660-9DD3-109A9A7E37DA} = {C51733CE-9792-4660-9DD3-109A9A7E37DA}
 		{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793} = {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}
 		{45DC21D4-9996-4D22-8D81-5D3F4782625C} = {45DC21D4-9996-4D22-8D81-5D3F4782625C}
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38} = {5ABB92D9-AA40-40CA-8175-40AE2725AF38}
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7} = {E474F2DA-3C50-4717-9270-C23FD72A6CB7}
 		{546993DD-B02D-4747-93D8-98D6303DBCA0} = {546993DD-B02D-4747-93D8-98D6303DBCA0}
 		{DB5C7DE0-D560-481E-9D59-E9422DCF755E} = {DB5C7DE0-D560-481E-9D59-E9422DCF755E}
 		{F49D2CE3-110C-43C4-8D55-D7FCB7C7C3CF} = {F49D2CE3-110C-43C4-8D55-D7FCB7C7C3CF}
@@ -542,7 +544,7 @@
 		{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collocated", "..\test\Ice\servantLocator\msbuild\uwp\collocated\collocated.vcxproj", "{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collocated", "..\test\Ice\servantLocator\msbuild\uwp\collocated\collocated.vcxproj", "{5B0C8615-BB38-41DE-A2B7-EC0835000000}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
 	EndProjectSection
@@ -597,6 +599,12 @@
 		{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scope", "scope", "{FC791A53-7F02-493F-94E4-9BFDECD48ACC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\scope\msbuild\uwp\client\client.vcxproj", "{5ABB92D9-AA40-40CA-8175-40AE2725AF38}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\scope\msbuild\uwp\server\server.vcxproj", "{E474F2DA-3C50-4717-9270-C23FD72A6CB7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -1562,18 +1570,18 @@
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42}.Release|Win32.Build.0 = Release|Win32
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42}.Release|x64.ActiveCfg = Release|x64
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42}.Release|x64.Build.0 = Release|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|ARM.Build.0 = Debug|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|Win32.Build.0 = Debug|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|x64.ActiveCfg = Debug|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|x64.Build.0 = Debug|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|ARM.ActiveCfg = Release|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|ARM.Build.0 = Release|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|Win32.ActiveCfg = Release|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|Win32.Build.0 = Release|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|x64.ActiveCfg = Release|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|x64.Build.0 = Release|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|ARM.Build.0 = Debug|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|Win32.Build.0 = Debug|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|x64.ActiveCfg = Debug|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|x64.Build.0 = Debug|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|ARM.ActiveCfg = Release|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|ARM.Build.0 = Release|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|Win32.ActiveCfg = Release|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|Win32.Build.0 = Release|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|x64.ActiveCfg = Release|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|x64.Build.0 = Release|x64
 		{DADB31F5-6185-4BF5-B521-70B844BB954D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{DADB31F5-6185-4BF5-B521-70B844BB954D}.Debug|ARM.Build.0 = Debug|ARM
 		{DADB31F5-6185-4BF5-B521-70B844BB954D}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1682,6 +1690,30 @@
 		{3D3A850C-A012-4DF2-A272-87C75687C026}.Release|Win32.Build.0 = Release|Win32
 		{3D3A850C-A012-4DF2-A272-87C75687C026}.Release|x64.ActiveCfg = Release|x64
 		{3D3A850C-A012-4DF2-A272-87C75687C026}.Release|x64.Build.0 = Release|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|ARM.Build.0 = Debug|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|Win32.Build.0 = Debug|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|x64.ActiveCfg = Debug|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|x64.Build.0 = Debug|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|ARM.ActiveCfg = Release|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|ARM.Build.0 = Release|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|Win32.ActiveCfg = Release|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|Win32.Build.0 = Release|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|x64.ActiveCfg = Release|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|x64.Build.0 = Release|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|ARM.Build.0 = Debug|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|Win32.Build.0 = Debug|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|x64.ActiveCfg = Debug|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|x64.Build.0 = Debug|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|ARM.ActiveCfg = Release|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|ARM.Build.0 = Release|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|Win32.ActiveCfg = Release|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|Win32.Build.0 = Release|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|x64.ActiveCfg = Release|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1798,7 +1830,7 @@
 		{28B7F535-8C3B-47DA-BD9E-F8EDF037AD50} = {33C073C8-B76A-4C52-8373-1C32237981AC}
 		{4C2F942B-E834-4E01-8868-1E0B973DB7F3} = {345EB31B-1B1C-43E9-87C0-2FC7319A5CBD}
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
 		{DADB31F5-6185-4BF5-B521-70B844BB954D} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
 		{7F03370C-C18B-4159-985E-73F4C1BD0BFF} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
 		{5C5041F2-03DD-4BA4-81E6-65031F9413B8} = {345EB31B-1B1C-43E9-87C0-2FC7319A5CBD}
@@ -1812,5 +1844,11 @@
 		{8C27154A-8427-4033-8178-495341B1D3A8} = {1FD72BFE-7894-41A7-A2C5-5B2EAEEF168A}
 		{B9FD897C-70F1-4639-891B-F5590CCCB404} = {1FD72BFE-7894-41A7-A2C5-5B2EAEEF168A}
 		{3D3A850C-A012-4DF2-A272-87C75687C026} = {1FD72BFE-7894-41A7-A2C5-5B2EAEEF168A}
+		{FC791A53-7F02-493F-94E4-9BFDECD48ACC} = {345EB31B-1B1C-43E9-87C0-2FC7319A5CBD}
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38} = {FC791A53-7F02-493F-94E4-9BFDECD48ACC}
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7} = {FC791A53-7F02-493F-94E4-9BFDECD48ACC}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {640815E7-554F-4EF2-8BBB-0478C504E426}
 	EndGlobalSection
 EndGlobal
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/ice.test.v100.sln zeroc-ice-3.7.2/cpp/msbuild/ice.test.v100.sln
--- zeroc-ice-3.7.1/cpp/msbuild/ice.test.v100.sln	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/ice.test.v100.sln	2019-02-05 18:03:04.000000000 +0000
@@ -559,18 +559,6 @@
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "condvar", "condvar", "{02851CB5-EB65-415A-B525-7CDDD838EB60}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "workqueue", "..\test\IceUtil\condvar\msbuild\workqueue\workqueue.vcxproj", "{6859C86F-E845-4CC3-9667-549638D1BBE4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "match", "..\test\IceUtil\condvar\msbuild\match\match.vcxproj", "{7AAF5067-EBBB-46BA-934B-0337EE844B69}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IceBox", "IceBox", "{C6F0A150-0CFC-42B4-B24C-79D9FCA26E07}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IceSSL", "IceSSL", "{8DC4FC60-61F2-4D58-8DB1-615460DEF993}"
@@ -822,14 +810,32 @@
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scope", "scope", "{EAE3DBDF-3689-4DEF-B5DF-B9A51268E784}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\scope\msbuild\client\client.vcxproj", "{A19DC61B-84AE-4983-9B4C-4F4A338178C5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\scope\msbuild\server\server.vcxproj", "{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Cpp11-Debug|Win32 = Cpp11-Debug|Win32
+		Cpp11-Debug|x64 = Cpp11-Debug|x64
+		Cpp11-Release|Win32 = Cpp11-Release|Win32
+		Cpp11-Release|x64 = Cpp11-Release|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Debug|Win32.Build.0 = Debug|Win32
 		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Debug|x64.ActiveCfg = Debug|x64
@@ -838,6 +844,14 @@
 		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Release|Win32.Build.0 = Release|Win32
 		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Release|x64.ActiveCfg = Release|x64
 		{CD25A05C-228D-473F-A86F-6C2DD22085B4}.Release|x64.Build.0 = Release|x64
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.Build.0 = Debug|Win32
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.ActiveCfg = Debug|x64
@@ -846,6 +860,14 @@
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|Win32.Build.0 = Release|Win32
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.ActiveCfg = Release|x64
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.Build.0 = Release|x64
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Debug|Win32.Build.0 = Debug|Win32
 		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Debug|x64.ActiveCfg = Debug|x64
@@ -854,6 +876,14 @@
 		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Release|Win32.Build.0 = Release|Win32
 		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Release|x64.ActiveCfg = Release|x64
 		{FC4AC0A5-84D5-461F-BE52-EA686F52773E}.Release|x64.Build.0 = Release|x64
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Debug|Win32.Build.0 = Debug|Win32
 		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Debug|x64.ActiveCfg = Debug|x64
@@ -862,6 +892,14 @@
 		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Release|Win32.Build.0 = Release|Win32
 		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Release|x64.ActiveCfg = Release|x64
 		{715411FA-34B3-4ABF-8476-3C84F5EFFFE5}.Release|x64.Build.0 = Release|x64
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Debug|Win32.Build.0 = Debug|Win32
 		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Debug|x64.ActiveCfg = Debug|x64
@@ -870,6 +908,14 @@
 		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Release|Win32.Build.0 = Release|Win32
 		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Release|x64.ActiveCfg = Release|x64
 		{5D38E70A-98C1-4B1D-BC0D-01BC114078C5}.Release|x64.Build.0 = Release|x64
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Debug|Win32.Build.0 = Debug|Win32
 		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Debug|x64.ActiveCfg = Debug|x64
@@ -878,6 +924,14 @@
 		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Release|Win32.Build.0 = Release|Win32
 		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Release|x64.ActiveCfg = Release|x64
 		{9929ACAD-44DE-4699-BA2C-6EE8B665C6EB}.Release|x64.Build.0 = Release|x64
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Debug|Win32.Build.0 = Debug|Win32
 		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Debug|x64.ActiveCfg = Debug|x64
@@ -886,6 +940,14 @@
 		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Release|Win32.Build.0 = Release|Win32
 		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Release|x64.ActiveCfg = Release|x64
 		{25132357-8775-4C8F-AF35-CEC5F6BB08E7}.Release|x64.Build.0 = Release|x64
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Debug|Win32.Build.0 = Debug|Win32
 		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Debug|x64.ActiveCfg = Debug|x64
@@ -894,6 +956,14 @@
 		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Release|Win32.Build.0 = Release|Win32
 		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Release|x64.ActiveCfg = Release|x64
 		{0A601498-AA62-4639-9319-BC1EA94EBE13}.Release|x64.Build.0 = Release|x64
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Debug|Win32.ActiveCfg = Debug|Win32
 		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Debug|Win32.Build.0 = Debug|Win32
 		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Debug|x64.ActiveCfg = Debug|x64
@@ -902,6 +972,14 @@
 		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Release|Win32.Build.0 = Release|Win32
 		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Release|x64.ActiveCfg = Release|x64
 		{24272AC4-1B9D-40C0-B432-485EEB642A38}.Release|x64.Build.0 = Release|x64
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Debug|Win32.Build.0 = Debug|Win32
 		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Debug|x64.ActiveCfg = Debug|x64
@@ -910,6 +988,14 @@
 		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Release|Win32.Build.0 = Release|Win32
 		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Release|x64.ActiveCfg = Release|x64
 		{697273CB-CEAF-481E-A77B-56FDAE5B3D3A}.Release|x64.Build.0 = Release|x64
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Debug|Win32.Build.0 = Debug|Win32
 		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Debug|x64.ActiveCfg = Debug|x64
@@ -918,6 +1004,14 @@
 		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Release|Win32.Build.0 = Release|Win32
 		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Release|x64.ActiveCfg = Release|x64
 		{26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2}.Release|x64.Build.0 = Release|x64
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Debug|Win32.Build.0 = Debug|Win32
 		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Debug|x64.ActiveCfg = Debug|x64
@@ -926,6 +1020,14 @@
 		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Release|Win32.Build.0 = Release|Win32
 		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Release|x64.ActiveCfg = Release|x64
 		{5BEA940C-1C98-486B-A530-C238D3A74E87}.Release|x64.Build.0 = Release|x64
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Debug|Win32.Build.0 = Debug|Win32
 		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Debug|x64.ActiveCfg = Debug|x64
@@ -934,6 +1036,14 @@
 		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Release|Win32.Build.0 = Release|Win32
 		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Release|x64.ActiveCfg = Release|x64
 		{3215FCAD-59F2-47F4-8DB5-AEA11B39991D}.Release|x64.Build.0 = Release|x64
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{80FE3863-C289-4BDE-833C-256D5E54093A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{80FE3863-C289-4BDE-833C-256D5E54093A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{80FE3863-C289-4BDE-833C-256D5E54093A}.Debug|Win32.Build.0 = Debug|Win32
 		{80FE3863-C289-4BDE-833C-256D5E54093A}.Debug|x64.ActiveCfg = Debug|x64
@@ -942,6 +1052,14 @@
 		{80FE3863-C289-4BDE-833C-256D5E54093A}.Release|Win32.Build.0 = Release|Win32
 		{80FE3863-C289-4BDE-833C-256D5E54093A}.Release|x64.ActiveCfg = Release|x64
 		{80FE3863-C289-4BDE-833C-256D5E54093A}.Release|x64.Build.0 = Release|x64
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Debug|Win32.Build.0 = Debug|Win32
 		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Debug|x64.ActiveCfg = Debug|x64
@@ -950,6 +1068,14 @@
 		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Release|Win32.Build.0 = Release|Win32
 		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Release|x64.ActiveCfg = Release|x64
 		{5105B294-6DAB-4604-8BD7-10C126EED1FE}.Release|x64.Build.0 = Release|x64
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Debug|Win32.Build.0 = Debug|Win32
 		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Debug|x64.ActiveCfg = Debug|x64
@@ -958,6 +1084,14 @@
 		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Release|Win32.Build.0 = Release|Win32
 		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Release|x64.ActiveCfg = Release|x64
 		{BA3042D4-7E5B-461D-A31E-345753A8A726}.Release|x64.Build.0 = Release|x64
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Debug|Win32.Build.0 = Debug|Win32
 		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Debug|x64.ActiveCfg = Debug|x64
@@ -966,6 +1100,14 @@
 		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Release|Win32.Build.0 = Release|Win32
 		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Release|x64.ActiveCfg = Release|x64
 		{FBAC9C87-6A77-4663-9653-F0DFEFB00935}.Release|x64.Build.0 = Release|x64
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Debug|Win32.Build.0 = Debug|Win32
 		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Debug|x64.ActiveCfg = Debug|x64
@@ -974,6 +1116,14 @@
 		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Release|Win32.Build.0 = Release|Win32
 		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Release|x64.ActiveCfg = Release|x64
 		{3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1}.Release|x64.Build.0 = Release|x64
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Debug|Win32.Build.0 = Debug|Win32
 		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Debug|x64.ActiveCfg = Debug|x64
@@ -982,6 +1132,14 @@
 		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Release|Win32.Build.0 = Release|Win32
 		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Release|x64.ActiveCfg = Release|x64
 		{5F22AF4C-5DFE-43E9-98E6-64187F174761}.Release|x64.Build.0 = Release|x64
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Debug|Win32.Build.0 = Debug|Win32
 		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -990,6 +1148,14 @@
 		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Release|Win32.Build.0 = Release|Win32
 		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Release|x64.ActiveCfg = Release|x64
 		{3BDD2378-5B4E-4021-846E-3225A04E85B1}.Release|x64.Build.0 = Release|x64
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Debug|Win32.Build.0 = Debug|Win32
 		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Debug|x64.ActiveCfg = Debug|x64
@@ -998,6 +1164,14 @@
 		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Release|Win32.Build.0 = Release|Win32
 		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Release|x64.ActiveCfg = Release|x64
 		{0E5471E9-E208-4B77-B9D6-C4AD36CBB653}.Release|x64.Build.0 = Release|x64
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Debug|Win32.Build.0 = Debug|Win32
 		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Debug|x64.ActiveCfg = Debug|x64
@@ -1006,6 +1180,14 @@
 		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Release|Win32.Build.0 = Release|Win32
 		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Release|x64.ActiveCfg = Release|x64
 		{6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F}.Release|x64.Build.0 = Release|x64
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Debug|Win32.Build.0 = Debug|Win32
 		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Debug|x64.ActiveCfg = Debug|x64
@@ -1014,6 +1196,14 @@
 		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|Win32.Build.0 = Release|Win32
 		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|x64.ActiveCfg = Release|x64
 		{3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|x64.Build.0 = Release|x64
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|Win32.Build.0 = Debug|Win32
 		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|x64.ActiveCfg = Debug|x64
@@ -1022,6 +1212,14 @@
 		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|Win32.Build.0 = Release|Win32
 		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|x64.ActiveCfg = Release|x64
 		{24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|x64.Build.0 = Release|x64
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Debug|Win32.Build.0 = Debug|Win32
 		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Debug|x64.ActiveCfg = Debug|x64
@@ -1030,6 +1228,14 @@
 		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Release|Win32.Build.0 = Release|Win32
 		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Release|x64.ActiveCfg = Release|x64
 		{8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Release|x64.Build.0 = Release|x64
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{386DD353-1314-407B-A394-476F4983461D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{386DD353-1314-407B-A394-476F4983461D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{386DD353-1314-407B-A394-476F4983461D}.Debug|Win32.Build.0 = Debug|Win32
 		{386DD353-1314-407B-A394-476F4983461D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1038,6 +1244,14 @@
 		{386DD353-1314-407B-A394-476F4983461D}.Release|Win32.Build.0 = Release|Win32
 		{386DD353-1314-407B-A394-476F4983461D}.Release|x64.ActiveCfg = Release|x64
 		{386DD353-1314-407B-A394-476F4983461D}.Release|x64.Build.0 = Release|x64
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Debug|Win32.Build.0 = Debug|Win32
 		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Debug|x64.ActiveCfg = Debug|x64
@@ -1046,6 +1260,14 @@
 		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Release|Win32.Build.0 = Release|Win32
 		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Release|x64.ActiveCfg = Release|x64
 		{46DDEC66-2287-47E2-BFE4-BDE53B5D40C5}.Release|x64.Build.0 = Release|x64
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Debug|Win32.Build.0 = Debug|Win32
 		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Debug|x64.ActiveCfg = Debug|x64
@@ -1054,6 +1276,14 @@
 		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Release|Win32.Build.0 = Release|Win32
 		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Release|x64.ActiveCfg = Release|x64
 		{420B2FB5-833E-449A-BF43-5A5538DAEEC4}.Release|x64.Build.0 = Release|x64
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{606D6061-3084-498A-988A-7F5B9FE8732D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{606D6061-3084-498A-988A-7F5B9FE8732D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{606D6061-3084-498A-988A-7F5B9FE8732D}.Debug|Win32.Build.0 = Debug|Win32
 		{606D6061-3084-498A-988A-7F5B9FE8732D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1062,6 +1292,14 @@
 		{606D6061-3084-498A-988A-7F5B9FE8732D}.Release|Win32.Build.0 = Release|Win32
 		{606D6061-3084-498A-988A-7F5B9FE8732D}.Release|x64.ActiveCfg = Release|x64
 		{606D6061-3084-498A-988A-7F5B9FE8732D}.Release|x64.Build.0 = Release|x64
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Debug|Win32.Build.0 = Debug|Win32
 		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Debug|x64.ActiveCfg = Debug|x64
@@ -1070,6 +1308,14 @@
 		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Release|Win32.Build.0 = Release|Win32
 		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Release|x64.ActiveCfg = Release|x64
 		{CC0C7076-D15B-42AB-AFD6-CE40472F6E84}.Release|x64.Build.0 = Release|x64
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Debug|Win32.Build.0 = Debug|Win32
 		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Debug|x64.ActiveCfg = Debug|x64
@@ -1078,6 +1324,14 @@
 		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Release|Win32.Build.0 = Release|Win32
 		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Release|x64.ActiveCfg = Release|x64
 		{FA42EA5F-FDBE-4F27-ACC7-7717E401C868}.Release|x64.Build.0 = Release|x64
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Debug|Win32.ActiveCfg = Debug|Win32
 		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Debug|Win32.Build.0 = Debug|Win32
 		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Debug|x64.ActiveCfg = Debug|x64
@@ -1086,6 +1340,14 @@
 		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Release|Win32.Build.0 = Release|Win32
 		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Release|x64.ActiveCfg = Release|x64
 		{685612A9-F2AA-4ACA-8327-5D40E4731906}.Release|x64.Build.0 = Release|x64
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Debug|Win32.Build.0 = Debug|Win32
 		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Debug|x64.ActiveCfg = Debug|x64
@@ -1094,6 +1356,14 @@
 		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Release|Win32.Build.0 = Release|Win32
 		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Release|x64.ActiveCfg = Release|x64
 		{649ECCDB-5CA3-4371-B521-95CE8EF534BA}.Release|x64.Build.0 = Release|x64
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{10A9A668-8508-4971-AD56-15B50AB12829}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{10A9A668-8508-4971-AD56-15B50AB12829}.Debug|Win32.ActiveCfg = Debug|Win32
 		{10A9A668-8508-4971-AD56-15B50AB12829}.Debug|Win32.Build.0 = Debug|Win32
 		{10A9A668-8508-4971-AD56-15B50AB12829}.Debug|x64.ActiveCfg = Debug|x64
@@ -1102,6 +1372,14 @@
 		{10A9A668-8508-4971-AD56-15B50AB12829}.Release|Win32.Build.0 = Release|Win32
 		{10A9A668-8508-4971-AD56-15B50AB12829}.Release|x64.ActiveCfg = Release|x64
 		{10A9A668-8508-4971-AD56-15B50AB12829}.Release|x64.Build.0 = Release|x64
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Debug|Win32.Build.0 = Debug|Win32
 		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Debug|x64.ActiveCfg = Debug|x64
@@ -1110,6 +1388,14 @@
 		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Release|Win32.Build.0 = Release|Win32
 		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Release|x64.ActiveCfg = Release|x64
 		{3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73}.Release|x64.Build.0 = Release|x64
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{9145C992-2C7A-4D01-B957-F38373DF5829}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{9145C992-2C7A-4D01-B957-F38373DF5829}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9145C992-2C7A-4D01-B957-F38373DF5829}.Debug|Win32.Build.0 = Debug|Win32
 		{9145C992-2C7A-4D01-B957-F38373DF5829}.Debug|x64.ActiveCfg = Debug|x64
@@ -1118,6 +1404,14 @@
 		{9145C992-2C7A-4D01-B957-F38373DF5829}.Release|Win32.Build.0 = Release|Win32
 		{9145C992-2C7A-4D01-B957-F38373DF5829}.Release|x64.ActiveCfg = Release|x64
 		{9145C992-2C7A-4D01-B957-F38373DF5829}.Release|x64.Build.0 = Release|x64
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Debug|Win32.Build.0 = Debug|Win32
 		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Debug|x64.ActiveCfg = Debug|x64
@@ -1126,6 +1420,14 @@
 		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Release|Win32.Build.0 = Release|Win32
 		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Release|x64.ActiveCfg = Release|x64
 		{4ADE8581-F2FC-4350-BFAE-62FEFF254A11}.Release|x64.Build.0 = Release|x64
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Debug|Win32.Build.0 = Debug|Win32
 		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Debug|x64.ActiveCfg = Debug|x64
@@ -1134,6 +1436,14 @@
 		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Release|Win32.Build.0 = Release|Win32
 		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Release|x64.ActiveCfg = Release|x64
 		{C95B71C9-654C-4C6C-B956-F1A70F5CB5A3}.Release|x64.Build.0 = Release|x64
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Debug|Win32.Build.0 = Debug|Win32
 		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Debug|x64.ActiveCfg = Debug|x64
@@ -1142,6 +1452,14 @@
 		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Release|Win32.Build.0 = Release|Win32
 		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Release|x64.ActiveCfg = Release|x64
 		{311D5177-A40C-4527-BA81-A0D8C20AA121}.Release|x64.Build.0 = Release|x64
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{74931348-C85B-4B59-BC91-154D1CF9A933}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{74931348-C85B-4B59-BC91-154D1CF9A933}.Debug|Win32.ActiveCfg = Debug|Win32
 		{74931348-C85B-4B59-BC91-154D1CF9A933}.Debug|Win32.Build.0 = Debug|Win32
 		{74931348-C85B-4B59-BC91-154D1CF9A933}.Debug|x64.ActiveCfg = Debug|x64
@@ -1150,6 +1468,14 @@
 		{74931348-C85B-4B59-BC91-154D1CF9A933}.Release|Win32.Build.0 = Release|Win32
 		{74931348-C85B-4B59-BC91-154D1CF9A933}.Release|x64.ActiveCfg = Release|x64
 		{74931348-C85B-4B59-BC91-154D1CF9A933}.Release|x64.Build.0 = Release|x64
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Debug|Win32.Build.0 = Debug|Win32
 		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1158,6 +1484,14 @@
 		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Release|Win32.Build.0 = Release|Win32
 		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Release|x64.ActiveCfg = Release|x64
 		{1E199A0A-392A-45E3-9B33-D27ADD734F0D}.Release|x64.Build.0 = Release|x64
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Debug|Win32.Build.0 = Debug|Win32
 		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Debug|x64.ActiveCfg = Debug|x64
@@ -1166,6 +1500,14 @@
 		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Release|Win32.Build.0 = Release|Win32
 		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Release|x64.ActiveCfg = Release|x64
 		{FD9FB0E5-22D8-41B2-B6B9-272BA12516CC}.Release|x64.Build.0 = Release|x64
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Debug|Win32.Build.0 = Debug|Win32
 		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Debug|x64.ActiveCfg = Debug|x64
@@ -1174,6 +1516,14 @@
 		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Release|Win32.Build.0 = Release|Win32
 		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Release|x64.ActiveCfg = Release|x64
 		{40D8363E-E617-4270-9A1F-7B69A3112F6B}.Release|x64.Build.0 = Release|x64
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Debug|Win32.Build.0 = Debug|Win32
 		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Debug|x64.ActiveCfg = Debug|x64
@@ -1182,6 +1532,14 @@
 		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Release|Win32.Build.0 = Release|Win32
 		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Release|x64.ActiveCfg = Release|x64
 		{2923D875-5496-4D0D-B19F-B55AF6EC25E8}.Release|x64.Build.0 = Release|x64
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{387716BD-A892-4D88-86CB-E64FF359271D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{387716BD-A892-4D88-86CB-E64FF359271D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{387716BD-A892-4D88-86CB-E64FF359271D}.Debug|Win32.Build.0 = Debug|Win32
 		{387716BD-A892-4D88-86CB-E64FF359271D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1190,6 +1548,14 @@
 		{387716BD-A892-4D88-86CB-E64FF359271D}.Release|Win32.Build.0 = Release|Win32
 		{387716BD-A892-4D88-86CB-E64FF359271D}.Release|x64.ActiveCfg = Release|x64
 		{387716BD-A892-4D88-86CB-E64FF359271D}.Release|x64.Build.0 = Release|x64
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Debug|Win32.Build.0 = Debug|Win32
 		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Debug|x64.ActiveCfg = Debug|x64
@@ -1198,6 +1564,14 @@
 		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Release|Win32.Build.0 = Release|Win32
 		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Release|x64.ActiveCfg = Release|x64
 		{CC584047-6A76-4E0B-AABE-1CDB4A735079}.Release|x64.Build.0 = Release|x64
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Debug|Win32.Build.0 = Debug|Win32
 		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Debug|x64.ActiveCfg = Debug|x64
@@ -1206,6 +1580,14 @@
 		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Release|Win32.Build.0 = Release|Win32
 		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Release|x64.ActiveCfg = Release|x64
 		{BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271}.Release|x64.Build.0 = Release|x64
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Debug|Win32.ActiveCfg = Debug|Win32
 		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Debug|Win32.Build.0 = Debug|Win32
 		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Debug|x64.ActiveCfg = Debug|x64
@@ -1214,6 +1596,14 @@
 		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Release|Win32.Build.0 = Release|Win32
 		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Release|x64.ActiveCfg = Release|x64
 		{75A5B8DA-6110-4588-8B86-D9002E6FD028}.Release|x64.Build.0 = Release|x64
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Debug|Win32.Build.0 = Debug|Win32
 		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Debug|x64.ActiveCfg = Debug|x64
@@ -1222,6 +1612,14 @@
 		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Release|Win32.Build.0 = Release|Win32
 		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Release|x64.ActiveCfg = Release|x64
 		{ED9139A9-82F5-435F-BA2D-FD55D46ADCCB}.Release|x64.Build.0 = Release|x64
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Debug|Win32.Build.0 = Debug|Win32
 		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Debug|x64.ActiveCfg = Debug|x64
@@ -1230,6 +1628,14 @@
 		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Release|Win32.Build.0 = Release|Win32
 		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Release|x64.ActiveCfg = Release|x64
 		{9681E7B8-4D88-4AFF-8F96-784DDF5F5B76}.Release|x64.Build.0 = Release|x64
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{10096783-388B-4B2A-806A-F0190AFB5096}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{10096783-388B-4B2A-806A-F0190AFB5096}.Debug|Win32.ActiveCfg = Debug|Win32
 		{10096783-388B-4B2A-806A-F0190AFB5096}.Debug|Win32.Build.0 = Debug|Win32
 		{10096783-388B-4B2A-806A-F0190AFB5096}.Debug|x64.ActiveCfg = Debug|x64
@@ -1238,6 +1644,14 @@
 		{10096783-388B-4B2A-806A-F0190AFB5096}.Release|Win32.Build.0 = Release|Win32
 		{10096783-388B-4B2A-806A-F0190AFB5096}.Release|x64.ActiveCfg = Release|x64
 		{10096783-388B-4B2A-806A-F0190AFB5096}.Release|x64.Build.0 = Release|x64
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Debug|Win32.Build.0 = Debug|Win32
 		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Debug|x64.ActiveCfg = Debug|x64
@@ -1246,6 +1660,14 @@
 		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Release|Win32.Build.0 = Release|Win32
 		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Release|x64.ActiveCfg = Release|x64
 		{46204626-B8AC-4E09-88F2-0A68A5DEEF5A}.Release|x64.Build.0 = Release|x64
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Debug|Win32.Build.0 = Debug|Win32
 		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Debug|x64.ActiveCfg = Debug|x64
@@ -1254,6 +1676,14 @@
 		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Release|Win32.Build.0 = Release|Win32
 		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Release|x64.ActiveCfg = Release|x64
 		{57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8}.Release|x64.Build.0 = Release|x64
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Debug|Win32.Build.0 = Debug|Win32
 		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Debug|x64.ActiveCfg = Debug|x64
@@ -1262,6 +1692,14 @@
 		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Release|Win32.Build.0 = Release|Win32
 		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Release|x64.ActiveCfg = Release|x64
 		{A364B7AB-7129-4891-A305-B2EEE2948EC4}.Release|x64.Build.0 = Release|x64
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Debug|Win32.Build.0 = Debug|Win32
 		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Debug|x64.ActiveCfg = Debug|x64
@@ -1270,6 +1708,14 @@
 		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Release|Win32.Build.0 = Release|Win32
 		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Release|x64.ActiveCfg = Release|x64
 		{1C3367B8-CCFF-4409-8847-623DFD833DAD}.Release|x64.Build.0 = Release|x64
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Debug|Win32.Build.0 = Debug|Win32
 		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Debug|x64.ActiveCfg = Debug|x64
@@ -1278,6 +1724,14 @@
 		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Release|Win32.Build.0 = Release|Win32
 		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Release|x64.ActiveCfg = Release|x64
 		{27B7CAC4-9236-4139-88B8-3B9950D2DB2C}.Release|x64.Build.0 = Release|x64
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Debug|Win32.Build.0 = Debug|Win32
 		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Debug|x64.ActiveCfg = Debug|x64
@@ -1286,6 +1740,14 @@
 		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Release|Win32.Build.0 = Release|Win32
 		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Release|x64.ActiveCfg = Release|x64
 		{306B9C8B-F11B-4071-AE80-CF69EF0BBB2B}.Release|x64.Build.0 = Release|x64
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Debug|Win32.Build.0 = Debug|Win32
 		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -1294,6 +1756,14 @@
 		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Release|Win32.Build.0 = Release|Win32
 		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Release|x64.ActiveCfg = Release|x64
 		{A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2}.Release|x64.Build.0 = Release|x64
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Debug|Win32.Build.0 = Debug|Win32
 		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Debug|x64.ActiveCfg = Debug|x64
@@ -1302,6 +1772,14 @@
 		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Release|Win32.Build.0 = Release|Win32
 		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Release|x64.ActiveCfg = Release|x64
 		{E64764EB-2B8E-454F-9635-0729D07CCA24}.Release|x64.Build.0 = Release|x64
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Debug|Win32.Build.0 = Debug|Win32
 		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Debug|x64.ActiveCfg = Debug|x64
@@ -1310,6 +1788,14 @@
 		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Release|Win32.Build.0 = Release|Win32
 		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Release|x64.ActiveCfg = Release|x64
 		{9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA}.Release|x64.Build.0 = Release|x64
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Debug|Win32.Build.0 = Debug|Win32
 		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Debug|x64.ActiveCfg = Debug|x64
@@ -1318,6 +1804,14 @@
 		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Release|Win32.Build.0 = Release|Win32
 		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Release|x64.ActiveCfg = Release|x64
 		{EABE4465-0DDC-41CE-91C5-CCB9586B789F}.Release|x64.Build.0 = Release|x64
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Debug|Win32.Build.0 = Debug|Win32
 		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Debug|x64.ActiveCfg = Debug|x64
@@ -1326,6 +1820,14 @@
 		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Release|Win32.Build.0 = Release|Win32
 		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Release|x64.ActiveCfg = Release|x64
 		{D0301B50-901B-4298-B8C8-B134A320E2A0}.Release|x64.Build.0 = Release|x64
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Debug|Win32.Build.0 = Debug|Win32
 		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Debug|x64.ActiveCfg = Debug|x64
@@ -1334,6 +1836,14 @@
 		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Release|Win32.Build.0 = Release|Win32
 		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Release|x64.ActiveCfg = Release|x64
 		{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}.Release|x64.Build.0 = Release|x64
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Debug|Win32.ActiveCfg = Debug|Win32
 		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Debug|Win32.Build.0 = Debug|Win32
 		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Debug|x64.ActiveCfg = Debug|x64
@@ -1342,6 +1852,14 @@
 		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Release|Win32.Build.0 = Release|Win32
 		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Release|x64.ActiveCfg = Release|x64
 		{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}.Release|x64.Build.0 = Release|x64
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Debug|Win32.Build.0 = Debug|Win32
 		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Debug|x64.ActiveCfg = Debug|x64
@@ -1350,6 +1868,14 @@
 		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Release|Win32.Build.0 = Release|Win32
 		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Release|x64.ActiveCfg = Release|x64
 		{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}.Release|x64.Build.0 = Release|x64
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Debug|Win32.Build.0 = Debug|Win32
 		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1358,6 +1884,14 @@
 		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Release|Win32.Build.0 = Release|Win32
 		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Release|x64.ActiveCfg = Release|x64
 		{2C8EC06E-CC5B-4D04-A49E-4656CF1D199D}.Release|x64.Build.0 = Release|x64
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Debug|Win32.Build.0 = Debug|Win32
 		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Debug|x64.ActiveCfg = Debug|x64
@@ -1366,6 +1900,14 @@
 		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Release|Win32.Build.0 = Release|Win32
 		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Release|x64.ActiveCfg = Release|x64
 		{9D7FD661-AA09-43D3-9772-66EC4915A848}.Release|x64.Build.0 = Release|x64
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{F689934E-7EED-4E85-A620-8FC72CD83255}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{F689934E-7EED-4E85-A620-8FC72CD83255}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F689934E-7EED-4E85-A620-8FC72CD83255}.Debug|Win32.Build.0 = Debug|Win32
 		{F689934E-7EED-4E85-A620-8FC72CD83255}.Debug|x64.ActiveCfg = Debug|x64
@@ -1374,6 +1916,14 @@
 		{F689934E-7EED-4E85-A620-8FC72CD83255}.Release|Win32.Build.0 = Release|Win32
 		{F689934E-7EED-4E85-A620-8FC72CD83255}.Release|x64.ActiveCfg = Release|x64
 		{F689934E-7EED-4E85-A620-8FC72CD83255}.Release|x64.Build.0 = Release|x64
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3329FD4A-C510-40FF-A642-365F8F56422E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3329FD4A-C510-40FF-A642-365F8F56422E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3329FD4A-C510-40FF-A642-365F8F56422E}.Debug|Win32.Build.0 = Debug|Win32
 		{3329FD4A-C510-40FF-A642-365F8F56422E}.Debug|x64.ActiveCfg = Debug|x64
@@ -1382,6 +1932,14 @@
 		{3329FD4A-C510-40FF-A642-365F8F56422E}.Release|Win32.Build.0 = Release|Win32
 		{3329FD4A-C510-40FF-A642-365F8F56422E}.Release|x64.ActiveCfg = Release|x64
 		{3329FD4A-C510-40FF-A642-365F8F56422E}.Release|x64.Build.0 = Release|x64
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Debug|Win32.Build.0 = Debug|Win32
 		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Debug|x64.ActiveCfg = Debug|x64
@@ -1390,6 +1948,14 @@
 		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Release|Win32.Build.0 = Release|Win32
 		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Release|x64.ActiveCfg = Release|x64
 		{8698D5A5-EABD-4024-B3A0-A78793B39510}.Release|x64.Build.0 = Release|x64
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Debug|Win32.Build.0 = Debug|Win32
 		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Debug|x64.ActiveCfg = Debug|x64
@@ -1398,6 +1964,14 @@
 		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Release|Win32.Build.0 = Release|Win32
 		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Release|x64.ActiveCfg = Release|x64
 		{2B6769F3-9C20-49D1-821C-65BB70A53F76}.Release|x64.Build.0 = Release|x64
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Debug|Win32.Build.0 = Debug|Win32
 		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Debug|x64.ActiveCfg = Debug|x64
@@ -1406,6 +1980,14 @@
 		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Release|Win32.Build.0 = Release|Win32
 		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Release|x64.ActiveCfg = Release|x64
 		{425BC777-A886-4EC9-819B-35D103A7FDD0}.Release|x64.Build.0 = Release|x64
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Debug|Win32.Build.0 = Debug|Win32
 		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Debug|x64.ActiveCfg = Debug|x64
@@ -1414,6 +1996,14 @@
 		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Release|Win32.Build.0 = Release|Win32
 		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Release|x64.ActiveCfg = Release|x64
 		{07BDBE85-B3C1-4E70-91E3-B2517CFB04C1}.Release|x64.Build.0 = Release|x64
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Debug|Win32.Build.0 = Debug|Win32
 		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Debug|x64.ActiveCfg = Debug|x64
@@ -1422,6 +2012,14 @@
 		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Release|Win32.Build.0 = Release|Win32
 		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Release|x64.ActiveCfg = Release|x64
 		{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}.Release|x64.Build.0 = Release|x64
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Debug|Win32.Build.0 = Debug|Win32
 		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Debug|x64.ActiveCfg = Debug|x64
@@ -1430,6 +2028,14 @@
 		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Release|Win32.Build.0 = Release|Win32
 		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Release|x64.ActiveCfg = Release|x64
 		{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}.Release|x64.Build.0 = Release|x64
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{171056B8-17A5-4825-9110-2877A94CD933}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{171056B8-17A5-4825-9110-2877A94CD933}.Debug|Win32.ActiveCfg = Debug|Win32
 		{171056B8-17A5-4825-9110-2877A94CD933}.Debug|Win32.Build.0 = Debug|Win32
 		{171056B8-17A5-4825-9110-2877A94CD933}.Debug|x64.ActiveCfg = Debug|x64
@@ -1438,6 +2044,14 @@
 		{171056B8-17A5-4825-9110-2877A94CD933}.Release|Win32.Build.0 = Release|Win32
 		{171056B8-17A5-4825-9110-2877A94CD933}.Release|x64.ActiveCfg = Release|x64
 		{171056B8-17A5-4825-9110-2877A94CD933}.Release|x64.Build.0 = Release|x64
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Debug|Win32.Build.0 = Debug|Win32
 		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Debug|x64.ActiveCfg = Debug|x64
@@ -1446,6 +2060,14 @@
 		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Release|Win32.Build.0 = Release|Win32
 		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Release|x64.ActiveCfg = Release|x64
 		{ECFBC0CA-07CD-448D-8B23-660644E9D9FC}.Release|x64.Build.0 = Release|x64
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Debug|Win32.Build.0 = Debug|Win32
 		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -1454,6 +2076,14 @@
 		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Release|Win32.Build.0 = Release|Win32
 		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Release|x64.ActiveCfg = Release|x64
 		{3A76C039-4054-4D6C-AA2D-D69C8806FB6E}.Release|x64.Build.0 = Release|x64
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Debug|Win32.Build.0 = Debug|Win32
 		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Debug|x64.ActiveCfg = Debug|x64
@@ -1462,6 +2092,14 @@
 		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Release|Win32.Build.0 = Release|Win32
 		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Release|x64.ActiveCfg = Release|x64
 		{5AB527E1-111F-4AD0-8D98-2896E1390A70}.Release|x64.Build.0 = Release|x64
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Debug|Win32.Build.0 = Debug|Win32
 		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1470,6 +2108,14 @@
 		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Release|Win32.Build.0 = Release|Win32
 		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Release|x64.ActiveCfg = Release|x64
 		{BDA98D7E-A92B-4B18-89C0-5F5C5D52934D}.Release|x64.Build.0 = Release|x64
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{11C94711-6AA5-4D42-8F1A-08421527376E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{11C94711-6AA5-4D42-8F1A-08421527376E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{11C94711-6AA5-4D42-8F1A-08421527376E}.Debug|Win32.Build.0 = Debug|Win32
 		{11C94711-6AA5-4D42-8F1A-08421527376E}.Debug|x64.ActiveCfg = Debug|x64
@@ -1478,6 +2124,14 @@
 		{11C94711-6AA5-4D42-8F1A-08421527376E}.Release|Win32.Build.0 = Release|Win32
 		{11C94711-6AA5-4D42-8F1A-08421527376E}.Release|x64.ActiveCfg = Release|x64
 		{11C94711-6AA5-4D42-8F1A-08421527376E}.Release|x64.Build.0 = Release|x64
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{649FACD9-76C7-4184-A34C-269E7F302952}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{649FACD9-76C7-4184-A34C-269E7F302952}.Debug|Win32.ActiveCfg = Debug|Win32
 		{649FACD9-76C7-4184-A34C-269E7F302952}.Debug|Win32.Build.0 = Debug|Win32
 		{649FACD9-76C7-4184-A34C-269E7F302952}.Debug|x64.ActiveCfg = Debug|x64
@@ -1486,6 +2140,14 @@
 		{649FACD9-76C7-4184-A34C-269E7F302952}.Release|Win32.Build.0 = Release|Win32
 		{649FACD9-76C7-4184-A34C-269E7F302952}.Release|x64.ActiveCfg = Release|x64
 		{649FACD9-76C7-4184-A34C-269E7F302952}.Release|x64.Build.0 = Release|x64
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Debug|Win32.ActiveCfg = Debug|Win32
 		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Debug|Win32.Build.0 = Debug|Win32
 		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Debug|x64.ActiveCfg = Debug|x64
@@ -1494,6 +2156,14 @@
 		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Release|Win32.Build.0 = Release|Win32
 		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Release|x64.ActiveCfg = Release|x64
 		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894}.Release|x64.Build.0 = Release|x64
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{CFB00773-94A6-411F-A2C1-20BC52772510}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{CFB00773-94A6-411F-A2C1-20BC52772510}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CFB00773-94A6-411F-A2C1-20BC52772510}.Debug|Win32.Build.0 = Debug|Win32
 		{CFB00773-94A6-411F-A2C1-20BC52772510}.Debug|x64.ActiveCfg = Debug|x64
@@ -1502,6 +2172,14 @@
 		{CFB00773-94A6-411F-A2C1-20BC52772510}.Release|Win32.Build.0 = Release|Win32
 		{CFB00773-94A6-411F-A2C1-20BC52772510}.Release|x64.ActiveCfg = Release|x64
 		{CFB00773-94A6-411F-A2C1-20BC52772510}.Release|x64.Build.0 = Release|x64
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Debug|Win32.Build.0 = Debug|Win32
 		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Debug|x64.ActiveCfg = Debug|x64
@@ -1510,6 +2188,14 @@
 		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Release|Win32.Build.0 = Release|Win32
 		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Release|x64.ActiveCfg = Release|x64
 		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B}.Release|x64.Build.0 = Release|x64
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Debug|Win32.Build.0 = Debug|Win32
 		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Debug|x64.ActiveCfg = Debug|x64
@@ -1518,6 +2204,14 @@
 		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Release|Win32.Build.0 = Release|Win32
 		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Release|x64.ActiveCfg = Release|x64
 		{6408610F-33BC-4BAE-B0E0-F366C7B93B88}.Release|x64.Build.0 = Release|x64
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Debug|Win32.Build.0 = Debug|Win32
 		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Debug|x64.ActiveCfg = Debug|x64
@@ -1526,6 +2220,14 @@
 		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Release|Win32.Build.0 = Release|Win32
 		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Release|x64.ActiveCfg = Release|x64
 		{66CF01A0-7BE5-482E-8D27-6294E691B084}.Release|x64.Build.0 = Release|x64
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Debug|Win32.ActiveCfg = Debug|Win32
 		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Debug|Win32.Build.0 = Debug|Win32
 		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Debug|x64.ActiveCfg = Debug|x64
@@ -1534,6 +2236,14 @@
 		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Release|Win32.Build.0 = Release|Win32
 		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Release|x64.ActiveCfg = Release|x64
 		{15F7115E-5CD1-4CC9-9B8C-9C9357801302}.Release|x64.Build.0 = Release|x64
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Debug|Win32.Build.0 = Debug|Win32
 		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Debug|x64.ActiveCfg = Debug|x64
@@ -1542,6 +2252,14 @@
 		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Release|Win32.Build.0 = Release|Win32
 		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Release|x64.ActiveCfg = Release|x64
 		{2C646634-969C-4A25-B9F2-ACE22302A89C}.Release|x64.Build.0 = Release|x64
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Debug|Win32.Build.0 = Debug|Win32
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Debug|x64.ActiveCfg = Debug|x64
@@ -1550,6 +2268,14 @@
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Release|Win32.Build.0 = Release|Win32
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Release|x64.ActiveCfg = Release|x64
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD}.Release|x64.Build.0 = Release|x64
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Debug|Win32.ActiveCfg = Debug|Win32
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Debug|Win32.Build.0 = Debug|Win32
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Debug|x64.ActiveCfg = Debug|x64
@@ -1558,22 +2284,14 @@
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|Win32.Build.0 = Release|Win32
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.ActiveCfg = Release|x64
 		{74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.Build.0 = Release|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|Win32.Build.0 = Debug|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|x64.ActiveCfg = Debug|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Debug|x64.Build.0 = Debug|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|Win32.ActiveCfg = Release|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|Win32.Build.0 = Release|Win32
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|x64.ActiveCfg = Release|x64
-		{6859C86F-E845-4CC3-9667-549638D1BBE4}.Release|x64.Build.0 = Release|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|Win32.Build.0 = Debug|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|x64.ActiveCfg = Debug|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Debug|x64.Build.0 = Debug|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|Win32.ActiveCfg = Release|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|Win32.Build.0 = Release|Win32
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|x64.ActiveCfg = Release|x64
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69}.Release|x64.Build.0 = Release|x64
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Debug|Win32.Build.0 = Debug|Win32
 		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Debug|x64.ActiveCfg = Debug|x64
@@ -1582,6 +2300,14 @@
 		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Release|Win32.Build.0 = Release|Win32
 		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Release|x64.ActiveCfg = Release|x64
 		{0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Release|x64.Build.0 = Release|x64
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Debug|Win32.ActiveCfg = Debug|Win32
 		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Debug|Win32.Build.0 = Debug|Win32
 		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Debug|x64.ActiveCfg = Debug|x64
@@ -1590,6 +2316,14 @@
 		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Release|Win32.Build.0 = Release|Win32
 		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Release|x64.ActiveCfg = Release|x64
 		{508275B8-D93D-4F1B-BD48-1A4B7420F860}.Release|x64.Build.0 = Release|x64
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Debug|Win32.Build.0 = Debug|Win32
 		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Debug|x64.ActiveCfg = Debug|x64
@@ -1598,6 +2332,14 @@
 		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Release|Win32.Build.0 = Release|Win32
 		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Release|x64.ActiveCfg = Release|x64
 		{6854119E-CB5F-4B6F-9AB9-49538B9219F6}.Release|x64.Build.0 = Release|x64
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{C4A93019-9757-4999-A1E5-3C019569A525}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{C4A93019-9757-4999-A1E5-3C019569A525}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C4A93019-9757-4999-A1E5-3C019569A525}.Debug|Win32.Build.0 = Debug|Win32
 		{C4A93019-9757-4999-A1E5-3C019569A525}.Debug|x64.ActiveCfg = Debug|x64
@@ -1606,6 +2348,14 @@
 		{C4A93019-9757-4999-A1E5-3C019569A525}.Release|Win32.Build.0 = Release|Win32
 		{C4A93019-9757-4999-A1E5-3C019569A525}.Release|x64.ActiveCfg = Release|x64
 		{C4A93019-9757-4999-A1E5-3C019569A525}.Release|x64.Build.0 = Release|x64
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Debug|Win32.Build.0 = Debug|Win32
 		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Debug|x64.ActiveCfg = Debug|x64
@@ -1614,6 +2364,14 @@
 		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Release|Win32.Build.0 = Release|Win32
 		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Release|x64.ActiveCfg = Release|x64
 		{8458C2DB-4B5E-4CC9-9365-571C62B2832F}.Release|x64.Build.0 = Release|x64
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Debug|Win32.Build.0 = Debug|Win32
 		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1622,6 +2380,14 @@
 		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Release|Win32.Build.0 = Release|Win32
 		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Release|x64.ActiveCfg = Release|x64
 		{667B765B-502E-46C3-92EE-DDDDC657ED2D}.Release|x64.Build.0 = Release|x64
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Debug|Win32.Build.0 = Debug|Win32
 		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Debug|x64.ActiveCfg = Debug|x64
@@ -1630,6 +2396,14 @@
 		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Release|Win32.Build.0 = Release|Win32
 		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Release|x64.ActiveCfg = Release|x64
 		{4CDBBDDD-7CB7-4063-ACCE-667D6162C5CA}.Release|x64.Build.0 = Release|x64
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Debug|Win32.Build.0 = Debug|Win32
 		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Debug|x64.ActiveCfg = Debug|x64
@@ -1638,6 +2412,14 @@
 		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|Win32.Build.0 = Release|Win32
 		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|x64.ActiveCfg = Release|x64
 		{8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|x64.Build.0 = Release|x64
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Debug|Win32.ActiveCfg = Debug|Win32
 		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Debug|Win32.Build.0 = Debug|Win32
 		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Debug|x64.ActiveCfg = Debug|x64
@@ -1646,6 +2428,14 @@
 		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Release|Win32.Build.0 = Release|Win32
 		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Release|x64.ActiveCfg = Release|x64
 		{076446BE-553C-4938-9CF8-BC7DEB1BF235}.Release|x64.Build.0 = Release|x64
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Debug|Win32.Build.0 = Debug|Win32
 		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Debug|x64.ActiveCfg = Debug|x64
@@ -1654,6 +2444,14 @@
 		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Release|Win32.Build.0 = Release|Win32
 		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Release|x64.ActiveCfg = Release|x64
 		{1733A0D9-A75C-47DB-86B9-EF199E48482B}.Release|x64.Build.0 = Release|x64
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Debug|Win32.Build.0 = Debug|Win32
 		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Debug|x64.ActiveCfg = Debug|x64
@@ -1662,6 +2460,14 @@
 		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Release|Win32.Build.0 = Release|Win32
 		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Release|x64.ActiveCfg = Release|x64
 		{CEDE5677-D376-4859-AEAE-55608D8F0440}.Release|x64.Build.0 = Release|x64
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Debug|Win32.ActiveCfg = Debug|Win32
 		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Debug|Win32.Build.0 = Debug|Win32
 		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Debug|x64.ActiveCfg = Debug|x64
@@ -1670,6 +2476,14 @@
 		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Release|Win32.Build.0 = Release|Win32
 		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Release|x64.ActiveCfg = Release|x64
 		{54CA937D-F425-4EEA-B1A4-5DEC87BDDC19}.Release|x64.Build.0 = Release|x64
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Debug|Win32.Build.0 = Debug|Win32
 		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Debug|x64.ActiveCfg = Debug|x64
@@ -1678,6 +2492,14 @@
 		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Release|Win32.Build.0 = Release|Win32
 		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Release|x64.ActiveCfg = Release|x64
 		{FE519629-8AB6-4E36-AE0A-4D8FCF67C2B9}.Release|x64.Build.0 = Release|x64
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Debug|Win32.Build.0 = Debug|Win32
 		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Debug|x64.ActiveCfg = Debug|x64
@@ -1686,6 +2508,14 @@
 		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Release|Win32.Build.0 = Release|Win32
 		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Release|x64.ActiveCfg = Release|x64
 		{2EE3C8C1-B890-4B24-932D-D699F1825C01}.Release|x64.Build.0 = Release|x64
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Debug|Win32.Build.0 = Debug|Win32
 		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Debug|x64.ActiveCfg = Debug|x64
@@ -1694,6 +2524,14 @@
 		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Release|Win32.Build.0 = Release|Win32
 		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Release|x64.ActiveCfg = Release|x64
 		{ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F}.Release|x64.Build.0 = Release|x64
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Debug|Win32.Build.0 = Debug|Win32
 		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Debug|x64.ActiveCfg = Debug|x64
@@ -1702,6 +2540,14 @@
 		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Release|Win32.Build.0 = Release|Win32
 		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Release|x64.ActiveCfg = Release|x64
 		{C2A13189-B75A-4ACA-98A0-326956F1F6EA}.Release|x64.Build.0 = Release|x64
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Debug|Win32.Build.0 = Debug|Win32
 		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Debug|x64.ActiveCfg = Debug|x64
@@ -1710,6 +2556,14 @@
 		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Release|Win32.Build.0 = Release|Win32
 		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Release|x64.ActiveCfg = Release|x64
 		{B2DDDBC0-559B-46E9-898F-958A1AA8991F}.Release|x64.Build.0 = Release|x64
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Debug|Win32.Build.0 = Debug|Win32
 		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1718,6 +2572,14 @@
 		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Release|Win32.Build.0 = Release|Win32
 		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Release|x64.ActiveCfg = Release|x64
 		{F5827922-7493-4DB4-AA42-3DCFF59CCA0D}.Release|x64.Build.0 = Release|x64
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Debug|Win32.Build.0 = Debug|Win32
 		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Debug|x64.ActiveCfg = Debug|x64
@@ -1726,6 +2588,14 @@
 		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Release|Win32.Build.0 = Release|Win32
 		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Release|x64.ActiveCfg = Release|x64
 		{C1228BE2-FC54-4D44-94B1-964F62A569C3}.Release|x64.Build.0 = Release|x64
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Debug|Win32.ActiveCfg = Debug|Win32
 		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Debug|Win32.Build.0 = Debug|Win32
 		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -1734,6 +2604,14 @@
 		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Release|Win32.Build.0 = Release|Win32
 		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Release|x64.ActiveCfg = Release|x64
 		{01C495B5-93BE-424E-BB7C-5110A3952A75}.Release|x64.Build.0 = Release|x64
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.Build.0 = Debug|Win32
 		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|x64.ActiveCfg = Debug|x64
@@ -1742,6 +2620,14 @@
 		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|Win32.Build.0 = Release|Win32
 		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|x64.ActiveCfg = Release|x64
 		{B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|x64.Build.0 = Release|x64
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.Build.0 = Debug|Win32
 		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|x64.ActiveCfg = Debug|x64
@@ -1750,6 +2636,14 @@
 		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|Win32.Build.0 = Release|Win32
 		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|x64.ActiveCfg = Release|x64
 		{F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|x64.Build.0 = Release|x64
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.Build.0 = Debug|Win32
 		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|x64.ActiveCfg = Debug|x64
@@ -1758,6 +2652,14 @@
 		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|Win32.Build.0 = Release|Win32
 		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|x64.ActiveCfg = Release|x64
 		{C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|x64.Build.0 = Release|x64
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.Build.0 = Debug|Win32
 		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|x64.ActiveCfg = Debug|x64
@@ -1766,11 +2668,27 @@
 		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Release|Win32.Build.0 = Release|Win32
 		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Release|x64.ActiveCfg = Release|x64
 		{ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Release|x64.Build.0 = Release|x64
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Debug|Win32.Build.0 = Debug|Win32
 		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Debug|x64.ActiveCfg = Debug|x64
 		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Release|Win32.ActiveCfg = Release|Win32
 		{D638D692-8549-48F7-897B-1EF24D0E3A59}.Release|x64.ActiveCfg = Release|x64
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Debug|Win32.Build.0 = Debug|Win32
 		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Debug|x64.ActiveCfg = Debug|x64
@@ -1779,6 +2697,14 @@
 		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Release|Win32.Build.0 = Release|Win32
 		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Release|x64.ActiveCfg = Release|x64
 		{EF33CB6A-A655-4812-995B-4000D85FC8B6}.Release|x64.Build.0 = Release|x64
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Debug|Win32.Build.0 = Debug|Win32
 		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Debug|x64.ActiveCfg = Debug|x64
@@ -1787,6 +2713,14 @@
 		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Release|Win32.Build.0 = Release|Win32
 		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Release|x64.ActiveCfg = Release|x64
 		{3182D709-1DDE-495B-8CE9-D1A4DACED7DA}.Release|x64.Build.0 = Release|x64
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Debug|Win32.Build.0 = Debug|Win32
 		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Debug|x64.ActiveCfg = Debug|x64
@@ -1795,6 +2729,14 @@
 		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Release|Win32.Build.0 = Release|Win32
 		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Release|x64.ActiveCfg = Release|x64
 		{83B9B9F0-EFF4-447B-A7DD-60BAE22123F8}.Release|x64.Build.0 = Release|x64
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Debug|Win32.ActiveCfg = Debug|Win32
 		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Debug|Win32.Build.0 = Debug|Win32
 		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Debug|x64.ActiveCfg = Debug|x64
@@ -1803,6 +2745,14 @@
 		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|Win32.Build.0 = Release|Win32
 		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|x64.ActiveCfg = Release|x64
 		{948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|x64.Build.0 = Release|x64
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Debug|Win32.Build.0 = Debug|Win32
 		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Debug|x64.ActiveCfg = Debug|x64
@@ -1811,6 +2761,14 @@
 		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Release|Win32.Build.0 = Release|Win32
 		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Release|x64.ActiveCfg = Release|x64
 		{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Release|x64.Build.0 = Release|x64
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Debug|Win32.Build.0 = Debug|Win32
 		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Debug|x64.ActiveCfg = Debug|x64
@@ -1819,6 +2777,14 @@
 		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Release|Win32.Build.0 = Release|Win32
 		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Release|x64.ActiveCfg = Release|x64
 		{BFB8253B-4233-410B-AC03-BBC876DAB68D}.Release|x64.Build.0 = Release|x64
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Debug|Win32.Build.0 = Debug|Win32
 		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Debug|x64.ActiveCfg = Debug|x64
@@ -1827,6 +2793,14 @@
 		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Release|Win32.Build.0 = Release|Win32
 		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Release|x64.ActiveCfg = Release|x64
 		{24E0F8DA-F197-4E4B-8820-0614713CD8A9}.Release|x64.Build.0 = Release|x64
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Debug|Win32.Build.0 = Debug|Win32
 		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Debug|x64.ActiveCfg = Debug|x64
@@ -1835,6 +2809,14 @@
 		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Release|Win32.Build.0 = Release|Win32
 		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Release|x64.ActiveCfg = Release|x64
 		{078030B1-68CF-4ABC-A21F-7C867477AEAC}.Release|x64.Build.0 = Release|x64
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Debug|Win32.Build.0 = Debug|Win32
 		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -1843,6 +2825,14 @@
 		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|Win32.Build.0 = Release|Win32
 		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|x64.ActiveCfg = Release|x64
 		{263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|x64.Build.0 = Release|x64
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Debug|Win32.ActiveCfg = Debug|Win32
 		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Debug|Win32.Build.0 = Debug|Win32
 		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Debug|x64.ActiveCfg = Debug|x64
@@ -1851,6 +2841,14 @@
 		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Release|Win32.Build.0 = Release|Win32
 		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Release|x64.ActiveCfg = Release|x64
 		{59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Release|x64.Build.0 = Release|x64
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Debug|Win32.Build.0 = Debug|Win32
 		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Debug|x64.ActiveCfg = Debug|x64
@@ -1859,6 +2857,14 @@
 		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Release|Win32.Build.0 = Release|Win32
 		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Release|x64.ActiveCfg = Release|x64
 		{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Release|x64.Build.0 = Release|x64
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Debug|Win32.Build.0 = Debug|Win32
 		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Debug|x64.ActiveCfg = Debug|x64
@@ -1867,6 +2873,14 @@
 		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Release|Win32.Build.0 = Release|Win32
 		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Release|x64.ActiveCfg = Release|x64
 		{A4E94959-FD6B-4280-B1B3-99E4829153C9}.Release|x64.Build.0 = Release|x64
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{2454F754-3A55-4875-9D8E-57B63673C231}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{2454F754-3A55-4875-9D8E-57B63673C231}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2454F754-3A55-4875-9D8E-57B63673C231}.Debug|Win32.Build.0 = Debug|Win32
 		{2454F754-3A55-4875-9D8E-57B63673C231}.Debug|x64.ActiveCfg = Debug|x64
@@ -1875,6 +2889,14 @@
 		{2454F754-3A55-4875-9D8E-57B63673C231}.Release|Win32.Build.0 = Release|Win32
 		{2454F754-3A55-4875-9D8E-57B63673C231}.Release|x64.ActiveCfg = Release|x64
 		{2454F754-3A55-4875-9D8E-57B63673C231}.Release|x64.Build.0 = Release|x64
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Debug|Win32.ActiveCfg = Debug|Win32
 		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Debug|Win32.Build.0 = Debug|Win32
 		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Debug|x64.ActiveCfg = Debug|x64
@@ -1883,6 +2905,14 @@
 		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Release|Win32.Build.0 = Release|Win32
 		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Release|x64.ActiveCfg = Release|x64
 		{73C0E333-6476-4B7E-A52D-AB5E9CA36906}.Release|x64.Build.0 = Release|x64
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Debug|Win32.Build.0 = Debug|Win32
 		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Debug|x64.ActiveCfg = Debug|x64
@@ -1891,6 +2921,14 @@
 		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Release|Win32.Build.0 = Release|Win32
 		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Release|x64.ActiveCfg = Release|x64
 		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5}.Release|x64.Build.0 = Release|x64
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Debug|Win32.Build.0 = Debug|Win32
 		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Debug|x64.ActiveCfg = Debug|x64
@@ -1899,6 +2937,14 @@
 		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|Win32.Build.0 = Release|Win32
 		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|x64.ActiveCfg = Release|x64
 		{28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|x64.Build.0 = Release|x64
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.Build.0 = Debug|Win32
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|x64.ActiveCfg = Debug|x64
@@ -1907,6 +2953,14 @@
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|Win32.Build.0 = Release|Win32
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.ActiveCfg = Release|x64
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.Build.0 = Release|x64
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Debug|Win32.ActiveCfg = Debug|Win32
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Debug|Win32.Build.0 = Debug|Win32
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Debug|x64.ActiveCfg = Debug|x64
@@ -1915,6 +2969,38 @@
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Release|Win32.Build.0 = Release|Win32
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Release|x64.ActiveCfg = Release|x64
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Release|x64.Build.0 = Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|Win32.Build.0 = Debug|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|x64.ActiveCfg = Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Debug|x64.Build.0 = Debug|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|Win32.ActiveCfg = Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|Win32.Build.0 = Release|Win32
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|x64.ActiveCfg = Release|x64
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Release|x64.Build.0 = Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|Win32.Build.0 = Debug|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|x64.ActiveCfg = Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Debug|x64.Build.0 = Debug|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|Win32.ActiveCfg = Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|Win32.Build.0 = Release|Win32
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.ActiveCfg = Release|x64
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1964,6 +3050,7 @@
 		{D66213E1-6A77-4705-B9DC-E2DB22A3E2F1} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC}
 		{23BDC161-86D7-4884-A200-2DF87C1AE15A} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC}
 		{36E32583-310E-48E3-B821-CE79701BDF1D} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC}
+		{EAE3DBDF-3689-4DEF-B5DF-B9A51268E784} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC}
 		{CD25A05C-228D-473F-A86F-6C2DD22085B4} = {C6B8BC64-0F88-4C57-A12D-A43372141F67}
 		{FC4AC0A5-84D5-461F-BE52-EA686F52773E} = {C6B8BC64-0F88-4C57-A12D-A43372141F67}
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {2D52604F-E2AD-4586-BBD7-BD13536C702C}
@@ -2074,7 +3161,6 @@
 		{3CEFD8CF-0E59-4614-A7BB-AD25F220FAB4} = {39AA1944-6915-43F5-B219-EC2DA22F6CBC}
 		{47D78666-F196-4700-B4B7-D83B75EA23DC} = {39AA1944-6915-43F5-B219-EC2DA22F6CBC}
 		{DE878A39-59DE-4F36-B669-68C84D60C93B} = {39AA1944-6915-43F5-B219-EC2DA22F6CBC}
-		{02851CB5-EB65-415A-B525-7CDDD838EB60} = {39AA1944-6915-43F5-B219-EC2DA22F6CBC}
 		{03ECBDF1-F8FB-40B0-8CC4-7F26D045B894} = {A7EDE208-ABA5-4339-A40B-29493E008228}
 		{CFB00773-94A6-411F-A2C1-20BC52772510} = {64FF54F9-16CC-4A32-B772-5079EE5B0561}
 		{6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B} = {CFCA8FF0-6E5A-4F87-8605-C51D6CA3F80F}
@@ -2084,8 +3170,6 @@
 		{2C646634-969C-4A25-B9F2-ACE22302A89C} = {3CEFD8CF-0E59-4614-A7BB-AD25F220FAB4}
 		{2D412D9D-49F4-4259-A175-D6BBA1E8DFFD} = {47D78666-F196-4700-B4B7-D83B75EA23DC}
 		{74127AED-9D17-4789-8B2F-9CCD660E7204} = {DE878A39-59DE-4F36-B669-68C84D60C93B}
-		{6859C86F-E845-4CC3-9667-549638D1BBE4} = {02851CB5-EB65-415A-B525-7CDDD838EB60}
-		{7AAF5067-EBBB-46BA-934B-0337EE844B69} = {02851CB5-EB65-415A-B525-7CDDD838EB60}
 		{FBD3D3FE-BE86-4C91-B9BC-363D7732CAC6} = {C6F0A150-0CFC-42B4-B24C-79D9FCA26E07}
 		{52A7D970-CA8B-490C-B3D2-4595BE4AFE5D} = {C6F0A150-0CFC-42B4-B24C-79D9FCA26E07}
 		{2557CF58-4848-4D0A-8D42-E0F7C7158A6B} = {8DC4FC60-61F2-4D58-8DB1-615460DEF993}
@@ -2121,5 +3205,7 @@
 		{A9537443-BB6C-4324-B1B9-B9492CAE1CD5} = {36E32583-310E-48E3-B821-CE79701BDF1D}
 		{28347243-F75F-4B28-89F9-7EA84478D9C9} = {36E32583-310E-48E3-B821-CE79701BDF1D}
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC} = {72BF4C3D-8E1B-4875-A9AA-2FD63C2442AB}
+		{A19DC61B-84AE-4983-9B4C-4F4A338178C5} = {EAE3DBDF-3689-4DEF-B5DF-B9A51268E784}
+		{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2} = {EAE3DBDF-3689-4DEF-B5DF-B9A51268E784}
 	EndGlobalSection
 EndGlobal
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/ice.v141.sln zeroc-ice-3.7.2/cpp/msbuild/ice.v141.sln
--- zeroc-ice-3.7.1/cpp/msbuild/ice.v141.sln	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/ice.v141.sln	2019-02-05 18:03:04.000000000 +0000
@@ -277,6 +277,16 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2objc", "..\src\slice2objc\msbuild\slice2objc.vcxproj", "{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl++11", "..\src\IceSSL\msbuild\icesslopenssl++11\icesslopenssl++11.vcxproj", "{D0DC2305-37FE-4D03-BE05-AC8912678DC8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl", "..\src\IceSSL\msbuild\icesslopenssl\icesslopenssl.vcxproj", "{0D08F6B8-39C0-413B-84CE-D73230BCC740}"
+	ProjectSection(ProjectDependencies) = postProject
+		{72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -669,6 +679,22 @@
 		{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|Win32.Build.0 = Release|Win32
 		{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.ActiveCfg = Release|x64
 		{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.Build.0 = Release|x64
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Debug|Win32.Build.0 = Debug|Win32
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Debug|x64.ActiveCfg = Debug|x64
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Debug|x64.Build.0 = Debug|x64
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|Win32.ActiveCfg = Release|Win32
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|Win32.Build.0 = Release|Win32
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|x64.ActiveCfg = Release|x64
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|x64.Build.0 = Release|x64
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|Win32.Build.0 = Debug|Win32
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|x64.ActiveCfg = Debug|x64
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Debug|x64.Build.0 = Debug|x64
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|Win32.ActiveCfg = Release|Win32
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|Win32.Build.0 = Release|Win32
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|x64.ActiveCfg = Release|x64
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -722,5 +748,10 @@
 		{1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{A79E9EB0-878C-4EDB-9804-2D262D6008DB} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
+		{D0DC2305-37FE-4D03-BE05-AC8912678DC8} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
+		{0D08F6B8-39C0-413B-84CE-D73230BCC740} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AAB39BE9-A7ED-4C54-80FE-D63A173ABB06}
 	EndGlobalSection
 EndGlobal
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/THIRD_PARTY_LICENSE.txt zeroc-ice-3.7.2/cpp/msbuild/THIRD_PARTY_LICENSE.txt
--- zeroc-ice-3.7.1/cpp/msbuild/THIRD_PARTY_LICENSE.txt	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/THIRD_PARTY_LICENSE.txt	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,152 @@
+License agreement for bzip2/libbzip2:
+--------------------------------------
+
+--------------------------------------------------------------------------
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2010 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must
+   not claim that you wrote the original software.  If you use this
+   software in a product, an acknowledgment in the product
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@bzip.org
+bzip2/libbzip2 version 1.0.6 of 6 September 2010
+
+--------------------------------------------------------------------------
+
+License agreement for Expat:
+-----------------------------
+
+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
+Copyright (c) 2001-2017 Expat maintainers
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License agreement for MCPP:
+----------------------------
+
+/*-
+ * Copyright (c) 1998, 2002-2008 Kiyoshi Matsui <kmatsui@t3.rim.or.jp>
+ * All rights reserved.
+ *
+ * This software including the files in this directory is provided under
+ * the following license.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+License agreement for LMDB:
+---------------------------
+
+The OpenLDAP Public License
+  Version 2.8, 17 August 2003
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions in source form must retain copyright statements
+   and notices,
+
+2. Redistributions in binary form must reproduce applicable copyright
+   statements and notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution, and
+
+3. Redistributions must contain a verbatim copy of this document.
+
+The OpenLDAP Foundation may revise this license from time to time.
+Each revision is distinguished by a version number.  You may use
+this Software under terms of this license revision or under the
+terms of any subsequent revision of the license.
+
+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+The names of the authors and copyright holders must not be used in
+advertising or otherwise to promote the sale, use or other dealing
+in this Software without specific, written prior permission.  Title
+to copyright in this Software shall at all times remain with copyright
+holders.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
+California, USA.  All Rights Reserved.  Permission to copy and
+distribute verbatim copies of this document is granted.
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,19 +3,19 @@
   <metadata>
     <id>zeroc.ice.uwp.v140</id>
     <title>ZeroC Ice for UWP and Visual Studio 2015</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++/CX SDK for Visual Studio 2015 (v140). Provides binaries for Universal Windows (UWP) x86 and x64. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v140 zeroc</tags>
     <dependencies>
-      <dependency id="zeroc.ice.uwp.v140.x86" version="[3.7.1]"/>
-      <dependency id="zeroc.ice.uwp.v140.x64" version="[3.7.1]"/>
+      <dependency id="zeroc.ice.uwp.v140.x86" version="[3.7.2]"/>
+      <dependency id="zeroc.ice.uwp.v140.x64" version="[3.7.2]"/>
     </dependencies>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.props zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.props
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '14.0'">
-        <IceVersion>3.7.1</IceVersion>
-        <IceIntVersion>30701</IceIntVersion>
+        <IceVersion>3.7.2</IceVersion>
+        <IceIntVersion>30702</IceIntVersion>
         <IceVersionMM>3.7</IceVersionMM>
         <IceSoVersion>37</IceSoVersion>
-        <IceNugetPackageVersion>3.7.1</IceNugetPackageVersion>
+        <IceNugetPackageVersion>3.7.2</IceNugetPackageVersion>
         <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
         <IceToolsPath>$(IceHome)\tools</IceToolsPath>
     </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.uwp.v140.x64</id>
     <title>ZeroC Ice for UWP and Visual Studio 2015</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x64 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v140.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v140 x64 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.uwp.v140.x86</id>
     <title>ZeroC Ice for UWP and Visual Studio 2015</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x86 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v140.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v140 x86 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,19 +3,19 @@
   <metadata>
     <id>zeroc.ice.uwp.v141</id>
     <title>ZeroC Ice for UWP and Visual Studio 2017</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++/CX SDK for Visual Studio 2017 (v141). Provides binaries for Universal Windows (UWP) x86 and x64. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v141 zeroc</tags>
     <dependencies>
-      <dependency id="zeroc.ice.uwp.v141.x86" version="[3.7.1]"/>
-      <dependency id="zeroc.ice.uwp.v141.x64" version="[3.7.1]"/>
+      <dependency id="zeroc.ice.uwp.v141.x86" version="[3.7.2]"/>
+      <dependency id="zeroc.ice.uwp.v141.x64" version="[3.7.2]"/>
     </dependencies>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.props zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.props
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '15.0'">
-        <IceVersion>3.7.1</IceVersion>
-        <IceIntVersion>30701</IceIntVersion>
+        <IceVersion>3.7.2</IceVersion>
+        <IceIntVersion>30702</IceIntVersion>
         <IceVersionMM>3.7</IceVersionMM>
         <IceSoVersion>37</IceSoVersion>
-        <IceNugetPackageVersion>3.7.1</IceNugetPackageVersion>
+        <IceNugetPackageVersion>3.7.2</IceNugetPackageVersion>
         <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
         <IceToolsPath>$(IceHome)\tools</IceToolsPath>
     </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.uwp.v141.x64</id>
     <title>ZeroC Ice for UWP and Visual Studio 2017</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x64 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v141.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v141 x64 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.uwp.v141.x86</id>
     <title>ZeroC Ice for UWP and Visual Studio 2017</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>x86 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v141.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc uwp v141 x86 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v100.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v100.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v100.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v100.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.v100</id>
     <title>ZeroC Ice C++ for Visual Studio 2010</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2010 (v100). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc v100 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v100.props zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v100.props
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v100.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v100.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'">
-        <IceVersion>3.7.1</IceVersion>
-        <IceIntVersion>30701</IceIntVersion>
+        <IceVersion>3.7.2</IceVersion>
+        <IceIntVersion>30702</IceIntVersion>
         <IceVersionMM>3.7</IceVersionMM>
         <IceSoVersion>37</IceSoVersion>
-        <IceNugetPackageVersion>3.7.1</IceNugetPackageVersion>
+        <IceNugetPackageVersion>3.7.2</IceNugetPackageVersion>
         <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
         <IceToolsPath>$(IceHome)\tools</IceToolsPath>
     </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v100.targets zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v100.targets
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v100.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v100.targets	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <!-- If we are using Visual Studio 2010 -->
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v120.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v120.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v120.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v120.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.v120</id>
     <title>ZeroC Ice C++ for Visual Studio 2013</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2013 (v120). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc v120 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v120.props zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v120.props
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v120.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v120.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '12.0'">
-        <IceVersion>3.7.1</IceVersion>
-        <IceIntVersion>30701</IceIntVersion>
+    <PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'">
+        <IceVersion>3.7.2</IceVersion>
+        <IceIntVersion>30702</IceIntVersion>
         <IceVersionMM>3.7</IceVersionMM>
         <IceSoVersion>37</IceSoVersion>
-        <IceNugetPackageVersion>3.7.1</IceNugetPackageVersion>
+        <IceNugetPackageVersion>3.7.2</IceNugetPackageVersion>
         <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
         <IceToolsPath>$(IceHome)\tools</IceToolsPath>
     </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v120.targets zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v120.targets
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v120.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v120.targets	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <!-- If MSBuildToolsVersion is 14.0 we are using Visual Studio 2015 -->
-    <ItemDefinitionGroup Condition="'$(MSBuildToolsVersion)' == '12.0'">
-        <ClCompile>
-            <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-        </ClCompile>
-    </ItemDefinitionGroup>
-
     <!-- Use bin and lib directories that match the used platform toolset -->
     <PropertyGroup Condition="'$(PlatformToolset)' == 'v120'">
         <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration>
@@ -17,6 +10,9 @@
     </PropertyGroup>
 
     <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v120'">
+        <ClCompile>
+            <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+        </ClCompile>
         <Link>
             <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\Release;$(MSBuildThisFileDirectory)lib\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
         </Link>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v140.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v140.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v140.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v140.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.v140</id>
     <title>ZeroC Ice C++ for Visual Studio 2015</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2015 (v140). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc v140 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v140.props zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v140.props
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v140.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v140.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '14.0'">
-        <IceVersion>3.7.1</IceVersion>
-        <IceIntVersion>30701</IceIntVersion>
+    <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'">
+        <IceVersion>3.7.2</IceVersion>
+        <IceIntVersion>30702</IceIntVersion>
         <IceVersionMM>3.7</IceVersionMM>
         <IceSoVersion>37</IceSoVersion>
-        <IceNugetPackageVersion>3.7.1</IceNugetPackageVersion>
+        <IceNugetPackageVersion>3.7.2</IceNugetPackageVersion>
         <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
         <IceToolsPath>$(IceHome)\tools</IceToolsPath>
     </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v140.targets zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v140.targets
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v140.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v140.targets	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <!-- If MSBuildToolsVersion is 14.0 we are using Visual Studio 2015 -->
-    <ItemDefinitionGroup Condition="'$(MSBuildToolsVersion)' == '14.0'">
-        <ClCompile>
-            <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-        </ClCompile>
-    </ItemDefinitionGroup>
-
     <!-- Use bin and lib directories that match the used platform toolset -->
     <PropertyGroup Condition="'$(PlatformToolset)' == 'v140'">
         <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration>
@@ -17,6 +10,9 @@
     </PropertyGroup>
 
     <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v140'">
+        <ClCompile>
+            <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+        </ClCompile>
         <Link>
             <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\Release;$(MSBuildThisFileDirectory)lib\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
         </Link>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v141.nuspec zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v141.nuspec
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v141.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v141.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
   <metadata>
     <id>zeroc.ice.v141</id>
     <title>ZeroC Ice C++ for Visual Studio 2017</title>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <authors>ZeroC</authors>
-    <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+    <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+    <license type="expression">GPL-2.0-only</license>
     <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
     <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Ice C++ SDK for Visual Studio 2017 (v141). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
-    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+    <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
     <tags>ice native rpc v141 zeroc</tags>
   </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v141.props zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v141.props
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v141.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v141.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '15.0'">
-        <IceVersion>3.7.1</IceVersion>
-        <IceIntVersion>30701</IceIntVersion>
+    <PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0' or '$(VisualStudioVersion)' == '16.0'">
+        <IceVersion>3.7.2</IceVersion>
+        <IceIntVersion>30702</IceIntVersion>
         <IceVersionMM>3.7</IceVersionMM>
         <IceSoVersion>37</IceSoVersion>
-        <IceNugetPackageVersion>3.7.1</IceNugetPackageVersion>
+        <IceNugetPackageVersion>3.7.2</IceNugetPackageVersion>
         <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
         <IceToolsPath>$(IceHome)\tools</IceToolsPath>
     </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v141.targets zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v141.targets
--- zeroc-ice-3.7.1/cpp/msbuild/zeroc.ice.v141.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/msbuild/zeroc.ice.v141.targets	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <!-- If MSBuildToolsVersion is 14.0 we are using Visual Studio 2017 RC1 -->
-    <ItemDefinitionGroup Condition="'$(MSBuildToolsVersion)' == '15.0'">
-        <ClCompile>
-            <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-        </ClCompile>
-    </ItemDefinitionGroup>
-
     <!-- Use bin and lib directories that match the used platform toolset -->
     <PropertyGroup Condition="'$(PlatformToolset)' == 'v141'">
         <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration>
@@ -17,6 +10,9 @@
     </PropertyGroup>
 
     <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v141'">
+        <ClCompile>
+            <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+        </ClCompile>
         <Link>
             <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\Release;$(MSBuildThisFileDirectory)lib\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
         </Link>
diff -Nru zeroc-ice-3.7.1/cpp/README.md zeroc-ice-3.7.2/cpp/README.md
--- zeroc-ice-3.7.1/cpp/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -34,7 +34,7 @@
 listed on [supported platforms][2].
 
 On Windows, the build requires a recent version of Visual Studio, and the
-Windows 10 SDK (10.0.14393.0) component when using Visual Studio 2017.
+Windows 10 SDK (10.0.14393.0) component when building with Visual Studio 2017.
 
 ### Third-Party Libraries
 
@@ -131,6 +131,13 @@
 make V=1 -j8 srcs
 ```
 
+The build system supports specifying additional preprocessor, compiler and
+linker options with the `CPPFLAGS`, `CXXFLAGS` and `LDFLAGS` variables. For
+example, to build the Ice C++98 mapping with `-std=c++11`, you can use:
+```
+make CXXFLAGS=-std=c++11
+```
+
 ### Build configurations and platforms
 
 The C++ source tree supports multiple build configurations and platforms. To
@@ -168,6 +175,8 @@
 
 ## Building Ice for Windows
 
+### Build Using MSBuild
+
 Open a Visual Studio command prompt. For example, with Visual Studio 2015, you
 can open one of:
 
@@ -184,7 +193,7 @@
 
 Now you're ready to build Ice:
 ```
-msbuild msbuild\ice.proj
+msbuild /m msbuild\ice.proj
 ```
 
 This builds the Ice for C++ SDK and the Ice for C++ test suite, with
@@ -193,7 +202,7 @@
 Set the MSBuild `Configuration` property to `Debug` to build debug binaries
 instead:
 ```
-msbuild msbuild\ice.proj /p:Configuration=Debug
+msbuild /m msbuild\ice.proj /p:Configuration=Debug
 ```
 
 The `Configuration` property may be set to `Debug` or `Release`.
@@ -201,17 +210,17 @@
 Set the MSBuild `Platform` property to `Win32` or `x64` to build binaries
 for a specific platform, for example:
 ```
-msbuild msbuild\ice.proj /p:Configuration=Debug /p:Platform=x64
+msbuild /m msbuild\ice.proj /p:Configuration=Debug /p:Platform=x64
 ```
 
 You can also skip the build of the test suite with the `BuildDist` target:
 ```
-msbuild msbuild\ice.proj /t:BuildDist /p:Platform=x64
+msbuild /m msbuild\ice.proj /t:BuildDist /p:Platform=x64
 ```
 
 To build the test suite using the NuGet binary distribution use:
 ```
-msbuild msbuild\ice.proj /p:ICE_BIN_DIST=all
+msbuild /m msbuild\ice.proj /p:ICE_BIN_DIST=all
 ```
 
 You can also sign the Ice binaries with Authenticode, by setting the following
@@ -220,8 +229,61 @@
  - `SIGN_CERTIFICATE` to your Authenticode certificate
  - `SIGN_PASSWORD` to the certificate password
 
+### Build Using Visual Studio
+
+Open the Visual Studio solution that corresponds to the Visual Studio version you
+are using.
+
+ - For Visual Studio 2017 use [msbuild/ice.v141.sln](./msbuild/ice.v141.sln)
+ - For Visual Studio 2015 use [msbuild/ice.v140.sln](./msbuild/ice.v140.sln)
+ - For Visual Studio 2013 use [msbuild/ice.v120.sln](./msbuild/ice.v120.sln)
+ - For Visual Studio 2010 use [msbuild/ice.v100.sln](./msbuild/ice.v100.sln)
+
+Restore the solution NuGet packages using the NuGet package manager, if the automatic
+download of packages during build is not enabled.
+
+Using the configuration manager choose the platform and configuration you want to build.
+
+The solution provide a project for each Ice component and each component can be built
+separatelly. When you build a component its dependencies are built automatically.
+
+For Visual Studio 2017 and Visual Studio 2015, the solutions organize the projects in two
+solution folders, C++11 and C++98, which correspond to the C++11 and C++98 mappings. If you
+want to build all the C++11 mapping components, build the C++11 solution folder;
+likewise if you want to build all the C++98 mapping components, build the C++98
+solution folder.
+
+For Visual Studio 2013 and Visual Studio 2010. there is no separate solution folder because
+only the C++98 mapping is supported with these compilers.
+
+The test suite is built using separate Visual Studio solutions:
+
+ - Ice Test Suite for Visual Studio 2017, Visual Studio 2015 and Visual Studio 2013 [msbuild/ice.test.sln](./msbuild/ice.test.sln)
+ - Ice Test Suite for Visual Studio 2010 [msbuild/ice.test.v100.sln](./msbuild/ice.test.v100.sln)
+ - Ice OpenSSL Test Suite for Visual Studio 2017, Visual Studio 2015 and Visual Studio 2013 [msbuild/ice.openssl.test.sln](./msbuild/ice.openssl.test.sln)
+
+The solution provides a separate project for each test component, the `Cpp11-Release` and `Cpp11-Debug` build
+configurations are setup to use the C++11 mapping in release and debug mode respectively, and are only supported
+with Visual Studio 2017 and Visual Studio 2015. The `Release` and `Debug` build configurations are setup to
+use the C++98 mapping in release and debug mode respectively.
+
+The building of the test uses by default the local source build, and you must have built the Ice
+source with the same platform and configuration than you are attemping to build the tests.
+
+For example to build the `Cpp11-Release/x64` tests you must have built first the C++11 mapping
+using `Release/x64`.
+
+It is also possible to build the tests using a C++ binary distribution, to do that you must
+set the `ICE_BIN_DIST` environment variable to `all` before starting Visual Studio.
+
+Then launch Visual Studio and open the desired test solution, you must now use NuGet package
+manager to restore the NuGet packages, and the build will use Ice NuGet packages instead of
+your local source build.
+
 ## Building Ice for Universal Windows (UWP)
 
+### Build Using MSBuild
+
 The steps are the same as for Building Ice for Windows above, except you must also
 use a `UWP` target.
 
@@ -240,6 +302,29 @@
 msbuild msbuild\ice.proj /t:UWPBuild /p:ICE_BIN_DIST=all
 ```
 
+### Build Using Visual Studio
+
+Before building Ice for UWP using Visual Studio you must build the slice2cpp compiler
+from the C++98 mapping, refer to [Building Ice for Windows](#building-ice-for-windows).
+
+Using either Visual Studio 2017 or Visual Studio 2015, open the [msbuild/ice.uwp.sln](./msbuild/ice.uwp.sln)
+
+Choose the platform and configuration you want to build using the configuration manager.
+
+The solution provides a project for each Ice component and each component can be built
+separately. When you build a component, its dependencies are built automatically.
+
+The test suite is built using a separate Visual Studio solution [msbuild/ice.testuwp.sln](./msbuild/ice.testuwp.sln).
+This solution includes a project for each test and a project for the UWP test controller
+required to run the test suite.
+
+It is also possible to build the tests using a C++ binary distribution, to do that you must
+set `ICE_BIN_DIST` environment variable to `all` before starting Visual Studio.
+
+Then launch Visual Studio and open the [msbuild/ice.testuwp.sln](./msbuild/ice.testuwp.sln) solution,
+you must now use NuGet package manager to restore the NuGet packages, and the build will use
+Ice NuGet packages instead of your local source build.
+
 ## Installing a C++ Source Build on Linux or macOS
 
 Simply run `make install`. This will install Ice in the directory specified by
@@ -251,7 +336,7 @@
 If you choose to not embed a `runpath` into executables at build time (see your
 build settings in `../config/Make.rules`) or did not create a symbolic link from
 the `runpath` directory to the installation directory, you also need to add the
-library directory to your `LD_LIBRARY_PATH` (Linux) or `DYLD_LIBRARY_PATH (macOS).
+library directory to your `LD_LIBRARY_PATH` (Linux) or `DYLD_LIBRARY_PATH` (macOS).
 
 On a Linux x86_64 system:
 ```
@@ -292,9 +377,9 @@
 This creates: `zeroc.ice.uwp.v140\zeroc.ice.uwp.v140.nupkg`,
 `zeroc.ice.uwp.v140.x64\zeroc.ice.uwp.v140.x64.nupkg` and
 `zeroc.ice.uwp.v140.x86\zeroc.ice.uwp.v140.x86.nupkg` for Visual Studio 2015
-builds or `zeroc.ice.uwp.v140\zeroc.ice.uwp.v140.nupkg`,
-`zeroc.ice.uwp.v140.x64\zeroc.ice.uwp.v140.x64.nupkg` and
-`zeroc.ice.uwp.v140.x86\zeroc.ice.uwp.v140.x86.nupkg` for Visual Studio 2017
+builds or `zeroc.ice.uwp.v141\zeroc.ice.uwp.v141.nupkg`,
+`zeroc.ice.uwp.v141.x64\zeroc.ice.uwp.v141.x64.nupkg` and
+`zeroc.ice.uwp.v141.x86\zeroc.ice.uwp.v141.x86.nupkg` for Visual Studio 2017
 builds.
 
 ## Cleaning the source build on macOS or Linux
@@ -335,9 +420,13 @@
  python allTests.py --config=cpp11-shared # cpp11-shared config with the default platform
 ```
 
-* Windows
+* Windows C++11 debug builds
 ```
 python allTests.py --config Cpp11-Debug
+```
+
+* Windows C++11 release builds
+```
 python allTests.py --config Cpp11-Release
 ```
 
@@ -363,18 +452,26 @@
  match the configuration(s) selected when building the test suite).
 
 #### iOS Simulator
+ - C++98 controller
 ```
 python allTests.py --config=xcodesdk --platform=iphonesimulator --controller-app
+```
+ - C++11 controller
+```
 python allTests.py --config=cpp11-xcodesdk --platform=iphonesimulator --controller-app
 ```
 
 #### iOS
  - Start the `C++98 Test Controller` or the `C++11 Test Controller` app on your
  iOS device, from Xcode.
- - On your Mac:
+
+ - Start the C++98 controller on your Mac:
+```
+python allTests.py --config=xcodesdk --platform=iphoneos
+```
+ - Start the C++11 controller on your Mac:
 ```
-python3 allTests.py --config=xcodesdk --platform=iphoneos # C++98 controller
-python3 allTests.py --config=cpp11-xcodesdk --platform=iphoneos # C++11 controller
+python allTests.py --config=cpp11-xcodesdk --platform=iphoneos
 ```
 
 All the test clients and servers run on the iOS device, not on your Mac computer.
@@ -397,8 +494,8 @@
 failure, the tests abort with `failed`.
 
 [1]: https://zeroc.com/distributions/ice
-[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.1
-[3]: http://bzip.org
+[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2
+[3]: https://github.com/zeroc-ice/bzip2
 [4]: https://libexpat.github.io
 [5]: https://symas.com/lightning-memory-mapped-database/
 [6]: https://github.com/zeroc-ice/mcpp
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/Blobject.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/Blobject.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/Blobject.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/Blobject.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/Blobject.h>
 #include <Glacier2/SessionRouterI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/Blobject.h zeroc-ice-3.7.2/cpp/src/Glacier2/Blobject.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/Blobject.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/Blobject.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef BLOBJECT_H
 #define BLOBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/ClientBlobject.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/ClientBlobject.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/ClientBlobject.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/ClientBlobject.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/ClientBlobject.h>
 #include <Glacier2/FilterManager.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/ClientBlobject.h zeroc-ice-3.7.2/cpp/src/Glacier2/ClientBlobject.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/ClientBlobject.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/ClientBlobject.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CLIENT_BLOBJECT_H
 #define CLIENT_BLOBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/FilterI.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/FilterI.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/FilterI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/FilterI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Properties.h>
 #include <Ice/Communicator.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/FilterI.h zeroc-ice-3.7.2/cpp/src/Glacier2/FilterI.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/FilterI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/FilterI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 #ifndef FILTER_I_H
 #define FILTER_I_H
 
@@ -16,6 +11,10 @@
 #include <vector>
 #include <list>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4505) // unreferenced local function has been removed
+#endif
+
 namespace Glacier2
 {
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/FilterManager.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/FilterManager.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/FilterManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/FilterManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/Logger.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/FilterManager.h zeroc-ice-3.7.2/cpp/src/Glacier2/FilterManager.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/FilterManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/FilterManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef FILTER_MANAGER_H
 #define FILTER_MANAGER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/Glacier2Router.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/Glacier2Router.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/Glacier2Router.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/Glacier2Router.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UUID.h>
 #include <IceUtil/Options.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/Instance.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/Instance.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/Instance.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/Instance.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/SessionRouterI.h>
 #include <Glacier2/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/Instance.h zeroc-ice-3.7.2/cpp/src/Glacier2/Instance.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/Instance.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/Instance.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_INSTANCE_H
 #define GLACIER2_INSTANCE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/Instrumentation.ice zeroc-ice-3.7.2/cpp/src/Glacier2/Instrumentation.ice
--- zeroc-ice-3.7.1/cpp/src/Glacier2/Instrumentation.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/Instrumentation.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/InstrumentationI.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/InstrumentationI.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/InstrumentationI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/InstrumentationI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/InstrumentationI.h>
 #include <Ice/InstrumentationI.h>
@@ -109,7 +104,7 @@
 
 struct ForwardedUpdate
 {
-    ForwardedUpdate(bool client) : client(client)
+    ForwardedUpdate(bool clientP) : client(clientP)
     {
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/InstrumentationI.h zeroc-ice-3.7.2/cpp/src/Glacier2/InstrumentationI.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/InstrumentationI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/InstrumentationI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef INSTRUMENTATION_I_H
 #define INSTRUMENTATION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/Makefile.mk zeroc-ice-3.7.2/cpp/src/Glacier2/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/Glacier2/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_programs             := glacier2router
 $(project)_sliceflags           := --include-dir Glacier2
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/ProxyVerifier.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/ProxyVerifier.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/ProxyVerifier.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/ProxyVerifier.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/ProxyVerifier.h>
 #include <Ice/ConsoleUtil.h>
@@ -577,21 +572,21 @@
             }
 
             pos = 0;
-            for(vector<AddressMatcher*>::const_iterator i = _addressRules.begin(); i != _addressRules.end(); ++i)
+            for(vector<AddressMatcher*>::const_iterator j = _addressRules.begin(); j != _addressRules.end(); ++j)
             {
-                if(!(*i)->match(host, pos))
+                if(!(*j)->match(host, pos))
                 {
                     if(_traceLevel >= 3)
                     {
                         Trace out(_communicator->getLogger(), "Glacier2");
-                        out << (*i)->toString() << " failed to match " << host << " at pos=" << pos << "\n";
+                        out << (*j)->toString() << " failed to match " << host << " at pos=" << pos << "\n";
                     }
                     return false;
                 }
                 if(_traceLevel >= 3)
                 {
                     Trace out(_communicator->getLogger(), "Glacier2");
-                    out << (*i)->toString() << " matched " << host << " at pos=" << pos << "\n";
+                    out << (*j)->toString() << " matched " << host << " at pos=" << pos << "\n";
                 }
             }
         }
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/ProxyVerifier.h zeroc-ice-3.7.2/cpp/src/Glacier2/ProxyVerifier.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/ProxyVerifier.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/ProxyVerifier.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROXY_VERIFIER_H
 #define ICE_PROXY_VERIFIER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/RequestQueue.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/RequestQueue.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/RequestQueue.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/RequestQueue.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/RequestQueue.h>
 #include <Glacier2/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/RequestQueue.h zeroc-ice-3.7.2/cpp/src/Glacier2/RequestQueue.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/RequestQueue.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/RequestQueue.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef REQUEST_H
 #define REQUEST_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/RouterI.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/RouterI.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/RouterI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/RouterI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Random.h>
 
@@ -14,6 +9,10 @@
 #include <Glacier2/RouterI.h>
 #include <Glacier2/Session.h>
 
+#ifdef ICE_CPP11_COMPILER
+#   include<random>
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace Glacier2;
@@ -49,6 +48,15 @@
         Identity ident;
         ident.name = "dummy";
         ident.category.resize(20);
+#ifdef ICE_CPP11_COMPILER
+        random_device rd;
+        mt19937 gen(rd());
+        uniform_int_distribution<> dist(33, 126);  // We use ASCII 33-126 (from ! to ~, w/o space).
+        for(unsigned int i = 0; i < ident.category.size(); ++i)
+        {
+            ident.category[i] = static_cast<unsigned char>(dist(gen));
+        }
+#else
         char buf[20];
         IceUtilInternal::generateRandom(buf, sizeof(buf));
         for(unsigned int i = 0; i < sizeof(buf); ++i)
@@ -56,6 +64,7 @@
             const unsigned char c = static_cast<unsigned char>(buf[i]); // A value between 0-255
             ident.category[i] = 33 + c % (127-33); // We use ASCII 33-126 (from ! to ~, w/o space).
         }
+#endif
         serverProxy = _instance->serverObjectAdapter()->createProxy(ident);
 
         ServerBlobjectPtr& serverBlobject = const_cast<ServerBlobjectPtr&>(_serverBlobject);
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/RouterI.h zeroc-ice-3.7.2/cpp/src/Glacier2/RouterI.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/RouterI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/RouterI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_ROUTER_I_H
 #define GLACIER2_ROUTER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/RoutingTable.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/RoutingTable.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/RoutingTable.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/RoutingTable.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/RoutingTable.h>
 #include <Glacier2/Instrumentation.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/RoutingTable.h zeroc-ice-3.7.2/cpp/src/Glacier2/RoutingTable.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/RoutingTable.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/RoutingTable.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ROUTING_TABLE_H
 #define ICE_ROUTING_TABLE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/ServerBlobject.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/ServerBlobject.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/ServerBlobject.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/ServerBlobject.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/ServerBlobject.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/ServerBlobject.h zeroc-ice-3.7.2/cpp/src/Glacier2/ServerBlobject.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/ServerBlobject.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/ServerBlobject.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SERVER_BLOBJECT_H
 #define SERVER_BLOBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/SessionRouterI.cpp zeroc-ice-3.7.2/cpp/src/Glacier2/SessionRouterI.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2/SessionRouterI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/SessionRouterI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/SessionRouterI.h>
 #include <Glacier2/PermissionsVerifier.h>
@@ -453,6 +448,15 @@
     _user(user),
     _current(current)
 {
+    // Clear reserved contexts potentially set by client
+    _context.erase("_con.type");
+    _context.erase("_con.remotePort");
+    _context.erase("_con.remoteAddress");
+    _context.erase("_con.localPort");
+    _context.erase("_con.localAddress");
+    _context.erase("_con.cipher");
+    _context.erase("_con.peerCert");
+
     if(_instance->properties()->getPropertyAsInt("Glacier2.AddConnectionContext") > 0)
     {
         _context["_con.type"] = current.con->type();
@@ -544,11 +548,11 @@
 }
 
 void
-CreateSession::createException(const Ice::Exception& ex)
+CreateSession::createException(const Ice::Exception& sex)
 {
     try
     {
-        ex.ice_throw();
+        sex.ice_throw();
     }
     catch(const CannotCreateSessionException& ex)
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2/SessionRouterI.h zeroc-ice-3.7.2/cpp/src/Glacier2/SessionRouterI.h
--- zeroc-ice-3.7.1/cpp/src/Glacier2/SessionRouterI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2/SessionRouterI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GLACIER2_SESSION_ROUTER_I_H
 #define GLACIER2_SESSION_ROUTER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp zeroc-ice-3.7.2/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/PermissionsVerifier.h>
 #include <IceUtil/IceUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk zeroc-ice-3.7.2/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries                            += Glacier2CryptPermissionsVerifier
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2Lib/Application.cpp zeroc-ice-3.7.2/cpp/src/Glacier2Lib/Application.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2Lib/Application.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2Lib/Application.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/Application.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2Lib/Makefile.mk zeroc-ice-3.7.2/cpp/src/Glacier2Lib/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/Glacier2Lib/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2Lib/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := Glacier2
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp zeroc-ice-3.7.2/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/PermissionsVerifier.h>
 #include <Glacier2/NullPermissionsVerifier.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Glacier2Lib/SessionHelper.cpp zeroc-ice-3.7.2/cpp/src/Glacier2Lib/SessionHelper.cpp
--- zeroc-ice-3.7.1/cpp/src/Glacier2Lib/SessionHelper.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Glacier2Lib/SessionHelper.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Glacier2/SessionHelper.h>
 
@@ -352,7 +347,7 @@
 namespace
 {
 
-class ConnectStrategySecureConnection : public ConnectStrategy
+class ConnectStrategySecureConnection ICE_FINAL : public ConnectStrategy
 {
 
 public:
@@ -373,7 +368,7 @@
     const map<string, string> _context;
 };
 
-class ConnectStrategyUserPassword : public ConnectStrategy
+class ConnectStrategyUserPassword ICE_FINAL : public ConnectStrategy
 {
 
 public:
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Acceptor.cpp zeroc-ice-3.7.2/cpp/src/Ice/Acceptor.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Acceptor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Acceptor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Acceptor.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/AcceptorF.h zeroc-ice-3.7.2/cpp/src/Ice/AcceptorF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/AcceptorF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/AcceptorF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACCEPTOR_F_H
 #define ICE_ACCEPTOR_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Acceptor.h zeroc-ice-3.7.2/cpp/src/Ice/Acceptor.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Acceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Acceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACCEPTOR_H
 #define ICE_ACCEPTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ACM.cpp zeroc-ice-3.7.2/cpp/src/Ice/ACM.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ACM.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ACM.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ACM.h>
 #include <Ice/ConnectionI.h>
@@ -43,41 +38,41 @@
     else
     {
         timeoutProperty = prefix + ".Timeout";
-    };
+    }
 
-    int timeout = p->getPropertyAsIntWithDefault(timeoutProperty, static_cast<int>(dflt.timeout.toSeconds()));
-    if(timeout >= 0)
+    int timeoutVal = p->getPropertyAsIntWithDefault(timeoutProperty, static_cast<int>(dflt.timeout.toSeconds()));
+    if(timeoutVal >= 0)
     {
-        this->timeout = IceUtil::Time::seconds(timeout);
+        timeout = IceUtil::Time::seconds(timeoutVal);
     }
     else
     {
         l->warning("invalid value for property `" + timeoutProperty + "', default value will be used instead");
-        this->timeout = dflt.timeout;
+        timeout = dflt.timeout;
     }
 
     int hb = p->getPropertyAsIntWithDefault(prefix + ".Heartbeat", static_cast<int>(dflt.heartbeat));
     if(hb >= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatOff)) &&
        hb <= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatAlways)))
     {
-        this->heartbeat = static_cast<Ice::ACMHeartbeat>(hb);
+        heartbeat = static_cast<Ice::ACMHeartbeat>(hb);
     }
     else
     {
         l->warning("invalid value for property `" + prefix + ".Heartbeat" + "', default value will be used instead");
-        this->heartbeat = dflt.heartbeat;
+        heartbeat = dflt.heartbeat;
     }
 
     int cl = p->getPropertyAsIntWithDefault(prefix + ".Close", static_cast<int>(dflt.close));
     if(cl >= static_cast<int>(ICE_ENUM(ACMClose, CloseOff)) &&
        cl <= static_cast<int>(ICE_ENUM(ACMClose, CloseOnIdleForceful)))
     {
-        this->close = static_cast<Ice::ACMClose>(cl);
+        close = static_cast<Ice::ACMClose>(cl);
     }
     else
     {
         l->warning("invalid value for property `" + prefix + ".Close" + "', default value will be used instead");
-        this->close = dflt.close;
+        close = dflt.close;
     }
 }
 
@@ -319,8 +314,11 @@
 }
 
 void
-IceInternal::ConnectionACMMonitor::remove(const ConnectionIPtr& connection)
+IceInternal::ConnectionACMMonitor::remove(ICE_MAYBE_UNUSED const ConnectionIPtr& connection)
 {
+#ifdef _MSC_VER
+    UNREFERENCED_PARAMETER(connection);
+#endif
     Lock sync(*this);
     assert(_connection == connection);
     if(_config.timeout != IceUtil::Time())
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ACMF.h zeroc-ice-3.7.2/cpp/src/Ice/ACMF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ACMF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ACMF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACM_F_H
 #define ICE_ACM_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ACM.h zeroc-ice-3.7.2/cpp/src/Ice/ACM.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ACM.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ACM.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ACM_H
 #define ICE_ACM_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Application.cpp zeroc-ice-3.7.2/cpp/src/Ice/Application.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Application.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Application.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Application.h>
 #include <Ice/LoggerI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ArgVector.cpp zeroc-ice-3.7.2/cpp/src/Ice/ArgVector.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ArgVector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ArgVector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ArgVector.h>
 #include <cstring>
 
-IceInternal::ArgVector::ArgVector(int argc, const char* const argv[])
+IceInternal::ArgVector::ArgVector(int argcP, const char* const argvP[])
 {
-    assert(argc >= 0);
-    _args.resize(argc);
-    for(int i = 0; i < argc; ++i)
+    assert(argcP >= 0);
+    _args.resize(argcP);
+    for(int i = 0; i < argcP; ++i)
     {
-        _args[i] = argv[i];
+        _args[i] = argvP[i];
     }
     setupArgcArgv();
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ArgVector.h zeroc-ice-3.7.2/cpp/src/Ice/ArgVector.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ArgVector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ArgVector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ARGVECTOR_H
 #define ICE_ARGVECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/AsyncResult.cpp zeroc-ice-3.7.2/cpp/src/Ice/AsyncResult.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/AsyncResult.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/AsyncResult.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CPP11_MAPPING
 
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/AsyncResult.h>
 #include <Ice/Proxy.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Base64.cpp zeroc-ice-3.7.2/cpp/src/Ice/Base64.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Base64.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Base64.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Base64.h>
 #include <iterator>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Base64.h zeroc-ice-3.7.2/cpp/src/Ice/Base64.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Base64.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Base64.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BASE_64_H
 #define ICE_BASE_64_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/BatchRequestQueue.cpp zeroc-ice-3.7.2/cpp/src/Ice/BatchRequestQueue.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/BatchRequestQueue.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/BatchRequestQueue.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/BatchRequestQueue.h>
 #include <Ice/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/BatchRequestQueue.h zeroc-ice-3.7.2/cpp/src/Ice/BatchRequestQueue.h
--- zeroc-ice-3.7.1/cpp/src/Ice/BatchRequestQueue.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/BatchRequestQueue.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BATCH_REQUEST_QUEUE_H
 #define ICE_BATCH_REQUEST_QUEUE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Buffer.cpp zeroc-ice-3.7.2/cpp/src/Ice/Buffer.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Buffer.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Buffer.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Buffer.h>
 #include <Ice/LocalException.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/CollocatedRequestHandler.cpp zeroc-ice-3.7.2/cpp/src/Ice/CollocatedRequestHandler.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/CollocatedRequestHandler.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/CollocatedRequestHandler.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/CollocatedRequestHandler.h>
 #include <Ice/ObjectAdapterI.h>
 #include <Ice/ThreadPool.h>
@@ -271,7 +265,7 @@
 }
 
 void
-CollocatedRequestHandler::invokeException(Int requestId, const LocalException& ex, int invokeNum, bool amd)
+CollocatedRequestHandler::invokeException(Int requestId, const LocalException& ex, int /*invokeNum*/, bool amd)
 {
     handleException(requestId, ex, amd);
     _adapter->decDirectCount();
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/CollocatedRequestHandler.h zeroc-ice-3.7.2/cpp/src/Ice/CollocatedRequestHandler.h
--- zeroc-ice-3.7.1/cpp/src/Ice/CollocatedRequestHandler.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/CollocatedRequestHandler.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_COLLOCATED_REQUEST_HANDLER_H
 #define ICE_COLLOCATED_REQUEST_HANDLER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/CommunicatorI.cpp zeroc-ice-3.7.2/cpp/src/Ice/CommunicatorI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/CommunicatorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/CommunicatorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/CommunicatorI.h>
 #include <Ice/Instance.h>
 #include <Ice/Properties.h>
@@ -59,7 +53,7 @@
         FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync,
                    const InstancePtr& instance,
                    InvocationObserver& observer) :
-            OutgoingAsyncBase(instance), _outAsync(outAsync), _observer(observer)
+            OutgoingAsyncBase(instance), _outAsync(outAsync), _parentObserver(observer)
         {
         }
 
@@ -83,7 +77,7 @@
         virtual InvocationObserver&
         getObserver()
         {
-            return _observer;
+            return _parentObserver;
         }
 
         virtual bool handleSent(bool, bool)
@@ -119,7 +113,7 @@
     private:
 
         const CommunicatorFlushBatchAsyncPtr _outAsync;
-        InvocationObserver& _observer;
+        InvocationObserver& _parentObserver;
     };
 
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/CommunicatorI.h zeroc-ice-3.7.2/cpp/src/Ice/CommunicatorI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/CommunicatorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/CommunicatorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_COMMUNICATOR_I_H
 #define ICE_COMMUNICATOR_I_H
@@ -47,7 +42,6 @@
     void check(bool);
 
     int _useCount;
-    InvocationObserver _observer;
 };
 
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Cond.cpp zeroc-ice-3.7.2/cpp/src/Ice/Cond.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Cond.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Cond.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Cond.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectionFactory.cpp zeroc-ice-3.7.2/cpp/src/Ice/ConnectionFactory.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectionFactory.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectionFactory.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ConnectionFactory.h>
 #include <Ice/ConnectionI.h>
@@ -53,14 +48,6 @@
 namespace
 {
 
-struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
-{
-    ptrdiff_t operator()(ptrdiff_t d)
-    {
-        return IceUtilInternal::random(static_cast<int>(d));
-    }
-};
-
 #ifdef ICE_CPP11_MAPPING
 template <typename Map> void
 remove(Map& m, const typename Map::key_type& k, const typename Map::mapped_type& v)
@@ -160,6 +147,27 @@
     InstancePtr _instance;
 };
 
+#if TARGET_OS_IPHONE != 0
+class FinishCall : public DispatchWorkItem
+{
+public:
+
+    FinishCall(const IncomingConnectionFactoryPtr& factory) : _factory(factory)
+    {
+    }
+
+    virtual void
+    run()
+    {
+        _factory->finish();
+    }
+
+private:
+
+    const IncomingConnectionFactoryPtr _factory;
+};
+#endif
+
 }
 
 bool
@@ -178,10 +186,16 @@
         return;
     }
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _connections)
+    {
+        p.second->destroy(ConnectionI::CommunicatorDestroyed);
+    }
+#else
     for_each(_connections.begin(), _connections.end(),
              bind2nd(Ice::secondVoidMemFun1<const ConnectorPtr, ConnectionI, ConnectionI::DestructionReason>
                      (&ConnectionI::destroy), ConnectionI::CommunicatorDestroyed));
-
+#endif
     _destroyed = true;
     _communicator = 0;
 
@@ -192,8 +206,15 @@
 IceInternal::OutgoingConnectionFactory::updateConnectionObservers()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _connections)
+    {
+        p.second->updateObserver();
+    }
+#else
     for_each(_connections.begin(), _connections.end(),
              Ice::secondVoidMemFun<const ConnectorPtr, ConnectionI>(&ConnectionI::updateObserver));
+#endif
 }
 
 void
@@ -221,9 +242,15 @@
         connections = _connections;
     }
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _connections)
+    {
+        p.second->waitUntilFinished();
+    }
+#else
     for_each(connections.begin(), connections.end(),
              Ice::secondVoidMemFun<const ConnectorPtr, ConnectionI>(&ConnectionI::waitUntilFinished));
-
+#endif
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
         // Ensure all the connections are finished and reapable at this point.
@@ -436,7 +463,15 @@
     assert(!endpoints.empty());
     for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
     {
+#ifdef ICE_CPP11_MAPPING
+        auto connection = find(_connectionsByEndpoint, *p,
+                               [](const ConnectionIPtr& conn)
+                               {
+                                   return conn->isActiveOrHolding();
+                               });
+#else
         ConnectionIPtr connection = find(_connectionsByEndpoint, *p, Ice::constMemFun(&ConnectionI::isActiveOrHolding));
+#endif
         if(connection)
         {
             if(defaultsAndOverrides->overrideCompress)
@@ -466,7 +501,15 @@
             continue;
         }
 
+#ifdef ICE_CPP11_MAPPING
+        auto connection = find(_connections, p->connector,
+                               [](const ConnectionIPtr& conn)
+                               {
+                                   return conn->isActiveOrHolding();
+                               });
+#else
         ConnectionIPtr connection = find(_connections, p->connector, Ice::constMemFun(&ConnectionI::isActiveOrHolding));
+#endif
         if(connection)
         {
             if(defaultsAndOverrides->overrideCompress)
@@ -1193,7 +1236,14 @@
 IceInternal::IncomingConnectionFactory::updateConnectionObservers()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& conn : _connections)
+    {
+        conn->updateObserver();
+    }
+#else
     for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::updateObserver));
+#endif
 }
 
 void
@@ -1223,7 +1273,14 @@
     //
     // Now we wait until each connection is in holding state.
     //
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& conn : connections)
+    {
+        conn->waitUntilHolding();
+    }
+#else
     for_each(connections.begin(), connections.end(), Ice::constVoidMemFun(&ConnectionI::waitUntilHolding));
+#endif
 }
 
 void
@@ -1253,7 +1310,14 @@
         connections = _connections;
     }
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& conn : connections)
+    {
+        conn->waitUntilFinished();
+    }
+#else
     for_each(connections.begin(), connections.end(), Ice::voidMemFun(&ConnectionI::waitUntilFinished));
+#endif
 
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
@@ -1311,9 +1375,16 @@
     //
     // Only copy connections which have not been destroyed.
     //
+#ifdef ICE_CPP11_COMPILER
+    remove_copy_if(_connections.begin(), _connections.end(), back_inserter(result),
+                   [](const ConnectionIPtr& conn)
+                   {
+                       return !conn->isActiveOrHolding();
+                   });
+#else
     remove_copy_if(_connections.begin(), _connections.end(), back_inserter(result),
                    not1(Ice::constMemFun(&ConnectionI::isActiveOrHolding)));
-
+#endif
     return result;
 }
 
@@ -1376,9 +1447,13 @@
 
         Error out(_instance->initializationData().logger);
         out << "couldn't accept connection:\n" << ex << '\n' << _acceptor->toString();
-        if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
+        if(_acceptorStarted)
         {
-            closeAcceptor();
+            _acceptorStarted = false;
+            if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
+            {
+                closeAcceptor();
+            }
         }
     }
     return _state < StateClosed;
@@ -1447,6 +1522,8 @@
                 Error out(_instance->initializationData().logger);
                 out << "can't accept more connections:\n" << ex << '\n' << _acceptor->toString();
 
+                assert(_acceptorStarted);
+                _acceptorStarted = false;
                 if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
                 {
                     closeAcceptor();
@@ -1507,27 +1584,45 @@
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     if(_state < StateClosed)
     {
-        if(_acceptorStarted && close)
+        if(close)
         {
             closeAcceptor();
         }
+
+        //
+        // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
+        // because of an unexpected error), try to restart the acceptor in 1 second.
+        //
+        if(!_acceptorStopped)
+        {
+            _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS, _instance),
+                                         IceUtil::Time::seconds(1));
+        }
         return;
     }
 
-    assert(_state == StateClosed);
+    assert(_state >= StateClosed);
     setState(StateFinished);
 
-    if(_acceptorStarted && close)
+    if(close)
     {
         closeAcceptor();
     }
 
 #if TARGET_OS_IPHONE != 0
     sync.release();
-    unregisterForBackgroundNotification(ICE_SHARED_FROM_THIS);
+    finish();
 #endif
 }
 
+#if TARGET_OS_IPHONE != 0
+void
+IceInternal::IncomingConnectionFactory::finish()
+{
+    unregisterForBackgroundNotification(ICE_SHARED_FROM_THIS);
+}
+#endif
+
 string
 IceInternal::IncomingConnectionFactory::toString() const
 {
@@ -1580,7 +1675,7 @@
 
 void
 IceInternal::IncomingConnectionFactory::connectionStartFailed(const Ice::ConnectionIPtr& /*connection*/,
-                                                              const Ice::LocalException& ex)
+                                                              const Ice::LocalException&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     if(_state >= StateClosed)
@@ -1637,7 +1732,7 @@
     }
 
     _acceptorStopped = true;
-
+    _acceptorStarted = false;
     if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
     {
         closeAcceptor();
@@ -1737,7 +1832,14 @@
                 }
                 _adapter->getThreadPool()->_register(ICE_SHARED_FROM_THIS, SocketOperationRead);
             }
+#ifdef ICE_CPP11_COMPILER
+            for(const auto& conn : _connections)
+            {
+                conn->activate();
+            }
+#else
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::activate));
+#endif
             break;
         }
 
@@ -1756,7 +1858,14 @@
                 }
                 _adapter->getThreadPool()->unregister(ICE_SHARED_FROM_THIS, SocketOperationRead);
             }
+#ifdef ICE_CPP11_COMPILER
+            for(const auto& conn : _connections)
+            {
+                conn->hold();
+            }
+#else
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::hold));
+#endif
             break;
         }
 
@@ -1771,6 +1880,7 @@
                 // the finish() call. Not all selector implementations do support this
                 // however.
                 //
+                _acceptorStarted = false;
                 if(_adapter->getThreadPool()->finish(ICE_SHARED_FROM_THIS, true))
                 {
                     closeAcceptor();
@@ -1778,11 +1888,21 @@
             }
             else
             {
+#if TARGET_OS_IPHONE != 0
+                _adapter->getThreadPool()->dispatch(new FinishCall(ICE_SHARED_FROM_THIS));
+#endif
                 state = StateFinished;
             }
 
+#ifdef ICE_CPP11_COMPILER
+            for(const auto& conn : _connections)
+            {
+                conn->destroy(ConnectionI::ObjectAdapterDeactivated);
+            }
+#else
             for_each(_connections.begin(), _connections.end(),
                      bind2nd(Ice::voidMemFun1(&ConnectionI::destroy), ConnectionI::ObjectAdapterDeactivated));
+#endif
             break;
         }
 
@@ -1847,16 +1967,6 @@
         out << "stopping to accept " << _endpoint->protocol() << " connections at " << _acceptor->toString();
     }
 
-    _acceptorStarted = false;
+    assert(!_acceptorStarted);
     _acceptor->close();
-
-    //
-    // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
-    // because of an unexpected error), try to restart the acceptor in 1 second.
-    //
-    if(!_acceptorStopped && (_state == StateHolding || _state == StateActive))
-    {
-        _instance->timer()->schedule(ICE_MAKE_SHARED(StartAcceptor, ICE_SHARED_FROM_THIS, _instance),
-                                     IceUtil::Time::seconds(1));
-    }
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectionFactoryF.h zeroc-ice-3.7.2/cpp/src/Ice/ConnectionFactoryF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectionFactoryF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectionFactoryF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_FACTORY_F_H
 #define ICE_CONNECTION_FACTORY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectionFactory.h zeroc-ice-3.7.2/cpp/src/Ice/ConnectionFactory.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectionFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectionFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_FACTORY_H
 #define ICE_CONNECTION_FACTORY_H
@@ -205,6 +200,9 @@
 
     virtual void message(ThreadPoolCurrent&);
     virtual void finished(ThreadPoolCurrent&, bool);
+#if TARGET_OS_IPHONE != 0
+    void finish();
+#endif
     virtual std::string toString() const;
     virtual NativeInfoPtr getNativeInfo();
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectionI.cpp zeroc-ice-3.7.2/cpp/src/Ice/ConnectionI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectionI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectionI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/ConnectionI.h>
@@ -1680,8 +1675,8 @@
 
                     Byte messageType;
                     _readStream.read(messageType);
-                    Byte compress;
-                    _readStream.read(compress);
+                    Byte compressByte;
+                    _readStream.read(compressByte);
                     Int size;
                     _readStream.read(size);
                     if(size < headerSize)
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectionI.h zeroc-ice-3.7.2/cpp/src/Ice/ConnectionI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_I_H
 #define ICE_CONNECTION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectionRequestHandler.cpp zeroc-ice-3.7.2/cpp/src/Ice/ConnectionRequestHandler.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectionRequestHandler.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectionRequestHandler.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ConnectionRequestHandler.h>
 #include <Ice/Proxy.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectionRequestHandler.h zeroc-ice-3.7.2/cpp/src/Ice/ConnectionRequestHandler.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectionRequestHandler.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectionRequestHandler.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTION_REQUEST_HANDLER_H
 #define ICE_CONNECTION_REQUEST_HANDLER_H
@@ -17,7 +12,7 @@
 namespace IceInternal
 {
 
-class ConnectionRequestHandler : public RequestHandler
+class ConnectionRequestHandler ICE_FINAL : public RequestHandler
 #ifdef ICE_CPP11_MAPPING
                                , public std::enable_shared_from_this<ConnectionRequestHandler>
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Connector.cpp zeroc-ice-3.7.2/cpp/src/Ice/Connector.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Connector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Connector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Connector.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectorF.h zeroc-ice-3.7.2/cpp/src/Ice/ConnectorF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectorF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectorF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTOR_F_H
 #define ICE_CONNECTOR_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Connector.h zeroc-ice-3.7.2/cpp/src/Ice/Connector.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Connector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Connector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECTOR_H
 #define ICE_CONNECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectRequestHandler.cpp zeroc-ice-3.7.2/cpp/src/Ice/ConnectRequestHandler.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectRequestHandler.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectRequestHandler.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ConnectRequestHandler.h>
 #include <Ice/ConnectionRequestHandler.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectRequestHandlerF.h zeroc-ice-3.7.2/cpp/src/Ice/ConnectRequestHandlerF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectRequestHandlerF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectRequestHandlerF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECT_REQUEST_HANDLER_F_H
 #define ICE_CONNECT_REQUEST_HANDLER_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ConnectRequestHandler.h zeroc-ice-3.7.2/cpp/src/Ice/ConnectRequestHandler.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ConnectRequestHandler.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ConnectRequestHandler.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_CONNECT_REQUEST_HANDLER_H
 #define ICE_CONNECT_REQUEST_HANDLER_H
@@ -26,10 +21,10 @@
 namespace IceInternal
 {
 
-class ConnectRequestHandler : public RequestHandler,
-                              public Reference::GetConnectionCallback,
-                              public RouterInfo::AddProxyCallback,
-                              public IceUtil::Monitor<IceUtil::Mutex>
+class ConnectRequestHandler ICE_FINAL : public RequestHandler,
+                                        public Reference::GetConnectionCallback,
+                                        public RouterInfo::AddProxyCallback,
+                                        public IceUtil::Monitor<IceUtil::Mutex>
 #ifdef ICE_CPP11_MAPPING
                             , public std::enable_shared_from_this<ConnectRequestHandler>
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/CountDownLatch.cpp zeroc-ice-3.7.2/cpp/src/Ice/CountDownLatch.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/CountDownLatch.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/CountDownLatch.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/CountDownLatch.h>
 #include <IceUtil/ThreadException.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/DefaultsAndOverrides.cpp zeroc-ice-3.7.2/cpp/src/Ice/DefaultsAndOverrides.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/DefaultsAndOverrides.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/DefaultsAndOverrides.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Properties.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/DefaultsAndOverridesF.h zeroc-ice-3.7.2/cpp/src/Ice/DefaultsAndOverridesF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/DefaultsAndOverridesF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/DefaultsAndOverridesF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
 #define ICE_DEFAULTS_AND_OVERRIDES_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/DefaultsAndOverrides.h zeroc-ice-3.7.2/cpp/src/Ice/DefaultsAndOverrides.h
--- zeroc-ice-3.7.1/cpp/src/Ice/DefaultsAndOverrides.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/DefaultsAndOverrides.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DEFAULTS_AND_OVERRIDES_H
 #define ICE_DEFAULTS_AND_OVERRIDES_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/DispatchInterceptor.cpp zeroc-ice-3.7.2/cpp/src/Ice/DispatchInterceptor.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/DispatchInterceptor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/DispatchInterceptor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/DispatchInterceptor.h>
 #include <Ice/IncomingRequest.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/DLLMain.cpp zeroc-ice-3.7.2/cpp/src/Ice/DLLMain.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/DLLMain.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/DLLMain.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ImplicitContextI.h>
 #include <Ice/Service.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/DynamicLibrary.cpp zeroc-ice-3.7.2/cpp/src/Ice/DynamicLibrary.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/DynamicLibrary.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/DynamicLibrary.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/DynamicLibrary.h>
 #include <IceUtil/StringUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactory.cpp zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactory.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactory.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactory.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/EndpointFactory.h>
 #include <Ice/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryF.h zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ENDPOINT_FACTORY_F_H
 #define ICE_ENDPOINT_FACTORY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactory.h zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactory.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ENDPOINT_FACTORY_H
 #define ICE_ENDPOINT_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryManager.cpp zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryManager.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/EndpointFactoryManager.h>
 #include <Ice/Endpoint.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryManagerF.h zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryManagerF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryManagerF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryManagerF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H
 #define ICE_ENDPOINT_FACTORY_MANAGER_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryManager.h zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryManager.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointFactoryManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointFactoryManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ENDPOINT_FACTORY_MANAGER_H
 #define ICE_ENDPOINT_FACTORY_MANAGER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointI.cpp zeroc-ice-3.7.2/cpp/src/Ice/EndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/EndpointI.h>
 #include <Ice/OutputStream.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointIF.h zeroc-ice-3.7.2/cpp/src/Ice/EndpointIF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointIF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointIF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ENDPOINT_I_F_H
 #define ICE_ENDPOINT_I_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EndpointI.h zeroc-ice-3.7.2/cpp/src/Ice/EndpointI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ENDPOINT_I_H
 #define ICE_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EventHandler.cpp zeroc-ice-3.7.2/cpp/src/Ice/EventHandler.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/EventHandler.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EventHandler.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/EventHandler.h>
 #include <Ice/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EventHandlerF.h zeroc-ice-3.7.2/cpp/src/Ice/EventHandlerF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EventHandlerF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EventHandlerF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_EVENT_HANDLER_F_H
 #define ICE_EVENT_HANDLER_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EventHandler.h zeroc-ice-3.7.2/cpp/src/Ice/EventHandler.h
--- zeroc-ice-3.7.1/cpp/src/Ice/EventHandler.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EventHandler.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_EVENT_HANDLER_H
 #define ICE_EVENT_HANDLER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/EventLoggerMsg.mc zeroc-ice-3.7.2/cpp/src/Ice/EventLoggerMsg.mc
--- zeroc-ice-3.7.1/cpp/src/Ice/EventLoggerMsg.mc	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/EventLoggerMsg.mc	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-; // **********************************************************************
 ; //
-; // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+; // Copyright (c) ZeroC, Inc. All rights reserved.
 ; //
-; // This copy of Ice is licensed to you under the terms described in the
-; // ICE_LICENSE file included in this distribution.
-; //
-; // **********************************************************************
 
 MessageId=0x0
 SymbolicName=EVENT_LOGGER_MSG
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Exception.cpp zeroc-ice-3.7.2/cpp/src/Ice/Exception.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Exception.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Exception.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Exception.h>
 #include <Ice/LocalException.h>
@@ -82,8 +77,8 @@
 
     string type = v->ice_id();
     throw Ice::UnexpectedObjectException(__FILE__, __LINE__,
-                                         "expected element of type `" + expectedType + "' but received '" +
-                                         type, type, expectedType);
+                                         "expected element of type `" + expectedType + "' but received `" +
+                                         type + "'", type, expectedType);
 }
 
 void
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/FactoryTable.cpp zeroc-ice-3.7.2/cpp/src/Ice/FactoryTable.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/FactoryTable.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/FactoryTable.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/FactoryTable.h>
 #include <Ice/ValueFactory.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/FactoryTableInit.cpp zeroc-ice-3.7.2/cpp/src/Ice/FactoryTableInit.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/FactoryTableInit.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/FactoryTableInit.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/FactoryTableInit.h>
 #include <Ice/UserExceptionFactory.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/GCObject.cpp zeroc-ice-3.7.2/cpp/src/Ice/GCObject.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/GCObject.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/GCObject.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/GCObject.h>
 
@@ -118,7 +113,7 @@
 }
 
 bool
-ClearMembers::visit(GCObject* obj)
+ClearMembers::visit(GCObject*)
 {
     return true;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/HashUtil.h zeroc-ice-3.7.2/cpp/src/Ice/HashUtil.h
--- zeroc-ice-3.7.1/cpp/src/Ice/HashUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/HashUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_HASH_UTIL_H
 #define ICE_HASH_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/HttpParser.cpp zeroc-ice-3.7.2/cpp/src/Ice/HttpParser.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/HttpParser.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/HttpParser.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Config.h>
 #include <Ice/HttpParser.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/HttpParser.h zeroc-ice-3.7.2/cpp/src/Ice/HttpParser.h
--- zeroc-ice-3.7.1/cpp/src/Ice/HttpParser.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/HttpParser.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_HTTP_PARSER_H
 #define ICE_HTTP_PARSER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/IconvStringConverter.cpp zeroc-ice-3.7.2/cpp/src/Ice/IconvStringConverter.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/IconvStringConverter.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/IconvStringConverter.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/IconvStringConverter.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ImplicitContextI.cpp zeroc-ice-3.7.2/cpp/src/Ice/ImplicitContextI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ImplicitContextI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ImplicitContextI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ImplicitContextI.h>
 #include <Ice/OutputStream.h>
@@ -126,7 +121,6 @@
         throw Ice::InitializationException(
             __FILE__, __LINE__,
             "'" + kind + "' is not a valid value for Ice.ImplicitContext");
-        return 0; // Keep the compiler happy.
     }
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ImplicitContextI.h zeroc-ice-3.7.2/cpp/src/Ice/ImplicitContextI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ImplicitContextI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ImplicitContextI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_IMPLICIT_CONTEXT_I_H
 #define ICE_IMPLICIT_CONTEXT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/IncomingAsync.cpp zeroc-ice-3.7.2/cpp/src/Ice/IncomingAsync.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/IncomingAsync.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/IncomingAsync.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/IncomingAsync.h>
 #include <Ice/ServantLocator.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Incoming.cpp zeroc-ice-3.7.2/cpp/src/Ice/Incoming.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Incoming.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Incoming.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Incoming.h>
 #include <Ice/IncomingAsync.h>
@@ -67,6 +62,7 @@
 }
 
 IceInternal::IncomingBase::IncomingBase(IncomingBase& other) :
+    IceUtil::noncopyable(), // TODO, remove noncopyable base class
     _current(other._current),
     _servant(other._servant),
     _locator(other._locator),
@@ -389,7 +385,7 @@
             _responseHandler->sendNoResponse();
         }
     }
-    else if(const UserException* ex = dynamic_cast<const UserException*>(&exc))
+    else if(const UserException* uex = dynamic_cast<const UserException*>(&exc))
     {
         _observer.userException();
 
@@ -402,7 +398,7 @@
             _os.write(_current.requestId);
             _os.write(replyUserException);
             _os.startEncapsulation(_current.encoding, _format);
-            _os.write(*ex);
+            _os.write(*uex);
             _os.endEncapsulation();
             _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4));
             _responseHandler->sendResponse(_current.requestId, &_os, _compress, amd);
@@ -454,11 +450,11 @@
                 }
                 _os.write(str.str(), false);
             }
-            else if(const UserException* ue = dynamic_cast<const UserException*>(&exc))
+            else if(const UserException* use = dynamic_cast<const UserException*>(&exc))
             {
                 _os.write(replyUnknownUserException);
                 ostringstream str;
-                str << *ue;
+                str << *use;
                 if(IceUtilInternal::printStackTraces)
                 {
                     str <<  '\n' << ex->ice_stackTrace();
@@ -659,11 +655,11 @@
     if(obsv)
     {
         // Read the parameter encapsulation size.
-        Ice::Int sz;
-        _is->read(sz);
+        Ice::Int encapsSize;
+        _is->read(encapsSize);
         _is->i -= 4;
 
-        _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + sz)));
+        _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + encapsSize)));
     }
 
     //
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/IncomingRequest.h zeroc-ice-3.7.2/cpp/src/Ice/IncomingRequest.h
--- zeroc-ice-3.7.1/cpp/src/Ice/IncomingRequest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/IncomingRequest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INCOMING_REQUEST_H
 #define ICE_INCOMING_REQUEST_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Initialize.cpp zeroc-ice-3.7.2/cpp/src/Ice/Initialize.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Initialize.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Initialize.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ArgVector.h>
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/CommunicatorI.h>
 #include <Ice/PropertiesI.h>
 #include <Ice/Initialize.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/InputStream.cpp zeroc-ice-3.7.2/cpp/src/Ice/InputStream.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/InputStream.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/InputStream.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/InputStream.h>
@@ -224,22 +219,22 @@
 
 #ifndef ICE_CPP11_MAPPING
 void
-Ice::InputStream::setCollectObjects(bool b)
+Ice::InputStream::setCollectObjects(bool on)
 {
-    _collectObjects = b;
+    _collectObjects = on;
 }
 #endif
 
 void
-Ice::InputStream::setSliceValues(bool b)
+Ice::InputStream::setSliceValues(bool on)
 {
-    _sliceValues = b;
+    _sliceValues = on;
 }
 
 void
-Ice::InputStream::setTraceSlicing(bool b)
+Ice::InputStream::setTraceSlicing(bool on)
 {
-    _traceSlicing = b;
+    _traceSlicing = on;
 }
 
 void
@@ -988,16 +983,6 @@
     *dest = *src;
 #else
     Byte* dest = reinterpret_cast<Byte*>(&v);
-#  if defined(ICE_LITTLEBYTE_BIGWORD)
-    dest[4] = *src++;
-    dest[5] = *src++;
-    dest[6] = *src++;
-    dest[7] = *src++;
-    dest[0] = *src++;
-    dest[1] = *src++;
-    dest[2] = *src++;
-    dest[3] = *src;
-#  else
     *dest++ = *src++;
     *dest++ = *src++;
     *dest++ = *src++;
@@ -1006,7 +991,6 @@
     *dest++ = *src++;
     *dest++ = *src++;
     *dest = *src;
-#  endif
 #endif
 }
 
@@ -1034,21 +1018,6 @@
             *dest-- = *src++;
             dest += 2 * sizeof(Double);
         }
-#elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]);
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
 #else
         copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
 #endif
@@ -1104,22 +1073,6 @@
             *dest-- = *src++;
             dest += 2 * sizeof(Double);
         }
-#  elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]);
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
-
 #  else
         copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
 #  endif
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Instance.cpp zeroc-ice-3.7.2/cpp/src/Ice/Instance.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Instance.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Instance.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Instance.h>
 #include <Ice/TraceLevels.h>
@@ -58,6 +53,7 @@
 
 #ifndef _WIN32
 #   include <Ice/SysLoggerI.h>
+#   include <Ice/SystemdJournalI.h>
 
 #   include <signal.h>
 #   include <syslog.h>
@@ -1100,6 +1096,13 @@
                                                    _initData.properties->getProperty("Ice.ProgramName"),
                                                    _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER"));
             }
+#   ifdef ICE_USE_SYSTEMD
+            else if(_initData.properties->getPropertyAsInt("Ice.UseSystemdJournal") > 0)
+            {
+                _initData.logger = ICE_MAKE_SHARED(SystemdJournalI,
+                                                   _initData.properties->getProperty("Ice.ProgramName"));
+            }
+#   endif
             else
 #endif
             if(!logfile.empty())
@@ -1453,6 +1456,18 @@
     try
     {
         _endpointHostResolver = new EndpointHostResolver(this);
+#ifndef ICE_OS_UWP
+        bool hasPriority = _initData.properties->getProperty("Ice.ThreadPriority") != "";
+        int priority = _initData.properties->getPropertyAsInt("Ice.ThreadPriority");
+        if(hasPriority)
+        {
+            _endpointHostResolver->start(0, priority);
+        }
+        else
+        {
+            _endpointHostResolver->start();
+        }
+#endif
     }
     catch(const IceUtil::Exception& ex)
     {
@@ -1652,8 +1667,15 @@
     }
 #endif
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _objectFactoryMap)
+    {
+        p.second->destroy();
+    }
+#else
     for_each(_objectFactoryMap.begin(), _objectFactoryMap.end(),
         Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
+#endif
     _objectFactoryMap.clear();
 
     if(_routerManager)
@@ -1826,9 +1848,9 @@
     // with the value factory manager. This may raise AlreadyRegisteredException.
     //
 #ifdef ICE_CPP11_MAPPING
-    _initData.valueFactoryManager->add([factory](const string& id)
+    _initData.valueFactoryManager->add([factory](const string& ident)
                                        {
-                                           return factory->create(id);
+                                           return factory->create(ident);
                                        },
                                        id);
 #else
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Instance.h zeroc-ice-3.7.2/cpp/src/Ice/Instance.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Instance.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Instance.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INSTANCE_H
 #define ICE_INSTANCE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/InstrumentationI.cpp zeroc-ice-3.7.2/cpp/src/Ice/InstrumentationI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/InstrumentationI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/InstrumentationI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/InstrumentationI.h>
 
@@ -52,7 +47,7 @@
 
 struct ThreadStateChanged
 {
-    ThreadStateChanged(ThreadState oldState, ThreadState newState) : oldState(oldState), newState(newState)
+    ThreadStateChanged(ThreadState oldStateP, ThreadState newStateP) : oldState(oldStateP), newState(newStateP)
     {
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/InstrumentationI.h zeroc-ice-3.7.2/cpp/src/Ice/InstrumentationI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/InstrumentationI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/InstrumentationI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_INSTRUMENTATION_I_H
 #define ICE_INSTRUMENTATION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/Notifications.mm zeroc-ice-3.7.2/cpp/src/Ice/ios/Notifications.mm
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/Notifications.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/Notifications.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamAcceptor.cpp zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamAcceptor.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamAcceptor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamAcceptor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "StreamTransceiver.h"
 #include "StreamEndpointI.h"
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamAcceptor.h zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamAcceptor.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamAcceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamAcceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STREAM_ACCEPTOR_H
 #define ICE_STREAM_ACCEPTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamConnector.cpp zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamConnector.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamConnector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamConnector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "StreamTransceiver.h"
 #include "StreamEndpointI.h"
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamConnector.h zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamConnector.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamConnector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamConnector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STREAM_CONNECTOR_H
 #define ICE_STREAM_CONNECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamEndpointI.cpp zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamEndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamEndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamEndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "StreamEndpointI.h"
 #include "StreamAcceptor.h"
@@ -94,7 +89,7 @@
 IceObjC::Instance::setupStreams(CFReadStreamRef readStream,
                                 CFWriteStreamRef writeStream,
                                 bool server,
-                                const string& host) const
+                                const string& /*host*/) const
 {
     if(_voip)
     {
@@ -126,7 +121,7 @@
 IceObjC::StreamEndpointI::StreamEndpointI(const InstancePtr& instance, const string& ho, Int po,
                                           const Address& sourceAddr, Int ti, const string& conId, bool co) :
     IceInternal::IPEndpointI(instance, ho, po, sourceAddr, conId),
-    _instance(instance),
+    _streamInstance(instance),
     _timeout(ti),
     _compress(co)
 {
@@ -134,7 +129,7 @@
 
 IceObjC::StreamEndpointI::StreamEndpointI(const InstancePtr& instance) :
     IceInternal::IPEndpointI(instance),
-    _instance(instance),
+    _streamInstance(instance),
     _timeout(instance->defaultTimeout()),
     _compress(false)
 {
@@ -142,7 +137,7 @@
 
 IceObjC::StreamEndpointI::StreamEndpointI(const InstancePtr& instance, Ice::InputStream* s) :
     IPEndpointI(instance, s),
-    _instance(instance),
+    _streamInstance(instance),
     _timeout(-1),
     _compress(false)
 {
@@ -175,7 +170,7 @@
     }
     else
     {
-        return ICE_MAKE_SHARED(StreamEndpointI, _instance, _host, _port, _sourceAddr, t, _connectionId, _compress);
+        return ICE_MAKE_SHARED(StreamEndpointI, _streamInstance, _host, _port, _sourceAddr, t, _connectionId, _compress);
     }
 }
 
@@ -194,7 +189,7 @@
     }
     else
     {
-        return ICE_MAKE_SHARED(StreamEndpointI, _instance, _host, _port, _sourceAddr, _timeout, _connectionId, c);
+        return ICE_MAKE_SHARED(StreamEndpointI, _streamInstance, _host, _port, _sourceAddr, _timeout, _connectionId, c);
     }
 }
 
@@ -207,14 +202,15 @@
 bool
 IceObjC::StreamEndpointI::secure() const
 {
-    return _instance->secure();
+    return _streamInstance->secure();
 }
 
 void
-IceObjC::StreamEndpointI::connectors_async(Ice::EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const
+IceObjC::StreamEndpointI::connectors_async(Ice::EndpointSelectionType /*selType*/,
+                                           const EndpointI_connectorsPtr& cb) const
 {
     vector<ConnectorPtr> connectors;
-    connectors.push_back(new StreamConnector(_instance, _host, _port, _timeout, _connectionId));
+    connectors.push_back(new StreamConnector(_streamInstance, _host, _port, _timeout, _connectionId));
     cb->connectors(connectors);
 }
 
@@ -227,7 +223,7 @@
 AcceptorPtr
 IceObjC::StreamEndpointI::acceptor(const string&) const
 {
-    return new StreamAcceptor(ICE_SHARED_FROM_CONST_THIS(StreamEndpointI), _instance, _host, _port);
+    return new StreamAcceptor(ICE_SHARED_FROM_CONST_THIS(StreamEndpointI), _streamInstance, _host, _port);
 }
 
 IceObjC::StreamEndpointIPtr
@@ -240,7 +236,8 @@
     }
     else
     {
-        return ICE_MAKE_SHARED(StreamEndpointI, _instance, _host, port, _sourceAddr, _timeout, _connectionId, _compress);
+        return ICE_MAKE_SHARED(StreamEndpointI, _streamInstance, _host, port, _sourceAddr, _timeout, _connectionId,
+                               _compress);
     }
 }
 
@@ -424,7 +421,7 @@
 }
 
 ConnectorPtr
-IceObjC::StreamEndpointI::createConnector(const Address& address, const NetworkProxyPtr& proxy) const
+IceObjC::StreamEndpointI::createConnector(const Address& /*address*/, const NetworkProxyPtr& /*proxy*/) const
 {
     assert(false);
     return 0;
@@ -433,7 +430,8 @@
 IPEndpointIPtr
 IceObjC::StreamEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
-    return ICE_MAKE_SHARED(StreamEndpointI, _instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
+    return ICE_MAKE_SHARED(StreamEndpointI, _streamInstance, host, port, _sourceAddr, _timeout, connectionId,
+                           _compress);
 }
 
 IceObjC::StreamEndpointFactory::StreamEndpointFactory(const InstancePtr& instance) : _instance(instance)
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamEndpointI.h zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamEndpointI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamEndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamEndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STREAM_ENDPOINT_I_H
 #define ICE_STREAM_ENDPOINT_I_H
@@ -121,7 +116,7 @@
 
 private:
 
-    const InstancePtr _instance;
+    const InstancePtr _streamInstance;
 
     //
     // All members are const, because endpoints are immutable.
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamTransceiver.cpp zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamTransceiver.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamTransceiver.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamTransceiver.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "StreamTransceiver.h"
 #include "StreamEndpointI.h"
@@ -227,7 +222,7 @@
 }
 
 SocketOperation
-IceObjC::StreamTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
+IceObjC::StreamTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeBuffer*/)
 {
     IceUtil::Mutex::Lock sync(_mutex);
     if(_state == StateNeedConnect)
@@ -344,7 +339,7 @@
 
         buf.i += ret;
 
-        if(packetSize > buf.b.end() - buf.i)
+        if(packetSize > static_cast<size_t>(buf.b.end() - buf.i))
         {
             packetSize = buf.b.end() - buf.i;
         }
@@ -389,7 +384,7 @@
 
         buf.i += ret;
 
-        if(packetSize > buf.b.end() - buf.i)
+        if(packetSize > static_cast<size_t>(buf.b.end() - buf.i))
         {
             packetSize = buf.b.end() - buf.i;
         }
@@ -427,7 +422,7 @@
 }
 
 void
-IceObjC::StreamTransceiver::checkSendSize(const Buffer& buf)
+IceObjC::StreamTransceiver::checkSendSize(const Buffer& /*buf*/)
 {
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamTransceiver.h zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamTransceiver.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ios/StreamTransceiver.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ios/StreamTransceiver.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STREAM_TRANSCEIVER_H
 #define ICE_STREAM_TRANSCEIVER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/IPEndpointI.cpp zeroc-ice-3.7.2/cpp/src/Ice/IPEndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/IPEndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/IPEndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/IPEndpointI.h>
 #include <Ice/ProtocolInstance.h>
@@ -538,30 +533,7 @@
     _preferIPv6(instance->preferIPv6()),
     _destroyed(false)
 {
-    __setNoDelete(true);
-    try
-    {
-        updateObserver();
-        bool hasPriority = _instance->initializationData().properties->getProperty("Ice.ThreadPriority") != "";
-        int priority = _instance->initializationData().properties->getPropertyAsInt("Ice.ThreadPriority");
-        if(hasPriority)
-        {
-            start(0, priority);
-        }
-        else
-        {
-            start();
-        }
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        {
-            Ice::Error out(_instance->initializationData().logger);
-            out << "cannot create thread for enpoint host resolver:\n" << ex;
-        }
-        throw;
-    }
-    __setNoDelete(false);
+    updateObserver();
 }
 
 void
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/IPEndpointIF.h zeroc-ice-3.7.2/cpp/src/Ice/IPEndpointIF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/IPEndpointIF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/IPEndpointIF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_IP_ENDPOINT_I_F_H
 #define ICE_IP_ENDPOINT_I_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/IPEndpointI.h zeroc-ice-3.7.2/cpp/src/Ice/IPEndpointI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/IPEndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/IPEndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_IP_ENDPOINT_I_H
 #define ICE_IP_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LocalObject.cpp zeroc-ice-3.7.2/cpp/src/Ice/LocalObject.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/LocalObject.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LocalObject.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/LocalObject.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LocatorInfo.cpp zeroc-ice-3.7.2/cpp/src/Ice/LocatorInfo.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/LocatorInfo.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LocatorInfo.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/LocatorInfo.h>
@@ -48,7 +43,7 @@
 #ifdef ICE_CPP11_MAPPING
             LocatorInfo::RequestPtr request = this;
             _locatorInfo->getLocator()->findObjectByIdAsync(
-                _ref->getIdentity(),
+                _reference->getIdentity(),
                 [request](const ObjectPrxPtr& object)
                 {
                     request->response(object);
@@ -66,7 +61,7 @@
                 });
 #else
             _locatorInfo->getLocator()->begin_findObjectById(
-                _ref->getIdentity(),
+                _reference->getIdentity(),
                 newCallback_Locator_findObjectById(static_cast<LocatorInfo::Request*>(this),
                                                    &LocatorInfo::Request::response,
                                                    &LocatorInfo::Request::exception));
@@ -94,7 +89,7 @@
         {
 #ifdef ICE_CPP11_MAPPING
             LocatorInfo::RequestPtr request = this;
-            _locatorInfo->getLocator()->findAdapterByIdAsync(_ref->getAdapterId(),
+            _locatorInfo->getLocator()->findAdapterByIdAsync(_reference->getAdapterId(),
                 [request](const shared_ptr<Ice::ObjectPrx>& object)
                 {
                     request->response(object);
@@ -112,7 +107,7 @@
                 });
 #else
             _locatorInfo->getLocator()->begin_findAdapterById(
-                _ref->getAdapterId(),
+                _reference->getAdapterId(),
                 newCallback_Locator_findAdapterById(static_cast<LocatorInfo::Request*>(this),
                                                     &LocatorInfo::Request::response,
                                                     &LocatorInfo::Request::exception));
@@ -352,7 +347,7 @@
     if(proxy)
     {
         ReferencePtr r = proxy->_getReference();
-        if(_ref->isWellKnown() && !isSupported(_ref->getEncoding(), r->getEncoding()))
+        if(_reference->isWellKnown() && !isSupported(_reference->getEncoding(), r->getEncoding()))
         {
             //
             // If a well-known proxy and the returned proxy encoding
@@ -364,26 +359,26 @@
         {
             endpoints = r->getEndpoints();
         }
-        else if(_ref->isWellKnown() && !r->isWellKnown())
+        else if(_reference->isWellKnown() && !r->isWellKnown())
         {
             //
             // We're resolving the endpoints of a well-known object and the proxy returned
             // by the locator is an indirect proxy. We now need to resolve the endpoints
             // of this indirect proxy.
             //
-            if(_ref->getInstance()->traceLevels()->location >= 1)
+            if(_reference->getInstance()->traceLevels()->location >= 1)
             {
                 locatorInfo->trace("retrieved adapter for well-known object from locator, adding to locator cache",
-                                   _ref, r);
+                                   _reference, r);
             }
-            locatorInfo->getEndpoints(r, _ref, _ttl, _callback);
+            locatorInfo->getEndpoints(r, _reference, _ttl, _callback);
             return;
         }
     }
 
-    if(_ref->getInstance()->traceLevels()->location >= 1)
+    if(_reference->getInstance()->traceLevels()->location >= 1)
     {
-        locatorInfo->getEndpointsTrace(_ref, endpoints, false);
+        locatorInfo->getEndpointsTrace(_reference, endpoints, false);
     }
     if(_callback)
     {
@@ -396,7 +391,7 @@
 {
     try
     {
-        locatorInfo->getEndpointsException(_ref, exc); // This throws.
+        locatorInfo->getEndpointsException(_reference, exc); // This throws.
     }
     catch(const Ice::LocalException& ex)
     {
@@ -410,7 +405,7 @@
 IceInternal::LocatorInfo::RequestCallback::RequestCallback(const ReferencePtr& ref,
                                                            int ttl,
                                                            const GetEndpointsCallbackPtr& cb) :
-    _ref(ref),  _ttl(ttl), _callback(cb)
+    _reference(ref),  _ttl(ttl), _callback(cb)
 {
 }
 
@@ -452,7 +447,7 @@
 }
 
 IceInternal::LocatorInfo::Request::Request(const LocatorInfoPtr& locatorInfo, const ReferencePtr& ref) :
-    _locatorInfo(locatorInfo), _ref(ref), _sent(false), _response(false)
+    _locatorInfo(locatorInfo), _reference(ref), _sent(false), _response(false)
 {
 }
 
@@ -461,7 +456,7 @@
 {
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-        _locatorInfo->finishRequest(_ref, _wellKnownRefs, proxy, false);
+        _locatorInfo->finishRequest(_reference, _wellKnownRefs, proxy, false);
         _response = true;
         _proxy = proxy;
         _monitor.notifyAll();
@@ -477,7 +472,7 @@
 {
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-        _locatorInfo->finishRequest(_ref, _wellKnownRefs, 0, dynamic_cast<const Ice::UserException*>(&ex));
+        _locatorInfo->finishRequest(_reference, _wellKnownRefs, 0, dynamic_cast<const Ice::UserException*>(&ex));
 
         ICE_SET_EXCEPTION_FROM_CLONE(_exception, ex.ice_clone());
         _monitor.notifyAll();
@@ -778,8 +773,16 @@
 
     const char* sep = endpoints.size() > 1 ? ":" : "";
     ostringstream o;
+#ifdef ICE_CPP11_MAPPING
+    transform(endpoints.begin(), endpoints.end(), ostream_iterator<string>(o, sep),
+              [](const EndpointPtr& endpoint)
+              {
+                  return endpoint->toString();
+              });
+#else
     transform(endpoints.begin(), endpoints.end(), ostream_iterator<string>(o, sep),
               Ice::constMemFun(&Endpoint::toString));
+#endif
     out << "endpoints = " << o.str();
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LocatorInfoF.h zeroc-ice-3.7.2/cpp/src/Ice/LocatorInfoF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/LocatorInfoF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LocatorInfoF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_LOCATOR_INFO_F_H
 #define ICE_LOCATOR_INFO_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LocatorInfo.h zeroc-ice-3.7.2/cpp/src/Ice/LocatorInfo.h
--- zeroc-ice-3.7.1/cpp/src/Ice/LocatorInfo.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LocatorInfo.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_LOCATOR_INFO_H
 #define ICE_LOCATOR_INFO_H
@@ -106,7 +101,7 @@
 
     private:
 
-        const ReferencePtr _ref;
+        const ReferencePtr _reference;
         const int _ttl;
         const GetEndpointsCallbackPtr _callback;
     };
@@ -128,7 +123,7 @@
         virtual void send() = 0;
 
         const LocatorInfoPtr _locatorInfo;
-        const ReferencePtr _ref;
+        const ReferencePtr _reference;
 
     private:
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LoggerAdminI.cpp zeroc-ice-3.7.2/cpp/src/Ice/LoggerAdminI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/LoggerAdminI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LoggerAdminI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/LoggerAdminI.h>
 #include <Ice/Initialize.h>
@@ -434,9 +429,9 @@
                 {
                     rethrow_exception(e);
                 }
-                catch(const Ice::LocalException& e)
+                catch(const Ice::LocalException& le)
                 {
-                    self->deadRemoteLogger(remoteLogger, logger, e, "init");
+                    self->deadRemoteLogger(remoteLogger, logger, le, "init");
                 }
             });
     }
@@ -539,7 +534,7 @@
 
     //
     // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to
-    // remote logggers
+    // remote loggers
     //
     if(sendLogCommunicator)
     {
@@ -618,16 +613,16 @@
         //
         // Queue updated, now find which remote loggers want this message
         //
-        for(RemoteLoggerMap::const_iterator p = _remoteLoggerMap.begin(); p != _remoteLoggerMap.end(); ++p)
+        for(RemoteLoggerMap::const_iterator q = _remoteLoggerMap.begin(); q != _remoteLoggerMap.end(); ++q)
         {
-            const Filters& filters = p->second;
+            const Filters& filters = q->second;
 
             if(filters.messageTypes.empty() || filters.messageTypes.count(logMessage.type) != 0)
             {
                 if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) || filters.traceCategories.empty() ||
                    filters.traceCategories.count(logMessage.traceCategory) != 0)
                 {
-                    remoteLoggers.push_back(p->first);
+                    remoteLoggers.push_back(q->first);
                 }
             }
         }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LoggerAdminI.h zeroc-ice-3.7.2/cpp/src/Ice/LoggerAdminI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/LoggerAdminI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LoggerAdminI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_LOGGER_ADMIN_I_H
 #define ICE_LOGGER_ADMIN_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LoggerI.cpp zeroc-ice-3.7.2/cpp/src/Ice/LoggerI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/LoggerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LoggerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Time.h>
 #include <Ice/LoggerI.h>
@@ -176,22 +171,22 @@
                 string date = IceUtil::Time::now().toString("%Y%m%d-%H%M%S");
                 while(true)
                 {
-                    ostringstream s;
-                    s << basename << "-" << date;
+                    ostringstream oss;
+                    oss << basename << "-" << date;
                     if(id > 0)
                     {
-                        s << "-" << id;
+                        oss << "-" << id;
                     }
                     if(!ext.empty())
                     {
-                        s << "." << ext;
+                        oss << "." << ext;
                     }
-                    if(IceUtilInternal::fileExists(s.str()))
+                    if(IceUtilInternal::fileExists(oss.str()))
                     {
                         id++;
                         continue;
                     }
-                    archive = s.str();
+                    archive = oss.str();
                     break;
                 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LoggerI.h zeroc-ice-3.7.2/cpp/src/Ice/LoggerI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/LoggerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LoggerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_LOGGER_I_H
 #define ICE_LOGGER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/LoggerUtil.cpp zeroc-ice-3.7.2/cpp/src/Ice/LoggerUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/LoggerUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/LoggerUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/LoggerUtil.h>
 #include <Ice/Logger.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Makefile.mk zeroc-ice-3.7.2/cpp/src/Ice/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/Ice/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    = Ice
 
@@ -26,6 +21,12 @@
 Ice_excludes            += src/IceUtil/ConvertUTF.cpp src/IceUtil/Unicode.cpp
 endif
 
+ifeq ($(os),Linux)
+ifeq ($(shell pkg-config --exists libsystemd 2> /dev/null && echo yes),yes)
+Ice_cppflags                            += -DICE_USE_SYSTEMD $(shell pkg-config --cflags libsystemd)
+endif
+endif
+
 Ice[iphoneos]_excludes                  := $(wildcard $(addprefix $(currentdir)/,Tcp*.cpp))
 Ice[iphoneos]_extra_sources             := $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm))
 Ice[iphonesimulator]_excludes           = $(Ice[iphoneos]_excludes)
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/MetricsAdminI.cpp zeroc-ice-3.7.2/cpp/src/Ice/MetricsAdminI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/MetricsAdminI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/MetricsAdminI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/MetricsAdminI.h>
 
@@ -203,6 +198,11 @@
 }
 
 MetricsMapI::MetricsMapI(const MetricsMapI& map) :
+#if defined(ICE_CPP11_MAPPING)
+    std::enable_shared_from_this<MetricsMapI>(),
+#elif defined(__GNUC__)
+    IceUtil::Shared(),
+#endif
     _properties(map._properties),
     _groupByAttributes(map._groupByAttributes),
     _groupBySeparators(map._groupBySeparators),
@@ -451,11 +451,11 @@
                 q = views.insert(make_pair(viewName, q->second)).first;
             }
 
-            for(map<string, MetricsMapFactoryPtr>::const_iterator p = _factories.begin(); p != _factories.end(); ++p)
+            for(map<string, MetricsMapFactoryPtr>::const_iterator r = _factories.begin(); r != _factories.end(); ++r)
             {
-                if(q->second->addOrUpdateMap(_properties, p->first, p->second, _logger))
+                if(q->second->addOrUpdateMap(_properties, r->first, r->second, _logger))
                 {
-                    updatedMaps.insert(p->second);
+                    updatedMaps.insert(r->second);
                 }
             }
         }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/MetricsObserverI.cpp zeroc-ice-3.7.2/cpp/src/Ice/MetricsObserverI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/MetricsObserverI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/MetricsObserverI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/MetricsObserverI.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Network.cpp zeroc-ice-3.7.2/cpp/src/Ice/Network.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Network.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Network.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // The following is required on HP-UX in order to bring in
@@ -30,6 +25,11 @@
 #include <IceUtil/Random.h>
 #include <functional>
 
+// TODO: fix this warning
+#if defined(_MSC_VER)
+#   pragma warning(disable:4244) // 'argument': conversion from 'int' to 'u_short', possible loss of data
+#endif
+
 #if defined(ICE_OS_UWP)
 #   include <IceUtil/InputUtil.h>
 #elif defined(_WIN32)
@@ -52,6 +52,10 @@
 #  include <sys/sockio.h>
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ < 5)
+#  pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
 #if defined(_WIN32)
 #   ifndef SIO_LOOPBACK_FAST_PATH
 #       define SIO_LOOPBACK_FAST_PATH _WSAIOW(IOC_VENDOR,16)
@@ -116,6 +120,9 @@
 };
 
 #ifndef ICE_OS_UWP
+
+#   ifndef ICE_CPP11_COMPILER
+
 struct AddressIsIPv6 : public unary_function<Address, bool>
 {
 public:
@@ -126,26 +133,36 @@
         return ss.saStorage.ss_family == AF_INET6;
     }
 };
-
-struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
-{
-    ptrdiff_t operator()(ptrdiff_t d)
-    {
-        return IceUtilInternal::random(static_cast<int>(d));
-    }
-};
+#   endif
 
 void
 sortAddresses(vector<Address>& addrs, ProtocolSupport protocol, Ice::EndpointSelectionType selType, bool preferIPv6)
 {
     if(selType == Ice::ICE_ENUM(EndpointSelectionType, Random))
     {
-        RandomNumberGenerator rng;
-        random_shuffle(addrs.begin(), addrs.end(), rng);
+        IceUtilInternal::shuffle(addrs.begin(), addrs.end());
     }
 
     if(protocol == EnableBoth)
     {
+#ifdef ICE_CPP11_COMPILER
+        if(preferIPv6)
+        {
+            stable_partition(addrs.begin(), addrs.end(),
+                             [](const Address& ss)
+                             {
+                                 return ss.saStorage.ss_family == AF_INET6;
+                             });
+        }
+        else
+        {
+            stable_partition(addrs.begin(), addrs.end(),
+                             [](const Address& ss)
+                             {
+                                 return ss.saStorage.ss_family != AF_INET6;
+                             });
+        }
+#else
         if(preferIPv6)
         {
             stable_partition(addrs.begin(), addrs.end(), AddressIsIPv6());
@@ -154,6 +171,7 @@
         {
             stable_partition(addrs.begin(), addrs.end(), not1(AddressIsIPv6()));
         }
+#endif
     }
 }
 
@@ -206,8 +224,6 @@
 SOCKET
 createSocketImpl(bool udp, int)
 {
-    SOCKET fd;
-
     if(udp)
     {
         return ref new DatagramSocket();
@@ -219,8 +235,6 @@
         socket->Control->NoDelay = true;
         return socket;
     }
-
-    return fd;
 }
 #else
 SOCKET
@@ -891,6 +905,7 @@
     if(checkIfErrorOrCompleted(op, action, action->Status, connect))
     {
         asyncInfo->count = 0;
+        asyncInfo->error = ERROR_SUCCESS;
     }
     else
     {
@@ -898,7 +913,7 @@
             [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
             {
                 //
-                // COMPILERFIX with VC141 using operator!= and operator== inside
+                // COMPILERFIX with v141 using operator!= and operator== inside
                 // a lambda callback triggers a compiler bug, we move the code to
                 // a seperate private method to workaround the issue.
                 //
@@ -914,13 +929,13 @@
 {
     if(status != Windows::Foundation::AsyncStatus::Completed)
     {
-        asyncInfo->count = SOCKET_ERROR;
         asyncInfo->error = info->ErrorCode.Value;
     }
     else
     {
-        asyncInfo->count = 0;
+        asyncInfo->error = ERROR_SUCCESS;
     }
+    asyncInfo->count = 0;
     completed(op);
 }
 
@@ -939,6 +954,7 @@
         // the AsyncInfo structure after calling the completed callback.
         //
         info->count = static_cast<int>(operation->GetResults());
+        info->error = ERROR_SUCCESS;
         _completedHandler(op);
         return;
     }
@@ -950,7 +966,7 @@
                 [=] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
                 {
                     //
-                    // COMPILERFIX with VC141 using operator!= and operator== inside
+                    // COMPILERFIX with v141 using operator!= and operator== inside
                     // a lambda callback triggers a compiler bug, we move the code to
                     // a seperate private method to workaround the issue.
                     //
@@ -969,12 +985,13 @@
 {
     if(status != Windows::Foundation::AsyncStatus::Completed)
     {
-        info->count = SOCKET_ERROR;
+        info->count = 0;
         info->error = operation->ErrorCode.Value;
     }
     else
     {
         info->count = static_cast<int>(operation->GetResults());
+        info->error = ERROR_SUCCESS;
     }
     completed(op);
 }
@@ -1142,7 +1159,7 @@
     struct addrinfo* info = 0;
     int retry = 5;
 
-    struct addrinfo hints = { 0 };
+    struct addrinfo hints = {};
     if(protocol == EnableIPv4)
     {
         hints.ai_family = PF_INET;
@@ -1713,7 +1730,7 @@
 }
 
 vector<string>
-IceInternal::getInterfacesForMulticast(const string& intf, ProtocolSupport protocolSupport)
+IceInternal::getInterfacesForMulticast(const string& intf, ProtocolSupport)
 {
     vector<string> interfaces;
     if(intf.empty() || intf == "0.0.0.0" || intf == "::" || intf == "0:0:0:0:0:0:0:0")
@@ -1839,7 +1856,7 @@
         return -1;
     }
 #else
-    IceUtil::Int64 port;
+    IceUtil::Int64 port = 0;
     //
     // Don't need to use any string converter here as the port number use just ASCII characters.
     //
@@ -3017,7 +3034,7 @@
     // failure to connect. The socket isn't closed by this method.
     //
 
-    if(static_cast<int>(info.count) == SOCKET_ERROR)
+    if(info.error != ERROR_SUCCESS)
     {
         WSASetLastError(info.error);
         if(connectionRefused())
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/NetworkF.h zeroc-ice-3.7.2/cpp/src/Ice/NetworkF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/NetworkF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/NetworkF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_NETWORK_F_H
 #define ICE_NETWORK_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Network.h zeroc-ice-3.7.2/cpp/src/Ice/Network.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Network.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Network.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_NETWORK_H
 #define ICE_NETWORK_H
@@ -164,7 +159,7 @@
     WSABUF buf;
     DWORD flags;
     DWORD count;
-    int error;
+    DWORD error;
 };
 #elif defined(ICE_OS_UWP)
 struct ICE_API AsyncInfo
@@ -336,7 +331,7 @@
 //
 // UWP impose some restriction on operations that block when run from
 // STA thread and throws concurrency::invalid_operation. We cannot
-// directly call task::get or task::way, this helper method is used to
+// directly call task::get or task::wait, this helper method is used to
 // workaround this limitation.
 //
 template<typename T>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/NetworkProxy.cpp zeroc-ice-3.7.2/cpp/src/Ice/NetworkProxy.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/NetworkProxy.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/NetworkProxy.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/NetworkProxy.h>
 #include <Ice/HttpParser.h>
@@ -81,7 +76,6 @@
 SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port)
 {
     assert(!host.empty());
-    memset(&_address, 0, sizeof(_address));
 }
 
 SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr)
@@ -194,7 +188,6 @@
     _host(host), _port(port), _protocol(EnableBoth)
 {
     assert(!host.empty());
-    memset(&_address, 0, sizeof(_address));
 }
 
 HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol) :
@@ -305,6 +298,7 @@
     if(!proxyHost.empty())
     {
 #ifdef ICE_OS_UWP
+        UNREFERENCED_PARAMETER(protocolSupport);
         throw Ice::InitializationException(__FILE__, __LINE__, "SOCKS proxy not supported with UWP");
 #else
         if(protocolSupport == EnableIPv6)
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/NetworkProxyF.h zeroc-ice-3.7.2/cpp/src/Ice/NetworkProxyF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/NetworkProxyF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/NetworkProxyF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_NETWORK_PROXY_F_H
 #define ICE_NETWORK_PROXY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/NetworkProxy.h zeroc-ice-3.7.2/cpp/src/Ice/NetworkProxy.h
--- zeroc-ice-3.7.1/cpp/src/Ice/NetworkProxy.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/NetworkProxy.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_NETWORK_PROXY_H
 #define ICE_NETWORK_PROXY_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterFactory.cpp zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterFactory.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterFactory.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterFactory.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/ObjectAdapterI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterFactoryF.h zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterFactoryF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterFactoryF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterFactoryF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
 #define ICE_OBJECT_ADAPTER_FACTORY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterFactory.h zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterFactory.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OBJECT_ADAPTER_FACTORY_H
 #define ICE_OBJECT_ADAPTER_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterI.cpp zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UUID.h>
 #include <Ice/ObjectAdapterI.h>
@@ -1422,8 +1417,16 @@
         {
             EndpointSeq endpts = proxy ? proxy->ice_getEndpoints() : EndpointSeq();
             ostringstream o;
+#ifdef ICE_CPP11_COMPILER
+            transform(endpts.begin(), endpts.end(), ostream_iterator<string>(o, endpts.size() > 1 ? ":" : ""),
+                      [](const EndpointPtr& endpoint)
+                      {
+                          return endpoint->toString();
+                      });
+#else
             transform(endpts.begin(), endpts.end(), ostream_iterator<string>(o, endpts.size() > 1 ? ":" : ""),
                       Ice::constMemFun(&Endpoint::toString));
+#endif
             out << o.str();
         }
     }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterI.h zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ObjectAdapterI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ObjectAdapterI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_OBJECT_ADAPTER_I_H
 #define ICE_OBJECT_ADAPTER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Object.cpp zeroc-ice-3.7.2/cpp/src/Ice/Object.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Object.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Object.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Object.h>
 #include <Ice/Incoming.h>
@@ -118,7 +113,6 @@
 Ice::Object::ice_clone() const
 {
     throw CloneNotImplementedException(__FILE__, __LINE__);
-    return 0; // avoid warning with some compilers
 }
 
 Ice::SlicedDataPtr
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ObserverHelper.cpp zeroc-ice-3.7.2/cpp/src/Ice/ObserverHelper.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ObserverHelper.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ObserverHelper.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ObserverHelper.h>
 #include <Ice/Reference.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/OpaqueEndpointI.cpp zeroc-ice-3.7.2/cpp/src/Ice/OpaqueEndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/OpaqueEndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/OpaqueEndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/OpaqueEndpointI.h>
 #include <Ice/OutputStream.h>
@@ -57,7 +52,7 @@
 {
 public:
 
-    OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq& rawByes);
+    OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq& rawBytes);
 
     virtual Ice::Short
     type() const ICE_NOEXCEPT
@@ -86,9 +81,9 @@
 //
 // COMPILERFIX: inlining this constructor causes crashes with gcc 4.0.1.
 //
-OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding,
-                                         const Ice::ByteSeq& rawBytes) :
-    Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false, rawEncoding, rawBytes),
+OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncodingP,
+                                         const Ice::ByteSeq& rawBytesP) :
+    Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false, rawEncodingP, rawBytesP),
     _type(type)
 {
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/OpaqueEndpointI.h zeroc-ice-3.7.2/cpp/src/Ice/OpaqueEndpointI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/OpaqueEndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/OpaqueEndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UNKNOWN_ENDPOINT_I_H
 #define ICE_UNKNOWN_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/OutgoingAsync.cpp zeroc-ice-3.7.2/cpp/src/Ice/OutgoingAsync.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/OutgoingAsync.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/OutgoingAsync.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/OutgoingAsync.h>
 #include <Ice/ConnectionI.h>
@@ -643,7 +638,7 @@
 }
 
 void
-ProxyOutgoingAsyncBase::retryException(const Exception& ex)
+ProxyOutgoingAsyncBase::retryException(const Exception&)
 {
     try
     {
@@ -907,7 +902,7 @@
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
     //
-    // COMPILERFIX VC90 and VC100 get confused with namespaces and we need to
+    // COMPILERFIX v90 and v100 get confused with namespaces and we need to
     // defined both Ice::noExplicitContext and IceProxy::Ice::noExplicitContext
     // see comments in Ice/Proxy.h.
     //
@@ -1036,6 +1031,7 @@
                 ex->facet = facet;
                 ex->operation = operation;
                 ex->ice_throw();
+                break;
             }
 
             case replyUnknownException:
@@ -1075,6 +1071,7 @@
 
                 ex->unknown = unknown;
                 ex->ice_throw();
+                break;
             }
 
             default:
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/OutputStream.cpp zeroc-ice-3.7.2/cpp/src/Ice/OutputStream.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/OutputStream.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/OutputStream.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/OutputStream.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Instance.h>
@@ -509,16 +503,6 @@
     *dest = *src;
 #else
     const Byte* src = reinterpret_cast<const Byte*>(&v);
-#  if defined(ICE_LITTLEBYTE_BIGWORD)
-    dest[4] = *src++;
-    dest[5] = *src++;
-    dest[6] = *src++;
-    dest[7] = *src++;
-    dest[0] = *src++;
-    dest[1] = *src++;
-    dest[2] = *src++;
-    dest[3] = *src;
-#  else
     *dest++ = *src++;
     *dest++ = *src++;
     *dest++ = *src++;
@@ -527,7 +511,6 @@
     *dest++ = *src++;
     *dest++ = *src++;
     *dest = *src;
-#  endif
 #endif
 }
 
@@ -555,21 +538,6 @@
             *dest++ = *src--;
             src += 2 * sizeof(Double);
         }
-#elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = reinterpret_cast<const Byte*>(begin);
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
 #else
         memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double));
 #endif
@@ -689,9 +657,9 @@
     writeSize(sz);
     if(sz > 0)
     {
-        for(int i = 0; i < sz; ++i)
+        for(int j = 0; j < sz; ++j)
         {
-            write(begin[i], convert);
+            write(begin[j], convert);
         }
     }
 }
@@ -784,9 +752,9 @@
     writeSize(sz);
     if(sz > 0)
     {
-        for(int i = 0; i < sz; ++i)
+        for(int j = 0; j < sz; ++j)
         {
-            write(begin[i]);
+            write(begin[j]);
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PluginManagerI.cpp zeroc-ice-3.7.2/cpp/src/Ice/PluginManagerI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/PluginManagerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PluginManagerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <Ice/PluginManagerI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PluginManagerI.h zeroc-ice-3.7.2/cpp/src/Ice/PluginManagerI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/PluginManagerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PluginManagerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PLUGIN_MANAGER_I_H
 #define ICE_PLUGIN_MANAGER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PropertiesAdminI.cpp zeroc-ice-3.7.2/cpp/src/Ice/PropertiesAdminI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/PropertiesAdminI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PropertiesAdminI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/PropertiesAdminI.h>
 #include <Ice/Instance.h>
@@ -198,7 +193,7 @@
         for(const auto& cb : callbacks)
 #else
         vector<PropertiesAdminUpdateCallbackPtr> callbacks = _updateCallbacks;
-        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator p = callbacks.begin(); p != callbacks.end(); ++p)
+        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator q = callbacks.begin(); q != callbacks.end(); ++q)
 #endif
         {
             try
@@ -206,7 +201,7 @@
 #ifdef ICE_CPP11_MAPPING
                 cb(changes);
 #else
-                (*p)->updated(changes);
+                (*q)->updated(changes);
 #endif
             }
             catch(const std::exception& ex)
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PropertiesAdminI.h zeroc-ice-3.7.2/cpp/src/Ice/PropertiesAdminI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/PropertiesAdminI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PropertiesAdminI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROPERTIES_ADMIN_I_H
 #define ICE_PROPERTIES_ADMIN_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PropertiesI.cpp zeroc-ice-3.7.2/cpp/src/Ice/PropertiesI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/PropertiesI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PropertiesI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/PropertiesI.h>
 #include <IceUtil/StringUtil.h>
@@ -298,15 +293,16 @@
     StringConverterPtr stringConverter = getProcessStringConverter();
 
 //
-// Metro style applications cannot access Windows registry.
+// UWP applications cannot access Windows registry.
 //
 #if defined (_WIN32) && !defined(ICE_OS_UWP)
-    if(file.find("HKLM\\") == 0)
+    if(file.find("HKCU\\") == 0 || file.find("HKLM\\") == 0)
     {
+        HKEY key = file.find("HKCU\\") == 0 ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
         HKEY iceKey;
-        const wstring keyName = stringToWstring(file, stringConverter).substr(5).c_str();
+        const wstring keyName = stringToWstring(file, stringConverter).substr(file.find("\\") + 1).c_str();
         LONG err;
-        if((err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.c_str(), 0, KEY_QUERY_VALUE, &iceKey)) != ERROR_SUCCESS)
+        if((err = RegOpenKeyExW(key, keyName.c_str(), 0, KEY_QUERY_VALUE, &iceKey)) != ERROR_SUCCESS)
         {
             throw InitializationException(__FILE__, __LINE__, "could not open Windows registry key `" + file + "':\n" +
                                           IceUtilInternal::errorToString(err));
@@ -317,12 +313,12 @@
         DWORD numValues;
         try
         {
-            err = RegQueryInfoKey(iceKey, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, &numValues, &maxNameSize, &maxDataSize,
-                                  ICE_NULLPTR, ICE_NULLPTR);
+            err = RegQueryInfoKey(iceKey, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR,
+                                  &numValues, &maxNameSize, &maxDataSize, ICE_NULLPTR, ICE_NULLPTR);
             if(err != ERROR_SUCCESS)
             {
-                throw InitializationException(__FILE__, __LINE__, "could not open Windows registry key `" + file + "':\n" +
-                                              IceUtilInternal::errorToString(err));
+                throw InitializationException(__FILE__, __LINE__, "could not open Windows registry key `" + file +
+                                              "':\n" + IceUtilInternal::errorToString(err));
             }
 
             for(DWORD i = 0; i < numValues; ++i)
@@ -414,9 +410,9 @@
             {
                 const unsigned char UTF8_BOM[3] = {0xEF, 0xBB, 0xBF};
                 if(line.size() >= 3 &&
-                   static_cast<const unsigned char>(line[0]) == UTF8_BOM[0] &&
-                   static_cast<const unsigned char>(line[1]) == UTF8_BOM[1] &&
-                   static_cast<const unsigned char>(line[2]) == UTF8_BOM[2])
+                   static_cast<unsigned char>(line[0]) == UTF8_BOM[0] &&
+                   static_cast<unsigned char>(line[1]) == UTF8_BOM[1] &&
+                   static_cast<unsigned char>(line[2]) == UTF8_BOM[2])
                 {
                     line = line.substr(3);
                 }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PropertiesI.h zeroc-ice-3.7.2/cpp/src/Ice/PropertiesI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/PropertiesI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PropertiesI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROPERTIES_I_H
 #define ICE_PROPERTIES_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PropertyNames.cpp zeroc-ice-3.7.2/cpp/src/Ice/PropertyNames.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/PropertyNames.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PropertyNames.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 14 10:24:07 2018
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -181,6 +176,7 @@
     IceInternal::Property("Ice.TCP.SndSize", false, 0),
     IceInternal::Property("Ice.UseApplicationClassLoader", false, 0),
     IceInternal::Property("Ice.UseSyslog", false, 0),
+    IceInternal::Property("Ice.UseSystemdJournal", false, 0),
     IceInternal::Property("Ice.Warn.AMICallback", false, 0),
     IceInternal::Property("Ice.Warn.Connections", false, 0),
     IceInternal::Property("Ice.Warn.Datagrams", false, 0),
@@ -190,7 +186,7 @@
     IceInternal::Property("Ice.Warn.UnusedProperties", false, 0),
     IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
     IceInternal::Property("Ice.ThreadInterruptSafe", false, 0),
-    IceInternal::Property("Ice.Voip", false, 0),
+    IceInternal::Property("Ice.Voip", true, 0),
 };
 
 const IceInternal::PropertyArray
@@ -529,6 +525,43 @@
     IceInternal::Property("IceGridAdmin.Host", false, 0),
     IceInternal::Property("IceGridAdmin.Port", false, 0),
     IceInternal::Property("IceGridAdmin.InstanceName", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Timeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Heartbeat", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Close", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.AdapterId", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Endpoints", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.PreferSecure", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.InvocationTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.CollocationOptimized", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Context.*", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.EndpointSelection", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.ConnectionCached", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.PreferSecure", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.InvocationTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.CollocationOptimized", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.Context.*", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ProxyOptions", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadIdleTime", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.MessageSizeMax", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Address", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Interface", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Lookup", false, 0),
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/PropertyNames.h zeroc-ice-3.7.2/cpp/src/Ice/PropertyNames.h
--- zeroc-ice-3.7.1/cpp/src/Ice/PropertyNames.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/PropertyNames.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 14 10:24:07 2018
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Protocol.cpp zeroc-ice-3.7.2/cpp/src/Ice/Protocol.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Protocol.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Protocol.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Protocol.h>
 #include <Ice/LocalException.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProtocolInstance.cpp zeroc-ice-3.7.2/cpp/src/Ice/ProtocolInstance.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ProtocolInstance.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProtocolInstance.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ProtocolInstance.h>
 #include <Ice/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProtocolInstanceF.h zeroc-ice-3.7.2/cpp/src/Ice/ProtocolInstanceF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ProtocolInstanceF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProtocolInstanceF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROTOCOL_INSTANCE_F_H
 #define ICE_PROTOCOL_INSTANCE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProtocolInstance.h zeroc-ice-3.7.2/cpp/src/Ice/ProtocolInstance.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ProtocolInstance.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProtocolInstance.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROTOCOL_INSTANCE_H
 #define ICE_PROTOCOL_INSTANCE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProtocolPluginFacade.cpp zeroc-ice-3.7.2/cpp/src/Ice/ProtocolPluginFacade.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ProtocolPluginFacade.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProtocolPluginFacade.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ProtocolPluginFacade.h>
 #include <Ice/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProtocolPluginFacadeF.h zeroc-ice-3.7.2/cpp/src/Ice/ProtocolPluginFacadeF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ProtocolPluginFacadeF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProtocolPluginFacadeF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
 #define ICE_PROTOCOL_PLUGIN_FACADE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProtocolPluginFacade.h zeroc-ice-3.7.2/cpp/src/Ice/ProtocolPluginFacade.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ProtocolPluginFacade.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProtocolPluginFacade.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
 #define ICE_PROTOCOL_PLUGIN_FACADE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Proxy.cpp zeroc-ice-3.7.2/cpp/src/Ice/Proxy.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Proxy.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Proxy.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Proxy.h>
 #include <Ice/ProxyFactory.h>
@@ -38,7 +33,7 @@
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
 //
-// COMPILERFIX VC90 and VC100 get confused with namespaces and complains that
+// COMPILERFIX v90 and v100 get confused with namespaces and complains that
 // ::Ice::noExplicitContext isn't defined in IceProxy namespace.
 //
 namespace IceProxy
@@ -483,7 +478,7 @@
                                               const Context& ctx,
                                               const ::IceInternal::CallbackBasePtr& del,
                                               const ::Ice::LocalObjectPtr& cookie,
-                                              bool sync)
+                                              bool /*sync*/)
 {
     pair<const Byte*, const Byte*> inPair;
     if(inEncaps.empty())
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProxyFactory.cpp zeroc-ice-3.7.2/cpp/src/Ice/ProxyFactory.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ProxyFactory.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProxyFactory.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Thread.h>
 #include <IceUtil/Time.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ProxyFactory.h zeroc-ice-3.7.2/cpp/src/Ice/ProxyFactory.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ProxyFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ProxyFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PROXY_FACTORY_H
 #define ICE_PROXY_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Reference.cpp zeroc-ice-3.7.2/cpp/src/Ice/Reference.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Reference.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Reference.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Reference.h>
 #include <Ice/ReferenceFactory.h>
@@ -65,14 +60,6 @@
 
 Init init;
 
-struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
-{
-    ptrdiff_t operator()(ptrdiff_t d)
-    {
-        return IceUtilInternal::random(static_cast<int>(d));
-    }
-};
-
 }
 
 CommunicatorPtr
@@ -507,6 +494,7 @@
     return false;
 }
 
+#ifndef ICE_CPP11_COMPILER
 class ConnectionIsDatagram : public unary_function<ConnectionIPtr, bool>
 {
 public:
@@ -528,6 +516,7 @@
         return p->endpoint()->secure();
     }
 };
+#endif
 
 IceInternal::Reference::Reference(const InstancePtr& instance,
                                   const CommunicatorPtr& communicator,
@@ -556,6 +545,7 @@
 }
 
 IceInternal::Reference::Reference(const Reference& r) :
+    IceUtil::Shared(),
     _hashInitialized(false),
     _instance(r._instance),
     _communicator(r._communicator),
@@ -677,77 +667,66 @@
 IceInternal::FixedReference::changeEndpoints(const vector<EndpointIPtr>& /*newEndpoints*/) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeAdapterId(const string& /*newAdapterId*/) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeLocator(const LocatorPrxPtr&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeRouter(const RouterPrxPtr&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeCollocationOptimized(bool) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeCacheConnection(bool) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changePreferSecure(bool) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeEndpointSelection(EndpointSelectionType) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeLocatorCacheTimeout(int) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeTimeout(int) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
 IceInternal::FixedReference::changeConnectionId(const string&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-    return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
@@ -784,9 +763,6 @@
 IceInternal::FixedReference::toProperty(const string&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
-
-    assert(false);   // Cannot be reached.
-    return PropertyDict(); // To keep the compiler from complaining.
 }
 
 RequestHandlerPtr
@@ -1631,7 +1607,7 @@
     {
     public:
 
-        class Callback2 : public Reference::GetConnectionCallback
+        class Callback2 ICE_FINAL : public Reference::GetConnectionCallback
         {
         public:
 
@@ -1907,6 +1883,7 @@
 namespace
 {
 
+#ifndef ICE_CPP11_COMPILER
 struct EndpointIsOpaque : public unary_function<EndpointIPtr, bool>
 {
 public:
@@ -1917,6 +1894,7 @@
         return dynamic_cast<OpaqueEndpointI*>(p.get()) != 0;
     }
 };
+#endif
 
 }
 
@@ -1928,8 +1906,16 @@
     //
     // Filter out unknown endpoints.
     //
+#ifdef ICE_CPP11_COMPILER
+    endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
+                              [](const EndpointIPtr& p)
+                              {
+                                  return dynamic_cast<OpaqueEndpointI*>(p.get()) != 0;
+                              }),
+                    endpoints.end());
+#else
     endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), EndpointIsOpaque()), endpoints.end());
-
+#endif
     //
     // Filter out endpoints according to the mode of the reference.
     //
@@ -1942,8 +1928,17 @@
             //
             // Filter out datagram endpoints.
             //
+#ifdef ICE_CPP11_COMPILER
+            endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
+                                      [](const EndpointIPtr& p)
+                                      {
+                                          return p->datagram();
+                                      }),
+                            endpoints.end());
+#else
             endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), Ice::constMemFun(&EndpointI::datagram)),
                             endpoints.end());
+#endif
             break;
         }
 
@@ -1953,9 +1948,18 @@
             //
             // Filter out non-datagram endpoints.
             //
+#ifdef ICE_CPP11_COMPILER
+            endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
+                                      [](const EndpointIPtr& p)
+                                      {
+                                          return !p->datagram();
+                                      }),
+                            endpoints.end());
+#else
             endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
                                       not1(Ice::constMemFun(&EndpointI::datagram))),
                             endpoints.end());
+#endif
             break;
         }
     }
@@ -1967,8 +1971,7 @@
     {
         case ICE_ENUM(EndpointSelectionType, Random):
         {
-            RandomNumberGenerator rng;
-            random_shuffle(endpoints.begin(), endpoints.end(), rng);
+            IceUtilInternal::shuffle(endpoints.begin(), endpoints.end());
             break;
         }
         case ICE_ENUM(EndpointSelectionType, Ordered):
@@ -1992,8 +1995,17 @@
     DefaultsAndOverridesPtr overrides = getInstance()->defaultsAndOverrides();
     if(overrides->overrideSecure ? overrides->overrideSecureValue : getSecure())
     {
+#ifdef ICE_CPP11_COMPILER
+        endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
+                                  [](const EndpointIPtr& p)
+                                  {
+                                      return !p->secure();
+                                  }),
+                        endpoints.end());
+#else
         endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), not1(Ice::constMemFun(&EndpointI::secure))),
                         endpoints.end());
+#endif
     }
     else if(getPreferSecure())
     {
@@ -2002,7 +2014,15 @@
         // partition(), because otherwise some STL implementations
         // order our now randomized endpoints.
         //
-         stable_partition(endpoints.begin(), endpoints.end(), Ice::constMemFun(&EndpointI::secure));
+#ifdef ICE_CPP11_COMPILER
+        stable_partition(endpoints.begin(), endpoints.end(),
+                         [](const EndpointIPtr& p)
+                         {
+                             return p->secure();
+                         });
+#else
+        stable_partition(endpoints.begin(), endpoints.end(), Ice::constMemFun(&EndpointI::secure));
+#endif
     }
     else
     {
@@ -2011,7 +2031,15 @@
         // partition(), because otherwise some STL implementations
         // order our now randomized endpoints.
         //
+#ifdef ICE_CPP11_COMPILER
+        stable_partition(endpoints.begin(), endpoints.end(),
+                         [](const EndpointIPtr& p)
+                         {
+                             return !p->secure();
+                         });
+#else
         stable_partition(endpoints.begin(), endpoints.end(), not1(Ice::constMemFun(&EndpointI::secure)));
+#endif
     }
 
     return endpoints;
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ReferenceFactory.cpp zeroc-ice-3.7.2/cpp/src/Ice/ReferenceFactory.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ReferenceFactory.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ReferenceFactory.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/ReferenceFactory.h>
@@ -541,8 +536,6 @@
             throw ProxyParseException(__FILE__, __LINE__, "malformed proxy `" + s + "'");
         }
     }
-
-    return 0; // Unreachable, prevents compiler warning.
 }
 
 ReferencePtr
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ReferenceFactoryF.h zeroc-ice-3.7.2/cpp/src/Ice/ReferenceFactoryF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ReferenceFactoryF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ReferenceFactoryF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REFERENCE_FACTORY_F_H
 #define ICE_REFERENCE_FACTORY_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ReferenceFactory.h zeroc-ice-3.7.2/cpp/src/Ice/ReferenceFactory.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ReferenceFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ReferenceFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REFERENCE_FACTORY_H
 #define ICE_REFERENCE_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Reference.h zeroc-ice-3.7.2/cpp/src/Ice/Reference.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Reference.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Reference.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REFERENCE_H
 #define ICE_REFERENCE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RegisterPluginsInit.cpp zeroc-ice-3.7.2/cpp/src/Ice/RegisterPluginsInit.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/RegisterPluginsInit.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RegisterPluginsInit.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/RegisterPluginsInit.h>
 #include <Ice/CommunicatorF.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RegisterPluginsInit.h zeroc-ice-3.7.2/cpp/src/Ice/RegisterPluginsInit.h
--- zeroc-ice-3.7.1/cpp/src/Ice/RegisterPluginsInit.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RegisterPluginsInit.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REGISTER_PLUGINS_INIT_H
 #define ICE_REGISTER_PLUGINS_INIT_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ReplyStatus.h zeroc-ice-3.7.2/cpp/src/Ice/ReplyStatus.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ReplyStatus.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ReplyStatus.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REPLY_STATUS_H
 #define ICE_REPLY_STATUS_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RequestHandler.cpp zeroc-ice-3.7.2/cpp/src/Ice/RequestHandler.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/RequestHandler.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RequestHandler.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/RequestHandler.h>
 #include <Ice/Reference.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RequestHandlerFactory.cpp zeroc-ice-3.7.2/cpp/src/Ice/RequestHandlerFactory.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/RequestHandlerFactory.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RequestHandlerFactory.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/RequestHandlerFactory.h>
 #include <Ice/CollocatedRequestHandler.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RequestHandlerFactory.h zeroc-ice-3.7.2/cpp/src/Ice/RequestHandlerFactory.h
--- zeroc-ice-3.7.1/cpp/src/Ice/RequestHandlerFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RequestHandlerFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REQUEST_HANDLER_FACTORY_H
 #define ICE_REQUEST_HANDLER_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RequestHandler.h zeroc-ice-3.7.2/cpp/src/Ice/RequestHandler.h
--- zeroc-ice-3.7.1/cpp/src/Ice/RequestHandler.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RequestHandler.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REQUEST_HANDLER_H
 #define ICE_REQUEST_HANDLER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ResponseHandler.cpp zeroc-ice-3.7.2/cpp/src/Ice/ResponseHandler.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ResponseHandler.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ResponseHandler.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ResponseHandler.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ResponseHandler.h zeroc-ice-3.7.2/cpp/src/Ice/ResponseHandler.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ResponseHandler.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ResponseHandler.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RESPONSE_HANDLER_H
 #define ICE_RESPONSE_HANDLER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RetryQueue.cpp zeroc-ice-3.7.2/cpp/src/Ice/RetryQueue.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/RetryQueue.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RetryQueue.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/RetryQueue.h>
 #include <Ice/OutgoingAsync.h>
@@ -44,7 +39,7 @@
 }
 
 void
-IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex)
+IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& /*outAsync*/, const Ice::LocalException& ex)
 {
     if(_queue->cancel(ICE_SHARED_FROM_THIS))
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RetryQueueF.h zeroc-ice-3.7.2/cpp/src/Ice/RetryQueueF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/RetryQueueF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RetryQueueF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RETRY_QUEUE_F_H
 #define ICE_RETRY_QUEUE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RetryQueue.h zeroc-ice-3.7.2/cpp/src/Ice/RetryQueue.h
--- zeroc-ice-3.7.1/cpp/src/Ice/RetryQueue.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RetryQueue.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RETRY_QUEUE_H
 #define ICE_RETRY_QUEUE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RouterInfo.cpp zeroc-ice-3.7.2/cpp/src/Ice/RouterInfo.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/RouterInfo.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RouterInfo.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/RouterInfo.h>
 #include <Ice/Router.h>
@@ -259,9 +254,9 @@
 #ifdef ICE_CPP11_MAPPING
     RouterInfoPtr self = this;
     _router->addProxiesAsync(proxies,
-        [self, cookie](const Ice::ObjectProxySeq& proxies)
+        [self, cookie](const Ice::ObjectProxySeq& p)
         {
-            self->addProxyResponse(proxies, cookie);
+            self->addProxyResponse(p, cookie);
         },
         [self, cookie](exception_ptr e)
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RouterInfoF.h zeroc-ice-3.7.2/cpp/src/Ice/RouterInfoF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/RouterInfoF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RouterInfoF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ROUTER_INFO_F_H
 #define ICE_ROUTER_INFO_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/RouterInfo.h zeroc-ice-3.7.2/cpp/src/Ice/RouterInfo.h
--- zeroc-ice-3.7.1/cpp/src/Ice/RouterInfo.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/RouterInfo.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ROUTER_INFO_H
 #define ICE_ROUTER_INFO_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Selector.cpp zeroc-ice-3.7.2/cpp/src/Ice/Selector.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Selector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Selector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Selector.h>
 #include <Ice/EventHandler.h>
@@ -74,10 +69,16 @@
     }
 
 #ifdef ICE_USE_IOCP
-    HANDLE socket = reinterpret_cast<HANDLE>(handler->getNativeInfo()->fd());
-    if(CreateIoCompletionPort(socket, _handle, reinterpret_cast<ULONG_PTR>(handler), 0) == ICE_NULLPTR)
+    SOCKET socket = handler->getNativeInfo()->fd();
+    if (socket != INVALID_SOCKET)
     {
-        throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
+        if (CreateIoCompletionPort(reinterpret_cast<HANDLE>(socket),
+                                   _handle,
+                                   reinterpret_cast<ULONG_PTR>(handler),
+                                   0) == ICE_NULLPTR)
+        {
+            throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
+        }
     }
     handler->getNativeInfo()->initialize(_handle, reinterpret_cast<ULONG_PTR>(handler));
 #else
@@ -153,7 +154,7 @@
 #ifdef ICE_USE_IOCP
     ULONG_PTR key;
     LPOVERLAPPED ol;
-    error = 0;
+    error = ERROR_SUCCESS;
 
     if(!GetQueuedCompletionStatus(_handle, &count, &key, &ol, timeout > 0 ? timeout * 1000 : INFINITE))
     {
@@ -177,7 +178,7 @@
         {
             status = info->status;
         }
-        count = SOCKET_ERROR;
+        count = 0;
         error = WSAGetLastError();
         return reinterpret_cast<EventHandler*>(key);
     }
@@ -379,8 +380,14 @@
         epoll_event event;
         memset(&event, 0, sizeof(epoll_event));
         event.data.ptr = handler;
-        event.events |= newStatus & SocketOperationRead ? EPOLLIN : 0;
-        event.events |= newStatus & SocketOperationWrite ? EPOLLOUT : 0;
+        if(newStatus & SocketOperationRead)
+        {
+            event.events |= EPOLLIN;
+        }
+        if(newStatus & SocketOperationWrite)
+        {
+            event.events |= EPOLLOUT;
+        }
         if(epoll_ctl(_queueFd, previous ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, fd, &event) != 0)
         {
             Ice::Error out(_instance->initializationData().logger);
@@ -426,8 +433,14 @@
         epoll_event event;
         memset(&event, 0, sizeof(epoll_event));
         event.data.ptr = handler;
-        event.events |= newStatus & SocketOperationRead ? EPOLLIN : 0;
-        event.events |= newStatus & SocketOperationWrite ? EPOLLOUT : 0;
+        if(newStatus & SocketOperationRead)
+        {
+            event.events |= EPOLLIN;
+        }
+        if(newStatus & SocketOperationWrite)
+        {
+            event.events |= EPOLLOUT;
+        }
         if(epoll_ctl(_queueFd, newStatus ? EPOLL_CTL_MOD : EPOLL_CTL_DEL, fd, &event) != 0)
         {
             Ice::Error out(_instance->initializationData().logger);
@@ -929,8 +942,14 @@
         status = static_cast<SocketOperation>(status & ~handler->_disabled);
         previous = static_cast<SocketOperation>(previous & ~handler->_disabled);
     }
-    event.events |= status & SocketOperationRead ? EPOLLIN : 0;
-    event.events |= status & SocketOperationWrite ? EPOLLOUT : 0;
+    if(status & SocketOperationRead)
+    {
+        event.events |= EPOLLIN;
+    }
+    if(status & SocketOperationWrite)
+    {
+        event.events |= EPOLLOUT;
+    }
     int op;
     if(!previous && status)
     {
@@ -1031,6 +1050,16 @@
     virtual void run()
     {
         _selector.run();
+
+#if TARGET_IPHONE_SIMULATOR != 0
+        //
+        // Workaround for CFSocket bug where the CFSocketManager thread crashes if an
+        // invalidated socket is being processed for reads/writes. We add this sleep
+        // mostly to prevent spurious crashes with testing. This bug is very unlikely
+        // to be hit otherwise.
+        //
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
+#endif
     }
 
 private:
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Selector.h zeroc-ice-3.7.2/cpp/src/Ice/Selector.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Selector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Selector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SELECTOR_H
 #define ICE_SELECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ServantManager.cpp zeroc-ice-3.7.2/cpp/src/Ice/ServantManager.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ServantManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ServantManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ServantManager.h>
 #include <Ice/ServantLocator.h>
@@ -212,22 +207,22 @@
 
     if(p == servantMapMap.end() || (q = p->second.find(facet)) == p->second.end())
     {
-        DefaultServantMap::const_iterator p = _defaultServantMap.find(ident.category);
-        if(p == _defaultServantMap.end())
+        DefaultServantMap::const_iterator d = _defaultServantMap.find(ident.category);
+        if(d == _defaultServantMap.end())
         {
-            p = _defaultServantMap.find("");
-            if(p == _defaultServantMap.end())
+            d = _defaultServantMap.find("");
+            if(d == _defaultServantMap.end())
             {
                 return 0;
             }
             else
             {
-                return p->second;
+                return d->second;
             }
         }
         else
         {
-            return p->second;
+            return d->second;
         }
     }
     else
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ServantManager.h zeroc-ice-3.7.2/cpp/src/Ice/ServantManager.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ServantManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ServantManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SERVANT_MANAGER_H
 #define ICE_SERVANT_MANAGER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Service.cpp zeroc-ice-3.7.2/cpp/src/Ice/Service.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/StringUtil.h>
@@ -34,6 +29,9 @@
 #   include <sys/types.h>
 #   include <sys/stat.h>
 #   include <csignal>
+#   ifdef ICE_USE_SYSTEMD
+#       include <systemd/sd-daemon.h>
+#   endif
 #endif
 
 using namespace std;
@@ -564,7 +562,6 @@
     // First check for the --service option.
     //
     string name;
-    string eventLogSource;
     int idx = 1;
     const StringConverterPtr stringConverter = getProcessStringConverter();
     while(idx < av.argc)
@@ -764,12 +761,6 @@
     return _name;
 }
 
-bool
-Ice::Service::checkSystem() const
-{
-    return true;
-}
-
 #ifdef _WIN32
 int
 Ice::Service::run(int argc, const wchar_t* const argv[], const InitializationData& initData, int version)
@@ -828,11 +819,20 @@
         //
         if(start(av.argc, av.argv, status))
         {
+#ifdef ICE_USE_SYSTEMD
+            sd_notify(0, "READY=1");
+#endif
             //
             // Wait for service shutdown.
             //
             waitForShutdown();
 
+#ifdef ICE_USE_SYSTEMD
+            //
+            // Inform the service manager that the service is beginning its shutdown.
+            //
+            sd_notify(0, "STOPPING=1");
+#endif
             //
             // Stop the service.
             //
@@ -846,25 +846,42 @@
     {
         ServiceError err(this);
         err << "service terminating after catching exception:\n" << ex;
+#ifdef ICE_USE_SYSTEMD
+        const string msg = err.str();
+        sd_notifyf(0, "STATUS=Failed service terminating after catching exception: %s", msg.c_str());
+#endif
     }
     catch(const std::exception& ex)
     {
         ServiceError err(this);
         err << "service terminating after catching exception:\n" << ex;
+#ifdef ICE_USE_SYSTEMD
+        const string msg = err.str();
+        sd_notifyf(0, "STATUS=Failed service terminating after catching exception: %s", msg.c_str());
+#endif
     }
     catch(const std::string& msg)
     {
         ServiceError err(this);
         err << "service terminating after catching exception:\n" << msg;
+#ifdef ICE_USE_SYSTEMD
+        sd_notifyf(0, "STATUS=Failed service terminating after catching exception: %s", msg.c_str());
+#endif
     }
     catch(const char* msg)
     {
         ServiceError err(this);
         err << "service terminating after catching exception:\n" << msg;
+#ifdef ICE_USE_SYSTEMD
+        sd_notifyf(0, "STATUS=Failed service terminating after catching exception: %s", msg);
+#endif
     }
     catch(...)
     {
         error("service terminating after catching unknown exception");
+#ifdef ICE_USE_SYSTEMD
+        sd_notify(0, "STATUS=Failed service terminating after catching unknown exception");
+#endif
     }
 
     if(_communicator)
@@ -1057,12 +1074,6 @@
 {
     assert(_service);
 
-    if(!checkSystem())
-    {
-        error("Win32 service not supported on Windows 9x/ME");
-        return EXIT_FAILURE;
-    }
-
     if(_name.empty())
     {
         error("invalid name for Win32 service");
@@ -1530,7 +1541,7 @@
         {
             consoleErr << argv[0] << ": ";
         }
-        consoleErr << strerror(errno) << endl;
+        consoleErr << IceUtilInternal::errorToString(errno) << endl;
         return EXIT_FAILURE;
     }
 
@@ -1563,7 +1574,7 @@
                 {
                     consoleErr << argv[0] << ": ";
                 }
-                consoleErr << strerror(errno) << endl;
+                consoleErr << IceUtilInternal::errorToString(errno) << endl;
                 _exit(EXIT_FAILURE);
             }
             break;
@@ -1590,7 +1601,8 @@
                     {
                         consoleErr << ": ";
                     }
-                    consoleErr << "I/O error while reading error message from child:\n" << strerror(errno) << endl;
+                    consoleErr << "I/O error while reading error message from child:\n"
+                               << IceUtilInternal::errorToString(errno) << endl;
                     _exit(EXIT_FAILURE);
                 }
                 pos += n;
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SHA1.cpp zeroc-ice-3.7.2/cpp/src/Ice/SHA1.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/SHA1.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SHA1.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/SHA1.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SharedContext.h zeroc-ice-3.7.2/cpp/src/Ice/SharedContext.h
--- zeroc-ice-3.7.1/cpp/src/Ice/SharedContext.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SharedContext.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SHARED_CONTEXT_H
 #define ICE_SHARED_CONTEXT_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SliceChecksums.cpp zeroc-ice-3.7.2/cpp/src/Ice/SliceChecksums.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/SliceChecksums.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SliceChecksums.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/SliceChecksums.h>
 #include <IceUtil/Mutex.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SlicedData.cpp zeroc-ice-3.7.2/cpp/src/Ice/SlicedData.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/SlicedData.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SlicedData.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/SlicedData.h>
 #include <Ice/OutputStream.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/StreamSocket.cpp zeroc-ice-3.7.2/cpp/src/Ice/StreamSocket.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/StreamSocket.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/StreamSocket.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/StreamSocket.h>
 #include <Ice/NetworkProxy.h>
@@ -92,7 +87,7 @@
 #if defined(ICE_USE_IOCP)
         doFinishConnectAsync(_fd, _write);
 #elif defined(ICE_OS_UWP)
-        if(_write.count == SOCKET_ERROR)
+        if(_write.error != ERROR_SUCCESS)
         {
             try
             {
@@ -389,6 +384,7 @@
 
     _write.buf.len = static_cast<DWORD>(packetSize);
     _write.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _write.error = ERROR_SUCCESS;
     int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, ICE_NULLPTR);
     if(err == SOCKET_ERROR)
     {
@@ -415,7 +411,7 @@
         return;
     }
 
-    if(static_cast<int>(_write.count) == SOCKET_ERROR)
+    if(_write.error != ERROR_SUCCESS)
     {
         WSASetLastError(_write.error);
         if(connectionLost())
@@ -444,6 +440,7 @@
     size_t packetSize = getRecvPacketSize(length);
     _read.buf.len = static_cast<DWORD>(packetSize);
     _read.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _read.error = ERROR_SUCCESS;
     int err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, ICE_NULLPTR);
     if(err == SOCKET_ERROR)
     {
@@ -469,7 +466,7 @@
         return;
     }
 
-    if(static_cast<int>(_read.count) == SOCKET_ERROR)
+    if(_read.error != ERROR_SUCCESS)
     {
         WSASetLastError(_read.error);
         if(connectionLost())
@@ -542,7 +539,7 @@
     {
         checkErrorCode(__FILE__, __LINE__, ex->HResult);
     }
-    return packetSize == static_cast<int>(buf.b.end() - buf.i);
+    return packetSize == static_cast<size_t>(buf.b.end() - buf.i);
 }
 
 void
@@ -554,7 +551,7 @@
         return;
     }
 
-    if(_write.count == SOCKET_ERROR)
+    if(_write.error != ERROR_SUCCESS)
     {
         checkErrorCode(__FILE__, __LINE__, _write.error);
     }
@@ -586,7 +583,7 @@
         return;
     }
 
-    if(_read.count == SOCKET_ERROR)
+    if(_read.error != ERROR_SUCCESS)
     {
         checkErrorCode(__FILE__, __LINE__, _read.error);
     }
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/StreamSocket.h zeroc-ice-3.7.2/cpp/src/Ice/StreamSocket.h
--- zeroc-ice-3.7.1/cpp/src/Ice/StreamSocket.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/StreamSocket.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STREAM_SOCKET_H
 #define ICE_STREAM_SOCKET_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/StringConverterPlugin.cpp zeroc-ice-3.7.2/cpp/src/Ice/StringConverterPlugin.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/StringConverterPlugin.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/StringConverterPlugin.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/StringUtil.h zeroc-ice-3.7.2/cpp/src/Ice/StringUtil.h
--- zeroc-ice-3.7.1/cpp/src/Ice/StringUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/StringUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STRING_UTIL_H
 #define ICE_STRING_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SysLoggerI.cpp zeroc-ice-3.7.2/cpp/src/Ice/SysLoggerI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/SysLoggerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SysLoggerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef _WIN32
 
@@ -111,7 +106,7 @@
     }
 
     int logopt = LOG_PID | LOG_CONS;
-    openlog(prefix.c_str(), logopt, _facility);
+    openlog(_prefix.c_str(), logopt, _facility);
 }
 
 Ice::SysLoggerI::SysLoggerI(const string& prefix, int facility) :
@@ -119,7 +114,7 @@
     _prefix(prefix)
 {
     int logopt = LOG_PID | LOG_CONS;
-    openlog(prefix.c_str(), logopt, facility);
+    openlog(_prefix.c_str(), logopt, facility);
 }
 
 Ice::SysLoggerI::~SysLoggerI()
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SysLoggerI.h zeroc-ice-3.7.2/cpp/src/Ice/SysLoggerI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/SysLoggerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SysLoggerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SYS_LOGGER_I_H
 #define ICE_SYS_LOGGER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SystemdJournalI.cpp zeroc-ice-3.7.2/cpp/src/Ice/SystemdJournalI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/SystemdJournalI.cpp	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SystemdJournalI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,66 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifdef ICE_USE_SYSTEMD
+
+#include <Ice/SystemdJournalI.h>
+#include <Ice/LocalException.h>
+#include <syslog.h>
+#include <systemd/sd-journal.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+Ice::SystemdJournalI::SystemdJournalI(const string& prefix) :
+    _prefix(prefix)
+{
+}
+
+void
+Ice::SystemdJournalI::print(const string& message)
+{
+    write(LOG_INFO, message);
+}
+
+void
+Ice::SystemdJournalI::trace(const string& category, const string& message)
+{
+    write(LOG_INFO, category + ": " + message);
+}
+
+void
+Ice::SystemdJournalI::warning(const string& message)
+{
+    write(LOG_WARNING, message);
+}
+
+void
+Ice::SystemdJournalI::error(const string& message)
+{
+    write(LOG_ERR, message);
+}
+
+string
+Ice::SystemdJournalI::getPrefix()
+{
+    return _prefix;
+}
+
+Ice::LoggerPtr
+Ice::SystemdJournalI::cloneWithPrefix(const string& prefix)
+{
+    return ICE_MAKE_SHARED(SystemdJournalI, prefix);
+}
+
+void
+Ice::SystemdJournalI::write(int priority, const string& message) const
+{
+    sd_journal_send("MESSAGE=%s", message.c_str(),
+                    "PRIORITY=%i", priority,
+                    "SYSLOG_IDENTIFIER=%s", _prefix.c_str(),
+                    NULL); // Using NULL is necessary for EL7, see #293
+}
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/SystemdJournalI.h zeroc-ice-3.7.2/cpp/src/Ice/SystemdJournalI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/SystemdJournalI.h	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/SystemdJournalI.h	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,39 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef ICE_SYSTEMD_JOURNAL_I_H
+#define ICE_SYSTEMD_JOURNAL_I_H
+
+#ifdef ICE_USE_SYSTEMD
+
+#include <Ice/Logger.h>
+
+namespace Ice
+{
+
+class SystemdJournalI : public Logger
+{
+public:
+
+    SystemdJournalI(const std::string&);
+
+    virtual void print(const std::string&);
+    virtual void trace(const std::string&, const std::string&);
+    virtual void warning(const std::string&);
+    virtual void error(const std::string&);
+    virtual std::string getPrefix();
+    virtual LoggerPtr cloneWithPrefix(const std::string&);
+
+private:
+
+    void write(int, const std::string&) const;
+
+    const std::string _prefix;
+};
+
+}
+
+#endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpAcceptor.cpp zeroc-ice-3.7.2/cpp/src/Ice/TcpAcceptor.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpAcceptor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpAcceptor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/TcpAcceptor.h>
 #include <Ice/TcpTransceiver.h>
@@ -131,6 +126,7 @@
     assert(_acceptFd == INVALID_SOCKET);
     _acceptFd = createSocket(false, _addr);
     const int sz = static_cast<int>(_acceptBuf.size() / 2);
+    _info.error = ERROR_SUCCESS;
     if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
     {
         if(!wouldBlock())
@@ -143,7 +139,7 @@
 void
 IceInternal::TcpAcceptor::finishAccept()
 {
-    if(static_cast<int>(_info.count) == SOCKET_ERROR || _fd == INVALID_SOCKET)
+    if(_info.error != ERROR_SUCCESS || _fd == INVALID_SOCKET)
     {
         closeSocketNoThrow(_acceptFd);
         _acceptFd = INVALID_SOCKET;
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpAcceptor.h zeroc-ice-3.7.2/cpp/src/Ice/TcpAcceptor.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpAcceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpAcceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TCP_ACCEPTOR_H
 #define ICE_TCP_ACCEPTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpConnector.cpp zeroc-ice-3.7.2/cpp/src/Ice/TcpConnector.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpConnector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpConnector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/TcpConnector.h>
 #include <Ice/TcpTransceiver.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpConnector.h zeroc-ice-3.7.2/cpp/src/Ice/TcpConnector.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpConnector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpConnector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TCP_CONNECTOR_H
 #define ICE_TCP_CONNECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpEndpointI.cpp zeroc-ice-3.7.2/cpp/src/Ice/TcpEndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpEndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpEndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/TcpEndpointI.h>
 #include <Ice/Network.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpEndpointI.h zeroc-ice-3.7.2/cpp/src/Ice/TcpEndpointI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpEndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpEndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TCP_ENDPOINT_I_H
 #define ICE_TCP_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpTransceiver.cpp zeroc-ice-3.7.2/cpp/src/Ice/TcpTransceiver.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpTransceiver.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpTransceiver.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/TcpTransceiver.h>
 #include <Ice/Connection.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TcpTransceiver.h zeroc-ice-3.7.2/cpp/src/Ice/TcpTransceiver.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TcpTransceiver.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TcpTransceiver.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TCP_TRANSCEIVER_H
 #define ICE_TCP_TRANSCEIVER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Thread.cpp zeroc-ice-3.7.2/cpp/src/Ice/Thread.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Thread.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Thread.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifdef __sun
 //
@@ -205,16 +200,24 @@
     }
 
     //
-    // It's necessary to increment the reference count since
-    // pthread_create won't necessarily call the thread function until
+    // It's necessary to increment the reference count since the
+    // thread constructor won't necessarily call the thread function until
     // later. If the user does (new MyThread)->start() then the thread
     // object could be deleted before the thread object takes
     // ownership. It's also necessary to increment the reference count
-    // prior to calling pthread_create since the thread itself calls
-    // __decRef().
+    // prior to calling the thread constructor since the thread start hook
+    // itself calls __decRef().
     //
-    __incRef();
-    _thread.reset(new thread(startHook, this));
+    try
+    {
+        __incRef();
+        _thread.reset(new thread(startHook, this));
+    }
+    catch(const std::system_error&)
+    {
+        __decRef();
+        throw;
+    }
 
     _started = true;
     _running = true;
@@ -467,6 +470,7 @@
     }
     if(SetThreadPriority(_handle, priority) == 0)
     {
+        __decRef();
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
     }
     if(static_cast<int>(ResumeThread(_handle)) == -1)
@@ -558,8 +562,8 @@
         throw BadThreadControlException(__FILE__, __LINE__);
     }
 
-    void* ignore = 0;
-    int rc = pthread_join(_thread, &ignore);
+    void* status = 0;
+    int rc = pthread_join(_thread, &status);
     if(rc != 0)
     {
         throw ThreadSyscallException(__FILE__, __LINE__, rc);
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ThreadPool.cpp zeroc-ice-3.7.2/cpp/src/Ice/ThreadPool.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ThreadPool.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ThreadPool.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ThreadPool.h>
 #include <Ice/EventHandler.h>
@@ -506,6 +501,8 @@
     _workQueue->queue(new FinishedWorkItem(handler, !closeNow));
     return closeNow;
 #else
+    UNREFERENCED_PARAMETER(closeNow);
+
     // If there are no pending asynchronous operations, we can call finish on the handler now.
     if(!handler->_pending)
     {
@@ -763,8 +760,8 @@
 #ifdef ICE_OS_UWP
             current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _threadIdleTime));
 #else
-            current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count, current._error,
-                               _threadIdleTime));
+            current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count,
+                                                                                 current._error, _threadIdleTime));
 #endif
         }
         catch(const SelectorTimeoutException&)
@@ -815,7 +812,7 @@
 #else
 
                 current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count,
-                                   current._error, _serverIdleTime));
+                                                            current._error, _serverIdleTime));
 #endif
             }
             catch(const SelectorTimeoutException&)
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ThreadPool.h zeroc-ice-3.7.2/cpp/src/Ice/ThreadPool.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ThreadPool.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ThreadPool.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_THREAD_POOL_H
 #define ICE_THREAD_POOL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Timer.cpp zeroc-ice-3.7.2/cpp/src/Ice/Timer.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Timer.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Timer.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Timer.h>
 #include <IceUtil/Exception.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TraceLevels.cpp zeroc-ice-3.7.2/cpp/src/Ice/TraceLevels.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/TraceLevels.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TraceLevels.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/TraceLevels.h>
 #include <Ice/Properties.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TraceLevelsF.h zeroc-ice-3.7.2/cpp/src/Ice/TraceLevelsF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TraceLevelsF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TraceLevelsF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TRACE_LEVELS_F_H
 #define ICE_TRACE_LEVELS_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TraceLevels.h zeroc-ice-3.7.2/cpp/src/Ice/TraceLevels.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TraceLevels.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TraceLevels.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TRACE_LEVELS_H
 #define ICE_TRACE_LEVELS_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TraceUtil.cpp zeroc-ice-3.7.2/cpp/src/Ice/TraceUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/TraceUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TraceUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TraceUtil.h zeroc-ice-3.7.2/cpp/src/Ice/TraceUtil.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TraceUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TraceUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TRACE_UTIL_H
 #define ICE_TRACE_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Transceiver.cpp zeroc-ice-3.7.2/cpp/src/Ice/Transceiver.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Transceiver.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Transceiver.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Transceiver.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/TransceiverF.h zeroc-ice-3.7.2/cpp/src/Ice/TransceiverF.h
--- zeroc-ice-3.7.1/cpp/src/Ice/TransceiverF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/TransceiverF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TRANSCEIVER_F_H
 #define ICE_TRANSCEIVER_F_H
@@ -30,8 +25,8 @@
 typedef Handle<UdpTransceiver> UdpTransceiverPtr;
 
 class WSTransceiver;
-ICE_API IceUtil::Shared* upCast(Transceiver*);
-typedef Handle<Transceiver> TransceiverPtr;
+ICE_API IceUtil::Shared* upCast(WSTransceiver*);
+typedef Handle<WSTransceiver> WSTransceiverPtr;
 
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Transceiver.h zeroc-ice-3.7.2/cpp/src/Ice/Transceiver.h
--- zeroc-ice-3.7.1/cpp/src/Ice/Transceiver.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Transceiver.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TRANSCEIVER_H
 #define ICE_TRANSCEIVER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/UdpConnector.cpp zeroc-ice-3.7.2/cpp/src/Ice/UdpConnector.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/UdpConnector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/UdpConnector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UdpConnector.h>
 #include <Ice/ProtocolInstance.h>
@@ -131,6 +126,9 @@
     _mcastTtl(mcastTtl),
     _connectionId(connectionId)
 {
+#ifdef ICE_OS_UWP
+    UNREFERENCED_PARAMETER(sourceAddr);
+#endif
 }
 
 IceInternal::UdpConnector::~UdpConnector()
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/UdpConnector.h zeroc-ice-3.7.2/cpp/src/Ice/UdpConnector.h
--- zeroc-ice-3.7.1/cpp/src/Ice/UdpConnector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/UdpConnector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UDP_CONNECTOR_H
 #define ICE_UDP_CONNECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/UdpEndpointI.cpp zeroc-ice-3.7.2/cpp/src/Ice/UdpEndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/UdpEndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/UdpEndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UdpEndpointI.h>
 #include <Ice/Network.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/UdpEndpointI.h zeroc-ice-3.7.2/cpp/src/Ice/UdpEndpointI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/UdpEndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/UdpEndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UDP_ENDPOINT_I_H
 #define ICE_UDP_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/UdpTransceiver.cpp zeroc-ice-3.7.2/cpp/src/Ice/UdpTransceiver.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/UdpTransceiver.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/UdpTransceiver.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UdpTransceiver.h>
 #include <Ice/UdpEndpointI.h>
@@ -56,6 +51,7 @@
         return 0;
     }
 #elif defined(ICE_OS_UWP)
+    UNREFERENCED_PARAMETER(status);
     return &_write;
 #endif
 }
@@ -74,7 +70,7 @@
 #if defined(ICE_USE_IOCP)
         doFinishConnectAsync(_fd, _write);
 #elif defined(ICE_OS_UWP)
-        if(_write.count == SOCKET_ERROR)
+        if(_write.error != ERROR_SUCCESS)
         {
             try
             {
@@ -376,7 +372,7 @@
                         [this] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
                         {
                             //
-                            // COMPILERFIX with VC141 using operator!= and operator== inside
+                            // COMPILERFIX with v141 using operator!= and operator== inside
                             // a lambda callback triggers a compiler bug, we move the code to
                             // a seperate private method to workaround the issue.
                             //
@@ -386,6 +382,7 @@
                 else
                 {
                     _write.count = 0;
+                    _write.error = ERROR_SUCCESS;
                     _writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
                 }
             }
@@ -398,7 +395,7 @@
                         [=](IAsyncOperation<IOutputStream^>^ info, Windows::Foundation::AsyncStatus status)
                         {
                             //
-                            // COMPILERFIX with VC141 using operator!= and operator== inside
+                            // COMPILERFIX with v141 using operator!= and operator== inside
                             // a lambda callback triggers a compiler bug, we move the code to
                             // a seperate private method to workaround the issue.
                             //
@@ -408,6 +405,7 @@
                 else
                 {
                     _write.count = 0;
+                    _write.error = ERROR_SUCCESS;
                     _writer = ref new DataWriter(operation->GetResults());
                     if(_mcastAddr.host != nullptr)
                     {
@@ -431,7 +429,7 @@
                 [=, &buf](concurrency::task<IOutputStream^> task)
                 {
                     //
-                    // COMPILERFIX with VC141 using operator!= and operator== inside
+                    // COMPILERFIX with v141 using operator!= and operator== inside
                     // a lambda callback triggers a compiler bug, we move the code to
                     // a seperate private method to workaround the issue.
                     //
@@ -460,6 +458,7 @@
 #else
     _write.buf.len = static_cast<int>(buf.b.size());
     _write.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _write.error = ERROR_SUCCESS;
     int err;
     if(_state == StateConnected)
     {
@@ -481,8 +480,7 @@
             // No peer has sent a datagram yet.
             throw SocketException(__FILE__, __LINE__, 0);
         }
-        err = WSASendTo(_fd, &_write.buf, 1, &_write.count, 0, &_peerAddr.sa,
-                        len, &_write, ICE_NULLPTR);
+        err = WSASendTo(_fd, &_write.buf, 1, &_write.count, 0, &_peerAddr.sa, len, &_write, ICE_NULLPTR);
     }
 
     if(err == SOCKET_ERROR)
@@ -499,8 +497,8 @@
             }
         }
     }
-#endif
     return true;
+#endif
 }
 
 #ifdef ICE_OS_UWP
@@ -510,14 +508,14 @@
 {
     if(status != Windows::Foundation::AsyncStatus::Completed)
     {
-        _write.count = SOCKET_ERROR;
         _write.error = action->ErrorCode.Value;
     }
     else
     {
-        _write.count = 0;
+        _write.error = ERROR_SUCCESS;
         _writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
     }
+    _write.count = 0;
     completed(SocketOperationConnect);
 }
 
@@ -527,14 +525,14 @@
 {
     if(status != Windows::Foundation::AsyncStatus::Completed)
     {
-        _write.count = SOCKET_ERROR;
         _write.error = operation->ErrorCode.Value;
     }
     else
     {
-        _write.count = 0;
+        _write.error = ERROR_SUCCESS;
         _writer = ref new DataWriter(operation->GetResults());
     }
+    _write.count = 0;
     if(_mcastAddr.host != nullptr)
     {
         setMcastGroup(_fd, _mcastAddr, "");
@@ -554,7 +552,7 @@
     }
     catch(Platform::Exception^ pex)
     {
-        _write.count = SOCKET_ERROR;
+        _write.count = 0;
         _write.error = pex->HResult;
         completed(SocketOperationWrite);
     }
@@ -570,7 +568,7 @@
         return;
     }
 
-    if(static_cast<int>(_write.count) == SOCKET_ERROR)
+    if(_write.error != ERROR_SUCCESS)
     {
 #ifndef ICE_OS_UWP
         WSASetLastError(_write.error);
@@ -587,7 +585,7 @@
 #endif
     }
 
-    assert(_write.count == buf.b.size());
+    assert(static_cast<size_t>(_write.count) == buf.b.size());
     buf.i = buf.b.end();
 }
 
@@ -601,6 +599,7 @@
 #ifndef ICE_OS_UWP
     _read.buf.len = packetSize;
     _read.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _read.error = ERROR_SUCCESS;
     int err;
     if(_state == StateConnected)
     {
@@ -611,8 +610,8 @@
         memset(&_readAddr.saStorage, 0, sizeof(struct sockaddr_storage));
         _readAddrLen = static_cast<socklen_t>(sizeof(sockaddr_storage));
 
-        err = WSARecvFrom(_fd, &_read.buf, 1, &_read.count, &_read.flags,
-                          &_readAddr.sa, &_readAddrLen, &_read, ICE_NULLPTR);
+        err = WSARecvFrom(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_readAddr.sa, &_readAddrLen, &_read,
+                          ICE_NULLPTR);
     }
 
     if(err == SOCKET_ERROR)
@@ -661,7 +660,7 @@
     DatagramSocketMessageReceivedEventArgs^ args = _received.front();
     _received.pop_front();
 
-    int ret;
+    int ret = 0;
     try
     {
         DataReader^ reader = args->GetDataReader();
@@ -682,7 +681,7 @@
         checkErrorCode(__FILE__, __LINE__, ex->HResult);
     }
 #else
-    if(static_cast<int>(_read.count) == SOCKET_ERROR)
+    if(_read.error != ERROR_SUCCESS)
     {
         WSASetLastError(_read.error);
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/UdpTransceiver.h zeroc-ice-3.7.2/cpp/src/Ice/UdpTransceiver.h
--- zeroc-ice-3.7.1/cpp/src/Ice/UdpTransceiver.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/UdpTransceiver.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UDP_TRANSCEIVER_H
 #define ICE_UDP_TRANSCEIVER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/Value.cpp zeroc-ice-3.7.2/cpp/src/Ice/Value.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/Value.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/Value.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Value.h>
 #include <Ice/LocalException.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ValueFactoryManagerI.cpp zeroc-ice-3.7.2/cpp/src/Ice/ValueFactoryManagerI.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/ValueFactoryManagerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ValueFactoryManagerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/ValueFactoryManagerI.h>
 #include <Ice/LocalException.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/ValueFactoryManagerI.h zeroc-ice-3.7.2/cpp/src/Ice/ValueFactoryManagerI.h
--- zeroc-ice-3.7.1/cpp/src/Ice/ValueFactoryManagerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/ValueFactoryManagerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_VALUE_FACTORY_MANAGER_I_H
 #define ICE_VALUE_FACTORY_MANAGER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/VirtualShared.h zeroc-ice-3.7.2/cpp/src/Ice/VirtualShared.h
--- zeroc-ice-3.7.1/cpp/src/Ice/VirtualShared.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/VirtualShared.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_VIRTUAL_SHARED_H
 #define ICE_VIRTUAL_SHARED_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSAcceptor.cpp zeroc-ice-3.7.2/cpp/src/Ice/WSAcceptor.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/WSAcceptor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSAcceptor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/WSAcceptor.h>
 #include <Ice/WSTransceiver.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSAcceptor.h zeroc-ice-3.7.2/cpp/src/Ice/WSAcceptor.h
--- zeroc-ice-3.7.1/cpp/src/Ice/WSAcceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSAcceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_WS_ACCEPTOR_I_H
 #define ICE_WS_ACCEPTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSConnector.cpp zeroc-ice-3.7.2/cpp/src/Ice/WSConnector.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/WSConnector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSConnector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/WSConnector.h>
 #include <Ice/WSTransceiver.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSConnector.h zeroc-ice-3.7.2/cpp/src/Ice/WSConnector.h
--- zeroc-ice-3.7.1/cpp/src/Ice/WSConnector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSConnector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_WSCONNECTOR_I_H
 #define ICE_WSCONNECTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSEndpoint.cpp zeroc-ice-3.7.2/cpp/src/Ice/WSEndpoint.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/WSEndpoint.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSEndpoint.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/WSEndpoint.h>
 #include <Ice/WSAcceptor.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSEndpoint.h zeroc-ice-3.7.2/cpp/src/Ice/WSEndpoint.h
--- zeroc-ice-3.7.1/cpp/src/Ice/WSEndpoint.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSEndpoint.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_WS_ENDPOINT_I_H
 #define ICE_WS_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSTransceiver.cpp zeroc-ice-3.7.2/cpp/src/Ice/WSTransceiver.cpp
--- zeroc-ice-3.7.1/cpp/src/Ice/WSTransceiver.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSTransceiver.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/WSTransceiver.h>
 #include <Ice/Endpoint.h>
@@ -1470,7 +1465,7 @@
                 return false;
             }
 
-            assert(buf.i = buf.b.begin());
+            assert(buf.i == buf.b.begin());
             prepareWriteHeader(OP_DATA, buf.b.size());
 
             _writeState = WriteStatePayload;
diff -Nru zeroc-ice-3.7.1/cpp/src/Ice/WSTransceiver.h zeroc-ice-3.7.2/cpp/src/Ice/WSTransceiver.h
--- zeroc-ice-3.7.1/cpp/src/Ice/WSTransceiver.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Ice/WSTransceiver.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_WS_TRANSCEIVER_I_H
 #define ICE_WS_TRANSCEIVER_I_H
@@ -140,7 +135,6 @@
 
     std::vector<Ice::Byte> _pingPayload;
 };
-typedef IceUtil::Handle<WSTransceiver> WSTransceiverPtr;
 
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBox/Admin.cpp zeroc-ice-3.7.2/cpp/src/IceBox/Admin.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBox/Admin.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBox/Admin.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,58 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <Ice/Application.h>
+#include <Ice/Ice.h>
 #include <Ice/SliceChecksums.h>
 #include <Ice/ConsoleUtil.h>
 #include <IceUtil/Options.h>
 #include <IceBox/IceBox.h>
 
 using namespace std;
-using namespace Ice;
 using namespace IceInternal;
 
-class Client : public Ice::Application
-{
-public:
+int run(const Ice::StringSeq&);
 
-    void usage();
-    virtual int run(int, char*[]);
-};
+Ice::CommunicatorPtr communicator;
 
-#ifdef _WIN32
+void
+destroyCommunicator(int)
+{
+    communicator->destroy();
+}
 
 int
+#ifdef _WIN32
 wmain(int argc, wchar_t* argv[])
-
 #else
-
-int
 main(int argc, char* argv[])
-
 #endif
 {
-    Client app;
-    return app.main(argc, argv);
+    int status = 0;
+
+    try
+    {
+        Ice::CtrlCHandler ctrlCHandler;
+        Ice::CommunicatorHolder ich(argc, argv);
+        communicator = ich.communicator();
+
+        ctrlCHandler.setCallback(&destroyCommunicator);
+
+        status = run(Ice::argsToStringSeq(argc, argv));
+    }
+    catch(const std::exception& ex)
+    {
+        consoleErr << ex.what() << endl;
+        status = 1;
+    }
+
+    return status;
 }
 
 void
-Client::usage()
+usage(const string& name)
 {
-    consoleErr << "Usage: " << appName() << " [options] [command...]\n";
+    consoleErr << "Usage: " << name << " [options] [command...]\n";
     consoleErr <<
         "Options:\n"
         "-h, --help           Show this message.\n"
@@ -58,7 +66,7 @@
 }
 
 int
-Client::run(int argc, char* argv[])
+run(const Ice::StringSeq& args)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -67,33 +75,33 @@
     vector<string> commands;
     try
     {
-        commands = opts.parse(argc, const_cast<const char**>(argv));
+        commands = opts.parse(args);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
         consoleErr << e.reason << endl;
-        usage();
-        return EXIT_FAILURE;
+        usage(args[0]);
+        return 1;
     }
 
     if(opts.isSet("help"))
     {
-        usage();
-        return EXIT_SUCCESS;
+        usage(args[0]);
+        return 0;
     }
     if(opts.isSet("version"))
     {
         consoleOut << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     if(commands.empty())
     {
-        usage();
-        return EXIT_FAILURE;
+        usage(args[0]);
+        return 1;
     }
 
-    ObjectPrxPtr base = communicator()->propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
+    Ice::ObjectPrxPtr base = communicator->propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
 
     if(base == 0)
     {
@@ -101,9 +109,9 @@
         // The old deprecated way to retrieve the service manager proxy
         //
 
-        PropertiesPtr properties = communicator()->getProperties();
+        Ice::PropertiesPtr properties = communicator->getProperties();
 
-        Identity managerIdentity;
+        Ice::Identity managerIdentity;
         managerIdentity.category = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox");
         managerIdentity.name = "ServiceManager";
 
@@ -113,32 +121,32 @@
             string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints");
             if(managerEndpoints.empty())
             {
-                consoleErr << appName() << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
+                return 1;
             }
 
-            managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" :" + managerEndpoints;
+            managerProxy = "\"" + communicator->identityToString(managerIdentity) + "\" :" + managerEndpoints;
         }
         else
         {
             string managerAdapterId = properties->getProperty("IceBox.ServiceManager.AdapterId");
             if(managerAdapterId.empty())
             {
-                consoleErr << appName() << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
+                return 1;
             }
 
-            managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" @" + managerAdapterId;
+            managerProxy = "\"" + communicator->identityToString(managerIdentity) + "\" @" + managerAdapterId;
         }
 
-        base = communicator()->stringToProxy(managerProxy);
+        base = communicator->stringToProxy(managerProxy);
     }
 
     IceBox::ServiceManagerPrxPtr manager = ICE_CHECKED_CAST(IceBox::ServiceManagerPrx, base);
     if(!manager)
     {
-        consoleErr << appName() << ": `" << base << "' is not an IceBox::ServiceManager" << endl;
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": `" << base << "' is not an IceBox::ServiceManager" << endl;
+        return 1;
     }
 
     for(vector<string>::const_iterator r = commands.begin(); r != commands.end(); ++r)
@@ -151,8 +159,8 @@
         {
             if(++r == commands.end())
             {
-                consoleErr << appName() << ": no service name specified." << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": no service name specified." << endl;
+                return 1;
             }
 
             try
@@ -161,20 +169,20 @@
             }
             catch(const IceBox::NoSuchServiceException&)
             {
-                consoleErr << appName() << ": unknown service `" << *r << "'" << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": unknown service `" << *r << "'" << endl;
+                return 1;
             }
             catch(const IceBox::AlreadyStartedException&)
             {
-                consoleErr << appName() << ": service already started." << endl;
+                consoleErr << args[0] << ": service already started." << endl;
             }
         }
         else if((*r) == "stop")
         {
             if(++r == commands.end())
             {
-                consoleErr << appName() << ": no service name specified." << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": no service name specified." << endl;
+                return 1;
             }
 
             try
@@ -183,21 +191,21 @@
             }
             catch(const IceBox::NoSuchServiceException&)
             {
-                consoleErr << appName() << ": unknown service `" << *r << "'" << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": unknown service `" << *r << "'" << endl;
+                return 1;
             }
             catch(const IceBox::AlreadyStoppedException&)
             {
-                consoleErr << appName() << ": service already stopped." << endl;
+                consoleErr << args[0] << ": service already stopped." << endl;
             }
         }
         else
         {
-            consoleErr << appName() << ": unknown command `" << *r << "'" << endl;
-            usage();
-            return EXIT_FAILURE;
+            consoleErr << args[0] << ": unknown command `" << *r << "'" << endl;
+            usage(args[0]);
+            return 1;
         }
     }
 
-    return EXIT_SUCCESS;
+    return 0;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBox/Exception.cpp zeroc-ice-3.7.2/cpp/src/IceBox/Exception.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBox/Exception.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBox/Exception.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBox/IceBox.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBox/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceBox/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceBox/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBox/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := IceBox
 $(project)_programs     := icebox iceboxadmin
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBox/Service.cpp zeroc-ice-3.7.2/cpp/src/IceBox/Service.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBox/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBox/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBox/ServiceManagerI.cpp zeroc-ice-3.7.2/cpp/src/IceBox/ServiceManagerI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBox/ServiceManagerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBox/ServiceManagerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
@@ -361,12 +356,11 @@
             throw FailureException(__FILE__, __LINE__, "ServiceManager: configuration must include at least one IceBox service");
         }
 
-        PropertyDict::iterator p;
         StringSeq loadOrder = properties->getPropertyAsList("IceBox.LoadOrder");
         vector<StartServiceInfo> servicesInfo;
         for(StringSeq::const_iterator q = loadOrder.begin(); q != loadOrder.end(); ++q)
         {
-            p = services.find(prefix + *q);
+            PropertyDict::iterator p = services.find(prefix + *q);
             if(p == services.end())
             {
                 throw FailureException(__FILE__, __LINE__, "ServiceManager: no service definition for `" +
@@ -375,7 +369,7 @@
             servicesInfo.push_back(StartServiceInfo(*q, p->second, _argv));
             services.erase(p);
         }
-        for(p = services.begin(); p != services.end(); ++p)
+        for(PropertyDict::iterator p = services.begin(); p != services.end(); ++p)
         {
             servicesInfo.push_back(StartServiceInfo(p->first.substr(prefix.size()), p->second, _argv));
         }
@@ -623,6 +617,7 @@
             if(initData.properties->getProperty("Ice.LogFile").empty()
 #ifndef _WIN32
                && initData.properties->getPropertyAsInt("Ice.UseSyslog") <= 0
+               && initData.properties->getPropertyAsInt("Ice.UseSystemdJournal") <= 0
 #endif
                )
             {
@@ -839,6 +834,10 @@
         // leak detector doesn't report potential leaks, and the communicator must be destroyed before
         // the library is released since the library will destroy its global state.
         //
+
+#ifdef ICE_CPP11_MAPPING
+        info.service = 0;
+#else
         try
         {
             info.service = 0;
@@ -854,7 +853,7 @@
             Warning out(_logger);
             out << "ServiceManager: unknown exception while stopping service " << info.name;
         }
-
+#endif
         if(info.communicator)
         {
             removeAdminFacets("IceBox.Service." + info.name + ".");
@@ -884,15 +883,7 @@
     {
         removeAdminFacets("IceBox.SharedCommunicator.");
 
-        try
-        {
-            _sharedCommunicator->destroy();
-        }
-        catch(const std::exception& ex)
-        {
-            Warning out(_logger);
-            out << "ServiceManager: exception while destroying shared communicator:\n" << ex;
-        }
+        _sharedCommunicator->destroy();
         _sharedCommunicator = 0;
     }
 
@@ -1060,9 +1051,9 @@
     auto p = _observers.find(observer);
     if(p != _observers.end())
     {
-        auto observer = *p;
+        auto found = *p;
         _observers.erase(p);
-        observerRemoved(observer, ex);
+        observerRemoved(found, ex);
     }
 }
 #else
@@ -1085,7 +1076,7 @@
         set<ServiceObserverPrx>::iterator p = _observers.find(observer);
         if(p != _observers.end())
         {
-            ServiceObserverPrx observer = *p;
+            observer = *p;
             _observers.erase(p);
             observerRemoved(observer, ex);
         }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBox/ServiceManagerI.h zeroc-ice-3.7.2/cpp/src/IceBox/ServiceManagerI.h
--- zeroc-ice-3.7.1/cpp/src/IceBox/ServiceManagerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBox/ServiceManagerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SERVICE_MANAGER_I_H
 #define SERVICE_MANAGER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBridge/IceBridge.cpp zeroc-ice-3.7.2/cpp/src/IceBridge/IceBridge.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBridge/IceBridge.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBridge/IceBridge.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Connection.h>
 #include <Ice/ObjectAdapter.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBridge/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceBridge/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceBridge/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBridge/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_programs             := icebridge
 $(project)_dependencies         := Ice
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/AcceptorI.cpp zeroc-ice-3.7.2/cpp/src/IceBT/AcceptorI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/AcceptorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/AcceptorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/AcceptorI.h>
 #include <IceBT/Engine.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/AcceptorI.h zeroc-ice-3.7.2/cpp/src/IceBT/AcceptorI.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/AcceptorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/AcceptorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_ACCEPTOR_I_H
 #define ICE_BT_ACCEPTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Config.h zeroc-ice-3.7.2/cpp/src/IceBT/Config.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_CONFIG_H
 #define ICE_BT_CONFIG_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/ConnectorI.cpp zeroc-ice-3.7.2/cpp/src/IceBT/ConnectorI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/ConnectorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/ConnectorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/ConnectorI.h>
 #include <IceBT/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/ConnectorI.h zeroc-ice-3.7.2/cpp/src/IceBT/ConnectorI.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/ConnectorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/ConnectorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_CONNECTOR_I_H
 #define ICE_BT_CONNECTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/DBus.cpp zeroc-ice-3.7.2/cpp/src/IceBT/DBus.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/DBus.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/DBus.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/DBus.h>
 #include <IceUtil/Thread.h>
@@ -751,9 +746,9 @@
             //
             string sig = ::dbus_message_iter_get_signature(_iter);
             string::iterator p = sig.begin();
-            TypePtr t = buildType(p);
+            TypePtr vt = buildType(p);
             VariantValuePtr v = new VariantValue;
-            v->v = readValue(t);
+            v->v = readValue(vt);
             popIter();
             return v;
         }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/DBus.h zeroc-ice-3.7.2/cpp/src/IceBT/DBus.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/DBus.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/DBus.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_DBUS_H
 #define ICE_BT_DBUS_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/EndpointI.cpp zeroc-ice-3.7.2/cpp/src/IceBT/EndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/EndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/EndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/EndpointI.h>
 #include <IceBT/AcceptorI.h>
@@ -171,7 +166,7 @@
 }
 
 void
-IceBT::EndpointI::connectors_async(EndpointSelectionType selType, const IceInternal::EndpointI_connectorsPtr& cb) const
+IceBT::EndpointI::connectors_async(EndpointSelectionType /*selType*/, const IceInternal::EndpointI_connectorsPtr& cb) const
 {
     vector<IceInternal::ConnectorPtr> connectors;
     connectors.push_back(new ConnectorI(_instance, _addr, _uuid, _timeout, _connectionId));
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/EndpointI.h zeroc-ice-3.7.2/cpp/src/IceBT/EndpointI.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/EndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/EndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_ENDPOINT_I_H
 #define ICE_BT_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Engine.cpp zeroc-ice-3.7.2/cpp/src/IceBT/Engine.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/Engine.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Engine.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/Engine.h>
 #include <IceBT/DBus.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/EngineF.h zeroc-ice-3.7.2/cpp/src/IceBT/EngineF.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/EngineF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/EngineF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_ENGINE_F_H
 #define ICE_BT_ENGINE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Engine.h zeroc-ice-3.7.2/cpp/src/IceBT/Engine.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/Engine.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Engine.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_ENGINE_H
 #define ICE_BT_ENGINE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Instance.cpp zeroc-ice-3.7.2/cpp/src/IceBT/Instance.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/Instance.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Instance.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/Instance.h>
 #include <IceBT/Engine.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/InstanceF.h zeroc-ice-3.7.2/cpp/src/IceBT/InstanceF.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/InstanceF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/InstanceF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_INSTANCE_F_H
 #define ICE_BT_INSTANCE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Instance.h zeroc-ice-3.7.2/cpp/src/IceBT/Instance.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/Instance.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Instance.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_INSTANCE_H
 #define ICE_BT_INSTANCE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceBT/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceBT/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Only build the IceBT plugin if Bluetooth system libraries are available (Bluez/DBus)
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/PluginI.cpp zeroc-ice-3.7.2/cpp/src/IceBT/PluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/PluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/PluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/PluginI.h>
 #include <IceBT/EndpointI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/PluginI.h zeroc-ice-3.7.2/cpp/src/IceBT/PluginI.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/PluginI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/PluginI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_PLUGIN_I_H
 #define ICE_BT_PLUGIN_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/StreamSocket.cpp zeroc-ice-3.7.2/cpp/src/IceBT/StreamSocket.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/StreamSocket.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/StreamSocket.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/StreamSocket.h>
 #include <IceBT/EndpointInfo.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/StreamSocket.h zeroc-ice-3.7.2/cpp/src/IceBT/StreamSocket.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/StreamSocket.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/StreamSocket.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_STREAM_SOCKET_H
 #define ICE_BT_STREAM_SOCKET_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/TransceiverI.cpp zeroc-ice-3.7.2/cpp/src/IceBT/TransceiverI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/TransceiverI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/TransceiverI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/TransceiverI.h>
 #include <IceBT/ConnectionInfo.h>
@@ -31,7 +26,7 @@
 }
 
 IceInternal::SocketOperation
-IceBT::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
+IceBT::TransceiverI::initialize(IceInternal::Buffer& /*readBuffer*/, IceInternal::Buffer& /*writeBuffer*/)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/TransceiverI.h zeroc-ice-3.7.2/cpp/src/IceBT/TransceiverI.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/TransceiverI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/TransceiverI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_TRANSCEIVER_H
 #define ICE_BT_TRANSCEIVER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Util.cpp zeroc-ice-3.7.2/cpp/src/IceBT/Util.cpp
--- zeroc-ice-3.7.1/cpp/src/IceBT/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceBT/Util.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceBT/Util.h zeroc-ice-3.7.2/cpp/src/IceBT/Util.h
--- zeroc-ice-3.7.1/cpp/src/IceBT/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceBT/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_BT_UTIL_H
 #define ICE_BT_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDB/IceDB.cpp zeroc-ice-3.7.2/cpp/src/IceDB/IceDB.cpp
--- zeroc-ice-3.7.1/cpp/src/IceDB/IceDB.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDB/IceDB.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceDB/IceDB.h>
 #include <Ice/Initialize.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDB/IceDB.h zeroc-ice-3.7.2/cpp/src/IceDB/IceDB.h
--- zeroc-ice-3.7.1/cpp/src/IceDB/IceDB.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDB/IceDB.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_DB_H
 #define ICE_DB_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDB/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceDB/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceDB/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDB/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    = IceDB
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDB/msbuild/icedb.vcxproj zeroc-ice-3.7.2/cpp/src/IceDB/msbuild/icedb.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceDB/msbuild/icedb.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDB/msbuild/icedb.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -116,17 +116,17 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" />
-    <Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
-    <Import Project="..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDB/msbuild/packages.config zeroc-ice-3.7.2/cpp/src/IceDB/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceDB/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDB/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="lmdb.v120" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v140" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v141" version="0.9.19.3" targetFramework="native" />
+  <package id="lmdb.v120" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v141" version="0.9.23" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDiscovery/LocatorI.cpp zeroc-ice-3.7.2/cpp/src/IceDiscovery/LocatorI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceDiscovery/LocatorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDiscovery/LocatorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceDiscovery/LocatorI.h>
 #include <IceDiscovery/LookupI.h>
@@ -14,6 +9,8 @@
 #include <Ice/Communicator.h>
 #include <Ice/ObjectAdapter.h>
 
+#include <IceUtil/Random.h>
+
 #include <iterator>
 
 using namespace std;
@@ -172,7 +169,7 @@
         return 0;
     }
 
-    random_shuffle(adapterIds.begin(), adapterIds.end());
+    IceUtilInternal::shuffle(adapterIds.begin(), adapterIds.end());
     return prx->ice_adapterId(adapterIds[0]);
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDiscovery/LocatorI.h zeroc-ice-3.7.2/cpp/src/IceDiscovery/LocatorI.h
--- zeroc-ice-3.7.1/cpp/src/IceDiscovery/LocatorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDiscovery/LocatorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef LOCATORI_H
 #define LOCATORI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDiscovery/LookupI.cpp zeroc-ice-3.7.2/cpp/src/IceDiscovery/LookupI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceDiscovery/LookupI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDiscovery/LookupI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Connection.h>
 #include <Ice/ObjectAdapter.h>
@@ -196,9 +191,9 @@
         {
             rethrow_exception(ex);
         }
-        catch(const Ice::LocalException& ex)
+        catch(const Ice::LocalException& e)
         {
-            self->_lookup->adapterRequestException(self, ex);
+            self->_lookup->adapterRequestException(self, e);
         }
     });
 #else
@@ -235,9 +230,9 @@
         {
             rethrow_exception(ex);
         }
-        catch(const Ice::LocalException& ex)
+        catch(const Ice::LocalException& e)
         {
-            self->_lookup->objectRequestException(self, ex);
+            self->_lookup->objectRequestException(self, e);
         }
     });
 #else
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDiscovery/LookupI.h zeroc-ice-3.7.2/cpp/src/IceDiscovery/LookupI.h
--- zeroc-ice-3.7.1/cpp/src/IceDiscovery/LookupI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDiscovery/LookupI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef LOOKUPI_H
 #define LOOKUPI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDiscovery/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceDiscovery/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceDiscovery/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDiscovery/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries := IceDiscovery
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDiscovery/PluginI.cpp zeroc-ice-3.7.2/cpp/src/IceDiscovery/PluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceDiscovery/PluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDiscovery/PluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceDiscovery/PluginI.h zeroc-ice-3.7.2/cpp/src/IceDiscovery/PluginI.h
--- zeroc-ice-3.7.1/cpp/src/IceDiscovery/PluginI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceDiscovery/PluginI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef PLUGIN_I_H
 #define PLUGIN_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Activator.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Activator.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Activator.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Activator.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ArgVector.h>
 #include <IceUtil/FileUtil.h>
@@ -83,17 +78,14 @@
     // Send any errors to the parent process, using the write
     // end of the pipe.
     //
-    char msg[500];
-    strcpy(msg, cannot);
-    strcat(msg, " `");
-    strcat(msg, name);
-    strcat(msg, "'");
+    ostringstream os;
+    os << cannot << " `" << name << "'";
     if(err)
     {
-        strcat(msg, ": ");
-        strcat(msg, strerror(err));
+        os << ": " << IceUtilInternal::errorToString(err) << endl;
     }
-    ssize_t sz = write(fd, msg, strlen(msg));
+    const string msg = os.str();
+    ssize_t sz = write(fd, msg.c_str(), msg.size());
     if(sz == -1)
     {
         Ice::Warning out(traceLevels->logger);
@@ -267,7 +259,6 @@
             }
         }
         throw BadSignalException("unknown signal `" + str + "'");
-        return SIGTERM; // Keep the compiler happy.
     }
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Activator.h zeroc-ice-3.7.2/cpp/src/IceGrid/Activator.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Activator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Activator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_ACTIVATOR_H
 #define ICE_GRID_ACTIVATOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdapterCache.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/AdapterCache.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdapterCache.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdapterCache.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Random.h>
 #include <Ice/Communicator.h>
@@ -375,7 +370,7 @@
 
 void
 ServerAdapterEntry::getLocatorAdapterInfo(LocatorAdapterInfoSeq& adapters, int& nReplicas, bool& replicaGroup,
-                                          bool& roundRobin, string& filter, const set<string>&)
+                                          bool& roundRobin, string&, const set<string>&)
 {
     nReplicas = 1;
     replicaGroup = false;
@@ -645,8 +640,7 @@
         else if(AdaptiveLoadBalancingPolicyPtr::dynamicCast(_loadBalancing))
         {
             replicas = _replicas;
-            RandomNumberGenerator rng;
-            random_shuffle(replicas.begin(), replicas.end(), rng);
+            IceUtilInternal::shuffle(replicas.begin(), replicas.end());
             loadSample = _loadSample;
             adaptive = true;
         }
@@ -658,8 +652,7 @@
         else if(RandomLoadBalancingPolicyPtr::dynamicCast(_loadBalancing))
         {
             replicas = _replicas;
-            RandomNumberGenerator rng;
-            random_shuffle(replicas.begin(), replicas.end(), rng);
+            IceUtilInternal::shuffle(replicas.begin(), replicas.end());
         }
     }
 
@@ -762,8 +755,7 @@
     }
     else
     {
-        RandomNumberGenerator rng;
-        random_shuffle(replicas.begin(), replicas.end(), rng);
+        IceUtilInternal::shuffle(replicas.begin(), replicas.end());
         vector<pair<float, ServerAdapterEntryPtr> > rl;
         transform(replicas.begin(), replicas.end(), back_inserter(rl), TransformToReplicaLoad(loadSample));
         return min_element(rl.begin(), rl.end(), ReplicaLoadComp())->first;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdapterCache.h zeroc-ice-3.7.2/cpp/src/IceGrid/AdapterCache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdapterCache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdapterCache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_ADAPTERCACHE_H
 #define ICE_GRID_ADAPTERCACHE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminCallbackRouter.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/AdminCallbackRouter.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminCallbackRouter.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminCallbackRouter.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/AdminCallbackRouter.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminCallbackRouter.h zeroc-ice-3.7.2/cpp/src/IceGrid/AdminCallbackRouter.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminCallbackRouter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminCallbackRouter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H
 #define ICE_GRID_ADMIN_CALLBACK_ROUTER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/AdminI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UUID.h>
 
@@ -434,9 +429,9 @@
             _proxy.handleException(ex);
             assert(false);
         }
-        catch(const Ice::Exception& ex)
+        catch(const Ice::Exception& e)
         {
-            _amdCB->ice_exception(ex);
+            _amdCB->ice_exception(e);
         }
     }
 
@@ -491,9 +486,9 @@
         {
             _amdCB->ice_response();
         }
-        catch(const Ice::Exception& ex)
+        catch(const Ice::Exception& e)
         {
-            _amdCB->ice_exception(ex);
+            _amdCB->ice_exception(e);
         }
     }
 
@@ -802,7 +797,6 @@
         os << ex;
         throw NodeUnreachableException(name, os.str());
     }
-    return LoadInfo(); // Keep the compiler happy.
 }
 
 int
@@ -865,7 +859,6 @@
         ostringstream os;
         os << ex;
         throw NodeUnreachableException(name, os.str());
-        return ""; // Keep the compiler happy.
     }
 }
 
@@ -926,7 +919,6 @@
     {
         return false;
     }
-    return false;
 }
 
 void
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminI.h zeroc-ice-3.7.2/cpp/src/IceGrid/AdminI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_ADMIN_I_H
 #define ICE_GRID_ADMIN_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminRouter.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/AdminRouter.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminRouter.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminRouter.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/AdminRouter.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminRouter.h zeroc-ice-3.7.2/cpp/src/IceGrid/AdminRouter.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminRouter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminRouter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_ADMIN_ROUTER_H
 #define ICE_GRID_ADMIN_ROUTER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminSessionI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/AdminSessionI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminSessionI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminSessionI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/UUID.h>
@@ -101,7 +96,6 @@
         os << ex;
         throw FileNotAvailableException(os.str());
     }
-    return false; // Keep the compiler happy.
 }
 
 void
@@ -291,7 +285,6 @@
     catch(const SynchronizationException&)
     {
         throw DeploymentException("server is being updated");
-        return 0;
     }
 }
 
@@ -305,7 +298,6 @@
     catch(const SynchronizationException&)
     {
         throw DeploymentException("server is being updated");
-        return 0;
     }
 }
 
@@ -319,7 +311,6 @@
     catch(const SynchronizationException&)
     {
         throw DeploymentException("server is being updated");
-        return 0;
     }
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AdminSessionI.h zeroc-ice-3.7.2/cpp/src/IceGrid/AdminSessionI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AdminSessionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AdminSessionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_ADMINSESSIONI_H
 #define ICEGRID_ADMINSESSIONI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Allocatable.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Allocatable.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Allocatable.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Allocatable.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/Allocatable.h>
 #include <IceGrid/SessionI.h>
@@ -272,7 +267,8 @@
                     allocatable = dequeueAllocationAttempt(request);
                     if(!allocatable)
                     {
-                        assert(_count == 0 && _requests.empty());
+                        assert(_requests.empty());
+                        assert(_count == 0);
                         _releasing = false;
                         notifyAll();
                         return;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Allocatable.h zeroc-ice-3.7.2/cpp/src/IceGrid/Allocatable.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Allocatable.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Allocatable.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_ALLOCATABLE_H
 #define ICE_GRID_ALLOCATABLE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AllocatableObjectCache.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/AllocatableObjectCache.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AllocatableObjectCache.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AllocatableObjectCache.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Random.h>
 #include <Ice/Communicator.h>
@@ -216,8 +211,7 @@
     }
 
     vector<AllocatableObjectEntryPtr> objects = p->second.getObjects();
-    RandomNumberGenerator rng;
-    random_shuffle(objects.begin(), objects.end(), rng); // TODO: OPTIMIZE
+    IceUtilInternal::shuffle(objects.begin(), objects.end()); // TODO: OPTIMIZE
     int allocatable = 0;
     try
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/AllocatableObjectCache.h zeroc-ice-3.7.2/cpp/src/IceGrid/AllocatableObjectCache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/AllocatableObjectCache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/AllocatableObjectCache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H
 #define ICE_GRID_ALLOCATABLEOBJECTCACHE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Cache.h zeroc-ice-3.7.2/cpp/src/IceGrid/Cache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Cache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Cache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_CACHE_H
 #define ICE_GRID_CACHE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Client.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Client.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Thread.h>
@@ -37,10 +31,7 @@
 #endif
 
 using namespace std;
-using namespace Ice;
 using namespace IceInternal;
-using namespace IceLocatorDiscovery;
-using namespace IceGrid;
 
 class Client;
 
@@ -48,7 +39,8 @@
 {
 
 IceUtil::Mutex* _staticMutex = 0;
-Client* _globalClient = 0;
+Ice::CommunicatorPtr communicator;
+IceGrid::ParserPtr parser;
 
 class Init
 {
@@ -70,128 +62,68 @@
 
 }
 
-class SessionKeepAliveThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
+class ReuseConnectionRouter : public Ice::Router
 {
 public:
 
-    SessionKeepAliveThread(const AdminSessionPrx& session, long timeout) :
-        IceUtil::Thread("IceGrid admin session keepalive thread"),
-        _session(session),
-        _timeout(IceUtil::Time::seconds(timeout)),
-        _destroy(false)
-    {
-    }
-
-    virtual void
-    run()
+    ReuseConnectionRouter(const Ice::ObjectPrx& proxy) : _clientProxy(proxy)
     {
-        Lock sync(*this);
-        while(!_destroy)
-        {
-            timedWait(_timeout);
-            if(_destroy)
-            {
-                break;
-            }
-            try
-            {
-                _session->keepAlive();
-            }
-            catch(const Exception&)
-            {
-                break;
-            }
-        }
     }
 
-    void
-    destroy()
-    {
-        Lock sync(*this);
-        _destroy = true;
-        notify();
-    }
-
-private:
-
-    AdminSessionPrx _session;
-    const IceUtil::Time _timeout;
-    bool _destroy;
-};
-typedef IceUtil::Handle<SessionKeepAliveThread> SessionKeepAliveThreadPtr;
-
-class ReuseConnectionRouter : public Router
-{
-public:
-
-    ReuseConnectionRouter(const ObjectPrx& proxy) : _clientProxy(proxy)
-    {
-    }
-
-    virtual ObjectPrx
-    getClientProxy(IceUtil::Optional<bool>& hasRoutingTable, const Current&) const
+    virtual Ice::ObjectPrx
+    getClientProxy(IceUtil::Optional<bool>& hasRoutingTable, const Ice::Current&) const
     {
         hasRoutingTable = false;
         return _clientProxy;
     }
 
-    virtual ObjectPrx
-    getServerProxy(const Current&) const
+    virtual Ice::ObjectPrx
+    getServerProxy(const Ice::Current&) const
     {
         return 0;
     }
 
     virtual void
-    addProxy(const ObjectPrx&, const Current&)
+    addProxy(const Ice::ObjectPrx&, const Ice::Current&)
     {
     }
 
-    virtual ObjectProxySeq
-    addProxies(const ObjectProxySeq&, const Current&)
+    virtual Ice::ObjectProxySeq
+    addProxies(const Ice::ObjectProxySeq&, const Ice::Current&)
     {
-        return ObjectProxySeq();
+        return Ice::ObjectProxySeq();
     }
 
 private:
 
-    const ObjectPrx _clientProxy;
+    const Ice::ObjectPrx _clientProxy;
 };
 
-class Client : public IceUtil::Monitor<IceUtil::Mutex>
-{
-public:
-
-    void usage();
-    int main(StringSeq& args);
-    int run(StringSeq& args);
-    void interrupted();
-
-    CommunicatorPtr communicator() const { return _communicator; }
-    const string& appName() const { return _appName; }
-
-    string getPassword(const string&);
-
-private:
-
-    IceUtil::CtrlCHandler _ctrlCHandler;
-    CommunicatorPtr _communicator;
-    string _appName;
-    ParserPtr _parser;
-};
+int run(const Ice::StringSeq&);
 
+//
+// Callback for CtrlCHandler
+//
 static void
 interruptCallback(int /*signal*/)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
-    if(_globalClient)
+    if(parser) // If there's an interactive parser, notify the parser.
     {
-        _globalClient->interrupted();
+        parser->interrupt();
+    }
+    else
+    {
+        //
+        // Otherwise, destroy the communicator.
+        //
+        assert(communicator);
+        communicator->destroy();
     }
 }
 
-#ifdef _WIN32
-
 int
+#ifdef _WIN32
 wmain(int argc, wchar_t* argv[])
 {
     //
@@ -199,129 +131,104 @@
     //
     _setmode(_fileno(stdin), _O_BINARY);
 #else
-
-int
 main(int argc, char* argv[])
 {
 #endif
-    Client app;
-    StringSeq args = argsToStringSeq(argc, argv);
-    return app.main(args);
-}
-
-void
-Client::usage()
-{
-    consoleErr << "Usage: " << appName() << " [options]\n";
-    consoleErr <<
-        "Options:\n"
-        "-h, --help           Show this message.\n"
-        "-v, --version        Display the Ice version.\n"
-        "-e COMMANDS          Execute COMMANDS.\n"
-        "-d, --debug          Print debug messages.\n"
-        "-s, --server         Start icegridadmin as a server (to parse XML files).\n"
-        "-i, --instanceName   Connect to the registry with the given instance name.\n"
-        "-H, --host           Connect to the registry at the given host.\n"
-        "-P, --port           Connect to the registry running on the given port.\n"
-        "-u, --username       Login with the given username.\n"
-        "-p, --password       Login with the given password.\n"
-        "-S, --ssl            Authenticate through SSL.\n"
-        "-r, --replica NAME   Connect to the replica NAME.\n"
-        ;
-}
-
-extern "C" ICE_LOCATOR_DISCOVERY_API Ice::Plugin*
-createIceLocatorDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&);
-
-int
-Client::main(StringSeq& args)
-{
-    int status = EXIT_SUCCESS;
+    int status = 0;
+    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
 
     try
     {
-        _appName = args[0];
-        InitializationData id;
-        id.properties = createProperties(args);
+        Ice::CtrlCHandler ctrlCHandler;
+        Ice::PropertiesPtr defaultProps = Ice::createProperties();
+        defaultProps->setProperty("IceGridAdmin.Server.Endpoints", "tcp -h localhost");
+        Ice::InitializationData id;
+        id.properties = createProperties(args, defaultProps);
         id.properties->setProperty("Ice.Warn.Endpoints", "0");
-        _communicator = initialize(id);
+        Ice::CommunicatorHolder ich(id);
+        communicator = ich.communicator();
 
-        {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_staticMutex);
-            _globalClient = this;
-        }
-        _ctrlCHandler.setCallback(interruptCallback);
+        ctrlCHandler.setCallback(interruptCallback);
 
         try
         {
             status = run(args);
         }
-        catch(const CommunicatorDestroyedException&)
+        catch(const Ice::CommunicatorDestroyedException&)
         {
             // Expected if the client is interrupted during the initialization.
         }
     }
     catch(const IceUtil::Exception& ex)
     {
-        consoleErr << _appName << ": " << ex << endl;
-        status = EXIT_FAILURE;
+        consoleErr << args[0] << ": " << ex << endl;
+        status = 1;
     }
     catch(const std::exception& ex)
     {
-        consoleErr << _appName << ": std::exception: " << ex.what() << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(const std::string& msg)
-    {
-        consoleErr << _appName << ": " << msg << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << _appName << ": " << msg << endl;
-        status = EXIT_FAILURE;
+        consoleErr << args[0] << ": std::exception: " << ex.what() << endl;
+        status = 1;
     }
     catch(...)
     {
-        consoleErr << _appName << ": unknown exception" << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(_communicator)
-    {
-        _communicator->destroy();
-    }
-
-    _ctrlCHandler.setCallback(0);
-    {
-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_staticMutex);
-        _globalClient = 0;
+        consoleErr << args[0] << ": unknown exception" << endl;
+        status = 1;
     }
 
     return status;
-
 }
 
 void
-Client::interrupted()
+usage(const string& name)
 {
-    Lock sync(*this);
-    if(_parser) // If there's an interactive parser, notify the parser.
-    {
-        _parser->interrupt();
-    }
-    else
+    consoleErr << "Usage: " << name << " [options]\n";
+    consoleErr <<
+        "Options:\n"
+        "-h, --help           Show this message.\n"
+        "-v, --version        Display the Ice version.\n"
+        "-e COMMANDS          Execute COMMANDS.\n"
+        "-d, --debug          Print debug messages.\n"
+        "-s, --server         Start icegridadmin as a server (to parse XML files).\n"
+        "-i, --instanceName   Connect to the registry with the given instance name.\n"
+        "-H, --host           Connect to the registry at the given host.\n"
+        "-P, --port           Connect to the registry running on the given port.\n"
+        "-u, --username       Login with the given username.\n"
+        "-p, --password       Login with the given password.\n"
+        "-S, --ssl            Authenticate through SSL.\n"
+        "-r, --replica NAME   Connect to the replica NAME.\n"
+        ;
+}
+
+string
+getPassword(const string& prompt)
+{
+    consoleOut << prompt << flush;
+    string password;
+#ifndef _WIN32
+    struct termios oldConf;
+    struct termios newConf;
+    tcgetattr(0, &oldConf);
+    newConf = oldConf;
+    newConf.c_lflag &= (~ECHO);
+    tcsetattr(0, TCSANOW, &newConf);
+    getline(cin, password);
+    tcsetattr(0, TCSANOW, &oldConf);
+#else
+    char c;
+    while((c = static_cast<char>(_getch())) != '\r')
     {
-        //
-        // Otherwise, destroy the communicator.
-        //
-        assert(_communicator);
-        _communicator->destroy();
+        password += c;
     }
+#endif
+    consoleOut << endl;
+    return IceUtilInternal::trim(password);
 }
 
+extern "C" ICE_LOCATOR_DISCOVERY_API Ice::Plugin*
+createIceLocatorDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&);
+
 int
-Client::run(StringSeq& originalArgs)
+run(const Ice::StringSeq& args)
 {
     string commands;
     bool debug;
@@ -340,45 +247,42 @@
     opts.addOpt("s", "server");
     opts.addOpt("r", "replica", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::NoRepeat);
 
-    vector<string> args;
     try
     {
-        args = opts.parse(originalArgs);
+        if(!opts.parse(args).empty())
+        {
+            consoleErr << args[0] << ": too many arguments" << endl;
+            usage(args[0]);
+            return 1;
+        }
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
         consoleErr << e.reason << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-    if(!args.empty())
-    {
-        consoleErr << _appName << ": too many arguments" << endl;
-        usage();
-        return EXIT_FAILURE;
+        usage(args[0]);
+        return 1;
     }
 
     if(opts.isSet("help"))
     {
-        usage();
-        return EXIT_SUCCESS;
+        usage(args[0]);
+        return 0;
     }
     if(opts.isSet("version"))
     {
         consoleOut << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     if(opts.isSet("server"))
     {
-        ObjectAdapterPtr adapter =
-            communicator()->createObjectAdapterWithEndpoints("FileParser", "tcp -h localhost");
+        Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("IceGridAdmin.Server");
         adapter->activate();
-        ObjectPrx proxy = adapter->add(new FileParserI, stringToIdentity("FileParser"));
+        Ice::ObjectPrx proxy = adapter->add(new FileParserI, Ice::stringToIdentity("FileParser"));
         consoleOut << proxy << endl;
 
-        communicator()->waitForShutdown();
-        return EXIT_SUCCESS;
+        communicator->waitForShutdown();
+        return 0;
     }
 
     if(opts.isSet("e"))
@@ -391,47 +295,47 @@
     }
     debug = opts.isSet("debug");
 
-    bool ssl = communicator()->getProperties()->getPropertyAsInt("IceGridAdmin.AuthenticateUsingSSL");
+    bool ssl = communicator->getProperties()->getPropertyAsInt("IceGridAdmin.AuthenticateUsingSSL") > 0;
     if(opts.isSet("ssl"))
     {
         ssl = true;
     }
 
-    string id = communicator()->getProperties()->getProperty("IceGridAdmin.Username");
+    string id = communicator->getProperties()->getProperty("IceGridAdmin.Username");
     if(!opts.optArg("username").empty())
     {
         id = opts.optArg("username");
     }
-    string password = communicator()->getProperties()->getProperty("IceGridAdmin.Password");
+    string password = communicator->getProperties()->getProperty("IceGridAdmin.Password");
     if(!opts.optArg("password").empty())
     {
         password = opts.optArg("password");
     }
 
-    string host = communicator()->getProperties()->getProperty("IceGridAdmin.Host");
+    string host = communicator->getProperties()->getProperty("IceGridAdmin.Host");
     if(!opts.optArg("host").empty())
     {
         host = opts.optArg("host");
     }
 
-    string instanceName = communicator()->getProperties()->getProperty("IceGridAdmin.InstanceName");
+    string instanceName = communicator->getProperties()->getProperty("IceGridAdmin.InstanceName");
     if(!opts.optArg("instanceName").empty())
     {
         instanceName = opts.optArg("instanceName");
     }
 
-    int port = communicator()->getProperties()->getPropertyAsInt("IceGridAdmin.Port");
+    int port = communicator->getProperties()->getPropertyAsInt("IceGridAdmin.Port");
     if(!opts.optArg("port").empty())
     {
         istringstream is(opts.optArg("port"));
         if(!(is >> port))
         {
-            consoleErr << _appName << ": given port number is not a numeric value" << endl;
-            return EXIT_FAILURE;
+            consoleErr << args[0] << ": given port number is not a numeric value" << endl;
+            return 1;
         }
     }
 
-    PropertiesPtr properties = communicator()->getProperties();
+    Ice::PropertiesPtr properties = communicator->getProperties();
     string replica = properties->getProperty("IceGridAdmin.Replica");
     if(!opts.optArg("replica").empty())
     {
@@ -439,14 +343,12 @@
     }
 
     Glacier2::RouterPrx router;
-    AdminSessionPrx session;
-    SessionKeepAliveThreadPtr keepAlive;
-    int status = EXIT_SUCCESS;
+    IceGrid::AdminSessionPrx session;
+    int status = 0;
     try
     {
-        int sessionTimeout;
         int acmTimeout = 0;
-        if(!communicator()->getDefaultLocator() && !communicator()->getDefaultRouter())
+        if(!communicator->getDefaultLocator() && !communicator->getDefaultRouter())
         {
             if(!host.empty())
             {
@@ -455,21 +357,21 @@
                 os << "Ice/LocatorFinder" << (ssl ? " -s" : "");
                 os << ":tcp -h \"" << host << "\" -p " << (port == 0 ? 4061 : port) << " -t " << timeout;
                 os << ":ssl -h \"" << host << "\" -p " << (port == 0 ? 4062 : port) << " -t " << timeout;
-                LocatorFinderPrx finder = LocatorFinderPrx::uncheckedCast(communicator()->stringToProxy(os.str()));
+                Ice::LocatorFinderPrx finder = Ice::LocatorFinderPrx::uncheckedCast(communicator->stringToProxy(os.str()));
                 try
                 {
-                    communicator()->setDefaultLocator(finder->getLocator());
+                    communicator->setDefaultLocator(finder->getLocator());
                 }
                 catch(const Ice::LocalException&)
                 {
                     // Ignore.
                 }
                 if(!instanceName.empty() &&
-                   communicator()->getDefaultLocator()->ice_getIdentity().category != instanceName)
+                   communicator->getDefaultLocator()->ice_getIdentity().category != instanceName)
                 {
-                    consoleErr << _appName << ": registry running on `" << host << "' uses a different instance name:\n";
-                    consoleErr << communicator()->getDefaultLocator()->ice_getIdentity().category << endl;
-                    return EXIT_FAILURE;
+                    consoleErr << args[0] << ": registry running on `" << host << "' uses a different instance name:\n";
+                    consoleErr << communicator->getDefaultLocator()->ice_getIdentity().category << endl;
+                    return 1;
                 }
             }
             else
@@ -480,8 +382,8 @@
                 // to lookup for locator proxies. We destroy the plugin, once we have selected a
                 // locator.
                 //
-                Ice::PluginPtr p = createIceLocatorDiscovery(communicator(), "IceGridAdmin.Discovery", Ice::StringSeq());
-                IceLocatorDiscovery::PluginPtr plugin = IceLocatorDiscovery::PluginPtr::dynamicCast(p);
+                Ice::PluginPtr pluginObj = createIceLocatorDiscovery(communicator, "IceGridAdmin.Discovery", Ice::StringSeq());
+                IceLocatorDiscovery::PluginPtr plugin = IceLocatorDiscovery::PluginPtr::dynamicCast(pluginObj);
                 plugin->initialize();
 
                 vector<Ice::LocatorPrx> locators = plugin->getLocators(instanceName, IceUtil::Time::milliSeconds(300));
@@ -502,7 +404,7 @@
                         getline(cin, line);
                         if(!cin.good() || line.empty())
                         {
-                            return EXIT_FAILURE;
+                            return 1;
                         }
                         line = IceUtilInternal::trim(line);
 
@@ -515,16 +417,16 @@
                     }
 
                     assert(num <= locators.size());
-                    communicator()->setDefaultLocator(locators[num - 1]);
+                    communicator->setDefaultLocator(locators[num - 1]);
                 }
                 else if(locators.size() == 1)
                 {
                     consoleOut << "using discovered locator:\nproxy = `" << locators[0] << "'" << endl;
-                    communicator()->setDefaultLocator(locators[0]);
+                    communicator->setDefaultLocator(locators[0]);
                 }
                 else
                 {
-                    communicator()->setDefaultLocator(0);
+                    communicator->setDefaultLocator(0);
                 }
 
                 //
@@ -534,33 +436,33 @@
             }
         }
 
-        if(communicator()->getDefaultRouter())
+        if(communicator->getDefaultRouter())
         {
             try
             {
                 // Use SSL if available.
-                router = Glacier2::RouterPrx::checkedCast(communicator()->getDefaultRouter()->ice_preferSecure(true));
+                router = Glacier2::RouterPrx::checkedCast(communicator->getDefaultRouter()->ice_preferSecure(true));
                 if(!router)
                 {
-                    consoleErr << _appName << ": configured router is not a Glacier2 router" << endl;
-                    return EXIT_FAILURE;
+                    consoleErr << args[0] << ": configured router is not a Glacier2 router" << endl;
+                    return 1;
                 }
             }
-            catch(const LocalException& ex)
+            catch(const Ice::LocalException& ex)
             {
-                consoleErr << _appName << ": could not contact the default router:" << endl << ex << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": could not contact the default router:" << endl << ex << endl;
+                return 1;
             }
 
             if(ssl)
             {
-                session = AdminSessionPrx::uncheckedCast(router->createSessionFromSecureConnection());
+                session = IceGrid::AdminSessionPrx::uncheckedCast(router->createSessionFromSecureConnection());
                 if(!session)
                 {
-                    consoleErr << _appName
+                    consoleErr << args[0]
                          << ": Glacier2 returned a null session, please set the Glacier2.SSLSessionManager property"
                          << endl;
-                    return EXIT_FAILURE;
+                    return 1;
                 }
             }
             else
@@ -571,7 +473,7 @@
                     getline(cin, id);
                     if(!cin.good())
                     {
-                        return EXIT_FAILURE;
+                        return 1;
                     }
                     id = IceUtilInternal::trim(id);
                 }
@@ -582,38 +484,40 @@
 #ifndef _WIN32
                     if(!cin.good())
                     {
-                        return EXIT_FAILURE;
+                        return 1;
                     }
 #endif
                 }
 
-                session = AdminSessionPrx::uncheckedCast(router->createSession(id, password));
+                session = IceGrid::AdminSessionPrx::uncheckedCast(router->createSession(id, password));
                 fill(password.begin(), password.end(), '\0'); // Zero the password string.
 
                 if(!session)
                 {
-                    consoleErr << _appName
+                    consoleErr << args[0]
                          << ": Glacier2 returned a null session, please set the Glacier2.SessionManager property"
                          << endl;
-                    return EXIT_FAILURE;
+                    return 1;
                 }
             }
-            sessionTimeout = static_cast<int>(router->getSessionTimeout());
+
             try
             {
                 acmTimeout = router->getACMTimeout();
             }
             catch(const Ice::OperationNotExistException&)
             {
+                consoleErr << args[0] << ": can't talk to old Glacier2 router version" << endl;
+                return 1;
             }
         }
-        else if(communicator()->getDefaultLocator())
+        else if(communicator->getDefaultLocator())
         {
             //
             // Create the identity of the registry to connect to.
             //
-            Identity registryId;
-            registryId.category = communicator()->getDefaultLocator()->ice_getIdentity().category;
+            Ice::Identity registryId;
+            registryId.category = communicator->getDefaultLocator()->ice_getIdentity().category;
             registryId.name = "Registry";
             if(!replica.empty() && replica != "Master")
             {
@@ -626,21 +530,21 @@
             // proxy.
             //
             IceGrid::LocatorPrx locator;
-            RegistryPrx localRegistry;
+            IceGrid::RegistryPrx localRegistry;
             try
             {
-                locator = IceGrid::LocatorPrx::checkedCast(communicator()->getDefaultLocator());
+                locator = IceGrid::LocatorPrx::checkedCast(communicator->getDefaultLocator());
                 if(!locator)
                 {
-                    consoleErr << _appName << ": configured locator is not an IceGrid locator" << endl;
-                    return EXIT_FAILURE;
+                    consoleErr << args[0] << ": configured locator is not an IceGrid locator" << endl;
+                    return 1;
                 }
                 localRegistry = locator->getLocalRegistry();
             }
-            catch(const LocalException& ex)
+            catch(const Ice::LocalException& ex)
             {
-                consoleErr << _appName << ": could not contact the default locator:" << endl << ex << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": could not contact the default locator:" << endl << ex << endl;
+                return 1;
             }
 
             IceGrid::RegistryPrx registry;
@@ -656,24 +560,24 @@
 
                 try
                 {
-                    registry = RegistryPrx::checkedCast(locator->findObjectById(registryId));
+                    registry = IceGrid::RegistryPrx::checkedCast(locator->findObjectById(registryId));
                     if(!registry)
                     {
-                        consoleErr << _appName << ": could not contact an IceGrid registry" << endl;
+                        consoleErr << args[0] << ": could not contact an IceGrid registry" << endl;
                     }
                 }
-                catch(const ObjectNotFoundException&)
+                catch(const Ice::ObjectNotFoundException&)
                 {
-                    consoleErr << _appName << ": no active registry replica named `" << replica << "'" << endl;
-                    return EXIT_FAILURE;
+                    consoleErr << args[0] << ": no active registry replica named `" << replica << "'" << endl;
+                    return 1;
                 }
-                catch(const LocalException& ex)
+                catch(const Ice::LocalException& ex)
                 {
                     if(!replica.empty())
                     {
-                        consoleErr << _appName << ": could not contact the registry replica named `" << replica << "':\n";
+                        consoleErr << args[0] << ": could not contact the registry replica named `" << replica << "':\n";
                         consoleErr << ex << endl;
-                        return EXIT_FAILURE;
+                        return 1;
                     }
                     else
                     {
@@ -688,7 +592,7 @@
                         {
                             name = name.substr(prefix.size());
                         }
-                        consoleErr << _appName << ": warning: could not contact master, using slave `" << name << "'" << endl;
+                        consoleErr << args[0] << ": warning: could not contact master, using slave `" << name << "'" << endl;
                     }
                 }
             }
@@ -700,10 +604,10 @@
             //
             if(registry->ice_getIdentity() == localRegistry->ice_getIdentity())
             {
-                ObjectAdapterPtr colloc = communicator()->createObjectAdapter(""); // colloc-only adapter
-                ObjectPrx router = colloc->addWithUUID(new ReuseConnectionRouter(locator));
-                communicator()->setDefaultRouter(RouterPrx::uncheckedCast(router));
-                registry = registry->ice_router(communicator()->getDefaultRouter());
+                Ice::ObjectAdapterPtr colloc = communicator->createObjectAdapter(""); // colloc-only adapter
+                communicator->setDefaultRouter(Ice::RouterPrx::uncheckedCast(
+                    colloc->addWithUUID(new ReuseConnectionRouter(locator))));
+                registry = registry->ice_router(communicator->getDefaultRouter());
             }
 
             // Prefer SSL.
@@ -721,7 +625,7 @@
                     getline(cin, id);
                     if(!cin.good())
                     {
-                        return EXIT_FAILURE;
+                        return 1;
                     }
                     id = IceUtilInternal::trim(id);
                 }
@@ -732,7 +636,7 @@
 #ifndef _WIN32
                     if(!cin.good())
                     {
-                        return EXIT_FAILURE;
+                        return 1;
                     }
 #endif
                 }
@@ -741,79 +645,69 @@
                 fill(password.begin(), password.end(), '\0'); // Zero the password string.
             }
 
-            sessionTimeout = registry->getSessionTimeout();
             try
             {
                 acmTimeout = registry->getACMTimeout();
             }
             catch(const Ice::OperationNotExistException&)
             {
+                consoleErr << args[0] << ": can't talk to old IceGrid registry version" << endl;
+                return 1;
             }
         }
         else // No default locator or router set.
         {
-            consoleErr << _appName << ": could not contact the registry:" << endl;
+            consoleErr << args[0] << ": could not contact the registry:" << endl;
             consoleErr << "no default locator or router configured" << endl;
-            return EXIT_FAILURE;
+            return 1;
         }
 
         if(acmTimeout > 0)
         {
-            session->ice_getConnection()->setACM(acmTimeout, IceUtil::None, ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
-        }
-        else if(sessionTimeout > 0)
-        {
-            keepAlive = new SessionKeepAliveThread(session, sessionTimeout / 2);
-            keepAlive->start();
+            session->ice_getConnection()->setACM(acmTimeout, IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
         }
 
         {
-            Lock sync(*this);
-            _parser = Parser::createParser(communicator(), session, session->getAdmin(), commands.empty());
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
+            parser = IceGrid::Parser::createParser(communicator, session, session->getAdmin(), commands.empty());
         }
 
         if(!commands.empty()) // Commands were given
         {
-            int parseStatus = _parser->parse(commands, debug);
-            if(parseStatus == EXIT_FAILURE)
+            int parseStatus = parser->parse(commands, debug);
+            if(parseStatus == 1)
             {
-                status = EXIT_FAILURE;
+                status = 1;
             }
         }
         else // No commands, let's use standard input
         {
-            _parser->showBanner();
+            parser->showBanner();
 
-            int parseStatus = _parser->parse(stdin, debug);
-            if(parseStatus == EXIT_FAILURE)
+            int parseStatus = parser->parse(stdin, debug);
+            if(parseStatus == 1)
             {
-                status = EXIT_FAILURE;
+                status = 1;
             }
         }
     }
     catch(const IceGrid::PermissionDeniedException& ex)
     {
         consoleOut << "permission denied:\n" << ex.reason << endl;
-        return EXIT_FAILURE;
+        return 1;
     }
     catch(const Glacier2::PermissionDeniedException& ex)
     {
         consoleOut << "permission denied:\n" << ex.reason << endl;
-        return EXIT_FAILURE;
+        return 1;
     }
     catch(const Glacier2::CannotCreateSessionException& ex)
     {
         consoleOut << "session creation failed:\n" << ex.reason << endl;
-        return EXIT_FAILURE;
+        return 1;
     }
     catch(...)
     {
-        if(keepAlive)
-        {
-            keepAlive->destroy();
-            keepAlive->getThreadControl().join();
-        }
-
         try
         {
             if(router)
@@ -825,18 +719,12 @@
                 session->destroy();
             }
         }
-        catch(const Exception&)
+        catch(const Ice::Exception&)
         {
         }
         throw;
     }
 
-    if(keepAlive)
-    {
-        keepAlive->destroy();
-        keepAlive->getThreadControl().join();
-    }
-
     if(session)
     {
         try
@@ -850,7 +738,7 @@
                 session->destroy();
             }
         }
-        catch(const Exception&)
+        catch(const Ice::Exception&)
         {
             // Ignore. If the registry has been shutdown this will cause
             // an exception.
@@ -859,28 +747,3 @@
 
     return status;
 }
-
-string
-Client::getPassword(const string& prompt)
-{
-    consoleOut << prompt << flush;
-    string password;
-#ifndef _WIN32
-    struct termios oldConf;
-    struct termios newConf;
-    tcgetattr(0, &oldConf);
-    newConf = oldConf;
-    newConf.c_lflag &= (~ECHO);
-    tcsetattr(0, TCSANOW, &newConf);
-    getline(cin, password);
-    tcsetattr(0, TCSANOW, &oldConf);
-#else
-    char c;
-    while((c = _getch()) != '\r')
-    {
-        password += c;
-    }
-#endif
-    consoleOut << endl;
-    return IceUtilInternal::trim(password);
-}
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Database.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Database.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Database.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Database.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Random.h>
@@ -546,8 +541,6 @@
         logError(_communicator, ex);
         throw;
     }
-    assert(false);
-    return ApplicationInfoSeq();
 }
 
 AdapterInfoSeq
@@ -565,8 +558,6 @@
         logError(_communicator, ex);
         throw;
     }
-    assert(false);
-    return AdapterInfoSeq();
 }
 
 ObjectInfoSeq
@@ -584,8 +575,6 @@
         logError(_communicator, ex);
         throw;
     }
-    assert(false);
-    return ObjectInfoSeq();
 }
 
 StringLongDict
@@ -1628,7 +1617,7 @@
 
             if(!_objects.get(txn, id, info))
             {
-                ObjectNotRegisteredException(id);
+                throw ObjectNotRegisteredException(id);
             }
             info.proxy = proxy;
             addObject(txn, info, false);
@@ -1751,8 +1740,7 @@
         return 0;
     }
 
-    RandomNumberGenerator rng;
-    random_shuffle(objs.begin(), objs.end(), rng);
+    IceUtilInternal::shuffle(objs.begin(), objs.end());
     vector<pair<Ice::ObjectPrx, float> > objectsWithLoad;
     objectsWithLoad.reserve(objs.size());
     for(Ice::ObjectProxySeq::const_iterator p = objs.begin(); p != objs.end(); ++p)
@@ -2455,9 +2443,9 @@
                 {
 #if defined(__SUNPRO_CC) && defined(_RWSTD_NO_MEMBER_TEMPLATES)
                     Ice::StringSeq nodes;
-                    for(set<string>::const_iterator p = unreachableNodes.begin(); p != unreachableNodes.end(); ++p)
+                    for(set<string>::const_iterator r = unreachableNodes.begin(); r != unreachableNodes.end(); ++r)
                     {
-                        nodes.push_back(*p);
+                        nodes.push_back(*r);
                     }
 #else
                     Ice::StringSeq nodes(unreachableNodes.begin(), unreachableNodes.end());
@@ -2473,9 +2461,9 @@
                 }
                 if(!reasons.empty())
                 {
-                    for(vector<string>::const_iterator p = reasons.begin(); p != reasons.end(); ++p)
+                    for(vector<string>::const_iterator r = reasons.begin(); r != reasons.end(); ++r)
                     {
-                        out << "\n" << *p;
+                        out << "\n" << *r;
                     }
                 }
             }
@@ -2497,9 +2485,9 @@
             {
 #if defined(__SUNPRO_CC) && defined(_RWSTD_NO_MEMBER_TEMPLATES)
                 Ice::StringSeq nodes;
-                for(set<string>::const_iterator p = unreachableNodes.begin(); p != unreachableNodes.end(); ++p)
+                for(set<string>::const_iterator r = unreachableNodes.begin(); r != unreachableNodes.end(); ++r)
                 {
-                    nodes.push_back(*p);
+                    nodes.push_back(*r);
                 }
 #else
                 Ice::StringSeq nodes(unreachableNodes.begin(), unreachableNodes.end());
@@ -2520,9 +2508,9 @@
     {
         ostringstream os;
         os << "check for application `" << application << "' update failed:";
-        for(vector<string>::const_iterator p = reasons.begin(); p != reasons.end(); ++p)
+        for(vector<string>::const_iterator r = reasons.begin(); r != reasons.end(); ++r)
         {
-            os << "\n" << *p;
+            os << "\n" << *r;
         }
         throw DeploymentException(os.str());
     }
@@ -2531,13 +2519,13 @@
 void
 Database::finishApplicationUpdate(const ApplicationUpdateInfo& update,
                                   const ApplicationInfo& oldApp,
-                                  const ApplicationHelper& previous,
-                                  const ApplicationHelper& helper,
+                                  const ApplicationHelper& previousAppHelper,
+                                  const ApplicationHelper& appHelper,
                                   AdminSessionI* /*session*/,
                                   bool noRestart,
                                   Ice::Long dbSerial)
 {
-    const ApplicationDescriptor& newDesc = helper.getDefinition();
+    const ApplicationDescriptor& newDesc = appHelper.getDefinition();
 
     ServerEntrySeq entries;
     int serial = 0;
@@ -2545,15 +2533,15 @@
     {
         if(_master)
         {
-            checkUpdate(previous, helper, oldApp.uuid, oldApp.revision, noRestart);
+            checkUpdate(previousAppHelper, appHelper, oldApp.uuid, oldApp.revision, noRestart);
         }
 
         Lock sync(*this);
 
         IceDB::ReadWriteTxn txn(_env);
 
-        checkForUpdate(previous, helper, txn);
-        reload(previous, helper, entries, oldApp.uuid, oldApp.revision + 1, noRestart);
+        checkForUpdate(previousAppHelper, appHelper, txn);
+        reload(previousAppHelper, appHelper, entries, oldApp.uuid, oldApp.revision + 1, noRestart);
 
         for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::sync));
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Database.h zeroc-ice-3.7.2/cpp/src/IceGrid/Database.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Database.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Database.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_DATABASE_H
 #define ICE_GRID_DATABASE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorBuilder.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorBuilder.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorBuilder.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorBuilder.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/LoggerUtil.h>
@@ -105,7 +100,6 @@
     if(p == _attributes.end())
     {
         throw invalid_argument("missing attribute '" + name + "'");
-        return true; // Keep the compiler happy.
     }
     else if(p->second == "true")
     {
@@ -118,7 +112,6 @@
     else
     {
         throw invalid_argument("invalid attribute `" + name + "': value is not 'false' or 'true'");
-        return true; // Keep the compiler happy.
     }
 }
 
@@ -142,7 +135,6 @@
     else
     {
         throw invalid_argument("invalid attribute `" + name + "': value is not 'false' or 'true'");
-        return true; // Keep the compiler happy.
     }
 }
 
@@ -855,14 +847,12 @@
 ServerDescriptorBuilder::createService(const XmlAttributesHelper& /*attrs*/)
 {
     throw invalid_argument("<service> element can only be a child of an <icebox> element");
-    return 0;
 }
 
 ServiceInstanceDescriptorBuilder*
 ServerDescriptorBuilder::createServiceInstance(const XmlAttributesHelper& /*attrs*/)
 {
     throw invalid_argument("<service-instance> element can only be a child of an <icebox> element");
-    return 0;
 }
 
 void
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorBuilder.h zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorBuilder.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorBuilder.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorBuilder.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_DESCRIPTOR_BUILDER_H
 #define ICE_GRID_DESCRIPTOR_BUILDER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorHelper.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorHelper.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorHelper.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorHelper.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/DescriptorHelper.h>
@@ -995,8 +990,8 @@
         if(!desc.references.empty())
         {
             resolved.insert(*p);
-            PropertyDescriptorSeq p = getProperties(desc.references, resolved);
-            properties.insert(properties.end(), p.begin(), p.end());
+            PropertyDescriptorSeq q = getProperties(desc.references, resolved);
+            properties.insert(properties.end(), q.begin(), q.end());
         }
 
         PropertyDescriptorSeq pds = operator()(desc.properties);
@@ -2655,11 +2650,11 @@
 }
 
 ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator,
-                                     const ApplicationDescriptor& desc,
+                                     const ApplicationDescriptor& appDesc,
                                      bool enableWarning,
                                      bool instantiate) :
     _communicator(communicator),
-    _def(desc)
+    _def(appDesc)
 {
     if(_def.name.empty())
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorHelper.h zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorHelper.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorHelper.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorHelper.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_DESCRIPTOR_HELPER_H
 #define ICE_GRID_DESCRIPTOR_HELPER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorParser.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorParser.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorParser.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorParser.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceXML/Parser.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorParser.h zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorParser.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/DescriptorParser.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/DescriptorParser.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_DESCRIPTOR_PARSER_H
 #define ICEGRID_DESCRIPTOR_PARSER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/FileCache.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/FileCache.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/FileCache.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/FileCache.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/Properties.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/FileCache.h zeroc-ice-3.7.2/cpp/src/IceGrid/FileCache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/FileCache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/FileCache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_FILE_CACHE_H
 #define ICE_GRID_FILE_CACHE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/FileParserI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/FileParserI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/FileParserI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/FileParserI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/FileParserI.h>
 #include <IceGrid/DescriptorParser.h>
@@ -26,6 +21,5 @@
     catch(const IceXML::ParserException& e)
     {
         throw ParseException(e.reason());
-        return ApplicationDescriptor();
     }
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/FileParserI.h zeroc-ice-3.7.2/cpp/src/IceGrid/FileParserI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/FileParserI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/FileParserI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_FILE_PARSERI_H
 #define ICE_GRID_FILE_PARSERI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/FileUserAccountMapperI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/FileUserAccountMapperI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/FileUserAccountMapperI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/FileUserAccountMapperI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
 #include <IceGrid/FileUserAccountMapperI.h>
 #include <fstream>
@@ -20,7 +15,7 @@
     ifstream file(IceUtilInternal::streamFilename(filename).c_str()); // filename is a UTF-8 string
     if(!file)
     {
-        throw runtime_error("cannot open `" + filename + "' for reading: " + strerror(errno));
+        throw runtime_error("cannot open `" + filename + "' for reading: " + IceUtilInternal::errorToString(errno));
     }
 
     const string delim = " \t\r\n";
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/FileUserAccountMapperI.h zeroc-ice-3.7.2/cpp/src/IceGrid/FileUserAccountMapperI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/FileUserAccountMapperI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/FileUserAccountMapperI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H
 #define ICE_GRID_FILEUSERACCOUNTMAPPERI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Grammar.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Grammar.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Grammar.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Grammar.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison implementation for Yacc-like parsers in C
-
+   
       Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -66,24 +66,22 @@
 #line 1 "src/IceGrid/Grammar.y"
 
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/Parser.h>
 
 #ifdef _MSC_VER
-// I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
+#   pragma warning(disable:4102)
 // warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
+#   pragma warning(disable:4065)
+// warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+#   pragma warning(disable:4244)
+// warning C4702: unreachable code
+#   pragma warning(disable:4702)
 #endif
 
 //
@@ -105,7 +103,7 @@
 
 
 /* Line 371 of yacc.c  */
-#line 109 "src/IceGrid/Grammar.cpp"
+#line 112 "src/IceGrid/Grammar.cpp"
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -212,7 +210,7 @@
 /* Copy the second part of user declarations.  */
 
 /* Line 390 of yacc.c  */
-#line 216 "src/IceGrid/Grammar.cpp"
+#line 219 "src/IceGrid/Grammar.cpp"
 
 #ifdef short
 # undef short
@@ -590,24 +588,24 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,    95,    95,    99,   106,   109,   116,   124,   128,   132,
-     136,   140,   144,   148,   152,   156,   160,   164,   168,   172,
-     176,   180,   184,   188,   192,   196,   200,   204,   208,   212,
-     216,   220,   224,   228,   232,   236,   240,   244,   248,   252,
-     256,   260,   264,   268,   272,   276,   280,   284,   288,   292,
-     296,   300,   304,   308,   312,   316,   320,   324,   328,   332,
-     336,   340,   344,   348,   352,   356,   360,   364,   368,   372,
-     376,   380,   384,   388,   392,   396,   400,   404,   408,   412,
-     416,   420,   424,   428,   432,   436,   440,   444,   448,   452,
-     456,   460,   464,   468,   472,   476,   480,   484,   488,   492,
-     496,   500,   504,   508,   512,   516,   520,   524,   528,   532,
-     536,   540,   544,   548,   552,   556,   560,   564,   568,   579,
-     583,   594,   605,   609,   613,   617,   623,   628,   633,   637,
-     646,   651,   656,   662,   669,   677,   680,   683,   686,   689,
-     692,   695,   698,   701,   704,   707,   710,   713,   716,   719,
-     722,   725,   728,   731,   734,   737,   740,   743,   746,   749,
-     752,   755,   758,   761,   764,   767,   770,   773,   776,   779,
-     782,   785,   788
+       0,    98,    98,   102,   109,   112,   119,   127,   131,   135,
+     139,   143,   147,   151,   155,   159,   163,   167,   171,   175,
+     179,   183,   187,   191,   195,   199,   203,   207,   211,   215,
+     219,   223,   227,   231,   235,   239,   243,   247,   251,   255,
+     259,   263,   267,   271,   275,   279,   283,   287,   291,   295,
+     299,   303,   307,   311,   315,   319,   323,   327,   331,   335,
+     339,   343,   347,   351,   355,   359,   363,   367,   371,   375,
+     379,   383,   387,   391,   395,   399,   403,   407,   411,   415,
+     419,   423,   427,   431,   435,   439,   443,   447,   451,   455,
+     459,   463,   467,   471,   475,   479,   483,   487,   491,   495,
+     499,   503,   507,   511,   515,   519,   523,   527,   531,   535,
+     539,   543,   547,   551,   555,   559,   563,   567,   571,   582,
+     586,   597,   608,   612,   616,   620,   626,   631,   636,   640,
+     648,   653,   658,   664,   671,   679,   682,   685,   688,   691,
+     694,   697,   700,   703,   706,   709,   712,   715,   718,   721,
+     724,   727,   730,   733,   736,   739,   742,   745,   748,   751,
+     754,   757,   760,   763,   766,   769,   772,   775,   778,   781,
+     784,   787,   790
 };
 #endif
 
@@ -2189,35 +2187,35 @@
     {
         case 2:
 /* Line 1792 of yacc.c  */
-#line 96 "src/IceGrid/Grammar.y"
+#line 99 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 3:
 /* Line 1792 of yacc.c  */
-#line 99 "src/IceGrid/Grammar.y"
+#line 102 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 4:
 /* Line 1792 of yacc.c  */
-#line 107 "src/IceGrid/Grammar.y"
+#line 110 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 5:
 /* Line 1792 of yacc.c  */
-#line 110 "src/IceGrid/Grammar.y"
+#line 113 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 6:
 /* Line 1792 of yacc.c  */
-#line 116 "src/IceGrid/Grammar.y"
+#line 119 "src/IceGrid/Grammar.y"
     {
     parser->checkInterrupted();
 }
@@ -2225,7 +2223,7 @@
 
   case 7:
 /* Line 1792 of yacc.c  */
-#line 125 "src/IceGrid/Grammar.y"
+#line 128 "src/IceGrid/Grammar.y"
     {
     parser->usage();
 }
@@ -2233,7 +2231,7 @@
 
   case 8:
 /* Line 1792 of yacc.c  */
-#line 129 "src/IceGrid/Grammar.y"
+#line 132 "src/IceGrid/Grammar.y"
     {
     return 0;
 }
@@ -2241,7 +2239,7 @@
 
   case 9:
 /* Line 1792 of yacc.c  */
-#line 133 "src/IceGrid/Grammar.y"
+#line 136 "src/IceGrid/Grammar.y"
     {
     parser->addApplication((yyvsp[(3) - (4)]));
 }
@@ -2249,7 +2247,7 @@
 
   case 10:
 /* Line 1792 of yacc.c  */
-#line 137 "src/IceGrid/Grammar.y"
+#line 140 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "add");
 }
@@ -2257,7 +2255,7 @@
 
   case 11:
 /* Line 1792 of yacc.c  */
-#line 141 "src/IceGrid/Grammar.y"
+#line 144 "src/IceGrid/Grammar.y"
     {
     parser->removeApplication((yyvsp[(3) - (4)]));
 }
@@ -2265,7 +2263,7 @@
 
   case 12:
 /* Line 1792 of yacc.c  */
-#line 145 "src/IceGrid/Grammar.y"
+#line 148 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "remove");
 }
@@ -2273,7 +2271,7 @@
 
   case 13:
 /* Line 1792 of yacc.c  */
-#line 149 "src/IceGrid/Grammar.y"
+#line 152 "src/IceGrid/Grammar.y"
     {
     parser->diffApplication((yyvsp[(3) - (4)]));
 }
@@ -2281,7 +2279,7 @@
 
   case 14:
 /* Line 1792 of yacc.c  */
-#line 153 "src/IceGrid/Grammar.y"
+#line 156 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "diff");
 }
@@ -2289,7 +2287,7 @@
 
   case 15:
 /* Line 1792 of yacc.c  */
-#line 157 "src/IceGrid/Grammar.y"
+#line 160 "src/IceGrid/Grammar.y"
     {
     parser->updateApplication((yyvsp[(3) - (4)]));
 }
@@ -2297,7 +2295,7 @@
 
   case 16:
 /* Line 1792 of yacc.c  */
-#line 161 "src/IceGrid/Grammar.y"
+#line 164 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "update");
 }
@@ -2305,7 +2303,7 @@
 
   case 17:
 /* Line 1792 of yacc.c  */
-#line 165 "src/IceGrid/Grammar.y"
+#line 168 "src/IceGrid/Grammar.y"
     {
     parser->describeApplication((yyvsp[(3) - (4)]));
 }
@@ -2313,7 +2311,7 @@
 
   case 18:
 /* Line 1792 of yacc.c  */
-#line 169 "src/IceGrid/Grammar.y"
+#line 172 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "describe");
 }
@@ -2321,7 +2319,7 @@
 
   case 19:
 /* Line 1792 of yacc.c  */
-#line 173 "src/IceGrid/Grammar.y"
+#line 176 "src/IceGrid/Grammar.y"
     {
     parser->patchApplication((yyvsp[(3) - (4)]));
 }
@@ -2329,7 +2327,7 @@
 
   case 20:
 /* Line 1792 of yacc.c  */
-#line 177 "src/IceGrid/Grammar.y"
+#line 180 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "patch");
 }
@@ -2337,7 +2335,7 @@
 
   case 21:
 /* Line 1792 of yacc.c  */
-#line 181 "src/IceGrid/Grammar.y"
+#line 184 "src/IceGrid/Grammar.y"
     {
     parser->listAllApplications((yyvsp[(3) - (4)]));
 }
@@ -2345,7 +2343,7 @@
 
   case 22:
 /* Line 1792 of yacc.c  */
-#line 185 "src/IceGrid/Grammar.y"
+#line 188 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "list");
 }
@@ -2353,7 +2351,7 @@
 
   case 23:
 /* Line 1792 of yacc.c  */
-#line 189 "src/IceGrid/Grammar.y"
+#line 192 "src/IceGrid/Grammar.y"
     {
     parser->describeServerTemplate((yyvsp[(4) - (5)]));
 }
@@ -2361,7 +2359,7 @@
 
   case 24:
 /* Line 1792 of yacc.c  */
-#line 193 "src/IceGrid/Grammar.y"
+#line 196 "src/IceGrid/Grammar.y"
     {
     parser->usage("server template", "describe");
 }
@@ -2369,7 +2367,7 @@
 
   case 25:
 /* Line 1792 of yacc.c  */
-#line 197 "src/IceGrid/Grammar.y"
+#line 200 "src/IceGrid/Grammar.y"
     {
     parser->instantiateServerTemplate((yyvsp[(4) - (5)]));
 }
@@ -2377,7 +2375,7 @@
 
   case 26:
 /* Line 1792 of yacc.c  */
-#line 201 "src/IceGrid/Grammar.y"
+#line 204 "src/IceGrid/Grammar.y"
     {
     parser->usage("server template", "instantiate");
 }
@@ -2385,7 +2383,7 @@
 
   case 27:
 /* Line 1792 of yacc.c  */
-#line 205 "src/IceGrid/Grammar.y"
+#line 208 "src/IceGrid/Grammar.y"
     {
     parser->usage("server template");
 }
@@ -2393,7 +2391,7 @@
 
   case 28:
 /* Line 1792 of yacc.c  */
-#line 209 "src/IceGrid/Grammar.y"
+#line 212 "src/IceGrid/Grammar.y"
     {
     parser->describeServiceTemplate((yyvsp[(4) - (5)]));
 }
@@ -2401,7 +2399,7 @@
 
   case 29:
 /* Line 1792 of yacc.c  */
-#line 213 "src/IceGrid/Grammar.y"
+#line 216 "src/IceGrid/Grammar.y"
     {
     parser->usage("service template", "describe");
 }
@@ -2409,7 +2407,7 @@
 
   case 30:
 /* Line 1792 of yacc.c  */
-#line 217 "src/IceGrid/Grammar.y"
+#line 220 "src/IceGrid/Grammar.y"
     {
     parser->usage("service template");
 }
@@ -2417,7 +2415,7 @@
 
   case 31:
 /* Line 1792 of yacc.c  */
-#line 221 "src/IceGrid/Grammar.y"
+#line 224 "src/IceGrid/Grammar.y"
     {
     parser->describeNode((yyvsp[(3) - (4)]));
 }
@@ -2425,7 +2423,7 @@
 
   case 32:
 /* Line 1792 of yacc.c  */
-#line 225 "src/IceGrid/Grammar.y"
+#line 228 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "describe");
 }
@@ -2433,7 +2431,7 @@
 
   case 33:
 /* Line 1792 of yacc.c  */
-#line 229 "src/IceGrid/Grammar.y"
+#line 232 "src/IceGrid/Grammar.y"
     {
     parser->pingNode((yyvsp[(3) - (4)]));
 }
@@ -2441,7 +2439,7 @@
 
   case 34:
 /* Line 1792 of yacc.c  */
-#line 233 "src/IceGrid/Grammar.y"
+#line 236 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "ping");
 }
@@ -2449,7 +2447,7 @@
 
   case 35:
 /* Line 1792 of yacc.c  */
-#line 237 "src/IceGrid/Grammar.y"
+#line 240 "src/IceGrid/Grammar.y"
     {
     parser->printLoadNode((yyvsp[(3) - (4)]));
 }
@@ -2457,7 +2455,7 @@
 
   case 36:
 /* Line 1792 of yacc.c  */
-#line 241 "src/IceGrid/Grammar.y"
+#line 244 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "load");
 }
@@ -2465,7 +2463,7 @@
 
   case 37:
 /* Line 1792 of yacc.c  */
-#line 245 "src/IceGrid/Grammar.y"
+#line 248 "src/IceGrid/Grammar.y"
     {
     parser->printNodeProcessorSockets((yyvsp[(3) - (4)]));
 }
@@ -2473,7 +2471,7 @@
 
   case 38:
 /* Line 1792 of yacc.c  */
-#line 249 "src/IceGrid/Grammar.y"
+#line 252 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "sockets");
 }
@@ -2481,7 +2479,7 @@
 
   case 39:
 /* Line 1792 of yacc.c  */
-#line 253 "src/IceGrid/Grammar.y"
+#line 256 "src/IceGrid/Grammar.y"
     {
     parser->shutdownNode((yyvsp[(3) - (4)]));
 }
@@ -2489,7 +2487,7 @@
 
   case 40:
 /* Line 1792 of yacc.c  */
-#line 257 "src/IceGrid/Grammar.y"
+#line 260 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "shutdown");
 }
@@ -2497,7 +2495,7 @@
 
   case 41:
 /* Line 1792 of yacc.c  */
-#line 261 "src/IceGrid/Grammar.y"
+#line 264 "src/IceGrid/Grammar.y"
     {
     parser->listAllNodes((yyvsp[(3) - (4)]));
 }
@@ -2505,7 +2503,7 @@
 
   case 42:
 /* Line 1792 of yacc.c  */
-#line 265 "src/IceGrid/Grammar.y"
+#line 268 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "list");
 }
@@ -2513,7 +2511,7 @@
 
   case 43:
 /* Line 1792 of yacc.c  */
-#line 269 "src/IceGrid/Grammar.y"
+#line 272 "src/IceGrid/Grammar.y"
     {
     parser->show("node", (yyvsp[(3) - (4)]));
 }
@@ -2521,7 +2519,7 @@
 
   case 44:
 /* Line 1792 of yacc.c  */
-#line 273 "src/IceGrid/Grammar.y"
+#line 276 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "show");
 }
@@ -2529,7 +2527,7 @@
 
   case 45:
 /* Line 1792 of yacc.c  */
-#line 277 "src/IceGrid/Grammar.y"
+#line 280 "src/IceGrid/Grammar.y"
     {
     parser->describeRegistry((yyvsp[(3) - (4)]));
 }
@@ -2537,7 +2535,7 @@
 
   case 46:
 /* Line 1792 of yacc.c  */
-#line 281 "src/IceGrid/Grammar.y"
+#line 284 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "describe");
 }
@@ -2545,7 +2543,7 @@
 
   case 47:
 /* Line 1792 of yacc.c  */
-#line 285 "src/IceGrid/Grammar.y"
+#line 288 "src/IceGrid/Grammar.y"
     {
     parser->pingRegistry((yyvsp[(3) - (4)]));
 }
@@ -2553,7 +2551,7 @@
 
   case 48:
 /* Line 1792 of yacc.c  */
-#line 289 "src/IceGrid/Grammar.y"
+#line 292 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "ping");
 }
@@ -2561,7 +2559,7 @@
 
   case 49:
 /* Line 1792 of yacc.c  */
-#line 293 "src/IceGrid/Grammar.y"
+#line 296 "src/IceGrid/Grammar.y"
     {
     parser->shutdownRegistry((yyvsp[(3) - (4)]));
 }
@@ -2569,7 +2567,7 @@
 
   case 50:
 /* Line 1792 of yacc.c  */
-#line 297 "src/IceGrid/Grammar.y"
+#line 300 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "shutdown");
 }
@@ -2577,7 +2575,7 @@
 
   case 51:
 /* Line 1792 of yacc.c  */
-#line 301 "src/IceGrid/Grammar.y"
+#line 304 "src/IceGrid/Grammar.y"
     {
     parser->listAllRegistries((yyvsp[(3) - (4)]));
 }
@@ -2585,7 +2583,7 @@
 
   case 52:
 /* Line 1792 of yacc.c  */
-#line 305 "src/IceGrid/Grammar.y"
+#line 308 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "list");
 }
@@ -2593,7 +2591,7 @@
 
   case 53:
 /* Line 1792 of yacc.c  */
-#line 309 "src/IceGrid/Grammar.y"
+#line 312 "src/IceGrid/Grammar.y"
     {
     parser->show("registry", (yyvsp[(3) - (4)]));
 }
@@ -2601,7 +2599,7 @@
 
   case 54:
 /* Line 1792 of yacc.c  */
-#line 313 "src/IceGrid/Grammar.y"
+#line 316 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "show");
 }
@@ -2609,7 +2607,7 @@
 
   case 55:
 /* Line 1792 of yacc.c  */
-#line 317 "src/IceGrid/Grammar.y"
+#line 320 "src/IceGrid/Grammar.y"
     {
     parser->removeServer((yyvsp[(3) - (4)]));
 }
@@ -2617,7 +2615,7 @@
 
   case 56:
 /* Line 1792 of yacc.c  */
-#line 321 "src/IceGrid/Grammar.y"
+#line 324 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "remove");
 }
@@ -2625,7 +2623,7 @@
 
   case 57:
 /* Line 1792 of yacc.c  */
-#line 325 "src/IceGrid/Grammar.y"
+#line 328 "src/IceGrid/Grammar.y"
     {
     parser->describeServer((yyvsp[(3) - (4)]));
 }
@@ -2633,7 +2631,7 @@
 
   case 58:
 /* Line 1792 of yacc.c  */
-#line 329 "src/IceGrid/Grammar.y"
+#line 332 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "describe");
 }
@@ -2641,7 +2639,7 @@
 
   case 59:
 /* Line 1792 of yacc.c  */
-#line 333 "src/IceGrid/Grammar.y"
+#line 336 "src/IceGrid/Grammar.y"
     {
     parser->startServer((yyvsp[(3) - (4)]));
 }
@@ -2649,7 +2647,7 @@
 
   case 60:
 /* Line 1792 of yacc.c  */
-#line 337 "src/IceGrid/Grammar.y"
+#line 340 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "start");
 }
@@ -2657,7 +2655,7 @@
 
   case 61:
 /* Line 1792 of yacc.c  */
-#line 341 "src/IceGrid/Grammar.y"
+#line 344 "src/IceGrid/Grammar.y"
     {
     parser->stopServer((yyvsp[(3) - (4)]));
 }
@@ -2665,7 +2663,7 @@
 
   case 62:
 /* Line 1792 of yacc.c  */
-#line 345 "src/IceGrid/Grammar.y"
+#line 348 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "stop");
 }
@@ -2673,7 +2671,7 @@
 
   case 63:
 /* Line 1792 of yacc.c  */
-#line 349 "src/IceGrid/Grammar.y"
+#line 352 "src/IceGrid/Grammar.y"
     {
     parser->patchServer((yyvsp[(3) - (4)]));
 }
@@ -2681,7 +2679,7 @@
 
   case 64:
 /* Line 1792 of yacc.c  */
-#line 353 "src/IceGrid/Grammar.y"
+#line 356 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "patch");
 }
@@ -2689,7 +2687,7 @@
 
   case 65:
 /* Line 1792 of yacc.c  */
-#line 357 "src/IceGrid/Grammar.y"
+#line 360 "src/IceGrid/Grammar.y"
     {
     parser->signalServer((yyvsp[(3) - (4)]));
 }
@@ -2697,7 +2695,7 @@
 
   case 66:
 /* Line 1792 of yacc.c  */
-#line 361 "src/IceGrid/Grammar.y"
+#line 364 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "signal");
 }
@@ -2705,7 +2703,7 @@
 
   case 67:
 /* Line 1792 of yacc.c  */
-#line 365 "src/IceGrid/Grammar.y"
+#line 368 "src/IceGrid/Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 1);
 }
@@ -2713,7 +2711,7 @@
 
   case 68:
 /* Line 1792 of yacc.c  */
-#line 369 "src/IceGrid/Grammar.y"
+#line 372 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "stdout");
 }
@@ -2721,7 +2719,7 @@
 
   case 69:
 /* Line 1792 of yacc.c  */
-#line 373 "src/IceGrid/Grammar.y"
+#line 376 "src/IceGrid/Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 2);
 }
@@ -2729,7 +2727,7 @@
 
   case 70:
 /* Line 1792 of yacc.c  */
-#line 377 "src/IceGrid/Grammar.y"
+#line 380 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "stderr");
 }
@@ -2737,7 +2735,7 @@
 
   case 71:
 /* Line 1792 of yacc.c  */
-#line 381 "src/IceGrid/Grammar.y"
+#line 384 "src/IceGrid/Grammar.y"
     {
     parser->stateServer((yyvsp[(3) - (4)]));
 }
@@ -2745,7 +2743,7 @@
 
   case 72:
 /* Line 1792 of yacc.c  */
-#line 385 "src/IceGrid/Grammar.y"
+#line 388 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "start");
 }
@@ -2753,7 +2751,7 @@
 
   case 73:
 /* Line 1792 of yacc.c  */
-#line 389 "src/IceGrid/Grammar.y"
+#line 392 "src/IceGrid/Grammar.y"
     {
     parser->pidServer((yyvsp[(3) - (4)]));
 }
@@ -2761,7 +2759,7 @@
 
   case 74:
 /* Line 1792 of yacc.c  */
-#line 393 "src/IceGrid/Grammar.y"
+#line 396 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "pid");
 }
@@ -2769,7 +2767,7 @@
 
   case 75:
 /* Line 1792 of yacc.c  */
-#line 397 "src/IceGrid/Grammar.y"
+#line 400 "src/IceGrid/Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), false);
 }
@@ -2777,7 +2775,7 @@
 
   case 76:
 /* Line 1792 of yacc.c  */
-#line 401 "src/IceGrid/Grammar.y"
+#line 404 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "properties");
 }
@@ -2785,7 +2783,7 @@
 
   case 77:
 /* Line 1792 of yacc.c  */
-#line 405 "src/IceGrid/Grammar.y"
+#line 408 "src/IceGrid/Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), true);
 }
@@ -2793,7 +2791,7 @@
 
   case 78:
 /* Line 1792 of yacc.c  */
-#line 409 "src/IceGrid/Grammar.y"
+#line 412 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "property");
 }
@@ -2801,7 +2799,7 @@
 
   case 79:
 /* Line 1792 of yacc.c  */
-#line 413 "src/IceGrid/Grammar.y"
+#line 416 "src/IceGrid/Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), true);
 }
@@ -2809,7 +2807,7 @@
 
   case 80:
 /* Line 1792 of yacc.c  */
-#line 417 "src/IceGrid/Grammar.y"
+#line 420 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "enable");
 }
@@ -2817,7 +2815,7 @@
 
   case 81:
 /* Line 1792 of yacc.c  */
-#line 421 "src/IceGrid/Grammar.y"
+#line 424 "src/IceGrid/Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), false);
 }
@@ -2825,7 +2823,7 @@
 
   case 82:
 /* Line 1792 of yacc.c  */
-#line 425 "src/IceGrid/Grammar.y"
+#line 428 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "disable");
 }
@@ -2833,7 +2831,7 @@
 
   case 83:
 /* Line 1792 of yacc.c  */
-#line 429 "src/IceGrid/Grammar.y"
+#line 432 "src/IceGrid/Grammar.y"
     {
     parser->listAllServers((yyvsp[(3) - (4)]));
 }
@@ -2841,7 +2839,7 @@
 
   case 84:
 /* Line 1792 of yacc.c  */
-#line 433 "src/IceGrid/Grammar.y"
+#line 436 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "list");
 }
@@ -2849,7 +2847,7 @@
 
   case 85:
 /* Line 1792 of yacc.c  */
-#line 437 "src/IceGrid/Grammar.y"
+#line 440 "src/IceGrid/Grammar.y"
     {
     parser->show("server", (yyvsp[(3) - (4)]));
 }
@@ -2857,7 +2855,7 @@
 
   case 86:
 /* Line 1792 of yacc.c  */
-#line 441 "src/IceGrid/Grammar.y"
+#line 444 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "show");
 }
@@ -2865,7 +2863,7 @@
 
   case 87:
 /* Line 1792 of yacc.c  */
-#line 445 "src/IceGrid/Grammar.y"
+#line 448 "src/IceGrid/Grammar.y"
     {
     parser->startService((yyvsp[(3) - (4)]));
 }
@@ -2873,7 +2871,7 @@
 
   case 88:
 /* Line 1792 of yacc.c  */
-#line 449 "src/IceGrid/Grammar.y"
+#line 452 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "start");
 }
@@ -2881,7 +2879,7 @@
 
   case 89:
 /* Line 1792 of yacc.c  */
-#line 453 "src/IceGrid/Grammar.y"
+#line 456 "src/IceGrid/Grammar.y"
     {
     parser->stopService((yyvsp[(3) - (4)]));
 }
@@ -2889,7 +2887,7 @@
 
   case 90:
 /* Line 1792 of yacc.c  */
-#line 457 "src/IceGrid/Grammar.y"
+#line 460 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "stop");
 }
@@ -2897,7 +2895,7 @@
 
   case 91:
 /* Line 1792 of yacc.c  */
-#line 461 "src/IceGrid/Grammar.y"
+#line 464 "src/IceGrid/Grammar.y"
     {
     parser->describeService((yyvsp[(3) - (4)]));
 }
@@ -2905,7 +2903,7 @@
 
   case 92:
 /* Line 1792 of yacc.c  */
-#line 465 "src/IceGrid/Grammar.y"
+#line 468 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "describe");
 }
@@ -2913,7 +2911,7 @@
 
   case 93:
 /* Line 1792 of yacc.c  */
-#line 469 "src/IceGrid/Grammar.y"
+#line 472 "src/IceGrid/Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), false);
 }
@@ -2921,7 +2919,7 @@
 
   case 94:
 /* Line 1792 of yacc.c  */
-#line 473 "src/IceGrid/Grammar.y"
+#line 476 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "properties");
 }
@@ -2929,7 +2927,7 @@
 
   case 95:
 /* Line 1792 of yacc.c  */
-#line 477 "src/IceGrid/Grammar.y"
+#line 480 "src/IceGrid/Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), true);
 }
@@ -2937,7 +2935,7 @@
 
   case 96:
 /* Line 1792 of yacc.c  */
-#line 481 "src/IceGrid/Grammar.y"
+#line 484 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "property");
 }
@@ -2945,7 +2943,7 @@
 
   case 97:
 /* Line 1792 of yacc.c  */
-#line 485 "src/IceGrid/Grammar.y"
+#line 488 "src/IceGrid/Grammar.y"
     {
     parser->listServices((yyvsp[(3) - (4)]));
 }
@@ -2953,7 +2951,7 @@
 
   case 98:
 /* Line 1792 of yacc.c  */
-#line 489 "src/IceGrid/Grammar.y"
+#line 492 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "list");
 }
@@ -2961,7 +2959,7 @@
 
   case 99:
 /* Line 1792 of yacc.c  */
-#line 493 "src/IceGrid/Grammar.y"
+#line 496 "src/IceGrid/Grammar.y"
     {
     parser->endpointsAdapter((yyvsp[(3) - (4)]));
 }
@@ -2969,7 +2967,7 @@
 
   case 100:
 /* Line 1792 of yacc.c  */
-#line 497 "src/IceGrid/Grammar.y"
+#line 500 "src/IceGrid/Grammar.y"
     {
     parser->usage("adapter", "endpoints");
 }
@@ -2977,7 +2975,7 @@
 
   case 101:
 /* Line 1792 of yacc.c  */
-#line 501 "src/IceGrid/Grammar.y"
+#line 504 "src/IceGrid/Grammar.y"
     {
     parser->removeAdapter((yyvsp[(3) - (4)]));
 }
@@ -2985,7 +2983,7 @@
 
   case 102:
 /* Line 1792 of yacc.c  */
-#line 505 "src/IceGrid/Grammar.y"
+#line 508 "src/IceGrid/Grammar.y"
     {
     parser->usage("adapter", "remove");
 }
@@ -2993,7 +2991,7 @@
 
   case 103:
 /* Line 1792 of yacc.c  */
-#line 509 "src/IceGrid/Grammar.y"
+#line 512 "src/IceGrid/Grammar.y"
     {
     parser->listAllAdapters((yyvsp[(3) - (4)]));
 }
@@ -3001,7 +2999,7 @@
 
   case 104:
 /* Line 1792 of yacc.c  */
-#line 513 "src/IceGrid/Grammar.y"
+#line 516 "src/IceGrid/Grammar.y"
     {
     parser->usage("adapter", "list");
 }
@@ -3009,7 +3007,7 @@
 
   case 105:
 /* Line 1792 of yacc.c  */
-#line 517 "src/IceGrid/Grammar.y"
+#line 520 "src/IceGrid/Grammar.y"
     {
     parser->addObject((yyvsp[(3) - (4)]));
 }
@@ -3017,7 +3015,7 @@
 
   case 106:
 /* Line 1792 of yacc.c  */
-#line 521 "src/IceGrid/Grammar.y"
+#line 524 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "add");
 }
@@ -3025,7 +3023,7 @@
 
   case 107:
 /* Line 1792 of yacc.c  */
-#line 525 "src/IceGrid/Grammar.y"
+#line 528 "src/IceGrid/Grammar.y"
     {
     parser->removeObject((yyvsp[(3) - (4)]));
 }
@@ -3033,7 +3031,7 @@
 
   case 108:
 /* Line 1792 of yacc.c  */
-#line 529 "src/IceGrid/Grammar.y"
+#line 532 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "remove");
 }
@@ -3041,7 +3039,7 @@
 
   case 109:
 /* Line 1792 of yacc.c  */
-#line 533 "src/IceGrid/Grammar.y"
+#line 536 "src/IceGrid/Grammar.y"
     {
     parser->findObject((yyvsp[(3) - (4)]));
 }
@@ -3049,7 +3047,7 @@
 
   case 110:
 /* Line 1792 of yacc.c  */
-#line 537 "src/IceGrid/Grammar.y"
+#line 540 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "find");
 }
@@ -3057,7 +3055,7 @@
 
   case 111:
 /* Line 1792 of yacc.c  */
-#line 541 "src/IceGrid/Grammar.y"
+#line 544 "src/IceGrid/Grammar.y"
     {
     parser->listObject((yyvsp[(3) - (4)]));
 }
@@ -3065,7 +3063,7 @@
 
   case 112:
 /* Line 1792 of yacc.c  */
-#line 545 "src/IceGrid/Grammar.y"
+#line 548 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "list");
 }
@@ -3073,7 +3071,7 @@
 
   case 113:
 /* Line 1792 of yacc.c  */
-#line 549 "src/IceGrid/Grammar.y"
+#line 552 "src/IceGrid/Grammar.y"
     {
     parser->describeObject((yyvsp[(3) - (4)]));
 }
@@ -3081,7 +3079,7 @@
 
   case 114:
 /* Line 1792 of yacc.c  */
-#line 553 "src/IceGrid/Grammar.y"
+#line 556 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "describe");
 }
@@ -3089,7 +3087,7 @@
 
   case 115:
 /* Line 1792 of yacc.c  */
-#line 557 "src/IceGrid/Grammar.y"
+#line 560 "src/IceGrid/Grammar.y"
     {
     parser->showCopying();
 }
@@ -3097,7 +3095,7 @@
 
   case 116:
 /* Line 1792 of yacc.c  */
-#line 561 "src/IceGrid/Grammar.y"
+#line 564 "src/IceGrid/Grammar.y"
     {
     parser->showWarranty();
 }
@@ -3105,7 +3103,7 @@
 
   case 117:
 /* Line 1792 of yacc.c  */
-#line 565 "src/IceGrid/Grammar.y"
+#line 568 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(2) - (3)]).front());
 }
@@ -3113,7 +3111,7 @@
 
   case 118:
 /* Line 1792 of yacc.c  */
-#line 569 "src/IceGrid/Grammar.y"
+#line 572 "src/IceGrid/Grammar.y"
     {
     if(((yyvsp[(2) - (4)]).front() == "server" || (yyvsp[(2) - (4)]).front() == "service") && (yyvsp[(3) - (4)]).front() == "template")
     {
@@ -3128,7 +3126,7 @@
 
   case 119:
 /* Line 1792 of yacc.c  */
-#line 580 "src/IceGrid/Grammar.y"
+#line 583 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front());
 }
@@ -3136,7 +3134,7 @@
 
   case 120:
 /* Line 1792 of yacc.c  */
-#line 584 "src/IceGrid/Grammar.y"
+#line 587 "src/IceGrid/Grammar.y"
     {
     if(((yyvsp[(2) - (5)]).front() == "server" || (yyvsp[(2) - (5)]).front() == "service") && (yyvsp[(3) - (5)]).front() == "template")
     {
@@ -3151,7 +3149,7 @@
 
   case 121:
 /* Line 1792 of yacc.c  */
-#line 595 "src/IceGrid/Grammar.y"
+#line 598 "src/IceGrid/Grammar.y"
     {
     if(((yyvsp[(2) - (6)]).front() == "server" || (yyvsp[(2) - (6)]).front() == "service") && (yyvsp[(3) - (6)]).front() == "template")
     {
@@ -3166,7 +3164,7 @@
 
   case 122:
 /* Line 1792 of yacc.c  */
-#line 606 "src/IceGrid/Grammar.y"
+#line 609 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(2) - (4)]).front());
 }
@@ -3174,7 +3172,7 @@
 
   case 123:
 /* Line 1792 of yacc.c  */
-#line 610 "src/IceGrid/Grammar.y"
+#line 613 "src/IceGrid/Grammar.y"
     {
     parser->usage();
 }
@@ -3182,7 +3180,7 @@
 
   case 124:
 /* Line 1792 of yacc.c  */
-#line 614 "src/IceGrid/Grammar.y"
+#line 617 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(1) - (3)]).front());
 }
@@ -3190,7 +3188,7 @@
 
   case 125:
 /* Line 1792 of yacc.c  */
-#line 618 "src/IceGrid/Grammar.y"
+#line 621 "src/IceGrid/Grammar.y"
     {
     (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front());
     parser->invalidCommand((yyvsp[(1) - (4)]));
@@ -3200,7 +3198,7 @@
 
   case 126:
 /* Line 1792 of yacc.c  */
-#line 624 "src/IceGrid/Grammar.y"
+#line 627 "src/IceGrid/Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3209,7 +3207,7 @@
 
   case 127:
 /* Line 1792 of yacc.c  */
-#line 629 "src/IceGrid/Grammar.y"
+#line 632 "src/IceGrid/Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3218,7 +3216,7 @@
 
   case 128:
 /* Line 1792 of yacc.c  */
-#line 634 "src/IceGrid/Grammar.y"
+#line 637 "src/IceGrid/Grammar.y"
     {
     yyerrok;
 }
@@ -3226,14 +3224,14 @@
 
   case 129:
 /* Line 1792 of yacc.c  */
-#line 638 "src/IceGrid/Grammar.y"
+#line 641 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 130:
 /* Line 1792 of yacc.c  */
-#line 647 "src/IceGrid/Grammar.y"
+#line 649 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3242,7 +3240,7 @@
 
   case 131:
 /* Line 1792 of yacc.c  */
-#line 652 "src/IceGrid/Grammar.y"
+#line 654 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3251,7 +3249,7 @@
 
   case 132:
 /* Line 1792 of yacc.c  */
-#line 657 "src/IceGrid/Grammar.y"
+#line 659 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3261,7 +3259,7 @@
 
   case 133:
 /* Line 1792 of yacc.c  */
-#line 663 "src/IceGrid/Grammar.y"
+#line 665 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3271,7 +3269,7 @@
 
   case 134:
 /* Line 1792 of yacc.c  */
-#line 669 "src/IceGrid/Grammar.y"
+#line 671 "src/IceGrid/Grammar.y"
     {
     (yyval) = YYSTYPE();
 }
@@ -3279,273 +3277,273 @@
 
   case 135:
 /* Line 1792 of yacc.c  */
-#line 678 "src/IceGrid/Grammar.y"
+#line 680 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 136:
 /* Line 1792 of yacc.c  */
-#line 681 "src/IceGrid/Grammar.y"
+#line 683 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 137:
 /* Line 1792 of yacc.c  */
-#line 684 "src/IceGrid/Grammar.y"
+#line 686 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 138:
 /* Line 1792 of yacc.c  */
-#line 687 "src/IceGrid/Grammar.y"
+#line 689 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 139:
 /* Line 1792 of yacc.c  */
-#line 690 "src/IceGrid/Grammar.y"
+#line 692 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 140:
 /* Line 1792 of yacc.c  */
-#line 693 "src/IceGrid/Grammar.y"
+#line 695 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 141:
 /* Line 1792 of yacc.c  */
-#line 696 "src/IceGrid/Grammar.y"
+#line 698 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 142:
 /* Line 1792 of yacc.c  */
-#line 699 "src/IceGrid/Grammar.y"
+#line 701 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 143:
 /* Line 1792 of yacc.c  */
-#line 702 "src/IceGrid/Grammar.y"
+#line 704 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 144:
 /* Line 1792 of yacc.c  */
-#line 705 "src/IceGrid/Grammar.y"
+#line 707 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 145:
 /* Line 1792 of yacc.c  */
-#line 708 "src/IceGrid/Grammar.y"
+#line 710 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 146:
 /* Line 1792 of yacc.c  */
-#line 711 "src/IceGrid/Grammar.y"
+#line 713 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 147:
 /* Line 1792 of yacc.c  */
-#line 714 "src/IceGrid/Grammar.y"
+#line 716 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 148:
 /* Line 1792 of yacc.c  */
-#line 717 "src/IceGrid/Grammar.y"
+#line 719 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 149:
 /* Line 1792 of yacc.c  */
-#line 720 "src/IceGrid/Grammar.y"
+#line 722 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 150:
 /* Line 1792 of yacc.c  */
-#line 723 "src/IceGrid/Grammar.y"
+#line 725 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 151:
 /* Line 1792 of yacc.c  */
-#line 726 "src/IceGrid/Grammar.y"
+#line 728 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 152:
 /* Line 1792 of yacc.c  */
-#line 729 "src/IceGrid/Grammar.y"
+#line 731 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 153:
 /* Line 1792 of yacc.c  */
-#line 732 "src/IceGrid/Grammar.y"
+#line 734 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 154:
 /* Line 1792 of yacc.c  */
-#line 735 "src/IceGrid/Grammar.y"
+#line 737 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 155:
 /* Line 1792 of yacc.c  */
-#line 738 "src/IceGrid/Grammar.y"
+#line 740 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 156:
 /* Line 1792 of yacc.c  */
-#line 741 "src/IceGrid/Grammar.y"
+#line 743 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 157:
 /* Line 1792 of yacc.c  */
-#line 744 "src/IceGrid/Grammar.y"
+#line 746 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 158:
 /* Line 1792 of yacc.c  */
-#line 747 "src/IceGrid/Grammar.y"
+#line 749 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 159:
 /* Line 1792 of yacc.c  */
-#line 750 "src/IceGrid/Grammar.y"
+#line 752 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 160:
 /* Line 1792 of yacc.c  */
-#line 753 "src/IceGrid/Grammar.y"
+#line 755 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 161:
 /* Line 1792 of yacc.c  */
-#line 756 "src/IceGrid/Grammar.y"
+#line 758 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 162:
 /* Line 1792 of yacc.c  */
-#line 759 "src/IceGrid/Grammar.y"
+#line 761 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 163:
 /* Line 1792 of yacc.c  */
-#line 762 "src/IceGrid/Grammar.y"
+#line 764 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 164:
 /* Line 1792 of yacc.c  */
-#line 765 "src/IceGrid/Grammar.y"
+#line 767 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 165:
 /* Line 1792 of yacc.c  */
-#line 768 "src/IceGrid/Grammar.y"
+#line 770 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 166:
 /* Line 1792 of yacc.c  */
-#line 771 "src/IceGrid/Grammar.y"
+#line 773 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 167:
 /* Line 1792 of yacc.c  */
-#line 774 "src/IceGrid/Grammar.y"
+#line 776 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 168:
 /* Line 1792 of yacc.c  */
-#line 777 "src/IceGrid/Grammar.y"
+#line 779 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 169:
 /* Line 1792 of yacc.c  */
-#line 780 "src/IceGrid/Grammar.y"
+#line 782 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 170:
 /* Line 1792 of yacc.c  */
-#line 783 "src/IceGrid/Grammar.y"
+#line 785 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 171:
 /* Line 1792 of yacc.c  */
-#line 786 "src/IceGrid/Grammar.y"
+#line 788 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
   case 172:
 /* Line 1792 of yacc.c  */
-#line 789 "src/IceGrid/Grammar.y"
+#line 791 "src/IceGrid/Grammar.y"
     {
 }
     break;
 
 
 /* Line 1792 of yacc.c  */
-#line 3549 "src/IceGrid/Grammar.cpp"
+#line 3552 "src/IceGrid/Grammar.cpp"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Grammar.h zeroc-ice-3.7.2/cpp/src/IceGrid/Grammar.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Grammar.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Grammar.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison interface for Yacc-like parsers in C
-
+   
       Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Grammar.y zeroc-ice-3.7.2/cpp/src/IceGrid/Grammar.y
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Grammar.y	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Grammar.y	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,21 @@
 %{
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/Parser.h>
 
 #ifdef _MSC_VER
-// I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
+#   pragma warning(disable:4102)
 // warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
+#   pragma warning(disable:4065)
+// warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+#   pragma warning(disable:4244)
+// warning C4702: unreachable code
+#   pragma warning(disable:4702)
 #endif
 
 //
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/IceGridNode.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/IceGridNode.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/IceGridNode.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/IceGridNode.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UUID.h>
 #include <IceUtil/Timer.h>
@@ -463,6 +458,13 @@
     _adapter->addDefaultServant(new NodeServerAdminRouter(_node), _node->getServerAdminCategory());
 
     //
+    // Keep the old default servant for backward compatibility with IceGrid registries 3.5 that
+    // still forward requests to this category. This can be removed when we decide to break
+    // backward compatibility with 3.5 registries.
+    //
+    _adapter->addDefaultServant(new NodeServerAdminRouter(_node), instanceName + "-NodeRouter");
+
+    //
     // Start the platform info thread if needed.
     //
     _node->getPlatformInfo().start();
@@ -562,13 +564,13 @@
             }
             else
             {
-                string id = communicator()->getProperties()->getProperty("IceGridAdmin.Username");
+                string username = communicator()->getProperties()->getProperty("IceGridAdmin.Username");
                 string password = communicator()->getProperties()->getProperty("IceGridAdmin.Password");
-                while(id.empty())
+                while(username.empty())
                 {
                     consoleOut << "user id: " << flush;
-                    getline(cin, id);
-                    id = IceUtilInternal::trim(id);
+                    getline(cin, username);
+                    username = IceUtilInternal::trim(username);
                 }
 
                 if(password.empty())
@@ -578,7 +580,7 @@
                     password = IceUtilInternal::trim(password);
                 }
 
-                session = registry->createAdminSession(id, password);
+                session = registry->createAdminSession(username, password);
             }
             assert(session);
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/IceGridRegistry.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/IceGridRegistry.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/IceGridRegistry.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/IceGridRegistry.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Internal.ice zeroc-ice-3.7.2/cpp/src/IceGrid/Internal.ice
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Internal.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Internal.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/InternalRegistryI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/InternalRegistryI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/InternalRegistryI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/InternalRegistryI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/InternalRegistryI.h zeroc-ice-3.7.2/cpp/src/IceGrid/InternalRegistryI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/InternalRegistryI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/InternalRegistryI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_INTERNALREGISTRYI_H
 #define ICE_GRID_INTERNALREGISTRYI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/LocatorI.h>
@@ -123,12 +118,12 @@
             _cb->ice_response(_obj);
             return;
         }
-        catch(const Ice::Exception& ex)
+        catch(const Ice::Exception& e)
         {
             //
             // Rethrow unexpected exception.
             //
-            _cb->ice_exception(ex);
+            _cb->ice_exception(e);
             return;
         }
 
@@ -639,8 +634,8 @@
     LocatorAdapterInfo
     nextAdapter()
     {
-        bool replicaGroup;
-        bool roundRobin;
+        bool replicaGroup = false;
+        bool roundRobin = false;
 
         _adapters.clear();
 
@@ -779,11 +774,11 @@
     }
 
     virtual void
-    synchronized(const Ice::Exception& ex)
+    synchronized(const Ice::Exception& sex)
     {
         try
         {
-            ex.ice_throw();
+            sex.ice_throw();
         }
         catch(const AdapterNotExistException&)
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorI.h zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_LOCATOR_I_H
 #define ICE_GRID_LOCATOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorRegistryI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorRegistryI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorRegistryI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorRegistryI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/LocatorRegistryI.h>
@@ -180,9 +175,9 @@
         {
             ex.ice_throw();
         }
-        catch(const Ice::Exception& ex)
+        catch(const Ice::Exception& e)
         {
-            _amiCB->exception(ex);
+            _amiCB->exception(e);
         }
     }
 
@@ -221,11 +216,11 @@
     }
 
     virtual void
-    synchronized(const Ice::Exception& ex)
+    synchronized(const Ice::Exception& sex)
     {
         try
         {
-            ex.ice_throw();
+            sex.ice_throw();
         }
         catch(const ServerNotExistException&)
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorRegistryI.h zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorRegistryI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/LocatorRegistryI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/LocatorRegistryI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_LOCATOR_REGISTRY_I_H
 #define ICE_GRID_LOCATOR_REGISTRY_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceGrid/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 local_node_srcs         = Activator.cpp \
                           NodeAdminRouter.cpp \
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -262,20 +262,20 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridnode/packages.config zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridnode/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridnode/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridnode/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="lmdb.v120" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v140" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v141" version="0.9.19.3" targetFramework="native" />
+  <package id="lmdb.v120" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v141" version="0.9.23" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -256,20 +256,20 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridregistry/packages.config zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridregistry/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceGrid/msbuild/icegridregistry/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/msbuild/icegridregistry/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="lmdb.v120" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v140" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v141" version="0.9.19.3" targetFramework="native" />
+  <package id="lmdb.v120" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v141" version="0.9.23" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeAdminRouter.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/NodeAdminRouter.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeAdminRouter.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeAdminRouter.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/NodeAdminRouter.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeAdminRouter.h zeroc-ice-3.7.2/cpp/src/IceGrid/NodeAdminRouter.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeAdminRouter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeAdminRouter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_NODE_ADMIN_ROUTER_H
 #define ICE_GRID_NODE_ADMIN_ROUTER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeCache.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/NodeCache.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeCache.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeCache.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Functional.h>
 #include <Ice/Communicator.h>
@@ -204,11 +199,11 @@
     }
 
     void
-    exception(const Ice::Exception& ex)
+    exception(const Ice::Exception& lex)
     {
         try
         {
-            ex.ice_throw();
+            lex.ice_throw();
         }
         catch(const DeploymentException& ex)
         {
@@ -266,11 +261,11 @@
     }
 
     void
-    exception(const Ice::Exception& ex)
+    exception(const Ice::Exception& dex)
     {
         try
         {
-            ex.ice_throw();
+            dex.ice_throw();
         }
         catch(const DeploymentException& ex)
         {
@@ -389,18 +384,18 @@
             }
             else
             {
-                NodeSessionIPtr session = _session;
+                NodeSessionIPtr s = _session;
                 sync.release();
                 try
                 {
-                    session->getNode()->ice_ping();
+                    s->getNode()->ice_ping();
                     throw NodeActiveException();
                 }
                 catch(const Ice::LocalException&)
                 {
                     try
                     {
-                        session->destroy(Ice::emptyCurrent);
+                        s->destroy(Ice::emptyCurrent);
                     }
                     catch(const Ice::ObjectNotExistException&)
                     {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeCache.h zeroc-ice-3.7.2/cpp/src/IceGrid/NodeCache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeCache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeCache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_NODECACHE_H
 #define ICE_GRID_NODECACHE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/NodeI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Timer.h>
 #include <IceUtil/FileUtil.h>
@@ -535,8 +530,7 @@
         }
     }
 
-    set<ServerIPtr>::iterator s = servers.begin();
-    while(s != servers.end())
+    for(set<ServerIPtr>::iterator s = servers.begin(); s != servers.end();)
     {
         if(!appDistrib->icepatch.empty() && (*s)->dependsOnApplicationDistrib())
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeI.h zeroc-ice-3.7.2/cpp/src/IceGrid/NodeI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_NODE_I_H
 #define ICE_GRID_NODE_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UUID.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionI.h zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_NODE_SESSION_H
 #define ICEGRID_NODE_SESSION_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionManager.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionManager.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/NodeSessionManager.h>
@@ -28,7 +23,7 @@
     {
         name = name.substr(prefix.size());
     }
-    const_cast<string&>(_name) = name;
+    const_cast<string&>(_replicaName) = name;
 }
 
 NodeSessionPrx
@@ -42,7 +37,7 @@
         if(traceLevels && traceLevels->replica > 1)
         {
             Ice::Trace out(traceLevels->logger, traceLevels->replicaCat);
-            out << "trying to establish session with replica `" << _name << "'";
+            out << "trying to establish session with replica `" << _replicaName << "'";
         }
 
         set<InternalRegistryPrx> used;
@@ -104,7 +99,8 @@
     {
         if(traceLevels)
         {
-            traceLevels->logger->error("a node with the same name is already active with the replica `" + _name + "'");
+            traceLevels->logger->error("a node with the same name is already active with the replica `" +
+                                       _replicaName + "'");
         }
         exception.reset(ex.ice_clone());
     }
@@ -112,7 +108,7 @@
     {
         if(traceLevels)
         {
-            traceLevels->logger->error("connection to the registry `" + _name + "' was denied:\n" + ex.reason);
+            traceLevels->logger->error("connection to the registry `" + _replicaName + "' was denied:\n" + ex.reason);
         }
         exception.reset(ex.ice_clone());
     }
@@ -126,7 +122,7 @@
         if(traceLevels && traceLevels->replica > 0)
         {
             Ice::Trace out(traceLevels->logger, traceLevels->replicaCat);
-            out << "established session with replica `" << _name << "'";
+            out << "established session with replica `" << _replicaName << "'";
         }
     }
     else
@@ -134,7 +130,7 @@
         if(traceLevels && traceLevels->replica > 1)
         {
             Ice::Trace out(traceLevels->logger, traceLevels->replicaCat);
-            out << "failed to establish session with replica `" << _name << "':\n";
+            out << "failed to establish session with replica `" << _replicaName << "':\n";
             if(exception.get())
             {
                 out << *exception.get();
@@ -185,7 +181,7 @@
             if(_node->getTraceLevels() && _node->getTraceLevels()->replica > 0)
             {
                 Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->replicaCat);
-                out << "destroyed replica `" << _name << "' session";
+                out << "destroyed replica `" << _replicaName << "' session";
             }
         }
         catch(const Ice::LocalException& ex)
@@ -193,7 +189,7 @@
             if(_node->getTraceLevels() && _node->getTraceLevels()->replica > 1)
             {
                 Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->replicaCat);
-                out << "couldn't destroy replica `" << _name << "' session:\n" << ex;
+                out << "couldn't destroy replica `" << _replicaName << "' session:\n" << ex;
             }
         }
     }
@@ -205,7 +201,7 @@
     if(_node->getTraceLevels() && _node->getTraceLevels()->replica > 2)
     {
         Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->replicaCat);
-        out << "sending keep alive message to replica `" << _name << "'";
+        out << "sending keep alive message to replica `" << _replicaName << "'";
     }
 
     try
@@ -219,7 +215,7 @@
         if(_node->getTraceLevels() && _node->getTraceLevels()->replica > 0)
         {
             Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->replicaCat);
-            out << "lost session with replica `" << _name << "':\n" << ex;
+            out << "lost session with replica `" << _replicaName << "':\n" << ex;
         }
         return false;
     }
@@ -641,9 +637,9 @@
 
                     if(_sessions.find((*p)->ice_getIdentity()) == _sessions.end())
                     {
-                        NodeSessionKeepAliveThreadPtr session = addReplicaSession(*p);
-                        session->tryCreateSession();
-                        sessions.push_back(session);
+                        NodeSessionKeepAliveThreadPtr thread = addReplicaSession(*p);
+                        thread->tryCreateSession();
+                        sessions.push_back(thread);
                     }
                     else
                     {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionManager.h zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionManager.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/NodeSessionManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/NodeSessionManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_NODE_SESSION_MANAGER_H
 #define ICE_GRID_NODE_SESSION_MANAGER_H
@@ -44,7 +39,7 @@
     virtual NodeSessionPrx createSessionImpl(const InternalRegistryPrx&, IceUtil::Time&);
 
     const NodeIPtr _node;
-    const std::string _name;
+    const std::string _replicaName;
     NodeSessionManager& _manager;
 };
 typedef IceUtil::Handle<NodeSessionKeepAliveThread> NodeSessionKeepAliveThreadPtr;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ObjectCache.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ObjectCache.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ObjectCache.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ObjectCache.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Random.h>
 #include <Ice/Communicator.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ObjectCache.h zeroc-ice-3.7.2/cpp/src/IceGrid/ObjectCache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ObjectCache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ObjectCache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_OBJECTCACHE_H
 #define ICE_GRID_OBJECTCACHE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Parser.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Parser.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Parser.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Parser.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/IceUtil.h>
@@ -29,6 +24,8 @@
 extern FILE* yyin;
 extern int yydebug;
 
+int yyparse();
+
 using namespace std;
 using namespace IceUtil;
 using namespace IceUtilInternal;
@@ -666,19 +663,19 @@
         StringSeq targets;
         map<string, string> vars;
 
-        vector<string>::const_iterator p = args.begin();
-        string desc = *p++;
+        vector<string>::const_iterator arg = args.begin();
+        string desc = *arg++;
 
-        for(; p != args.end(); ++p)
+        for(; arg != args.end(); ++arg)
         {
-            string::size_type pos = p->find('=');
+            string::size_type pos = arg->find('=');
             if(pos != string::npos)
             {
-                vars[p->substr(0, pos)] = p->substr(pos + 1);
+                vars[arg->substr(0, pos)] = arg->substr(pos + 1);
             }
             else
             {
-                targets.push_back(*p);
+                targets.push_back(*arg);
             }
         }
 
@@ -2476,15 +2473,15 @@
 
         _session->ice_getConnection()->setAdapter(adapter);
 
-        Ice::Identity id;
+        Ice::Identity ident;
         ostringstream name;
         name << "RemoteLogger-" << loggerCallbackCount++;
-        id.name = name.str();
-        id.category = adminCallbackTemplate->ice_getIdentity().category;
+        ident.name = name.str();
+        ident.category = adminCallbackTemplate->ice_getIdentity().category;
 
         RemoteLoggerIPtr servant = new RemoteLoggerI;
         Ice::RemoteLoggerPrx prx =
-            Ice::RemoteLoggerPrx::uncheckedCast(adapter->add(servant, id));
+            Ice::RemoteLoggerPrx::uncheckedCast(adapter->add(servant, ident));
         adapter->activate();
 
         loggerAdmin->attachRemoteLogger(prx, Ice::LogMessageTypeSeq(), Ice::StringSeq(), tail ? lineCount : -1);
@@ -2526,7 +2523,7 @@
 void
 Parser::showBanner()
 {
-    consoleOut << "Ice " << ICE_STRING_VERSION << "  Copyright (c) 2003-2018 ZeroC, Inc." << endl;
+    consoleOut << "Ice " << ICE_STRING_VERSION << "  Copyright (c) ZeroC, Inc." << endl;
 }
 
 void
@@ -2610,7 +2607,7 @@
         string line;
         while(true)
         {
-            char c = static_cast<char>(getc(yyin));
+            int c = getc(yyin);
             if(c == EOF)
             {
                 if(line.size())
@@ -2620,7 +2617,7 @@
                 break;
             }
 
-            line += c;
+            line += static_cast<char>(c);
             if(c == '\n')
             {
                 break;
@@ -2871,11 +2868,11 @@
 }
 
 void
-Parser::exception(const Ice::Exception& ex)
+Parser::exception(const Ice::Exception& pex)
 {
     try
     {
-        ex.ice_throw();
+        pex.ice_throw();
     }
     catch(const ApplicationNotExistException& ex)
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Parser.h zeroc-ice-3.7.2/cpp/src/IceGrid/Parser.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Parser.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Parser.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_PARSER_H
 #define ICE_GRID_PARSER_H
@@ -23,7 +18,6 @@
 #define YYSTYPE std::list<std::string>
 #define YY_DECL int yylex(YYSTYPE* yylvalp)
 YY_DECL;
-int yyparse();
 
 //
 // I must set the initial stack depth to the maximum stack depth to
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/PlatformInfo.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/PlatformInfo.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/PlatformInfo.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/PlatformInfo.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
@@ -240,8 +235,8 @@
 #ifdef _WIN32
     _os = "Windows";
     char hostname[MAX_COMPUTERNAME_LENGTH + 1];
-    unsigned long size = sizeof(hostname);
-    if(GetComputerName(hostname, &size))
+    unsigned long hsize = sizeof(hostname);
+    if(GetComputerName(hostname, &hsize))
     {
         _hostname = hostname;
     }
@@ -627,7 +622,7 @@
         }
 
         int usage = 100;
-        PDH_STATUS err = PdhCollectQueryData(query);
+        err = PdhCollectQueryData(query);
         if(err == ERROR_SUCCESS)
         {
             DWORD type;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/PlatformInfo.h zeroc-ice-3.7.2/cpp/src/IceGrid/PlatformInfo.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/PlatformInfo.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/PlatformInfo.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_PLATFORM_INFO_H
 #define ICE_GRID_PLATFORM_INFO_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/PluginFacadeI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/PluginFacadeI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/PluginFacadeI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/PluginFacadeI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/PluginFacadeI.h>
 #include <IceGrid/PlatformInfo.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/PluginFacadeI.h zeroc-ice-3.7.2/cpp/src/IceGrid/PluginFacadeI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/PluginFacadeI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/PluginFacadeI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_PLUGIN_FACADE_I_H
 #define ICEGRID_PLUGIN_FACADE_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/QueryI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/QueryI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/QueryI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/QueryI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/Internal.h>
 #include <IceGrid/QueryI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/QueryI.h zeroc-ice-3.7.2/cpp/src/IceGrid/QueryI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/QueryI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/QueryI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_QUERY_I_H
 #define ICE_GRID_QUERY_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReapThread.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ReapThread.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReapThread.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReapThread.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/ReapThread.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReapThread.h zeroc-ice-3.7.2/cpp/src/IceGrid/ReapThread.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReapThread.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReapThread.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_REAPER_THREAD_H
 #define ICEGRID_REAPER_THREAD_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryAdminRouter.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryAdminRouter.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryAdminRouter.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryAdminRouter.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceGrid/RegistryAdminRouter.h>
 #include <Ice/Ice.h>
@@ -25,7 +20,7 @@
                              const AMD_Object_ice_invokePtr& cb,
                              const pair<const Byte*, const Byte*>& inParams,
                              const Current& current) :
-        _callback(cb), _inParams(inParams.first, inParams.second), _current(current)
+        _adminRouter(adminRouter), _callback(cb), _inParams(inParams.first, inParams.second), _current(current)
     {
     }
 
@@ -37,7 +32,7 @@
         _adminRouter->ice_invoke_async(_callback, make_pair(&_inParams[0], &_inParams[0] + _inParams.size()), _current);
     }
 
-    void synchronized(const Ice::Exception& ex)
+    void synchronized(const Ice::Exception&)
     {
         _callback->ice_exception(Ice::ObjectNotExistException(__FILE__, __LINE__));
     }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryAdminRouter.h zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryAdminRouter.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryAdminRouter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryAdminRouter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_REGISTRY_ADMIN_ROUTER_H
 #define ICE_GRID_REGISTRY_ADMIN_ROUTER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UUID.h>
 #include <IceUtil/FileUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryI.h zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/RegistryI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/RegistryI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_REGISTRYI_H
 #define ICE_GRID_REGISTRYI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaCache.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaCache.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaCache.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaCache.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/LocalException.h>
@@ -42,8 +37,8 @@
     ReplicaEntryPtr entry;
     while((entry = getImpl(name)))
     {
-        ReplicaSessionIPtr session = entry->getSession();
-        if(session->isDestroyed())
+        ReplicaSessionIPtr s = entry->getSession();
+        if(s->isDestroyed())
         {
             wait(); // Wait for the session to be removed.
         }
@@ -56,14 +51,14 @@
             sync.release();
             try
             {
-                session->getInternalRegistry()->ice_ping();
+                s->getInternalRegistry()->ice_ping();
                 throw ReplicaActiveException();
             }
             catch(const Ice::LocalException&)
             {
                 try
                 {
-                    session->destroy(Ice::emptyCurrent);
+                    s->destroy(Ice::emptyCurrent);
                 }
                 catch(const Ice::LocalException&)
                 {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaCache.h zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaCache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaCache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaCache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_REPLICACACHE_H
 #define ICE_GRID_REPLICACACHE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionI.h zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_REPLICA_SESSION_H
 #define ICEGRID_REPLICA_SESSION_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionManager.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionManager.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/ReplicaSessionManager.h>
@@ -35,7 +30,7 @@
     virtual void
     applicationInit(int, const ApplicationInfoSeq& applications, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         _database->syncApplications(applications, getSerials(current.ctx, serial));
         receivedUpdate(ApplicationObserverTopicName, serial);
     }
@@ -43,7 +38,7 @@
     virtual void
     applicationAdded(int, const ApplicationInfo& application, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -61,7 +56,7 @@
     virtual void
     applicationRemoved(int, const std::string& name, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -79,7 +74,7 @@
     virtual void
     applicationUpdated(int, const ApplicationUpdateInfo& update, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -103,7 +98,7 @@
     virtual void
     adapterInit(const AdapterInfoSeq& adapters, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         _database->syncAdapters(adapters, getSerials(current.ctx, serial));
         receivedUpdate(AdapterObserverTopicName, serial);
     }
@@ -111,7 +106,7 @@
     virtual void
     adapterAdded(const AdapterInfo& info, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -127,7 +122,7 @@
     virtual void
     adapterUpdated(const AdapterInfo& info, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -143,7 +138,7 @@
     virtual void
     adapterRemoved(const std::string& id, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -159,7 +154,7 @@
     virtual void
     objectInit(const ObjectInfoSeq& objects, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         _database->syncObjects(objects, getSerials(current.ctx, serial));
         receivedUpdate(ObjectObserverTopicName, serial);
     }
@@ -167,7 +162,7 @@
     virtual void
     objectAdded(const ObjectInfo& info, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -186,7 +181,7 @@
     virtual void
     objectUpdated(const ObjectInfo& info, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
@@ -211,7 +206,7 @@
     virtual void
     objectRemoved(const Ice::Identity& id, const Ice::Current& current)
     {
-        int serial;
+        int serial = 0;
         string failure;
         try
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionManager.h zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionManager.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ReplicaSessionManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ReplicaSessionManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H
 #define ICE_GRID_REPLICA_SESSION_MANAGER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Scanner.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Scanner.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Scanner.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Scanner.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -35,7 +35,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -52,7 +52,7 @@
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -169,7 +169,7 @@
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -226,7 +226,7 @@
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -462,37 +462,27 @@
 #line 1 "src/IceGrid/Scanner.l"
 #line 2 "src/IceGrid/Scanner.l"
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/Parser.h>
 #include <IceGrid/Grammar.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
@@ -536,7 +526,7 @@
 }
 #define         YY_USER_INIT initScanner();
 
-#line 539 "src/IceGrid/Scanner.cpp"
+#line 534 "src/IceGrid/Scanner.cpp"
 
 #define INITIAL 0
 
@@ -596,7 +586,7 @@
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-
+    
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -717,11 +707,11 @@
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
-#line 86 "src/IceGrid/Scanner.l"
+    
+#line 81 "src/IceGrid/Scanner.l"
 
 
-#line 724 "src/IceGrid/Scanner.cpp"
+#line 719 "src/IceGrid/Scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -806,7 +796,7 @@
 
 case 1:
 YY_RULE_SETUP
-#line 88 "src/IceGrid/Scanner.l"
+#line 83 "src/IceGrid/Scanner.l"
 {
     // C++-style comment
     int c;
@@ -819,7 +809,7 @@
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 98 "src/IceGrid/Scanner.l"
+#line 93 "src/IceGrid/Scanner.l"
 {
     // C-style comment
     while(true)
@@ -848,7 +838,7 @@
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 123 "src/IceGrid/Scanner.l"
+#line 118 "src/IceGrid/Scanner.l"
 {
     size_t len = strlen(yytext);
     for(size_t i = 0; i < len; ++i)
@@ -863,14 +853,14 @@
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 134 "src/IceGrid/Scanner.l"
+#line 129 "src/IceGrid/Scanner.l"
 {
     return ';';
 }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 138 "src/IceGrid/Scanner.l"
+#line 133 "src/IceGrid/Scanner.l"
 {
     // "..."-type strings
     string s = parseDoubleQuotedString();
@@ -881,13 +871,13 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 146 "src/IceGrid/Scanner.l"
+#line 141 "src/IceGrid/Scanner.l"
 {
     // '...'-type strings
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '\'')
         {
             break;
@@ -899,7 +889,7 @@
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     yylvalp->clear();
@@ -909,14 +899,14 @@
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 171 "src/IceGrid/Scanner.l"
+#line 166 "src/IceGrid/Scanner.l"
 {
     // Simple strings
     string s;
     s += yytext[0];
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == EOF)
         {
             break;
@@ -931,12 +921,12 @@
             s += parseSingleQuotedString();
             continue;
         }
-        else if(isspace(static_cast<unsigned char>(c)) || c == ';')
+        else if(isspace(c) || c == ';')
         {
             unput(c);
             break;
         }
-        s += c;
+        s += static_cast<char>(c);
     }
 
     yylvalp->clear();
@@ -948,10 +938,10 @@
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 207 "src/IceGrid/Scanner.l"
+#line 202 "src/IceGrid/Scanner.l"
 ECHO;
 	YY_BREAK
-#line 954 "src/IceGrid/Scanner.cpp"
+#line 949 "src/IceGrid/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1229,7 +1219,7 @@
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-
+    
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
@@ -1283,7 +1273,7 @@
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-
+    
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
@@ -1326,7 +1316,7 @@
 
 {
 	int c;
-
+    
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1393,12 +1383,12 @@
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- *
+ * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void yyrestart  (FILE * input_file )
 {
-
+    
 	if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1411,11 +1401,11 @@
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- *
+ * 
  */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
+    
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		yypop_buffer_state();
@@ -1455,13 +1445,13 @@
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
+ * 
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1484,11 +1474,11 @@
 
 /** Destroy the buffer.
  * @param b a buffer created with yy_create_buffer()
- *
+ * 
  */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-
+    
 	if ( ! b )
 		return;
 
@@ -1509,7 +1499,7 @@
 
 {
 	int oerrno = errno;
-
+    
 	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1531,7 +1521,7 @@
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
+ * 
  */
     void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -1560,7 +1550,7 @@
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *
+ *  
  */
 void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -1590,7 +1580,7 @@
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *
+ *  
  */
 void yypop_buffer_state (void)
 {
@@ -1614,7 +1604,7 @@
 static void yyensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
-
+    
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
@@ -1627,9 +1617,9 @@
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+				
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -1657,13 +1647,13 @@
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
+ * 
+ * @return the newly allocated buffer state object. 
  */
 YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -1692,14 +1682,14 @@
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- *
+ * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
 YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 {
-
+    
 	return yy_scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -1707,7 +1697,7 @@
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- *
+ * 
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
@@ -1716,7 +1706,7 @@
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) yyalloc(n  );
@@ -1770,16 +1760,16 @@
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- *
+ * 
  */
 int yyget_lineno  (void)
 {
-
+        
     return yylineno;
 }
 
 /** Get the input stream.
- *
+ * 
  */
 FILE *yyget_in  (void)
 {
@@ -1787,7 +1777,7 @@
 }
 
 /** Get the output stream.
- *
+ * 
  */
 FILE *yyget_out  (void)
 {
@@ -1795,7 +1785,7 @@
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
 yy_size_t yyget_leng  (void)
 {
@@ -1803,7 +1793,7 @@
 }
 
 /** Get the current token.
- *
+ * 
  */
 
 char *yyget_text  (void)
@@ -1813,18 +1803,18 @@
 
 /** Set the current line number.
  * @param line_number
- *
+ * 
  */
 void yyset_lineno (int  line_number )
 {
-
+    
     yylineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
- *
+ * 
  * @see yy_switch_to_buffer
  */
 void yyset_in (FILE *  in_str )
@@ -1878,7 +1868,7 @@
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 int yylex_destroy  (void)
 {
-
+    
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		yy_delete_buffer(YY_CURRENT_BUFFER  );
@@ -1945,7 +1935,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 207 "src/IceGrid/Scanner.l"
+#line 202 "src/IceGrid/Scanner.l"
 
 
 
@@ -2007,7 +1997,7 @@
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '"')
         {
             break;
@@ -2019,26 +2009,26 @@
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
+            int next = yyinput();
             switch(next)
             {
                 case '\\':
                 case '"':
                 {
-                    s += next;
+                    s += static_cast<char>(next);
                     break;
                 }
 
                 default:
                 {
-                    s += c;
+                    s += static_cast<char>(c);
                     unput(next);
                 }
             }
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     return s;
@@ -2050,7 +2040,7 @@
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '\'')
         {
             break;
@@ -2062,7 +2052,7 @@
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     return s;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Scanner.l zeroc-ice-3.7.2/cpp/src/IceGrid/Scanner.l
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Scanner.l	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Scanner.l	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,26 @@
 %{
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/Parser.h>
 #include <IceGrid/Grammar.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
@@ -148,7 +138,7 @@
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '\'')
         {
             break;
@@ -160,7 +150,7 @@
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     yylvalp->clear();
@@ -174,7 +164,7 @@
     s += yytext[0];
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == EOF)
         {
             break;
@@ -189,12 +179,12 @@
             s += parseSingleQuotedString();
             continue;
         }
-        else if(isspace(static_cast<unsigned char>(c)) || c == ';')
+        else if(isspace(c) || c == ';')
         {
             unput(c);
             break;
         }
-        s += c;
+        s += static_cast<char>(c);
     }
 
     yylvalp->clear();
@@ -264,7 +254,7 @@
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '"')
         {
             break;
@@ -276,26 +266,26 @@
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
+            int next = yyinput();
             switch(next)
             {
                 case '\\':
                 case '"':
                 {
-                    s += next;
+                    s += static_cast<char>(next);
                     break;
                 }
 
                 default:
                 {
-                    s += c;
+                    s += static_cast<char>(c);
                     unput(next);
                 }
             }
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     return s;
@@ -307,7 +297,7 @@
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '\'')
         {
             break;
@@ -319,7 +309,7 @@
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     return s;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ServerAdapterI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ServerAdapterI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ServerAdapterI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ServerAdapterI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/ServerAdapterI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ServerAdapterI.h zeroc-ice-3.7.2/cpp/src/IceGrid/ServerAdapterI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ServerAdapterI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ServerAdapterI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_SERVER_ADAPTER_I_H
 #define ICE_GRID_SERVER_ADAPTER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ServerCache.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ServerCache.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ServerCache.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ServerCache.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/LoggerUtil.h>
@@ -80,7 +75,7 @@
                                      bool noRestart,
                                      bool remove,
                                      const Ice::AsyncResultPtr& result) :
-    _server(server), _node(node), _noRestart(noRestart), _result(result)
+    _server(server), _node(node), _remove(remove), _noRestart(noRestart), _result(result)
 {
 }
 
@@ -94,7 +89,14 @@
     catch(const DeploymentException& ex)
     {
         ostringstream os;
-        os << "check for server `" << _server << "' update failed: " << ex.reason;
+        if(_remove)
+        {
+            os << "check for server `" << _server << "' remove failed: " << ex.reason;
+        }
+        else
+        {
+            os << "check for server `" << _server << "' update failed: " << ex.reason;
+        }
         throw DeploymentException(os.str());
     }
     catch(const Ice::OperationNotExistException&)
@@ -111,7 +113,6 @@
         os << ex;
         throw NodeUnreachableException(_node, os.str());
     }
-    return false;
 }
 
 ServerCache::ServerCache(const Ice::CommunicatorPtr& communicator,
@@ -449,7 +450,7 @@
     if(info.descriptor->activation == "session")
     {
         _allocatable = true;
-        _load->sessionId = _session ? _session->getId() : string("");
+        _load->sessionId = _allocationSession ? _allocationSession->getId() : string("");
     }
 }
 
@@ -493,7 +494,7 @@
             throw ServerNotExistException();
         }
         info = _loaded.get() ? *_loaded : *_load;
-        session = _session;
+        session = _allocationSession;
     }
     assert(info.descriptor);
     if(resolve)
@@ -696,7 +697,7 @@
         else if(_load.get())
         {
             load = *_load;
-            session = _session;
+            session = _allocationSession;
             timeout = _deactivationTimeout; // loadServer might block to deactivate the previous server.
         }
         else
@@ -874,7 +875,7 @@
             {
                 load = *_load;
                 noRestart = _noRestart;
-                session = _session;
+                session = _allocationSession;
                 timeout = _deactivationTimeout; // loadServer might block to deactivate the previous server.
             }
         }
@@ -937,7 +938,7 @@
             _updated = false;
             load = *_load;
             noRestart = _noRestart;
-            session = _session;
+            session = _allocationSession;
         }
     }
 
@@ -988,7 +989,7 @@
             _updated = false;
             load = *_load.get();
             noRestart = _noRestart;
-            session = _session;
+            session = _allocationSession;
             timeout = _deactivationTimeout; // loadServer might block to deactivate the previous server.
         }
     }
@@ -1041,7 +1042,7 @@
         }
 
         oldInfo = _loaded.get() ? *_loaded : *_load;
-        session = _session;
+        session = _allocationSession;
     }
 
     NodeEntryPtr node;
@@ -1131,7 +1132,7 @@
         {
             _load.reset(_loaded.release());
         }
-        _session = session;
+        _allocationSession = session;
         _load->sessionId = session->getId();
     }
 
@@ -1218,7 +1219,7 @@
             _load.reset(_loaded.release());
         }
         _load->sessionId = "";
-        _session = 0;
+        _allocationSession = 0;
     }
 
     TraceLevelsPtr traceLevels = _cache.getTraceLevels();
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ServerCache.h zeroc-ice-3.7.2/cpp/src/IceGrid/ServerCache.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ServerCache.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ServerCache.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_SERVERCACHE_H
 #define ICE_GRID_SERVERCACHE_H
@@ -51,6 +46,7 @@
 
     const std::string _server;
     const std::string _node;
+    const bool _remove;
     const bool _noRestart;
     const Ice::AsyncResultPtr _result;
 };
@@ -130,7 +126,7 @@
     bool _noRestart;
     std::vector<SynchronizationCallbackPtr> _callbacks;
 
-    SessionIPtr _session;
+    SessionIPtr _allocationSession;
 };
 typedef IceUtil::Handle<ServerEntry> ServerEntryPtr;
 typedef std::vector<ServerEntryPtr> ServerEntrySeq;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ServerI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/ServerI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ServerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ServerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/FileUtil.h>
@@ -328,7 +323,7 @@
         {
             assert(_p->first.find("config_") == 0);
             const string service = _p->first.substr(7);
-            if(getPropertyAsInt(_properties.at("config"), "IceBox.UseSharedCommunicator." + service) > 0)
+            if(getPropertyAsInt(_properties["config"], "IceBox.UseSharedCommunicator." + service) > 0)
             {
                 facet = "IceBox.SharedCommunicator.Properties";
             }
@@ -366,7 +361,7 @@
     const Ice::ObjectPrx _admin;
     const InternalServerDescriptorPtr _desc;
     const TraceLevelsPtr _traceLevels;
-    const PropertyDescriptorSeqDict _properties;
+    PropertyDescriptorSeqDict _properties;
     PropertyDescriptorSeqDict _oldProperties;
     PropertyDescriptorSeqDict::const_iterator _p;
 };
@@ -2479,9 +2474,9 @@
         is.getline(line, 1024); // Ignore comments
         is.getline(line, 1024);
         is.getline(line, 1024);
-        string ignore;
-        is >> ignore >> descUUID;
-        is >> ignore >> descRevision;
+        string ignored;
+        is >> ignored >> descUUID;
+        is >> ignored >> descRevision;
     }
 
     if(uuid != descUUID)
@@ -2604,13 +2599,20 @@
         // Get the uid/gid associated with the given user.
         //
         struct passwd pwbuf;
-        vector<char> buffer(4096); // 4KB initial buffer size
+        int sz = sysconf(_SC_GETPW_R_SIZE_MAX);
+        if(sz == -1)
+        {
+            sz = 4096;
+        }
+        vector<char> buffer(sz);
         struct passwd *pw;
         int err = getpwnam_r(user.c_str(), &pwbuf, &buffer[0], buffer.size(), &pw);
         while(err == ERANGE && buffer.size() < 1024 * 1024) // Limit buffer to 1MB
         {
             buffer.resize(buffer.size() * 2);
+            err = getpwnam_r(user.c_str(), &pwbuf, &buffer[0], buffer.size(), &pw);
         }
+
         if(err != 0)
         {
             throw Ice::SyscallException(__FILE__, __LINE__, err);
@@ -3168,7 +3170,6 @@
     else
     {
         throw FileNotAvailableException("unknown file");
-        return ""; // Keep the compiler happy.
     }
 }
 
@@ -3178,8 +3179,8 @@
     //
     // Copy the descriptor properties.
     //
-    PropertyDescriptorSeqDict properties = desc->properties;
-    PropertyDescriptorSeq& props = properties["config"];
+    PropertyDescriptorSeqDict propDict = desc->properties;
+    PropertyDescriptorSeq& props = propDict["config"];
 
     //
     // Cache the path of the stderr/stdout file, first check if the
@@ -3209,7 +3210,7 @@
     //
     {
         const PropertyDescriptorSeq& overrides = _node->getPropertiesOverride();
-        for(PropertyDescriptorSeqDict::iterator p = properties.begin(); p != properties.end(); ++p)
+        for(PropertyDescriptorSeqDict::iterator p = propDict.begin(); p != propDict.end(); ++p)
         {
             if(getProperty(p->second, "Ice.Default.Locator").empty())
             {
@@ -3237,5 +3238,5 @@
         }
     }
 
-    return properties;
+    return propDict;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/ServerI.h zeroc-ice-3.7.2/cpp/src/IceGrid/ServerI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/ServerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/ServerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_SERVER_I_H
 #define ICE_GRID_SERVER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/SessionI.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/SessionI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/SessionI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/SessionI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/UUID.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/SessionI.h zeroc-ice-3.7.2/cpp/src/IceGrid/SessionI.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/SessionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/SessionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_SESSIONI_H
 #define ICEGRID_SESSIONI_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/SessionManager.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/SessionManager.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/SessionManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/SessionManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/SessionManager.h>
 
+#include <set>
+
 using namespace std;
 using namespace IceGrid;
 
@@ -99,17 +96,24 @@
         }
     }
 
+    //
+    // Find all known query objects by querying all the registries we can find.
+    //
     map<Ice::Identity, QueryPrx> proxies;
-    vector<Ice::AsyncResultPtr> results;
-    size_t previousSize = 0;
-    do
+    set<QueryPrx> requested;
+    while(true)
     {
+        vector<Ice::AsyncResultPtr> results;
         for(vector<QueryPrx>::const_iterator q = queryObjects.begin(); q != queryObjects.end(); ++q)
         {
             results.push_back((*q)->begin_findAllObjectsByType(Registry::ice_staticId()));
+            requested.insert(*q);
+        }
+        if(results.empty())
+        {
+            break;
         }
 
-        map<Ice::Identity, QueryPrx> proxies;
         for(vector<Ice::AsyncResultPtr>::const_iterator p = results.begin(); p != results.end(); ++p)
         {
             QueryPrx query = QueryPrx::uncheckedCast((*p)->getProxy());
@@ -123,9 +127,16 @@
                 Ice::ObjectProxySeq prxs = query->end_findAllObjectsByType(*p);
                 for(Ice::ObjectProxySeq::iterator q = prxs.begin(); q != prxs.end(); ++q)
                 {
-                    Ice::Identity id = (*q)->ice_getIdentity();
-                    id.name = "Query";
-                    proxies[(*q)->ice_getIdentity()] = QueryPrx::uncheckedCast((*q)->ice_identity(id));
+                    if(proxies.find((*q)->ice_getIdentity()) == proxies.end())
+                    {
+                        //
+                        // Add query proxy for each IceGrid registry. The proxy contains the endpoints
+                        // of the registry since it's based on the registry interface proxy.
+                        //
+                        Ice::Identity id = (*q)->ice_getIdentity();
+                        id.name = "Query";
+                        proxies[(*q)->ice_getIdentity()] = QueryPrx::uncheckedCast((*q)->ice_identity(id));
+                    }
                 }
             }
             catch(const Ice::Exception&)
@@ -137,12 +148,18 @@
         queryObjects.clear();
         for(map<Ice::Identity, QueryPrx>::const_iterator p = proxies.begin(); p != proxies.end(); ++p)
         {
-            queryObjects.push_back(p->second);
+            if(requested.find(p->second) == requested.end())
+            {
+                queryObjects.push_back(p->second);
+            }
         }
     }
-    while(proxies.size() != previousSize);
 
     Lock sync(*this);
-    _queryObjects.swap(queryObjects);
+    _queryObjects.clear();
+    for(map<Ice::Identity, QueryPrx>::const_iterator p = proxies.begin(); p != proxies.end(); ++p)
+    {
+        _queryObjects.push_back(p->second);
+    }
     return _queryObjects;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/SessionManager.h zeroc-ice-3.7.2/cpp/src/IceGrid/SessionManager.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/SessionManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/SessionManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_SESSION_MANAGER_H
 #define ICE_GRID_SESSION_MANAGER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/SessionServantManager.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/SessionServantManager.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/SessionServantManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/SessionServantManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UUID.h>
 #include <Ice/LocalException.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/SessionServantManager.h zeroc-ice-3.7.2/cpp/src/IceGrid/SessionServantManager.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/SessionServantManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/SessionServantManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H
 #define ICE_GRID_SESSIONSERVANTLOCATOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Topics.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Topics.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Topics.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Topics.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/Topics.h>
@@ -104,14 +99,14 @@
 {
     Lock sync(*this);
     Ice::EncodingVersion v = IceInternal::getCompatibleEncoding(observer->ice_getEncodingVersion());
-    map<Ice::EncodingVersion, IceStorm::TopicPrx>::const_iterator p = _topics.find(v);
-    if(p == _topics.end())
+    map<Ice::EncodingVersion, IceStorm::TopicPrx>::const_iterator q = _topics.find(v);
+    if(q == _topics.end())
     {
         return;
     }
     try
     {
-        p->second->unsubscribe(observer);
+        q->second->unsubscribe(observer);
     }
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
@@ -468,9 +463,9 @@
 
     try
     {
-        for(vector<NodeObserverPrx>::const_iterator p = _publishers.begin(); p != _publishers.end(); ++p)
+        for(vector<NodeObserverPrx>::const_iterator q = _publishers.begin(); q != _publishers.end(); ++q)
         {
-            (*p)->updateServer(node, server);
+            (*q)->updateServer(node, server);
         }
     }
     catch(const Ice::LocalException& ex)
@@ -524,9 +519,9 @@
 
     try
     {
-        for(vector<NodeObserverPrx>::const_iterator p = _publishers.begin(); p != _publishers.end(); ++p)
+        for(vector<NodeObserverPrx>::const_iterator q = _publishers.begin(); q != _publishers.end(); ++q)
         {
-            (*p)->updateAdapter(node, adapter);
+            (*q)->updateAdapter(node, adapter);
         }
     }
     catch(const Ice::LocalException& ex)
@@ -730,18 +725,6 @@
         out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << ex.what();
         assert(false);
     }
-    catch(const std::string& msg)
-    {
-        Ice::Error out(_logger);
-        out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << msg;
-        assert(false);
-    }
-    catch(const char* msg)
-    {
-        Ice::Error out(_logger);
-        out << "unexpected exception while instantiating application `" << info.descriptor.name << "':\n" << msg;
-        assert(false);
-    }
     catch(...)
     {
         Ice::Error out(_logger);
@@ -1038,9 +1021,9 @@
             q->second = *p;
             try
             {
-                for(vector<ObjectObserverPrx>::const_iterator q = _publishers.begin(); q != _publishers.end(); ++q)
+                for(vector<ObjectObserverPrx>::const_iterator r = _publishers.begin(); r != _publishers.end(); ++r)
                 {
-                    (*q)->objectUpdated(*p, getContext(_serial));
+                    (*r)->objectUpdated(*p, getContext(_serial));
                 }
             }
             catch(const Ice::LocalException& ex)
@@ -1054,9 +1037,9 @@
             _objects.insert(make_pair(p->proxy->ice_getIdentity(), *p));
             try
             {
-                for(vector<ObjectObserverPrx>::const_iterator q = _publishers.begin(); q != _publishers.end(); ++q)
+                for(vector<ObjectObserverPrx>::const_iterator r = _publishers.begin(); r != _publishers.end(); ++r)
                 {
-                    (*q)->objectAdded(*p, getContext(_serial));
+                    (*r)->objectAdded(*p, getContext(_serial));
                 }
             }
             catch(const Ice::LocalException& ex)
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Topics.h zeroc-ice-3.7.2/cpp/src/IceGrid/Topics.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Topics.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Topics.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_TOPICS_H
 #define ICEGRID_TOPICS_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/TraceLevels.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/TraceLevels.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/TraceLevels.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/TraceLevels.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/Properties.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/TraceLevels.h zeroc-ice-3.7.2/cpp/src/IceGrid/TraceLevels.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/TraceLevels.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/TraceLevels.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_TRACE_LEVELS_H
 #define ICE_GRID_TRACE_LEVELS_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Util.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/Util.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/Util.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/Util.h zeroc-ice-3.7.2/cpp/src/IceGrid/Util.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_UTIL_H
 #define ICE_GRID_UTIL_H
@@ -21,14 +16,6 @@
 namespace IceGrid
 {
 
-struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
-{
-    ptrdiff_t operator()(ptrdiff_t d)
-    {
-        return IceUtilInternal::random(static_cast<int>(d));
-    }
-};
-
 template<typename T> std::insert_iterator<T>
 inline set_inserter(T& container)
 {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/WaitQueue.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/WaitQueue.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/WaitQueue.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/WaitQueue.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/WaitQueue.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/WaitQueue.h zeroc-ice-3.7.2/cpp/src/IceGrid/WaitQueue.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/WaitQueue.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/WaitQueue.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_WAIT_QUEUE_H
 #define ICE_GRID_WAIT_QUEUE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/WellKnownObjectsManager.cpp zeroc-ice-3.7.2/cpp/src/IceGrid/WellKnownObjectsManager.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGrid/WellKnownObjectsManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/WellKnownObjectsManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Endpoint.h>
 #include <Glacier2/PermissionsVerifier.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGrid/WellKnownObjectsManager.h zeroc-ice-3.7.2/cpp/src/IceGrid/WellKnownObjectsManager.h
--- zeroc-ice-3.7.1/cpp/src/IceGrid/WellKnownObjectsManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGrid/WellKnownObjectsManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
 #define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/icegriddb/DBTypes.ice zeroc-ice-3.7.2/cpp/src/icegriddb/DBTypes.ice
--- zeroc-ice-3.7.1/cpp/src/icegriddb/DBTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/icegriddb/DBTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/icegriddb/IceGridDB.cpp zeroc-ice-3.7.2/cpp/src/icegriddb/IceGridDB.cpp
--- zeroc-ice-3.7.1/cpp/src/icegriddb/IceGridDB.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/icegriddb/IceGridDB.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
 #include <Ice/Ice.h>
 #include <Ice/ConsoleUtil.h>
@@ -19,9 +15,7 @@
 #include <fstream>
 
 using namespace std;
-using namespace Ice;
 using namespace IceInternal;
-using namespace IceGrid;
 
 namespace
 {
@@ -79,7 +73,7 @@
     {
     }
 
-    virtual ObjectPtr create(const string& type)
+    virtual Ice::ObjectPtr create(const string& type)
     {
         if(type == "::IceGrid::ServerDescriptor")
         {
@@ -124,34 +118,48 @@
 };
 }
 
-class Client : public Ice::Application
-{
-public:
+int run(const Ice::StringSeq&);
 
-    void usage();
-    virtual int run(int, char*[]);
-};
+Ice::CommunicatorPtr communicator;
 
-#ifdef _WIN32
+void
+destroyCommunicator(int)
+{
+    communicator->destroy();
+}
 
 int
+#ifdef _WIN32
 wmain(int argc, wchar_t* argv[])
-
 #else
-
-int
 main(int argc, char* argv[])
-
 #endif
 {
-    Client app;
-    return app.main(argc, argv);
+    int status = 0;
+
+    try
+    {
+        Ice::CtrlCHandler ctrlCHandler;
+        Ice::CommunicatorHolder ich(argc, argv);
+        communicator = ich.communicator();
+
+        ctrlCHandler.setCallback(&destroyCommunicator);
+
+        status = run(Ice::argsToStringSeq(argc, argv));
+    }
+    catch(const std::exception& ex)
+    {
+        consoleErr << ex.what() << endl;
+        status = 1;
+    }
+
+    return status;
 }
 
 void
-Client::usage()
+usage(const string& name)
 {
-    consoleErr << "Usage: " << appName() << " <options>\n";
+    consoleErr << "Usage: " << name << " <options>\n";
     consoleErr <<
         "Options:\n"
         "-h, --help             Show this message.\n"
@@ -167,7 +175,7 @@
 }
 
 int
-Client::run(int argc, char* argv[])
+run(const Ice::StringSeq& args)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -180,48 +188,46 @@
     opts.addOpt("", "mapsize", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "server-version", IceUtilInternal::Options::NeedArg);
 
-    vector<string> args;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        if(!opts.parse(args).empty())
+        {
+            consoleErr << args[0] << ": too many arguments" << endl;
+            usage(args[0]);
+            return 1;
+        }
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        consoleErr << argv[0] << ": " << e.reason << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-    if(!args.empty())
-    {
-        consoleErr << argv[0] << ": too many arguments" << endl;
-        usage();
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": " << e.reason << endl;
+        usage(args[0]);
+        return 1;
     }
 
     if(opts.isSet("help"))
     {
-        usage();
-        return EXIT_SUCCESS;
+        usage(args[0]);
+        return 0;
     }
 
     if(opts.isSet("version"))
     {
         consoleOut << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     if(!(opts.isSet("import") ^ opts.isSet("export")))
     {
-        consoleErr << argv[0] << ": either --import or --export must be set" << endl;
-        usage();
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": either --import or --export must be set" << endl;
+        usage(args[0]);
+        return 1;
     }
 
     if(!(opts.isSet("dbhome") ^ opts.isSet("dbpath")))
     {
-        consoleErr << argv[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
-        usage();
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
+        usage(args[0]);
+        return 1;
     }
 
     bool debug = opts.isSet("debug");
@@ -246,7 +252,7 @@
         IceGrid::AllData data;
 
         IceDB::IceContext dbContext;
-        dbContext.communicator = communicator();
+        dbContext.communicator = communicator;
         dbContext.encoding.major = 1;
         dbContext.encoding.minor = 1;
 
@@ -257,21 +263,21 @@
 
             if(!IceUtilInternal::directoryExists(dbPath))
             {
-                consoleErr << argv[0] << ": output directory does not exist: " << dbPath << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": output directory does not exist: " << dbPath << endl;
+                return 1;
             }
 
             if(!IceUtilInternal::isEmptyDirectory(dbPath))
             {
-                consoleErr << argv[0] << ": output directory is not empty: " << dbPath << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": output directory is not empty: " << dbPath << endl;
+                return 1;
             }
 
             ifstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
             if(fs.fail())
             {
-                consoleErr << argv[0] << ": could not open input file: " << strerror(errno) << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": could not open input file: " << IceUtilInternal::errorToString(errno) << endl;
+                return 1;
             }
             fs.unsetf(ios::skipws);
 
@@ -281,8 +287,8 @@
             if(!fileSize)
             {
                 fs.close();
-                consoleErr << argv[0] << ": empty input file" << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": empty input file" << endl;
+                return 1;
             }
 
             fs.seekg(0, ios::beg);
@@ -295,12 +301,12 @@
 
             if(!serverVersion.empty())
             {
-                ValueFactoryPtr factory = new ValueFactoryI(serverVersion);
-                communicator()->getValueFactoryManager()->add(factory, "::IceGrid::ServerDescriptor");
-                communicator()->getValueFactoryManager()->add(factory, "::IceGrid::IceBoxDescriptor");
+                Ice::ValueFactoryPtr factory = new ValueFactoryI(serverVersion);
+                communicator->getValueFactoryManager()->add(factory, "::IceGrid::ServerDescriptor");
+                communicator->getValueFactoryManager()->add(factory, "::IceGrid::IceBoxDescriptor");
             }
 
-            Ice::InputStream stream(communicator(), dbContext.encoding, buf);
+            Ice::InputStream stream(communicator, dbContext.encoding, buf);
 
             string type;
             int version;
@@ -308,8 +314,8 @@
             stream.read(type);
             if(type != "IceGrid")
             {
-                consoleErr << argv[0] << ": incorrect input file type: " << type << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": incorrect input file type: " << type << endl;
+                return 1;
             }
             stream.read(version);
             if(version / 100 == 305)
@@ -331,10 +337,10 @@
                     consoleOut << "Writing Applications Map:" << endl;
                 }
 
-                IceDB::Dbi<string, ApplicationInfo, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream>
                     apps(txn, "applications", dbContext, MDB_CREATE);
 
-                for(ApplicationInfoSeq::const_iterator p = data.applications.begin(); p != data.applications.end(); ++p)
+                for(IceGrid::ApplicationInfoSeq::const_iterator p = data.applications.begin(); p != data.applications.end(); ++p)
                 {
                     if(debug)
                     {
@@ -348,10 +354,10 @@
                     consoleOut << "Writing Adapters Map:" << endl;
                 }
 
-                IceDB::Dbi<string, AdapterInfo, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream>
                     adpts(txn, "adapters", dbContext, MDB_CREATE);
 
-                for(AdapterInfoSeq::const_iterator p = data.adapters.begin(); p != data.adapters.end(); ++p)
+                for(IceGrid::AdapterInfoSeq::const_iterator p = data.adapters.begin(); p != data.adapters.end(); ++p)
                 {
                     if(debug)
                     {
@@ -365,14 +371,14 @@
                     consoleOut << "Writing Objects Map:" << endl;
                 }
 
-                IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
                     objs(txn, "objects", dbContext, MDB_CREATE);
 
-                for(ObjectInfoSeq::const_iterator p = data.objects.begin(); p != data.objects.end(); ++p)
+                for(IceGrid::ObjectInfoSeq::const_iterator p = data.objects.begin(); p != data.objects.end(); ++p)
                 {
                     if(debug)
                     {
-                        consoleOut << "  NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity())
+                        consoleOut << "  NAME = " << communicator->identityToString(p->proxy->ice_getIdentity())
                                    << endl;
                     }
                     objs.put(txn, p->proxy->ice_getIdentity(), *p);
@@ -383,15 +389,15 @@
                     consoleOut << "Writing Internal Objects Map:" << endl;
                 }
 
-                IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
                     internalObjs(txn, "internal-objects", dbContext, MDB_CREATE);
 
-                for(ObjectInfoSeq::const_iterator p = data.internalObjects.begin(); p != data.internalObjects.end();
+                for(IceGrid::ObjectInfoSeq::const_iterator p = data.internalObjects.begin(); p != data.internalObjects.end();
                     ++p)
                 {
                     if(debug)
                     {
-                        consoleOut << "  NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity())
+                        consoleOut << "  NAME = " << communicator->identityToString(p->proxy->ice_getIdentity())
                                    << endl;
                     }
                     internalObjs.put(txn, p->proxy->ice_getIdentity(), *p);
@@ -402,10 +408,10 @@
                     consoleOut << "Writing Serials Map:" << endl;
                 }
 
-                IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<string, Ice::Long, IceDB::IceContext, Ice::OutputStream>
                     srls(txn, "serials", dbContext, MDB_CREATE);
 
-                for(StringLongDict::const_iterator p = data.serials.begin(); p != data.serials.end(); ++p)
+                for(IceGrid::StringLongDict::const_iterator p = data.serials.begin(); p != data.serials.end(); ++p)
                 {
                     if(debug)
                     {
@@ -436,7 +442,7 @@
                     applications(txn, "applications", dbContext, 0);
 
                 string name;
-                ApplicationInfo application;
+                IceGrid::ApplicationInfo application;
                 IceDB::ReadOnlyCursor<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream>
                     appCursor(applications, txn);
                 while(appCursor.get(name, application, MDB_NEXT))
@@ -457,7 +463,7 @@
                 IceDB::Dbi<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream>
                     adapters(txn, "adapters", dbContext, 0);
 
-                AdapterInfo adapter;
+                IceGrid::AdapterInfo adapter;
                 IceDB::ReadOnlyCursor<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream>
                     adapterCursor(adapters, txn);
                 while(adapterCursor.get(name, adapter, MDB_NEXT))
@@ -475,18 +481,18 @@
                     consoleOut << "Reading Object Map:" << endl;
                 }
 
-                IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
                     objects(txn, "objects", dbContext, 0);
 
-                Identity id;
-                ObjectInfo object;
-                IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                Ice::Identity id;
+                IceGrid::ObjectInfo object;
+                IceDB::ReadOnlyCursor<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
                     objCursor(objects, txn);
                 while(objCursor.get(id, object, MDB_NEXT))
                 {
                     if(debug)
                     {
-                        consoleOut << "  IDENTITY = " << communicator()->identityToString(id) << endl;
+                        consoleOut << "  IDENTITY = " << communicator->identityToString(id) << endl;
                     }
                     data.objects.push_back(object);
                 }
@@ -497,16 +503,16 @@
                     consoleOut << "Reading Internal Object Map:" << endl;
                 }
 
-                IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
                     internalObjects(txn, "internal-objects", dbContext, 0);
 
-                IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                IceDB::ReadOnlyCursor<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
                     iobjCursor(internalObjects, txn);
                 while(iobjCursor.get(id, object, MDB_NEXT))
                 {
                     if(debug)
                     {
-                        consoleOut << "  IDENTITY = " << communicator()->identityToString(id) << endl;
+                        consoleOut << "  IDENTITY = " << communicator->identityToString(id) << endl;
                     }
                     data.internalObjects.push_back(object);
                 }
@@ -517,11 +523,11 @@
                     consoleOut << "Reading Serials Map:" << endl;
                 }
 
-                IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<string, Ice::Long, IceDB::IceContext, Ice::OutputStream>
                     serials(txn, "serials", dbContext, 0);
 
-                Long serial;
-                IceDB::ReadOnlyCursor<string, Long, IceDB::IceContext, Ice::OutputStream>
+                Ice::Long serial;
+                IceDB::ReadOnlyCursor<string, Ice::Long, IceDB::IceContext, Ice::OutputStream>
                     serialCursor(serials, txn);
                 while(serialCursor.get(name, serial, MDB_NEXT))
                 {
@@ -537,7 +543,7 @@
                 env.close();
             }
 
-            Ice::OutputStream stream(communicator(), dbContext.encoding);
+            Ice::OutputStream stream(communicator, dbContext.encoding);
             stream.write("IceGrid");
             stream.write(ICE_INT_VERSION);
             stream.write(data);
@@ -545,8 +551,8 @@
             ofstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
             if(fs.fail())
             {
-                consoleErr << argv[0] << ": could not open output file: " << strerror(errno) << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": could not open output file: " << IceUtilInternal::errorToString(errno) << endl;
+                return 1;
             }
             fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size());
             fs.close();
@@ -554,9 +560,9 @@
     }
     catch(const IceUtil::Exception& ex)
     {
-        consoleErr << argv[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
+        return 1;
     }
 
-    return EXIT_SUCCESS;
+    return 0;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/icegriddb/Makefile.mk zeroc-ice-3.7.2/cpp/src/icegriddb/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/icegriddb/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/icegriddb/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_programs             :=  icegriddb
 $(project)_generated_includedir := $(project)/generated/IceGrid
diff -Nru zeroc-ice-3.7.1/cpp/src/icegriddb/msbuild/icegriddb.vcxproj zeroc-ice-3.7.2/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
--- zeroc-ice-3.7.1/cpp/src/icegriddb/msbuild/icegriddb.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/icegriddb/msbuild/icegriddb.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -260,20 +260,20 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" />
-    <Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
-    <Import Project="..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
     <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/icegriddb/msbuild/packages.config zeroc-ice-3.7.2/cpp/src/icegriddb/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/src/icegriddb/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/icegriddb/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="lmdb.v120" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v140" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v141" version="0.9.19.3" targetFramework="native" />
+  <package id="lmdb.v120" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v141" version="0.9.23" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGridLib/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceGridLib/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceGridLib/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGridLib/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := IceGrid
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceGridLib/PluginFacadeI.cpp zeroc-ice-3.7.2/cpp/src/IceGridLib/PluginFacadeI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceGridLib/PluginFacadeI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceGridLib/PluginFacadeI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEGRID_API_EXPORTS
 #   define ICEGRID_API_EXPORTS
diff -Nru zeroc-ice-3.7.1/cpp/src/IceIAP/Connector.h zeroc-ice-3.7.2/cpp/src/IceIAP/Connector.h
--- zeroc-ice-3.7.1/cpp/src/IceIAP/Connector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceIAP/Connector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_IAP_CONNECTOR_H
 #define ICE_IAP_CONNECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceIAP/Connector.mm zeroc-ice-3.7.2/cpp/src/IceIAP/Connector.mm
--- zeroc-ice-3.7.1/cpp/src/IceIAP/Connector.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceIAP/Connector.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "Transceiver.h"
 #include "EndpointI.h"
@@ -26,7 +21,9 @@
     {
         throw Ice::ConnectFailedException(__FILE__, __LINE__, 0);
     }
-    return new iAPTransceiver(_instance, session);
+    TransceiverPtr transceiver = new iAPTransceiver(_instance, session);
+    [session release];
+    return transceiver;
 }
 
 Short
diff -Nru zeroc-ice-3.7.1/cpp/src/IceIAP/EndpointI.h zeroc-ice-3.7.2/cpp/src/IceIAP/EndpointI.h
--- zeroc-ice-3.7.1/cpp/src/IceIAP/EndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceIAP/EndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_IAP_ENDPOINT_I_H
 #define ICE_IAP_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceIAP/EndpointI.mm zeroc-ice-3.7.2/cpp/src/IceIAP/EndpointI.mm
--- zeroc-ice-3.7.1/cpp/src/IceIAP/EndpointI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceIAP/EndpointI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "EndpointI.h"
 #include "Connector.h"
@@ -234,7 +229,7 @@
 }
 
 void
-IceObjC::iAPEndpointI::connectors_async(Ice::EndpointSelectionType selType,
+IceObjC::iAPEndpointI::connectors_async(Ice::EndpointSelectionType /*selType*/,
                                         const EndpointI_connectorsPtr& callback) const
 {
     try
diff -Nru zeroc-ice-3.7.1/cpp/src/IceIAP/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceIAP/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceIAP/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceIAP/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    = IceIAP
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceIAP/Transceiver.h zeroc-ice-3.7.2/cpp/src/IceIAP/Transceiver.h
--- zeroc-ice-3.7.1/cpp/src/IceIAP/Transceiver.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceIAP/Transceiver.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_IAP_TRANSCEIVER_H
 #define ICE_IAP_TRANSCEIVER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceIAP/Transceiver.mm zeroc-ice-3.7.2/cpp/src/IceIAP/Transceiver.mm
--- zeroc-ice-3.7.1/cpp/src/IceIAP/Transceiver.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceIAP/Transceiver.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "Transceiver.h"
 #include "EndpointI.h"
@@ -34,7 +29,7 @@
 @end
 
 @implementation iAPTransceiverCallback
--(id) init:(SelectorReadyCallback*)cb;
+-(id) init:(SelectorReadyCallback*)cb
 {
     if(![super init])
     {
@@ -223,7 +218,7 @@
 }
 
 SocketOperation
-IceObjC::iAPTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
+IceObjC::iAPTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeBuffer*/)
 {
     IceUtil::Mutex::Lock sync(_mutex);
     if(_state == StateNeedConnect)
@@ -289,7 +284,7 @@
 
         buf.i += ret;
 
-        if(packetSize > buf.b.end() - buf.i)
+        if(packetSize > static_cast<size_t>(buf.b.end() - buf.i))
         {
             packetSize = buf.b.end() - buf.i;
         }
@@ -334,7 +329,7 @@
 
         buf.i += ret;
 
-        if(packetSize > buf.b.end() - buf.i)
+        if(packetSize > static_cast<size_t>(buf.b.end() - buf.i))
         {
             packetSize = buf.b.end() - buf.i;
         }
@@ -375,7 +370,7 @@
 }
 
 void
-IceObjC::iAPTransceiver::checkSendSize(const Buffer& buf)
+IceObjC::iAPTransceiver::checkSendSize(const Buffer& /*buf*/)
 {
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceLocatorDiscovery/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceLocatorDiscovery/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceLocatorDiscovery/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceLocatorDiscovery/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries := IceLocatorDiscovery
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceLocatorDiscovery/Plugin.h zeroc-ice-3.7.2/cpp/src/IceLocatorDiscovery/Plugin.h
--- zeroc-ice-3.7.1/cpp/src/IceLocatorDiscovery/Plugin.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceLocatorDiscovery/Plugin.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef LOCATOR_DISCOVERY_PLUGIN_I_H
 #define LOCATOR_DISCOVERY_PLUGIN_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceLocatorDiscovery/PluginI.cpp zeroc-ice-3.7.2/cpp/src/IceLocatorDiscovery/PluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceLocatorDiscovery/PluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceLocatorDiscovery/PluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
@@ -588,10 +583,10 @@
     // datagram on each endpoint.
     //
     Ice::EndpointSeq endpoints = lookup->ice_getEndpoints();
-    for(vector<Ice::EndpointPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
+    for(vector<Ice::EndpointPtr>::const_iterator q = endpoints.begin(); q != endpoints.end(); ++q)
     {
         Ice::EndpointSeq single;
-        single.push_back(*p);
+        single.push_back(*q);
         _lookups.push_back(make_pair(lookup->ice_endpoints(single), LookupReplyPrxPtr()));
     }
     assert(!_lookups.empty());
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2/Calc.cpp zeroc-ice-3.7.2/cpp/src/IcePatch2/Calc.cpp
--- zeroc-ice-3.7.1/cpp/src/IcePatch2/Calc.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2/Calc.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
@@ -315,11 +310,6 @@
         consoleErr << appName << ": " << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const char* ex)
-    {
-        consoleErr << appName << ": " << ex << endl;
-        return EXIT_FAILURE;
-    }
 
     return EXIT_SUCCESS;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2/Client.cpp zeroc-ice-3.7.2/cpp/src/IcePatch2/Client.cpp
--- zeroc-ice-3.7.1/cpp/src/IcePatch2/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
-#include <Ice/Application.h>
+#include <Ice/Ice.h>
 #include <Ice/ConsoleUtil.h>
 #include <IcePatch2Lib/Util.h>
 #include <IcePatch2/ClientUtil.h>
@@ -22,12 +17,9 @@
 #endif
 
 using namespace std;
-using namespace Ice;
 using namespace IceInternal;
-using namespace IcePatch2;
-using namespace IcePatch2Internal;
 
-class TextPatcherFeedback : public PatcherFeedback
+class TextPatcherFeedback : public IcePatch2::PatcherFeedback
 {
 public:
 
@@ -83,7 +75,7 @@
     virtual bool
     checksumProgress(const string& path)
     {
-        consoleOut << "Calculating checksum for " << getBasename(path) << endl;
+        consoleOut << "Calculating checksum for " << IcePatch2Internal::getBasename(path) << endl;
         return !keyPressed();
     }
 
@@ -108,7 +100,7 @@
     }
 
     virtual bool
-    fileListProgress(Int percent)
+    fileListProgress(Ice::Int percent)
     {
         for(unsigned int i = 0; i < _lastProgress.size(); ++i)
         {
@@ -129,7 +121,7 @@
     }
 
     virtual bool
-    patchStart(const string& path, Long size, Long totalProgress, Long totalSize)
+    patchStart(const string& path, Ice::Long size, Ice::Long totalProgress, Ice::Long totalSize)
     {
         if(!_pressAnyKeyMessage)
         {
@@ -140,12 +132,12 @@
         ostringstream s;
         s << "0/" << size << " (" << totalProgress << '/' << totalSize << ')';
         _lastProgress = s.str();
-        consoleOut << getBasename(path) << ' ' << _lastProgress << flush;
+        consoleOut << IcePatch2Internal::getBasename(path) << ' ' << _lastProgress << flush;
         return !keyPressed();
     }
 
     virtual bool
-    patchProgress(Long progress, Long size, Long totalProgress, Long totalSize)
+    patchProgress(Ice::Long progress, Ice::Long size, Ice::Long totalProgress, Ice::Long totalSize)
     {
         for(unsigned int i = 0; i < _lastProgress.size(); ++i)
         {
@@ -255,71 +247,111 @@
     bool _pressAnyKeyMessage;
 };
 
-class Client : public Ice::Application
+int run(const Ice::StringSeq&);
+
+Ice::CommunicatorPtr communicator;
+
+void
+destroyCommunicator(int)
 {
-public:
+    communicator->destroy();
+}
 
-    virtual int run(int, char*[]);
+int
+#ifdef _WIN32
+wmain(int argc, wchar_t* argv[])
+#else
+main(int argc, char* argv[])
+#endif
+{
+    int status = 0;
 
-private:
+    try
+    {
+        Ice::CtrlCHandler ctrlCHandler;
+        Ice::CommunicatorHolder ich(argc, argv);
+        communicator = ich.communicator();
 
-    void usage(const std::string&);
-};
+        ctrlCHandler.setCallback(&destroyCommunicator);
+
+        status = run(Ice::argsToStringSeq(argc, argv));
+    }
+    catch(const std::exception& ex)
+    {
+        consoleErr << ex.what() << endl;
+        status = 1;
+    }
+
+    return status;
+}
+
+void
+usage(const string& appName)
+{
+    string options =
+        "Options:\n"
+        "-h, --help           Show this message.\n"
+        "-v, --version        Display the Ice version.\n"
+        "-t, --thorough       Recalculate all checksums.";
+
+    consoleErr << "Usage: " << appName << " [options] [DIR]" << endl;
+    consoleErr << options << endl;
+}
 
 int
-Client::run(int argc, char* argv[])
+run(const Ice::StringSeq& args)
 {
-    PropertiesPtr properties = communicator()->getProperties();
+    Ice::PropertiesPtr properties = communicator->getProperties();
 
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
     opts.addOpt("t", "thorough");
 
-    vector<string> args;
+    vector<string> props;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        props = opts.parse(args);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
         consoleErr << e.reason << endl;
-        usage(argv[0]);
-        return EXIT_FAILURE;
+        usage(args[0]);
+        return 1;
     }
 
     if(opts.isSet("help"))
     {
-        usage(argv[0]);
-        return EXIT_SUCCESS;
+        usage(args[0]);
+        return 0;
     }
     if(opts.isSet("version"))
     {
         consoleOut << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
+        return 0;
     }
     if(opts.isSet("thorough"))
     {
         properties->setProperty("IcePatch2Client.Thorough", "1");
     }
 
-    if(args.size() > 1)
+    if(props.size() > 1)
     {
-        consoleErr << argv[0] << ": too many arguments" << endl;
-        usage(argv[0]);
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": too many arguments" << endl;
+        usage(args[0]);
+        return 1;
     }
-    if(args.size() == 1)
+    if(props.size() == 1)
     {
-        properties->setProperty("IcePatch2Client.Directory", simplify(args[0]));
+        properties->setProperty("IcePatch2Client.Directory", IcePatch2Internal::simplify(props[0]));
     }
 
     bool aborted = false;
 
     try
     {
-        PatcherFeedbackPtr feedback = new TextPatcherFeedback;
-        PatcherPtr patcher = PatcherFactory::create(communicator(), feedback);
+        IcePatch2::PatcherFeedbackPtr feedback = new TextPatcherFeedback;
+        IcePatch2::PatcherPtr patcher = IcePatch2::PatcherFactory::create(communicator, feedback);
 
         aborted = !patcher->prepare();
 
@@ -335,46 +367,17 @@
     }
     catch(const exception& ex)
     {
-        consoleErr << argv[0] << ": " << ex.what() << endl;
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": " << ex.what() << endl;
+        return 1;
     }
 
     if(aborted)
     {
         consoleOut << "\n[Aborted]" << endl;
-        return EXIT_FAILURE;
+        return 1;
     }
     else
     {
-        return EXIT_SUCCESS;
+        return 0;
     }
 }
-
-void
-Client::usage(const string& appName)
-{
-    string options =
-        "Options:\n"
-        "-h, --help           Show this message.\n"
-        "-v, --version        Display the Ice version.\n"
-        "-t, --thorough       Recalculate all checksums.";
-
-    consoleErr << "Usage: " << appName << " [options] [DIR]" << endl;
-    consoleErr << options << endl;
-}
-
-#ifdef _WIN32
-
-int
-wmain(int argc, wchar_t* argv[])
-
-#else
-
-int
-main(int argc, char* argv[])
-
-#endif
-{
-    Client app;
-    return app.main(argc, argv);
-}
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2/FileServerI.cpp zeroc-ice-3.7.2/cpp/src/IcePatch2/FileServerI.cpp
--- zeroc-ice-3.7.1/cpp/src/IcePatch2/FileServerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2/FileServerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/FileUtil.h>
@@ -144,7 +139,8 @@
     int fd = IceUtilInternal::open(absolutePath, O_RDONLY|O_BINARY);
     if(fd == -1)
     {
-        throw FileAccessException(string("cannot open `") + path + "' for reading: " + strerror(errno));
+        throw FileAccessException(string("cannot open `") + path + "' for reading: " +
+                                  IceUtilInternal::errorToString(errno));
     }
 
     if(!largeFile)
@@ -177,7 +173,7 @@
         posStr << pos;
 
         throw FileAccessException("cannot seek position " + posStr.str() + " in file `" + path + "': " +
-                                  strerror(errno));
+                                  IceUtilInternal::errorToString(errno));
     }
 
     buffer.resize(num);
@@ -190,7 +186,7 @@
 #endif
     {
         IceUtilInternal::close(fd);
-        throw FileAccessException("cannot read `" + path + "': " + strerror(errno));
+        throw FileAccessException("cannot read `" + path + "': " + IceUtilInternal::errorToString(errno));
     }
 
     IceUtilInternal::close(fd);
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2/FileServerI.h zeroc-ice-3.7.2/cpp/src/IcePatch2/FileServerI.h
--- zeroc-ice-3.7.1/cpp/src/IcePatch2/FileServerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2/FileServerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PATCH2_FILE_SERVER_I_H
 #define ICE_PATCH2_FILE_SERVER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2/Makefile.mk zeroc-ice-3.7.2/cpp/src/IcePatch2/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IcePatch2/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_programs             := icepatch2server icepatch2client icepatch2calc
 $(project)_dependencies         := IcePatch2 Ice
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2/Server.cpp zeroc-ice-3.7.2/cpp/src/IcePatch2/Server.cpp
--- zeroc-ice-3.7.1/cpp/src/IcePatch2/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/ClientUtil.cpp zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/ClientUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/ClientUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/ClientUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/Makefile.mk zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := IcePatch2
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/Util.cpp zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/Util.cpp
--- zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // We need to include io.h first to get the proper signature for
@@ -826,7 +821,7 @@
             }
             else
             {
-                fill(bytesSHA.begin(), bytesSHA.end(), 0);
+                fill(bytesSHA.begin(), bytesSHA.end(), Byte(0));
             }
             info.checksum.swap(bytesSHA);
 
@@ -887,7 +882,7 @@
             if(relPath.size() + buf.st_size == 0)
             {
                 bytesSHA.resize(20);
-                fill(bytesSHA.begin(), bytesSHA.end(), 0);
+                fill(bytesSHA.begin(), bytesSHA.end(), Byte(0));
             }
             else
             {
@@ -1226,7 +1221,7 @@
         }
         else
         {
-            fill(tree1.checksum.begin(), tree1.checksum.end(), 0);
+            fill(tree1.checksum.begin(), tree1.checksum.end(), Byte(0));
         }
 
         copy(tree1.checksum.begin(), tree1.checksum.end(), c0);
@@ -1238,6 +1233,6 @@
     }
     else
     {
-        fill(tree0.checksum.begin(), tree0.checksum.end(), 0);
+        fill(tree0.checksum.begin(), tree0.checksum.end(), Byte(0));
     }
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/Util.h zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/Util.h
--- zeroc-ice-3.7.1/cpp/src/IcePatch2Lib/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IcePatch2Lib/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PATCH2_UTIL_H
 #define ICE_PATCH2_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/iceserviceinstall/Install.cpp zeroc-ice-3.7.2/cpp/src/iceserviceinstall/Install.cpp
--- zeroc-ice-3.7.1/cpp/src/iceserviceinstall/Install.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/iceserviceinstall/Install.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/ConsoleUtil.h>
@@ -13,39 +8,47 @@
 #include <ServiceInstaller.h>
 
 using namespace std;
-using namespace Ice;
 using namespace IceInternal;
 
-class Install : public Application
-{
-public:
-    virtual int run(int, char*[]);
-
-    Install();
-
-    bool pauseEnabled() const;
-    bool debug() const;
-    bool pause() const;
+int run(const Ice::StringSeq&);
 
-private:
+Ice::CommunicatorPtr communicator;
 
-    void usage() const;
+void
+destroyCommunicator(int)
+{
+    communicator->destroy();
+}
 
-    bool _debug;
-    bool _pauseEnabled;
-    bool _pause;
-};
+bool debug = false;
+bool pauseEnabled = true;
+bool pause = false;
 
 int
 wmain(int argc, wchar_t* argv[])
 {
-    Install app;
-    InitializationData id;
-    id.properties = Ice::createProperties();
-    id.properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL");
-    int status = app.main(argc, argv, id);
+    int status = 0;
+
+    try
+    {
+        Ice::CtrlCHandler ctrlCHandler;
+        Ice::InitializationData id;
+        id.properties = Ice::createProperties();
+        id.properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL");
+        Ice::CommunicatorHolder ich(argc, argv, id);
+        communicator = ich.communicator();
+
+        ctrlCHandler.setCallback(&destroyCommunicator);
+
+        status = run(Ice::argsToStringSeq(argc, argv));
+    }
+    catch(const std::exception& ex)
+    {
+        consoleErr << ex.what() << endl;
+        status = 1;
+    }
 
-    if(app.pauseEnabled() && (app.pause() || app.debug() || status != 0))
+    if(pauseEnabled && (pause || debug || status != 0))
     {
         system("pause");
     }
@@ -53,8 +56,57 @@
     return status;
 }
 
+void
+usage(const string& name)
+{
+    string defaultImagePath = IceServiceInstaller::getServiceInstallerPath();
+    if(defaultImagePath.empty())
+    {
+        defaultImagePath = string("<error: cannot retrieve path of ") + name + ">";
+    }
+    defaultImagePath += "\\<service>";
+#ifdef _DEBUG
+    defaultImagePath += 'd';
+#endif
+    defaultImagePath += ".exe";
+
+    consoleErr << "Usage: " << name
+         << " [options] service config-file [property] [property]\n";
+    consoleErr <<
+        "Options:\n"
+        "-h, --help           Show this message.\n"
+        "-n, --nopause        Do not call pause after displaying a message.\n"
+        "-v, --version        Display the Ice version.\n"
+        "-u, --uninstall      Uninstall the Windows service.\n"
+        "\n"
+        "service must be icegridregistry, icegridnode or glacier2router.\n"
+        "\n"
+        "config-file          Path to the Ice configuration file for this service.\n"
+        "                     If the path starts with HKLM\\ the configuration will be\n"
+        "                     read from the corresponding Windows registry keyword in\n"
+        "                     HKEY_LOCAL_MACHINE.\n"
+        "\n"
+        "Valid properties:\n"
+        "AutoStart            0 = Manual, 1 = Automatic, 2 = Automatic (Delayed Start)\n"
+        "                     The default value is 1.\n"
+        "Debug                Show diagnostics when installing/uninstalling a service.\n"
+        "DependOnRegistry     If non-zero, the service depends on the IceGrid registry\n"
+        "                     service (the IceGrid registry service name is computed\n"
+        "                     using Ice.Default.Locator in <config-file>).\n"
+        "Description          Description of the service.\n"
+        "DisplayName          Display name of the service.\n"
+        "EventLog             The name of the EventLog used by this service;\n"
+        "                     the default is Application.\n"
+        "ImagePath            Full path to <service>.exe. The default value is\n"
+        "                     " << defaultImagePath << "\n" <<
+        "ObjectName           Account used to run the service. Defaults to\n"
+        "                     NT Authority\\LocalService.\n"
+        "Password             Password for ObjectName.\n"
+        ;
+}
+
 int
-Install::run(int argc, char* argv[])
+run(const Ice::StringSeq& args)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -72,34 +124,34 @@
     vector<string> commands;
     try
     {
-        commands = opts.parse(argc, (const char**)argv);
+        commands = opts.parse(args);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
         consoleErr << "Error:" << e.reason << endl;
-        usage();
-        return EXIT_FAILURE;
+        usage(args[0]);
+        return 1;
     }
 
-    _pauseEnabled = !opts.isSet("nopause");
+    pauseEnabled = !opts.isSet("nopause");
 
     if(opts.isSet("help"))
     {
-        usage();
-        _pause = true;
-        return EXIT_SUCCESS;
+        usage(args[0]);
+        pause = true;
+        return 0;
     }
     if(opts.isSet("version"))
     {
         consoleOut << ICE_STRING_VERSION << endl;
-        _pause = true;
-        return EXIT_SUCCESS;
+        pause = true;
+        return 0;
     }
 
     if(commands.size() != 2)
     {
-        usage();
-        return EXIT_FAILURE;
+        usage(args[0]);
+        return 1;
     }
 
     int serviceType = -1;
@@ -115,14 +167,14 @@
     if(serviceType == -1)
     {
         consoleErr << "Invalid service " << commands[0] << endl;
-        return EXIT_FAILURE;
+        return 1;
     }
 
     string configFile = commands[1];
 
     try
     {
-        IceServiceInstaller installer(serviceType, configFile, communicator());
+        IceServiceInstaller installer(serviceType, configFile, communicator);
 
         if(opts.isSet("uninstall"))
         {
@@ -130,7 +182,7 @@
         }
         else
         {
-            PropertiesPtr properties = communicator()->getProperties();
+            Ice::PropertiesPtr properties = communicator->getProperties();
 
             for(size_t j = 0; j < propNames.size(); ++j)
             {
@@ -140,7 +192,7 @@
                 }
             }
 
-            _debug = properties->getPropertyAsInt("Debug") > 0;
+            debug = properties->getPropertyAsInt("Debug") > 0;
 
             installer.install(properties);
         }
@@ -148,81 +200,7 @@
     catch(const exception& ex)
     {
         consoleErr << "Error: " << ex.what() << endl;
-        return EXIT_FAILURE;
-    }
-    return EXIT_SUCCESS;
-}
-
-Install::Install() :
-    _pauseEnabled(true),
-    _debug(false),
-    _pause(false)
-{
-}
-
-bool
-Install::pauseEnabled() const
-{
-    return _pauseEnabled;
-}
-
-bool
-Install::debug() const
-{
-    return _debug;
-}
-
-bool
-Install::pause() const
-{
-    return _pause;
-}
-
-void
-Install::usage() const
-{
-    string defaultImagePath = IceServiceInstaller::getServiceInstallerPath();
-    if(defaultImagePath.empty())
-    {
-        defaultImagePath = string("<error: cannot retrieve path of ") + appName() + ">";
+        return 1;
     }
-    defaultImagePath += "\\<service>";
-#ifdef _DEBUG
-    defaultImagePath += 'd';
-#endif
-    defaultImagePath += ".exe";
-
-    consoleErr << "Usage: " << appName()
-         << " [options] service config-file [property] [property]\n";
-    consoleErr <<
-        "Options:\n"
-        "-h, --help           Show this message.\n"
-        "-n, --nopause        Do not call pause after displaying a message.\n"
-        "-v, --version        Display the Ice version.\n"
-        "-u, --uninstall      Uninstall the Windows service.\n"
-        "\n"
-        "service must be icegridregistry, icegridnode or glacier2router.\n"
-        "\n"
-        "config-file          Path to the Ice configuration file for this service.\n"
-        "                     If the path starts with HKLM\\ the configuration will be\n"
-        "                     read from the corresponding Windows registry keyword in\n"
-        "                     HKEY_LOCAL_MACHINE.\n"
-        "\n"
-        "Valid properties:\n"
-        "AutoStart            0 = Manual, 1 = Automatic, 2 = Automatic (Delayed Start)\n"
-        "                     The default value is 1.\n"
-        "Debug                Show diagnostics when installing/uninstalling a service.\n"
-        "DependOnRegistry     If non-zero, the service depends on the IceGrid registry\n"
-        "                     service (the IceGrid registry service name is computed\n"
-        "                     using Ice.Default.Locator in <config-file>).\n"
-        "Description          Description of the service.\n"
-        "DisplayName          Display name of the service.\n"
-        "EventLog             The name of the EventLog used by this service;\n"
-        "                     the default is Application.\n"
-        "ImagePath            Full path to <service>.exe. The default value is\n"
-        "                     " << defaultImagePath << "\n" <<
-        "ObjectName           Account used to run the service. Defaults to\n"
-        "                     NT Authority\\LocalService.\n"
-        "Password             Password for ObjectName.\n"
-        ;
+    return 0;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/iceserviceinstall/ServiceInstaller.cpp zeroc-ice-3.7.2/cpp/src/iceserviceinstall/ServiceInstaller.cpp
--- zeroc-ice-3.7.1/cpp/src/iceserviceinstall/ServiceInstaller.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/iceserviceinstall/ServiceInstaller.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <ServiceInstaller.h>
 #include <IceUtil/StringUtil.h>
@@ -853,14 +848,6 @@
         RegCloseKey(key);
         throw runtime_error("Error while searching EventLog with source '" + source + "': " + IceUtilInternal::errorToString(res));
     }
-
-    res = RegCloseKey(key);
-    if(res != ERROR_SUCCESS)
-    {
-        throw runtime_error("Could not close registry key handle: " + IceUtilInternal::errorToString(res));
-    }
-
-    return ""; // To keep compilers happy.
 }
 
 string
diff -Nru zeroc-ice-3.7.1/cpp/src/iceserviceinstall/ServiceInstaller.h zeroc-ice-3.7.2/cpp/src/iceserviceinstall/ServiceInstaller.h
--- zeroc-ice-3.7.1/cpp/src/iceserviceinstall/ServiceInstaller.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/iceserviceinstall/ServiceInstaller.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SERVICE_INSTALLER_H
 #define ICE_SERVICE_INSTALLER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/AcceptorI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/AcceptorI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/AcceptorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/AcceptorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/AcceptorI.h>
 #include <IceSSL/EndpointI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/AcceptorI.h zeroc-ice-3.7.2/cpp/src/IceSSL/AcceptorI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/AcceptorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/AcceptorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_ACCEPTOR_I_H
 #define ICESSL_ACCEPTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/CertificateI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/CertificateI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/CertificateI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/CertificateI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Mutex.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/CertificateI.h zeroc-ice-3.7.2/cpp/src/IceSSL/CertificateI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/CertificateI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/CertificateI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_CERTIFICATE_I_H
 #define ICESSL_CERTIFICATE_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/ConnectorI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/ConnectorI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/ConnectorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/ConnectorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/ConnectorI.h>
 #include <IceSSL/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/ConnectorI.h zeroc-ice-3.7.2/cpp/src/IceSSL/ConnectorI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/ConnectorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/ConnectorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_CONNECTOR_I_H
 #define ICESSL_CONNECTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/EndpointI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/EndpointI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/EndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/EndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/EndpointI.h>
 #include <IceSSL/AcceptorI.h>
@@ -342,36 +337,36 @@
 }
 
 bool
-IceSSL::EndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
+IceSSL::EndpointI::checkOption(const string& /*option*/, const string& /*argument*/, const string& /*endpoint*/)
 {
     return false;
 }
 
 IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance, Short type) :
-    IceInternal::EndpointFactoryWithUnderlying(instance, type), _instance(instance.get())
+    IceInternal::EndpointFactoryWithUnderlying(instance, type), _sslInstance(instance.get())
 {
 }
 
 void
 IceSSL::EndpointFactoryI::destroy()
 {
-    _instance = 0;
+    _sslInstance = 0;
 }
 
 IceInternal::EndpointFactoryPtr
 IceSSL::EndpointFactoryI::cloneWithUnderlying(const IceInternal::ProtocolInstancePtr& instance, Short underlying) const
 {
-    return new EndpointFactoryI(new Instance(_instance->engine(), instance->type(), instance->protocol()), underlying);
+    return new EndpointFactoryI(new Instance(_sslInstance->engine(), instance->type(), instance->protocol()), underlying);
 }
 
 IceInternal::EndpointIPtr
 IceSSL::EndpointFactoryI::createWithUnderlying(const IceInternal::EndpointIPtr& underlying, vector<string>&, bool) const
 {
-    return ICE_MAKE_SHARED(EndpointI, _instance, underlying);
+    return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying);
 }
 
 IceInternal::EndpointIPtr
-IceSSL::EndpointFactoryI::readWithUnderlying(const IceInternal::EndpointIPtr& underlying, Ice::InputStream* s) const
+IceSSL::EndpointFactoryI::readWithUnderlying(const IceInternal::EndpointIPtr& underlying, Ice::InputStream*) const
 {
-    return ICE_MAKE_SHARED(EndpointI, _instance, underlying);
+    return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying);
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/EndpointI.h zeroc-ice-3.7.2/cpp/src/IceSSL/EndpointI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/EndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/EndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_ENDPOINT_I_H
 #define ICESSL_ENDPOINT_I_H
@@ -97,7 +92,7 @@
 
 private:
 
-    InstancePtr _instance;
+    InstancePtr _sslInstance;
 };
 
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/Instance.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/Instance.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/Instance.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/Instance.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Instance.h>
 #include <IceSSL/SSLEngine.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/InstanceF.h zeroc-ice-3.7.2/cpp/src/IceSSL/InstanceF.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/InstanceF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/InstanceF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_INSTANCE_F_H
 #define ICESSL_INSTANCE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/Instance.h zeroc-ice-3.7.2/cpp/src/IceSSL/Instance.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/Instance.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/Instance.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_INSTANCE_H
 #define ICESSL_INSTANCE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceSSL/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceSSL/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := IceSSL
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -113,15 +113,17 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.openssl.v120" version="1.0.2.5" targetFramework="native" />
-  <package id="zeroc.openssl.v140" version="1.0.2.5" targetFramework="native" />
+  <package id="zeroc.openssl.v120" version="1.0.2.6" targetFramework="native" />
+  <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" />
+  <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -108,13 +108,15 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.openssl.v140" version="1.0.2.5" targetFramework="native" />
+  <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" />
+  <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLCertificateI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLCertificateI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLCertificateI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLCertificateI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Plugin.h>
 #include <IceSSL/OpenSSL.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLEngine.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLEngine.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLEngine.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLEngine.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Config.h>
 
@@ -31,6 +26,10 @@
 #include <openssl/ssl.h>
 #include <openssl/pkcs12.h>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4127) // conditional expression is constant
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace IceSSL;
@@ -201,8 +200,6 @@
     IceSSL::SSLEngine(communicator),
     _ctx(0)
 {
-    __setNoDelete(true);
-
     //
     // Initialize OpenSSL if necessary.
     //
@@ -279,6 +276,7 @@
 
                 if(!IceUtilInternal::splitString(randFiles, IceUtilInternal::pathsep, files))
                 {
+                    cleanup();
                     throw PluginInitializationException(__FILE__, __LINE__,
                                                         "IceSSL: invalid value for IceSSL.Random:\n" + randFiles);
                 }
@@ -288,11 +286,13 @@
                     string resolved;
                     if(!checkPath(file, defaultDir, false, resolved))
                     {
+                        cleanup();
                         throw PluginInitializationException(__FILE__, __LINE__,
                                                             "IceSSL: entropy data file not found:\n" + file);
                     }
                     if(!RAND_load_file(resolved.c_str(), 1024))
                     {
+                        cleanup();
                         throw PluginInitializationException(__FILE__, __LINE__,
                                                             "IceSSL: unable to load entropy data from " + resolved);
                     }
@@ -308,6 +308,7 @@
             {
                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
                 {
+                    cleanup();
                     throw PluginInitializationException(__FILE__, __LINE__,
                                                         "IceSSL: EGD failure using file " + entropyDaemon);
                 }
@@ -332,21 +333,24 @@
 #endif
         }
     }
-    __setNoDelete(false);
 }
 
-OpenSSL::SSLEngine::~SSLEngine()
+void
+OpenSSL::SSLEngine::cleanup()
 {
-//
-// OpenSSL 1.1.0 remove the need for library initialization and cleanup.
-//
+    //
+    // Must be called with the static mutex locked.
+    //
+    --instanceCount;
+    //
+    // OpenSSL 1.1.0 remove the need for library initialization and cleanup. We
+    // still need to decrement instanceCount
+    //
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
     //
     // Clean up OpenSSL resources.
     //
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(staticMutex);
-
-    if(--instanceCount == 0 && initOpenSSL)
+    if(instanceCount == 0 && initOpenSSL)
     {
         //
         // NOTE: We can't destroy the locks here: threads which might have called openssl methods
@@ -366,6 +370,12 @@
 #endif
 }
 
+OpenSSL::SSLEngine::~SSLEngine()
+{
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(staticMutex);
+    cleanup();
+}
+
 void
 OpenSSL::SSLEngine::initialize()
 {
@@ -387,9 +397,21 @@
         // TLS1.1 and TLS1.2 to avoid security issues with SSLv3
         //
         vector<string> defaultProtocols;
+#if defined(TLS1_VERSION) && !defined(OPENSSL_NO_TLS1_METHOD)
         defaultProtocols.push_back("tls1_0");
+#endif
+
+#if defined(TLS1_1_VERSION) && !defined(OPENSSL_NO_TLS1_1_METHOD)
         defaultProtocols.push_back("tls1_1");
+#endif
+
+#if defined(TLS1_2_VERSION) && !defined(OPENSSL_NO_TLS1_2_METHOD)
         defaultProtocols.push_back("tls1_2");
+#endif
+
+#if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3_METHOD)
+        defaultProtocols.push_back("tls1_3");
+#endif
 
         const int protocols =
                 parseProtocols(properties->getPropertyAsListWithDefault(propPrefix + "Protocols", defaultProtocols));
@@ -485,7 +507,7 @@
                     while(count < passwordRetryMax)
                     {
                         ERR_clear_error();
-                        if((success = SSL_CTX_load_verify_locations(_ctx, file, dir)) || !passwordError())
+                        if((success = SSL_CTX_load_verify_locations(_ctx, file, dir)) != 0 || !passwordError())
                         {
                             break;
                         }
@@ -529,8 +551,9 @@
                 vector<string> files;
                 if(!IceUtilInternal::splitString(certFile, IceUtilInternal::pathsep, files) || files.size() > 2)
                 {
-                    PluginInitializationException ex(__FILE__, __LINE__,
-                                            "IceSSL: invalid value for " + propPrefix + "CertFile:\n" + certFile);
+                    throw PluginInitializationException(__FILE__, __LINE__,
+                                                        "IceSSL: invalid value for " + propPrefix + "CertFile:\n" +
+                                                        certFile);
                 }
                 numCerts = files.size();
                 for(vector<string>::iterator p = files.begin(); p != files.end(); ++p)
@@ -539,8 +562,8 @@
                     string resolved;
                     if(!checkPath(file, defaultDir, false, resolved))
                     {
-                        PluginInitializationException ex(__FILE__, __LINE__,
-                                                         "IceSSL: certificate file not found:\n" + file);
+                        throw PluginInitializationException(__FILE__, __LINE__,
+                                                            "IceSSL: certificate file not found:\n" + file);
                     }
                     file = resolved;
 
@@ -573,7 +596,7 @@
                                 key = 0;
                                 cert = 0;
                                 chain = 0;
-                                if(!(success = PKCS12_parse(p12, password(false).c_str(), &key, &cert, &chain)))
+                                if((success = PKCS12_parse(p12, password(false).c_str(), &key, &cert, &chain)) == 0)
                                 {
                                     if(passwordError())
                                     {
@@ -655,7 +678,7 @@
                         while(count < passwordRetryMax)
                         {
                             ERR_clear_error();
-                            if(!(success = SSL_CTX_use_certificate_chain_file(_ctx, file.c_str())))
+                            if((success = SSL_CTX_use_certificate_chain_file(_ctx, file.c_str())) == 0)
                             {
                                 if(passwordError())
                                 {
@@ -737,10 +760,10 @@
                         }
                         else
                         {
-                            string err = sslErrors();
-                            if(!err.empty())
+                            string errStr = sslErrors();
+                            if(!errStr.empty())
                             {
-                                msg += ":\n" + err;
+                                msg += ":\n" + errStr;
                             }
                         }
                         throw PluginInitializationException(__FILE__, __LINE__, msg);
@@ -836,13 +859,13 @@
         //
         // Establish the cipher list.
         //
-        string ciphers = properties->getProperty(propPrefix + "Ciphers");
-        if(!ciphers.empty())
+        string ciphersStr = properties->getProperty(propPrefix + "Ciphers");
+        if(!ciphersStr.empty())
         {
-            if(!SSL_CTX_set_cipher_list(_ctx, ciphers.c_str()))
+            if(!SSL_CTX_set_cipher_list(_ctx, ciphersStr.c_str()))
             {
                 throw PluginInitializationException(__FILE__, __LINE__,
-                                        "IceSSL: unable to set ciphers using `" + ciphers + "':\n" + sslErrors());
+                                        "IceSSL: unable to set ciphers using `" + ciphersStr + "':\n" + sslErrors());
             }
         }
 
@@ -951,19 +974,48 @@
         string prot = IceUtilInternal::toUpper(*p);
         if(prot == "SSL3" || prot == "SSLV3")
         {
+#if defined(OPENSSL_NO_SSL3_METHOD) || !defined(SSL3_VERSION)
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: OpenSSL was build without SSLv3 support");
+#else
             v |= SSLv3;
+#endif
         }
         else if(prot == "TLS" || prot == "TLS1" || prot == "TLSV1" || prot == "TLS1_0" || prot == "TLSV1_0")
         {
+#if defined(OPENSSL_NO_TLS1_METHOD) || !defined(TLS1_VERSION)
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: OpenSSL was build without TLS 1.0 support");
+#else
             v |= TLSv1_0;
+#endif
         }
         else if(prot == "TLS1_1" || prot == "TLSV1_1")
         {
+#if defined(OPENSSL_NO_TLS1_1_METHOD) || !defined(TLS1_1_VERSION)
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: OpenSSL was build without TLS 1.1 support");
+#else
             v |= TLSv1_1;
+#endif
         }
         else if(prot == "TLS1_2" || prot == "TLSV1_2")
         {
+#if defined(OPENSSL_NO_TLS1_2_METHOD) || !defined(TLS1_2_VERSION)
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: OpenSSL was build without TLS 1.2 support");
+#else
             v |= TLSv1_2;
+#endif
+        }
+        else if(prot == "TLS1_3" || prot == "TLSV1_3")
+        {
+#if defined(OPENSSL_NO_TLS1_3_METHOD) || !defined(TLS1_3_VERSION)
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: OpenSSL was build without TLS 1.3 support");
+#else
+            v |= TLSv1_3;
+#endif
         }
         else
         {
@@ -1002,14 +1054,21 @@
 OpenSSL::SSLEngine::setOptions(int protocols)
 {
     long opts = SSL_OP_NO_SSLv2; // SSLv2 is not supported.
+
+#ifdef SSL_OP_NO_SSLv3
     if(!(protocols & SSLv3))
     {
         opts |= SSL_OP_NO_SSLv3;
     }
+#endif
+
+#ifdef SSL_OP_NO_TLSv1
     if(!(protocols & TLSv1_0))
     {
         opts |= SSL_OP_NO_TLSv1;
     }
+#endif
+
 #ifdef SSL_OP_NO_TLSv1_1
     if(!(protocols & TLSv1_1))
     {
@@ -1030,5 +1089,12 @@
         opts |= SSL_OP_NO_TLSv1_2;
     }
 #endif
+
+#ifdef SSL_OP_NO_TLSv1_3
+    if(!(protocols & TLSv1_3))
+    {
+        opts |= SSL_OP_NO_TLSv1_3;
+    }
+#endif
     SSL_CTX_set_options(_ctx, opts);
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLEngineF.h zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLEngineF.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLEngineF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLEngineF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_OPENSSL_ENGINE_F_H
 #define ICESSL_OPENSSL_ENGINE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLEngine.h zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLEngine.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLEngine.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLEngine.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_OPENSSL_ENGINE_H
 #define ICESSL_OPENSSL_ENGINE_H
@@ -45,9 +40,10 @@
 
 private:
 
+    void cleanup();
     SSL_METHOD* getMethod(int);
     void setOptions(int);
-    enum Protocols { SSLv3 = 0x01, TLSv1_0 = 0x02, TLSv1_1 = 0x04, TLSv1_2 = 0x08 };
+    enum Protocols { SSLv3 = 1, TLSv1_0 = 2, TLSv1_1 = 4, TLSv1_2 = 8, TLSv1_3 = 16 };
     int parseProtocols(const Ice::StringSeq&) const;
 
     SSL_CTX* _ctx;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLPluginI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLPluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLPluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLPluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/PluginI.h>
 #include <IceSSL/OpenSSL.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLTransceiverI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLTransceiverI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLTransceiverI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/OpenSSLTransceiverI.h>
 #include <IceSSL/OpenSSLEngine.h>
@@ -99,31 +94,33 @@
     if(!_ssl)
     {
         SOCKET fd = _delegate->getNativeInfo()->fd();
+        BIO* bio = 0;
         if(fd == INVALID_SOCKET)
         {
-            //
-            // The delegate has finished its initialization but may not have a file descriptor yet (e.g., Bluetooth).
-            // The underlying transport must (eventually) be socket-based.
-            //
-            return IceInternal::SocketOperationRead;
+            assert(_sentBytes == 0);
+            _maxSendPacketSize = 128 * 1024; // 128KB
+            _maxRecvPacketSize = 128 * 1024; // 128KB
+            if(!BIO_new_bio_pair(&bio, _maxSendPacketSize, &_memBio, _maxRecvPacketSize))
+            {
+                bio = 0;
+                _memBio = 0;
+            }
         }
-
-#ifdef ICE_USE_IOCP
-        _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(fd));
-        _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(fd));
-        BIO* bio;
-        _sentBytes = 0;
-        if(!BIO_new_bio_pair(&bio, _maxSendPacketSize, &_iocpBio, _maxRecvPacketSize))
+        else
         {
-            bio = 0;
-            _iocpBio = 0;
-        }
+#ifdef ICE_USE_IOCP
+            assert(_sentBytes == 0);
+            _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(fd));
+            _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(fd));
+            if(!BIO_new_bio_pair(&bio, _maxSendPacketSize, &_memBio, _maxRecvPacketSize))
+            {
+                bio = 0;
+                _memBio = 0;
+            }
 #else
-        //
-        // This static_cast is necessary due to 64bit windows. There SOCKET is a non-int type.
-        //
-        BIO* bio = BIO_new_socket(static_cast<int>(fd), 0);
+            bio = BIO_new_socket(fd, 0);
 #endif
+        }
 
         if(!bio)
         {
@@ -134,10 +131,11 @@
         if(!_ssl)
         {
             BIO_free(bio);
-#ifdef ICE_USE_IOCP
-            BIO_free(_iocpBio);
-            _iocpBio = 0;
-#endif
+            if(_memBio)
+            {
+                BIO_free(_memBio);
+                _memBio = 0;
+            }
             throw SecurityException(__FILE__, __LINE__, "openssl failure");
         }
         SSL_set_bio(_ssl, bio, bio);
@@ -213,8 +211,7 @@
         sync.release();
 #endif
 
-#ifdef ICE_USE_IOCP
-        if(BIO_ctrl_pending(_iocpBio))
+        if(_memBio && BIO_ctrl_pending(_memBio))
         {
             if(!send())
             {
@@ -222,7 +219,6 @@
             }
             continue;
         }
-#endif
 
         if(ret <= 0)
         {
@@ -239,58 +235,55 @@
             }
             case SSL_ERROR_WANT_READ:
             {
-#ifdef ICE_USE_IOCP
-                if(receive())
+                if(_memBio && receive())
                 {
                     continue;
                 }
-#endif
                 return IceInternal::SocketOperationRead;
             }
             case SSL_ERROR_WANT_WRITE:
             {
-#ifdef ICE_USE_IOCP
-                if(send())
+                if(_memBio && send())
                 {
                     continue;
                 }
-#endif
                 return IceInternal::SocketOperationWrite;
             }
             case SSL_ERROR_SYSCALL:
             {
-#ifndef ICE_USE_IOCP
-                if(IceInternal::interrupted())
-                {
-                    break;
-                }
-
-                if(IceInternal::wouldBlock())
+                if(!_memBio)
                 {
-                    if(SSL_want_read(_ssl))
+                    if(IceInternal::interrupted())
                     {
-                        return IceInternal::SocketOperationRead;
+                        break;
                     }
-                    else if(SSL_want_write(_ssl))
+
+                    if(IceInternal::wouldBlock())
                     {
-                        return IceInternal::SocketOperationWrite;
-                    }
+                        if(SSL_want_read(_ssl))
+                        {
+                            return IceInternal::SocketOperationRead;
+                        }
+                        else if(SSL_want_write(_ssl))
+                        {
+                            return IceInternal::SocketOperationWrite;
+                        }
 
-                    break;
-                }
+                        break;
+                    }
 
-                if(IceInternal::connectionLost() || IceInternal::getSocketErrno() == 0)
-                {
-                    throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
+                    if(IceInternal::connectionLost() || IceInternal::getSocketErrno() == 0)
+                    {
+                        throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
+                    }
                 }
-#endif
                 throw SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
             }
             case SSL_ERROR_SSL:
             {
                 ostringstream ostr;
                 ostr << "SSL error occurred for new " << (_incoming ? "incoming" : "outgoing")
-                     << " connection:\nremote address = " << _delegate->toString() << "\n" << _engine->sslErrors();
+                     << " connection:\n" << _delegate->toString() << "\n" << _engine->sslErrors();
                 throw ProtocolException(__FILE__, __LINE__, ostr.str());
             }
             }
@@ -349,7 +342,7 @@
             out << "bits = " << SSL_CIPHER_get_bits(cipher, 0) << "\n";
             out << "protocol = " << SSL_get_version(_ssl) << "\n";
         }
-        out << IceInternal::fdToString(SSL_get_fd(_ssl));
+        out << toString();
     }
 
     return IceInternal::SocketOperationNone;
@@ -382,13 +375,11 @@
         _ssl = 0;
     }
 
-#ifdef ICE_USE_IOCP
-    if(_iocpBio)
+    if(_memBio)
     {
-        BIO_free(_iocpBio);
-        _iocpBio = 0;
+        BIO_free(_memBio);
+        _memBio = 0;
     }
-#endif
 
     _delegate->close();
 }
@@ -401,15 +392,13 @@
         return _delegate->write(buf);
     }
 
-#ifdef ICE_USE_IOCP
-    if(_writeBuffer.i != _writeBuffer.b.end())
+    if(_memBio && _writeBuffer.i != _writeBuffer.b.end())
     {
         if(!send())
         {
             return IceInternal::SocketOperationWrite;
         }
     }
-#endif
 
     if(buf.i == buf.b.end())
     {
@@ -419,37 +408,39 @@
     //
     // It's impossible for packetSize to be more than an Int.
     //
-    int packetSize =
-#ifdef ICE_USE_IOCP
-        std::min(static_cast<int>(_maxSendPacketSize), static_cast<int>(buf.b.end() - buf.i));
-#else
+    int packetSize = _memBio ?
+        std::min(static_cast<int>(_maxSendPacketSize), static_cast<int>(buf.b.end() - buf.i)) :
         static_cast<int>(buf.b.end() - buf.i);
-#endif
+
     while(buf.i != buf.b.end())
     {
         ERR_clear_error(); // Clear any spurious errors.
-#ifdef ICE_USE_IOCP
         int ret;
-        if(_sentBytes)
-        {
-            ret = _sentBytes;
-            _sentBytes = 0;
-        }
-        else
+        if(_memBio)
         {
-            ret = SSL_write(_ssl, reinterpret_cast<const void*>(&*buf.i), packetSize);
-            if(ret > 0)
+            if(_sentBytes)
             {
-                if(!send())
+                ret = _sentBytes;
+                _sentBytes = 0;
+            }
+            else
+            {
+                ret = SSL_write(_ssl, reinterpret_cast<const void*>(&*buf.i), packetSize);
+                if(ret > 0)
                 {
-                    _sentBytes = ret;
-                    return IceInternal::SocketOperationWrite;
+                    if(!send())
+                    {
+                        _sentBytes = ret;
+                        return IceInternal::SocketOperationWrite;
+                    }
                 }
             }
         }
-#else
-        int ret = SSL_write(_ssl, reinterpret_cast<const void*>(&*buf.i), packetSize);
-#endif
+        else
+        {
+            ret = SSL_write(_ssl, reinterpret_cast<const void*>(&*buf.i), packetSize);
+        }
+
         if(ret <= 0)
         {
             switch(SSL_get_error(_ssl, ret))
@@ -468,35 +459,34 @@
             }
             case SSL_ERROR_WANT_WRITE:
             {
-#ifdef ICE_USE_IOCP
-                if(send())
+                if(_memBio && send())
                 {
                     continue;
                 }
-#endif
                 return IceInternal::SocketOperationWrite;
             }
             case SSL_ERROR_SYSCALL:
             {
-#ifndef ICE_USE_IOCP
-
-                if(IceInternal::interrupted())
+                if(!_memBio)
                 {
-                    continue;
-                }
+                    if(IceInternal::interrupted())
+                    {
+                        continue;
+                    }
 
-                if(IceInternal::noBuffers() && packetSize > 1024)
-                {
-                    packetSize /= 2;
-                    continue;
-                }
+                    if(IceInternal::noBuffers() && packetSize > 1024)
+                    {
+                        packetSize /= 2;
+                        continue;
+                    }
 
-                if(IceInternal::wouldBlock())
-                {
-                    assert(SSL_want_write(_ssl));
-                    return IceInternal::SocketOperationWrite;
+                    if(IceInternal::wouldBlock())
+                    {
+                        assert(SSL_want_write(_ssl));
+                        return IceInternal::SocketOperationWrite;
+                    }
                 }
-#endif
+
                 if(IceInternal::connectionLost() || IceInternal::getSocketErrno() == 0)
                 {
                     throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
@@ -532,15 +522,13 @@
         return _delegate->read(buf);
     }
 
-#ifdef ICE_USE_IOCP
-    if(_readBuffer.i != _readBuffer.b.end())
+    if(_memBio && _readBuffer.i != _readBuffer.b.end())
     {
         if(!receive())
         {
             return IceInternal::SocketOperationRead;
         }
     }
-#endif
 
     //
     // Note: We assume that OpenSSL doesn't read more SSL records than
@@ -578,12 +566,10 @@
             }
             case SSL_ERROR_WANT_READ:
             {
-#ifdef ICE_USE_IOCP
-                if(receive())
+                if(_memBio && receive())
                 {
                     continue;
                 }
-#endif
                 return IceInternal::SocketOperationRead;
             }
             case SSL_ERROR_WANT_WRITE:
@@ -593,24 +579,26 @@
             }
             case SSL_ERROR_SYSCALL:
             {
-#ifndef ICE_USE_IOCP
-                if(IceInternal::interrupted())
+                if(!_memBio)
                 {
-                    continue;
-                }
+                    if(IceInternal::interrupted())
+                    {
+                        continue;
+                    }
 
-                if(IceInternal::noBuffers() && packetSize > 1024)
-                {
-                    packetSize /= 2;
-                    continue;
-                }
+                    if(IceInternal::noBuffers() && packetSize > 1024)
+                    {
+                        packetSize /= 2;
+                        continue;
+                    }
 
-                if(IceInternal::wouldBlock())
-                {
-                    assert(SSL_want_read(_ssl));
-                    return IceInternal::SocketOperationRead;
+                    if(IceInternal::wouldBlock())
+                    {
+                        assert(SSL_want_read(_ssl));
+                        return IceInternal::SocketOperationRead;
+                    }
                 }
-#endif
+
                 if(IceInternal::connectionLost() || IceInternal::getSocketErrno() == 0)
                 {
                     throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
@@ -660,10 +648,10 @@
         int packetSize = std::min(static_cast<int>(_maxSendPacketSize), static_cast<int>(buffer.b.end() - buffer.i));
         _sentBytes = SSL_write(_ssl, reinterpret_cast<void*>(&*buffer.i), packetSize);
 
-        assert(BIO_ctrl_pending(_iocpBio));
-        _writeBuffer.b.resize( BIO_ctrl_pending(_iocpBio));
+        assert(BIO_ctrl_pending(_memBio));
+        _writeBuffer.b.resize( BIO_ctrl_pending(_memBio));
         _writeBuffer.i = _writeBuffer.b.begin();
-        BIO_read(_iocpBio, _writeBuffer.i, static_cast<int>(_writeBuffer.b.size()));
+        BIO_read(_memBio, _writeBuffer.i, static_cast<int>(_writeBuffer.b.size()));
     }
 
     return _delegate->startWrite(_writeBuffer) && buffer.i == buffer.b.end();
@@ -705,8 +693,8 @@
             SSL_read(_ssl, reinterpret_cast<void*>(&*buffer.i), static_cast<int>(buffer.b.end() - buffer.i));
         assert(ret <= 0 && SSL_get_error(_ssl, ret) == SSL_ERROR_WANT_READ);
 
-        assert(BIO_ctrl_get_read_request(_iocpBio));
-        _readBuffer.b.resize(BIO_ctrl_get_read_request(_iocpBio));
+        assert(BIO_ctrl_get_read_request(_memBio));
+        _readBuffer.b.resize(BIO_ctrl_get_read_request(_memBio));
         _readBuffer.i = _readBuffer.b.begin();
     }
 
@@ -727,7 +715,7 @@
     _delegate->finishRead(_readBuffer);
     if(_readBuffer.i == _readBuffer.b.end())
     {
-        int n = BIO_write(_iocpBio, _readBuffer.b.begin(), static_cast<int>(_readBuffer.b.size()));
+        int n = BIO_write(_memBio, _readBuffer.b.begin(), static_cast<int>(_readBuffer.b.size()));
         if(n < 0) // Expected if the transceiver was closed.
         {
             throw SecurityException(__FILE__, __LINE__, "SSL bio write failed");
@@ -837,7 +825,7 @@
         out << "subject = " << buf << '\n';
         out << "depth = " << X509_STORE_CTX_get_error_depth(c) << '\n';
         out << "error = " << X509_verify_cert_error_string(err) << '\n';
-        out << IceInternal::fdToString(SSL_get_fd(_ssl));
+        out << toString();
     }
 
     //
@@ -877,13 +865,11 @@
     _delegate(delegate),
     _connected(false),
     _verified(false),
-    _ssl(0)
-#ifdef ICE_USE_IOCP
-    , _iocpBio(0),
+    _ssl(0),
+    _memBio(0),
     _sentBytes(0),
     _maxSendPacketSize(0),
     _maxRecvPacketSize(0)
-#endif
 {
 }
 
@@ -891,14 +877,13 @@
 {
 }
 
-#ifdef ICE_USE_IOCP
 bool
 OpenSSL::TransceiverI::receive()
 {
     if(_readBuffer.i == _readBuffer.b.end())
     {
-        assert(BIO_ctrl_get_read_request(_iocpBio));
-        _readBuffer.b.resize(BIO_ctrl_get_read_request(_iocpBio));
+        assert(BIO_ctrl_get_read_request(_memBio));
+        _readBuffer.b.resize(BIO_ctrl_get_read_request(_memBio));
         _readBuffer.i = _readBuffer.b.begin();
     }
 
@@ -915,7 +900,7 @@
 #ifndef NDEBUG
     int n =
 #endif
-        BIO_write(_iocpBio, &_readBuffer.b[0], static_cast<int>(_readBuffer.b.end() - _readBuffer.b.begin()));
+        BIO_write(_memBio, &_readBuffer.b[0], static_cast<int>(_readBuffer.b.end() - _readBuffer.b.begin()));
 
     assert(n == static_cast<int>(_readBuffer.b.end() - _readBuffer.b.begin()));
 
@@ -927,10 +912,10 @@
 {
     if(_writeBuffer.i == _writeBuffer.b.end())
     {
-        assert(BIO_ctrl_pending(_iocpBio));
-        _writeBuffer.b.resize( BIO_ctrl_pending(_iocpBio));
+        assert(BIO_ctrl_pending(_memBio));
+        _writeBuffer.b.resize( BIO_ctrl_pending(_memBio));
         _writeBuffer.i = _writeBuffer.b.begin();
-        BIO_read(_iocpBio, _writeBuffer.i, static_cast<int>(_writeBuffer.b.size()));
+        BIO_read(_memBio, _writeBuffer.i, static_cast<int>(_writeBuffer.b.size()));
     }
 
     if(_writeBuffer.i != _writeBuffer.b.end())
@@ -942,4 +927,3 @@
     }
     return _writeBuffer.i == _writeBuffer.b.end();
 }
-#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLTransceiverI.h zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLTransceiverI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLTransceiverI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLTransceiverI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_OPENSSL_TRANSCEIVER_I_H
 #define ICESSL_OPENSSL_TRANSCEIVER_I_H
@@ -61,10 +56,8 @@
     TransceiverI(const InstancePtr&, const IceInternal::TransceiverPtr&, const std::string&, bool);
     virtual ~TransceiverI();
 
-#ifdef ICE_USE_IOCP
     bool receive();
     bool send();
-#endif
 
     friend class IceSSL::OpenSSL::SSLEngine;
 
@@ -80,14 +73,12 @@
     bool _verified;
 
     SSL* _ssl;
-#ifdef ICE_USE_IOCP
-    BIO* _iocpBio;
+    BIO* _memBio;
     IceInternal::Buffer _writeBuffer;
     IceInternal::Buffer _readBuffer;
     int _sentBytes;
     size_t _maxSendPacketSize;
     size_t _maxRecvPacketSize;
-#endif
 };
 typedef IceUtil::Handle<TransceiverI> TransceiverIPtr;
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLUtil.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/OpenSSLUtil.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLUtil.h zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLUtil.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/OpenSSLUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/OpenSSLUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_OPENSSL_UTIL_I_H
 #define ICESSL_OPENSSL_UTIL_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/PluginI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/PluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/PluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/PluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/PluginI.h>
 #include <IceSSL/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/PluginI.h zeroc-ice-3.7.2/cpp/src/IceSSL/PluginI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/PluginI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/PluginI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_PLUGIN_I_H
 #define ICESSL_PLUGIN_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/RFC2253.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/RFC2253.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/RFC2253.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/RFC2253.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringUtil.h>
 
@@ -187,7 +182,6 @@
         return 10 + (v - 'A');
     }
     throw ParseException(__FILE__, __LINE__, "unescape: invalid hex pair");
-    return 0; // To satisfy the compiler.
 }
 
 static char
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/RFC2253.h zeroc-ice-3.7.2/cpp/src/IceSSL/RFC2253.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/RFC2253.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/RFC2253.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_RFC_2253_H
 #define ICESSL_RFC_2253_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelCertificateI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelCertificateI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelCertificateI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelCertificateI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Plugin.h>
 #include <IceSSL/SChannel.h>
@@ -165,17 +160,17 @@
 }
 
 string
-certNameToString(CERT_NAME_BLOB* name)
+certNameToString(CERT_NAME_BLOB* certName)
 {
-    assert(name);
+    assert(certName);
     DWORD length = 0;
-    if(!(length = CertNameToStr(X509_ASN_ENCODING, name, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, 0, 0)))
+    if((length = CertNameToStr(X509_ASN_ENCODING, certName, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, 0, 0)) == 0)
     {
         throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
     }
 
     vector<char> buffer(length);
-    if(!CertNameToStr(X509_ASN_ENCODING, name, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, &buffer[0], length))
+    if(!CertNameToStr(X509_ASN_ENCODING, certName, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, &buffer[0], length))
     {
         throw CertificateEncodingException(__FILE__, __LINE__,  IceUtilInternal::lastErrorToString());
     }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelEngine.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelEngine.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelEngine.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelEngine.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/SChannelEngine.h>
 #include <IceSSL/SChannelTransceiverI.h>
@@ -19,11 +14,21 @@
 
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
+#include <IceUtil/MutexPtrLock.h>
 #include <Ice/UUID.h>
 
 #include <wincrypt.h>
 
 //
+// SP_PROT_TLS1_3 is new in v10.0.15021 SDK
+//
+#ifndef SP_PROT_TLS1_3
+#    define SP_PROT_TLS1_3_SERVER 0x00001000
+#    define SP_PROT_TLS1_3_CLIENT 0x00002000
+#    define SP_PROT_TLS1_3 (SP_PROT_TLS1_3_SERVER | SP_PROT_TLS1_3_CLIENT)
+#endif
+
+//
 // CALG_ECDH_EPHEM algorithm constant is not defined in older version of the SDK headers
 //
 // https://msdn.microsoft.com/en-us/library/windows/desktop/aa375549(v=vs.85).aspx
@@ -32,7 +37,7 @@
 const int ICESSL_CALG_ECDH_EPHEM = 0x0000AE06;
 
 //
-// COMPILERFIX SCH_USE_STRONG_CRYPTO not defined with VC90
+// COMPILERFIX SCH_USE_STRONG_CRYPTO not defined with v90
 //
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
 #  ifndef SCH_USE_STRONG_CRYPTO
@@ -54,6 +59,26 @@
 namespace
 {
 
+IceUtil::Mutex* globalMutex;
+
+class Init
+{
+public:
+
+    Init()
+    {
+        globalMutex = new IceUtil::Mutex;
+    }
+
+    ~Init()
+    {
+        delete globalMutex;
+        globalMutex = 0;
+    }
+};
+
+Init init;
+
 void
 addMatchingCertificates(HCERTSTORE source, HCERTSTORE target, DWORD findType, const void* findParam)
 {
@@ -61,7 +86,7 @@
     do
     {
         if((next = CertFindCertificateInStore(source, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0,
-                                              findType, findParam, next)))
+                                              findType, findParam, next)) != 0)
         {
             if(!CertAddCertificateContextToStore(target, next, CERT_STORE_ADD_ALWAYS, 0))
             {
@@ -74,7 +99,7 @@
 }
 
 vector<PCCERT_CONTEXT>
-findCertificates(const string& location, const string& name, const string& value, vector<HCERTSTORE>& stores)
+findCertificates(const string& location, const string& storeName, const string& value, vector<HCERTSTORE>& stores)
 {
     DWORD storeLoc;
     if(location == "CurrentUser")
@@ -86,10 +111,10 @@
         storeLoc = CERT_SYSTEM_STORE_LOCAL_MACHINE;
     }
 
-    HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, storeLoc, Ice::stringToWstring(name).c_str());
+    HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, storeLoc, Ice::stringToWstring(storeName).c_str());
     if(!store)
     {
-        throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: failed to open certificate store `" + name +
+        throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: failed to open certificate store `" + storeName +
                                             "':\n" + IceUtilInternal::lastErrorToString());
     }
 
@@ -253,7 +278,7 @@
                     do
                     {
                         if((next = CertFindCertificateInStore(store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0,
-                                                              CERT_FIND_ANY, 0, next)))
+                                                              CERT_FIND_ANY, 0, next)) != 0)
                         {
                             if(CertCompareIntegerBlob(&serial, &next->pCertInfo->SerialNumber))
                             {
@@ -295,7 +320,7 @@
         do
         {
             if((next = CertFindCertificateInStore(store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, CERT_FIND_ANY, 0,
-                                                  next)))
+                                                  next)) != 0)
             {
                 certs.push_back(next);
             }
@@ -399,23 +424,23 @@
 
         if(prot == "SSL3" || prot == "SSLV3")
         {
-            v |= SP_PROT_SSL3_SERVER;
-            v |= SP_PROT_SSL3_CLIENT;
+            v |= SP_PROT_SSL3;
         }
         else if(prot == "TLS" || prot == "TLS1" || prot == "TLSV1" || prot == "TLS1_0" || prot == "TLSV1_0")
         {
-            v |= SP_PROT_TLS1_SERVER;
-            v |= SP_PROT_TLS1_CLIENT;
+            v |= SP_PROT_TLS1;
         }
         else if(prot == "TLS1_1" || prot == "TLSV1_1")
         {
-            v |= SP_PROT_TLS1_1_SERVER;
-            v |= SP_PROT_TLS1_1_CLIENT;
+            v |= SP_PROT_TLS1_1;
         }
         else if(prot == "TLS1_2" || prot == "TLSV1_2")
         {
-            v |= SP_PROT_TLS1_2_SERVER;
-            v |= SP_PROT_TLS1_2_CLIENT;
+            v |= SP_PROT_TLS1_2;
+        }
+        else if (prot == "TLS1_3" || prot == "TLSV1_2")
+        {
+            v |= SP_PROT_TLS1_3;
         }
         else
         {
@@ -580,6 +605,17 @@
 void
 SChannel::SSLEngine::initialize()
 {
+    //
+    // BUGFIX: we use a global mutex for the initialization of SChannel to
+    // avoid crashes ocurring with last SChannel updates see:
+    // https://github.com/zeroc-ice/ice/issues/242
+    //
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
+
+    //
+    // We still have to acquire the instance mutex because it is used by the base
+    // class to access _initialized data member.
+    //
     Mutex::Lock lock(_mutex);
     if(_initialized)
     {
@@ -751,21 +787,21 @@
 
         for(size_t i = 0; i < certFiles.size(); ++i)
         {
-            string certFile = certFiles[i];
+            string cFile = certFiles[i];
             string resolved;
-            if(!checkPath(certFile, defaultDir, false, resolved))
+            if(!checkPath(cFile, defaultDir, false, resolved))
             {
                 throw PluginInitializationException(__FILE__, __LINE__,
-                                                    "IceSSL: certificate file not found:\n" + certFile);
+                                                    "IceSSL: certificate file not found:\n" + cFile);
             }
-            certFile = resolved;
+            cFile = resolved;
 
             vector<char> buffer;
-            readFile(certFile, buffer);
+            readFile(cFile, buffer);
             if(buffer.empty())
             {
                 throw PluginInitializationException(__FILE__, __LINE__,
-                                                    "IceSSL: certificate file is empty:\n" + certFile);
+                                                    "IceSSL: certificate file is empty:\n" + cFile);
             }
 
             CRYPT_DATA_BLOB pfxBlob;
@@ -962,7 +998,7 @@
                                                         "store:\n" + lastErrorToString());
                 }
 
-                addCertificatesToStore(certFile, store, &cert);
+                addCertificatesToStore(cFile, store, &cert);
 
                 //
                 // Associate key & certificate
@@ -1098,7 +1134,11 @@
         case CALG_SHA_512:
             return "SHA_512";
         default:
-            return "Unknown";
+        {
+            ostringstream os;
+            os << "Unknown cipher: " << cipher;
+            return os.str();
+        }
     }
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelEngineF.h zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelEngineF.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelEngineF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelEngineF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SCHANNEL_ENGINE_F_H
 #define ICESSL_SCHANNEL_ENGINE_F_H
 
+#ifdef _WIN32
+
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
 
@@ -30,3 +27,5 @@
 }
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelEngine.h zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelEngine.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelEngine.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelEngine.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SCHANNEL_ENGINE_H
 #define ICESSL_SCHANNEL_ENGINE_H
 
+#ifdef _WIN32
+
 #include <IceSSL/SSLEngine.h>
 #include <IceSSL/SChannelEngineF.h>
 
@@ -124,3 +121,5 @@
 }
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelPluginI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelPluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelPluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelPluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/PluginI.h>
 #include <IceSSL/SChannelEngine.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelTransceiverI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelTransceiverI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelTransceiverI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelTransceiverI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/SChannelTransceiverI.h>
 
@@ -234,9 +229,9 @@
     }
 
     SECURITY_STATUS err = SEC_E_OK;
-    DWORD ctxFlags = 0;
     if(_state == StateHandshakeNotStarted)
     {
+        _ctxFlags = 0;
         _readBuffer.b.resize(2048);
         _readBuffer.i = _readBuffer.b.begin();
         _credentials = _engine->newCredentialsHandle(_incoming);
@@ -248,7 +243,7 @@
             SecBufferDesc outBufferDesc = { SECBUFFER_VERSION, 1, &outBuffer };
 
             err = InitializeSecurityContext(&_credentials, 0, const_cast<char *>(_host.c_str()), flags, 0, 0, 0, 0,
-                                            &_ssl, &outBufferDesc, &ctxFlags, 0);
+                                            &_ssl, &outBufferDesc, &_ctxFlags, 0);
             if(err != SEC_E_OK && err != SEC_I_CONTINUE_NEEDED)
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: handshake failure:\n" + secStatusToString(err));
@@ -296,7 +291,7 @@
             if(_incoming)
             {
                 err = AcceptSecurityContext(&_credentials, (_sslInitialized ? &_ssl : 0), &inBufferDesc, flags, 0,
-                                            &_ssl, &outBufferDesc, &ctxFlags, 0);
+                                            &_ssl, &outBufferDesc, &_ctxFlags, 0);
                 if(err == SEC_I_CONTINUE_NEEDED || err == SEC_E_OK)
                 {
                     _sslInitialized = true;
@@ -305,7 +300,7 @@
             else
             {
                 err = InitializeSecurityContext(&_credentials, &_ssl, const_cast<char*>(_host.c_str()), flags, 0, 0,
-                                                &inBufferDesc, 0, 0, &outBufferDesc, &ctxFlags, 0);
+                                                &inBufferDesc, 0, 0, &outBufferDesc, &_ctxFlags, 0);
             }
 
             //
@@ -315,7 +310,7 @@
             {
                 SecBuffer* missing = getSecBufferWithType(inBufferDesc, SECBUFFER_MISSING);
                 size_t pos = _readBuffer.i - _readBuffer.b.begin();
-                _readBuffer.b.resize(missing ? (pos + missing->cbBuffer) : (pos * 2));
+                _readBuffer.b.resize((missing && missing->cbBuffer > 0) ? (pos + missing->cbBuffer) : (pos * 2));
                 _readBuffer.i = _readBuffer.b.begin() + pos;
                 return IceInternal::SocketOperationRead;
             }
@@ -354,7 +349,14 @@
 
             if(token->cbBuffer)
             {
-                _state = StateHandshakeWriteContinue; // Continue writing if we have a token.
+                if(err == SEC_E_OK)
+                {
+                    _state = StateHandshakeWriteNoContinue; // Write and don't continue.
+                }
+                else
+                {
+                    _state = StateHandshakeWriteContinue; // Continue writing if we have a token.
+                }
             }
             else if(err == SEC_E_OK)
             {
@@ -364,7 +366,7 @@
             // Otherwise continue either reading credentials
         }
 
-        if(_state == StateHandshakeWriteContinue)
+        if(_state == StateHandshakeWriteContinue || _state == StateHandshakeWriteNoContinue)
         {
             //
             // Write any pending data.
@@ -373,80 +375,83 @@
             {
                 return IceInternal::SocketOperationWrite;
             }
-            if(err == SEC_E_OK)
+            if(_state == StateHandshakeWriteNoContinue)
             {
                 break; // Token is written and we weren't told to continue, so we're done!
             }
-            assert(err == SEC_I_CONTINUE_NEEDED);
             _state = StateHandshakeReadContinue;
         }
     }
 
     //
-    // Check if the requested capabilities are met
+    // Check if the requested capabilities are met.
+    //
+    // NOTE: it's important for _ctxFlags to be a data member. The context flags might not be checked immediately
+    // if the last write can't complete without blocking above. In such a case, the context flags are checked here
+    // only once the sslHandshake is called again after the write completes.
     //
-    if(flags != ctxFlags)
+    if(flags != _ctxFlags)
     {
         if(_incoming)
         {
-            if(!(ctxFlags & ASC_REQ_SEQUENCE_DETECT))
+            if(!(_ctxFlags & ASC_REQ_SEQUENCE_DETECT))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup sequence detect");
             }
 
-            if(!(ctxFlags & ASC_REQ_REPLAY_DETECT))
+            if(!(_ctxFlags & ASC_REQ_REPLAY_DETECT))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup replay detect");
             }
 
-            if(!(ctxFlags & ASC_REQ_CONFIDENTIALITY))
+            if(!(_ctxFlags & ASC_REQ_CONFIDENTIALITY))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup confidentiality");
             }
 
-            if(!(ctxFlags & ASC_REQ_EXTENDED_ERROR))
+            if(!(_ctxFlags & ASC_REQ_EXTENDED_ERROR))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup extended error");
             }
 
-            if(!(ctxFlags & ASC_REQ_ALLOCATE_MEMORY))
+            if(!(_ctxFlags & ASC_REQ_ALLOCATE_MEMORY))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup memory allocation");
             }
 
-            if(!(ctxFlags & ASC_REQ_STREAM))
+            if(!(_ctxFlags & ASC_REQ_STREAM))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup stream");
             }
         }
         else
         {
-            if(!(ctxFlags & ISC_REQ_SEQUENCE_DETECT))
+            if(!(_ctxFlags & ISC_REQ_SEQUENCE_DETECT))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup sequence detect");
             }
 
-            if(!(ctxFlags & ISC_REQ_REPLAY_DETECT))
+            if(!(_ctxFlags & ISC_REQ_REPLAY_DETECT))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup replay detect");
             }
 
-            if(!(ctxFlags & ISC_REQ_CONFIDENTIALITY))
+            if(!(_ctxFlags & ISC_REQ_CONFIDENTIALITY))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup confidentiality");
             }
 
-            if(!(ctxFlags & ISC_REQ_EXTENDED_ERROR))
+            if(!(_ctxFlags & ISC_REQ_EXTENDED_ERROR))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup extended error");
             }
 
-            if(!(ctxFlags & ISC_REQ_ALLOCATE_MEMORY))
+            if(!(_ctxFlags & ISC_REQ_ALLOCATE_MEMORY))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup memory allocation");
             }
 
-            if(!(ctxFlags & ISC_REQ_STREAM))
+            if(!(_ctxFlags & ISC_REQ_STREAM))
             {
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: SChannel failed to setup stream");
             }
@@ -900,7 +905,7 @@
         _bufferedW = encryptMessage(buffer);
     }
 
-    return _delegate->startWrite(_writeBuffer) && _bufferedW == (buffer.b.end() - buffer.i);
+    return _delegate->startWrite(_writeBuffer) && _bufferedW == static_cast<size_t>((buffer.b.end() - buffer.i));
 }
 
 void
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelTransceiverI.h zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelTransceiverI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SChannelTransceiverI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SChannelTransceiverI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SCHANNELTRANSCEIVER_I_H
 #define ICESSL_SCHANNELTRANSCEIVER_I_H
 
+#ifdef _WIN32
+
 #include <IceSSL/Config.h>
 #include <IceSSL/InstanceF.h>
 #include <IceSSL/Plugin.h>
@@ -86,6 +83,7 @@
         StateHandshakeNotStarted,
         StateHandshakeReadContinue,
         StateHandshakeWriteContinue,
+        StateHandshakeWriteNoContinue,
         StateHandshakeComplete
     };
 
@@ -96,6 +94,7 @@
     const bool _incoming;
     const IceInternal::TransceiverPtr _delegate;
     State _state;
+    DWORD _ctxFlags;
 
     //
     // Buffered encrypted data that has not been written.
@@ -129,3 +128,5 @@
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportCertificateI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportCertificateI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportCertificateI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportCertificateI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Plugin.h>
 #include <IceSSL/SecureTransport.h>
@@ -220,8 +215,8 @@
 
 #endif
 
-class SecureTransportCertificateI : public IceSSL::SecureTransport::Certificate,
-                                    public IceSSL::CertificateI
+class SecureTransportCertificateI ICE_FINAL : public IceSSL::SecureTransport::Certificate,
+                                              public IceSSL::CertificateI
 {
 public:
 
@@ -346,15 +341,15 @@
                 {
                     CFArrayRef section = (CFArrayRef)v;
                     ostringstream os;
-                    for(int i = 0, count = CFArrayGetCount(section); i < count;)
+                    for(int j = 0, count = CFArrayGetCount(section); j < count;)
                     {
-                        CFDictionaryRef d = (CFDictionaryRef)CFArrayGetValueAtIndex(section, i);
+                        CFDictionaryRef d = (CFDictionaryRef)CFArrayGetValueAtIndex(section, j);
 
                         CFStringRef sectionLabel = static_cast<CFStringRef>(CFDictionaryGetValue(d, kSecPropertyKeyLabel));
                         CFStringRef sectionValue = static_cast<CFStringRef>(CFDictionaryGetValue(d, kSecPropertyKeyValue));
 
                         os << certificateOIDAlias(fromCFString(sectionLabel)) << "=" << fromCFString(sectionValue);
-                        if(++i < count)
+                        if(++j < count)
                         {
                             os << ",";
                         }
@@ -544,7 +539,7 @@
         {
             UniqueRef<SecPolicyRef> policy(SecPolicyCreateBasicX509());
             UniqueRef<SecTrustRef> trust;
-            OSStatus err = 0;;
+            OSStatus err = 0;
             if((err = SecTrustCreateWithCertificates(_cert.get(), policy.get(), &trust.get())))
             {
                 throw CertificateEncodingException(__FILE__, __LINE__, sslErrorToString(err));
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportEngine.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportEngine.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportEngine.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportEngine.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Config.h>
 
@@ -132,7 +127,7 @@
         _ciphers["RSA_EXPORT_WITH_RC4_40_MD5"] = SSL_RSA_EXPORT_WITH_RC4_40_MD5;
         _ciphers["RSA_WITH_RC4_128_MD5"] = SSL_RSA_WITH_RC4_128_MD5;
         _ciphers["RSA_WITH_RC4_128_SHA"] = SSL_RSA_WITH_RC4_128_SHA;
-        _ciphers["RSA_EXPORT_WITH_RC2_CBC_40_MD5"] =    SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5;
+        _ciphers["RSA_EXPORT_WITH_RC2_CBC_40_MD5"] = SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5;
         _ciphers["RSA_WITH_IDEA_CBC_SHA"] = SSL_RSA_WITH_IDEA_CBC_SHA;
         _ciphers["RSA_EXPORT_WITH_DES40_CBC_SHA"] = SSL_RSA_EXPORT_WITH_DES40_CBC_SHA;
         _ciphers["RSA_WITH_DES_CBC_SHA"] = SSL_RSA_WITH_DES_CBC_SHA;
@@ -344,6 +339,16 @@
         _ciphers["RSA_WITH_DES_CBC_MD5"] = SSL_RSA_WITH_DES_CBC_MD5;
         _ciphers["RSA_WITH_3DES_EDE_CBC_MD5"] = SSL_RSA_WITH_3DES_EDE_CBC_MD5;
         _ciphers["NO_SUCH_CIPHERSUITE"] = SSL_NO_SUCH_CIPHERSUITE;
+
+        //
+        // TLS 1.3 standard cipher suites
+        //
+        _ciphers["TLS_AES_128_GCM_SHA256"] = TLS_AES_128_GCM_SHA256;
+        _ciphers["TLS_AES_256_GCM_SHA384"] = TLS_AES_256_GCM_SHA384;
+        _ciphers["TLS_CHACHA20_POLY1305_SHA256"] = TLS_CHACHA20_POLY1305_SHA256;
+        _ciphers["TLS_AES_128_CCM_SHA256"] = TLS_AES_128_CCM_SHA256;
+        _ciphers["TLS_AES_128_CCM_8_SHA256"] = TLS_AES_128_CCM_8_SHA256;
+
     }
 }
 
@@ -744,6 +749,21 @@
             return "RSA_WITH_DES_CBC_MD5";
         case SSL_RSA_WITH_3DES_EDE_CBC_MD5:
             return "RSA_WITH_3DES_EDE_CBC_MD5";
+
+        //
+        //TLS 1.3 standard cipher suites
+        //
+        case TLS_AES_128_GCM_SHA256:
+            return "TLS_AES_128_GCM_SHA256";
+        case TLS_AES_256_GCM_SHA384:
+            return "TLS_AES_256_GCM_SHA384";
+        case TLS_CHACHA20_POLY1305_SHA256:
+            return "TLS_CHACHA20_POLY1305_SHA256";
+        case TLS_AES_128_CCM_SHA256:
+            return "TLS_AES_128_CCM_SHA256";
+        case TLS_AES_128_CCM_8_SHA256:
+            return "TLS_AES_128_CCM_8_SHA256";
+
         default:
             return "";
     }
@@ -775,6 +795,10 @@
     {
         return kTLSProtocol12;
     }
+    else if(prot == "TLS1_3" || prot == "TLSV1_3")
+    {
+        return kTLSProtocol13;
+    }
     else
     {
         throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unrecognized protocol `" + p + "'");
@@ -857,7 +881,6 @@
     PasswordPromptPtr passwordPrompt = getPasswordPrompt();
 
     string certFile = properties->getProperty("IceSSL.CertFile");
-    string keyFile = properties->getProperty("IceSSL.KeyFile");
     string findCert = properties->getProperty("IceSSL.FindCert");
     string keychain = properties->getProperty("IceSSL.Keychain");
     string keychainPassword = properties->getProperty("IceSSL.KeychainPassword");
@@ -871,21 +894,24 @@
                                                 "IceSSL: invalid value for IceSSL.CertFile:\n" + certFile);
         }
         vector<string> keyFiles;
-        if(!keyFile.empty())
         {
-            if(!IceUtilInternal::splitString(keyFile, IceUtilInternal::pathsep, keyFiles) || keyFiles.size() > 2)
+            string keyFile = properties->getProperty("IceSSL.KeyFile");
+            if(!keyFile.empty())
             {
-                throw PluginInitializationException(__FILE__, __LINE__,
-                                                    "IceSSL: invalid value for IceSSL.KeyFile:\n" + keyFile);
-            }
-            if(files.size() != keyFiles.size())
-            {
-                throw PluginInitializationException(__FILE__, __LINE__,
-                                                    "IceSSL: IceSSL.KeyFile does not agree with IceSSL.CertFile");
+                if(!IceUtilInternal::splitString(keyFile, IceUtilInternal::pathsep, keyFiles) || keyFiles.size() > 2)
+                {
+                    throw PluginInitializationException(__FILE__, __LINE__,
+                                                        "IceSSL: invalid value for IceSSL.KeyFile:\n" + keyFile);
+                }
+                if(files.size() != keyFiles.size())
+                {
+                    throw PluginInitializationException(__FILE__, __LINE__,
+                                                        "IceSSL: IceSSL.KeyFile does not agree with IceSSL.CertFile");
+                }
             }
         }
 
-        for(int i = 0; i < files.size(); ++i)
+        for(size_t i = 0; i < files.size(); ++i)
         {
             string file = files[i];
             string keyFile = keyFiles.empty() ? "" : keyFiles[i];
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportEngineF.h zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportEngineF.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportEngineF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportEngineF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SECURE_TRANSPORT_ENGINE_F_H
 #define ICESSL_SECURE_TRANSPORT_ENGINE_F_H
 
+#ifdef __APPLE__
 #include <IceSSL/Plugin.h>
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
@@ -29,3 +25,5 @@
 }
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportEngine.h zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportEngine.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportEngine.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportEngine.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SECURE_TRANSPORT_ENGINE_H
 #define ICESSL_SECURE_TRANSPORT_ENGINE_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/SSLEngine.h>
 #include <Ice/UniqueRef.h>
 
@@ -58,3 +55,5 @@
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportPluginI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportPluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportPluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportPluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/PluginI.h>
 #include <IceSSL/SecureTransport.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportTransceiverI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportTransceiverI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportTransceiverI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/SecureTransportTransceiverI.h>
 #include <IceSSL/Instance.h>
@@ -215,8 +210,16 @@
     // Limit the size of packets passed to SSLWrite/SSLRead to avoid
     // blocking and holding too much memory.
     //
-    _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_delegate->getNativeInfo()->fd()));
-    _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_delegate->getNativeInfo()->fd()));
+    if(_delegate->getNativeInfo()->fd() != INVALID_SOCKET)
+    {
+        _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_delegate->getNativeInfo()->fd()));
+        _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_delegate->getNativeInfo()->fd()));
+    }
+    else
+    {
+        _maxSendPacketSize = 128 * 1024; // 128KB
+        _maxRecvPacketSize = 128 * 1024; // 128KB
+    }
 
     OSStatus err = 0;
     if(!_ssl)
@@ -253,8 +256,8 @@
         }
         else if(err == errSSLWouldBlock)
         {
-            assert(_flags & SSLWantRead || _flags & SSLWantWrite);
-            return _flags & SSLWantRead ? IceInternal::SocketOperationRead : IceInternal::SocketOperationWrite;
+            assert(_tflags & SSLWantRead || _tflags & SSLWantWrite);
+            return _tflags & SSLWantRead ? IceInternal::SocketOperationRead : IceInternal::SocketOperationWrite;
         }
         else if(err == errSSLPeerAuthCompleted)
         {
@@ -294,9 +297,11 @@
     }
 
     assert(_ssl);
-    SSLCipherSuite cipher;
-    SSLGetNegotiatedCipher(_ssl.get(), &cipher);
-    _cipher = _engine->getCipherName(cipher);
+    {
+        SSLCipherSuite cipher;
+        SSLGetNegotiatedCipher(_ssl.get(), &cipher);
+        _cipher = _engine->getCipherName(cipher);
+    }
 
     _engine->verifyPeer(_host, ICE_DYNAMIC_CAST(ConnectionInfo, getInfo()), toString());
 
@@ -381,7 +386,7 @@
                 {
                     _buffered = processed;
                 }
-                assert(_flags & SSLWantWrite);
+                assert(_tflags & SSLWantWrite);
                 return IceInternal::SocketOperationWrite;
             }
 
@@ -420,9 +425,9 @@
             buf.i += processed;
         }
 
-        if(packetSize > buf.b.end() - buf.i)
+        if(packetSize > static_cast<size_t>(buf.b.end() - buf.i))
         {
-            packetSize = buf.b.end() - buf.i;
+            packetSize = static_cast<size_t>(buf.b.end() - buf.i);
         }
     }
 
@@ -454,7 +459,7 @@
             if(err == errSSLWouldBlock)
             {
                 buf.i += processed;
-                assert(_flags & SSLWantRead);
+                assert(_tflags & SSLWantRead);
                 return IceInternal::SocketOperationRead;
             }
 
@@ -485,9 +490,9 @@
 
         buf.i += processed;
 
-        if(packetSize > buf.b.end() - buf.i)
+        if(packetSize > static_cast<size_t>(buf.b.end() - buf.i))
         {
-            packetSize = buf.b.end() - buf.i;
+            packetSize = static_cast<size_t>(buf.b.end() - buf.i);
         }
     }
 
@@ -570,7 +575,7 @@
 OSStatus
 IceSSL::SecureTransport::TransceiverI::writeRaw(const char* data, size_t* length) const
 {
-    _flags &= ~SSLWantWrite;
+    _tflags &= ~SSLWantWrite;
 
     try
     {
@@ -579,7 +584,7 @@
         if(op == IceInternal::SocketOperationWrite)
         {
             *length = buf.i - buf.b.begin();
-            _flags |= SSLWantWrite;
+            _tflags |= SSLWantWrite;
             return errSSLWouldBlock;
         }
         assert(op == IceInternal::SocketOperationNone);
@@ -603,7 +608,7 @@
 OSStatus
 IceSSL::SecureTransport::TransceiverI::readRaw(char* data, size_t* length) const
 {
-    _flags &= ~SSLWantRead;
+    _tflags &= ~SSLWantRead;
 
     try
     {
@@ -612,7 +617,7 @@
         if(op == IceInternal::SocketOperationRead)
         {
             *length = buf.i - buf.b.begin();
-            _flags |= SSLWantRead;
+            _tflags |= SSLWantRead;
             return errSSLWouldBlock;
         }
         assert(op == IceInternal::SocketOperationNone);
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportTransceiverI.h zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportTransceiverI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportTransceiverI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportTransceiverI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
 #define ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/Config.h>
 #include <IceSSL/InstanceF.h>
 #include <IceSSL/SecureTransportEngineF.h>
@@ -75,7 +72,7 @@
         SSLWantWrite = 0x2
     };
 
-    mutable Ice::Byte _flags;
+    mutable Ice::Byte _tflags;
     size_t _maxSendPacketSize;
     size_t _maxRecvPacketSize;
     std::string _cipher;
@@ -90,3 +87,5 @@
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportUtil.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/SecureTransportUtil.h>
 #include <IceSSL/Plugin.h>
@@ -363,11 +358,11 @@
     UniqueRef<SecKeyRef> key;
     for(int i = 0; i < count; ++i)
     {
-        SecKeychainItemRef item =
+        SecKeychainItemRef itemRef =
             static_cast<SecKeychainItemRef>(const_cast<void*>(CFArrayGetValueAtIndex(items.get(), 0)));
-        if(SecKeyGetTypeID() == CFGetTypeID(item))
+        if(SecKeyGetTypeID() == CFGetTypeID(itemRef))
         {
-            key.retain(reinterpret_cast<SecKeyRef>(item));
+            key.retain(reinterpret_cast<SecKeyRef>(itemRef));
             break;
         }
     }
@@ -524,9 +519,15 @@
 //
 CFArrayRef
 IceSSL::SecureTransport::loadCertificateChain(const string& file,
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+                                              const string& /*keyFile*/,
+                                              const std::string& /*keychainPath*/,
+                                              const string& /*keychainPassword*/,
+#else
                                               const string& keyFile,
                                               const std::string& keychainPath,
                                               const string& keychainPassword,
+#endif
                                               const string& password,
                                               const PasswordPromptPtr& prompt,
                                               int retryMax)
@@ -652,9 +653,15 @@
 }
 
 CFArrayRef
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+IceSSL::SecureTransport::findCertificateChain(const std::string&,
+                                              const std::string&,
+                                              const string& value)
+#else
 IceSSL::SecureTransport::findCertificateChain(const std::string& keychainPath,
                                               const std::string& keychainPassword,
                                               const string& value)
+#endif
 {
     //
     //  Search the keychain using key:value pairs. The following keys are supported:
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportUtil.h zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportUtil.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SecureTransportUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SecureTransportUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
 #define ICESSL_SECURE_TRANSPORT_UTIL_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/SecureTransport.h>
 #include <IceSSL/Util.h>
 
@@ -44,3 +41,5 @@
 } // IceSSL namespace end
 
 #endif
+
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SSLEngine.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/SSLEngine.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SSLEngine.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SSLEngine.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/SSLEngine.h>
 #include <IceSSL/TrustManager.h>
@@ -224,7 +219,7 @@
 }
 
 void
-IceSSL::SSLEngine::verifyPeer(const string& address, const ConnectionInfoPtr& info, const string& desc)
+IceSSL::SSLEngine::verifyPeer(const string& /*address*/, const ConnectionInfoPtr& info, const string& desc)
 {
     const CertificateVerifierPtr verifier = getCertificateVerifier();
     if(_verifyDepthMax > 0 && static_cast<int>(info->certs.size()) > _verifyDepthMax)
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SSLEngineF.h zeroc-ice-3.7.2/cpp/src/IceSSL/SSLEngineF.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SSLEngineF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SSLEngineF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_ENGINE_F_H
 #define ICESSL_ENGINE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/SSLEngine.h zeroc-ice-3.7.2/cpp/src/IceSSL/SSLEngine.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/SSLEngine.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/SSLEngine.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_ENGINE_H
 #define ICESSL_ENGINE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/TrustManager.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/TrustManager.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/TrustManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/TrustManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/TrustManager.h>
 #include <IceSSL/RFC2253.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/TrustManagerF.h zeroc-ice-3.7.2/cpp/src/IceSSL/TrustManagerF.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/TrustManagerF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/TrustManagerF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_TRUST_MANAGER_F_H
 #define ICESSL_TRUST_MANAGER_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/TrustManager.h zeroc-ice-3.7.2/cpp/src/IceSSL/TrustManager.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/TrustManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/TrustManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_TRUST_MANAGER_H
 #define ICESSL_TRUST_MANAGER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/Util.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/Util.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Config.h>
 #if defined(_WIN32) && !defined(ICE_OS_UWP)
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/Util.h zeroc-ice-3.7.2/cpp/src/IceSSL/Util.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UTIL_H
 #define ICESSL_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/UWPCertificateI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/UWPCertificateI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/UWPCertificateI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/UWPCertificateI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // UWP Certificate implementation
@@ -224,11 +219,11 @@
 }
 
 UWP::CertificatePtr
-UWP::Certificate::load(const std::string& file)
+UWP::Certificate::load(const std::string& filename)
 {
     try
     {
-        auto uri = ref new Uri(ref new String(stringToWstring(file).c_str()));
+        auto uri = ref new Uri(ref new String(stringToWstring(filename).c_str()));
         auto file = create_task(StorageFile::GetFileFromApplicationUriAsync(uri)).get();
         auto buffer = create_task(FileIO::ReadTextAsync(file)).get();
         return UWP::Certificate::decode(wstringToString(buffer->Data()));
@@ -237,7 +232,7 @@
     {
         if(HRESULT_CODE(ex->HResult) == ERROR_FILE_NOT_FOUND)
         {
-            throw CertificateReadException(__FILE__, __LINE__, "error opening file :" + file);
+            throw CertificateReadException(__FILE__, __LINE__, "error opening file :" + filename);
         }
         else
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/UWPEngine.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/UWPEngine.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/UWPEngine.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/UWPEngine.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Config.h>
 
@@ -104,10 +99,10 @@
 }
 
 Certificates::Certificate^
-importPersonalCertificate(const string& file, function<string ()> password, bool passwordPrompt,
+importPersonalCertificate(const string& filename, function<string ()> password, bool passwordPrompt,
                           int passwordRetryMax)
 {
-    auto uri = ref new Uri(ref new String(stringToWstring(file).c_str()));
+    auto uri = ref new Uri(ref new String(stringToWstring(filename).c_str()));
     try
     {
         auto file = IceInternal::runSync(StorageFile::GetFileFromApplicationUriAsync(uri));
@@ -153,7 +148,7 @@
     {
         if(HRESULT_CODE(ex->HResult) == ERROR_FILE_NOT_FOUND)
         {
-            throw PluginInitializationException(__FILE__, __LINE__, "certificate file not found:\n" + file);
+            throw PluginInitializationException(__FILE__, __LINE__, "certificate file not found:\n" + filename);
         }
         else
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/UWPEngineF.h zeroc-ice-3.7.2/cpp/src/IceSSL/UWPEngineF.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/UWPEngineF.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/UWPEngineF.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UWP_ENGINE_F_H
 #define ICESSL_UWP_ENGINE_F_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/UWPEngine.h zeroc-ice-3.7.2/cpp/src/IceSSL/UWPEngine.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/UWPEngine.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/UWPEngine.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UWP_ENGINE_H
 #define ICESSL_UWP_ENGINE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/UWPPluginI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/UWPPluginI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/UWPPluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/UWPPluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/PluginI.h>
 #include <IceSSL/UWPEngine.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/UWPTransceiverI.cpp zeroc-ice-3.7.2/cpp/src/IceSSL/UWPTransceiverI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceSSL/UWPTransceiverI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/UWPTransceiverI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceSSL/Config.h>
 #include <IceSSL/UWPTransceiverI.h>
@@ -289,7 +284,7 @@
     if(_connected && !_upgraded)
     {
         IceInternal::AsyncInfo* asyncInfo = getNativeInfo()->getAsyncInfo(IceInternal::SocketOperationWrite);
-        if(asyncInfo->count == SOCKET_ERROR)
+        if(asyncInfo->error != ERROR_SUCCESS)
         {
             if(CERT_E_CN_NO_MATCH == asyncInfo->error)
             {
@@ -368,9 +363,9 @@
 }
 
 UWP::TransceiverI::TransceiverI(const InstancePtr& instance,
-                                   const IceInternal::TransceiverPtr& delegate,
-                                   const string& hostOrAdapterName,
-                                   bool incoming) :
+                                const IceInternal::TransceiverPtr& delegate,
+                                const string& hostOrAdapterName,
+                                bool incoming) :
     _instance(instance),
     _engine(UWP::SSLEnginePtr::dynamicCast(instance->engine())),
     _host(incoming ? "" : hostOrAdapterName),
diff -Nru zeroc-ice-3.7.1/cpp/src/IceSSL/UWPTransceiverI.h zeroc-ice-3.7.2/cpp/src/IceSSL/UWPTransceiverI.h
--- zeroc-ice-3.7.1/cpp/src/IceSSL/UWPTransceiverI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceSSL/UWPTransceiverI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UWP_TRANSCEIVER_I_H
 #define ICESSL_UWP_TRANSCEIVER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Admin.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Admin.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Admin.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Admin.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
-#include <Ice/Application.h>
+#include <Ice/Ice.h>
 #include <Ice/ConsoleUtil.h>
 #include <Ice/SliceChecksums.h>
 #include <IceStorm/Parser.h>
@@ -19,21 +14,20 @@
 #endif
 
 using namespace std;
-using namespace Ice;
 using namespace IceInternal;
-using namespace IceStorm;
 
-class Client : public Ice::Application
-{
-public:
+int run(const Ice::StringSeq&);
 
-    void usage();
-    virtual int run(int, char*[]);
-};
+Ice::CommunicatorPtr communicator;
 
-#ifdef _WIN32
+void
+destroyCommunicator(int)
+{
+    communicator->destroy();
+}
 
 int
+#ifdef _WIN32
 wmain(int argc, wchar_t* argv[])
 {
     //
@@ -41,24 +35,39 @@
     //
     _setmode(_fileno(stdin), _O_BINARY);
 #else
-
-int
 main(int argc, char* argv[])
 {
 #endif
-    Client app;
-    Ice::InitializationData id;
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    id.properties = Ice::createProperties(args);
-    id.properties->setProperty("Ice.Warn.Endpoints", "0");
-    int rc = app.main(argc, argv, id);
-    return rc;
+    int status = 0;
+
+    try
+    {
+        Ice::CtrlCHandler ctrlCHandler;
+
+        Ice::InitializationData id;
+        Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
+        id.properties = Ice::createProperties(args);
+        id.properties->setProperty("Ice.Warn.Endpoints", "0");
+        Ice::CommunicatorHolder ich(id);
+        communicator = ich.communicator();
+
+        ctrlCHandler.setCallback(&destroyCommunicator);
+
+        status = run(args);
+    }
+    catch(const std::exception& ex)
+    {
+        consoleErr << ex.what() << endl;
+        status = 1;
+    }
+
+    return status;
 }
 
 void
-Client::usage()
+usage(const string& name)
 {
-    consoleErr << "Usage: " << appName() << " [options]\n";
+    consoleErr << "Usage: " << name << " [options]\n";
     consoleErr <<
         "Options:\n"
         "-h, --help           Show this message.\n"
@@ -69,7 +78,7 @@
 }
 
 int
-Client::run(int argc, char* argv[])
+run(const Ice::StringSeq& args)
 {
     string commands;
     bool debug;
@@ -80,33 +89,31 @@
     opts.addOpt("e", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("d", "debug");
 
-    vector<string> args;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        if(!opts.parse(args).empty())
+        {
+            consoleErr << args[0] << ": too many arguments" << endl;
+            usage(args[0]);
+            return 1;
+        }
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
         consoleErr << e.reason << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-    if(!args.empty())
-    {
-        consoleErr << argv[0] << ": too many arguments" << endl;
-        usage();
-        return EXIT_FAILURE;
+        usage(args[0]);
+        return 1;
     }
 
     if(opts.isSet("help"))
     {
-        usage();
-        return EXIT_SUCCESS;
+        usage(args[0]);
+        return 0;
     }
     if(opts.isSet("version"))
     {
         consoleOut << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
+        return 0;
     }
     if(opts.isSet("e"))
     {
@@ -120,10 +127,10 @@
 
     // The complete set of Ice::Identity -> manager proxies.
     map<Ice::Identity, IceStorm::TopicManagerPrx> managers;
-    PropertiesPtr properties = communicator()->getProperties();
+    Ice::PropertiesPtr properties = communicator->getProperties();
     IceStorm::TopicManagerPrx defaultManager;
 
-    Ice::PropertyDict props = communicator()->getProperties()->getPropertiesForPrefix("IceStormAdmin.TopicManager.");
+    Ice::PropertyDict props = communicator->getProperties()->getPropertiesForPrefix("IceStormAdmin.TopicManager.");
     {
         for(Ice::PropertyDict::const_iterator p = props.begin(); p != props.end(); ++p)
         {
@@ -135,14 +142,14 @@
                 try
                 {
                     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::uncheckedCast(
-                        communicator()->propertyToProxy(p->first));
+                        communicator->propertyToProxy(p->first));
                     managers.insert(map<Ice::Identity, IceStorm::TopicManagerPrx>::value_type(
                                         manager->ice_getIdentity(), manager));
                 }
                 catch(const Ice::ProxyParseException&)
                 {
-                    consoleErr << appName() << ": malformed proxy: " << p->second << endl;
-                    return EXIT_FAILURE;
+                    consoleErr << args[0] << ": malformed proxy: " << p->second << endl;
+                    return 1;
                 }
             }
         }
@@ -151,7 +158,7 @@
         if(!managerProxy.empty())
         {
             defaultManager = IceStorm::TopicManagerPrx::uncheckedCast(
-                communicator()->stringToProxy(managerProxy));
+                communicator->stringToProxy(managerProxy));
         }
         else if(!managers.empty())
         {
@@ -169,7 +176,7 @@
         os << "IceStorm/Finder";
         os << ":tcp" << (host.empty() ? "" : (" -h \"" + host + "\"")) << " -p " << port << " -t " << timeout;
         os << ":ssl" << (host.empty() ? "" : (" -h \"" + host + "\"")) << " -p " << port << " -t " << timeout;
-        IceStorm::FinderPrx finder = IceStorm::FinderPrx::uncheckedCast(communicator()->stringToProxy(os.str()));
+        IceStorm::FinderPrx finder = IceStorm::FinderPrx::uncheckedCast(communicator->stringToProxy(os.str()));
         try
         {
             defaultManager = finder->getTopicManager();
@@ -182,19 +189,19 @@
 
     if(!defaultManager)
     {
-        consoleErr << appName() << ": no manager proxies configured" << endl;
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": no manager proxies configured" << endl;
+        return 1;
     }
 
-    ParserPtr p = Parser::createParser(communicator(), defaultManager, managers);
-    int status = EXIT_SUCCESS;
+    IceStorm::ParserPtr p = IceStorm::Parser::createParser(communicator, defaultManager, managers);
+    int status = 0;
 
     if(!commands.empty()) // Commands were given
     {
         int parseStatus = p->parse(commands, debug);
-        if(parseStatus == EXIT_FAILURE)
+        if(parseStatus == 1)
         {
-            status = EXIT_FAILURE;
+            status = 1;
         }
     }
     else // No commands, let's use standard input
@@ -202,9 +209,9 @@
         p->showBanner();
 
         int parseStatus = p->parse(stdin, debug);
-        if(parseStatus == EXIT_FAILURE)
+        if(parseStatus == 1)
         {
-            status = EXIT_FAILURE;
+            status = 1;
         }
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/DBTypes.ice zeroc-ice-3.7.2/cpp/src/IceStorm/DBTypes.ice
--- zeroc-ice-3.7.1/cpp/src/IceStorm/DBTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/DBTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Election.ice zeroc-ice-3.7.2/cpp/src/IceStorm/Election.ice
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Election.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Election.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Grammar.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Grammar.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Grammar.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Grammar.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison implementation for Yacc-like parsers in C
-
+   
       Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -66,24 +66,22 @@
 #line 1 "src/IceStorm/Grammar.y"
 
 
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/Parser.h>
 
 #ifdef _MSC_VER
-// I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
+#   pragma warning(disable:4102)
 // warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
+#   pragma warning(disable:4065)
+// warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+#   pragma warning(disable:4244)
+// warning C4702: unreachable code
+#   pragma warning(disable:4702)
 #endif
 
 //
@@ -105,7 +103,7 @@
 
 
 /* Line 371 of yacc.c  */
-#line 109 "src/IceStorm/Grammar.cpp"
+#line 112 "src/IceStorm/Grammar.cpp"
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -184,7 +182,7 @@
 /* Copy the second part of user declarations.  */
 
 /* Line 390 of yacc.c  */
-#line 188 "src/IceStorm/Grammar.cpp"
+#line 191 "src/IceStorm/Grammar.cpp"
 
 #ifdef short
 # undef short
@@ -482,10 +480,10 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    67,    67,    71,    78,    81,    89,    93,    97,   101,
-     105,   109,   113,   117,   121,   125,   129,   133,   137,   141,
-     149,   154,   160,   168,   171,   174,   177,   180,   183,   186,
-     189,   192
+       0,    70,    70,    74,    81,    84,    92,    96,   100,   104,
+     108,   112,   116,   120,   124,   128,   132,   136,   140,   144,
+     152,   157,   163,   171,   174,   177,   180,   183,   186,   189,
+     192,   195
 };
 #endif
 
@@ -1425,35 +1423,35 @@
     {
         case 2:
 /* Line 1792 of yacc.c  */
-#line 68 "src/IceStorm/Grammar.y"
+#line 71 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 3:
 /* Line 1792 of yacc.c  */
-#line 71 "src/IceStorm/Grammar.y"
+#line 74 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 4:
 /* Line 1792 of yacc.c  */
-#line 79 "src/IceStorm/Grammar.y"
+#line 82 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 5:
 /* Line 1792 of yacc.c  */
-#line 82 "src/IceStorm/Grammar.y"
+#line 85 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 6:
 /* Line 1792 of yacc.c  */
-#line 90 "src/IceStorm/Grammar.y"
+#line 93 "src/IceStorm/Grammar.y"
     {
     parser->usage();
 }
@@ -1461,7 +1459,7 @@
 
   case 7:
 /* Line 1792 of yacc.c  */
-#line 94 "src/IceStorm/Grammar.y"
+#line 97 "src/IceStorm/Grammar.y"
     {
     return 0;
 }
@@ -1469,7 +1467,7 @@
 
   case 8:
 /* Line 1792 of yacc.c  */
-#line 98 "src/IceStorm/Grammar.y"
+#line 101 "src/IceStorm/Grammar.y"
     {
     parser->create((yyvsp[(2) - (3)]));
 }
@@ -1477,7 +1475,7 @@
 
   case 9:
 /* Line 1792 of yacc.c  */
-#line 102 "src/IceStorm/Grammar.y"
+#line 105 "src/IceStorm/Grammar.y"
     {
     parser->current((yyvsp[(2) - (3)]));
 }
@@ -1485,7 +1483,7 @@
 
   case 10:
 /* Line 1792 of yacc.c  */
-#line 106 "src/IceStorm/Grammar.y"
+#line 109 "src/IceStorm/Grammar.y"
     {
     parser->destroy((yyvsp[(2) - (3)]));
 }
@@ -1493,7 +1491,7 @@
 
   case 11:
 /* Line 1792 of yacc.c  */
-#line 110 "src/IceStorm/Grammar.y"
+#line 113 "src/IceStorm/Grammar.y"
     {
     parser->link((yyvsp[(2) - (3)]));
 }
@@ -1501,7 +1499,7 @@
 
   case 12:
 /* Line 1792 of yacc.c  */
-#line 114 "src/IceStorm/Grammar.y"
+#line 117 "src/IceStorm/Grammar.y"
     {
     parser->unlink((yyvsp[(2) - (3)]));
 }
@@ -1509,7 +1507,7 @@
 
   case 13:
 /* Line 1792 of yacc.c  */
-#line 118 "src/IceStorm/Grammar.y"
+#line 121 "src/IceStorm/Grammar.y"
     {
     parser->links((yyvsp[(2) - (3)]));
 }
@@ -1517,7 +1515,7 @@
 
   case 14:
 /* Line 1792 of yacc.c  */
-#line 122 "src/IceStorm/Grammar.y"
+#line 125 "src/IceStorm/Grammar.y"
     {
     parser->topics((yyvsp[(2) - (3)]));
 }
@@ -1525,7 +1523,7 @@
 
   case 15:
 /* Line 1792 of yacc.c  */
-#line 126 "src/IceStorm/Grammar.y"
+#line 129 "src/IceStorm/Grammar.y"
     {
     parser->replica((yyvsp[(2) - (3)]));
 }
@@ -1533,7 +1531,7 @@
 
   case 16:
 /* Line 1792 of yacc.c  */
-#line 130 "src/IceStorm/Grammar.y"
+#line 133 "src/IceStorm/Grammar.y"
     {
     parser->subscribers((yyvsp[(2) - (3)]));
 }
@@ -1541,7 +1539,7 @@
 
   case 17:
 /* Line 1792 of yacc.c  */
-#line 134 "src/IceStorm/Grammar.y"
+#line 137 "src/IceStorm/Grammar.y"
     {
     parser->invalidCommand("unknown command `" + (yyvsp[(1) - (3)]).front() + "' (type `help' for more info)");
 }
@@ -1549,7 +1547,7 @@
 
   case 18:
 /* Line 1792 of yacc.c  */
-#line 138 "src/IceStorm/Grammar.y"
+#line 141 "src/IceStorm/Grammar.y"
     {
     yyerrok;
 }
@@ -1557,14 +1555,14 @@
 
   case 19:
 /* Line 1792 of yacc.c  */
-#line 142 "src/IceStorm/Grammar.y"
+#line 145 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 20:
 /* Line 1792 of yacc.c  */
-#line 150 "src/IceStorm/Grammar.y"
+#line 153 "src/IceStorm/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -1573,7 +1571,7 @@
 
   case 21:
 /* Line 1792 of yacc.c  */
-#line 155 "src/IceStorm/Grammar.y"
+#line 158 "src/IceStorm/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -1582,7 +1580,7 @@
 
   case 22:
 /* Line 1792 of yacc.c  */
-#line 160 "src/IceStorm/Grammar.y"
+#line 163 "src/IceStorm/Grammar.y"
     {
     (yyval) = YYSTYPE();
 }
@@ -1590,70 +1588,70 @@
 
   case 23:
 /* Line 1792 of yacc.c  */
-#line 169 "src/IceStorm/Grammar.y"
+#line 172 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 24:
 /* Line 1792 of yacc.c  */
-#line 172 "src/IceStorm/Grammar.y"
+#line 175 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 25:
 /* Line 1792 of yacc.c  */
-#line 175 "src/IceStorm/Grammar.y"
+#line 178 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 26:
 /* Line 1792 of yacc.c  */
-#line 178 "src/IceStorm/Grammar.y"
+#line 181 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 27:
 /* Line 1792 of yacc.c  */
-#line 181 "src/IceStorm/Grammar.y"
+#line 184 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 28:
 /* Line 1792 of yacc.c  */
-#line 184 "src/IceStorm/Grammar.y"
+#line 187 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 29:
 /* Line 1792 of yacc.c  */
-#line 187 "src/IceStorm/Grammar.y"
+#line 190 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 30:
 /* Line 1792 of yacc.c  */
-#line 190 "src/IceStorm/Grammar.y"
+#line 193 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
   case 31:
 /* Line 1792 of yacc.c  */
-#line 193 "src/IceStorm/Grammar.y"
+#line 196 "src/IceStorm/Grammar.y"
     {
 }
     break;
 
 
 /* Line 1792 of yacc.c  */
-#line 1657 "src/IceStorm/Grammar.cpp"
+#line 1660 "src/IceStorm/Grammar.cpp"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1885,5 +1883,5 @@
 
 
 /* Line 2055 of yacc.c  */
-#line 196 "src/IceStorm/Grammar.y"
+#line 199 "src/IceStorm/Grammar.y"
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Grammar.h zeroc-ice-3.7.2/cpp/src/IceStorm/Grammar.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Grammar.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Grammar.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison interface for Yacc-like parsers in C
-
+   
       Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Grammar.y zeroc-ice-3.7.2/cpp/src/IceStorm/Grammar.y
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Grammar.y	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Grammar.y	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,21 @@
 %{
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/Parser.h>
 
 #ifdef _MSC_VER
-// I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
+#   pragma warning(disable:4102)
 // warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
+#   pragma warning(disable:4065)
+// warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+#   pragma warning(disable:4244)
+// warning C4702: unreachable code
+#   pragma warning(disable:4702)
 #endif
 
 //
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/IceStormDB.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/IceStormDB.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/IceStormDB.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/IceStormDB.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,61 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
 #include <Ice/Ice.h>
 #include <Ice/ConsoleUtil.h>
 #include <IceDB/IceDB.h>
 #include <IceStorm/DBTypes.h>
-#include <IceUtil/DisableWarnings.h>
 #include <fstream>
 
 using namespace std;
-using namespace Ice;
 using namespace IceInternal;
-using namespace IceStorm;
-using namespace IceStormElection;
 
-class Client : public Ice::Application
-{
-public:
+int run(const Ice::StringSeq&);
 
-    void usage();
-    virtual int run(int, char*[]);
-};
+Ice::CommunicatorPtr communicator;
 
-#ifdef _WIN32
+void
+destroyCommunicator(int)
+{
+    communicator->destroy();
+}
 
 int
+#ifdef _WIN32
 wmain(int argc, wchar_t* argv[])
-
 #else
-
-int
 main(int argc, char* argv[])
-
 #endif
 {
-    Client app;
-    return app.main(argc, argv);
+    int status = 0;
+
+    try
+    {
+        Ice::CtrlCHandler ctrlCHandler;
+        Ice::CommunicatorHolder ich(argc, argv);
+        communicator = ich.communicator();
+
+        ctrlCHandler.setCallback(&destroyCommunicator);
+
+        status = run(Ice::argsToStringSeq(argc, argv));
+    }
+    catch(const std::exception& ex)
+    {
+        consoleErr << ex.what() << endl;
+        status = 1;
+    }
+
+    return status;
 }
 
 void
-Client::usage()
+usage(const string& name)
 {
-    consoleErr << "Usage: " << appName() << " <options>\n";
+    consoleErr << "Usage: " << name << " <options>\n";
     consoleErr <<
         "Options:\n"
         "-h, --help             Show this message.\n"
@@ -64,7 +70,7 @@
 }
 
 int
-Client::run(int argc, char* argv[])
+run(const Ice::StringSeq& args)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -76,48 +82,46 @@
     opts.addOpt("", "dbpath", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "mapsize", IceUtilInternal::Options::NeedArg);
 
-    vector<string> args;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        if(!opts.parse(args).empty())
+        {
+            consoleErr << args[0] << ": too many arguments" << endl;
+            usage(args[0]);
+            return 1;
+        }
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        consoleErr << argv[0] << ": " << e.reason << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-    if(!args.empty())
-    {
-        consoleErr << argv[0] << ": too many arguments" << endl;
-        usage();
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": " << e.reason << endl;
+        usage(args[0]);
+        return 1;
     }
 
     if(opts.isSet("help"))
     {
-        usage();
-        return EXIT_SUCCESS;
+        usage(args[0]);
+        return 0;
     }
 
     if(opts.isSet("version"))
     {
         consoleOut << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     if(!(opts.isSet("import") ^ opts.isSet("export")))
     {
-        consoleErr << argv[0] << ": either --import or --export must be set" << endl;
-        usage();
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": either --import or --export must be set" << endl;
+        usage(args[0]);
+        return 1;
     }
 
     if(!(opts.isSet("dbhome") ^ opts.isSet("dbpath")))
     {
-        consoleErr << argv[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
-        usage();
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
+        usage(args[0]);
+        return 1;
     }
 
     bool debug = opts.isSet("debug");
@@ -141,7 +145,7 @@
         IceStorm::AllData data;
 
         IceDB::IceContext dbContext;
-        dbContext.communicator = communicator();
+        dbContext.communicator = communicator;
         dbContext.encoding.major = 1;
         dbContext.encoding.minor = 1;
 
@@ -151,21 +155,22 @@
 
             if(!IceUtilInternal::directoryExists(dbPath))
             {
-                consoleErr << argv[0] << ": output directory does not exist: " << dbPath << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": output directory does not exist: " << dbPath << endl;
+                return 1;
             }
 
             if(!IceUtilInternal::isEmptyDirectory(dbPath))
             {
-                consoleErr << argv[0] << ": output directory is not empty: " << dbPath << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": output directory is not empty: " << dbPath << endl;
+                return 1;
             }
 
             ifstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
             if(fs.fail())
             {
-                consoleErr << argv[0] << ": could not open input file: " << strerror(errno) << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": could not open input file: " << IceUtilInternal::errorToString(errno)
+                           << endl;
+                return 1;
             }
             fs.unsetf(ios::skipws);
 
@@ -175,8 +180,8 @@
             if(!fileSize)
             {
                 fs.close();
-                consoleErr << argv[0] << ": empty input file" << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": empty input file" << endl;
+                return 1;
             }
 
             fs.seekg(0, ios::beg);
@@ -190,12 +195,12 @@
             string type;
             int version;
 
-            Ice::InputStream stream(communicator(), dbContext.encoding, buf);
+            Ice::InputStream stream(communicator, dbContext.encoding, buf);
             stream.read(type);
             if(type != "IceStorm")
             {
-                consoleErr << argv[0] << ": incorrect input file type: " << type << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": incorrect input file type: " << type << endl;
+                return 1;
             }
             stream.read(version);
             stream.read(data);
@@ -209,10 +214,10 @@
                     consoleOut << "Writing LLU Map:" << endl;
                 }
 
-                IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<string,IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream>
                     lluMap(txn, "llu", dbContext, MDB_CREATE);
 
-                for(StringLogUpdateDict::const_iterator p = data.llus.begin(); p != data.llus.end(); ++p)
+                for(IceStormElection::StringLogUpdateDict::const_iterator p = data.llus.begin(); p != data.llus.end(); ++p)
                 {
                     if(debug)
                     {
@@ -226,15 +231,15 @@
                     consoleOut << "Writing Subscriber Map:" << endl;
                 }
 
-                IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
                     subscriberMap(txn, "subscribers", dbContext, MDB_CREATE);
 
-                for(SubscriberRecordDict::const_iterator q = data.subscribers.begin(); q != data.subscribers.end(); ++q)
+                for(IceStorm::SubscriberRecordDict::const_iterator q = data.subscribers.begin(); q != data.subscribers.end(); ++q)
                 {
                     if(debug)
                     {
-                        consoleOut << "  KEY = TOPIC(" << communicator()->identityToString(q->first.topic)
-                                   << ") ID(" << communicator()->identityToString(q->first.id) << ")" << endl;
+                        consoleOut << "  KEY = TOPIC(" << communicator->identityToString(q->first.topic)
+                                   << ") ID(" << communicator->identityToString(q->first.id) << ")" << endl;
                     }
                     subscriberMap.put(txn, q->first, q->second);
                 }
@@ -256,12 +261,12 @@
                     consoleOut << "Reading LLU Map:" << endl;
                 }
 
-                IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream>
                     lluMap(txn, "llu", dbContext, 0);
 
                 string s;
-                LogUpdate llu;
-                IceDB::ReadOnlyCursor<string, LogUpdate, IceDB::IceContext, Ice::OutputStream> lluCursor(lluMap, txn);
+                IceStormElection::LogUpdate llu;
+                IceDB::ReadOnlyCursor<string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream> lluCursor(lluMap, txn);
                 while(lluCursor.get(s, llu, MDB_NEXT))
                 {
                     if(debug)
@@ -277,19 +282,19 @@
                     consoleOut << "Reading Subscriber Map:" << endl;
                 }
 
-                IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+                IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
                     subscriberMap(txn, "subscribers", dbContext, 0);
 
-                SubscriberRecordKey key;
-                SubscriberRecord record;
-                IceDB::ReadOnlyCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+                IceStorm::SubscriberRecordKey key;
+                IceStorm::SubscriberRecord record;
+                IceDB::ReadOnlyCursor<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
                     subCursor(subscriberMap, txn);
                 while(subCursor.get(key, record, MDB_NEXT))
                 {
                     if(debug)
                     {
-                        consoleOut << "  KEY = TOPIC(" << communicator()->identityToString(key.topic)
-                                   << ") ID(" << communicator()->identityToString(key.id) << ")" << endl;
+                        consoleOut << "  KEY = TOPIC(" << communicator->identityToString(key.topic)
+                                   << ") ID(" << communicator->identityToString(key.id) << ")" << endl;
                     }
                     data.subscribers.insert(std::make_pair(key, record));
                 }
@@ -299,7 +304,7 @@
                 env.close();
             }
 
-            Ice::OutputStream stream(communicator(), dbContext.encoding);
+            Ice::OutputStream stream(communicator, dbContext.encoding);
             stream.write("IceStorm");
             stream.write(ICE_INT_VERSION);
             stream.write(data);
@@ -307,8 +312,9 @@
             ofstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
             if(fs.fail())
             {
-                consoleErr << argv[0] << ": could not open output file: " << strerror(errno) << endl;
-                return EXIT_FAILURE;
+                consoleErr << args[0] << ": could not open output file: " << IceUtilInternal::errorToString(errno)
+                           << endl;
+                return 1;
             }
             fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size());
             fs.close();
@@ -316,9 +322,9 @@
     }
     catch(const IceUtil::Exception& ex)
     {
-        consoleErr << argv[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
-        return EXIT_FAILURE;
+        consoleErr << args[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
+        return 1;
     }
 
-    return EXIT_SUCCESS;
+    return 0;
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/IceStormInternal.ice zeroc-ice-3.7.2/cpp/src/IceStorm/IceStormInternal.ice
--- zeroc-ice-3.7.1/cpp/src/IceStorm/IceStormInternal.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/IceStormInternal.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Instance.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Instance.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Instance.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Instance.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/Instance.h>
 #include <IceStorm/TraceLevels.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Instance.h zeroc-ice-3.7.2/cpp/src/IceStorm/Instance.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Instance.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Instance.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef INSTANCE_H
 #define INSTANCE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Instrumentation.ice zeroc-ice-3.7.2/cpp/src/IceStorm/Instrumentation.ice
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Instrumentation.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Instrumentation.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/InstrumentationI.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/InstrumentationI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/InstrumentationI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/InstrumentationI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/InstrumentationI.h>
 
@@ -241,7 +236,7 @@
 
 struct QueuedUpdate
 {
-    QueuedUpdate(int count) : count(count)
+    QueuedUpdate(int countP) : count(countP)
     {
     }
 
@@ -265,7 +260,7 @@
 
 struct OutstandingUpdate
 {
-    OutstandingUpdate(int count) : count(count)
+    OutstandingUpdate(int countP) : count(countP)
     {
     }
 
@@ -294,7 +289,7 @@
 
 struct DeliveredUpdate
 {
-    DeliveredUpdate(int count) : count(count)
+    DeliveredUpdate(int countP) : count(countP)
     {
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/InstrumentationI.h zeroc-ice-3.7.2/cpp/src/IceStorm/InstrumentationI.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/InstrumentationI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/InstrumentationI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef INSTRUMENTATION_I_H
 #define INSTRUMENTATION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/LinkRecord.ice zeroc-ice-3.7.2/cpp/src/IceStorm/LinkRecord.ice
--- zeroc-ice-3.7.1/cpp/src/IceStorm/LinkRecord.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/LinkRecord.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/LLURecord.ice zeroc-ice-3.7.2/cpp/src/IceStorm/LLURecord.ice
--- zeroc-ice-3.7.1/cpp/src/IceStorm/LLURecord.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/LLURecord.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceStorm/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries            := IceStormService
 $(project)_programs             := icestormadmin icestormdb
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -250,20 +250,20 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormdb/packages.config zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormdb/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormdb/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormdb/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="lmdb.v120" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v140" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v141" version="0.9.19.3" targetFramework="native" />
+  <package id="lmdb.v120" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v141" version="0.9.23" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -427,20 +427,20 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
-    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.23\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.23\build\native\lmdb.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v141.0.9.23\build\native\lmdb.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormservice/packages.config zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormservice/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceStorm/msbuild/icestormservice/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/msbuild/icestormservice/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="lmdb.v120" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v140" version="0.9.19.3" targetFramework="native" />
-  <package id="lmdb.v141" version="0.9.19.3" targetFramework="native" />
+  <package id="lmdb.v120" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.23" targetFramework="native" />
+  <package id="lmdb.v141" version="0.9.23" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/NodeI.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/NodeI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/NodeI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/NodeI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/NodeI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/NodeI.h zeroc-ice-3.7.2/cpp/src/IceStorm/NodeI.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/NodeI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/NodeI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ELECTION_I_H
 #define ELECTION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Observers.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Observers.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Observers.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Observers.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/Observers.h>
 #include <IceStorm/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Observers.h zeroc-ice-3.7.2/cpp/src/IceStorm/Observers.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Observers.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Observers.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef OBSERVERS_H
 #define OBSERVERS_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Parser.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Parser.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Parser.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Parser.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/Ice.h>
@@ -22,6 +17,8 @@
 extern FILE* yyin;
 extern int yydebug;
 
+int yyparse();
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
@@ -45,9 +42,9 @@
 {
 public:
 
-    UnknownManagerException(const string& name, const char* file, int line) :
+    UnknownManagerException(const string& nameP, const char* file, int line) :
         Exception(file, line),
-        name(name)
+        name(nameP)
     {
     }
 
@@ -410,7 +407,7 @@
 void
 Parser::showBanner()
 {
-    consoleOut << "Ice " << ICE_STRING_VERSION << "  Copyright (c) 2003-2018 ZeroC, Inc." << endl;
+    consoleOut << "Ice " << ICE_STRING_VERSION << "  Copyright (c) ZeroC, Inc." << endl;
 }
 
 //
@@ -485,7 +482,7 @@
         string line;
         while(true)
         {
-            char c = static_cast<char>(getc(yyin));
+            int c = getc(yyin);
             if(c == EOF)
             {
                 if(line.size())
@@ -495,7 +492,7 @@
                 break;
             }
 
-            line += c;
+            line += static_cast<char>(c);
             if(c == '\n')
             {
                 break;
@@ -681,12 +678,12 @@
 }
 
 void
-Parser::exception(const Ice::Exception& ex, bool warn)
+Parser::exception(const Ice::Exception& pex, bool warn)
 {
     ostringstream os;
     try
     {
-        ex.ice_throw();
+        pex.ice_throw();
     }
     catch(const LinkExists& ex)
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Parser.h zeroc-ice-3.7.2/cpp/src/IceStorm/Parser.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Parser.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Parser.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STORM_PARSER_H
 #define ICE_STORM_PARSER_H
@@ -22,7 +17,6 @@
 #define YYSTYPE std::list<std::string>
 #define YY_DECL int yylex(YYSTYPE* yylvalp)
 YY_DECL;
-int yyparse();
 
 //
 // I must set the initial stack depth to the maximum stack depth to
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Replica.h zeroc-ice-3.7.2/cpp/src/IceStorm/Replica.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Replica.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Replica.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef REPLICA_H
 #define REPLICA_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Scanner.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Scanner.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Scanner.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Scanner.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -35,7 +35,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -52,7 +52,7 @@
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -169,7 +169,7 @@
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -226,7 +226,7 @@
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -462,37 +462,27 @@
 #line 1 "src/IceStorm/Scanner.l"
 #line 2 "src/IceStorm/Scanner.l"
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/Parser.h>
 #include <IceStorm/Grammar.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
@@ -534,7 +524,7 @@
 }
 #define         YY_USER_INIT initScanner();
 
-#line 537 "src/IceStorm/Scanner.cpp"
+#line 532 "src/IceStorm/Scanner.cpp"
 
 #define INITIAL 0
 
@@ -594,7 +584,7 @@
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-
+    
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -715,11 +705,11 @@
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
-#line 84 "src/IceStorm/Scanner.l"
+    
+#line 79 "src/IceStorm/Scanner.l"
 
 
-#line 722 "src/IceStorm/Scanner.cpp"
+#line 717 "src/IceStorm/Scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -804,7 +794,7 @@
 
 case 1:
 YY_RULE_SETUP
-#line 86 "src/IceStorm/Scanner.l"
+#line 81 "src/IceStorm/Scanner.l"
 {
     // C++-style comment
     int c;
@@ -817,7 +807,7 @@
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 96 "src/IceStorm/Scanner.l"
+#line 91 "src/IceStorm/Scanner.l"
 {
     // C-style comment
     while(true)
@@ -846,7 +836,7 @@
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 121 "src/IceStorm/Scanner.l"
+#line 116 "src/IceStorm/Scanner.l"
 {
     size_t len = strlen(yytext);
     for(size_t i = 0; i < len; ++i)
@@ -861,20 +851,20 @@
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 132 "src/IceStorm/Scanner.l"
+#line 127 "src/IceStorm/Scanner.l"
 {
     return ';';
 }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 136 "src/IceStorm/Scanner.l"
+#line 131 "src/IceStorm/Scanner.l"
 {
     // "..."-type strings
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '"')
         {
             break;
@@ -886,26 +876,26 @@
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
+            int next = yyinput();
             switch(next)
             {
                 case '\\':
                 case '"':
                 {
-                    s += next;
+                    s += static_cast<char>(next);
                     break;
                 }
 
                 default:
                 {
-                    s += c;
+                    s += static_cast<char>(c);
                     unput(next);
                 }
             }
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     yylvalp->clear();
@@ -915,13 +905,13 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 180 "src/IceStorm/Scanner.l"
+#line 175 "src/IceStorm/Scanner.l"
 {
     // '...'-type strings
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '\'')
         {
             break;
@@ -943,25 +933,25 @@
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 205 "src/IceStorm/Scanner.l"
+#line 200 "src/IceStorm/Scanner.l"
 {
     // Simple strings
     string s;
     s += yytext[0];
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == EOF)
         {
             break;
         }
-        else if(isspace(static_cast<unsigned char>(c)) || c == ';')
+        else if(isspace(c) || c == ';')
         {
             unput(c);
             break;
         }
 
-        s += c;
+        s += static_cast<char>(c);
     }
 
     yylvalp->clear();
@@ -973,10 +963,10 @@
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 232 "src/IceStorm/Scanner.l"
+#line 227 "src/IceStorm/Scanner.l"
 ECHO;
 	YY_BREAK
-#line 979 "src/IceStorm/Scanner.cpp"
+#line 974 "src/IceStorm/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1254,7 +1244,7 @@
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-
+    
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
@@ -1308,7 +1298,7 @@
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-
+    
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
@@ -1351,7 +1341,7 @@
 
 {
 	int c;
-
+    
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1418,12 +1408,12 @@
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- *
+ * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void yyrestart  (FILE * input_file )
 {
-
+    
 	if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1436,11 +1426,11 @@
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- *
+ * 
  */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
+    
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		yypop_buffer_state();
@@ -1480,13 +1470,13 @@
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
+ * 
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1509,11 +1499,11 @@
 
 /** Destroy the buffer.
  * @param b a buffer created with yy_create_buffer()
- *
+ * 
  */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-
+    
 	if ( ! b )
 		return;
 
@@ -1534,7 +1524,7 @@
 
 {
 	int oerrno = errno;
-
+    
 	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1556,7 +1546,7 @@
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
+ * 
  */
     void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -1585,7 +1575,7 @@
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *
+ *  
  */
 void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -1615,7 +1605,7 @@
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *
+ *  
  */
 void yypop_buffer_state (void)
 {
@@ -1639,7 +1629,7 @@
 static void yyensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
-
+    
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
@@ -1652,9 +1642,9 @@
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+				
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -1682,13 +1672,13 @@
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
+ * 
+ * @return the newly allocated buffer state object. 
  */
 YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -1717,14 +1707,14 @@
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- *
+ * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
 YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 {
-
+    
 	return yy_scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -1732,7 +1722,7 @@
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- *
+ * 
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
@@ -1741,7 +1731,7 @@
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) yyalloc(n  );
@@ -1795,16 +1785,16 @@
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- *
+ * 
  */
 int yyget_lineno  (void)
 {
-
+        
     return yylineno;
 }
 
 /** Get the input stream.
- *
+ * 
  */
 FILE *yyget_in  (void)
 {
@@ -1812,7 +1802,7 @@
 }
 
 /** Get the output stream.
- *
+ * 
  */
 FILE *yyget_out  (void)
 {
@@ -1820,7 +1810,7 @@
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
 yy_size_t yyget_leng  (void)
 {
@@ -1828,7 +1818,7 @@
 }
 
 /** Get the current token.
- *
+ * 
  */
 
 char *yyget_text  (void)
@@ -1838,18 +1828,18 @@
 
 /** Set the current line number.
  * @param line_number
- *
+ * 
  */
 void yyset_lineno (int  line_number )
 {
-
+    
     yylineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
- *
+ * 
  * @see yy_switch_to_buffer
  */
 void yyset_in (FILE *  in_str )
@@ -1903,7 +1893,7 @@
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 int yylex_destroy  (void)
 {
-
+    
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		yy_delete_buffer(YY_CURRENT_BUFFER  );
@@ -1970,7 +1960,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 232 "src/IceStorm/Scanner.l"
+#line 227 "src/IceStorm/Scanner.l"
 
 
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Scanner.l zeroc-ice-3.7.2/cpp/src/IceStorm/Scanner.l
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Scanner.l	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Scanner.l	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,26 @@
 %{
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/Parser.h>
 #include <IceStorm/Grammar.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
@@ -138,7 +128,7 @@
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '"')
         {
             break;
@@ -150,26 +140,26 @@
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
+            int next = yyinput();
             switch(next)
             {
                 case '\\':
                 case '"':
                 {
-                    s += next;
+                    s += static_cast<char>(next);
                     break;
                 }
 
                 default:
                 {
-                    s += c;
+                    s += static_cast<char>(c);
                     unput(next);
                 }
             }
         }
         else
         {
-            s += c;
+            s += static_cast<char>(c);
         }
     }
     yylvalp->clear();
@@ -182,7 +172,7 @@
     string s;
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == '\'')
         {
             break;
@@ -208,18 +198,18 @@
     s += yytext[0];
     while(true)
     {
-        char c = static_cast<char>(yyinput());
+        int c = yyinput();
         if(c == EOF)
         {
             break;
         }
-        else if(isspace(static_cast<unsigned char>(c)) || c == ';')
+        else if(isspace(c) || c == ';')
         {
             unput(c);
             break;
         }
 
-        s += c;
+        s += static_cast<char>(c);
     }
 
     yylvalp->clear();
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Service.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Service.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #define ICESTORM_SERVICE_API_EXPORTS
 
@@ -95,7 +90,7 @@
 {
 
 ICESTORM_SERVICE_API ::IceBox::Service*
-createIceStorm(CommunicatorPtr communicator)
+createIceStorm(CommunicatorPtr)
 {
     return new ServiceI;
 }
@@ -300,11 +295,11 @@
                 int nodeid = atoi(adapterid.substr(start, end-start).c_str());
                 ostringstream os;
                 os << "node" << nodeid;
-                Ice::Identity id;
-                id.category = instanceName;
-                id.name = os.str();
+                Ice::Identity ident;
+                ident.category = instanceName;
+                ident.name = os.str();
 
-                nodes[nodeid] = NodePrx::uncheckedCast((*p)->ice_adapterId(adapterid)->ice_identity(id));
+                nodes[nodeid] = NodePrx::uncheckedCast((*p)->ice_adapterId(adapterid)->ice_identity(ident));
             }
         }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Service.h zeroc-ice-3.7.2/cpp/src/IceStorm/Service.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Service.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Service.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESTORM_SERVICE_H
 #define ICESTORM_SERVICE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Subscriber.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Subscriber.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Subscriber.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Subscriber.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/Subscriber.h>
 #include <IceStorm/Instance.h>
@@ -685,8 +680,8 @@
         // State transition to online.
         //
         setState(SubscriberStateOnline);
-        // fall through
     }
+    /* FALLTHROUGH */
 
     case SubscriberStateOnline:
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Subscriber.h zeroc-ice-3.7.2/cpp/src/IceStorm/Subscriber.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Subscriber.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Subscriber.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SUBSCRIBER_H
 #define SUBSCRIBER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/SubscriberRecord.ice zeroc-ice-3.7.2/cpp/src/IceStorm/SubscriberRecord.ice
--- zeroc-ice-3.7.1/cpp/src/IceStorm/SubscriberRecord.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/SubscriberRecord.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TopicI.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/TopicI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TopicI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TopicI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/TopicI.h>
 #include <IceStorm/Instance.h>
@@ -394,12 +389,12 @@
         //
         for(SubscriberRecordSeq::const_iterator p = subscribers.begin(); p != subscribers.end(); ++p)
         {
-            Ice::Identity id = p->obj->ice_getIdentity();
+            Ice::Identity ident = p->obj->ice_getIdentity();
             TraceLevelsPtr traceLevels = _instance->traceLevels();
             if(traceLevels->topic > 0)
             {
                 Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
-                out << _name << " recreate " << _instance->communicator()->identityToString(id);
+                out << _name << " recreate " << _instance->communicator()->identityToString(ident);
                 if(traceLevels->topic > 1)
                 {
                     out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj);
@@ -418,7 +413,7 @@
             catch(const Ice::Exception& ex)
             {
                 Ice::Warning out(traceLevels->logger);
-                out << _name << " recreate " << _instance->communicator()->identityToString(id);
+                out << _name << " recreate " << _instance->communicator()->identityToString(ident);
                 if(traceLevels->topic > 1)
                 {
                     out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj);
@@ -1058,7 +1053,6 @@
     {
         // If the subscriber is already in the database display a
         // diagnostic.
-        TraceLevelsPtr traceLevels = _instance->traceLevels();
         if(traceLevels->topic > 0)
         {
             Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TopicI.h zeroc-ice-3.7.2/cpp/src/IceStorm/TopicI.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TopicI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TopicI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TOPIC_I_H
 #define TOPIC_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TopicManagerI.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/TopicManagerI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TopicManagerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TopicManagerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/TopicManagerI.h>
 #include <IceStorm/TopicI.h>
@@ -284,9 +279,8 @@
 
                     Ice::Identity topic = k.topic;
 
-                    bool moreTopics;
                     SubscriberRecordSeq content;
-                    while((moreTopics = cursor.get(k, v, MDB_NEXT)) && k.topic == topic)
+                    while((moreTopics = cursor.get(k, v, MDB_NEXT)) == true && k.topic == topic)
                     {
                         content.push_back(v);
                     }
@@ -423,13 +417,13 @@
 
         for(TopicContentSeq::const_iterator p = content.begin(); p != content.end(); ++p)
         {
-            SubscriberRecordKey key;
-            key.topic = p->id;
+            SubscriberRecordKey srkey;
+            srkey.topic = p->id;
             SubscriberRecord rec;
             rec.link = false;
             rec.cost = 0;
 
-            _subscriberMap.put(txn, key, rec);
+            _subscriberMap.put(txn, srkey, rec);
 
             for(SubscriberRecordSeq::const_iterator q = p->records.begin(); q != p->records.end(); ++q)
             {
@@ -487,14 +481,14 @@
     for(TopicContentSeq::const_iterator q = content.begin(); q != content.end(); ++q)
     {
         string name = identityToTopicName(q->id);
-        map<string, TopicImplPtr>::const_iterator p = _topics.find(name);
-        if(p == _topics.end())
+        map<string, TopicImplPtr>::const_iterator r = _topics.find(name);
+        if(r == _topics.end())
         {
             installTopic(name, q->id, true, q->records);
         }
         else
         {
-            p->second->update(q->records);
+            r->second->update(q->records);
         }
     }
     // Clear the set of observers.
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TopicManagerI.h zeroc-ice-3.7.2/cpp/src/IceStorm/TopicManagerI.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TopicManagerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TopicManagerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TOPIC_MANAGER_I_H
 #define TOPIC_MANAGER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TraceLevels.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/TraceLevels.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TraceLevels.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TraceLevels.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/TraceLevels.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TraceLevels.h zeroc-ice-3.7.2/cpp/src/IceStorm/TraceLevels.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TraceLevels.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TraceLevels.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STORM_TRACE_LEVELS_H
 #define ICE_STORM_TRACE_LEVELS_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicI.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/TransientTopicI.h>
 #include <IceStorm/Instance.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicI.h zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicI.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TRANSIENT_TOPIC_I_H
 #define TRANSIENT_TOPIC_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicManagerI.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicManagerI.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicManagerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicManagerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/TransientTopicManagerI.h>
 #include <IceStorm/TransientTopicI.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicManagerI.h zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicManagerI.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/TransientTopicManagerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/TransientTopicManagerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TRANSIENT_TOPIC_MANAGER_I_H
 #define TRANSIENT_TOPIC_MANAGER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Util.cpp zeroc-ice-3.7.2/cpp/src/IceStorm/Util.cpp
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceStorm/Util.h>
 #include <IceStorm/SubscriberRecord.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStorm/Util.h zeroc-ice-3.7.2/cpp/src/IceStorm/Util.h
--- zeroc-ice-3.7.1/cpp/src/IceStorm/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStorm/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef UTIL_H
 #define UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceStormLib/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceStormLib/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceStormLib/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceStormLib/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := IceStorm
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/ConsoleUtil.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/ConsoleUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/ConsoleUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/ConsoleUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/ConsoleUtil.h>
 #include <IceUtil/MutexPtrLock.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/CtrlCHandler.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/CtrlCHandler.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/CtrlCHandler.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/CtrlCHandler.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifdef __sun
 #    define _POSIX_PTHREAD_SEMANTICS
@@ -131,6 +126,7 @@
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         _handler = 0;
+        _callback = ICE_NULLPTR;
     }
 }
 
@@ -242,6 +238,7 @@
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         _handler = 0;
+        _callback = ICE_NULLPTR;
     }
 
     //
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/FileUtil.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/FileUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/FileUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/FileUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/FileUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/InputUtil.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/InputUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/InputUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/InputUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/InputUtil.h>
 #include <stdlib.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceUtil/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceUtil/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    = IceUtil
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/MutexProtocol.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/MutexProtocol.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/MutexProtocol.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/MutexProtocol.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/MutexProtocol.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/Options.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/Options.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/Options.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/Options.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
@@ -646,13 +641,20 @@
 
             if(p != string::npos)
             {
-                if(pos->second->arg == NoArg && p != args[i].size() - 1)
+                if(pos->second->arg == NoArg)
                 {
                     string err = "`";
-                    err += args[i];
+                    err += opt;
                     err += "': option does not take an argument";
                     throw BadOptException(__FILE__, __LINE__, err);
                 }
+                else if(pos->second->arg == NeedArg && p == args[i].size() - 1)
+                {
+                    string err = "`";
+                    err += opt;
+                    err += "': option requires an argument";
+                    throw BadOptException(__FILE__, __LINE__, err);
+                }
                 setOpt(opt, "", args[i].substr(p + 1), pos->second->repeat);
                 argDone = true;
             }
@@ -685,12 +687,20 @@
                     }
                 }
 
-                if(pos->second->arg == NeedArg && p != args[i].size() - 1)
+                if(pos->second->arg == NeedArg)
+                {
+                    if(p != args[i].size() - 1)
+                    {
+                        string optArg = args[i].substr(p + 1);
+                        setOpt(opt, "", optArg, pos->second->repeat);
+                        argDone = true;
+                        break;
+                    }
+                }
+                else
                 {
-                    string optArg = args[i].substr(p + 1);
-                    setOpt(opt, "", optArg, pos->second->repeat);
+                    setOpt(opt, "", "1", pos->second->repeat);
                     argDone = true;
-                    break;
                 }
             }
         }
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/OutputUtil.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/OutputUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/OutputUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/OutputUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/OutputUtil.h>
 #include <IceUtil/FileUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/Random.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/Random.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/Random.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/Random.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifdef _WIN32
 #  define _CRT_RAND_S
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/RecMutex.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/RecMutex.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/RecMutex.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/RecMutex.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/Exception.h>
@@ -113,7 +108,7 @@
 #else
 
 void
-IceUtil::RecMutex::init(const MutexProtocol protocol)
+IceUtil::RecMutex::init(ICE_MAYBE_UNUSED const MutexProtocol protocol)
 {
     int rc;
     pthread_mutexattr_t attr;
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/Shared.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/Shared.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/Shared.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/Shared.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Shared.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/StringConverter.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/StringConverter.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/StringConverter.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/StringConverter.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringConverter.h>
 #include <IceUtil/MutexPtrLock.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/StringUtil.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/StringUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/StringUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/StringUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/StringConverter.h>
 #include <cstring>
+#include <string.h> // for strerror_r
 
+#include <sstream>
 #include <iomanip>
 
 using namespace std;
@@ -1071,7 +1068,43 @@
 string
 IceUtilInternal::errorToString(int error)
 {
-    return strerror(error);
+    vector<char> buffer(500);
+    while(true)
+    {
+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
+        //
+        // Use the XSI-compliant version of strerror_r
+        //
+        int err = strerror_r(error, &buffer[0], buffer.size());
+        if(err == 0)
+        {
+            return string(&buffer[0]);
+        }
+#else
+        //
+        // Use the GNU-specific version of strerror_r
+        //
+        int oerrno = errno;
+        errno = 0;
+        const char* msg = strerror_r(error, &buffer[0], buffer.size());
+        int err = errno;
+        errno = oerrno;
+        if(err == 0)
+        {
+            return msg;
+        }
+#endif
+        if(err == ERANGE && buffer.size() < 1024 * 1024)
+        {
+            buffer.resize(buffer.size() * 2);
+        }
+        else
+        {
+            ostringstream os;
+            os << "Unknown error `" << error << "'";
+            return os.str();
+        }
+    }
 }
 
 string
@@ -1091,7 +1124,7 @@
     {
         if(isascii(s[i]))
         {
-            result += tolower(static_cast<unsigned char>(s[i]));
+            result += static_cast<char>(tolower(static_cast<unsigned char>(s[i])));
         }
         else
         {
@@ -1110,7 +1143,7 @@
     {
         if(isascii(s[i]))
         {
-            result += toupper(static_cast<unsigned char>(s[i]));
+            result += static_cast<char>(toupper(static_cast<unsigned char>(s[i])));
         }
         else
         {
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/ThreadException.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/ThreadException.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/ThreadException.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/ThreadException.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/ThreadException.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/Time.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/Time.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/Time.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/Time.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Exception.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/Unicode.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/Unicode.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/Unicode.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/Unicode.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Config.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/Unicode.h zeroc-ice-3.7.2/cpp/src/IceUtil/Unicode.h
--- zeroc-ice-3.7.1/cpp/src/IceUtil/Unicode.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/Unicode.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_UNICODE_H
 #define ICE_UTIL_UNICODE_H
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/UtilException.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/UtilException.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/UtilException.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/UtilException.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #if defined(_MSC_VER) && _MSC_VER >= 1700
 //
@@ -56,7 +51,10 @@
 #   endif
 #endif
 
-#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__)
+//
+// The Slice compilers don't retrieve the exception stack traces so we don't need the DbgHelp calls.
+//
+#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__) && !defined(ICE_BUILDING_SLICE_COMPILERS)
 #   define ICE_DBGHELP
 #   if defined(_MSC_VER) && (_MSC_VER >= 1700)
 #       define DBGHELP_TRANSLATE_TCHAR
@@ -114,13 +112,13 @@
 backtrace_state* bstate = 0;
 
 void
-ignoreErrorCallback(void*, const char* msg, int errnum)
+ignoreErrorCallback(void*, const char* /*msg*/, int /*errnum*/)
 {
     // cerr << "Error callback: " << msg << ", errnum = " << errnum << endl;
 }
 
 int
-ignoreFrame(void*, uintptr_t pc, const char*, int, const char*)
+ignoreFrame(void*, ICE_MAYBE_UNUSED uintptr_t pc, const char*, int, const char*)
 {
     assert(pc == 0);
     return 0;
@@ -301,7 +299,7 @@
 #ifdef ICE_LIBBACKTRACE
 
 void
-handlePcInfoError(void* data, const char* msg, int errnum)
+handlePcInfoError(void* data, const char* /*msg*/, int /*errnum*/)
 {
     FrameInfo& frameInfo = *reinterpret_cast<FrameInfo*>(data);
     printFrame(&frameInfo, frameInfo.pc, 0, 0, 0);
@@ -379,6 +377,7 @@
     // Note: the Sym functions are not thread-safe
     //
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
+    bool refreshModuleList = process != 0;
     if(process == 0)
     {
         process = GetCurrentProcess();
@@ -412,8 +411,10 @@
 
     lock.acquire();
 
-    // TODO: call SymRefreshModuleList here? (not available on XP)
-
+    if(refreshModuleList && SymRefreshModuleList(process) == 0)
+    {
+        return "No stack trace: SymRefreshModuleList failed with " + IceUtilInternal::errorToString(GetLastError());
+    }
 #ifdef DBGHELP_TRANSLATE_TCHAR
     const IceUtil::StringConverterPtr converter = IceUtil::getProcessStringConverter();
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/src/IceUtil/UUID.cpp zeroc-ice-3.7.2/cpp/src/IceUtil/UUID.cpp
--- zeroc-ice-3.7.1/cpp/src/IceUtil/UUID.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceUtil/UUID.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/UUID.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceXML/Makefile.mk zeroc-ice-3.7.2/cpp/src/IceXML/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/IceXML/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceXML/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := IceXML
 
diff -Nru zeroc-ice-3.7.1/cpp/src/IceXML/msbuild/icexml.vcxproj zeroc-ice-3.7.2/cpp/src/IceXML/msbuild/icexml.vcxproj
--- zeroc-ice-3.7.1/cpp/src/IceXML/msbuild/icexml.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceXML/msbuild/icexml.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -96,17 +96,17 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\msbuild\packages\expat.v120.2.2.5.1\build\native\expat.v120.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v120.2.2.5.1\build\native\expat.v120.targets')" />
-    <Import Project="..\..\..\msbuild\packages\expat.v140.2.2.5.1\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.2.5.1\build\native\expat.v140.targets')" />
-    <Import Project="..\..\..\msbuild\packages\expat.v141.2.2.5.1\build\native\expat.v141.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v141.2.2.5.1\build\native\expat.v141.targets')" />
+    <Import Project="..\..\..\msbuild\packages\expat.v120.2.2.6\build\native\expat.v120.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v120.2.2.6\build\native\expat.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\expat.v140.2.2.6\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.2.6\build\native\expat.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\expat.v141.2.2.6\build\native\expat.v141.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v141.2.2.6\build\native\expat.v141.targets')" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v120.2.2.5.1\build\native\expat.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v120.2.2.5.1\build\native\expat.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v140.2.2.5.1\build\native\expat.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v140.2.2.5.1\build\native\expat.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v141.2.2.5.1\build\native\expat.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v141.2.2.5.1\build\native\expat.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v120.2.2.6\build\native\expat.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v120.2.2.6\build\native\expat.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v140.2.2.6\build\native\expat.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v140.2.2.6\build\native\expat.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v141.2.2.6\build\native\expat.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v141.2.2.6\build\native\expat.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceXML/msbuild/packages.config zeroc-ice-3.7.2/cpp/src/IceXML/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/src/IceXML/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceXML/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="expat.v120" version="2.2.5.1" targetFramework="native" />
-  <package id="expat.v140" version="2.2.5.1" targetFramework="native" />
-  <package id="expat.v141" version="2.2.5.1" targetFramework="native" />
+  <package id="expat.v120" version="2.2.6" targetFramework="native" />
+  <package id="expat.v140" version="2.2.6" targetFramework="native" />
+  <package id="expat.v141" version="2.2.6" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/IceXML/Parser.cpp zeroc-ice-3.7.2/cpp/src/IceXML/Parser.cpp
--- zeroc-ice-3.7.1/cpp/src/IceXML/Parser.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceXML/Parser.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceXML/Parser.h>
 #include <IceUtil/FileUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/IceXML/Parser.h zeroc-ice-3.7.2/cpp/src/IceXML/Parser.h
--- zeroc-ice-3.7.1/cpp/src/IceXML/Parser.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/IceXML/Parser.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_XML_PARSER_H
 #define ICE_XML_PARSER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Checksum.cpp zeroc-ice-3.7.2/cpp/src/Slice/Checksum.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/Checksum.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Checksum.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/Checksum.h>
 #include <Slice/MD5.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Checksum.h zeroc-ice-3.7.2/cpp/src/Slice/Checksum.h
--- zeroc-ice-3.7.1/cpp/src/Slice/Checksum.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Checksum.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_CHECKSUM_H
 #define SLICE_CHECKSUM_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/CPlusPlusUtil.cpp zeroc-ice-3.7.2/cpp/src/Slice/CPlusPlusUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/CPlusPlusUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/CPlusPlusUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/CPlusPlusUtil.h>
 #include <Slice/Util.h>
@@ -62,7 +57,7 @@
 }
 
 string
-stringTypeToString(const TypePtr& type, const StringList& metaData, int typeCtx)
+stringTypeToString(const TypePtr&, const StringList& metaData, int typeCtx)
 {
     string strType = findMetaData(metaData, typeCtx);
     if(strType == "wstring" || (typeCtx & TypeContextUseWstring && strType == ""))
@@ -124,7 +119,7 @@
             }
             else
             {
-                s = getAbsolute(fixKwd(seq->scoped()), scope);
+                s = getUnqualified(fixKwd(seq->scoped()), scope);
             }
 
             if(typeCtx & TypeContextAMIPrivateEnd)
@@ -145,7 +140,7 @@
     }
     else
     {
-        return getAbsolute(fixKwd(seq->scoped()), scope);
+        return getUnqualified(fixKwd(seq->scoped()), scope);
     }
 }
 
@@ -155,7 +150,7 @@
     const string dictType = findMetaData(metaData, typeCtx);
     if(dictType.empty())
     {
-        return getAbsolute(fixKwd(dict->scoped()), scope);
+        return getUnqualified(fixKwd(dict->scoped()), scope);
     }
     else
     {
@@ -192,10 +187,10 @@
             seqType = findMetaData(seq->getMetaData(), typeCtx);
         }
 
-        string s;
+        string str;
         if(seqType == "%array")
         {
-            s = typeToString(seq, scope, metaData, TypeContextAMIPrivateEnd);
+            str = typeToString(seq, scope, metaData, TypeContextAMIPrivateEnd);
         }
         else if(seqType.find("%range") == 0)
         {
@@ -204,16 +199,16 @@
             {
                 md.push_back("cpp:type:" + seqType.substr(strlen("%range:")));
             }
-            s = typeToString(seq, scope, md, 0);
+            str = typeToString(seq, scope, md, 0);
         }
 
-        if(!s.empty())
+        if(!str.empty())
         {
             if(optional)
             {
-                s = toOptional(s, typeCtx);
+                str = toOptional(str, typeCtx);
             }
-            out << nl << s << ' ' << fixedName << "_tmp_;";
+            out << nl << str << ' ' << fixedName << "_tmp_;";
         }
     }
 }
@@ -515,14 +510,9 @@
 Slice::printHeader(Output& out)
 {
     static const char* header =
-"// **********************************************************************\n"
-"//\n"
-"// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// **********************************************************************\n"
         ;
 
     out << header;
@@ -610,7 +600,7 @@
 }
 
 string
-Slice::getAbsolute(const std::string& type, const std::string& scope)
+Slice::getUnqualified(const std::string& type, const std::string& scope)
 {
     if(type.find("::") != string::npos)
     {
@@ -627,7 +617,11 @@
 
         if(type.find(scope, prefix.size()) == prefix.size())
         {
-            return prefix + type.substr(prefix.size() + scope.size());
+            string t = type.substr(prefix.size() + scope.size());
+            if(t.find("::") == string::npos)
+            {
+                return prefix + t;
+            }
         }
     }
     return type;
@@ -695,16 +689,16 @@
         {
             if(builtin->kind() == Builtin::KindObject && !(typeCtx & TypeContextLocal))
             {
-                return getAbsolute(cpp11BuiltinTable[Builtin::KindValue], scope);
+                return getUnqualified(cpp11BuiltinTable[Builtin::KindValue], scope);
             }
             else
             {
-                return getAbsolute(cpp11BuiltinTable[builtin->kind()], scope);
+                return getUnqualified(cpp11BuiltinTable[builtin->kind()], scope);
             }
         }
         else
         {
-            return getAbsolute(builtinTable[builtin->kind()], scope);
+            return getUnqualified(builtinTable[builtin->kind()], scope);
         }
     }
 
@@ -715,20 +709,20 @@
         {
             if(cl->definition() && cl->definition()->isDelegate())
             {
-                return getAbsolute(fixKwd(cl->scoped()), scope);
+                return getUnqualified(fixKwd(cl->scoped()), scope);
             }
             else if(cl->isInterface() && !cl->isLocal())
             {
-                return getAbsolute(cpp11BuiltinTable[Builtin::KindValue], scope);
+                return getUnqualified(cpp11BuiltinTable[Builtin::KindValue], scope);
             }
             else
             {
-                return "::std::shared_ptr<" + getAbsolute(cl->scoped(), scope) + ">";
+                return "::std::shared_ptr<" + getUnqualified(cl->scoped(), scope) + ">";
             }
         }
         else
         {
-            return getAbsolute(cl->scoped() + "Ptr", scope);
+            return getUnqualified(cl->scoped() + "Ptr", scope);
         }
     }
 
@@ -740,11 +734,11 @@
         //
         if(!cpp11 && findMetaData(st->getMetaData()) == "%class")
         {
-            return getAbsolute(fixKwd(st->scoped() + "Ptr"), scope);
+            return getUnqualified(fixKwd(st->scoped() + "Ptr"), scope);
         }
         else
         {
-            return getAbsolute(fixKwd(st->scoped()), scope);
+            return getUnqualified(fixKwd(st->scoped()), scope);
         }
     }
 
@@ -760,23 +754,23 @@
             //
             if(def && !def->isInterface() && def->allOperations().empty())
             {
-                return getAbsolute(cpp11BuiltinTable[Builtin::KindObjectProxy], scope);
+                return getUnqualified(cpp11BuiltinTable[Builtin::KindObjectProxy], scope);
             }
             else
             {
-                return "::std::shared_ptr<" + getAbsolute(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">";
+                return "::std::shared_ptr<" + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">";
             }
         }
         else
         {
-            return getAbsolute(fixKwd(proxy->_class()->scoped() + "Prx"), scope);
+            return getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope);
         }
     }
 
     EnumPtr en = EnumPtr::dynamicCast(type);
     if(en)
     {
-        return getAbsolute(fixKwd(en->scoped()), scope);
+        return getUnqualified(fixKwd(en->scoped()), scope);
     }
 
     SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -880,16 +874,16 @@
         {
             if(builtin->kind() == Builtin::KindObject && !(typeCtx & TypeContextLocal))
             {
-                return getAbsolute(cpp11InputBuiltinTable[Builtin::KindValue], scope);
+                return getUnqualified(cpp11InputBuiltinTable[Builtin::KindValue], scope);
             }
             else
             {
-                return getAbsolute(cpp11InputBuiltinTable[builtin->kind()], scope);
+                return getUnqualified(cpp11InputBuiltinTable[builtin->kind()], scope);
             }
         }
         else
         {
-            return getAbsolute(cpp98InputBuiltinTable[builtin->kind()], scope);
+            return getUnqualified(cpp98InputBuiltinTable[builtin->kind()], scope);
         }
     }
 
@@ -900,20 +894,20 @@
         {
             if(cl->definition() && cl->definition()->isDelegate())
             {
-                return getAbsolute(fixKwd(cl->scoped()), scope);
+                return getUnqualified(fixKwd(cl->scoped()), scope);
             }
             else if(cl->isInterface() && !cl->isLocal())
             {
-                return getAbsolute(cpp11InputBuiltinTable[Builtin::KindValue], scope);
+                return getUnqualified(cpp11InputBuiltinTable[Builtin::KindValue], scope);
             }
             else
             {
-                return "const ::std::shared_ptr<" + getAbsolute(fixKwd(cl->scoped()), scope) + ">&";
+                return "const ::std::shared_ptr<" + getUnqualified(fixKwd(cl->scoped()), scope) + ">&";
             }
         }
         else
         {
-            return "const " + getAbsolute(fixKwd(cl->scoped() + "Ptr&"), scope);
+            return "const " + getUnqualified(fixKwd(cl->scoped() + "Ptr&"), scope);
         }
     }
 
@@ -922,17 +916,17 @@
     {
         if(cpp11)
         {
-            return "const " + getAbsolute(fixKwd(st->scoped()), scope) + "&";
+            return "const " + getUnqualified(fixKwd(st->scoped()), scope) + "&";
         }
         else
         {
             if(findMetaData(st->getMetaData()) == "%class")
             {
-                return "const " + getAbsolute(fixKwd(st->scoped() + "Ptr"), scope) + "&";
+                return "const " + getUnqualified(fixKwd(st->scoped() + "Ptr"), scope) + "&";
             }
             else
             {
-                return "const " + getAbsolute(fixKwd(st->scoped()), scope) + "&";
+                return "const " + getUnqualified(fixKwd(st->scoped()), scope) + "&";
             }
         }
     }
@@ -945,23 +939,23 @@
             ClassDefPtr def = proxy->_class()->definition();
             if(def && !def->isInterface() && def->allOperations().empty())
             {
-                return getAbsolute(cpp11InputBuiltinTable[Builtin::KindObjectProxy], scope);
+                return getUnqualified(cpp11InputBuiltinTable[Builtin::KindObjectProxy], scope);
             }
             else
             {
-                return "const ::std::shared_ptr<" + getAbsolute(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">&";
+                return "const ::std::shared_ptr<" + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">&";
             }
         }
         else
         {
-            return "const " + getAbsolute(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + "&";
+            return "const " + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + "&";
         }
     }
 
     EnumPtr en = EnumPtr::dynamicCast(type);
     if(en)
     {
-        return getAbsolute(fixKwd(en->scoped()), scope);
+        return getUnqualified(fixKwd(en->scoped()), scope);
     }
 
     SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -1033,16 +1027,16 @@
         {
             if(builtin->kind() == Builtin::KindObject && !(typeCtx & TypeContextLocal))
             {
-                return getAbsolute(cpp11OutputBuiltinTable[Builtin::KindValue], scope);
+                return getUnqualified(cpp11OutputBuiltinTable[Builtin::KindValue], scope);
             }
             else
             {
-                return getAbsolute(cpp11OutputBuiltinTable[builtin->kind()], scope);
+                return getUnqualified(cpp11OutputBuiltinTable[builtin->kind()], scope);
             }
         }
         else
         {
-            return getAbsolute(outputBuiltinTable[builtin->kind()], scope);
+            return getUnqualified(outputBuiltinTable[builtin->kind()], scope);
         }
     }
 
@@ -1053,20 +1047,20 @@
         {
             if(cl->definition() && cl->definition()->isDelegate())
             {
-                return getAbsolute(fixKwd(cl->scoped()), scope) + "&";
+                return getUnqualified(fixKwd(cl->scoped()), scope) + "&";
             }
             else if(cl->isInterface() && !cl->isLocal())
             {
-                return getAbsolute(cpp11OutputBuiltinTable[Builtin::KindValue], scope);
+                return getUnqualified(cpp11OutputBuiltinTable[Builtin::KindValue], scope);
             }
             else
             {
-                return "::std::shared_ptr<" + getAbsolute(fixKwd(cl->scoped()), scope) + ">&";
+                return "::std::shared_ptr<" + getUnqualified(fixKwd(cl->scoped()), scope) + ">&";
             }
         }
         else
         {
-            return getAbsolute(fixKwd(cl->scoped() + "Ptr&"), scope);
+            return getUnqualified(fixKwd(cl->scoped() + "Ptr&"), scope);
         }
     }
 
@@ -1075,11 +1069,11 @@
     {
         if(!cpp11 && findMetaData(st->getMetaData()) == "%class")
         {
-            return getAbsolute(fixKwd(st->scoped() + "Ptr&"), scope);
+            return getUnqualified(fixKwd(st->scoped() + "Ptr&"), scope);
         }
         else
         {
-            return getAbsolute(fixKwd(st->scoped()), scope) + "&";
+            return getUnqualified(fixKwd(st->scoped()), scope) + "&";
         }
     }
 
@@ -1095,23 +1089,23 @@
             //
             if(def && !def->isInterface() && def->allOperations().empty())
             {
-                return getAbsolute(cpp11OutputBuiltinTable[Builtin::KindObjectProxy], scope);
+                return getUnqualified(cpp11OutputBuiltinTable[Builtin::KindObjectProxy], scope);
             }
             else
             {
-                return "::std::shared_ptr<" + getAbsolute(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">&";
+                return "::std::shared_ptr<" + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">&";
             }
         }
         else
         {
-            return getAbsolute(fixKwd(proxy->_class()->scoped() + "Prx&"), scope);
+            return getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx&"), scope);
         }
     }
 
     EnumPtr en = EnumPtr::dynamicCast(type);
     if(en)
     {
-        return getAbsolute(fixKwd(en->scoped()), scope) + "&";
+        return getUnqualified(fixKwd(en->scoped()), scope) + "&";
     }
 
     SequencePtr seq = SequencePtr::dynamicCast(type);
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/CPlusPlusUtil.h zeroc-ice-3.7.2/cpp/src/Slice/CPlusPlusUtil.h
--- zeroc-ice-3.7.1/cpp/src/Slice/CPlusPlusUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/CPlusPlusUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef C_PLUS_PLUS_UTIL_H
 #define C_PLUS_PLUS_UTIL_H
@@ -37,7 +32,7 @@
 
 bool isMovable(const TypePtr&);
 
-std::string getAbsolute(const std::string&, const std::string&);
+std::string getUnqualified(const std::string&, const std::string&);
 std::string typeToString(const TypePtr&, const std::string& = "", const StringList& = StringList(), int = 0);
 std::string typeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
 std::string returnTypeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/FileTracker.cpp zeroc-ice-3.7.2/cpp/src/Slice/FileTracker.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/FileTracker.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/FileTracker.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/FileTracker.h>
 #include <IceUtil/ConsoleUtil.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/FileTracker.h zeroc-ice-3.7.2/cpp/src/Slice/FileTracker.h
--- zeroc-ice-3.7.1/cpp/src/Slice/FileTracker.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/FileTracker.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef FILE_TRACKER_H
 #define FILE_TRACKER_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Grammar.cpp zeroc-ice-3.7.2/cpp/src/Slice/Grammar.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/Grammar.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Grammar.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison implementation for Yacc-like parsers in C
-
+   
       Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -73,14 +73,9 @@
 #line 1 "src/Slice/Grammar.y"
 
 
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// **********************************************************************
 
 #include <Slice/GrammarUtil.h>
 #include <IceUtil/InputUtil.h>
@@ -88,11 +83,12 @@
 #include <cstring>
 
 #ifdef _MSC_VER
-// I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
+#   pragma warning(disable:4102)
 // warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
+#   pragma warning(disable:4065)
+// warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+#   pragma warning(disable:4244)
 #endif
 
 //
@@ -123,7 +119,7 @@
 
 
 /* Line 371 of yacc.c  */
-#line 127 "src/Slice/Grammar.cpp"
+#line 128 "src/Slice/Grammar.cpp"
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -233,7 +229,7 @@
 /* Copy the second part of user declarations.  */
 
 /* Line 390 of yacc.c  */
-#line 237 "src/Slice/Grammar.cpp"
+#line 238 "src/Slice/Grammar.cpp"
 
 #ifdef short
 # undef short
@@ -609,29 +605,29 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   114,   114,   122,   126,   133,   142,   147,   156,   155,
-     165,   164,   175,   183,   182,   188,   187,   192,   197,   196,
-     202,   201,   206,   211,   210,   216,   215,   220,   225,   224,
-     230,   229,   234,   239,   238,   244,   243,   248,   253,   252,
-     257,   262,   261,   267,   266,   271,   275,   285,   284,   318,
-     322,   333,   344,   343,   370,   379,   387,   396,   399,   404,
-     411,   424,   444,   537,   545,   558,   566,   581,   587,   591,
-     602,   613,   612,   654,   663,   666,   671,   678,   684,   688,
-     699,   724,   826,   838,   852,   851,   891,   926,   934,   939,
-     947,   956,   959,   964,   971,   993,  1020,  1042,  1068,  1077,
-    1088,  1097,  1106,  1116,  1130,  1136,  1144,  1156,  1180,  1205,
-    1229,  1260,  1259,  1282,  1281,  1304,  1305,  1311,  1315,  1326,
-    1341,  1340,  1375,  1410,  1445,  1450,  1460,  1465,  1473,  1482,
-    1485,  1490,  1497,  1503,  1510,  1522,  1534,  1545,  1554,  1569,
-    1580,  1597,  1601,  1613,  1612,  1645,  1644,  1663,  1669,  1677,
-    1689,  1709,  1717,  1726,  1730,  1769,  1776,  1787,  1789,  1805,
-    1821,  1833,  1845,  1856,  1872,  1877,  1885,  1888,  1896,  1900,
-    1904,  1908,  1912,  1916,  1920,  1924,  1928,  1932,  1936,  1940,
-    1944,  1963,  2004,  2010,  2018,  2025,  2037,  2044,  2054,  2067,
-    2080,  2127,  2138,  2149,  2165,  2174,  2188,  2191,  2194,  2197,
-    2200,  2203,  2206,  2209,  2212,  2215,  2218,  2221,  2224,  2227,
-    2230,  2233,  2236,  2239,  2242,  2245,  2248,  2251,  2254,  2257,
-    2260,  2263,  2266,  2269,  2272,  2275
+       0,   115,   115,   123,   127,   134,   143,   148,   157,   156,
+     166,   165,   176,   184,   183,   189,   188,   193,   198,   197,
+     203,   202,   207,   212,   211,   217,   216,   221,   226,   225,
+     231,   230,   235,   240,   239,   245,   244,   249,   254,   253,
+     258,   263,   262,   268,   267,   272,   276,   286,   285,   319,
+     323,   334,   345,   344,   371,   380,   388,   397,   400,   405,
+     412,   425,   445,   538,   546,   559,   567,   582,   588,   592,
+     603,   614,   613,   655,   664,   667,   672,   679,   685,   689,
+     700,   725,   827,   839,   853,   852,   892,   927,   935,   940,
+     948,   957,   960,   965,   972,   994,  1021,  1043,  1069,  1078,
+    1089,  1098,  1107,  1117,  1131,  1137,  1145,  1157,  1181,  1206,
+    1230,  1261,  1260,  1283,  1282,  1305,  1306,  1312,  1316,  1327,
+    1342,  1341,  1376,  1411,  1446,  1451,  1461,  1466,  1474,  1483,
+    1486,  1491,  1498,  1504,  1511,  1523,  1535,  1546,  1555,  1570,
+    1581,  1598,  1602,  1614,  1613,  1646,  1645,  1664,  1670,  1678,
+    1690,  1710,  1718,  1727,  1731,  1770,  1777,  1788,  1790,  1806,
+    1822,  1834,  1846,  1857,  1873,  1878,  1886,  1889,  1897,  1901,
+    1905,  1909,  1913,  1917,  1921,  1925,  1929,  1933,  1937,  1941,
+    1945,  1964,  2005,  2011,  2019,  2026,  2038,  2045,  2055,  2068,
+    2081,  2128,  2139,  2150,  2166,  2175,  2189,  2192,  2195,  2198,
+    2201,  2204,  2207,  2210,  2213,  2216,  2219,  2222,  2225,  2228,
+    2231,  2234,  2237,  2240,  2243,  2246,  2249,  2252,  2255,  2258,
+    2261,  2264,  2267,  2270,  2273,  2276
 };
 #endif
 
@@ -1893,28 +1889,28 @@
     {
         case 2:
 /* Line 1792 of yacc.c  */
-#line 115 "src/Slice/Grammar.y"
+#line 116 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 3:
 /* Line 1792 of yacc.c  */
-#line 123 "src/Slice/Grammar.y"
+#line 124 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 4:
 /* Line 1792 of yacc.c  */
-#line 126 "src/Slice/Grammar.y"
+#line 127 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 5:
 /* Line 1792 of yacc.c  */
-#line 134 "src/Slice/Grammar.y"
+#line 135 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
 }
@@ -1922,7 +1918,7 @@
 
   case 6:
 /* Line 1792 of yacc.c  */
-#line 143 "src/Slice/Grammar.y"
+#line 144 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
 }
@@ -1930,7 +1926,7 @@
 
   case 7:
 /* Line 1792 of yacc.c  */
-#line 147 "src/Slice/Grammar.y"
+#line 148 "src/Slice/Grammar.y"
     {
     (yyval) = new StringListTok;
 }
@@ -1938,7 +1934,7 @@
 
   case 8:
 /* Line 1792 of yacc.c  */
-#line 156 "src/Slice/Grammar.y"
+#line 157 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     if(!metaData->v.empty())
@@ -1950,7 +1946,7 @@
 
   case 10:
 /* Line 1792 of yacc.c  */
-#line 165 "src/Slice/Grammar.y"
+#line 166 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -1963,14 +1959,14 @@
 
   case 12:
 /* Line 1792 of yacc.c  */
-#line 175 "src/Slice/Grammar.y"
+#line 176 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 13:
 /* Line 1792 of yacc.c  */
-#line 183 "src/Slice/Grammar.y"
+#line 184 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ModulePtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -1978,7 +1974,7 @@
 
   case 15:
 /* Line 1792 of yacc.c  */
-#line 188 "src/Slice/Grammar.y"
+#line 189 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -1986,7 +1982,7 @@
 
   case 17:
 /* Line 1792 of yacc.c  */
-#line 193 "src/Slice/Grammar.y"
+#line 194 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after class forward declaration");
 }
@@ -1994,7 +1990,7 @@
 
   case 18:
 /* Line 1792 of yacc.c  */
-#line 197 "src/Slice/Grammar.y"
+#line 198 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2002,7 +1998,7 @@
 
   case 20:
 /* Line 1792 of yacc.c  */
-#line 202 "src/Slice/Grammar.y"
+#line 203 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2010,7 +2006,7 @@
 
   case 22:
 /* Line 1792 of yacc.c  */
-#line 207 "src/Slice/Grammar.y"
+#line 208 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after interface forward declaration");
 }
@@ -2018,7 +2014,7 @@
 
   case 23:
 /* Line 1792 of yacc.c  */
-#line 211 "src/Slice/Grammar.y"
+#line 212 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2026,7 +2022,7 @@
 
   case 25:
 /* Line 1792 of yacc.c  */
-#line 216 "src/Slice/Grammar.y"
+#line 217 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0);
 }
@@ -2034,7 +2030,7 @@
 
   case 27:
 /* Line 1792 of yacc.c  */
-#line 221 "src/Slice/Grammar.y"
+#line 222 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after exception forward declaration");
 }
@@ -2042,7 +2038,7 @@
 
   case 28:
 /* Line 1792 of yacc.c  */
-#line 225 "src/Slice/Grammar.y"
+#line 226 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ExceptionPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2050,7 +2046,7 @@
 
   case 30:
 /* Line 1792 of yacc.c  */
-#line 230 "src/Slice/Grammar.y"
+#line 231 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0);
 }
@@ -2058,7 +2054,7 @@
 
   case 32:
 /* Line 1792 of yacc.c  */
-#line 235 "src/Slice/Grammar.y"
+#line 236 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after struct forward declaration");
 }
@@ -2066,7 +2062,7 @@
 
   case 33:
 /* Line 1792 of yacc.c  */
-#line 239 "src/Slice/Grammar.y"
+#line 240 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || StructPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2074,7 +2070,7 @@
 
   case 35:
 /* Line 1792 of yacc.c  */
-#line 244 "src/Slice/Grammar.y"
+#line 245 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || SequencePtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2082,7 +2078,7 @@
 
   case 37:
 /* Line 1792 of yacc.c  */
-#line 249 "src/Slice/Grammar.y"
+#line 250 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after sequence definition");
 }
@@ -2090,7 +2086,7 @@
 
   case 38:
 /* Line 1792 of yacc.c  */
-#line 253 "src/Slice/Grammar.y"
+#line 254 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || DictionaryPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2098,7 +2094,7 @@
 
   case 40:
 /* Line 1792 of yacc.c  */
-#line 258 "src/Slice/Grammar.y"
+#line 259 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after dictionary definition");
 }
@@ -2106,7 +2102,7 @@
 
   case 41:
 /* Line 1792 of yacc.c  */
-#line 262 "src/Slice/Grammar.y"
+#line 263 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || EnumPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2114,7 +2110,7 @@
 
   case 43:
 /* Line 1792 of yacc.c  */
-#line 267 "src/Slice/Grammar.y"
+#line 268 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ConstPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2122,7 +2118,7 @@
 
   case 45:
 /* Line 1792 of yacc.c  */
-#line 272 "src/Slice/Grammar.y"
+#line 273 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after const definition");
 }
@@ -2130,7 +2126,7 @@
 
   case 46:
 /* Line 1792 of yacc.c  */
-#line 276 "src/Slice/Grammar.y"
+#line 277 "src/Slice/Grammar.y"
     {
     yyerrok;
 }
@@ -2138,7 +2134,7 @@
 
   case 47:
 /* Line 1792 of yacc.c  */
-#line 285 "src/Slice/Grammar.y"
+#line 286 "src/Slice/Grammar.y"
     {
     unit->setSeenDefinition();
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2159,7 +2155,7 @@
 
   case 48:
 /* Line 1792 of yacc.c  */
-#line 302 "src/Slice/Grammar.y"
+#line 303 "src/Slice/Grammar.y"
     {
     if((yyvsp[(3) - (6)]))
     {
@@ -2175,7 +2171,7 @@
 
   case 49:
 /* Line 1792 of yacc.c  */
-#line 319 "src/Slice/Grammar.y"
+#line 320 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2183,7 +2179,7 @@
 
   case 50:
 /* Line 1792 of yacc.c  */
-#line 323 "src/Slice/Grammar.y"
+#line 324 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
@@ -2193,7 +2189,7 @@
 
   case 51:
 /* Line 1792 of yacc.c  */
-#line 334 "src/Slice/Grammar.y"
+#line 335 "src/Slice/Grammar.y"
     {
     unit->error("exceptions cannot be forward declared");
     (yyval) = 0;
@@ -2202,7 +2198,7 @@
 
   case 52:
 /* Line 1792 of yacc.c  */
-#line 344 "src/Slice/Grammar.y"
+#line 345 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
@@ -2220,7 +2216,7 @@
 
   case 53:
 /* Line 1792 of yacc.c  */
-#line 358 "src/Slice/Grammar.y"
+#line 359 "src/Slice/Grammar.y"
     {
     if((yyvsp[(4) - (7)]))
     {
@@ -2232,7 +2228,7 @@
 
   case 54:
 /* Line 1792 of yacc.c  */
-#line 371 "src/Slice/Grammar.y"
+#line 372 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
@@ -2244,7 +2240,7 @@
 
   case 55:
 /* Line 1792 of yacc.c  */
-#line 379 "src/Slice/Grammar.y"
+#line 380 "src/Slice/Grammar.y"
     {
     (yyval) = 0;
 }
@@ -2252,7 +2248,7 @@
 
   case 56:
 /* Line 1792 of yacc.c  */
-#line 388 "src/Slice/Grammar.y"
+#line 389 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2265,14 +2261,14 @@
 
   case 57:
 /* Line 1792 of yacc.c  */
-#line 397 "src/Slice/Grammar.y"
+#line 398 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 58:
 /* Line 1792 of yacc.c  */
-#line 400 "src/Slice/Grammar.y"
+#line 401 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -2280,14 +2276,14 @@
 
   case 59:
 /* Line 1792 of yacc.c  */
-#line 404 "src/Slice/Grammar.y"
+#line 405 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 60:
 /* Line 1792 of yacc.c  */
-#line 412 "src/Slice/Grammar.y"
+#line 413 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2299,7 +2295,7 @@
 
   case 61:
 /* Line 1792 of yacc.c  */
-#line 425 "src/Slice/Grammar.y"
+#line 426 "src/Slice/Grammar.y"
     {
     IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[(2) - (3)]));
 
@@ -2323,7 +2319,7 @@
 
   case 62:
 /* Line 1792 of yacc.c  */
-#line 445 "src/Slice/Grammar.y"
+#line 446 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
 
@@ -2420,7 +2416,7 @@
 
   case 63:
 /* Line 1792 of yacc.c  */
-#line 538 "src/Slice/Grammar.y"
+#line 539 "src/Slice/Grammar.y"
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
@@ -2432,7 +2428,7 @@
 
   case 64:
 /* Line 1792 of yacc.c  */
-#line 546 "src/Slice/Grammar.y"
+#line 547 "src/Slice/Grammar.y"
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
@@ -2444,7 +2440,7 @@
 
   case 65:
 /* Line 1792 of yacc.c  */
-#line 559 "src/Slice/Grammar.y"
+#line 560 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2456,7 +2452,7 @@
 
   case 66:
 /* Line 1792 of yacc.c  */
-#line 567 "src/Slice/Grammar.y"
+#line 568 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     OptionalDefTokPtr m = new OptionalDefTok;
@@ -2470,7 +2466,7 @@
 
   case 68:
 /* Line 1792 of yacc.c  */
-#line 588 "src/Slice/Grammar.y"
+#line 589 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2478,7 +2474,7 @@
 
   case 69:
 /* Line 1792 of yacc.c  */
-#line 592 "src/Slice/Grammar.y"
+#line 593 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as struct name");
@@ -2488,7 +2484,7 @@
 
   case 70:
 /* Line 1792 of yacc.c  */
-#line 603 "src/Slice/Grammar.y"
+#line 604 "src/Slice/Grammar.y"
     {
     unit->error("structs cannot be forward declared");
     (yyval) = 0; // Dummy
@@ -2497,7 +2493,7 @@
 
   case 71:
 /* Line 1792 of yacc.c  */
-#line 613 "src/Slice/Grammar.y"
+#line 614 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2520,7 +2516,7 @@
 
   case 72:
 /* Line 1792 of yacc.c  */
-#line 632 "src/Slice/Grammar.y"
+#line 633 "src/Slice/Grammar.y"
     {
     if((yyvsp[(3) - (6)]))
     {
@@ -2542,7 +2538,7 @@
 
   case 73:
 /* Line 1792 of yacc.c  */
-#line 655 "src/Slice/Grammar.y"
+#line 656 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2555,14 +2551,14 @@
 
   case 74:
 /* Line 1792 of yacc.c  */
-#line 664 "src/Slice/Grammar.y"
+#line 665 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 75:
 /* Line 1792 of yacc.c  */
-#line 667 "src/Slice/Grammar.y"
+#line 668 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -2570,14 +2566,14 @@
 
   case 76:
 /* Line 1792 of yacc.c  */
-#line 671 "src/Slice/Grammar.y"
+#line 672 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 78:
 /* Line 1792 of yacc.c  */
-#line 685 "src/Slice/Grammar.y"
+#line 686 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2585,7 +2581,7 @@
 
   case 79:
 /* Line 1792 of yacc.c  */
-#line 689 "src/Slice/Grammar.y"
+#line 690 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as class name");
@@ -2595,7 +2591,7 @@
 
   case 80:
 /* Line 1792 of yacc.c  */
-#line 700 "src/Slice/Grammar.y"
+#line 701 "src/Slice/Grammar.y"
     {
     IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[(3) - (4)]))->v;
     if(id < 0)
@@ -2624,7 +2620,7 @@
 
   case 81:
 /* Line 1792 of yacc.c  */
-#line 725 "src/Slice/Grammar.y"
+#line 726 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(3) - (4)]));
 
@@ -2730,7 +2726,7 @@
 
   case 82:
 /* Line 1792 of yacc.c  */
-#line 827 "src/Slice/Grammar.y"
+#line 828 "src/Slice/Grammar.y"
     {
     ClassIdTokPtr classId = new ClassIdTok();
     classId->v = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]))->v;
@@ -2741,7 +2737,7 @@
 
   case 83:
 /* Line 1792 of yacc.c  */
-#line 839 "src/Slice/Grammar.y"
+#line 840 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2753,7 +2749,7 @@
 
   case 84:
 /* Line 1792 of yacc.c  */
-#line 852 "src/Slice/Grammar.y"
+#line 853 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2780,7 +2776,7 @@
 
   case 85:
 /* Line 1792 of yacc.c  */
-#line 875 "src/Slice/Grammar.y"
+#line 876 "src/Slice/Grammar.y"
     {
     if((yyvsp[(5) - (8)]))
     {
@@ -2796,7 +2792,7 @@
 
   case 86:
 /* Line 1792 of yacc.c  */
-#line 892 "src/Slice/Grammar.y"
+#line 893 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
@@ -2834,7 +2830,7 @@
 
   case 87:
 /* Line 1792 of yacc.c  */
-#line 926 "src/Slice/Grammar.y"
+#line 927 "src/Slice/Grammar.y"
     {
     (yyval) = 0;
 }
@@ -2842,7 +2838,7 @@
 
   case 88:
 /* Line 1792 of yacc.c  */
-#line 935 "src/Slice/Grammar.y"
+#line 936 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2850,7 +2846,7 @@
 
   case 89:
 /* Line 1792 of yacc.c  */
-#line 939 "src/Slice/Grammar.y"
+#line 940 "src/Slice/Grammar.y"
     {
     (yyval) = new ClassListTok;
 }
@@ -2858,7 +2854,7 @@
 
   case 90:
 /* Line 1792 of yacc.c  */
-#line 948 "src/Slice/Grammar.y"
+#line 949 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2871,14 +2867,14 @@
 
   case 91:
 /* Line 1792 of yacc.c  */
-#line 957 "src/Slice/Grammar.y"
+#line 958 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 92:
 /* Line 1792 of yacc.c  */
-#line 960 "src/Slice/Grammar.y"
+#line 961 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -2886,14 +2882,14 @@
 
   case 93:
 /* Line 1792 of yacc.c  */
-#line 964 "src/Slice/Grammar.y"
+#line 965 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 94:
 /* Line 1792 of yacc.c  */
-#line 972 "src/Slice/Grammar.y"
+#line 973 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
@@ -2919,7 +2915,7 @@
 
   case 95:
 /* Line 1792 of yacc.c  */
-#line 994 "src/Slice/Grammar.y"
+#line 995 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -2950,7 +2946,7 @@
 
   case 96:
 /* Line 1792 of yacc.c  */
-#line 1021 "src/Slice/Grammar.y"
+#line 1022 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -2976,7 +2972,7 @@
 
   case 97:
 /* Line 1792 of yacc.c  */
-#line 1043 "src/Slice/Grammar.y"
+#line 1044 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
@@ -3001,7 +2997,7 @@
 
   case 98:
 /* Line 1792 of yacc.c  */
-#line 1069 "src/Slice/Grammar.y"
+#line 1070 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3014,7 +3010,7 @@
 
   case 99:
 /* Line 1792 of yacc.c  */
-#line 1078 "src/Slice/Grammar.y"
+#line 1079 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3029,7 +3025,7 @@
 
   case 100:
 /* Line 1792 of yacc.c  */
-#line 1089 "src/Slice/Grammar.y"
+#line 1090 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3042,7 +3038,7 @@
 
   case 101:
 /* Line 1792 of yacc.c  */
-#line 1098 "src/Slice/Grammar.y"
+#line 1099 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (4)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3055,7 +3051,7 @@
 
   case 102:
 /* Line 1792 of yacc.c  */
-#line 1107 "src/Slice/Grammar.y"
+#line 1108 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -3069,7 +3065,7 @@
 
   case 103:
 /* Line 1792 of yacc.c  */
-#line 1117 "src/Slice/Grammar.y"
+#line 1118 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3082,7 +3078,7 @@
 
   case 104:
 /* Line 1792 of yacc.c  */
-#line 1131 "src/Slice/Grammar.y"
+#line 1132 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     m->v.type = TypePtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -3092,7 +3088,7 @@
 
   case 105:
 /* Line 1792 of yacc.c  */
-#line 1137 "src/Slice/Grammar.y"
+#line 1138 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = new OptionalDefTok();
     m->v.type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3104,7 +3100,7 @@
 
   case 106:
 /* Line 1792 of yacc.c  */
-#line 1145 "src/Slice/Grammar.y"
+#line 1146 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.optional = false;
@@ -3115,7 +3111,7 @@
 
   case 107:
 /* Line 1792 of yacc.c  */
-#line 1157 "src/Slice/Grammar.y"
+#line 1158 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -3143,7 +3139,7 @@
 
   case 108:
 /* Line 1792 of yacc.c  */
-#line 1181 "src/Slice/Grammar.y"
+#line 1182 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
@@ -3172,7 +3168,7 @@
 
   case 109:
 /* Line 1792 of yacc.c  */
-#line 1206 "src/Slice/Grammar.y"
+#line 1207 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -3200,7 +3196,7 @@
 
   case 110:
 /* Line 1792 of yacc.c  */
-#line 1230 "src/Slice/Grammar.y"
+#line 1231 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
@@ -3229,7 +3225,7 @@
 
   case 111:
 /* Line 1792 of yacc.c  */
-#line 1260 "src/Slice/Grammar.y"
+#line 1261 "src/Slice/Grammar.y"
     {
     if((yyvsp[(1) - (3)]))
     {
@@ -3245,7 +3241,7 @@
 
   case 112:
 /* Line 1792 of yacc.c  */
-#line 1272 "src/Slice/Grammar.y"
+#line 1273 "src/Slice/Grammar.y"
     {
     OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
     ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3259,7 +3255,7 @@
 
   case 113:
 /* Line 1792 of yacc.c  */
-#line 1282 "src/Slice/Grammar.y"
+#line 1283 "src/Slice/Grammar.y"
     {
     if((yyvsp[(1) - (3)]))
     {
@@ -3271,7 +3267,7 @@
 
   case 114:
 /* Line 1792 of yacc.c  */
-#line 1290 "src/Slice/Grammar.y"
+#line 1291 "src/Slice/Grammar.y"
     {
     OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
     ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3285,7 +3281,7 @@
 
   case 117:
 /* Line 1792 of yacc.c  */
-#line 1312 "src/Slice/Grammar.y"
+#line 1313 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3293,7 +3289,7 @@
 
   case 118:
 /* Line 1792 of yacc.c  */
-#line 1316 "src/Slice/Grammar.y"
+#line 1317 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as interface name");
@@ -3303,7 +3299,7 @@
 
   case 119:
 /* Line 1792 of yacc.c  */
-#line 1327 "src/Slice/Grammar.y"
+#line 1328 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -3316,7 +3312,7 @@
 
   case 120:
 /* Line 1792 of yacc.c  */
-#line 1341 "src/Slice/Grammar.y"
+#line 1342 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
@@ -3338,7 +3334,7 @@
 
   case 121:
 /* Line 1792 of yacc.c  */
-#line 1359 "src/Slice/Grammar.y"
+#line 1360 "src/Slice/Grammar.y"
     {
     if((yyvsp[(4) - (7)]))
     {
@@ -3354,7 +3350,7 @@
 
   case 122:
 /* Line 1792 of yacc.c  */
-#line 1376 "src/Slice/Grammar.y"
+#line 1377 "src/Slice/Grammar.y"
     {
     ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -3393,7 +3389,7 @@
 
   case 123:
 /* Line 1792 of yacc.c  */
-#line 1411 "src/Slice/Grammar.y"
+#line 1412 "src/Slice/Grammar.y"
     {
     ClassListTokPtr intfs = new ClassListTok;
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3432,7 +3428,7 @@
 
   case 124:
 /* Line 1792 of yacc.c  */
-#line 1446 "src/Slice/Grammar.y"
+#line 1447 "src/Slice/Grammar.y"
     {
     unit->error("illegal inheritance from type Object");
     (yyval) = new ClassListTok; // Dummy
@@ -3441,7 +3437,7 @@
 
   case 125:
 /* Line 1792 of yacc.c  */
-#line 1451 "src/Slice/Grammar.y"
+#line 1452 "src/Slice/Grammar.y"
     {
     unit->error("illegal inheritance from type Value");
     (yyval) = new ClassListTok; // Dummy
@@ -3450,7 +3446,7 @@
 
   case 126:
 /* Line 1792 of yacc.c  */
-#line 1461 "src/Slice/Grammar.y"
+#line 1462 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3458,7 +3454,7 @@
 
   case 127:
 /* Line 1792 of yacc.c  */
-#line 1465 "src/Slice/Grammar.y"
+#line 1466 "src/Slice/Grammar.y"
     {
     (yyval) = new ClassListTok;
 }
@@ -3466,7 +3462,7 @@
 
   case 128:
 /* Line 1792 of yacc.c  */
-#line 1474 "src/Slice/Grammar.y"
+#line 1475 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -3479,14 +3475,14 @@
 
   case 129:
 /* Line 1792 of yacc.c  */
-#line 1483 "src/Slice/Grammar.y"
+#line 1484 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 130:
 /* Line 1792 of yacc.c  */
-#line 1486 "src/Slice/Grammar.y"
+#line 1487 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -3494,14 +3490,14 @@
 
   case 131:
 /* Line 1792 of yacc.c  */
-#line 1490 "src/Slice/Grammar.y"
+#line 1491 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 133:
 /* Line 1792 of yacc.c  */
-#line 1504 "src/Slice/Grammar.y"
+#line 1505 "src/Slice/Grammar.y"
     {
     ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (3)]));
     ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3512,7 +3508,7 @@
 
   case 134:
 /* Line 1792 of yacc.c  */
-#line 1511 "src/Slice/Grammar.y"
+#line 1512 "src/Slice/Grammar.y"
     {
     ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (1)]));
     ExceptionListTokPtr exceptionList = new ExceptionListTok;
@@ -3523,7 +3519,7 @@
 
   case 135:
 /* Line 1792 of yacc.c  */
-#line 1523 "src/Slice/Grammar.y"
+#line 1524 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainerPtr cont = unit->currentContainer();
@@ -3539,7 +3535,7 @@
 
   case 136:
 /* Line 1792 of yacc.c  */
-#line 1535 "src/Slice/Grammar.y"
+#line 1536 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
@@ -3549,7 +3545,7 @@
 
   case 137:
 /* Line 1792 of yacc.c  */
-#line 1546 "src/Slice/Grammar.y"
+#line 1547 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
@@ -3562,7 +3558,7 @@
 
   case 138:
 /* Line 1792 of yacc.c  */
-#line 1555 "src/Slice/Grammar.y"
+#line 1556 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
@@ -3576,7 +3572,7 @@
 
   case 139:
 /* Line 1792 of yacc.c  */
-#line 1570 "src/Slice/Grammar.y"
+#line 1571 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
@@ -3591,7 +3587,7 @@
 
   case 140:
 /* Line 1792 of yacc.c  */
-#line 1581 "src/Slice/Grammar.y"
+#line 1582 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
@@ -3607,7 +3603,7 @@
 
   case 141:
 /* Line 1792 of yacc.c  */
-#line 1598 "src/Slice/Grammar.y"
+#line 1599 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3615,7 +3611,7 @@
 
   case 142:
 /* Line 1792 of yacc.c  */
-#line 1602 "src/Slice/Grammar.y"
+#line 1603 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumeration name");
@@ -3625,7 +3621,7 @@
 
   case 143:
 /* Line 1792 of yacc.c  */
-#line 1613 "src/Slice/Grammar.y"
+#line 1614 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -3646,7 +3642,7 @@
 
   case 144:
 /* Line 1792 of yacc.c  */
-#line 1630 "src/Slice/Grammar.y"
+#line 1631 "src/Slice/Grammar.y"
     {
     EnumPtr en = EnumPtr::dynamicCast((yyvsp[(3) - (6)]));
     if(en)
@@ -3664,7 +3660,7 @@
 
   case 145:
 /* Line 1792 of yacc.c  */
-#line 1645 "src/Slice/Grammar.y"
+#line 1646 "src/Slice/Grammar.y"
     {
     unit->error("missing enumeration name");
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -3677,7 +3673,7 @@
 
   case 146:
 /* Line 1792 of yacc.c  */
-#line 1654 "src/Slice/Grammar.y"
+#line 1655 "src/Slice/Grammar.y"
     {
     unit->popContainer();
     (yyval) = (yyvsp[(2) - (6)]);
@@ -3686,7 +3682,7 @@
 
   case 147:
 /* Line 1792 of yacc.c  */
-#line 1664 "src/Slice/Grammar.y"
+#line 1665 "src/Slice/Grammar.y"
     {
     EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v);
@@ -3696,14 +3692,14 @@
 
   case 148:
 /* Line 1792 of yacc.c  */
-#line 1670 "src/Slice/Grammar.y"
+#line 1671 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 149:
 /* Line 1792 of yacc.c  */
-#line 1678 "src/Slice/Grammar.y"
+#line 1679 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
@@ -3719,7 +3715,7 @@
 
   case 150:
 /* Line 1792 of yacc.c  */
-#line 1690 "src/Slice/Grammar.y"
+#line 1691 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
@@ -3743,7 +3739,7 @@
 
   case 151:
 /* Line 1792 of yacc.c  */
-#line 1710 "src/Slice/Grammar.y"
+#line 1711 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumerator");
@@ -3754,7 +3750,7 @@
 
   case 152:
 /* Line 1792 of yacc.c  */
-#line 1717 "src/Slice/Grammar.y"
+#line 1718 "src/Slice/Grammar.y"
     {
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     (yyval) = ens; // Dummy
@@ -3763,7 +3759,7 @@
 
   case 153:
 /* Line 1792 of yacc.c  */
-#line 1727 "src/Slice/Grammar.y"
+#line 1728 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(1) - (1)]);
 }
@@ -3771,7 +3767,7 @@
 
   case 154:
 /* Line 1792 of yacc.c  */
-#line 1731 "src/Slice/Grammar.y"
+#line 1732 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
@@ -3809,7 +3805,7 @@
 
   case 155:
 /* Line 1792 of yacc.c  */
-#line 1770 "src/Slice/Grammar.y"
+#line 1771 "src/Slice/Grammar.y"
     {
     BoolTokPtr out = new BoolTok;
     out->v = true;
@@ -3819,7 +3815,7 @@
 
   case 156:
 /* Line 1792 of yacc.c  */
-#line 1776 "src/Slice/Grammar.y"
+#line 1777 "src/Slice/Grammar.y"
     {
     BoolTokPtr out = new BoolTok;
     out->v = false;
@@ -3829,14 +3825,14 @@
 
   case 157:
 /* Line 1792 of yacc.c  */
-#line 1787 "src/Slice/Grammar.y"
+#line 1788 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 158:
 /* Line 1792 of yacc.c  */
-#line 1790 "src/Slice/Grammar.y"
+#line 1791 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3856,7 +3852,7 @@
 
   case 159:
 /* Line 1792 of yacc.c  */
-#line 1806 "src/Slice/Grammar.y"
+#line 1807 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
     OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3876,7 +3872,7 @@
 
   case 160:
 /* Line 1792 of yacc.c  */
-#line 1822 "src/Slice/Grammar.y"
+#line 1823 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (4)]));
@@ -3892,7 +3888,7 @@
 
   case 161:
 /* Line 1792 of yacc.c  */
-#line 1834 "src/Slice/Grammar.y"
+#line 1835 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (6)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (6)]));
@@ -3908,7 +3904,7 @@
 
   case 162:
 /* Line 1792 of yacc.c  */
-#line 1846 "src/Slice/Grammar.y"
+#line 1847 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3923,7 +3919,7 @@
 
   case 163:
 /* Line 1792 of yacc.c  */
-#line 1857 "src/Slice/Grammar.y"
+#line 1858 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3938,7 +3934,7 @@
 
   case 164:
 /* Line 1792 of yacc.c  */
-#line 1873 "src/Slice/Grammar.y"
+#line 1874 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3946,7 +3942,7 @@
 
   case 165:
 /* Line 1792 of yacc.c  */
-#line 1877 "src/Slice/Grammar.y"
+#line 1878 "src/Slice/Grammar.y"
     {
     (yyval) = new ExceptionListTok;
 }
@@ -3954,21 +3950,21 @@
 
   case 166:
 /* Line 1792 of yacc.c  */
-#line 1886 "src/Slice/Grammar.y"
+#line 1887 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 167:
 /* Line 1792 of yacc.c  */
-#line 1889 "src/Slice/Grammar.y"
+#line 1890 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 168:
 /* Line 1792 of yacc.c  */
-#line 1897 "src/Slice/Grammar.y"
+#line 1898 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindByte);
 }
@@ -3976,7 +3972,7 @@
 
   case 169:
 /* Line 1792 of yacc.c  */
-#line 1901 "src/Slice/Grammar.y"
+#line 1902 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindBool);
 }
@@ -3984,7 +3980,7 @@
 
   case 170:
 /* Line 1792 of yacc.c  */
-#line 1905 "src/Slice/Grammar.y"
+#line 1906 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindShort);
 }
@@ -3992,7 +3988,7 @@
 
   case 171:
 /* Line 1792 of yacc.c  */
-#line 1909 "src/Slice/Grammar.y"
+#line 1910 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindInt);
 }
@@ -4000,7 +3996,7 @@
 
   case 172:
 /* Line 1792 of yacc.c  */
-#line 1913 "src/Slice/Grammar.y"
+#line 1914 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindLong);
 }
@@ -4008,7 +4004,7 @@
 
   case 173:
 /* Line 1792 of yacc.c  */
-#line 1917 "src/Slice/Grammar.y"
+#line 1918 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindFloat);
 }
@@ -4016,7 +4012,7 @@
 
   case 174:
 /* Line 1792 of yacc.c  */
-#line 1921 "src/Slice/Grammar.y"
+#line 1922 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindDouble);
 }
@@ -4024,7 +4020,7 @@
 
   case 175:
 /* Line 1792 of yacc.c  */
-#line 1925 "src/Slice/Grammar.y"
+#line 1926 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindString);
 }
@@ -4032,7 +4028,7 @@
 
   case 176:
 /* Line 1792 of yacc.c  */
-#line 1929 "src/Slice/Grammar.y"
+#line 1930 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindObject);
 }
@@ -4040,7 +4036,7 @@
 
   case 177:
 /* Line 1792 of yacc.c  */
-#line 1933 "src/Slice/Grammar.y"
+#line 1934 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindObjectProxy);
 }
@@ -4048,7 +4044,7 @@
 
   case 178:
 /* Line 1792 of yacc.c  */
-#line 1937 "src/Slice/Grammar.y"
+#line 1938 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindLocalObject);
 }
@@ -4056,7 +4052,7 @@
 
   case 179:
 /* Line 1792 of yacc.c  */
-#line 1941 "src/Slice/Grammar.y"
+#line 1942 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindValue);
 }
@@ -4064,7 +4060,7 @@
 
   case 180:
 /* Line 1792 of yacc.c  */
-#line 1945 "src/Slice/Grammar.y"
+#line 1946 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainerPtr cont = unit->currentContainer();
@@ -4087,7 +4083,7 @@
 
   case 181:
 /* Line 1792 of yacc.c  */
-#line 1964 "src/Slice/Grammar.y"
+#line 1965 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     ContainerPtr cont = unit->currentContainer();
@@ -4127,7 +4123,7 @@
 
   case 182:
 /* Line 1792 of yacc.c  */
-#line 2005 "src/Slice/Grammar.y"
+#line 2006 "src/Slice/Grammar.y"
     {
     StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -4137,14 +4133,14 @@
 
   case 183:
 /* Line 1792 of yacc.c  */
-#line 2011 "src/Slice/Grammar.y"
+#line 2012 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 184:
 /* Line 1792 of yacc.c  */
-#line 2019 "src/Slice/Grammar.y"
+#line 2020 "src/Slice/Grammar.y"
     {
     StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -4155,7 +4151,7 @@
 
   case 185:
 /* Line 1792 of yacc.c  */
-#line 2026 "src/Slice/Grammar.y"
+#line 2027 "src/Slice/Grammar.y"
     {
     StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     StringListTokPtr stringList = new StringListTok;
@@ -4166,7 +4162,7 @@
 
   case 186:
 /* Line 1792 of yacc.c  */
-#line 2038 "src/Slice/Grammar.y"
+#line 2039 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = new BoolTok;
     local->v = true;
@@ -4176,7 +4172,7 @@
 
   case 187:
 /* Line 1792 of yacc.c  */
-#line 2044 "src/Slice/Grammar.y"
+#line 2045 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = new BoolTok;
     local->v = false;
@@ -4186,7 +4182,7 @@
 
   case 188:
 /* Line 1792 of yacc.c  */
-#line 2055 "src/Slice/Grammar.y"
+#line 2056 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindLong);
     IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4203,7 +4199,7 @@
 
   case 189:
 /* Line 1792 of yacc.c  */
-#line 2068 "src/Slice/Grammar.y"
+#line 2069 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindDouble);
     FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4220,7 +4216,7 @@
 
   case 190:
 /* Line 1792 of yacc.c  */
-#line 2081 "src/Slice/Grammar.y"
+#line 2082 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ConstDefTokPtr def = new ConstDefTok;
@@ -4271,7 +4267,7 @@
 
   case 191:
 /* Line 1792 of yacc.c  */
-#line 2128 "src/Slice/Grammar.y"
+#line 2129 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindString);
     StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4286,7 +4282,7 @@
 
   case 192:
 /* Line 1792 of yacc.c  */
-#line 2139 "src/Slice/Grammar.y"
+#line 2140 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
     StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4301,7 +4297,7 @@
 
   case 193:
 /* Line 1792 of yacc.c  */
-#line 2150 "src/Slice/Grammar.y"
+#line 2151 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
     StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4316,7 +4312,7 @@
 
   case 194:
 /* Line 1792 of yacc.c  */
-#line 2166 "src/Slice/Grammar.y"
+#line 2167 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (6)]));
     TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (6)]));
@@ -4329,7 +4325,7 @@
 
   case 195:
 /* Line 1792 of yacc.c  */
-#line 2175 "src/Slice/Grammar.y"
+#line 2176 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (5)]));
     TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (5)]));
@@ -4342,217 +4338,217 @@
 
   case 196:
 /* Line 1792 of yacc.c  */
-#line 2189 "src/Slice/Grammar.y"
+#line 2190 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 197:
 /* Line 1792 of yacc.c  */
-#line 2192 "src/Slice/Grammar.y"
+#line 2193 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 198:
 /* Line 1792 of yacc.c  */
-#line 2195 "src/Slice/Grammar.y"
+#line 2196 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 199:
 /* Line 1792 of yacc.c  */
-#line 2198 "src/Slice/Grammar.y"
+#line 2199 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 200:
 /* Line 1792 of yacc.c  */
-#line 2201 "src/Slice/Grammar.y"
+#line 2202 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 201:
 /* Line 1792 of yacc.c  */
-#line 2204 "src/Slice/Grammar.y"
+#line 2205 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 202:
 /* Line 1792 of yacc.c  */
-#line 2207 "src/Slice/Grammar.y"
+#line 2208 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 203:
 /* Line 1792 of yacc.c  */
-#line 2210 "src/Slice/Grammar.y"
+#line 2211 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 204:
 /* Line 1792 of yacc.c  */
-#line 2213 "src/Slice/Grammar.y"
+#line 2214 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 205:
 /* Line 1792 of yacc.c  */
-#line 2216 "src/Slice/Grammar.y"
+#line 2217 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 206:
 /* Line 1792 of yacc.c  */
-#line 2219 "src/Slice/Grammar.y"
+#line 2220 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 207:
 /* Line 1792 of yacc.c  */
-#line 2222 "src/Slice/Grammar.y"
+#line 2223 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 208:
 /* Line 1792 of yacc.c  */
-#line 2225 "src/Slice/Grammar.y"
+#line 2226 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 209:
 /* Line 1792 of yacc.c  */
-#line 2228 "src/Slice/Grammar.y"
+#line 2229 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 210:
 /* Line 1792 of yacc.c  */
-#line 2231 "src/Slice/Grammar.y"
+#line 2232 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 211:
 /* Line 1792 of yacc.c  */
-#line 2234 "src/Slice/Grammar.y"
+#line 2235 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 212:
 /* Line 1792 of yacc.c  */
-#line 2237 "src/Slice/Grammar.y"
+#line 2238 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 213:
 /* Line 1792 of yacc.c  */
-#line 2240 "src/Slice/Grammar.y"
+#line 2241 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 214:
 /* Line 1792 of yacc.c  */
-#line 2243 "src/Slice/Grammar.y"
+#line 2244 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 215:
 /* Line 1792 of yacc.c  */
-#line 2246 "src/Slice/Grammar.y"
+#line 2247 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 216:
 /* Line 1792 of yacc.c  */
-#line 2249 "src/Slice/Grammar.y"
+#line 2250 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 217:
 /* Line 1792 of yacc.c  */
-#line 2252 "src/Slice/Grammar.y"
+#line 2253 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 218:
 /* Line 1792 of yacc.c  */
-#line 2255 "src/Slice/Grammar.y"
+#line 2256 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 219:
 /* Line 1792 of yacc.c  */
-#line 2258 "src/Slice/Grammar.y"
+#line 2259 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 220:
 /* Line 1792 of yacc.c  */
-#line 2261 "src/Slice/Grammar.y"
+#line 2262 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 221:
 /* Line 1792 of yacc.c  */
-#line 2264 "src/Slice/Grammar.y"
+#line 2265 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 222:
 /* Line 1792 of yacc.c  */
-#line 2267 "src/Slice/Grammar.y"
+#line 2268 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 223:
 /* Line 1792 of yacc.c  */
-#line 2270 "src/Slice/Grammar.y"
+#line 2271 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 224:
 /* Line 1792 of yacc.c  */
-#line 2273 "src/Slice/Grammar.y"
+#line 2274 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 225:
 /* Line 1792 of yacc.c  */
-#line 2276 "src/Slice/Grammar.y"
+#line 2277 "src/Slice/Grammar.y"
     {
 }
     break;
 
 
 /* Line 1792 of yacc.c  */
-#line 4556 "src/Slice/Grammar.cpp"
+#line 4557 "src/Slice/Grammar.cpp"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4784,5 +4780,5 @@
 
 
 /* Line 2055 of yacc.c  */
-#line 2280 "src/Slice/Grammar.y"
+#line 2281 "src/Slice/Grammar.y"
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Grammar.h zeroc-ice-3.7.2/cpp/src/Slice/Grammar.h
--- zeroc-ice-3.7.1/cpp/src/Slice/Grammar.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Grammar.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison interface for Yacc-like parsers in C
-
+   
       Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/GrammarUtil.h zeroc-ice-3.7.2/cpp/src/Slice/GrammarUtil.h
--- zeroc-ice-3.7.1/cpp/src/Slice/GrammarUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/GrammarUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_GRAMMAR_UTIL_H
 #define SLICE_GRAMMAR_UTIL_H
@@ -213,7 +208,6 @@
 #define YYSTYPE Slice::GrammarBasePtr
 #define YY_DECL int slice_lex(YYSTYPE* yylvalp)
 YY_DECL;
-int slice_parse();
 
 //
 // I must set the initial stack depth to the maximum stack depth to
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Grammar.y zeroc-ice-3.7.2/cpp/src/Slice/Grammar.y
--- zeroc-ice-3.7.1/cpp/src/Slice/Grammar.y	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Grammar.y	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
 %{
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/GrammarUtil.h>
 #include <IceUtil/InputUtil.h>
@@ -15,11 +10,12 @@
 #include <cstring>
 
 #ifdef _MSC_VER
-// I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
+#   pragma warning(disable:4102)
 // warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
+#   pragma warning(disable:4065)
+// warning C4244: '=': conversion from 'int' to 'yytype_int16', possible loss of data
+#   pragma warning(disable:4244)
 #endif
 
 //
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/JavaUtil.cpp zeroc-ice-3.7.2/cpp/src/Slice/JavaUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/JavaUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/JavaUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
+#include <IceUtil/StringUtil.h>
 #include <Slice/JavaUtil.h>
 #include <Slice/FileTracker.h>
 #include <Slice/Util.h>
@@ -231,9 +226,9 @@
         TypePtr returnType = p->returnType();
         StringList metaData = getMetaData(p);
 
-        UnitPtr unit = p->unit();
+        UnitPtr unt = p->unit();
         string file = p->file();
-        DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        DefinitionContextPtr dc = unt->findDefinitionContext(p->file());
 
         if(!returnType)
         {
@@ -284,8 +279,8 @@
 
         const string file =  p->file();
         const string line = p->line();
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc = unt->findDefinitionContext(file);
 
         for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); )
         {
@@ -363,9 +358,9 @@
         StringList metaData = cont->getMetaData();
         StringList result;
 
-        UnitPtr unit = cont->container()->unit();
+        UnitPtr unt = cont->container()->unit();
         string file = cont->file();
-        DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        DefinitionContextPtr dc = unt->findDefinitionContext(file);
         assert(dc);
 
         for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
@@ -452,8 +447,8 @@
     StringList validateType(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file,
                             const string& line)
     {
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc = unt->findDefinitionContext(file);
         assert(dc);
         StringList newMetaData;
         for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); ++i)
@@ -549,8 +544,8 @@
     StringList validateGetSet(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file,
                               const string& line)
     {
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc= unit->findDefinitionContext(file);
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc= unt->findDefinitionContext(file);
         assert(dc);
         StringList newMetaData;
         for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); ++i)
@@ -740,7 +735,7 @@
             if(IceUtilInternal::mkdir(path, 0777) != 0)
             {
                 ostringstream os;
-                os << "cannot create directory `" << path << "': " << strerror(errno);
+                os << "cannot create directory `" << path << "': " << IceUtilInternal::errorToString(errno);
                 throw FileException(__FILE__, __LINE__, os.str());
             }
             FileTracker::instance()->addDirectory(path);
@@ -779,7 +774,7 @@
     else
     {
         ostringstream os;
-        os << "cannot open file `" << path << "': " << strerror(errno);
+        os << "cannot open file `" << path << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 }
@@ -788,14 +783,9 @@
 Slice::JavaOutput::printHeader()
 {
     static const char* header =
-"// **********************************************************************\n"
-"//\n"
-"// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// **********************************************************************\n"
         ;
 
     print(header);
@@ -971,11 +961,11 @@
     string q;
     if(!m->findMetaData(prefix, q))
     {
-        UnitPtr unit = cont->unit();
+        UnitPtr ut = cont->unit();
         string file = cont->file();
         assert(!file.empty());
 
-        DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        DefinitionContextPtr dc = ut->findDefinitionContext(file);
         assert(dc);
         q = dc->findMetaData(prefix);
     }
@@ -1009,7 +999,7 @@
 }
 
 string
-Slice::JavaCompatGenerator::getAbsolute(const std::string& type, const std::string& package) const
+Slice::JavaCompatGenerator::getUnqualified(const std::string& type, const std::string& package) const
 {
     if(type.find(".") != string::npos && type.find(package) == 0 && type.find(".", package.size() + 1) == string::npos)
     {
@@ -1019,7 +1009,7 @@
 }
 
 string
-Slice::JavaCompatGenerator::getAbsolute(const ContainedPtr& cont,
+Slice::JavaCompatGenerator::getUnqualified(const ContainedPtr& cont,
                                         const string& package,
                                         const string& prefix,
                                         const string& suffix) const
@@ -1058,11 +1048,11 @@
     }
     else if(cl->isInterface())
     {
-        return getAbsolute(cl, package, "_", "Disp") + ".ice_staticId()";
+        return getUnqualified(cl, package, "_", "Disp") + ".ice_staticId()";
     }
     else
     {
-        return getAbsolute(cl, package) + ".ice_staticId()";
+        return getUnqualified(cl, package) + ".ice_staticId()";
     }
 }
 
@@ -1291,13 +1281,13 @@
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return getAbsolute(cl, package, "", mode == TypeModeOut ? "Holder" : "");
+        return getUnqualified(cl, package, "", mode == TypeModeOut ? "Holder" : "");
     }
 
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return getAbsolute(proxy->_class(), package, "", mode == TypeModeOut ? "PrxHolder" : "Prx");
+        return getUnqualified(proxy->_class(), package, "", mode == TypeModeOut ? "PrxHolder" : "Prx");
     }
 
     DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
@@ -1315,7 +1305,7 @@
             getDictionaryTypes(dict, "", StringList(), origInstanceType, origFormalType);
             if(formalType == origFormalType && instanceType == origInstanceType)
             {
-                return getAbsolute(dict, package, "", "Holder");
+                return getUnqualified(dict, package, "", "Holder");
             }
 
             //
@@ -1350,7 +1340,7 @@
                 getSequenceTypes(seq, "", StringList(), origInstanceType, origFormalType);
                 if(formalType == origFormalType && instanceType == origInstanceType)
                 {
-                    return getAbsolute(seq, package, "", "Holder");
+                    return getUnqualified(seq, package, "", "Holder");
                 }
             }
 
@@ -1374,11 +1364,11 @@
     {
         if(mode == TypeModeOut)
         {
-            return getAbsolute(contained, package, "", "Holder");
+            return getUnqualified(contained, package, "", "Holder");
         }
         else
         {
-            return getAbsolute(contained, package);
+            return getUnqualified(contained, package);
         }
     }
 
@@ -2192,7 +2182,7 @@
                 }
             }
 
-            string ignore;
+            string ignored;
             const size_t wireSize = elemType->minWireSize();
 
             if(marshal)
@@ -2220,8 +2210,8 @@
                     writeSequenceMarshalUnmarshalCode(out, package, seq, s, marshal, iter, true, customStream, metaData);
                     out << nl << stream << ".endSize(pos);";
                 }
-                else if(findMetaData("java:type:", metaData, ignore) ||
-                        findMetaData("java:type:", seq->getMetaData(), ignore))
+                else if(findMetaData("java:type:", metaData, ignored) ||
+                        findMetaData("java:type:", seq->getMetaData(), ignored))
                 {
                     //
                     // The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
@@ -2247,8 +2237,8 @@
                     }
                     writeSequenceMarshalUnmarshalCode(out, package, seq, tmpName, marshal, iter, true, customStream, metaData);
                 }
-                else if(findMetaData("java:protobuf:", seq->getMetaData(), ignore) ||
-                        findMetaData("java:serializable:", seq->getMetaData(), ignore))
+                else if(findMetaData("java:protobuf:", seq->getMetaData(), ignored) ||
+                        findMetaData("java:serializable:", seq->getMetaData(), ignored))
                 {
                     //
                     // This just writes a byte sequence.
@@ -2309,8 +2299,8 @@
                 }
                 else if(wireSize > 1)
                 {
-                    if(findMetaData("java:type:", metaData, ignore) ||
-                       findMetaData("java:type:", seq->getMetaData(), ignore))
+                    if(findMetaData("java:type:", metaData, ignored) ||
+                       findMetaData("java:type:", seq->getMetaData(), ignored))
                     {
                         //
                         // The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
@@ -2318,8 +2308,8 @@
 
                         out << nl << stream << ".skipSize();";
                     }
-                    else if(!findMetaData("java:protobuf:", seq->getMetaData(), ignore) &&
-                            !findMetaData("java:serializable:", seq->getMetaData(), ignore))
+                    else if(!findMetaData("java:protobuf:", seq->getMetaData(), ignored) &&
+                            !findMetaData("java:serializable:", seq->getMetaData(), ignored))
                     {
                         out << nl << stream << ".skipSize();";
                     }
@@ -2350,7 +2340,7 @@
 
     ConstructedPtr constructed = ConstructedPtr::dynamicCast(type);
     assert(constructed);
-    string typeS = getAbsolute(constructed, package, "", "Helper");
+    string typeS = getUnqualified(constructed, package, "", "Helper");
     if(marshal)
     {
         out << nl << typeS << ".write(" << stream << ", " << v << ");";
@@ -2410,7 +2400,7 @@
     //
     if(useHelper)
     {
-        string typeS = getAbsolute(dict, package, "", "Helper");
+        string typeS = getUnqualified(dict, package, "", "Helper");
         if(marshal)
         {
             out << nl << typeS << ".write(" << stream << ", " << v << ");";
@@ -2718,7 +2708,7 @@
     //
     if(useHelper)
     {
-        string typeS = getAbsolute(seq, package, "", "Helper");
+        string typeS = getUnqualified(seq, package, "", "Helper");
         if(marshal)
         {
             out << nl << typeS << ".write(" << stream << ", " << v << ");";
@@ -2759,7 +2749,7 @@
         // Marshal/unmarshal a custom sequence type.
         //
         BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        string typeS = getAbsolute(seq, package);
+        string typeS = getUnqualified(seq, package);
         ostringstream o;
         o << origContentS;
         int d = depth;
@@ -2777,7 +2767,7 @@
             out << nl << "else";
             out << sb;
             out << nl << stream << ".writeSize(" << v << ".size());";
-            string typeS = typeToString(type, TypeModeIn, package);
+            typeS = typeToString(type, TypeModeIn, package);
             out << nl << "for(" << typeS << " elem : " << v << ')';
             out << sb;
             writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, "elem", true, iter, false, customStream);
@@ -3208,8 +3198,8 @@
         {
             string prefix = "java:buffer";
             string meta;
-            string ignore;
-            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignore))
+            string ignored;
+            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignored))
             {
                 instanceType = formalType = typeToBufferString(seq->type());
                 return true;
@@ -3451,11 +3441,11 @@
     string q;
     if(!m->findMetaData(prefix, q))
     {
-        UnitPtr unit = cont->unit();
+        UnitPtr ut = cont->unit();
         string file = cont->file();
         assert(!file.empty());
 
-        DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        DefinitionContextPtr dc = ut->findDefinitionContext(file);
         assert(dc);
         q = dc->findMetaData(prefix);
     }
@@ -3489,7 +3479,7 @@
 }
 
 string
-Slice::JavaGenerator::getAbsolute(const std::string& type, const std::string& package) const
+Slice::JavaGenerator::getUnqualified(const std::string& type, const std::string& package) const
 {
     if(type.find(".") != string::npos && type.find(package) == 0 && type.find(".", package.size() + 1) == string::npos)
     {
@@ -3499,7 +3489,7 @@
 }
 
 string
-Slice::JavaGenerator::getAbsolute(const ContainedPtr& cont,
+Slice::JavaGenerator::getUnqualified(const ContainedPtr& cont,
                                   const string& package,
                                   const string& prefix,
                                   const string& suffix) const
@@ -3534,15 +3524,15 @@
 
     if(b && b->kind() == Builtin::KindObject)
     {
-        return getAbsolute("com.zeroc.Ice.Object", package) + ".ice_staticId()";
+        return getUnqualified("com.zeroc.Ice.Object", package) + ".ice_staticId()";
     }
     else if(b && b->kind() == Builtin::KindValue)
     {
-        return getAbsolute("com.zeroc.Ice.Value", package) + ".ice_staticId()";
+        return getUnqualified("com.zeroc.Ice.Value", package) + ".ice_staticId()";
     }
     else
     {
-        return getAbsolute(cl, package) + ".ice_staticId()";
+        return getUnqualified(cl, package) + ".ice_staticId()";
     }
 }
 
@@ -3726,7 +3716,7 @@
                 case Builtin::KindFloat:
                 case Builtin::KindDouble:
                 {
-                    return getAbsolute(builtinOptionalTable[builtin->kind()], package);
+                    return getUnqualified(builtinOptionalTable[builtin->kind()], package);
                 }
                 case Builtin::KindString:
                 case Builtin::KindObject:
@@ -3742,11 +3732,11 @@
         {
             if(!local && builtin->kind() == Builtin::KindObject)
             {
-                return getAbsolute(builtinTable[Builtin::KindValue], package);
+                return getUnqualified(builtinTable[Builtin::KindValue], package);
             }
             else
             {
-                return getAbsolute(builtinTable[builtin->kind()], package);
+                return getUnqualified(builtinTable[builtin->kind()], package);
             }
         }
     }
@@ -3762,11 +3752,11 @@
     {
         if(cl->isInterface() && !local)
         {
-            return getAbsolute("com.zeroc.Ice.Value", package);
+            return getUnqualified("com.zeroc.Ice.Value", package);
         }
         else
         {
-            return getAbsolute(cl, package);
+            return getUnqualified(cl, package);
         }
     }
 
@@ -3777,11 +3767,11 @@
         assert(def);
         if(def->isAbstract())
         {
-            return getAbsolute(proxy->_class(), package, "", "Prx");
+            return getUnqualified(proxy->_class(), package, "", "Prx");
         }
         else
         {
-            return getAbsolute("com.zeroc.Ice.ObjectPrx", package);
+            return getUnqualified("com.zeroc.Ice.ObjectPrx", package);
         }
     }
 
@@ -3806,11 +3796,11 @@
     {
         if(mode == TypeModeOut)
         {
-            return getAbsolute(contained, package, "", "Holder");
+            return getUnqualified(contained, package, "", "Holder");
         }
         else
         {
-            return getAbsolute(contained, package);
+            return getUnqualified(contained, package);
         }
     }
 
@@ -4087,7 +4077,7 @@
                 //
                 // If we can use the helper, it's easy.
                 //
-                string helper = getAbsolute(dict, package, "", "Helper");
+                string helper = getUnqualified(dict, package, "", "Helper");
                 if(marshal)
                 {
                     out << nl << helper << ".write" << spar << stream << tag << param << epar << ";";
@@ -4182,7 +4172,7 @@
     {
         if(optionalParam || mode == OptionalMember)
         {
-            string ignore;
+            string ignored;
             TypePtr elemType = seq->type();
             BuiltinPtr eltBltin = BuiltinPtr::dynamicCast(elemType);
             if(!hasTypeMetaData(seq, metaData) && eltBltin && eltBltin->kind() < Builtin::KindObject)
@@ -4199,7 +4189,7 @@
                     return;
                 }
             }
-            else if(findMetaData("java:serializable", seq->getMetaData(), ignore))
+            else if(findMetaData("java:serializable", seq->getMetaData(), ignored))
             {
                 if(marshal)
                 {
@@ -4213,15 +4203,15 @@
                 }
             }
             else if(!hasTypeMetaData(seq, metaData) ||
-                    findMetaData("java:type", seq->getMetaData(), ignore) ||
-                    findMetaData("java:type", metaData, ignore))
+                    findMetaData("java:type", seq->getMetaData(), ignored) ||
+                    findMetaData("java:type", metaData, ignored))
             {
                 string instanceType, formalType, origInstanceType, origFormalType;
                 getSequenceTypes(seq, "", metaData, instanceType, formalType, false);
                 getSequenceTypes(seq, "", StringList(), origInstanceType, origFormalType, false);
                 if(formalType == origFormalType && (marshal || instanceType == origInstanceType))
                 {
-                    string helper = getAbsolute(seq, package, "", "Helper");
+                    string helper = getUnqualified(seq, package, "", "Helper");
                     if(marshal)
                     {
                         out << nl << helper << ".write" << spar << stream << tag << param << epar << ";";
@@ -4265,10 +4255,10 @@
                     string s = optionalParam && optionalMapping ? param + ".get()" : param;
                     if(sz > 1)
                     {
-                        string ignore;
+                        string ignored2;
                         out << nl << "final int optSize = " << s << " == null ? 0 : ";
-                        if(findMetaData("java:buffer", seq->getMetaData(), ignore) ||
-                           findMetaData("java:buffer", metaData, ignore))
+                        if(findMetaData("java:buffer", seq->getMetaData(), ignored2) ||
+                           findMetaData("java:buffer", metaData, ignored2))
                         {
                             out << s << ".remaining() / " << sz << ";";
                         }
@@ -4401,7 +4391,7 @@
         //
         // If we can use the helper, it's easy.
         //
-        string helper = getAbsolute(dict, package, "", "Helper");
+        string helper = getUnqualified(dict, package, "", "Helper");
         if(marshal)
         {
             out << nl << helper << ".write" << spar << stream << v << epar << ";";
@@ -4470,7 +4460,7 @@
             out << nl << "final " << keyS << " key;";
             writeMarshalUnmarshalCode(out, package, key, OptionalNone, false, 0, "key", false, iter, customStream);
 
-            string valueS = typeToObjectString(value, TypeModeIn, package);
+            valueS = typeToObjectString(value, TypeModeIn, package);
             ostringstream patchParams;
             patchParams << "value -> " << v << ".put(key, value), " << valueS << ".class";
             writeMarshalUnmarshalCode(out, package, value, OptionalNone, false, 0, "value", false, iter, customStream,
@@ -4630,7 +4620,7 @@
         //
         // If we can use the helper, it's easy.
         //
-        string helper = getAbsolute(seq, package, "", "Helper");
+        string helper = getUnqualified(seq, package, "", "Helper");
         if(marshal)
         {
             out << nl << helper << ".write" << spar << stream << v << epar << ";";
@@ -4671,7 +4661,7 @@
         // Marshal/unmarshal a custom sequence type.
         //
         BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        string typeS = getAbsolute(seq, package);
+        typeS = getUnqualified(seq, package);
         ostringstream o;
         o << origContentS;
         int d = depth;
@@ -4689,8 +4679,8 @@
             out << nl << "else";
             out << sb;
             out << nl << stream << ".writeSize(" << v << ".size());";
-            string typeS = typeToString(type, TypeModeIn, package);
-            out << nl << "for(" << typeS << " elem : " << v << ')';
+            string ctypeS = typeToString(type, TypeModeIn, package);
+            out << nl << "for(" << ctypeS << " elem : " << v << ')';
             out << sb;
             writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, "elem", true, iter, customStream);
             out << eb;
@@ -5112,8 +5102,8 @@
         {
             string prefix = "java:buffer";
             string meta;
-            string ignore;
-            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignore))
+            string ignored;
+            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignored))
             {
                 instanceType = formalType = typeToBufferString(seq->type());
                 return true;
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/JavaUtil.h zeroc-ice-3.7.2/cpp/src/Slice/JavaUtil.h
--- zeroc-ice-3.7.1/cpp/src/Slice/JavaUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/JavaUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef JAVA_UTIL_H
 #define JAVA_UTIL_H
@@ -107,13 +102,13 @@
     //
     std::string getPackage(const ContainedPtr&) const;
 
-    std::string getAbsolute(const std::string&, const std::string&) const;
+    std::string getUnqualified(const std::string&, const std::string&) const;
     //
     // Returns the Java name for a Contained entity. If the optional
     // package argument matches the entity's package name, then the
     // package is removed from the result.
     //
-    std::string getAbsolute(const ContainedPtr&,
+    std::string getUnqualified(const ContainedPtr&,
                             const std::string& = std::string(),
                             const std::string& = std::string(),
                             const std::string& = std::string()) const;
@@ -277,14 +272,14 @@
     // Returns the Java type without a package if the package
     // matches the current package
     //
-    std::string getAbsolute(const std::string&, const std::string&) const;
+    std::string getUnqualified(const std::string&, const std::string&) const;
 
     //
     // Returns the Java name for a Contained entity. If the optional
     // package argument matches the entity's package name, then the
     // package is removed from the result.
     //
-    std::string getAbsolute(const ContainedPtr&,
+    std::string getUnqualified(const ContainedPtr&,
                             const std::string& = std::string(),
                             const std::string& = std::string(),
                             const std::string& = std::string()) const;
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Makefile.mk zeroc-ice-3.7.2/cpp/src/Slice/Makefile.mk
--- zeroc-ice-3.7.1/cpp/src/Slice/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := Slice
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/MD5.cpp zeroc-ice-3.7.2/cpp/src/Slice/MD5.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/MD5.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/MD5.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/MD5.h>
 #include <Slice/MD5I.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/MD5.h zeroc-ice-3.7.2/cpp/src/Slice/MD5.h
--- zeroc-ice-3.7.1/cpp/src/Slice/MD5.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/MD5.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_MD5_H
 #define SLICE_MD5_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Parser.cpp zeroc-ice-3.7.2/cpp/src/Slice/Parser.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/Parser.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Parser.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Functional.h>
 #include <IceUtil/InputUtil.h>
@@ -16,8 +11,9 @@
 #include <cstring>
 #include <iterator>
 
-#ifdef _WIN32
-#   include <io.h>
+// TODO: fix this warning once we no longer support VS2013 and earlier
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#    pragma warning(disable:4589) // Constructor of abstract class 'Slice::Type' ignores initializer...
 #endif
 
 using namespace std;
@@ -26,6 +22,8 @@
 extern FILE* slice_in;
 extern int slice_debug;
 
+int slice_parse();
+
 //
 // Operation attributes
 //
@@ -114,18 +112,18 @@
 }
 
 void
-checkDeprecatedType(const UnitPtr& unit, const TypePtr& type)
+checkDeprecatedType(const UnitPtr& unt, const TypePtr& type)
 {
     ClassDeclPtr decl = ClassDeclPtr::dynamicCast(type);
     if(decl && !decl->isLocal() && decl->isInterface())
     {
-        unit->warning(Deprecated, "interface by value is deprecated");
+        unt->warning(Deprecated, "interface by value is deprecated");
     }
 
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy && !proxy->_class()->isInterface())
     {
-        unit->warning(Deprecated, "proxy for a class is deprecated");
+        unt->warning(Deprecated, "proxy for a class is deprecated");
     }
 }
 
@@ -362,12 +360,13 @@
 {
 }
 
-Slice::SyntaxTreeBase::SyntaxTreeBase(const UnitPtr& unit) :
-    _unit(unit)
+Slice::SyntaxTreeBase::SyntaxTreeBase(const UnitPtr& unt, const DefinitionContextPtr& definitionContext) :
+    _unit(unt),
+    _definitionContext(definitionContext)
 {
-    if(_unit)
+    if(!_definitionContext && _unit)
     {
-        _definitionContext = unit->currentDefinitionContext();
+        _definitionContext = unt->currentDefinitionContext();
     }
 }
 
@@ -375,8 +374,8 @@
 // Type
 // ----------------------------------------------------------------------
 
-Slice::Type::Type(const UnitPtr& unit) :
-    SyntaxTreeBase(unit)
+Slice::Type::Type(const UnitPtr& unt) :
+    SyntaxTreeBase(unt)
 {
 }
 
@@ -481,6 +480,7 @@
         1, // KindString: at least one byte for an empty string.
         1, // KindObject: at least one byte (to marshal an index instead of an instance).
         2, // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes.
+        0, // KindLocalObject: unused
         1  // KindValue: at least one byte (to marshal an index instead of an instance).
     };
 
@@ -522,9 +522,9 @@
         "Value"
     };
 
-Slice::Builtin::Builtin(const UnitPtr& unit, Kind kind) :
-    SyntaxTreeBase(unit),
-    Type(unit),
+Slice::Builtin::Builtin(const UnitPtr& ut, Kind kind) :
+    SyntaxTreeBase(ut),
+    Type(ut),
     _kind(kind)
 {
     //
@@ -2070,10 +2070,10 @@
                 string name = scoped.substr(lastColon + 1);
                 for(EnumList::iterator p = enums.begin(); p != enums.end(); ++p)
                 {
-                    ContainedList cl = (*p)->lookupContained(name, false);
-                    if(!cl.empty())
+                    ContainedList cl2 = (*p)->lookupContained(name, false);
+                    if(!cl2.empty())
                     {
-                        result.push_back(EnumeratorPtr::dynamicCast(cl.front()));
+                        result.push_back(EnumeratorPtr::dynamicCast(cl2.front()));
                     }
                 }
             }
@@ -2441,18 +2441,39 @@
 }
 
 bool
-Slice::Container::hasAbstractClassDefs() const
+Slice::Container::hasOperations() const
 {
     for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
     {
         ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
-        if(cl && cl->isAbstract())
+        if(cl && cl->hasOperations())
         {
             return true;
         }
 
         ContainerPtr container = ContainerPtr::dynamicCast(*p);
-        if(container && container->hasAbstractClassDefs())
+        if(container && container->hasOperations())
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool
+Slice::Container::hasNonLocalAbstractClassDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+        if(cl && cl->isAbstract() && !cl->isLocal())
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasNonLocalAbstractClassDefs())
         {
             return true;
         }
@@ -3504,7 +3525,7 @@
 
 void
 Slice::ClassDecl::checkBasesAreLegal(const string& name, bool intf, bool local, const ClassList& bases,
-                                     const UnitPtr& unit)
+                                     const UnitPtr& ut)
 {
     //
     // Local definitions cannot have non-local bases, and vice versa.
@@ -3517,7 +3538,7 @@
             msg << (local ? "local" : "non-local") << " " << (intf ? "interface" : "class") << " `"
                 << name << "' cannot have " << ((*p)->isLocal() ? "local" : "non-local") << " base "
                 << ((*p)->isInterface() ? "interface" : "class") << " `" << (*p)->name() << "'";
-            unit->error(msg.str());
+            ut->error(msg.str());
         }
     }
 
@@ -3554,7 +3575,7 @@
         // name (that is, if the union of the intersections of all possible pairs
         // of partitions is empty).
         //
-        checkPairIntersections(spl, name, unit);
+        checkPairIntersections(spl, name, ut);
     }
 }
 
@@ -3656,7 +3677,7 @@
 // in the other and, if so, complain.
 //
 void
-Slice::ClassDecl::checkPairIntersections(const StringPartitionList& l, const string& name, const UnitPtr& unit)
+Slice::ClassDecl::checkPairIntersections(const StringPartitionList& l, const string& name, const UnitPtr& ut)
 {
     set<string> reported;
     for(StringPartitionList::const_iterator i = l.begin(); i != l.end(); ++i)
@@ -3673,7 +3694,7 @@
                     {
                         string msg = "ambiguous multiple inheritance: `" + name;
                         msg += "' inherits operation `" + *s1 + "' from two or more unrelated base interfaces";
-                        unit->error(msg);
+                        ut->error(msg);
                         reported.insert(*s1);
                     }
                     else if(!CICompare()(*s1, *s2) && !CICompare()(*s2, *s1) &&
@@ -3682,7 +3703,7 @@
                         string msg = "ambiguous multiple inheritance: `" + name;
                         msg += "' inherits operations `" + *s1 + "' and `" + *s2;
                         msg += "', which differ only in capitalization, from unrelated base interfaces";
-                        unit->error(msg);
+                        ut->error(msg);
                         reported.insert(*s1);
                         reported.insert(*s2);
                     }
@@ -3784,8 +3805,8 @@
             }
 
             string baseName = IceUtilInternal::toLower((*q)->name());
-            string newName = IceUtilInternal::toLower(name);
-            if(baseName == newName)
+            string newName2 = IceUtilInternal::toLower(name);
+            if(baseName == newName2)
             {
                 string msg = "operation `" + name + "' differs only in capitalization from " + (*q)->kindOf();
                 msg += " `" + (*q)->name() + "', which is defined in a base interface or class";
@@ -3880,8 +3901,8 @@
             }
 
             string baseName = IceUtilInternal::toLower((*q)->name());
-            string newName = IceUtilInternal::toLower(name);
-            if(baseName == newName)
+            string newName2 = IceUtilInternal::toLower(name);
+            if(baseName == newName2)
             {
                 string msg = "data member `" + name + "' differs only in capitalization from " + (*q)->kindOf();
                 msg += " `" + (*q)->name() + "', which is defined in a base interface or class";
@@ -3989,14 +4010,26 @@
 OperationList
 Slice::ClassDef::allOperations() const
 {
-    OperationList result = operations();
-    result.sort();
-    result.unique();
+    OperationList result;
     for(ClassList::const_iterator p = _bases.begin(); p != _bases.end(); ++p)
     {
         OperationList li = (*p)->allOperations();
-        result.merge(li);
-        result.unique();
+        for(OperationList::const_iterator q = li.begin(); q != li.end(); ++q)
+        {
+            if(find(result.begin(), result.end(), *q) == result.end())
+            {
+                result.push_back(*q);
+            }
+        }
+    }
+
+    OperationList li = operations();
+    for(OperationList::const_iterator q = li.begin(); q != li.end(); ++q)
+    {
+        if(find(result.begin(), result.end(), *q) == result.end())
+        {
+            result.push_back(*q);
+        }
     }
     return result;
 }
@@ -4346,8 +4379,8 @@
 }
 
 Slice::Proxy::Proxy(const ClassDeclPtr& cl) :
-     SyntaxTreeBase(cl->unit()),
-     Type(cl->unit()),
+    SyntaxTreeBase(cl->unit(), cl->definitionContext()),
+    Type(cl->unit()),
     _classDecl(cl)
 {
 }
@@ -4414,8 +4447,8 @@
             }
 
             string baseName = IceUtilInternal::toLower((*r)->name());
-            string newName = IceUtilInternal::toLower(name);
-            if(baseName == newName)
+            string newName2 = IceUtilInternal::toLower(name);
+            if(baseName == newName2)
             {
                 string msg = "exception member `" + name + "' differs only in capitalization from exception member `";
                 msg += (*r)->name() + "', which is defined in a base exception";
@@ -5967,7 +6000,7 @@
             //
             freezeMD = freezeMD.substr(1);
 
-            int i = 0;
+            i = 0;
             while(i < 4)
             {
                 if(freezeMD.find(txAttribute[i]) == 0)
@@ -6665,7 +6698,7 @@
 }
 
 std::string
-Slice::Unit::getTypeId(int compactId)
+Slice::Unit::getTypeId(int compactId) const
 {
     map<int, string>::const_iterator p = _typeIds.find(compactId);
     if(p != _typeIds.end())
@@ -6676,6 +6709,12 @@
 }
 
 bool
+Slice::Unit::hasCompactTypeId() const
+{
+    return _typeIds.size() > 0;
+}
+
+bool
 Slice::Unit::usesNonLocals() const
 {
     for(map<string, ContainedList>::const_iterator p = _contentMap.begin(); p != _contentMap.end(); ++p)
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Parser.h zeroc-ice-3.7.2/cpp/src/Slice/Parser.h
--- zeroc-ice-3.7.1/cpp/src/Slice/Parser.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Parser.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_PARSER_H
 #define SLICE_PARSER_H
@@ -319,7 +314,7 @@
 
 protected:
 
-    SyntaxTreeBase(const UnitPtr&);
+    SyntaxTreeBase(const UnitPtr&, const DefinitionContextPtr& = 0);
 
     UnitPtr _unit;
     DefinitionContextPtr _definitionContext;
@@ -507,7 +502,8 @@
     bool hasNonLocalInterfaceDefs() const;
     bool hasValueDefs() const;
     bool hasOnlyClassDecls() const;
-    bool hasAbstractClassDefs() const;
+    bool hasOperations() const; // interfaces or classes with operations
+    bool hasNonLocalAbstractClassDefs() const; // interfaces or abstract classes
     bool hasNonLocalDataOnlyClasses() const;
     bool hasOtherConstructedOrExceptions() const; // Exceptions or constructed types other than classes.
     bool hasContentsWithMetaData(const std::string&) const;
@@ -1092,7 +1088,8 @@
     ContainedList findUsedBy(const ContainedPtr&) const;
 
     void addTypeId(int, const std::string&);
-    std::string getTypeId(int);
+    std::string getTypeId(int) const;
+    bool hasCompactTypeId() const;
 
     bool usesNonLocals() const;
     bool usesConsts() const;
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/PHPUtil.cpp zeroc-ice-3.7.2/cpp/src/Slice/PHPUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/PHPUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/PHPUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/PHPUtil.h>
 #include <functional>
@@ -19,7 +14,12 @@
 lowerCase(const string& s)
 {
     string result(s);
+#ifdef ICE_CPP11_COMPILER
+    transform(result.begin(), result.end(), result.begin(),
+              [](char c){ return static_cast<char>(::tolower(static_cast<unsigned char>(c))); });
+#else
     transform(result.begin(), result.end(), result.begin(), ::tolower);
+#endif
     return result;
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/PHPUtil.h zeroc-ice-3.7.2/cpp/src/Slice/PHPUtil.h
--- zeroc-ice-3.7.1/cpp/src/Slice/PHPUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/PHPUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_PHP_UTIL_H
 #define SLICE_PHP_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Preprocessor.cpp zeroc-ice-3.7.2/cpp/src/Slice/Preprocessor.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/Preprocessor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Preprocessor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/Preprocessor.h>
 #include <Slice/Util.h>
@@ -309,7 +304,7 @@
 
 bool
 Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, const vector<string>& includePaths,
-                                               const vector<string>& extraArgs, const string& cppSourceExt,
+                                               const vector<string>& extraArgs, const string& /*cppSourceExt*/,
                                                const string& optValue)
 {
     if(!checkInputFile())
@@ -548,7 +543,7 @@
             }
         }
 
-        string::size_type pos = 0;
+        pos = 0;
         while((pos = result.find("\\", pos + 1)) != string::npos)
         {
             result.insert(pos, 1, '\\');
@@ -590,7 +585,7 @@
             //
             // Change .o[bj] suffix to the h header extension suffix.
             //
-            string::size_type pos = result.find(suffix);
+            pos = result.find(suffix);
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);
@@ -621,7 +616,7 @@
             //
             // Find end of next file.
             //
-            string::size_type pos = 0;
+            pos = 0;
             while((pos = result.find_first_of(" :\t\r\n\\", pos + 1)) != string::npos)
             {
                 if(result[pos] == ':')
@@ -654,7 +649,7 @@
             //
             // Change .o[bj] suffix to .cs suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".cs");
@@ -668,7 +663,7 @@
             //
             // Change .o[bj] suffix to .js suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".js");
@@ -684,7 +679,7 @@
             {
                 result = pyPrefix + result;
             }
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, "_ice.py");
@@ -696,7 +691,7 @@
             //
             // Change .o[bj] suffix to .rb suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".rb");
@@ -708,7 +703,7 @@
             //
             // Change .o[bj] suffix to .php suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".php");
@@ -717,7 +712,7 @@
         }
         case ObjC:
         {
-            string::size_type pos = result.find(suffix);
+            pos = result.find(suffix);
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Preprocessor.h zeroc-ice-3.7.2/cpp/src/Slice/Preprocessor.h
--- zeroc-ice-3.7.1/cpp/src/Slice/Preprocessor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Preprocessor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef PREPROCESSOR_H
 #define PREPROCESSOR_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Python.cpp zeroc-ice-3.7.2/cpp/src/Slice/Python.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/Python.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Python.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
@@ -92,7 +86,7 @@
     if(IceUtilInternal::mkdir(dir, 0777) != 0)
     {
         ostringstream os;
-        os << "cannot create directory '" << dir << "': " << strerror(errno);
+        os << "cannot create directory '" << dir << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 }
@@ -132,7 +126,7 @@
             if(IceUtilInternal::mkdir(path, 0777) != 0)
             {
                 ostringstream os;
-                os << "cannot create directory '" << path << "': " << strerror(errno);
+                os << "cannot create directory '" << path << "': " << IceUtilInternal::errorToString(errno);
                 throw FileException(__FILE__, __LINE__, os.str());
             }
             FileTracker::instance()->addDirectory(path);
@@ -149,21 +143,21 @@
         // PackageVisitor. We need every intermediate subdirectory to have an __init__.py file, which
         // can be empty.
         //
-        const string init = path + "/__init__.py";
-        if(!IceUtilInternal::fileExists(init))
+        const string initFile = path + "/__init__.py";
+        if(!IceUtilInternal::fileExists(initFile))
         {
             //
             // Create an empty file.
             //
             IceUtilInternal::Output out;
-            out.open(init.c_str());
+            out.open(initFile.c_str());
             if(!out)
             {
                 ostringstream os;
-                os << "cannot open '" << init << "': " << strerror(errno);
+                os << "cannot open '" << initFile << "': " << IceUtilInternal::errorToString(errno);
                 throw FileException(__FILE__, __LINE__, os.str());
             }
-            FileTracker::instance()->addFile(init);
+            FileTracker::instance()->addFile(initFile);
         }
     }
 }
@@ -226,24 +220,24 @@
 }
 
 void
-PackageVisitor::createModules(const UnitPtr& unit, const string& module, const string& dir)
+PackageVisitor::createModules(const UnitPtr& unt, const string& module, const string& dir)
 {
     StringList modules;
     PackageVisitor v(modules);
-    unit->visit(&v, false);
+    unt->visit(&v, false);
 
     for(StringList::iterator p = modules.begin(); p != modules.end(); ++p)
     {
-        vector<string> v;
-        if(!IceUtilInternal::splitString(*p, ".", v))
+        vector<string> vs;
+        if(!IceUtilInternal::splitString(*p, ".", vs))
         {
             assert(false);
         }
         string currentModule;
         string path = dir.empty() ? "." : dir;
-        for(vector<string>::iterator q = v.begin(); q != v.end(); ++q)
+        for(vector<string>::iterator q = vs.begin(); q != vs.end(); ++q)
         {
-            if(q != v.begin())
+            if(q != vs.begin())
             {
                 addSubmodule(path, currentModule, *q);
                 currentModule += ".";
@@ -322,7 +316,7 @@
         if(!in)
         {
             ostringstream os;
-            os << "cannot open file '" << initPath << "': " << strerror(errno);
+            os << "cannot open file '" << initPath << "': " << IceUtilInternal::errorToString(errno);
             throw FileException(__FILE__, __LINE__, os.str());
         }
 
@@ -414,9 +408,9 @@
     ofstream os(IceUtilInternal::streamFilename(initPath).c_str());
     if(!os)
     {
-        ostringstream os;
-        os << "cannot open file '" << initPath << "': " << strerror(errno);
-        throw FileException(__FILE__, __LINE__, os.str());
+        ostringstream oss;
+        oss << "cannot open file '" << initPath << "': " << IceUtilInternal::errorToString(errno);
+        throw FileException(__FILE__, __LINE__, oss.str());
     }
     FileTracker::instance()->addFile(initPath);
 
@@ -750,9 +744,9 @@
                             out.open(path.c_str());
                             if(!out)
                             {
-                                ostringstream os;
-                                os << "cannot open '" << path << "': " << strerror(errno);
-                                throw FileException(__FILE__, __LINE__, os.str());
+                                ostringstream oss;
+                                oss << "cannot open '" << path << "': " << IceUtilInternal::errorToString(errno);
+                                throw FileException(__FILE__, __LINE__, oss.str());
                             }
                             FileTracker::instance()->addFile(path);
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/PythonUtil.cpp zeroc-ice-3.7.2/cpp/src/Slice/PythonUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/PythonUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/PythonUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/PythonUtil.h>
 #include <Slice/Checksum.h>
@@ -432,7 +427,8 @@
             _out << nl << "_M_" << getAbsolute(p, "_t_") << " = IcePy.declareValue('" << scoped << "')";
         }
 
-        if(!p->isLocal() && (p->isInterface() || p->definition()->allOperations().size()))
+        ClassDefPtr def = p->definition();
+        if(!p->isLocal() && (p->isInterface() || (def && def->allOperations().size())))
         {
             _out << nl << "_M_" << getAbsolute(p, "_t_", "Disp") << " = IcePy.declareClass('" << scoped << "')";
             _out << nl << "_M_" << getAbsolute(p, "_t_", "Prx") << " = IcePy.declareProxy('" << scoped << "')";
@@ -459,7 +455,7 @@
                 if((*oli)->hasMarshaledResult())
                 {
                     string name = (*oli)->name();
-                    name[0] = toupper(static_cast<unsigned char>(name[0]));
+                    name[0] = static_cast<char>(toupper(static_cast<unsigned char>(name[0])));
                     _out << sp;
                     _out << nl << "\"\"\"";
                     _out << nl << "Immediately marshals the result of an invocation of " << (*oli)->name()
@@ -1831,7 +1827,7 @@
     if(prx)
     {
         ClassDefPtr def = prx->_class()->definition();
-        if(def->isInterface() || def->allOperations().size() > 0)
+        if(def && (def->isInterface() || def->allOperations().size() > 0))
         {
             _out << "_M_" << getAbsolute(prx->_class(), "_t_", "Prx");
         }
@@ -2307,12 +2303,12 @@
         string::size_type start = 0;
         while(start != string::npos)
         {
-            string::size_type nl = text.find_first_of("\r\n", start);
+            string::size_type newline = text.find_first_of("\r\n", start);
             string line;
-            if(nl != string::npos)
+            if(newline != string::npos)
             {
-                line = text.substr(start, nl - start);
-                start = nl;
+                line = text.substr(start, newline - start);
+                start = newline;
             }
             else
             {
@@ -2849,7 +2845,7 @@
 }
 
 string
-Slice::Python::getPackageDirectory(const string& file, const UnitPtr& unit)
+Slice::Python::getPackageDirectory(const string& file, const UnitPtr& ut)
 {
     //
     // file must be a fully-qualified path name.
@@ -2858,7 +2854,7 @@
     //
     // Check if the file contains the python:pkgdir global metadata.
     //
-    DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
     const string prefix = "python:pkgdir:";
     string pkgdir = dc->findMetaData(prefix);
@@ -2874,7 +2870,7 @@
 }
 
 string
-Slice::Python::getImportFileName(const string& file, const UnitPtr& unit, const vector<string>& includePaths)
+Slice::Python::getImportFileName(const string& file, const UnitPtr& ut, const vector<string>& includePaths)
 {
     //
     // The file and includePaths arguments must be fully-qualified path names.
@@ -2883,7 +2879,7 @@
     //
     // Check if the file contains the python:pkgdir global metadata.
     //
-    string pkgdir = getPackageDirectory(file, unit);
+    string pkgdir = getPackageDirectory(file, ut);
     if(!pkgdir.empty())
     {
         //
@@ -3046,11 +3042,11 @@
     string q;
     if(!m->findMetaData(prefix, q))
     {
-        UnitPtr unit = cont->unit();
+        UnitPtr ut = cont->unit();
         string file = cont->file();
         assert(!file.empty());
 
-        DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        DefinitionContextPtr dc = ut->findDefinitionContext(file);
         assert(dc);
         q = dc->findMetaData(prefix);
     }
@@ -3088,14 +3084,9 @@
 Slice::Python::printHeader(IceUtilInternal::Output& out)
 {
     static const char* header =
-"# **********************************************************************\n"
-"#\n"
-"# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# **********************************************************************\n"
         ;
 
     out << header;
@@ -3232,8 +3223,8 @@
     const string file = p->file();
     const string line = p->line();
     StringList protobufMetaData;
-    const UnitPtr unit = p->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    const UnitPtr ut = p->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
 
     for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); )
@@ -3285,8 +3276,8 @@
 Slice::Python::MetaDataVisitor::validateSequence(const string& file, const string& line,
                                                  const TypePtr& type, const StringList& metaData)
 {
-    const UnitPtr unit = type->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    const UnitPtr ut = type->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
 
     static const string prefix = "python:";
@@ -3296,17 +3287,53 @@
         string s = *p++;
         if(s.find(prefix) == 0)
         {
-            string::size_type pos = s.find(':', prefix.size());
-            if(pos != string::npos && s.substr(prefix.size(), pos - prefix.size()) == "seq")
+            SequencePtr seq = SequencePtr::dynamicCast(type);
+            if(seq)
             {
                 static const string seqPrefix = "python:seq:";
-                string arg = s.substr(seqPrefix.size(), pos - seqPrefix.size());
-                if(SequencePtr::dynamicCast(type))
+                if(s.find(seqPrefix) == 0)
+                {
+                    string arg = s.substr(seqPrefix.size());
+                    if(arg == "tuple" || arg == "list" || arg == "default")
+                    {
+                        continue;
+                    }
+                }
+                else if(s.size() > prefix.size())
                 {
+                    string arg = s.substr(prefix.size());
                     if(arg == "tuple" || arg == "list" || arg == "default")
                     {
                         continue;
                     }
+                    else if(arg == "array.array" || arg == "numpy.ndarray" || arg.find("memoryview:") == 0)
+                    {
+                        //
+                        // The memoryview sequence metadata is only valid for integral builtin
+                        // types excluding strings.
+                        //
+                        BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
+                        if(builtin)
+                        {
+                            switch(builtin->kind())
+                            {
+                            case Builtin::KindBool:
+                            case Builtin::KindByte:
+                            case Builtin::KindShort:
+                            case Builtin::KindInt:
+                            case Builtin::KindLong:
+                            case Builtin::KindFloat:
+                            case Builtin::KindDouble:
+                                {
+                                    continue;
+                                }
+                            default:
+                                {
+                                    break;
+                                }
+                            }
+                        }
+                    }
                 }
             }
             dc->warning(InvalidMetaData, file, line, "ignoring invalid metadata `" + s + "'");
@@ -3322,8 +3349,8 @@
     StringList localMetaData = cont->getMetaData();
     static const string prefix = "python:";
 
-    const UnitPtr unit = cont->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(cont->file());
+    const UnitPtr ut = cont->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(cont->file());
     assert(dc);
 
     for(StringList::const_iterator p = localMetaData.begin(); p != localMetaData.end();)
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/PythonUtil.h zeroc-ice-3.7.2/cpp/src/Slice/PythonUtil.h
--- zeroc-ice-3.7.1/cpp/src/Slice/PythonUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/PythonUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_PYTHON_UTIL_H
 #define SLICE_PYTHON_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Ruby.cpp zeroc-ice-3.7.2/cpp/src/Slice/Ruby.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/Ruby.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Ruby.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Mutex.h>
@@ -296,9 +291,9 @@
                         out.open(file.c_str());
                         if(!out)
                         {
-                            ostringstream os;
-                            os << "cannot open`" << file << "': " << strerror(errno);
-                            throw FileException(__FILE__, __LINE__, os.str());
+                            ostringstream oss;
+                            oss << "cannot open`" << file << "': " << IceUtilInternal::errorToString(errno);
+                            throw FileException(__FILE__, __LINE__, oss.str());
                         }
                         FileTracker::instance()->addFile(file);
                         //
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/RubyUtil.cpp zeroc-ice-3.7.2/cpp/src/Slice/RubyUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/RubyUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/RubyUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/RubyUtil.h>
 #include <Slice/Checksum.h>
@@ -191,7 +186,16 @@
 bool
 Slice::Ruby::CodeVisitor::visitModuleStart(const ModulePtr& p)
 {
-    _out << sp << nl << "module " << fixIdent(p->name(), IdentToUpper);
+    _out << sp << nl << "module ";
+    //
+    // Ensure that Slice top-level modules are defined as top
+    // level modules in Ruby
+    //
+    if(UnitPtr::dynamicCast(p->container()))
+    {
+        _out << "::";
+    }
+    _out << fixIdent(p->name(), IdentToUpper);
     _out.inc();
     return true;
 }
@@ -331,7 +335,6 @@
         //
         // read/write accessors for data members.
         //
-        DataMemberList members = p->dataMembers();
         if(!members.empty())
         {
             bool prot = p->hasMetaData("protected");
@@ -1556,14 +1559,9 @@
 Slice::Ruby::printHeader(IceUtilInternal::Output& out)
 {
     static const char* header =
-"# **********************************************************************\n"
-"#\n"
-"# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# **********************************************************************\n"
         ;
 
     out << header;
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/RubyUtil.h zeroc-ice-3.7.2/cpp/src/Slice/RubyUtil.h
--- zeroc-ice-3.7.1/cpp/src/Slice/RubyUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/RubyUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_RUBY_UTIL_H
 #define SLICE_RUBY_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Scanner.cpp zeroc-ice-3.7.2/cpp/src/Slice/Scanner.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/Scanner.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Scanner.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -54,7 +54,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -71,7 +71,7 @@
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -188,7 +188,7 @@
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -245,7 +245,7 @@
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -546,14 +546,9 @@
 #line 1 "src/Slice/Scanner.l"
 #line 2 "src/Slice/Scanner.l"
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
@@ -564,24 +559,19 @@
 #include <stdlib.h>
 #include <math.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
@@ -628,7 +618,7 @@
 
 
 
-#line 631 "src/Slice/Scanner.cpp"
+#line 626 "src/Slice/Scanner.cpp"
 
 #define INITIAL 0
 #define BOMSCAN 1
@@ -690,7 +680,7 @@
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-
+    
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -814,11 +804,11 @@
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
+    
+#line 93 "src/Slice/Scanner.l"
 
-#line 98 "src/Slice/Scanner.l"
 
-
-#line 821 "src/Slice/Scanner.cpp"
+#line 816 "src/Slice/Scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -903,7 +893,7 @@
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 100 "src/Slice/Scanner.l"
+#line 95 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -917,7 +907,7 @@
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 107 "src/Slice/Scanner.l"
+#line 102 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -930,7 +920,7 @@
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 114 "src/Slice/Scanner.l"
+#line 109 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -944,7 +934,7 @@
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
-#line 121 "src/Slice/Scanner.l"
+#line 116 "src/Slice/Scanner.l"
 {
     if(unit->scanPosition(slice_text))
     {
@@ -954,7 +944,7 @@
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 128 "src/Slice/Scanner.l"
+#line 123 "src/Slice/Scanner.l"
 {
     // C++-style comment
     BEGIN(MAINSCAN);
@@ -972,7 +962,7 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 143 "src/Slice/Scanner.l"
+#line 138 "src/Slice/Scanner.l"
 {
     // C-style comment
     BEGIN(MAINSCAN);
@@ -1016,7 +1006,7 @@
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 184 "src/Slice/Scanner.l"
+#line 179 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_OPEN;
@@ -1024,7 +1014,7 @@
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "src/Slice/Scanner.l"
+#line 184 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_METADATA_CLOSE;
@@ -1032,7 +1022,7 @@
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 194 "src/Slice/Scanner.l"
+#line 189 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_OPEN;
@@ -1040,7 +1030,7 @@
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 199 "src/Slice/Scanner.l"
+#line 194 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     return ICE_GLOBAL_METADATA_CLOSE;
@@ -1049,7 +1039,7 @@
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 204 "src/Slice/Scanner.l"
+#line 199 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
@@ -1086,7 +1076,7 @@
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 238 "src/Slice/Scanner.l"
+#line 233 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr ident = new StringTok;
@@ -1097,15 +1087,15 @@
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 246 "src/Slice/Scanner.l"
+#line 241 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     StringTokPtr str = new StringTok;
     str->literal = "\"";
     while(true)
     {
-        char c = static_cast<char>(yyinput());
-        str->literal += c;
+        int c = yyinput();
+        str->literal += static_cast<char>(c);
         if(c == '"')
         {
             break;
@@ -1115,15 +1105,15 @@
             unit->error("EOF in string");
             break;
         }
-        else if(static_cast<unsigned char>(c) < 32 || c == 127)
+        else if(c < 32 || c == 127)
         {
             unit->error("a string literal can only contain printable ASCII characters and non-ASCII characters");
             break;
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
-            str->literal += next;
+            int next = yyinput();
+            str->literal += static_cast<char>(next);
             switch(next)
             {
                 case '\\':
@@ -1139,7 +1129,7 @@
                 case '\'':
                 case '?':
                 {
-                    str->v += next;
+                    str->v += static_cast<char>(next);
                     break;
                 }
                 case 'a':
@@ -1193,16 +1183,16 @@
                 {
                     static string octalDigits = "01234567";
                     string escape;
-                    escape += next;
+                    escape += static_cast<char>(next);
                     for(int i = 0; i < 2; ++i)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(octalDigits.find_first_of(next) == string::npos)
+                        next = yyinput();
+                        if(octalDigits.find_first_of(static_cast<char>(next)) == string::npos)
                         {
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                     }
                     str->literal += escape;
                     IceUtil::Int64 value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
@@ -1217,15 +1207,15 @@
                 case 'x':
                 {
                     string escape = "";
-                    next = static_cast<char>(yyinput());
+                    next = yyinput();
 
                     //
                     // Unlike C++, we limit hex escape sequences to 2 hex digits
                     //
-                    while(isxdigit(next) && escape.length() < 2)
+                    while(isxdigit(static_cast<char>(next)) && escape.length() < 2)
                     {
-                        escape += next;
-                        next = static_cast<char>(yyinput());
+                        escape += static_cast<char>(next);
+                        next = yyinput();
                     }
                     unput(next);
 
@@ -1249,18 +1239,19 @@
                 case 'U':
                 {
                     string escape = "";
-                    char c = next;
+                    c = next;
                     int size = (c == 'u') ? 4 : 8;
                     while(size > 0)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(!isxdigit(static_cast<unsigned char>(next)))
+                        next = yyinput();
+                        if(!isxdigit(next))
                         {
-                            unit->error(string("unknown escape sequence in string literal: `\\") + c + escape + next + "'");
+                            unit->error(string("unknown escape sequence in string literal: `\\") +
+                                               static_cast<char>(c) + escape + static_cast<char>(next) + "'");
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                         --size;
                     }
 
@@ -1270,19 +1261,20 @@
                         IceUtil::Int64 codePoint = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
                         if(codePoint >= 0xd800 && codePoint <= 0xdfff)
                         {
-                            unit->error(string("a universal character name cannot designate a surrogate: `\\") + c + escape + "'");
+                            unit->error(string("a universal character name cannot designate a surrogate: `\\") +
+                                               static_cast<char>(c) + escape + "'");
                         }
                     }
 
                     str->literal += escape;
-                    str->v += string("\\") + c + escape;
+                    str->v += string("\\") + static_cast<char>(c) + escape;
                     break;
                 }
 
                 default:
                 {
                     ostringstream os;
-                    os << "unknown escape sequence `\\" << next << "'";
+                    os << "unknown escape sequence `\\" << static_cast<char>(next) << "'";
                     unit->warning(All, os.str());
 
                     // Escape the \ in this unknown escape sequence
@@ -1294,7 +1286,7 @@
         }
         else
         {
-            str->v += c;
+            str->v += static_cast<char>(c);
         }
     }
     *yylvalp = str;
@@ -1303,7 +1295,7 @@
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 449 "src/Slice/Scanner.l"
+#line 446 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     IntegerTokPtr itp = new IntegerTok;
@@ -1322,7 +1314,7 @@
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 465 "src/Slice/Scanner.l"
+#line 462 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     errno = 0;
@@ -1356,7 +1348,7 @@
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 495 "src/Slice/Scanner.l"
+#line 492 "src/Slice/Scanner.l"
 {
     // Ignore white-space
 
@@ -1372,7 +1364,7 @@
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 508 "src/Slice/Scanner.l"
+#line 505 "src/Slice/Scanner.l"
 {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
 
@@ -1381,7 +1373,7 @@
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 514 "src/Slice/Scanner.l"
+#line 511 "src/Slice/Scanner.l"
 {
     BEGIN(MAINSCAN);
     if(slice_text[0] < 32 || slice_text[0] > 126)
@@ -1400,10 +1392,10 @@
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 530 "src/Slice/Scanner.l"
+#line 527 "src/Slice/Scanner.l"
 ECHO;
 	YY_BREAK
-#line 1406 "src/Slice/Scanner.cpp"
+#line 1403 "src/Slice/Scanner.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(BOMSCAN):
 case YY_STATE_EOF(MAINSCAN):
@@ -1684,7 +1676,7 @@
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-
+    
 	yy_current_state = (yy_start);
 	yy_current_state += YY_AT_BOL();
 
@@ -1739,7 +1731,7 @@
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-
+    
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up slice_text */
@@ -1782,7 +1774,7 @@
 
 {
 	int c;
-
+    
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1851,12 +1843,12 @@
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- *
+ * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void slice_restart  (FILE * input_file )
 {
-
+    
 	if ( ! YY_CURRENT_BUFFER ){
         slice_ensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1869,11 +1861,11 @@
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- *
+ * 
  */
     void slice__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
+    
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		slice_pop_buffer_state();
@@ -1913,13 +1905,13 @@
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
+ * 
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE slice__create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	b = (YY_BUFFER_STATE) slice_alloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in slice__create_buffer()" );
@@ -1942,11 +1934,11 @@
 
 /** Destroy the buffer.
  * @param b a buffer created with slice__create_buffer()
- *
+ * 
  */
     void slice__delete_buffer (YY_BUFFER_STATE  b )
 {
-
+    
 	if ( ! b )
 		return;
 
@@ -1967,7 +1959,7 @@
 
 {
 	int oerrno = errno;
-
+    
 	slice__flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1983,13 +1975,13 @@
     }
 
         b->yy_is_interactive = 0;
-
+    
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
+ * 
  */
     void slice__flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -2018,7 +2010,7 @@
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *
+ *  
  */
 void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -2048,7 +2040,7 @@
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *
+ *  
  */
 void slice_pop_buffer_state (void)
 {
@@ -2072,7 +2064,7 @@
 static void slice_ensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
-
+    
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
@@ -2085,9 +2077,9 @@
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in slice_ensure_buffer_stack()" );
-
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+				
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -2115,13 +2107,13 @@
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
+ * 
+ * @return the newly allocated buffer state object. 
  */
 YY_BUFFER_STATE slice__scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -2150,14 +2142,14 @@
 /** Setup the input buffer state to scan a string. The next call to slice_lex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- *
+ * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       slice__scan_bytes() instead.
  */
 YY_BUFFER_STATE slice__scan_string (yyconst char * yystr )
 {
-
+    
 	return slice__scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -2165,7 +2157,7 @@
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- *
+ * 
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
@@ -2174,7 +2166,7 @@
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) slice_alloc(n  );
@@ -2228,16 +2220,16 @@
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- *
+ * 
  */
 int slice_get_lineno  (void)
 {
-
+        
     return slice_lineno;
 }
 
 /** Get the input stream.
- *
+ * 
  */
 FILE *slice_get_in  (void)
 {
@@ -2245,7 +2237,7 @@
 }
 
 /** Get the output stream.
- *
+ * 
  */
 FILE *slice_get_out  (void)
 {
@@ -2253,7 +2245,7 @@
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
 yy_size_t slice_get_leng  (void)
 {
@@ -2261,7 +2253,7 @@
 }
 
 /** Get the current token.
- *
+ * 
  */
 
 char *slice_get_text  (void)
@@ -2271,18 +2263,18 @@
 
 /** Set the current line number.
  * @param line_number
- *
+ * 
  */
 void slice_set_lineno (int  line_number )
 {
-
+    
     slice_lineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
- *
+ * 
  * @see slice__switch_to_buffer
  */
 void slice_set_in (FILE *  in_str )
@@ -2336,7 +2328,7 @@
 /* slice_lex_destroy is for both reentrant and non-reentrant scanners. */
 int slice_lex_destroy  (void)
 {
-
+    
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		slice__delete_buffer(YY_CURRENT_BUFFER  );
@@ -2403,7 +2395,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 530 "src/Slice/Scanner.l"
+#line 527 "src/Slice/Scanner.l"
 
 
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Scanner.l zeroc-ice-3.7.2/cpp/src/Slice/Scanner.l
--- zeroc-ice-3.7.1/cpp/src/Slice/Scanner.l	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Scanner.l	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
 %{
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
@@ -18,24 +13,19 @@
 #include <stdlib.h>
 #include <math.h>
 
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
+#if defined(_MSC_VER)
+// '<' : signed/unsigned mismatch
+#   pragma warning(disable:4018)
 // 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
+#   pragma warning(disable:4244)
 
-#if defined(_MSC_VER) && defined(ICE_32)
+#   if defined(ICE_64)
 //
-// '<' : signed/unsigned mismatch
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
 //
-#   pragma warning( 4 : 4018 )
+#       pragma warning(disable:4267)
+#   endif
 #endif
 
 #if defined(__GNUC__)
@@ -249,8 +239,8 @@
     str->literal = "\"";
     while(true)
     {
-        char c = static_cast<char>(yyinput());
-        str->literal += c;
+        int c = yyinput();
+        str->literal += static_cast<char>(c);
         if(c == '"')
         {
             break;
@@ -260,15 +250,15 @@
             unit->error("EOF in string");
             break;
         }
-        else if(static_cast<unsigned char>(c) < 32 || c == 127)
+        else if(c < 32 || c == 127)
         {
             unit->error("a string literal can only contain printable ASCII characters and non-ASCII characters");
             break;
         }
         else if(c == '\\')
         {
-            char next = static_cast<char>(yyinput());
-            str->literal += next;
+            int next = yyinput();
+            str->literal += static_cast<char>(next);
             switch(next)
             {
                 case '\\':
@@ -284,7 +274,7 @@
                 case '\'':
                 case '?':
                 {
-                    str->v += next;
+                    str->v += static_cast<char>(next);
                     break;
                 }
                 case 'a':
@@ -338,16 +328,16 @@
                 {
                     static string octalDigits = "01234567";
                     string escape;
-                    escape += next;
+                    escape += static_cast<char>(next);
                     for(int i = 0; i < 2; ++i)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(octalDigits.find_first_of(next) == string::npos)
+                        next = yyinput();
+                        if(octalDigits.find_first_of(static_cast<char>(next)) == string::npos)
                         {
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                     }
                     str->literal += escape;
                     IceUtil::Int64 value = IceUtilInternal::strToInt64(escape.c_str(), 0, 8);
@@ -362,15 +352,15 @@
                 case 'x':
                 {
                     string escape = "";
-                    next = static_cast<char>(yyinput());
+                    next = yyinput();
 
                     //
                     // Unlike C++, we limit hex escape sequences to 2 hex digits
                     //
-                    while(isxdigit(next) && escape.length() < 2)
+                    while(isxdigit(static_cast<char>(next)) && escape.length() < 2)
                     {
-                        escape += next;
-                        next = static_cast<char>(yyinput());
+                        escape += static_cast<char>(next);
+                        next = yyinput();
                     }
                     unput(next);
 
@@ -394,18 +384,19 @@
                 case 'U':
                 {
                     string escape = "";
-                    char c = next;
+                    c = next;
                     int size = (c == 'u') ? 4 : 8;
                     while(size > 0)
                     {
-                        next = static_cast<char>(yyinput());
-                        if(!isxdigit(static_cast<unsigned char>(next)))
+                        next = yyinput();
+                        if(!isxdigit(next))
                         {
-                            unit->error(string("unknown escape sequence in string literal: `\\") + c + escape + next + "'");
+                            unit->error(string("unknown escape sequence in string literal: `\\") +
+                                               static_cast<char>(c) + escape + static_cast<char>(next) + "'");
                             unput(next);
                             break;
                         }
-                        escape += next;
+                        escape += static_cast<char>(next);
                         --size;
                     }
 
@@ -415,19 +406,20 @@
                         IceUtil::Int64 codePoint = IceUtilInternal::strToInt64(escape.c_str(), 0, 16);
                         if(codePoint >= 0xd800 && codePoint <= 0xdfff)
                         {
-                            unit->error(string("a universal character name cannot designate a surrogate: `\\") + c + escape + "'");
+                            unit->error(string("a universal character name cannot designate a surrogate: `\\") +
+                                               static_cast<char>(c) + escape + "'");
                         }
                     }
 
                     str->literal += escape;
-                    str->v += string("\\") + c + escape;
+                    str->v += string("\\") + static_cast<char>(c) + escape;
                     break;
                 }
 
                 default:
                 {
                     ostringstream os;
-                    os << "unknown escape sequence `\\" << next << "'";
+                    os << "unknown escape sequence `\\" << static_cast<char>(next) << "'";
                     unit->warning(All, os.str());
 
                     // Escape the \ in this unknown escape sequence
@@ -439,7 +431,7 @@
         }
         else
         {
-            str->v += c;
+            str->v += static_cast<char>(c);
         }
     }
     *yylvalp = str;
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/SliceUtil.cpp zeroc-ice-3.7.2/cpp/src/Slice/SliceUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/SliceUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/SliceUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Slice/Util.h>
 #include <Slice/FileTracker.h>
 #include <IceUtil/FileUtil.h>
@@ -397,7 +391,7 @@
         if(!of)
         {
             ostringstream os;
-            os << "cannot open file `" << dependFile << "': " << strerror(errno);
+            os << "cannot open file `" << dependFile << "': " << IceUtilInternal::errorToString(errno);
             throw Slice::FileException(__FILE__, __LINE__, os.str());
         }
         of << dependencies;
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/StringLiteralUtil.cpp zeroc-ice-3.7.2/cpp/src/Slice/StringLiteralUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/Slice/StringLiteralUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/StringLiteralUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/Util.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/src/Slice/Util.h zeroc-ice-3.7.2/cpp/src/Slice/Util.h
--- zeroc-ice-3.7.1/cpp/src/Slice/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/Slice/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_UTIL_H
 #define SLICE_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2confluence/ConfluenceOutput.cpp zeroc-ice-3.7.2/cpp/src/slice2confluence/ConfluenceOutput.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2confluence/ConfluenceOutput.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2confluence/ConfluenceOutput.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/ConsoleUtil.h>
 #include <ConfluenceOutput.h>
@@ -13,6 +8,20 @@
 #include <sstream>
 #include <algorithm>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#   pragma warning(disable:4100) // unreferenced parameter
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wshadow-all"
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 using namespace std;
 using namespace IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2confluence/ConfluenceOutput.h zeroc-ice-3.7.2/cpp/src/slice2confluence/ConfluenceOutput.h
--- zeroc-ice-3.7.1/cpp/src/slice2confluence/ConfluenceOutput.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2confluence/ConfluenceOutput.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CONFLUENCE_OUTPUT
 #define CONFLUENCE_OUTPUT
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2confluence/Gen.cpp zeroc-ice-3.7.2/cpp/src/slice2confluence/Gen.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2confluence/Gen.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2confluence/Gen.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/Functional.h>
@@ -27,6 +22,20 @@
 
 #include <string>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#   pragma warning(disable:4100) // unreferenced parameter
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wshadow-all"
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
@@ -1426,7 +1435,7 @@
     if(!_out.isOpen())
     {
         ostringstream os;
-        os << "cannot open file `" << path << "': " << strerror(errno);
+        os << "cannot open file `" << path << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(path);
@@ -1787,7 +1796,7 @@
     if(IceUtilInternal::mkdir(dir, 0777) != 0)
     {
         ostringstream os;
-        os << "cannot create directory `" << dir << "': " << strerror(errno);
+        os << "cannot create directory `" << dir << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addDirectory(dir);
@@ -1800,7 +1809,7 @@
     if(!in)
     {
         ostringstream os;
-        os << "cannot open file `" << file << "': " << strerror(errno);
+        os << "cannot open file `" << file << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 
@@ -1836,7 +1845,7 @@
     if(!in)
     {
         ostringstream os;
-        os << "cannot open file `" << file << "': " << strerror(errno);
+        os << "cannot open file `" << file << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2confluence/Gen.h zeroc-ice-3.7.2/cpp/src/slice2confluence/Gen.h
--- zeroc-ice-3.7.1/cpp/src/slice2confluence/Gen.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2confluence/Gen.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_H
 #define GEN_H
@@ -16,6 +11,10 @@
 
 #include <iterator>
 
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow-all"
+#endif
+
 namespace Slice
 {
 
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2confluence/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2confluence/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2confluence/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2confluence/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
@@ -71,7 +66,7 @@
 }
 
 void
-interruptedCallback(int signal)
+interruptedCallback(int)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
 
@@ -329,16 +324,10 @@
             consoleErr << argv[0] << ": error: " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
-        catch(const string& err)
-        {
-            FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
-            status = EXIT_FAILURE;
-        }
-        catch(const char* err)
+        catch(...)
         {
             FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
+            consoleErr << args[0] << ": error:" << "unknown exception" << endl;
             status = EXIT_FAILURE;
         }
     }
@@ -374,16 +363,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cpp/Gen.cpp zeroc-ice-3.7.2/cpp/src/slice2cpp/Gen.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2cpp/Gen.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cpp/Gen.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include "Gen.h"
 #include <Slice/Util.h>
 #include <Slice/CPlusPlusUtil.h>
@@ -103,11 +97,11 @@
     ConstPtr constant = ConstPtr::dynamicCast(valueType);
     if(constant)
     {
-        out << getAbsolute(fixKwd(constant->scoped()), scope);
+        out << getUnqualified(fixKwd(constant->scoped()), scope);
     }
     else
     {
-        bool cpp11 = typeContext & TypeContextCpp11;
+        bool cpp11 = (typeContext & TypeContextCpp11) == TypeContextCpp11;
         BuiltinPtr bp = BuiltinPtr::dynamicCast(type);
         if(bp && bp->kind() == Builtin::KindString)
         {
@@ -156,17 +150,17 @@
 
                 if(unscoped)
                 {
-                    out << getAbsolute(fixKwd(ep->scope() + enumerator->name()), scope);
+                    out << getUnqualified(fixKwd(ep->scope() + enumerator->name()), scope);
                 }
                 else
                 {
                     if(cpp11)
                     {
-                        out << getAbsolute(fixKwd(enumerator->scoped()), scope);
+                        out << getUnqualified(fixKwd(enumerator->scoped()), scope);
                     }
                     else
                     {
-                        out << getAbsolute(fixKwd(ep->scope() + ep->name() + enumerator->name()), scope);
+                        out << getUnqualified(fixKwd(ep->scope() + ep->name() + enumerator->name()), scope);
                     }
                 }
             }
@@ -242,7 +236,7 @@
     }
     else
     {
-        C << "[&](" << getAbsolute("::Ice::OutputStream*", scope) << " ostr)";
+        C << "[&](" << getUnqualified("::Ice::OutputStream*", scope) << " ostr)";
         C << sb;
         writeMarshalCode(C, inParams, 0, true, TypeContextInParam | TypeContextCpp11);
         if(p->sendsClasses(false))
@@ -273,7 +267,7 @@
         //
         throws.sort(Slice::DerivedToBaseCompare());
 
-        C << "[](const " << getAbsolute("::Ice::UserException&", scope) << " ex)";
+        C << "[](const " << getUnqualified("::Ice::UserException&", scope) << " ex)";
         C << sb;
         C << nl << "try";
         C << sb;
@@ -285,12 +279,12 @@
         for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i)
         {
             string scoped = (*i)->scoped();
-            C << nl << "catch(const " << getAbsolute(fixKwd((*i)->scoped()), scope) << "&)";
+            C << nl << "catch(const " << getUnqualified(fixKwd((*i)->scoped()), scope) << "&)";
             C << sb;
             C << nl << "throw;";
             C << eb;
         }
-        C << nl << "catch(const " << getAbsolute("::Ice::UserException&", scope) << ")";
+        C << nl << "catch(const " << getUnqualified("::Ice::UserException&", scope) << ")";
         C << sb;
         C << eb;
         C << eb;
@@ -465,11 +459,11 @@
         case Contained::ContainedTypeStruct:
         case Contained::ContainedTypeException:
         {
-            UnitPtr unit = p->container()->unit();
+            UnitPtr unt = p->container()->unit();
             string file = p->file();
             assert(!file.empty());
             static const string prefix = "cpp:doxygen:include:";
-            DefinitionContextPtr dc = unit->findDefinitionContext(file);
+            DefinitionContextPtr dc = unt->findDefinitionContext(file);
             assert(dc);
             string q = dc->findMetaData(prefix);
             if(!q.empty())
@@ -803,7 +797,7 @@
         if(!implH)
         {
             ostringstream os;
-            os << "cannot open `" << fileImplH << "': " << strerror(errno);
+            os << "cannot open `" << fileImplH << "': " << IceUtilInternal::errorToString(errno);
             throw FileException(__FILE__, __LINE__, os.str());
         }
         FileTracker::instance()->addFile(fileImplH);
@@ -812,7 +806,7 @@
         if(!implC)
         {
             ostringstream os;
-            os << "cannot open `" << fileImplC << "': " << strerror(errno);
+            os << "cannot open `" << fileImplC << "': " << IceUtilInternal::errorToString(errno);
             throw FileException(__FILE__, __LINE__, os.str());
         }
         FileTracker::instance()->addFile(fileImplC);
@@ -840,7 +834,7 @@
     if(!H)
     {
         ostringstream os;
-        os << "cannot open `" << fileH << "': " << strerror(errno);
+        os << "cannot open `" << fileH << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(fileH);
@@ -849,7 +843,7 @@
     if(!C)
     {
         ostringstream os;
-        os << "cannot open `" << fileC << "': " << strerror(errno);
+        os << "cannot open `" << fileC << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(fileC);
@@ -859,7 +853,7 @@
     printHeader(C);
     printGeneratedHeader(C, _base + ".ice");
 
-    string s = _base + "." + _headerExtension;;
+    string s = _base + "." + _headerExtension;
     if(_include.size())
     {
         s = _include + '/' + s;
@@ -982,20 +976,20 @@
         StringList globalMetaData = dc->getMetaData();
         for(StringList::const_iterator q = globalMetaData.begin(); q != globalMetaData.end();)
         {
-            string s = *q++;
+            string md = *q++;
             static const string includePrefix = "cpp:include:";
-            if(s.find(includePrefix) == 0)
+            if(md.find(includePrefix) == 0)
             {
-                if(s.size() > includePrefix.size())
+                if(md.size() > includePrefix.size())
                 {
-                    H << nl << "#include <" << s.substr(includePrefix.size()) << ">";
+                    H << nl << "#include <" << md.substr(includePrefix.size()) << ">";
                 }
                 else
                 {
                     ostringstream ostr;
-                    ostr << "ignoring invalid global metadata `" << s << "'";
+                    ostr << "ignoring invalid global metadata `" << md << "'";
                     dc->warning(InvalidMetaData, file, -1, ostr.str());
-                    globalMetaData.remove(s);
+                    globalMetaData.remove(md);
                 }
             }
         }
@@ -1065,7 +1059,6 @@
                 implH << _include << '/';
             }
             implH << _base << "." << _headerExtension << ">";
-            implH << nl << "//base";
             writeExtraHeaders(implC);
 
             implC << "\n#include <";
@@ -1299,11 +1292,11 @@
     H << "public ";
     if(base)
     {
-        H << getAbsolute(fixKwd(base->scoped()), scope);
+        H << getUnqualified(fixKwd(base->scoped()), scope);
     }
     else
     {
-        H << getAbsolute(p->isLocal() ? "::Ice::LocalException" : "::Ice::UserException", scope);
+        H << getUnqualified(p->isLocal() ? "::Ice::LocalException" : "::Ice::UserException", scope);
     }
     H.restoreIndent();
     H << sb;
@@ -1581,11 +1574,11 @@
 
         H << sp;
         H << nl << "/// \\cond STREAM";
-        H << nl << "virtual void _writeImpl(" << getAbsolute("::Ice::OutputStream*", scope) << ") const;";
-        H << nl << "virtual void _readImpl(" << getAbsolute("::Ice::InputStream*", scope) << ");";
+        H << nl << "virtual void _writeImpl(" << getUnqualified("::Ice::OutputStream*", scope) << ") const;";
+        H << nl << "virtual void _readImpl(" << getUnqualified("::Ice::InputStream*", scope) << ");";
         H << nl << "/// \\endcond";
 
-        string baseName = getAbsolute(base ? fixKwd(base->scoped()) : "::Ice::UserException", scope);
+        string baseName = getUnqualified(base ? fixKwd(base->scoped()) : "::Ice::UserException", scope);
 
         if(preserved && !basePreserved)
         {
@@ -1601,7 +1594,7 @@
             C << eb;
 
             C << sp << nl << "void" << nl << scoped.substr(2) << "::_write("
-              << getAbsolute("::Ice::OutputStream*", scope) << " ostr) const";
+              << getUnqualified("::Ice::OutputStream*", scope) << " ostr) const";
             C << sb;
             C << nl << "ostr->startException(_slicedData);";
             C << nl << "_writeImpl(ostr);";
@@ -1609,7 +1602,7 @@
             C << eb;
 
             C << sp << nl << "void" << nl << scoped.substr(2) << "::_read("
-              << getAbsolute("::Ice::InputStream*", scope) << " istr)";
+              << getUnqualified("::Ice::InputStream*", scope) << " istr)";
             C << sb;
             C << nl << "istr->startException();";
             C << nl << "_readImpl(istr);";
@@ -1620,11 +1613,11 @@
         C << sp;
         C << nl << "/// \\cond STREAM";
         C << nl << "void" << nl << scoped.substr(2) << "::_writeImpl("
-          << getAbsolute("::Ice::OutputStream*", scope) << " ostr) const";
+          << getUnqualified("::Ice::OutputStream*", scope) << " ostr) const";
         C << sb;
         C << nl << "ostr->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");";
-        C << nl << getAbsolute("::Ice::StreamWriter", scope) << "< " << name << ", "
-          << getAbsolute("::Ice::OutputStream", scope) << ">::write(ostr, *this);";
+        C << nl << getUnqualified("::Ice::StreamWriter", scope) << "< " << name << ", "
+          << getUnqualified("::Ice::OutputStream", scope) << ">::write(ostr, *this);";
         C << nl << "ostr->endSlice();";
         if(base)
         {
@@ -1633,11 +1626,11 @@
         C << eb;
 
         C << sp << nl << "void" << nl << scoped.substr(2) << "::_readImpl("
-          << getAbsolute("::Ice::InputStream*", scope) << " istr)";
+          << getUnqualified("::Ice::InputStream*", scope) << " istr)";
         C << sb;
         C << nl << "istr->startSlice();";
-        C << nl << getAbsolute("::Ice::StreamReader", scope) << "< " << name << ", "
-          << getAbsolute("::Ice::InputStream", scope) << ">::read(istr, *this);";
+        C << nl << getUnqualified("::Ice::StreamReader", scope) << "< " << name << ", "
+          << getUnqualified("::Ice::InputStream", scope) << ">::read(istr, *this);";
         C << nl << "istr->endSlice();";
         if(base)
         {
@@ -1795,7 +1788,6 @@
     DataMemberList dataMembers = p->dataMembers();
 
     vector<string> params;
-    vector<string>::const_iterator pi;
 
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
@@ -1896,7 +1888,7 @@
     string name = fixKwd(p->name());
     TypePtr type = p->type();
     ContainedPtr cont = ContainedPtr::dynamicCast(p->container());
-    string scope = fixKwd(cont->scope());
+    string scope = fixKwd(p->scope());
     string s = typeToString(type, scope, p->typeMetaData(), _useWstring);
     StringList metaData = p->getMetaData();
 
@@ -1920,7 +1912,7 @@
 {
     string name = fixKwd(p->name());
     ContainedPtr cont = ContainedPtr::dynamicCast(p->container());
-    string scope = fixKwd(cont->scope());
+    string scope = fixKwd(p->scope());
     string dictType = findMetaData(p->getMetaData());
 
     H << sp;
@@ -2010,11 +2002,11 @@
     C << nl;
     if(base)
     {
-        C << getAbsolute(fixKwd(base->scoped()), scope);
+        C << getUnqualified(fixKwd(base->scoped()), scope);
     }
     else
     {
-        C << getAbsolute(isLocal ? "::Ice::LocalException" : "::Ice::UserException", scope);
+        C << getUnqualified(isLocal ? "::Ice::LocalException" : "::Ice::UserException", scope);
     }
     C << call;
 }
@@ -2073,7 +2065,6 @@
     }
 
     string name = fixKwd(p->name());
-    string scoped = fixKwd(p->scoped());
 
     H << sp << nl << "class " << name << ';';
     //
@@ -2082,9 +2073,8 @@
     // Note that _readProxy is always in the IceProxy::... namespace
     //
     H << nl << "/// \\cond INTERNAL";
-    H << nl << _dllExport << "void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy"
-      << scoped << ">&);";
-    H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
+    H << nl << _dllExport << "void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< " << name << ">&);";
+    H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(" << name << "*);";
     H << nl << "/// \\endcond";
 }
 
@@ -2655,7 +2645,6 @@
 #endif
         for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i)
         {
-            string scoped = (*i)->scoped();
             C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)";
             C << sb;
             C << nl << "throw;";
@@ -2718,7 +2707,6 @@
 #endif
         for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i)
         {
-            string scoped = (*i)->scoped();
             C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)";
             C << sb;
             C << nl << "throw;";
@@ -2790,7 +2778,7 @@
         // depends on this name
         //
         H << nl << "/// \\cond INTERNAL";
-        H << nl << _dllExport << getAbsolute("::Ice::Object*", scope) << " upCast(" << name << "*);";
+        H << nl << _dllExport << getUnqualified("::Ice::Object*", scope) << " upCast(" << name << "*);";
         H << nl << "/// \\endcond";
         H << nl << "typedef ::IceInternal::Handle< " << name << "> " << p->name() << "Ptr;";
         H << nl << "typedef ::IceInternal::ProxyHandle< ::IceProxy" << scoped << "> " << p->name() << "Prx;";
@@ -2802,14 +2790,14 @@
         //
         H << nl << "/// \\cond INTERNAL";
         H << nl << _dllExport << "void _icePatchObjectPtr(" << p->name() << "Ptr&, const "
-          << getAbsolute("::Ice::ObjectPtr&", scope) << ");";
+          << getUnqualified("::Ice::ObjectPtr&", scope) << ");";
         H << nl << "/// \\endcond";
     }
     else
     {
         H << nl << "/// \\cond INTERNAL";
-        H << nl << _dllExport << getAbsolute("::Ice::LocalObject*", scope) << " upCast("
-          << getAbsolute(scoped, scope) << "*);";
+        H << nl << _dllExport << getUnqualified("::Ice::LocalObject*", scope) << " upCast("
+          << getUnqualified(scoped, scope) << "*);";
         H << nl << "/// \\endcond";
         H << nl << "typedef ::IceInternal::Handle< " << name << "> " << p->name() << "Ptr;";
     }
@@ -2882,7 +2870,7 @@
     H.useCurrentPosAsIndent();
     if(bases.empty())
     {
-        H << "public virtual " << getAbsolute(p->isLocal() ? "::Ice::LocalObject" : "::Ice::Object", scope);
+        H << "public virtual " << getUnqualified(p->isLocal() ? "::Ice::LocalObject" : "::Ice::Object", scope);
     }
     else
     {
@@ -2895,7 +2883,7 @@
                 H << "virtual ";
             }
 
-            H << "public " << getAbsolute(fixKwd((*q)->scoped()), scope);
+            H << "public " << getUnqualified(fixKwd((*q)->scoped()), scope);
             if(++q != bases.end())
             {
                 H << ',' << nl;
@@ -2995,7 +2983,7 @@
             H << nl << " * Polymporphically clones this object.";
             H << nl << " * @return A shallow copy of this object.";
             H << nl << " */";
-            H << nl << "virtual " << getAbsolute("::Ice::ObjectPtr", scope) << " ice_clone() const;";
+            H << nl << "virtual " << getUnqualified("::Ice::ObjectPtr", scope) << " ice_clone() const;";
 
             if(hasGCObjectBaseClass)
             {
@@ -3012,7 +3000,7 @@
             C << sb;
             if(!p->isAbstract())
             {
-                C << nl << getAbsolute("::Ice::Object*", scope) << " p = new " << name << "(*this);";
+                C << nl << getUnqualified("::Ice::Object*", scope) << " p = new " << name << "(*this);";
                 C << nl << "return p;";
             }
             else
@@ -3020,7 +3008,7 @@
                 //
                 // We need this ice_clone for abstract classes derived from concrete classes
                 //
-                C << nl << "throw " << getAbsolute("::Ice::CloneNotImplementedException", scope)
+                C << nl << "throw " << getUnqualified("::Ice::CloneNotImplementedException", scope)
                   << "(__FILE__, __LINE__);";
             }
             C << eb;
@@ -3055,24 +3043,24 @@
         H << nl << " * @param current The Current object for the invocation.";
         H << nl << " * @return True if this object supports the interface, false, otherwise.";
         H << nl << " */";
-        H << nl << "virtual bool ice_isA(const ::std::string& id, const " << getAbsolute("::Ice::Current&", scope)
-          << " current = " << getAbsolute("::Ice::emptyCurrent", scope) << ") const;";
+        H << nl << "virtual bool ice_isA(const ::std::string& id, const " << getUnqualified("::Ice::Current&", scope)
+          << " current = " << getUnqualified("::Ice::emptyCurrent", scope) << ") const;";
         H << sp;
         H << nl << "/**";
         H << nl << " * Obtains a list of the Slice type IDs representing the interfaces supported by this object.";
         H << nl << " * @param current The Current object for the invocation.";
         H << nl << " * @return A list of fully-scoped type IDs.";
         H << nl << " */";
-        H << nl << "virtual ::std::vector< ::std::string> ice_ids(const " << getAbsolute("::Ice::Current&", scope)
-          << " current = " << getAbsolute("::Ice::emptyCurrent", scope) << ") const;";
+        H << nl << "virtual ::std::vector< ::std::string> ice_ids(const " << getUnqualified("::Ice::Current&", scope)
+          << " current = " << getUnqualified("::Ice::emptyCurrent", scope) << ") const;";
         H << sp;
         H << nl << "/**";
         H << nl << " * Obtains a Slice type ID representing the most-derived interface supported by this object.";
         H << nl << " * @param current The Current object for the invocation.";
         H << nl << " * @return A fully-scoped type ID.";
         H << nl << " */";
-        H << nl << "virtual const ::std::string& ice_id(const " << getAbsolute("::Ice::Current&", scope)
-          << " current = " << getAbsolute("::Ice::emptyCurrent", scope) << ") const;";
+        H << nl << "virtual const ::std::string& ice_id(const " << getUnqualified("::Ice::Current&", scope)
+          << " current = " << getUnqualified("::Ice::emptyCurrent", scope) << ") const;";
         H << sp;
         H << nl << "/**";
         H << nl << " * Obtains the Slice type ID corresponding to this class.";
@@ -3100,14 +3088,14 @@
 
         C << sp;
         C << nl << "bool" << nl << scoped.substr(2)
-          << "::ice_isA(const ::std::string& s, const " << getAbsolute("::Ice::Current&", scope) << ") const";
+          << "::ice_isA(const ::std::string& s, const " << getUnqualified("::Ice::Current&", scope) << ") const";
         C << sb;
         C << nl << "return ::std::binary_search(" << flatName << ", " << flatName << " + " << ids.size() << ", s);";
         C << eb;
 
         C << sp;
         C << nl << "::std::vector< ::std::string>" << nl << scoped.substr(2)
-          << "::ice_ids(const " << getAbsolute("::Ice::Current&", scope) << ") const";
+          << "::ice_ids(const " << getUnqualified("::Ice::Current&", scope) << ") const";
         C << sb;
         C << nl << "return ::std::vector< ::std::string>(&" << flatName << "[0], &" << flatName
           << '[' << ids.size() << "]);";
@@ -3115,7 +3103,7 @@
 
         C << sp;
         C << nl << "const ::std::string&" << nl << scoped.substr(2)
-          << "::ice_id(const " << getAbsolute("::Ice::Current&", scope) << ") const";
+          << "::ice_id(const " << getUnqualified("::Ice::Current&", scope) << ") const";
         C << sb;
         C << nl << "return ice_staticId();";
         C << eb;
@@ -3145,7 +3133,7 @@
         C << nl << "/// \\cond INTERNAL";
         C << nl
           << _dllExport
-          << "::Ice::LocalObject* " << scope.substr(2) << "upCast(" << getAbsolute(scoped, scope)
+          << "::Ice::LocalObject* " << scope.substr(2) << "upCast(" << getUnqualified(scoped, scope)
           << "* p) { return p; }";
         C << nl << "/// \\endcond";
     }
@@ -3189,7 +3177,7 @@
             H << sp;
             H << nl << "/// \\cond INTERNAL";
             H << nl << "virtual bool _iceDispatch(::IceInternal::Incoming&, const "
-              << getAbsolute("::Ice::Current&", scope) << ");";
+              << getUnqualified("::Ice::Current&", scope) << ");";
             H << nl << "/// \\endcond";
 
             string flatName = "iceC" + p->flattenedScope() + p->name() + "_all";
@@ -3212,7 +3200,7 @@
             C << nl << "/// \\cond INTERNAL";
             C << nl << "bool";
             C << nl << scoped.substr(2) << "::_iceDispatch(::IceInternal::Incoming& in, const "
-              << getAbsolute("::Ice::Current&", scope) << " current)";
+              << getUnqualified("::Ice::Current&", scope) << " current)";
             C << sb;
 
             C << nl << "::std::pair<const ::std::string*, const ::std::string*> r = "
@@ -3220,7 +3208,7 @@
               << ", current.operation);";
             C << nl << "if(r.first == r.second)";
             C << sb;
-            C << nl << "throw " << getAbsolute("::Ice::OperationNotExistException", scope)
+            C << nl << "throw " << getUnqualified("::Ice::OperationNotExistException", scope)
               << "(__FILE__, __LINE__, current.id, " << "current.facet, current.operation);";
             C << eb;
             C << sp;
@@ -3237,7 +3225,7 @@
             C << nl << "default:";
             C << sb;
             C << nl << "assert(false);";
-            C << nl << "throw " << getAbsolute("::Ice::OperationNotExistException", scope)
+            C << nl << "throw " << getUnqualified("::Ice::OperationNotExistException", scope)
               << "(__FILE__, __LINE__, current.id, " << "current.facet, current.operation);";
             C << eb;
             C << eb;
@@ -3261,7 +3249,7 @@
             {
                 H << sp;
                 H << nl << "/// \\cond INTERNAL";
-                H << nl << "virtual " << getAbsolute("::Ice::Int", scope)
+                H << nl << "virtual " << getUnqualified("::Ice::Int", scope)
                   << " ice_operationAttributes(const ::std::string&) const;";
                 H << nl << "/// \\endcond";
 
@@ -3319,7 +3307,7 @@
             H << nl << " * Obtains a value factory that instantiates this class.";
             H << nl << " * @return The value factory.";
             H << nl << " */";
-            H << nl << "static " << getAbsolute("::Ice::ValueFactoryPtr", scope) << " ice_factory();";
+            H << nl << "static " << getUnqualified("::Ice::ValueFactoryPtr", scope) << " ice_factory();";
         }
 
         if(preserved && !basePreserved)
@@ -3331,12 +3319,12 @@
             H << nl << " * @return The SlicedData object, or nil if the class was not sliced or was not";
             H << nl << " * marshaled in the sliced format.";
             H << nl << " */";
-            H << nl << "virtual " << getAbsolute("::Ice::SlicedDataPtr", scope) << " ice_getSlicedData() const;";
+            H << nl << "virtual " << getUnqualified("::Ice::SlicedDataPtr", scope) << " ice_getSlicedData() const;";
 
             H << sp;
             H << nl << "/// \\cond STREAM";
-            H << nl << "virtual void _iceWrite(" << getAbsolute("::Ice::OutputStream*", scope) << ") const;";
-            H << nl << "virtual void _iceRead(" << getAbsolute("::Ice::InputStream*", scope) << ");";
+            H << nl << "virtual void _iceWrite(" << getUnqualified("::Ice::OutputStream*", scope) << ") const;";
+            H << nl << "virtual void _iceRead(" << getUnqualified("::Ice::InputStream*", scope) << ");";
             H << nl << "/// \\endcond";
         }
 
@@ -3347,8 +3335,8 @@
 
         H << sp;
         H << nl << "/// \\cond STREAM";
-        H << nl << "virtual void _iceWriteImpl(" << getAbsolute("::Ice::OutputStream*", scope) << ") const;";
-        H << nl << "virtual void _iceReadImpl(" << getAbsolute("::Ice::InputStream*", scope) << ");";
+        H << nl << "virtual void _iceWriteImpl(" << getUnqualified("::Ice::OutputStream*", scope) << ") const;";
+        H << nl << "virtual void _iceReadImpl(" << getUnqualified("::Ice::InputStream*", scope) << ");";
         H << nl << "/// \\endcond";
 
         if(preserved && !basePreserved)
@@ -3360,7 +3348,7 @@
             C << eb;
 
             C << sp;
-            C << nl << "void" << nl << scoped.substr(2) << "::_iceWrite(" << getAbsolute("::Ice::OutputStream*", scope)
+            C << nl << "void" << nl << scoped.substr(2) << "::_iceWrite(" << getUnqualified("::Ice::OutputStream*", scope)
               << "ostr) const";
             C << sb;
             C << nl << "ostr->startValue(_iceSlicedData);";
@@ -3369,7 +3357,7 @@
             C << eb;
 
             C << sp;
-            C << nl << "void" << nl << scoped.substr(2) << "::_iceRead(" << getAbsolute("::Ice::InputStream*", scope)
+            C << nl << "void" << nl << scoped.substr(2) << "::_iceRead(" << getUnqualified("::Ice::InputStream*", scope)
               << " istr)";
             C << sb;
             C << nl << "istr->startValue();";
@@ -3380,12 +3368,12 @@
 
         C << sp;
         C << nl << "/// \\cond STREAM";
-        C << nl << "void" << nl << scoped.substr(2) << "::_iceWriteImpl(" << getAbsolute("::Ice::OutputStream*", scope)
+        C << nl << "void" << nl << scoped.substr(2) << "::_iceWriteImpl(" << getUnqualified("::Ice::OutputStream*", scope)
           << " ostr) const";
         C << sb;
         C << nl << "ostr->startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
-        C << nl << getAbsolute("::Ice::StreamWriter", scope) << "< " << name << ", "
-          << getAbsolute("::Ice::OutputStream", scope) << ">::write(ostr, *this);";
+        C << nl << getUnqualified("::Ice::StreamWriter", scope) << "< " << name << ", "
+          << getUnqualified("::Ice::OutputStream", scope) << ">::write(ostr, *this);";
         C << nl << "ostr->endSlice();";
         if(base)
         {
@@ -3394,12 +3382,12 @@
         C << eb;
 
         C << sp;
-        C << nl << "void" << nl << scoped.substr(2) << "::_iceReadImpl(" << getAbsolute("::Ice::InputStream*", scope)
+        C << nl << "void" << nl << scoped.substr(2) << "::_iceReadImpl(" << getUnqualified("::Ice::InputStream*", scope)
           << " istr)";
         C << sb;
         C << nl << "istr->startSlice();";
-        C << nl << getAbsolute("::Ice::StreamReader", scope) << "< " << name << ", "
-          << getAbsolute("::Ice::InputStream", scope) << ">::read(istr, *this);";
+        C << nl << getUnqualified("::Ice::StreamReader", scope) << "< " << name << ", "
+          << getUnqualified("::Ice::InputStream", scope) << ">::read(istr, *this);";
         C << nl << "istr->endSlice();";
         if(base)
         {
@@ -3533,15 +3521,15 @@
         H << nl << "inline bool operator==(const " << fixKwd(p->name()) << "& lhs, const " << fixKwd(p->name())
           << "& rhs)";
         H << sb;
-        H << nl << "return static_cast<const " << getAbsolute("::Ice::LocalObject&", scope)
-          << ">(lhs) == static_cast<const " << getAbsolute("::Ice::LocalObject&", scope) << ">(rhs);";
+        H << nl << "return static_cast<const " << getUnqualified("::Ice::LocalObject&", scope)
+          << ">(lhs) == static_cast<const " << getUnqualified("::Ice::LocalObject&", scope) << ">(rhs);";
         H << eb;
         H << sp;
         H << nl << "inline bool operator<(const " << fixKwd(p->name()) << "& lhs, const " << fixKwd(p->name())
           << "& rhs)";
         H << sb;
-        H << nl << "return static_cast<const " << getAbsolute("::Ice::LocalObject&", scope)
-          << ">(lhs) < static_cast<const " << getAbsolute("::Ice::LocalObject&", scope) << ">(rhs);";
+        H << nl << "return static_cast<const " << getUnqualified("::Ice::LocalObject&", scope)
+          << ">(lhs) < static_cast<const " << getUnqualified("::Ice::LocalObject&", scope) << ">(rhs);";
         H << eb;
         H << nl << "/// \\endcond";
     }
@@ -3551,7 +3539,7 @@
         C << nl << "/// \\cond INTERNAL";
         C << nl << "void";
         C << nl << scope.substr(2) << "_icePatchObjectPtr(" << p->name() << "Ptr& handle, const "
-          << getAbsolute("::Ice::ObjectPtr&", scope) << " v)";
+          << getUnqualified("::Ice::ObjectPtr&", scope) << " v)";
         C << sb;
         C << nl << "handle = " << p->name() << "Ptr::dynamicCast(v);";
         C << nl << "if(v && !handle)";
@@ -3566,15 +3554,15 @@
         H << nl << "inline bool operator==(const " << fixKwd(p->name()) << "& lhs, const " << fixKwd(p->name())
           << "& rhs)";
         H << sb;
-        H << nl << "return static_cast<const " << getAbsolute("::Ice::Object&", scope)
-          << ">(lhs) == static_cast<const " << getAbsolute("::Ice::Object&", scope) << ">(rhs);";
+        H << nl << "return static_cast<const " << getUnqualified("::Ice::Object&", scope)
+          << ">(lhs) == static_cast<const " << getUnqualified("::Ice::Object&", scope) << ">(rhs);";
         H << eb;
         H << sp;
         H << nl << "inline bool operator<(const " << fixKwd(p->name()) << "& lhs, const " << fixKwd(p->name())
           << "& rhs)";
         H << sb;
-        H << nl << "return static_cast<const " << getAbsolute("::Ice::Object&", scope)
-          << ">(lhs) < static_cast<const " << getAbsolute("::Ice::Object&", scope) << ">(rhs);";
+        H << nl << "return static_cast<const " << getUnqualified("::Ice::Object&", scope)
+          << ">(lhs) < static_cast<const " << getUnqualified("::Ice::Object&", scope) << ">(rhs);";
         H << eb;
         H << nl << "/// \\endcond";
     }
@@ -3683,9 +3671,9 @@
             args += ", ";
         }
 
-        params += "const " + getAbsolute("::Ice::Current&", classScope) + " " + currentParam + " = " +
-            getAbsolute("::Ice::emptyCurrent", classScope) + ")";
-        paramsDecl += "const " + getAbsolute("::Ice::Current&", classScope) + " " + currentParam + ")";
+        params += "const " + getUnqualified("::Ice::Current&", classScope) + " " + currentParam + " = " +
+            getUnqualified("::Ice::emptyCurrent", classScope) + ")";
+        paramsDecl += "const " + getUnqualified("::Ice::Current&", classScope) + " " + currentParam + ")";
         args += "current)";
     }
     else
@@ -3695,8 +3683,8 @@
         args += ')';
     }
 
-    paramsAMD += "const " + getAbsolute("::Ice::Current&", classScope) + " " + currentParam + " = " +
-        getAbsolute("::Ice::emptyCurrent", classScope) + ")";
+    paramsAMD += "const " + getUnqualified("::Ice::Current&", classScope) + " " + currentParam + " = " +
+        getUnqualified("::Ice::emptyCurrent", classScope) + ")";
     argsAMD += "current)";
 
     string isConst = ((p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const")) ? " const" : "";
@@ -3745,7 +3733,7 @@
     if(!cl->isLocal())
     {
         H << nl << "/// \\cond INTERNAL";
-        H << nl << "bool _iceD_" << name << "(::IceInternal::Incoming&, const " << getAbsolute("::Ice::Current&", scope)
+        H << nl << "bool _iceD_" << name << "(::IceInternal::Incoming&, const " << getUnqualified("::Ice::Current&", scope)
           << ")" << isConst << ';';
         H << nl << "/// \\endcond";
 
@@ -3755,13 +3743,13 @@
         //
         C << nl << "/// \\cond INTERNAL";
         C << nl << "bool" << nl << scope.substr(2) << "_iceD_" << name << "(::IceInternal::Incoming& inS"
-          << ", const " << getAbsolute("::Ice::Current&", classScope) << " current)" << isConst;
+          << ", const " << getUnqualified("::Ice::Current&", classScope) << " current)" << isConst;
         C << sb;
         C << nl << "_iceCheckMode(" << operationModeToString(p->mode()) << ", current.mode);";
 
         if(!inParams.empty())
         {
-            C << nl << getAbsolute("::Ice::InputStream*", classScope) << " istr = inS.startReadParams();";
+            C << nl << getUnqualified("::Ice::InputStream*", classScope) << " istr = inS.startReadParams();";
             writeAllocateCode(C, inParams, 0, true, classScope, _useWstring | TypeContextInParam);
             writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam);
             if(p->sendsClasses(false))
@@ -3790,7 +3778,7 @@
             C << "this->" << fixKwd(name) << args << ';';
             if(ret || !outParams.empty())
             {
-                C << nl << getAbsolute("::Ice::OutputStream*", classScope) << " ostr = inS.startWriteParams();";
+                C << nl << getUnqualified("::Ice::OutputStream*", classScope) << " ostr = inS.startWriteParams();";
                 writeMarshalCode(C, outParams, p, true, 0);
                 if(p->returnsClasses(false))
                 {
@@ -3818,7 +3806,6 @@
         vector<string> paramsDeclAMI;
         vector<string> outParamsDeclAMI;
 
-        ParamDeclList paramList = p->parameters();
         for(ParamDeclList::const_iterator r = paramList.begin(); r != paramList.end(); ++r)
         {
             string paramName = fixKwd((*r)->name());
@@ -3852,7 +3839,7 @@
             returns.push_back(returnDoc);
             writeOpDocSummary(H, p, comment, OpDocInParams, false, StringList(), StringList(), returns);
         }
-        H << nl << "virtual " << getAbsolute("::Ice::AsyncResultPtr", classScope) << " begin_" << name << spar
+        H << nl << "virtual " << getUnqualified("::Ice::AsyncResultPtr", classScope) << " begin_" << name << spar
           << paramsDeclAMI << epar << " = 0;";
 
         H << sp;
@@ -3864,10 +3851,10 @@
             returns.push_back(returnDoc);
             writeOpDocSummary(H, p, comment, OpDocInParams, false, StringList(), postParams, returns);
         }
-        H << nl << "virtual " << getAbsolute("::Ice::AsyncResultPtr", classScope) << " begin_" << name << spar
+        H << nl << "virtual " << getUnqualified("::Ice::AsyncResultPtr", classScope) << " begin_" << name << spar
           << paramsDeclAMI
-          << ("const " + getAbsolute("::Ice::CallbackPtr&", classScope) + " " + cbParam)
-          << ("const " + getAbsolute("::Ice::LocalObjectPtr&", classScope) + " " + cookieParam + " = 0")
+          << ("const " + getUnqualified("::Ice::CallbackPtr&", classScope) + " " + cbParam)
+          << ("const " + getUnqualified("::Ice::LocalObjectPtr&", classScope) + " " + cookieParam + " = 0")
           << epar << " = 0;";
 
         string delName = "Callback_" + cl->name() + "_" + name;
@@ -3881,10 +3868,10 @@
             returns.push_back(returnDoc);
             writeOpDocSummary(H, p, comment, OpDocInParams, false, StringList(), postParams, returns);
         }
-        H << nl << "virtual " << getAbsolute("::Ice::AsyncResultPtr", classScope) << " begin_" << name << spar
+        H << nl << "virtual " << getUnqualified("::Ice::AsyncResultPtr", classScope) << " begin_" << name << spar
           << paramsDeclAMI
           << ("const " + delName + "Ptr& " + cbParam)
-          << ("const " + getAbsolute("::Ice::LocalObjectPtr&", classScope) + " " + cookieParam + " = 0") << epar
+          << ("const " + getUnqualified("::Ice::LocalObjectPtr&", classScope) + " " + cookieParam + " = 0") << epar
           << " = 0;";
 
         H << sp;
@@ -3896,7 +3883,7 @@
             writeOpDocSummary(H, p, comment, OpDocOutParams, true, StringList(), postParams, comment->returns());
         }
         H << nl << "virtual " << retS << " end_" << name << spar << outParamsDeclAMI
-          << ("const " + getAbsolute("::Ice::AsyncResultPtr&", classScope) + " " + resultParam) << epar << " = 0;";
+          << ("const " + getUnqualified("::Ice::AsyncResultPtr&", classScope) + " " + resultParam) << epar << " = 0;";
     }
 }
 
@@ -4191,11 +4178,11 @@
     C << nl;
     if(base)
     {
-        C << getAbsolute(fixKwd(base->scoped()), scope);
+        C << getUnqualified(fixKwd(base->scoped()), scope);
     }
     else
     {
-        C << getAbsolute("::Ice::Object", scope);
+        C << getUnqualified("::Ice::Object", scope);
     }
     C << call;
 }
@@ -4453,7 +4440,7 @@
         //
         H << sp;
         H << nl << "/// \\cond INTERNAL";
-        H << nl << "virtual void completed(const " << getAbsolute("::Ice::AsyncResultPtr&", clScope)
+        H << nl << "virtual void completed(const " << getUnqualified("::Ice::AsyncResultPtr&", clScope)
           << " result) const";
         H << sb;
         H << nl << clName << "Prx proxy = " << clName << "Prx::uncheckedCast(result->getProxy());";
@@ -4666,14 +4653,14 @@
         StructPtr st = StructPtr::dynamicCast(type);
         if(st)
         {
-            return getAbsolute(fixKwd(st->scoped()), scope) + "()";
+            return getUnqualified(fixKwd(st->scoped()), scope) + "()";
         }
 
         EnumPtr en = EnumPtr::dynamicCast(type);
         if(en)
         {
             EnumeratorList enumerators = en->enumerators();
-            return getAbsolute(fixKwd(en->scope() + enumerators.front()->name()), scope);
+            return getUnqualified(fixKwd(en->scope() + enumerators.front()->name()), scope);
         }
 
         SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -4685,7 +4672,7 @@
         DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
         if(dict)
         {
-            return getAbsolute(fixKwd(dict->scoped()), scope) + "()";
+            return getUnqualified(fixKwd(dict->scoped()), scope) + "()";
         }
     }
 
@@ -4817,7 +4804,7 @@
         }
         else
         {
-            H << sp << nl << "virtual " << getAbsolute(retS, scope) << ' ' << fixKwd(opName) << '(';
+            H << sp << nl << "virtual " << getUnqualified(retS, scope) << ' ' << fixKwd(opName) << '(';
             H.useCurrentPosAsIndent();
             ParamDeclList paramList = op->parameters();
             for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
@@ -4845,8 +4832,6 @@
             }
             H.restoreIndent();
 
-            string isConst = ((op->mode() == Operation::Nonmutating) || op->hasMetaData("cpp:const")) ? " const" : "";
-
             H << ")" << isConst << ';';
 
             C << sp << nl << retS << nl;
@@ -5000,7 +4985,7 @@
     H << nl << " * method in the case of an error.";
     H << nl << " */";
     H << nl << "class " << _dllExport << cbName << " : public virtual "
-      << getAbsolute("::Ice::AMDCallback", classScope);
+      << getUnqualified("::Ice::AMDCallback", classScope);
     H << sb;
     H.dec();
     H << nl << "public:";
@@ -5160,6 +5145,14 @@
         }
     }
 
+    H.zeroIndent();
+    H << sp;
+    H << nl << "#if defined(_MSC_VER) && (_MSC_VER >= 1900)";
+    H << nl << "#   pragma warning(push)";
+    H << nl << "#   pragma warning(disable:4239)";
+    H << nl << "#endif";
+    H.restoreIndent();
+
     H << sp << nl << "class " << _dllExport << classNameAMD << '_' << name
       << " : public " << classScopedAMD  << '_' << name << ", public ::IceInternal::IncomingAsync";
     H << sb;
@@ -5174,6 +5167,13 @@
     H << nl << "virtual void ice_response(" << params << ");";
     H << eb << ';';
 
+    H.zeroIndent();
+    H << sp;
+    H << nl << "#if defined(_MSC_VER) && (_MSC_VER >= 1900)";
+    H << nl << "#   pragma warning(pop)";
+    H << nl << "#endif";
+    H.restoreIndent();
+
     C << sp;
     C << nl << "/// \\cond INTERNAL";
     C << nl << "IceAsync" << classScopedAMD << '_' << name << "::" << classNameAMD << '_' << name
@@ -5504,8 +5504,8 @@
 
     StringList metaData = p->getMetaData();
 
-    const UnitPtr unit = p->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+    const UnitPtr ut = p->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(p->file());
     assert(dc);
     if(!cl->isLocal() && p->hasMetaData("cpp:noexcept"))
     {
@@ -5586,8 +5586,8 @@
     static const string cpp11Prefix = "cpp11:";
     static const string cpp98Prefix  = "cpp98:";
 
-    const UnitPtr unit = cont->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    const UnitPtr ut = cont->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
     StringList newMetaData = metaData;
     for(StringList::const_iterator p = newMetaData.begin(); p != newMetaData.end();)
@@ -5720,7 +5720,7 @@
 }
 
 bool
-Slice::Gen::NormalizeMetaDataVisitor::visitUnitStart(const UnitPtr& p)
+Slice::Gen::NormalizeMetaDataVisitor::visitUnitStart(const UnitPtr&)
 {
     return true;
 }
@@ -5974,11 +5974,11 @@
 }
 
 string
-Slice::Gen::getHeaderExt(const string& file, const UnitPtr& unit)
+Slice::Gen::getHeaderExt(const string& file, const UnitPtr& ut)
 {
     string ext;
     static const string headerExtPrefix = "cpp:header-ext:";
-    DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
     string meta = dc->findMetaData(headerExtPrefix);
     if(meta.size() > headerExtPrefix.size())
@@ -5989,11 +5989,11 @@
 }
 
 string
-Slice::Gen::getSourceExt(const string& file, const UnitPtr& unit)
+Slice::Gen::getSourceExt(const string& file, const UnitPtr& ut)
 {
     string ext;
     static const string sourceExtPrefix = "cpp:source-ext:";
-    DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
     string meta = dc->findMetaData(sourceExtPrefix);
     if(meta.size() > sourceExtPrefix.size())
@@ -6021,7 +6021,7 @@
 }
 
 void
-Slice::Gen::Cpp11DeclVisitor::visitUnitEnd(const UnitPtr& p)
+Slice::Gen::Cpp11DeclVisitor::visitUnitEnd(const UnitPtr&)
 {
     C << sp << nl << "}";
 }
@@ -6079,7 +6079,7 @@
         if(p->compactId() >= 0)
         {
             string n = "iceC" + p->flattenedScope() + p->name() + "_compactIdInit ";
-            C << "const ::IceInternal::CompactIdInit " << n << "(\"" << p->scoped() << "\", " << p->compactId()
+            C << nl << "const ::IceInternal::CompactIdInit " << n << "(\"" << p->scoped() << "\", " << p->compactId()
               << ");";
         }
     }
@@ -6260,10 +6260,10 @@
     }
 
     string helperClass =
-        getAbsolute(p->isLocal() ? "::Ice::LocalExceptionHelper" : "::Ice::UserExceptionHelper", scope);
+        getUnqualified(p->isLocal() ? "::Ice::LocalExceptionHelper" : "::Ice::UserExceptionHelper", scope);
     string baseClass = base ?
-        getAbsolute(fixKwd(base->scoped()), scope) :
-        getAbsolute(p->isLocal() ? "::Ice::LocalException" : "::Ice::UserException", scope);
+        getUnqualified(fixKwd(base->scoped()), scope) :
+        getUnqualified(p->isLocal() ? "::Ice::LocalException" : "::Ice::UserException", scope);
     string templateParameters = name + ", " + baseClass;
 
     H << sp;
@@ -6297,7 +6297,7 @@
           << " The line number at which the exception was raised, typically __LINE__.";
         H << nl << " */";
         H << nl << name << "(const char* " << fileParam << ", int " << lineParam << ") : ";
-        H << getAbsolute("::Ice::LocalExceptionHelper", scope) << "<" << templateParameters << ">";
+        H << getUnqualified("::Ice::LocalExceptionHelper", scope) << "<" << templateParameters << ">";
         H << "(" << fileParam << ", " << lineParam << ")";
         H << sb;
         H << eb;
@@ -6385,7 +6385,7 @@
         }
         else if(p->isLocal())
         {
-            H << " " << getAbsolute("::Ice::LocalExceptionHelper", scope) << "<" << templateParameters << ">";
+            H << " " << getUnqualified("::Ice::LocalExceptionHelper", scope) << "<" << templateParameters << ">";
             H << "(" << fileParam << ", " << lineParam << ")";
             if(!dataMembers.empty())
             {
@@ -6498,16 +6498,16 @@
             H << nl << " * @return The SlicedData object, or nil if the exception was not sliced or was not";
             H << nl << " * marshaled in the sliced format.";
             H << nl << " */";
-            H << nl << _dllMemberExport << "virtual ::std::shared_ptr<" << getAbsolute("::Ice::SlicedData", scope)
+            H << nl << _dllMemberExport << "virtual ::std::shared_ptr<" << getUnqualified("::Ice::SlicedData", scope)
               << "> ice_getSlicedData() const override;";
             H << sp;
             H << nl << "/// \\cond STREAM";
-            H << nl << _dllMemberExport << "virtual void _write(" << getAbsolute("::Ice::OutputStream*", scope)
+            H << nl << _dllMemberExport << "virtual void _write(" << getUnqualified("::Ice::OutputStream*", scope)
               << ") const override;";
-            H << nl << _dllMemberExport << "virtual void _read(" << getAbsolute("::Ice::InputStream*", scope)
+            H << nl << _dllMemberExport << "virtual void _read(" << getUnqualified("::Ice::InputStream*", scope)
               << ") override;";
 
-            H << sp << nl << "::std::shared_ptr<" << getAbsolute("::Ice::SlicedData", scope) << "> _slicedData;";
+            H << sp << nl << "::std::shared_ptr<" << getUnqualified("::Ice::SlicedData", scope) << "> _slicedData;";
             H << nl << "/// \\endcond";
 
             C << sp;
@@ -6520,7 +6520,7 @@
             C << sp;
             C << nl << "/// \\cond STREAM";
             C << nl << "void" << nl << scoped.substr(2) << "::_write("
-              << getAbsolute("::Ice::OutputStream*", scope) << " ostr) const";
+              << getUnqualified("::Ice::OutputStream*", scope) << " ostr) const";
             C << sb;
             C << nl << "ostr->startException(_slicedData);";
             C << nl << "_writeImpl(ostr);";
@@ -6528,7 +6528,7 @@
             C << eb;
 
             C << sp << nl << "void" << nl << scoped.substr(2) << "::_read("
-              << getAbsolute("::Ice::InputStream*", scope) << " istr)";
+              << getUnqualified("::Ice::InputStream*", scope) << " istr)";
             C << sb;
             C << nl << "istr->startException();";
             C << nl << "_readImpl(istr);";
@@ -6683,7 +6683,7 @@
 }
 
 bool
-Slice::Gen::Cpp11ProxyVisitor::visitUnitStart(const UnitPtr& p)
+Slice::Gen::Cpp11ProxyVisitor::visitUnitStart(const UnitPtr&)
 {
     return true;
 }
@@ -6739,17 +6739,17 @@
     H << sp;
     writeDocSummary(H, p);
     H << nl << "class " << _dllClassExport << p->name() << "Prx : public virtual "
-      << getAbsolute("::Ice::Proxy", scope) << "<" << fixKwd(p->name() + "Prx") << ", ";
+      << getUnqualified("::Ice::Proxy", scope) << "<" << fixKwd(p->name() + "Prx") << ", ";
     if(bases.empty() || (base && base->allOperations().empty()))
     {
-        H << getAbsolute("::Ice::ObjectPrx", scope);
+        H << getUnqualified("::Ice::ObjectPrx", scope);
     }
     else
     {
         ClassList::const_iterator q = bases.begin();
         while(q != bases.end())
         {
-            H << getAbsolute(fixKwd((*q)->scoped() + "Prx"), scope);
+            H << getUnqualified(fixKwd((*q)->scoped() + "Prx"), scope);
             if(++q != bases.end())
             {
                 H << ", ";
@@ -6785,11 +6785,11 @@
     H.inc();
     H << sp;
     H << nl << "/// \\cond INTERNAL";
-    H << nl << getAbsolute(prx, scope) << "() = default;";
-    H << nl << "friend ::std::shared_ptr<" << getAbsolute(prx, scope) << "> IceInternal::createProxy<"
-      << getAbsolute(prx, scope) << ">();";
+    H << nl << getUnqualified(prx, scope) << "() = default;";
+    H << nl << "friend ::std::shared_ptr<" << getUnqualified(prx, scope) << "> IceInternal::createProxy<"
+      << getUnqualified(prx, scope) << ">();";
     H << sp;
-    H << nl << _dllMemberExport << "virtual ::std::shared_ptr<" << getAbsolute("::Ice::ObjectPrx", scope)
+    H << nl << _dllMemberExport << "virtual ::std::shared_ptr<" << getUnqualified("::Ice::ObjectPrx", scope)
       << "> _newInstance() const override;";
     H << nl << "/// \\endcond";
     H << eb << ';';
@@ -6799,7 +6799,7 @@
     C << nl << "::std::shared_ptr<::Ice::ObjectPrx>";
     C << nl << scoped.substr(2) << "::_newInstance() const";
     C << sb;
-    C << nl << "return ::IceInternal::createProxy<" << getAbsolute(prx, scope) << ">();";
+    C << nl << "return ::IceInternal::createProxy<" << getUnqualified(prx, scope) << ">();";
     C << eb;
     C << nl << "/// \\endcond";
     C << sp;
@@ -6896,8 +6896,8 @@
     string scoped = fixKwd(cl->scope() + cl->name() + "Prx" + "::").substr(2);
 
     const string contextParam = escapeParam(paramList, "context");
-    const string contextDecl = "const " + getAbsolute("::Ice::Context&", clScope) + " " + contextParam + " = " +
-        getAbsolute("::Ice::noExplicitContext", clScope);
+    const string contextDecl = "const " + getUnqualified("::Ice::Context&", clScope) + " " + contextParam + " = " +
+        getUnqualified("::Ice::noExplicitContext", clScope);
 
     string futureT;
     if(futureOutParams.empty())
@@ -6948,7 +6948,7 @@
         H << "auto _result = ";
     }
 
-    H << "_makePromiseOutgoing<" << getAbsolute(futureT, cl->scoped()) << ">";
+    H << "_makePromiseOutgoing<" << getUnqualified(futureT, cl->scoped()) << ">";
 
     H << spar << "true, this" << "&" + cl->name() + "Prx::_iceI_" + name;
     for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
@@ -7171,7 +7171,7 @@
         H << nl << "return _makeLamdaOutgoing<" << futureT << ">" << spar;
 
         H << (futureOutParams.size() > 1 ? "_responseCb" : responseParam) << exParam << sentParam << "this";
-        H << string("&" + getAbsolute(scoped, clScope.substr(2)) + "_iceI_" + name);
+        H << string("&" + getUnqualified(scoped, clScope.substr(2)) + "_iceI_" + name);
         for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
         {
             H << fixKwd((*q)->name());
@@ -7189,7 +7189,7 @@
     H << nl << _dllMemberExport << "void _iceI_" << name << spar;
     H << "const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<" + futureT + ">>&";
     H << inParamsS;
-    H << ("const " + getAbsolute("::Ice::Context&", clScope));
+    H << ("const " + getUnqualified("::Ice::Context&", clScope));
     H << epar << ";";
     H << nl << "/// \\endcond";
 
@@ -7197,7 +7197,7 @@
     C << nl << "/// \\cond INTERNAL";
     C << nl << "void" << nl << scoped << "_iceI_" << name << spar;
     C << "const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<" + futureT + ">>& outAsync";
-    C << inParamsImplDecl << ("const " + getAbsolute("::Ice::Context&", clScope) + " context");
+    C << inParamsImplDecl << ("const " + getUnqualified("::Ice::Context&", clScope) + " context");
     C << epar;
     C << sb;
     if(p->returnsData())
@@ -7205,8 +7205,8 @@
         C << nl << "_checkTwowayOnly(" << flatName << ");";
     }
     C << nl << "outAsync->invoke(" << flatName << ", ";
-    C << getAbsolute(operationModeToString(p->sendMode(), true), clScope) << ", "
-      << getAbsolute(opFormatTypeToString(p, true), clScope) << ", context,";
+    C << getUnqualified(operationModeToString(p->sendMode(), true), clScope) << ", "
+      << getUnqualified(opFormatTypeToString(p, true), clScope) << ", context,";
     C.inc();
     C << nl;
 
@@ -7221,7 +7221,7 @@
         // only one, we rely on the default read method from LambdaOutgoing
         // except if the unique ret/out is optional or is an array/range.
         //
-        C << "," << nl << "[](" << getAbsolute("::Ice::InputStream*", clScope) << " istr)";
+        C << "," << nl << "[](" << getUnqualified("::Ice::InputStream*", clScope) << " istr)";
         C << sb;
         C << nl << futureT << " v;";
         writeUnmarshalCode(C, outParams, p, false, _useWstring | TypeContextCpp11, "", returnValueS, "v");
@@ -7240,7 +7240,7 @@
         // a read method, we can't rely on the default read method which wouldn't
         // known which tag to use.
         //
-        C << "," << nl << "[](" << getAbsolute("::Ice::InputStream*", clScope) << " istr)";
+        C << "," << nl << "[](" << getUnqualified("::Ice::InputStream*", clScope) << " istr)";
         C << sb;
 
         writeAllocateCode(C, outParams, p, true, clScope, _useWstring | TypeContextCpp11);
@@ -7331,11 +7331,11 @@
     C << nl;
     if(base)
     {
-        C << getAbsolute(fixKwd(base->scoped()), scope);
+        C << getUnqualified(fixKwd(base->scoped()), scope);
     }
     else
     {
-        getAbsolute(isLocal ? "::Ice::LocalException" : "::Ice::UserException", scope);
+        getUnqualified(isLocal ? "::Ice::LocalException" : "::Ice::UserException", scope);
     }
     C << call;
 }
@@ -7398,11 +7398,11 @@
     C << nl;
     if(base)
     {
-        C << getAbsolute(fixKwd(base->scoped()), scope);
+        C << getUnqualified(fixKwd(base->scoped()), scope);
     }
     else
     {
-        C << getAbsolute("::Ice::Object", scope);
+        C << getUnqualified("::Ice::Object", scope);
     }
     C << call;
 }
@@ -7413,11 +7413,11 @@
     C << nl;
     if(base)
     {
-        C << getAbsolute(fixKwd(base->scoped()), scope);
+        C << getUnqualified(fixKwd(base->scoped()), scope);
     }
     else
     {
-        C << getAbsolute("::Ice::Value", scope);
+        C << getUnqualified("::Ice::Value", scope);
     }
     C << call;
 }
@@ -7872,7 +7872,7 @@
     H.useCurrentPosAsIndent();
     if(bases.empty() || (base && base->allOperations().empty()))
     {
-        H << "public virtual " << getAbsolute("::Ice::Object", scope);
+        H << "public virtual " << getUnqualified("::Ice::Object", scope);
     }
     else
     {
@@ -7882,7 +7882,7 @@
             string baseSuffix = (*q)->isInterface() ? "" : "Disp";
             string baseScoped = fixKwd((*q)->scope() + (*q)->name() + baseSuffix);
 
-            H << "public virtual " << getAbsolute(baseScoped, scope);
+            H << "public virtual " << getUnqualified(baseScoped, scope);
             if(++q != bases.end())
             {
                 H << ',' << nl;
@@ -7927,7 +7927,7 @@
     H << nl << " * @param current The Current object for the invocation.";
     H << nl << " * @return True if this object supports the interface, false, otherwise.";
     H << nl << " */";
-    H << nl << "virtual bool ice_isA(::std::string id, const " << getAbsolute("::Ice::Current&", scope)
+    H << nl << "virtual bool ice_isA(::std::string id, const " << getUnqualified("::Ice::Current&", scope)
       << " current) const override;";
         H << sp;
     H << nl << "/**";
@@ -7936,7 +7936,7 @@
     H << nl << " * @return A list of fully-scoped type IDs.";
     H << nl << " */";
     H << nl
-      << "virtual ::std::vector<::std::string> ice_ids(const " << getAbsolute("::Ice::Current&", scope)
+      << "virtual ::std::vector<::std::string> ice_ids(const " << getUnqualified("::Ice::Current&", scope)
       << " current) const override;";
         H << sp;
     H << nl << "/**";
@@ -7944,7 +7944,7 @@
     H << nl << " * @param current The Current object for the invocation.";
     H << nl << " * @return A fully-scoped type ID.";
     H << nl << " */";
-    H << nl << "virtual ::std::string ice_id(const " << getAbsolute("::Ice::Current&", scope)
+    H << nl << "virtual ::std::string ice_id(const " << getUnqualified("::Ice::Current&", scope)
       << " current) const override;";
         H << sp;
     H << nl << "/**";
@@ -7957,21 +7957,21 @@
 
     C << sp;
     C << nl << "bool" << nl << scoped.substr(2) << "::ice_isA(::std::string s, const "
-      << getAbsolute("::Ice::Current&", scope) << ") const";
+      << getUnqualified("::Ice::Current&", scope) << ") const";
     C << sb;
     C << nl << "return ::std::binary_search(" << flatName << ", " << flatName << " + " << ids.size() << ", s);";
     C << eb;
 
     C << sp;
     C << nl << "::std::vector<::std::string>" << nl << scoped.substr(2) << "::ice_ids(const "
-      << getAbsolute("::Ice::Current&", scope) << ") const";
+      << getUnqualified("::Ice::Current&", scope) << ") const";
     C << sb;
     C << nl << "return ::std::vector<::std::string>(&" << flatName << "[0], &" << flatName << '[' << ids.size()
       << "]);";
     C << eb;
 
     C << sp;
-    C << nl << "::std::string" << nl << scoped.substr(2) << "::ice_id(const " << getAbsolute("::Ice::Current&", scope)
+    C << nl << "::std::string" << nl << scoped.substr(2) << "::ice_id(const " << getUnqualified("::Ice::Current&", scope)
       << ") const";
     C << sb;
     C << nl << "return ice_staticId();";
@@ -8021,14 +8021,14 @@
         H << sp;
         H << nl << "/// \\cond INTERNAL";
         H << nl << "virtual bool _iceDispatch(::IceInternal::Incoming&, const "
-          << getAbsolute("::Ice::Current&", scope) << ") override;";
+          << getUnqualified("::Ice::Current&", scope) << ") override;";
         H << nl << "/// \\endcond";
 
         C << sp;
         C << nl << "/// \\cond INTERNAL";
         C << nl << "bool";
         C << nl << scoped.substr(2) << "::_iceDispatch(::IceInternal::Incoming& in, const "
-          << getAbsolute("::Ice::Current&", scope) << " current)";
+          << getUnqualified("::Ice::Current&", scope) << " current)";
         C << sb;
 
         C << nl << "::std::pair<const ::std::string*, const ::std::string*> r = "
@@ -8036,7 +8036,7 @@
           << ", current.operation);";
         C << nl << "if(r.first == r.second)";
         C << sb;
-        C << nl << "throw " << getAbsolute("::Ice::OperationNotExistException", scope)
+        C << nl << "throw " << getUnqualified("::Ice::OperationNotExistException", scope)
           << "(__FILE__, __LINE__, current.id, current.facet, current.operation);";
         C << eb;
         C << sp;
@@ -8053,7 +8053,7 @@
         C << nl << "default:";
         C << sb;
         C << nl << "assert(false);";
-        C << nl << "throw " << getAbsolute("::Ice::OperationNotExistException", scope)
+        C << nl << "throw " << getUnqualified("::Ice::OperationNotExistException", scope)
           << "(__FILE__, __LINE__, current.id, current.facet, current.operation);";
         C << eb;
         C << eb;
@@ -8110,7 +8110,7 @@
     const string responsecbParam = escapeParam(inParams, "response");
     const string excbParam = escapeParam(inParams, "exception");
     const string currentParam = escapeParam(amd ? inParams : paramList, "current");
-    const string currentTypeDecl = "const " + getAbsolute("::Ice::Current&", classScope);
+    const string currentTypeDecl = "const " + getUnqualified("::Ice::Current&", classScope);
     const string currentDecl = currentTypeDecl + " " + currentParam;
 
     CommentPtr comment = p->parseComment(false);
@@ -8201,7 +8201,7 @@
         H << nl << "/**";
         H << nl << " * Marshaled result structure for operation " << (amd ? name + "Async" : fixKwd(name)) << ".";
         H << nl << " */";
-        H << nl << "class " << resultName << " : public " << getAbsolute("::Ice::MarshaledResult", classScope);
+        H << nl << "class " << resultName << " : public " << getUnqualified("::Ice::MarshaledResult", classScope);
         H << sb;
         H.dec();
         H << nl << "public:";
@@ -8276,7 +8276,7 @@
     H << nl << deprecateSymbol << "virtual " << retS << ' ' << opName << spar << params << epar << isConst << " = 0;";
     H << nl << "/// \\cond INTERNAL";
     H << nl << "bool _iceD_" << name << "(::IceInternal::Incoming&, const "
-      << getAbsolute("::Ice::Current&", classScope) << ")" << isConst << ';';
+      << getUnqualified("::Ice::Current&", classScope) << ")" << isConst << ';';
     H << nl << "/// \\endcond";
 
     C << sp;
@@ -8284,9 +8284,9 @@
     C << nl << "bool";
     C << nl << scope.substr(2);
     C << "_iceD_" << name << "(::IceInternal::Incoming& inS, const "
-      << getAbsolute("::Ice::Current&", classScope) << " current)" << isConst;
+      << getUnqualified("::Ice::Current&", classScope) << " current)" << isConst;
     C << sb;
-    C << nl << "_iceCheckMode(" << getAbsolute(operationModeToString(p->mode(), true), classScope)
+    C << nl << "_iceCheckMode(" << getUnqualified(operationModeToString(p->mode(), true), classScope)
       << ", current.mode);";
 
     if(!inParams.empty())
@@ -8311,18 +8311,21 @@
 
     if(!amd)
     {
-        writeAllocateCode(C, outParams, 0, true, classScope, _useWstring | TypeContextCpp11);
         if(p->hasMarshaledResult())
         {
             C << nl << "inS.setMarshaledResult(";
         }
-        else if(ret)
-        {
-            C << nl << retS << " ret = ";
-        }
         else
         {
-            C << nl;
+            writeAllocateCode(C, outParams, 0, true, classScope, _useWstring | TypeContextCpp11);
+            if(ret)
+            {
+                C << nl << retS << " ret = ";
+            }
+            else
+            {
+                C << nl;
+            }
         }
 
         C << "this->" << opName << spar << args << epar;
@@ -8427,16 +8430,16 @@
 
     H << sp;
     writeDocSummary(H, p);
-    H << nl << "class " << _dllClassExport << name << " : public " << getAbsolute("::Ice::ValueHelper", scope)
+    H << nl << "class " << _dllClassExport << name << " : public " << getUnqualified("::Ice::ValueHelper", scope)
       << "<" << name << ", ";
 
     if(!base || (base && base->isInterface()))
     {
-        H << getAbsolute("::Ice::Value", scope);
+        H << getUnqualified("::Ice::Value", scope);
     }
     else
     {
-        H << getAbsolute(fixKwd(base->scoped()), scope);
+        H << getUnqualified(fixKwd(base->scoped()), scope);
     }
     H << ">";
     H << sb;
@@ -8507,7 +8510,7 @@
         H << nl << " * @return The SlicedData object, or nil if the value was not sliced or was not";
         H << nl << " * marshaled in the sliced format.";
         H << nl << " */";
-        H << nl << "virtual ::std::shared_ptr<" << getAbsolute("::Ice::SlicedData", scope)
+        H << nl << "virtual ::std::shared_ptr<" << getUnqualified("::Ice::SlicedData", scope)
           << "> ice_getSlicedData() const override;";
 
         C << sp;
@@ -8518,13 +8521,13 @@
 
         H << sp;
         H << nl << "/// \\cond STREAM";
-        H << nl << "virtual void _iceWrite(" << getAbsolute("::Ice::OutputStream*", scope) << ") const override;";
-        H << nl << "virtual void _iceRead(" << getAbsolute("::Ice::InputStream*", scope) << ") override;";
+        H << nl << "virtual void _iceWrite(" << getUnqualified("::Ice::OutputStream*", scope) << ") const override;";
+        H << nl << "virtual void _iceRead(" << getUnqualified("::Ice::InputStream*", scope) << ") override;";
         H << nl << "/// \\endcond";
 
         C << sp;
         C << nl << "/// \\cond STREAM";
-        C << nl << "void" << nl << scoped.substr(2) << "::_iceWrite(" << getAbsolute("::Ice::OutputStream*", scope)
+        C << nl << "void" << nl << scoped.substr(2) << "::_iceWrite(" << getUnqualified("::Ice::OutputStream*", scope)
           << " ostr) const";
         C << sb;
         C << nl << "ostr->startValue(_iceSlicedData);";
@@ -8533,7 +8536,7 @@
         C << eb;
 
         C << sp;
-        C << nl << "void" << nl << scoped.substr(2) << "::_iceRead(" << getAbsolute("::Ice::InputStream*", scope)
+        C << nl << "void" << nl << scoped.substr(2) << "::_iceRead(" << getUnqualified("::Ice::InputStream*", scope)
           << " istr)";
         C << sb;
         C << nl << "istr->startValue();";
@@ -8608,7 +8611,7 @@
         }
         H << sp;
         H << nl << "/// \\cond STREAM";
-        H << nl << "::std::shared_ptr<" << getAbsolute("::Ice::SlicedData", scope) << "> _iceSlicedData;";
+        H << nl << "::std::shared_ptr<" << getUnqualified("::Ice::SlicedData", scope) << "> _iceSlicedData;";
         H << nl << "/// \\endcond";
     }
 
@@ -8696,12 +8699,12 @@
 
     if(base->isLocal())
     {
-        H << nl << getAbsolute(fixKwd(base->scoped()), scope);
+        H << nl << getUnqualified(fixKwd(base->scoped()), scope);
     }
     else
     {
-        H << nl << "Ice::ValueHelper<" << getAbsolute(fixKwd(derived->scoped()), scope)
-          << ", " << getAbsolute(fixKwd(base->scoped()), scope) << ">";
+        H << nl << "Ice::ValueHelper<" << getUnqualified(fixKwd(derived->scoped()), scope)
+          << ", " << getUnqualified(fixKwd(base->scoped()), scope) << ">";
     }
     H << upcall;
     return true;
@@ -9019,14 +9022,14 @@
         StructPtr st = StructPtr::dynamicCast(type);
         if(st)
         {
-            return getAbsolute(fixKwd(st->scoped()), scope) + "()";
+            return getUnqualified(fixKwd(st->scoped()), scope) + "()";
         }
 
         EnumPtr en = EnumPtr::dynamicCast(type);
         if(en)
         {
             EnumeratorList enumerators = en->enumerators();
-            return getAbsolute(fixKwd(en->scoped() + "::" + enumerators.front()->name()), scope);
+            return getUnqualified(fixKwd(en->scoped() + "::" + enumerators.front()->name()), scope);
         }
 
         SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -9038,7 +9041,7 @@
         DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
         if(dict)
         {
-            return getAbsolute(fixKwd(dict->scoped()), scope) + "()";
+            return getUnqualified(fixKwd(dict->scoped()), scope) + "()";
         }
     }
 
@@ -9225,7 +9228,7 @@
         }
         else
         {
-            H << sp << nl << "virtual " << getAbsolute(retS, scope) << ' ' << fixKwd(opName) << '(';
+            H << sp << nl << "virtual " << getUnqualified(retS, scope) << ' ' << fixKwd(opName) << '(';
             H.useCurrentPosAsIndent();
             ParamDeclList paramList = op->hasMarshaledResult() ? inParams : op->parameters();
             for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cpp/Gen.h zeroc-ice-3.7.2/cpp/src/slice2cpp/Gen.h
--- zeroc-ice-3.7.1/cpp/src/slice2cpp/Gen.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cpp/Gen.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_H
 #define GEN_H
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cpp/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2cpp/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2cpp/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cpp/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
@@ -398,16 +393,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj zeroc-ice-3.7.2/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -71,7 +71,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -80,7 +80,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -89,7 +89,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -98,7 +98,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/CsUtil.cpp zeroc-ice-3.7.2/cpp/src/slice2cs/CsUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2cs/CsUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/CsUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <CsUtil.h>
 #include <DotNetNames.h>
@@ -100,13 +95,110 @@
 }
 
 string
-Slice::CsGenerator::getAbsolute(const string& type, const string& scope)
+Slice::CsGenerator::getNamespacePrefix(const ContainedPtr& cont)
+{
+    //
+    // Traverse to the top-level module.
+    //
+    ModulePtr m;
+    ContainedPtr p = cont;
+    while(true)
+    {
+        if(ModulePtr::dynamicCast(p))
+        {
+            m = ModulePtr::dynamicCast(p);
+        }
+
+        ContainerPtr c = p->container();
+        p = ContainedPtr::dynamicCast(c); // This cast fails for Unit.
+        if(!p)
+        {
+            break;
+        }
+    }
+
+    assert(m);
+
+    static const string prefix = "cs:namespace:";
+
+    string q;
+    if(m->findMetaData(prefix, q))
+    {
+        q = q.substr(prefix.size());
+    }
+    return q;
+}
+
+string
+Slice::CsGenerator::getCustomTypeIdNamespace(const UnitPtr& ut)
+{
+    DefinitionContextPtr dc = ut->findDefinitionContext(ut->topLevelFile());
+    assert(dc);
+
+    static const string typeIdNsPrefix = "cs:typeid-namespace:";
+    string result = dc->findMetaData(typeIdNsPrefix);
+    if(!result.empty())
+    {
+        result = result.substr(typeIdNsPrefix.size());
+    }
+    return result;
+}
+
+string
+Slice::CsGenerator::getNamespace(const ContainedPtr& cont)
+{
+    string scope = fixId(cont->scope());
+    if(scope.rfind(".") == scope.size() - 1)
+    {
+        scope = scope.substr(0, scope.size() - 1);
+    }
+    string prefix = getNamespacePrefix(cont);
+    if(!prefix.empty())
+    {
+        if(!scope.empty())
+        {
+            return prefix + "." + scope;
+        }
+        else
+        {
+            return prefix;
+        }
+    }
+
+    return scope;
+}
+
+string
+Slice::CsGenerator::getUnqualified(const string& type, const string& scope, bool builtin)
+{
+    if(type.find(".") != string::npos && type.find(scope) == 0 && type.find(".", scope.size() + 1) == string::npos)
+    {
+        return type.substr(scope.size() + 1);
+    }
+    else if(builtin)
+    {
+        return type.find(".") == string::npos ? type : "global::" + type;
+    }
+    else
+    {
+        return "global::" + type;
+    }
+}
+
+string
+Slice::CsGenerator::getUnqualified(const ContainedPtr& p, const string& package, const string& prefix,
+                                   const string& suffix)
 {
-    if(type.find(".") != string::npos && type.find(scope) == 0 && type.find(".", scope.size()) == string::npos)
+    string name = fixId(prefix + p->name() + suffix);
+    string contPkg = getNamespace(p);
+    if(contPkg == package || contPkg.empty())
     {
-        return type.substr(scope.size());
+        return name;
+    }
+    else
+    {
+        return "global::" + contPkg + "." + name;
     }
-    return type;
 }
 
 //
@@ -167,7 +259,7 @@
 Slice::CsGenerator::getOptionalFormat(const TypePtr& type, const string& scope)
 {
     BuiltinPtr bp = BuiltinPtr::dynamicCast(type);
-    string prefix = getAbsolute("Ice.OptionalFormat", scope);
+    string prefix = getUnqualified("Ice.OptionalFormat", scope);
     if(bp)
     {
         switch(bp->kind())
@@ -285,16 +377,16 @@
     {
         ContainedPtr cont = ContainedPtr::dynamicCast(cl->container());
         assert(cont);
-        return fixId(cont->scoped(), DotNet::ICloneable) + "." + cl->name() + "Disp_.ice_staticId()";
+        return getUnqualified(cont) + "." + cl->name() + "Disp_.ice_staticId()";
     }
     else
     {
-        return fixId(cl->scoped(), DotNet::ICloneable) + ".ice_staticId()";
+        return getUnqualified(cl) + ".ice_staticId()";
     }
 }
 
 string
-Slice::CsGenerator::typeToString(const TypePtr& type, const string& scope, bool optional, bool local,
+Slice::CsGenerator::typeToString(const TypePtr& type, const string& package, bool optional, bool local,
                                  const StringList& metaData)
 {
     if(!type)
@@ -304,7 +396,7 @@
 
     if(optional)
     {
-        return getAbsolute("Ice.Optional", scope) + "<" + typeToString(type, scope, false, local) + ">";
+        return getUnqualified("Ice.Optional", package) + "<" + typeToString(type, package, false, local) + ">";
     }
 
     static const char* builtinTable[] =
@@ -319,7 +411,7 @@
         "string",
         "Ice.Object",
         "Ice.ObjectPrx",
-        "_System.Object",
+        "System.Object",
         "Ice.Value"
     };
 
@@ -341,11 +433,11 @@
     {
         if(!local && builtin->kind() == Builtin::KindObject)
         {
-            return getAbsolute(builtinTable[Builtin::KindValue], scope);
+            return getUnqualified(builtinTable[Builtin::KindValue], package, true);
         }
         else
         {
-            return getAbsolute(builtinTable[builtin->kind()], scope);
+            return getUnqualified(builtinTable[builtin->kind()], package, true);
         }
     }
 
@@ -354,11 +446,11 @@
     {
         if(cl->isInterface() && !local)
         {
-            return getAbsolute("Ice.Value", scope);
+            return getUnqualified("Ice.Value", package);
         }
         else
         {
-            return getAbsolute(fixId(cl->scoped()), scope);
+            return getUnqualified(cl, package);
         }
     }
 
@@ -368,11 +460,11 @@
         ClassDefPtr def = proxy->_class()->definition();
         if(def->isInterface() || def->allOperations().size() > 0)
         {
-            return getAbsolute(fixId(proxy->_class()->scoped() + "Prx"), scope);
+            return getUnqualified(proxy->_class(), package, "", "Prx");
         }
         else
         {
-            return getAbsolute("Ice.ObjectPrx", scope);
+            return getUnqualified("Ice.ObjectPrx", package);
         }
     }
 
@@ -383,25 +475,26 @@
         string meta;
         if(seq->findMetaData(prefix, meta))
         {
-            string type = meta.substr(prefix.size());
-            if(type == "List" || type == "LinkedList" || type == "Queue" || type == "Stack")
+            string customType = meta.substr(prefix.size());
+            if(customType == "List" || customType == "LinkedList" || customType == "Queue" || customType == "Stack")
             {
-                return "_System.Collections.Generic." + type + "<" + typeToString(seq->type(), scope, optional, local) + ">";
+                return "global::System.Collections.Generic." + customType + "<" +
+                    typeToString(seq->type(), package, optional, local) + ">";
             }
             else
             {
-                return "global::" + type + "<" + typeToString(seq->type(), scope, optional, local) + ">";
+                return "global::" + customType + "<" + typeToString(seq->type(), package, optional, local) + ">";
             }
         }
 
         prefix = "cs:serializable:";
         if(seq->findMetaData(prefix, meta))
         {
-            string type = meta.substr(prefix.size());
-            return "global::" + type;
+            string customType = meta.substr(prefix.size());
+            return "global::" + customType;
         }
 
-        return typeToString(seq->type(), scope, optional, local) + "[]";
+        return typeToString(seq->type(), package, optional, local) + "[]";
     }
 
     DictionaryPtr d = DictionaryPtr::dynamicCast(type);
@@ -418,15 +511,15 @@
         {
             typeName = "Dictionary";
         }
-        return "_System.Collections.Generic." + typeName + "<" +
-            typeToString(d->keyType(), scope, optional, local) + ", " +
-            typeToString(d->valueType(), scope, optional, local) + ">";
+        return "global::System.Collections.Generic." + typeName + "<" +
+            typeToString(d->keyType(), package, optional, local) + ", " +
+            typeToString(d->valueType(), package, optional, local) + ">";
     }
 
     ContainedPtr contained = ContainedPtr::dynamicCast(type);
     if(contained)
     {
-        return getAbsolute(fixId(contained->scoped()), scope);
+        return getUnqualified(contained, package);
     }
 
     return "???";
@@ -445,12 +538,12 @@
 }
 
 string
-Slice::CsGenerator::resultType(const OperationPtr& op, const string& scope, bool dispatch)
+Slice::CsGenerator::resultType(const OperationPtr& op, const string& package, bool dispatch)
 {
     ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container()); // Get the class containing the op.
     if(dispatch && op->hasMarshaledResult())
     {
-        return getAbsolute(fixId(cl->scope() + resultStructName(cl->name(), op->name(), true)), scope);
+        return getUnqualified(cl, package, "", resultStructName("", op->name(), true));
     }
 
     string t;
@@ -459,16 +552,15 @@
     {
         if(outParams.empty())
         {
-            t = typeToString(op->returnType(), scope, op->returnIsOptional(), cl->isLocal());
+            t = typeToString(op->returnType(), package, op->returnIsOptional(), cl->isLocal());
         }
         else if(op->returnType() || outParams.size() > 1)
         {
-            ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
-            t = getAbsolute(fixId(cl->scope()) + resultStructName(cl->name(), op->name()), scope);
+            t = getUnqualified(cl, package, "", resultStructName("", op->name()));
         }
         else
         {
-            t = typeToString(outParams.front()->type(), scope, outParams.front()->optional(), cl->isLocal());
+            t = typeToString(outParams.front()->type(), package, outParams.front()->optional(), cl->isLocal());
         }
     }
 
@@ -481,11 +573,11 @@
     string t = resultType(op, scope, dispatch);
     if(t.empty())
     {
-        return "_System.Threading.Tasks.Task";
+        return "global::System.Threading.Tasks.Task";
     }
     else
     {
-        return "_System.Threading.Tasks.Task<" + t + '>';
+        return "global::System.Threading.Tasks.Task<" + t + '>';
     }
 }
 
@@ -551,7 +643,7 @@
 void
 Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
                                               const TypePtr& type,
-                                              const string& scope,
+                                              const string& package,
                                               const string& param,
                                               bool marshal,
                                               const string& customStream)
@@ -678,7 +770,7 @@
             }
             case Builtin::KindObjectProxy:
             {
-                string typeS = typeToString(type, scope);
+                string typeS = typeToString(type, package);
                 if(marshal)
                 {
                     out << nl << stream << ".writeProxy(" << param << ");";
@@ -704,8 +796,8 @@
         ClassDefPtr def = prx->_class()->definition();
         if(def->isInterface() || def->allOperations().size() > 0)
         {
-            string typeS = typeToString(type, scope);
-            if (marshal)
+            string typeS = typeToString(type, package);
+            if(marshal)
             {
                 out << nl << typeS << "Helper.write(" << stream << ", " << param << ");";
             }
@@ -749,7 +841,7 @@
         {
             if(!isValueType(st))
             {
-                out << nl << typeToString(st, scope) << ".ice_write(" << stream << ", " << param << ");";
+                out << nl << typeToString(st, package) << ".ice_write(" << stream << ", " << param << ");";
             }
             else
             {
@@ -760,7 +852,7 @@
         {
             if(!isValueType(st))
             {
-                out << nl << param << " = " << typeToString(type, scope) << ".ice_read(" << stream << ");";
+                out << nl << param << " = " << typeToString(type, package) << ".ice_read(" << stream << ");";
             }
             else
             {
@@ -779,7 +871,7 @@
         }
         else
         {
-            out << nl << param << " = (" << typeToString(type, scope) << ')' << stream << ".readEnum(" << en->maxValue()
+            out << nl << param << " = (" << typeToString(type, package) << ')' << stream << ".readEnum(" << en->maxValue()
                 << ");";
         }
         return;
@@ -788,22 +880,22 @@
     SequencePtr seq = SequencePtr::dynamicCast(type);
     if(seq)
     {
-        writeSequenceMarshalUnmarshalCode(out, seq, scope, param, marshal, true, stream);
+        writeSequenceMarshalUnmarshalCode(out, seq, package, param, marshal, true, stream);
         return;
     }
 
     assert(ConstructedPtr::dynamicCast(type));
-    string typeS;
+    string helperName;
     DictionaryPtr d = DictionaryPtr::dynamicCast(type);
     if(d)
     {
-        typeS = fixId(d->scope()) + d->name();
+        helperName = getUnqualified(d, package, "", "Helper");
     }
     else
     {
-        typeS = typeToString(type, scope);
+        helperName = typeToString(type, package) + "Helper";
     }
-    string helperName = getAbsolute(typeS + "Helper", scope);
+
     if(marshal)
     {
         out << nl << helperName << ".write(" << stream << ", " << param << ");";
@@ -980,8 +1072,8 @@
                 }
                 else
                 {
-                    out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<"
-                        << getAbsolute("Ice.ObjectPrx", scope) << ">(" << stream << ".readProxy(" << tag << "));";
+                    out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<"
+                        << getUnqualified("Ice.ObjectPrx", scope) << ">(" << stream << ".readProxy(" << tag << "));";
                 }
                 break;
             }
@@ -1000,7 +1092,7 @@
         if(marshal)
         {
             out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag
-                << ", " << getAbsolute("Ice.OptionalFormat", scope) << ".FSize))";
+                << ", " << getUnqualified("Ice.OptionalFormat", scope) << ".FSize))";
             out << sb;
             out << nl << "int pos = " << stream << ".startSize();";
             writeMarshalUnmarshalCode(out, type, scope, param + ".Value", marshal, customStream);
@@ -1009,7 +1101,7 @@
         }
         else
         {
-            out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getAbsolute("Ice.OptionalFormat", scope)
+            out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getUnqualified("Ice.OptionalFormat", scope)
                 << ".FSize))";
             out << sb;
             out << nl << stream << ".skip(4);";
@@ -1017,11 +1109,11 @@
             string typeS = typeToString(type, scope);
             out << nl << typeS << ' ' << tmp << ';';
             writeMarshalUnmarshalCode(out, type, scope, tmp, marshal, customStream);
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
             out << sb;
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">();";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">();";
             out << eb;
         }
         return;
@@ -1087,11 +1179,11 @@
                 out << nl << typeS << ' ' << tmp << " = null;";
             }
             writeMarshalUnmarshalCode(out, type, scope, tmp, marshal, customStream);
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
             out << sb;
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">();";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">();";
             out << eb;
         }
         return;
@@ -1110,18 +1202,18 @@
         }
         else
         {
-            out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getAbsolute("Ice.OptionalFormat", scope)
+            out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getUnqualified("Ice.OptionalFormat", scope)
                 << ".Size))";
             out << sb;
             string typeS = typeToString(type, scope);
             string tmp = "tmpVal";
             out << nl << typeS << ' ' << tmp << ';';
             writeMarshalUnmarshalCode(out, type, scope, tmp, marshal, customStream);
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
             out << sb;
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">();";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">();";
             out << eb;
         }
         return;
@@ -1176,11 +1268,11 @@
         string tmp = "tmpVal";
         out << nl << typeS << ' ' << tmp << " = new " << typeS << "();";
         writeMarshalUnmarshalCode(out, type, scope, tmp, marshal, customStream);
-        out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
+        out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">(" << tmp << ");";
         out << eb;
         out << nl << "else";
         out << sb;
-        out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << typeS << ">();";
+        out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << typeS << ">();";
         out << eb;
     }
 }
@@ -1204,7 +1296,7 @@
     assert(cont);
     if(useHelper)
     {
-        string helperName = getAbsolute(fixId(cont->scoped(), DotNet::ICloneable) + "." + seq->name() + "Helper", scope);
+        string helperName = getUnqualified(getNamespace(seq) + "." + seq->name() + "Helper", scope);
         if(marshal)
         {
             out << nl << helperName << ".write(" << stream << ", " << param << ");";
@@ -1292,7 +1384,7 @@
                             // If the collection is a stack, write in top-to-bottom order. Stacks
                             // cannot contain Ice.Object.
                             //
-                            out << nl << getAbsolute("Ice.ObjectPrx", scope) << "[] " << param << "_tmp = " << param
+                            out << nl << getUnqualified("Ice.ObjectPrx", scope) << "[] " << param << "_tmp = " << param
                                 << ".ToArray();";
                             out << nl << "for(int ix = 0; ix < " << param << "_tmp.Length; ++ix)";
                             out << sb;
@@ -1301,7 +1393,7 @@
                         }
                         else
                         {
-                            out << nl << "_System.Collections.Generic.IEnumerator<" << typeS
+                            out << nl << "global::System.Collections.Generic.IEnumerator<" << typeS
                                 << "> e = " << param << ".GetEnumerator();";
                             out << nl << "while(e.MoveNext())";
                             out << sb;
@@ -1335,40 +1427,45 @@
                         string patcherName;
                         if(isArray)
                         {
-                            patcherName = "IceInternal.Patcher.arrayReadValue";
-                            out << "Ice.Value[" << param << "_lenx];";
+                            patcherName = "global::IceInternal.Patcher.arrayReadValue";
+                            out << getUnqualified("Ice.Value", scope) << "[" << param << "_lenx];";
                         }
                         else if(isCustom)
                         {
-                            patcherName = "IceInternal.Patcher.customSeqReadValue";
-                            out << "global::" << genericType << "<Ice.Value>();";
+                            patcherName = "global::IceInternal.Patcher.customSeqReadValue";
+                            out << "global::" << genericType << "<" << getUnqualified("Ice.Value", scope) << ">();";
                         }
                         else
                         {
-                            patcherName = "IceInternal.Patcher.listReadValue";
-                            out << "_System.Collections.Generic." << genericType << "<Ice.Value>(" << param << "_lenx);";
+                            patcherName = "global::IceInternal.Patcher.listReadValue";
+                            out << "global::System.Collections.Generic." << genericType << "<"
+                                << getUnqualified("Ice.Value", scope) << ">(" << param << "_lenx);";
                         }
                         out << nl << "for(int ix = 0; ix < " << param << "_lenx; ++ix)";
                         out << sb;
-                        out << nl << stream << ".readValue(" << patcherName << "<Ice.Value>(" << param << ", ix));";
+                        out << nl << stream << ".readValue(" << patcherName << "<"
+                            << getUnqualified("Ice.Value", scope) << ">(" << param << ", ix));";
                     }
                     else
                     {
                         if(isStack)
                         {
-                            out << nl << "Ice.ObjectPrx[] " << param << "_tmp = new Ice.ObjectPrx[" << param << "_lenx];";
+                            out << nl << getUnqualified("Ice.ObjectPrx", scope) << "[] " << param << "_tmp = new "
+                                << getUnqualified("Ice.ObjectPrx", scope) << "[" << param << "_lenx];";
                         }
                         else if(isArray)
                         {
-                            out << "Ice.ObjectPrx[" << param << "_lenx];";
+                            out << getUnqualified("Ice.ObjectPrx", scope) << "[" << param << "_lenx];";
                         }
                         else if(isCustom)
                         {
-                            out << "global::" << genericType << "<Ice.ObjectPrx>();";
+                            out << "global::" << genericType << "<" << getUnqualified("Ice.ObjectPrx", scope)
+                                << ">();";
                         }
                         else
                         {
-                            out << "_System.Collections.Generic." << genericType << "<Ice.ObjectPrx>(";
+                            out << "global::System.Collections.Generic." << genericType << "<"
+                                << getUnqualified("Ice.ObjectPrx", scope) << ">(";
                             if(!isLinkedList)
                             {
                                 out << param << "_lenx";
@@ -1385,7 +1482,8 @@
                         }
                         else
                         {
-                            out << nl << "Ice.ObjectPrx val = new Ice.ObjectPrxHelperBase();";
+                            out << nl << getUnqualified("Ice.ObjectPrx", scope) << " val = new "
+                                << getUnqualified("Ice.ObjectPrxHelperBase", scope) << "();";
                             out << nl << "val = " << stream << ".readProxy();";
                             out << nl << param << "." << addMethod << "(val);";
                         }
@@ -1394,8 +1492,8 @@
 
                     if(isStack)
                     {
-                        out << nl << "_System.Array.Reverse(" << param << "_tmp);";
-                        out << nl << param << " = new _System.Collections.Generic." << genericType << "<" << typeS << ">("
+                        out << nl << "global::System.Array.Reverse(" << param << "_tmp);";
+                        out << nl << param << " = new global::System.Collections.Generic." << genericType << "<" << typeS << ">("
                             << param << "_tmp);";
                     }
                 }
@@ -1419,7 +1517,7 @@
                 }
 
                 string func = typeS;
-                func[0] = toupper(static_cast<unsigned char>(typeS[0]));
+                func[0] = static_cast<char>(toupper(static_cast<unsigned char>(typeS[0])));
                 if(marshal)
                 {
                     if(isArray)
@@ -1486,7 +1584,7 @@
                 // Stacks cannot contain class instances, so there is no need to marshal a
                 // stack bottom-up here.
                 //
-                out << nl << "_System.Collections.Generic.IEnumerator<" << typeS
+                out << nl << "global::System.Collections.Generic.IEnumerator<" << typeS
                     << "> e = " << param << ".GetEnumerator();";
                 out << nl << "while(e.MoveNext())";
                 out << sb;
@@ -1511,18 +1609,18 @@
             string patcherName;
             if(isArray)
             {
-                patcherName = "IceInternal.Patcher.arrayReadValue";
+                patcherName = "global::IceInternal.Patcher.arrayReadValue";
                 out << toArrayAlloc(typeS + "[]", "szx") << ";";
             }
             else if(isCustom)
             {
-                patcherName = "IceInternal.Patcher.customSeqReadValue";
+                patcherName = "global::IceInternal.Patcher.customSeqReadValue";
                 out << "global::" << genericType << "<" << typeS << ">();";
             }
             else
             {
-                patcherName = "IceInternal.Patcher.listReadValue";
-                out << "_System.Collections.Generic." << genericType << "<" << typeS << ">(szx);";
+                patcherName = "global::IceInternal.Patcher.listReadValue";
+                out << "global::System.Collections.Generic." << genericType << "<" << typeS << ">(szx);";
             }
             out << nl << "for(int ix = 0; ix < szx; ++ix)";
             out << sb;
@@ -1558,7 +1656,7 @@
                 }
                 else
                 {
-                    out << nl << "_System.Collections.Generic.IEnumerator<" << typeS
+                    out << nl << "global::System.Collections.Generic.IEnumerator<" << typeS
                         << "> e = " << param << ".GetEnumerator();";
                     out << nl << "while(e.MoveNext())";
                 }
@@ -1637,7 +1735,7 @@
             }
             else
             {
-                out << nl << param << " = new _System.Collections.Generic." << genericType << "<" << typeS << ">(";
+                out << nl << param << " = new global::System.Collections.Generic." << genericType << "<" << typeS << ">(";
                 if(!isLinkedList)
                 {
                     out << "szx";
@@ -1664,8 +1762,8 @@
             out << eb;
             if(isStack)
             {
-                out << nl << "_System.Array.Reverse(" << param << "_tmp);";
-                out << nl << param << " = new _System.Collections.Generic." << genericType << "<" << typeS << ">("
+                out << nl << "global::System.Array.Reverse(" << param << "_tmp);";
+                out << nl << param << " = new global::System.Collections.Generic." << genericType << "<" << typeS << ">("
                     << param << "_tmp);";
             }
             out << eb;
@@ -1700,7 +1798,7 @@
                 }
                 else
                 {
-                    out << nl << "_System.Collections.Generic.IEnumerator<" << typeS
+                    out << nl << "global::System.Collections.Generic.IEnumerator<" << typeS
                         << "> e = " << param << ".GetEnumerator();";
                     out << nl << "while(e.MoveNext())";
                     out << sb;
@@ -1736,7 +1834,7 @@
             }
             else
             {
-                out << nl << param << " = new _System.Collections.Generic." << genericType << "<" << typeS << ">(";
+                out << nl << param << " = new global::System.Collections.Generic." << genericType << "<" << typeS << ">(";
                 if(!isLinkedList)
                 {
                     out << "szx";
@@ -1758,8 +1856,8 @@
             out << eb;
             if(isStack)
             {
-                out << nl << "_System.Array.Reverse(" << param << "_tmp);";
-                out << nl << param << " = new _System.Collections.Generic." << genericType << "<" << typeS << ">("
+                out << nl << "global::System.Array.Reverse(" << param << "_tmp);";
+                out << nl << param << " = new global::System.Collections.Generic." << genericType << "<" << typeS << ">("
                     << param << "_tmp);";
             }
             out << eb;
@@ -1770,11 +1868,11 @@
     string helperName;
     if(ProxyPtr::dynamicCast(type))
     {
-        helperName = getAbsolute(fixId(ProxyPtr::dynamicCast(type)->_class()->scoped() + "PrxHelper"), scope);
+        helperName = getUnqualified(ProxyPtr::dynamicCast(type)->_class(), scope, "", "PrxHelper");
     }
     else
     {
-        helperName = getAbsolute(fixId(ContainedPtr::dynamicCast(type)->scoped() + "Helper"), scope);
+        helperName = getUnqualified(ContainedPtr::dynamicCast(type), scope, "", "Helper");
     }
 
     string func;
@@ -1803,7 +1901,7 @@
             }
             else
             {
-                out << nl << "_System.Collections.Generic.IEnumerator<" << typeS
+                out << nl << "global::System.Collections.Generic.IEnumerator<" << typeS
                     << "> e = " << param << ".GetEnumerator();";
                 out << nl << "while(e.MoveNext())";
                 out << sb;
@@ -1840,7 +1938,7 @@
         }
         else
         {
-            out << nl << param << " = new _System.Collections.Generic." << genericType << "<" << typeS << ">();";
+            out << nl << param << " = new global::System.Collections.Generic." << genericType << "<" << typeS << ">();";
         }
         out << nl << "for(int ix = 0; ix < szx; ++ix)";
         out << sb;
@@ -1856,8 +1954,8 @@
         out << eb;
         if(isStack)
         {
-            out << nl << "_System.Array.Reverse(" << param << "_tmp);";
-            out << nl << param << " = new _System.Collections.Generic." << genericType << "<" << typeS << ">("
+            out << nl << "global::System.Array.Reverse(" << param << "_tmp);";
+            out << nl << param << " = new global::System.Collections.Generic." << genericType << "<" << typeS << ">("
                 << param << "_tmp);";
         }
         out << eb;
@@ -1904,7 +2002,7 @@
         case Builtin::KindString:
         {
             string func = typeS;
-            func[0] = toupper(static_cast<unsigned char>(typeS[0]));
+            func[0] = static_cast<char>(toupper(static_cast<unsigned char>(typeS[0])));
             const bool isSerializable = seq->findMetaData("cs:serializable:", meta);
 
             if(marshal)
@@ -1912,7 +2010,7 @@
                 if(isSerializable)
                 {
                     out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag
-                        << ", " << getAbsolute("Ice.OptionalFormat", scope) << ".VSize))";
+                        << ", " << getUnqualified("Ice.OptionalFormat", scope) << ".VSize))";
                     out << sb;
                     out << nl << stream << ".writeSerializable(" << param << ".Value);";
                     out << eb;
@@ -1945,12 +2043,12 @@
                 string tmp = "tmpVal";
                 out << nl << seqS << ' ' << tmp << ';';
                 writeSequenceMarshalUnmarshalCode(out, seq, scope, tmp, marshal, true, stream);
-                out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">(" << tmp
+                out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">(" << tmp
                     << ");";
                 out << eb;
                 out << nl << "else";
                 out << sb;
-                out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">();";
+                out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">();";
                 out << eb;
             }
             break;
@@ -1978,12 +2076,12 @@
                 string tmp = "tmpVal";
                 out << nl << seqS << ' ' << tmp << ';';
                 writeSequenceMarshalUnmarshalCode(out, seq, scope, tmp, marshal, true, stream);
-                out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">(" << tmp
+                out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">(" << tmp
                     << ");";
                 out << eb;
                 out << nl << "else";
                 out << sb;
-                out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">();";
+                out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">();";
                 out << eb;
             }
             break;
@@ -2035,11 +2133,11 @@
             string tmp = "tmpVal";
             out << nl << seqS << ' ' << tmp << ';';
             writeSequenceMarshalUnmarshalCode(out, seq, scope, tmp, marshal, true, stream);
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">(" << tmp << ");";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
             out << sb;
-            out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">();";
+            out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">();";
             out << eb;
         }
         return;
@@ -2066,11 +2164,11 @@
         string tmp = "tmpVal";
         out << nl << seqS << ' ' << tmp << ';';
         writeSequenceMarshalUnmarshalCode(out, seq, scope, tmp, marshal, true, stream);
-        out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">(" << tmp << ");";
+        out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">(" << tmp << ");";
         out << eb;
         out << nl << "else";
         out << sb;
-        out << nl << param << " = new " << getAbsolute("Ice.Optional", scope) << "<" << seqS << ">();";
+        out << nl << param << " = new " << getUnqualified("Ice.Optional", scope) << "<" << seqS << ">();";
         out << eb;
     }
 }
@@ -2081,7 +2179,7 @@
                                                   const string& scope,
                                                   const string& param,
                                                   bool optional,
-                                                  int tag,
+                                                  int /*tag*/,
                                                   bool serialize)
 {
     //
@@ -2387,7 +2485,9 @@
             if(s.find(csPrefix) == 0)
             {
                 static const string csAttributePrefix = csPrefix + "attribute:";
-                if(s.find(csAttributePrefix) != 0 || s.size() == csAttributePrefix.size())
+                static const string csTypeIdNsPrefix = csPrefix + "typeid-namespace:";
+                if(!(s.find(csTypeIdNsPrefix) == 0 && s.size() > csTypeIdNsPrefix.size()) &&
+                   !(s.find(csAttributePrefix) == 0 && s.size() > csAttributePrefix.size()))
                 {
                     dc->warning(InvalidMetaData, file, -1, "ignoring invalid global metadata `" + oldS + "'");
                     continue;
@@ -2511,8 +2611,8 @@
     StringList localMetaData = cont->getMetaData();
     StringList newLocalMetaData;
 
-    const UnitPtr unit = cont->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(cont->file());
+    const UnitPtr ut = cont->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(cont->file());
     assert(dc);
 
     for(StringList::iterator p = localMetaData.begin(); p != localMetaData.end(); ++p)
@@ -2628,6 +2728,15 @@
                 {
                     newLocalMetaData.push_back(s);
                     continue;
+                }
+            }
+            else if(ModulePtr::dynamicCast(cont))
+            {
+                static const string csNamespacePrefix = csPrefix + "namespace:";
+                if(s.find(csNamespacePrefix) == 0 && s.size() > csNamespacePrefix.size())
+                {
+                    newLocalMetaData.push_back(s);
+                    continue;
                 }
             }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/CsUtil.h zeroc-ice-3.7.2/cpp/src/slice2cs/CsUtil.h
--- zeroc-ice-3.7.1/cpp/src/slice2cs/CsUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/CsUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CS_UTIL_H
 #define CS_UTIL_H
@@ -32,9 +27,25 @@
     //
     static void validateMetaData(const UnitPtr&);
 
+    //
+    // Returns the namespace of a Contained entity.
+    //
+    static std::string getNamespace(const ContainedPtr&);
+
+    static std::string getUnqualified(const std::string&, const std::string&, bool builtin = false);
+    static std::string getUnqualified(const ContainedPtr&,
+                                      const std::string& package = "",
+                                      const std::string& prefix = "",
+                                      const std::string& suffix = "");
+
 protected:
 
-    static std::string getAbsolute(const std::string&, const std::string&);
+    //
+    // Returns the namespace prefix of a Contained entity.
+    //
+    static std::string getNamespacePrefix(const ContainedPtr&);
+    static std::string getCustomTypeIdNamespace(const UnitPtr&);
+
     static std::string resultStructName(const std::string&, const std::string&, bool = false);
     static std::string resultType(const OperationPtr&, const std::string&, bool = false);
     static std::string taskResultType(const OperationPtr&, const std::string&, bool = false);
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/DotNetNames.cpp zeroc-ice-3.7.2/cpp/src/slice2cs/DotNetNames.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2cs/DotNetNames.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/DotNetNames.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <DotNetNames.h>
 #include <ctype.h>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/DotNetNames.h zeroc-ice-3.7.2/cpp/src/slice2cs/DotNetNames.h
--- zeroc-ice-3.7.1/cpp/src/slice2cs/DotNetNames.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/DotNetNames.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef DOTNETNAMES_H
 #define DOTNETNAMES_H
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/Gen.cpp zeroc-ice-3.7.2/cpp/src/slice2cs/Gen.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2cs/Gen.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/Gen.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
@@ -37,24 +31,24 @@
 {
 
 string
-sliceModeToIceMode(Operation::Mode opMode)
+sliceModeToIceMode(Operation::Mode opMode, string ns)
 {
     string mode;
     switch(opMode)
     {
         case Operation::Normal:
         {
-            mode = "Ice.OperationMode.Normal";
+            mode = CsGenerator::getUnqualified("Ice.OperationMode.Normal", ns);
             break;
         }
         case Operation::Nonmutating:
         {
-            mode = "Ice.OperationMode.Nonmutating";
+            mode = CsGenerator::getUnqualified("Ice.OperationMode.Nonmutating", ns);
             break;
         }
         case Operation::Idempotent:
         {
-            mode = "Ice.OperationMode.Idempotent";
+            mode = CsGenerator::getUnqualified("Ice.OperationMode.Idempotent", ns);
             break;
         }
         default:
@@ -67,18 +61,26 @@
 }
 
 string
-opFormatTypeToString(const OperationPtr& op)
+opFormatTypeToString(const OperationPtr& op, string ns)
 {
-    switch(op->format())
+    switch (op->format())
     {
-    case DefaultFormat:
-        return "Ice.FormatType.DefaultFormat";
-    case CompactFormat:
-        return "Ice.FormatType.CompactFormat";
-    case SlicedFormat:
-        return "Ice.FormatType.SlicedFormat";
-    default:
-        assert(false);
+        case DefaultFormat:
+        {
+            return CsGenerator::getUnqualified("Ice.FormatType.DefaultFormat", ns);
+        }
+        case CompactFormat:
+        {
+            return CsGenerator::getUnqualified("Ice.FormatType.CompactFormat", ns);
+        }
+        case SlicedFormat:
+        {
+            return CsGenerator::getUnqualified("Ice.FormatType.SlicedFormat", ns);
+        }
+        default:
+        {
+            assert(false);
+        }
     }
 
     return "???";
@@ -107,7 +109,7 @@
     string reason = getDeprecateReason(p1, p2, type);
     if(!reason.empty())
     {
-        out << nl << "[_System.Obsolete(\"" << reason << "\")]";
+        out << nl << "[global::System.Obsolete(\"" << reason << "\")]";
     }
 }
 
@@ -165,7 +167,7 @@
 
 void
 Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const OperationPtr& op, bool marshal,
-                                              const string& scope, bool resultStruct, bool publicNames,
+                                              const string& ns, bool resultStruct, bool publicNames,
                                               const string& customStream)
 {
     ParamDeclList optionals;
@@ -189,7 +191,7 @@
         if(!marshal && isClassType(type))
         {
             ostringstream os;
-            os << '(' << typeToString(type, scope) << " v) => {" << paramPrefix << param << " = v; }";
+            os << '(' << typeToString(type, ns) << " v) => {" << paramPrefix << param << " = v; }";
             param = os.str();
         }
         else
@@ -203,7 +205,7 @@
         }
         else
         {
-            writeMarshalUnmarshalCode(_out, type, scope, param, marshal, customStream);
+            writeMarshalUnmarshalCode(_out, type, ns, param, marshal, customStream);
         }
     }
 
@@ -216,7 +218,7 @@
         if(!marshal && isClassType(ret))
         {
             ostringstream os;
-            os << '(' << typeToString(ret, scope) << " v) => {" << paramPrefix << returnValueS << " = v; }";
+            os << '(' << typeToString(ret, ns) << " v) => {" << paramPrefix << returnValueS << " = v; }";
             param = os.str();
         }
         else
@@ -226,7 +228,7 @@
 
         if(!op->returnIsOptional())
         {
-            writeMarshalUnmarshalCode(_out, ret, scope, param, marshal, customStream);
+            writeMarshalUnmarshalCode(_out, ret, ns, param, marshal, customStream);
         }
     }
 
@@ -255,14 +257,14 @@
             if(!marshal && isClassType(ret))
             {
                 ostringstream os;
-                os << '(' << typeToString(ret, scope) << " v) => {" << paramPrefix << returnValueS << " = v; }";
+                os << '(' << typeToString(ret, ns) << " v) => {" << paramPrefix << returnValueS << " = v; }";
                 param = os.str();
             }
             else
             {
                 param = paramPrefix + returnValueS;
             }
-            writeOptionalMarshalUnmarshalCode(_out, ret, scope, param, op->returnTag(), marshal, customStream);
+            writeOptionalMarshalUnmarshalCode(_out, ret, ns, param, op->returnTag(), marshal, customStream);
             checkReturnType = false;
         }
 
@@ -271,7 +273,7 @@
         if(!marshal && isClassType(type))
         {
             ostringstream os;
-            os << '(' << typeToString(type, scope) << " v) => {" << paramPrefix << param << " = v; }";
+            os << '(' << typeToString(type, ns) << " v) => {" << paramPrefix << param << " = v; }";
             param = os.str();
         }
         else
@@ -279,7 +281,7 @@
             param = paramPrefix + param;
         }
 
-        writeOptionalMarshalUnmarshalCode(_out, type, scope, param, (*pli)->tag(), marshal, customStream);
+        writeOptionalMarshalUnmarshalCode(_out, type, ns, param, (*pli)->tag(), marshal, customStream);
     }
 
     if(checkReturnType)
@@ -288,24 +290,25 @@
         if(!marshal && isClassType(ret))
         {
             ostringstream os;
-            os << '(' << typeToString(ret, scope) << " v) => {" << paramPrefix << returnValueS << " = v; }";
+            os << '(' << typeToString(ret, ns) << " v) => {" << paramPrefix << returnValueS << " = v; }";
             param = os.str();
         }
         else
         {
             param = paramPrefix + returnValueS;
         }
-        writeOptionalMarshalUnmarshalCode(_out, ret, scope, param, op->returnTag(), marshal, customStream);
+        writeOptionalMarshalUnmarshalCode(_out, ret, ns, param, op->returnTag(), marshal, customStream);
     }
 }
 
 void
-Slice::CsVisitor::writeMarshalDataMember(const DataMemberPtr& member, const string& name, const string& scope, bool forStruct)
+Slice::CsVisitor::writeMarshalDataMember(const DataMemberPtr& member, const string& name, const string& ns,
+                                         bool forStruct)
 {
     if(member->optional())
     {
         assert(!forStruct);
-        writeOptionalMarshalUnmarshalCode(_out, member->type(), scope, name, member->tag(), true, "ostr_");
+        writeOptionalMarshalUnmarshalCode(_out, member->type(), ns, name, member->tag(), true, "ostr_");
     }
     else
     {
@@ -316,18 +319,19 @@
             memberName = "this." + memberName;
         }
 
-        writeMarshalUnmarshalCode(_out, member->type(), scope, memberName, true, stream);
+        writeMarshalUnmarshalCode(_out, member->type(), ns, memberName, true, stream);
     }
 }
 
 void
-Slice::CsVisitor::writeUnmarshalDataMember(const DataMemberPtr& member, const string& name, const string& scope, bool forStruct)
+Slice::CsVisitor::writeUnmarshalDataMember(const DataMemberPtr& member, const string& name, const string& ns,
+                                           bool forStruct)
 {
     string param = name;
     if(isClassType(member->type()))
     {
         ostringstream os;
-        os << '(' << typeToString(member->type(), scope) << " v) => { this." << name << " = v; }";
+        os << '(' << typeToString(member->type(), ns) << " v) => { this." << name << " = v; }";
         param = os.str();
     }
     else if(forStruct)
@@ -338,18 +342,17 @@
     if(member->optional())
     {
         assert(!forStruct);
-        writeOptionalMarshalUnmarshalCode(_out, member->type(), scope, param, member->tag(), false, "istr_");
+        writeOptionalMarshalUnmarshalCode(_out, member->type(), ns, param, member->tag(), false, "istr_");
     }
     else
     {
-        writeMarshalUnmarshalCode(_out, member->type(), scope, param, false, forStruct ? "" : "istr_");
+        writeMarshalUnmarshalCode(_out, member->type(), ns, param, false, forStruct ? "" : "istr_");
     }
 }
 
 void
 Slice::CsVisitor::writeInheritedOperations(const ClassDefPtr& p)
 {
-    const string scope = fixId(p->scope());
     ClassList bases = p->bases();
     if(!bases.empty() && !bases.front()->isInterface())
     {
@@ -371,7 +374,8 @@
         {
             string retS;
             vector<string> params, args;
-            string name = getDispatchParams(*i, retS, params, args, scope);
+            string ns = getNamespace(p);
+            string name = getDispatchParams(*i, retS, params, args, ns);
             _out << sp << nl << "public abstract " << retS << " " << name << spar << params << epar << ';';
         }
 
@@ -384,7 +388,7 @@
 {
     string name = fixId(p->name());
     string scoped = p->scoped();
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     ClassList allBases = p->allBases();
     StringList ids;
     ClassList bases = p->bases();
@@ -430,9 +434,9 @@
     {
         emitGeneratedCodeAttribute();
     }
-    _out << nl << "public override bool ice_isA(string s, " << getAbsolute("Ice.Current", scope) << " current = null)";
+    _out << nl << "public override bool ice_isA(string s, " << getUnqualified("Ice.Current", ns) << " current = null)";
     _out << sb;
-    _out << nl << "return _System.Array.BinarySearch(_ids, s, IceUtilInternal.StringUtil.OrdinalStringComparer) >= 0;";
+    _out << nl << "return global::System.Array.BinarySearch(_ids, s, IceUtilInternal.StringUtil.OrdinalStringComparer) >= 0;";
     _out << eb;
 
     _out << sp;
@@ -440,7 +444,7 @@
     {
         emitGeneratedCodeAttribute();
     }
-    _out << nl << "public override string[] ice_ids(" << getAbsolute("Ice.Current", scope) << " current = null)";
+    _out << nl << "public override string[] ice_ids(" << getUnqualified("Ice.Current", ns) << " current = null)";
     _out << sb;
     _out << nl << "return _ids;";
     _out << eb;
@@ -450,7 +454,7 @@
     {
         emitGeneratedCodeAttribute();
     }
-    _out << nl << "public override string ice_id(" << getAbsolute("Ice.Current", scope) << " current = null)";
+    _out << nl << "public override string ice_id(" << getUnqualified("Ice.Current", ns) << " current = null)";
     _out << sb;
     _out << nl << "return _ids[" << scopedPos << "];";
     _out << eb;
@@ -483,21 +487,21 @@
 
         string opName = op->name();
         _out << sp;
-        _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1011\")]";
+        _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1011\")]";
         if(!p->isInterface())
         {
             emitGeneratedCodeAttribute();
         }
-        _out << nl << "public static _System.Threading.Tasks.Task<" << getAbsolute("Ice.OutputStream", scope) << ">";
+        _out << nl << "public static global::System.Threading.Tasks.Task<" << getUnqualified("Ice.OutputStream", ns) << ">";
         _out << nl << "iceD_" << opName << "(" << name << (p->isInterface() ? "" : "Disp_") << " obj, "
-             <<  "IceInternal.Incoming inS, " << getAbsolute("Ice.Current", scope) << " current)";
+             <<  "global::IceInternal.Incoming inS, " << getUnqualified("Ice.Current", ns) << " current)";
         _out << sb;
 
         TypePtr ret = op->returnType();
         ParamDeclList inParams = op->inParameters();
         ParamDeclList outParams = op->outParameters();
 
-        _out << nl << getAbsolute("Ice.ObjectImpl", scope) << ".iceCheckMode(" << sliceModeToIceMode(op->mode())
+        _out << nl << getUnqualified("Ice.ObjectImpl", ns) << ".iceCheckMode(" << sliceModeToIceMode(op->mode(), ns)
              << ", current.mode);";
         if(!inParams.empty())
         {
@@ -508,7 +512,7 @@
             for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 string param = "iceP_" + (*pli)->name();
-                string typeS = typeToString((*pli)->type(), scope, (*pli)->optional());
+                string typeS = typeToString((*pli)->type(), ns, (*pli)->optional());
                 const bool isClass = isClassType((*pli)->type());
 
                 if((*pli)->optional())
@@ -516,7 +520,7 @@
                     _out << nl << typeS << ' ' << param;
                     if(isClass)
                     {
-                        _out << " = " << getAbsolute("Ice.Util", scope) << ".None";
+                        _out << " = " << getUnqualified("Ice.Util", ns) << ".None";
                     }
                     _out << ';';
                 }
@@ -534,7 +538,7 @@
                     }
                 }
             }
-            writeMarshalUnmarshalParams(inParams, 0, false, scope);
+            writeMarshalUnmarshalParams(inParams, 0, false, ns);
             if(op->sendsClasses(false))
             {
                 _out << nl << "istr.readPendingValues();";
@@ -548,7 +552,7 @@
 
         if(op->format() != DefaultFormat)
         {
-            _out << nl << "inS.setFormat(" << opFormatTypeToString(op) << ");";
+            _out << nl << "inS.setFormat(" << opFormatTypeToString(op, ns) << ");";
         }
 
         vector<string> inArgs;
@@ -566,7 +570,7 @@
         }
         else if(amd)
         {
-            string retS = resultType(op, scope);
+            string retS = resultType(op, ns);
             _out << nl << "return inS.setResultTask" << (retS.empty() ? "" : ('<' + retS + '>'));
             _out << "(obj." << opName << "Async" << spar << inArgs << "current" << epar;
             if(!retS.empty())
@@ -582,7 +586,7 @@
                     _out << nl << "(ostr, ret) =>";
                 }
                 _out << sb;
-                writeMarshalUnmarshalParams(outParams, op, true, scope, true);
+                writeMarshalUnmarshalParams(outParams, op, true, ns, true);
                 if(op->returnsClasses(false))
                 {
                     _out << nl << "ostr.writePendingValues();";
@@ -597,7 +601,7 @@
         {
             for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
-                string typeS = typeToString((*pli)->type(), scope, (*pli)->optional());
+                string typeS = typeToString((*pli)->type(), ns, (*pli)->optional());
                 _out << nl << typeS << ' ' << "iceP_" + (*pli)->name() << ";";
             }
 
@@ -622,7 +626,7 @@
             if(!outParams.empty() || ret)
             {
                 _out << nl << "var ostr = inS.startWriteParams();";
-                writeMarshalUnmarshalParams(outParams, op, true, scope);
+                writeMarshalUnmarshalParams(outParams, op, true, ns);
                 if(op->returnsClasses(false))
                 {
                     _out << nl << "ostr.writePendingValues();";
@@ -667,14 +671,16 @@
         {
             emitGeneratedCodeAttribute();
         }
-        _out << nl << "public override _System.Threading.Tasks.Task<Ice.OutputStream>";
-        _out << nl << "iceDispatch(IceInternal.Incoming inS, " << getAbsolute("Ice.Current", scope) << " current)";
+        _out << nl << "public override global::System.Threading.Tasks.Task<"
+             << getUnqualified("Ice.OutputStream", ns) << ">";
+        _out << nl << "iceDispatch(global::IceInternal.Incoming inS, "
+             << getUnqualified("Ice.Current", ns) << " current)";
         _out << sb;
-        _out << nl << "int pos = _System.Array.BinarySearch(_all, current.operation, "
-            << "IceUtilInternal.StringUtil.OrdinalStringComparer);";
+        _out << nl << "int pos = global::System.Array.BinarySearch(_all, current.operation, "
+             << "global::IceUtilInternal.StringUtil.OrdinalStringComparer);";
         _out << nl << "if(pos < 0)";
         _out << sb;
-        _out << nl << "throw new " << getAbsolute("Ice.OperationNotExistException", scope)
+        _out << nl << "throw new " << getUnqualified("Ice.OperationNotExistException", ns)
              << "(current.id, current.facet, current.operation);";
         _out << eb;
         _out << sp << nl << "switch(pos)";
@@ -688,19 +694,23 @@
             _out << sb;
             if(opName == "ice_id")
             {
-                _out << nl << "return " << getAbsolute("Ice.ObjectImpl", scope) << ".iceD_ice_id(this, inS, current);";
+                _out << nl << "return " << getUnqualified("Ice.ObjectImpl", ns)
+                     << ".iceD_ice_id(this, inS, current);";
             }
             else if(opName == "ice_ids")
             {
-                _out << nl << "return " << getAbsolute("Ice.ObjectImpl", scope) << ".iceD_ice_ids(this, inS, current);";
+                _out << nl << "return " << getUnqualified("Ice.ObjectImpl", ns)
+                     << ".iceD_ice_ids(this, inS, current);";
             }
             else if(opName == "ice_isA")
             {
-                _out << nl << "return " << getAbsolute("Ice.ObjectImpl", scope) << ".iceD_ice_isA(this, inS, current);";
+                _out << nl << "return " << getUnqualified("Ice.ObjectImpl", ns)
+                     << ".iceD_ice_isA(this, inS, current);";
             }
             else if(opName == "ice_ping")
             {
-                _out << nl << "return " << getAbsolute("Ice.ObjectImpl", scope) << ".iceD_ice_ping(this, inS, current);";
+                _out << nl << "return " << getUnqualified("Ice.ObjectImpl", ns)
+                     << ".iceD_ice_ping(this, inS, current);";
             }
             else
             {
@@ -720,8 +730,8 @@
                         }
                         else
                         {
-                            _out << nl << "return " << getAbsolute(fixId(cl->scoped() + "Disp_"), scope) << ".iceD_"
-                                 << opName << "(this, inS, current);";
+                            _out << nl << "return " << getUnqualified(cl, ns, "", "Disp_")
+                                 << ".iceD_" << opName << "(this, inS, current);";
                         }
                         break;
                     }
@@ -730,8 +740,8 @@
             _out << eb;
         }
         _out << eb;
-        _out << sp << nl << "_System.Diagnostics.Debug.Assert(false);";
-        _out << nl << "throw new " << getAbsolute("Ice.OperationNotExistException", scope)
+        _out << sp << nl << "global::System.Diagnostics.Debug.Assert(false);";
+        _out << nl << "throw new " << getUnqualified("Ice.OperationNotExistException", ns)
              << "(current.id, current.facet, current.operation);";
         _out << eb;
     }
@@ -747,7 +757,7 @@
 {
     string name = fixId(p->name());
     string scoped = p->scoped();
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     ClassList allBases = p->allBases();
     StringList ids;
     ClassList bases = p->bases();
@@ -787,7 +797,7 @@
         {
             emitGeneratedCodeAttribute();
         }
-        _out << nl << "public override " << getAbsolute("Ice.SlicedData", scope) << " ice_getSlicedData()";
+        _out << nl << "public override " << getUnqualified("Ice.SlicedData", ns) << " ice_getSlicedData()";
         _out << sb;
         _out << nl << "return iceSlicedData_;";
         _out << eb;
@@ -797,7 +807,7 @@
         {
             emitGeneratedCodeAttribute();
         }
-        _out << nl << "public override void iceWrite(" << getAbsolute("Ice.OutputStream", scope) << " ostr_)";
+        _out << nl << "public override void iceWrite(" << getUnqualified("Ice.OutputStream", ns) << " ostr_)";
         _out << sb;
         _out << nl << "ostr_.startValue(iceSlicedData_);";
         _out << nl << "iceWriteImpl(ostr_);";
@@ -809,7 +819,7 @@
         {
             emitGeneratedCodeAttribute();
         }
-        _out << nl << "public override void iceRead(" << getAbsolute("Ice.InputStream", scope) << " istr_)";
+        _out << nl << "public override void iceRead(" << getUnqualified("Ice.InputStream", ns) << " istr_)";
         _out << sb;
         _out << nl << "istr_.startValue();";
         _out << nl << "iceReadImpl(istr_);";
@@ -822,19 +832,19 @@
     {
         emitGeneratedCodeAttribute();
     }
-    _out << nl << "protected override void iceWriteImpl(" << getAbsolute("Ice.OutputStream", scope) << " ostr_)";
+    _out << nl << "protected override void iceWriteImpl(" << getUnqualified("Ice.OutputStream", ns) << " ostr_)";
     _out << sb;
     _out << nl << "ostr_.startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
     for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         if(!(*d)->optional())
         {
-            writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), scope);
+            writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), ns);
         }
     }
     for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
     {
-        writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), scope);
+        writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), ns);
     }
     _out << nl << "ostr_.endSlice();";
     if(base)
@@ -848,19 +858,19 @@
     {
         emitGeneratedCodeAttribute();
     }
-    _out << nl << "protected override void iceReadImpl(" << getAbsolute("Ice.InputStream", scope) << " istr_)";
+    _out << nl << "protected override void iceReadImpl(" << getUnqualified("Ice.InputStream", ns) << " istr_)";
     _out << sb;
     _out << nl << "istr_.startSlice();";
     for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         if(!(*d)->optional())
         {
-            writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), scope);
+            writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), ns);
         }
     }
     for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
     {
-        writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), scope);
+        writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), ns);
     }
     _out << nl << "istr_.endSlice();";
     if(base)
@@ -871,7 +881,7 @@
 
     if(preserved && !basePreserved)
     {
-        _out << sp << nl << "protected " << getAbsolute("Ice.SlicedData", scope) << " iceSlicedData_;";
+        _out << sp << nl << "protected " << getUnqualified("Ice.SlicedData", ns) << " iceSlicedData_;";
     }
 
     _out << sp << nl << "#endregion"; // Marshalling support
@@ -894,7 +904,7 @@
 }
 
 vector<string>
-Slice::CsVisitor::getParams(const OperationPtr& op, const string& scope)
+Slice::CsVisitor::getParams(const OperationPtr& op, const string& ns)
 {
     vector<string> params;
     ParamDeclList paramList = op->parameters();
@@ -906,14 +916,14 @@
         {
             param += "out ";
         }
-        param += typeToString((*q)->type(), scope, (*q)->optional(), cl->isLocal()) + " " + fixId((*q)->name());
+        param += typeToString((*q)->type(), ns, (*q)->optional(), cl->isLocal()) + " " + fixId((*q)->name());
         params.push_back(param);
     }
     return params;
 }
 
 vector<string>
-Slice::CsVisitor::getInParams(const OperationPtr& op, const string& scope, bool internal)
+Slice::CsVisitor::getInParams(const OperationPtr& op, const string& ns, bool internal)
 {
     vector<string> params;
 
@@ -922,14 +932,14 @@
     ParamDeclList paramList = op->inParameters();
     for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
     {
-        params.push_back(getParamAttributes(*q) + typeToString((*q)->type(), scope, (*q)->optional(), cl->isLocal())
+        params.push_back(getParamAttributes(*q) + typeToString((*q)->type(), ns, (*q)->optional(), cl->isLocal())
                          + " " + (internal ? "iceP_" + (*q)->name() : fixId((*q)->name())));
     }
     return params;
 }
 
 vector<string>
-Slice::CsVisitor::getOutParams(const OperationPtr& op, const string& scope, bool returnParam, bool outKeyword)
+Slice::CsVisitor::getOutParams(const OperationPtr& op, const string& ns, bool returnParam, bool outKeyword)
 {
     vector<string> params;
     if(returnParam)
@@ -937,7 +947,7 @@
         TypePtr ret = op->returnType();
         if(ret)
         {
-            params.push_back(typeToString(ret, scope, op->returnIsOptional()) + " ret");
+            params.push_back(typeToString(ret, ns, op->returnIsOptional()) + " ret");
         }
     }
 
@@ -949,7 +959,7 @@
         {
             s += "out ";
         }
-        s += typeToString((*q)->type(), scope, (*q)->optional()) + ' ' + fixId((*q)->name());
+        s += typeToString((*q)->type(), ns, (*q)->optional()) + ' ' + fixId((*q)->name());
         params.push_back(s);
     }
 
@@ -990,7 +1000,7 @@
 
 string
 Slice::CsVisitor::getDispatchParams(const OperationPtr& op, string& retS, vector<string>& params, vector<string>& args,
-                                    const string& scope)
+                                    const string& ns)
 {
     string name;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container()); // Get the class containing the op.
@@ -999,30 +1009,30 @@
     if(cl->hasMetaData("amd") || op->hasMetaData("amd"))
     {
         name = op->name() + "Async";
-        params = getInParams(op, scope);
+        params = getInParams(op, ns);
         args = getInArgs(op);
         paramDecls = op->inParameters();
-        retS = taskResultType(op, scope, true);
+        retS = taskResultType(op, ns, true);
     }
     else if(op->hasMarshaledResult())
     {
         name = fixId(op->name(), DotNet::ICloneable, true);
-        params = getInParams(op, scope);
+        params = getInParams(op, ns);
         args = getInArgs(op);
         paramDecls = op->inParameters();
-        retS = resultType(op, scope, true);
+        retS = resultType(op, ns, true);
     }
     else
     {
         name = fixId(op->name(), DotNet::ICloneable, true);
-        params = getParams(op, scope);
+        params = getParams(op, ns);
         args = getArgs(op);
         paramDecls = op->parameters();
-        retS = typeToString(op->returnType(), scope, op->returnIsOptional());
+        retS = typeToString(op->returnType(), ns, op->returnIsOptional());
     }
 
     string currentParamName = getEscapedParamName(op, "current");
-    params.push_back(getAbsolute("Ice.Current", scope) + " " + currentParamName + " = null");
+    params.push_back(getUnqualified("Ice.Current", ns) + " " + currentParamName + " = null");
     args.push_back(currentParamName);
     return name;
 }
@@ -1044,13 +1054,13 @@
 void
 Slice::CsVisitor::emitComVisibleAttribute()
 {
-    _out << nl << "[_System.Runtime.InteropServices.ComVisible(false)]";
+    _out << nl << "[global::System.Runtime.InteropServices.ComVisible(false)]";
 }
 
 void
 Slice::CsVisitor::emitGeneratedCodeAttribute()
 {
-    _out << nl << "[_System.CodeDom.Compiler.GeneratedCodeAttribute(\"slice2cs\", \"" << ICE_STRING_VERSION << "\")]";
+    _out << nl << "[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"slice2cs\", \"" << ICE_STRING_VERSION << "\")]";
 }
 
 void
@@ -1061,20 +1071,20 @@
     // FxCop may complain about naming convention violations. These attributes suppress those
     // warnings, but only when the generated code is compiled with /define:CODE_ANALYSIS.
     //
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1704\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1707\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1709\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1710\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1711\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1715\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1716\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1720\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1722\")]";
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1724\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1704\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1707\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1709\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1710\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1711\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1715\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1716\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1720\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1722\")]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Naming\", \"CA1724\")]";
 }
 
 string
-Slice::CsVisitor::writeValue(const TypePtr& type, const string& scope)
+Slice::CsVisitor::writeValue(const TypePtr& type, const string& ns)
 {
     assert(type);
 
@@ -1117,7 +1127,7 @@
     EnumPtr en = EnumPtr::dynamicCast(type);
     if(en)
     {
-        return typeToString(type, scope) + "." + fixId((*en->enumerators().begin())->name());
+        return typeToString(type, ns) + "." + fixId((*en->enumerators().begin())->name());
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
@@ -1129,7 +1139,7 @@
         }
         else
         {
-            return "new " + typeToString(type, scope) + "()";
+            return "new " + typeToString(type, ns) + "()";
         }
     }
 
@@ -1194,7 +1204,7 @@
 }
 
 void
-Slice::CsVisitor::writeDataMemberInitializers(const DataMemberList& members, const string& scope, int baseTypes,
+Slice::CsVisitor::writeDataMemberInitializers(const DataMemberList& members, const string& ns, int baseTypes,
                                               bool propertyMapping)
 {
     for(DataMemberList::const_iterator p = members.begin(); p != members.end(); ++p)
@@ -1217,7 +1227,7 @@
         else if((*p)->optional())
         {
             _out << nl << "this." << fixId((*p)->name(), baseTypes) << " = new "
-                 << typeToString((*p)->type(), scope, true) << "();";
+                 << typeToString((*p)->type(), ns, true) << "();";
         }
         else
         {
@@ -1230,7 +1240,7 @@
             StructPtr st = StructPtr::dynamicCast((*p)->type());
             if(st)
             {
-                _out << nl << "this." << fixId((*p)->name(), baseTypes) << " = new " << typeToString(st, scope, false)
+                _out << nl << "this." << fixId((*p)->name(), baseTypes) << " = new " << typeToString(st, ns, false)
                      << "();";
             }
         }
@@ -1820,7 +1830,7 @@
 }
 
 void
-Slice::CsVisitor::writeDocCommentParam(const OperationPtr& p, ParamDir paramType, bool amd)
+Slice::CsVisitor::writeDocCommentParam(const OperationPtr& p, ParamDir paramType, bool /*amd*/)
 {
     //
     // Collect the names of the in- or -out parameters to be documented.
@@ -1892,6 +1902,34 @@
     }
 }
 
+void
+Slice::CsVisitor::moduleStart(const ModulePtr& p)
+{
+    if(!ContainedPtr::dynamicCast(p->container()))
+    {
+        string ns = getNamespacePrefix(p);
+        string name = fixId(p->name());
+        if(!ns.empty())
+        {
+            _out << sp;
+            _out << nl << "namespace " << ns;
+            _out << sb;
+        }
+    }
+}
+
+void
+Slice::CsVisitor::moduleEnd(const ModulePtr& p)
+{
+    if(!ContainedPtr::dynamicCast(p->container()))
+    {
+        if(!getNamespacePrefix(p).empty())
+        {
+            _out << eb;
+        }
+    }
+}
+
 Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir,
                 bool tie, bool impl, bool implTie) :
     _includePaths(includePaths),
@@ -1916,7 +1954,7 @@
     if(!_out)
     {
         ostringstream os;
-        os << "cannot open `" << file << "': " << strerror(errno);
+        os << "cannot open `" << file << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(file);
@@ -1942,7 +1980,7 @@
         if(!_impl)
         {
             ostringstream os;
-            os << ": cannot open `" << fileImpl << "': " << strerror(errno);
+            os << ": cannot open `" << fileImpl << "': " << IceUtilInternal::errorToString(errno);
             throw FileException(__FILE__, __LINE__, os.str());
         }
 
@@ -1976,6 +2014,9 @@
     TypesVisitor typesVisitor(_out);
     p->visit(&typesVisitor, false);
 
+    TypeIdVisitor typeIdVisitor(_out);
+    p->visit(&typeIdVisitor, false);
+
     //
     // The async delegates are emitted before the proxy definition
     // because the proxy methods need to know the type.
@@ -2034,11 +2075,11 @@
         _out << sb;
         _out << nl << "namespace SliceChecksums";
         _out << sb;
-        _out << nl << "[_System.CodeDom.Compiler.GeneratedCodeAttribute(\"slice2cs\", \"" << ICE_STRING_VERSION
+        _out << nl << "[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"slice2cs\", \"" << ICE_STRING_VERSION
              << "\")]";
         _out << nl << "public sealed class " << className;
         _out << sb;
-        _out << nl << "public static _System.Collections.Hashtable map = new _System.Collections.Hashtable();";
+        _out << nl << "public static global::System.Collections.Hashtable map = new global::System.Collections.Hashtable();";
         _out << sp << nl << "static " << className << "()";
         _out << sb;
         for(ChecksumMap::const_iterator p = map.begin(); p != map.end(); ++p)
@@ -2071,14 +2112,9 @@
 Slice::Gen::printHeader()
 {
     static const char* header =
-"// **********************************************************************\n"
-"//\n"
-"// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// **********************************************************************\n"
         ;
 
     _out << header;
@@ -2125,11 +2161,27 @@
 }
 
 bool
-Slice::Gen::CompactIdVisitor::visitUnitStart(const UnitPtr&)
+Slice::Gen::CompactIdVisitor::visitUnitStart(const UnitPtr& p)
 {
-    _out << sp << nl << "namespace IceCompactId";
-    _out << sb;
-    return true;
+    if(p->hasCompactTypeId())
+    {
+        string typeIdNs = getCustomTypeIdNamespace(p);
+
+        if(typeIdNs.empty())
+        {
+            // TODO: replace by namespace Ice.TypeId, see issue #239
+            //
+            _out << sp << nl << "namespace IceCompactId";
+        }
+        else
+        {
+            _out << sp << nl << "namespace " << typeIdNs;
+        }
+
+        _out << sb;
+        return true;
+    }
+    return false;
 }
 
 void
@@ -2145,6 +2197,9 @@
     {
         _out << sp;
         emitGeneratedCodeAttribute();
+
+        // TODO: rename to class Compact_Xxx, see issue #239
+        //
         _out << nl << "public sealed class TypeId_" << p->compactId();
         _out << sb;
         _out << nl << "public const string typeId = \"" << p->scoped() << "\";";
@@ -2153,6 +2208,76 @@
     return false;
 }
 
+Slice::Gen::TypeIdVisitor::TypeIdVisitor(IceUtilInternal::Output& out) :
+    CsVisitor(out)
+{
+}
+
+bool
+Slice::Gen::TypeIdVisitor::visitModuleStart(const ModulePtr& p)
+{
+    string ns = getNamespacePrefix(p);
+
+    if(!ns.empty() && (p->hasValueDefs() || p->hasNonLocalExceptions()))
+    {
+        string name = fixId(p->name());
+        if(!ContainedPtr::dynamicCast(p->container()))
+        {
+            // Top-level module
+            //
+            string typeIdNs = getCustomTypeIdNamespace(p->unit());
+            if(typeIdNs.empty())
+            {
+                typeIdNs = "Ice.TypeId";
+            }
+
+            name = typeIdNs + "." + name;
+        }
+        _out << sp << nl << "namespace " << name;
+        _out << sb;
+        return true;
+    }
+    return false;
+}
+
+void
+Slice::Gen::TypeIdVisitor::visitModuleEnd(const ModulePtr&)
+{
+    _out << eb;
+}
+
+bool
+Slice::Gen::TypeIdVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(!p->isInterface() && !p->isLocal())
+    {
+        generateHelperClass(p);
+    }
+    return false;
+}
+
+bool
+Slice::Gen::TypeIdVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    if(!p->isLocal())
+    {
+        generateHelperClass(p);
+    }
+    return false;
+}
+
+void
+Slice::Gen::TypeIdVisitor::generateHelperClass(const ContainedPtr& p)
+{
+    string name = fixId(p->name());
+    _out << sp;
+    emitGeneratedCodeAttribute();
+    _out << nl << "public abstract class " << name;
+    _out << sb;
+    _out << nl << "public abstract global::" << getNamespace(p) << "." << name << " targetClass { get; }";
+    _out << eb;
+}
+
 Slice::Gen::TypesVisitor::TypesVisitor(IceUtilInternal::Output& out) :
     CsVisitor(out)
 {
@@ -2173,6 +2298,7 @@
         return false;
     }
 
+    moduleStart(p);
     string name = fixId(p->name());
     _out << sp;
     emitAttributes(p);
@@ -2184,9 +2310,10 @@
 }
 
 void
-Slice::Gen::TypesVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::TypesVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
@@ -2194,7 +2321,7 @@
 {
     string name = p->name();
     string scoped = fixId(p->scoped());
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     ClassList bases = p->bases();
     bool hasBaseClass = !bases.empty() && !bases.front()->isInterface();
 
@@ -2207,8 +2334,8 @@
     {
         emitComVisibleAttribute();
         OperationPtr o = p->allOperations().front();
-        _out << nl << "public delegate " << typeToString(o->returnType(), scope, o->returnIsOptional()) << " ";
-        _out << fixId(name) << spar << getParams(o, scope) << epar << ";";
+        _out << nl << "public delegate " << typeToString(o->returnType(), ns, o->returnIsOptional()) << " ";
+        _out << fixId(name) << spar << getParams(o, ns) << epar << ";";
         return false;
     }
 
@@ -2219,22 +2346,22 @@
         _out << nl << "public partial interface " << fixId(name);
         if(!p->isLocal())
         {
-            baseNames.push_back(getAbsolute("Ice.Object", scope));
+            baseNames.push_back(getUnqualified("Ice.Object", ns));
             baseNames.push_back(name + "Operations_");
         }
         for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
         {
-            baseNames.push_back(getAbsolute(fixId((*q)->scoped()), scope));
+            baseNames.push_back(getUnqualified(*q, ns));
         }
     }
     else
     {
         emitComVisibleAttribute();
         emitPartialTypeAttributes();
-        _out << nl << "[_System.Serializable]";
+        _out << nl << "[global::System.Serializable]";
         if(p->allOperations().size() > 0) // See bug 4747
         {
-            _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1012\")]";
+            _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1012\")]";
         }
         _out << nl << "public ";
         if(p->isLocal() && p->allOperations().size() > 0) // Don't use isAbstract() here - see bug 3739
@@ -2247,12 +2374,12 @@
         {
             if(!p->isLocal())
             {
-                baseNames.push_back("Ice.Value");
+                baseNames.push_back(getUnqualified("Ice.Value", ns));
             }
         }
         else
         {
-            baseNames.push_back(fixId(bases.front()->scoped()));
+            baseNames.push_back(getUnqualified(bases.front(), ns));
             bases.pop_front();
         }
 
@@ -2262,7 +2389,7 @@
             {
                 if((*q)->isAbstract())
                 {
-                    baseNames.push_back(fixId((*q)->scoped()));
+                    baseNames.push_back(getUnqualified(*q, ns));
                 }
             }
         }
@@ -2290,7 +2417,7 @@
             {
                 _out << ", ";
             }
-            _out << getAbsolute(*q, scope);
+            _out << *q;
         }
     }
 
@@ -2326,7 +2453,7 @@
 Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
 {
     string name = fixId(p->name());
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     DataMemberList classMembers = p->classDataMembers();
     DataMemberList allClassMembers = p->allClassDataMembers();
     DataMemberList dataMembers = p->dataMembers();
@@ -2368,7 +2495,7 @@
                 _out << " : base()";
             }
             _out << sb;
-            writeDataMemberInitializers(dataMembers, scope, DotNet::ICloneable, propertyMapping);
+            writeDataMemberInitializers(dataMembers, ns, DotNet::ICloneable, propertyMapping);
             _out << nl << "ice_initialize();";
             _out << eb;
 
@@ -2379,7 +2506,7 @@
             for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
             {
                 string memberName = fixId((*d)->name(), DotNet::ICloneable);
-                string memberType = typeToString((*d)->type(), scope, (*d)->optional(), p->isLocal(), (*d)->getMetaData());
+                string memberType = typeToString((*d)->type(), ns, (*d)->optional(), p->isLocal(), (*d)->getMetaData());
                 paramDecl.push_back(memberType + " " + memberName);
             }
             _out << paramDecl << epar;
@@ -2457,13 +2584,13 @@
     ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
     bool isLocal = cl->isLocal();
     bool isInterface = cl->isInterface();
-    string scope = fixId(cl->scope());
+    string ns = getNamespace(cl);
 
     if(isLocal)
     {
         string name = fixId(p->name(), DotNet::ICloneable, true);
         TypePtr ret = p->returnType();
-        string retS = typeToString(ret, scope, p->returnIsOptional(), true);
+        string retS = typeToString(ret, ns, p->returnIsOptional(), true);
 
         _out << sp;
         if(isInterface)
@@ -2481,11 +2608,11 @@
         {
             _out << "public abstract ";
         }
-        _out << retS << " " << name << spar << getParams(p, scope) << epar << ";";
+        _out << retS << " " << name << spar << getParams(p, ns) << epar << ";";
 
         if(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway"))
         {
-            vector<string> inParams = getInParams(p, scope);
+            vector<string> inParams = getInParams(p, ns);
             ParamDeclList inParamDecls = p->inParameters();
 
             //
@@ -2499,14 +2626,14 @@
             {
                 _out << "public abstract ";
             }
-            _out << taskResultType(p, scope);
+            _out << taskResultType(p, ns);
 
             string progress = getEscapedParamName(p, "progress");
             string cancel = getEscapedParamName(p, "cancel");
 
             _out << " " << name << "Async" << spar << inParams
-                 << ("_System.IProgress<bool> " + progress + " = null")
-                 << ("_System.Threading.CancellationToken " + cancel + " = new _System.Threading.CancellationToken()")
+                 << ("global::System.IProgress<bool> " + progress + " = null")
+                 << ("global::System.Threading.CancellationToken " + cancel + " = new global::System.Threading.CancellationToken()")
                  << epar << ";";
 
             //
@@ -2520,8 +2647,8 @@
             {
                 _out << "public abstract ";
             }
-            _out << getAbsolute("Ice.AsyncResult", scope) << " begin_" << name << spar << inParams
-                 << getAbsolute("Ice.AsyncCallback", scope) + " " + getEscapedParamName(p, "callback") + " = null"
+            _out << getUnqualified("Ice.AsyncResult", ns) << " begin_" << name << spar << inParams
+                 << getUnqualified("Ice.AsyncCallback", ns) + " " + getEscapedParamName(p, "callback") + " = null"
                  << "object " + getEscapedParamName(p, "cookie") + " = null" << epar << ';';
 
             _out << sp;
@@ -2532,14 +2659,14 @@
             {
                 _out << "public abstract ";
             }
-            _out << retS << " end_" << name << spar << getOutParams(p, scope, false, true)
-                 << (getAbsolute("Ice.AsyncResult", scope) + " " + getEscapedParamName(p, "asyncResult")) << epar << ';';
+            _out << retS << " end_" << name << spar << getOutParams(p, ns, false, true)
+                 << (getUnqualified("Ice.AsyncResult", ns) + " " + getEscapedParamName(p, "asyncResult")) << epar << ';';
         }
     }
 }
 
 void
-Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
+Slice::Gen::TypesVisitor::visitSequence(const SequencePtr&)
 {
     //
     // No need to generate anything for sequences.
@@ -2550,7 +2677,7 @@
 Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 {
     string name = fixId(p->name());
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     ExceptionPtr base = p->base();
 
     _out << sp;
@@ -2561,18 +2688,18 @@
     //
     // Suppress FxCop diagnostic about a missing constructor MyException(String).
     //
-    _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1032\")]";
-    _out << nl << "[_System.Serializable]";
+    _out << nl << "[global::System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1032\")]";
+    _out << nl << "[global::System.Serializable]";
 
     emitPartialTypeAttributes();
     _out << nl << "public partial class " << name << " : ";
     if(base)
     {
-        _out << getAbsolute(fixId(base->scoped()), scope);
+        _out << getUnqualified(base, ns);
     }
     else
     {
-        _out << getAbsolute(p->isLocal() ? "Ice.LocalException" : "Ice.UserException", scope);
+        _out << getUnqualified(p->isLocal() ? "Ice.LocalException" : "Ice.UserException", ns);
     }
     _out << sb;
 
@@ -2588,7 +2715,7 @@
 Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 {
     string name = fixId(p->name());
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     DataMemberList allDataMembers = p->allDataMembers();
     DataMemberList dataMembers = p->dataMembers();
     DataMemberList allClassMembers = p->allClassDataMembers();
@@ -2599,7 +2726,7 @@
     for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
     {
         string memberName = fixId((*q)->name());
-        string memberType = typeToString((*q)->type(), scope, (*q)->optional());
+        string memberType = typeToString((*q)->type(), ns, (*q)->optional());
         allParamDecl.push_back(memberType + " " + memberName);
     }
 
@@ -2613,7 +2740,7 @@
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         string memberName = fixId((*q)->name());
-        string memberType = typeToString((*q)->type(), scope, (*q)->optional());
+        string memberType = typeToString((*q)->type(), ns, (*q)->optional());
         paramDecl.push_back(memberType + " " + memberName);
     }
 
@@ -2643,7 +2770,7 @@
         emitGeneratedCodeAttribute();
         _out << nl << "private void _initDM()";
         _out << sb;
-        writeDataMemberInitializers(dataMembers, scope, DotNet::Exception);
+        writeDataMemberInitializers(dataMembers, ns, DotNet::Exception);
         _out << eb;
     }
 
@@ -2659,7 +2786,7 @@
 
     _out << sp;
     emitGeneratedCodeAttribute();
-    _out << nl << "public " << name << "(_System.Exception ex) : base(ex)";
+    _out << nl << "public " << name << "(global::System.Exception ex) : base(ex)";
     _out << sb;
     if(hasDataMemberInitializers)
     {
@@ -2668,13 +2795,13 @@
     _out << eb;
     _out << sp;
     emitGeneratedCodeAttribute();
-    _out << nl << "public " << name << "(_System.Runtime.Serialization.SerializationInfo info, "
-         << "_System.Runtime.Serialization.StreamingContext context) : base(info, context)";
+    _out << nl << "public " << name << "(global::System.Runtime.Serialization.SerializationInfo info, "
+         << "global::System.Runtime.Serialization.StreamingContext context) : base(info, context)";
     _out << sb;
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
-        string name = fixId((*q)->name(), DotNet::Exception, false);
-        writeSerializeDeserializeCode(_out, (*q)->type(), scope, name, (*q)->optional(), (*q)->tag(), false);
+        string memberName = fixId((*q)->name(), DotNet::Exception, false);
+        writeSerializeDeserializeCode(_out, (*q)->type(), ns, memberName, (*q)->optional(), (*q)->tag(), false);
     }
     _out << eb;
 
@@ -2688,8 +2815,8 @@
             _out << sb;
             for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
-                string name = fixId((*q)->name(), DotNet::Exception, false);
-                _out << nl << "this." << name << " = " << fixId((*q)->name()) << ';';
+                string memberName = fixId((*q)->name(), DotNet::Exception, false);
+                _out << nl << "this." << memberName << " = " << fixId((*q)->name()) << ';';
             }
             _out << eb;
         }
@@ -2712,7 +2839,7 @@
         vector<string> exceptionParam;
         exceptionParam.push_back(exParam);
         vector<string> exceptionDecl;
-        exceptionDecl.push_back("_System.Exception " + exParam);
+        exceptionDecl.push_back("global::System.Exception " + exParam);
         _out << sp;
         emitGeneratedCodeAttribute();
         _out << nl << "public " << name << spar << allParamDecl << exceptionDecl << epar << " : base" << spar;
@@ -2752,7 +2879,7 @@
     {
         _out << nl << "int h_ = 5381;";
     }
-    _out << nl << "IceInternal.HashUtil.hashAdd(ref h_, \"" << p->scoped() << "\");";
+    _out << nl << "global::IceInternal.HashUtil.hashAdd(ref h_, \"" << p->scoped() << "\");";
     writeMemberHashCode(dataMembers, DotNet::Exception);
     _out << nl << "return h_;";
     _out << eb;
@@ -2789,13 +2916,13 @@
     {
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public override void GetObjectData(_System.Runtime.Serialization.SerializationInfo info, "
-             << "_System.Runtime.Serialization.StreamingContext context)";
+        _out << nl << "public override void GetObjectData(global::System.Runtime.Serialization.SerializationInfo info, "
+             << "global::System.Runtime.Serialization.StreamingContext context)";
         _out << sb;
         for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            string name = fixId((*q)->name(), DotNet::Exception, false);
-            writeSerializeDeserializeCode(_out, (*q)->type(), scope, name, (*q)->optional(), (*q)->tag(), true);
+            string memberName = fixId((*q)->name(), DotNet::Exception, false);
+            writeSerializeDeserializeCode(_out, (*q)->type(), ns, memberName, (*q)->optional(), (*q)->tag(), true);
         }
         _out << sp << nl << "base.GetObjectData(info, context);";
         _out << eb;
@@ -2835,14 +2962,14 @@
         {
             _out << sp;
             emitGeneratedCodeAttribute();
-            _out << nl << "public override " << getAbsolute("Ice.SlicedData", scope) << " ice_getSlicedData()";
+            _out << nl << "public override " << getUnqualified("Ice.SlicedData", ns) << " ice_getSlicedData()";
             _out << sb;
             _out << nl << "return slicedData_;";
             _out << eb;
 
             _out << sp;
             emitGeneratedCodeAttribute();
-            _out << nl << "public override void iceWrite(" << getAbsolute("Ice.OutputStream", scope) << " ostr_)";
+            _out << nl << "public override void iceWrite(" << getUnqualified("Ice.OutputStream", ns) << " ostr_)";
             _out << sb;
             _out << nl << "ostr_.startException(slicedData_);";
             _out << nl << "iceWriteImpl(ostr_);";
@@ -2851,7 +2978,7 @@
 
             _out << sp;
             emitGeneratedCodeAttribute();
-            _out << nl << "public override void iceRead(" << getAbsolute("Ice.InputStream", scope) << " istr_)";
+            _out << nl << "public override void iceRead(" << getUnqualified("Ice.InputStream", ns) << " istr_)";
             _out << sb;
             _out << nl << "istr_.startException();";
             _out << nl << "iceReadImpl(istr_);";
@@ -2861,12 +2988,12 @@
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "protected override void iceWriteImpl(" << getAbsolute("Ice.OutputStream", scope) << " ostr_)";
+        _out << nl << "protected override void iceWriteImpl(" << getUnqualified("Ice.OutputStream", ns) << " ostr_)";
         _out << sb;
         _out << nl << "ostr_.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
         for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), scope);
+            writeMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), ns);
         }
         _out << nl << "ostr_.endSlice();";
         if(base)
@@ -2877,13 +3004,13 @@
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "protected override void iceReadImpl(" << getAbsolute("Ice.InputStream", scope) << " istr_)";
+        _out << nl << "protected override void iceReadImpl(" << getUnqualified("Ice.InputStream", ns) << " istr_)";
         _out << sb;
         _out << nl << "istr_.startSlice();";
 
         for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), scope);
+            writeUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), ns);
         }
         _out << nl << "istr_.endSlice();";
         if(base)
@@ -2904,7 +3031,7 @@
 
         if(preserved && !basePreserved)
         {
-            _out << sp << nl << "protected " << getAbsolute("Ice.SlicedData", scope) << " slicedData_;";
+            _out << sp << nl << "protected " << getUnqualified("Ice.SlicedData", ns) << " slicedData_;";
         }
 
         _out << sp << nl << "#endregion"; // Marshalling support
@@ -2917,20 +3044,20 @@
 Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
 {
     string name = fixId(p->name());
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     _out << sp;
 
     emitDeprecate(p, 0, _out, "type");
 
     emitAttributes(p);
     emitPartialTypeAttributes();
-    _out << nl << "[_System.Serializable]";
+    _out << nl << "[global::System.Serializable]";
     _out << nl << "public partial " << (isValueType(p) ? "struct" : "class") << ' ' << name;
 
     StringList baseNames;
     if(!isValueType(p))
     {
-        baseNames.push_back("_System.ICloneable");
+        baseNames.push_back("System.ICloneable");
     }
 
     //
@@ -2955,7 +3082,7 @@
             {
                 _out << ", ";
             }
-            _out << getAbsolute(*q, scope);
+            _out << getUnqualified(*q, ns);
         }
     }
 
@@ -2971,6 +3098,7 @@
 {
     string name = fixId(p->name());
     string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     DataMemberList classMembers = p->classDataMembers();
     DataMemberList dataMembers = p->dataMembers();
 
@@ -2994,7 +3122,7 @@
         emitGeneratedCodeAttribute();
         _out << nl << "public " << name << "()";
         _out << sb;
-        writeDataMemberInitializers(dataMembers, scope, DotNet::ICloneable, propertyMapping);
+        writeDataMemberInitializers(dataMembers, ns, DotNet::ICloneable, propertyMapping);
         _out << nl << "ice_initialize();";
         _out << eb;
     }
@@ -3006,7 +3134,7 @@
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         string memberName = fixId((*q)->name(), isClass ? DotNet::ICloneable : 0);
-        string memberType = typeToString((*q)->type(), scope, false, p->isLocal());
+        string memberType = typeToString((*q)->type(), ns, false, p->isLocal());
         paramDecl.push_back(memberType + " " + memberName);
     }
     _out << paramDecl << epar;
@@ -3051,7 +3179,7 @@
     _out << nl << "public override int GetHashCode()";
     _out << sb;
     _out << nl << "int h_ = 5381;";
-    _out << nl << "IceInternal.HashUtil.hashAdd(ref h_, \"" << p->scoped() << "\");";
+    _out << nl << "global::IceInternal.HashUtil.hashAdd(ref h_, \"" << p->scoped() << "\");";
     writeMemberHashCode(dataMembers, isClass ? DotNet::ICloneable : 0);
     _out << nl << "return h_;";
     _out << eb;
@@ -3116,27 +3244,27 @@
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public void ice_writeMembers(" << getAbsolute("Ice.OutputStream", scope) << " ostr)";
+        _out << nl << "public void ice_writeMembers(" << getUnqualified("Ice.OutputStream", ns) << " ostr)";
         _out << sb;
         for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeMarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), scope, true);
+            writeMarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), ns, true);
         }
         _out << eb;
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public void ice_readMembers(" << getAbsolute("Ice.InputStream", scope) << " istr)";
+        _out << nl << "public void ice_readMembers(" << getUnqualified("Ice.InputStream", ns) << " istr)";
         _out << sb;
         for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
-            writeUnmarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), scope, true);
+            writeUnmarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), ns, true);
         }
         _out << eb;
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public static void ice_write(" << getAbsolute("Ice.OutputStream", scope) << " ostr, " << name
+        _out << nl << "public static void ice_write(" << getUnqualified("Ice.OutputStream", ns) << " ostr, " << name
              << " v)";
         _out << sb;
         if(isClass)
@@ -3158,7 +3286,7 @@
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public static " << name << " ice_read(" << getAbsolute("Ice.InputStream", scope) << " istr)";
+        _out << nl << "public static " << name << " ice_read(" << getUnqualified("Ice.InputStream", ns) << " istr)";
         _out << sb;
         _out << nl << "var v = new " << name << "();";
         _out << nl << "v.ice_readMembers(istr);";
@@ -3176,7 +3304,7 @@
 }
 
 void
-Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
+Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr&)
 {
 }
 
@@ -3184,7 +3312,7 @@
 Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
 {
     string name = fixId(p->name());
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     string scoped = fixId(p->scoped());
     EnumeratorList enumerators = p->enumerators();
     const bool explicitValue = p->explicitValue();
@@ -3216,17 +3344,18 @@
         _out << nl << "public sealed class " << p->name() << "Helper";
         _out << sb;
         _out << sp;
-        _out << nl << "public static void write(" << getAbsolute("Ice.OutputStream", scope) << " ostr, " << name << " v)";
+        _out << nl << "public static void write(" << getUnqualified("Ice.OutputStream", ns) << " ostr, " << name
+             << " v)";
         _out << sb;
-        writeMarshalUnmarshalCode(_out, p, scope, "v", true);
+        writeMarshalUnmarshalCode(_out, p, ns, "v", true);
         _out << eb;
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public static " << name << " read(" << getAbsolute("Ice.InputStream", scope) << " istr)";
+        _out << nl << "public static " << name << " read(" << getUnqualified("Ice.InputStream", ns) << " istr)";
         _out << sb;
         _out << nl << name << " v;";
-        writeMarshalUnmarshalCode(_out, p, scope, "v", false);
+        writeMarshalUnmarshalCode(_out, p, ns, "v", false);
         _out << nl << "return v;";
         _out << eb;
 
@@ -3265,7 +3394,7 @@
     StructPtr st = StructPtr::dynamicCast(cont);
     ExceptionPtr ex = ExceptionPtr::dynamicCast(cont);
     ClassDefPtr cl = ClassDefPtr::dynamicCast(cont);
-    string scope = fixId(cont->scope());
+    string ns = getNamespace(cont);
     if(st)
     {
         isLocal = st->isLocal();
@@ -3301,7 +3430,7 @@
 
     emitDeprecate(p, cont, _out, "member");
 
-    string type = typeToString(p->type(), scope, isOptional, isLocal, p->getMetaData());
+    string type = typeToString(p->type(), ns, isOptional, isLocal, p->getMetaData());
     string propertyName = fixId(p->name(), baseTypes, isClass);
     string dataMemberName;
     if(isProperty)
@@ -3367,7 +3496,7 @@
 {
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
-        _out << nl << "IceInternal.HashUtil.hashAdd(ref h_, " << fixId((*q)->name(), baseTypes);
+        _out << nl << "global::IceInternal.HashUtil.hashAdd(ref h_, " << fixId((*q)->name(), baseTypes);
         if((*q)->optional())
         {
             _out << ".Value";
@@ -3413,7 +3542,7 @@
                     //
                     // Equals() for generic types does not have value semantics.
                     //
-                    _out << nl << "if(!IceUtilInternal.Collections.SequenceEquals(this." << memberName << ", o."
+                    _out << nl << "if(!global::IceUtilInternal.Collections.SequenceEquals(this." << memberName << ", o."
                          << memberName << "))";
                 }
             }
@@ -3425,7 +3554,7 @@
                     //
                     // Equals() for generic types does not have value semantics.
                     //
-                    _out << nl << "if(!IceUtilInternal.Collections.DictionaryEquals(this." << memberName << ", o."
+                    _out << nl << "if(!global::IceUtilInternal.Collections.DictionaryEquals(this." << memberName << ", o."
                             << memberName << "))";
                 }
                 else
@@ -3498,6 +3627,7 @@
 {
     if(hasResultType(p))
     {
+        moduleStart(p);
         _out << sp << nl << "namespace " << fixId(p->name());
         _out << sb;
         return true;
@@ -3506,9 +3636,10 @@
 }
 
 void
-Slice::Gen::ResultVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::ResultVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
@@ -3526,7 +3657,7 @@
 Slice::Gen::ResultVisitor::visitOperation(const OperationPtr& p)
 {
     ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
-    string scope = fixId(cl->scope());
+    string ns = getNamespace(cl);
     if(cl->isLocal())
     {
         return;
@@ -3542,7 +3673,7 @@
         string retSName;
         if(ret)
         {
-            retS = typeToString(ret, scope, p->returnIsOptional());
+            retS = typeToString(ret, ns, p->returnIsOptional());
             retSName = resultStructReturnValueName(outParams);
         }
 
@@ -3560,7 +3691,7 @@
         }
         for(ParamDeclList::const_iterator i = outParams.begin(); i != outParams.end(); ++i)
         {
-            _out << (typeToString((*i)->type(), scope, (*i)->optional()) + " " + fixId((*i)->name()));
+            _out << (typeToString((*i)->type(), ns, (*i)->optional()) + " " + fixId((*i)->name()));
         }
         _out << epar;
 
@@ -3589,7 +3720,7 @@
 
         for(ParamDeclList::const_iterator i = outParams.begin(); i != outParams.end(); ++i)
         {
-            _out << nl << "public " << typeToString((*i)->type(), scope, (*i)->optional()) << " " << fixId((*i)->name())
+            _out << nl << "public " << typeToString((*i)->type(), ns, (*i)->optional()) << " " << fixId((*i)->name())
                  << ";";
         }
         _out << eb;
@@ -3601,18 +3732,18 @@
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public struct " << name << " : " << getAbsolute("Ice.MarshaledResult", scope);
+        _out << nl << "public struct " << name << " : " << getUnqualified("Ice.MarshaledResult", ns);
         _out << sb;
 
         //
         // One shot constructor
         //
-        _out << nl << "public " << name << spar << getOutParams(p, scope, true, false)
-             << getAbsolute("Ice.Current", scope) + " current" << epar;
+        _out << nl << "public " << name << spar << getOutParams(p, ns, true, false)
+             << getUnqualified("Ice.Current", ns) + " current" << epar;
         _out << sb;
-        _out << nl << "_ostr = IceInternal.Incoming.createResponseOutputStream(current);";
-        _out << nl << "_ostr.startEncapsulation(current.encoding, " << opFormatTypeToString(p) << ");";
-        writeMarshalUnmarshalParams(outParams, p, true, scope, false, true, "_ostr");
+        _out << nl << "_ostr = global::IceInternal.Incoming.createResponseOutputStream(current);";
+        _out << nl << "_ostr.startEncapsulation(current.encoding, " << opFormatTypeToString(p, ns) << ");";
+        writeMarshalUnmarshalParams(outParams, p, true, ns, false, true, "_ostr");
         if(p->returnsClasses(false))
         {
             _out << nl << "_ostr.writePendingValues();";
@@ -3620,26 +3751,26 @@
         _out << nl << "_ostr.endEncapsulation();";
         _out << eb;
         _out << sp;
-        _out << nl << "public " << getAbsolute("Ice.OutputStream", scope) << " getOutputStream("
-             << getAbsolute("Ice.Current", scope) << " current)";
+        _out << nl << "public " << getUnqualified("Ice.OutputStream", ns) << " getOutputStream("
+             << getUnqualified("Ice.Current", ns) << " current)";
         _out << sb;
         _out << nl << "if(_ostr == null)";
         _out << sb;
         _out << nl << "return new " << name << spar;
         if(ret)
         {
-            _out << writeValue(ret, scope);
+            _out << writeValue(ret, ns);
         }
         for(ParamDeclList::const_iterator i = outParams.begin(); i != outParams.end(); ++i)
         {
-            _out << writeValue((*i)->type(), scope);
+            _out << writeValue((*i)->type(), ns);
         }
         _out << "current" << epar << ".getOutputStream(current);";
         _out << eb;
         _out << nl << "return _ostr;";
         _out << eb;
         _out << sp;
-        _out << nl << "private " << getAbsolute("Ice.OutputStream", scope) << " _ostr;";
+        _out << nl << "private " << getUnqualified("Ice.OutputStream", ns) << " _ostr;";
         _out << eb;
     }
 }
@@ -3652,20 +3783,22 @@
 bool
 Slice::Gen::ProxyVisitor::visitModuleStart(const ModulePtr& p)
 {
-    if(!p->hasNonLocalClassDecls())
+    if(!p->hasNonLocalAbstractClassDefs())
     {
         return false;
     }
 
+    moduleStart(p);
     _out << sp << nl << "namespace " << fixId(p->name());
     _out << sb;
     return true;
 }
 
 void
-Slice::Gen::ProxyVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::ProxyVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
@@ -3677,7 +3810,7 @@
     }
 
     string name = p->name();
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     ClassList bases = p->bases();
 
     _out << sp;
@@ -3691,13 +3824,13 @@
         ClassDefPtr def = *q;
         if(def->isInterface() || def->allOperations().size() > 0)
         {
-            baseInterfaces.push_back(getAbsolute(fixId((*q)->scoped() + "Prx"), scope));
+            baseInterfaces.push_back(getUnqualified(*q, ns, "", "Prx"));
         }
     }
 
     if(baseInterfaces.empty())
     {
-        baseInterfaces.push_back(getAbsolute("Ice.ObjectPrx", scope));
+        baseInterfaces.push_back(getUnqualified("Ice.ObjectPrx", ns));
     }
 
     for(vector<string>::const_iterator q = baseInterfaces.begin(); q != baseInterfaces.end();)
@@ -3723,11 +3856,11 @@
 Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
 {
     ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
-    string scope = fixId(cl->scope());
+    string ns = getNamespace(cl);
     string name = fixId(p->name(), DotNet::ICloneable, true);
-    vector<string> inParams = getInParams(p, scope);
+    vector<string> inParams = getInParams(p, ns);
     ParamDeclList inParamDecls = p->inParameters();
-    string retS = typeToString(p->returnType(), scope, p->returnIsOptional());
+    string retS = typeToString(p->returnType(), ns, p->returnIsOptional());
     string deprecateReason = getDeprecateReason(p, cl, "operation");
 
     {
@@ -3740,11 +3873,11 @@
             "<param name=\"" + context + " \">The Context map to send with the invocation.</param>");
         if(!deprecateReason.empty())
         {
-            _out << nl << "[_System.Obsolete(\"" << deprecateReason << "\")]";
+            _out << nl << "[global::System.Obsolete(\"" << deprecateReason << "\")]";
         }
-        _out << nl << retS << " " << name << spar << getParams(p, scope)
-             << (getAbsolute("Ice.OptionalContext", scope) + " " + context + " = new " +
-                 getAbsolute("Ice.OptionalContext", scope) + "()") << epar << ';';
+        _out << nl << retS << " " << name << spar << getParams(p, ns)
+             << (getUnqualified("Ice.OptionalContext", ns) + " " + context + " = new " +
+                 getUnqualified("Ice.OptionalContext", ns) + "()") << epar << ';';
     }
 
     {
@@ -3762,14 +3895,14 @@
             "<param name=\"" + cancel + "\">A cancellation token that receives the cancellation requests.</param>");
         if(!deprecateReason.empty())
         {
-            _out << nl << "[_System.Obsolete(\"" << deprecateReason << "\")]";
+            _out << nl << "[global::System.Obsolete(\"" << deprecateReason << "\")]";
         }
-        _out << nl << taskResultType(p, scope);
+        _out << nl << taskResultType(p, ns);
         _out << " " << p->name() << "Async" << spar << inParams
-             << (getAbsolute("Ice.OptionalContext", scope) + " " + context + " = new " +
-                 getAbsolute("Ice.OptionalContext", scope) + "()")
-             << ("_System.IProgress<bool> " + progress + " = null")
-             << ("_System.Threading.CancellationToken " + cancel + " = new _System.Threading.CancellationToken()")
+             << (getUnqualified("Ice.OptionalContext", ns) + " " + context + " = new " +
+                 getUnqualified("Ice.OptionalContext", ns) + "()")
+             << ("global::System.IProgress<bool> " + progress + " = null")
+             << ("global::System.Threading.CancellationToken " + cancel + " = new global::System.Threading.CancellationToken()")
              << epar << ";";
     }
 
@@ -3789,12 +3922,12 @@
                            "<param name=\"" + context + "\">The Context map to send with the invocation.</param>");
         if(!deprecateReason.empty())
         {
-            _out << nl << "[_System.Obsolete(\"" << deprecateReason << "\")]";
+            _out << nl << "[global::System.Obsolete(\"" << deprecateReason << "\")]";
         }
-        _out << nl << getAbsolute("Ice.AsyncResult", scope) << "<" << delType << "> begin_" << p->name() << spar
+        _out << nl << getUnqualified("Ice.AsyncResult", ns) << "<" << delType << "> begin_" << p->name() << spar
              << inParams
-             << (getAbsolute("Ice.OptionalContext", scope) + " " + context + " = new " +
-                 getAbsolute("Ice.OptionalContext", scope) + "()") << epar << ';';
+             << (getUnqualified("Ice.OptionalContext", ns) + " " + context + " = new " +
+                 getUnqualified("Ice.OptionalContext", ns) + "()") << epar << ';';
 
         //
         // Type-unsafe begin_ methods.
@@ -3805,10 +3938,10 @@
            "<param name=\"" + cookie + "\">Application data to store in the asynchronous result object.</param>");
         if(!deprecateReason.empty())
         {
-            _out << nl << "[_System.Obsolete(\"" << deprecateReason << "\")]";
+            _out << nl << "[global::System.Obsolete(\"" << deprecateReason << "\")]";
         }
-        _out << nl << getAbsolute("Ice.AsyncResult", scope) << " begin_" << p->name() << spar << inParams
-             << getAbsolute("Ice.AsyncCallback", scope) + " " + callback << "object " + cookie << epar << ';';
+        _out << nl << getUnqualified("Ice.AsyncResult", ns) << " begin_" << p->name() << spar << inParams
+             << getUnqualified("Ice.AsyncCallback", ns) + " " + callback << "object " + cookie << epar << ';';
 
         _out << sp;
         writeDocCommentAMI(p, InParam, deprecateReason,
@@ -3817,11 +3950,11 @@
            "<param name=\"" + cookie + "\">Application data to store in the asynchronous result object.</param>");
         if(!deprecateReason.empty())
         {
-            _out << nl << "[_System.Obsolete(\"" << deprecateReason << "\")]";
+            _out << nl << "[global::System.Obsolete(\"" << deprecateReason << "\")]";
         }
-        _out << nl << getAbsolute("Ice.AsyncResult", scope) << " begin_" << p->name() << spar << inParams
-             << getAbsolute("Ice.OptionalContext", scope) + " " + context
-             << getAbsolute("Ice.AsyncCallback", scope) + " " + callback
+        _out << nl << getUnqualified("Ice.AsyncResult", ns) << " begin_" << p->name() << spar << inParams
+             << getUnqualified("Ice.OptionalContext", ns) + " " + context
+             << getUnqualified("Ice.AsyncCallback", ns) + " " + callback
              << "object " + cookie << epar << ';';
 
         //
@@ -3832,10 +3965,10 @@
            "<param name=\"" + asyncResult + "\">The asynchronous result object for the invocation.</param>");
         if(!deprecateReason.empty())
         {
-            _out << nl << "[_System.Obsolete(\"" << deprecateReason << "\")]";
+            _out << nl << "[global::System.Obsolete(\"" << deprecateReason << "\")]";
         }
-        _out << nl << retS << " end_" << p->name() << spar << getOutParams(p, scope, false, true)
-             << getAbsolute("Ice.AsyncResult", scope) + " " + asyncResult << epar << ';';
+        _out << nl << retS << " end_" << p->name() << spar << getOutParams(p, ns, false, true)
+             << getUnqualified("Ice.AsyncResult", ns) + " " + asyncResult << epar << ';';
     }
 }
 
@@ -3847,21 +3980,27 @@
 bool
 Slice::Gen::AsyncDelegateVisitor::visitModuleStart(const ModulePtr& p)
 {
-    _out << sp << nl << "namespace " << fixId(p->name());
-    _out << sb;
-    return true;
+    if(p->hasOperations())
+    {
+        moduleStart(p);
+        _out << sp << nl << "namespace " << fixId(p->name());
+        _out << sb;
+        return true;
+    }
+    return false;
 }
 
 void
-Slice::Gen::AsyncDelegateVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::AsyncDelegateVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
 Slice::Gen::AsyncDelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
 {
-    return !p->operations().empty();
+    return p->hasOperations();
 }
 
 void
@@ -3882,9 +4021,9 @@
         return;
     }
 
-    string scope = fixId(cl->scope());
-    vector<string> paramDeclAMI = getOutParams(p, scope, false, false);
-    string retS = typeToString(p->returnType(), scope, p->returnIsOptional());
+    string ns = getNamespace(cl);
+    vector<string> paramDeclAMI = getOutParams(p, ns, false, false);
+    string retS = typeToString(p->returnType(), ns, p->returnIsOptional());
     string delName = "Callback_" + cl->name() + "_" + p->name();
 
     _out << sp;
@@ -3905,20 +4044,21 @@
 bool
 Slice::Gen::OpsVisitor::visitModuleStart(const ModulePtr& p)
 {
-    if(!p->hasAbstractClassDefs())
+    if(!p->hasNonLocalAbstractClassDefs())
     {
         return false;
     }
-
+    moduleStart(p);
     _out << sp << nl << "namespace " << fixId(p->name());
     _out << sb;
     return true;
 }
 
 void
-Slice::Gen::OpsVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::OpsVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
@@ -3932,7 +4072,7 @@
         return false;
     }
     string name = p->name();
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     string scoped = fixId(p->scoped());
     ClassList bases = p->bases();
     string opIntfName = "Operations";
@@ -3958,9 +4098,7 @@
                 {
                     first = false;
                 }
-                string s = (*q)->scoped();
-                s += "Operations";
-                _out << getAbsolute(fixId(s), scope) << '_';
+                _out << getUnqualified(*q, ns, "", "Operations_");
             }
             ++q;
         }
@@ -3974,7 +4112,7 @@
         bool amd = !p->isLocal() && (p->hasMetaData("amd") || op->hasMetaData("amd"));
         string retS;
         vector<string> params, args;
-        string name = getDispatchParams(op, retS, params, args, scope);
+        string opName = getDispatchParams(op, retS, params, args, ns);
         _out << sp;
         if(amd)
         {
@@ -3989,7 +4127,7 @@
         emitAttributes(op);
         emitDeprecate(op, op, _out, "operation");
         emitGeneratedCodeAttribute();
-        _out << nl << retS << " " << name << spar << params << epar << ";";
+        _out << nl << retS << " " << opName << spar << params << epar << ";";
     }
 
     _out << eb;
@@ -4004,20 +4142,22 @@
 bool
 Slice::Gen::HelperVisitor::visitModuleStart(const ModulePtr& p)
 {
-    if(!p->hasNonLocalClassDecls() && !p->hasNonLocalSequences() && !p->hasDictionaries())
+    if(!p->hasNonLocalAbstractClassDefs() && !p->hasNonLocalSequences() && !p->hasDictionaries())
     {
         return false;
     }
 
+    moduleStart(p);
     _out << sp << nl << "namespace " << fixId(p->name());
     _out << sb;
     return true;
 }
 
 void
-Slice::Gen::HelperVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::HelperVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
@@ -4029,14 +4169,14 @@
     }
 
     string name = p->name();
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     ClassList bases = p->bases();
 
     _out << sp;
     emitComVisibleAttribute();
     emitGeneratedCodeAttribute();
-    _out << nl << "[_System.Serializable]";
-    _out << nl << "public sealed class " << name << "PrxHelper : " << getAbsolute("Ice.ObjectPrxHelperBase", scope)
+    _out << nl << "[global::System.Serializable]";
+    _out << nl << "public sealed class " << name << "PrxHelper : " << getUnqualified("Ice.ObjectPrxHelperBase", ns)
          << ", " << name << "Prx";
     _out << sb;
 
@@ -4046,8 +4186,8 @@
     _out << eb;
 
     _out << sp;
-    _out << nl << "public " << name << "PrxHelper(_System.Runtime.Serialization.SerializationInfo info, "
-         << "_System.Runtime.Serialization.StreamingContext context) : base(info, context)";
+    _out << nl << "public " << name << "PrxHelper(global::System.Runtime.Serialization.SerializationInfo info, "
+         << "global::System.Runtime.Serialization.StreamingContext context) : base(info, context)";
     _out << sb;
     _out << eb;
 
@@ -4064,9 +4204,9 @@
         ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
         string opName = fixId(op->name(), DotNet::ICloneable, true);
         TypePtr ret = op->returnType();
-        string retS = typeToString(ret, scope, op->returnIsOptional());
+        string retS = typeToString(ret, ns, op->returnIsOptional());
 
-        vector<string> params = getParams(op, scope);
+        vector<string> params = getParams(op, ns);
         vector<string> args = getArgs(op);
         vector<string> argsAMI = getInArgs(op);
 
@@ -4095,8 +4235,8 @@
 
         _out << sp;
         _out << nl << "public " << retS << " " << opName << spar << params
-             << (getAbsolute("Ice.OptionalContext", scope) + " " + context + " = new " +
-                 getAbsolute("Ice.OptionalContext", scope) + "()") << epar;
+             << (getUnqualified("Ice.OptionalContext", ns) + " " + context + " = new " +
+                 getUnqualified("Ice.OptionalContext", ns) + "()") << epar;
         _out << sb;
         _out << nl << "try";
         _out << sb;
@@ -4119,7 +4259,7 @@
             }
         }
         _out << "_iceI_" << op->name() << "Async" << spar << argsAMI << context
-             << "null" << "_System.Threading.CancellationToken.None" << "true" << epar;
+             << "null" << "global::System.Threading.CancellationToken.None" << "true" << epar;
 
         if(ret || outParams.size() > 0)
         {
@@ -4144,7 +4284,7 @@
             }
         }
         _out << eb;
-        _out << nl << "catch(_System.AggregateException ex_)";
+        _out << nl << "catch(global::System.AggregateException ex_)";
         _out << sb;
         _out << nl << "throw ex_.InnerException;";
         _out << eb;
@@ -4165,7 +4305,7 @@
         OperationPtr op = *r;
 
         ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
-        vector<string> paramsAMI = getInParams(op, scope);
+        vector<string> paramsAMI = getInParams(op, ns);
         vector<string> argsAMI = getInArgs(op);
 
         string opName = op->name();
@@ -4179,9 +4319,9 @@
 
         TypePtr ret = op->returnType();
 
-        string retS = typeToString(ret, scope, op->returnIsOptional());
+        string retS = typeToString(ret, ns, op->returnIsOptional());
 
-        string returnTypeS = resultType(op, scope);
+        string returnTypeS = resultType(op, ns);
 
         ExceptionList throws = op->throws();
         throws.sort();
@@ -4203,16 +4343,16 @@
         // Write the public Async method.
         //
         _out << sp;
-        _out << nl << "public _System.Threading.Tasks.Task";
+        _out << nl << "public global::System.Threading.Tasks.Task";
         if(!returnTypeS.empty())
         {
             _out << "<" << returnTypeS << ">";
         }
         _out << " " << opName << "Async" << spar << paramsAMI
-             << (getAbsolute("Ice.OptionalContext", scope) + " " + context + " = new " +
-                 getAbsolute("Ice.OptionalContext", scope) + "()")
-             << ("_System.IProgress<bool> " + progress + " = null")
-             << ("_System.Threading.CancellationToken " + cancel + " = new _System.Threading.CancellationToken()")
+             << (getUnqualified("Ice.OptionalContext", ns) + " " + context + " = new " +
+                 getUnqualified("Ice.OptionalContext", ns) + "()")
+             << ("global::System.IProgress<bool> " + progress + " = null")
+             << ("global::System.Threading.CancellationToken " + cancel + " = new global::System.Threading.CancellationToken()")
              << epar;
 
         _out << sb;
@@ -4224,15 +4364,15 @@
         // Write the Async method implementation.
         //
         _out << sp;
-        _out << nl << "private _System.Threading.Tasks.Task";
+        _out << nl << "private global::System.Threading.Tasks.Task";
         if(!returnTypeS.empty())
         {
             _out << "<" << returnTypeS << ">";
         }
-        _out << " _iceI_" << opName << "Async" << spar << getInParams(op, scope, true)
-             << getAbsolute("Ice.OptionalContext", scope) + " context"
-             << "_System.IProgress<bool> progress"
-             << "_System.Threading.CancellationToken cancel"
+        _out << " _iceI_" << opName << "Async" << spar << getInParams(op, ns, true)
+             << getUnqualified("Ice.OptionalContext", ns) + " context"
+             << "global::System.IProgress<bool> progress"
+             << "global::System.Threading.CancellationToken cancel"
              << "bool synchronous" << epar;
         _out << sb;
 
@@ -4244,12 +4384,12 @@
         if(returnTypeS.empty())
         {
             _out << nl << "var completed = "
-                 << "new IceInternal.OperationTaskCompletionCallback<object>(progress, cancel);";
+                 << "new global::IceInternal.OperationTaskCompletionCallback<object>(progress, cancel);";
         }
         else
         {
             _out << nl << "var completed = "
-                 << "new IceInternal.OperationTaskCompletionCallback<" << returnTypeS << ">(progress, cancel);";
+                 << "new global::IceInternal.OperationTaskCompletionCallback<" << returnTypeS << ">(progress, cancel);";
         }
 
         _out << nl << "_iceI_" << opName << spar << getInArgs(op, true) << "context" << "synchronous" << "completed"
@@ -4264,10 +4404,10 @@
         // Write the common invoke method
         //
         _out << sp << nl;
-        _out << "private void _iceI_" << op->name() << spar << getInParams(op, scope, true)
-             << "_System.Collections.Generic.Dictionary<string, string> context"
+        _out << "private void _iceI_" << op->name() << spar << getInParams(op, ns, true)
+             << "global::System.Collections.Generic.Dictionary<string, string> context"
              << "bool synchronous"
-             << "IceInternal.OutgoingAsyncCompletionCallback completed" << epar;
+             << "global::IceInternal.OutgoingAsyncCompletionCallback completed" << epar;
         _out << sb;
 
         if(returnTypeS.empty())
@@ -4282,16 +4422,16 @@
         _out << nl << "outAsync.invoke(";
         _out.inc();
         _out << nl << flatName << ",";
-        _out << nl << sliceModeToIceMode(op->sendMode()) << ",";
-        _out << nl << opFormatTypeToString(op) << ",";
+        _out << nl << sliceModeToIceMode(op->sendMode(), ns) << ",";
+        _out << nl << opFormatTypeToString(op, ns) << ",";
         _out << nl << "context,";
         _out << nl << "synchronous";
         if(!inParams.empty())
         {
             _out << ",";
-            _out << nl << "write: (" << getAbsolute("Ice.OutputStream", scope) << " ostr) =>";
+            _out << nl << "write: (" << getUnqualified("Ice.OutputStream", ns) << " ostr) =>";
             _out << sb;
-            writeMarshalUnmarshalParams(inParams, 0, true, scope);
+            writeMarshalUnmarshalParams(inParams, 0, true, ns);
             if(op->sendsClasses(false))
             {
                 _out << nl << "ostr.writePendingValues();";
@@ -4302,7 +4442,7 @@
         if(!throws.empty())
         {
             _out << ",";
-            _out << nl << "userException: (" << getAbsolute("Ice.UserException", scope) << " ex) =>";
+            _out << nl << "userException: (" << getUnqualified("Ice.UserException", ns) << " ex) =>";
             _out << sb;
             _out << nl << "try";
             _out << sb;
@@ -4314,13 +4454,13 @@
             //
             for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i)
             {
-                _out << nl << "catch(" << getAbsolute(fixId((*i)->scoped()), scope) << ")";
+                _out << nl << "catch(" << getUnqualified(*i, ns) << ")";
                 _out << sb;
                 _out << nl << "throw;";
                 _out << eb;
             }
 
-            _out << nl << "catch(" << getAbsolute("Ice.UserException", scope) << ")";
+            _out << nl << "catch(" << getUnqualified("Ice.UserException", ns) << ")";
             _out << sb;
             _out << eb;
 
@@ -4330,7 +4470,7 @@
         if(ret || !outParams.empty())
         {
             _out << ",";
-            _out << nl << "read: (" << getAbsolute("Ice.InputStream", scope) << " istr) =>";
+            _out << nl << "read: (" << getUnqualified("Ice.InputStream", ns) << " istr) =>";
             _out << sb;
             if(outParams.empty())
             {
@@ -4349,7 +4489,7 @@
                 }
                 else if(isClassType(ret))
                 {
-                    _out << " = " << getAbsolute("Ice.Util", scope) << ".None";
+                    _out << " = " << getUnqualified("Ice.Util", ns) << ".None";
                 }
                 _out << ";";
             }
@@ -4360,14 +4500,14 @@
             else
             {
                 TypePtr t = outParams.front()->type();
-                _out << nl << typeToString(t, scope, (outParams.front()->optional())) << " iceP_"
+                _out << nl << typeToString(t, ns, (outParams.front()->optional())) << " iceP_"
                      << outParams.front()->name();
                 if(!outParams.front()->optional())
                 {
                     StructPtr st = StructPtr::dynamicCast(t);
                     if(st && isValueType(st))
                     {
-                        _out << " = " << "new " << typeToString(t, scope) << "()";
+                        _out << " = " << "new " << typeToString(t, ns) << "()";
                     }
                     else if(isClassType(t) || st)
                     {
@@ -4376,12 +4516,12 @@
                 }
                 else if(isClassType(t))
                 {
-                    _out << " = " << getAbsolute("Ice.Util", scope) << ".None";
+                    _out << " = " << getUnqualified("Ice.Util", ns) << ".None";
                 }
                 _out << ";";
             }
 
-            writeMarshalUnmarshalParams(outParams, op, false, scope, true);
+            writeMarshalUnmarshalParams(outParams, op, false, ns, true);
             if(op->returnsClasses(false))
             {
                 _out << nl << "istr.readPendingValues();";
@@ -4413,48 +4553,48 @@
         OperationPtr op = *r;
 
         ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
-        vector<string> paramsAMI = getInParams(op, scope);
+        vector<string> paramsAMI = getInParams(op, ns);
         vector<string> argsAMI = getInArgs(op);
         string opName = op->name();
         ParamDeclList inParams = op->inParameters();
         ParamDeclList outParams = op->outParameters();
 
         TypePtr ret = op->returnType();
-        string retS = typeToString(ret, scope, op->returnIsOptional());
+        string retS = typeToString(ret, ns, op->returnIsOptional());
 
-        string returnTypeS = resultType(op, scope);
+        string returnTypeS = resultType(op, ns);
 
         //
         // Write the begin_ methods.
         //
-        string clScope = fixId(cl->scope());
-        string delType = getAbsolute(clScope + "Callback_" + cl->name() + "_" + op->name(), scope);
+        string clScope = getNamespace(cl);
+        string delType = getUnqualified(clScope + ".Callback_" + cl->name() + "_" + op->name(), ns);
 
         string context = getEscapedParamName(op, "context");
         string callback = getEscapedParamName(op, "callback");
         string cookie = getEscapedParamName(op, "cookie");
 
         _out << sp;
-        _out << nl << "public " << getAbsolute("Ice.AsyncResult", scope) << "<" << delType << "> begin_" << opName
-             << spar << paramsAMI << (getAbsolute("Ice.OptionalContext", scope) + " " + context + " = new " +
-                                      getAbsolute("Ice.OptionalContext", scope) + "()") << epar;
+        _out << nl << "public " << getUnqualified("Ice.AsyncResult", ns) << "<" << delType << "> begin_" << opName
+             << spar << paramsAMI << (getUnqualified("Ice.OptionalContext", ns) + " " + context + " = new " +
+                                      getUnqualified("Ice.OptionalContext", ns) + "()") << epar;
         _out << sb;
         _out << nl << "return begin_" << opName << spar << argsAMI << context << "null" << "null" << "false"
             << epar << ';';
         _out << eb;
 
         _out << sp;
-        _out << nl << "public " << getAbsolute("Ice.AsyncResult", scope) << " begin_" << opName << spar << paramsAMI
-             << getAbsolute("Ice.AsyncCallback", scope) + " " + callback << "object " + cookie << epar;
+        _out << nl << "public " << getUnqualified("Ice.AsyncResult", ns) << " begin_" << opName << spar << paramsAMI
+             << getUnqualified("Ice.AsyncCallback", ns) + " " + callback << "object " + cookie << epar;
         _out << sb;
         _out << nl << "return begin_" << opName << spar << argsAMI
-             << "new " + getAbsolute("Ice.OptionalContext", scope) + "()" << callback << cookie << "false" << epar << ';';
+             << "new " + getUnqualified("Ice.OptionalContext", ns) + "()" << callback << cookie << "false" << epar << ';';
         _out << eb;
 
         _out << sp;
-        _out << nl << "public " << getAbsolute("Ice.AsyncResult", scope) + " begin_" << opName << spar << paramsAMI
-             << getAbsolute("Ice.OptionalContext", scope) + " " + context
-             << getAbsolute("Ice.AsyncCallback", scope) + " " + callback
+        _out << nl << "public " << getUnqualified("Ice.AsyncResult", ns) + " begin_" << opName << spar << paramsAMI
+             << getUnqualified("Ice.OptionalContext", ns) + " " + context
+             << getUnqualified("Ice.AsyncCallback", ns) + " " + callback
              << "object " + cookie << epar;
         _out << sb;
         _out << nl << "return begin_" << opName << spar << argsAMI << context << callback
@@ -4467,19 +4607,19 @@
         string flatName = "_" + opName + "_name";
         string asyncResult = getEscapedParamName(op, "asyncResult");
 
-        _out << sp << nl << "public " << retS << " end_" << opName << spar << getOutParams(op, scope, false, true)
-             << getAbsolute("Ice.AsyncResult", scope) + " " + asyncResult << epar;
+        _out << sp << nl << "public " << retS << " end_" << opName << spar << getOutParams(op, ns, false, true)
+             << getUnqualified("Ice.AsyncResult", ns) + " " + asyncResult << epar;
         _out << sb;
 
-        _out << nl << "var resultI_ = IceInternal.AsyncResultI.check(" + asyncResult + ", this, " << flatName << ");";
+        _out << nl << "var resultI_ = global::IceInternal.AsyncResultI.check(" + asyncResult + ", this, " << flatName << ");";
 
         if(returnTypeS.empty())
         {
-            _out << nl << "((IceInternal.OutgoingAsyncT<object>)resultI_.OutgoingAsync).getResult(resultI_.wait());";
+            _out << nl << "((global::IceInternal.OutgoingAsyncT<object>)resultI_.OutgoingAsync).getResult(resultI_.wait());";
         }
         else
         {
-            _out << nl << "var outgoing_ = (IceInternal.OutgoingAsyncT<" << returnTypeS << ">)resultI_.OutgoingAsync;";
+            _out << nl << "var outgoing_ = (global::IceInternal.OutgoingAsyncT<" << returnTypeS << ">)resultI_.OutgoingAsync;";
             if(outParams.empty())
             {
                 _out << nl << "return outgoing_.getResult(resultI_.wait());";
@@ -4508,10 +4648,10 @@
         // Write the common begin_ implementation.
         //
         _out << sp;
-        _out << nl << "private " << getAbsolute("Ice.AsyncResult", scope) << "<" << delType << "> begin_" << opName << spar
-             << getInParams(op, scope, true)
-             << "_System.Collections.Generic.Dictionary<string, string> context"
-             << getAbsolute("Ice.AsyncCallback", scope) + " completedCallback" << "object cookie" << "bool synchronous"
+        _out << nl << "private " << getUnqualified("Ice.AsyncResult", ns) << "<" << delType << "> begin_" << opName << spar
+             << getInParams(op, ns, true)
+             << "global::System.Collections.Generic.Dictionary<string, string> context"
+             << getUnqualified("Ice.AsyncCallback", ns) + " completedCallback" << "object cookie" << "bool synchronous"
              << epar;
         _out << sb;
 
@@ -4519,7 +4659,7 @@
         {
             _out << nl << "iceCheckAsyncTwowayOnly(" << flatName << ");";
         }
-        _out << nl << "var completed = new IceInternal.OperationAsyncResultCompletionCallback<" << delType;
+        _out << nl << "var completed = new global::IceInternal.OperationAsyncResultCompletionCallback<" << delType;
         _out << ", " << (returnTypeS.empty() ? "object" : returnTypeS);
         _out << ">(";
 
@@ -4565,7 +4705,7 @@
     _out << sp << nl << "#endregion"; // Asynchronous operations
     _out << sp << nl << "#region Checked and unchecked cast operations";
 
-    _out << sp << nl << "public static " << name << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", scope) << " b)";
+    _out << sp << nl << "public static " << name << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", ns) << " b)";
     _out << sb;
     _out << nl << "if(b == null)";
     _out << sb;
@@ -4582,8 +4722,8 @@
     _out << eb;
 
     _out << sp << nl << "public static " << name
-         << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", scope)
-         << " b, _System.Collections.Generic.Dictionary<string, string> ctx)";
+         << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", ns)
+         << " b, global::System.Collections.Generic.Dictionary<string, string> ctx)";
     _out << sb;
     _out << nl << "if(b == null)";
     _out << sb;
@@ -4599,14 +4739,14 @@
     _out << nl << "return r;";
     _out << eb;
 
-    _out << sp << nl << "public static " << name << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", scope)
+    _out << sp << nl << "public static " << name << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", ns)
          << " b, string f)";
     _out << sb;
     _out << nl << "if(b == null)";
     _out << sb;
     _out << nl << "return null;";
     _out << eb;
-    _out << nl << getAbsolute("Ice.ObjectPrx", scope) << " bb = b.ice_facet(f);";
+    _out << nl << getUnqualified("Ice.ObjectPrx", ns) << " bb = b.ice_facet(f);";
     _out << nl << "try";
     _out << sb;
     _out << nl << "if(bb.ice_isA(ice_staticId()))";
@@ -4616,21 +4756,21 @@
     _out << nl << "return h;";
     _out << eb;
     _out << eb;
-    _out << nl << "catch(" << getAbsolute("Ice.FacetNotExistException", scope) << ")";
+    _out << nl << "catch(" << getUnqualified("Ice.FacetNotExistException", ns) << ")";
     _out << sb;
     _out << eb;
     _out << nl << "return null;";
     _out << eb;
 
     _out << sp << nl << "public static " << name
-         << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", scope) << " b, string f, "
-         << "_System.Collections.Generic.Dictionary<string, string> ctx)";
+         << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", ns) << " b, string f, "
+         << "global::System.Collections.Generic.Dictionary<string, string> ctx)";
     _out << sb;
     _out << nl << "if(b == null)";
     _out << sb;
     _out << nl << "return null;";
     _out << eb;
-    _out << nl << getAbsolute("Ice.ObjectPrx", scope) << " bb = b.ice_facet(f);";
+    _out << nl << getUnqualified("Ice.ObjectPrx", ns) << " bb = b.ice_facet(f);";
     _out << nl << "try";
     _out << sb;
     _out << nl << "if(bb.ice_isA(ice_staticId(), ctx))";
@@ -4640,13 +4780,13 @@
     _out << nl << "return h;";
     _out << eb;
     _out << eb;
-    _out << nl << "catch(" << getAbsolute("Ice.FacetNotExistException", scope) << ")";
+    _out << nl << "catch(" << getUnqualified("Ice.FacetNotExistException", ns) << ")";
     _out << sb;
     _out << eb;
     _out << nl << "return null;";
     _out << eb;
 
-    _out << sp << nl << "public static " << name << "Prx uncheckedCast(" << getAbsolute("Ice.ObjectPrx", scope) << " b)";
+    _out << sp << nl << "public static " << name << "Prx uncheckedCast(" << getUnqualified("Ice.ObjectPrx", ns) << " b)";
     _out << sb;
     _out << nl << "if(b == null)";
     _out << sb;
@@ -4662,14 +4802,14 @@
     _out << nl << "return r;";
     _out << eb;
 
-    _out << sp << nl << "public static " << name << "Prx uncheckedCast(" << getAbsolute("Ice.ObjectPrx", scope)
+    _out << sp << nl << "public static " << name << "Prx uncheckedCast(" << getUnqualified("Ice.ObjectPrx", ns)
          << " b, string f)";
     _out << sb;
     _out << nl << "if(b == null)";
     _out << sb;
     _out << nl << "return null;";
     _out << eb;
-    _out << nl << getAbsolute("Ice.ObjectPrx", scope) << " bb = b.ice_facet(f);";
+    _out << nl << getUnqualified("Ice.ObjectPrx", ns) << " bb = b.ice_facet(f);";
     _out << nl << name << "PrxHelper h = new " << name << "PrxHelper();";
     _out << nl << "h.iceCopyFrom(bb);";
     _out << nl << "return h;";
@@ -4719,15 +4859,15 @@
 
     _out << sp << nl << "#region Marshaling support";
 
-    _out << sp << nl << "public static void write(" << getAbsolute("Ice.OutputStream", scope) << " ostr, " << name
+    _out << sp << nl << "public static void write(" << getUnqualified("Ice.OutputStream", ns) << " ostr, " << name
          << "Prx v)";
     _out << sb;
     _out << nl << "ostr.writeProxy(v);";
     _out << eb;
 
-    _out << sp << nl << "public static " << name << "Prx read(" << getAbsolute("Ice.InputStream", scope) << " istr)";
+    _out << sp << nl << "public static " << name << "Prx read(" << getUnqualified("Ice.InputStream", ns) << " istr)";
     _out << sb;
-    _out << nl << getAbsolute("Ice.ObjectPrx", scope) << " proxy = istr.readProxy();";
+    _out << nl << getUnqualified("Ice.ObjectPrx", ns) << " proxy = istr.readProxy();";
     _out << nl << "if(proxy != null)";
     _out << sb;
     _out << nl << name << "PrxHelper result = new " << name << "PrxHelper();";
@@ -4759,23 +4899,23 @@
         return;
     }
 
-    string scope = fixId(p->scope());
-    string typeS = typeToString(p, scope);
+    string ns = getNamespace(p);
+    string typeS = typeToString(p, ns);
     _out << sp;
     emitGeneratedCodeAttribute();
     _out << nl << "public sealed class " << p->name() << "Helper";
     _out << sb;
 
-    _out << sp << nl << "public static void write(" << getAbsolute("Ice.OutputStream", scope) << " ostr, " << typeS
+    _out << sp << nl << "public static void write(" << getUnqualified("Ice.OutputStream", ns) << " ostr, " << typeS
          << " v)";
     _out << sb;
-    writeSequenceMarshalUnmarshalCode(_out, p, scope, "v", true, false);
+    writeSequenceMarshalUnmarshalCode(_out, p, ns, "v", true, false);
     _out << eb;
 
-    _out << sp << nl << "public static " << typeS << " read(" << getAbsolute("Ice.InputStream", scope) << " istr)";
+    _out << sp << nl << "public static " << typeS << " read(" << getUnqualified("Ice.InputStream", ns) << " istr)";
     _out << sb;
     _out << nl << typeS << " v;";
-    writeSequenceMarshalUnmarshalCode(_out, p, scope, "v", false, false);
+    writeSequenceMarshalUnmarshalCode(_out, p, ns, "v", false, false);
     _out << nl << "return v;";
     _out << eb;
     _out << eb;
@@ -4840,10 +4980,10 @@
         genericType = meta.substr(prefix.size());
     }
 
-    string scope = fixId(p->scope());
-    string keyS = typeToString(key, scope);
-    string valueS = typeToString(value, scope);
-    string name = "_System.Collections.Generic." + genericType + "<" + keyS + ", " + valueS + ">";
+    string ns = getNamespace(p);
+    string keyS = typeToString(key, ns);
+    string valueS = typeToString(value, ns);
+    string name = "global::System.Collections.Generic." + genericType + "<" + keyS + ", " + valueS + ">";
 
     _out << sp;
     emitGeneratedCodeAttribute();
@@ -4852,7 +4992,7 @@
 
     _out << sp << nl << "public static void write(";
     _out.useCurrentPosAsIndent();
-    _out << getAbsolute("Ice.OutputStream", scope) << " ostr,";
+    _out << getUnqualified("Ice.OutputStream", ns) << " ostr,";
     _out << nl << name << " v)";
     _out.restoreIndent();
     _out << sb;
@@ -4863,17 +5003,17 @@
     _out << nl << "else";
     _out << sb;
     _out << nl << "ostr.writeSize(v.Count);";
-    _out << nl << "foreach(_System.Collections.";
+    _out << nl << "foreach(global::System.Collections.";
     _out << "Generic.KeyValuePair<" << keyS << ", " << valueS << ">";
     _out << " e in v)";
     _out << sb;
-    writeMarshalUnmarshalCode(_out, key, scope, "e.Key", true);
-    writeMarshalUnmarshalCode(_out, value, scope, "e.Value", true);
+    writeMarshalUnmarshalCode(_out, key, ns, "e.Key", true);
+    writeMarshalUnmarshalCode(_out, value, ns, "e.Value", true);
     _out << eb;
     _out << eb;
     _out << eb;
 
-    _out << sp << nl << "public static " << name << " read(" << getAbsolute("Ice.InputStream", scope) << " istr)";
+    _out << sp << nl << "public static " << name << " read(" << getUnqualified("Ice.InputStream", ns) << " istr)";
     _out << sb;
     _out << nl << "int sz = istr.readSize();";
     _out << nl << name << " r = new " << name << "();";
@@ -4885,37 +5025,37 @@
     {
         if(isValueType(st))
         {
-            _out << nl << "k = new " << typeToString(key, scope) << "();";
+            _out << nl << "k = new " << typeToString(key, ns) << "();";
         }
         else
         {
             _out << nl << "k = null;";
         }
     }
-    writeMarshalUnmarshalCode(_out, key, scope, "k", false);
+    writeMarshalUnmarshalCode(_out, key, ns, "k", false);
 
     if(isClassType(value))
     {
         ostringstream os;
-        os << '(' << typeToString(value, scope) << " v) => { r[k] = v; }";
-        writeMarshalUnmarshalCode(_out, value, scope, os.str(), false);
+        os << '(' << typeToString(value, ns) << " v) => { r[k] = v; }";
+        writeMarshalUnmarshalCode(_out, value, ns, os.str(), false);
     }
     else
     {
         _out << nl << valueS << " v;";
-        StructPtr st = StructPtr::dynamicCast(value);
-        if(st)
+        StructPtr stv = StructPtr::dynamicCast(value);
+        if(stv)
         {
-            if(isValueType(st))
+            if(isValueType(stv))
             {
-                _out << nl << "v = new " << typeToString(value, scope) << "();";
+                _out << nl << "v = new " << typeToString(value, ns) << "();";
             }
             else
             {
                 _out << nl << "v = null;";
             }
         }
-        writeMarshalUnmarshalCode(_out, value, scope, "v", false);
+        writeMarshalUnmarshalCode(_out, value, ns, "v", false);
         _out << nl << "r[k] = v;";
     }
     _out << eb;
@@ -4934,20 +5074,22 @@
 bool
 Slice::Gen::DispatcherVisitor::visitModuleStart(const ModulePtr& p)
 {
-    if(!p->hasNonLocalClassDecls())
+    if(!p->hasNonLocalAbstractClassDefs())
     {
         return false;
     }
 
+    moduleStart(p);
     _out << sp << nl << "namespace " << fixId(p->name());
     _out << sb;
     return true;
 }
 
 void
-Slice::Gen::DispatcherVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::DispatcherVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
@@ -4961,11 +5103,11 @@
     ClassList bases = p->bases();
     bool hasBaseClass = !bases.empty() && !bases.front()->isInterface();
     string name = p->name();
-    string scope = fixId(p->scope());
-    string baseClass = getAbsolute("Ice.ObjectImpl", scope);
+    string ns = getNamespace(p);
+    string baseClass = getUnqualified("Ice.ObjectImpl", ns);
     if(hasBaseClass && !bases.front()->allOperations().empty())
     {
-        baseClass = fixId(bases.front()->scoped() + "Disp_");
+        baseClass = getUnqualified(bases.front(), ns, "", "Disp_");
     }
 
     _out << sp;
@@ -4992,7 +5134,7 @@
 
         for(ClassList::const_iterator i = allBases.begin(); i != allBases.end(); ++i)
         {
-            _out << ", " << getAbsolute(fixId((*i)->scoped()), scope);
+            _out << ", " << getUnqualified(*i, ns);
         }
     }
 
@@ -5008,8 +5150,8 @@
     {
         string retS;
         vector<string> params, args;
-        string name = getDispatchParams(*i, retS, params, args, scope);
-        _out << sp << nl << "public abstract " << retS << " " << name << spar << params << epar << ';';
+        string opName = getDispatchParams(*i, retS, params, args, ns);
+        _out << sp << nl << "public abstract " << retS << " " << opName << spar << params << epar << ';';
     }
 
     if(!ops.empty())
@@ -5032,7 +5174,7 @@
         _out << sp;
         emitComVisibleAttribute();
         emitGeneratedCodeAttribute();
-        _out << nl << "public class " << name << "Tie_ : " << name << "Disp_, " << getAbsolute("Ice.TieBase", scope);
+        _out << nl << "public class " << name << "Tie_ : " << name << "Disp_, " << getUnqualified("Ice.TieBase", ns);
 
         _out << sb;
 
@@ -5093,14 +5235,14 @@
 void
 Slice::Gen::DispatcherVisitor::writeTieOperations(const ClassDefPtr& p, NameSet* opNames)
 {
-    string scope = fixId(p->scope());
+    string ns = getNamespace(p);
     OperationList ops = p->operations();
     for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         string retS;
         vector<string> params;
         vector<string> args;
-        string opName = getDispatchParams(*r, retS, params, args, scope);
+        string opName = getDispatchParams(*r, retS, params, args, ns);
         if(opNames)
         {
             if(opNames->find(opName) != opNames->end())
@@ -5123,11 +5265,11 @@
 
     if(!opNames)
     {
-        NameSet opNames;
+        NameSet opNamesTmp;
         ClassList bases = p->bases();
         for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i)
         {
-            writeTieOperations(*i, &opNames);
+            writeTieOperations(*i, &opNamesTmp);
         }
     }
     else
@@ -5149,7 +5291,7 @@
 Slice::Gen::BaseImplVisitor::writeOperation(const OperationPtr& op, bool comment, bool forTie)
 {
     ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
-    string scope = fixId(cl->scope());
+    string ns = getNamespace(cl);
     string opName = op->name();
     TypePtr ret = op->returnType();
     ParamDeclList params = op->parameters();
@@ -5178,9 +5320,8 @@
 
     if(!cl->isLocal() && (cl->hasMetaData("amd") || op->hasMetaData("amd")))
     {
-        ParamDeclList::const_iterator i;
-        vector<string> pDecl = getInParams(op, scope);
-        string resultType = CsGenerator::resultType(op, scope, true);
+        vector<string> pDecl = getInParams(op, ns);
+        string resultType = CsGenerator::resultType(op, ns, true);
 
         _out << "public ";
         if(!forTie)
@@ -5188,12 +5329,12 @@
             _out << "override ";
         }
 
-        _out << "_System.Threading.Tasks.Task";
+        _out << "global::System.Threading.Tasks.Task";
         if(!resultType.empty())
         {
             _out << "<" << resultType << ">";
         }
-        _out << " " << opName << "Async" << spar << pDecl << getAbsolute("Ice.Current", scope) + " current = null"
+        _out << " " << opName << "Async" << spar << pDecl << getUnqualified("Ice.Current", ns) + " current = null"
              << epar;
 
         if(comment)
@@ -5205,7 +5346,7 @@
         _out << sb;
         if(ret)
         {
-            _out << nl << typeToString(ret, scope) << " ret = " << writeValue(ret, scope) << ';';
+            _out << nl << typeToString(ret, ns) << " ret = " << writeValue(ret, ns) << ';';
         }
         for(ParamDeclList::const_iterator i = params.begin(); i != params.end(); ++i)
         {
@@ -5213,13 +5354,13 @@
             {
                 string name = fixId((*i)->name());
                 TypePtr type = (*i)->type();
-                _out << nl << typeToString(type, scope) << ' ' << name << " = " << writeValue(type, scope) << ';';
+                _out << nl << typeToString(type, ns) << ' ' << name << " = " << writeValue(type, ns) << ';';
             }
         }
-        _out << nl << "return _System.Threading.Tasks.Task.FromResult";
+        _out << nl << "return global::System.Threading.Tasks.Task.FromResult";
         if(resultType.empty())
         {
-            _out << "<_System.Object>(null);";
+            _out << "<global::System.Object>(null);";
         }
         else
         {
@@ -5263,9 +5404,9 @@
     {
         string retS = op->hasMarshaledResult() ?
             fixId(cl->scope() + resultStructName(cl->name(), op->name(), true)) :
-            typeToString(ret, scope);
+            typeToString(ret, ns);
 
-        vector<string> pDecls = op->hasMarshaledResult() ? getInParams(op, scope) : getParams(op, scope);
+        vector<string> pDecls = op->hasMarshaledResult() ? getInParams(op, ns) : getParams(op, ns);
 
         _out << "public ";
         if(!forTie && !cl->isLocal())
@@ -5275,7 +5416,7 @@
         _out << retS << ' ' << fixId(opName, DotNet::ICloneable, true) << spar << pDecls;
         if(!cl->isLocal())
         {
-            _out << getAbsolute("Ice.Current", scope) + " current = null";
+            _out << getUnqualified("Ice.Current", ns) + " current = null";
         }
         _out << epar;
         if(comment)
@@ -5290,7 +5431,7 @@
                  << "(";
             if(ret)
             {
-                _out << writeValue(ret, scope);
+                _out << writeValue(ret, ns);
             }
             for(ParamDeclList::const_iterator i = outParams.begin(); i != outParams.end(); ++i)
             {
@@ -5298,7 +5439,7 @@
                 {
                     _out << ", ";
                 }
-                _out << writeValue((*i)->type(), scope);
+                _out << writeValue((*i)->type(), ns);
             }
             _out << ", current);";
         }
@@ -5308,12 +5449,12 @@
             {
                 string name = fixId((*i)->name());
                 TypePtr type = (*i)->type();
-                _out << nl << name << " = " << writeValue(type, scope) << ';';
+                _out << nl << name << " = " << writeValue(type, ns) << ';';
             }
 
             if(ret)
             {
-                _out << nl << "return " << writeValue(ret, scope) << ';';
+                _out << nl << "return " << writeValue(ret, ns) << ';';
             }
         }
         _out << eb;
@@ -5333,6 +5474,7 @@
         return false;
     }
 
+    moduleStart(p);
     _out << sp << nl << "namespace " << fixId(p->name());
     _out << sb;
 
@@ -5340,9 +5482,10 @@
 }
 
 void
-Slice::Gen::ImplVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::ImplVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
@@ -5401,6 +5544,7 @@
         return false;
     }
 
+    moduleStart(p);
     _out << sp << nl << "namespace " << fixId(p->name());
     _out << sb;
 
@@ -5408,9 +5552,10 @@
 }
 
 void
-Slice::Gen::ImplTieVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::ImplTieVisitor::visitModuleEnd(const ModulePtr& p)
 {
     _out << eb;
+    moduleEnd(p);
 }
 
 bool
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/Gen.h zeroc-ice-3.7.2/cpp/src/slice2cs/Gen.h
--- zeroc-ice-3.7.1/cpp/src/slice2cs/Gen.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/Gen.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_H
 #define GEN_H
@@ -74,6 +69,9 @@
     void writeDocCommentAMD(const OperationPtr&, const std::string&);
     void writeDocCommentParam(const OperationPtr&, ParamDir, bool);
 
+    void moduleStart(const ModulePtr&);
+    void moduleEnd(const ModulePtr&);
+
     ::IceUtilInternal::Output& _out;
 };
 
@@ -118,12 +116,25 @@
     public:
 
         CompactIdVisitor(IceUtilInternal::Output&);
-
         virtual bool visitUnitStart(const UnitPtr&);
         virtual void visitUnitEnd(const UnitPtr&);
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
 
+    class TypeIdVisitor : public CsVisitor
+    {
+    public:
+
+        TypeIdVisitor(IceUtilInternal::Output&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+
+    private:
+        void generateHelperClass(const ContainedPtr&);
+    };
+
     class TypesVisitor : public CsVisitor
     {
     public:
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2cs/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2cs/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
@@ -230,8 +225,8 @@
         //
         // Ignore duplicates.
         //
-        vector<string>::iterator p = find(args.begin(), args.end(), *i);
-        if(p != i)
+        vector<string>::iterator j = find(args.begin(), args.end(), *i);
+        if(j != i)
         {
             continue;
         }
@@ -379,16 +374,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2cs/msbuild/slice2cs.vcxproj zeroc-ice-3.7.2/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2cs/msbuild/slice2cs.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2cs/msbuild/slice2cs.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -72,7 +72,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -82,7 +82,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -92,7 +92,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -102,7 +102,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2html/Gen.cpp zeroc-ice-3.7.2/cpp/src/slice2html/Gen.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2html/Gen.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2html/Gen.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
@@ -26,6 +20,20 @@
 #include <iterator>
 #include <string.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#   pragma warning(disable:4100) // unreferenced parameter
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wshadow-all"
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
@@ -1254,7 +1262,7 @@
     if(!_out.isOpen())
     {
         ostringstream os;
-        os << "cannot open file `" << path << "': " << strerror(errno);
+        os << "cannot open file `" << path << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(path);
@@ -1575,7 +1583,7 @@
     if(IceUtilInternal::mkdir(dir, 0777) != 0)
     {
         ostringstream os;
-        os << "cannot create directory `" << dir << "': " << strerror(errno);
+        os << "cannot create directory `" << dir << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addDirectory(dir);
@@ -1588,7 +1596,7 @@
     if(!in)
     {
         ostringstream os;
-        os << "cannot open file `" << file << "': " << strerror(errno);
+        os << "cannot open file `" << file << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 
@@ -1662,7 +1670,7 @@
     if(!in)
     {
         ostringstream os;
-        os << "cannot open file `" << file << "': " << strerror(errno);
+        os << "cannot open file `" << file << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2html/Gen.h zeroc-ice-3.7.2/cpp/src/slice2html/Gen.h
--- zeroc-ice-3.7.1/cpp/src/slice2html/Gen.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2html/Gen.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_H
 #define GEN_H
@@ -13,6 +8,10 @@
 #include <Slice/Parser.h>
 #include <IceUtil/OutputUtil.h>
 
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow-all"
+#endif
+
 namespace Slice
 {
 
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2html/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2html/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2html/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2html/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
@@ -300,17 +295,11 @@
             consoleErr << argv[0] << ": error: " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
-        catch(const string& err)
-        {
-            FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
-            status = EXIT_FAILURE;
-        }
-        catch(const char* err)
+        catch(...)
         {
             FileTracker::instance()->cleanup();
-            consoleErr << argv[0] << ": error: " << err << endl;
-            status = EXIT_FAILURE;
+            consoleErr << args[0] << ": error:" << "unknown exception" << endl;
+            return EXIT_FAILURE;
         }
     }
 
@@ -345,16 +334,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2html/msbuild/slice2html.vcxproj zeroc-ice-3.7.2/cpp/src/slice2html/msbuild/slice2html.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2html/msbuild/slice2html.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2html/msbuild/slice2html.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -72,7 +72,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -82,7 +82,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -92,7 +92,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -102,7 +102,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2java/GenCompat.cpp zeroc-ice-3.7.2/cpp/src/slice2java/GenCompat.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2java/GenCompat.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2java/GenCompat.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <GenCompat.h>
 #include <Slice/Checksum.h>
@@ -18,6 +13,17 @@
 
 #include <limits>
 
+// TODO: fix this warning!
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
@@ -313,7 +319,7 @@
     string name = op->name();
     ContainerPtr container = op->container();
     ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
-    string classNameAsync = getAbsolute(cl, package, amd ? "AMD_" : "AMI_", '_' + name);
+    string classNameAsync = getUnqualified(cl, package, amd ? "AMD_" : "AMI_", '_' + name);
     params.insert(params.begin(), classNameAsync + " " + getEscapedParamName(op, "cb"));
 
     return params;
@@ -372,7 +378,7 @@
 
     if(!ret && outParams.empty())
     {
-        return throws ? getAbsolute("Ice.TwowayCallbackVoidUE", package) : getAbsolute("Ice.OnewayCallback", package);
+        return throws ? getUnqualified("Ice.TwowayCallbackVoidUE", package) : getUnqualified("Ice.OnewayCallback", package);
     }
     else if((ret && outParams.empty()) || (!ret && outParams.size() == 1))
     {
@@ -392,7 +398,7 @@
                 case Builtin::KindFloat:
                 case Builtin::KindDouble:
                 {
-                    return getAbsolute(prefix + builtinAsyncCallbackTable[builtin->kind()] + suffix, package);
+                    return getUnqualified(prefix + builtinAsyncCallbackTable[builtin->kind()] + suffix, package);
                 }
                 default:
                 {
@@ -401,13 +407,13 @@
             }
         }
 
-        return getAbsolute("Ice.TwowayCallbackArg1" + suffix, package) + "<" +
+        return getUnqualified("Ice.TwowayCallbackArg1" + suffix, package) + "<" +
             typeToString(t, TypeModeIn, package, op->getMetaData(), true, optional) + ">";
     }
     else
     {
         ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
-        return getAbsolute(getPackage(cl) + "._Callback_" + cl->name(), package) + "_" + op->name();
+        return getUnqualified(getPackage(cl) + "._Callback_" + cl->name(), package) + "_" + op->name();
     }
 }
 
@@ -426,7 +432,7 @@
         assert(throws);
         return functional ?
             "IceInternal.Functional_TwowayCallbackVoidUE" :
-            "IceInternal.TwowayCallback implements " + getAbsolute("Ice.TwowayCallbackVoidUE", package);
+            "IceInternal.TwowayCallback implements " + getUnqualified("Ice.TwowayCallbackVoidUE", package);
     }
     else if((ret && outParams.empty()) || (!ret && outParams.size() == 1))
     {
@@ -453,7 +459,7 @@
                     else
                     {
                         os << "IceInternal.TwowayCallback implements "
-                           << getAbsolute(string("Ice.") + builtinAsyncCallbackTable[builtin->kind()] + suffix, package);
+                           << getUnqualified(string("Ice.") + builtinAsyncCallbackTable[builtin->kind()] + suffix, package);
                     }
                     return os.str();
                 }
@@ -471,7 +477,7 @@
         }
         else
         {
-            os << "IceInternal.TwowayCallback implements " << getAbsolute("Ice.TwowayCallbackArg1", package);
+            os << "IceInternal.TwowayCallback implements " << getUnqualified("Ice.TwowayCallbackArg1", package);
         }
         os << suffix << "<" << typeToString(t, TypeModeIn, getPackage(op), op->getMetaData(), true, optional) + ">";
         return os.str();
@@ -580,11 +586,11 @@
 
     if(!op->throws().empty())
     {
-        params.push_back("IceInternal.Functional_GenericCallback1<" + getAbsolute("Ice.UserException", package) + "> " +
+        params.push_back("IceInternal.Functional_GenericCallback1<" + getUnqualified("Ice.UserException", package) + "> " +
                          userExceptionCbParamName);
     }
 
-    params.push_back("IceInternal.Functional_GenericCallback1<" + getAbsolute("Ice.Exception", package) + "> " +
+    params.push_back("IceInternal.Functional_GenericCallback1<" + getUnqualified("Ice.Exception", package) + "> " +
                      exceptionCbParamName);
 
     if(sentCB)
@@ -596,7 +602,7 @@
 }
 
 vector<string>
-Slice::JavaCompatVisitor::getArgsAsyncLambda(const OperationPtr& op, const string& package, bool context, bool sentCB)
+Slice::JavaCompatVisitor::getArgsAsyncLambda(const OperationPtr& op, const string& /*package*/, bool context, bool sentCB)
 {
     vector<string> args = getInOutArgs(op, InParam);
 
@@ -669,7 +675,8 @@
     if(ret)
     {
         BuiltinPtr builtin = BuiltinPtr::dynamicCast(ret);
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(ret))
+        if((builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) ||
+           ClassDeclPtr::dynamicCast(ret))
         {
             args.push_back("ret.value");
         }
@@ -685,7 +692,8 @@
         if((*q)->isOutParam())
         {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast((*q)->type());
-            if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast((*q)->type()))
+            if((builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) ||
+               ClassDeclPtr::dynamicCast((*q)->type()))
             {
                 args.push_back(fixKwd((*q)->name()) + ".value");
             }
@@ -745,7 +753,8 @@
         ret = op->returnType();
         BuiltinPtr builtin = BuiltinPtr::dynamicCast(ret);
         ClassDeclPtr cl = ClassDeclPtr::dynamicCast(ret);
-        returnsObject = (builtin && builtin->kind() == Builtin::KindObject) || cl;
+        returnsObject = (builtin && (builtin->kind() == Builtin::KindObject ||
+                                     builtin->kind() == Builtin::KindValue)) || cl;
         const bool optional = optionalMapping && op->returnIsOptional();
 
         string retS = typeToString(ret, TypeModeReturn, package, op->getMetaData(), true, optional);
@@ -830,7 +839,7 @@
     {
         ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
         out.inc();
-        out << nl << "throws " << getAbsolute("Ice.UserException", getPackage(cl));
+        out << nl << "throws " << getUnqualified("Ice.UserException", getPackage(cl));
         out.dec();
     }
     else if(throws.size() > 0)
@@ -845,7 +854,7 @@
             {
                 out << "," << nl;
             }
-            out << getAbsolute(*r, package);
+            out << getUnqualified(*r, package);
             count++;
         }
         out.restoreIndent();
@@ -889,7 +898,8 @@
     if(needPatcher)
     {
         BuiltinPtr builtin = BuiltinPtr::dynamicCast(member->type());
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(member->type()))
+        if((builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) ||
+           ClassDeclPtr::dynamicCast(member->type()))
         {
             ostringstream ostr;
             ostr << "new Patcher(" << patchIter++ << ')';
@@ -925,7 +935,7 @@
 Slice::JavaCompatVisitor::writePatcher(Output& out, const string& package, const DataMemberList& classMembers,
                                        const DataMemberList& optionalMembers)
 {
-    out << sp << nl << "private class Patcher implements " << getAbsolute("Ice.ReadValueCallback", package);
+    out << sp << nl << "private class Patcher implements " << getUnqualified("Ice.ReadValueCallback", package);
     out << sb;
     if(classMembers.size() > 1)
     {
@@ -935,7 +945,7 @@
         out << eb;
     }
 
-    out << sp << nl << "public void" << nl << "valueReady(" << getAbsolute("Ice.Object", package) << " v)";
+    out << sp << nl << "public void" << nl << "valueReady(" << getUnqualified("Ice.Object", package) << " v)";
     out << sb;
     if(classMembers.size() > 1)
     {
@@ -953,7 +963,7 @@
         BuiltinPtr b = BuiltinPtr::dynamicCast((*d)->type());
         if(b)
         {
-            assert(b->kind() == Builtin::KindObject);
+            assert(b->kind() == Builtin::KindObject || b->kind() == Builtin::KindValue);
         }
 
         if(classMembers.size() > 1)
@@ -963,7 +973,7 @@
             out.inc();
             if(b)
             {
-                out << nl << "_typeId = " << getAbsolute("Ice.ObjectImpl", package) << ".ice_staticId();";
+                out << nl << "_typeId = " << getUnqualified("Ice.ObjectImpl", package) << ".ice_staticId();";
             }
             else
             {
@@ -1000,14 +1010,15 @@
     for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
     {
         BuiltinPtr b = BuiltinPtr::dynamicCast((*d)->type());
-        if(b && b->kind() != Builtin::KindObject)
+        if(b && b->kind() != Builtin::KindObject && b->kind() != Builtin::KindValue)
         {
             continue;
         }
 
         TypePtr paramType = (*d)->type();
         BuiltinPtr builtin = BuiltinPtr::dynamicCast(paramType);
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(paramType))
+        if((builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) ||
+           ClassDeclPtr::dynamicCast(paramType))
         {
 
             if(classMembers.size() > 1)
@@ -1017,7 +1028,7 @@
                 out.inc();
                 if(b)
                 {
-                    out << nl << "_typeId = " << getAbsolute("Ice.ObjectImpl", package) << ".ice_staticId();";
+                    out << nl << "_typeId = " << getUnqualified("Ice.ObjectImpl", package) << ".ice_staticId();";
                 }
                 else
                 {
@@ -1026,7 +1037,7 @@
             }
 
             string capName = (*d)->name();
-            capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+            capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
 
             if(b)
             {
@@ -1126,7 +1137,7 @@
     out << nl << "return java.util.Arrays.binarySearch(_ids, s) >= 0;";
     out << eb;
 
-    out << sp << nl << "public boolean ice_isA(String s, " << getAbsolute("Ice.Current", package) << " current)";
+    out << sp << nl << "public boolean ice_isA(String s, " << getUnqualified("Ice.Current", package) << " current)";
     out << sb;
     out << nl << "return java.util.Arrays.binarySearch(_ids, s) >= 0;";
     out << eb;
@@ -1136,7 +1147,7 @@
     out << nl << "return _ids;";
     out << eb;
 
-    out << sp << nl << "public String[] ice_ids(" << getAbsolute("Ice.Current", package) << " current)";
+    out << sp << nl << "public String[] ice_ids(" << getUnqualified("Ice.Current", package) << " current)";
     out << sb;
     out << nl << "return _ids;";
     out << eb;
@@ -1146,7 +1157,7 @@
     out << nl << "return _ids[" << scopedPos << "];";
     out << eb;
 
-    out << sp << nl << "public String ice_id(" << getAbsolute("Ice.Current", package) << " current)";
+    out << sp << nl << "public String ice_id(" << getUnqualified("Ice.Current", package) << " current)";
     out << sb;
     out << nl << "return _ids[" << scopedPos << "];";
     out << eb;
@@ -1281,9 +1292,9 @@
         out << sp;
         writeSuppressDeprecation(out, op);
         out << nl << "public static boolean _iceD_" << opName << '(' << name
-            << " obj, IceInternal.Incoming inS, " << getAbsolute("Ice.Current", package) << " current)";
+            << " obj, IceInternal.Incoming inS, " << getUnqualified("Ice.Current", package) << " current)";
         out.inc();
-        out << nl << "throws " << getAbsolute("Ice.UserException", package);
+        out << nl << "throws " << getUnqualified("Ice.UserException", package);
         out.dec();
 
         out << sb;
@@ -1319,7 +1330,7 @@
                 //
                 // Unmarshal 'in' parameters.
                 //
-                out << nl << getAbsolute("Ice.InputStream", package) << " istr = inS.startReadParams();";
+                out << nl << getUnqualified("Ice.InputStream", package) << " istr = inS.startReadParams();";
                 for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
                 {
                     TypePtr paramType = (*pli)->type();
@@ -1333,7 +1344,8 @@
                     else
                     {
                         BuiltinPtr builtin = BuiltinPtr::dynamicCast(paramType);
-                        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(paramType))
+                        if((builtin && (builtin->kind() == Builtin::KindObject ||
+                                        builtin->kind() == Builtin::KindValue)) || ClassDeclPtr::dynamicCast(paramType))
                         {
                             out << nl << typeS << "Holder " << paramName << " = new " << typeS << "Holder();";
                         }
@@ -1392,7 +1404,8 @@
                 if(!(*pli)->optional())
                 {
                     BuiltinPtr builtin = BuiltinPtr::dynamicCast(paramType);
-                    if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(paramType))
+                    if((builtin && (builtin->kind() == Builtin::KindObject ||
+                                    builtin->kind() == Builtin::KindValue)) || ClassDeclPtr::dynamicCast(paramType))
                     {
                         out << ".value";
                     }
@@ -1410,7 +1423,7 @@
             //
             if(!outParams.empty() || ret)
             {
-                out << nl << getAbsolute("Ice.OutputStream", package) << " ostr = inS.startWriteParams();";
+                out << nl << getUnqualified("Ice.OutputStream", package) << " ostr = inS.startWriteParams();";
                 writeMarshalUnmarshalParams(out, package, outParams, op, iter, true, optionalMapping, true, "", true);
                 if(op->returnsClasses(false))
                 {
@@ -1447,7 +1460,7 @@
                 //
                 // Unmarshal 'in' parameters.
                 //
-                out << nl << getAbsolute("Ice.InputStream", package) << " istr = inS.startReadParams();";
+                out << nl << getUnqualified("Ice.InputStream", package) << " istr = inS.startReadParams();";
                 iter = 0;
                 for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
                 {
@@ -1462,7 +1475,8 @@
                     else
                     {
                         BuiltinPtr builtin = BuiltinPtr::dynamicCast(paramType);
-                        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(paramType))
+                        if((builtin && (builtin->kind() == Builtin::KindObject ||
+                                        builtin->kind() == Builtin::KindValue)) || ClassDeclPtr::dynamicCast(paramType))
                         {
                             out << nl << typeS << "Holder " << paramName << " = new " << typeS << "Holder();";
                         }
@@ -1506,7 +1520,8 @@
                 if(!(*pli)->optional())
                 {
                     BuiltinPtr builtin = BuiltinPtr::dynamicCast(paramType);
-                    if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(paramType))
+                    if((builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) ||
+                       ClassDeclPtr::dynamicCast(paramType))
                     {
                         out << ".value";
                     }
@@ -1569,7 +1584,7 @@
         out << nl << "int pos = java.util.Arrays.binarySearch(_all, current.operation);";
         out << nl << "if(pos < 0)";
         out << sb;
-        out << nl << "throw new " << getAbsolute("Ice.OperationNotExistException", package)
+        out << nl << "throw new " << getUnqualified("Ice.OperationNotExistException", package)
             << "(current.id, current.facet, current.operation);";
         out << eb;
         out << sp << nl << "switch(pos)";
@@ -1618,11 +1633,11 @@
                             string base;
                             if(cl->isInterface())
                             {
-                                base = getAbsolute(cl, package, "_", "Disp");
+                                base = getUnqualified(cl, package, "_", "Disp");
                             }
                             else
                             {
-                                base = getAbsolute(cl, package);
+                                base = getUnqualified(cl, package);
                             }
                             out << nl << "return " << base << "._iceD_" << opName << "(this, in, current);";
                         }
@@ -1634,7 +1649,7 @@
         }
         out << eb;
         out << sp << nl << "assert(false);";
-        out << nl << "throw new " << getAbsolute("Ice.OperationNotExistException", package)
+        out << nl << "throw new " << getUnqualified("Ice.OperationNotExistException", package)
             << "(current.id, current.facet, current.operation);";
         out << eb;
 
@@ -1694,19 +1709,19 @@
 
     if(preserved && !basePreserved)
     {
-        out << sp << nl << "public " << getAbsolute("Ice.SlicedData", package) << " ice_getSlicedData()";
+        out << sp << nl << "public " << getUnqualified("Ice.SlicedData", package) << " ice_getSlicedData()";
         out << sb;
         out << nl << "return _iceSlicedData;";
         out << eb;
 
-        out << sp << nl << "public void _iceWrite(" << getAbsolute("Ice.OutputStream", package) << " ostr)";
+        out << sp << nl << "public void _iceWrite(" << getUnqualified("Ice.OutputStream", package) << " ostr)";
         out << sb;
         out << nl << "ostr.startValue(_iceSlicedData);";
         out << nl << "_iceWriteImpl(ostr);";
         out << nl << "ostr.endValue();";
         out << eb;
 
-        out << sp << nl << "public void _iceRead(" << getAbsolute("Ice.InputStream", package) << " istr)";
+        out << sp << nl << "public void _iceRead(" << getUnqualified("Ice.InputStream", package) << " istr)";
         out << sb;
         out << nl << "istr.startValue();";
         out << nl << "_iceReadImpl(istr);";
@@ -1714,7 +1729,7 @@
         out << eb;
     }
 
-    out << sp << nl << "protected void _iceWriteImpl(" << getAbsolute("Ice.OutputStream", package) << " ostr_)";
+    out << sp << nl << "protected void _iceWriteImpl(" << getUnqualified("Ice.OutputStream", package) << " ostr_)";
     out << sb;
     out << nl << "ostr_.startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
     iter = 0;
@@ -1744,7 +1759,7 @@
         writePatcher(out, package, classMembers, optionalMembers);
     }
 
-    out << sp << nl << "protected void _iceReadImpl(" << getAbsolute("Ice.InputStream", package) << " istr_)";
+    out << sp << nl << "protected void _iceReadImpl(" << getUnqualified("Ice.InputStream", package) << " istr_)";
     out << sb;
     out << nl << "istr_.startSlice();";
 
@@ -1771,7 +1786,7 @@
 
     if(preserved && !basePreserved)
     {
-        out << sp << nl << "protected " << getAbsolute("Ice.SlicedData", package) << " _iceSlicedData;";
+        out << sp << nl << "protected " << getUnqualified("Ice.SlicedData", package) << " _iceSlicedData;";
     }
 }
 
@@ -1782,7 +1797,7 @@
     ConstPtr constant = ConstPtr::dynamicCast(valueType);
     if(constant)
     {
-        out << getAbsolute(constant, package) << ".value";
+        out << getUnqualified(constant, package) << ".value";
     }
     else
     {
@@ -1835,7 +1850,7 @@
         {
             EnumeratorPtr lte = EnumeratorPtr::dynamicCast(valueType);
             assert(lte);
-            out << getAbsolute(lte, package);
+            out << getUnqualified(lte, package);
         }
         else
         {
@@ -1855,7 +1870,7 @@
             if((*p)->optional())
             {
                 string capName = (*p)->name();
-                capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                 out << nl << "set" << capName << '(';
                 writeConstantValue(out, t, (*p)->defaultValueType(), (*p)->defaultValue(), package);
                 out << ");";
@@ -1879,7 +1894,7 @@
             if(en)
             {
                 string firstEnum = fixKwd(en->enumerators().front()->name());
-                out << nl << "this." << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum
+                out << nl << "this." << fixKwd((*p)->name()) << " = " << getUnqualified(en, package) << '.' << firstEnum
                     << ';';
             }
 
@@ -2516,7 +2531,7 @@
     {
         opIntfName += "NC";
     }
-    string absolute = getAbsolute(p, "", "_", opIntfName);
+    string absolute = getUnqualified(p, "", "_", opIntfName);
 
     open(absolute, p->file());
 
@@ -2545,7 +2560,7 @@
                 {
                     first = false;
                 }
-                out << getAbsolute(*q, package, "_", opIntfName);
+                out << getUnqualified(*q, package, "_", opIntfName);
             }
             ++q;
         }
@@ -2603,7 +2618,7 @@
         out << nl << retS << ' ' << (amd ? opname + "_async" : fixKwd(opname)) << spar << params;
         if(!noCurrent && !p->isLocal())
         {
-            out << getAbsolute("Ice.Current", package) + " " + currentParamName;
+            out << getUnqualified("Ice.Current", package) + " " + currentParamName;
         }
         out << epar;
         writeThrowsClause(package, throws, op);
@@ -2657,7 +2672,7 @@
     }
 
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     DataMemberList members = p->dataMembers();
     DataMemberList allDataMembers = p->allDataMembers();
 
@@ -2699,12 +2714,12 @@
             out << '_' << name << "Operations, _" << name << "OperationsNC";
             if(bases.empty())
             {
-                out << "," << nl << getAbsolute("Ice.Object", package);
+                out << "," << nl << getUnqualified("Ice.Object", package);
             }
         }
         else if(q != bases.end())
         {
-            out << getAbsolute(*q++, package);
+            out << getUnqualified(*q++, package);
         }
         else if(r != implements.end())
         {
@@ -2713,7 +2728,7 @@
 
         for(;q != bases.end(); ++q)
         {
-            out << ',' << nl << getAbsolute(*q, package);
+            out << ',' << nl << getUnqualified(*q, package);
         }
         for(; r != implements.end(); ++r)
         {
@@ -2733,12 +2748,12 @@
 
         if(baseClass)
         {
-            out << " extends " << getAbsolute(baseClass, package);
+            out << " extends " << getUnqualified(baseClass, package);
             bases.pop_front();
         }
         else if(!p->isLocal())
         {
-            out << " extends " << getAbsolute("Ice.ObjectImpl", package);
+            out << " extends " << getUnqualified("Ice.ObjectImpl", package);
         }
         else
         {
@@ -2752,7 +2767,7 @@
         }
         for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
         {
-            implements.push_back(getAbsolute(*q, package));
+            implements.push_back(getUnqualified(*q, package));
         }
 
         if(!implements.empty())
@@ -2831,7 +2846,7 @@
                 {
                     out << "public abstract ";
                 }
-                out << getAbsolute("Ice.AsyncResult", package) << " begin_" << opname << spar << inParams << epar << ';';
+                out << getUnqualified("Ice.AsyncResult", package) << " begin_" << opname << spar << inParams << epar << ';';
 
                 out << sp;
                 writeDocCommentAMI(out, op, InParam, "@param " + getEscapedParamName(op, "cb") + " A generic callback.");
@@ -2840,7 +2855,7 @@
                 {
                     out << "public abstract ";
                 }
-                out << getAbsolute("Ice.AsyncResult", package) << " begin_" << opname << spar << inParams
+                out << getUnqualified("Ice.AsyncResult", package) << " begin_" << opname << spar << inParams
                     << ("Ice.Callback " + getEscapedParamName(op, "cb")) << epar << ';';
 
                 out << sp;
@@ -2851,7 +2866,7 @@
                     out << "public abstract ";
                 }
                 string cb = "Callback_" + name + "_" + opname + " " + getEscapedParamName(op, "cb");
-                out << getAbsolute("Ice.AsyncResult", package) << " begin_" << opname << spar << inParams << cb << epar
+                out << getUnqualified("Ice.AsyncResult", package) << " begin_" << opname << spar << inParams << cb << epar
                     << ';';
 
                 out << sp;
@@ -2864,7 +2879,7 @@
                 {
                     out << "public abstract ";
                 }
-                out << getAbsolute("Ice.AsyncResult", package) << " begin_" << opname;
+                out << getUnqualified("Ice.AsyncResult", package) << " begin_" << opname;
                 writeParamList(out, getParamsAsyncLambda(op, package, false, true));
                 out << ';';
 
@@ -2878,7 +2893,7 @@
                 }
 
                 out << retS << " end_" << opname << spar << outParams
-                    << (getAbsolute("Ice.AsyncResult", package) + " " + getEscapedParamName(op, "result")) << epar << ';';
+                    << (getUnqualified("Ice.AsyncResult", package) + " " + getEscapedParamName(op, "result")) << epar << ';';
             }
         }
     }
@@ -3011,7 +3026,7 @@
                 if((*d)->optional())
                 {
                     string capName = paramName;
-                    capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                    capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                     out << nl << "set" << capName << '(' << paramName << ");";
                 }
                 else
@@ -3029,17 +3044,17 @@
     if(!p->isInterface() && p->allOperations().size() == 0 && !p->isLocal())
     {
         out << sp;
-        out << nl << "private static class _F implements " << getAbsolute("Ice.ValueFactory", package);
+        out << nl << "private static class _F implements " << getUnqualified("Ice.ValueFactory", package);
         out << sb;
-        out << nl << "public " << getAbsolute("Ice.Object", package) << " create(String type)";
+        out << nl << "public " << getUnqualified("Ice.Object", package) << " create(String type)";
         out << sb;
         out << nl << "assert(type.equals(ice_staticId()));";
         out << nl << "return new " << fixKwd(name) << "();";
         out << eb;
         out << eb;
-        out << nl << "private static " << getAbsolute("Ice.ValueFactory", package) << " _factory = new _F();";
+        out << nl << "private static " << getUnqualified("Ice.ValueFactory", package) << " _factory = new _F();";
         out << sp;
-        out << nl << "public static " << getAbsolute("Ice.ValueFactory", package) << nl << "ice_factory()";
+        out << nl << "public static " << getUnqualified("Ice.ValueFactory", package) << nl << "ice_factory()";
         out << sb;
         out << nl << "return _factory;";
         out << eb;
@@ -3150,7 +3165,7 @@
     string scoped = p->scoped();
     ExceptionPtr base = p->base();
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     DataMemberList members = p->dataMembers();
     DataMemberList allDataMembers = p->allDataMembers();
 
@@ -3168,16 +3183,16 @@
     {
         if(p->isLocal())
         {
-            out << getAbsolute("Ice.LocalException", package);
+            out << getUnqualified("Ice.LocalException", package);
         }
         else
         {
-            out << getAbsolute("Ice.UserException", package);
+            out << getUnqualified("Ice.UserException", package);
         }
     }
     else
     {
-        out << getAbsolute(base, package);
+        out << getUnqualified(base, package);
     }
     out << sb;
 
@@ -3355,7 +3370,7 @@
                 if((*d)->optional())
                 {
                     string capName = paramName;
-                    capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                    capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                     out << nl << "set" << capName << '(' << paramName << ");";
                 }
                 else
@@ -3397,7 +3412,7 @@
                     if((*d)->optional())
                     {
                         string capName = paramName;
-                        capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                        capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                         out << nl << "set" << capName << '(' << paramName << ");";
                     }
                     else
@@ -3439,19 +3454,19 @@
         if(preserved && !basePreserved)
         {
             out << sp;
-            out << nl << "public " << getAbsolute("Ice.SlicedData", package) << " " << nl << "ice_getSlicedData()";
+            out << nl << "public " << getUnqualified("Ice.SlicedData", package) << " " << nl << "ice_getSlicedData()";
             out << sb;
             out << nl << "return _slicedData;";
             out << eb;
 
-            out << sp << nl << "public void" << nl << "_write(" << getAbsolute("Ice.OutputStream", package) << " ostr)";
+            out << sp << nl << "public void" << nl << "_write(" << getUnqualified("Ice.OutputStream", package) << " ostr)";
             out << sb;
             out << nl << "ostr.startException(_slicedData);";
             out << nl << "_writeImpl(ostr);";
             out << nl << "ostr.endException();";
             out << eb;
 
-            out << sp << nl << "public void" << nl << "_read(" << getAbsolute("Ice.InputStream", package) << " istr)";
+            out << sp << nl << "public void" << nl << "_read(" << getUnqualified("Ice.InputStream", package) << " istr)";
             out << sb;
             out << nl << "istr.startException();";
             out << nl << "_readImpl(istr);";
@@ -3459,7 +3474,7 @@
             out << eb;
         }
 
-        out << sp << nl << "protected void" << nl << "_writeImpl(" << getAbsolute("Ice.OutputStream", package)
+        out << sp << nl << "protected void" << nl << "_writeImpl(" << getUnqualified("Ice.OutputStream", package)
             << " ostr_)";
         out << sb;
         out << nl << "ostr_.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
@@ -3489,7 +3504,7 @@
         {
             writePatcher(out, package, classMembers, optionalMembers);
         }
-        out << sp << nl << "protected void" << nl << "_readImpl(" << getAbsolute("Ice.InputStream", package)
+        out << sp << nl << "protected void" << nl << "_readImpl(" << getUnqualified("Ice.InputStream", package)
             << " istr_)";
         out << sb;
         out << nl << "istr_.startSlice();";
@@ -3527,7 +3542,7 @@
 
         if(preserved && !basePreserved)
         {
-            out << sp << nl << "protected " << getAbsolute("Ice.SlicedData", package) << " _slicedData;";
+            out << sp << nl << "protected " << getUnqualified("Ice.SlicedData", package) << " _slicedData;";
         }
     }
 
@@ -3578,7 +3593,7 @@
 Slice::GenCompat::TypesVisitor::visitStructStart(const StructPtr& p)
 {
     string name = fixKwd(p->name());
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
 
     open(absolute, p->file());
 
@@ -3798,7 +3813,7 @@
 
     if(!p->isLocal())
     {
-        out << sp << nl << "public void" << nl << "ice_writeMembers(" << getAbsolute("Ice.OutputStream", package)
+        out << sp << nl << "public void" << nl << "ice_writeMembers(" << getUnqualified("Ice.OutputStream", package)
             << " ostr)";
         out << sb;
         iter = 0;
@@ -3815,7 +3830,7 @@
             writePatcher(out, package, classMembers, DataMemberList());
         }
 
-        out << sp << nl << "public void" << nl << "ice_readMembers(" << getAbsolute("Ice.InputStream", package)
+        out << sp << nl << "public void" << nl << "ice_readMembers(" << getUnqualified("Ice.InputStream", package)
             << " istr)";
         out << sb;
         iter = 0;
@@ -3827,7 +3842,7 @@
         }
         out << eb;
 
-        out << sp << nl << "static public void" << nl << "ice_write(" << getAbsolute("Ice.OutputStream", package)
+        out << sp << nl << "static public void" << nl << "ice_write(" << getUnqualified("Ice.OutputStream", package)
             << " ostr, " << name << " v)";
         out << sb;
         out << nl << "if(v == null)";
@@ -3840,7 +3855,7 @@
         out << eb;
         out << eb;
 
-        out << sp << nl << "static public " << name << nl << "ice_read(" << getAbsolute("Ice.InputStream", package)
+        out << sp << nl << "static public " << name << nl << "ice_read(" << getUnqualified("Ice.InputStream", package)
             << " istr)";
         out << sb;
         out << nl << name << " v = new " << name << "();";
@@ -3960,7 +3975,7 @@
     if(getSet || optional)
     {
         string capName = p->name();
-        capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+        capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
 
         //
         // If container is a class, get all of its operations so that we can check for conflicts.
@@ -4177,7 +4192,7 @@
 Slice::GenCompat::TypesVisitor::visitEnum(const EnumPtr& p)
 {
     string name = fixKwd(p->name());
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     string package = getPackage(p);
     EnumeratorList enumerators = p->enumerators();
 
@@ -4237,12 +4252,12 @@
 
     if(!p->isLocal())
     {
-        out << sp << nl << "public void ice_write(" << getAbsolute("Ice.OutputStream", package) << " ostr)";
+        out << sp << nl << "public void ice_write(" << getUnqualified("Ice.OutputStream", package) << " ostr)";
         out << sb;
         out << nl << "ostr.writeEnum(_value, " << p->maxValue() << ");";
         out << eb;
 
-        out << sp << nl << "public static void ice_write(" << getAbsolute("Ice.OutputStream", package) << " ostr, "
+        out << sp << nl << "public static void ice_write(" << getUnqualified("Ice.OutputStream", package) << " ostr, "
             << name << " v)";
         out << sb;
         out << nl << "if(v == null)";
@@ -4256,7 +4271,7 @@
         out << eb;
         out << eb;
 
-        out << sp << nl << "public static " << name << " ice_read(" << getAbsolute("Ice.InputStream", package)
+        out << sp << nl << "public static " << name << " ice_read(" << getUnqualified("Ice.InputStream", package)
             << " istr)";
         out << sb;
         out << nl << "int v = istr.readEnum(" << p->maxValue() << ");";
@@ -4268,7 +4283,7 @@
         out << nl << "final " << name << " e = valueOf(v);";
         out << nl << "if(e == null)";
         out << sb;
-        out << nl << "throw new " << getAbsolute("Ice.MarshalException", package)
+        out << nl << "throw new " << getUnqualified("Ice.MarshalException", package)
             << "(\"enumerator value \" + v + \" is out of range\");";
         out << eb;
         out << nl << "return e;";
@@ -4286,7 +4301,7 @@
 {
     string name = fixKwd(p->name());
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     TypePtr type = p->type();
 
     open(absolute, p->file());
@@ -4369,7 +4384,7 @@
     if(!p->isLocal())
     {
         string name = p->name();
-        string absolute = getAbsolute(p, "", "", "PrxHolder");
+        string absolute = getUnqualified(p, "", "", "PrxHolder");
 
         open(absolute, p->file());
         Output& out = output();
@@ -4426,7 +4441,7 @@
     assert(contained);
     string name = contained->name();
     string package = getPackage(contained);
-    string absolute = getAbsolute(contained, "", "", "Holder");
+    string absolute = getUnqualified(contained, "", "", "Holder");
 
     string file;
     if(p->definitionContext())
@@ -4447,15 +4462,17 @@
 
     string typeS = typeToString(p, TypeModeIn, getPackage(contained));
     out << nl << "public final class " << name << "Holder";
-    if(!p->isLocal() && ((builtin && builtin->kind() == Builtin::KindObject) || cl))
+    if(!p->isLocal() && ((builtin && (builtin->kind() == Builtin::KindObject ||
+                                      builtin->kind() == Builtin::KindValue)) || cl))
     {
-        out << " extends " << getAbsolute("Ice.ObjectHolderBase", package) << "<" << typeS << ">";
+        out << " extends " << getUnqualified("Ice.ObjectHolderBase", package) << "<" << typeS << ">";
     }
     else {
-        out << " extends " << getAbsolute("Ice.Holder", package) << "<" << typeS << ">";
+        out << " extends " << getUnqualified("Ice.Holder", package) << "<" << typeS << ">";
     }
     out << sb;
-    if(!p->isLocal() && ((builtin && builtin->kind() == Builtin::KindObject) || cl))
+    if(!p->isLocal() && ((builtin && (builtin->kind() == Builtin::KindObject ||
+                                      builtin->kind() == Builtin::KindValue)) || cl))
     {
         out << sp << nl << "public" << nl << name << "Holder()";
         out << sb;
@@ -4466,7 +4483,7 @@
         out << eb;
 
         out << sp << nl << "public void";
-        out << nl << "valueReady(" << getAbsolute("Ice.Object", package) << " v)";
+        out << nl << "valueReady(" << getUnqualified("Ice.Object", package) << " v)";
         out << sb;
         out << nl << "if(v == null || v instanceof " << typeS << ")";
         out << sb;
@@ -4529,9 +4546,9 @@
     string name = p->name();
     string scoped = p->scoped();
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
 
-    open(getAbsolute(p, "", "", "PrxHelper"), p->file());
+    open(getUnqualified(p, "", "", "PrxHelper"), p->file());
     Output& out = output();
     OperationList ops = p->allOperations();
 
@@ -4556,7 +4573,7 @@
     }
 
     out << nl << "public final class " << name << "PrxHelper extends "
-        << getAbsolute("Ice.ObjectPrxHelperBase", package) << " implements " << name << "Prx";
+        << getUnqualified("Ice.ObjectPrxHelperBase", package) << " implements " << name << "Prx";
 
     out << sb;
 
@@ -4600,7 +4617,7 @@
         out << sp;
         const string iresultParamName = getEscapedParamName(op, "iresult");
         out << nl << "public " << retS << " end_" << op->name() << spar << outParams
-            << (getAbsolute("Ice.AsyncResult", package) + " " + iresultParamName) << epar;
+            << (getUnqualified("Ice.AsyncResult", package) + " " + iresultParamName) << epar;
         writeThrowsClause(package, throws);
         out << sb;
         if(op->returnsData())
@@ -4629,20 +4646,20 @@
 #endif
             for(ExceptionList::const_iterator eli = throws.begin(); eli != throws.end(); ++eli)
             {
-                out << nl << "catch(" << getAbsolute(*eli, package) << " ex_)";
+                out << nl << "catch(" << getUnqualified(*eli, package) << " ex_)";
                 out << sb;
                 out << nl << "throw ex_;";
                 out << eb;
             }
-            out << nl << "catch(" << getAbsolute("Ice.UserException", package) << " ex_)";
+            out << nl << "catch(" << getUnqualified("Ice.UserException", package) << " ex_)";
             out << sb;
-            out << nl << "throw new " << getAbsolute("Ice.UnknownUserException", package) << "(ex_.ice_id(), ex_);";
+            out << nl << "throw new " << getUnqualified("Ice.UnknownUserException", package) << "(ex_.ice_id(), ex_);";
             out << eb;
             out << eb;
 
             if(ret || !outParams.empty())
             {
-                out << nl << getAbsolute("Ice.InputStream", package) << " istr_ = result_.startReadParams();";
+                out << nl << getUnqualified("Ice.InputStream", package) << " istr_ = result_.startReadParams();";
                 const ParamDeclList paramList = op->parameters();
                 ParamDeclList pl;
                 for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
@@ -4668,7 +4685,8 @@
             {
                 BuiltinPtr builtin = BuiltinPtr::dynamicCast(ret);
                 if(!op->returnIsOptional() &&
-                   ((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(ret)))
+                   ((builtin && (builtin->kind() == Builtin::KindObject ||
+                                 builtin->kind() == Builtin::KindValue)) || ClassDeclPtr::dynamicCast(ret)))
                 {
                     out << nl << "return ret_.value;";
                 }
@@ -4712,8 +4730,8 @@
             out << sp << nl << "static public void _iceI_" << op->name() << "_completed("
                 << getAsyncCallbackInterface(op, package) << " cb, Ice.AsyncResult result)";
             out << sb;
-            out << nl << getAbsolute(cl, "", "", "Prx") << " _proxy = ("
-                << getAbsolute(cl, "", "", "Prx") << ")result.getProxy();";
+            out << nl << getUnqualified(cl, "", "", "Prx") << " _proxy = ("
+                << getUnqualified(cl, "", "", "Prx") << ")result.getProxy();";
 
             TypePtr ret = op->returnType();
             if(ret)
@@ -4741,18 +4759,18 @@
             out << eb;
             if(!throws.empty())
             {
-                out << nl << "catch(" << getAbsolute("Ice.UserException", package) << " ex)";
+                out << nl << "catch(" << getUnqualified("Ice.UserException", package) << " ex)";
                 out << sb;
                 out << nl << "cb.exception(ex);";
                 out << nl << "return;";
                 out << eb;
             }
-            out << nl << "catch(" << getAbsolute("Ice.LocalException", package) << " ex)";
+            out << nl << "catch(" << getUnqualified("Ice.LocalException", package) << " ex)";
             out << sb;
             out << nl << "cb.exception(ex);";
             out << nl << "return;";
             out << eb;
-            out << nl << "catch(" << getAbsolute("Ice.SystemException", package) << " ex)";
+            out << nl << "catch(" << getUnqualified("Ice.SystemException", package) << " ex)";
             out << sb;
             out << nl << "cb.exception(ex);";
             out << nl << "return;";
@@ -4786,7 +4804,7 @@
                     "Raises a local exception if a communication error occurs.\n"
                     "@param obj The untyped proxy.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "public static " << name << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", package) << " obj)";
+    out << nl << "public static " << name << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", package) << " obj)";
     out << sb;
     out << nl << "return checkedCastImpl(obj, ice_staticId(), " << name << "Prx.class, "
         << name << "PrxHelper.class);";
@@ -4799,7 +4817,7 @@
                     "@param obj The untyped proxy.\n"
                     "@param context The Context map to send with the invocation.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "public static " << name << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", package) << " obj, "
+    out << nl << "public static " << name << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", package) << " obj, "
         << contextParam << ')';
     out << sb;
     out << nl << "return checkedCastImpl(obj, context, ice_staticId(), " << name
@@ -4813,7 +4831,7 @@
                     "@param obj The untyped proxy.\n"
                     "@param facet The name of the desired facet.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "public static " << name << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", package)
+    out << nl << "public static " << name << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", package)
         << " obj, String facet)";
     out << sb;
     out << nl << "return checkedCastImpl(obj, facet, ice_staticId(), " << name
@@ -4828,7 +4846,7 @@
                     "@param facet The name of the desired facet.\n"
                     "@param context The Context map to send with the invocation.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "public static " << name << "Prx checkedCast(" << getAbsolute("Ice.ObjectPrx", package)
+    out << nl << "public static " << name << "Prx checkedCast(" << getUnqualified("Ice.ObjectPrx", package)
         << " obj, String facet, " << contextParam << ')';
     out << sb;
     out << nl << "return checkedCastImpl(obj, facet, context, ice_staticId(), " << name
@@ -4840,7 +4858,7 @@
                     "Downcasts the given proxy to this type without contacting the remote server.\n"
                     "@param obj The untyped proxy.\n"
                     "@return A proxy for this type.");
-    out << nl << "public static " << name << "Prx uncheckedCast(" << getAbsolute("Ice.ObjectPrx", package) << " obj)";
+    out << nl << "public static " << name << "Prx uncheckedCast(" << getUnqualified("Ice.ObjectPrx", package) << " obj)";
     out << sb;
     out << nl << "return uncheckedCastImpl(obj, " << name << "Prx.class, " << name
         << "PrxHelper.class);";
@@ -4852,7 +4870,7 @@
                     "@param obj The untyped proxy.\n"
                     "@param facet The name of the desired facet.\n"
                     "@return A proxy for this type.");
-    out << nl << "public static " << name << "Prx uncheckedCast(" << getAbsolute("Ice.ObjectPrx", package)
+    out << nl << "public static " << name << "Prx uncheckedCast(" << getUnqualified("Ice.ObjectPrx", package)
         << " obj, String facet)";
     out << sb;
     out << nl << "return uncheckedCastImpl(obj, facet, " << name << "Prx.class, " << name
@@ -4896,15 +4914,15 @@
     out << nl << "return _ids[" << scopedPos << "];";
     out << eb;
 
-    out << sp << nl << "public static void write(" << getAbsolute("Ice.OutputStream", package) << " ostr, " << name
+    out << sp << nl << "public static void write(" << getUnqualified("Ice.OutputStream", package) << " ostr, " << name
         << "Prx v)";
     out << sb;
     out << nl << "ostr.writeProxy(v);";
     out << eb;
 
-    out << sp << nl << "public static " << name << "Prx read(" << getAbsolute("Ice.InputStream", package) << " istr)";
+    out << sp << nl << "public static " << name << "Prx read(" << getUnqualified("Ice.InputStream", package) << " istr)";
     out << sb;
-    out << nl << getAbsolute("Ice.ObjectPrx", package) << " proxy = istr.readProxy();";
+    out << nl << getUnqualified("Ice.ObjectPrx", package) << " proxy = istr.readProxy();";
     out << nl << "if(proxy != null)";
     out << sb;
     out << nl << name << "PrxHelper result = new " << name << "PrxHelper();";
@@ -4951,8 +4969,8 @@
     }
 
     string name = p->name();
-    string absolute = getAbsolute(p);
-    string helper = getAbsolute(p, "", "", "Helper");
+    string absolute = getUnqualified(p);
+    string helper = getUnqualified(p, "", "", "Helper");
     string package = getPackage(p);
     string typeS = typeToString(p, TypeModeIn, package);
 
@@ -5015,7 +5033,7 @@
     out << sp << nl << "public final class " << name << "Helper";
     out << sb;
 
-    out << nl << "public static void" << nl << "write(" << getAbsolute("Ice.OutputStream", package) << " ostr, "
+    out << nl << "public static void" << nl << "write(" << getUnqualified("Ice.OutputStream", package) << " ostr, "
         << typeS << " v)";
     out << sb;
     iter = 0;
@@ -5027,7 +5045,7 @@
     {
         out << nl << "@SuppressWarnings(\"unchecked\")";
     }
-    out << nl << "public static " << typeS << nl << "read(" << getAbsolute("Ice.InputStream", package) << " istr)";
+    out << nl << "public static " << typeS << nl << "read(" << getUnqualified("Ice.InputStream", package) << " istr)";
     out << sb;
     out << nl << typeS << " v;";
     iter = 0;
@@ -5054,8 +5072,8 @@
     TypePtr value = p->valueType();
 
     string name = p->name();
-    string absolute = getAbsolute(p);
-    string helper = getAbsolute(p, "", "", "Helper");
+    string absolute = getUnqualified(p);
+    string helper = getUnqualified(p, "", "", "Helper");
     string package = getPackage(p);
     StringList metaData = p->getMetaData();
     string formalType = typeToString(p, TypeModeIn, package, StringList(), true);
@@ -5068,7 +5086,7 @@
     out << sp << nl << "public final class " << name << "Helper";
     out << sb;
 
-    out << nl << "public static void" << nl << "write(" << getAbsolute("Ice.OutputStream", package) << " ostr, "
+    out << nl << "public static void" << nl << "write(" << getUnqualified("Ice.OutputStream", package) << " ostr, "
         << formalType << " v)";
     out << sb;
     iter = 0;
@@ -5076,7 +5094,7 @@
     out << eb;
 
     out << sp << nl << "public static " << formalType
-        << nl << "read(" << getAbsolute("Ice.InputStream", package) << " istr)";
+        << nl << "read(" << getUnqualified("Ice.InputStream", package) << " istr)";
     out << sb;
     out << nl << formalType << " v;";
     iter = 0;
@@ -5201,35 +5219,35 @@
         vector<string> inParams = getInOutParams(op, package, InParam, true, optionalMapping);
         vector<string> inArgs = getInOutArgs(op, InParam);
         const string callbackParamName = getEscapedParamName(op, "cb");
-        const string callbackParam = getAbsolute("Ice.Callback", package) + " " + callbackParamName;
+        const string callbackParam = getUnqualified("Ice.Callback", package) + " " + callbackParamName;
         const ParamDeclList paramList = op->parameters();
         int iter;
 
         //
         // Type-unsafe begin methods
         //
-        out << sp << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name() << spar
+        out << sp << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name() << spar
             << inParams << epar;
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << inArgs << "null" << "false" << "false" << "null"
             << epar << ';';
         out << eb;
 
-        out << sp << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name() << spar
+        out << sp << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name() << spar
             << inParams << contextParam << epar;
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << inArgs << contextParamName << "true" << "false"
             << "null" << epar << ';';
         out << eb;
 
-        out << sp << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name() << spar
+        out << sp << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name() << spar
             << inParams << callbackParam << epar;
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << inArgs << "null" << "false" << "false"
             << callbackParamName << epar << ';';
         out << eb;
 
-        out << sp << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name() << spar
+        out << sp << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name() << spar
             << inParams << contextParam << callbackParam << epar;
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << inArgs << contextParamName << "true" << "false"
@@ -5247,17 +5265,17 @@
         //
         ContainerPtr container = op->container();
         ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
-        string opClassName = getAbsolute(cl, package, "Callback_", '_' + op->name());
+        string opClassName = getUnqualified(cl, package, "Callback_", '_' + op->name());
         typeSafeCallbackParam = opClassName + " " + getEscapedParamName(op, "cb");
 
-        out << sp << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name() << spar
+        out << sp << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name() << spar
             << inParams << typeSafeCallbackParam << epar;
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << inArgs << "null" << "false" << "false"
             << callbackParamName << epar << ';';
         out << eb;
 
-        out << sp << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name() << spar
+        out << sp << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name() << spar
             << inParams << contextParam << typeSafeCallbackParam << epar;
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << inArgs << contextParamName << "true" << "false"
@@ -5268,14 +5286,14 @@
         // Async methods that accept Java 8 lambda callbacks.
         //
         out << sp;
-        out << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name();
+        out << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name();
         writeParamList(out, getParamsAsyncLambda(op, package, false, false, optionalMapping));
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << getArgsAsyncLambda(op, package) << epar << ';';
         out << eb;
 
         out << sp;
-        out << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name();
+        out << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name();
         writeParamList(out, getParamsAsyncLambda(op, package, false, true, optionalMapping));
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << getArgsAsyncLambda(op, package, false, true) << epar
@@ -5283,14 +5301,14 @@
         out << eb;
 
         out << sp;
-        out << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name();
+        out << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name();
         writeParamList(out, getParamsAsyncLambda(op, package, true, false, optionalMapping));
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << getArgsAsyncLambda(op, package, true) << epar << ';';
         out << eb;
 
         out << sp;
-        out << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << op->name();
+        out << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << op->name();
         writeParamList(out, getParamsAsyncLambda(op, package, true, true, optionalMapping));
         out << sb;
         out << nl << "return _iceI_begin_" << op->name() << spar << getArgsAsyncLambda(op, package, true, true) << epar
@@ -5305,7 +5323,7 @@
         copy(asyncParams.begin(), asyncParams.end(), back_inserter(params));
 
         out << sp;
-        out << nl << "private " << getAbsolute("Ice.AsyncResult", package) << " _iceI_begin_" << op->name();
+        out << nl << "private " << getUnqualified("Ice.AsyncResult", package) << " _iceI_begin_" << op->name();
         writeParamList(out, params);
         out << sb;
 
@@ -5363,7 +5381,7 @@
             out << eb;
 
             out << sp;
-            out << nl << "public final void _iceCompleted(" << getAbsolute("Ice.AsyncResult", package) << " result)";
+            out << nl << "public final void _iceCompleted(" << getUnqualified("Ice.AsyncResult", package) << " result)";
             out << sb;
             out << nl << p->name() << "PrxHelper._iceI_" << op->name() << "_completed(this, result);";
             out << eb;
@@ -5392,7 +5410,7 @@
                     "new " + baseClass + "(responseCb, userExceptionCb, exceptionCb, sentCb)");
             out.inc();
             out << sb;
-            out << nl << "public final void _iceCompleted(" << getAbsolute("Ice.AsyncResult", package) << " result)";
+            out << nl << "public final void _iceCompleted(" << getUnqualified("Ice.AsyncResult", package) << " result)";
             out << sb;
             out << nl << p->name() << "PrxHelper._iceI_" << op->name() << "_completed(this, result);";
             out << eb;
@@ -5413,7 +5431,7 @@
         params.push_back("IceInternal.CallbackBase cb");
 
         out << sp;
-        out << nl << "private " << getAbsolute("Ice.AsyncResult", package) << " _iceI_begin_" << op->name();
+        out << nl << "private " << getUnqualified("Ice.AsyncResult", package) << " _iceI_begin_" << op->name();
         writeParamList(out, params);
         out << sb;
         if(op->returnsData())
@@ -5431,7 +5449,7 @@
         iter = 0;
         if(!inArgs.empty())
         {
-            out << nl << getAbsolute("Ice.OutputStream", package) << " ostr = result.startWriteParams("
+            out << nl << getUnqualified("Ice.OutputStream", package) << " ostr = result.startWriteParams("
                 << opFormatTypeToString(op) << ");";
             ParamDeclList pl;
             for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
@@ -5455,7 +5473,7 @@
 
         out << nl << "result.invoke();";
         out << eb;
-        out << nl << "catch(" << getAbsolute("Ice.Exception", package) << " ex)";
+        out << nl << "catch(" << getUnqualified("Ice.Exception", package) << " ex)";
         out << sb;
         out << nl << "result.abort(ex);";
         out << eb;
@@ -5480,7 +5498,7 @@
     string name = p->name();
     ClassList bases = p->bases();
     string package = getPackage(p);
-    string absolute = getAbsolute(p, "", "", "Prx");
+    string absolute = getUnqualified(p, "", "", "Prx");
 
     open(absolute, p->file());
 
@@ -5494,14 +5512,14 @@
     out << nl << "public interface " << name << "Prx extends ";
     if(bases.empty())
     {
-        out << getAbsolute("Ice.ObjectPrx", package);
+        out << getUnqualified("Ice.ObjectPrx", package);
     }
     else
     {
         out.useCurrentPosAsIndent();
         for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
         {
-            out << getAbsolute(*q, package, "", "Prx");
+            out << getUnqualified(*q, package, "", "Prx");
             if(++q != bases.end())
             {
                 out << ',' << nl;
@@ -5595,17 +5613,17 @@
         // Start with the type-unsafe begin methods.
         //
         vector<string> inParams = getInOutParams(p, package, InParam, true, true);
-        string callbackParam = getAbsolute("Ice.Callback", package) + " " + getEscapedParamName(p, "cb");
+        string callbackParam = getUnqualified("Ice.Callback", package) + " " + getEscapedParamName(p, "cb");
         string callbackDoc = "@param cb The asynchronous callback object.";
 
         out << sp;
         writeDocCommentAMI(out, p, InParam);
-        out << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << p->name() << spar << inParams
+        out << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << p->name() << spar << inParams
             << epar << ';';
 
         out << sp;
         writeDocCommentAMI(out, p, InParam, contextDoc);
-        out << nl << "public " << getAbsolute("Ice.AsyncResult", package) << " begin_" << p->name() << spar << inParams
+        out << nl << "public " << getUnqualified("Ice.AsyncResult", package) << " begin_" << p->name() << spar << inParams
             << contextParam << epar << ';';
 
         out << sp;
@@ -5628,7 +5646,7 @@
         //
         ContainerPtr container = p->container();
         ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
-        string opClassName = getAbsolute(cl, package, "Callback_", '_' + p->name());
+        string opClassName = getUnqualified(cl, package, "Callback_", '_' + p->name());
         typeSafeCallbackParam = opClassName + " " + getEscapedParamName(p, "cb");
 
         out << sp;
@@ -5771,7 +5789,7 @@
         //
         ContainerPtr container = p->container();
         ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
-        string opClassName = getAbsolute(cl, package, "Callback_", '_' + p->name());
+        string opClassName = getUnqualified(cl, package, "Callback_", '_' + p->name());
         typeSafeCallbackParam = opClassName + " " + getEscapedParamName(p, "cb");
 
         out << sp;
@@ -5800,7 +5818,7 @@
 
     if(!p->isLocal() && p->isInterface())
     {
-        string absolute = getAbsolute(p, "", "_", "Disp");
+        string absolute = getUnqualified(p, "", "_", "Disp");
 
         open(absolute, p->file());
 
@@ -5825,7 +5843,7 @@
         // Tie class
 
         string package = getPackage(p);
-        string absolute = getAbsolute(p, "", "_", "Tie");
+        string absolute = getUnqualified(p, "", "_", "Tie");
         string opIntfName = "Operations";
         if(p->isLocal())
         {
@@ -6100,7 +6118,7 @@
             if(en)
             {
                 EnumeratorList enumerators = en->enumerators();
-                out << " = " << getAbsolute(en, package) << '.' << fixKwd(enumerators.front()->name());
+                out << " = " << getUnqualified(en, package) << '.' << fixKwd(enumerators.front()->name());
             }
             else
             {
@@ -6306,7 +6324,7 @@
     string name = p->name();
     ClassList bases = p->bases();
     string package = getPackage(p);
-    string absolute = getAbsolute(p, "", "", "I");
+    string absolute = getUnqualified(p, "", "", "I");
 
     open(absolute, p->file());
 
@@ -6362,7 +6380,7 @@
     string name = p->name();
     ClassList bases = p->bases();
     string package = getPackage(p);
-    string absolute = getAbsolute(p, "", "", "I");
+    string absolute = getUnqualified(p, "", "", "I");
 
     open(absolute, p->file());
 
@@ -6480,13 +6498,13 @@
         //
         if(p->returnsData() && ((ret && !outParams.empty()) || outParams.size() > 1))
         {
-            open(getAbsolute(cl, "", "_Callback_", "_" + name), p->file());
+            open(getUnqualified(cl, "", "_Callback_", "_" + name), p->file());
 
             Output& out = output();
 
             writeDocCommentOp(out, p);
             out << sp << nl << "public interface " << ("_Callback_" + cl->name()) << '_' << name
-                << " extends " << getAbsolute(throws.empty() ? "Ice.TwowayCallback" : "Ice.TwowayCallbackUE", package);
+                << " extends " << getUnqualified(throws.empty() ? "Ice.TwowayCallback" : "Ice.TwowayCallbackUE", package);
             out << sb;
             out << nl << "public void response" << spar << params << epar << ';';
             out << eb;
@@ -6495,7 +6513,7 @@
         }
 
         string classNameAsync = "Callback_" + cl->name();
-        string absoluteAsync = getAbsolute(cl, "", "Callback_", "_" + name);
+        string absoluteAsync = getUnqualified(cl, "", "Callback_", "_" + name);
 
         open(absoluteAsync, p->file());
 
@@ -6511,7 +6529,7 @@
             out.dec();
             out << sb;
 
-            out << sp << nl << "public final void _iceCompleted(" << getAbsolute("Ice.AsyncResult", package)
+            out << sp << nl << "public final void _iceCompleted(" << getUnqualified("Ice.AsyncResult", package)
                 << " result)";
             out << sb;
             out << nl << cl->name() << "PrxHelper._iceI_" << p->name() << "_completed(this, result);";
@@ -6521,7 +6539,7 @@
         }
         else
         {
-            out << " extends " << getAbsolute("Ice.OnewayCallback", package);
+            out << " extends " << getUnqualified("Ice.OnewayCallback", package);
             out << sb;
             out << eb;
         }
@@ -6532,10 +6550,10 @@
     if(cl->hasMetaData("amd") || p->hasMetaData("amd"))
     {
         string classNameAMD = "AMD_" + cl->name();
-        string absoluteAMD = getAbsolute(cl, "", "AMD_", "_" + name);
+        string absoluteAMD = getUnqualified(cl, "", "AMD_", "_" + name);
 
         string classNameAMDI = "_AMD_" + cl->name();
-        string absoluteAMDI = getAbsolute(cl, "", "_AMD_", "_" + name);
+        string absoluteAMDI = getUnqualified(cl, "", "_AMD_", "_" + name);
 
         const bool optionalMapping = useOptionalMapping(p);
         vector<string> paramsAMD = getParamsAsyncCB(p, classPkg, true, optionalMapping);
@@ -6547,7 +6565,7 @@
 
             writeDocCommentOp(out, p);
             out << sp << nl << "public interface " << classNameAMD << '_' << name;
-            out << " extends " << getAbsolute("Ice.AMDCallback", package);
+            out << " extends " << getUnqualified("Ice.AMDCallback", package);
             out << sb;
             out << sp;
             writeDocCommentAsync(out, p, OutParam);
@@ -6592,7 +6610,7 @@
             iter = 0;
             if(ret || !outParams.empty())
             {
-                out << nl << getAbsolute("Ice.OutputStream", package) << " ostr_ = this.startWriteParams();";
+                out << nl << getUnqualified("Ice.OutputStream", package) << " ostr_ = this.startWriteParams();";
                 writeMarshalUnmarshalParams(out, classPkg, outParams, p, iter, true, optionalMapping, false, "ret", false);
                 if(p->returnsClasses(false))
                 {
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2java/GenCompat.h zeroc-ice-3.7.2/cpp/src/slice2java/GenCompat.h
--- zeroc-ice-3.7.1/cpp/src/slice2java/GenCompat.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2java/GenCompat.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_COMPAT_H
 #define GEN_COMPAT_H
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2java/Gen.cpp zeroc-ice-3.7.2/cpp/src/slice2java/Gen.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2java/Gen.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2java/Gen.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Gen.h>
 #include <Slice/Checksum.h>
@@ -162,23 +157,23 @@
         string abs;
         if(c->isInterface())
         {
-            abs = getAbsolute(c, package);
+            abs = getUnqualified(c, package);
         }
         else
         {
-            abs = getAbsolute(c, package, "", "Disp");
+            abs = getUnqualified(c, package, "", "Disp");
         }
         string name = op->name();
-        name[0] = toupper(static_cast<unsigned char>(name[0]));
+        name[0] = static_cast<char>(toupper(static_cast<unsigned char>(name[0])));
         return abs + "." + name + "MarshaledResult";
     }
     else if(op->returnsMultipleValues())
     {
         const ContainedPtr c = ContainedPtr::dynamicCast(op->container());
         assert(c);
-        const string abs = getAbsolute(c, package);
+        const string abs = getUnqualified(c, package);
         string name = op->name();
-        name[0] = toupper(static_cast<unsigned char>(name[0]));
+        name[0] = static_cast<char>(toupper(static_cast<unsigned char>(name[0])));
         return abs + "." + name + "Result";
     }
     else
@@ -223,9 +218,11 @@
 Slice::JavaVisitor::writeResultType(Output& out, const OperationPtr& op, const string& package, const CommentPtr& dc)
 {
     string opName = op->name();
-    opName[0] = toupper(static_cast<unsigned char>(opName[0]));
+    opName[0] = static_cast<char>(toupper(static_cast<unsigned char>(opName[0])));
 
-    out << sp << nl << "public static class " << opName << "Result";
+    out << sp;
+    writeDocComment(out, "Holds the result of operation " + op->name() + ".");
+    out << nl << "public static class " << opName << "Result";
     out << sb;
 
     //
@@ -249,6 +246,7 @@
     //
     // Default constructor.
     //
+    writeDocComment(out, "Default constructor.");
     out << nl << "public " << opName << "Result()";
     out << sb;
     out << eb;
@@ -397,7 +395,7 @@
         ParamDeclList required, optional;
         op->outParameters(required, optional);
 
-        out << sp << nl << "public void write(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr)";
+        out << sp << nl << "public void write(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr)";
         out << sb;
 
         int iter = 0;
@@ -441,7 +439,7 @@
 
         out << eb;
 
-        out << sp << nl << "public void read(" << getAbsolute("com.zeroc.Ice.InputStream", package) << " istr)";
+        out << sp << nl << "public void read(" << getUnqualified("com.zeroc.Ice.InputStream", package) << " istr)";
         out << sb;
 
         iter = 0;
@@ -502,15 +500,17 @@
     const TypePtr ret = op->returnType();
     const ClassDefPtr cl = ClassDefPtr::dynamicCast(op->container());
     assert(cl);
-    opName[0] = toupper(static_cast<unsigned char>(opName[0]));
+    opName[0] = static_cast<char>(toupper(static_cast<unsigned char>(opName[0])));
 
-    out << sp << nl << "public static class " << opName << "MarshaledResult implements "
-        << getAbsolute("com.zeroc.Ice.MarshaledResult", package) << sb;
+    out << sp;
+    writeDocComment(out, "Holds the marshaled result of operation " + op->name() + ".");
+    out << nl << "public static class " << opName << "MarshaledResult implements "
+        << getUnqualified("com.zeroc.Ice.MarshaledResult", package) << sb;
 
     const ParamDeclList outParams = op->outParameters();
     const string retval = getEscapedParamName(op, "returnValue");
     const string currentParamName = getEscapedParamName(op, "current");
-    const string currentParam = getAbsolute("com.zeroc.Ice.Current", package) + " " + currentParamName;
+    const string currentParam = getUnqualified("com.zeroc.Ice.Current", package) + " " + currentParamName;
 
     out << sp;
 
@@ -520,7 +520,7 @@
     if(dc)
     {
         out << nl << "/**";
-        out << nl << " * This constructor marshals the results of operation " << opName << " immediately.";
+        out << nl << " * This constructor marshals the results of operation " << op->name() << " immediately.";
 
         if(ret && !dc->returns().empty())
         {
@@ -559,7 +559,7 @@
     }
     out << currentParam << epar;
     out << sb;
-    out << nl << "_ostr = " << getAbsolute("com.zeroc.IceInternal.Incoming", package) << ".createResponseOutputStream("
+    out << nl << "_ostr = " << getUnqualified("com.zeroc.IceInternal.Incoming", package) << ".createResponseOutputStream("
         << currentParamName << ");";
     out << nl << "_ostr.startEncapsulation(" << currentParamName << ".encoding, " << opFormatTypeToString(op) << ");";
 
@@ -623,7 +623,7 @@
         if(dc)
         {
             out << nl << "/**";
-            out << nl << " * This constructor marshals the results of operation " << opName
+            out << nl << " * This constructor marshals the results of operation " << op->name()
                 << " immediately (overload without Optional parameters).";
 
             if(ret && !dc->returns().empty())
@@ -690,13 +690,13 @@
 
     out << sp;
     out << nl << "@Override"
-        << nl << "public " << getAbsolute("com.zeroc.Ice.OutputStream", package) << " getOutputStream()"
+        << nl << "public " << getUnqualified("com.zeroc.Ice.OutputStream", package) << " getOutputStream()"
         << sb
         << nl << "return _ostr;"
         << eb;
 
     out << sp;
-    out << nl << "private " << getAbsolute("com.zeroc.Ice.OutputStream", package) << " _ostr;";
+    out << nl << "private " << getUnqualified("com.zeroc.Ice.OutputStream", package) << " _ostr;";
     out << eb;
 }
 
@@ -711,11 +711,11 @@
     string clsName;
     if(b || cl->isInterface())
     {
-        clsName = getAbsolute("com.zeroc.Ice.Value", package);
+        clsName = getUnqualified("com.zeroc.Ice.Value", package);
     }
     else
     {
-        clsName = getAbsolute(cl, package);
+        clsName = getUnqualified(cl, package);
     }
     if(optionalMapping)
     {
@@ -736,11 +736,11 @@
         string clsName;
         if(b || cl->isInterface())
         {
-            clsName = getAbsolute("com.zeroc.Ice.Value", package);
+            clsName = getUnqualified("com.zeroc.Ice.Value", package);
         }
         else
         {
-            clsName = getAbsolute(cl, package);
+            clsName = getUnqualified(cl, package);
         }
         ostr << "v -> " << dest << " = v, " << clsName << ".class";
     }
@@ -1000,7 +1000,7 @@
     if(op && (op->hasMetaData("java:UserException") || op->hasMetaData("UserException")))
     {
         out.inc();
-        out << nl << "throws " << getAbsolute("com.zeroc.Ice.UserException", package);
+        out << nl << "throws " << getUnqualified("com.zeroc.Ice.UserException", package);
         out.dec();
     }
     else if(throws.size() > 0)
@@ -1015,7 +1015,7 @@
             {
                 out << "," << nl;
             }
-            out << getAbsolute(*r, package);
+            out << getUnqualified(*r, package);
             count++;
         }
         out.restoreIndent();
@@ -1111,7 +1111,7 @@
         }
 
         vector<string> params = getParams(op, package);
-        const string currentParam = getAbsolute("com.zeroc.Ice.Current", package) + " " +
+        const string currentParam = getUnqualified("com.zeroc.Ice.Current", package) + " " +
             getEscapedParamName(op, "current");
 
         const bool amd = p->hasMetaData("amd") || op->hasMetaData("amd");
@@ -1157,7 +1157,9 @@
     assert(scopedIter != ids.end());
 #endif
 
-    out << sp << nl << "static final String[] _iceIds =";
+    out << sp;
+    writeHiddenDocComment(out);
+    out << nl << "static final String[] _iceIds =";
     out << sb;
 
     for(StringList::const_iterator q = ids.begin(); q != ids.end();)
@@ -1170,13 +1172,13 @@
     }
     out << eb << ';';
 
-    out << sp << nl << "@Override" << nl << "default String[] ice_ids(" << getAbsolute("com.zeroc.Ice.Current", package)
+    out << sp << nl << "@Override" << nl << "default String[] ice_ids(" << getUnqualified("com.zeroc.Ice.Current", package)
         << " current)";
     out << sb;
     out << nl << "return _iceIds;";
     out << eb;
 
-    out << sp << nl << "@Override" << nl << "default String ice_id(" << getAbsolute("com.zeroc.Ice.Current", package)
+    out << sp << nl << "@Override" << nl << "default String ice_id(" << getUnqualified("com.zeroc.Ice.Current", package)
         << " current)";
     out << sb;
     out << nl << "return ice_staticId();";
@@ -1209,12 +1211,24 @@
 
         string opName = op->name();
         out << sp;
+
+        out << nl << "/**";
+        out << nl << " * @hidden";
+        out << nl << " * @param obj -";
+        out << nl << " * @param inS -";
+        out << nl << " * @param current -";
+        out << nl << " * @return -";
+        if(!op->throws().empty() || op->hasMetaData("java:UserException") || op->hasMetaData("UserException"))
+        {
+            out << nl << " * @throws " << getUnqualified("com.zeroc.Ice.UserException", package) << " -";
+        }
+        out << nl << "**/";
         if(dc && dc->isDeprecated())
         {
             out << nl << "@Deprecated";
         }
         out << nl << "static java.util.concurrent.CompletionStage<"
-            << getAbsolute("com.zeroc.Ice.OutputStream", package)
+            << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << "> _iceD_" << opName << '(';
         if(p->isInterface())
         {
@@ -1224,12 +1238,12 @@
         {
             out << p->name() << "Disp";
         }
-        out << " obj, final " << getAbsolute("com.zeroc.IceInternal.Incoming", package) << " inS, "
-            << getAbsolute("com.zeroc.Ice.Current", package) << " current)";
+        out << " obj, final " << getUnqualified("com.zeroc.IceInternal.Incoming", package) << " inS, "
+            << getUnqualified("com.zeroc.Ice.Current", package) << " current)";
         if(!op->throws().empty() || op->hasMetaData("java:UserException") || op->hasMetaData("UserException"))
         {
             out.inc();
-            out << nl << "throws " << getAbsolute("com.zeroc.Ice.UserException", package);
+            out << nl << "throws " << getUnqualified("com.zeroc.Ice.UserException", package);
             out.dec();
         }
         out << sb;
@@ -1241,7 +1255,7 @@
         const ParamDeclList inParams = op->inParameters();
         const ParamDeclList outParams = op->outParameters();
 
-        out << nl << getAbsolute("com.zeroc.Ice.Object", package) << "._iceCheckMode(" << sliceModeToIceMode(op->mode())
+        out << nl << getUnqualified("com.zeroc.Ice.Object", package) << "._iceCheckMode(" << sliceModeToIceMode(op->mode())
             << ", current.mode);";
 
         if(!inParams.empty())
@@ -1251,7 +1265,7 @@
             //
             // Declare 'in' parameters.
             //
-            out << nl << getAbsolute("com.zeroc.Ice.InputStream", package) << " istr = inS.startReadParams();";
+            out << nl << getUnqualified("com.zeroc.Ice.InputStream", package) << " istr = inS.startReadParams();";
             for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 const TypePtr paramType = (*pli)->type();
@@ -1356,7 +1370,7 @@
             }
             else if(ret || !outParams.empty())
             {
-                out << nl << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr = inS.startWriteParams();";
+                out << nl << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr = inS.startWriteParams();";
                 writeMarshalServantResults(out, package, op, "ret");
                 out << nl << "inS.endWriteParams(ostr);";
                 out << nl << "return inS.setResult(ostr);";
@@ -1382,7 +1396,9 @@
         allOpNames.sort();
         allOpNames.unique();
 
-        out << sp << nl << "final static String[] _iceOps =";
+        out << sp;
+        writeHiddenDocComment(out);
+        out << nl << "final static String[] _iceOps =";
         out << sb;
         for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
         {
@@ -1395,6 +1411,7 @@
         out << eb << ';';
 
         out << sp;
+        writeHiddenDocComment(out);
         for(OperationList::iterator r = allOps.begin(); r != allOps.end(); ++r)
         {
             //
@@ -1411,18 +1428,18 @@
             }
         }
         out << nl << "@Override" << nl
-            << "default java.util.concurrent.CompletionStage<" << getAbsolute("com.zeroc.Ice.OutputStream", package)
-            << "> _iceDispatch(" << getAbsolute("com.zeroc.IceInternal.Incoming", package) << " in, "
-            << getAbsolute("com.zeroc.Ice.Current", package) << " current)";
+            << "default java.util.concurrent.CompletionStage<" << getUnqualified("com.zeroc.Ice.OutputStream", package)
+            << "> _iceDispatch(" << getUnqualified("com.zeroc.IceInternal.Incoming", package) << " in, "
+            << getUnqualified("com.zeroc.Ice.Current", package) << " current)";
         out.inc();
-        out << nl << "throws " << getAbsolute("com.zeroc.Ice.UserException", package);
+        out << nl << "throws " << getUnqualified("com.zeroc.Ice.UserException", package);
         out.dec();
         out << sb;
         out << nl << "int pos = java.util.Arrays.binarySearch(_iceOps, current.operation);";
         out << nl << "if(pos < 0)";
         out << sb;
         out << nl << "throw new "
-            << getAbsolute("com.zeroc.Ice.OperationNotExistException", package)
+            << getUnqualified("com.zeroc.Ice.OperationNotExistException", package)
             << "(current.id, current.facet, current.operation);";
         out << eb;
         out << sp << nl << "switch(pos)";
@@ -1436,22 +1453,22 @@
             out << sb;
             if(opName == "ice_id")
             {
-                out << nl << "return " << getAbsolute("com.zeroc.Ice.Object", package)
+                out << nl << "return " << getUnqualified("com.zeroc.Ice.Object", package)
                     << "._iceD_ice_id(this, in, current);";
             }
             else if(opName == "ice_ids")
             {
-                out << nl << "return " << getAbsolute("com.zeroc.Ice.Object", package)
+                out << nl << "return " << getUnqualified("com.zeroc.Ice.Object", package)
                     << "._iceD_ice_ids(this, in, current);";
             }
             else if(opName == "ice_isA")
             {
-                out << nl << "return " << getAbsolute("com.zeroc.Ice.Object", package)
+                out << nl << "return " << getUnqualified("com.zeroc.Ice.Object", package)
                     << "._iceD_ice_isA(this, in, current);";
             }
             else if(opName == "ice_ping")
             {
-                out << nl << "return " << getAbsolute("com.zeroc.Ice.Object", package)
+                out << nl << "return " << getUnqualified("com.zeroc.Ice.Object", package)
                     << "._iceD_ice_ping(this, in, current);";
             }
             else
@@ -1472,16 +1489,16 @@
                         }
                         else
                         {
-                            string base;
+                            string baseName;
                             if(cl->isInterface())
                             {
-                                base = getAbsolute(cl, package);
+                                baseName = getUnqualified(cl, package);
                             }
                             else
                             {
-                                base = getAbsolute(cl, package, "", "Disp");
+                                baseName = getUnqualified(cl, package, "", "Disp");
                             }
-                            out << nl << "return " << base << "._iceD_" << opName << "(this, in, current);";
+                            out << nl << "return " << baseName << "._iceD_" << opName << "(this, in, current);";
                         }
                         break;
                     }
@@ -1491,7 +1508,7 @@
         }
         out << eb;
         out << sp << nl << "assert(false);";
-        out << nl << "throw new " << getAbsolute("com.zeroc.Ice.OperationNotExistException", package)
+        out << nl << "throw new " << getUnqualified("com.zeroc.Ice.OperationNotExistException", package)
             << "(current.id, current.facet, current.operation);";
         out << eb;
     }
@@ -1519,15 +1536,17 @@
     if(preserved && !basePreserved)
     {
         out << sp;
+        writeHiddenDocComment(out);
         out << nl << "@Override";
-        out << nl << "public " << getAbsolute("com.zeroc.Ice.SlicedData", package) << " ice_getSlicedData()";
+        out << nl << "public " << getUnqualified("com.zeroc.Ice.SlicedData", package) << " ice_getSlicedData()";
         out << sb;
         out << nl << "return _iceSlicedData;";
         out << eb;
 
         out << sp;
+        writeHiddenDocComment(out);
         out << nl << "@Override";
-        out << nl << "public void _iceWrite(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr)";
+        out << nl << "public void _iceWrite(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr)";
         out << sb;
         out << nl << "ostr.startValue(_iceSlicedData);";
         out << nl << "_iceWriteImpl(ostr);";
@@ -1535,8 +1554,9 @@
         out << eb;
 
         out << sp;
+        writeHiddenDocComment(out);
         out << nl << "@Override";
-        out << nl << "public void _iceRead(" << getAbsolute("com.zeroc.Ice.InputStream", package) << " istr)";
+        out << nl << "public void _iceRead(" << getUnqualified("com.zeroc.Ice.InputStream", package) << " istr)";
         out << sb;
         out << nl << "istr.startValue();";
         out << nl << "_iceReadImpl(istr);";
@@ -1545,8 +1565,9 @@
     }
 
     out << sp;
+    writeHiddenDocComment(out);
     out << nl << "@Override";
-    out << nl << "protected void _iceWriteImpl(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr_)";
+    out << nl << "protected void _iceWriteImpl(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr_)";
     out << sb;
     out << nl << "ostr_.startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
     iter = 0;
@@ -1572,8 +1593,9 @@
     DataMemberList allClassMembers = p->allClassDataMembers();
 
     out << sp;
+    writeHiddenDocComment(out);
     out << nl << "@Override";
-    out << nl << "protected void _iceReadImpl(" << getAbsolute("com.zeroc.Ice.InputStream", package) << " istr_)";
+    out << nl << "protected void _iceReadImpl(" << getUnqualified("com.zeroc.Ice.InputStream", package) << " istr_)";
     out << sb;
     out << nl << "istr_.startSlice();";
 
@@ -1599,7 +1621,9 @@
 
     if(preserved && !basePreserved)
     {
-        out << sp << nl << "protected " << getAbsolute("com.zeroc.Ice.SlicedData", package) << " _iceSlicedData;";
+        out << sp;
+        writeHiddenDocComment(out);
+        out << nl << "protected " << getUnqualified("com.zeroc.Ice.SlicedData", package) << " _iceSlicedData;";
     }
 }
 
@@ -1610,7 +1634,7 @@
     ConstPtr constant = ConstPtr::dynamicCast(valueType);
     if(constant)
     {
-        out << getAbsolute(constant, package) << ".value";
+        out << getUnqualified(constant, package) << ".value";
     }
     else
     {
@@ -1663,7 +1687,7 @@
         {
             EnumeratorPtr lte = EnumeratorPtr::dynamicCast(valueType);
             assert(lte);
-            out << getAbsolute(lte, package);
+            out << getUnqualified(lte, package);
         }
         else
         {
@@ -1683,7 +1707,7 @@
             if((*p)->optional())
             {
                 string capName = (*p)->name();
-                capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                 out << nl << "set" << capName << '(';
                 writeConstantValue(out, t, (*p)->defaultValueType(), (*p)->defaultValue(), package);
                 out << ");";
@@ -1707,7 +1731,7 @@
             if(en)
             {
                 string firstEnum = fixKwd(en->enumerators().front()->name());
-                out << nl << "this." << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum << ';';
+                out << nl << "this." << fixKwd((*p)->name()) << " = " << getUnqualified(en, package) << '.' << firstEnum << ';';
             }
 
             StructPtr st = StructPtr::dynamicCast(t);
@@ -1743,6 +1767,12 @@
 }
 
 void
+Slice::JavaVisitor::writeHiddenDocComment(Output& out)
+{
+    out << nl << "/** @hidden */";
+}
+
+void
 Slice::JavaVisitor::writeDocCommentLines(Output& out, const StringList& lines)
 {
     //
@@ -1814,7 +1844,7 @@
 }
 
 void
-Slice::JavaVisitor::writeDocComment(Output& out, const UnitPtr& unit, const CommentPtr& dc)
+Slice::JavaVisitor::writeDocComment(Output& out, const UnitPtr& unt, const CommentPtr& dc)
 {
     if(!dc)
     {
@@ -1841,7 +1871,7 @@
         for(StringList::iterator p = sa.begin(); p != sa.end(); ++p)
         {
             out << nl << " * @see ";
-            writeSeeAlso(out, unit, *p);
+            writeSeeAlso(out, unt, *p);
         }
     }
 
@@ -1872,14 +1902,13 @@
 
 void
 Slice::JavaVisitor::writeProxyDocComment(Output& out, const OperationPtr& p, const string& package,
-                                         const CommentPtr& dc, bool async, bool context)
+                                         const CommentPtr& dc, bool async, const string& contextParam)
 {
     if(!dc)
     {
         return;
     }
 
-    const string contextParam = " * @param context The Context map to send with the invocation.";
     map<string, StringList> paramDocs = dc->parameters();
 
     out << nl << "/**";
@@ -1903,9 +1932,9 @@
             writeDocCommentLines(out, j->second);
         }
     }
-    if(context)
+    if(!contextParam.empty())
     {
-        out << nl << contextParam;
+        out << nl << " * " << contextParam;
     }
 
     //
@@ -2002,6 +2031,35 @@
 }
 
 void
+Slice::JavaVisitor::writeHiddenProxyDocComment(Output& out, const OperationPtr& p)
+{
+    // the _iceI_ methods are all async
+
+    out << nl << "/**";
+    out << nl << " * @hidden";
+
+    //
+    // Show in-params in order of declaration
+    //
+    const ParamDeclList paramList = p->inParameters();
+    for(ParamDeclList::const_iterator i = paramList.begin(); i != paramList.end(); ++i)
+    {
+        const string name = (*i)->name();
+        out << nl << " * @param " << "iceP_" << name << " -";
+    }
+    out << nl << " * @param context -";
+    out << nl << " * @param sync -";
+
+    //
+    // There is always a return value since it's async
+    //
+    out << nl << " * @return -";
+
+    // No throws since it's async
+    out << nl << " **/";
+}
+
+void
 Slice::JavaVisitor::writeServantDocComment(Output& out, const OperationPtr& p, const string& package,
                                            const CommentPtr& dc, bool async)
 {
@@ -2090,7 +2148,7 @@
 
     if(p->hasMetaData("java:UserException") || p->hasMetaData("UserException"))
     {
-        out << nl << " * @throws " << getAbsolute("com.zeroc.Ice.UserException", package);
+        out << nl << " * @throws " << getUnqualified("com.zeroc.Ice.UserException", package);
     }
     else
     {
@@ -2133,7 +2191,7 @@
 }
 
 void
-Slice::JavaVisitor::writeSeeAlso(Output& out, const UnitPtr& unit, const string& ref)
+Slice::JavaVisitor::writeSeeAlso(Output& out, const UnitPtr& unt, const string& ref)
 {
     assert(!ref.empty());
 
@@ -2164,7 +2222,7 @@
         s.insert(0, "::");
     }
 
-    TypeList l = unit->lookupTypeNoBuiltin(s, false, true);
+    TypeList l = unt->lookupTypeNoBuiltin(s, false, true);
     if(l.empty())
     {
         out << ref;
@@ -2173,7 +2231,7 @@
     {
         ContainedPtr cont = ContainedPtr::dynamicCast(l.front());
         assert(cont);
-        out << getAbsolute(cont) << rest;
+        out << getUnqualified(cont) << rest;
     }
 }
 
@@ -2245,7 +2303,9 @@
     //
     // Emit the class.
     //
-    out << sp << nl << "public class " << className;
+    out << sp;
+    out << nl << "/** @hidden */";
+    out << nl << "public class " << className;
     out << sb;
 
     //
@@ -2316,7 +2376,7 @@
     }
 
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     DataMemberList members = p->dataMembers();
     DataMemberList allDataMembers = p->allDataMembers();
 
@@ -2366,11 +2426,11 @@
         out.useCurrentPosAsIndent();
         if(!p->isLocal() && bases.empty())
         {
-            out << getAbsolute("com.zeroc.Ice.Object", package);
+            out << getUnqualified("com.zeroc.Ice.Object", package);
         }
         else if(q != bases.end())
         {
-            out << getAbsolute(*q++, package);
+            out << getUnqualified(*q++, package);
         }
         else if(r != implements.end())
         {
@@ -2379,7 +2439,7 @@
 
         for(;q != bases.end(); ++q)
         {
-            out << ',' << nl << getAbsolute(*q, package);
+            out << ',' << nl << getUnqualified(*q, package);
         }
         for(; r != implements.end(); ++r)
         {
@@ -2399,12 +2459,12 @@
 
         if(baseClass)
         {
-            out << " extends " << getAbsolute(baseClass, package);
+            out << " extends " << getUnqualified(baseClass, package);
             bases.pop_front();
         }
         else if(!p->isLocal())
         {
-            out << " extends " << getAbsolute("com.zeroc.Ice.Value", package);
+            out << " extends " << getUnqualified("com.zeroc.Ice.Value", package);
         }
 
         if(p->isLocal())
@@ -2416,7 +2476,7 @@
 
             for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
             {
-                implements.push_back(getAbsolute(*q, package));
+                implements.push_back(getUnqualified(*q, package));
             }
         }
 
@@ -2571,7 +2631,7 @@
                 if((*d)->optional())
                 {
                     string capName = paramName;
-                    capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                    capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                     out << nl << "set" << capName << '(' << paramName << ");";
                 }
                 else
@@ -2645,12 +2705,14 @@
 
     if(!p->isInterface())
     {
-        out << sp << nl << "public static final long serialVersionUID = ";
+        out << sp;
+        writeHiddenDocComment(out);
+        out << nl << "public static final long serialVersionUID = ";
         string serialVersionUID;
         if(p->findMetaData("java:serialVersionUID", serialVersionUID))
         {
-            const UnitPtr unit = p->unit();
-            const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+            const UnitPtr unt = p->unit();
+            const DefinitionContextPtr dc = unt->findDefinitionContext(p->file());
             assert(dc);
 
             string::size_type pos = serialVersionUID.rfind(":") + 1;
@@ -2746,7 +2808,7 @@
         throws.unique();
         out << sp;
 
-        writeProxyDocComment(out, p, package, dc, false, false);
+        writeProxyDocComment(out, p, package, dc, false, "");
         if(dc && dc->isDeprecated())
         {
             out << nl << "@Deprecated";
@@ -2766,7 +2828,7 @@
         if(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway"))
         {
             out << sp;
-            writeProxyDocComment(out, p, package, dc, true, false);
+            writeProxyDocComment(out, p, package, dc, true, "");
             if(dc && dc->isDeprecated())
             {
                 out << nl << "@Deprecated";
@@ -2788,7 +2850,7 @@
     string scoped = p->scoped();
     ExceptionPtr base = p->base();
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     DataMemberList members = p->dataMembers();
     DataMemberList allDataMembers = p->allDataMembers();
 
@@ -2811,16 +2873,16 @@
     {
         if(p->isLocal())
         {
-            out << getAbsolute("com.zeroc.Ice.LocalException", package);
+            out << getUnqualified("com.zeroc.Ice.LocalException", package);
         }
         else
         {
-            out << getAbsolute("com.zeroc.Ice.UserException", package);
+            out << getUnqualified("com.zeroc.Ice.UserException", package);
         }
     }
     else
     {
-        out << getAbsolute(base, package);
+        out << getUnqualified(base, package);
     }
     out << sb;
 
@@ -2987,8 +3049,8 @@
             {
                 out << nl << "super" << spar;
                 vector<string> baseParamNames;
-                DataMemberList baseDataMembers = base->allDataMembers();
-                for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                DataMemberList baseDataMemberList = base->allDataMembers();
+                for(DataMemberList::const_iterator d = baseDataMemberList.begin(); d != baseDataMemberList.end(); ++d)
                 {
                     baseParamNames.push_back(fixKwd((*d)->name()));
                 }
@@ -3001,7 +3063,7 @@
                 if((*d)->optional())
                 {
                     string capName = paramName;
-                    capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                    capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                     out << nl << "set" << capName << '(' << paramName << ");";
                 }
                 else
@@ -3030,8 +3092,8 @@
                 {
                     out << nl << "super" << spar;
                     vector<string> baseParamNames;
-                    DataMemberList baseDataMembers = base->allDataMembers();
-                    for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                    DataMemberList baseDataMemberList = base->allDataMembers();
+                    for(DataMemberList::const_iterator d = baseDataMemberList.begin(); d != baseDataMemberList.end(); ++d)
                     {
                         baseParamNames.push_back(fixKwd((*d)->name()));
                     }
@@ -3044,7 +3106,7 @@
                     if((*d)->optional())
                     {
                         string capName = paramName;
-                        capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+                        capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
                         out << nl << "set" << capName << '(' << paramName << ");";
                     }
                     else
@@ -3086,15 +3148,17 @@
         if(preserved && !basePreserved)
         {
             out << sp;
+            writeHiddenDocComment(out);
             out << nl << "@Override";
-            out << nl << "public " << getAbsolute("com.zeroc.Ice.SlicedData", package) << " ice_getSlicedData()";
+            out << nl << "public " << getUnqualified("com.zeroc.Ice.SlicedData", package) << " ice_getSlicedData()";
             out << sb;
             out << nl << "return _slicedData;";
             out << eb;
 
             out << sp;
+            writeHiddenDocComment(out);
             out << nl << "@Override";
-            out << nl << "public void _write(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr)";
+            out << nl << "public void _write(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr)";
             out << sb;
             out << nl << "ostr.startException(_slicedData);";
             out << nl << "_writeImpl(ostr);";
@@ -3102,8 +3166,9 @@
             out << eb;
 
             out << sp;
+            writeHiddenDocComment(out);
             out << nl << "@Override";
-            out << nl << "public void _read(" << getAbsolute("com.zeroc.Ice.InputStream", package) << " istr)";
+            out << nl << "public void _read(" << getUnqualified("com.zeroc.Ice.InputStream", package) << " istr)";
             out << sb;
             out << nl << "istr.startException();";
             out << nl << "_readImpl(istr);";
@@ -3112,8 +3177,9 @@
         }
 
         out << sp;
+        writeHiddenDocComment(out);
         out << nl << "@Override";
-        out << nl << "protected void _writeImpl(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr_)";
+        out << nl << "protected void _writeImpl(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr_)";
         out << sb;
         out << nl << "ostr_.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
         iter = 0;
@@ -3139,8 +3205,9 @@
         DataMemberList allClassMembers = p->allClassDataMembers();
 
         out << sp;
+        writeHiddenDocComment(out);
         out << nl << "@Override";
-        out << nl << "protected void _readImpl(" << getAbsolute("com.zeroc.Ice.InputStream", package) << " istr_)";
+        out << nl << "protected void _readImpl(" << getUnqualified("com.zeroc.Ice.InputStream", package) << " istr_)";
         out << sb;
         out << nl << "istr_.startSlice();";
         iter = 0;
@@ -3167,6 +3234,7 @@
             if(!base || (base && !base->usesClasses(false)))
             {
                 out << sp;
+                writeHiddenDocComment(out);
                 out << nl << "@Override";
                 out << nl << "public boolean _usesClasses()";
                 out << sb;
@@ -3177,16 +3245,20 @@
 
         if(preserved && !basePreserved)
         {
-            out << sp << nl << "protected " << getAbsolute("com.zeroc.Ice.SlicedData", package) << " _slicedData;";
+            out << sp;
+            writeHiddenDocComment(out);
+            out << nl << "protected " << getUnqualified("com.zeroc.Ice.SlicedData", package) << " _slicedData;";
         }
     }
 
-    out << sp << nl << "public static final long serialVersionUID = ";
+    out << sp;
+    writeHiddenDocComment(out);
+    out << nl << "public static final long serialVersionUID = ";
     string serialVersionUID;
     if(p->findMetaData("java:serialVersionUID", serialVersionUID))
     {
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc = unt->findDefinitionContext(p->file());
         assert(dc);
 
         string::size_type pos = serialVersionUID.rfind(":") + 1;
@@ -3229,7 +3301,7 @@
 Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
 {
     string name = fixKwd(p->name());
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
 
     open(absolute, p->file());
 
@@ -3454,7 +3526,7 @@
 
     if(!p->isLocal())
     {
-        out << sp << nl << "public void ice_writeMembers(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+        out << sp << nl << "public void ice_writeMembers(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << " ostr)";
         out << sb;
         iter = 0;
@@ -3466,7 +3538,7 @@
 
         DataMemberList classMembers = p->classDataMembers();
 
-        out << sp << nl << "public void ice_readMembers(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+        out << sp << nl << "public void ice_readMembers(" << getUnqualified("com.zeroc.Ice.InputStream", package)
             << " istr)";
         out << sb;
         iter = 0;
@@ -3476,7 +3548,7 @@
         }
         out << eb;
 
-        out << sp << nl << "static public void ice_write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+        out << sp << nl << "static public void ice_write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << " ostr, " << name << " v)";
         out << sb;
         out << nl << "if(v == null)";
@@ -3489,7 +3561,7 @@
         out << eb;
         out << eb;
 
-        out << sp << nl << "static public " << name << " ice_read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+        out << sp << nl << "static public " << name << " ice_read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
             << " istr)";
         out << sb;
         out << nl << name << " v = new " << name << "();";
@@ -3499,7 +3571,7 @@
 
         string optName = "java.util.Optional<" + name + ">";
         out << sp;
-        out << nl << "static public void ice_write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+        out << nl << "static public void ice_write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << " ostr, int tag, " << optName << " v)";
         out << sb;
         out << nl << "if(v != null && v.isPresent())";
@@ -3509,7 +3581,7 @@
         out << eb;
 
         out << sp;
-        out << nl << "static public void ice_write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+        out << nl << "static public void ice_write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << " ostr, int tag, " << name << " v)";
         out << sb;
         out << nl << "if(ostr.writeOptional(tag, " << getOptionalFormat(p) << "))";
@@ -3529,7 +3601,7 @@
         out << eb;
 
         out << sp;
-        out << nl << "static public " << optName << " ice_read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+        out << nl << "static public " << optName << " ice_read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
             << " istr, int tag)";
         out << sb;
         out << nl << "if(istr.readOptional(tag, " << getOptionalFormat(p) << "))";
@@ -3553,12 +3625,14 @@
         out << sp << nl << "private static final " << name << " _nullMarshalValue = new " << name << "();";
     }
 
-    out << sp << nl << "public static final long serialVersionUID = ";
+    out << sp;
+    writeHiddenDocComment(out);
+    out << nl << "public static final long serialVersionUID = ";
     string serialVersionUID;
     if(p->findMetaData("java:serialVersionUID", serialVersionUID))
     {
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc = unt->findDefinitionContext(p->file());
         assert(dc);
         string::size_type pos = serialVersionUID.rfind(":") + 1;
         if(pos == string::npos)
@@ -3669,7 +3743,7 @@
     if(getSet || optional)
     {
         string capName = p->name();
-        capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+        capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
 
         //
         // If container is a class, get all of its operations so that we can check for conflicts.
@@ -3945,7 +4019,7 @@
 {
     string name = fixKwd(p->name());
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     EnumeratorList enumerators = p->enumerators();
 
     open(absolute, p->file());
@@ -4013,12 +4087,12 @@
 
     if(!p->isLocal())
     {
-        out << sp << nl << "public void ice_write(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr)";
+        out << sp << nl << "public void ice_write(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr)";
         out << sb;
         out << nl << "ostr.writeEnum(_value, " << p->maxValue() << ");";
         out << eb;
 
-        out << sp << nl << "public static void ice_write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+        out << sp << nl << "public static void ice_write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << " ostr, " << name << " v)";
         out << sb;
         out << nl << "if(v == null)";
@@ -4032,7 +4106,7 @@
         out << eb;
         out << eb;
 
-        out << sp << nl << "public static " << name << " ice_read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+        out << sp << nl << "public static " << name << " ice_read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
             << " istr)";
         out << sb;
         out << nl << "int v = istr.readEnum(" << p->maxValue() << ");";
@@ -4041,7 +4115,7 @@
 
         string optName = "java.util.Optional<" + name + ">";
         out << sp;
-        out << nl << "public static void ice_write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+        out << nl << "public static void ice_write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << " ostr, int tag, " << optName << " v)";
         out << sb;
         out << nl << "if(v != null && v.isPresent())";
@@ -4051,7 +4125,7 @@
         out << eb;
 
         out << sp;
-        out << nl << "public static void ice_write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+        out << nl << "public static void ice_write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
             << " ostr, int tag, " << name << " v)";
         out << sb;
         out << nl << "if(ostr.writeOptional(tag, " << getOptionalFormat(p) << "))";
@@ -4061,7 +4135,7 @@
         out << eb;
 
         out << sp;
-        out << nl << "public static " << optName << " ice_read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+        out << nl << "public static " << optName << " ice_read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
             << " istr, int tag)";
         out << sb;
         out << nl << "if(istr.readOptional(tag, " << getOptionalFormat(p) << "))";
@@ -4079,7 +4153,7 @@
         out << nl << "final " << name << " e = valueOf(v);";
         out << nl << "if(e == null)";
         out << sb;
-        out << nl << "throw new " << getAbsolute("com.zeroc.Ice.MarshalException", package)
+        out << nl << "throw new " << getUnqualified("com.zeroc.Ice.MarshalException", package)
             << "(\"enumerator value \" + v + \" is out of range\");";
         out << eb;
         out << nl << "return e;";
@@ -4097,7 +4171,7 @@
 {
     string name = fixKwd(p->name());
     string package = getPackage(p);
-    string absolute = getAbsolute(p);
+    string absolute = getUnqualified(p);
     TypePtr type = p->type();
 
     open(absolute, p->file());
@@ -4163,7 +4237,9 @@
         open(os.str(), p->file());
 
         Output& out = output();
-        out << sp << nl << "public class TypeId_" << p->compactId();
+        out << sp;
+        writeHiddenDocComment(out);
+        out << nl << "public class TypeId_" << p->compactId();
         out << sb;
         out << nl << "public final static String typeId = \"" << p->scoped() << "\";";
         out << eb;
@@ -4201,8 +4277,8 @@
     }
 
     string name = p->name();
-    string absolute = getAbsolute(p);
-    string helper = getAbsolute(p, "", "", "Helper");
+    string absolute = getUnqualified(p);
+    string helper = getUnqualified(p, "", "", "Helper");
     string package = getPackage(p);
     string typeS = typeToString(p, TypeModeIn, package);
 
@@ -4262,10 +4338,12 @@
 
     int iter;
 
-    out << sp << nl << "public final class " << name << "Helper";
+    out << sp;
+    writeDocComment(out, "Helper class for marshaling/unmarshaling " + name + ".");
+    out << nl << "public final class " << name << "Helper";
     out << sb;
 
-    out << nl << "public static void write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+    out << nl << "public static void write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
         << " ostr, " << typeS << " v)";
     out << sb;
     iter = 0;
@@ -4277,7 +4355,7 @@
     {
         out << nl << "@SuppressWarnings(\"unchecked\")";
     }
-    out << nl << "public static " << typeS << " read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+    out << nl << "public static " << typeS << " read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
         << " istr)";
     out << sb;
     out << nl << "final " << typeS << " v;";
@@ -4290,7 +4368,7 @@
 
     string optTypeS = "java.util.Optional<" + typeS + ">";
     out << sp;
-    out << nl << "public static void write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+    out << nl << "public static void write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
         << " ostr, int tag, " << optTypeS << " v)";
     out << sb;
     if(!hasTypeMetaData(p) && builtin && builtin->kind() < Builtin::KindObject)
@@ -4307,7 +4385,7 @@
     out << eb;
 
     out << sp;
-    out << nl << "public static void write(" << getAbsolute("com.zeroc.Ice.OutputStream", package)
+    out << nl << "public static void write(" << getUnqualified("com.zeroc.Ice.OutputStream", package)
         << " ostr, int tag, " << typeS << " v)";
     out << sb;
     if(!hasTypeMetaData(p) && builtin && builtin->kind() < Builtin::KindObject)
@@ -4356,7 +4434,7 @@
     out << eb;
 
     out << sp;
-    out << nl << "public static " << optTypeS << " read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+    out << nl << "public static " << optTypeS << " read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
         << " istr, int tag)";
     out << sb;
     if(!hasTypeMetaData(p) && builtin && builtin->kind() < Builtin::KindObject)
@@ -4405,8 +4483,8 @@
     TypePtr value = p->valueType();
 
     string name = p->name();
-    string absolute = getAbsolute(p);
-    string helper = getAbsolute(p, "", "", "Helper");
+    string absolute = getUnqualified(p);
+    string helper = getUnqualified(p, "", "", "Helper");
     string package = getPackage(p);
     StringList metaData = p->getMetaData();
     string formalType = typeToString(p, TypeModeIn, package, StringList(), true);
@@ -4416,17 +4494,18 @@
 
     int iter;
 
+    writeDocComment(out, "Helper class for marshaling/unmarshaling " + name + ".");
     out << sp << nl << "public final class " << name << "Helper";
     out << sb;
 
-    out << nl << "public static void write(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr, "
+    out << nl << "public static void write(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr, "
         << formalType << " v)";
     out << sb;
     iter = 0;
     writeDictionaryMarshalUnmarshalCode(out, package, p, "v", true, iter, false);
     out << eb;
 
-    out << sp << nl << "public static " << formalType << " read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+    out << sp << nl << "public static " << formalType << " read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
         << " istr)";
     out << sb;
     out << nl << formalType << " v;";
@@ -4437,7 +4516,7 @@
 
     string optTypeS = "java.util.Optional<" + formalType + ">";
     out << sp;
-    out << nl << "public static void write(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr, int tag, "
+    out << nl << "public static void write(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr, int tag, "
         << optTypeS << " v)";
     out << sb;
     out << nl << "if(v != null && v.isPresent())";
@@ -4447,7 +4526,7 @@
     out << eb;
 
     out << sp;
-    out << nl << "public static void write(" << getAbsolute("com.zeroc.Ice.OutputStream", package) << " ostr, int tag, "
+    out << nl << "public static void write(" << getUnqualified("com.zeroc.Ice.OutputStream", package) << " ostr, int tag, "
         << formalType << " v)";
     out << sb;
     out << nl << "if(ostr.writeOptional(tag, " << getOptionalFormat(p) << "))";
@@ -4471,7 +4550,7 @@
     out << eb;
 
     out << sp;
-    out << nl << "public static " << optTypeS << " read(" << getAbsolute("com.zeroc.Ice.InputStream", package)
+    out << nl << "public static " << optTypeS << " read(" << getUnqualified("com.zeroc.Ice.InputStream", package)
         << " istr, int tag)";
     out << sb;
     out << nl << "if(istr.readOptional(tag, " << getOptionalFormat(p) << "))";
@@ -4523,7 +4602,7 @@
     string name = p->name();
     ClassList bases = p->bases();
     string package = getPackage(p);
-    string absolute = getAbsolute(p, "", "", "Prx");
+    string absolute = getUnqualified(p, "", "", "Prx");
 
     open(absolute, p->file());
 
@@ -4552,7 +4631,7 @@
     out.useCurrentPosAsIndent();
     if(bases.empty())
     {
-        out << getAbsolute("com.zeroc.Ice.ObjectPrx", package);
+        out << getUnqualified("com.zeroc.Ice.ObjectPrx", package);
     }
     else
     {
@@ -4562,7 +4641,7 @@
             {
                 out << ',' << nl;
             }
-            out << getAbsolute(*q, package, "", "Prx");
+            out << getUnqualified(*q, package, "", "Prx");
         }
     }
     out.restoreIndent();
@@ -4588,10 +4667,10 @@
                     "Raises a local exception if a communication error occurs.\n"
                     "@param obj The untyped proxy.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "static " << p->name() << "Prx checkedCast(" << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "static " << p->name() << "Prx checkedCast(" << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << " obj)";
     out << sb;
-    out << nl << "return " << getAbsolute("com.zeroc.Ice.ObjectPrx", package) << "._checkedCast(obj, ice_staticId(), "
+    out << nl << "return " << getUnqualified("com.zeroc.Ice.ObjectPrx", package) << "._checkedCast(obj, ice_staticId(), "
         << p->name() << "Prx.class, _" << p->name() << "PrxI.class);";
     out << eb;
 
@@ -4602,10 +4681,10 @@
                     "@param obj The untyped proxy.\n"
                     "@param context The Context map to send with the invocation.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "static " << p->name() << "Prx checkedCast(" << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "static " << p->name() << "Prx checkedCast(" << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << " obj, " << contextParam << ')';
     out << sb;
-    out << nl << "return " << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "return " << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << "._checkedCast(obj, context, ice_staticId(), " << p->name() << "Prx.class, _" << p->name() << "PrxI.class);";
     out << eb;
 
@@ -4616,10 +4695,10 @@
                     "@param obj The untyped proxy.\n"
                     "@param facet The name of the desired facet.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "static " << p->name() << "Prx checkedCast(" << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "static " << p->name() << "Prx checkedCast(" << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << " obj, String facet)";
     out << sb;
-    out << nl << "return " << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "return " << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << "._checkedCast(obj, facet, ice_staticId(), " << p->name() << "Prx.class, _" << p->name() << "PrxI.class);";
     out << eb;
 
@@ -4631,10 +4710,10 @@
                     "@param facet The name of the desired facet.\n"
                     "@param context The Context map to send with the invocation.\n"
                     "@return A proxy for this type, or null if the object does not support this type.");
-    out << nl << "static " << p->name() << "Prx checkedCast(" << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "static " << p->name() << "Prx checkedCast(" << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << " obj, String facet, " << contextParam << ')';
     out << sb;
-    out << nl << "return " << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "return " << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << "._checkedCast(obj, facet, context, ice_staticId(), " << p->name()
         << "Prx.class, _" << p->name() << "PrxI.class);";
     out << eb;
@@ -4644,10 +4723,10 @@
                     "Downcasts the given proxy to this type without contacting the remote server.\n"
                     "@param obj The untyped proxy.\n"
                     "@return A proxy for this type.");
-    out << nl << "static " << p->name() << "Prx uncheckedCast(" << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "static " << p->name() << "Prx uncheckedCast(" << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << " obj)";
     out << sb;
-    out << nl << "return " << getAbsolute("com.zeroc.Ice.ObjectPrx", package) << "._uncheckedCast(obj, " << p->name()
+    out << nl << "return " << getUnqualified("com.zeroc.Ice.ObjectPrx", package) << "._uncheckedCast(obj, " << p->name()
         << "Prx.class, _" << p->name() << "PrxI.class);";
     out << eb;
 
@@ -4657,10 +4736,10 @@
                     "@param obj The untyped proxy.\n"
                     "@param facet The name of the desired facet.\n"
                     "@return A proxy for this type.");
-    out << nl << "static " << p->name() << "Prx uncheckedCast(" << getAbsolute("com.zeroc.Ice.ObjectPrx", package)
+    out << nl << "static " << p->name() << "Prx uncheckedCast(" << getUnqualified("com.zeroc.Ice.ObjectPrx", package)
         << " obj, String facet)";
     out << sb;
-    out << nl << "return " << getAbsolute("com.zeroc.Ice.ObjectPrx", package) << "._uncheckedCast(obj, facet, "
+    out << nl << "return " << getUnqualified("com.zeroc.Ice.ObjectPrx", package) << "._uncheckedCast(obj, facet, "
         << p->name() << "Prx.class, _"
         << p->name() << "PrxI.class);";
     out << eb;
@@ -4693,7 +4772,7 @@
                     "@param newEndpoints The endpoints for the new proxy.\n"
                     "@return A proxy with the specified endpoints.");
     out << nl << "@Override";
-    out << nl << "default " << p->name() << "Prx ice_endpoints(" << getAbsolute("com.zeroc.Ice.Endpoint", package) << "[] newEndpoints)";
+    out << nl << "default " << p->name() << "Prx ice_endpoints(" << getUnqualified("com.zeroc.Ice.Endpoint", package) << "[] newEndpoints)";
     out << sb;
     out << nl << "return (" << p->name() << "Prx)_ice_endpoints(newEndpoints);";
     out << eb;
@@ -4738,7 +4817,7 @@
                     "@return A proxy with the specified endpoint selection policy.");
     out << nl << "@Override";
     out << nl << "default " << p->name() << "Prx ice_endpointSelection("
-        << getAbsolute("com.zeroc.Ice.EndpointSelectionType", package)
+        << getUnqualified("com.zeroc.Ice.EndpointSelectionType", package)
         << " newType)";
     out << sb;
     out << nl << "return (" << p->name() << "Prx)_ice_endpointSelection(newType);";
@@ -4763,7 +4842,7 @@
                     "@param e The encoding version to use to marshal request parameters.\n"
                     "@return A proxy with the specified encoding version.");
     out << nl << "@Override";
-    out << nl << "default " << p->name() << "Prx ice_encodingVersion(" << getAbsolute("com.zeroc.Ice.EncodingVersion", package)
+    out << nl << "default " << p->name() << "Prx ice_encodingVersion(" << getUnqualified("com.zeroc.Ice.EncodingVersion", package)
         << " e)";
     out << sb;
     out << nl << "return (" << p->name() << "Prx)_ice_encodingVersion(e);";
@@ -4788,7 +4867,7 @@
                     "@param router The router for the new proxy.\n"
                     "@return A proxy with the specified router.");
     out << nl << "@Override";
-    out << nl << "default " << p->name() << "Prx ice_router(" << getAbsolute("com.zeroc.Ice.RouterPrx", package) << " router)";
+    out << nl << "default " << p->name() << "Prx ice_router(" << getUnqualified("com.zeroc.Ice.RouterPrx", package) << " router)";
     out << sb;
     out << nl << "return (" << p->name() << "Prx)_ice_router(router);";
     out << eb;
@@ -4799,7 +4878,7 @@
                     "@param locator The locator for the new proxy.\n"
                     "@return A proxy with the specified locator.");
     out << nl << "@Override";
-    out << nl << "default " << p->name() << "Prx ice_locator(" << getAbsolute("com.zeroc.Ice.LocatorPrx", package)
+    out << nl << "default " << p->name() << "Prx ice_locator(" << getUnqualified("com.zeroc.Ice.LocatorPrx", package)
         << " locator)";
     out << sb;
     out << nl << "return (" << p->name() << "Prx)_ice_locator(locator);";
@@ -4920,21 +4999,24 @@
     out << eb;
     close();
 
-    string absolute = getAbsolute(p, "", "_", "PrxI");
+    string absolute = getUnqualified(p, "", "_", "PrxI");
 
     open(absolute, p->file());
 
     Output& outi = output();
 
     outi << sp;
+    writeHiddenDocComment(outi);
     if(dc && dc->isDeprecated())
     {
         outi << nl << "@Deprecated";
     }
-    outi << nl << "public class _" << p->name() << "PrxI extends " << getAbsolute("com.zeroc.Ice._ObjectPrxI", package)
+    outi << nl << "public class _" << p->name() << "PrxI extends " << getUnqualified("com.zeroc.Ice._ObjectPrxI", package)
          << " implements " << p->name() << "Prx";
     outi << sb;
-    outi << sp << nl << "public static final long serialVersionUID = 0L;";
+    outi << sp;
+    writeHiddenDocComment(outi);
+    outi << nl << "public static final long serialVersionUID = 0L;";
     outi << eb;
     close();
 }
@@ -4988,7 +5070,7 @@
     // Synchronous methods with required parameters.
     //
     out << sp;
-    writeProxyDocComment(out, p, package, dc, false, false);
+    writeProxyDocComment(out, p, package, dc, false, "");
     if(dc && dc->isDeprecated())
     {
         out << nl << "@Deprecated";
@@ -5005,7 +5087,7 @@
     out << eb;
 
     out << sp;
-    writeProxyDocComment(out, p, package, dc, false, true);
+    writeProxyDocComment(out, p, package, dc, false, contextDoc);
     if(dc && dc->isDeprecated())
     {
         out << nl << "@Deprecated";
@@ -5035,15 +5117,15 @@
         out << eb;
         for(ExceptionList::const_iterator t = throws.begin(); t != throws.end(); ++t)
         {
-            string exS = getAbsolute(*t, package);
+            string exS = getUnqualified(*t, package);
             out << nl << "catch(" << exS << " ex)";
             out << sb;
             out << nl << "throw ex;";
             out << eb;
         }
-        out << nl << "catch(" << getAbsolute("com.zeroc.Ice.UserException", package) << " ex)";
+        out << nl << "catch(" << getUnqualified("com.zeroc.Ice.UserException", package) << " ex)";
         out << sb;
-        out << nl << "throw new " << getAbsolute("com.zeroc.Ice.UnknownUserException", package) << "(ex.ice_id(), ex);";
+        out << nl << "throw new " << getUnqualified("com.zeroc.Ice.UnknownUserException", package) << "(ex.ice_id(), ex);";
         out << eb;
     }
     out << eb;
@@ -5054,7 +5136,7 @@
     if(sendsOptionals)
     {
         out << sp;
-        writeProxyDocComment(out, p, package, dc, false, false);
+        writeProxyDocComment(out, p, package, dc, false, "");
         if(dc && dc->isDeprecated())
         {
             out << nl << "@Deprecated";
@@ -5071,7 +5153,7 @@
         out << eb;
 
         out << sp;
-        writeProxyDocComment(out, p, package, dc, false, true);
+        writeProxyDocComment(out, p, package, dc, false, contextDoc);
         if(dc && dc->isDeprecated())
         {
             out << nl << "@Deprecated";
@@ -5101,15 +5183,15 @@
             out << eb;
             for(ExceptionList::const_iterator t = throws.begin(); t != throws.end(); ++t)
             {
-                string exS = getAbsolute(*t, package);
+                string exS = getUnqualified(*t, package);
                 out << nl << "catch(" << exS << " ex)";
                 out << sb;
                 out << nl << "throw ex;";
                 out << eb;
             }
-            out << nl << "catch(" << getAbsolute("com.zeroc.Ice.UserException", package) << " ex)";
+            out << nl << "catch(" << getUnqualified("com.zeroc.Ice.UserException", package) << " ex)";
             out << sb;
-            out << nl << "throw new " << getAbsolute("com.zeroc.Ice.UnknownUserException", package)
+            out << nl << "throw new " << getUnqualified("com.zeroc.Ice.UnknownUserException", package)
                 << "(ex.ice_id(), ex);";
             out << eb;
         }
@@ -5120,28 +5202,27 @@
     // Asynchronous methods with required parameters.
     //
     out << sp;
-    writeProxyDocComment(out, p, package, dc, true, false);
+    writeProxyDocComment(out, p, package, dc, true, "");
 
-    const string future = getFutureType(p, package);
+    const string futureType = getFutureType(p, package);
 
     if(dc && dc->isDeprecated())
     {
         out << nl << "@Deprecated";
     }
-    out << nl << "default " << future << ' ' << p->name() << "Async" << spar << params << epar;
+    out << nl << "default " << futureType << ' ' << p->name() << "Async" << spar << params << epar;
     out << sb;
     out << nl << "return _iceI_" << p->name() << "Async" << spar << args << noExplicitContextArg << "false" << epar
         << ';';
     out << eb;
 
     out << sp;
-    writeProxyDocComment(out, p, package, dc, true, true);
-
+    writeProxyDocComment(out, p, package, dc, true, contextDoc);
     if(dc && dc->isDeprecated())
     {
         out << nl << "@Deprecated";
     }
-    out << nl << "default " << future << ' ' << p->name() << "Async" << spar << params << contextParam << epar;
+    out << nl << "default " << futureType << ' ' << p->name() << "Async" << spar << params << contextParam << epar;
     out << sb;
     out << nl << "return _iceI_" << p->name() << "Async" << spar << args << contextParamName << "false" << epar << ';';
     out << eb;
@@ -5149,11 +5230,12 @@
     const string futureImpl = getFutureImplType(p, package);
 
     out << sp;
+    writeHiddenProxyDocComment(out, p);
     out << nl << "default " << futureImpl << " _iceI_" << p->name() << "Async" << spar << getParamsProxy(p, package, false, true)
         << "java.util.Map<String, String> context"
         << "boolean sync" << epar;
     out << sb;
-    out << nl << futureImpl << " f = new " << getAbsolute("com.zeroc.IceInternal.OutgoingAsync", package)
+    out << nl << futureImpl << " f = new " << getUnqualified("com.zeroc.IceInternal.OutgoingAsync", package)
         << "<>(this, \"" << p->name() << "\", " << sliceModeToIceMode(p->sendMode()) << ", sync, "
         << (throws.empty() ? "null" : "_iceE_" + p->name()) << ");";
 
@@ -5193,7 +5275,9 @@
 
     if(!throws.empty())
     {
-        out << sp << nl << "static final Class<?>[] _iceE_" << p->name() << " =";
+        out << sp;
+        writeHiddenDocComment(out);
+        out << nl << "static final Class<?>[] _iceE_" << p->name() << " =";
         out << sb;
         for(ExceptionList::const_iterator t = throws.begin(); t != throws.end(); ++t)
         {
@@ -5201,7 +5285,7 @@
             {
                 out << ",";
             }
-            out << nl << getAbsolute(*t, package) << ".class";
+            out << nl << getUnqualified(*t, package) << ".class";
         }
         out << eb << ';';
     }
@@ -5209,7 +5293,7 @@
     if(sendsOptionals)
     {
         out << sp;
-        writeProxyDocComment(out, p, package, dc, true, false);
+        writeProxyDocComment(out, p, package, dc, true, "");
 
         const string future = getFutureType(p, package);
 
@@ -5224,7 +5308,7 @@
         out << eb;
 
         out << sp;
-        writeProxyDocComment(out, p, package, dc, true, true);
+        writeProxyDocComment(out, p, package, dc, true, contextDoc);
 
         if(dc && dc->isDeprecated())
         {
@@ -5236,11 +5320,12 @@
         out << eb;
 
         out << sp;
+        writeHiddenProxyDocComment(out, p);
         out << nl << "default " << futureImpl << " _iceI_" << p->name() << "Async" << spar << getParamsProxy(p, package, true, true)
             << "java.util.Map<String, String> context"
             << "boolean sync" << epar;
         out << sb;
-        out << nl << futureImpl << " f = new " << getAbsolute("com.zeroc.IceInternal.OutgoingAsync", package)
+        out << nl << futureImpl << " f = new " << getUnqualified("com.zeroc.IceInternal.OutgoingAsync", package)
             << "<>(this, \"" << p->name() << "\", " << sliceModeToIceMode(p->sendMode()) << ", sync, "
             << (throws.empty() ? "null" : "_iceE_" + p->name()) << ");";
 
@@ -5293,7 +5378,7 @@
     }
 
     const string name = p->name();
-    const string absolute = getAbsolute(p, "", "", "Disp");
+    const string absolute = getUnqualified(p, "", "", "Disp");
     const string package = getPackage(p);
 
     open(absolute, p->file());
@@ -5320,7 +5405,7 @@
 
     if(bases.empty())
     {
-        out << " extends " << getAbsolute("com.zeroc.Ice.Object", package);
+        out << " extends " << getUnqualified("com.zeroc.Ice.Object", package);
     }
     else
     {
@@ -5334,11 +5419,11 @@
             }
             if(!(*q)->isInterface())
             {
-                out << getAbsolute(*q, package, "", "Disp");
+                out << getUnqualified(*q, package, "", "Disp");
             }
             else
             {
-                out << getAbsolute(*q, package);
+                out << getUnqualified(*q, package);
             }
         }
         out.restoreIndent();
@@ -5369,7 +5454,7 @@
     string name = p->name();
     ClassList bases = p->bases();
     string package = getPackage(p);
-    string absolute = getAbsolute(p, "", "", "I");
+    string absolute = getUnqualified(p, "", "", "I");
 
     open(absolute, p->file());
 
@@ -5490,7 +5575,7 @@
             if(en)
             {
                 EnumeratorList enumerators = en->enumerators();
-                return getAbsolute(en, package) + '.' + fixKwd(enumerators.front()->name());
+                return getUnqualified(en, package) + '.' + fixKwd(enumerators.front()->name());
             }
         }
     }
@@ -5577,7 +5662,7 @@
     const ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
 
     const vector<string> params = getParams(op, package);
-    const string currentParam = getAbsolute("com.zeroc.Ice.Current", package) + " " + getEscapedParamName(op, "current");
+    const string currentParam = getUnqualified("com.zeroc.Ice.Current", package) + " " + getEscapedParamName(op, "current");
 
     if(local)
     {
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2java/Gen.h zeroc-ice-3.7.2/cpp/src/slice2java/Gen.h
--- zeroc-ice-3.7.1/cpp/src/slice2java/Gen.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2java/Gen.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_H
 #define GEN_H
@@ -100,12 +95,14 @@
     // Handle doc comments.
     //
     static StringList splitComment(const ContainedPtr&);
+    void writeHiddenDocComment(::IceUtilInternal::Output&);
     void writeDocCommentLines(::IceUtilInternal::Output&, const StringList&);
     void writeDocCommentLines(::IceUtilInternal::Output&, const std::string&);
     void writeDocComment(::IceUtilInternal::Output&, const UnitPtr&, const CommentPtr&);
     void writeDocComment(::IceUtilInternal::Output&, const std::string&);
     void writeProxyDocComment(::IceUtilInternal::Output&, const OperationPtr&, const std::string&, const CommentPtr&,
-                              bool, bool);
+                              bool, const std::string&);
+    void writeHiddenProxyDocComment(::IceUtilInternal::Output&, const OperationPtr&);
     void writeServantDocComment(::IceUtilInternal::Output&, const OperationPtr&, const std::string&,
                                 const CommentPtr&, bool);
     void writeSeeAlso(::IceUtilInternal::Output&, const UnitPtr&, const std::string&);
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2java/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2java/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2java/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2java/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
@@ -263,8 +258,8 @@
         //
         // Ignore duplicates.
         //
-        vector<string>::iterator p = find(args.begin(), args.end(), *i);
-        if(p != i)
+        vector<string>::iterator j = find(args.begin(), args.end(), *i);
+        if(j != i)
         {
             continue;
         }
@@ -301,7 +296,6 @@
         }
         else
         {
-            ostringstream os;
             FileTracker::instance()->setSource(*i);
 
             PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
@@ -464,16 +458,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2java/msbuild/slice2java.vcxproj zeroc-ice-3.7.2/cpp/src/slice2java/msbuild/slice2java.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2java/msbuild/slice2java.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2java/msbuild/slice2java.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -72,7 +72,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -82,7 +82,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -92,7 +92,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -102,7 +102,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2js/Gen.cpp zeroc-ice-3.7.2/cpp/src/slice2js/Gen.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2js/Gen.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2js/Gen.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/InputUtil.h>
 #include <Gen.h>
-#include <limits>
-#include <sys/stat.h>
-#ifndef _WIN32
-#include <unistd.h>
-#else
-#include <direct.h>
-#endif
 #include <IceUtil/Iterator.h>
 #include <IceUtil/UUID.h>
 #include <Slice/Checksum.h>
 #include <Slice/FileTracker.h>
 #include <Slice/Util.h>
-#include <string.h>
+
+// TODO: fix this warning!
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
 
 using namespace std;
 using namespace Slice;
@@ -87,9 +84,284 @@
     return deprecateReason;
 }
 
+void
+printHeader(IceUtilInternal::Output& out)
+{
+    static const char* header =
+        "//\n"
+        "// Copyright (c) ZeroC, Inc. All rights reserved.\n"
+        "//\n"
+        ;
+
+    out << header;
+    out << "//\n";
+    out << "// Ice version " << ICE_STRING_VERSION << "\n";
+    out << "//\n";
+}
+
+string
+escapeParam(const ParamDeclList& params, const string& name)
+{
+    string r = name;
+    for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p)
+    {
+        if(Slice::JsGenerator::fixId((*p)->name()) == name)
+        {
+            r = name + "_";
+            break;
+        }
+    }
+    return r;
+}
+
+void
+writeDocLines(Output& out, const StringList& lines, bool commentFirst, const string& space = " ")
+{
+    StringList l = lines;
+    if(!commentFirst)
+    {
+        out << l.front();
+        l.pop_front();
+    }
+    for(StringList::const_iterator i = l.begin(); i != l.end(); ++i)
+    {
+        out << nl << " *";
+        if(!i->empty())
+        {
+            out << space << *i;
+        }
+    }
+}
+
+void
+writeSeeAlso(Output& out, const StringList& lines, const string& space = " ")
+{
+    for(StringList::const_iterator i = lines.begin(); i != lines.end(); ++i)
+    {
+        out << nl << " *";
+        if(!i->empty())
+        {
+            out << space << "@see " << *i;
+        }
+    }
+}
+
+string
+getDocSentence(const StringList& lines)
+{
+    //
+    // Extract the first sentence.
+    //
+    ostringstream ostr;
+    for(StringList::const_iterator i = lines.begin(); i != lines.end(); ++i)
+    {
+        const string ws = " \t";
+
+        if(i->empty())
+        {
+            break;
+        }
+        if(i != lines.begin() && i->find_first_not_of(ws) == 0)
+        {
+            ostr << " ";
+        }
+        string::size_type pos = i->find('.');
+        if(pos == string::npos)
+        {
+            ostr << *i;
+        }
+        else if(pos == i->size() - 1)
+        {
+            ostr << *i;
+            break;
+        }
+        else
+        {
+            //
+            // Assume a period followed by whitespace indicates the end of the sentence.
+            //
+            while(pos != string::npos)
+            {
+                if(ws.find((*i)[pos + 1]) != string::npos)
+                {
+                    break;
+                }
+                pos = i->find('.', pos + 1);
+            }
+            if(pos != string::npos)
+            {
+                ostr << i->substr(0, pos + 1);
+                break;
+            }
+            else
+            {
+                ostr << *i;
+            }
+        }
+    }
+
+    return ostr.str();
 }
 
-Slice::JsVisitor::JsVisitor(Output& out) : _out(out)
+void
+writeDocSummary(Output& out, const ContainedPtr& p)
+{
+    if(p->comment().empty())
+    {
+        return;
+    }
+
+    CommentPtr doc = p->parseComment(false);
+
+    out << nl << "/**";
+
+    if(!doc->overview().empty())
+    {
+        writeDocLines(out, doc->overview(), true);
+    }
+
+    if(!doc->misc().empty())
+    {
+        writeDocLines(out, doc->misc(), true);
+    }
+
+    if(!doc->seeAlso().empty())
+    {
+        writeSeeAlso(out, doc->seeAlso());
+    }
+
+    if(!doc->deprecated().empty())
+    {
+        out << nl << " *";
+        out << nl << " * @deprecated ";
+        writeDocLines(out, doc->deprecated(), false);
+    }
+    else if(doc->isDeprecated())
+    {
+        out << nl << " *";
+        out << nl << " * @deprecated";
+    }
+
+    out << nl << " */";
+}
+
+enum OpDocParamType { OpDocInParams, OpDocOutParams, OpDocAllParams };
+
+void
+writeOpDocParams(Output& out, const OperationPtr& op, const CommentPtr& doc, OpDocParamType type,
+                 const StringList& preParams = StringList(), const StringList& postParams = StringList())
+{
+    ParamDeclList params;
+    switch (type)
+    {
+    case OpDocInParams:
+        params = op->inParameters();
+        break;
+    case OpDocOutParams:
+        params = op->outParameters();
+        break;
+    case OpDocAllParams:
+        params = op->parameters();
+        break;
+    }
+
+    if (!preParams.empty())
+    {
+        writeDocLines(out, preParams, true);
+    }
+
+    map<string, StringList> paramDoc = doc->parameters();
+    for (ParamDeclList::iterator p = params.begin(); p != params.end(); ++p)
+    {
+        map<string, StringList>::iterator q = paramDoc.find((*p)->name());
+        if(q != paramDoc.end())
+        {
+            out << nl << " * @param " << Slice::JsGenerator::fixId(q->first) << " ";
+            writeDocLines(out, q->second, false);
+        }
+    }
+
+    if(!postParams.empty())
+    {
+        writeDocLines(out, postParams, true);
+    }
+}
+
+void
+writeOpDocExceptions(Output& out, const OperationPtr& op, const CommentPtr& doc)
+{
+    map<string, StringList> exDoc = doc->exceptions();
+    for (map<string, StringList>::iterator p = exDoc.begin(); p != exDoc.end(); ++p)
+    {
+        //
+        // Try to locate the exception's definition using the name given in the comment.
+        //
+        string name = p->first;
+        ExceptionPtr ex = op->container()->lookupException(name, false);
+        if (ex)
+        {
+            name = ex->scoped().substr(2);
+        }
+        out << nl << " * @throws " << name << " ";
+        writeDocLines(out, p->second, false);
+    }
+}
+
+void
+writeOpDocSummary(Output& out, const OperationPtr& op, const CommentPtr& doc, OpDocParamType type, bool showExceptions,
+                  const StringList& preParams = StringList(), const StringList& postParams = StringList(),
+                  const StringList& returns = StringList())
+{
+    out << nl << "/**";
+
+    if (!doc->overview().empty())
+    {
+        writeDocLines(out, doc->overview(), true);
+    }
+
+    writeOpDocParams(out, op, doc, type, preParams, postParams);
+
+    if(!returns.empty())
+    {
+        out << nl << " * @return ";
+        writeDocLines(out, returns, false);
+    }
+
+    if(showExceptions)
+    {
+        writeOpDocExceptions(out, op, doc);
+    }
+
+    if(!doc->misc().empty())
+    {
+        writeDocLines(out, doc->misc(), true);
+    }
+
+    if(!doc->seeAlso().empty())
+    {
+        writeSeeAlso(out, doc->seeAlso());
+    }
+
+    if(!doc->deprecated().empty())
+    {
+        out << nl << " *";
+        out << nl << " * @deprecated ";
+        writeDocLines(out, doc->deprecated(), false);
+    }
+    else if(doc->isDeprecated())
+    {
+        out << nl << " *";
+        out << nl << " * @deprecated";
+    }
+
+    out << nl << " */";
+}
+
+}
+
+Slice::JsVisitor::JsVisitor(Output& out, const vector<pair<string, string> >& imports) :
+    _out(out),
+    _imports(imports)
 {
 }
 
@@ -97,6 +369,12 @@
 {
 }
 
+vector<pair<string, string> >
+Slice::JsVisitor::imports() const
+{
+    return _imports;
+}
+
 void
 Slice::JsVisitor::writeMarshalDataMembers(const DataMemberList& dataMembers, const DataMemberList& optionalMembers)
 {
@@ -132,7 +410,7 @@
 }
 
 void
-Slice::JsVisitor::writeInitDataMembers(const DataMemberList& dataMembers, const string& scope)
+Slice::JsVisitor::writeInitDataMembers(const DataMemberList& dataMembers)
 {
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
@@ -142,7 +420,7 @@
 }
 
 string
-Slice::JsVisitor::getValue(const string& scope, const TypePtr& type)
+Slice::JsVisitor::getValue(const string& /*scope*/, const TypePtr& type)
 {
     assert(type);
 
@@ -189,7 +467,7 @@
     EnumPtr en = EnumPtr::dynamicCast(type);
     if(en)
     {
-        return getReference(scope, en->scoped()) + '.' + fixId((*en->enumerators().begin())->name());
+        return fixId(en->scoped()) + '.' + fixId((*en->enumerators().begin())->name());
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
@@ -202,14 +480,14 @@
 }
 
 string
-Slice::JsVisitor::writeConstantValue(const string& scope, const TypePtr& type, const SyntaxTreeBasePtr& valueType,
+Slice::JsVisitor::writeConstantValue(const string& /*scope*/, const TypePtr& type, const SyntaxTreeBasePtr& valueType,
                                      const string& value)
 {
     ostringstream os;
     ConstPtr constant = ConstPtr::dynamicCast(valueType);
     if(constant)
     {
-        os << getReference(scope, constant->scoped());
+        os << fixId(constant->scoped());
     }
     else
     {
@@ -244,7 +522,7 @@
         {
             EnumeratorPtr lte = EnumeratorPtr::dynamicCast(valueType);
             assert(lte);
-            os << getReference(scope, ep->scoped()) << '.' << fixId(lte->name());
+            os << fixId(ep->scoped()) << '.' << fixId(lte->name());
         }
         else
         {
@@ -332,11 +610,13 @@
     _out << nl << " **/";
 }
 
-Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir) :
+Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, bool typeScript) :
     _includePaths(includePaths),
-    _useStdout(false)
+    _useStdout(false),
+    _typeScript(typeScript)
 {
     _fileBase = base;
+
     string::size_type pos = base.find_last_of("/\\");
     if(pos != string::npos)
     {
@@ -350,23 +630,42 @@
         file = dir + '/' + file;
     }
 
-    _out.open(file.c_str());
-    if(!_out)
+    _jsout.open(file.c_str());
+    if(!_jsout)
     {
         ostringstream os;
-        os << "cannot open `" << file << "': " << strerror(errno);
+        os << "cannot open `" << file << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(file);
 
-    printHeader();
-    printGeneratedHeader(_out, _fileBase + ".ice");
+    if(typeScript)
+    {
+        file = _fileBase + ".d.ts";
+
+        if(!dir.empty())
+        {
+            file = dir + '/' + file;
+        }
+
+        _tsout.open(file.c_str());
+        if(!_tsout)
+        {
+            ostringstream os;
+            os << "cannot open `" << file << "': " << IceUtilInternal::errorToString(errno);
+            throw FileException(__FILE__, __LINE__, os.str());
+        }
+        FileTracker::instance()->addFile(file);
+    }
 }
 
-Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, ostream& out) :
-    _out(out),
+Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& /*dir*/, bool typeScript,
+                ostream& out) :
+    _jsout(out),
+    _tsout(out),
     _includePaths(includePaths),
-    _useStdout(true)
+    _useStdout(true),
+    _typeScript(typeScript)
 {
     _fileBase = base;
     string::size_type pos = base.find_last_of("/\\");
@@ -374,115 +673,169 @@
     {
         _fileBase = base.substr(pos + 1);
     }
-
-    printHeader();
-    printGeneratedHeader(_out, _fileBase + ".ice");
 }
 
 Slice::Gen::~Gen()
 {
-    if(_out.isOpen() || _useStdout)
+    if(_jsout.isOpen() || _useStdout)
+    {
+        _jsout << '\n';
+    }
+
+    if(_tsout.isOpen() || _useStdout)
     {
-        _out << '\n';
+        _tsout << '\n';
     }
 }
 
 void
 Slice::Gen::generate(const UnitPtr& p)
 {
-    //
-    // Check for global "js:ice-build" and "js:es6-module"
-    // metadata. If this is set then we are building Ice.
-    //
+    string module;
     DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile());
     assert(dc);
-    StringList globalMetaData = dc->getMetaData();
-    bool icejs = find(globalMetaData.begin(), globalMetaData.end(), "js:ice-build") != globalMetaData.end();
-    bool es6module = find(globalMetaData.begin(), globalMetaData.end(), "js:es6-module") != globalMetaData.end();
 
-    _out << nl << "/* eslint-disable */";
-    _out << nl << "/* jshint ignore: start */";
-    _out << nl;
+    {
+        const string prefix = "js:module:";
+        const string m = dc->findMetaData(prefix);
+        if(!m.empty())
+        {
+            module = m.substr(prefix.size());
+        }
+    }
+
+    if(_useStdout)
+    {
+        _jsout << "\n";
+        _jsout << "/** slice2js: " << _fileBase << ".js generated begin module:\"" << module << "\" **/";
+        _jsout << "\n";
+    }
+    printHeader(_jsout);
+    printGeneratedHeader(_jsout, _fileBase + ".ice");
+
+    //
+    // Check for global "js:module:ice" metadata. If this is set then we are building Ice.
+    //
+    bool icejs = module == "ice";
+
+    //
+    // Check for global "js:es6-module" metadata. If this is set we are using es6 module mapping
+    //
+    bool es6module = dc->findMetaData("js:es6-module") == "js:es6-module";
+
+    _jsout << nl << "/* eslint-disable */";
+    _jsout << nl << "/* jshint ignore: start */";
+    _jsout << nl;
 
     if(!es6module)
     {
         if(icejs)
         {
-            _out.zeroIndent();
-            _out << nl << "/* slice2js browser-bundle-skip */";
-            _out.restoreIndent();
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip */";
+            _jsout.restoreIndent();
         }
-        _out << nl << "(function(module, require, exports)";
-        _out << sb;
+        _jsout << nl << "(function(module, require, exports)";
+        _jsout << sb;
         if(icejs)
         {
-            _out.zeroIndent();
-            _out << nl << "/* slice2js browser-bundle-skip-end */";
-            _out.restoreIndent();
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip-end */";
+            _jsout.restoreIndent();
         }
     }
-    RequireVisitor requireVisitor(_out, _includePaths, icejs, es6module);
+    RequireVisitor requireVisitor(_jsout, _includePaths, icejs, es6module);
     p->visit(&requireVisitor, false);
     vector<string> seenModules = requireVisitor.writeRequires(p);
 
-    TypesVisitor typesVisitor(_out, seenModules, icejs);
+    TypesVisitor typesVisitor(_jsout, seenModules, icejs);
     p->visit(&typesVisitor, false);
 
     //
     // Export the top-level modules.
     //
-    ExportVisitor exportVisitor(_out, icejs, es6module);
+    ExportVisitor exportVisitor(_jsout, icejs, es6module);
     p->visit(&exportVisitor, false);
 
     if(!es6module)
     {
         if(icejs)
         {
-            _out.zeroIndent();
-            _out << nl << "/* slice2js browser-bundle-skip */";
-            _out.restoreIndent();
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip */";
+            _jsout.restoreIndent();
         }
 
-        _out << eb;
-        _out << nl << "(typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? module : undefined,"
-             << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require :"
-             << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,"
-             << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports :"
-             << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self : window));";
+        _jsout << eb;
+        _jsout << nl << "(typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? module : undefined,"
+               << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require :"
+               << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,"
+               << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports :"
+               << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self : window));";
 
         if(icejs)
         {
-            _out.zeroIndent();
-            _out << nl << "/* slice2js browser-bundle-skip-end */";
-            _out.restoreIndent();
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip-end */";
+            _jsout.restoreIndent();
         }
     }
-}
 
-void
-Slice::Gen::closeOutput()
-{
-    _out.close();
+    if(_useStdout)
+    {
+        _jsout << "\n";
+        _jsout << "/** slice2js: generated end **/";
+        _jsout << "\n";
+    }
+
+    if(_typeScript)
+    {
+        if(_useStdout)
+        {
+            _tsout << "\n";
+            _tsout << "/** slice2js: " << _fileBase << ".d.ts generated begin module:\"" << module << "\" **/";
+            _tsout << "\n";
+        }
+        printHeader(_tsout);
+        printGeneratedHeader(_tsout, _fileBase + ".ice");
+
+        TypeScriptRequireVisitor requireVisitor(_tsout, icejs);
+        p->visit(&requireVisitor, false);
+
+        //
+        // If at some point TypeScript adds an operator to refer to a type in the global scope
+        // we can get rid of the TypeScriptAliasVisitor and use this. For now we need to generate
+        // a type alias when there is an abiguity.
+        // see: https://github.com/Microsoft/TypeScript/issues/983
+        //
+        TypeScriptAliasVisitor aliasVisitor(_tsout);
+        p->visit(&aliasVisitor, false);
+        aliasVisitor.writeAlias(p);
+
+        TypeScriptVisitor typeScriptVisitor(_tsout, requireVisitor.imports());
+        p->visit(&typeScriptVisitor, false);
+
+        if(_useStdout)
+        {
+            _tsout << "\n";
+            _tsout << "/** slice2js: generated end **/";
+            _tsout << "\n";
+        }
+    }
 }
 
 void
-Slice::Gen::printHeader()
+Slice::Gen::closeOutput()
 {
-    static const char* header =
-"// **********************************************************************\n"
-"//\n"
-"// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
-"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
-"// **********************************************************************\n"
-        ;
+    if(_jsout.isOpen())
+    {
+        _jsout.close();
+    }
 
-    _out << header;
-    _out << "//\n";
-    _out << "// Ice version " << ICE_STRING_VERSION << "\n";
-    _out << "//\n";
+    if(_tsout.isOpen())
+    {
+        _tsout.close();
+    }
 }
 
 Slice::Gen::RequireVisitor::RequireVisitor(IceUtilInternal::Output& out, vector<string> includePaths,
@@ -519,14 +872,14 @@
 }
 
 bool
-Slice::Gen::RequireVisitor::visitStructStart(const StructPtr& p)
+Slice::Gen::RequireVisitor::visitStructStart(const StructPtr&)
 {
     _seenStruct = true; // Set regardless of whether p->isLocal()
     return false;
 }
 
 void
-Slice::Gen::RequireVisitor::visitOperation(const OperationPtr& p)
+Slice::Gen::RequireVisitor::visitOperation(const OperationPtr&)
 {
     _seenOperation = true;
 }
@@ -550,9 +903,19 @@
 Slice::Gen::RequireVisitor::visitSequence(const SequencePtr& seq)
 {
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
-    if(builtin && builtin->kind() == Builtin::KindObject)
+    if(builtin)
     {
-        _seenObjectSeq = true;
+        switch(builtin->kind())
+        {
+        case Builtin::KindObject:
+            _seenObjectSeq = true;
+            break;
+        case Builtin::KindObjectProxy:
+            _seenObjectProxySeq = true;
+            break;
+        default:
+            break;
+        }
     }
 }
 
@@ -560,14 +923,24 @@
 Slice::Gen::RequireVisitor::visitDictionary(const DictionaryPtr& dict)
 {
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(dict->valueType());
-    if(builtin && builtin->kind() == Builtin::KindObject)
+    if(builtin)
     {
-        _seenObjectDict = true;
+        switch(builtin->kind())
+        {
+        case Builtin::KindObject:
+            _seenObjectDict = true;
+            break;
+        case Builtin::KindObjectProxy:
+            _seenObjectProxyDict = true;
+            break;
+        default:
+            break;
+        }
     }
 }
 
 void
-Slice::Gen::RequireVisitor::visitEnum(const EnumPtr& p)
+Slice::Gen::RequireVisitor::visitEnum(const EnumPtr&)
 {
     _seenEnum = true;
 }
@@ -580,66 +953,12 @@
     return name == "Glacier2" || name == "Ice" || name == "IceGrid" || name == "IceMX" || name == "IceStorm";
 }
 
-string
-relativePath(string p1, string p2)
-{
-    vector<string> tokens1;
-    vector<string> tokens2;
-
-    splitString(p1, "/\\", tokens1);
-    splitString(p2, "/\\", tokens2);
-
-    string f1 = tokens1.back();
-    string f2 = tokens2.back();
-
-    tokens1.pop_back();
-    tokens2.pop_back();
-
-    vector<string>::const_iterator i1 = tokens1.begin();
-    vector<string>::const_iterator i2 = tokens2.begin();
-
-    while(i1 != tokens1.end() && i2 != tokens2.end() && *i1 == *i2)
-    {
-        i1++;
-        i2++;
-    }
-
-    //
-    // Different volumes, relative path not possible.
-    //
-    if(i1 == tokens1.begin() && i2 == tokens2.begin())
-    {
-        return p1;
-    }
-
-    string newPath;
-    if(i2 == tokens2.end())
-    {
-        newPath += "./";
-        for(; i1 != tokens1.end(); ++i1)
-        {
-            newPath += *i1 + "/";
-        }
-    }
-    else
-    {
-        for(;i2 != tokens2.end();++i2)
-        {
-            newPath += "../";
-        }
-    }
-    newPath += f1;
-
-    return newPath;
-}
-
 }
 
 vector<string>
 Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p)
 {
     vector<string> seenModules;
-
     map<string, list<string> > requires;
     if(_icejs)
     {
@@ -696,58 +1015,111 @@
     StringList includes = p->includeFiles();
     if(_es6modules)
     {
-        _out << nl << "import { Ice } from \"ice\";";
-        _out << nl << "const _ModuleRegistry = Ice._ModuleRegistry;";
+        const string prefix = "js:module:";
+        DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile());
+        string m1 = dc->findMetaData(prefix);
+        if(!m1.empty())
+        {
+            m1 = m1.substr(prefix.size());
+        }
 
         seenModules.push_back("Ice");
 
+        map<string, set<string> > imports;
+        set<string> mImports;
+        {
+            mImports.insert("Ice");
+            imports["ice"] = mImports;
+        }
+
         for(StringList::const_iterator i = includes.begin(); i != includes.end(); ++i)
         {
             set<string> modules = p->getTopLevelModules(*i);
-            vector<string> newModules;
-            bool externals = false; // is there any external modules?
-            for(set<string>::const_iterator j = modules.begin(); j != modules.end(); ++j)
+
+            dc = p->findDefinitionContext(*i);
+
+            string m2 = dc->findMetaData(prefix);
+            if(!m2.empty())
+            {
+                m2 = m2.substr(prefix.size());
+            }
+
+            if(m1 != m2 && !m2.empty())
             {
-                if(find(seenModules.begin(), seenModules.end(), *j) == seenModules.end())
+                for(set<string>::const_iterator j = modules.begin(); j != modules.end(); ++j)
                 {
-                    seenModules.push_back(*j);
-                    if(!_icejs && iceBuiltinModule(*j))
+                    if(imports.find(m2) == imports.end())
                     {
-                        _out << nl << "import { " << *j << " } from \"ice\";";
+                        set<string> mImports;
+                        mImports.insert(*j);
+                        imports[m2] = mImports;
                     }
                     else
                     {
-                        newModules.push_back(*j);
-                        externals = true;
+                        imports[m2].insert(*j);
                     }
                 }
             }
+            else
+            {
+                set<string> newModules;
+                for(set<string>::const_iterator j = modules.begin(); j != modules.end(); ++j)
+                {
+                    if(find(seenModules.begin(), seenModules.end(), *j) == seenModules.end())
+                    {
+                        seenModules.push_back(*j);
+                        newModules.insert(*j);
+                    }
+                }
 
-            if(externals)
+                string f = relativePath(*i, p->topLevelFile());
+                string::size_type pos;
+                if((pos = f.rfind('.')) != string::npos)
+                {
+                    f.erase(pos);
+                }
+
+                imports[f] = newModules;
+            }
+        }
+
+        //
+        // We first import the Ice runtime
+        //
+        _out << nl << "import { ";
+        mImports = imports["ice"];
+        for(set<string>::const_iterator i = mImports.begin(); i != mImports.end();)
+        {
+            _out << (*i);
+            if(++i != mImports.end())
             {
+                _out << ", ";
+            }
+        }
+        _out << " } from \"ice\";";
+
+        _out << nl << "const _ModuleRegistry = Ice._ModuleRegistry;";
+
+        for(map<string, set<string> >::const_iterator i = imports.begin(); i != imports.end(); ++i)
+        {
+            if(i->first != "ice")
+            {
+                mImports = i->second;
                 _out << nl << "import ";
-                if(!newModules.empty())
+                if(!mImports.empty())
                 {
                     _out << "{ ";
-                    for(vector<string>::const_iterator j = newModules.begin(); j != newModules.end();)
+                    for(set<string>::const_iterator i = mImports.begin(); i != mImports.end();)
                     {
-                        _out << *j;
-                        ++j;
-                        if(j != newModules.end())
+                        _out << (*i);
+                        if(++i != mImports.end())
                         {
                             _out << ", ";
                         }
                     }
                     _out << " } from ";
                 }
-
-                string result = relativePath(*i, p->topLevelFile());
-                string::size_type pos;
-                if((pos = result.rfind('.')) != string::npos)
-                {
-                    result.erase(pos);
-                }
-                _out << "\"" << result << "\";";
+                _out << "\"" << i->first << "\";";
             }
         }
         _out << nl << "const Slice = Ice.Slice;";
@@ -777,6 +1149,7 @@
                 }
             }
         }
+
         if(_icejs)
         {
             _out.zeroIndent();
@@ -898,7 +1271,7 @@
 }
 
 void
-Slice::Gen::TypesVisitor::visitModuleEnd(const ModulePtr& p)
+Slice::Gen::TypesVisitor::visitModuleEnd(const ModulePtr&)
 {
 }
 
@@ -926,7 +1299,7 @@
     {
         base = bases.front();
         bases.erase(bases.begin());
-        baseRef = getReference(scope, base->scoped());
+        baseRef = fixId(base->scoped());
     }
     else
     {
@@ -1041,7 +1414,7 @@
             {
                 _out << nl << "super" << spar << baseParamNames << epar << ';';
             }
-            writeInitDataMembers(dataMembers, scope);
+            writeInitDataMembers(dataMembers);
             _out << eb;
 
             if(!p->isLocal())
@@ -1092,12 +1465,12 @@
     //
     // Define servant an proxy types for non local classes
     //
-    if(!p->isLocal())
+    if(!p->isLocal() && (p->isInterface() || !p->allOperations().empty()))
     {
         _out << sp;
         writeDocComment(p, getDeprecateReason(p, 0, "type"));
         _out << nl << localScope << "." << (p->isInterface() ? p->name() :  p->name() + "Disp") << " = class extends ";
-        if(hasBaseClass)
+        if(hasBaseClass && !base->allOperations().empty())
         {
             _out << getLocalScope(base->scope())  << "." << base->name() << "Disp";
         }
@@ -1141,7 +1514,7 @@
         // Generate a proxy class for interfaces or classes with operations.
         //
         string proxyType = "undefined";
-        if(p->isInterface() || p->allOperations().size() > 0)
+        if(p->isInterface() || !p->allOperations().empty())
         {
             proxyType = localScope + '.' + prxName;
             string baseProxy = "Ice.ObjectPrx";
@@ -1424,7 +1797,11 @@
          << "\"" << getHelper(type) << "\"" << ", " << (fixed ? "true" : "false");
     if(isClassType(type))
     {
-        _out<< ", \"" << typeToString(type) << "\"";
+        bool isinterface =
+            ClassDeclPtr::dynamicCast(type) &&
+            ClassDeclPtr::dynamicCast(type)->definition() &&
+            ClassDeclPtr::dynamicCast(type)->definition()->isInterface();
+        _out<< ", \"" << (isinterface ? "Ice.Value" : typeToString(type)) << "\"";
     }
     _out << ");";
 }
@@ -1439,7 +1816,7 @@
     string baseRef;
     if(base)
     {
-        baseRef = getReference(scope, base->scoped());
+        baseRef = fixId(base->scoped());
     }
     else
     {
@@ -1511,7 +1888,7 @@
     _out << "_cause = \"\"" << epar;
     _out << sb;
     _out << nl << "super" << spar << baseParamNames << "_cause" << epar << ';';
-    writeInitDataMembers(dataMembers, scope);
+    writeInitDataMembers(dataMembers);
     _out << eb;
 
     _out << sp;
@@ -1526,8 +1903,6 @@
     _out << nl << "return \"" << p->scoped() << "\";";
     _out << eb;
 
-    // TODO: equals?
-
     if(!p->isLocal())
     {
         _out << sp;
@@ -1627,7 +2002,7 @@
 
     _out << epar;
     _out << sb;
-    writeInitDataMembers(dataMembers, scope);
+    writeInitDataMembers(dataMembers);
     _out << eb;
 
     if(!p->isLocal())
@@ -1692,10 +2067,15 @@
     const string propertyName = name + "Helper";
     bool fixed = !keyType->isVariableLength() && !valueType->isVariableLength();
 
+    bool isinterface =
+            ClassDeclPtr::dynamicCast(valueType) &&
+            ClassDeclPtr::dynamicCast(valueType)->definition() &&
+            ClassDeclPtr::dynamicCast(valueType)->definition()->isInterface();
+
     _out << sp;
     _out << nl << "Slice.defineDictionary(" << scope << ", \"" << name << "\", \"" << propertyName << "\", "
          << "\"" << getHelper(keyType) << "\", "
-         << "\"" << getHelper(valueType) << "\", "
+         << "\"" << (isinterface ? "Ice.Value" : getHelper(valueType)) << "\", "
          << (fixed ? "true" : "false") << ", "
          << (keyUseEquals ? "Ice.HashMap.compareEquals" : "undefined");
 
@@ -1892,3 +2272,1023 @@
     }
     return false;
 }
+
+Slice::Gen::TypeScriptRequireVisitor::TypeScriptRequireVisitor(IceUtilInternal::Output& out, bool icejs) :
+    JsVisitor(out),
+    _icejs(icejs),
+    _nextImport(0)
+{
+}
+
+string
+Slice::Gen::TypeScriptRequireVisitor::nextImportPrefix()
+{
+    ostringstream ns;
+    ns << "iceNS" << _nextImport++;
+    return ns.str();
+}
+
+void
+Slice::Gen::TypeScriptRequireVisitor::addImport(const TypePtr& definition, const ContainedPtr& toplevel)
+{
+    if(!BuiltinPtr::dynamicCast(definition))
+    {
+        const string m1 = getModuleMetadata(definition);
+        const string m2 = getModuleMetadata(toplevel);
+
+        const string p1 = definition->definitionContext()->filename();
+        const string p2 = toplevel->definitionContext()->filename();
+
+        addImport(m1, m2, p1, p2);
+    }
+}
+
+void
+Slice::Gen::TypeScriptRequireVisitor::addImport(const ContainedPtr& definition, const ContainedPtr& toplevel)
+{
+    const string m1 = getModuleMetadata(definition);
+    const string m2 = getModuleMetadata(toplevel);
+
+    const string p1 = definition->definitionContext()->filename();
+    const string p2 = toplevel->definitionContext()->filename();
+
+    addImport(m1, m2, p1, p2);
+}
+
+void
+Slice::Gen::TypeScriptRequireVisitor::addImport(const string& m1, const string& m2,
+                                                const string& p1, const string& p2)
+{
+    //
+    // Generate an import for a definition that is outside a JS module and comes from
+    // a different definition context or for a definition defined in a module different
+    // than the current module.
+    //
+    if(m1.empty())
+    {
+        if(p1 != p2)
+        {
+            string relpath = relativePath(p1, p2);
+
+            string::size_type pos = relpath.rfind('.');
+            if(pos != string::npos)
+            {
+                relpath.erase(pos);
+            }
+
+            for(vector<pair<string, string> >::const_iterator i = _imports.begin(); i != _imports.end(); ++i)
+            {
+                if(i->first == relpath)
+                {
+                    return;
+                }
+            }
+            _imports.push_back(make_pair(relpath, nextImportPrefix()));
+        }
+    }
+    else if(m1 != m2)
+    {
+        for(vector<pair<string, string> >::const_iterator i = _imports.begin(); i != _imports.end(); ++i)
+        {
+            if(i->first == m1)
+            {
+                return;
+            }
+        }
+        _imports.push_back(make_pair(m1, nextImportPrefix()));
+    }
+}
+
+bool
+Slice::Gen::TypeScriptRequireVisitor::visitModuleStart(const ModulePtr& p)
+{
+    //
+    // Import ice module if not building Ice
+    //
+    if(UnitPtr::dynamicCast(p->container()) && !_icejs && _imports.empty())
+    {
+        _imports.push_back(make_pair("ice", nextImportPrefix()));
+    }
+    return true;
+}
+
+bool
+Slice::Gen::TypeScriptRequireVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    //
+    // Add imports required for base classes
+    //
+    ClassList bases = p->bases();
+    for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i)
+    {
+        addImport(ContainedPtr::dynamicCast(*i), p);
+    }
+
+    //
+    // Add imports required for data members
+    //
+    const DataMemberList allDataMembers = p->allDataMembers();
+    for(DataMemberList::const_iterator i = allDataMembers.begin(); i != allDataMembers.end(); ++i)
+    {
+        addImport((*i)->type(), p);
+    }
+
+    //
+    // Add imports required for operation parameters and return type
+    //
+    const OperationList operationList = p->allOperations();
+    for(OperationList::const_iterator i = operationList.begin(); i != operationList.end(); ++i)
+    {
+        const TypePtr ret = (*i)->returnType();
+        if(ret && ret->definitionContext())
+        {
+            addImport(ret, p);
+        }
+
+        const ParamDeclList paramList = (*i)->parameters();
+        for(ParamDeclList::const_iterator j = paramList.begin(); j != paramList.end(); ++j)
+        {
+            addImport((*j)->type(), p);
+        }
+    }
+    return false;
+}
+
+bool
+Slice::Gen::TypeScriptRequireVisitor::visitStructStart(const StructPtr& p)
+{
+    //
+    // Add imports required for data members
+    //
+    const DataMemberList dataMembers = p->dataMembers();
+    for(DataMemberList::const_iterator i = dataMembers.begin(); i != dataMembers.end(); ++i)
+    {
+        addImport((*i)->type(), p);
+    }
+    return false;
+}
+
+bool
+Slice::Gen::TypeScriptRequireVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    //
+    // Add imports required for base exceptions
+    //
+    ExceptionPtr base = p->base();
+    if(base)
+    {
+        addImport(ContainedPtr::dynamicCast(base), p);
+    }
+
+    //
+    // Add imports required for data members
+    //
+    const DataMemberList allDataMembers = p->allDataMembers();
+    for(DataMemberList::const_iterator i = allDataMembers.begin(); i != allDataMembers.end(); ++i)
+    {
+        addImport((*i)->type(), p);
+    }
+    return false;
+}
+
+void
+Slice::Gen::TypeScriptRequireVisitor::visitSequence(const SequencePtr& seq)
+{
+    //
+    // Add import required for the sequence element type
+    //
+    addImport(seq->type(), seq);
+}
+
+void
+Slice::Gen::TypeScriptRequireVisitor::visitDictionary(const DictionaryPtr& dict)
+{
+    //
+    // Add imports required for the dictionary key and value types
+    //
+    addImport(dict->keyType(), dict);
+    addImport(dict->valueType(), dict);
+}
+
+Slice::Gen::TypeScriptAliasVisitor::TypeScriptAliasVisitor(IceUtilInternal::Output& out) :
+    JsVisitor(out)
+{
+}
+
+void
+Slice::Gen::TypeScriptAliasVisitor::addAlias(const ExceptionPtr& type, const ContainedPtr& toplevel)
+{
+    string m1 = getModuleMetadata(ContainedPtr::dynamicCast(type));
+    string m2 = getModuleMetadata(toplevel);
+
+    //
+    // Do not add alias for a type defined in the current module
+    //
+    if(!m1.empty() && m1 == m2)
+    {
+        return;
+    }
+
+    const string prefix = importPrefix(ContainedPtr::dynamicCast(type), toplevel, imports());
+    const string typeS = prefix + getUnqualified(fixId(type->scoped()), toplevel->scope(), prefix);
+
+    addAlias(typeS, prefix, toplevel);
+}
+
+void
+Slice::Gen::TypeScriptAliasVisitor::addAlias(const TypePtr& type, const ContainedPtr& toplevel)
+{
+    string m1 = getModuleMetadata(type);
+    string m2 = getModuleMetadata(toplevel);
+
+    //
+    // Do not add alias for a type defined in the current module
+    //
+    if(!m1.empty() && m1 == m2)
+    {
+        return;
+    }
+
+    addAlias(typeToString(type, toplevel, imports(), true),
+             importPrefix(type, toplevel, imports()),
+             toplevel);
+}
+
+void
+Slice::Gen::TypeScriptAliasVisitor::addAlias(const string& type, const string& prefix,
+                                             const ContainedPtr& toplevel)
+{
+    const string scope = fixId(toplevel->scoped()) + ".";
+    //
+    // When using an import prefix we don't need an alias, prefixes use iceNSXX that is reserved
+    // name prefix
+    //
+    string::size_type i = type.find(".");
+    if(prefix.empty() && i != string::npos)
+    {
+        if(scope.find("." + type.substr(0, i + 1)) != string::npos)
+        {
+            for(vector<pair<string, string> >::const_iterator j = _aliases.begin(); j != _aliases.end(); ++j)
+            {
+                if(j->first == type)
+                {
+                    return;
+                }
+            }
+            string alias = type;
+            replace(alias.begin(), alias.end(), '.', '_');
+            //
+            // We prefix alias with iceA this avoid conflict with iceNSX used for
+            // import prefixes
+            //
+            _aliases.push_back(make_pair(type, "iceA_" + alias));
+        }
+    }
+}
+
+bool
+Slice::Gen::TypeScriptAliasVisitor::visitModuleStart(const ModulePtr&)
+{
+    return true;
+}
+
+bool
+Slice::Gen::TypeScriptAliasVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    ModulePtr module = ModulePtr::dynamicCast(p->container());
+    //
+    // Add alias required for base classes
+    //
+    ClassList bases = p->bases();
+    for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i)
+    {
+        addAlias(TypePtr::dynamicCast((*i)->declaration()), module);
+    }
+
+    //
+    // Add alias required for data members
+    //
+    const DataMemberList allDataMembers = p->allDataMembers();
+    for(DataMemberList::const_iterator i = allDataMembers.begin(); i != allDataMembers.end(); ++i)
+    {
+        addAlias((*i)->type(), module);
+    }
+
+    //
+    // Add alias required for operation parameters
+    //
+    const OperationList operationList = p->allOperations();
+    for(OperationList::const_iterator i = operationList.begin(); i != operationList.end(); ++i)
+    {
+        const TypePtr ret = (*i)->returnType();
+        if(ret && ret->definitionContext())
+        {
+            addAlias(ret, module);
+        }
+
+        const ParamDeclList paramList = (*i)->parameters();
+        for(ParamDeclList::const_iterator j = paramList.begin(); j != paramList.end(); ++j)
+        {
+            addAlias((*j)->type(), module);
+        }
+    }
+    return false;
+}
+
+bool
+Slice::Gen::TypeScriptAliasVisitor::visitStructStart(const StructPtr& p)
+{
+    ModulePtr module = ModulePtr::dynamicCast(p->container());
+    //
+    // Add alias required for data members
+    //
+    const DataMemberList dataMembers = p->dataMembers();
+    for(DataMemberList::const_iterator i = dataMembers.begin(); i != dataMembers.end(); ++i)
+    {
+        addAlias((*i)->type(), module);
+    }
+    return false;
+}
+
+bool
+Slice::Gen::TypeScriptAliasVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    ModulePtr module = ModulePtr::dynamicCast(p->container());
+    //
+    // Add alias required for base exception
+    //
+    ExceptionPtr base = p->base();
+    if(base)
+    {
+        addAlias(base, module);
+    }
+
+    //
+    // Add alias required for data members
+    //
+    const DataMemberList allDataMembers = p->allDataMembers();
+    for(DataMemberList::const_iterator i = allDataMembers.begin(); i != allDataMembers.end(); ++i)
+    {
+        addAlias((*i)->type(), module);
+    }
+    return false;
+}
+
+void
+Slice::Gen::TypeScriptAliasVisitor::visitSequence(const SequencePtr& seq)
+{
+    addAlias(seq->type(), ModulePtr::dynamicCast(seq->container()));
+}
+
+void
+Slice::Gen::TypeScriptAliasVisitor::visitDictionary(const DictionaryPtr& dict)
+{
+    ModulePtr module = ModulePtr::dynamicCast(dict->container());
+    addAlias(dict->keyType(), module);
+    addAlias(dict->valueType(), module);
+}
+
+void
+Slice::Gen::TypeScriptAliasVisitor::writeAlias(const UnitPtr&)
+{
+    if(!_aliases.empty())
+    {
+        _out << sp;
+        for(vector<pair<string, string> >::const_iterator i = _aliases.begin(); i != _aliases.end(); ++i)
+        {
+            _out << nl << "type " << i->second << " = " << i->first << ";";
+        }
+    }
+}
+
+Slice::Gen::TypeScriptVisitor::TypeScriptVisitor(::IceUtilInternal::Output& out,
+                                                 const vector<pair<string, string> >& imports) :
+    JsVisitor(out, imports),
+    _wroteImports(false)
+{
+}
+
+void
+Slice::Gen::TypeScriptVisitor::writeImports()
+{
+    if(!_wroteImports)
+    {
+        for(vector<pair<string, string> >::const_iterator i = _imports.begin(); i != _imports.end(); ++i)
+        {
+            _out << nl << "import * as " << i->second << " from \"" << i->first << "\"";
+        }
+        _wroteImports = true;
+    }
+}
+
+bool
+Slice::Gen::TypeScriptVisitor::visitModuleStart(const ModulePtr& p)
+{
+    UnitPtr unit = UnitPtr::dynamicCast(p->container());
+    if(unit)
+    {
+        _out << sp;
+        writeImports();
+        _out << nl << "export namespace " << fixId(p->name()) << sb;
+    }
+    else
+    {
+        _out << nl << "namespace " << fixId(p->name()) << sb;
+    }
+    return true;
+}
+
+void
+Slice::Gen::TypeScriptVisitor::visitModuleEnd(const ModulePtr&)
+{
+    _out << eb; // namespace end
+}
+
+bool
+Slice::Gen::TypeScriptVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    const string toplevelModule = getModuleMetadata(ContainedPtr::dynamicCast(p));
+    const string icePrefix = importPrefix("Ice.", p);
+    if(p->isDelegate())
+    {
+        // A delegate only has one operation
+        OperationPtr op = p->allOperations().front();
+        CommentPtr comment = op->parseComment(false);
+        if(comment)
+        {
+            writeOpDocSummary(_out, op, comment, OpDocAllParams, true, StringList(), StringList(), comment->returns());
+        }
+        _out << nl << "type " << fixId(p->name()) << " = " << spar;
+        ParamDeclList paramList = op->parameters();
+        for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q)
+        {
+            ostringstream os;
+            os << fixId((*q)->name()) << ":";
+            if((*q)->isOutParam())
+            {
+                os << icePrefix << getUnqualified("Ice.Holder", p->scope(), icePrefix) << "<";
+            }
+            os << typeToString((*q)->type(), p, imports(), true, false, true);
+            if((*q)->isOutParam())
+            {
+                os << ">";
+            }
+            _out << os.str();
+        }
+        _out << epar << " => ";
+        TypePtr ret = op->returnType();
+        if(ret)
+        {
+            _out << typeToString(ret, p, imports(), true, false, true) << ";";
+        }
+        else
+        {
+            _out << "void;";
+        }
+    }
+    else if(p->isLocal())
+    {
+        const ClassList bases = p->bases();
+        const DataMemberList dataMembers = p->dataMembers();
+        const DataMemberList allDataMembers = p->allDataMembers();
+
+        _out << sp;
+        writeDocSummary(_out, p);
+        _out << nl;
+        _out << (p->isInterface() ? "interface" : "class") << " " << fixId(p->name());
+        if(!bases.empty() && !bases.front()->isInterface())
+        {
+            const string prefix = importPrefix(ContainedPtr::dynamicCast(bases.front()), p, imports());
+            _out << " extends " << prefix << getUnqualified(fixId(bases.front()->scoped()), p->scope(), prefix);
+        }
+        _out << sb;
+        if(!p->isInterface())
+        {
+            _out << nl << "/**";
+            _out << nl << " * One-shot constructor to initialize all data members.";
+            for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+            {
+                CommentPtr comment = (*q)->parseComment(false);
+                if(comment)
+                {
+                    _out << nl << " * @param " << fixId((*q)->name()) << " " << getDocSentence(comment->overview());
+                }
+            }
+            _out << nl << " */";
+            _out << nl << "constructor" << spar;
+            for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+            {
+                _out << (fixId((*q)->name()) + "?:" + typeToString((*q)->type(), p, imports(), true, false, true));
+            }
+            _out << epar << ";";
+
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            {
+                writeDocSummary(_out, *q);
+                _out << nl << fixId((*q)->name()) << ":" << typeToString((*q)->type(), p, imports(), true, false, true)
+                     << ";";
+            }
+        }
+
+        OperationList allOperations = p->allOperations();
+        for(OperationList::const_iterator q = allOperations.begin(); q != allOperations.end(); ++q)
+        {
+            OperationPtr op = *q;
+            ParamDeclList params = op->parameters();
+            ParamDeclList inParams, outParams;
+            for(ParamDeclList::const_iterator r = params.begin(); r != params.end(); ++r)
+            {
+                if((*r)->isOutParam())
+                {
+                    outParams.push_back(*r);
+                }
+                else
+                {
+                    inParams.push_back(*r);
+                }
+            }
+
+            TypePtr ret = op->returnType();
+            bool async = op->hasMetaData("js:async") || op->hasMetaData("async-oneway");
+            CommentPtr comment = op->parseComment(false);
+            if(comment)
+            {
+                StringList returns;
+                if(async)
+                {
+                    returns.push_back("@returns The asynchronous result object for the invocation.");
+                }
+                else if(ret)
+                {
+                    returns = comment->returns();
+                }
+                writeOpDocSummary(_out, op, comment, OpDocAllParams, true, StringList(), StringList(), returns);
+            }
+
+            _out << nl << fixId((*q)->name()) << spar;
+            for(ParamDeclList::const_iterator r = inParams.begin(); r != inParams.end(); r++)
+            {
+                _out << (fixId((*r)->name()) + ":" + typeToString((*r)->type(), p, imports(), true, false, true));
+            }
+
+            for(ParamDeclList::const_iterator r = outParams.begin(); r != outParams.end(); r++)
+            {
+                const string prefix = importPrefix("Ice.Holder", p);
+                _out << (fixId((*r)->name()) + ":"  + prefix +
+                         getUnqualified("Ice.Holder", p->scope(), prefix) + "<" +
+                         typeToString((*r)->type(), p, imports(), true, false, true) + ">");
+            }
+
+            _out << epar;
+
+            _out << ":";
+            if(async)
+            {
+               _out << icePrefix << getUnqualified("Ice.AsyncResultBase", p->scope(), icePrefix) << "<";
+            }
+
+            if(ret)
+            {
+                _out << typeToString(ret, p, imports(), true, false, true);
+            }
+            else
+            {
+                _out << "void";
+            }
+
+            if (async)
+            {
+                _out << ">";
+            }
+            _out << ";";
+        }
+
+        if(p->hasMetaData("js:comparable"))
+        {
+            _out << nl << "equals(rhs:any):boolean";
+        }
+        _out << eb;
+    }
+    else
+    {
+        const OperationList ops = p->allOperations();
+        if(p->isInterface() || !ops.empty())
+        {
+            //
+            // Define servant an proxy types for non local classes
+            //
+            _out << sp;
+            _out << nl << "abstract class " << fixId(p->name() + "Prx")
+                 << " extends " << icePrefix << getUnqualified("Ice.ObjectPrx", p->scope(), icePrefix);
+            _out << sb;
+
+            for(OperationList::const_iterator q = ops.begin(); q != ops.end(); ++q)
+            {
+                const OperationPtr op = *q;
+                const ParamDeclList paramList = op->parameters();
+                const TypePtr ret = op->returnType();
+                ParamDeclList inParams, outParams;
+                for(ParamDeclList::const_iterator r = paramList.begin(); r != paramList.end(); ++r)
+                {
+                    if((*r)->isOutParam())
+                    {
+                        outParams.push_back(*r);
+                    }
+                    else
+                    {
+                        inParams.push_back(*r);
+                    }
+                }
+
+                const string contextParam = escapeParam(paramList, "context");
+                CommentPtr comment = op->parseComment(false);
+                const string contextDoc = "@param " + contextParam + " The Context map to send with the invocation.";
+                const string asyncDoc = "The asynchronous result object for the invocation.";
+                if(comment)
+                {
+                    StringList postParams, returns;
+                    postParams.push_back(contextDoc);
+                    returns.push_back(asyncDoc);
+                    writeOpDocSummary(_out, op, comment, OpDocInParams, false, StringList(), postParams, returns);
+                }
+                _out << nl << fixId((*q)->name()) << spar;
+                for(ParamDeclList::const_iterator r = inParams.begin(); r != inParams.end(); ++r)
+                {
+                    _out << (fixId((*r)->name()) +
+                             ((*r)->optional() ? "?" : "") +
+                             ":" +
+                             typeToString((*r)->type(), p, imports(), true, false, true));
+                }
+                _out << "context?:Map<string, string>";
+                _out << epar;
+
+                _out << ":" << icePrefix << getUnqualified("Ice.AsyncResult", p->scope(), icePrefix);
+                if(!ret && outParams.empty())
+                {
+                    _out << "<void>";
+                }
+                else if((ret && outParams.empty()) || (!ret && outParams.size() == 1))
+                {
+                    TypePtr t = ret ? ret : outParams.front()->type();
+                    _out << "<" << typeToString(t, p, imports(), true, false, true) << ">";
+                }
+                else
+                {
+                    _out << "<[";
+                    if(ret)
+                    {
+                        _out << typeToString(ret, p, imports(), true, false, true) << ", ";
+                    }
+
+                    for(ParamDeclList::const_iterator i = outParams.begin(); i != outParams.end();)
+                    {
+                        _out << typeToString((*i)->type(), p, imports(), true, false, true);
+                        if(++i != outParams.end())
+                        {
+                            _out << ", ";
+                        }
+                    }
+
+                    _out << "]>";
+                }
+
+                _out << ";";
+            }
+
+            const string icePrefix = importPrefix("Ice.ObjectPrx", p);
+            _out << sp;
+            _out << nl << "/**";
+            _out << nl << " * Downcasts a proxy without confirming the target object's type via a remote invocation.";
+            _out << nl << " * @param prx The target proxy.";
+            _out << nl << " * @return A proxy with the requested type.";
+            _out << nl << " */";
+            _out << nl << "static uncheckedCast(prx:" << icePrefix
+                 << getUnqualified("Ice.ObjectPrx", p->scope(), icePrefix) << ", "
+                 << "facet?:string):"
+                 << fixId(p->name() + "Prx") << ";";
+            _out << nl << "/**";
+            _out << nl << " * Downcasts a proxy after confirming the target object's type via a remote invocation.";
+            _out << nl << " * @param prx The target proxy.";
+            _out << nl << " * @param facet A facet name.";
+            _out << nl << " * @param context The context map for the invocation.";
+            _out << nl << " * @return A proxy with the requested type and facet, or nil if the target proxy is nil or the target";
+            _out << nl << " * object does not support the requested type.";
+            _out << nl << " */";
+            _out << nl << "static checkedCast(prx:" << icePrefix
+                 << getUnqualified("Ice.ObjectPrx", p->scope(), icePrefix) << ", "
+                 << "facet?:string, contex?:Map<string, string>):" << icePrefix
+                 << getUnqualified("Ice.AsyncResult", p->scope(), icePrefix) << "<" << fixId(p->name() + "Prx") << ">;";
+            _out << eb;
+
+            _out << sp;
+            _out << nl << "abstract class " << fixId(p->name() + (p->isInterface() ? "" : "Disp"))
+                 << " extends " << icePrefix << getUnqualified("Ice.Object", p->scope(), icePrefix);
+            _out << sb;
+            for(OperationList::const_iterator q = ops.begin(); q != ops.end(); ++q)
+            {
+                const OperationPtr op = *q;
+                const ParamDeclList paramList = op->parameters();
+                const TypePtr ret = op->returnType();
+                ParamDeclList inParams, outParams;
+                for(ParamDeclList::const_iterator r = paramList.begin(); r != paramList.end(); ++r)
+                {
+                    if((*r)->isOutParam())
+                    {
+                        outParams.push_back(*r);
+                    }
+                    else
+                    {
+                        inParams.push_back(*r);
+                    }
+                }
+
+                const string currentParam = escapeParam(inParams, "current");
+                CommentPtr comment = p->parseComment(false);
+                const string currentDoc = "@param " + currentParam + " The Current object for the invocation.";
+                const string resultDoc = "The result or a promise like object that will "
+                    "be resolved with the result of the invocation.";
+                if(comment)
+                {
+                    StringList postParams, returns;
+                    postParams.push_back(currentDoc);
+                    returns.push_back(resultDoc);
+                    writeOpDocSummary(_out, op, comment, OpDocInParams, false, StringList(), postParams, returns);
+                }
+                _out << nl << "abstract " << fixId((*q)->name()) << spar;
+                for(ParamDeclList::const_iterator r = inParams.begin(); r != inParams.end(); ++r)
+                {
+                    _out << (fixId((*r)->name()) + ":" + typeToString((*r)->type(), p, imports(), true, false, true));
+                }
+                _out << ("current:" + icePrefix + getUnqualified("Ice.Current", p->scope(), icePrefix));
+                _out << epar << ":";
+
+                if(!ret && outParams.empty())
+                {
+                    _out << "PromiseLike<void>|void";
+                }
+                else if((ret && outParams.empty()) || (!ret && outParams.size() == 1))
+                {
+                    TypePtr t = ret ? ret : outParams.front()->type();
+                    string returnType = typeToString(t, p, imports(), true, false, true);
+                    _out << "PromiseLike<" << returnType  << ">|" << returnType;
+                }
+                else
+                {
+                    ostringstream os;
+                    if(ret)
+                    {
+                        os << typeToString(ret, p, imports(), true, false, true) << ", ";
+                    }
+
+                    for(ParamDeclList::const_iterator i = outParams.begin(); i != outParams.end();)
+                    {
+                        os << typeToString((*i)->type(), p, imports(), true, false, true);
+                        if(++i != outParams.end())
+                        {
+                            os << ", ";
+                        }
+                    }
+                    _out << "PromiseLike<[" << os.str() << "]>|[" << os.str() << "]";
+                }
+                _out << ";";
+            }
+            _out << nl << "/**";
+            _out << nl << " * Obtains the Slice type ID of this type.";
+            _out << nl << " * @return The return value is always \"" + p->scoped() + "\".";
+            _out << nl << " */";
+            _out << nl << "static ice_staticId():string;";
+            _out << eb;
+        }
+
+        if(!p->isInterface())
+        {
+            const DataMemberList dataMembers = p->dataMembers();
+            const DataMemberList allDataMembers = p->allDataMembers();
+            _out << sp;
+            writeDocSummary(_out, p);
+            _out << nl << "class " << fixId(p->name()) << " extends ";
+            const string scope = p->scope();
+            const string scoped = p->scoped();
+            ClassList bases = p->bases();
+            if(!bases.empty() && !bases.front()->isInterface())
+            {
+                ClassDefPtr base = bases.front();
+                const string prefix = importPrefix(ContainedPtr::dynamicCast(base), p, imports());
+                _out << prefix << getUnqualified(fixId(base->scoped()), p->scope(), prefix);
+            }
+            else
+            {
+                _out << icePrefix << getUnqualified("Ice.Value", p->scope(), icePrefix);
+            }
+            _out << sb;
+            _out << nl << "/**";
+            _out << nl << " * One-shot constructor to initialize all data members.";
+            for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+            {
+                CommentPtr comment = (*q)->parseComment(false);
+                if(comment)
+                {
+                    _out << nl << " * @param " << fixId((*q)->name()) << " " << getDocSentence(comment->overview());
+                }
+            }
+            _out << nl << " */";
+            _out << nl << "constructor" << spar;
+            for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+            {
+                _out << (fixId((*q)->name()) + "?:" + typeToString((*q)->type(), p, imports(), true, false, true));
+            }
+            _out << epar << ";";
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            {
+                writeDocSummary(_out, *q);
+                _out << nl << fixId((*q)->name()) << ":" << typeToString((*q)->type(), p, imports(), true, false, true)
+                     << ";";
+            }
+            _out << eb;
+        }
+    }
+    return false;
+}
+
+bool
+Slice::Gen::TypeScriptVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    const string name = fixId(p->name());
+    const DataMemberList dataMembers = p->dataMembers();
+    const DataMemberList allDataMembers = p->allDataMembers();
+    const string toplevelModule = getModuleMetadata(ContainedPtr::dynamicCast(p));
+    const string icePrefix = importPrefix("Ice.", p);
+
+    ExceptionPtr base = p->base();
+    string baseRef;
+    if(base)
+    {
+        const string prefix = importPrefix(ContainedPtr::dynamicCast(base), p, imports());
+        baseRef = prefix + getUnqualified(fixId(base->scoped()), p->scope(), prefix);
+    }
+    else
+    {
+        baseRef = p->isLocal() ?
+            icePrefix + getUnqualified("Ice.LocalException", p->scope(), icePrefix) :
+            icePrefix + getUnqualified("Ice.UserException", p->scope(), icePrefix);
+    }
+
+    _out << sp;
+    writeDocSummary(_out, p);
+    _out << nl << "class " << name << " extends " << baseRef << sb;
+    if(!allDataMembers.empty())
+    {
+        _out << nl << "/**";
+        _out << nl << " * One-shot constructor to initialize all data members.";
+        for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+        {
+            CommentPtr comment = (*q)->parseComment(false);
+            if(comment)
+            {
+                _out << nl << " * @param " << fixId((*q)->name()) << " " << getDocSentence(comment->overview());
+            }
+        }
+        _out << nl << " * @param ice_cause The error that cause this exception.";
+        _out << nl << " */";
+        _out << nl << "constructor" << spar;
+        for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+        {
+            _out << (fixId((*q)->name()) + "?:" + typeToString((*q)->type(), p, imports(), true, false, true));
+        }
+        _out << "ice_cause?:string|Error";
+        _out << epar << ";";
+    }
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        _out << nl << fixId((*q)->name()) << ":" << typeToString((*q)->type(), p, imports(), true, false, true) << ";";
+    }
+    _out << eb;
+    return false;
+}
+
+bool
+Slice::Gen::TypeScriptVisitor::visitStructStart(const StructPtr& p)
+{
+    const string icePrefix = importPrefix("Ice.", p);
+    const string name = fixId(p->name());
+    const DataMemberList dataMembers = p->dataMembers();
+    const string toplevelModule = getModuleMetadata(ContainedPtr::dynamicCast(p));
+    _out << sp;
+    writeDocSummary(_out, p);
+    _out << nl << "class " << name << sb;
+    _out << nl << "constructor" << spar;
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        _out << (fixId((*q)->name()) + "?:" + typeToString((*q)->type(), p, imports(), true, false, true));
+    }
+    _out << epar << ";";
+
+    _out << nl << "clone():" << name << ";";
+    _out << nl << "equals(rhs:any):boolean;";
+
+    //
+    // Only generate hashCode if this structure type is a legal dictionary key type.
+    //
+    bool containsSequence = false;
+    bool legalKeyType = Dictionary::legalKeyType(p, containsSequence);
+    if(legalKeyType)
+    {
+        _out << nl << "hashCode():number;";
+    }
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        _out << nl << fixId((*q)->name()) << ":" << typeToString((*q)->type(), p, imports(), true, false, true) << ";";
+    }
+
+    //
+    // Streaming API
+    //
+    _out << nl << "static write(outs:" << icePrefix << getUnqualified("Ice.OutputStream", p->scope(), icePrefix)
+         << ", value:" << name << "):void;";
+    _out << nl << "static read(ins:" << icePrefix << getUnqualified("Ice.InputStream", p->scope(), icePrefix) << "):"
+         << name << ";";
+    _out << eb;
+    return false;
+}
+
+void
+Slice::Gen::TypeScriptVisitor::visitSequence(const SequencePtr& p)
+{
+    const string icePrefix = importPrefix("Ice.", p);
+    const string toplevelModule = getModuleMetadata(ContainedPtr::dynamicCast(p));
+    const string name = fixId(p->name());
+    _out << sp;
+    writeDocSummary(_out, p);
+    _out << nl << "type " << name << " = " << typeToString(p, p, imports(), true, true) << ";";
+
+    _out << sp;
+    _out << nl << "class " << fixId(p->name() + "Helper");
+    _out << sb;
+    //
+    // Streaming API
+    //
+    _out << nl << "static write(outs:" << icePrefix << getUnqualified("Ice.OutputStream", p->scope(), icePrefix)
+         << ", value:" << name << "):void;";
+    _out << nl << "static read(ins:" << icePrefix << getUnqualified("Ice.InputStream", p->scope(), icePrefix) << "):"
+         << name << ";";
+    _out << eb;
+}
+
+void
+Slice::Gen::TypeScriptVisitor::visitDictionary(const DictionaryPtr& p)
+{
+    const string icePrefix = importPrefix("Ice.", p);
+    const string toplevelModule = getModuleMetadata(ContainedPtr::dynamicCast(p));
+    const string name = fixId(p->name());
+    _out << sp;
+    writeDocSummary(_out, p);
+    _out << nl << "class " << name << " extends " << typeToString(p, p, imports(), true, true);
+    _out << sb;
+    _out << eb;
+
+    _out << sp;
+    _out << nl << "class " << fixId(p->name() + "Helper");
+    _out << sb;
+    //
+    // Streaming API
+    //
+    _out << nl << "static write(outs:" << icePrefix << getUnqualified("Ice.OutputStream", p->scope(), icePrefix)
+         << ", value:" << name << "):void;";
+    _out << nl << "static read(ins:" << icePrefix << getUnqualified("Ice.InputStream", p->scope(), icePrefix) << "):"
+         << name << ";";
+    _out << eb;
+}
+
+void
+Slice::Gen::TypeScriptVisitor::visitEnum(const EnumPtr& p)
+{
+    _out << sp;
+    writeDocSummary(_out, p);
+    _out << nl << "class " << fixId(p->name());
+    _out << sb;
+    const EnumeratorList enumerators = p->enumerators();
+    for(EnumeratorList::const_iterator en = enumerators.begin(); en != enumerators.end(); ++en)
+    {
+        writeDocSummary(_out, *en);
+        _out << nl << "static readonly " << fixId((*en)->name()) << ":" << fixId(p->name()) << ";";
+    }
+    _out << nl;
+    _out << nl << "static valueOf(value:number):" << fixId(p->name()) << ";";
+    _out << nl << "equals(other:any):boolean;";
+    _out << nl << "hashCode():number;";
+    _out << nl << "toString():string;";
+    _out << nl;
+    _out << nl << "readonly name:string;";
+    _out << nl << "readonly value:number;";
+    _out << eb;
+}
+
+void
+Slice::Gen::TypeScriptVisitor::visitConst(const ConstPtr& p)
+{
+    const string toplevelModule = getModuleMetadata(p->type());
+    _out << sp;
+    writeDocSummary(_out, p);
+    _out << nl << "const " << fixId(p->name()) << ":" << typeToString(p->type(), p, imports(), true) << ";";
+}
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2js/Gen.h zeroc-ice-3.7.2/cpp/src/slice2js/Gen.h
--- zeroc-ice-3.7.1/cpp/src/slice2js/Gen.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2js/Gen.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_H
 #define GEN_H
@@ -19,14 +14,18 @@
 {
 public:
 
-    JsVisitor(::IceUtilInternal::Output&);
+    JsVisitor(::IceUtilInternal::Output&,
+              const std::vector<std::pair<std::string, std::string> >& imports =
+                    std::vector<std::pair<std::string, std::string> >());
     virtual ~JsVisitor();
 
+    std::vector<std::pair<std::string, std::string> > imports() const;
+
 protected:
 
     void writeMarshalDataMembers(const DataMemberList&, const DataMemberList&);
     void writeUnmarshalDataMembers(const DataMemberList&, const DataMemberList&);
-    void writeInitDataMembers(const DataMemberList&, const std::string&);
+    void writeInitDataMembers(const DataMemberList&);
 
     std::string getValue(const std::string&, const TypePtr&);
 
@@ -36,6 +35,8 @@
     void writeDocComment(const ContainedPtr&, const std::string&, const std::string& = "");
 
     ::IceUtilInternal::Output& _out;
+
+    std::vector<std::pair<std::string, std::string> > _imports;
 };
 
 class Gen : public JsGenerator
@@ -44,11 +45,13 @@
 
     Gen(const std::string&,
         const std::vector<std::string>&,
-        const std::string&);
+        const std::string&,
+        bool);
 
     Gen(const std::string&,
         const std::vector<std::string>&,
         const std::string&,
+        bool,
         std::ostream&);
 
     ~Gen();
@@ -58,14 +61,13 @@
 
 private:
 
-    std::ofstream _stdout;
-    IceUtilInternal::Output _out;
+    IceUtilInternal::Output _jsout;
+    IceUtilInternal::Output _tsout;
 
     std::vector<std::string> _includePaths;
     std::string _fileBase;
     bool _useStdout;
-
-    void printHeader();
+    bool _typeScript;
 
     class RequireVisitor : public JsVisitor
     {
@@ -95,7 +97,9 @@
         bool _seenLocalException;
         bool _seenEnum;
         bool _seenObjectSeq;
+        bool _seenObjectProxySeq;
         bool _seenObjectDict;
+        bool _seenObjectProxyDict;
         std::vector<std::string> _includePaths;
     };
 
@@ -103,7 +107,7 @@
     {
     public:
 
-        TypesVisitor(::IceUtilInternal::Output&, std::vector< std::string>, bool);
+        TypesVisitor(::IceUtilInternal::Output&, std::vector<std::string>, bool);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -130,12 +134,85 @@
         ExportVisitor(::IceUtilInternal::Output&, bool, bool);
 
         virtual bool visitModuleStart(const ModulePtr&);
+
     private:
 
         bool _icejs;
         bool _es6modules;
         std::vector<std::string> _exported;
     };
+
+    class TypeScriptRequireVisitor : public JsVisitor
+    {
+    public:
+
+        TypeScriptRequireVisitor(::IceUtilInternal::Output&, bool);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+
+    private:
+
+        void addImport(const TypePtr&, const ContainedPtr&);
+        void addImport(const ContainedPtr&, const ContainedPtr&);
+        void addImport(const std::string&, const std::string&, const std::string&, const std::string&);
+
+        std::string nextImportPrefix();
+
+        bool _icejs;
+        int _nextImport;
+        std::map<std::string, std::string> _modulePrefix;
+    };
+
+    class TypeScriptAliasVisitor : public JsVisitor
+    {
+    public:
+
+        TypeScriptAliasVisitor(::IceUtilInternal::Output&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+
+        void writeAlias(const UnitPtr&);
+
+    private:
+
+        void addAlias(const ExceptionPtr&, const ContainedPtr&);
+        void addAlias(const TypePtr&, const ContainedPtr&);
+        void addAlias(const std::string&, const std::string&, const ContainedPtr&);
+        std::vector<std::pair<std::string, std::string> > _aliases;
+    };
+
+    class TypeScriptVisitor : public JsVisitor
+    {
+    public:
+
+        TypeScriptVisitor(::IceUtilInternal::Output&,
+                          const std::vector<std::pair<std::string, std::string> >&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+
+    private:
+
+        void writeImports();
+        bool _wroteImports;
+    };
 };
 
 }
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2js/JsUtil.cpp zeroc-ice-3.7.2/cpp/src/slice2js/JsUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2js/JsUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2js/JsUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <JsUtil.h>
 #include <Slice/Util.h>
 #include <IceUtil/Functional.h>
+#include <IceUtil/StringUtil.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -22,11 +18,80 @@
 #include <unistd.h>
 #endif
 
+// TODO: fix this warning!
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
 using namespace IceUtilInternal;
 
+string
+Slice::relativePath(const string& p1, const string& p2)
+{
+    vector<string> tokens1;
+    vector<string> tokens2;
+
+    splitString(p1, "/\\", tokens1);
+    splitString(p2, "/\\", tokens2);
+
+    string f1 = tokens1.back();
+    string f2 = tokens2.back();
+
+    tokens1.pop_back();
+    tokens2.pop_back();
+
+    vector<string>::const_iterator i1 = tokens1.begin();
+    vector<string>::const_iterator i2 = tokens2.begin();
+
+    while(i1 != tokens1.end() && i2 != tokens2.end() && *i1 == *i2)
+    {
+        i1++;
+        i2++;
+    }
+
+    //
+    // Different volumes, relative path not possible.
+    //
+    if(i1 == tokens1.begin() && i2 == tokens2.begin())
+    {
+        return p1;
+    }
+
+    string newPath;
+    if(i2 == tokens2.end())
+    {
+        newPath += "./";
+        for (; i1 != tokens1.end(); ++i1)
+        {
+            newPath += *i1 + "/";
+        }
+    }
+    else
+    {
+        for(size_t i = tokens2.end() - i2; i > 0; i--)
+        {
+            newPath += "../";
+        }
+
+        for(; i1 != tokens1.end(); ++i1)
+        {
+            newPath += *i1 + "/";
+        }
+    }
+    newPath += f1;
+
+    return newPath;
+}
+
 static string
 lookupKwd(const string& name)
 {
@@ -99,11 +164,55 @@
     return newIds;
 }
 
+string
+Slice::JsGenerator::getModuleMetadata(const TypePtr& type)
+{
+    static const char* builtinModuleTable[] =
+    {
+        "",           // byte
+        "",           // bool
+        "",           // short
+        "",           // int
+        "ice",        // long
+        "",           // float
+        "",           // double
+        "",           // string
+        "ice",        // Ice.Value
+        "ice",        // Ice.ObjectPrx
+        "",           // LocalObject
+        "ice"         // Ice.Object
+    };
+
+    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
+    if(builtin)
+    {
+        return builtinModuleTable[builtin->kind()];
+    }
+
+    ProxyPtr proxy = ProxyPtr::dynamicCast(type);
+    return getModuleMetadata(proxy ? ContainedPtr::dynamicCast(proxy->_class()->definition()) :
+                                     ContainedPtr::dynamicCast(type));
+}
+
+string
+Slice::JsGenerator::getModuleMetadata(const ContainedPtr& p)
+{
+    //
+    // Check if the file contains the python:pkgdir global metadata.
+    //
+    DefinitionContextPtr dc = p->definitionContext();
+    assert(dc);
+    const string prefix = "js:module:";
+    const string value = dc->findMetaData(prefix);
+    return value.empty() ? value : value.substr(prefix.size());
+}
+
 bool
 Slice::JsGenerator::isClassType(const TypePtr& type)
 {
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-    return (builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type);
+    return (builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) ||
+        ClassDeclPtr::dynamicCast(type);
 }
 
 //
@@ -146,20 +255,182 @@
 }
 
 string
-Slice::JsGenerator::typeToString(const TypePtr& type)
+Slice::JsGenerator::importPrefix(const TypePtr& type,
+                                 const ContainedPtr& toplevel,
+                                 const vector<pair<string, string> >& imports)
+{
+    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
+    if(builtin)
+    {
+        return typeToString(type, toplevel, imports, true);
+    }
+    else if(ProxyPtr::dynamicCast(type))
+    {
+        ProxyPtr proxy = ProxyPtr::dynamicCast(type);
+        return importPrefix(ContainedPtr::dynamicCast(proxy->_class()->definition()), toplevel, imports);
+    }
+    else if(ContainedPtr::dynamicCast(type))
+    {
+        bool local = false;
+        if(toplevel)
+        {
+            if(ConstructedPtr::dynamicCast(toplevel))
+            {
+                local = ConstructedPtr::dynamicCast(toplevel)->isLocal();
+            }
+            else if(ClassDefPtr::dynamicCast(toplevel))
+            {
+                local = ClassDefPtr::dynamicCast(toplevel)->isLocal();
+            }
+        }
+
+        ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
+        if(cl && cl->isInterface() && !local)
+        {
+            return "iceNS0.";
+        }
+        else
+        {
+            return importPrefix(ContainedPtr::dynamicCast(type), toplevel, imports);
+        }
+    }
+    return "";
+}
+
+string
+Slice::JsGenerator::importPrefix(const ContainedPtr& contained,
+                                 const ContainedPtr& toplevel,
+                                 const vector<pair<string, string> >& imports)
+{
+    string m1 = getModuleMetadata(contained);
+    string m2 = getModuleMetadata(toplevel);
+
+    string p;
+
+    if(m1.empty())
+    {
+        string p1 = contained->definitionContext()->filename();
+        string p2 = toplevel->definitionContext()->filename();
+
+        p = relativePath(p1, p2);
+
+        string::size_type pos = p.rfind('.');
+        if (pos != string::npos)
+        {
+            p.erase(pos);
+        }
+    }
+    else if(m1 == "ice" && m1 != m2)
+    {
+        return "iceNS0.";
+    }
+    else if(m1 != m2)
+    {
+        p = m1;
+    }
+
+    if(!p.empty())
+    {
+        for(vector<pair<string, string> >::const_iterator i = imports.begin(); i != imports.end(); ++i)
+        {
+            if(i->first == p)
+            {
+                return i->second + ".";
+            }
+        }
+    }
+
+    return "";
+}
+
+bool
+Slice::JsGenerator::findMetaData(const string& prefix, const StringList& metaData, string& value)
+{
+    for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); i++)
+    {
+        string s = *i;
+        if(s.find(prefix) == 0)
+        {
+            value = s.substr(prefix.size());
+            return true;
+        }
+    }
+    return false;
+}
+
+string
+Slice::JsGenerator::importPrefix(const string& type, const ContainedPtr& toplevel)
+{
+    const string module = getModuleMetadata(toplevel);
+    return (type.find("Ice.") == 0 && module != "ice") ? "iceNS0." : "";
+}
+
+string
+Slice::JsGenerator::getUnqualified(const string& type, const string& scope, const string& importPrefix)
+{
+    if(importPrefix.empty())
+    {
+        const string localScope = getLocalScope(scope) + ".";
+        if(type.find(localScope) == 0)
+        {
+            string t = type.substr(localScope.size());
+            if(t.find(".") == string::npos)
+            {
+                return t;
+            }
+        }
+    }
+    return type;
+}
+
+string
+Slice::JsGenerator::typeToString(const TypePtr& type,
+                                 const ContainedPtr& toplevel,
+                                 const vector<pair<string, string> >& imports,
+                                 bool typescript,
+                                 bool definition)
 {
     if(!type)
     {
         return "void";
     }
 
-    static const char* builtinTable[] =
+    bool local = false;
+    if(toplevel)
+    {
+        if(ConstructedPtr::dynamicCast(toplevel))
+        {
+            local = ConstructedPtr::dynamicCast(toplevel)->isLocal();
+        }
+        else if(ClassDefPtr::dynamicCast(toplevel))
+        {
+            local = ClassDefPtr::dynamicCast(toplevel)->isLocal();
+        }
+    }
+
+    static const char* typeScriptBuiltinTable[] =
+    {
+        "number",           // byte
+        "boolean",          // bool
+        "number",           // short
+        "number",           // int
+        "Ice.Long",         // long
+        "number",           // float
+        "number",           // double
+        "string",
+        "Ice.Object",
+        "Ice.ObjectPrx",
+        "Object",
+        "Ice.Value"
+    };
+
+    static const char* javaScriptBuiltinTable[] =
     {
         "Number",           // byte
         "Boolean",          // bool
         "Number",           // short
         "Number",           // int
-        "Number",           // long
+        "Ice.Long",         // long
         "Number",           // float
         "Number",           // double
         "String",
@@ -172,39 +443,200 @@
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
     if(builtin)
     {
-        return builtinTable[builtin->kind()];
+        if(typescript)
+        {
+            int kind = (!local && builtin->kind() == Builtin::KindObject) ? Builtin::KindValue : builtin->kind();
+            ostringstream os;
+            if(getModuleMetadata(type) == "ice" && getModuleMetadata(toplevel) != "ice")
+            {
+                os << "iceNS0.";
+            }
+            os << getUnqualified(typeScriptBuiltinTable[kind], toplevel->scope(), "iceNS0.");
+            return os.str();
+        }
+        else
+        {
+            return javaScriptBuiltinTable[builtin->kind()];
+        }
     }
 
-    ProxyPtr proxy = ProxyPtr::dynamicCast(type);
-    if(proxy)
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
+    if(cl)
     {
-        return fixId(proxy->_class()->scoped() + "Prx");
+        string prefix;
+        ostringstream os;
+        if(typescript)
+        {
+            if(cl->isInterface() && !local)
+            {
+                prefix = importPrefix("Ice.Value", toplevel);
+            }
+            else
+            {
+                prefix = importPrefix(ContainedPtr::dynamicCast(cl), toplevel, imports);
+            }
+        }
+        os << prefix;
+        if(!prefix.empty() && typescript)
+        {
+            if(cl->isInterface() && !local)
+            {
+                os << getUnqualified("Ice.Value", toplevel->scope(), prefix);
+            }
+            else
+            {
+                os << getUnqualified(fixId(cl->scoped()), toplevel->scope(), prefix);
+            }
+        }
+        else
+        {
+            os << fixId(cl->scoped());
+        }
+        return os.str();
     }
 
-    SequencePtr seq = SequencePtr::dynamicCast(type);
-    if(seq)
+    ProxyPtr proxy = ProxyPtr::dynamicCast(type);
+    if(proxy)
     {
-        return typeToString(seq->type()) + "[]";
+        ostringstream os;
+        ClassDefPtr def = proxy->_class()->definition();
+        if(!def->isInterface() && def->allOperations().empty())
+        {
+            if(getModuleMetadata(toplevel) != "ice")
+            {
+                os << "iceNS0.";
+            }
+            os << getUnqualified(typeScriptBuiltinTable[Builtin::KindObjectProxy],
+                                 toplevel->scope(),
+                                 getModuleMetadata(toplevel));
+        }
+        else
+        {
+            string prefix;
+            if(typescript)
+            {
+                prefix = importPrefix(ContainedPtr::dynamicCast(def), toplevel, imports);
+                os << prefix;
+            }
+
+            if(prefix.empty() && typescript)
+            {
+                os << getUnqualified(fixId(proxy->_class()->scoped() + "Prx"), toplevel->scope(), prefix);
+            }
+            else
+            {
+                os << fixId(proxy->_class()->scoped() + "Prx");
+            }
+        }
+        return os.str();
     }
 
-    DictionaryPtr d = DictionaryPtr::dynamicCast(type);
-    if(d)
+    if(!typescript || definition)
     {
-        const TypePtr keyType = d->keyType();
-        BuiltinPtr b = BuiltinPtr::dynamicCast(keyType);
-        return ((b && b->kind() == Builtin::KindLong) || StructPtr::dynamicCast(keyType)) ? "Ice.HashMap" : "Map";
+        SequencePtr seq = SequencePtr::dynamicCast(type);
+        if (seq)
+        {
+            BuiltinPtr b = BuiltinPtr::dynamicCast(seq->type());
+            if (b && b->kind() == Builtin::KindByte)
+            {
+                return "Uint8Array";
+            }
+            else
+            {
+                return typeToString(seq->type(), toplevel, imports, typescript) + "[]";
+            }
+        }
+
+        DictionaryPtr d = DictionaryPtr::dynamicCast(type);
+        if(d)
+        {
+            const TypePtr keyType = d->keyType();
+            BuiltinPtr builtin = BuiltinPtr::dynamicCast(keyType);
+            ostringstream os;
+            if ((builtin && builtin->kind() == Builtin::KindLong) || StructPtr::dynamicCast(keyType))
+            {
+                const string prefix = importPrefix("Ice.HashMap", toplevel);
+                os << prefix << getUnqualified("Ice.HashMap", toplevel->scope(), prefix);
+            }
+            else
+            {
+                os << "Map";
+            }
+
+            if (typescript)
+            {
+                os << "<"
+                    << typeToString(keyType, toplevel, imports, true) << ", "
+                    << typeToString(d->valueType(), toplevel, imports, true) << ">";
+            }
+            return os.str();
+        }
     }
 
     ContainedPtr contained = ContainedPtr::dynamicCast(type);
     if(contained)
     {
-        return fixId(contained->scoped());
+        ostringstream os;
+        string prefix;
+        if(typescript)
+        {
+            prefix = importPrefix(contained, toplevel, imports);
+            os << prefix;
+        }
+
+        if(prefix.empty() && typescript)
+        {
+            os << getUnqualified(fixId(contained->scoped()), toplevel->scope(), prefix);
+        }
+        else
+        {
+            os << fixId(contained->scoped());
+        }
+        return os.str();
     }
 
     return "???";
 }
 
 string
+Slice::JsGenerator::typeToString(const TypePtr& type,
+                                 const ContainedPtr& toplevel,
+                                 const std::vector<std::pair<std::string, std::string> >& imports,
+                                 bool typeScript,
+                                 bool definition,
+                                 bool usealias)
+{
+    string t = typeToString(type, toplevel, imports, typeScript, definition);
+    if(usealias)
+    {
+        string m1 = getModuleMetadata(type);
+        string m2 = getModuleMetadata(toplevel);
+        if (!m1.empty() && m1 == m2)
+        {
+            // we are using the same module
+            return t;
+        }
+        string p = importPrefix(type, toplevel, imports);
+
+        //
+        // When using an import prefix we don't need an alias, prefixes use iceNSXX that is reserved
+        // name prefix
+        //
+        string::size_type i = t.find(".");
+        if(p.empty() && i != string::npos)
+        {
+            const string scoped = fixId(toplevel->scoped()) + ".";
+            if(scoped.find("." + t.substr(0, i + 1)) != string::npos)
+            {
+                replace(t.begin(), t.end(), '.', '_');
+                t = "iceA_" + t;
+            }
+        }
+    }
+    return t;
+}
+
+string
 Slice::JsGenerator::getLocalScope(const string& scope, const string& separator)
 {
     assert(!scope.empty());
@@ -222,6 +654,7 @@
     {
         fixedScope = scope;
     }
+
     if(fixedScope.empty())
     {
         return "";
@@ -243,39 +676,6 @@
     return result.str();
 }
 
-string
-Slice::JsGenerator::getReference(const string& scope, const string& target)
-{
-    //
-    // scope and target should be fully-qualified symbols.
-    //
-    assert(!scope.empty() && scope[0] == ':' && !target.empty() && target[0] == ':');
-
-    //
-    // Check whether the target is in the given scope.
-    //
-    if(target.find(scope) == 0)
-    {
-        //
-        // Remove scope from target, but keep the leading "::".
-        //
-        const string rem = target.substr(scope.size() - 2);
-        assert(!rem.empty());
-        const StringList ids = fixIds(splitScopedName(rem));
-        stringstream result;
-        result << getLocalScope(scope);
-        for(StringList::const_iterator i = ids.begin(); i != ids.end(); ++i)
-        {
-            result << '.' << *i;
-        }
-        return result.str();
-    }
-    else
-    {
-        return fixId(target);
-    }
-}
-
 void
 Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out,
                                               const TypePtr& type,
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2js/JsUtil.h zeroc-ice-3.7.2/cpp/src/slice2js/JsUtil.h
--- zeroc-ice-3.7.1/cpp/src/slice2js/JsUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2js/JsUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef JS_UTIL_H
 #define JS_UTIL_H
@@ -16,20 +11,46 @@
 namespace Slice
 {
 
+std::string relativePath(const std::string&, const std::string&);
+
 class JsGenerator : private ::IceUtil::noncopyable
 {
 public:
 
     virtual ~JsGenerator() {};
 
-protected:
-
     static bool isClassType(const TypePtr&);
+    static std::string getModuleMetadata(const TypePtr&);
+    static std::string getModuleMetadata(const ContainedPtr&);
     static std::string fixId(const std::string&);
     static std::string fixId(const ContainedPtr&);
-    static std::string typeToString(const TypePtr&);
+    static bool findMetaData(const std::string&, const StringList&, std::string&);
+    static std::string importPrefix(const TypePtr&,
+                                    const ContainedPtr&,
+                                    const std::vector<std::pair<std::string, std::string> >&);
+
+    static std::string importPrefix(const ContainedPtr&,
+                                    const ContainedPtr&,
+                                    const std::vector<std::pair<std::string, std::string> >&);
+    static std::string importPrefix(const std::string&, const ContainedPtr&);
+
+    static std::string getUnqualified(const std::string&, const std::string&, const std::string&);
+
+    static std::string typeToString(const TypePtr&,
+                                    const ContainedPtr& = 0,
+                                    const std::vector<std::pair<std::string, std::string> >& =
+                                        std::vector<std::pair<std::string, std::string> >(),
+                                    bool typeScript = false,
+                                    bool definition = false);
+
+    static std::string typeToString(const TypePtr&,
+                                    const ContainedPtr&,
+                                    const std::vector<std::pair<std::string, std::string> >&,
+                                    bool typeScript,
+                                    bool definition,
+                                    bool usealias);
+
     static std::string getLocalScope(const std::string&, const std::string& separator = ".");
-    static std::string getReference(const std::string&, const std::string&);
 
     static std::string getHelper(const TypePtr&);
     //
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2js/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2js/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2js/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2js/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/CtrlCHandler.h>
@@ -75,6 +70,7 @@
         "--depend-file FILE       Write dependencies to FILE instead of standard output.\n"
         "--validate               Validate command line options.\n"
         "--stdout                 Print generated code to stdout.\n"
+        "--typescript             Generate TypeScript declarations.\n"
         "--depend-json            Generate dependency information in JSON format.\n"
         "--ice                    Allow reserved Ice prefix in Slice identifiers\n"
         "                         deprecated: use instead [[\"ice-prefix\"]] metadata.\n"
@@ -95,6 +91,7 @@
     opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("E");
     opts.addOpt("", "stdout");
+    opts.addOpt("", "typescript");
     opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "depend");
     opts.addOpt("", "depend-json");
@@ -172,6 +169,8 @@
 
     bool underscore = opts.isSet("underscore");
 
+    bool typeScript = opts.isSet("typescript");
+
     if(args.empty())
     {
         consoleErr << argv[0] << ": error: no input file" << endl;
@@ -245,18 +244,20 @@
         }
     }
 
+    map<string, vector<string> > moduleInfo;
+
     for(vector<string>::const_iterator i = sources.begin(); i != sources.end();)
     {
-        if(depend || dependJSON || dependxml)
-        {
-            PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
-            FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2JS__");
+        PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
+        FILE* cppHandle = icecpp->preprocess(true, "-D__SLICE2JS__");
 
-            if(cppHandle == 0)
-            {
-                return EXIT_FAILURE;
-            }
+        if(cppHandle == 0)
+        {
+            return EXIT_FAILURE;
+        }
 
+        if(depend || dependJSON || dependxml)
+        {
             UnitPtr u = Unit::createUnit(false, false, ice, underscore);
             int parseStatus = u->parse(*i, cppHandle, debug);
             u->destroy();
@@ -269,7 +270,8 @@
             bool last = (++i == sources.end());
 
             if(!icecpp->printMakefileDependencies(os,
-                    depend ? Preprocessor::JavaScript : (dependJSON ? Preprocessor::JavaScriptJSON : Preprocessor::SliceXML),
+                    depend ? Preprocessor::JavaScript : (dependJSON ? Preprocessor::JavaScriptJSON :
+                                                                      Preprocessor::SliceXML),
                     includePaths,
                     "-D__SLICE2JS__"))
             {
@@ -292,13 +294,6 @@
         }
         else
         {
-            PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
-            FILE* cppHandle = icecpp->preprocess(true, "-D__SLICE2JS__");
-
-            if(cppHandle == 0)
-            {
-                return EXIT_FAILURE;
-            }
             if(preprocess)
             {
                 char buf[4096];
@@ -331,16 +326,36 @@
                 }
                 else
                 {
+                    DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile());
+                    assert(dc);
+                    const string prefix = "js:module:";
+                    string m = dc->findMetaData(prefix);
+                    if(!m.empty())
+                    {
+                        m = m.substr(prefix.size());
+                    }
+
+                    if(moduleInfo.find(m) == moduleInfo.end())
+                    {
+                        vector<string> files;
+                        files.push_back(*i);
+                        moduleInfo[m] = files;
+                    }
+                    else
+                    {
+                        moduleInfo[m].push_back(*i);
+                    }
+
                     try
                     {
                         if(useStdout)
                         {
-                            Gen gen(icecpp->getBaseName(), includePaths, output, cout);
+                            Gen gen(icecpp->getBaseName(), includePaths, output, typeScript, cout);
                             gen.generate(p);
                         }
                         else
                         {
-                            Gen gen(icecpp->getBaseName(), includePaths, output);
+                            Gen gen(icecpp->getBaseName(), includePaths, output, typeScript);
                             gen.generate(p);
                         }
                     }
@@ -405,16 +420,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2js/msbuild/slice2js.vcxproj zeroc-ice-3.7.2/cpp/src/slice2js/msbuild/slice2js.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2js/msbuild/slice2js.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2js/msbuild/slice2js.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -71,7 +71,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -81,7 +81,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -91,7 +91,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,7 +101,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2matlab/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2matlab/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2matlab/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2matlab/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/InputUtil.h>
@@ -39,6 +33,17 @@
 using namespace Slice;
 using namespace IceUtilInternal;
 
+// TODO: fix this warning!
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 namespace
 {
 
@@ -249,7 +254,7 @@
         f = f.substr(pos + 1);
     }
 
-    out << nl << "% Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.";
+    out << nl << "% Copyright (c) ZeroC, Inc. All rights reserved.";
     out << nl << "% Generated from " << f << " by slice2matlab version " << ICE_STRING_VERSION;
     out << nl;
 }
@@ -277,7 +282,7 @@
             if(IceUtilInternal::mkdir(path, 0777) != 0)
             {
                 ostringstream os;
-                os << "cannot create directory `" << path << "': " << strerror(errno);
+                os << "cannot create directory `" << path << "': " << IceUtilInternal::errorToString(errno);
                 throw FileException(__FILE__, __LINE__, os.str());
             }
             FileTracker::instance()->addDirectory(path);
@@ -363,7 +368,11 @@
     DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
     if(dict)
     {
-        if(!StructPtr::dynamicCast(dict->keyType()))
+        if(StructPtr::dynamicCast(dict->keyType()))
+        {
+            return "struct";
+        }
+        else
         {
             return "containers.Map";
         }
@@ -1604,11 +1613,6 @@
 bool
 CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
 {
-    if(p->hasMetaData("matlab:internal"))
-    {
-        return false;
-    }
-
     const string name = fixIdent(p->name());
     const string scoped = p->scoped();
     const string abs = getAbsolute(p);
@@ -3605,7 +3609,7 @@
 
         if(cls || convert)
         {
-            out << nl << "function r = convert(d, obj)";
+            out << nl << "function r = convert(d)";
             out.inc();
             if(st)
             {
@@ -5014,16 +5018,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj zeroc-ice-3.7.2/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2matlab/msbuild/slice2matlab.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -71,7 +71,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -80,7 +80,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -89,7 +89,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -98,7 +98,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -135,4 +135,4 @@
     <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" />
     <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2objc/Gen.cpp zeroc-ice-3.7.2/cpp/src/slice2objc/Gen.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2objc/Gen.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2objc/Gen.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/Functional.h>
 #include "Gen.h"
 #include <limits>
@@ -28,6 +23,17 @@
 using namespace Slice;
 using namespace IceUtilInternal;
 
+// TODO: fix this warning!
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 namespace
 {
 
@@ -661,7 +667,7 @@
     return result;
 }
 
-Slice::Gen::Gen(const string& name, const string& base, const string& include, const vector<string>& includePaths,
+Slice::Gen::Gen(const string& /*name*/, const string& base, const string& include, const vector<string>& includePaths,
                 const string& dir, const string& dllExport) :
     _base(base),
     _include(include),
@@ -696,7 +702,7 @@
     if(!_H)
     {
         ostringstream os;
-        os << "cannot open `" << fileH << "': " << strerror(errno);
+        os << "cannot open `" << fileH << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(fileH);
@@ -707,7 +713,7 @@
     if(!_M)
     {
         ostringstream os;
-        os << "cannot open `" << fileM << "': " << strerror(errno);
+        os << "cannot open `" << fileM << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
     FileTracker::instance()->addFile(fileM);
@@ -870,14 +876,9 @@
 Slice::Gen::printHeader(Output& o)
 {
     static const char* header =
-"// **********************************************************************\n"
-"//\n"
-"// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// **********************************************************************\n"
         ;
 
     o << header;
@@ -901,7 +902,7 @@
 }
 
 void
-Slice::Gen::UnitVisitor::visitUnitEnd(const UnitPtr& unit)
+Slice::Gen::UnitVisitor::visitUnitEnd(const UnitPtr&)
 {
     string uuid = IceUtil::generateUUID();
     for(string::size_type pos = 0; pos < uuid.size(); ++pos)
@@ -1624,7 +1625,7 @@
 }
 
 void
-Slice::Gen::TypesVisitor::writeInit(const ContainedPtr& p, const DataMemberList& dataMembers,
+Slice::Gen::TypesVisitor::writeInit(const ContainedPtr&, const DataMemberList& dataMembers,
                                     const DataMemberList& baseDataMembers, const DataMemberList& allDataMembers,
                                     bool requiresMemberInit, int baseType, ContainerType ct) const
 {
@@ -1778,7 +1779,7 @@
 }
 
 void
-Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers, int baseType,
+Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers, int /*baseType*/,
                                                ContainerType ct) const
 {
     if(ct == LocalException)
@@ -2017,7 +2018,7 @@
         string paramName = getParamName(*q, true);
 
         string capName = (*q)->name();
-        capName[0] = toupper(static_cast<unsigned char>(capName[0]));
+        capName[0] = static_cast<char>(toupper(static_cast<unsigned char>(capName[0])));
 
         _H << nl << "-(void)set" << capName << ":(" << typeString << ")" << name << ";";
 
@@ -2559,7 +2560,8 @@
     TypePtr valueType = p->valueType();
     BuiltinPtr valueBuiltin = BuiltinPtr::dynamicCast(valueType);
     ClassDeclPtr valueClass = ClassDeclPtr::dynamicCast(valueType);
-    if((valueBuiltin && valueBuiltin->kind() == Builtin::KindObject) || valueClass)
+    if((valueBuiltin && (valueBuiltin->kind() == Builtin::KindObject || valueBuiltin->kind() == Builtin::KindValue)) ||
+       valueClass)
     {
         _H << sp << nl << _dllExport << "@interface " << name << " : ICEObjectDictionaryHelper";
         _H << nl << "@end";
@@ -2670,7 +2672,7 @@
 }
 
 bool
-Slice::Gen::DelegateMVisitor::visitModuleStart(const ModulePtr& p)
+Slice::Gen::DelegateMVisitor::visitModuleStart(const ModulePtr&)
 {
     return true;
 }
@@ -3018,7 +3020,7 @@
 }
 
 void
-Slice::Gen::DelegateMVisitor::visitClassDefEnd(const ClassDefPtr& p)
+Slice::Gen::DelegateMVisitor::visitClassDefEnd(const ClassDefPtr&)
 {
     _H << nl << "@end";
     _M << nl << "@end";
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2objc/Gen.h zeroc-ice-3.7.2/cpp/src/slice2objc/Gen.h
--- zeroc-ice-3.7.1/cpp/src/slice2objc/Gen.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2objc/Gen.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef GEN_H
 #define GEN_H
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2objc/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2objc/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2objc/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2objc/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <Slice/Preprocessor.h>
@@ -48,7 +43,7 @@
 }
 
 void
-interruptedCallback(int signal)
+interruptedCallback(int)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
     interrupted = true;
@@ -348,16 +343,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2objc/msbuild/slice2objc.vcxproj zeroc-ice-3.7.2/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2objc/msbuild/slice2objc.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2objc/msbuild/slice2objc.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -71,7 +71,7 @@
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -81,7 +81,7 @@
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -101,7 +101,7 @@
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2objc/ObjCUtil.cpp zeroc-ice-3.7.2/cpp/src/slice2objc/ObjCUtil.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2objc/ObjCUtil.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2objc/ObjCUtil.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <ObjCUtil.h>
 #include <Slice/Util.h>
@@ -76,6 +71,7 @@
             {
                 break;
             }
+            /* FALLTHROUGH */
 
         case BaseTypeObject:
             found = binary_search(&nsObjectList[0],
@@ -148,7 +144,7 @@
 }
 
 ModulePtr
-Slice::ObjCGenerator::findModule(const ContainedPtr& cont, int baseTypes, bool mangleCasts)
+Slice::ObjCGenerator::findModule(const ContainedPtr& cont, int /*baseTypes*/, bool /*mangleCasts*/)
 {
     ModulePtr m = ModulePtr::dynamicCast(cont);
     ContainerPtr container = cont->container();
@@ -240,17 +236,17 @@
     }
     else if(deprecated || name.size() < 2 || !isupper(*(name.begin() + 1)))
     {
-        *name.begin() = tolower(*name.begin());
+        *name.begin() = static_cast<char>(tolower(*name.begin()));
     }
     else
     {
-        for(string::iterator p = name.begin(); p != name.end() && isalpha(*p); ++p)
+        for(string::iterator q = name.begin(); q != name.end() && isalpha(*q); ++q)
         {
-            if(p != name.end() - 1 && isalpha(*(p + 1)) && !isupper(*(p + 1)))
+            if(q != name.end() - 1 && isalpha(*(q + 1)) && !isupper(*(q + 1)))
             {
                 break;
             }
-            *p = tolower(*p);
+            *q = static_cast<char>(tolower(*q));
         }
     }
     return name;
@@ -445,6 +441,7 @@
         {
             case Builtin::KindString:
             case Builtin::KindObject:
+            case Builtin::KindValue:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
             {
@@ -481,7 +478,7 @@
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
     if(builtin)
     {
-        return builtin->kind() == Builtin::KindObject;
+        return builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue;
     }
     return ClassDeclPtr::dynamicCast(type);
 }
@@ -551,6 +548,7 @@
             return "String";
         }
         case Builtin::KindObject:
+        case Builtin::KindValue:
         {
             return "Object";
         }
@@ -711,7 +709,7 @@
     if(builtin)
     {
         string name;
-        if(builtin->kind() == Builtin::KindObject)
+        if(builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)
         {
             if(marshal)
             {
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2objc/ObjCUtil.h zeroc-ice-3.7.2/cpp/src/slice2objc/ObjCUtil.h
--- zeroc-ice-3.7.1/cpp/src/slice2objc/ObjCUtil.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2objc/ObjCUtil.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef OBJC_UTIL_H
 #define OBJC_UTIL_H
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2php/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2php/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2php/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2php/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/InputUtil.h>
@@ -35,6 +29,17 @@
 #  include <unistd.h>
 #endif
 
+// TODO: fix this warning!
+#if defined(_MSC_VER)
+#   pragma warning(disable:4456) // shadow
+#   pragma warning(disable:4457) // shadow
+#   pragma warning(disable:4459) // shadow
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 using namespace std;
 using namespace Slice;
 using namespace Slice::PHP;
@@ -95,6 +100,7 @@
     // Emit the array for a Slice type.
     //
     void writeType(const TypePtr&);
+    string getType(const TypePtr&);
 
     //
     // Write a default value for a given type.
@@ -162,14 +168,15 @@
         _out << sp << nl << "global " << type << ';';
 
         bool isInterface = p->isInterface();
-        if(!p->isLocal() && (isInterface || p->definition()->allOperations().size() > 0))
+        ClassDefPtr def = p->definition();
+        if(!p->isLocal() && (isInterface || (def && def->allOperations().size() > 0)))
         {
             _out << nl << "global " << type << "Prx;";
         }
         _out << nl << "if(!isset(" << type << "))";
         _out << sb;
         _out << nl << type << " = IcePHP_declareClass('" << scoped << "');";
-        if(!p->isLocal() && (isInterface || p->definition()->allOperations().size() > 0))
+        if(!p->isLocal() && (isInterface || (def && def->allOperations().size() > 0)))
         {
             _out << nl << type << "Prx = IcePHP_declareProxy('" << scoped << "');";
         }
@@ -184,16 +191,6 @@
 bool
 CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
 {
-    //
-    // Do not generate any code for php:internal types, those are provided by
-    // IcePHP C++ extension.
-    //
-    StringList metadata = p->getMetaData();
-    if(find(metadata.begin(), metadata.end(), "php:internal") != metadata.end())
-    {
-        return false;
-    }
-
     string scoped = p->scoped();
     string name = getName(p);
     string type = getTypeVar(p);
@@ -427,16 +424,52 @@
         }
     }
 
+    {
+        string type;
+        vector<string> seenType;
+        if(base || (!p->isLocal() && !isInterface))
+        {
+            _out << sp << nl << "global ";
+            if(!base)
+            {
+                type = "$Ice__t_Value";
+            }
+            else
+            {
+                type = getTypeVar(base);
+            }
+            _out << type << ";";
+        }
+        seenType.push_back(type);
+
+        for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q)
+        {
+            string type = getType((*q)->type());
+            if(find(seenType.begin(), seenType.end(), type) == seenType.end())
+            {
+                seenType.push_back(type);
+                _out << nl << "global " << type << ";";
+            }
+        }
+    }
+
     //
     // Emit the type information.
     //
     const bool preserved = p->hasMetaData("preserve-slice") || p->inheritsMetaData("preserve-slice");
-    _out << sp << nl << type << " = IcePHP_defineClass('" << scoped << "', '" << escapeName(abs) << "', "
+    _out << nl << type << " = IcePHP_defineClass('" << scoped << "', '" << escapeName(abs) << "', "
          << p->compactId() << ", " << (preserved ? "true" : "false") << ", "
          << (isInterface ? "true" : "false") << ", ";
-    if(!base || (isInterface && !p->isLocal()))
+    if(!base)
     {
-        _out << "$Ice__t_Value";
+        if(p->isLocal() || isInterface)
+        {
+            _out << "null";
+        }
+        else
+        {
+            _out << "$Ice__t_Value";
+        }
     }
     else
     {
@@ -478,7 +511,17 @@
 
     if(!p->isLocal() && isAbstract)
     {
-        _out << sp << nl << prxType << " = IcePHP_defineProxy('" << scoped << "', ";
+        _out << sp << nl << "global ";
+        if(!base || base->allOperations().empty())
+        {
+            _out << "$Ice__t_ObjectPrx";
+        }
+        else
+        {
+            _out << getTypeVar(base, "Prx");
+        }
+        _out << ";";
+        _out << nl << prxType << " = IcePHP_defineProxy('" << scoped << "', ";
         if(!base || base->allOperations().empty())
         {
             _out << "$Ice__t_ObjectPrx";
@@ -521,6 +564,31 @@
         if(!ops.empty())
         {
             _out << sp;
+            vector<string> seenTypes;
+            for(OperationList::const_iterator p = ops.begin(); p != ops.end(); ++p)
+            {
+                ParamDeclList params = (*p)->parameters();
+                for(ParamDeclList::const_iterator q = params.begin(); q != params.end(); ++q)
+                {
+                    string type = getType((*q)->type());
+                    if(find(seenTypes.begin(), seenTypes.end(), type) == seenTypes.end())
+                    {
+                        seenTypes.push_back(type);
+                        _out << nl << "global " << type << ";";
+                    }
+                }
+
+                if((*p)->returnType())
+                {
+                    string type = getType((*p)->returnType());
+                    if(find(seenTypes.begin(), seenTypes.end(), type) == seenTypes.end())
+                    {
+                        seenTypes.push_back(type);
+                        _out << nl << "global " << type << ";";
+                    }
+                }
+            }
+
             for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
             {
                 ParamDeclList params = (*oli)->parameters();
@@ -649,16 +717,6 @@
 bool
 CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
 {
-    //
-    // Do not generate any code for php:internal types, those are provided by
-    // IcePHP C++ extension.
-    //
-    StringList metadata = p->getMetaData();
-    if(find(metadata.begin(), metadata.end(), "php:internal") != metadata.end())
-    {
-        return false;
-    }
-
     string scoped = p->scoped();
     string name = getName(p);
     string type = getTypeVar(p);
@@ -751,6 +809,17 @@
 
     _out << eb;
 
+    vector<string> seenType;
+    for(DataMemberList::iterator dmli = members.begin(); dmli != members.end(); ++dmli)
+    {
+        string type = getType((*dmli)->type());
+        if(find(seenType.begin(), seenType.end(), type) == seenType.end())
+        {
+            seenType.push_back(type);
+            _out << nl << "global " << type << ";";
+        }
+    }
+
     //
     // Emit the type information.
     //
@@ -805,16 +874,6 @@
 bool
 CodeVisitor::visitStructStart(const StructPtr& p)
 {
-    //
-    // Do not generate any code for php:internal types, those are provided by
-    // IcePHP C++ extension.
-    //
-    StringList metadata = p->getMetaData();
-    if(find(metadata.begin(), metadata.end(), "php:internal") != metadata.end())
-    {
-        return false;
-    }
-
     string scoped = p->scoped();
     string name = getName(p);
     string type = getTypeVar(p);
@@ -868,10 +927,21 @@
 
     _out << eb;
 
+    _out << sp;
+    vector<string> seenType;
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
+    {
+        string type = getType(r->dataMember->type());
+        if(find(seenType.begin(), seenType.end(), type) == seenType.end())
+        {
+            seenType.push_back(type);
+            _out << nl << "global " << type << ";";
+        }
+    }
     //
     // Emit the type information.
     //
-    _out << sp << nl << type << " = IcePHP_defineStruct('" << scoped << "', '" << escapeName(abs) << "', array(";
+    _out << nl << type << " = IcePHP_defineStruct('" << scoped << "', '" << escapeName(abs) << "', array(";
     //
     // Data members are represented as an array:
     //
@@ -900,16 +970,6 @@
 void
 CodeVisitor::visitSequence(const SequencePtr& p)
 {
-    //
-    // Do not generate any code for php:internal types, those are provided by
-    // IcePHP C++ extension.
-    //
-    StringList metadata = p->getMetaData();
-    if(find(metadata.begin(), metadata.end(), "php:internal") != metadata.end())
-    {
-        return;
-    }
-
     string type = getTypeVar(p);
     TypePtr content = p->type();
 
@@ -922,6 +982,7 @@
     _out << sp << nl << "global " << type << ';';
     _out << sp << nl << "if(!isset(" << type << "))";
     _out << sb;
+    _out << nl << "global " << getType(content) << ";";
     _out << nl << type << " = IcePHP_defineSequence('" << scoped << "', ";
     writeType(content);
     _out << ");";
@@ -933,16 +994,6 @@
 void
 CodeVisitor::visitDictionary(const DictionaryPtr& p)
 {
-    //
-    // Do not generate any code for php:internal types, those are provided by
-    // IcePHP C++ extension.
-    //
-    StringList metadata = p->getMetaData();
-    if(find(metadata.begin(), metadata.end(), "php:internal") != metadata.end())
-    {
-        return;
-    }
-
     TypePtr keyType = p->keyType();
     BuiltinPtr b = BuiltinPtr::dynamicCast(keyType);
 
@@ -994,6 +1045,8 @@
     _out << sp << nl << "global " << type << ';';
     _out << sp << nl << "if(!isset(" << type << "))";
     _out << sb;
+    _out << nl << "global " << getType(p->keyType()) << ";";
+    _out << nl << "global " << getType(p->valueType()) << ";";
     _out << nl << type << " = IcePHP_defineDictionary('" << scoped << "', ";
     writeType(p->keyType());
     _out << ", ";
@@ -1007,16 +1060,6 @@
 void
 CodeVisitor::visitEnum(const EnumPtr& p)
 {
-    //
-    // Do not generate any code for php:internal types, those are provided by
-    // IcePHP C++ extension.
-    //
-    StringList metadata = p->getMetaData();
-    if(find(metadata.begin(), metadata.end(), "php:internal") != metadata.end())
-    {
-        return;
-    }
-
     string scoped = p->scoped();
     string name = getName(p);
     string type = getTypeVar(p);
@@ -1059,16 +1102,6 @@
 void
 CodeVisitor::visitConst(const ConstPtr& p)
 {
-    //
-    // Do not generate any code for php:internal types, those are provided by
-    // IcePHP C++ extension.
-    //
-    StringList metadata = p->getMetaData();
-    if(find(metadata.begin(), metadata.end(), "php:internal") != metadata.end())
-    {
-        return;
-    }
-
     string name = getName(p);
     string type = getTypeVar(p);
     string abs = getAbsolute(p, _ns);
@@ -1138,6 +1171,12 @@
 void
 CodeVisitor::writeType(const TypePtr& p)
 {
+    _out << getType(p);
+}
+
+string
+CodeVisitor::getType(const TypePtr& p)
+{
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
     if(builtin)
     {
@@ -1145,82 +1184,69 @@
         {
             case Builtin::KindBool:
             {
-                _out << "$IcePHP__t_bool";
-                break;
+                return "$IcePHP__t_bool";
             }
             case Builtin::KindByte:
             {
-                _out << "$IcePHP__t_byte";
-                break;
+                return "$IcePHP__t_byte";
             }
             case Builtin::KindShort:
             {
-                _out << "$IcePHP__t_short";
-                break;
+                return "$IcePHP__t_short";
             }
             case Builtin::KindInt:
             {
-                _out << "$IcePHP__t_int";
-                break;
+                return "$IcePHP__t_int";
             }
             case Builtin::KindLong:
             {
-                _out << "$IcePHP__t_long";
-                break;
+                return "$IcePHP__t_long";
             }
             case Builtin::KindFloat:
             {
-                _out << "$IcePHP__t_float";
-                break;
+                return "$IcePHP__t_float";
             }
             case Builtin::KindDouble:
             {
-                _out << "$IcePHP__t_double";
-                break;
+                return "$IcePHP__t_double";
             }
             case Builtin::KindString:
             {
-                _out << "$IcePHP__t_string";
-                break;
+                return "$IcePHP__t_string";
             }
             case Builtin::KindObject:
             case Builtin::KindValue:
             {
-                _out << "$Ice__t_Value";
-                break;
+                return "$Ice__t_Value";
             }
             case Builtin::KindObjectProxy:
             {
-                _out << "$Ice__t_ObjectPrx";
-                break;
+                return "$Ice__t_ObjectPrx";
             }
             case Builtin::KindLocalObject:
             {
-                _out << "$Ice__t_LocalObject";
-                break;
+                return "$Ice__t_LocalObject";
             }
         }
-        return;
     }
 
     ProxyPtr prx = ProxyPtr::dynamicCast(p);
     if(prx)
     {
         ClassDefPtr def = prx->_class()->definition();
-        if(def->isInterface() || def->allOperations().size() > 0)
+        if(def && (def->isInterface() || def->allOperations().size() > 0))
         {
-            _out << getTypeVar(prx->_class(), "Prx");
+            return getTypeVar(prx->_class(), "Prx");
         }
         else
         {
-            _out << "$Ice__t_ObjectPrx";
+            return "$Ice__t_ObjectPrx";
         }
-        return;
     }
 
     ContainedPtr cont = ContainedPtr::dynamicCast(p);
     assert(cont);
-    _out << getTypeVar(cont);
+    return getTypeVar(cont);
 }
 
 void
@@ -1524,6 +1550,7 @@
             }
             else
             {
+                out << nl << "global $Ice_sliceChecksums;";
                 for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end(); ++p)
                 {
                     out << nl << "$Ice_sliceChecksums[\"" << p->first << "\"] = \"";
@@ -1547,14 +1574,9 @@
 printHeader(IceUtilInternal::Output& out)
 {
     static const char* header =
-        "// **********************************************************************\n"
         "//\n"
-        "// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
+        "// Copyright (c) ZeroC, Inc. All rights reserved.\n"
         "//\n"
-        "// This copy of Ice is licensed to you under the terms described in the\n"
-        "// ICE_LICENSE file included in this distribution.\n"
-        "//\n"
-        "// **********************************************************************\n"
         ;
 
     out << header;
@@ -1857,7 +1879,7 @@
                         if(!out)
                         {
                             ostringstream os;
-                            os << "cannot open`" << file << "': " << strerror(errno);
+                            os << "cannot open`" << file << "': " << IceUtilInternal::errorToString(errno);
                             throw FileException(__FILE__, __LINE__, os.str());
                         }
                         FileTracker::instance()->addFile(file);
@@ -1935,16 +1957,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2php/msbuild/slice2php.vcxproj zeroc-ice-3.7.2/cpp/src/slice2php/msbuild/slice2php.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2php/msbuild/slice2php.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2php/msbuild/slice2php.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -71,7 +71,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -80,7 +80,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -89,7 +89,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -98,7 +98,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2py/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2py/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2py/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2py/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/PythonUtil.h>
 #include <Slice/Util.h>
@@ -32,16 +27,6 @@
         consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << args[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << args[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2py/msbuild/slice2py.vcxproj zeroc-ice-3.7.2/cpp/src/slice2py/msbuild/slice2py.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2py/msbuild/slice2py.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2py/msbuild/slice2py.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -71,7 +71,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -80,7 +80,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -89,7 +89,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -98,7 +98,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2rb/Main.cpp zeroc-ice-3.7.2/cpp/src/slice2rb/Main.cpp
--- zeroc-ice-3.7.1/cpp/src/slice2rb/Main.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2rb/Main.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/RubyUtil.h>
 #include <Slice/Util.h>
@@ -32,16 +27,6 @@
         consoleErr << argv[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << argv[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/src/slice2rb/msbuild/slice2rb.vcxproj zeroc-ice-3.7.2/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
--- zeroc-ice-3.7.1/cpp/src/slice2rb/msbuild/slice2rb.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/src/slice2rb/msbuild/slice2rb.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -70,7 +70,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -79,7 +79,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -88,7 +88,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -97,7 +97,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/Makefile.mk zeroc-ice-3.7.2/cpp/test/Common/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Common/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,18 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    = TestCommon
 $(project)_caninstall   := no
 
 #
 # Put the shared TestCommon library in the lib directory for convenience on platforms
-# which don't support something like @loader_path.
+# which don't support something like @loader_path. We don't use lib or $(libdir) here
+# because TestCommon isn't installed with the binary distribution and it might also
+# be used by a component that has Ice as a sub-module (e.g. Freeze).
 #
-TestCommon[shared]_targetdir    := lib
-TestCommon_dependencies         := Ice
+TestCommon[shared]_targetdir    := $(call mappingdir,$(currentdir),lib)
+TestCommon_dependencies         := IceSSL Ice
 TestCommon_cppflags             := -DTEST_API_EXPORTS -I$(includedir) -I$(project) -Itest/include
 
 projects += $(project)
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Common/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Common/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/msbuild/testcommon.vcxproj zeroc-ice-3.7.2/cpp/test/Common/msbuild/testcommon.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Common/msbuild/testcommon.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/msbuild/testcommon.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -40,10 +40,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\TestCommon.cpp" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ClCompile Include="..\TestHelper.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\TestHelper.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}</ProjectGuid>
@@ -174,24 +177,24 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/msbuild/testcommon.vcxproj.filters zeroc-ice-3.7.2/cpp/test/Common/msbuild/testcommon.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/Common/msbuild/testcommon.vcxproj.filters	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/msbuild/testcommon.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -76,11 +76,16 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\TestCommon.cpp">
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\TestHelper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ClInclude Include="..\..\include\TestHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/msbuild/uwp/packages.config zeroc-ice-3.7.2/cpp/test/Common/msbuild/uwp/packages.config
--- zeroc-ice-3.7.1/cpp/test/Common/msbuild/uwp/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/msbuild/uwp/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj zeroc-ice-3.7.2/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -143,29 +143,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\TestCommon.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\TestCommon.h" />
     <ClInclude Include="..\..\..\include\TestHelper.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\TestHelper.cpp" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj.filters zeroc-ice-3.7.2/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj.filters	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -67,14 +67,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\TestCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\include\TestCommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\include\TestHelper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -82,4 +74,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\TestHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/TestCommon.cpp zeroc-ice-3.7.2/cpp/test/Common/TestCommon.cpp
--- zeroc-ice-3.7.1/cpp/test/Common/TestCommon.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/TestCommon.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <TestCommon.h>
-
-#include <Ice/Communicator.h>
-
-std::string
-getTestEndpoint(const Ice::CommunicatorPtr& communicator, int num, const std::string& protocol)
-{
-    return getTestEndpoint(communicator->getProperties(), num, protocol);
-}
-
-std::string
-getTestEndpoint(const Ice::PropertiesPtr& properties, int num, const std::string& prot)
-{
-    std::ostringstream ostr;
-    std::string protocol = prot;
-    if(protocol.empty())
-    {
-        protocol = properties->getPropertyWithDefault("Ice.Default.Protocol", "default");
-    }
-
-    int basePort = properties->getPropertyAsIntWithDefault("Test.BasePort", 12010);
-
-    if(protocol == "bt")
-    {
-        //
-        // For Bluetooth, there's no need to specify a port (channel) number.
-        // The client locates the server using its address and a UUID.
-        //
-        switch(num)
-        {
-        case 0:
-            ostr << "default -u 5e08f4de-5015-4507-abe1-a7807002db3d";
-            break;
-        case 1:
-            ostr << "default -u dae56460-2485-46fd-a3ca-8b730e1e868b";
-            break;
-        case 2:
-            ostr << "default -u 99e08bc6-fcda-4758-afd0-a8c00655c999";
-            break;
-        default:
-            assert(false);
-        }
-    }
-    else
-    {
-        ostr << protocol << " -p " << (basePort + num);
-    }
-    return ostr.str();
-}
-
-std::string
-getTestHost(const Ice::PropertiesPtr& properties)
-{
-    return properties->getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
-}
-
-std::string
-getTestProtocol(const Ice::PropertiesPtr& properties)
-{
-    return properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-}
-
-int
-getTestPort(const Ice::PropertiesPtr& properties, int num)
-{
-    return properties->getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
-}
-
-Ice::InitializationData
-getTestInitData(int& argc, char* argv[])
-{
-    Ice::InitializationData initData;
-    initData.properties = Ice::createProperties(argc, argv);
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = initData.properties->parseCommandLineOptions("Test", args);
-    Ice::stringSeqToArgs(args, argc, argv);
-    return initData;
-}
diff -Nru zeroc-ice-3.7.1/cpp/test/Common/TestHelper.cpp zeroc-ice-3.7.2/cpp/test/Common/TestHelper.cpp
--- zeroc-ice-3.7.1/cpp/test/Common/TestHelper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Common/TestHelper.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,347 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#include <TestHelper.h>
+#include <Ice/RegisterPlugins.h>
+#include <IceUtil/CtrlCHandler.h>
+
+using namespace std;
+using namespace Test;
+
+namespace
+{
+
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
+Test::TestHelper* instance = 0;
+
+void
+shutdownOnInterruptCallback(int)
+{
+    if(instance)
+    {
+        instance->shutdown();
+    }
+}
+
+#endif
+
+}
+
+#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
+
+StreamHelper::StreamHelper() : _controllerHelper(0)
+{
+    setp(&data[0], &data[sizeof(data) - 1]);
+
+    _previousCoutBuffer = std::cout.rdbuf();
+    std::cout.rdbuf(this);
+
+    _previousCerrBuffer = std::cerr.rdbuf();
+    std::cerr.rdbuf(this);
+}
+
+StreamHelper::~StreamHelper()
+{
+    std::cout.rdbuf(_previousCoutBuffer);
+    std::cerr.rdbuf(_previousCerrBuffer);
+}
+
+void
+StreamHelper::setControllerHelper(ControllerHelper* controllerHelper)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    assert(_controllerHelper && !controllerHelper || !_controllerHelper && controllerHelper);
+    _controllerHelper = controllerHelper;
+
+    if(_controllerHelper)
+    {
+        _previousLogger = Ice::getProcessLogger();
+        Ice::setProcessLogger(Ice::getProcessLogger()->cloneWithPrefix(_controllerHelper->loggerPrefix()));
+    }
+    else
+    {
+        Ice::setProcessLogger(_previousLogger);
+    }
+}
+
+void
+StreamHelper::flush()
+{
+}
+
+void
+StreamHelper::newLine()
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(_controllerHelper)
+    {
+        _controllerHelper->print("\n");
+    }
+}
+
+int
+StreamHelper::sync()
+{
+    std::streamsize n = pptr() - pbase();
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+        if(_controllerHelper)
+        {
+            _controllerHelper->print(std::string(pbase(), static_cast<int>(n)));
+        }
+    }
+    pbump(-static_cast<int>(pptr() - pbase()));
+    return 0;
+}
+
+int
+StreamHelper::overflow(int ch)
+{
+    sync();
+    if(ch != EOF)
+    {
+        assert(pptr() != epptr());
+        sputc(static_cast<char>(ch));
+    }
+    return 0;
+}
+
+int
+StreamHelper::sputc(char c)
+{
+    if(c == '\n')
+    {
+        pubsync();
+    }
+    return std::streambuf::sputc(c);
+}
+
+#endif
+
+Test::TestHelper::TestHelper(bool registerPlugins) :
+    _controllerHelper(0)
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
+    , _ctrlCHandler(0)
+#endif
+{
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
+    instance = this;
+#endif
+
+    if(registerPlugins)
+    {
+#ifdef ICE_STATIC_LIBS
+        Ice::registerIceSSL(false);
+        Ice::registerIceWS(true);
+        Ice::registerIceUDP(true);
+#   ifdef ICE_HAS_BT
+        Ice::registerIceBT(false);
+#   endif
+#endif
+    }
+
+#if defined(_WIN32) && !defined(ICE_OS_UWP)
+    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+    _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+
+    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
+    _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+
+    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+    _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+
+    _set_abort_behavior(_CALL_REPORTFAULT, _CALL_REPORTFAULT);
+#endif
+}
+
+Test::TestHelper::~TestHelper()
+{
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
+    if(_ctrlCHandler)
+    {
+        delete _ctrlCHandler;
+        _ctrlCHandler = 0;
+    }
+#endif
+}
+
+void
+Test::TestHelper::setControllerHelper(ControllerHelper* controllerHelper)
+{
+    assert(!_controllerHelper);
+    _controllerHelper = controllerHelper;
+}
+
+string
+Test::TestHelper::getTestEndpoint(const std::string& prot)
+{
+    assert(_communicator);
+    return getTestEndpoint(_communicator->getProperties(), 0, prot);
+}
+
+string
+Test::TestHelper::getTestEndpoint(int num, const std::string& prot)
+{
+    assert(_communicator);
+    return getTestEndpoint(_communicator->getProperties(), num, prot);
+}
+
+std::string
+Test::TestHelper::getTestEndpoint(const Ice::PropertiesPtr& properties, int num, const std::string& prot)
+{
+    std::ostringstream ostr;
+    std::string protocol = prot;
+    if(protocol.empty())
+    {
+        protocol = properties->getPropertyWithDefault("Ice.Default.Protocol", "default");
+    }
+
+    int basePort = properties->getPropertyAsIntWithDefault("Test.BasePort", 12010);
+
+    if(protocol == "bt")
+    {
+        //
+        // For Bluetooth, there's no need to specify a port (channel) number.
+        // The client locates the server using its address and a UUID.
+        //
+        switch(num)
+        {
+            case 0:
+            {
+                ostr << "default -u 5e08f4de-5015-4507-abe1-a7807002db3d";
+                break;
+            }
+            case 1:
+            {
+                ostr << "default -u dae56460-2485-46fd-a3ca-8b730e1e868b";
+                break;
+            }
+            case 2:
+            {
+                ostr << "default -u 99e08bc6-fcda-4758-afd0-a8c00655c999";
+                break;
+            }
+            default:
+            {
+                assert(false);
+            }
+        }
+    }
+    else
+    {
+        ostr << protocol << " -p " << (basePort + num);
+    }
+    return ostr.str();
+}
+
+string
+Test::TestHelper::getTestHost()
+{
+    assert(_communicator);
+    return getTestHost(_communicator->getProperties());
+}
+
+string
+Test::TestHelper::getTestHost(const Ice::PropertiesPtr& properties)
+{
+    return properties->getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+}
+
+string
+Test::TestHelper::getTestProtocol()
+{
+    assert(_communicator);
+    return getTestProtocol(_communicator->getProperties());
+}
+
+string
+Test::TestHelper::getTestProtocol(const Ice::PropertiesPtr& properties)
+{
+    return properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+}
+
+int
+Test::TestHelper::getTestPort(int num)
+{
+    assert(_communicator);
+    return getTestPort(_communicator->getProperties(), num);
+}
+
+int
+Test::TestHelper::getTestPort(const Ice::PropertiesPtr& properties, int num)
+{
+    return properties->getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
+}
+
+Ice::PropertiesPtr
+Test::TestHelper::createTestProperties(int& argc, char* argv[])
+{
+    Ice::PropertiesPtr properties = Ice::createProperties(argc, argv);
+    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
+    args = properties->parseCommandLineOptions("Test", args);
+    args = properties->parseCommandLineOptions("TestAdapter", args);
+    Ice::stringSeqToArgs(args, argc, argv);
+    return properties;
+}
+
+Ice::CommunicatorPtr
+Test::TestHelper::initialize(int& argc, char* argv[], const Ice::PropertiesPtr& properties)
+{
+    Ice::InitializationData initData;
+    initData.properties = properties ? properties : createTestProperties(argc, argv);
+    return initialize(argc, argv, initData);
+}
+
+Ice::CommunicatorPtr
+Test::TestHelper::initialize(int& argc, char* argv[], const Ice::InitializationData& initData)
+{
+    _communicator = Ice::initialize(argc, argv, initData);
+    if(_controllerHelper)
+    {
+        _controllerHelper->communicatorInitialized(_communicator);
+    }
+    return _communicator;
+}
+
+Ice::CommunicatorPtr
+Test::TestHelper::communicator() const
+{
+    return _communicator;
+}
+
+void
+Test::TestHelper::serverReady()
+{
+    if(_controllerHelper)
+    {
+        _controllerHelper->serverReady();
+    }
+}
+
+void
+Test::TestHelper::shutdown()
+{
+    if(_communicator)
+    {
+        _communicator->shutdown();
+    }
+}
+
+#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
+void
+Test::TestHelper::shutdownOnInterrupt()
+{
+}
+#else
+void
+Test::TestHelper::shutdownOnInterrupt()
+{
+    assert(!_ctrlCHandler);
+    if(_ctrlCHandler == 0)
+    {
+        _ctrlCHandler = new IceUtil::CtrlCHandler();
+    }
+    _ctrlCHandler->setCallback(shutdownOnInterruptCallback);
+}
+#endif
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/Callback.ice zeroc-ice-3.7.2/cpp/test/Glacier2/application/Callback.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/application/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <Glacier2/Glacier2.h>
 
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #include <iostream>
 #include <iomanip>
@@ -80,7 +75,8 @@
         {
             cout << "testing Glacier2::Application restart... " << flush;
         }
-        Ice::ObjectPrxPtr base = communicator()->stringToProxy("callback:" + getTestEndpoint(communicator(), 0));
+        Ice::ObjectPrxPtr base = communicator()->stringToProxy(
+            "callback:" + TestHelper::getTestEndpoint(communicator()->getProperties()));
         CallbackPrxPtr callback = ICE_UNCHECKED_CAST(CallbackPrx, base);
         if(++_restart < 5)
         {
@@ -110,24 +106,34 @@
 
 } // anonymous namespace end
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
     Application app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
     initData.properties->setProperty("Ice.Warn.Connections", "0");
-    initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:" + getTestEndpoint(initData.properties, 50));
+    initData.properties->setProperty("Ice.Default.Router",
+                                     "Glacier2/router:" + TestHelper::getTestEndpoint(initData.properties, 50));
     int status = app.main(argc, argv, initData);
+    if(status != 0)
+    {
+        test(false);
+    }
 
     initData.properties->setProperty("Ice.Default.Router", "");
-    Ice::CommunicatorPtr communicator = Ice::initialize(initData);
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
 
     cout << "testing stringToProxy for process object... " << flush;
-    Ice::ObjectPrxPtr processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(communicator, 51));
+    Ice::ObjectPrxPtr processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
     cout << "ok" << endl;
 
     cout << "testing checked cast for admin object... " << flush;
@@ -137,6 +143,7 @@
 
     cout << "testing Glacier2 shutdown... " << flush;
     process->shutdown();
+
     try
     {
         process->ice_ping();
@@ -149,7 +156,6 @@
 
     test(app._restart == 5);
     test(app._destroyed);
-
-    communicator->destroy();
-    return status;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/application/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp Callback.ice
 $(test)_client_dependencies = Glacier2
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/application/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/application/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/application/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/application/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Callback.h>
 
 using namespace std;
@@ -18,13 +13,6 @@
 namespace
 {
 
-class Server : public Ice::Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
 class CallbackI : public Callback
 {
 
@@ -45,29 +33,25 @@
 
 }
 
-int
-Server::run(int, char**)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator()->getProperties()->setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(communicator(), 1));
-    communicator()->createObjectAdapter("DeactivatedAdapter");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+    communicator->createObjectAdapter("DeactivatedAdapter");
 
-    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint(communicator(), 0));
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter");
+    communicator->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint());
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("CallbackAdapter");
     adapter->add(ICE_MAKE_SHARED(CallbackI), Ice::stringToIdentity("callback"));
     adapter->activate();
-    communicator()->waitForShutdown();
-
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    Server app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    return app.main(argc, argv, initData);
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Backend.ice zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Backend.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Backend.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Backend.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/BackendI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/attack/BackendI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/BackendI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/BackendI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <BackendI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/BackendI.h zeroc-ice-3.7.2/cpp/test/Glacier2/attack/BackendI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/BackendI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/BackendI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef BACKEND_I_H
 #define BACKEND_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,41 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Random.h>
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
 #include <Backend.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <set>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class AttackClient : public Application
+class AttackClient : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+AttackClient::run(int argc, char** argv)
 {
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
     //
     // We want to check whether the client retries for evicted
     // proxies, even with regular retries disabled.
     //
-    initData.properties->setProperty("Ice.RetryIntervals", "-1");
-
-    AttackClient app;
-    return app.main(argc, argv, initData);
-}
+    properties->setProperty("Ice.RetryIntervals", "-1");
 
-int
-AttackClient::run(int, char**)
-{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
+    ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
-    communicator()->setDefaultRouter(router);
+    communicator->setDefaultRouter(router);
     cout << "ok" << endl;
 
     cout << "creating session... " << flush;
@@ -55,7 +43,7 @@
     cout << "ok" << endl;
 
     cout << "making thousands of invocations on proxies... " << flush;
-    ObjectPrx backendBase = communicator()->stringToProxy("dummy:" + getTestEndpoint(communicator(), 0));
+    ObjectPrx backendBase = communicator->stringToProxy("dummy:" + getTestEndpoint());
     BackendPrx backend = BackendPrx::uncheckedCast(backendBase);
     backend->ice_ping();
 
@@ -112,9 +100,8 @@
 
     cout << "testing server and router shutdown... " << flush;
     backend->shutdown();
-    communicator()->setDefaultRouter(0);
-    ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                        getTestEndpoint(communicator(), 51));
+    communicator->setDefaultRouter(0);
+    ObjectPrx adminBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(adminBase);
     test(process);
     process->shutdown();
@@ -127,6 +114,6 @@
     {
         cout << "ok" << endl;
     }
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(AttackClient)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp BackendI.cpp Backend.ice
 $(test)_client_dependencies = Glacier2
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -336,12 +336,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <BackendI.h>
 
 using namespace std;
@@ -42,28 +37,22 @@
     BackendPtr _backend;
 };
 
-class BackendServer : public Application
+class BackendServer : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+BackendServer::run(int argc, char** argv)
 {
-    BackendServer app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    return app.main(argc, argv, initData);
-}
-
-int
-BackendServer::run(int, char**)
-{
-    communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", getTestEndpoint(communicator(), 0));
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("BackendAdapter.Endpoints", getTestEndpoint());
+    ObjectAdapterPtr adapter = communicator->createObjectAdapter("BackendAdapter");
     adapter->addServantLocator(new ServantLocatorI, "");
     adapter->activate();
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(BackendServer)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/attack/test.py zeroc-ice-3.7.2/cpp/test/Glacier2/attack/test.py
--- zeroc-ice-3.7.1/cpp/test/Glacier2/attack/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/attack/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 Glacier2TestSuite(__name__, routerProps = { "Glacier2.RoutingTable.MaxSize" : 10 })
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <BackendI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/BackendI.h zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/BackendI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/BackendI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/BackendI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef BACKEND_I_H
 #define BACKEND_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class SessionControlClient : public Application
+class SessionControlClient : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+SessionControlClient::run(int argc, char** argv)
 {
-    SessionControlClient app;
-
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
     //
     // We want to check whether the client retries for evicted
     // proxies, even with regular retries disabled.
     //
-    initData.properties->setProperty("Ice.RetryIntervals", "-1");
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.RetryIntervals", "-1");
+    properties->setProperty("Ice.Warn.Connections", "0");
 
-    return app.main(argc, argv, initData);
-}
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
-int
-SessionControlClient::run(int argc, char* argv[])
-{
     //
     // We initialize the controller on a separate port because we want
     // to bypass the router for test control operations.
     //
     cout << "accessing test controller... " << flush;
     Ice::InitializationData initData;
-    initData.properties = communicator()->getProperties();
+    initData.properties = communicator->getProperties();
     Ice::CommunicatorPtr controlComm = Ice::initialize(argc, argv, initData);
     TestControllerPrx controller = TestControllerPrx::checkedCast(
-        controlComm->stringToProxy("testController:" + getTestEndpoint(communicator(), 2, "tcp")));
+        controlComm->stringToProxy("testController:" + getTestEndpoint(2, "tcp")));
     test(controller);
     TestToken currentState;
     TestToken newState;
@@ -65,10 +53,10 @@
     cout << "ok" << endl;
 
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
+    ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
-    communicator()->setDefaultRouter(router);
+    communicator->setDefaultRouter(router);
     cout << "ok" << endl;
 
     Glacier2::SessionPrx sessionBase = router->createSession("userid", "abc123");
@@ -104,7 +92,7 @@
 
         if(currentState.expectedResult)
         {
-            BackendPrx prx = BackendPrx::uncheckedCast(communicator()->stringToProxy(currentState.testReference));
+            BackendPrx prx = BackendPrx::uncheckedCast(communicator->stringToProxy(currentState.testReference));
             try
             {
                 prx->check();
@@ -117,7 +105,7 @@
         }
         else
         {
-            BackendPrx prx = BackendPrx::uncheckedCast(communicator()->stringToProxy(currentState.testReference));
+            BackendPrx prx = BackendPrx::uncheckedCast(communicator->stringToProxy(currentState.testReference));
             try
             {
                 prx->check();
@@ -158,9 +146,8 @@
     //
     // Shut down the router.
     //
-    communicator()->setDefaultRouter(0);
-    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 51));
+    communicator->setDefaultRouter(0);
+    ObjectPrx processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
@@ -183,6 +170,6 @@
         cerr << ex << endl;
         test(false);
     }
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(SessionControlClient)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_dependencies = Glacier2 Ice TestCommon
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,12 +341,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/Locator.h>
 #include <Glacier2/PermissionsVerifier.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestControllerI.h>
 #include <SessionI.h>
 #include <BackendI.h>
@@ -112,24 +107,17 @@
     BackendPtr _backend;
 };
 
-class SessionControlServer : public Application
+class SessionControlServer : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
-{
-    SessionControlServer app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    return app.main(argc, argv, initData);
-}
-
-int
-SessionControlServer::run(int, char*[])
+void
+SessionControlServer::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     //
     // The server requires 3 separate server endpoints. One for the test
     // controller that will coordinate the tests and the required
@@ -141,27 +129,27 @@
     // servant, allowing us to use any reference as long as the client
     // expects to use a proxy for the correct type of object.
     //
-    communicator()->getProperties()->setProperty("TestControllerAdapter.Endpoints",
-                                                 getTestEndpoint(communicator(), 2, "tcp"));
-    ObjectAdapterPtr controllerAdapter = communicator()->createObjectAdapter("TestControllerAdapter");
-    TestControllerIPtr controller = new TestControllerI(getTestEndpoint(communicator(), 1));
+    communicator->getProperties()->setProperty("TestControllerAdapter.Endpoints", getTestEndpoint(2, "tcp"));
+    ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("TestControllerAdapter");
+    TestControllerIPtr controller = new TestControllerI(getTestEndpoint(1));
     controllerAdapter->add(controller, Ice::stringToIdentity("testController"));
     controllerAdapter->activate();
 
-    communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", getTestEndpoint(communicator(), 0));
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter");
+    communicator->getProperties()->setProperty("SessionControlAdapter.Endpoints", getTestEndpoint());
+    ObjectAdapterPtr adapter = communicator->createObjectAdapter("SessionControlAdapter");
     adapter->add(new SessionManagerI(controller), Ice::stringToIdentity("SessionManager"));
     adapter->activate();
 
     BackendPtr backend = new BackendI;
-    communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", getTestEndpoint(communicator(), 1));
-    ObjectAdapterPtr backendAdapter = communicator()->createObjectAdapter("BackendAdapter");
+    communicator->getProperties()->setProperty("BackendAdapter.Endpoints", getTestEndpoint(1));
+    ObjectAdapterPtr backendAdapter = communicator->createObjectAdapter("BackendAdapter");
     backendAdapter->addServantLocator(new ServantLocatorI(backend), "");
     backendAdapter->activate();
 
     Ice::LocatorPtr locator = new ServerLocatorI(backend, backendAdapter);
     backendAdapter->add(locator, Ice::stringToIdentity("locator"));
 
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(SessionControlServer)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <SessionI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/SessionI.h zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/SessionI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/SessionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/SessionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SESSION_I_H
 #define SESSION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestControllerI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <vector>
 #include <string>
 
@@ -64,7 +59,7 @@
     {
         case Test::Finished:
         {
-            assert("TestController::step() shouldn't have been called with a state of Finished" == 0);
+            assert(false);
             break;
         }
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_CONTROLLER_H
 #define TEST_CONTROLLER_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Test.ice zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/test.py zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/test.py
--- zeroc-ice-3.7.1/cpp/test/Glacier2/dynamicFiltering/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/dynamicFiltering/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Note: we limit the send buffer size with Ice.TCP.SndSize, the
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/hashpassword/test.py zeroc-ice-3.7.2/cpp/test/Glacier2/hashpassword/test.py
--- zeroc-ice-3.7.1/cpp/test/Glacier2/hashpassword/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/hashpassword/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class Glacier2HashPasswordTestCase(ClientTestCase):
 
@@ -15,24 +10,17 @@
         import passlib.hash
 
         hashpassword = os.path.join(toplevel, "scripts", "icehashpassword.py")
+        usePBKDF2 = sys.platform == "win32" or sys.platform == "darwin"
+        useCryptExt = sys.platform.startswith("linux")
 
         def test(b):
             if not b:
                 raise RuntimeError('test assertion failed')
 
         def hashPasswords(password, args = ""):
-            p = subprocess.Popen('"%s" "%s" %s' % (sys.executable, hashpassword, args), shell=True, stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT, stdin=subprocess.PIPE)
-            p.stdin.write(password.encode('UTF-8'))
-            p.stdin.write('\r\n'.encode('UTF-8'))
-            p.stdin.flush()
-            if(p.wait() != 0):
-                raise RuntimeError("icehashpassword.py failed:\n" + p.stdout.read().decode('UTF-8').strip())
-            hash = p.stdout.readline().decode('UTF-8').strip()
-            return hash
-
-        usePBKDF2 = sys.platform == "win32" or sys.platform == "darwin"
-        useCryptExt = sys.platform.startswith("linux")
+            return run('"%s" "%s" %s' % (sys.executable, hashpassword, args),
+                       stdin=(password + "\r\n").encode('UTF-8'),
+                       stdinRepeat=False)
 
         if usePBKDF2:
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/Callback.ice zeroc-ice-3.7.2/cpp/test/Glacier2/override/Callback.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/CallbackI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/override/CallbackI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/CallbackI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/CallbackI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <CallbackI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/CallbackI.h zeroc-ice-3.7.2/cpp/test/Glacier2/override/CallbackI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/CallbackI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/CallbackI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CALLBACK_I_H
 #define CALLBACK_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/override/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <CallbackI.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class CallbackClient : public Application
+class CallbackClient : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+CallbackClient::run(int argc, char** argv)
 {
-    //
-    // We must disable connection warnings, because we attempt to ping
-    // the router before session establishment, as well as after
-    // session destruction. Both will cause a ConnectionLostException.
-    //
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
-    initData.properties->setProperty("Ice.ThreadPool.Client.Serialize", "1");
-
-    CallbackClient app;
-    return app.main(argc, argv, initData);
-}
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.ThreadPool.Client.Serialize", "1");
 
-int
-CallbackClient::run(int, char**)
-{
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
-    communicator()->setDefaultRouter(router);
+    communicator->setDefaultRouter(router);
 
-    ObjectPrx base = communicator()->stringToProxy("c/callback:" + getTestEndpoint(communicator(), 0));
+    ObjectPrx base = communicator->stringToProxy("c/callback:" + getTestEndpoint());
     Glacier2::SessionPrx session = router->createSession("userid", "abc123");
     base->ice_ping();
 
@@ -55,8 +39,8 @@
     CallbackPrx oneway = twoway->ice_oneway();
     CallbackPrx batchOneway = twoway->ice_batchOneway();
 
-    communicator()->getProperties()->setProperty("Ice.PrintAdapterReady", "0");
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
+    communicator->getProperties()->setProperty("Ice.PrintAdapterReady", "0");
+    ObjectAdapterPtr adapter = communicator->createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
     adapter->activate();
 
     string category = router->getCategoryForClient();
@@ -205,9 +189,8 @@
             test(false);
         }
 
-        communicator()->setDefaultRouter(0);
-        ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                              getTestEndpoint(communicator(), 51));
+        communicator->setDefaultRouter(0);
+        ObjectPrx processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
         Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
         process->shutdown();
         try
@@ -220,5 +203,6 @@
             cout << "ok" << endl;
         }
     }
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(CallbackClient)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/override/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice
 $(test)_client_dependencies = Glacier2
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -259,9 +259,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/override/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <CallbackI.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class CallbackServer : public Application
+class CallbackServer : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+CallbackServer::run(int argc, char** argv)
 {
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
-    initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-    initData.properties->setProperty("Ice.ThreadPool.Server.Serialize", "1");
-
-    CallbackServer app;
-    return app.main(argc, argv, initData);
-}
-
-int
-CallbackServer::run(int, char**)
-{
-    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint(communicator(), 0));
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter");
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    properties->setProperty("Ice.ThreadPool.Server.Serialize", "1");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint());
+    ObjectAdapterPtr adapter = communicator->createObjectAdapter("CallbackAdapter");
     adapter->add(new CallbackI(), Ice::stringToIdentity("c/callback"));
     adapter->activate();
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(CallbackServer)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/override/test.py zeroc-ice-3.7.2/cpp/test/Glacier2/override/test.py
--- zeroc-ice-3.7.1/cpp/test/Glacier2/override/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/override/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Note: we limit the send buffer size with Ice.TCP.SndSize, the
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/Callback.ice zeroc-ice-3.7.2/cpp/test/Glacier2/router/Callback.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/CallbackI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/router/CallbackI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/CallbackI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/CallbackI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <CallbackI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/CallbackI.h zeroc-ice-3.7.2/cpp/test/Glacier2/router/CallbackI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/CallbackI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/CallbackI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CALLBACK_I_H
 #define CALLBACK_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/router/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Random.h>
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <CallbackI.h>
 
 using namespace std;
@@ -82,7 +77,8 @@
     void run()
     {
         CommunicatorPtr communicator = initialize(initData);
-        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator, 50));
+        ObjectPrx routerBase = communicator->stringToProxy(
+            "Glacier2/router:" + TestHelper::getTestEndpoint(communicator->getProperties(), 50));
         Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
         communicator->setDefaultRouter(router);
 
@@ -109,7 +105,8 @@
         ident.category = category;
         CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident));
 
-        ObjectPrx base = communicator->stringToProxy("c1/callback:" + getTestEndpoint(communicator, 0));
+        ObjectPrx base = communicator->stringToProxy(
+            "c1/callback:" + TestHelper::getTestEndpoint(communicator->getProperties()));
         base = base->ice_oneway();
         CallbackPrx callback = CallbackPrx::uncheckedCast(base);
 
@@ -188,7 +185,8 @@
     void run()
     {
         CommunicatorPtr communicator = initialize(initData);
-        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator, 50));
+        ObjectPrx routerBase = communicator->stringToProxy(
+            "Glacier2/router:" + TestHelper::getTestEndpoint(communicator->getProperties(), 50));
         _router = Glacier2::RouterPrx::checkedCast(routerBase);
         communicator->setDefaultRouter(_router);
 
@@ -206,7 +204,8 @@
         ident.category = category;
         CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident));
 
-        ObjectPrx base = communicator->stringToProxy("c1/callback:" + getTestEndpoint(communicator, 0));
+        ObjectPrx base = communicator->stringToProxy(
+            "c1/callback:" + TestHelper::getTestEndpoint(communicator->getProperties()));
         base = base->ice_oneway();
         CallbackPrx callback = CallbackPrx::uncheckedCast(base);
 
@@ -408,36 +407,29 @@
     }
 };
 
-class CallbackClient : public Application
+class CallbackClient : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+CallbackClient::run(int argc, char** argv)
 {
     //
     // We must disable connection warnings, because we attempt to ping
     // the router before session establishment, as well as after
     // session destruction. Both will cause a ConnectionLostException.
     //
-    initData = getTestInitData(argc, argv);
+    initData.properties = createTestProperties(argc, argv);
     initData.properties->setProperty("Ice.Warn.Connections", "0");
 
-    CallbackClient app;
-    return app.main(argc, argv, initData);
-}
-
-int
-CallbackClient::run(int argc, char* argv[])
-{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
     ObjectPrx routerBase;
-
     {
         cout << "testing stringToProxy for router... " << flush;
-        routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
+        routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(50));
         cout << "ok" << endl;
     }
 
@@ -453,15 +445,14 @@
     {
         cout << "testing router finder... " << flush;
         Ice::RouterFinderPrx finder =
-            RouterFinderPrx::uncheckedCast(communicator()->stringToProxy("Ice/RouterFinder:" +
-                                                                         getTestEndpoint(communicator(), 50)));
+            RouterFinderPrx::uncheckedCast(communicator->stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
         test(finder->getRouter()->ice_getIdentity() == router->ice_getIdentity());
         cout << "ok" << endl;
     }
 
     {
         cout << "installing router with communicator... " << flush;
-        communicator()->setDefaultRouter(router);
+        communicator->setDefaultRouter(router);
         cout << "ok" << endl;
     }
 
@@ -476,7 +467,7 @@
 
     {
         cout << "testing stringToProxy for server object... " << flush;
-        base = communicator()->stringToProxy("c1/callback:" + getTestEndpoint(communicator(), 0));
+        base = communicator->stringToProxy("c1/callback:" + getTestEndpoint());
         cout << "ok" << endl;
     }
 
@@ -556,7 +547,7 @@
 
     {
         cout << "pinging object with client endpoint... " << flush;
-        Ice::ObjectPrx baseC = communicator()->stringToProxy("collocated:" + getTestEndpoint(communicator(), 50));
+        Ice::ObjectPrx baseC = communicator->stringToProxy("collocated:" + getTestEndpoint(50));
         try
         {
             baseC->ice_ping();
@@ -580,8 +571,8 @@
 
     {
         cout << "creating and activating callback receiver adapter with router... " << flush;
-        communicator()->getProperties()->setProperty("Ice.PrintAdapterReady", "0");
-        adapter = communicator()->createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
+        communicator->getProperties()->setProperty("Ice.PrintAdapterReady", "0");
+        adapter = communicator->createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
         adapter->activate();
         cout << "ok" << endl;
     }
@@ -910,7 +901,7 @@
     {
         {
             cout << "uninstalling router with communicator... " << flush;
-            communicator()->setDefaultRouter(0);
+            communicator->setDefaultRouter(0);
             cout << "ok" << endl;
         }
 
@@ -918,8 +909,7 @@
 
         {
             cout << "testing stringToProxy for admin process facet... " << flush;
-            processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                        getTestEndpoint(communicator(), 51));
+            processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
             cout << "ok" << endl;
         }
 
@@ -944,6 +934,6 @@
             cout << "ok" << endl;
         }
     }
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(CallbackClient)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/router/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice
 $(test)_client_dependencies = Glacier2
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -259,9 +259,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/router/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/router/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/router/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/router/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <CallbackI.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class CallbackServer : public Application
+class CallbackServer : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+CallbackServer::run(int argc, char** argv)
 {
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
-    initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-    CallbackServer app;
-    return app.main(argc, argv, initData);
-}
-
-int
-CallbackServer::run(int, char**)
-{
-    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint(communicator(), 0));
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter");
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint());
+    ObjectAdapterPtr adapter = communicator->createObjectAdapter("CallbackAdapter");
     adapter->add(new CallbackI(), Ice::stringToIdentity("c1/callback")); // The test allows "c1" as category.
     adapter->add(new CallbackI(), Ice::stringToIdentity("c2/callback")); // The test allows "c2" as category.
     adapter->add(new CallbackI(), Ice::stringToIdentity("c3/callback")); // The test rejects "c3" as category.
     adapter->add(new CallbackI(), Ice::stringToIdentity("_userid/callback")); // The test allows the prefixed userid.
     adapter->activate();
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(CallbackServer)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,43 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
 #include <Session.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <set>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class SessionControlClient : public Application
+class SessionControlClient : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+SessionControlClient::run(int argc, char** argv)
 {
-    Ice::InitializationData initData = getTestInitData(argc, argv);
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
 
     //
     // We want to check whether the client retries for evicted
     // proxies, even with regular retries disabled.
     //
-    initData.properties->setProperty("Ice.RetryIntervals", "-1");
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.RetryIntervals", "-1");
+    properties->setProperty("Ice.Warn.Connections", "0");
 
-    SessionControlClient app;
-    return app.main(argc, argv, initData);
-}
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
-int
-SessionControlClient::run(int, char**)
-{
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
+    ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
-    communicator()->setDefaultRouter(router);
+    communicator->setDefaultRouter(router);
     cout << "ok" << endl;
 
     cout << "creating session... " << flush;
@@ -97,9 +87,8 @@
     cout << "testing shutdown... " << flush;
     session = Test::SessionPrx::uncheckedCast(router->createSession("userid", "abc123"));
     session->shutdown();
-    communicator()->setDefaultRouter(0);
-    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 51));
+    communicator->setDefaultRouter(0);
+    ObjectPrx processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
@@ -112,6 +101,6 @@
     {
         cout << "ok" << endl;
     }
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(SessionControlClient)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_dependencies = Glacier2 Ice TestCommon
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Glacier2/PermissionsVerifier.h>
 #include <SessionI.h>
 
@@ -16,28 +11,22 @@
 using namespace Ice;
 using namespace Test;
 
-class SessionControlServer : public Application
+class SessionControlServer : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+SessionControlServer::run(int argc, char** argv)
 {
-    SessionControlServer app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    return app.main(argc, argv, initData);
-}
-
-int
-SessionControlServer::run(int, char**)
-{
-    communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", getTestEndpoint(communicator(), 0));
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("SessionControlAdapter.Endpoints", getTestEndpoint());
+    ObjectAdapterPtr adapter = communicator->createObjectAdapter("SessionControlAdapter");
     adapter->add(new SessionManagerI, Ice::stringToIdentity("SessionManager"));
     adapter->activate();
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(SessionControlServer)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Session.ice zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Session.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/Session.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/Session.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/SessionI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/SessionI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/SessionI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/SessionI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <SessionI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Test;
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/SessionI.h zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/SessionI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/SessionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/SessionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SESSION_I_H
 #define SESSION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/test.py zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/test.py
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionControl/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionControl/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Note: we limit the send buffer size with Ice.TCP.SndSize, the
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Callback.ice zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Callback.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <Glacier2/Glacier2.h>
 
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #include <iostream>
 #include <iomanip>
@@ -190,7 +185,7 @@
     {
         try
         {
-            ex.ice_throw();;
+            ex.ice_throw();
         }
         catch(const Ice::ConnectFailedException&)
         {
@@ -294,274 +289,269 @@
     }
 };
 
-class SessionHelperClient : public Ice::Application, public Notify
+} // Anonymous namespace end
+
+class Client : public Test::TestHelper,
+               public Notify
 {
 public:
 
-    int run(int argc, char* argv[])
+    void run(int, char**);
+
+    void
+    notify()
     {
-        instance = this;
-        string protocol = getTestProtocol(communicator()->getProperties());
-        string host = getTestHost(communicator()->getProperties());
-        _initData.properties = Ice::createProperties(argc, argv, communicator()->getProperties());
-        _initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                          getTestEndpoint(communicator(), 50));
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        _monitor.notify();
+    }
+
+private:
+
+    Glacier2::SessionHelperPtr _session;
+    Glacier2::SessionFactoryHelperPtr _factory;
+    Ice::InitializationData _initData;
+    IceUtil::Monitor<IceUtil::Mutex> _monitor;
+};
+
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    instance = this;
+    string protocol = getTestProtocol();
+    string host = getTestHost();
+    _initData.properties = Ice::createProperties(argc, argv, communicator->getProperties());
+    _initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:" + getTestEndpoint(50));
 
-        DispatcherPtr dispatcher = new Dispatcher();
-        dispatcher->start();
+    DispatcherPtr dispatcher = new Dispatcher();
+    dispatcher->start();
 #ifdef ICE_CPP11_MAPPING
-        _initData.dispatcher = [dispatcher](std::function<void()> call, const std::shared_ptr<Ice::Connection>& conn)
-            {
-                dispatcher->dispatch(call, conn);
-            };
+    _initData.dispatcher = [dispatcher](std::function<void()> call, const std::shared_ptr<Ice::Connection>& conn)
+        {
+            dispatcher->dispatch(call, conn);
+        };
 #else
-        _initData.dispatcher = dispatcher;
+    _initData.dispatcher = dispatcher;
 #endif
-        _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(FailSessionCallback));
+    _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(FailSessionCallback));
+
+    //
+    // Test to create a session with wrong userid/password
+    //
+
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+
+        cout << "testing SessionHelper connect with wrong userid/password... " << flush;
 
+        _session = _factory->connect("userid", "xxx");
         //
-        // Test to create a session with wrong userid/password
+        // Wait for connectFailed callback
         //
+        _monitor.timedWait(IceUtil::Time::seconds(30));
 
-        {
-            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        test(!_session->isConnected());
+    }
+    _factory->destroy();
 
-            cout << "testing SessionHelper connect with wrong userid/password... " << flush;
+    //
+    // Test to interrupt connection establishment
+    //
 
-            _session = _factory->connect("userid", "xxx");
-            //
-            // Wait for connectFailed callback
-            //
-            _monitor.timedWait(IceUtil::Time::seconds(30));
+    _initData.properties->setProperty("Ice.Default.Router", "");
+    _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(InterruptConnectCallback));
 
-            test(!_session->isConnected());
-        }
-        _factory->destroy();
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        cout << "testing SessionHelper connect interrupt... " << flush;
+        _factory->setRouterHost(host);
+        _factory->setPort(getTestPort(_initData.properties, 1));
+        _factory->setProtocol(protocol);
+        _session = _factory->connect("userid", "abc123");
+
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
+        _session->destroy();
 
         //
-        // Test to interrupt connection establishment
+        // Wait for connectFailed callback
         //
+        _monitor.timedWait(IceUtil::Time::seconds(30));
+        test(!_session->isConnected());
+    }
+    _factory->destroy();
 
-        _initData.properties->setProperty("Ice.Default.Router", "");
-        _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(InterruptConnectCallback));
-
-        {
-            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-            cout << "testing SessionHelper connect interrupt... " << flush;
-            _factory->setRouterHost(host);
-            _factory->setPort(getTestPort(_initData.properties, 1));
-            _factory->setProtocol(protocol);
-            _session = _factory->connect("userid", "abc123");
+    _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(SuccessSessionCallback));
 
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
-            _session->destroy();
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        cout << "testing SessionHelper connect... " << flush;
+        _factory->setRouterHost(host);
+        _factory->setPort(getTestPort(_initData.properties, 50));
+        _factory->setProtocol(protocol);
+        _session = _factory->connect("userid", "abc123");
 
-            //
-            // Wait for connectFailed callback
-            //
-            _monitor.timedWait(IceUtil::Time::seconds(30));
-            test(!_session->isConnected());
-        }
-        _factory->destroy();
+        //
+        // Wait for connect callback
+        //
+        _monitor.timedWait(IceUtil::Time::seconds(30));
 
-        _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(SuccessSessionCallback));
+        cout << "testing SessionHelper isConnected after connect... " << flush;
+        test(_session->isConnected());
+        cout << "ok" << endl;
 
+        cout << "testing SessionHelper categoryForClient after connect... " << flush;
+        try
+        {
+            test(!_session->categoryForClient().empty());
+        }
+        catch(const Glacier2::SessionNotExistException&)
         {
-            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-            cout << "testing SessionHelper connect... " << flush;
-            _factory->setRouterHost(host);
-            _factory->setPort(getTestPort(_initData.properties, 50));
-            _factory->setProtocol(protocol);
-            _session = _factory->connect("userid", "abc123");
+            test(false);
+        }
+        cout << "ok" << endl;
 
-            //
-            // Wait for connect callback
-            //
-            _monitor.timedWait(IceUtil::Time::seconds(30));
+        test(!_session->session());
 
-            cout << "testing SessionHelper isConnected after connect... " << flush;
-            test(_session->isConnected());
-            cout << "ok" << endl;
+        cout << "testing stringToProxy for server object... " << flush;
+        Ice::ObjectPrxPtr base =
+            _session->communicator()->stringToProxy("callback:" + getTestEndpoint(_session->communicator()->getProperties()));
+        cout << "ok" << endl;
 
-            cout << "testing SessionHelper categoryForClient after connect... " << flush;
-            try
-            {
-                test(!_session->categoryForClient().empty());
-            }
-            catch(const Glacier2::SessionNotExistException&)
-            {
-                test(false);
-            }
-            cout << "ok" << endl;
+        cout << "pinging server after session creation... " << flush;
+        base->ice_ping();
+        cout << "ok" << endl;
 
-            test(!_session->session());
+        cout << "testing checked cast for server object... " << flush;
+        CallbackPrxPtr twoway = ICE_CHECKED_CAST(CallbackPrx, base);
+        test(twoway);
+        cout << "ok" << endl;
 
-            cout << "testing stringToProxy for server object... " << flush;
-            Ice::ObjectPrxPtr base =
-                _session->communicator()->stringToProxy("callback:" + getTestEndpoint(_session->communicator(), 0));
-            cout << "ok" << endl;
+        cout << "testing server shutdown... " << flush;
+        twoway->shutdown();
+        cout << "ok" << endl;
 
-            cout << "pinging server after session creation... " << flush;
-            base->ice_ping();
-            cout << "ok" << endl;
+        test(_session->communicator());
+        cout << "testing SessionHelper destroy... " << flush;
+        _session->destroy();
 
-            cout << "testing checked cast for server object... " << flush;
-            CallbackPrxPtr twoway = ICE_CHECKED_CAST(CallbackPrx, base);
-            test(twoway);
-            cout << "ok" << endl;
+        //
+        // Wait for disconnected callback
+        //
+        _monitor.wait();
 
-            cout << "testing server shutdown... " << flush;
-            twoway->shutdown();
-            cout << "ok" << endl;
+        cout << "testing SessionHelper isConnected after destroy... " << flush;
+        test(_session->isConnected() == false);
+        cout << "ok" << endl;
 
-            test(_session->communicator());
-            cout << "testing SessionHelper destroy... " << flush;
-            _session->destroy();
+        cout << "testing SessionHelper categoryForClient after destroy... " << flush;
+        try
+        {
+            test(!_session->categoryForClient().empty());
+            test(false);
+        }
+        catch(const Glacier2::SessionNotExistException&)
+        {
+        }
+        cout << "ok" << endl;
 
-            //
-            // Wait for disconnected callback
-            //
-            _monitor.wait();
+        cout << "testing SessionHelper session after destroy... " << flush;
+        test(_session->session() == ICE_NULLPTR);
+        cout << "ok" << endl;
 
-            cout << "testing SessionHelper isConnected after destroy... " << flush;
-            test(_session->isConnected() == false);
-            cout << "ok" << endl;
+        cout << "testing SessionHelper communicator after destroy... " << flush;
+        try
+        {
+            test(_session->communicator());
+            _session->communicator()->stringToProxy("dummy");
+            test(false);
+        }
+        catch(const Ice::CommunicatorDestroyedException&)
+        {
+        }
+        cout << "ok" << endl;
 
-            cout << "testing SessionHelper categoryForClient after destroy... " << flush;
-            try
-            {
-                test(!_session->categoryForClient().empty());
-                test(false);
-            }
-            catch(const Glacier2::SessionNotExistException&)
-            {
-            }
-            cout << "ok" << endl;
+        cout << "uninstalling router with communicator... " << flush;
+        communicator->setDefaultRouter(0);
+        cout << "ok" << endl;
 
-            cout << "testing SessionHelper session after destroy... " << flush;
-            test(_session->session() == ICE_NULLPTR);
+        Ice::ObjectPrxPtr processBase;
+        {
+            cout << "testing stringToProxy for process object... " << flush;
+            processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
             cout << "ok" << endl;
+        }
 
-            cout << "testing SessionHelper communicator after destroy... " << flush;
-            try
-            {
-                test(_session->communicator());
-                _session->communicator()->stringToProxy("dummy");
-                test(false);
-            }
-            catch(const Ice::CommunicatorDestroyedException&)
-            {
-            }
+        Ice::ProcessPrxPtr process;
+        {
+            cout << "testing checked cast for admin object... " << flush;
+            process = ICE_CHECKED_CAST(Ice::ProcessPrx, processBase);
+            test(process != 0);
             cout << "ok" << endl;
+        }
 
-            cout << "uninstalling router with communicator... " << flush;
-            communicator()->setDefaultRouter(0);
+        cout << "testing Glacier2 shutdown... " << flush;
+        process->shutdown();
+        try
+        {
+            process->ice_ping();
+            test(false);
+        }
+        catch(const Ice::LocalException&)
+        {
             cout << "ok" << endl;
+        }
+    }
 
-            Ice::ObjectPrxPtr processBase;
-            {
-                cout << "testing stringToProxy for process object... " << flush;
-                processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                            getTestEndpoint(communicator(), 51));
-                cout << "ok" << endl;
-            }
-
-            Ice::ProcessPrxPtr process;
-            {
-                cout << "testing checked cast for admin object... " << flush;
-                process = ICE_CHECKED_CAST(Ice::ProcessPrx, processBase);
-                test(process != 0);
-                cout << "ok" << endl;
-            }
+    _factory->destroy();
 
-            cout << "testing Glacier2 shutdown... " << flush;
-            process->shutdown();
-            try
-            {
-                process->ice_ping();
-                test(false);
-            }
-            catch(const Ice::LocalException&)
-            {
-                cout << "ok" << endl;
-            }
-        }
+    _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(AfterShutdownSessionCallback));
 
-        _factory->destroy();
+    //
+    // Wait a bit to ensure glaci2router has been shutdown.
+    //
+    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
 
-        _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, _initData, ICE_MAKE_SHARED(AfterShutdownSessionCallback));
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        cout << "testing SessionHelper connect after router shutdown... " << flush;
+        _factory->setRouterHost(host);
+        _factory->setPort(getTestPort(_initData.properties, 50));
+        _factory->setProtocol(protocol);
+        _session = _factory->connect("userid", "abc123");
 
         //
-        // Wait a bit to ensure glaci2router has been shutdown.
+        // Wait for connectFailed callback
         //
-        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
-
-        {
-            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-            cout << "testing SessionHelper connect after router shutdown... " << flush;
-            _factory->setRouterHost(host);
-            _factory->setPort(getTestPort(_initData.properties, 50));
-            _factory->setProtocol(protocol);
-            _session = _factory->connect("userid", "abc123");
-
-            //
-            // Wait for connectFailed callback
-            //
-            _monitor.wait();
-
-            cout << "testing SessionHelper isConnect after connect failure... " << flush;
-            test(_session->isConnected() == false);
-            cout << "ok" << endl;
+        _monitor.wait();
 
-            cout << "testing SessionHelper communicator after connect failure... " << flush;
-            try
-            {
-                test(_session->communicator());
-                _session->communicator()->stringToProxy("dummy");
-                test(false);
-            }
-            catch(const Ice::CommunicatorDestroyedException&)
-            {
-            }
-            cout << "ok" << endl;
+        cout << "testing SessionHelper isConnect after connect failure... " << flush;
+        test(_session->isConnected() == false);
+        cout << "ok" << endl;
 
-            cout << "testing SessionHelper destroy after connect failure... " << flush;
-            _session->destroy();
-            cout << "ok" << endl;
+        cout << "testing SessionHelper communicator after connect failure... " << flush;
+        try
+        {
+            test(_session->communicator());
+            _session->communicator()->stringToProxy("dummy");
+            test(false);
         }
-
-        _factory->destroy();
-
-        if(dispatcher)
+        catch(const Ice::CommunicatorDestroyedException&)
         {
-            dispatcher->destroy();
-            dispatcher->getThreadControl().join();
         }
+        cout << "ok" << endl;
 
-        return 0;
+        cout << "testing SessionHelper destroy after connect failure... " << flush;
+        _session->destroy();
+        cout << "ok" << endl;
     }
 
-    void
-    notify()
+    _factory->destroy();
+
+    if(dispatcher)
     {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-        _monitor.notify();
+        dispatcher->destroy();
+        dispatcher->getThreadControl().join();
     }
-
-private:
-
-    Glacier2::SessionHelperPtr _session;
-    Glacier2::SessionFactoryHelperPtr _factory;
-    Ice::InitializationData _initData;
-    IceUtil::Monitor<IceUtil::Mutex> _monitor;
-};
-
-} // Anonymous namespace end
-
-int
-main(int argc, char* argv[])
-{
-    SessionHelperClient c;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    return c.main(argc, argv, initData);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp Callback.ice
 $(test)_client_dependencies = Glacier2
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/sessionHelper/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/sessionHelper/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Callback.h>
 
 using namespace std;
@@ -18,13 +13,6 @@
 namespace
 {
 
-class SessionHelperServer : public Ice::Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
 class CallbackI : public Callback
 {
 
@@ -51,25 +39,25 @@
 
 }
 
-int
-SessionHelperServer::run(int, char**)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator()->getProperties()->setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(communicator(), 1));
-    communicator()->createObjectAdapter("DeactivatedAdapter");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+    communicator->createObjectAdapter("DeactivatedAdapter");
 
-    communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint(communicator(), 0));
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter");
+    communicator->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint());
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("CallbackAdapter");
     adapter->add(ICE_MAKE_SHARED(CallbackI), Ice::stringToIdentity("callback"));
     adapter->activate();
-    communicator()->waitForShutdown();
-
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    SessionHelperServer app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    return app.main(argc, argv, initData);
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
-//using namespace Test;
+using namespace Test;
 
-class CallbackClient : public Application
+class Client : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-    //
-    // We must disable connection warnings, because we attempt to ping
-    // the router before session establishment, as well as after
-    // session destruction. Both will cause a ConnectionLostException.
-    //
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
-    CallbackClient app;
-    return app.main(argc, argv, initData);
-}
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
-int
-CallbackClient::run(int, char**)
-{
     Glacier2::RouterPrx router = Glacier2::RouterPrx::uncheckedCast(
-        communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 0, "tcp")));
-    communicator()->setDefaultRouter(router);
+        communicator->stringToProxy("Glacier2/router:" + getTestEndpoint("tcp")));
+    communicator->setDefaultRouter(router);
 
     //
     // First try to create a non ssl sessions.
@@ -74,10 +59,10 @@
     // Switch to using the SSL router. First, clear the router. Then
     // set a new SSL based router.
     //
-    communicator()->setDefaultRouter(Glacier2::RouterPrx());
+    communicator->setDefaultRouter(Glacier2::RouterPrx());
     router = Glacier2::RouterPrx::uncheckedCast(
-        communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 1, "ssl")));
-    communicator()->setDefaultRouter(router);
+        communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(1, "ssl")));
+    communicator->setDefaultRouter(router);
 
     //
     // Next try to create a non ssl session. This should succeed.
@@ -108,10 +93,10 @@
     }
     cout << "ok" << endl;
 
-    communicator()->setDefaultRouter(0);
+    communicator->setDefaultRouter(0);
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(
-        communicator()->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(communicator(), 2, "tcp")));
+        communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(2, "tcp")));
     process->shutdown();
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_dependencies = Glacier2
 $(test)_server_dependencies = Glacier2 IceSSL
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -91,9 +91,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -165,11 +165,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -85,9 +85,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -165,11 +165,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/PermissionsVerifier.h>
 #include <Glacier2/Session.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <IceSSL/Plugin.h>
 
 using namespace std;
+using namespace Test;
 
 namespace
 {
@@ -25,14 +21,14 @@
     {
         test(ctx["_con.type"] == "tcp");
         ostringstream port;
-        port << getTestPort(communicator->getProperties(), 0);
+        port << TestHelper::getTestPort(communicator->getProperties());
         test(ctx["_con.localPort"] == port.str());
     }
     else
     {
         test(ctx["_con.type"] == "ssl");
         ostringstream port;
-        port << getTestPort(communicator->getProperties(), 1);
+        port << TestHelper::getTestPort(communicator->getProperties(), 1);
         test(ctx["_con.localPort"] == port.str());
     }
     test(ctx["_con.localAddress"] == "127.0.0.1");
@@ -131,7 +127,7 @@
 
         test(info.remoteHost == "127.0.0.1");
         test(info.localHost == "127.0.0.1");
-        test(info.localPort == getTestPort(current.adapter->getCommunicator()->getProperties(), 1));
+        test(info.localPort == TestHelper::getTestPort(current.adapter->getCommunicator()->getProperties(), 1));
 
         try
         {
@@ -152,31 +148,25 @@
     }
 };
 
-class SessionServer : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    SessionServer app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    return app.main(argc, argv, initData);
-}
-
-int
-SessionServer::run(int, char**)
-{
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints("SessionServer",
-                                                             getTestEndpoint(communicator(), 3, "tcp"));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SessionServer",
+                                                                                   getTestEndpoint(3, "tcp"));
     adapter->add(new PermissionsVerifierI, Ice::stringToIdentity("verifier"));
     adapter->add(new SSLPermissionsVerifierI, Ice::stringToIdentity("sslverifier"));
     adapter->add(new SessionManagerI, Ice::stringToIdentity("sessionmanager"));
     adapter->add(new SSLSessionManagerI, Ice::stringToIdentity("sslsessionmanager"));
     adapter->activate();
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/test.py zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/test.py
--- zeroc-ice-3.7.1/cpp/test/Glacier2/ssl/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/ssl/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 routerProps = lambda process, current : {
     'Ice.Warn.Dispatch' : '0',
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Backend.ice zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Backend.ice
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Backend.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Backend.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/BackendI.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/BackendI.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/BackendI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/BackendI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <BackendI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/BackendI.h zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/BackendI.h
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/BackendI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/BackendI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef BACKEND_I_H
 #define BACKEND_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Client.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,54 +1,43 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
 #include <Backend.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class AttackClient : public Application
+class AttackClient : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+AttackClient::run(int argc, char** argv)
 {
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
     //
     // We want to check whether the client retries for evicted
     // proxies, even with regular retries disabled.
     //
-    initData.properties->setProperty("Ice.RetryIntervals", "-1");
+    properties->setProperty("Ice.RetryIntervals", "-1");
 
-    AttackClient app;
-    return app.main(argc, argv, initData);
-}
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
-int
-AttackClient::run(int, char**)
-{
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
+    ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
-    communicator()->setDefaultRouter(router);
+    communicator->setDefaultRouter(router);
 
     PropertyDict::const_iterator p;
 
-    PropertyDict badProxies = communicator()->getProperties()->getPropertiesForPrefix("Reject.Proxy.");
+    PropertyDict badProxies = communicator->getProperties()->getPropertiesForPrefix("Reject.Proxy.");
     for(p = badProxies.begin(); p != badProxies.end(); ++p)
     {
         try
@@ -57,14 +46,14 @@
         }
         catch(const Glacier2::CannotCreateSessionException&)
         {
-            test("Unable to create new session" == 0);
+            test(false);
         }
-        BackendPrx backend = BackendPrx::uncheckedCast(communicator()->stringToProxy(p->second));
+        BackendPrx backend = BackendPrx::uncheckedCast(communicator->stringToProxy(p->second));
         try
         {
             backend->ice_ping();
             cerr << "Test failed on : " << p->second << endl;
-            test("Expected exception" == 0);
+            test(false);
         }
         catch(const ConnectionLostException&)
         {
@@ -94,11 +83,11 @@
         catch(const LocalException& e)
         {
             cerr << e << endl;
-            test("Unexpected local exception" == 0);
+            test(false);
         }
     }
 
-    PropertyDict goodProxies = communicator()->getProperties()->getPropertiesForPrefix("Accept.Proxy.");
+    PropertyDict goodProxies = communicator->getProperties()->getPropertiesForPrefix("Accept.Proxy.");
     for(p = goodProxies.begin(); p != goodProxies.end(); ++p)
     {
         try
@@ -107,9 +96,9 @@
         }
         catch(const Glacier2::CannotCreateSessionException&)
         {
-            test("Unable to create new session" == 0);
+            test(false);
         }
-        BackendPrx backend = BackendPrx::uncheckedCast(communicator()->stringToProxy(p->second));
+        BackendPrx backend = BackendPrx::uncheckedCast(communicator->stringToProxy(p->second));
         try
         {
             backend->ice_ping();
@@ -118,7 +107,7 @@
         {
             cerr << p->second << endl;
             cerr << ex << endl;
-            test("Unexpected local exception" == 0);
+            test(false);
         }
         try
         {
@@ -136,10 +125,10 @@
     // Stop using router and communicate with backend and router directly
     // to shut things down.
     //
-    communicator()->setDefaultRouter(0);
+    communicator->setDefaultRouter(0);
     try
     {
-        BackendPrx backend = BackendPrx::checkedCast(communicator()->stringToProxy("dummy:tcp -p 12010"));
+        BackendPrx backend = BackendPrx::checkedCast(communicator->stringToProxy("dummy:tcp -p 12010"));
         backend->shutdown();
     }
     catch(const Ice::LocalException&)
@@ -147,8 +136,7 @@
         test(false);
     }
 
-    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 51));
+    ObjectPrx processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
@@ -161,6 +149,6 @@
     {
         cout << "ok" << endl;
     }
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(AttackClient)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/.gitignore zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/.gitignore
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-client.cfg
-router.cfg
-server.cfg
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Makefile.mk zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp BackendI.cpp Backend.ice
 $(test)_client_dependencies = Glacier2
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -258,9 +258,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -336,12 +336,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Server.cpp zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <BackendI.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -108,33 +104,28 @@
     const BackendPtr _backend;
 };
 
-class BackendServer : public Application
+class BackendServer : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+BackendServer::run(int argc, char** argv)
 {
-    BackendServer app;
-    return app.main(argc, argv);
-}
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    string endpoints = communicator->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints",
+                                                                             "tcp -p 12010:ssl -p 12011");
 
-int
-BackendServer::run(int, char**)
-{
-    string endpoints = communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints",
-                                                                               "tcp -p 12010:ssl -p 12011");
-
-    communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", endpoints);
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter");
+    communicator->getProperties()->setProperty("BackendAdapter.Endpoints", endpoints);
+    ObjectAdapterPtr adapter = communicator->createObjectAdapter("BackendAdapter");
     BackendPtr backend = new BackendI;
     Ice::LocatorPtr locator = new ServerLocatorI(backend, adapter);
     adapter->add(locator, Ice::stringToIdentity("locator"));
     adapter->addServantLocator(new ServantLocatorI(backend), "");
     adapter->activate();
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(BackendServer)
diff -Nru zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/test.py zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/test.py
--- zeroc-ice-3.7.1/cpp/test/Glacier2/staticFiltering/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Glacier2/staticFiltering/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
+
+import os
+
 
 class Glacier2StaticFilteringTestCase(ClientServerTestCase):
 
@@ -81,6 +79,11 @@
             if not len(adapterFilter) == 0:
                 routerConfig.write("Glacier2.Filter.AdapterId.Accept=%s\n" % adapterFilter)
 
+    def teardownServerSide(self, current, success):
+        for c in ["client.cfg", "router.cfg", "server.cfg"]:
+            os.remove(os.path.join(self.getTestSuite().getPath(), c))
+
+
 class Glacier2StaticFilteringTestSuite(Glacier2TestSuite):
 
     def setup(self, current):
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/acm/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -130,7 +125,7 @@
 public:
 
     TestCase(const string& name, const RemoteCommunicatorPrxPtr& com) :
-        _name(name), _com(com), _logger(new LoggerI()),
+        _testCaseName(name), _com(com), _logger(new LoggerI()),
         _clientACMTimeout(-1), _clientACMClose(-1), _clientACMHeartbeat(-1),
         _serverACMTimeout(-1), _serverACMClose(-1), _serverACMHeartbeat(-1),
         _heartbeat(0), _closed(false)
@@ -176,7 +171,7 @@
     void join()
 #endif
     {
-        cout << "testing " << _name << "... " << flush;
+        cout << "testing " << _testCaseName << "... " << flush;
         _logger->start();
 #ifdef ICE_CPP11_MAPPING
         t.join();
@@ -279,7 +274,7 @@
 
 protected:
 
-    const string _name;
+    const string _testCaseName;
     const RemoteCommunicatorPrxPtr _com;
     string _msg;
     LoggerIPtr _logger;
@@ -299,7 +294,7 @@
 };
 ICE_DEFINE_PTR(TestCasePtr, TestCase);
 
-class InvocationHeartbeatTest : public TestCase
+class InvocationHeartbeatTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -309,7 +304,7 @@
         setServerACM(1, -1, -1); // Faster ACM to make sure we receive enough ACM heartbeats
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr& proxy)
     {
         proxy->sleep(4);
 
@@ -318,7 +313,7 @@
     }
 };
 
-class InvocationHeartbeatOnHoldTest : public TestCase
+class InvocationHeartbeatOnHoldTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -348,7 +343,7 @@
     }
 };
 
-class InvocationNoHeartbeatTest : public TestCase
+class InvocationNoHeartbeatTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -358,7 +353,7 @@
         setServerACM(2, 2, 0); // Disable heartbeat on invocations
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr& proxy)
     {
         try
         {
@@ -380,7 +375,7 @@
     }
 };
 
-class InvocationHeartbeatCloseOnIdleTest : public TestCase
+class InvocationHeartbeatCloseOnIdleTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -391,7 +386,7 @@
         setServerACM(1, 2, 0); // Disable heartbeat on invocations
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr& proxy)
     {
         // No close on invocation, the call should succeed this time.
         proxy->sleep(3);
@@ -402,7 +397,7 @@
     }
 };
 
-class CloseOnIdleTest : public TestCase
+class CloseOnIdleTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -411,7 +406,7 @@
         setClientACM(1, 1, 0); // Only close on idle
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr&)
     {
         IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(3000)); // Idle for 3 seconds
 
@@ -422,7 +417,7 @@
     }
 };
 
-class CloseOnInvocationTest : public TestCase
+class CloseOnInvocationTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -431,7 +426,7 @@
         setClientACM(1, 2, 0); // Only close on invocation
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr&)
     {
         IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(3000)); // Idle for 3 seconds
 
@@ -441,7 +436,7 @@
     }
 };
 
-class CloseOnIdleAndInvocationTest : public TestCase
+class CloseOnIdleAndInvocationTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -450,7 +445,7 @@
         setClientACM(1, 3, 0); // Only close on idle and invocation
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr&)
     {
         //
         // Put the adapter on hold. The server will not respond to
@@ -473,7 +468,7 @@
     }
 };
 
-class ForcefulCloseOnIdleAndInvocationTest : public TestCase
+class ForcefulCloseOnIdleAndInvocationTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -483,7 +478,7 @@
         setClientACM(1, 4, 0); // Only close on idle and invocation
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr&)
     {
         adapter->hold();
         IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(3000)); // Idle for 3 seconds
@@ -495,7 +490,7 @@
     }
 };
 
-class HeartbeatOnIdleTest : public TestCase
+class HeartbeatOnIdleTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -504,7 +499,7 @@
         setServerACM(1, -1, 2); // Enable server heartbeats.
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr&)
     {
         IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(3000));
 
@@ -513,7 +508,7 @@
     }
 };
 
-class HeartbeatAlwaysTest : public TestCase
+class HeartbeatAlwaysTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -522,7 +517,7 @@
         setServerACM(1, -1, 3); // Enable server heartbeats.
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr& proxy)
     {
         for(int i = 0; i < 10; ++i)
         {
@@ -535,7 +530,7 @@
     }
 };
 
-class HeartbeatManualTest : public TestCase
+class HeartbeatManualTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -548,7 +543,7 @@
         setServerACM(10, -1, 0);
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr& proxy)
     {
         proxy->startHeartbeatCount();
         Ice::ConnectionPtr con = proxy->ice_getConnection();
@@ -561,7 +556,7 @@
     }
 };
 
-class SetACMTest : public TestCase
+class SetACMTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -614,7 +609,7 @@
         setClientACM(15, 4, 0);
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr& proxy)
     {
         Ice::ConnectionPtr con = proxy->ice_getConnection();
 
@@ -711,9 +706,10 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string ref = "communicator:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string ref = "communicator:" + helper->getTestEndpoint();
     RemoteCommunicatorPrxPtr com = ICE_UNCHECKED_CAST(RemoteCommunicatorPrx, communicator->stringToProxy(ref));
 
     vector<TestCasePtr> tests;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/acm/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+// Copyright (c) ZeroC, Inc. All rights reserved.
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   if ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -325,14 +325,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -265,16 +265,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/acm/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,40 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.ACM.Timeout", "1");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     communicator->getProperties()->setProperty("TestAdapter.ACM.Timeout", "0");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("communicator");
     adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id);
     adapter->activate();
 
-    TEST_READY
+    serverReady();
 
     // Disable ready print for further adapters.
     communicator->getProperties()->setProperty("Ice.PrintAdapterReady", "0");
 
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.ACM.Timeout", "1");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/acm/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
@@ -105,7 +100,7 @@
 }
 
 void
-TestI::sleep(int delay, const Ice::Current& current)
+TestI::sleep(int delay, const Ice::Current&)
 {
     Lock sync(*this);
     timedWait(IceUtil::Time::seconds(delay));
@@ -120,7 +115,7 @@
 }
 
 void
-TestI::interruptSleep(const Ice::Current& current)
+TestI::interruptSleep(const Ice::Current&)
 {
     Lock sync(*this);
     notifyAll();
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/acm/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/acm/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/acm/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/acm/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
@@ -49,7 +44,7 @@
 
 private:
 
-    class HeartbeatCallbackI :
+    class HeartbeatCallbackI ICE_FINAL :
 #ifdef ICE_CPP11_MAPPING
                                 public std::enable_shared_from_this<HeartbeatCallbackI>,
 #else
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -16,10 +11,11 @@
 using namespace Test;
 
 TestIntfPrxPtr
-allTests(const CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    CommunicatorPtr communicator = helper->communicator();
     cout << "testing stringToProxy... " << flush;
-    ObjectPrxPtr base = communicator->stringToProxy("test:" + getTestEndpoint(communicator, 0));
+    ObjectPrxPtr base = communicator->stringToProxy("test:" + helper->getTestEndpoint());
     test(base);
     cout << "ok" << endl;
 
@@ -41,7 +37,7 @@
 
     {
         if(!uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
-                      communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
+                    communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
         {
             cout << "creating/destroying/recreating object adapter... " << flush;
             ObjectAdapterPtr adpt = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
@@ -78,9 +74,9 @@
             initData.properties = communicator->getProperties()->clone();
             Ice::CommunicatorHolder comm(initData);
 #ifdef ICE_CPP11_MAPPING
-            comm->stringToProxy("test:" + getTestEndpoint(communicator, 0))->ice_pingAsync();
+            comm->stringToProxy("test:" + helper->getTestEndpoint())->ice_pingAsync();
 #else
-            comm->stringToProxy("test:" + getTestEndpoint(communicator, 0))->begin_ice_ping();
+            comm->stringToProxy("test:" + helper->getTestEndpoint())->begin_ice_ping();
 #endif
         }
         cout << "ok" << endl;
@@ -172,23 +168,26 @@
         try
         {
             router = ICE_UNCHECKED_CAST(Ice::RouterPrx,
-                                        communicator->stringToProxy("test:" + getTestEndpoint(communicator, 1)));
+                                        communicator->stringToProxy("test:" + helper->getTestEndpoint(1)));
             communicator->createObjectAdapterWithRouter("", router);
             test(false);
         }
         catch(const Ice::ConnectFailedException&)
         {
         }
+        catch(const Ice::ConnectTimeoutException&)
+        {
+        }
     }
     cout << "ok" << endl;
 
     cout << "testing object adapter creation with port in use... " << flush;
     {
         Ice::ObjectAdapterPtr adapter1 =
-            communicator->createObjectAdapterWithEndpoints("Adpt1", getTestEndpoint(communicator, 10));
+            communicator->createObjectAdapterWithEndpoints("Adpt1", helper->getTestEndpoint(10));
         try
         {
-            communicator->createObjectAdapterWithEndpoints("Adpt2", getTestEndpoint(communicator, 10));
+            communicator->createObjectAdapterWithEndpoints("Adpt2", helper->getTestEndpoint(10));
             test(false);
         }
         catch(const Ice::LocalException&)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <string>
 #include <iostream>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    TestIntfPrxPtr allTests(const CommunicatorPtr&);
-    TestIntfPrxPtr obj = allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    TestIntfPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <Ice/Application.h>
 #include <ServantLocatorI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
 
     //
     // 2 threads are necessary to dispatch the collocated transient() call with AMI
@@ -32,30 +32,10 @@
     ServantLocatorPtr locator = ICE_MAKE_SHARED(ServantLocatorI);
     adapter->addServantLocator(locator, "");
 
-    TestIntfPrxPtr allTests(const CommunicatorPtr&);
-    allTests(communicator);
+    TestIntfPrxPtr allTests(TestHelper*);
+    allTests(this);
 
     adapter->waitForDeactivate();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_sources = Server.cpp TestI.cpp Test.ice ServantLocatorI.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -345,14 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -344,14 +344,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -269,16 +269,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -273,16 +273,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <ServantLocatorI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SERVANT_LOCATOR_I_H
 #define SERVANT_LOCATOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <Ice/Application.h>
 #include <ServantLocatorI.h>
-#include <TestCommon.h>
-
-DEFINE_TEST("server")
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     ServantLocatorPtr locator = ICE_MAKE_SHARED(ServantLocatorI);
     adapter->addServantLocator(locator, "");
     adapter->activate();
-    TEST_READY
+    serverReady();
     adapter->waitForDeactivate();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
+using namespace Test;
 
 void
 TestI::transient(const Current& current)
 {
     CommunicatorPtr communicator = current.adapter->getCommunicator();
-    ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter",
-                                                                              getTestEndpoint(communicator, 1));
+    ObjectAdapterPtr adapter =
+        communicator->createObjectAdapterWithEndpoints("TransientTestAdapter",
+                                                       TestHelper::getTestEndpoint(communicator->getProperties(), 1));
     adapter->activate();
     adapter->destroy();
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/adapterDeactivation/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/adapterDeactivation/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/admin/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h> // For TestFacetI
 
 using namespace std;
@@ -101,7 +96,7 @@
     virtual void init(ICE_IN(string), ICE_IN(Ice::LogMessageSeq), const Ice::Current&);
     virtual void log(ICE_IN(Ice::LogMessage), const Ice::Current&);
 
-    void checkNextInit(const string&, const Ice::LogMessageSeq&);
+    void checkNextInit(const string&, Ice::LogMessageType, const string&, const string& = "");
     void checkNextLog(Ice::LogMessageType, const string&, const string& = "");
 
     void wait(int);
@@ -109,13 +104,10 @@
 private:
 
     IceUtil::Monitor<IceUtil::Mutex> _monitor;
-
     int _receivedCalls;
-
-    string _expectedPrefix;
-    Ice::LogMessageSeq _expectedInitMessages;
-
-    Ice::LogMessageSeq _expectedLogMessages;
+    string _prefix;
+    Ice::LogMessageSeq _initMessages;
+    Ice::LogMessageSeq _logMessages;
 };
 
 ICE_DEFINE_PTR(RemoteLoggerIPtr, RemoteLoggerI);
@@ -128,8 +120,8 @@
 RemoteLoggerI::init(ICE_IN(string) prefix, ICE_IN(Ice::LogMessageSeq) logMessages, const Ice::Current&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-    test(prefix == _expectedPrefix);
-    test(logMessages == _expectedInitMessages);
+    _prefix = prefix;
+    _initMessages.insert(_initMessages.end(), logMessages.begin(), logMessages.end());
     _receivedCalls++;
     _monitor.notifyAll();
 }
@@ -138,32 +130,35 @@
 RemoteLoggerI::log(ICE_IN(Ice::LogMessage) logMessage, const Ice::Current&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-    Ice::LogMessage front = _expectedLogMessages.front();
-
-    test(front.type == logMessage.type && front.message == logMessage.message &&
-         front.traceCategory == logMessage.traceCategory);
-
-    _expectedLogMessages.pop_front();
+    _logMessages.push_back(logMessage);
     _receivedCalls++;
     _monitor.notifyAll();
 }
 
 void
-RemoteLoggerI::checkNextInit(const string& prefix, const Ice::LogMessageSeq& logMessages)
+RemoteLoggerI::checkNextInit(const string& prefix, Ice::LogMessageType type, const string& message,
+                             const string& category)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-    _expectedPrefix = prefix;
-    _expectedInitMessages = logMessages;
+    test(_prefix == prefix);
+    test(_initMessages.size() > 0);
+    Ice::LogMessage front = _initMessages.front();
+    test(front.type == type);
+    test(front.message == message);
+    test(front.traceCategory == category);
+    _initMessages.pop_front();
 }
 
 void
-RemoteLoggerI::checkNextLog(Ice::LogMessageType messageType, const string& message,
-                            const string& category)
+RemoteLoggerI::checkNextLog(Ice::LogMessageType type, const string& message, const string& category)
 {
-    Ice::LogMessage logMessage = { messageType, 0, category, message };
-
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-    _expectedLogMessages.push_back(logMessage);
+    test(_logMessages.size() > 0);
+    Ice::LogMessage front = _logMessages.front();
+    test(front.type == type);
+    test(front.message == message);
+    test(front.traceCategory == category);
+    _logMessages.pop_front();
 }
 
 void
@@ -178,8 +173,9 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing communicator operations... " << flush;
     {
         //
@@ -279,7 +275,7 @@
     }
     cout << "ok" << endl;
 
-    string ref = "factory:" + getTestEndpoint(communicator, 0) + " -t 10000";
+    string ref = "factory:" + helper->getTestEndpoint() + " -t 10000";
     RemoteCommunicatorFactoryPrxPtr factory =
         ICE_UNCHECKED_CAST(RemoteCommunicatorFactoryPrx, communicator->stringToProxy(ref));
 
@@ -513,15 +509,13 @@
         // No filtering
         //
         logMessages = logger->getLog(Ice::LogMessageTypeSeq(), Ice::StringSeq(), -1, prefix);
-        remoteLogger->checkNextInit(prefix, logMessages);
-
         logger->attachRemoteLogger(myProxy, Ice::LogMessageTypeSeq(), Ice::StringSeq(), -1);
         remoteLogger->wait(1);
 
-        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace", "testCat");
-        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, WarningMessage), "rwarning");
-        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror");
-        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, PrintMessage), "rprint");
+        for(LogMessageSeq::const_iterator i = logMessages.begin(); i != logMessages.end(); ++i)
+        {
+            remoteLogger->checkNextInit(prefix, i->type, i->message, i->traceCategory);
+        }
 
         com->trace("testCat", "rtrace");
         com->warning("rwarning");
@@ -529,6 +523,11 @@
         com->print("rprint");
         remoteLogger->wait(4);
 
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace", "testCat");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, WarningMessage), "rwarning");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, PrintMessage), "rprint");
+
         test(logger->detachRemoteLogger(myProxy));
         test(!logger->detachRemoteLogger(myProxy));
 
@@ -537,12 +536,13 @@
         //
         logMessages = logger->getLog(messageTypes, categories, 4, prefix);
         test(logMessages.size() == 4);
-        remoteLogger->checkNextInit(prefix, logMessages);
         logger->attachRemoteLogger(myProxy, messageTypes, categories, 4);
         remoteLogger->wait(1);
 
-        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace2", "testCat");
-        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror2");
+        for(LogMessageSeq::const_iterator i = logMessages.begin(); i != logMessages.end(); ++i)
+        {
+            remoteLogger->checkNextInit(prefix, i->type, i->message, i->traceCategory);
+        }
 
         com->warning("rwarning2");
         com->trace("testCat", "rtrace2");
@@ -551,6 +551,9 @@
         com->print("rprint2");
         remoteLogger->wait(2);
 
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace2", "testCat");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror2");
+
         //
         // Attempt reconnection with slightly different proxy
         //
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/admin/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-DEFINE_TEST("client")
-
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -265,16 +265,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/admin/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-DEFINE_TEST("server")
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("factory");
     adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorFactoryI), id);
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/admin/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/admin/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestI.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/admin/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/admin/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/admin/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/admin/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Ice/NativePropertiesAdmin.h>
 
 class RemoteCommunicatorI : public virtual Test::RemoteCommunicator,
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/ami/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Random.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -17,6 +12,30 @@
 namespace
 {
 
+class PingReplyI : public Test::PingReply
+{
+public:
+    PingReplyI() :
+        _received(false)
+    {
+    }
+
+    virtual void reply(const Ice::Current&)
+    {
+        _received = true;
+    }
+
+    bool checkReceived()
+    {
+        return _received;
+    }
+
+private:
+    bool _received;
+};
+
+ICE_DEFINE_PTR(PingReplyIPtr, PingReplyI);
+
 enum ThrowType { LocalException, UserException, StandardException, OtherException };
 
 #ifdef ICE_CPP11_MAPPING
@@ -62,7 +81,7 @@
 };
 typedef IceUtil::Handle<Cookie> CookiePtr;
 
-class CallbackBase : public Ice::LocalObject
+class CallbackBase : public virtual Ice::LocalObject
 {
 public:
 
@@ -781,7 +800,7 @@
     {
     }
 
-    virtual void closed(const Ice::ConnectionPtr& con)
+    virtual void closed(const Ice::ConnectionPtr&)
     {
         called();
     }
@@ -899,22 +918,23 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
+allTests(Test::TestHelper* helper, bool collocated)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     const string protocol = communicator->getProperties()->getProperty("Ice.Default.Protocol");
 
 #ifdef ICE_CPP11_MAPPING
-    string sref = "test:" + getTestEndpoint(communicator, 0);
-    auto obj = communicator->stringToProxy(sref);
-    test(obj);
+    string sref = "test:" + helper->getTestEndpoint();
+    auto prx = communicator->stringToProxy(sref);
+    test(prx);
 
-    auto p = Ice::uncheckedCast<Test::TestIntfPrx>(obj);
+    auto p = Ice::uncheckedCast<Test::TestIntfPrx>(prx);
 
-    sref = "testController:" + getTestEndpoint(communicator, 1);
-    obj = communicator->stringToProxy(sref);
-    test(obj);
+    sref = "testController:" + helper->getTestEndpoint(1);
+    prx = communicator->stringToProxy(sref);
+    test(prx);
 
-    auto testController = Ice::uncheckedCast<Test::TestIntfControllerPrx>(obj);
+    auto testController = Ice::uncheckedCast<Test::TestIntfControllerPrx>(prx);
 
     Ice::Context ctx;
     cout << "testing lambda API... " << flush;
@@ -1795,7 +1815,7 @@
                         promise.set_value();
                         thrower(throwEx[i]);
                     },
-                    [&](const exception_ptr& ex)
+                    [&](const exception_ptr&)
                     {
                         test(false);
                     });
@@ -2189,7 +2209,7 @@
                 auto con = p->ice_getConnection();
                 auto sc = make_shared<promise<void>>();
                 con->setCloseCallback(
-                    [sc](Ice::ConnectionPtr connection)
+                    [sc](Ice::ConnectionPtr)
                     {
                         sc->set_value();
                     });
@@ -2244,13 +2264,13 @@
                         for(int i = 0; i < maxQueue; i++)
                         {
                             auto s = make_shared<promise<void>>();
-                            atomic_flag sent = ATOMIC_FLAG_INIT;
+                            atomic_flag sent2 = ATOMIC_FLAG_INIT;
                             p->opWithPayloadAsync(seq,
                                                   [s]() { s->set_value(); },
                                                   [s](exception_ptr ex) { s->set_exception(ex); },
-                                                  [&sent](bool) { sent.test_and_set(); });
+                                                  [&sent2](bool) { sent2.test_and_set(); });
                             results.push_back(s->get_future());
-                            if(sent.test_and_set())
+                            if(sent2.test_and_set())
                             {
                                 done = false;
                                 maxQueue *= 2;
@@ -2264,11 +2284,11 @@
                         done = false;
                     }
 
-                    for(vector<future<void>>::iterator p = results.begin(); p != results.end(); ++p)
+                    for(vector<future<void>>::iterator r = results.begin(); r != results.end(); ++r)
                     {
                         try
                         {
-                            p->get();
+                            r->get();
                         }
                         catch(const Ice::LocalException&)
                         {
@@ -2292,7 +2312,7 @@
                 auto sent = make_shared<promise<void>>();
                 p->startDispatchAsync([s]() { s->set_value(); },
                                       [s](exception_ptr ex) { s->set_exception(ex); },
-                                      [sent](bool ss) { sent->set_value(); });
+                                      [sent](bool) { sent->set_value(); });
                 auto f = s->get_future();
                 sent->get_future().get(); // Ensure the request was sent before we close the connection.
                 con->close(Ice::ConnectionClose::Gracefully);
@@ -2314,7 +2334,7 @@
                 con = p->ice_getConnection();
                 auto sc = make_shared<promise<void>>();
                 con->setCloseCallback(
-                    [sc](Ice::ConnectionPtr connection)
+                    [sc](Ice::ConnectionPtr)
                     {
                         sc->set_value();
                     });
@@ -2349,7 +2369,7 @@
                 auto sent = make_shared<promise<void>>();
                 p->startDispatchAsync([s]() { s->set_value(); },
                                       [s](exception_ptr ex) { s->set_exception(ex); },
-                                      [sent](bool ss) { sent->set_value(); });
+                                      [sent](bool) { sent->set_value(); });
                 auto f = s->get_future();
                 sent->get_future().get(); // Ensure the request was sent before we close the connection.
                 con->close(Ice::ConnectionClose::Forcefully);
@@ -2387,7 +2407,7 @@
         cout << "testing result struct... " << flush;
 
         auto q = Ice::uncheckedCast<Test::Outer::Inner::TestIntfPrx>(
-            communicator->stringToProxy("test2:" + getTestEndpoint(communicator, 0)));
+            communicator->stringToProxy("test2:" + helper->getTestEndpoint()));
 
         promise<void> promise;
         q->opAsync(1,
@@ -2417,16 +2437,32 @@
         cout << "ok" << endl;
     }
 
+    if(p->ice_getConnection())
+    {
+        cout << "testing bidir... " << flush;
+        auto adapter = communicator->createObjectAdapter("");
+        auto replyI = make_shared<PingReplyI>();
+        auto reply = Ice::uncheckedCast<Test::PingReplyPrx>(adapter->addWithUUID(replyI));
+        adapter->activate();
+
+        p->ice_getConnection()->setAdapter(adapter);
+        p->pingBiDir(reply);
+        test(replyI->checkReceived());
+        adapter->destroy();
+
+        cout << "ok" << endl;
+    }
+
     p->shutdown();
 
 #else
-    string sref = "test:" + getTestEndpoint(communicator, 0);
+    string sref = "test:" + helper->getTestEndpoint();
     Ice::ObjectPrx obj = communicator->stringToProxy(sref);
     test(obj);
 
     Test::TestIntfPrx p = Test::TestIntfPrx::uncheckedCast(obj);
 
-    sref = "testController:" + getTestEndpoint(communicator, 1);
+    sref = "testController:" + helper->getTestEndpoint(1);
     obj = communicator->stringToProxy(sref);
     test(obj);
 
@@ -2701,7 +2737,7 @@
             Ice::InitializationData initData;
             initData.properties = communicator->getProperties()->clone();
             Ice::CommunicatorPtr ic = Ice::initialize(initData);
-            Ice::ObjectPrx obj = ic->stringToProxy(p->ice_toString());
+            obj = ic->stringToProxy(p->ice_toString());
             Test::TestIntfPrx p2 = Test::TestIntfPrx::checkedCast(obj);
             ic->destroy();
 
@@ -3981,12 +4017,12 @@
                     done = false;
                 }
 
-                for(vector<Ice::AsyncResultPtr>::const_iterator p = results.begin(); p != results.end(); ++p)
+                for(vector<Ice::AsyncResultPtr>::const_iterator r = results.begin(); r != results.end(); ++r)
                 {
-                    (*p)->waitForCompleted();
+                    (*r)->waitForCompleted();
                     try
                     {
-                        (*p)->throwLocalException();
+                        (*r)->throwLocalException();
                     }
                     catch(const Ice::LocalException&)
                     {
@@ -4084,6 +4120,22 @@
         cout << "ok" << endl;
     }
 
+    if(p->ice_getConnection())
+    {
+        cout << "testing bidir... " << flush;
+        Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("");
+        PingReplyIPtr replyI = new PingReplyI();
+        Test::PingReplyPrx reply = Test::PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI));
+        adapter->activate();
+
+        p->ice_getConnection()->setAdapter(adapter);
+        p->pingBiDir(reply);
+        test(replyI->checkReceived());
+        adapter->destroy();
+
+        cout << "ok" << endl;
+    }
+
     p->shutdown();
 #endif
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/ami/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&, bool);
-    allTests(communicator, false);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.AMICallback", "0");
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties->setProperty("Ice.TCP.SndSize", "50000");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.AMICallback", "0");
+    properties->setProperty("Ice.Warn.Connections", "0");
+
+    //
+    // Limit the send buffer size, this test relies on the socket
+    // send() blocking after sending a given amount of data.
+    //
+    properties->setProperty("Ice.TCP.SndSize", "50000");
+
+    Ice::CommunicatorHolder communcator = initialize(argc, argv, properties);
+    void allTests(Test::TestHelper*, bool);
+    allTests(this, false);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/ami/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.AMICallback", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
     communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -34,31 +37,8 @@
     adapter2->add(testController, Ice::stringToIdentity("testController"));
     //adapter2->activate(); // Collocated test doesn't need to activate the OA
 
-    void allTests(const Ice::CommunicatorPtr&, bool);
-    allTests(communicator, true);
-
-    return EXIT_SUCCESS;
+    void allTests(Test::TestHelper*, bool);
+    allTests(this, true);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.AMICallback", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -267,16 +267,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/ami/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    properties->setProperty("Ice.Warn.Connections", "0");
+
+    //
+    // Limit the recv buffer size, this test relies on the socket
+    // send() blocking after sending a given amount of data.
+    //
+    properties->setProperty("Ice.TCP.RcvSize", "50000");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
     communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -34,41 +48,9 @@
     adapter2->add(testController, Ice::stringToIdentity("testController"));
     adapter2->activate();
 
-    TEST_READY
+    serverReady();
 
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        //
-        // Limit the recv buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties->setProperty("Ice.TCP.RcvSize", "50000");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -55,7 +50,7 @@
     bool supportsAMD();
     bool supportsFunctionalTests();
 
-    void pingBiDir(Ice::Identity id);
+    void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/ami/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestI.h>
 #include <Ice/Ice.h>
@@ -99,7 +94,7 @@
 }
 
 void
-TestIntfI::sleep(Ice::Int ms, const Ice::Current& current)
+TestIntfI::sleep(Ice::Int ms, const Ice::Current&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     timedWait(IceUtil::Time::milliSeconds(ms));
@@ -107,7 +102,7 @@
 
 #ifdef ICE_CPP11_MAPPING
 void
-TestIntfI::startDispatchAsync(std::function<void()> response, std::function<void(std::exception_ptr)> ex,
+TestIntfI::startDispatchAsync(std::function<void()> response, std::function<void(std::exception_ptr)>,
                               const Ice::Current&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
@@ -143,7 +138,7 @@
 #endif
 
 void
-TestIntfI::finishDispatch(const Ice::Current& current)
+TestIntfI::finishDispatch(const Ice::Current&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     if(_shutdown)
@@ -193,9 +188,15 @@
 }
 
 void
-TestIntfI::pingBiDir(ICE_IN(Ice::Identity) id, const Ice::Current& current)
+TestIntfI::pingBiDir(ICE_IN(Test::PingReplyPrxPtr) reply, const Ice::Current& current)
 {
-    ICE_UNCHECKED_CAST(Test::PingReplyPrx, current.con->createProxy(id))->reply();
+#ifdef ICE_CPP11_MAPPING
+    reply->ice_fixed(current.con)->replyAsync().get();
+#else
+    Test::PingReplyPrx fprx = reply->ice_fixed(current.con);
+    Ice::AsyncResultPtr result = fprx->begin_reply();
+    fprx->end_reply(result);
+#endif
 }
 
 void
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/ami/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/ami/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/ami/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/ami/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 class TestIntfControllerI;
 ICE_DEFINE_PTR(TestIntfControllerIPtr, TestIntfControllerI);
@@ -46,7 +41,7 @@
     virtual bool supportsAMD(const Ice::Current&);
     virtual bool supportsFunctionalTests(const Ice::Current&);
 
-    virtual void pingBiDir(ICE_IN(Ice::Identity), const Ice::Current&);
+    virtual void pingBiDir(ICE_IN(Test::PingReplyPrxPtr), const Ice::Current&);
 
 private:
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Acceptor.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/Acceptor.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Acceptor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Acceptor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Acceptor.h zeroc-ice-3.7.2/cpp/test/Ice/background/Acceptor.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Acceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Acceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ACCEPTOR_H
 #define TEST_ACCEPTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Random.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <PluginI.h>
 #include <Configuration.h>
@@ -205,16 +200,17 @@
 void readWriteTests(const ConfigurationPtr&, const Test::BackgroundPrxPtr&, const Test::BackgroundControllerPrxPtr&);
 
 BackgroundPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    const string endp = getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    const string endp = helper->getTestEndpoint();
     string sref = "background:" + endp;
     Ice::ObjectPrxPtr obj = communicator->stringToProxy(sref);
     test(obj);
 
     BackgroundPrxPtr background = ICE_UNCHECKED_CAST(BackgroundPrx, obj);
 
-    sref = "backgroundController:" + getTestEndpoint(communicator, 1, "tcp");
+    sref = "backgroundController:" + helper->getTestEndpoint(1, "tcp");
     obj = communicator->stringToProxy(sref);
     test(obj);
 
@@ -455,8 +451,7 @@
     }
     background->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait));
 
-    int i;
-    for(i = 0; i < 4; ++i)
+    for(int i = 0; i < 4; ++i)
     {
         if(i == 0 || i == 2)
         {
@@ -549,7 +544,7 @@
     OpThreadPtr thread1 = new OpThread(background);
     OpThreadPtr thread2 = new OpThread(background);
 
-    for(i = 0; i < 5; i++)
+    for(int i = 0; i < 5; i++)
     {
         try
         {
@@ -597,8 +592,7 @@
     }
     background->ice_getConnection()->close(Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait));
 
-    int i;
-    for(i = 0; i < 4; i++)
+    for(int i = 0; i < 4; i++)
     {
         if(i == 0 || i == 2)
         {
@@ -759,7 +753,7 @@
     OpThreadPtr thread1 = new OpThread(background);
     OpThreadPtr thread2 = new OpThread(background);
 
-    for(i = 0; i < 5; i++)
+    for(int i = 0; i < 5; i++)
     {
         try
         {
@@ -881,8 +875,7 @@
         test(false);
     }
 
-    int i;
-    for(i = 0; i < 2; i++)
+    for(int i = 0; i < 2; i++)
     {
         configuration->readException(new Ice::SocketException(__FILE__, __LINE__));
         BackgroundPrxPtr prx = i == 0 ? background : background->ice_oneway();
@@ -1227,8 +1220,7 @@
         test(false);
     }
 
-    int i;
-    for(i = 0; i < 2; i++)
+    for(int i = 0; i < 2; i++)
     {
         BackgroundPrxPtr prx = i == 0 ? background : background->ice_oneway();
 
@@ -1307,28 +1299,30 @@
     configuration->readReady(false); // Required in C# to make sure beginRead() doesn't throw too soon.
     configuration->readException(new Ice::SocketException(__FILE__, __LINE__));
 #ifdef ICE_CPP11_MAPPING
-    promise<void> completed;
-    background->opAsync(
-        []()
-        {
-            test(false);
-        },
-        [&completed](exception_ptr e)
-        {
-            try
-            {
-                rethrow_exception(e);
-            }
-            catch(const Ice::SocketException&)
-            {
-                completed.set_value();
-            }
-            catch(...)
+    {
+        promise<void> completed;
+        background->opAsync(
+            []()
             {
                 test(false);
-            }
-        });
-    completed.get_future().get();
+            },
+            [&completed](exception_ptr e)
+            {
+                try
+                {
+                    rethrow_exception(e);
+                }
+                catch(const Ice::SocketException&)
+                {
+                    completed.set_value();
+                }
+                catch(...)
+                {
+                    test(false);
+                }
+            });
+        completed.get_future().get();
+    }
 #else
     Ice::AsyncResultPtr r = background->begin_op();
     try
@@ -1389,7 +1383,7 @@
             configuration->writeException(0);
         }
 
-        for(i = 0; i < 2; ++i)
+        for(int i = 0; i < 2; ++i)
         {
             BackgroundPrxPtr prx = i == 0 ? background : background->ice_oneway();
 
@@ -1426,7 +1420,7 @@
             test(sent.get_future().wait_for(chrono::milliseconds(0)) != future_status::ready);
             completed.get_future().get();
 #else
-            Ice::AsyncResultPtr r = prx->begin_op();
+            r = prx->begin_op();
             test(!r->sentSynchronously());
             try
             {
@@ -1485,7 +1479,7 @@
             completed.get_future().get();
 
 #else
-            Ice::AsyncResultPtr r = background->begin_op();
+            r = background->begin_op();
             try
             {
                 background->end_op(r);
@@ -1529,7 +1523,7 @@
                 });
             completed.get_future().get();
 #else
-            Ice::AsyncResultPtr r = background->begin_op();
+            r = background->begin_op();
             // The read exception might propagate before the message send is seen as completed on IOCP.
 #   ifndef ICE_USE_IOCP
             r->waitForSent();
@@ -1590,7 +1584,7 @@
         {
             c1.set_value();
         },
-        [](exception_ptr err)
+        [](exception_ptr)
         {
             test(false);
         },
@@ -1608,7 +1602,7 @@
         {
             c2.set_value();
         },
-        [](exception_ptr err)
+        [](exception_ptr)
         {
             test(false);
         },
@@ -1774,7 +1768,7 @@
     OpThreadPtr thread1 = new OpThread(background);
     OpThreadPtr thread2 = new OpThread(background);
 
-    for(i = 0; i < 5; i++)
+    for(int i = 0; i < 5; i++)
     {
         try
         {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <Configuration.h>
 
@@ -26,64 +21,49 @@
 
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    BackgroundPrxPtr allTests(const Ice::CommunicatorPtr&);
-    BackgroundPrxPtr background = allTests(communicator);
-    background->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
 #ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
     Ice::registerPluginFactory("Test", createTestTransport, false);
 #endif
 
-    int status;
-    Ice::CommunicatorPtr communicator;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-
-        //
-        // For this test, we want to disable retries.
-        //
-        initData.properties->setProperty("Ice.RetryIntervals", "-1");
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        // This test relies on filling the TCP send/recv buffer, so
-        // we rely on a fixed value for these buffers.
-        initData.properties->setProperty("Ice.TCP.SndSize", "50000");
-
-        //
-        // Setup the test transport plug-in.
-        //
-        initData.properties->setProperty("Ice.Plugin.Test", "TestTransport:createTestTransport");
-        string defaultProtocol = initData.properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties->setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << " " << ex.ice_stackTrace() << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
 
-    return status;
+    //
+    // For this test, we want to disable retries.
+    //
+    properties->setProperty("Ice.RetryIntervals", "-1");
+
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    properties->setProperty("Ice.Warn.Connections", "0");
+
+    //
+    // This test relies on filling the TCP send/recv buffer, so
+    // we rely on a fixed value for these buffers.
+    //
+    properties->setProperty("Ice.TCP.SndSize", "50000");
+
+    //
+    // Setup the test transport plug-in.
+    //
+    properties->setProperty("Ice.Plugin.Test", "TestTransport:createTestTransport");
+    string defaultProtocol = properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+    properties->setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    BackgroundPrxPtr allTests(Test::TestHelper*);
+    BackgroundPrxPtr background = allTests(this);
+    background->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Configuration.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/Configuration.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Configuration.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Configuration.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Configuration.h zeroc-ice-3.7.2/cpp/test/Ice/background/Configuration.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Configuration.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Configuration.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_CONFIGURATION_H
 #define TEST_CONFIGURATION_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Connector.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/Connector.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Connector.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Connector.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Connector.h zeroc-ice-3.7.2/cpp/test/Ice/background/Connector.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Connector.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Connector.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_CONNECTOR_H
 #define TEST_CONNECTOR_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointFactory.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointFactory.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointFactory.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointFactory.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointFactory.h zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointFactory.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ENDPOINT_FACTORY_H
 #define TEST_ENDPOINT_FACTORY_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointI.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointI.h zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/EndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/EndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ENDPOINT_I_H
 #define TEST_ENDPOINT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/background/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries       := $(test)_TestTransport
 $(test)_cppflags        := -I$(srcdir)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -198,13 +198,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -199,13 +199,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/testtransport/packages.config zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/testtransport/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/testtransport/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/testtransport/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -361,14 +361,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/PluginI.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/PluginI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/PluginI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/PluginI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
@@ -66,6 +61,22 @@
     {
         IceInternal::EndpointFactoryPtr factory = facade->getEndpointFactory(s);
         if(factory)
+        {
+            facade->addEndpointFactory(new EndpointFactory(factory));
+        }
+    }
+    for(Ice::Short s = 1000; s < 1010; ++s)
+    {
+        IceInternal::EndpointFactoryPtr factory = facade->getEndpointFactory(s);
+        if(factory)
+        {
+            facade->addEndpointFactory(new EndpointFactory(factory));
+        }
+    }
+    for(Ice::Short s = 10000; s < 10010; ++s)
+    {
+        IceInternal::EndpointFactoryPtr factory = facade->getEndpointFactory(s);
+        if(factory)
         {
             facade->addEndpointFactory(new EndpointFactory(factory));
         }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/PluginI.h zeroc-ice-3.7.2/cpp/test/Ice/background/PluginI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/PluginI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/PluginI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_PLUGIN_H
 #define TEST_PLUGIN_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 #include <Configuration.h>
 #include <PluginI.h>
@@ -124,11 +119,45 @@
     BackgroundControllerIPtr _controller;
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1, "tcp"));
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+#ifdef ICE_STATIC_LIBS
+    Ice::registerPluginFactory("Test", createTestTransport, false);
+#endif
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    properties->setProperty("Ice.Warn.Connections", "0");
+
+    properties->setProperty("Ice.MessageSizeMax", "50000");
+
+    //
+    // This test relies on filling the TCP send/recv buffer, so
+    // we rely on a fixed value for these buffers.
+    //
+    properties->setProperty("Ice.TCP.RcvSize", "50000");
+
+    //
+    // Setup the test transport plug-in.
+    //
+    properties->setProperty("Ice.Plugin.Test", "TestTransport:createTestTransport");
+    string defaultProtocol = properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+    properties->setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
     communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -152,46 +181,6 @@
     adapter2->activate();
 
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerPluginFactory("Test", createTestTransport, false);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        initData.properties->setProperty("Ice.MessageSizeMax", "50000");
-
-        // This test relies on filling the TCP send/recv buffer, so
-        // we rely on a fixed value for these buffers.
-        initData.properties->setProperty("Ice.TCP.RcvSize", "50000");
-
-        //
-        // Setup the test transport plug-in.
-        //
-        initData.properties->setProperty("Ice.Plugin.Test", "TestTransport:createTestTransport");
-        string defaultProtocol = initData.properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties->setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/background/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestI.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/background/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 #include <Configuration.h>
 
 #include <set>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Transceiver.cpp zeroc-ice-3.7.2/cpp/test/Ice/background/Transceiver.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Transceiver.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Transceiver.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
@@ -24,8 +19,9 @@
 IceInternal::SocketOperation
 Transceiver::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
 {
+    IceInternal::SocketOperation status = IceInternal::SocketOperationNone;
 #ifndef ICE_USE_IOCP
-    IceInternal::SocketOperation status = _configuration->initializeSocketOperation();
+    status = _configuration->initializeSocketOperation();
     if(status == IceInternal::SocketOperationConnect)
     {
         return status;
@@ -52,7 +48,7 @@
     _configuration->checkInitializeException();
     if(!_initialized)
     {
-        IceInternal::SocketOperation status = _transceiver->initialize(readBuffer, writeBuffer);
+        status = _transceiver->initialize(readBuffer, writeBuffer);
         if(status != IceInternal::SocketOperationNone)
         {
             return status;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/background/Transceiver.h zeroc-ice-3.7.2/cpp/test/Ice/background/Transceiver.h
--- zeroc-ice-3.7.1/cpp/test/Ice/background/Transceiver.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/background/Transceiver.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_TRANSCEIVER_H
 #define TEST_TRANSCEIVER_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/binding/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Random.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <set>
 
@@ -18,14 +13,6 @@
 using namespace std;
 using namespace Test;
 
-struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
-{
-    ptrdiff_t operator()(ptrdiff_t d)
-    {
-        return IceUtilInternal::random(static_cast<int>(d));
-    }
-};
-
 #ifndef ICE_CPP11_MAPPING
 class GetAdapterNameCB : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
@@ -101,13 +88,12 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string ref = "communicator:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string ref = "communicator:" + helper->getTestEndpoint();
     RemoteCommunicatorPrxPtr com = ICE_UNCHECKED_CAST(RemoteCommunicatorPrx, communicator->stringToProxy(ref));
 
-    RandomNumberGenerator rng;
-
     cout << "testing binding with single endpoint... " << flush;
     {
         RemoteObjectAdapterPrxPtr adapter = com->createObjectAdapter("Adapter", "default");
@@ -161,9 +147,9 @@
             vector<RemoteObjectAdapterPrxPtr> adpts = adapters;
 
             TestIntfPrxPtr test1 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test2 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test3 = createTestIntfPrx(adpts);
 
             test(test1->ice_getConnection() == test2->ice_getConnection());
@@ -209,9 +195,9 @@
             vector<RemoteObjectAdapterPrxPtr> adpts = adapters;
 
             TestIntfPrxPtr test1 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test2 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test3 = createTestIntfPrx(adpts);
 
             test(test1->ice_getConnection() == test2->ice_getConnection());
@@ -341,9 +327,9 @@
             vector<RemoteObjectAdapterPrxPtr> adpts = adapters;
 
             TestIntfPrxPtr test1 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test2 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test3 = createTestIntfPrx(adpts);
 
             test(test1->ice_getConnection() == test2->ice_getConnection());
@@ -389,9 +375,9 @@
             vector<RemoteObjectAdapterPrxPtr> adpts = adapters;
 
             TestIntfPrxPtr test1 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test2 = createTestIntfPrx(adpts);
-            random_shuffle(adpts.begin(), adpts.end(), rng);
+            IceUtilInternal::shuffle(adpts.begin(), adpts.end());
             TestIntfPrxPtr test3 = createTestIntfPrx(adpts);
 
             test(test1->ice_getConnection() == test2->ice_getConnection());
@@ -940,7 +926,7 @@
         string endpoint;
         {
             ostringstream str;
-            str << "tcp -p " << getTestPort(communicator->getProperties(), 2);
+            str << "tcp -p " << helper->getTestPort(2);
             endpoint = str.str();
         }
 
@@ -1018,10 +1004,10 @@
                 Ice::InitializationData clientInitData;
                 clientInitData.properties = *q;
                 Ice::CommunicatorHolder clientCommunicator(clientInitData);
-                Ice::ObjectPrxPtr prx = clientCommunicator->stringToProxy(strPrx);
+                Ice::ObjectPrxPtr clientPrx = clientCommunicator->stringToProxy(strPrx);
                 try
                 {
-                    prx->ice_ping();
+                    clientPrx->ice_ping();
                     test(false);
                 }
                 catch(const Ice::ObjectNotExistException&)
@@ -1090,7 +1076,7 @@
         catch(const Ice::ConnectionRefusedException&)
         {
             // Close the connection now to free a FD (it could be done after the sleep but
-            // there could be race condiutation since the connection might not be closed
+            // there could be race condition since the connection might not be closed
             // immediately due to threading).
             test->ice_connectionId("0")->ice_getConnection()->close(
                 Ice::ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait));
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/binding/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/binding/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
 namespace
@@ -58,43 +51,33 @@
 
 }
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    initData.properties->setProperty("Ice.Warn.Connections", "0");
+    initData.logger = ICE_MAKE_SHARED(NullLogger);
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("communicator");
     adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id);
     adapter->activate();
 
-    TEST_READY
+    serverReady();
 
     // Disable ready print for further adapters.
     communicator->getProperties()->setProperty("Ice.PrintAdapterReady", "0");
 
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.logger = ICE_MAKE_SHARED(NullLogger);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/binding/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-RemoteCommunicatorI::RemoteCommunicatorI() : _nextPort(1)
+RemoteCommunicatorI::RemoteCommunicatorI() :
+    _nextPort(1)
 {
 }
 
@@ -39,7 +35,7 @@
             {
                 if(endpoints.find("-p") == string::npos)
                 {
-                    endpoints = getTestEndpoint(com, _nextPort++, endpoints);
+                    endpoints = TestHelper::getTestEndpoint(com->getProperties(), _nextPort++, endpoints);
                 }
             }
             com->getProperties()->setProperty(name + ".ThreadPool.Size", "1");
@@ -90,7 +86,7 @@
 }
 
 void
-RemoteObjectAdapterI::deactivate(const Ice::Current& current)
+RemoteObjectAdapterI::deactivate(const Ice::Current&)
 {
     try
     {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/binding/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/binding/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/binding/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/binding/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
+#include <TestHelper.h>
 
 class RemoteCommunicatorI : public Test::RemoteCommunicator
 {
@@ -19,7 +15,8 @@
     RemoteCommunicatorI();
 
 #ifdef ICE_CPP11_MAPPING
-    virtual std::shared_ptr<Test::RemoteObjectAdapterPrx> createObjectAdapter(std::string, std::string, const Ice::Current&);
+    virtual std::shared_ptr<Test::RemoteObjectAdapterPrx> createObjectAdapter(std::string, std::string,
+                                                                              const Ice::Current&);
     virtual void deactivateObjectAdapter(std::shared_ptr<Test::RemoteObjectAdapterPrx>, const Ice::Current&);
 #else
     virtual Test::RemoteObjectAdapterPrx createObjectAdapter(const std::string&, const std::string&,
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/checksum/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
 Test::ChecksumPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator, bool)
+allTests(Test::TestHelper* helper)
 {
-    string ref = "test:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string ref = "test:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/checksum/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-DEFINE_TEST("client")
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Client::run(int argc, char** argv)
 {
-    Test::ChecksumPrxPtr allTests(const Ice::CommunicatorPtr&, bool);
-    Test::ChecksumPrxPtr checksum = allTests(communicator, false);
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Test::ChecksumPrxPtr allTests(Test::TestHelper*);
+    Test::ChecksumPrxPtr checksum = allTests(this);
     checksum->shutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/ClientTypes.ice zeroc-ice-3.7.2/cpp/test/Ice/checksum/ClientTypes.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/ClientTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/ClientTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/checksum/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_sliceflags      = --checksum
 $(test)_client_sources  = $(test-client-sources) ClientTypes.ice
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -504,14 +504,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -505,14 +505,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -334,16 +334,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -370,16 +370,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/checksum/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-DEFINE_TEST("server")
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(ChecksumI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/ServerTypes.ice zeroc-ice-3.7.2/cpp/test/Ice/checksum/ServerTypes.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/ServerTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/ServerTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/checksum/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/checksum/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/SliceChecksums.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/checksum/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/checksum/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/checksum/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/checksum/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Iterator.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <Wstring.h>
 
@@ -566,9 +561,10 @@
 #endif
 
 Test::TestIntfPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    const string endp = getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    const string endp = helper->getTestEndpoint();
     cout << "testing stringToProxy... " << flush;
     string ref = communicator->getProperties()->getPropertyWithDefault("Custom.Proxy", "test:" + endp);
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
@@ -870,7 +866,7 @@
         int i = 0;
         for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p)
         {
-            *p = '1' + i++;
+            *p = static_cast<Ice::Byte>('1' + i++);
         }
 
         MyByteSeq out;
@@ -1584,7 +1580,7 @@
             int i = 0;
             for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p)
             {
-                *p = '1' + i++;
+                *p = static_cast<Ice::Byte>('1' + i++);
             }
 
 #ifdef ICE_CPP11_MAPPING
@@ -2534,7 +2530,7 @@
         int i = 0;
         for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p)
         {
-            *p = '1' + i++;
+            *p = static_cast<Ice::Byte>('1' + i++);
         }
 
 #ifdef ICE_CPP11_MAPPING
@@ -3365,10 +3361,10 @@
 
     cout << "testing class mapped structs with AMI... " << flush;
     {
-        Test::ClassStructPtr cs2;
-        Test::ClassStructSeq csseq2;
+        cs2 = 0;
+        csseq2.clear();
         Ice::AsyncResultPtr r = t->begin_opClassStruct(cs, csseq1);
-        Test::ClassStructPtr cs3 = t->end_opClassStruct(cs2, csseq2, r);
+        cs3 = t->end_opClassStruct(cs2, csseq2, r);
         assert(cs3 == cs);
         assert(csseq1.size() == csseq2.size());
         assert(csseq1[0] == csseq2[0]);
@@ -3423,8 +3419,7 @@
         test(r.returnValue == wstr);
 #else
         Ice::AsyncResultPtr r = wsc1->begin_opString(wstr);
-        wstring out;
-        wstring ret = wsc1->end_opString(out, r);
+        ret = wsc1->end_opString(out, r);
         test(out == wstr);
         test(ret == wstr);
 #endif
@@ -3435,10 +3430,10 @@
         promise<bool> done;
 
         wsc1->opStringAsync(wstr,
-                            [&](wstring ret, wstring out)
+                            [&](wstring retP, wstring outP)
                             {
-                                test(out == wstr);
-                                test(ret == wstr);
+                                test(outP == wstr);
+                                test(retP == wstr);
                                 done.set_value(true);
                             },
                             [&](std::exception_ptr)
@@ -3466,8 +3461,7 @@
         test(r.returnValue == wstr);
 #else
         Ice::AsyncResultPtr r = wsc2->begin_opString(wstr);
-        wstring out;
-        wstring ret = wsc2->end_opString(out, r);
+        ret = wsc2->end_opString(out, r);
         test(out == wstr);
         test(ret == wstr);
 #endif
@@ -3478,10 +3472,10 @@
         promise<bool> done;
 
         wsc2->opStringAsync(wstr,
-                            [&](wstring ret, wstring out)
+                            [&](wstring retP, wstring outP)
                             {
-                                test(out == wstr);
-                                test(ret == wstr);
+                                test(outP == wstr);
+                                test(retP == wstr);
                                 done.set_value(true);
                             },
                             [&](std::exception_ptr)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,61 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <StringConverterI.h>
 
 using namespace std;
 
-DEFINE_TEST("client")
-
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    Test::TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&);
-    Test::TestIntfPrxPtr test = allTests(communicator);
-    test->shutdown();
+public:
 
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char** argv)
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
-        setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
-
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << ": " << ex.ice_stackTrace() << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-
+    setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
+    setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Test::TestIntfPrxPtr allTests(Test::TestHelper*);
+    Test::TestIntfPrxPtr test = allTests(this);
+    test->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 #include <WstringI.h>
 #include <StringConverterI.h>
 
 using namespace std;
 
-DEFINE_TEST("collocated")
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
+    setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), Ice::stringToIdentity("TEST"));
+    adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("TEST"));
     adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("WSTRING1"));
     adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("WSTRING2"));
 
-    Test::TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    Test::TestIntfPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-int
-main(int argc, char** argv)
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
-        setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
-
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/CustomBuffer.h zeroc-ice-3.7.2/cpp/test/Ice/custom/CustomBuffer.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/CustomBuffer.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/CustomBuffer.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CUSTOM_BUFFER_H
 #define CUSTOM_BUFFER_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/CustomMap.h zeroc-ice-3.7.2/cpp/test/Ice/custom/CustomMap.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/CustomMap.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/CustomMap.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CUSTOM_MAP_H
 #define CUSTOM_MAP_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/custom/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources          = Client.cpp \
                                   AllTests.cpp \
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -506,14 +506,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -510,14 +510,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -509,14 +509,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -509,14 +509,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -366,16 +366,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -370,16 +370,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -374,15 +374,15 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -381,16 +381,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/MyByteSeq.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/MyByteSeq.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/MyByteSeq.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/MyByteSeq.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <MyByteSeq.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/MyByteSeq.h zeroc-ice-3.7.2/cpp/test/Ice/custom/MyByteSeq.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/MyByteSeq.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/MyByteSeq.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_MY_BYTE_SEQ_H
 #define TEST_MY_BYTE_SEQ_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,67 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 #include <WstringAMDI.h>
 #include <StringConverterI.h>
 
 using namespace std;
 
-DEFINE_TEST("serveramd")
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+ServerAMD::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
+    setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(ICE_MAKE_SHARED(TestIntfI,communicator), Ice::stringToIdentity("TEST"));
+    adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("TEST"));
     adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("WSTRING1"));
     adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("WSTRING2"));
 
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char** argv)
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
-        setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
-
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,67 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 #include <WstringI.h>
 #include <StringConverterI.h>
 
 using namespace std;
 
-DEFINE_TEST("server")
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
+    setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(ICE_MAKE_SHARED(TestIntfI, communicator), Ice::stringToIdentity("TEST"));
+    adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("TEST"));
     adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("WSTRING1"));
     adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("WSTRING2"));
 
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char** argv)
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
-        setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
-
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/StringConverterI.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/StringConverterI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/StringConverterI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/StringConverterI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <StringConverterI.h>
 
@@ -21,7 +16,7 @@
 
     for(size_t i = 0; i < size; ++i)
     {
-        targetStart[i] = tolower(sourceStart[i]);
+        targetStart[i] = static_cast<Byte>(tolower(sourceStart[i]));
     }
 
     return targetEnd;
@@ -35,7 +30,7 @@
     target.resize(size);
     for(size_t i = 0; i < size; ++i)
     {
-        target[i] = toupper(sourceStart[i]);
+        target[i] = static_cast<Byte>(toupper(sourceStart[i]));
     }
 }
 
@@ -51,7 +46,7 @@
 
     for(size_t i = 0; i < size; ++i)
     {
-        targetStart[i] = tolower(s[i]);
+        targetStart[i] = static_cast<Byte>(tolower(s[i]));
     }
     return targetEnd;
 }
@@ -63,7 +58,7 @@
     string s(sourceStart, sourceEnd);
     for(size_t i = 0; i < s.size(); ++i)
     {
-        s[i] = toupper(s[i]);
+        s[i] = static_cast<char>(toupper(s[i]));
     }
     target = stringToWstring(s);
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/StringConverterI.h zeroc-ice-3.7.2/cpp/test/Ice/custom/StringConverterI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/StringConverterI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/StringConverterI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef STRING_CONVERTER_I_H
 #define STRING_CONVERTER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/StringView.h zeroc-ice-3.7.2/cpp/test/Ice/custom/StringView.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/StringView.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/StringView.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef STRING_VIEW_H
 #define STRING_VIEW_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/custom/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <TestAMDI.h>
 
-TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator)
-    : _communicator(communicator)
-{
-}
-
 #ifdef ICE_CPP11_MAPPING
 
 void
@@ -343,9 +333,10 @@
 
 void
 TestIntfI::shutdownAsync(std::function<void()> response,
-                         std::function<void(std::exception_ptr)>, const Ice::Current&)
+                         std::function<void(std::exception_ptr)>,
+                         const Ice::Current& current)
 {
-    _communicator->shutdown();
+    current.adapter->getCommunicator()->shutdown();
     response();
 }
 
@@ -694,9 +685,9 @@
 
 void
 TestIntfI::shutdown_async(const Test::AMD_TestIntf_shutdownPtr& shutdownCB,
-                          const Ice::Current&)
+                          const Ice::Current& current)
 {
-    _communicator->shutdown();
+    current.adapter->getCommunicator()->shutdown();
     shutdownCB->ice_response();
 }
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/custom/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
@@ -16,8 +11,6 @@
 {
 public:
 
-    TestIntfI(const Ice::CommunicatorPtr&);
-
 #ifdef ICE_CPP11_MAPPING
 
     void opDoubleArrayAsync(std::pair<const ::Ice::Double*, const ::Ice::Double*>,
@@ -343,10 +336,6 @@
     virtual void shutdown_async(const Test::AMD_TestIntf_shutdownPtr&,
                                 const Ice::Current&);
 #endif
-
-private:
-
-    Ice::CommunicatorPtr _communicator;
 };
 
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/custom/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <TestI.h>
 
-TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator)
-    : _communicator(communicator)
-{
-}
-
 Test::DoubleSeq
 TestIntfI::opDoubleArray(ICE_IN(std::pair<const Ice::Double*, const Ice::Double*>) inSeq,
                          Test::DoubleSeq& outSeq,
@@ -461,7 +451,7 @@
 }
 
 void
-TestIntfI::shutdown(const Ice::Current&)
+TestIntfI::shutdown(const Ice::Current& current)
 {
-    _communicator->shutdown();
+    current.adapter->getCommunicator()->shutdown();
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/custom/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
@@ -16,8 +11,6 @@
 {
 public:
 
-    TestIntfI(const Ice::CommunicatorPtr&);
-
     virtual Test::DoubleSeq opDoubleArray(ICE_IN(std::pair<const Ice::Double*, const Ice::Double*>),
                                           Test::DoubleSeq&,
                                           const Ice::Current&);
@@ -207,10 +200,6 @@
     Test::BufferStruct opBufferStruct(ICE_IN(Test::BufferStruct), const Ice::Current&);
 
     virtual void shutdown(const Ice::Current&);
-
-private:
-
-    Ice::CommunicatorPtr _communicator;
 };
 
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <WstringAMDI.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef WSTRINGAMD_I_H
 #define WSTRINGAMD_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/Wstring.ice zeroc-ice-3.7.2/cpp/test/Ice/custom/Wstring.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/Wstring.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/Wstring.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringI.cpp zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <WstringI.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringI.h zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/custom/WstringI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/custom/WstringI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef WSTRING_I_H
 #define WSTRING_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
 using namespace std;
 using namespace Test;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     Ice::ObjectAdapterPtr oa = communicator->createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost");
     oa->activate();
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-DEFINE_TEST("client")
-
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -267,16 +267,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultServant/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultServant/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-DEFINE_TEST("client")
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**)
+void
+Client::run(int, char**)
 {
     void allTests();
     allTests();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-
-    try
-    {
-        status = run(argc, argv);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    return status;
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -40,7 +40,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{80FE3863-C289-4BDE-833C-256D5E5.0.4A}</ProjectGuid>
+    <ProjectGuid>{80FE3863-C289-4BDE-833C-256D5E54093A}</ProjectGuid>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -265,16 +265,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Random.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <Dispatcher.h>
 
@@ -113,15 +108,16 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string sref = "test:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string sref = "test:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr obj = communicator->stringToProxy(sref);
     test(obj);
 
     Test::TestIntfPrxPtr p = ICE_UNCHECKED_CAST(Test::TestIntfPrx, obj);
 
-    sref = "testController:" + getTestEndpoint(communicator, 1, "tcp");
+    sref = "testController:" + helper->getTestEndpoint(1, "tcp");
     obj = communicator->stringToProxy(sref);
     test(obj);
 
@@ -174,7 +170,7 @@
             //
             // Expect InvocationTimeoutException.
             //
-            auto to = p->ice_invocationTimeout(250);
+            auto to = p->ice_invocationTimeout(10);
             to->sleepAsync(500,
                 [cb]()
                 {
@@ -249,7 +245,7 @@
             //
             // Expect InvocationTimeoutException.
             //
-            Test::TestIntfPrx to = p->ice_invocationTimeout(250);
+            Test::TestIntfPrx to = p->ice_invocationTimeout(10);
             to->begin_sleep(500, Test::newCallback_TestIntf_sleep(cb, &Callback::responseEx, &Callback::exceptionEx));
             cb->check();
         }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,64 +1,49 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <Dispatcher.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    int status;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
+    void run(int, char**);
+};
 
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties->setProperty("Ice.TCP.SndSize", "50000");
+void
+Client::run(int argc, char** argv)
+{
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    //
+    // Limit the send buffer size, this test relies on the socket
+    // send() blocking after sending a given amount of data.
+    //
+    initData.properties->setProperty("Ice.TCP.SndSize", "50000");
 
 #ifdef ICE_CPP11_MAPPING
-        IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
-        initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
-            {
-                dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
-            };
+    IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
+    initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
+        {
+            dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
+        };
 #else
-        initData.dispatcher = new Dispatcher();
+    initData.dispatcher = new Dispatcher();
 #endif
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        status = run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
+    // The communicator must be destroyed before the dispatcher is terminated.
     {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
+
+        void allTests(Test::TestHelper*);
+        allTests(this);
     }
     Dispatcher::terminate();
-    return status;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 #include <Dispatcher.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1, "tcp"));
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+#ifdef ICE_CPP11_MAPPING
+    IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
+    initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
+        {
+            dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
+        };
+#else
+    initData.dispatcher = new Dispatcher();
+#endif
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
     communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -34,39 +47,10 @@
     adapter2->add(testController, Ice::stringToIdentity("testController"));
     //adapter2->activate(); // Don't activate OA to ensure collocation is used.
 
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+    void allTests(Test::TestHelper*);
+    allTests(this);
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    int status;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-#ifdef ICE_CPP11_MAPPING
-        IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
-        initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
-            {
-                dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
-            };
-#else
-        initData.dispatcher = new Dispatcher();
-#endif
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        status = run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
     Dispatcher::terminate();
-    return status;
 }
+
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Dispatcher.cpp zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Dispatcher.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Dispatcher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Dispatcher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Dispatcher.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Dispatcher.h zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Dispatcher.h
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Dispatcher.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Dispatcher.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef DISPATCHER_I_H
 #define DISPATCHER_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = $(test-client-sources) Dispatcher.cpp
 $(test)_server_sources = $(test-server-sources) Dispatcher.cpp
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -345,14 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -344,14 +344,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -267,16 +267,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -269,16 +269,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -273,16 +273,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,80 +1,65 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Dispatcher.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1, "tcp"));
-    communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
+public:
 
-    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter");
+    void run(int, char**);
+};
 
-    TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter);
+void
+Server::run(int argc, char** argv)
+{
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    //
+    // Limit the recv buffer size, this test relies on the socket
+    // send() blocking after sending a given amount of data.
+    //
+    initData.properties->setProperty("Ice.TCP.RcvSize", "50000");
 
-    adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test"));
-    adapter->activate();
+#ifdef ICE_CPP11_MAPPING
+    IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
+    initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
+        {
+            dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
+        };
+#else
+    initData.dispatcher = new Dispatcher();
+#endif
+    // The communicator must be destroyed before the dispatcher is terminated.
+    {
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
 
-    adapter2->add(testController, Ice::stringToIdentity("testController"));
-    adapter2->activate();
+        communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
+        communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+        communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
-    TEST_READY
+        Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+        Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter");
 
-    communicator->waitForShutdown();
-    return EXIT_SUCCESS;
-}
+        TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter);
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    int status;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
+        adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test"));
+        adapter->activate();
 
-        //
-        // Limit the recv buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties->setProperty("Ice.TCP.RcvSize", "50000");
+        adapter2->add(testController, Ice::stringToIdentity("testController"));
+        adapter2->activate();
 
-#ifdef ICE_CPP11_MAPPING
-        IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
-        initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
-            {
-                dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
-            };
-#else
-        initData.dispatcher = new Dispatcher();
-#endif
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        status = run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
+        serverReady();
+
+        communicator->waitForShutdown();
     }
     Dispatcher::terminate();
-    return status;
 }
+
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestI.h>
 #include <Ice/Ice.h>
 #include <Dispatcher.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <IceUtil/Thread.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/dispatcher/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/dispatcher/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/BlobjectI.cpp zeroc-ice-3.7.2/cpp/test/Ice/echo/BlobjectI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/BlobjectI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/BlobjectI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <BlobjectI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/BlobjectI.h zeroc-ice-3.7.2/cpp/test/Ice/echo/BlobjectI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/BlobjectI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/BlobjectI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef BLOBJECT_H
 #define BLOBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/echo/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_sources  = Test.ice BlobjectI.cpp Server.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/echo/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/msbuild/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/echo/msbuild/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/msbuild/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/msbuild/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/echo/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <BlobjectI.h>
 #include <Test.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
 class EchoI : public Test::Echo
@@ -50,44 +43,25 @@
     BlobjectIPtr _blob;
 };
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     BlobjectIPtr blob = ICE_MAKE_SHARED(BlobjectI);
     adapter->addDefaultServant(blob, "");
     adapter->add(ICE_MAKE_SHARED(EchoI, blob), Ice::stringToIdentity("__echo"));
     adapter->activate();
-
-    TEST_READY
-
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/echo/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/echo/test.py zeroc-ice-3.7.2/cpp/test/Ice/echo/test.py
--- zeroc-ice-3.7.1/cpp/test/Ice/echo/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/echo/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class EchoServerTestCase(ClientServerTestCase):
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/enums/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
 TestIntfPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string ref = "test:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string ref = "test:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr obj = communicator->stringToProxy(ref);
     test(obj);
     TestIntfPrxPtr proxy = ICE_CHECKED_CAST(TestIntfPrx, obj);
@@ -86,14 +82,14 @@
         Ice::OutputStream out(communicator);
         out.write(ICE_ENUM(ShortEnum, senum11));
         out.finished(bytes);
-        test(bytes.size() == (encoding_1_0 ? 2 : 5));
+        test(bytes.size() == (encoding_1_0 ? size_t(2) : size_t(5)));
     }
 
     {
         Ice::OutputStream out(communicator);
         out.write(ICE_ENUM(IntEnum, ienum11));
         out.finished(bytes);
-        test(bytes.size() == (encoding_1_0 ? 4 : 5));
+        test(bytes.size() == (encoding_1_0 ? size_t(4) : size_t(5)));
     }
 
     {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/enums/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&);
-    TestIntfPrxPtr t = allTests(communicator);
-    t->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    TestIntfPrxPtr allTests(Test::TestHelper*);
+    TestIntfPrxPtr t = allTests(this);
+    t->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -265,16 +265,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/enums/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test"));
 
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/enums/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/enums/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/enums/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/enums/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/enums/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class TestIntfI : public virtual Test::TestIntf
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -402,8 +397,9 @@
 }
 
 ThrowerPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     const string protocol = communicator->getProperties()->getProperty("Ice.Default.Protocol");
 
     cout << "testing ice_print()/what()... " << flush;
@@ -691,7 +687,7 @@
     cout << "ok" << endl;
 
     cout << "testing stringToProxy... " << flush;
-    string ref = "thrower:" + getTestEndpoint(communicator, 0);
+    string ref = "thrower:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
@@ -1002,7 +998,7 @@
         try
         {
             ThrowerPrxPtr thrower2 =
-                ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 1)));
+                ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + helper->getTestEndpoint(1)));
             try
             {
                 thrower2->throwMemoryLimitException(Ice::ByteSeq(2 * 1024 * 1024)); // 2MB (no limits)
@@ -1011,7 +1007,7 @@
             {
             }
             ThrowerPrxPtr thrower3 =
-                ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 2)));
+                ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + helper->getTestEndpoint(2)));
             try
             {
                 thrower3->throwMemoryLimitException(Ice::ByteSeq(1024)); // 1KB limit
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&);
-    ThrowerPrxPtr thrower = allTests(communicator);
-    thrower->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    ThrowerPrxPtr allTests(Test::TestHelper*);
+    ThrowerPrxPtr thrower = allTests(this);
+    thrower->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated");
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI);
     adapter->add(object, Ice::stringToIdentity("thrower"));
 
-    ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    ThrowerPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/ExceptionsI.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/ExceptionsI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/ExceptionsI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/ExceptionsI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifdef ICE_AMD_TEST
 #   include <TestAMD.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = $(test-client-sources) ExceptionsI.cpp
 $(test)_server_sources = $(test-server-sources) ExceptionsI.cpp
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -302,14 +302,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -344,14 +344,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -351,14 +351,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -236,16 +236,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -268,16 +268,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -272,16 +272,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -273,16 +273,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 
-DEFINE_TEST("serveramd");
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerAMD : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(communicator, 1));
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerAMD::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
     communicator->getProperties()->setProperty("TestAdapter2.MessageSizeMax", "0");
-    communicator->getProperties()->setProperty("TestAdapter3.Endpoints", getTestEndpoint(communicator, 2));
+    communicator->getProperties()->setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
     communicator->getProperties()->setProperty("TestAdapter3.MessageSizeMax", "1");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2");
@@ -33,33 +39,8 @@
     adapter->activate();
     adapter2->activate();
     adapter3->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server");
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(communicator, 1));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
+    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
     communicator->getProperties()->setProperty("TestAdapter2.MessageSizeMax", "0");
-    communicator->getProperties()->setProperty("TestAdapter3.Endpoints", getTestEndpoint(communicator, 2));
+    communicator->getProperties()->setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
     communicator->getProperties()->setProperty("TestAdapter3.MessageSizeMax", "1");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2");
@@ -33,33 +40,8 @@
     adapter->activate();
     adapter2->activate();
     adapter3->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace Test;
 using namespace std;
@@ -200,7 +195,7 @@
 void
 ThrowerI::throwModAAsync(int a, int a2,
                          function<void()>,
-                         function<void(exception_ptr)> exception,
+                         function<void(exception_ptr)>,
                          const Ice::Current&)
 {
     Mod::A ex;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <TestAMD.h>
-#include <TestCommon.h>
 
 bool
 endsWith(const std::string&, const std::string&);
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace Test;
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/exceptions/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/exceptions/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 bool endsWith(const std::string&, const std::string&);
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/facets/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -20,8 +15,9 @@
 };
 
 GPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
 #ifdef ICE_OS_UWP
     bool uwp = true;
 #else
@@ -122,7 +118,7 @@
     }
 
     cout << "testing stringToProxy... " << flush;
-    string ref = "d:" + getTestEndpoint(communicator, 0);
+    string ref = "d:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr db = communicator->stringToProxy(ref);
     test(db);
     cout << "ok" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/facets/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    GPrxPtr allTests(const Ice::CommunicatorPtr&);
-    GPrxPtr g = allTests(communicator);
-    g->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    GPrxPtr allTests(Test::TestHelper*);
+    GPrxPtr g = allTests(this);
+    g->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/facets/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr d = ICE_MAKE_SHARED(DI);
     adapter->add(d, Ice::stringToIdentity("d"));
     adapter->addFacet(d, Ice::stringToIdentity("d"), "facetABCD");
     Ice::ObjectPtr f = ICE_MAKE_SHARED(FI);
     adapter->addFacet(f, Ice::stringToIdentity("d"), "facetEF");
-    Ice::ObjectPtr h = ICE_MAKE_SHARED(HI, communicator);
+    Ice::ObjectPtr h = ICE_MAKE_SHARED(HI);
     adapter->addFacet(h, Ice::stringToIdentity("d"), "facetGH");
 
-    GPrxPtr allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    GPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -267,16 +267,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/facets/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
+class Server : public Test::TestHelper
+{
+public:
 
-using namespace std;
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr d = ICE_MAKE_SHARED(DI);
     adapter->add(d, Ice::stringToIdentity("d"));
     adapter->addFacet(d, Ice::stringToIdentity("d"), "facetABCD");
     Ice::ObjectPtr f = ICE_MAKE_SHARED(FI);
     adapter->addFacet(f, Ice::stringToIdentity("d"), "facetEF");
-    Ice::ObjectPtr h = ICE_MAKE_SHARED(HI, communicator);
+    Ice::ObjectPtr h = ICE_MAKE_SHARED(HI);
     adapter->addFacet(h, Ice::stringToIdentity("d"), "facetGH");
-    TEST_READY
+    serverReady();
     adapter->activate();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/facets/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
@@ -46,15 +41,10 @@
     return "F";
 }
 
-GI::GI(const Ice::CommunicatorPtr& communicator) :
-    _communicator(communicator)
-{
-}
-
 void
-GI::shutdown(const Ice::Current&)
+GI::shutdown(const Ice::Current& current)
 {
-    _communicator->shutdown();
+    current.adapter->getCommunicator()->shutdown();
 }
 
 std::string
@@ -63,11 +53,6 @@
     return "G";
 }
 
-HI::HI(const Ice::CommunicatorPtr& communicator) :
-    GI(communicator)
-{
-}
-
 std::string
 HI::callH(const Ice::Current&)
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/facets/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/facets/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/facets/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/facets/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
@@ -58,20 +53,14 @@
 {
 public:
 
-    GI(const Ice::CommunicatorPtr&);
     virtual void shutdown(const Ice::Current&);
     virtual std::string callG(const Ice::Current&);
-
-private:
-
-    Ice::CommunicatorPtr _communicator;
 };
 
 class HI : public virtual Test::H, public virtual GI
 {
 public:
 
-    HI(const Ice::CommunicatorPtr&);
     virtual std::string callH(const Ice::Current&);
 };
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -89,9 +84,9 @@
         catch(const Ice::ConnectFailedException&)
         {
         }
-        catch(const Ice::Exception& ex)
+        catch(const Ice::Exception& e)
         {
-            cout << ex << endl;
+            cout << e << endl;
             test(false);
         }
         called();
@@ -109,14 +104,15 @@
 typedef IceUtil::Handle<Callback> CallbackPtr;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
+allTests(Test::TestHelper* helper, const vector<int>& ports)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing stringToProxy... " << flush;
     ostringstream ref;
     ref << "test";
     for(vector<int>::const_iterator p = ports.begin(); p != ports.end(); ++p)
     {
-        ref << ":" << getTestEndpoint(communicator, *p);
+        ref << ":" << helper->getTestEndpoint(*p);
     }
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref.str());
     test(base);
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,80 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-void
-usage(const char* n)
+class Client : public Test::TestHelper
 {
-    cerr << "Usage: " << n << " port...\n";
-}
+public:
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0"); // test aborts
+    Ice::CommunicatorHolder ich = initialize(argc, argv, properties);
+
     vector<int> ports;
     for(int i = 1; i < argc; ++i)
     {
         if(argv[i][0] == '-')
         {
-            cerr << argv[0] << ": unknown option `" << argv[i] << "'" << endl;
-            usage(argv[0]);
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << "unknown option `" << argv[i] << "'";
+            throw invalid_argument(os.str());
         }
-
         ports.push_back(atoi(argv[i]));
     }
 
     if(ports.empty())
     {
-        cerr << argv[0] << ": no ports specified" << endl;
-        usage(argv[0]);
-        return EXIT_FAILURE;
-    }
-
-    try
-    {
-        void allTests(const Ice::CommunicatorPtr&, const vector<int>&);
-        allTests(communicator, ports);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cout << ex << endl;
-        test(false);
+        throw runtime_error("no ports specified");
     }
 
-    return EXIT_SUCCESS;
+    void allTests(Test::TestHelper*, const vector<int>&);
+    allTests(this, ports);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0"); // test aborts
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-void
-usage(const char* n)
+class Server : public Test::TestHelper
 {
-    cerr << "Usage: " << n << " port\n";
-}
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
+    //
+    // In this test, we need a longer server idle time, otherwise
+    // our test servers may time out before they are used in the
+    // test.
+    //
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.ServerIdleTime", "120"); // Two minutes.
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
     int port = 0;
     for(int i = 1; i < argc; ++i)
     {
         if(argv[i][0] == '-')
         {
-            cerr << argv[0] << ": unknown option `" << argv[i] << "'" << endl;
-            usage(argv[0]);
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << ": unknown option `" << argv[i] << "'";
+            throw invalid_argument(os.str());
         }
 
         if(port > 0)
         {
-            cerr << argv[0] << ": only one port can be specified" << endl;
-            usage(argv[0]);
-            return EXIT_FAILURE;
+            throw runtime_error("only one port can be specified");
         }
 
         port = atoi(argv[i]);
@@ -44,47 +48,18 @@
 
     if(port <= 0)
     {
-        cerr << argv[0] << ": no port specified" << endl;
-        usage(argv[0]);
-        return EXIT_FAILURE;
+        throw runtime_error("no port specified");
     }
 
     ostringstream endpts;
-    endpts << getTestEndpoint(communicator, port);
+    endpts << getTestEndpoint(port);
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpts.str());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI);
     adapter->add(object, Ice::stringToIdentity("test"));
     adapter->activate();
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        //
-        // In this test, we need a longer server idle time, otherwise
-        // our test servers may time out before they are used in the
-        // test.
-        //
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.ServerIdleTime", "120"); // Two minutes.
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/faultTolerance/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/faultTolerance/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/gc/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/gc/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/gc/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/gc/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Thread.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
 #include <IceUtil/Random.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <fstream>
 
@@ -145,21 +140,8 @@
     }
 };
 
-class MyApplication : public Ice::Application
-{
-public:
-
-    MyApplication();
-    virtual int run(int, char* []);
-};
-
-MyApplication::MyApplication()
-    : Ice::Application(Ice::ICE_ENUM(SignalPolicy, NoSignalHandling))
-{
-}
-
-int
-MyApplication::run(int argc, char* argv[])
+void
+allTests()
 {
     cout << "testing single instance... " << flush;
     {
@@ -528,16 +510,19 @@
     test(getNum() == 0);
 
     cout << "ok" << endl;
-    return 0;
 }
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    MyApplication app;
-    return app.main(argc, argv);
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int, char**)
+{
+    allTests();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/gc/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/gc/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/gc/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/gc/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -340,14 +340,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/gc/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/gc/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/gc/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/gc/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/gc/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/gc/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/gc/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/gc/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/gc/test.py zeroc-ice-3.7.2/cpp/test/Ice/gc/test.py
--- zeroc-ice-3.7.1/cpp/test/Ice/gc/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/gc/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, options = { "cpp11" : [False] })
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hash/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/hash/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/hash/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hash/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Random.h>
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #if defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -19,14 +14,21 @@
 using namespace std;
 using namespace Test;
 
-DEFINE_TEST("client")
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int main(int argc, char** argv)
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceUDP(true);
-    Ice::registerIceSSL(false);
-#endif
+    Ice::PropertiesPtr properties = Ice::createProperties(argc, argv);
+    properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL");
+    properties->setProperty("IceSSL.Keychain", "client.keychain");
+    properties->setProperty("IceSSL.KeychainPassword", "password");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     cout << "testing proxy hash algorithm collisions... " << flush;
     map<Ice::Int, Ice::ObjectPrxPtr> seenProxy;
     map<Ice::Int, Ice::EndpointPtr> seenEndpoint;
@@ -35,13 +37,6 @@
     unsigned int maxCollisions = 10;
     unsigned int maxIterations = 10000;
 
-    Ice::InitializationData id;
-    id.properties = Ice::createProperties(argc, argv);
-    id.properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL");
-    id.properties->setProperty("IceSSL.Keychain", "client.keychain");
-    id.properties->setProperty("IceSSL.KeychainPassword", "password");
-
-    Ice::CommunicatorPtr communicator = Ice::initialize(id);
     for(i = 0; proxyCollisions < maxCollisions && i < maxIterations; ++i)
     {
         ostringstream os;
@@ -84,22 +79,20 @@
     proxyMap["prx9"] = prx9->_hash();
     proxyMap["prx10"] = prx10->_hash();
 
-    test( communicator->stringToProxy("Glacier2/router:tcp -p 10010")->_hash() == proxyMap["prx1"]);
-    test( communicator->stringToProxy("Glacier2/router:ssl -p 10011")->_hash() == proxyMap["prx2"]);
-    test( communicator->stringToProxy("Glacier2/router:udp -p 10012")->_hash() == proxyMap["prx3"]);
-    test( communicator->stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010")->_hash() == proxyMap["prx4"]);
-    test( communicator->stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011")->_hash() == proxyMap["prx5"]);
-    test( communicator->stringToProxy("Glacier2/router:udp -h zeroc.com -p 10012")->_hash() == proxyMap["prx6"]);
-    test( communicator->stringToProxy("Glacier2/router:tcp -p 10010 -t 10000")->_hash() == proxyMap["prx7"]);
-    test( communicator->stringToProxy("Glacier2/router:ssl -p 10011 -t 10000")->_hash() == proxyMap["prx8"]);
-    test( communicator->stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010 -t 10000")->_hash() == proxyMap["prx9"]);
-    test( communicator->stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011 -t 10000")->_hash() == proxyMap["prx10"]);
+    test(communicator->stringToProxy("Glacier2/router:tcp -p 10010")->_hash() == proxyMap["prx1"]);
+    test(communicator->stringToProxy("Glacier2/router:ssl -p 10011")->_hash() == proxyMap["prx2"]);
+    test(communicator->stringToProxy("Glacier2/router:udp -p 10012")->_hash() == proxyMap["prx3"]);
+    test(communicator->stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010")->_hash() == proxyMap["prx4"]);
+    test(communicator->stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011")->_hash() == proxyMap["prx5"]);
+    test(communicator->stringToProxy("Glacier2/router:udp -h zeroc.com -p 10012")->_hash() == proxyMap["prx6"]);
+    test(communicator->stringToProxy("Glacier2/router:tcp -p 10010 -t 10000")->_hash() == proxyMap["prx7"]);
+    test(communicator->stringToProxy("Glacier2/router:ssl -p 10011 -t 10000")->_hash() == proxyMap["prx8"]);
+    test(communicator->stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010 -t 10000")->_hash() ==
+         proxyMap["prx9"]);
+    test(communicator->stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011 -t 10000")->_hash() ==
+         proxyMap["prx10"]);
 
     cerr << "ok" << endl;
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -340,14 +340,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -264,16 +264,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/uwp/packages.config zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/uwp/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/hash/msbuild/uwp/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hash/msbuild/uwp/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hash/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/hash/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/hash/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hash/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/hold/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Random.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -78,13 +73,14 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing stringToProxy... " << flush;
-    string ref = "hold:" + getTestEndpoint(communicator, 0);
+    string ref = "hold:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
-    string refSerialized = "hold:" + getTestEndpoint(communicator, 1);
+    string refSerialized = "hold:" + helper->getTestEndpoint(1);
     Ice::ObjectPrxPtr baseSerialized = communicator->stringToProxy(refSerialized);
     test(base);
     cout << "ok" << endl;
@@ -108,20 +104,19 @@
     cout << "ok" << endl;
 
     cout << "changing state between active and hold rapidly... " << flush;
-    int i;
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         hold->putOnHold(0);
     }
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         hold->ice_oneway()->putOnHold(0);
     }
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         holdSerialized->putOnHold(0);
     }
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         holdSerialized->ice_oneway()->putOnHold(0);
     }
@@ -139,9 +134,9 @@
             auto sent = make_shared<promise<bool>>();
             auto expected = value;
             hold->setAsync(value + 1, IceUtilInternal::random(5),
-                [cond, expected, completed](int value)
+                [cond, expected, completed](int val)
                 {
-                    if(value != expected)
+                    if(val != expected)
                     {
                         cond->set(false);
                     }
@@ -214,9 +209,9 @@
             holdSerialized->setAsync(
                 value + 1,
                 IceUtilInternal::random(1),
-                [cond, expected, completed](int value)
+                [cond, expected, completed](int val)
                 {
-                    if(value != expected)
+                    if(val != expected)
                     {
                         cond->set(false);
                     }
@@ -281,7 +276,7 @@
                 [](exception_ptr)
                 {
                 },
-                [completed](bool sentSynchronously)
+                [completed](bool /*sentSynchronously*/)
                 {
                     completed->set_value();
                 });
@@ -317,7 +312,7 @@
     {
         hold->waitForHold();
         hold->waitForHold();
-        for(i = 0; i < 1000; ++i)
+        for(int i = 0; i < 1000; ++i)
         {
             hold->ice_oneway()->ice_ping();
             if((i % 20) == 0)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/hold/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/hold/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtil::TimerPtr timer = new IceUtil::Timer();
 
-    communicator->getProperties()->setProperty("TestAdapter1.Endpoints", getTestEndpoint(communicator, 0));
+    communicator->getProperties()->setProperty("TestAdapter1.Endpoints", getTestEndpoint());
     communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Size", "5");
     communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
     communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
@@ -28,7 +29,7 @@
     Ice::ObjectAdapterPtr adapter1 = communicator->createObjectAdapter("TestAdapter1");
     adapter1->add(ICE_MAKE_SHARED(HoldI, timer, adapter1), Ice::stringToIdentity("hold"));
 
-    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(communicator, 1));
+    communicator->getProperties()->setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
     communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Size", "5");
     communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
     communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
@@ -39,32 +40,11 @@
     adapter1->activate();
     adapter2->activate();
 
-    TEST_READY
+    serverReady();
 
     communicator->waitForShutdown();
 
     timer->destroy();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/hold/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/hold/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 HoldI::HoldI(const IceUtil::TimerPtr& timer, const Ice::ObjectAdapterPtr& adapter) :
     _last(0), _timer(timer), _adapter(adapter)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/hold/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/hold/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/hold/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/hold/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/impl/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_impl     = Test
 $(test)_serveramd_impl  = TestAMD
@@ -18,7 +13,7 @@
 ifneq ($$($2_impl),)
 $5_sources      += $$($5_objdir)/$$($2_impl)I.cpp
 $5_objects      += $$(addprefix $$($5_objdir)/,$$(call source-to-object,$$($5_objdir)/$$($2_impl)I.cpp))
-$5_cppflags     += -I$$($5_objdir)
+$5_cppflags     += -I$$($5_objdir) $(nounusedparameter-cppflags)
 
 $$($5_objects): $$($5_objdir)/$$($2_impl)I.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -92,10 +92,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -126,56 +126,56 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Label="IceBuilder">
@@ -481,14 +481,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -92,10 +92,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -126,56 +126,56 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Label="IceBuilder">
@@ -479,14 +479,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/impl/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,59 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 
-DEFINE_TEST("serveramd")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerAMD : public Test::TestHelper
 {
-    string endpt = getTestEndpoint(communicator, 0);
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt);
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerAMD::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    //
+    // Its possible to have batch oneway requests dispatched after
+    // the adapter is deactivated due to thread scheduling so we
+    // supress this warning.
+    //
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        //
-        // Its possible to have batch oneway requests dispatched after
-        // the adapter is deactivated due to thread scheduling so we
-        // supress this warning.
-        //
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/impl/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,59 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    string endpt = getTestEndpoint(communicator, 0);
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt);
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    //
+    // Its possible to have batch oneway requests dispatched after
+    // the adapter is deactivated due to thread scheduling so we
+    // supress this warning.
+    //
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        //
-        // Its possible to have batch oneway requests dispatched after
-        // the adapter is deactivated due to thread scheduling so we
-        // supress this warning.
-        //
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/impl/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/impl/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/impl/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/impl/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/impl/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/info/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/info/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceSSL/IceSSL.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
 using namespace std;
@@ -49,8 +44,9 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing proxy endpoint information... " << flush;
     {
         Ice::ObjectPrxPtr p1 =
@@ -147,11 +143,11 @@
 
             adapter->destroy();
 
-            int port = getTestPort(communicator->getProperties(), 1);
+            int port = helper->getTestPort(1);
             ostringstream portStr;
             portStr << port;
             communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -h * -p " + portStr.str());
-            communicator->getProperties()->setProperty("TestAdapter.PublishedEndpoints", getTestEndpoint(communicator, 1));
+            communicator->getProperties()->setProperty("TestAdapter.PublishedEndpoints", helper->getTestEndpoint(1));
             adapter = communicator->createObjectAdapter("TestAdapter");
 
             endpoints = adapter->getEndpoints();
@@ -166,7 +162,7 @@
             }
 
             ipEndpoint = getTCPEndpointInfo(publishedEndpoints[0]->getInfo());
-            test(ipEndpoint->host == getTestHost(communicator->getProperties()));
+            test(ipEndpoint->host == helper->getTestHost());
             test(ipEndpoint->port == port);
 
             adapter->destroy();
@@ -174,8 +170,8 @@
         cout << "ok" << endl;
     }
 
-    string endpoints = getTestEndpoint(communicator, 0) + ":" + getTestEndpoint(communicator, 0, "udp") + " -c";
-    int port = getTestPort(communicator->getProperties(), 0);
+    string endpoints = helper->getTestEndpoint() + ":" + helper->getTestEndpoint("udp") + " -c";
+    int port = helper->getTestPort();
     Ice::ObjectPrxPtr base = communicator->stringToProxy("test:" + endpoints);
     TestIntfPrxPtr testIntf = ICE_CHECKED_CAST(TestIntfPrx, base);
 
@@ -193,14 +189,14 @@
         test(ctx["host"] == tcpinfo->host);
         test(ctx["compress"] == "false");
         istringstream is(ctx["port"]);
-        int port;
-        is >> port;
-        test(port > 0);
+        int portCtx;
+        is >> portCtx;
+        test(portCtx > 0);
 
         info = base->ice_datagram()->ice_getConnection()->getEndpoint()->getInfo();
         Ice::UDPEndpointInfoPtr udp = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, info);
         test(udp);
-        test(udp->port == port);
+        test(udp->port == portCtx);
         test(udp->host == defaultHost);
     }
     cout << "ok" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/info/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/info/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/info/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/info/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp
-$(test)_dependencies = IceSSL Ice TestCommon
+$(test)_dependencies = TestCommon IceSSL Ice
 
 tests += $(test)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -265,16 +265,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/info/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/info/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server");
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    string endpoints = getTestEndpoint(communicator, 0) + ":" + getTestEndpoint(communicator, 0, "udp");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpoints);
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints",
+                                               getTestEndpoint() + ":" + getTestEndpoint("udp"));
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/info/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/info/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceSSL/IceSSL.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
 using namespace std;
@@ -82,7 +77,7 @@
     {
         Ice::UDPEndpointInfoPtr udp = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, ipinfo);
         ctx["mcastInterface"] = udp->mcastInterface;
-        ctx["mcastTtl"] = udp->mcastTtl;
+        ctx["mcastTtl"] = static_cast<char>(udp->mcastTtl);
     }
 
     return ctx;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/info/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/info/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/info/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/info/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/inheritance/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
 InitialPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing stringToProxy... " << flush;
-    string ref = "initial:" + getTestEndpoint(communicator, 0);
+    string ref = "initial:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
-    InitialPrxPtr initial = allTests(communicator);
-    initial->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    InitialPrxPtr allTests(Test::TestHelper*);
+    InitialPrxPtr initial = allTests(this);
+    initial->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter);
     adapter->add(object, Ice::stringToIdentity("initial"));
-
-    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    InitialPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -267,16 +267,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter);
     adapter->add(object, Ice::stringToIdentity("initial"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/inheritance/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/inheritance/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/inheritance/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/inheritance/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/inheritance/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TESTI_H
 #define TESTI_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class InitialI : public Test::Initial
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/AMDInterceptorI.cpp zeroc-ice-3.7.2/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/AMDInterceptorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/AMDInterceptorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <AMDInterceptorI.h>
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
@@ -97,9 +92,9 @@
         {
             rethrow_exception(ex);
         }
-        catch(const IceUtil::Exception& ex)
+        catch(const IceUtil::Exception& e)
         {
-            setException(ex);
+            setException(e);
         }
         catch(...)
         {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/AMDInterceptorI.h zeroc-ice-3.7.2/cpp/test/Ice/interceptor/AMDInterceptorI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/AMDInterceptorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/AMDInterceptorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef AMD_INTERCEPTOR_I_H
 #define AMD_INTERCEPTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/interceptor/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,148 +1,62 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <MyObjectI.h>
 #include <InterceptorI.h>
 #include <AMDInterceptorI.h>
 #include <iostream>
 
-DEFINE_TEST("client")
-
 #ifndef _WIN32
 //
 // SIGPIPE test
 //
 #   include <signal.h>
-#endif
-
-using namespace std;
-
-#if defined(__APPLE__) || defined(ICE_OS_UWP)
-namespace
-{
-
-class App
-{
-public:
-
-    virtual ~App()
-    {
-        if(_communicator)
-        {
-            _communicator->destroy();
-        }
-    }
-
-    Ice::CommunicatorPtr communicator()
-    {
-        return _communicator;
-    }
-
-    virtual int _main(int argc, char** argv)
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        _communicator = Ice::initialize(initData);
-        return run(argc, argv);
-    }
-    virtual int run(int argc, char** argv) = 0;
-
-private:
-
-    Ice::CommunicatorPtr _communicator;
-};
 
-}
-#else
-namespace
+extern "C" void testAction(int)
 {
-typedef Ice::Application App;
+    test(false);
 }
+
 #endif
 
-class ClientApp : public App
+using namespace std;
+
+class Client : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    virtual void run(int, char**);
 
 private:
 
-    int run(const Test::MyObjectPrxPtr&, const InterceptorIPtr&);
-    int runAmd(const Test::MyObjectPrxPtr&, const AMDInterceptorIPtr&);
+    void runTest(const Test::MyObjectPrxPtr&, const InterceptorIPtr&);
+    void runAmdTest(const Test::MyObjectPrxPtr&, const AMDInterceptorIPtr&);
 };
 
-#ifndef _WIN32
-extern "C" void testAction(int)
-{
-    test(false);
-}
-#endif
-
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char* argv[])
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
 #ifndef _WIN32
-//
-// Set SIGPIPE action
-//
+    //
+    // Set SIGPIPE action
+    //
     struct sigaction action;
     action.sa_handler = &testAction;
     sigemptyset(&action.sa_mask);
     action.sa_flags = 0;
     sigaction(SIGPIPE, &action, 0);
 #endif
-
-    ClientApp app;
-#if defined(__APPLE__) || defined(ICE_OS_UWP)
-    int result = app._main(argc, argv);
-#else
-    int result = app.main(argc, argv);
-#endif
-
-#ifndef _WIN32
-//
-// Check SIGPIPE was properly reset to old action
-//
-    struct sigaction newAction;
-    sigaction(SIGPIPE, 0, &newAction);
-    test(action.sa_handler == &testAction);
-#endif
-
-    return result;
-}
-
-int
-ClientApp::run(int, char*[])
-{
-
-#ifndef _WIN32
-//
-// Check SIGPIPE is now SIG_IGN
-//
-    struct sigaction action;
-    sigaction(SIGPIPE, 0, &action);
-    test(action.sa_handler == SIG_IGN);
-#endif
-
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     //
     // Create OA and servants
     //
-    Ice::ObjectAdapterPtr oa = communicator()->createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost");
+    Ice::ObjectAdapterPtr oa = communicator->createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost");
 
     Ice::ObjectPtr servant = ICE_MAKE_SHARED(MyObjectI);
     InterceptorIPtr interceptor = ICE_MAKE_SHARED(InterceptorI, servant);
@@ -152,40 +66,34 @@
     Test::MyObjectPrxPtr prxForAMD = ICE_UNCHECKED_CAST(Test::MyObjectPrx, oa->addWithUUID(amdInterceptor));
 
     cout << "Collocation optimization on" << endl;
-    int rs = run(prx, interceptor);
-    if(rs != 0)
-    {
-        return rs;
-    }
+    runTest(prx, interceptor);
 
     cout << "Now with AMD" << endl;
-    rs = runAmd(prxForAMD, amdInterceptor);
-    if(rs != 0)
-    {
-        return rs;
-    }
+    runAmdTest(prxForAMD, amdInterceptor);
 
     oa->activate(); // Only necessary for non-collocation optimized tests
 
     cout << "Collocation optimization off" << endl;
     interceptor->clear();
     prx = ICE_UNCHECKED_CAST(Test::MyObjectPrx, prx->ice_collocationOptimized(false));
-    rs = run(prx, interceptor);
-    if(rs != 0)
-    {
-        return rs;
-    }
+    runTest(prx, interceptor);
 
     cout << "Now with AMD" << endl;
     amdInterceptor->clear();
     prxForAMD = ICE_UNCHECKED_CAST(Test::MyObjectPrx, prxForAMD->ice_collocationOptimized(false));
-    rs = runAmd(prxForAMD, amdInterceptor);
-
-    return rs;
+    runAmdTest(prxForAMD, amdInterceptor);
+#ifndef _WIN32
+    //
+    // Check SIGPIPE was properly reset to old action
+    //
+    struct sigaction newAction;
+    sigaction(SIGPIPE, 0, &newAction);
+    test(action.sa_handler == &testAction);
+#endif
 }
 
-int
-ClientApp::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& interceptor)
+void
+Client::runTest(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& interceptor)
 {
     cout << "testing simple interceptor... " << flush;
     test(interceptor->getLastOperation().empty());
@@ -261,12 +169,10 @@
     test(interceptor->getLastOperation() == "amdAdd");
     test(!interceptor->getLastStatus());
     cout << "ok" << endl;
-
-    return EXIT_SUCCESS;
 }
 
-int
-ClientApp::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& interceptor)
+void
+Client::runAmdTest(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& interceptor)
 {
     cout << "testing simple interceptor... " << flush;
     test(interceptor->getLastOperation().empty());
@@ -328,5 +234,6 @@
     test(!interceptor->getLastStatus());
     test(dynamic_cast<MySystemException*>(interceptor->getException()) != 0);
     cout << "ok" << endl;
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/InterceptorI.cpp zeroc-ice-3.7.2/cpp/test/Ice/interceptor/InterceptorI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/InterceptorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/InterceptorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <InterceptorI.h>
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/InterceptorI.h zeroc-ice-3.7.2/cpp/test/Ice/interceptor/InterceptorI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/InterceptorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/InterceptorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef INTERCEPTOR_I_H
 #define INTERCEPTOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/interceptor/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp Test.ice TestI.cpp MyObjectI.cpp InterceptorI.cpp AMDInterceptorI.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -210,13 +210,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -348,14 +348,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/MyObjectI.cpp zeroc-ice-3.7.2/cpp/test/Ice/interceptor/MyObjectI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/MyObjectI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/MyObjectI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <MyObjectI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <IceUtil/IceUtil.h>
 
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/MyObjectI.h zeroc-ice-3.7.2/cpp/test/Ice/interceptor/MyObjectI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/MyObjectI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/MyObjectI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef MY_OBJECT_I_H
 #define MY_OBJECT_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/interceptor/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/interceptor/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/interceptor/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/interceptor/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/interceptor/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef INTERCEPTOR_TEST_API_EXPORTS
 #   define INTERCEPTOR_TEST_API_EXPORTS
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/invoke/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
-using namespace Ice;
 
 static string testString = "This is a test string";
 
@@ -285,9 +279,10 @@
 #endif
 
 Test::MyClassPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string ref = "test:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string ref = "test:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
 
@@ -301,15 +296,15 @@
 
     {
         Ice::ByteSeq inEncaps, outEncaps;
-        if(!oneway->ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps))
+        if(!oneway->ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps))
         {
             test(false);
         }
 
-        test(batchOneway->ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
-        test(batchOneway->ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
-        test(batchOneway->ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
-        test(batchOneway->ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
+        test(batchOneway->ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
+        test(batchOneway->ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
+        test(batchOneway->ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
+        test(batchOneway->ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps));
         batchOneway->ice_flushBatchRequests();
 
         Ice::OutputStream out(communicator);
@@ -319,7 +314,7 @@
         out.finished(inEncaps);
 
         // ice_invoke
-        if(cl->ice_invoke("opString", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps))
+        if(cl->ice_invoke("opString", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps))
         {
             Ice::InputStream in(communicator, out.getEncoding(), outEncaps);
             in.startEncapsulation();
@@ -337,7 +332,7 @@
 
         // ice_invoke with array mapping
         pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size());
-        if(cl->ice_invoke("opString", ICE_ENUM(OperationMode, Normal), inPair, outEncaps))
+        if(cl->ice_invoke("opString", Ice::ICE_ENUM(OperationMode, Normal), inPair, outEncaps))
         {
             Ice::InputStream in(communicator, out.getEncoding(), outEncaps);
             in.startEncapsulation();
@@ -362,7 +357,7 @@
         {
             ctx["raise"] = "";
         }
-        if(cl->ice_invoke("opException", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps, ctx))
+        if(cl->ice_invoke("opException", Ice::ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps, ctx))
         {
             test(false);
         }
@@ -392,7 +387,7 @@
 
     {
         Ice::ByteSeq inEncaps;
-        batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps,
+        batchOneway->ice_invokeAsync("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps,
             [](bool, const vector<Ice::Byte>)
             {
                 test(false);
@@ -412,10 +407,10 @@
     //
     {
         Ice::ByteSeq inEncaps;
-        test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
-        test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
-        test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
-        test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
+        test(batchOneway->ice_invokeAsync("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
+        test(batchOneway->ice_invokeAsync("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
+        test(batchOneway->ice_invokeAsync("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
+        test(batchOneway->ice_invokeAsync("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps).get().returnValue);
         batchOneway->ice_flushBatchRequests();
     }
 
@@ -424,7 +419,7 @@
         Ice::ByteSeq inEncaps, outEncaps;
         oneway->ice_invokeAsync(
             "opOneway",
-            OperationMode::Normal,
+            Ice::OperationMode::Normal,
             inEncaps,
             nullptr,
             [&](exception_ptr ex)
@@ -445,7 +440,7 @@
 
     {
         Ice::ByteSeq inEncaps, outEncaps;
-        auto completed = oneway->ice_invokeAsync("opOneway", OperationMode::Normal, inEncaps);
+        auto completed = oneway->ice_invokeAsync("opOneway", Ice::OperationMode::Normal, inEncaps);
         test(completed.get().returnValue);
     }
 
@@ -458,7 +453,7 @@
         out.endEncapsulation();
         out.finished(inEncaps);
 
-        cl->ice_invokeAsync("opString", OperationMode::Normal, inEncaps,
+        cl->ice_invokeAsync("opString", Ice::OperationMode::Normal, inEncaps,
             [&](bool ok, vector<Ice::Byte> outParams)
             {
                 outEncaps = move(outParams);
@@ -490,7 +485,7 @@
         out.endEncapsulation();
         out.finished(inEncaps);
 
-        auto result = cl->ice_invokeAsync("opString", OperationMode::Normal, inEncaps).get();
+        auto result = cl->ice_invokeAsync("opString", Ice::OperationMode::Normal, inEncaps).get();
         test(result.returnValue);
 
         Ice::InputStream in(communicator, result.outParams);
@@ -515,7 +510,7 @@
 
         auto inPair = make_pair(inEncaps.data(), inEncaps.data() + inEncaps.size());
 
-        cl->ice_invokeAsync("opString", OperationMode::Normal, inPair,
+        cl->ice_invokeAsync("opString", Ice::OperationMode::Normal, inPair,
             [&](bool ok, pair<const Ice::Byte*, const Ice::Byte*> outParams)
             {
                 vector<Ice::Byte>(outParams.first, outParams.second).swap(outEncaps);
@@ -555,7 +550,7 @@
 
         auto inPair = make_pair(inEncaps.data(), inEncaps.data() + inEncaps.size());
 
-        auto result = cl->ice_invokeAsync("opString", OperationMode::Normal, inPair).get();
+        auto result = cl->ice_invokeAsync("opString", Ice::OperationMode::Normal, inPair).get();
         test(result.returnValue);
 
         Ice::InputStream in(communicator, result.outParams);
@@ -573,7 +568,7 @@
         promise<void> sent;
         Ice::ByteSeq inEncaps, outEncaps;
 
-        cl->ice_invokeAsync("opException", OperationMode::Normal, inEncaps,
+        cl->ice_invokeAsync("opException", Ice::OperationMode::Normal, inEncaps,
             [&](bool ok, vector<Ice::Byte> outParams)
             {
                 outEncaps = move(outParams);
@@ -610,7 +605,7 @@
     //
     {
         Ice::ByteSeq inEncaps;
-        auto result = cl->ice_invokeAsync("opException", OperationMode::Normal, inEncaps).get();
+        auto result = cl->ice_invokeAsync("opException", Ice::OperationMode::Normal, inEncaps).get();
         test(!result.returnValue);
 
         Ice::InputStream in(communicator, result.outParams);
@@ -635,10 +630,10 @@
 
     {
         Ice::ByteSeq inEncaps, outEncaps;
-        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps)));
-        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps)));
-        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps)));
-        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps)));
+        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps)));
+        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps)));
+        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps)));
+        test(batchOneway->end_ice_invoke(outEncaps, batchOneway->begin_ice_invoke("opOneway", Ice::ICE_ENUM(OperationMode, Normal), inEncaps)));
         batchOneway->ice_flushBatchRequests();
     }
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/BlobjectI.cpp zeroc-ice-3.7.2/cpp/test/Ice/invoke/BlobjectI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/BlobjectI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/BlobjectI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <BlobjectI.h>
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
@@ -135,7 +130,7 @@
 #else
 void
 BlobjectAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, const vector<Ice::Byte>& inEncaps,
-                                const Ice::Current& current)
+                                 const Ice::Current& current)
 {
     Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps);
     vector<Ice::Byte> outEncaps;
@@ -145,8 +140,8 @@
 
 void
 BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb,
-                                     const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps,
-                                     const Ice::Current& current)
+                                      const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps,
+                                      const Ice::Current& current)
 {
     Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps);
     vector<Ice::Byte> outEncaps;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/BlobjectI.h zeroc-ice-3.7.2/cpp/test/Ice/invoke/BlobjectI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/BlobjectI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/BlobjectI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef BLOBJECT_H
 #define BLOBJECT_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/invoke/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**,
-    const Ice::CommunicatorPtr& communicator,
-    const Ice::InitializationData&)
+class Client : public Test::TestHelper
 {
-    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
-    Test::MyClassPrxPtr myClass = allTests(communicator);
-
-    myClass->shutdown();
+public:
 
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator, initData);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
+    Ice::CommunicatorHolder holder = initialize(argc, argv);
+    Test::MyClassPrxPtr allTests(Test::TestHelper*);
+    Test::MyClassPrxPtr myClass = allTests(this);
+    myClass->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/invoke/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_sources = Server.cpp Test.ice BlobjectI.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/invoke/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <IceUtil/Options.h>
 #include <BlobjectI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
 class ServantLocatorI : public Ice::ServantLocator
@@ -79,9 +72,17 @@
     Ice::ObjectPtr _blobject;
 };
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtilInternal::Options opts;
     opts.addOpt("", "array");
     opts.addOpt("", "async");
@@ -93,51 +94,20 @@
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cout << argv[0] << ": " << e.reason << endl;
-        return false;
+        cout << argv[0] << ": error: " << e.reason << endl;
+        throw;
     }
     bool array = opts.isSet("array");
     bool async = opts.isSet("async");
 
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, array, async), "");
     adapter->activate();
 
-    TEST_READY
+    serverReady();
 
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/invoke/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/invoke/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/invoke/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/invoke/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/library/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/library/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Test.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/library/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/library/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 ICE_DECLSPEC_IMPORT void
 allTests(const Ice::ObjectAdapterPtr&);
@@ -17,28 +12,24 @@
 #   pragma comment(lib, ICE_LIBNAME("alltests"))
 #endif
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-
-        // Collocated-only OA
-        Ice::ObjectAdapterPtr oa = ich->createObjectAdapter("");
-
-        oa->activate();
-        allTests(oa);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-    return EXIT_SUCCESS;
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    // Collocated-only OA
+    Ice::ObjectAdapterPtr oa = communicator->createObjectAdapter("");
+
+    oa->activate();
+    allTests(oa);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/Consumer.cpp zeroc-ice-3.7.2/cpp/test/Ice/library/Consumer.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/library/Consumer.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/Consumer.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #if defined(_MSC_VER)
 #   pragma comment(lib, ICE_LIBNAME("gencode"))
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/library/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/library/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries            := $(test)_GenCode $(test)_Consumer $(test)_AllTests
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -203,13 +203,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/alltests/packages.config zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/alltests/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/alltests/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/alltests/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -171,13 +171,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -203,13 +203,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/consumer/packages.config zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/consumer/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/consumer/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/consumer/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -307,14 +307,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/gencode/packages.config zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/gencode/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/library/msbuild/gencode/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/msbuild/gencode/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/library/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/library/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/library/test.py zeroc-ice-3.7.2/cpp/test/Ice/library/test.py
--- zeroc-ice-3.7.1/cpp/test/Ice/library/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/library/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__file__, libDirs=["gencode", "consumer", "alltests"])
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/location/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/location/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/Router.h>
 #include <IceUtil/IceUtil.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <list>
 
@@ -60,8 +55,9 @@
 typedef IceUtil::Handle<AMICallback> AMICallbackPtr;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
+allTests(Test::TestHelper* helper, const string& ref)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     ServerManagerPrxPtr manager = ICE_CHECKED_CAST(ServerManagerPrx, communicator->stringToProxy(ref));
     TestLocatorPrxPtr locator = ICE_UNCHECKED_CAST(TestLocatorPrx, communicator->getDefaultLocator());
     test(manager);
@@ -276,20 +272,21 @@
     cout << "testing locator cache timeout... " << flush;
 
     int count = locator->getRequestCount();
-    communicator->stringToProxy("test@TestAdapter")->ice_locatorCacheTimeout(0)->ice_ping(); // No locator cache.
+    Ice::ObjectPrxPtr basencc = communicator->stringToProxy("test@TestAdapter")->ice_connectionCached(false);
+    basencc->ice_locatorCacheTimeout(0)->ice_ping(); // No locator cache.
     test(++count == locator->getRequestCount());
-    communicator->stringToProxy("test@TestAdapter")->ice_locatorCacheTimeout(0)->ice_ping(); // No locator cache.
+    basencc->ice_locatorCacheTimeout(0)->ice_ping(); // No locator cache.
     test(++count == locator->getRequestCount());
-    communicator->stringToProxy("test@TestAdapter")->ice_locatorCacheTimeout(1)->ice_ping(); // 1s timeout.
+    basencc->ice_locatorCacheTimeout(2)->ice_ping(); // 2s timeout.
     test(count == locator->getRequestCount());
     IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1300));
-    communicator->stringToProxy("test@TestAdapter")->ice_locatorCacheTimeout(1)->ice_ping(); // 1s timeout.
+    basencc->ice_locatorCacheTimeout(1)->ice_ping(); // 1s timeout.
     test(++count == locator->getRequestCount());
 
     communicator->stringToProxy("test")->ice_locatorCacheTimeout(0)->ice_ping(); // No locator cache.
     count += 2;
     test(count == locator->getRequestCount());
-    communicator->stringToProxy("test")->ice_locatorCacheTimeout(1)->ice_ping(); // 1s timeout
+    communicator->stringToProxy("test")->ice_locatorCacheTimeout(2)->ice_ping(); // 2s timeout
     test(count == locator->getRequestCount());
     IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1300));
     communicator->stringToProxy("test")->ice_locatorCacheTimeout(1)->ice_ping(); // 1s timeout
@@ -449,7 +446,8 @@
     try
     {
         communicator->stringToProxy("test@TestAdapter3")->ice_ping();
-        registry->setAdapterDirectProxy("TestAdapter3", communicator->stringToProxy("dummy:tcp"));
+        registry->setAdapterDirectProxy("TestAdapter3",
+                                        communicator->stringToProxy("dummy:" + helper->getTestEndpoint(99)));
         communicator->stringToProxy("test@TestAdapter3")->ice_ping();
     }
     catch(const Ice::LocalException&)
@@ -498,7 +496,8 @@
         test(ex.id == "TestUnknown");
     }
     registry->addObject(communicator->stringToProxy("test3@TestAdapter4")); // Update
-    registry->setAdapterDirectProxy("TestAdapter4", communicator->stringToProxy("dummy:tcp"));
+    registry->setAdapterDirectProxy("TestAdapter4",
+                                    communicator->stringToProxy("dummy:" + helper->getTestEndpoint(99)));
     try
     {
         communicator->stringToProxy("test3")->ice_ping();
@@ -517,7 +516,8 @@
         test(false);
     }
 
-    registry->setAdapterDirectProxy("TestAdapter4", communicator->stringToProxy("dummy:tcp"));
+    registry->setAdapterDirectProxy("TestAdapter4",
+                                    communicator->stringToProxy("dummy:" + helper->getTestEndpoint(99)));
     try
     {
         communicator->stringToProxy("test3")->ice_ping();
@@ -582,13 +582,13 @@
         registry->setAdapterDirectProxy("TestAdapter5", locator->findAdapterById("TestAdapter"));
         registry->addObject(communicator->stringToProxy("test3@TestAdapter"));
 
-        int count = locator->getRequestCount();
+        count = locator->getRequestCount();
         ic->stringToProxy("test@TestAdapter5")->ice_locatorCacheTimeout(0)->ice_ping(); // No locator cache.
         ic->stringToProxy("test3")->ice_locatorCacheTimeout(0)->ice_ping(); // No locator cache.
         count += 3;
         test(count == locator->getRequestCount());
         registry->setAdapterDirectProxy("TestAdapter5", 0);
-        registry->addObject(communicator->stringToProxy("test3:tcp"));
+        registry->addObject(communicator->stringToProxy("test3:" + helper->getTestEndpoint(99)));
         ic->stringToProxy("test@TestAdapter5")->ice_locatorCacheTimeout(10)->ice_ping(); // 10s timeout.
         ic->stringToProxy("test3")->ice_locatorCacheTimeout(10)->ice_ping(); // 10s timeout.
         test(count == locator->getRequestCount());
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/location/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/location/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&, const string&);
-    allTests(communicator, "ServerManager:" + getTestEndpoint(communicator, 0));
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(initData.properties, 0));
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(properties));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    void allTests(Test::TestHelper*, const string&);
+    allTests(this, "ServerManager:" + getTestEndpoint());
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/location/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/location/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_sources = $(test-server-sources) ServerLocator.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -344,14 +344,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -273,16 +273,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/location/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/location/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <ServerLocator.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
     //
     // Register the server manager. The server manager creates a new
     // 'server' (a server isn't a different process, it's just a new
@@ -26,7 +30,7 @@
     //
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.ThreadPool.Server.Size", "2");
-    properties->setProperty("ServerManager.Endpoints", getTestEndpoint(communicator, 0));
+    properties->setProperty("ServerManager.Endpoints", getTestEndpoint());
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ServerManager");
 
@@ -48,30 +52,8 @@
     adapter->add(locator, Ice::stringToIdentity("locator"));
 
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        assert(initData.properties != ich->getProperties());
-        return run(argc, argv, ich.communicator(), initData);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/ServerLocator.cpp zeroc-ice-3.7.2/cpp/test/Ice/location/ServerLocator.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/location/ServerLocator.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/ServerLocator.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/BuiltinSequences.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <ServerLocator.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/ServerLocator.h zeroc-ice-3.7.2/cpp/test/Ice/location/ServerLocator.h
--- zeroc-ice-3.7.1/cpp/test/Ice/location/ServerLocator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/ServerLocator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SERVER_LOCATOR_H
 #define SERVER_LOCATOR_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/location/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/location/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/location/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/location/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/Locator.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace Test;
 
@@ -60,14 +55,15 @@
         {
             Ice::PropertiesPtr props = _initData.properties;
             serverCommunicator->getProperties()->setProperty("TestAdapter.Endpoints",
-                                                             getTestEndpoint(props, _nextPort++));
+                                                             TestHelper::getTestEndpoint(props, _nextPort++));
             serverCommunicator->getProperties()->setProperty("TestAdapter2.Endpoints",
-                                                             getTestEndpoint(props, _nextPort++));
+                                                             TestHelper::getTestEndpoint(props, _nextPort++));
 
             adapter = serverCommunicator->createObjectAdapter("TestAdapter");
             adapter2 = serverCommunicator->createObjectAdapter("TestAdapter2");
 
-            Ice::ObjectPrxPtr locator = serverCommunicator->stringToProxy("locator:" + getTestEndpoint(props, 0));
+            Ice::ObjectPrxPtr locator =
+                serverCommunicator->stringToProxy("locator:" + TestHelper::getTestEndpoint(props));
             adapter->setLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, locator));
             adapter2->setLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, locator));
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/location/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/location/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/location/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/location/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
+#include <TestHelper.h>
 #include <vector>
 #include <ServerLocator.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/Client1.cpp zeroc-ice-3.7.2/cpp/test/Ice/logger/Client1.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/Client1.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/Client1.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <fstream>
 
 using namespace std;
 
-namespace
-{
-
-class Client : public Ice::Application
+class Client1 : public Test::TestHelper
 {
 public:
-    virtual int
-    run(int, char*[])
-    {
-        communicator()->getLogger()->trace("info", "XXX");
-        return EXIT_SUCCESS;
-    };
-};
 
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client1::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
     cout << "testing logger encoding with Ice.LogFile... " << flush;
-    Ice::InitializationData id;
-    id.properties = Ice::createProperties();
-    id.properties->load("config.client");
-    id.properties->setProperty("Ice.LogFile", "log.txt");
-    const string programName = id.properties->getProperty("Ice.ProgramName");
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->load("config.client");
+    properties->setProperty("Ice.LogFile", "log.txt");
+    const string programName = properties->getProperty("Ice.ProgramName");
 
-    Client c;
-    c.main(argc, argv, id);
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getLogger()->trace("info", "XXX");
 
     ifstream in("log.txt");
     if(!in)
@@ -61,5 +41,6 @@
     in.close();
     remove("log.txt");
     cout << "ok" << endl;
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client1)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/Client2.cpp zeroc-ice-3.7.2/cpp/test/Ice/logger/Client2.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/Client2.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/Client2.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-namespace
-{
-
-class Client : public Ice::Application
+class Client2 : public Test::TestHelper
 {
 public:
-    virtual int
-    run(int, char*[])
-    {
-        communicator()->getLogger()->trace("info", "XXX");
-        return EXIT_SUCCESS;
-    };
-};
 
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client2::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
 #ifdef _WIN32
     int cp = GetConsoleOutputCP();
     //
@@ -46,14 +27,16 @@
 #else
     setProcessStringConverter(Ice::createIconvStringConverter<char>("ISO8859-15"));
 #endif
-    Ice::InitializationData id;
-    id.properties = Ice::createProperties();
-    id.properties->load("config.client");
-    Client c;
-    int status = c.main(argc, argv, id);
+
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->load("config.client");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getLogger()->trace("info", "XXX");
 
 #ifdef _WIN32
     SetConsoleOutputCP(cp);
 #endif
-    return status;
 }
+
+DEFINE_TEST(Client2)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/Client3.cpp zeroc-ice-3.7.2/cpp/test/Ice/logger/Client3.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/Client3.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/Client3.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-namespace
-{
-
-class Client : public Ice::Application
+class Client3 : public Test::TestHelper
 {
 public:
-    virtual int
-    run(int, char*[])
-    {
-        communicator()->getLogger()->trace("info", "XXX");
-        return EXIT_SUCCESS;
-    };
-};
 
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client3::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
 #ifdef _WIN32
     int cp = GetConsoleOutputCP();
     SetConsoleOutputCP(CP_UTF8);
 #endif
-    Ice::InitializationData id;
-    id.properties = Ice::createProperties();
-    id.properties->load("config.client");
-    Client c;
-    int status = c.main(argc, argv, id);
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->load("config.client");
 
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getLogger()->trace("info", "XXX");
 #ifdef _WIN32
     SetConsoleOutputCP(cp);
 #endif
-    return status;
 }
+
+DEFINE_TEST(Client3)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/Client4.cpp zeroc-ice-3.7.2/cpp/test/Ice/logger/Client4.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/Client4.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/Client4.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-namespace
-{
-
-class Client : public Ice::Application
+class Client4 : public Test::TestHelper
 {
 public:
-    virtual int
-    run(int, char*[])
-    {
-        communicator()->getLogger()->trace("info", "XXX");
-        return EXIT_SUCCESS;
-    };
-};
 
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client4::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
 #ifdef _WIN32
     //
     // 28605 == ISO 8859-15 codepage
@@ -46,13 +27,13 @@
 #else
     setProcessStringConverter(Ice::createIconvStringConverter<char>("ISO8859-15"));
 #endif
-    Ice::InitializationData id;
-    id.properties = Ice::createProperties();
-    id.properties->load("config.client");
-    Client c;
-    int status = c.main(argc, argv, id);
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->load("config.client");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getLogger()->trace("info", "XXX");
 #ifdef _WIN32
     SetConsoleOutputCP(cp);
 #endif
-    return status;
 }
+
+DEFINE_TEST(Client4)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/Client5.cpp zeroc-ice-3.7.2/cpp/test/Ice/logger/Client5.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/Client5.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/Client5.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-namespace
-{
-
-class Client : public Ice::Application
+void
+runTest(const Ice::CommunicatorPtr& communicator)
 {
-public:
-    virtual int
-    run(int, char*[])
+    int count = communicator->getProperties()->getPropertyAsInt("Client.Iterations");
+    const string message = communicator->getProperties()->getProperty("Client.Message");
+    for(int i = 0; i < count; ++i)
     {
-        int count = communicator()->getProperties()->getPropertyAsInt("Client.Iterations");
-        const string message = communicator()->getProperties()->getProperty("Client.Message");
-        for(int i = 0; i < count; ++i)
-        {
-            communicator()->getLogger()->print(message);
-        }
-        return EXIT_SUCCESS;
-    };
-};
-
+        communicator->getLogger()->print(message);
+    }
 }
 
 //
@@ -47,14 +32,16 @@
                        "Fusce dictum turpis ante, sit amet finibus eros commodo vel. Sed amet.";
 #endif
 
-int
-main(int argc, char* argv[])
+class Client5 : public Test::TestHelper
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
+public:
 
+    void run(int, char**);
+};
+
+void
+Client5::run(int, char**)
+{
     //
     // Run Client application 20 times, each times it generate 512 bytes of log messages,
     // the application logger is configured to archive log files larger than 512 bytes.
@@ -71,11 +58,9 @@
         id.properties->setProperty("Client.Message", message);
         id.properties->setProperty("Ice.LogFile", "client5-0.log");
         id.properties->setProperty("Ice.LogFile.SizeMax", "512");
-        Client c;
-        if(c.main(argc, argv, id) != EXIT_SUCCESS)
-        {
-            return EXIT_FAILURE;
-        }
+
+        Ice::CommunicatorHolder ich = Ice::initialize(id);
+        runTest(ich.communicator());
     }
 
     //
@@ -91,11 +76,9 @@
         id.properties->setProperty("Client.Message", message);
         id.properties->setProperty("Ice.LogFile", "client5-1.log");
         id.properties->setProperty("Ice.LogFile.SizeMax", "0");
-        Client c;
-        if(c.main(argc, argv, id) != EXIT_SUCCESS)
-        {
-            return EXIT_FAILURE;
-        }
+
+        Ice::CommunicatorHolder ich = Ice::initialize(id);
+        runTest(ich.communicator());
     }
 
     //
@@ -111,11 +94,9 @@
         id.properties->setProperty("Client.Message", message);
         id.properties->setProperty("Ice.LogFile", "client5-2.log");
         id.properties->setProperty("Ice.LogFile.SizeMax", "128");
-        Client c;
-        if(c.main(argc, argv, id) != EXIT_SUCCESS)
-        {
-            return EXIT_FAILURE;
-        }
+
+        Ice::CommunicatorHolder ich = Ice::initialize(id);
+        runTest(ich.communicator());
     }
 
     //
@@ -130,11 +111,9 @@
         id.properties->setProperty("Client.Message", message);
         id.properties->setProperty("Ice.LogFile", "client5-3.log");
         id.properties->setProperty("Ice.LogFile.SizeMax", "64");
-        Client c;
-        if(c.main(argc, argv, id) != EXIT_SUCCESS)
-        {
-            return EXIT_FAILURE;
-        }
+
+        Ice::CommunicatorHolder ich = Ice::initialize(id);
+        runTest(ich.communicator());
     }
 
     //
@@ -151,10 +130,10 @@
         id.properties->setProperty("Client.Message", message);
         id.properties->setProperty("Ice.LogFile", "log/client5-4.log");
         id.properties->setProperty("Ice.LogFile.SizeMax", "512");
-        Client c;
-        if(c.main(argc, argv, id) != EXIT_SUCCESS)
-        {
-            return EXIT_FAILURE;
-        }
+
+        Ice::CommunicatorHolder ich = Ice::initialize(id);
+        runTest(ich.communicator());
     }
 }
+
+DEFINE_TEST(Client5)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/logger/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs        = client1 client2 client3 client4 client5
 $(test)_libs            = iconv
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -95,10 +95,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client1/packages.config zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client1/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client1/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client1/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -95,10 +95,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client2/packages.config zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client2/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client2/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client2/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -95,10 +95,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client3/packages.config zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client3/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client3/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client3/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -95,10 +95,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client4/packages.config zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client4/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client4/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client4/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -95,10 +95,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client5/packages.config zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client5/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/msbuild/client5/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/msbuild/client5/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/logger/test.py zeroc-ice-3.7.2/cpp/test/Ice/logger/test.py
--- zeroc-ice-3.7.1/cpp/test/Ice/logger/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/logger/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import glob
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/metrics/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <InstrumentationI.h>
 #include <Test.h>
 
@@ -59,7 +54,7 @@
 getPort(const Ice::PropertiesAdminPrxPtr& p)
 {
     ostringstream os;
-    os << getTestPort(p->ice_getCommunicator()->getProperties(), 0);
+    os << TestHelper::getTestPort(p->ice_getCommunicator()->getProperties(), 0);
     return os.str();
 }
 
@@ -278,7 +273,7 @@
 
 struct Connect
 {
-    Connect(const Ice::ObjectPrxPtr& proxy) : proxy(proxy)
+    Connect(const Ice::ObjectPrxPtr& proxyP) : proxy(proxyP)
     {
     }
 
@@ -307,7 +302,7 @@
 
 struct InvokeOp
 {
-    InvokeOp(const Test::MetricsPrxPtr& proxy) : proxy(proxy)
+    InvokeOp(const Test::MetricsPrxPtr& proxyP) : proxy(proxyP)
     {
     }
 
@@ -384,7 +379,8 @@
 }
 
 void
-checkFailure(const IceMX::MetricsAdminPrxPtr& m, const string& map, const string& id, const string& failure, int count = 0)
+checkFailure(const IceMX::MetricsAdminPrxPtr& m, const string& map, const string& id, const string& failure,
+             int count = 0)
 {
     IceMX::MetricsFailures f = m->getMetricsFailures("View", map, id);
     if(f.failures.find(failure) == f.failures.end())
@@ -414,18 +410,18 @@
 }
 
 MetricsPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPtr& obsv)
+allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv)
 {
-    Ice::PropertiesPtr properties = communicator->getProperties();
-    string host = getTestHost(properties);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string host = helper->getTestHost();
     string port;
     {
         ostringstream os;
-        os << getTestPort(properties, 0);
+        os << helper->getTestPort();
         port = os.str();
     }
     string hostAndPort = host + ":" + port;
-    string protocol = getTestProtocol(properties);
+    string protocol = helper->getTestProtocol();
     string endpoint;
     {
         ostringstream os;
@@ -514,13 +510,13 @@
     if(!collocated)
     {
         test(invoke->remotes.size() == 2);
-        test(invoke->remotes[0]->total = 2);
-        test(invoke->remotes[1]->total = 3);
+        test(invoke->remotes[0]->total == 2);
+        test(invoke->remotes[1]->total == 3);
     }
     else
     {
         test(invoke->collocated.size() == 1);
-        test(invoke->collocated[0]->total = 5);
+        test(invoke->collocated[0]->total == 5);
     }
 
     view = serverMetrics->getMetricsView("View", timestamp);
@@ -638,7 +634,7 @@
         map = toMap(clientMetrics->getMetricsView("View", timestamp)["Connection"]);
         test(map["active"]->current == 1);
 
-        Ice::ObjectPrxPtr cprx = communicator->stringToProxy("controller:" + getTestEndpoint(communicator, 1));
+        Ice::ObjectPrxPtr cprx = communicator->stringToProxy("controller:" + helper->getTestEndpoint(1));
         ControllerPrxPtr controller = ICE_CHECKED_CAST(ControllerPrx, cprx);
         controller->hold();
 
@@ -1425,6 +1421,82 @@
     testAttribute(clientMetrics, clientProps, update.get(), "Invocation", "mode", "batch-oneway",
                   InvokeOp(metricsBatchOneway));
 
+    //
+    // Tests flushBatchRequests
+    //
+    props["IceMX.Metrics.View.Map.Invocation.GroupBy"] = "operation";
+    props["IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"] = "localPort";
+    updateProps(clientProps, serverProps, update.get(), props, "Invocation");
+
+    metricsBatchOneway = metrics->ice_batchOneway();
+    metricsBatchOneway->op();
+
+    metricsBatchOneway->ice_flushBatchRequests();
+#ifdef ICE_CPP11_MAPPING
+    metricsBatchOneway->ice_flushBatchRequestsAsync().get();
+    metricsBatchOneway->ice_flushBatchRequestsAsync([cb](exception_ptr) {});
+#else
+    metricsBatchOneway->end_ice_flushBatchRequests(metricsBatchOneway->begin_ice_flushBatchRequests());
+    metricsBatchOneway->begin_ice_flushBatchRequests(
+                    Ice::newCallback_Object_ice_flushBatchRequests(cb, &Callback::exception))->waitForCompleted();
+#endif
+
+    map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]);
+    test(map.size() == 2);
+
+    im1 = ICE_DYNAMIC_CAST(IceMX::InvocationMetrics, map["ice_flushBatchRequests"]);
+    test(im1->current <= 1 && im1->total == 3 && im1->failures == 0 && im1->retry == 0);
+    if(!collocated)
+    {
+        test(im1->remotes.size() == 1); // The first operation got sent over a connection
+    }
+
+    if(!collocated)
+    {
+        clearView(clientProps, serverProps, update.get());
+
+        Ice::ConnectionPtr con = metricsBatchOneway->ice_getConnection();
+
+        metricsBatchOneway = metricsBatchOneway->ice_fixed(con);
+        metricsBatchOneway->op();
+
+        con->flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No));
+#ifdef ICE_CPP11_MAPPING
+        con->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No)).get();
+        con->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No), [cb](exception_ptr) {});
+#else
+        con->end_flushBatchRequests(con->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No)));
+        con->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No),
+            Ice::newCallback_Connection_flushBatchRequests(cb, &Callback::exception))->waitForCompleted();
+#endif
+        map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]);
+        test(map.size() == 3);
+
+        im1 = ICE_DYNAMIC_CAST(IceMX::InvocationMetrics, map["flushBatchRequests"]);
+        test(im1->current == 0 && im1->total == 3 && im1->failures == 0 && im1->retry == 0);
+        test(im1->remotes.size() == 1); // The first operation got sent over a connection
+
+        clearView(clientProps, serverProps, update.get());
+        metricsBatchOneway->op();
+
+        communicator->flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No));
+#ifdef ICE_CPP11_MAPPING
+        communicator->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No)).get();
+        communicator->flushBatchRequestsAsync(ICE_SCOPED_ENUM(Ice::CompressBatch, No),
+                                              [cb](exception_ptr) {});
+#else
+        communicator->end_flushBatchRequests(
+            communicator->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No)));
+        communicator->begin_flushBatchRequests(ICE_SCOPED_ENUM(Ice::CompressBatch, No),
+            Ice::newCallback_Communicator_flushBatchRequests(cb, &Callback::exception))->waitForCompleted();
+#endif
+        map = toMap(clientMetrics->getMetricsView("View", timestamp)["Invocation"]);
+        test(map.size() == 2);
+
+        im1 = ICE_DYNAMIC_CAST(IceMX::InvocationMetrics, map["flushBatchRequests"]);
+        test(im1->current <= 1 && im1->total == 3 && im1->failures == 0 && im1->retry == 0);
+        test(im1->remotes.size() == 1); // The first operation got sent over a connection
+    }
     cout << "ok" << endl;
 
     cout << "testing metrics view enable/disable..." << flush;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/metrics/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <InstrumentationI.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPtr& observer)
+class Client : public Test::TestHelper
 {
-    MetricsPrxPtr allTests(const Ice::CommunicatorPtr&, const CommunicatorObserverIPtr&);
-    MetricsPrxPtr metrics = allTests(communicator, observer);
-    metrics->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Admin.Endpoints", "default");
-        initData.properties->setProperty("Ice.Admin.InstanceName", "client");
-        initData.properties->setProperty("Ice.Admin.DelayCreation", "1");
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI);
-        initData.observer = observer;
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator(), observer);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    initData.properties->setProperty("Ice.Admin.Endpoints", "default");
+    initData.properties->setProperty("Ice.Admin.InstanceName", "client");
+    initData.properties->setProperty("Ice.Admin.DelayCreation", "1");
+    initData.properties->setProperty("Ice.Warn.Connections", "0");
+    CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI);
+    initData.observer = observer;
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
+
+    MetricsPrxPtr allTests(Test::TestHelper*, const CommunicatorObserverIPtr&);
+    MetricsPrxPtr metrics = allTests(this, observer);
+    metrics->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/metrics/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,64 +1,49 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 #include <InstrumentationI.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPtr& observer)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    initData.properties->setProperty("Ice.Admin.Endpoints", "tcp");
+    initData.properties->setProperty("Ice.Admin.InstanceName", "client");
+    initData.properties->setProperty("Ice.Admin.DelayCreation", "1");
+    initData.properties->setProperty("Ice.Warn.Connections", "0");
+    initData.properties->setProperty("Ice.Warn.Dispatch", "0");
+    CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI);
+    initData.observer = observer;
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics"));
     //adapter->activate(); // Don't activate OA to ensure collocation is used.
 
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1));
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
     Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter");
     controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller"));
     //controllerAdapter->activate(); // Don't activate OA to ensure collocation is used.
 
-    MetricsPrxPtr allTests(const Ice::CommunicatorPtr&, const CommunicatorObserverIPtr&);
-    MetricsPrxPtr metrics = allTests(communicator, observer);
+    MetricsPrxPtr allTests(Test::TestHelper*, const CommunicatorObserverIPtr&);
+    MetricsPrxPtr metrics = allTests(this, observer);
     metrics->shutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties->setProperty("Ice.Admin.InstanceName", "client");
-        initData.properties->setProperty("Ice.Admin.DelayCreation", "1");
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI);
-        initData.observer = observer;
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator(), observer);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/InstrumentationI.h zeroc-ice-3.7.2/cpp/test/Ice/metrics/InstrumentationI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/InstrumentationI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/InstrumentationI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef INSTRUMENTATION_I_H
 #define INSTRUMENTATION_I_H
@@ -227,7 +222,7 @@
     }
 
     virtual Ice::Instrumentation::RemoteObserverPtr
-    getRemoteObserver(const Ice::ConnectionInfoPtr& c, const Ice::EndpointPtr& e, Ice::Int, Ice::Int)
+    getRemoteObserver(const Ice::ConnectionInfoPtr&, const Ice::EndpointPtr&, Ice::Int, Ice::Int)
     {
         IceUtil::Mutex::Lock sync(*this);
         if(!remoteObserver)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -345,14 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -347,14 +347,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -267,16 +267,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -269,16 +269,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -266,16 +266,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/metrics/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,62 +1,43 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 
-DEFINE_TEST("serveramd")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerAMD::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Admin.Endpoints", "tcp");
+    properties->setProperty("Ice.Admin.InstanceName", "server");
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    properties->setProperty("Ice.MessageSizeMax", "50000");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics"));
     adapter->activate();
 
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1));
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
     Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter");
     controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller"));
     controllerAdapter->activate();
 
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        //initData.properties->setProperty("Ice.ThreadPool.Server.Size", "1");
-        //initData.properties->setProperty("Ice.ThreadPool.Server.SizeMax", "1");
-        initData.properties->setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties->setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties->setProperty("Ice.MessageSizeMax", "50000");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/metrics/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,62 +1,43 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Admin.Endpoints", "tcp");
+    properties->setProperty("Ice.Admin.InstanceName", "server");
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    properties->setProperty("Ice.MessageSizeMax", "50000");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics"));
     adapter->activate();
 
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1));
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
     Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter");
     controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller"));
     controllerAdapter->activate();
 
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        //initData.properties->setProperty("Ice.ThreadPool.Server.Size", "1");
-        //initData.properties->setProperty("Ice.ThreadPool.Server.SizeMax", "1");
-        initData.properties->setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties->setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties->setProperty("Ice.MessageSizeMax", "50000");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/metrics/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/metrics/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/metrics/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class MetricsI : public Test::Metrics
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -34,9 +29,10 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string sref = "test:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string sref = "test:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr obj = communicator->stringToProxy(sref);
     test(obj);
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator){
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -262,10 +262,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -261,10 +261,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -340,14 +340,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -269,16 +269,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
 namespace
@@ -31,37 +24,24 @@
 
 }
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI);
     adapter->add(object, Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/networkProxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/networkProxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/objects/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-#ifdef _MSC_VER
-// For 'Ice::Communicator::addObjectFactory()' deprecation
-#pragma warning( disable : 4996 )
-#endif
-
-#if defined(__GNUC__)
 // For 'Ice::Communicator::addObjectFactory()' deprecation
+#if defined(_MSC_VER)
+#   pragma warning( disable : 4996 )
+#elif defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
@@ -39,7 +31,7 @@
 void
 testUOE(const Ice::CommunicatorPtr& communicator)
 {
-    string ref = "uoet:" + getTestEndpoint(communicator, 0);
+    string ref = "uoet:" + TestHelper::getTestEndpoint(communicator->getProperties());
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     UnexpectedObjectExceptionTestPrxPtr uoet = ICE_UNCHECKED_CAST(UnexpectedObjectExceptionTestPrx, base);
@@ -67,10 +59,10 @@
 
 void clear(const CPtr&);
 
+#ifdef ICE_CPP11_MAPPING
 void
 clear(const BPtr& b)
 {
-#ifdef ICE_CPP11_MAPPING
     // No GC with the C++11 mapping
     if(dynamic_pointer_cast<B>(b->theA))
     {
@@ -85,23 +77,33 @@
         clear(dynamic_pointer_cast<B>(tmp));
     }
     b->theC = nullptr;
-#endif
 }
+#else
+void
+clear(const BPtr&)
+{
+}
+#endif
 
+#ifdef ICE_CPP11_MAPPING
 void
 clear(const CPtr& c)
 {
-#ifdef ICE_CPP11_MAPPING
     // No GC with the C++11 mapping
     clear(c->theB);
     c->theB = nullptr;
-#endif
 }
+#else
+void
+clear(const CPtr&)
+{
+}
+#endif
 
+#ifdef ICE_CPP11_MAPPING
 void
 clear(const DPtr& d)
 {
-#ifdef ICE_CPP11_MAPPING
     // No GC with the C++11 mapping
     if(dynamic_pointer_cast<B>(d->theA))
     {
@@ -110,16 +112,22 @@
     d->theA = nullptr;
     clear(d->theB);
     d->theB = nullptr;
-#endif
 }
+#else
+void
+clear(const DPtr&)
+{
+}
+#endif
 
 }
 
 InitialPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing stringToProxy... " << flush;
-    string ref = "initial:" + getTestEndpoint(communicator, 0);
+    string ref = "initial:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
@@ -342,6 +350,45 @@
 #endif
     cout << "ok" << endl;
 
+    cout << "getting K... " << flush;
+    {
+        KPtr k = initial->getK();
+        LPtr l = ICE_DYNAMIC_CAST(L, k->value);
+        test(l);
+        test(l->data == "l");
+    }
+    cout << "ok" << endl;
+
+    cout << "testing Value as parameter..." << flush;
+    {
+        LPtr v1 = ICE_MAKE_SHARED(L, "l");
+        Ice::ValuePtr v2;
+        Ice::ValuePtr v3 = initial->opValue(v1, v2);
+        test(ICE_DYNAMIC_CAST(L, v2)->data == "l");
+        test(ICE_DYNAMIC_CAST(L, v3)->data == "l");
+    }
+
+    {
+        LPtr l = ICE_MAKE_SHARED(L, "l");
+        Test::ValueSeq v1;
+        v1.push_back(l);
+        Test::ValueSeq v2;
+        Test::ValueSeq v3 = initial->opValueSeq(v1, v2);
+        test(ICE_DYNAMIC_CAST(L, v2[0])->data == "l");
+        test(ICE_DYNAMIC_CAST(L, v3[0])->data == "l");
+    }
+
+    {
+        LPtr l = ICE_MAKE_SHARED(L, "l");
+        Test::ValueMap v1;
+        v1["l"] = l;
+        Test::ValueMap v2;
+        Test::ValueMap v3 = initial->opValueMap(v1, v2);
+        test(ICE_DYNAMIC_CAST(L, v2["l"])->data == "l");
+        test(ICE_DYNAMIC_CAST(L, v3["l"])->data == "l");
+    }
+    cout << "ok" << endl;
+
     cout << "getting D1... " << flush;
     D1Ptr d1 = ICE_MAKE_SHARED(D1,
                                ICE_MAKE_SHARED(A1, "a1"),
@@ -399,10 +446,10 @@
 
     cout << "testing recursive type... " << flush;
     RecursivePtr top = ICE_MAKE_SHARED(Recursive);
-    RecursivePtr p = top;
     int depth = 0;
     try
     {
+        RecursivePtr p = top;
 #if defined(NDEBUG) || !defined(__APPLE__)
         const int maxDepth = 2000;
 #else
@@ -471,14 +518,16 @@
 
     try
     {
-        TestIntfPrxPtr p = ICE_CHECKED_CAST(TestIntfPrx,
-                                            communicator->stringToProxy("test:" + getTestEndpoint(communicator, 0)));
+        Ice::PropertiesPtr properties = communicator->getProperties();
+        TestIntfPrxPtr p =
+            ICE_CHECKED_CAST(TestIntfPrx,
+                             communicator->stringToProxy("test:" + TestHelper::getTestEndpoint(properties)));
 
         cout << "testing Object factory registration... " << flush;
         {
-            BasePtr base = p->opDerived();
-            test(base);
-            test(base->ice_id() == "::Test::Derived");
+            BasePtr basePtr = p->opDerived();
+            test(basePtr);
+            test(basePtr->ice_id() == "::Test::Derived");
         }
         cout << "ok" << endl;
 
@@ -499,5 +548,34 @@
     {
     }
 
+    cout << "testing class containing complex dictionary... " << flush;
+    {
+        Test::MPtr m = ICE_MAKE_SHARED(Test::M);
+
+        Test::StructKey k1;
+        k1.i = 1;
+        k1.s = "1";
+        m->v[k1] = ICE_MAKE_SHARED(L, "one");
+
+        Test::StructKey k2;
+        k2.i = 2;
+        k2.s = "2";
+        m->v[k2] = ICE_MAKE_SHARED(L, "two");
+
+        Test::MPtr m1;
+        Test::MPtr m2 = initial->opM(m, m1);
+
+        test(m1->v.size() == 2);
+        test(m2->v.size() == 2);
+
+        test(m1->v[k1]->data == "one");
+        test(m2->v[k1]->data == "one");
+
+        test(m1->v[k2]->data == "two");
+        test(m2->v[k2]->data == "two");
+
+    }
+    cout << "ok" << endl;
+
     return initial;
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/objects/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
 //
@@ -21,15 +16,10 @@
 //
 #include <DerivedEx.h>
 
-DEFINE_TEST("client")
-
-#ifdef _MSC_VER
-// For 'Ice::Communicator::addObjectFactory()' deprecation
-#pragma warning( disable : 4996 )
-#endif
-
-#if defined(__GNUC__)
 // For 'Ice::Communicator::addObjectFactory()' deprecation
+#if defined(_MSC_VER)
+#   pragma warning( disable : 4996 )
+#elif defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
@@ -84,13 +74,13 @@
         {
             return new HI;
         }
-
         assert(false); // Should never be reached
         return 0;
     }
 
 };
 #endif
+
 class MyObjectFactory : public Ice::ObjectFactory
 {
 public:
@@ -103,7 +93,7 @@
         assert(_destroyed);
     }
 
-    virtual Ice::ValuePtr create(const string& type)
+    virtual Ice::ValuePtr create(const string&)
     {
         return ICE_NULLPTR;
     }
@@ -117,9 +107,23 @@
     bool _destroyed;
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+
+#ifndef ICE_CPP11_MAPPING
+    properties->setProperty("Ice.CollectObjects", "1");
+#endif
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 #ifdef ICE_CPP11_MAPPING
     communicator->getValueFactoryManager()->add(makeFactory<BI>(), "::Test::B");
     communicator->getValueFactoryManager()->add(makeFactory<CI>(), "::Test::C");
@@ -143,35 +147,9 @@
     communicator->addObjectFactory(new MyObjectFactory(), "TestOF");
 #endif
 
-    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
-    InitialPrxPtr initial = allTests(communicator);
+    InitialPrxPtr allTests(Test::TestHelper*);
+    InitialPrxPtr initial = allTests(this);
     initial->shutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-#ifndef ICE_CPP11_MAPPING
-        initData.properties->setProperty("Ice.CollectObjects", "1");
-#endif
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/objects/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated")
-
-#ifdef _MSC_VER
-// For 'Ice::Communicator::addObjectFactory()' deprecation
-#pragma warning( disable : 4996 )
-#endif
-
-#if defined(__GNUC__)
+//
 // For 'Ice::Communicator::addObjectFactory()' deprecation
+//
+#if defined(_MSC_VER)
+#   pragma warning( disable : 4996 )
+#elif defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
@@ -81,6 +73,7 @@
 
 };
 #endif
+
 class MyObjectFactory : public Ice::ObjectFactory
 {
 public:
@@ -93,7 +86,7 @@
         assert(_destroyed);
     }
 
-    virtual Ice::ValuePtr create(const string& type)
+    virtual Ice::ValuePtr create(const string&)
     {
         return ICE_NULLPTR;
     }
@@ -106,9 +99,23 @@
     bool _destroyed;
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+#ifndef ICE_CPP11_MAPPING
+    properties->setProperty("Ice.CollectObjects", "1");
+#endif
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
 #ifdef ICE_CPP11_MAPPING
     communicator->getValueFactoryManager()->add(makeFactory<BI>(), "::Test::B");
     communicator->getValueFactoryManager()->add(makeFactory<CI>(), "::Test::C");
@@ -132,39 +139,15 @@
     communicator->addObjectFactory(new MyObjectFactory(), "TestOF");
 #endif
 
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(InitialI, adapter), Ice::stringToIdentity("initial"));
     adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test"));
     adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), Ice::stringToIdentity("uoet"));
-    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
-    InitialPrxPtr initial = allTests(communicator);
+    InitialPrxPtr allTests(Test::TestHelper*);
+    InitialPrxPtr initial = allTests(this);
     // We must call shutdown even in the collocated case for cyclic dependency cleanup
     initial->shutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-#ifndef ICE_CPP11_MAPPING
-        initData.properties->setProperty("Ice.CollectObjects", "1");
-#endif
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/DerivedEx.ice zeroc-ice-3.7.2/cpp/test/Ice/objects/DerivedEx.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/DerivedEx.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/DerivedEx.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/Derived.ice zeroc-ice-3.7.2/cpp/test/Ice/objects/Derived.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/Derived.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/Derived.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/objects/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_sliceflags              := -I$(test)
 $(test)_client_sources          = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -707,14 +707,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -700,14 +700,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -699,14 +699,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -463,16 +463,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -464,16 +464,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -468,16 +468,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/objects/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 using namespace Test;
 
@@ -52,9 +45,21 @@
 };
 #endif
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
 #ifdef ICE_CPP11_MAPPING
     communicator->getValueFactoryManager()->add(makeFactory<II>(), "::Test::I");
     communicator->getValueFactoryManager()->add(makeFactory<JI>(), "::Test::J");
@@ -66,36 +71,15 @@
     communicator->getValueFactoryManager()->add(factory, "::Test::H");
 #endif
 
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(InitialI, adapter), Ice::stringToIdentity("initial"));
     adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test"));
 
     adapter->add(ICE_MAKE_SHARED(UnexpectedObjectExceptionTestI), Ice::stringToIdentity("uoet"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -177,6 +172,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 interface Initial
 {
     void shutdown();
@@ -195,9 +216,14 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -214,6 +240,8 @@
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 interface TestIntf
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/objects/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
@@ -329,6 +324,33 @@
 }
 #endif
 
+KPtr
+InitialI::getK(const Ice::Current&)
+{
+    return ICE_MAKE_SHARED(K, ICE_MAKE_SHARED(L, "l"));
+}
+
+Ice::ValuePtr
+InitialI::opValue(ICE_IN(Ice::ValuePtr) v1, Ice::ValuePtr& v2, const Ice::Current&)
+{
+    v2 = v1;
+    return v1;
+}
+
+Test::ValueSeq
+InitialI::opValueSeq(ICE_IN(Test::ValueSeq) v1, Test::ValueSeq& v2, const Ice::Current&)
+{
+    v2 = v1;
+    return v1;
+}
+
+Test::ValueMap
+InitialI::opValueMap(ICE_IN(Test::ValueMap) v1, Test::ValueMap& v2, const Ice::Current&)
+{
+    v2 = v1;
+    return v1;
+}
+
 D1Ptr
 InitialI::getD1(ICE_IN(Test::D1Ptr) d1, const Ice::Current&)
 {
@@ -344,6 +366,13 @@
                    ICE_MAKE_SHARED(A1, "a4"));
 }
 
+Test::MPtr
+InitialI::opM(ICE_IN(Test::MPtr) v1, Test::MPtr& v2, const Ice::Current&)
+{
+    v2 = v1;
+    return v1;
+}
+
 bool
 UnexpectedObjectExceptionTestI::ice_invoke(ICE_IN(std::vector<Ice::Byte>),
                                            std::vector<Ice::Byte>& outParams,
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/objects/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class BI : public Test::B
 {
@@ -120,6 +114,12 @@
     virtual Test::IPtr getH(const Ice::Current&);
 #endif
 
+    virtual Test::KPtr getK(const Ice::Current&);
+
+    virtual Ice::ValuePtr opValue(ICE_IN(Ice::ValuePtr), Ice::ValuePtr&, const Ice::Current&);
+    virtual Test::ValueSeq opValueSeq(ICE_IN(Test::ValueSeq), Test::ValueSeq&, const Ice::Current&);
+    virtual Test::ValueMap opValueMap(ICE_IN(Test::ValueMap), Test::ValueMap&, const Ice::Current&);
+
     virtual Test::D1Ptr getD1(ICE_IN(Test::D1Ptr), const Ice::Current&);
     virtual void throwEDerived(const Ice::Current&);
 
@@ -140,6 +140,8 @@
     virtual void throwInnerEx(const Ice::Current&);
     virtual void throwInnerSubEx(const Ice::Current&);
 
+    virtual Test::MPtr opM(ICE_IN(Test::MPtr), Test::MPtr&, const Ice::Current&);
+
 private:
 
     Ice::ObjectAdapterPtr _adapter;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/objects/TestIntfI.cpp zeroc-ice-3.7.2/cpp/test/Ice/objects/TestIntfI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/objects/TestIntfI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/objects/TestIntfI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/Locator.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
 Test::MyClassPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string ref = "test:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string ref = "test:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     Test::MyClassPrxPtr cl = ICE_CHECKED_CAST(Test::MyClassPrx, base);
     Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl);
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/BatchOnewaysAMI.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/BatchOnewaysAMI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/BatchOnewaysAMI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/BatchOneways.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/BatchOneways.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/BatchOneways.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/BatchOneways.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -16,7 +11,7 @@
 namespace
 {
 
-class BatchRequestInterceptorI
+class BatchRequestInterceptorI ICE_FINAL
 #ifndef ICE_CPP11_MAPPING
     : public Ice::BatchRequestInterceptor
 #endif
@@ -141,15 +136,16 @@
 
     Ice::Identity identity;
     identity.name = "invalid";
-    Ice::ObjectPrxPtr batch3 = batch->ice_identity(identity);
-    batch3->ice_ping();
-    batch3->ice_flushBatchRequests();
-
-    // Make sure that a bogus batch request doesn't cause troubles to other ones.
-    batch3->ice_ping();
-    batch->ice_ping();
-    batch->ice_flushBatchRequests();
-    batch->ice_ping();
+    {
+        Ice::ObjectPrxPtr batch3 = batch->ice_identity(identity);
+        batch3->ice_ping();
+        batch3->ice_flushBatchRequests();
+        // Make sure that a bogus batch request doesn't cause troubles to other ones.
+        batch3->ice_ping();
+        batch->ice_ping();
+        batch->ice_flushBatchRequests();
+        batch->ice_ping();
+    }
 
     if(batch->ice_getConnection() &&
        p->ice_getCommunicator()->getProperties()->getProperty("Ice.Default.Protocol") != "bt")
@@ -159,41 +155,41 @@
         BatchRequestInterceptorIPtr interceptor = ICE_MAKE_SHARED(BatchRequestInterceptorI);
 
 #if defined(ICE_CPP11_MAPPING)
-        initData.batchRequestInterceptor = [=](const Ice::BatchRequest& request, int count, int size)
+        initData.batchRequestInterceptor = [=](const Ice::BatchRequest& request, int countP, int size)
         {
-            interceptor->enqueue(request, count, size);
+            interceptor->enqueue(request, countP, size);
         };
 #else
         initData.batchRequestInterceptor = interceptor;
 #endif
         Ice::CommunicatorPtr ic = Ice::initialize(initData);
 
-        Test::MyClassPrxPtr batch =
+        Test::MyClassPrxPtr batch4 =
             ICE_UNCHECKED_CAST(Test::MyClassPrx, ic->stringToProxy(p->ice_toString()))->ice_batchOneway();
 
         test(interceptor->count() == 0);
-        batch->ice_ping();
-        batch->ice_ping();
-        batch->ice_ping();
+        batch4->ice_ping();
+        batch4->ice_ping();
+        batch4->ice_ping();
         test(interceptor->count() == 0);
 
         interceptor->enqueue(true);
-        batch->ice_ping();
-        batch->ice_ping();
-        batch->ice_ping();
+        batch4->ice_ping();
+        batch4->ice_ping();
+        batch4->ice_ping();
         test(interceptor->count() == 3);
 
-        batch->ice_flushBatchRequests();
-        batch->ice_ping();
+        batch4->ice_flushBatchRequests();
+        batch4->ice_ping();
         test(interceptor->count() == 1);
 
-        batch->opByteSOneway(bs1);
+        batch4->opByteSOneway(bs1);
         test(interceptor->count() == 2);
-        batch->opByteSOneway(bs1);
+        batch4->opByteSOneway(bs1);
         test(interceptor->count() == 3);
 
-        batch->opByteSOneway(bs1); // This should trigger the flush
-        batch->ice_ping();
+        batch4->opByteSOneway(bs1); // This should trigger the flush
+        batch4->ice_ping();
         test(interceptor->count() == 2);
 
         ic->destroy();
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
-    Test::MyClassPrxPtr myClass = allTests(communicator);
+    //
+    // In this test, we need at least two threads in the
+    // client side thread pool for nested AMI.
+    //
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.ThreadPool.Client.Size", "2");
+    properties->setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+    properties->setProperty("Ice.BatchAutoFlushSize", "100");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    Test::MyClassPrxPtr allTests(Test::TestHelper*);
+    Test::MyClassPrxPtr myClass = allTests(this);
 
     myClass->shutdown();
     cout << "testing server shutdown... " << flush;
@@ -35,38 +46,6 @@
     {
         cout << "ok" << endl;
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        //
-        // In this test, we need at least two threads in the
-        // client side thread pool for nested AMI.
-        //
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.ThreadPool.Client.Size", "2");
-        initData.properties->setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-        initData.properties->setProperty("Ice.BatchAutoFlushSize", "100");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.BatchAutoFlushSize", "100");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     communicator->getProperties()->setProperty("TestAdapter.AdapterId", "test");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPrxPtr prx = adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
@@ -26,31 +29,8 @@
 
     test(!prx->ice_getConnection());
 
-    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    Test::MyClassPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.BatchAutoFlushSize", "100");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/operations/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = Test.ice \
                           Client.cpp \
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -347,14 +347,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -357,14 +357,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -350,14 +350,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -350,14 +350,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -279,16 +279,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -277,16 +277,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -278,16 +278,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/OnewaysAMI.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/OnewaysAMI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/OnewaysAMI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/OnewaysAMI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/Oneways.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/Oneways.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/Oneways.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/Oneways.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 
-DEFINE_TEST("serveramd")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerAMD::run(int argc, char** argv)
 {
-    string endpt = getTestEndpoint(communicator, 0);
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt);
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    //
+    // Its possible to have batch oneway requests dispatched after
+    // the adapter is deactivated due to thread scheduling so we
+    // supress this warning.
+    //
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        //
-        // Its possible to have batch oneway requests dispatched after
-        // the adapter is deactivated due to thread scheduling so we
-        // supress this warning.
-        //
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    string endpt = getTestEndpoint(communicator, 0);
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpt);
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    //
+    // Its possible to have batch oneway requests dispatched after
+    // the adapter is deactivated due to thread scheduling so we
+    // supress this warning.
+    //
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        //
-        // Its possible to have batch oneway requests dispatched after
-        // the adapter is deactivated due to thread scheduling so we
-        // supress this warning.
-        //
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/operations/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <functional>
 #include <iterator>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/operations/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_AMD_I_H
 #define TEST_AMD_I_H
 
 #include <IceUtil/Thread.h>
 #include <TestAMD.h>
-#include <TestCommon.h>
 
 class MyDerivedClassI : public Test::MyDerivedClass
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <functional>
 #include <iterator>
 
@@ -65,7 +60,7 @@
 }
 
 bool
-MyDerivedClassI::supportsCompress(const Ice::Current& current)
+MyDerivedClassI::supportsCompress(const Ice::Current&)
 {
 #if defined(ICE_OS_UWP)
     return false;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/operations/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class MyDerivedClassI : public Test::MyDerivedClass
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/TwowaysAMI.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/TwowaysAMI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/TwowaysAMI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/TwowaysAMI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 //
@@ -519,23 +514,23 @@
 
     void opMyStructMyEnumD(const Test::MyStructMyEnumD& ro, const Test::MyStructMyEnumD& _do)
     {
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
+        di1[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[ms12] = ICE_ENUM(Test::MyEnum, enum2);
         test(_do == di1);
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
         test(ro.size() == 4);
-        test(ro.find(s11) != ro.end());
-        test(ro.find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
-        test(ro.find(s12) != ro.end());
-        test(ro.find(s12)->second == ICE_ENUM(Test::MyEnum, enum2));
-        test(ro.find(s22) != ro.end());
-        test(ro.find(s22)->second == ICE_ENUM(Test::MyEnum, enum3));
-        test(ro.find(s23) != ro.end());
-        test(ro.find(s23)->second == ICE_ENUM(Test::MyEnum, enum2));
+        test(ro.find(ms11) != ro.end());
+        test(ro.find(ms11)->second == ICE_ENUM(Test::MyEnum, enum1));
+        test(ro.find(ms12) != ro.end());
+        test(ro.find(ms12)->second == ICE_ENUM(Test::MyEnum, enum2));
+        test(ro.find(ms22) != ro.end());
+        test(ro.find(ms22)->second == ICE_ENUM(Test::MyEnum, enum3));
+        test(ro.find(ms23) != ro.end());
+        test(ro.find(ms23)->second == ICE_ENUM(Test::MyEnum, enum2));
         called();
     }
 
@@ -737,40 +732,40 @@
 
     void opMyStructMyEnumDS(const Test::MyStructMyEnumDS& ro, const Test::MyStructMyEnumDS& _do)
     {
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
 
         test(ro.size() == 2);
         test(ro[0].size() == 3);
-        test(ro[0].find(s11) != ro[0].end());
-        test(ro[0].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
-        test(ro[0].find(s22) != ro[0].end());
-        test(ro[0].find(s22)->second == ICE_ENUM(Test::MyEnum, enum3));
-        test(ro[0].find(s23) != ro[0].end());
-        test(ro[0].find(s23)->second == ICE_ENUM(Test::MyEnum, enum2));
+        test(ro[0].find(ms11) != ro[0].end());
+        test(ro[0].find(ms11)->second == ICE_ENUM(Test::MyEnum, enum1));
+        test(ro[0].find(ms22) != ro[0].end());
+        test(ro[0].find(ms22)->second == ICE_ENUM(Test::MyEnum, enum3));
+        test(ro[0].find(ms23) != ro[0].end());
+        test(ro[0].find(ms23)->second == ICE_ENUM(Test::MyEnum, enum2));
         test(ro[1].size() == 2);
-        test(ro[1].find(s11) != ro[1].end());
-        test(ro[1].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
-        test(ro[1].find(s12) != ro[1].end());
-        test(ro[1].find(s12)->second == ICE_ENUM(Test::MyEnum, enum2));
+        test(ro[1].find(ms11) != ro[1].end());
+        test(ro[1].find(ms11)->second == ICE_ENUM(Test::MyEnum, enum1));
+        test(ro[1].find(ms12) != ro[1].end());
+        test(ro[1].find(ms12)->second == ICE_ENUM(Test::MyEnum, enum2));
         test(_do.size() == 3);
         test(_do[0].size() == 1);
-        test(_do[0].find(s23) != _do[0].end());
-        test(_do[0].find(s23)->second == ICE_ENUM(Test::MyEnum, enum3));
+        test(_do[0].find(ms23) != _do[0].end());
+        test(_do[0].find(ms23)->second == ICE_ENUM(Test::MyEnum, enum3));
         test(_do[1].size() == 2);
-        test(_do[1].find(s11) != _do[1].end());
-        test(_do[1].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
-        test(_do[1].find(s12) != _do[1].end());
-        test(_do[1].find(s12)->second == ICE_ENUM(Test::MyEnum, enum2));
+        test(_do[1].find(ms11) != _do[1].end());
+        test(_do[1].find(ms11)->second == ICE_ENUM(Test::MyEnum, enum1));
+        test(_do[1].find(ms12) != _do[1].end());
+        test(_do[1].find(ms12)->second == ICE_ENUM(Test::MyEnum, enum2));
         test(_do[2].size() == 3);
-        test(_do[2].find(s11) != _do[2].end());
-        test(_do[2].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
-        test(_do[2].find(s22) != _do[2].end());
-        test(_do[2].find(s22)->second == ICE_ENUM(Test::MyEnum, enum3));
-        test(_do[2].find(s23) != _do[2].end());
-        test(_do[2].find(s23)->second == ICE_ENUM(Test::MyEnum, enum2));
+        test(_do[2].find(ms11) != _do[2].end());
+        test(_do[2].find(ms11)->second == ICE_ENUM(Test::MyEnum, enum1));
+        test(_do[2].find(ms22) != _do[2].end());
+        test(_do[2].find(ms22)->second == ICE_ENUM(Test::MyEnum, enum3));
+        test(_do[2].find(ms23) != _do[2].end());
+        test(_do[2].find(ms23)->second == ICE_ENUM(Test::MyEnum, enum2));
         called();
     }
 
@@ -1191,9 +1186,9 @@
         CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opShortIntLongAsync(10, 11, 12,
-            [&](long long int l1, short s1, int i1, long long int l2)
+            [&](long long int l1, short s1P, int i1, long long int l2)
             {
-                cb->opShortIntLong(l1, s1, i1, l2);
+                cb->opShortIntLong(l1, s1P, i1, l2);
             },
             makeExceptionClosure(cb));
 #else
@@ -1225,9 +1220,9 @@
         CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringAsync("hello", "world",
-            [&](string s1, string s2)
+            [&](string s1P, string s2P)
             {
-                cb->opString(move(s1), move(s2));
+                cb->opString(move(s1P), move(s2P));
             },
             makeExceptionClosure(cb));
 #else
@@ -1729,18 +1724,18 @@
     }
 
     {
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
+        di1[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[ms12] = ICE_ENUM(Test::MyEnum, enum2);
 
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
-        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
+        di2[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[ms22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[ms23] = ICE_ENUM(Test::MyEnum, enum2);
 
         CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
@@ -1980,21 +1975,21 @@
         Test::MyStructMyEnumDS dsi2;
         dsi2.resize(1);
 
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
+        di1[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[ms12] = ICE_ENUM(Test::MyEnum, enum2);
 
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
-        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
+        di2[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[ms22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[ms23] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStructMyEnumD di3;
-        di3[s23] = ICE_ENUM(Test::MyEnum, enum3);
+        di3[ms23] = ICE_ENUM(Test::MyEnum, enum3);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
@@ -2350,9 +2345,9 @@
             CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
             p->opIntSAsync(s,
-                [&](Test::IntS s1)
+                [&](Test::IntS s1P)
                 {
-                    cb->opIntS(s1);
+                    cb->opIntS(s1P);
                 },
                 makeExceptionClosure(cb));
 #else
@@ -2365,94 +2360,96 @@
     }
 
     {
-        Test::StringStringD ctx;
-        ctx["one"] = "ONE";
-        ctx["two"] = "TWO";
-        ctx["three"] = "THREE";
-        {
-            test(p->ice_getContext().empty());
-#ifdef ICE_CPP11_MAPPING
-            promise<void> prom;
-            p->opContextAsync(
-                [&](Ice::Context c)
-                {
-                    test(c != ctx);
-                    prom.set_value();
-                },
-                [](exception_ptr)
-                {
-                    test(false);
-                });
-            prom.get_future().get();
-#else
-            Ice::AsyncResultPtr r = p->begin_opContext();
-            Ice::Context c = p->end_opContext(r);
-            test(c != ctx);
-#endif
-        }
         {
-            test(p->ice_getContext().empty());
+            Ice::Context ctx;
+            ctx["one"] = "ONE";
+            ctx["two"] = "TWO";
+            ctx["three"] = "THREE";
+            {
+                test(p->ice_getContext().empty());
+#ifdef ICE_CPP11_MAPPING
+                promise<void> prom;
+                p->opContextAsync(
+                    [&](Ice::Context c)
+                    {
+                        test(c != ctx);
+                        prom.set_value();
+                    },
+                    [](exception_ptr)
+                    {
+                        test(false);
+                    });
+                prom.get_future().get();
+#else
+                Ice::AsyncResultPtr r = p->begin_opContext();
+                Ice::Context c = p->end_opContext(r);
+                test(c != ctx);
+#endif
+            }
+            {
+                test(p->ice_getContext().empty());
 #ifdef ICE_CPP11_MAPPING
-            promise<void> prom;
-            p->opContextAsync(
-                [&](Ice::Context c)
-                {
-                    test(c == ctx);
-                    prom.set_value();
-                },
-                [](exception_ptr)
-                {
-                    test(false);
-                }, nullptr, ctx);
-            prom.get_future().get();
-#else
-            Ice::AsyncResultPtr r = p->begin_opContext(ctx);
-            Ice::Context c = p->end_opContext(r);
-            test(c == ctx);
+                promise<void> prom;
+                p->opContextAsync(
+                    [&](Ice::Context c)
+                    {
+                        test(c == ctx);
+                        prom.set_value();
+                    },
+                    [](exception_ptr)
+                    {
+                        test(false);
+                    }, nullptr, ctx);
+                prom.get_future().get();
+#else
+                Ice::AsyncResultPtr r = p->begin_opContext(ctx);
+                Ice::Context c = p->end_opContext(r);
+                test(c == ctx);
 #endif
-        }
-        Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
-        test(p2->ice_getContext() == ctx);
-        {
+            }
+            {
+                Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
+                test(p2->ice_getContext() == ctx);
 #ifdef ICE_CPP11_MAPPING
-            promise<void> prom;
-            p2->opContextAsync(
-                [&](Ice::Context c)
-                {
-                    test(c == ctx);
-                    prom.set_value();
-                },
-                [](exception_ptr)
-                {
-                    test(false);
-                });
-            prom.get_future().get();
-#else
-            Ice::AsyncResultPtr r = p2->begin_opContext();
-            Ice::Context c = p2->end_opContext(r);
-            test(c == ctx);
+                promise<void> prom;
+                p2->opContextAsync(
+                    [&](Ice::Context c)
+                    {
+                        test(c == ctx);
+                        prom.set_value();
+                    },
+                    [](exception_ptr)
+                    {
+                        test(false);
+                    });
+                prom.get_future().get();
+#else
+                Ice::AsyncResultPtr r = p2->begin_opContext();
+                Ice::Context c = p2->end_opContext(r);
+                test(c == ctx);
 #endif
-        }
-        {
-            Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
+            }
+            {
+                Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
 #ifdef ICE_CPP11_MAPPING
-            promise<void> prom;
-            p2->opContextAsync(
-                [&](Ice::Context c)
-                {
-                    test(c == ctx);
-                    prom.set_value();
-                },
-                [](exception_ptr)
-                {
-                    test(false);
-                }, nullptr, ctx);
-            prom.get_future().get();
-#else
-            Ice::AsyncResultPtr r = p2->begin_opContext(ctx);
-            Ice::Context c = p2->end_opContext(r);
-            test(c == ctx);
+                promise<void> prom;
+                p2->opContextAsync(
+                    [&](Ice::Context c)
+                    {
+                        test(c == ctx);
+                        prom.set_value();
+                    },
+                    [](exception_ptr)
+                    {
+                        test(false);
+                    }, nullptr, ctx);
+                prom.get_future().get();
+#else
+                Ice::AsyncResultPtr r = p2->begin_opContext(ctx);
+                Ice::Context c = p2->end_opContext(r);
+                test(c == ctx);
 #endif
+            }
         }
 
         if(p->ice_getConnection() && communicator->getProperties()->getProperty("Ice.Default.Protocol") != "bt")
@@ -2475,14 +2472,16 @@
                 ctx["two"] = "TWO";
                 ctx["three"] = "THREE";
 
-                Test::MyClassPrxPtr p =
-                    ICE_UNCHECKED_CAST(Test::MyClassPrx, ic->stringToProxy("test:" + getTestEndpoint(ic, 0)));
+                Ice::PropertiesPtr properties = ic->getProperties();
+                Test::MyClassPrxPtr q =
+                    ICE_UNCHECKED_CAST(Test::MyClassPrx,
+                                       ic->stringToProxy("test:" + TestHelper::getTestEndpoint(properties)));
                 ic->getImplicitContext()->setContext(ctx);
                 test(ic->getImplicitContext()->getContext() == ctx);
                 {
 #ifdef ICE_CPP11_MAPPING
                     promise<void> prom;
-                    p->opContextAsync(
+                    q->opContextAsync(
                         [&](Ice::Context c)
                         {
                             test(c == ctx);
@@ -2494,8 +2493,8 @@
                         });
                     prom.get_future().get();
 #else
-                    Ice::AsyncResultPtr r = p->begin_opContext();
-                    Ice::Context c = p->end_opContext(r);
+                    Ice::AsyncResultPtr r = q->begin_opContext();
+                    Ice::Context c = q->end_opContext(r);
                     test(c == ctx);
 #endif
                 }
@@ -2506,7 +2505,7 @@
                 {
 #ifdef ICE_CPP11_MAPPING
                     promise<void> prom;
-                    p->opContextAsync(
+                    q->opContextAsync(
                         [&](Ice::Context c)
                         {
                             test(c == ctx);
@@ -2526,8 +2525,8 @@
                         });
                     prom.get_future().get();
 #else
-                    Ice::AsyncResultPtr r = p->begin_opContext();
-                    Ice::Context c = p->end_opContext(r);
+                    Ice::AsyncResultPtr r = q->begin_opContext();
+                    Ice::Context c = q->end_opContext(r);
                     test(c == ctx);
 #endif
                 }
@@ -2540,13 +2539,13 @@
                 combined.insert(ctx.begin(), ctx.end());
                 test(combined["one"] == "UN");
 
-                p = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_context(prxContext));
+                q = ICE_UNCHECKED_CAST(Test::MyClassPrx, q->ice_context(prxContext));
 
                 ic->getImplicitContext()->setContext(Ice::Context());
                 {
 #ifdef ICE_CPP11_MAPPING
                     promise<void> prom;
-                    p->opContextAsync(
+                    q->opContextAsync(
                         [&](Ice::Context c)
                         {
                             test(c == prxContext);
@@ -2558,8 +2557,8 @@
                         });
                     prom.get_future().get();
 #else
-                    Ice::AsyncResultPtr r = p->begin_opContext();
-                    Ice::Context c = p->end_opContext(r);
+                    Ice::AsyncResultPtr r = q->begin_opContext();
+                    Ice::Context c = q->end_opContext(r);
                     test(c == prxContext);
 #endif
                 }
@@ -2568,7 +2567,7 @@
                 {
 #ifdef ICE_CPP11_MAPPING
                     promise<void> prom;
-                    p->opContextAsync(
+                    q->opContextAsync(
                         [&](Ice::Context c)
                         {
                             test(c == combined);
@@ -2580,8 +2579,8 @@
                         });
                     prom.get_future().get();
 #else
-                    Ice::AsyncResultPtr r = p->begin_opContext();
-                    Ice::Context c = p->end_opContext(r);
+                    Ice::AsyncResultPtr r = q->begin_opContext();
+                    Ice::Context c = q->end_opContext(r);
                     test(c == combined);
 #endif
                 }
@@ -3303,18 +3302,18 @@
     }
 
     {
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
+        di1[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[ms12] = ICE_ENUM(Test::MyEnum, enum2);
 
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
-        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
+        di2[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[ms22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[ms23] = ICE_ENUM(Test::MyEnum, enum2);
 
         CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opMyStructMyEnumDAsync(di1, di2);
@@ -3567,21 +3566,21 @@
         Test::MyStructMyEnumDS dsi2;
         dsi2.resize(1);
 
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
+        di1[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[ms12] = ICE_ENUM(Test::MyEnum, enum2);
 
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
-        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
-        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
+        di2[ms11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[ms22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[ms23] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStructMyEnumD di3;
-        di3[s23] = ICE_ENUM(Test::MyEnum, enum3);
+        di3[ms23] = ICE_ENUM(Test::MyEnum, enum3);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/operations/Twoways.cpp zeroc-ice-3.7.2/cpp/test/Ice/operations/Twoways.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/operations/Twoways.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/operations/Twoways.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <limits>
 
@@ -936,28 +931,28 @@
     }
 
     {
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = ICE_ENUM(MyEnum, enum1);
-        di1[s12] = ICE_ENUM(MyEnum, enum2);
+        di1[ms11] = ICE_ENUM(MyEnum, enum1);
+        di1[ms12] = ICE_ENUM(MyEnum, enum2);
 
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = ICE_ENUM(MyEnum, enum1);
-        di2[s22] = ICE_ENUM(MyEnum, enum3);
-        di2[s23] = ICE_ENUM(MyEnum, enum2);
+        di2[ms11] = ICE_ENUM(MyEnum, enum1);
+        di2[ms22] = ICE_ENUM(MyEnum, enum3);
+        di2[ms23] = ICE_ENUM(MyEnum, enum2);
 
         Test::MyStructMyEnumD _do;
         Test::MyStructMyEnumD ro = p->opMyStructMyEnumD(di1, di2, _do);
 
         test(_do == di1);
         test(ro.size() == 4);
-        test(ro[s11] == ICE_ENUM(MyEnum, enum1));
-        test(ro[s12] == ICE_ENUM(MyEnum, enum2));
-        test(ro[s22] == ICE_ENUM(MyEnum, enum3));
-        test(ro[s23] == ICE_ENUM(MyEnum, enum2));
+        test(ro[ms11] == ICE_ENUM(MyEnum, enum1));
+        test(ro[ms12] == ICE_ENUM(MyEnum, enum2));
+        test(ro[ms22] == ICE_ENUM(MyEnum, enum3));
+        test(ro[ms23] == ICE_ENUM(MyEnum, enum2));
     }
 
     {
@@ -1261,21 +1256,21 @@
         Test::MyStructMyEnumDS dsi2;
         dsi2.resize(1);
 
-        Test::MyStruct s11 = { 1, 1 };
-        Test::MyStruct s12 = { 1, 2 };
+        Test::MyStruct ms11 = { 1, 1 };
+        Test::MyStruct ms12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = ICE_ENUM(MyEnum, enum1);
-        di1[s12] = ICE_ENUM(MyEnum, enum2);
+        di1[ms11] = ICE_ENUM(MyEnum, enum1);
+        di1[ms12] = ICE_ENUM(MyEnum, enum2);
 
-        Test::MyStruct s22 = { 2, 2 };
-        Test::MyStruct s23 = { 2, 3 };
+        Test::MyStruct ms22 = { 2, 2 };
+        Test::MyStruct ms23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = ICE_ENUM(MyEnum, enum1);
-        di2[s22] = ICE_ENUM(MyEnum, enum3);
-        di2[s23] = ICE_ENUM(MyEnum, enum2);
+        di2[ms11] = ICE_ENUM(MyEnum, enum1);
+        di2[ms22] = ICE_ENUM(MyEnum, enum3);
+        di2[ms23] = ICE_ENUM(MyEnum, enum2);
 
         Test::MyStructMyEnumD di3;
-        di3[s23] = ICE_ENUM(MyEnum, enum3);
+        di3[ms23] = ICE_ENUM(MyEnum, enum3);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
@@ -1288,23 +1283,23 @@
 
             test(ro.size() == 2);
             test(ro[0].size() == 3);
-            test(ro[0][s11] == ICE_ENUM(MyEnum, enum1));
-            test(ro[0][s22] == ICE_ENUM(MyEnum, enum3));
-            test(ro[0][s23] == ICE_ENUM(MyEnum, enum2));
+            test(ro[0][ms11] == ICE_ENUM(MyEnum, enum1));
+            test(ro[0][ms22] == ICE_ENUM(MyEnum, enum3));
+            test(ro[0][ms23] == ICE_ENUM(MyEnum, enum2));
             test(ro[1].size() == 2);
-            test(ro[1][s11] == ICE_ENUM(MyEnum, enum1));
-            test(ro[1][s12] == ICE_ENUM(MyEnum, enum2));
+            test(ro[1][ms11] == ICE_ENUM(MyEnum, enum1));
+            test(ro[1][ms12] == ICE_ENUM(MyEnum, enum2));
 
             test(_do.size() == 3);
             test(_do[0].size() == 1);
-            test(_do[0][s23] == ICE_ENUM(MyEnum, enum3));
+            test(_do[0][ms23] == ICE_ENUM(MyEnum, enum3));
             test(_do[1].size() == 2);
-            test(_do[1][s11] == ICE_ENUM(MyEnum, enum1));
-            test(_do[1][s12] == ICE_ENUM(MyEnum, enum2));
+            test(_do[1][ms11] == ICE_ENUM(MyEnum, enum1));
+            test(_do[1][ms12] == ICE_ENUM(MyEnum, enum2));
             test(_do[2].size() == 3);
-            test(_do[2][s11] == ICE_ENUM(MyEnum, enum1));
-            test(_do[2][s22] == ICE_ENUM(MyEnum, enum3));
-            test(_do[2][s23] == ICE_ENUM(MyEnum, enum2));
+            test(_do[2][ms11] == ICE_ENUM(MyEnum, enum1));
+            test(_do[2][ms22] == ICE_ENUM(MyEnum, enum3));
+            test(_do[2][ms23] == ICE_ENUM(MyEnum, enum2));
         }
         catch(const Ice::OperationNotExistException&)
         {
@@ -1710,27 +1705,29 @@
     }
 
     {
-        Ice::Context ctx;
-        ctx["one"] = "ONE";
-        ctx["two"] = "TWO";
-        ctx["three"] = "THREE";
-        {
-            Test::StringStringD r = p->opContext();
-            test(p->ice_getContext().empty());
-            test(r != ctx);
-        }
-        {
-            Test::StringStringD r = p->opContext(ctx);
-            test(p->ice_getContext().empty());
-            test(r == ctx);
-        }
-        {
-            Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
-            test(p2->ice_getContext() == ctx);
-            Test::StringStringD r = p2->opContext();
-            test(r == ctx);
-            r = p2->opContext(ctx);
-            test(r == ctx);
+        {
+            Ice::Context ctx;
+            ctx["one"] = "ONE";
+            ctx["two"] = "TWO";
+            ctx["three"] = "THREE";
+            {
+                Test::StringStringD r = p->opContext();
+                test(p->ice_getContext().empty());
+                test(r != ctx);
+            }
+            {
+                Test::StringStringD r = p->opContext(ctx);
+                test(p->ice_getContext().empty());
+                test(r == ctx);
+            }
+            {
+                Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
+                test(p2->ice_getContext() == ctx);
+                Test::StringStringD r = p2->opContext();
+                test(r == ctx);
+                r = p2->opContext(ctx);
+                test(r == ctx);
+            }
         }
 
         if(p->ice_getConnection() && communicator->getProperties()->getProperty("Ice.Default.Protocol") != "bt")
@@ -1753,12 +1750,14 @@
                 ctx["two"] = "TWO";
                 ctx["three"] = "THREE";
 
-                Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx,
-                                                           ic->stringToProxy("test:" + getTestEndpoint(ic, 0)));
+                Ice::PropertiesPtr properties = ic->getProperties();
+                Test::MyClassPrxPtr q =
+                    ICE_UNCHECKED_CAST(Test::MyClassPrx,
+                                       ic->stringToProxy("test:" + TestHelper::getTestEndpoint(properties, 0)));
 
                 ic->getImplicitContext()->setContext(ctx);
                 test(ic->getImplicitContext()->getContext() == ctx);
-                test(p->opContext() == ctx);
+                test(q->opContext() == ctx);
 
                 test(ic->getImplicitContext()->containsKey("zero") == false);
                 string r = ic->getImplicitContext()->put("zero", "ZERO");
@@ -1767,7 +1766,7 @@
                 test(ic->getImplicitContext()->get("zero") == "ZERO");
 
                 ctx = ic->getImplicitContext()->getContext();
-                test(p->opContext() == ctx);
+                test(q->opContext() == ctx);
                 Ice::Context prxContext;
                 prxContext["one"] = "UN";
                 prxContext["four"] = "QUATRE";
@@ -1776,19 +1775,19 @@
                 combined.insert(ctx.begin(), ctx.end());
                 test(combined["one"] == "UN");
 
-                p = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_context(prxContext));
+                q = ICE_UNCHECKED_CAST(Test::MyClassPrx, q->ice_context(prxContext));
 
                 ic->getImplicitContext()->setContext(Ice::Context());
-                test(p->opContext() == prxContext);
+                test(q->opContext() == prxContext);
 
                 ic->getImplicitContext()->setContext(ctx);
-                test(p->opContext() == combined);
+                test(q->opContext() == combined);
 
                 test(ic->getImplicitContext()->remove("one") == "ONE");
 
                 if(impls[i] == "PerThread")
                 {
-                    IceUtil::ThreadPtr thread = new PerThreadContextInvokeThread(p->ice_context(Ice::Context()));
+                    IceUtil::ThreadPtr thread = new PerThreadContextInvokeThread(q->ice_context(Ice::Context()));
                     thread->start();
                     thread->getThreadControl().join();
                 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/optional/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+
+#ifdef _MSC_VER
+#   pragma warning(disable:4244) // '=': conversion from x to y, possible loss of data
+#endif
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 #ifdef ICE_CPP11_MAPPING
@@ -371,18 +370,23 @@
 #endif
 
 InitialPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator, bool)
+allTests(Test::TestHelper* helper, bool)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     FactoryIPtr factory = ICE_MAKE_SHARED(FactoryI);
 
 #ifdef ICE_CPP11_MAPPING
-    communicator->getValueFactoryManager()->add([factory](const string& typeId) { return factory->create(typeId); }, "");
+    communicator->getValueFactoryManager()->add([factory](const string& typeId)
+                                                {
+                                                    return factory->create(typeId);
+                                                },
+                                                "");
 #else
     communicator->getValueFactoryManager()->add(factory, "");
 #endif
 
     cout << "testing stringToProxy... " << flush;
-    string ref = "initial:" + getTestEndpoint(communicator, 0);
+    string ref = "initial:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
@@ -902,24 +906,24 @@
     cout << "ok" << endl;
 
     cout << "testing tag marshalling... " << flush;
-    BPtr b = ICE_MAKE_SHARED(B);
-    BPtr b2 = ICE_DYNAMIC_CAST(B, initial->pingPong(b));
-    test(!b2->ma);
-    test(!b2->mb);
-    test(!b2->mc);
-
-    b->ma = 10;
-    b->mb = 11;
-    b->mc = 12;
-    b->md = 13;
-
-    b2 = ICE_DYNAMIC_CAST(B, initial->pingPong(b));
-    test(b2->ma == 10);
-    test(b2->mb == 11);
-    test(b2->mc == 12);
-    test(b2->md == 13);
-
     {
+        BPtr b = ICE_MAKE_SHARED(B);
+        BPtr b2 = ICE_DYNAMIC_CAST(B, initial->pingPong(b));
+        test(!b2->ma);
+        test(!b2->mb);
+        test(!b2->mc);
+
+        b->ma = 10;
+        b->mb = 11;
+        b->mc = 12;
+        b->md = 13;
+
+        b2 = ICE_DYNAMIC_CAST(B, initial->pingPong(b));
+        test(b2->ma == 10);
+        test(b2->mb == 11);
+        test(b2->mc == 12);
+        test(b2->md == 13);
+
         factory->setEnabled(true);
         Ice::OutputStream out(communicator);
         out.startEncapsulation();
@@ -1518,8 +1522,8 @@
         Ice::OutputStream out(communicator);
         out.startEncapsulation();
 #ifdef ICE_CPP11_MAPPING
-        out.write(1, make_optional(f));
-        out.write(2, make_optional(f->ae));
+        out.write(1, Ice::make_optional(f));
+        out.write(2, Ice::make_optional(f->ae));
 #else
         out.write(1, makeOptional(f));
         out.write(2, makeOptional(f->ae));
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/optional/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    InitialPrxPtr allTests(const Ice::CommunicatorPtr&, bool);
-    InitialPrxPtr initial = allTests(communicator, false);
-    initial->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
+    void run(int, char**);
+};
 
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
+void
+Client::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
 #ifndef ICE_CPP11_MAPPING
-        initData.properties->setProperty("Ice.CollectObjects", "1");
+    properties->setProperty("Ice.CollectObjects", "1");
 #endif
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    InitialPrxPtr allTests(Test::TestHelper*, bool);
+    InitialPrxPtr initial = allTests(this, false);
+    initial->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/CustomMap.h zeroc-ice-3.7.2/cpp/test/Ice/optional/CustomMap.h
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/CustomMap.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/CustomMap.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CUSTOM_MAP_H
 #define CUSTOM_MAP_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -346,14 +346,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -40,7 +40,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{76FA117F-D41E-4136-933C-DE93E74AE88B}</ProjectGuid>
+    <ProjectGuid>{E64764EB-2B8E-454F-9635-0729D07CCA24}</ProjectGuid>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -346,14 +346,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -346,14 +346,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,15 +271,15 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -277,15 +277,15 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -278,15 +278,15 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/optional/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,63 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 
-DEFINE_TEST("serveramd")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerAMD::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+#ifndef ICE_CPP11_MAPPING
+    properties->setProperty("Ice.CollectObjects", "1");
+#endif
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(InitialI), Ice::stringToIdentity("initial"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-#ifndef ICE_CPP11_MAPPING
-        initData.properties->setProperty("Ice.CollectObjects", "1");
-#endif
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/optional/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,63 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server");
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+#ifndef ICE_CPP11_MAPPING
+    properties->setProperty("Ice.CollectObjects", "1");
+#endif
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(InitialI), Ice::stringToIdentity("initial"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-#ifndef ICE_CPP11_MAPPING
-        initData.properties->setProperty("Ice.CollectObjects", "1");
-#endif
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/StringView.h zeroc-ice-3.7.2/cpp/test/Ice/optional/StringView.h
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/StringView.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/StringView.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef STRING_VIEW_H
 #define STRING_VIEW_H
 
 #include <Ice/Ice.h>
 
+//
+// COMPILERFIX: G++ false positive "maybe-uninitialized" warnings when using
+// string_view with Ice::optional in C++17 mode.
+//
+#if defined(__GNUC__) && ICE_CPLUSPLUS >= 201703L
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
 namespace Util
 {
 
@@ -186,4 +190,8 @@
 
 }
 
+#if defined(__GNUC__) && ICE_CPLUSPLUS >= 201703L
+#   pragma GCC diagnostic pop
+#endif
+
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/optional/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/optional/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/optional/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/optional/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
@@ -39,7 +34,7 @@
 }
 #else
 Ice::ValuePtr
-InitialI::pingPong(const Ice::ValuePtr& obj, const Current& current)
+InitialI::pingPong(const Ice::ValuePtr& obj, const Current&)
 {
   return obj;
 }
@@ -277,9 +272,9 @@
 }
 
 #ifdef ICE_CPP11_MAPPING
-optional<Ice::StringSeq>
-InitialI::opStringSeq(optional<Ice::StringSeq> p1,
-                      optional<Ice::StringSeq>& p3, const Current&)
+Ice::optional<Ice::StringSeq>
+InitialI::opStringSeq(Ice::optional<Ice::StringSeq> p1,
+                      Ice::optional<Ice::StringSeq>& p3, const Current&)
 {
     if(p1)
     {
@@ -345,9 +340,9 @@
 }
 
 #ifdef ICE_CPP11_MAPPING
-optional<VarStructSeq>
-InitialI::opVarStructSeq(optional<VarStructSeq> p1,
-                         optional<VarStructSeq>& p3, const Current&)
+Ice::optional<VarStructSeq>
+InitialI::opVarStructSeq(Ice::optional<VarStructSeq> p1,
+                         Ice::optional<VarStructSeq>& p3, const Current&)
 {
     if(p1)
     {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/optional/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/optional/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/optional/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/optional/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/plugin/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-DEFINE_TEST("client")
-
 namespace
 {
 
@@ -23,8 +16,8 @@
 public:
 
     MyPlugin() :
-         _initialized(false),
-         _destroyed(false)
+        _initialized(false),
+        _destroyed(false)
     {
     }
 
@@ -59,7 +52,6 @@
 
 private:
 
-    const Ice::CommunicatorPtr _communicator;
     bool _initialized;
     bool _destroyed;
 };
@@ -78,16 +70,22 @@
 
 }
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-    int status = EXIT_SUCCESS;
-    Ice::CommunicatorPtr communicator;
+public:
+
+    void run(int, char**);
+};
 
+void
+Client::run(int argc, char** argv)
+{
     if(argc < 2)
     {
-        cerr << "usage: " << argv[0] << " <plugindir>";
-        return 1;
+        ostringstream os;
+        os << "usage: " << argv[0] << " <plugindir>";
+        cerr << os.str() << endl;
+        throw invalid_argument(os.str());
     }
 
     //
@@ -106,8 +104,7 @@
     cout << "testing static plugin factory... " << flush;
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::CommunicatorHolder communicator = initialize(argc, argv);
         MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1"));
         test(plugin && plugin->isInitialized());
         try
@@ -117,23 +114,22 @@
         catch(const Ice::NotRegisteredException&)
         {
         }
-        communicator->destroy();
     }
     catch(const Ice::Exception& ex)
     {
         cerr << ex << endl;
         test(false);
     }
+
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.Static2", "1");
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.Static2", "1");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
         MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1"));
         test(plugin && plugin->isInitialized());
         plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static2"));
         test(plugin && plugin->isInitialized());
-        communicator->destroy();
     }
     catch(const Ice::Exception& ex)
     {
@@ -145,16 +141,16 @@
     cout << "testing a simple plug-in... " << flush;
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin:createPlugin");
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->destroy();
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin:createPlugin");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     }
     catch(const Ice::Exception& ex)
     {
         cerr << ex << endl;
         test(false);
     }
+
     try
     {
         int majorVersion = (ICE_INT_VERSION / 10000);
@@ -172,44 +168,45 @@
             os << 'a' << (patchVersion - 50);
         }
         os << ":createPlugin";
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.Test", os.str());
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->destroy();
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.Test", os.str());
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     }
     catch(const Ice::Exception& ex)
     {
         cerr << ex << endl;
         test(false);
     }
+
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin,10:createPlugin");
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin,10:createPlugin");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
         test(false);
     }
     catch(const Ice::PluginInitializationException&)
     {
     }
+
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.Test", "TestPlugin,1.0.0:createPlugin");
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.Test", "TestPlugin,1.0.0:createPlugin");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
         test(false);
     }
     catch(const Ice::PluginInitializationException&)
     {
     }
+
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.Test",
-            pluginDir + "TestPlugin:createPluginWithArgs 'C:\\Program Files\\' --DatabasePath "
-            "'C:\\Program Files\\Application\\db'" );
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->destroy();
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.Test",
+                                pluginDir + "TestPlugin:createPluginWithArgs 'C:\\Program Files\\' --DatabasePath "
+                                "'C:\\Program Files\\Application\\db'" );
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     }
     catch(const Ice::Exception& ex)
     {
@@ -219,31 +216,28 @@
     cout << "ok" << endl;
 
     cout << "testing a simple plug-in that fails to initialize... " << flush;
-    communicator = 0;
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin:createPluginInitializeFail");
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.Test", pluginDir + "TestPlugin:createPluginInitializeFail");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
         test(false);
     }
     catch(const Ice::PluginInitializationException& ex)
     {
         test(ex.reason.find("PluginInitializeFailExeption") > 0);
     }
-    test(!communicator);
     cout << "ok" << endl;
 
     cout << "testing plug-in load order... " << flush;
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.PluginOne", pluginDir + "TestPlugin:createPluginOne");
-        initData.properties->setProperty("Ice.Plugin.PluginTwo", pluginDir + "TestPlugin:createPluginTwo");
-        initData.properties->setProperty("Ice.Plugin.PluginThree", pluginDir + "TestPlugin:createPluginThree");
-        initData.properties->setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->destroy();
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.PluginOne", pluginDir + "TestPlugin:createPluginOne");
+        properties->setProperty("Ice.Plugin.PluginTwo", pluginDir + "TestPlugin:createPluginTwo");
+        properties->setProperty("Ice.Plugin.PluginThree", pluginDir + "TestPlugin:createPluginThree");
+        properties->setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     }
     catch(const Ice::Exception& ex)
     {
@@ -255,13 +249,13 @@
     cout << "testing plug-in manager... " << flush;
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.PluginOne", pluginDir + "TestPlugin:createPluginOne");
-        initData.properties->setProperty("Ice.Plugin.PluginTwo", pluginDir + "TestPlugin:createPluginTwo");
-        initData.properties->setProperty("Ice.Plugin.PluginThree", pluginDir + "TestPlugin:createPluginThree");
-        initData.properties->setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo");
-        initData.properties->setProperty("Ice.InitPlugins", "0");
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.PluginOne", pluginDir + "TestPlugin:createPluginOne");
+        properties->setProperty("Ice.Plugin.PluginTwo", pluginDir + "TestPlugin:createPluginTwo");
+        properties->setProperty("Ice.Plugin.PluginThree", pluginDir + "TestPlugin:createPluginThree");
+        properties->setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo");
+        properties->setProperty("Ice.InitPlugins", "0");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
         Ice::PluginManagerPtr pm = communicator->getPluginManager();
         test(pm->getPlugin("PluginOne"));
@@ -288,23 +282,21 @@
     cout << "ok" << endl;
 
     cout << "testing destroy when a plug-in fails to initialize... " << flush;
-    communicator = 0;
     try
     {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Plugin.PluginOneFail", pluginDir + "TestPlugin:createPluginOneFail");
-        initData.properties->setProperty("Ice.Plugin.PluginTwoFail", pluginDir + "TestPlugin:createPluginTwoFail");
-        initData.properties->setProperty("Ice.Plugin.PluginThreeFail", pluginDir + "TestPlugin:createPluginThreeFail");
-        initData.properties->setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
-        communicator = Ice::initialize(argc, argv, initData);
+        Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+        properties->setProperty("Ice.Plugin.PluginOneFail", pluginDir + "TestPlugin:createPluginOneFail");
+        properties->setProperty("Ice.Plugin.PluginTwoFail", pluginDir + "TestPlugin:createPluginTwoFail");
+        properties->setProperty("Ice.Plugin.PluginThreeFail", pluginDir + "TestPlugin:createPluginThreeFail");
+        properties->setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
         test(false);
     }
     catch(const Ice::PluginInitializationException& ex)
     {
         test(ex.reason.find("PluginInitializeFailExeption") > 0);
     }
-    test(!communicator);
     cout << "ok" << endl;
-
-    return status;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/plugin/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries       := $(test)_TestPlugin
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -95,10 +95,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -135,13 +135,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/testplugin/packages.config zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/testplugin/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/testplugin/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/testplugin/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -95,10 +95,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/Plugin.cpp zeroc-ice-3.7.2/cpp/test/Ice/plugin/Plugin.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/Plugin.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/Plugin.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
@@ -356,7 +351,7 @@
 {
 
 ICE_DECLSPEC_EXPORT ::Ice::Plugin*
-createPlugin(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq& args)
+createPlugin(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&)
 {
     return new Plugin(communicator);
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/plugin/test.py zeroc-ice-3.7.2/cpp/test/Ice/plugin/test.py
--- zeroc-ice-3.7.1/cpp/test/Ice/plugin/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/plugin/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__file__,
           [ClientTestCase(client=SimpleClient(args=lambda process, current: [current.getBuildDir("testplugin")]))],
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/properties/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/properties/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/properties/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/properties/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <fstream>
 
 using namespace std;
@@ -18,9 +13,10 @@
 
 string configPath;
 
-class Client : public Ice::Application
+class TestApplication : public Ice::Application
 {
 public:
+
     virtual int
     run(int, char*[])
     {
@@ -31,19 +27,21 @@
         test(properties->getProperty("Ice.ProgramName") == "PropertiesClient");
         test(appName() == properties->getProperty("Ice.ProgramName"));
         return EXIT_SUCCESS;
-    };
+    }
 };
 
 }
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
+public:
 
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
+{
     ifstream in("./config/configPath");
     if(!in)
     {
@@ -54,7 +52,7 @@
     {
         test(false);
     }
-    try
+
     {
         cout << "testing load properties from UTF-8 path... " << flush;
         Ice::PropertiesPtr properties = Ice::createProperties();
@@ -65,22 +63,15 @@
         test(properties->getProperty("Ice.ProgramName") == "PropertiesClient");
         cout << "ok" << endl;
     }
-    catch(const Ice::Exception& ex)
+
     {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
+        cout << "testing load properties from UTF-8 path using Ice::Application... " << flush;
+        TestApplication app;
+        app.main(argc, argv, configPath.c_str());
+        cout << "ok" << endl;
     }
 
-    cout << "testing load properties from UTF-8 path using Ice::Application... " << flush;
-    Client c;
-    c.main(argc, argv, configPath.c_str());
-    cout << "ok" << endl;
-
-    try
     {
-        //
-        // Try to load multiple config files.
-        //
         cout << "testing using Ice.Config with multiple config files... " << flush;
         Ice::PropertiesPtr properties;
         Ice::StringSeq args;
@@ -91,13 +82,7 @@
         test(properties->getProperty("Config3") == "Config3");
         cout << "ok" << endl;
     }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
 
-    try
     {
         cout << "testing configuration file escapes... " << flush;
         Ice::PropertiesPtr properties;
@@ -105,42 +90,37 @@
         args.push_back("--Ice.Config=config/escapes.cfg");
         properties = Ice::createProperties(args);
 
-        string props[] = { "Foo\tBar", "3",
-                           "Foo\\tBar", "4",
-                           "Escape\\ Space", "2",
-                           "Prop1", "1",
-                           "Prop2", "2",
-                           "Prop3", "3",
-                           "My Prop1", "1",
-                           "My Prop2", "2",
-                           "My.Prop1", "a property",
-                           "My.Prop2", "a     property",
-                           "My.Prop3", "  a     property  ",
-                           "My.Prop4", "  a     property  ",
-                           "My.Prop5", "a \\ property",
-                           "foo=bar", "1",
-                           "foo#bar", "2",
-                           "foo bar", "3",
-                           "A", "1",
-                           "B", "2 3 4",
-                           "C", "5=#6",
-                           "AServer", "\\\\server\\dir",
-                           "BServer", "\\server\\dir",
-                           ""
-        } ;
+        string props[] = {
+            "Foo\tBar", "3",
+            "Foo\\tBar", "4",
+            "Escape\\ Space", "2",
+            "Prop1", "1",
+            "Prop2", "2",
+            "Prop3", "3",
+            "My Prop1", "1",
+            "My Prop2", "2",
+            "My.Prop1", "a property",
+            "My.Prop2", "a     property",
+            "My.Prop3", "  a     property  ",
+            "My.Prop4", "  a     property  ",
+            "My.Prop5", "a \\ property",
+            "foo=bar", "1",
+            "foo#bar", "2",
+            "foo bar", "3",
+            "A", "1",
+            "B", "2 3 4",
+            "C", "5=#6",
+            "AServer", "\\\\server\\dir",
+            "BServer", "\\server\\dir",
+            ""
+        };
 
         for(size_t i = 0; props[i] != ""; i += 2)
         {
             test(properties->getProperty(props[i]) == props[i + 1]);
         }
-
         cout << "ok" << endl;
     }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/properties/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/properties/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/properties/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/properties/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/properties/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/properties/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/properties/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/properties/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/proxy/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/Locator.h>
 #include <Ice/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4125) // decimal digit terminates octal escape sequence
+#endif
+
 using namespace std;
 
 Test::MyClassPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     const string protocol = communicator->getProperties()->getProperty("Ice.Default.Protocol");
 
-    const string endp = getTestEndpoint(communicator, 0);
+    const string endp = helper->getTestEndpoint();
     cout << "testing stringToProxy... " << flush;
 
     string ref = "test:" + endp;
@@ -1121,30 +1121,30 @@
     cout << "ok" << endl;
 
     cout << "testing checked cast with context... " << flush;
-    Ice::Context c = cl->getContext();
-    test(c.size() == 0);
+    Ice::Context ctx = cl->getContext();
+    test(ctx.size() == 0);
 
-    c["one"] = "hello";
-    c["two"] = "world";
+    ctx["one"] = "hello";
+    ctx["two"] = "world";
 #ifdef ICE_CPP11_MAPPING
-    cl = Ice::checkedCast<Test::MyClassPrx>(base, c);
+    cl = Ice::checkedCast<Test::MyClassPrx>(base, ctx);
 #else
-    cl = Test::MyClassPrx::checkedCast(base, c);
+    cl = Test::MyClassPrx::checkedCast(base, ctx);
 #endif
     Ice::Context c2 = cl->getContext();
-    test(c == c2);
+    test(ctx == c2);
 
     //
     // Now with alternate API
     //
 #ifndef ICE_CPP11_MAPPING
     cl = Ice::checkedCast<Test::MyClassPrx>(base);
-    c = cl->getContext();
-    test(c.size() == 0);
+    ctx = cl->getContext();
+    test(ctx.size() == 0);
 
-    cl = Ice::checkedCast<Test::MyClassPrx>(base, c);
+    cl = Ice::checkedCast<Test::MyClassPrx>(base, ctx);
     c2 = cl->getContext();
-    test(c == c2);
+    test(ctx == c2);
 #endif
     cout << "ok" << endl;
 
@@ -1160,7 +1160,7 @@
                 test(cl->ice_secure(true)->ice_fixed(connection)->ice_isSecure());
                 test(cl->ice_facet("facet")->ice_fixed(connection)->ice_getFacet() == "facet");
                 test(cl->ice_oneway()->ice_fixed(connection)->ice_isOneway());
-                Ice::Context ctx;
+                ctx.clear();
                 ctx["one"] = "hello";
                 ctx["two"] = "world";
                 test(cl->ice_fixed(connection)->ice_getContext().empty());
@@ -1431,8 +1431,10 @@
     test(pstr == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
 
     // Opaque endpoint encoded with 1.1 encoding.
-    Ice::ObjectPrxPtr p2 = communicator->stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
-    test(communicator->proxyToString(p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+    {
+        Ice::ObjectPrxPtr p2 = communicator->stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+        test(communicator->proxyToString(p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+    }
 
     if(communicator->getProperties()->getPropertyAsInt("Ice.IPv6") == 0 &&
        communicator->getProperties()->getProperty("Ice.Default.Host") == "127.0.0.1")
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/proxy/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
-    Test::MyClassPrxPtr myClass = allTests(communicator);
-
-    myClass->shutdown();
+public:
 
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Test::MyClassPrxPtr allTests(Test::TestHelper*);
+    Test::MyClassPrxPtr myClass = allTests(this);
+
+    myClass->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/proxy/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
     //adapter->activate(); // Don't activate OA to ensure collocation is used.
 
-    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    Test::MyClassPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -235,16 +235,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -267,16 +267,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -266,16 +266,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/proxy/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 
-DEFINE_TEST("serveramd")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerAMD::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/proxy/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_AMD_I_H
 #define TEST_AMD_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
 
 using namespace std;
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/proxy/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/proxy/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/retry/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <InstrumentationI.h>
 #include <SystemFailure.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/retry/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,70 +1,56 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <InstrumentationI.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& communicator2)
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
+    initCounts();
+
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    initData.observer = getObserver();
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    initData.properties->setProperty("Ice.Warn.Connections", "0");
+
+    // Disable PrintStackTraces otherwise the test can fail on Windows/Debug
+    initData.properties->setProperty("Ice.PrintStackTraces", "0");
+
+    initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
+    Ice::CommunicatorHolder ich1 = Ice::initialize(argc, argv, initData);
+
+    //
+    // Configure a second communicator for the invocation timeout
+    // + retry test, we need to configure a large retry interval
+    // to avoid time-sensitive failures.
+    //
+    initData.properties = initData.properties->clone();
+    initData.properties->setProperty("Ice.RetryIntervals", "0 1 10000");
+    initData.observer = getObserver();
+    Ice::CommunicatorHolder ich2 = Ice::initialize(initData);
+
     RetryPrxPtr allTests(const Ice::CommunicatorPtr&, const Ice::CommunicatorPtr&, const string&);
-    RetryPrxPtr retry = allTests(communicator, communicator2, "retry:" + getTestEndpoint(communicator, 0));
+    RetryPrxPtr retry = allTests(ich1.communicator(),
+                                 ich2.communicator(),
+                                 "retry:" + TestHelper::getTestEndpoint(ich1->getProperties()));
     retry->shutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        initCounts();
-
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.observer = getObserver();
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        // Disable PrintStackTraces otherwise the test can fail on Windows/Debug
-        initData.properties->setProperty("Ice.PrintStackTraces", "0");
-
-        initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        Ice::InitializationData initData2;
-        initData2.properties = initData.properties->clone();
-        initData2.properties->setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = getObserver();
-        Ice::CommunicatorHolder ich2(initData2);
-        return run(argc, argv, ich.communicator(), ich2.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/retry/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <TestI.h>
 #include <InstrumentationI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 using namespace Test;
 
@@ -26,59 +19,49 @@
     //adapter->activate(); // Don't activate OA to ensure collocation is used.
 }
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& communicator2)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
-    setupObjectAdapter(communicator);
-    setupObjectAdapter(communicator2);
+    initCounts();
+
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    initData.observer = getObserver();
+
+    initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
+
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    initData.properties->setProperty("Ice.Warn.Connections", "0");
+    initData.properties->setProperty("Ice.Warn.Dispatch", "0");
+
+    Ice::CommunicatorHolder ich1 = Ice::initialize(argc, argv, initData);
+
+    //
+    // Configure a second communicator for the invocation timeout
+    // + retry test, we need to configure a large retry interval
+    // to avoid time-sensitive failures.
+    //
+    initData.properties = initData.properties->clone();
+    initData.properties->setProperty("Ice.RetryIntervals", "0 1 10000");
+    initData.observer = getObserver();
+
+    Ice::CommunicatorHolder ich2 = Ice::initialize(initData);
+
+    setupObjectAdapter(ich1.communicator());
+    setupObjectAdapter(ich2.communicator());
 
     RetryPrxPtr allTests(const Ice::CommunicatorPtr&, const Ice::CommunicatorPtr&, const string&);
-    RetryPrxPtr retry = allTests(communicator, communicator2, "retry");
+    RetryPrxPtr retry = allTests(ich1.communicator(), ich2.communicator(), "retry");
     retry->shutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        initCounts();
-
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.observer = getObserver();
-
-        initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        Ice::InitializationData initData2;
-        initData2.properties = initData.properties->clone();
-        initData2.properties->setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = getObserver();
-
-        Ice::CommunicatorHolder ich2(initData2);
-
-        return run(argc, argv, ich.communicator(), ich2.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/InstrumentationI.cpp zeroc-ice-3.7.2/cpp/test/Ice/retry/InstrumentationI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/InstrumentationI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/InstrumentationI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 namespace
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/InstrumentationI.h zeroc-ice-3.7.2/cpp/test/Ice/retry/InstrumentationI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/InstrumentationI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/InstrumentationI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef INSTRUMENTATION_I_H
 #define INSTRUMENTATION_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/retry/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = Client.cpp AllTests.cpp Test.ice InstrumentationI.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -345,14 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -345,14 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -268,16 +268,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -270,16 +270,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -274,16 +274,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/retry/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+    properties->setProperty("Ice.PrintStackTraces", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(RetryI), Ice::stringToIdentity("retry"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-    int status = EXIT_FAILURE;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties->setProperty("Ice.PrintStackTraces", "0");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        status = run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/SystemFailure.h zeroc-ice-3.7.2/cpp/test/Ice/retry/SystemFailure.h
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/SystemFailure.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/SystemFailure.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SYSTEMFAILURE_H
 #define SYSTEMFAILURE_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/retry/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/retry/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
@@ -32,7 +27,7 @@
 }
 
 int
-RetryI::opIdempotent(int nRetry, const Ice::Current& current)
+RetryI::opIdempotent(int nRetry, const Ice::Current&)
 {
     if(nRetry < 0)
     {
@@ -51,7 +46,7 @@
 }
 
 void
-RetryI::opNotIdempotent(const Ice::Current& current)
+RetryI::opNotIdempotent(const Ice::Current&)
 {
     throw Ice::ConnectionLostException(__FILE__, __LINE__);
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/retry/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/retry/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/retry/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/retry/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/scope/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/AllTests.cpp	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,1903 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#include <Ice/Ice.h>
+#include <Ice/Locator.h>
+#include <TestHelper.h>
+#include <Test.h>
+
+using namespace std;
+
+#ifndef ICE_CPP11_MAPPING
+
+namespace Test
+{
+
+class Callback : public IceUtil::Shared
+{
+public:
+
+    Callback() : _called(false)
+    {
+    }
+
+    void opS(const Test::S& s2, const Test::S& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSSeq(const Test::SSeq& s2, const Test::SSeq& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSMap(const Test::SMap& s2, const Test::SMap& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opC(const Test::CPtr& c2, const Test::CPtr& c3)
+    {
+        test(c2 == c3);
+        called();
+    }
+
+    void opCSeq(const Test::CSeq& c2, const Test::CSeq& c3)
+    {
+        test(c2 == c3);
+        called();
+    }
+
+    void opCMap(const Test::CMap& c2, const Test::CMap& c3)
+    {
+        test(c2 == c3);
+        called();
+    }
+
+    void error(const Ice::Exception&)
+    {
+        test(false);
+    }
+
+    void called()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        assert(!_called);
+        _called = true;
+        _m.notify();
+    }
+
+    void check()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        while(!_called)
+        {
+            _m.wait();
+        }
+        _called = false;
+    }
+
+private:
+
+    IceUtil::Monitor<IceUtil::Mutex> _m;
+    bool _called;
+};
+
+namespace Inner
+{
+
+class Callback : public IceUtil::Shared
+{
+public:
+
+    Callback() : _called(false)
+    {
+    }
+
+    void opS(const Test::Inner::Inner2::S& s2, const Test::Inner::Inner2::S& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSSeq(const Test::Inner::Inner2::SSeq& s2, const Test::Inner::Inner2::SSeq& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSMap(const Test::Inner::Inner2::SMap& s2, const Test::Inner::Inner2::SMap& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opC(const Test::Inner::Inner2::CPtr& c2, const Test::Inner::Inner2::CPtr& c3)
+    {
+        test(c2 == c3);
+        called();
+    }
+
+    void opCSeq(const Test::Inner::Inner2::CSeq& c2, const Test::Inner::Inner2::CSeq& c3)
+    {
+        test(c2 == c3);
+        called();
+    }
+
+    void opCMap(const Test::Inner::Inner2::CMap& c2, const Test::Inner::Inner2::CMap& c3)
+    {
+        test(c2 == c3);
+        called();
+    }
+
+    void error(const Ice::Exception&)
+    {
+        test(false);
+    }
+
+    void called()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        assert(!_called);
+        _called = true;
+        _m.notify();
+    }
+
+    void check()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        while(!_called)
+        {
+            _m.wait();
+        }
+        _called = false;
+    }
+
+private:
+
+    IceUtil::Monitor<IceUtil::Mutex> _m;
+    bool _called;
+};
+
+namespace Inner2
+{
+
+class Callback : public IceUtil::Shared
+{
+public:
+
+    Callback() : _called(false)
+    {
+    }
+
+    void opS(const Test::Inner::Inner2::S& s2, const Test::Inner::Inner2::S& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSSeq(const Test::Inner::Inner2::SSeq& s2, const Test::Inner::Inner2::SSeq& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSMap(const Test::Inner::Inner2::SMap& s2, const Test::Inner::Inner2::SMap& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opC(const Test::Inner::Inner2::CPtr& s2, const Test::Inner::Inner2::CPtr& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opCSeq(const Test::Inner::Inner2::CSeq& s2, const Test::Inner::Inner2::CSeq& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opCMap(const Test::Inner::Inner2::CMap& s2, const Test::Inner::Inner2::CMap& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void error(const Ice::Exception&)
+    {
+        test(false);
+    }
+
+    void called()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        assert(!_called);
+        _called = true;
+        _m.notify();
+    }
+
+    void check()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        while(!_called)
+        {
+            _m.wait();
+        }
+        _called = false;
+    }
+
+private:
+
+    IceUtil::Monitor<IceUtil::Mutex> _m;
+    bool _called;
+};
+
+}
+
+}
+
+}
+
+namespace Inner
+{
+
+namespace Test
+{
+
+namespace Inner2
+{
+
+class Callback : public IceUtil::Shared
+{
+public:
+
+    Callback() : _called(false)
+    {
+    }
+
+    void opS(const ::Test::S& s2, const ::Test::S& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSSeq(const ::Test::SSeq& s2, const ::Test::SSeq& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opSMap(const ::Test::SMap& s2, const ::Test::SMap& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opC(const ::Test::CPtr& s2, const ::Test::CPtr& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opCSeq(const ::Test::CSeq& s2, const ::Test::CSeq& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void opCMap(const ::Test::CMap& s2, const ::Test::CMap& s3)
+    {
+        test(s2 == s3);
+        called();
+    }
+
+    void error(const Ice::Exception&)
+    {
+        test(false);
+    }
+
+    void called()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        assert(!_called);
+        _called = true;
+        _m.notify();
+    }
+
+    void check()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_m);
+        while(!_called)
+        {
+            _m.wait();
+        }
+        _called = false;
+    }
+
+private:
+
+    IceUtil::Monitor<IceUtil::Mutex> _m;
+    bool _called;
+};
+
+}
+
+}
+
+}
+
+#endif
+
+void
+allTests(Test::TestHelper* helper)
+{
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    //
+    // Scoped types
+    //
+    {
+        Test::IPrxPtr i = ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+        Test::S s2;
+        Test::S s3 = i->opS(s1, s2);
+        test(s1 == s2);
+        test(s1 == s3);
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        Test::SSeq sseq2;
+        Test::SSeq sseq3 = i->opSSeq(sseq1, sseq2);
+        test(sseq2 == sseq1);
+        test(sseq3 == sseq1);
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        Test::SMap smap2;
+        Test::SMap smap3 = i->opSMap(smap1, smap2);
+        test(smap2 == smap1);
+        test(smap3 == smap1);
+
+        Test::CPtr c1 = ICE_MAKE_SHARED(Test::C, s1);
+        Test::CPtr c2;
+        Test::CPtr c3 = i->opC(c1, c2);
+        test(c2->s == c1->s);
+        test(c3->s == c1->s);
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        Test::CSeq cseq2;
+        Test::CSeq cseq3 = i->opCSeq(cseq1, cseq2);
+        test(cseq2[0]->s == c1->s);
+        test(cseq3[0]->s == c1->s);
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        Test::CMap cmap2;
+        Test::CMap cmap3 = i->opCMap(cmap1, cmap2);
+        test(cmap2["a"]->s == c1->s);
+        test(cmap3["a"]->s == c1->s);
+    }
+
+#ifdef ICE_CPP11_MAPPING
+    //
+    // C++ 11 Future-Based Async Function
+    //
+    {
+        Test::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+        {
+            auto result = i->opSAsync(s1).get();
+            test(result.returnValue == s1);
+            test(result.s2 == s1);
+        }
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            auto result = i->opSSeqAsync(sseq1).get();
+            test(result.returnValue == sseq1);
+            test(result.s2 == sseq1);
+        }
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        {
+            auto result = i->opSMapAsync(smap1).get();
+            test(result.returnValue == smap1);
+            test(result.s2 == smap1);
+        }
+
+        Test::CPtr c1 =  make_shared<Test::C>(s1);
+        {
+            auto result = i->opCAsync(c1).get();
+            test(Ice::targetEqualTo(result.returnValue, c1));
+            test(Ice::targetEqualTo(result.c2, c1));
+        }
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            auto result = i->opCSeqAsync(cseq1).get();
+            test(Ice::targetEqualTo(result.returnValue[0], c1));
+            test(Ice::targetEqualTo(result.s2[0], c1));
+        }
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            auto result = i->opCMapAsync(cmap1).get();
+            test(Ice::targetEqualTo(result.returnValue["a"], c1));
+            test(Ice::targetEqualTo(result.c2["a"], c1));
+        }
+    }
+
+    //
+    // C++11 Callback-Based Async Function
+    //
+    {
+        Test::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSAsync(s1,
+                                      [&p, &s1](Test::S s2, Test::S s3)
+                                      {
+                                          test(s2 == s1);
+                                          test(s3 == s1);
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSSeqAsync(sseq1,
+                                         [&p, &sseq1](Test::SSeq s2, Test::SSeq s3)
+                                         {
+                                             test(s2 == sseq1);
+                                             test(s3 == sseq1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSMapAsync(smap1,
+                                         [&p, &smap1](Test::SMap s2, Test::SMap s3)
+                                         {
+                                             test(s2 == smap1);
+                                             test(s3 == smap1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::CPtr c1 = make_shared<Test::C>(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCAsync(c1,
+                                      [&p, &c1](Test::CPtr c2, Test::CPtr c3)
+                                      {
+                                          test(Ice::targetEqualTo(c2, c1));
+                                          test(Ice::targetEqualTo(c3, c1));
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCSeqAsync(cseq1,
+                                         [&p, c1](Test::CSeq c2, Test::CSeq c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2[0], c1));
+                                             test(Ice::targetEqualTo(c3[0], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCMapAsync(cmap1,
+                                         [&p, c1](Test::CMap c2, Test::CMap c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2["a"], c1));
+                                             test(Ice::targetEqualTo(c3["a"], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+    }
+#else
+    //
+    // C++ 98 AsyncResult API
+    //
+    {
+        Test::IPrxPtr i = ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+
+        Test::S s2;
+        Test::S s3 = i->end_opS(s2, i->begin_opS(s1));
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        sseq1.push_back(s2);
+        sseq1.push_back(s3);
+
+        Test::SSeq sseq2;
+        Test::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1));
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        smap1["b"] = s2;
+        smap1["c"] = s3;
+
+        Test::SMap smap2;
+        Test::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1));
+
+        Test::CPtr c1 = new Test::C(s1);
+        Test::CPtr c2;
+        Test::CPtr c3 = i->end_opC(c2, i->begin_opC(c1));
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        cseq1.push_back(c2);
+        cseq1.push_back(c3);
+
+        Test::CSeq cseq2;
+        Test::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1));
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        cmap1["b"] = c2;
+        cmap1["c"] = c3;
+
+        Test::CMap cmap2;
+        Test::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1));
+    }
+    //
+    // C++ 98 type safe callbacks
+    //
+    {
+        Test::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint()));
+        IceUtil::Handle<Test::Callback> cb = new Test::Callback();
+
+        Test::S s1;
+        s1.v = 0;
+        Test::Callback_I_opSPtr opSCB =
+            Test::newCallback_I_opS(cb, &Test::Callback::opS, &Test::Callback::error);
+        i->begin_opS(s1, opSCB);
+        cb->check();
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        Test::Callback_I_opSSeqPtr opSSeqCB =
+            Test::newCallback_I_opSSeq(cb, &Test::Callback::opSSeq, &Test::Callback::error);
+        i->begin_opSSeq(sseq1, opSSeqCB);
+        cb->check();
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        Test::Callback_I_opSMapPtr opSMapCB =
+            Test::newCallback_I_opSMap(cb, &Test::Callback::opSMap, &Test::Callback::error);
+        i->begin_opSMap(smap1, opSMapCB);
+        cb->check();
+
+        Test::CPtr c1 = new Test::C(s1);
+        Test::Callback_I_opCPtr opCCB =
+            Test::newCallback_I_opC(cb, &Test::Callback::opC, &Test::Callback::error);
+        i->begin_opC(c1, opCCB);
+        cb->check();
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        Test::Callback_I_opCSeqPtr opCSeqCB =
+            Test::newCallback_I_opCSeq(cb, &Test::Callback::opCSeq, &Test::Callback::error);
+        i->begin_opCSeq(cseq1, opCSeqCB);
+        cb->check();
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        Test::Callback_I_opCMapPtr opCMapCB =
+            Test::newCallback_I_opCMap(cb, &Test::Callback::opCMap, &Test::Callback::error);
+        i->begin_opCMap(cmap1, opCMapCB);
+        cb->check();
+
+    }
+#endif
+
+    {
+        Test::Inner::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::Inner2::IPrx,
+                             communicator->stringToProxy("i2:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        Test::Inner::Inner2::S s2;
+        Test::Inner::Inner2::S s3 = i->opS(s1, s2);
+        test(s1 == s2);
+        test(s1 == s3);
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        Test::Inner::Inner2::SSeq sseq2;
+        Test::Inner::Inner2::SSeq sseq3 = i->opSSeq(sseq1, sseq2);
+        test(sseq2 == sseq1);
+        test(sseq3 == sseq1);
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        Test::Inner::Inner2::SMap smap2;
+        Test::Inner::Inner2::SMap smap3 = i->opSMap(smap1, smap2);
+        test(smap2 == smap1);
+        test(smap3 == smap1);
+
+        Test::Inner::Inner2::CPtr c1 = ICE_MAKE_SHARED(Test::Inner::Inner2::C, s1);
+        Test::Inner::Inner2::CPtr c2;
+        Test::Inner::Inner2::CPtr c3 = i->opC(c1, c2);
+        test(c2->s == c1->s);
+        test(c3->s == c1->s);
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        Test::Inner::Inner2::CSeq cseq2;
+        Test::Inner::Inner2::CSeq cseq3 = i->opCSeq(cseq1, cseq2);
+        test(cseq2[0]->s == c1->s);
+        test(cseq3[0]->s == c1->s);
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        Test::Inner::Inner2::CMap cmap2;
+        Test::Inner::Inner2::CMap cmap3 = i->opCMap(cmap1, cmap2);
+        test(cmap2["a"]->s == c1->s);
+        test(cmap3["a"]->s == c1->s);
+    }
+#ifdef ICE_CPP11_MAPPING
+    //
+    // C++ 11 Future-Based Async Function
+    //
+    {
+        Test::Inner::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::Inner2::IPrx,
+                             communicator->stringToProxy("i2:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        {
+            auto result = i->opSAsync(s1).get();
+            test(result.returnValue == s1);
+            test(result.s2 == s1);
+        }
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            auto result = i->opSSeqAsync(sseq1).get();
+            test(result.returnValue == sseq1);
+            test(result.s2 == sseq1);
+        }
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        {
+            auto result = i->opSMapAsync(smap1).get();
+            test(result.returnValue == smap1);
+            test(result.s2 == smap1);
+        }
+
+        Test::Inner::Inner2::CPtr c1 = make_shared<Test::Inner::Inner2::C>(s1);
+        {
+            auto result = i->opCAsync(c1).get();
+            test(Ice::targetEqualTo(result.returnValue, c1));
+            test(Ice::targetEqualTo(result.c2, c1));
+        }
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            auto result = i->opCSeqAsync(cseq1).get();
+            test(Ice::targetEqualTo(result.returnValue[0], c1));
+            test(Ice::targetEqualTo(result.c2[0], c1));
+        }
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            auto result = i->opCMapAsync(cmap1).get();
+            test(Ice::targetEqualTo(result.returnValue["a"], c1));
+            test(Ice::targetEqualTo(result.c2["a"], c1));
+        }
+    }
+
+    //
+    // C++11 Callback-Based Async Function
+    //
+    {
+        Test::Inner::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::Inner2::IPrx,
+                             communicator->stringToProxy("i2:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSAsync(s1,
+                                      [&p, &s1](Test::Inner::Inner2::S s2, Test::Inner::Inner2::S s3)
+                                      {
+                                          test(s2 == s1);
+                                          test(s3 == s1);
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSSeqAsync(sseq1,
+                                         [&p, &sseq1](Test::Inner::Inner2::SSeq s2, Test::Inner::Inner2::SSeq s3)
+                                         {
+                                             test(s2 == sseq1);
+                                             test(s3 == sseq1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSMapAsync(smap1,
+                                         [&p, &smap1](Test::Inner::Inner2::SMap s2, Test::Inner::Inner2::SMap s3)
+                                         {
+                                             test(s2 == smap1);
+                                             test(s3 == smap1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        auto c1 = make_shared<Test::Inner::Inner2::C>(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCAsync(c1,
+                                      [&p, &c1](shared_ptr<Test::Inner::Inner2::C> c2,
+                                                shared_ptr<Test::Inner::Inner2::C> c3)
+                                      {
+                                          test(Ice::targetEqualTo(c2, c1));
+                                          test(Ice::targetEqualTo(c3, c1));
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCSeqAsync(cseq1,
+                                         [&p, c1](Test::Inner::Inner2::CSeq c2, Test::Inner::Inner2::CSeq c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2[0], c1));
+                                             test(Ice::targetEqualTo(c3[0], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCMapAsync(cmap1,
+                                         [&p, c1](Test::Inner::Inner2::CMap c2, Test::Inner::Inner2::CMap c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2["a"], c1));
+                                             test(Ice::targetEqualTo(c3["a"], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+    }
+#else
+    //
+    // C++ 98 AsyncResult API
+    //
+    {
+        Test::Inner::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::Inner2::IPrx,
+                             communicator->stringToProxy("i2:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+
+        s1.v = 0;
+
+        Test::Inner::Inner2::S s2;
+        Test::Inner::Inner2::S s3 = i->end_opS(s2, i->begin_opS(s1));
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        sseq1.push_back(s2);
+        sseq1.push_back(s3);
+
+        Test::Inner::Inner2::SSeq sseq2;
+        Test::Inner::Inner2::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1));
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        smap1["b"] = s2;
+        smap1["c"] = s3;
+
+        Test::Inner::Inner2::SMap smap2;
+        Test::Inner::Inner2::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1));
+
+        Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1);
+        Test::Inner::Inner2::CPtr c2;
+        Test::Inner::Inner2::CPtr c3 = i->end_opC(c2, i->begin_opC(c1));
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        cseq1.push_back(c2);
+        cseq1.push_back(c3);
+
+        Test::Inner::Inner2::CSeq cseq2;
+        Test::Inner::Inner2::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1));
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        cmap1["b"] = c2;
+        cmap1["c"] = c3;
+
+        Test::Inner::Inner2::CMap cmap2;
+        Test::Inner::Inner2::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1));
+    }
+    //
+    // C++ 98 type safe callbacks
+    //
+    {
+        Test::Inner::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::Inner2::IPrx,
+                             communicator->stringToProxy("i2:" + helper->getTestEndpoint()));
+
+        IceUtil::Handle<Test::Inner::Callback> cb = new Test::Inner::Callback();
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        Test::Inner::Inner2::Callback_I_opSPtr opSCB =
+            Test::Inner::Inner2::newCallback_I_opS(cb, &Test::Inner::Callback::opS, &Test::Inner::Callback::error);
+        i->begin_opS(s1, opSCB);
+        cb->check();
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        Test::Inner::Inner2::Callback_I_opSSeqPtr opSSeqCB =
+            Test::Inner::Inner2::newCallback_I_opSSeq(cb,
+                                                      &Test::Inner::Callback::opSSeq,
+                                                      &Test::Inner::Callback::error);
+        i->begin_opSSeq(sseq1, opSSeqCB);
+        cb->check();
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        Test::Inner::Inner2::Callback_I_opSMapPtr opSMapCB =
+            Test::Inner::Inner2::newCallback_I_opSMap(cb,
+                                                      &Test::Inner::Callback::opSMap,
+                                                      &Test::Inner::Callback::error);
+        i->begin_opSMap(smap1, opSMapCB);
+        cb->check();
+
+        Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1);
+        Test::Inner::Inner2::Callback_I_opCPtr opCCB =
+            Test::Inner::Inner2::newCallback_I_opC(cb,
+                                                   &Test::Inner::Callback::opC,
+                                                   &Test::Inner::Callback::error);
+        i->begin_opC(c1, opCCB);
+        cb->check();
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        Test::Inner::Inner2::Callback_I_opCSeqPtr opCSeqCB =
+            Test::Inner::Inner2::newCallback_I_opCSeq(cb,
+                                                      &Test::Inner::Callback::opCSeq,
+                                                      &Test::Inner::Callback::error);
+        i->begin_opCSeq(cseq1, opCSeqCB);
+        cb->check();
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        Test::Inner::Inner2::Callback_I_opCMapPtr opCMapCB =
+            Test::Inner::Inner2::newCallback_I_opCMap(cb,
+                                                      &Test::Inner::Callback::opCMap,
+                                                      &Test::Inner::Callback::error);
+        i->begin_opCMap(cmap1, opCMapCB);
+        cb->check();
+    }
+#endif
+
+    {
+        Test::Inner::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::IPrx, communicator->stringToProxy("i3:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        Test::Inner::Inner2::S s2;
+        Test::Inner::Inner2::S s3 = i->opS(s1, s2);
+        test(s1 == s2);
+        test(s1 == s3);
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        Test::Inner::Inner2::SSeq sseq2;
+        Test::Inner::Inner2::SSeq sseq3 = i->opSSeq(sseq1, sseq2);
+        test(sseq2 == sseq1);
+        test(sseq3 == sseq1);
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        Test::Inner::Inner2::SMap smap2;
+        Test::Inner::Inner2::SMap smap3 = i->opSMap(smap1, smap2);
+        test(smap2 == smap1);
+        test(smap3 == smap1);
+
+        Test::Inner::Inner2::CPtr c1 = ICE_MAKE_SHARED(Test::Inner::Inner2::C, s1);
+        Test::Inner::Inner2::CPtr c2;
+        Test::Inner::Inner2::CPtr c3 = i->opC(c1, c2);
+        test(c2->s == c1->s);
+        test(c3->s == c1->s);
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        Test::Inner::Inner2::CSeq cseq2;
+        Test::Inner::Inner2::CSeq cseq3 = i->opCSeq(cseq1, cseq2);
+        test(cseq2[0]->s == c1->s);
+        test(cseq3[0]->s == c1->s);
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        Test::Inner::Inner2::CMap cmap2;
+        Test::Inner::Inner2::CMap cmap3 = i->opCMap(cmap1, cmap2);
+        test(cmap2["a"]->s == c1->s);
+        test(cmap3["a"]->s == c1->s);
+    }
+
+#ifdef ICE_CPP11_MAPPING
+    //
+    // C++ 11 Future-Based Async Function
+    //
+    {
+        Test::Inner::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::IPrx, communicator->stringToProxy("i3:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        {
+            auto result = i->opSAsync(s1).get();
+            test(result.returnValue == s1);
+            test(result.s2 == s1);
+        }
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            auto result = i->opSSeqAsync(sseq1).get();
+            test(result.returnValue == sseq1);
+            test(result.s2 == sseq1);
+        }
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        {
+            auto result = i->opSMapAsync(smap1).get();
+            test(result.returnValue == smap1);
+            test(result.s2 == smap1);
+        }
+
+        Test::Inner::Inner2::CPtr c1 = make_shared<Test::Inner::Inner2::C>(s1);
+        {
+            auto result = i->opCAsync(c1).get();
+            test(Ice::targetEqualTo(result.returnValue, c1));
+            test(Ice::targetEqualTo(result.c2, c1));
+        }
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            auto result = i->opCSeqAsync(cseq1).get();
+            test(Ice::targetEqualTo(result.returnValue[0], c1));
+            test(Ice::targetEqualTo(result.c2[0], c1));
+        }
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            auto result = i->opCMapAsync(cmap1).get();
+            test(Ice::targetEqualTo(result.returnValue["a"], c1));
+            test(Ice::targetEqualTo(result.c2["a"], c1));
+        }
+    }
+
+    //
+    // C++11 Callback-Based Async Function
+    //
+    {
+        Test::Inner::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::IPrx, communicator->stringToProxy("i3:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSAsync(s1,
+                                      [&p, &s1](Test::Inner::Inner2::S s2, Test::Inner::Inner2::S s3)
+                                      {
+                                          test(s2 == s1);
+                                          test(s3 == s1);
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSSeqAsync(sseq1,
+                                         [&p, &sseq1](Test::Inner::Inner2::SSeq s2, Test::Inner::Inner2::SSeq s3)
+                                         {
+                                             test(s2 == sseq1);
+                                             test(s3 == sseq1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSMapAsync(smap1,
+                                         [&p, &smap1](Test::Inner::Inner2::SMap s2, Test::Inner::Inner2::SMap s3)
+                                         {
+                                             test(s2 == smap1);
+                                             test(s3 == smap1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        auto c1 = make_shared<Test::Inner::Inner2::C>(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCAsync(c1,
+                                      [&p, &c1](shared_ptr<Test::Inner::Inner2::C> c2,
+                                                shared_ptr<Test::Inner::Inner2::C> c3)
+                                      {
+                                          test(Ice::targetEqualTo(c2, c1));
+                                          test(Ice::targetEqualTo(c3, c1));
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCSeqAsync(cseq1,
+                                         [&p, c1](Test::Inner::Inner2::CSeq c2, Test::Inner::Inner2::CSeq c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2[0], c1));
+                                             test(Ice::targetEqualTo(c3[0], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCMapAsync(cmap1,
+                                         [&p, c1](Test::Inner::Inner2::CMap c2, Test::Inner::Inner2::CMap c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2["a"], c1));
+                                             test(Ice::targetEqualTo(c3["a"], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+    }
+#else
+    //
+    // C++ 98 AsyncResult API
+    //
+    {
+        Test::Inner::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::IPrx,
+                             communicator->stringToProxy("i3:" + helper->getTestEndpoint()));
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+
+        Test::Inner::Inner2::S s2;
+        Test::Inner::Inner2::S s3 = i->end_opS(s2, i->begin_opS(s1));
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        sseq1.push_back(s2);
+        sseq1.push_back(s3);
+
+        Test::Inner::Inner2::SSeq sseq2;
+        Test::Inner::Inner2::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1));
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        smap1["b"] = s2;
+        smap1["c"] = s3;
+
+        Test::Inner::Inner2::SMap smap2;
+        Test::Inner::Inner2::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1));
+
+        Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1);
+        Test::Inner::Inner2::CPtr c2;
+        Test::Inner::Inner2::CPtr c3 = i->end_opC(c2, i->begin_opC(c1));
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        cseq1.push_back(c2);
+        cseq1.push_back(c3);
+
+        Test::Inner::Inner2::CSeq cseq2;
+        Test::Inner::Inner2::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1));
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        cmap1["b"] = c2;
+        cmap1["c"] = c3;
+
+        Test::Inner::Inner2::CMap cmap2;
+        Test::Inner::Inner2::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1));
+    }
+    //
+    // C++ 98 type safe callbacks
+    //
+    {
+        Test::Inner::IPrxPtr i =
+            ICE_CHECKED_CAST(Test::Inner::IPrx,
+                             communicator->stringToProxy("i3:" + helper->getTestEndpoint()));
+
+        IceUtil::Handle<Test::Inner::Callback> cb = new Test::Inner::Callback();
+
+        Test::Inner::Inner2::S s1;
+        s1.v = 0;
+        Test::Inner::Callback_I_opSPtr opSCB =
+            Test::Inner::newCallback_I_opS(cb,
+                                           &Test::Inner::Callback::opS,
+                                           &Test::Inner::Callback::error);
+        i->begin_opS(s1, opSCB);
+        cb->check();
+
+        Test::Inner::Inner2::SSeq sseq1;
+        sseq1.push_back(s1);
+        Test::Inner::Callback_I_opSSeqPtr opSSeqCB =
+            Test::Inner::newCallback_I_opSSeq(cb,
+                                              &Test::Inner::Callback::opSSeq,
+                                              &Test::Inner::Callback::error);
+        i->begin_opSSeq(sseq1, opSSeqCB);
+        cb->check();
+
+        Test::Inner::Inner2::SMap smap1;
+        smap1["a"] = s1;
+        Test::Inner::Callback_I_opSMapPtr opSMapCB =
+            Test::Inner::newCallback_I_opSMap(cb,
+                                              &Test::Inner::Callback::opSMap,
+                                              &Test::Inner::Callback::error);
+        i->begin_opSMap(smap1, opSMapCB);
+        cb->check();
+
+        Test::Inner::Inner2::CPtr c1 = new Test::Inner::Inner2::C(s1);
+        Test::Inner::Callback_I_opCPtr opCCB =
+            Test::Inner::newCallback_I_opC(cb,
+                                           &Test::Inner::Callback::opC,
+                                           &Test::Inner::Callback::error);
+        i->begin_opC(c1, opCCB);
+        cb->check();
+
+        Test::Inner::Inner2::CSeq cseq1;
+        cseq1.push_back(c1);
+        Test::Inner::Callback_I_opCSeqPtr opCSeqCB =
+            Test::Inner::newCallback_I_opCSeq(cb,
+                                              &Test::Inner::Callback::opCSeq,
+                                              &Test::Inner::Callback::error);
+        i->begin_opCSeq(cseq1, opCSeqCB);
+        cb->check();
+
+        Test::Inner::Inner2::CMap cmap1;
+        cmap1["a"] = c1;
+        Test::Inner::Callback_I_opCMapPtr opCMapCB =
+            Test::Inner::newCallback_I_opCMap(cb,
+                                              &Test::Inner::Callback::opCMap,
+                                              &Test::Inner::Callback::error);
+        i->begin_opCMap(cmap1, opCMapCB);
+        cb->check();
+    }
+#endif
+
+    {
+        Inner::Test::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Inner::Test::Inner2::IPrx, communicator->stringToProxy("i4:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+        Test::S s2;
+        Test::S s3 = i->opS(s1, s2);
+        test(s1 == s2);
+        test(s1 == s3);
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        Test::SSeq sseq2;
+        Test::SSeq sseq3 = i->opSSeq(sseq1, sseq2);
+        test(sseq2 == sseq1);
+        test(sseq3 == sseq1);
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        Test::SMap smap2;
+        Test::SMap smap3 = i->opSMap(smap1, smap2);
+        test(smap2 == smap1);
+        test(smap3 == smap1);
+
+        Test::CPtr c1 = ICE_MAKE_SHARED(Test::C, s1);
+        Test::CPtr c2;
+        Test::CPtr c3 = i->opC(c1, c2);
+        test(c2->s == c1->s);
+        test(c3->s == c1->s);
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        Test::CSeq cseq2;
+        Test::CSeq cseq3 = i->opCSeq(cseq1, cseq2);
+        test(cseq2[0]->s == c1->s);
+        test(cseq3[0]->s == c1->s);
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        Test::CMap cmap2;
+        Test::CMap cmap3 = i->opCMap(cmap1, cmap2);
+        test(cmap2["a"]->s == c1->s);
+        test(cmap3["a"]->s == c1->s);
+    }
+
+#ifdef ICE_CPP11_MAPPING
+    //
+    // C++ 11 Future-Based Async Function
+    //
+    {
+        Inner::Test::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Inner::Test::Inner2::IPrx, communicator->stringToProxy("i4:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+        {
+            auto result = i->opSAsync(s1).get();
+            test(result.returnValue == s1);
+            test(result.s2 == s1);
+        }
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            auto result = i->opSSeqAsync(sseq1).get();
+            test(result.returnValue == sseq1);
+            test(result.s2 == sseq1);
+        }
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        {
+            auto result = i->opSMapAsync(smap1).get();
+            test(result.returnValue == smap1);
+            test(result.s2 == smap1);
+        }
+
+        Test::CPtr c1 = make_shared<Test::C>(s1);
+        {
+            auto result = i->opCAsync(c1).get();
+            test(Ice::targetEqualTo(result.returnValue, c1));
+            test(Ice::targetEqualTo(result.c2, c1));
+        }
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            auto result = i->opCSeqAsync(cseq1).get();
+            test(Ice::targetEqualTo(result.returnValue[0], c1));
+            test(Ice::targetEqualTo(result.c2[0], c1));
+        }
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            auto result = i->opCMapAsync(cmap1).get();
+            test(Ice::targetEqualTo(result.returnValue["a"], c1));
+            test(Ice::targetEqualTo(result.c2["a"], c1));
+        }
+    }
+
+    //
+    // C++11 Callback-Based Async Function
+    //
+    {
+        Inner::Test::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Inner::Test::Inner2::IPrx, communicator->stringToProxy("i4:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSAsync(s1,
+                                      [&p, &s1](Test::S s2, Test::S s3)
+                                      {
+                                          test(s2 == s1);
+                                          test(s3 == s1);
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSSeqAsync(sseq1,
+                                         [&p, &sseq1](Test::SSeq s2, Test::SSeq s3)
+                                         {
+                                             test(s2 == sseq1);
+                                             test(s3 == sseq1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opSMapAsync(smap1,
+                                         [&p, &smap1](Test::SMap s2, Test::SMap s3)
+                                         {
+                                             test(s2 == smap1);
+                                             test(s3 == smap1);
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        auto c1 = make_shared<Test::C>(s1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCAsync(c1,
+                                      [&p, &c1](shared_ptr<Test::C> c2,
+                                                shared_ptr<Test::C> c3)
+                                      {
+                                          test(Ice::targetEqualTo(c2, c1));
+                                          test(Ice::targetEqualTo(c3, c1));
+                                          p.set_value();
+                                      },
+                                      [&p](exception_ptr e)
+                                      {
+                                          p.set_exception(e);
+                                      });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCSeqAsync(cseq1,
+                                         [&p, c1](Test::CSeq c2, Test::CSeq c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2[0], c1));
+                                             test(Ice::targetEqualTo(c3[0], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        {
+            promise<void> p;
+            auto f = p.get_future();
+            auto result = i->opCMapAsync(cmap1,
+                                         [&p, c1](Test::CMap c2, Test::CMap c3)
+                                         {
+                                             test(Ice::targetEqualTo(c2["a"], c1));
+                                             test(Ice::targetEqualTo(c3["a"], c1));
+                                             p.set_value();
+                                         },
+                                         [&p](exception_ptr e)
+                                         {
+                                             p.set_exception(e);
+                                         });
+
+            try
+            {
+                f.get();
+            }
+            catch(const exception& ex)
+            {
+                cerr << ex.what() << endl;
+                test(false);
+            }
+        }
+    }
+#else
+    //
+    // C++ 98 AsyncResult API
+    //
+    {
+        Inner::Test::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Inner::Test::Inner2::IPrx,
+                             communicator->stringToProxy("i4:" + helper->getTestEndpoint()));
+
+        Test::S s1;
+        s1.v = 0;
+
+        Test::S s2;
+        Test::S s3 = i->end_opS(s2, i->begin_opS(s1));
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        sseq1.push_back(s2);
+        sseq1.push_back(s3);
+
+        Test::SSeq sseq2;
+        Test::SSeq sseq3 = i->end_opSSeq(sseq2, i->begin_opSSeq(sseq1));
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        smap1["b"] = s2;
+        smap1["c"] = s3;
+
+        Test::SMap smap2;
+        Test::SMap smap3 = i->end_opSMap(smap2, i->begin_opSMap(smap1));
+
+        Test::CPtr c1 = new Test::C(s1);
+        Test::CPtr c2;
+        Test::CPtr c3 = i->end_opC(c2, i->begin_opC(c1));
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        cseq1.push_back(c2);
+        cseq1.push_back(c3);
+
+        Test::CSeq cseq2;
+        Test::CSeq cseq3 = i->end_opCSeq(cseq2, i->begin_opCSeq(cseq1));
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        cmap1["b"] = c2;
+        cmap1["c"] = c3;
+
+        Test::CMap cmap2;
+        Test::CMap cmap3 = i->end_opCMap(cmap2, i->begin_opCMap(cmap1));
+    }
+    //
+    // C++ 98 type safe callbacks
+    //
+    {
+        Inner::Test::Inner2::IPrxPtr i =
+            ICE_CHECKED_CAST(Inner::Test::Inner2::IPrx,
+                             communicator->stringToProxy("i4:" + helper->getTestEndpoint()));
+
+        IceUtil::Handle<Inner::Test::Inner2::Callback> cb = new Inner::Test::Inner2::Callback();
+
+        Test::S s1;
+        s1.v = 0;
+        Inner::Test::Inner2::Callback_I_opSPtr opSCB =
+            Inner::Test::Inner2::newCallback_I_opS(cb,
+                                                   &Inner::Test::Inner2::Callback::opS,
+                                                   &Inner::Test::Inner2::Callback::error);
+        i->begin_opS(s1, opSCB);
+        cb->check();
+
+        Test::SSeq sseq1;
+        sseq1.push_back(s1);
+        Inner::Test::Inner2::Callback_I_opSSeqPtr opSSeqCB =
+            Inner::Test::Inner2::newCallback_I_opSSeq(cb,
+                                                      &Inner::Test::Inner2::Callback::opSSeq,
+                                                      &Inner::Test::Inner2::Callback::error);
+        i->begin_opSSeq(sseq1, opSSeqCB);
+        cb->check();
+
+        Test::SMap smap1;
+        smap1["a"] = s1;
+        Inner::Test::Inner2::Callback_I_opSMapPtr opSMapCB =
+            Inner::Test::Inner2::newCallback_I_opSMap(cb,
+                                                      &Inner::Test::Inner2::Callback::opSMap,
+                                                      &Inner::Test::Inner2::Callback::error);
+        i->begin_opSMap(smap1, opSMapCB);
+        cb->check();
+
+        Test::CPtr c1 = new Test::C(s1);
+        Inner::Test::Inner2::Callback_I_opCPtr opCCB =
+            Inner::Test::Inner2::newCallback_I_opC(cb,
+                                                   &Inner::Test::Inner2::Callback::opC,
+                                                   &Inner::Test::Inner2::Callback::error);
+        i->begin_opC(c1, opCCB);
+        cb->check();
+
+        Test::CSeq cseq1;
+        cseq1.push_back(c1);
+        Inner::Test::Inner2::Callback_I_opCSeqPtr opCSeqCB =
+            Inner::Test::Inner2::newCallback_I_opCSeq(cb,
+                                                      &Inner::Test::Inner2::Callback::opCSeq,
+                                                      &Inner::Test::Inner2::Callback::error);
+        i->begin_opCSeq(cseq1, opCSeqCB);
+        cb->check();
+
+        Test::CMap cmap1;
+        cmap1["a"] = c1;
+        Inner::Test::Inner2::Callback_I_opCMapPtr opCMapCB =
+            Inner::Test::Inner2::newCallback_I_opCMap(cb,
+                                                      &Inner::Test::Inner2::Callback::opCMap,
+                                                      &Inner::Test::Inner2::Callback::error);
+        i->begin_opCMap(cmap1, opCMapCB);
+        cb->check();
+    }
+#endif
+
+    Test::IPrxPtr i = ICE_CHECKED_CAST(Test::IPrx, communicator->stringToProxy("i1:" + helper->getTestEndpoint()));
+    i->shutdown();
+}
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/scope/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/Client.cpp	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,28 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#include <Ice/Ice.h>
+#include <TestHelper.h>
+#include <Test.h>
+
+using namespace std;
+
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    cout << "test same Slice type name in different scopes... " << flush;
+    void allTests(Test::TestHelper*);
+    allTests(this);
+    cout << "ok" << endl;
+}
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/client/client.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Cpp11-Debug|Win32">
+      <Configuration>Cpp11-Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Debug|x64">
+      <Configuration>Cpp11-Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Release|Win32">
+      <Configuration>Cpp11-Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Release|x64">
+      <Configuration>Cpp11-Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A19DC61B-84AE-4983-9B4C-4F4A338178C5}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And  '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\Test.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\AllTests.cpp" />
+    <ClCompile Include="..\..\Client.cpp" />
+    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Cpp11-Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Cpp11-Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Cpp11-Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/client/client.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\AllTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Client.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Debug\Test.cpp">
+      <Filter>Source Files\x64\Cpp11-Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
+      <Filter>Source Files\Win32\Cpp11-Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
+      <Filter>Source Files\x64\Cpp11-Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
+      <Filter>Source Files\Win32\Cpp11-Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6a8bf4e9-5b35-4fb7-9a6e-594d6e6ed04e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{714214a8-d019-45df-a663-d6eaf78b3101}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{69479d81-bc9e-4ecc-8973-01cc9a79319e}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{a73767b6-aacc-4fc6-b05a-82467de086ad}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Cpp11-Debug">
+      <UniqueIdentifier>{2169552a-6e52-49c0-9e2e-4a1ee0fa915b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{bff43d98-ea44-4264-b7ac-6f9edba637d4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Cpp11-Debug">
+      <UniqueIdentifier>{1d6571cc-2a9d-4c4a-ab0f-d060df3d4f5e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{1d8f772d-7ebd-40a1-bbb3-488cafe138d9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Cpp11-Debug">
+      <UniqueIdentifier>{27add602-5fa9-42ce-9819-9922aad0ade3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{4cf18090-2784-439b-b91d-4d18508778b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Cpp11-Debug">
+      <UniqueIdentifier>{af6cbdd3-217a-480e-8e05-75e4f225aaf8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{f36d15fc-be83-4b24-bebd-6476e2139ab5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{5c2a4219-b9be-4ead-ae0b-56ed10273263}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{9f451066-5740-4150-ac89-ee5798de72c0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{f80deb5b-a217-4184-bd68-ed2f29a33e68}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{772d8ee4-6290-402f-b9ff-311f8ca41be3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{25202916-912a-4727-8ce8-a7fb6dbd343b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{7d27b11c-80e7-4d88-9ea0-51741c6dbdd0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{0ecb0fa1-9dbe-4701-99b8-abef8e3df89c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Cpp11-Release">
+      <UniqueIdentifier>{515c7960-e3d8-4d61-9b41-02777dfc2197}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Cpp11-Release">
+      <UniqueIdentifier>{ea866deb-464e-4572-9b5b-14f869aeedab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Cpp11-Release">
+      <UniqueIdentifier>{2d63e6bc-0d3c-4785-a07a-b6b6a00f949e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Cpp11-Release">
+      <UniqueIdentifier>{5e708e2a-333d-49ac-b4da-94d528eb4ea4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="x64\Cpp11-Debug\Test.h">
+      <Filter>Header Files\x64\Cpp11-Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
+      <Filter>Header Files\Win32\Cpp11-Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Cpp11-Release\Test.h">
+      <Filter>Header Files\x64\Cpp11-Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Cpp11-Release\Test.h">
+      <Filter>Header Files\Win32\Cpp11-Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\Test.ice">
+      <Filter>Slice Files</Filter>
+    </SliceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/client/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/server/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/server/server.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Cpp11-Debug|Win32">
+      <Configuration>Cpp11-Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Debug|x64">
+      <Configuration>Cpp11-Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Release|Win32">
+      <Configuration>Cpp11-Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Release|x64">
+      <Configuration>Cpp11-Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And  '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\Test.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Server.cpp" />
+    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\TestI.h" />
+    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Cpp11-Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Cpp11-Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Cpp11-Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <PropertyGroup Label="UserMacros" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/server/server.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\Server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Debug\Test.cpp">
+      <Filter>Source Files\x64\Cpp11-Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
+      <Filter>Source Files\Win32\Cpp11-Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
+      <Filter>Source Files\x64\Cpp11-Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
+      <Filter>Source Files\Win32\Cpp11-Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{342bdbdd-c9eb-4c4e-9e42-26535c1d9ef1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{7d212e1c-94b9-40e6-b98b-7baeeba93c70}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{b53879f1-e137-4878-bf68-7d9d0a2d6052}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{759bc4ca-28b1-4edb-be6f-9e0aa9fc9591}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Cpp11-Debug">
+      <UniqueIdentifier>{76ba3424-75c4-4081-b287-4d67ed500b50}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{d41a7991-3b60-4df6-8e92-f7f3dae62b62}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Cpp11-Debug">
+      <UniqueIdentifier>{6615010b-d891-447a-9b1e-0f47224e4704}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{b12929ce-8b50-4056-8533-e6087fd20c70}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Cpp11-Debug">
+      <UniqueIdentifier>{da7f6ecb-6705-4c9f-a421-372f591b82ec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{1c2b8ea3-0207-4233-88db-25979dc06167}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Cpp11-Debug">
+      <UniqueIdentifier>{25e570ed-b3db-4e9f-86c4-84e267f5c62b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{53b2b65b-d9af-41f9-9d4b-90c189cb2452}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{e81add4c-9aef-4c8b-9d35-a5afb234645f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{6ca0da95-b3b2-4da2-8917-e122123d37cd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{033ac979-d188-488d-abda-40c0d9fd54aa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{53bdcc1c-07c1-4312-9dd2-d76a65eca2ce}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{a452a47c-a4f2-47a5-a150-858d94eff345}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{9e22de79-99b4-4b27-bea0-99708bd2edf8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{35b3ce8d-f989-40d3-9872-c8159e49a3fe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Cpp11-Release">
+      <UniqueIdentifier>{92ca2d6c-76d8-4282-a797-110c8918ab10}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Cpp11-Release">
+      <UniqueIdentifier>{7b9801fd-404e-41a2-8944-55bdcf44772b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Cpp11-Release">
+      <UniqueIdentifier>{a9cef5a9-43fa-4c2b-82b6-a0700312d25b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Cpp11-Release">
+      <UniqueIdentifier>{881fe500-1235-4723-a459-821314bc4cda}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\TestI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Cpp11-Debug\Test.h">
+      <Filter>Header Files\x64\Cpp11-Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
+      <Filter>Header Files\Win32\Cpp11-Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Cpp11-Release\Test.h">
+      <Filter>Header Files\x64\Cpp11-Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Cpp11-Release\Test.h">
+      <Filter>Header Files\Win32\Cpp11-Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\Test.ice">
+      <Filter>Slice Files</Filter>
+    </SliceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5ABB92D9-AA40-40CA-8175-40AE2725AF38}</ProjectGuid>
+    <Keyword>DynamicLibrary</Keyword>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>Ice_scope_client</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>Ice_scope_client</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>Ice_scope_client</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <TargetName>Ice_scope_client</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>Ice_scope_client</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <TargetName>Ice_scope_client</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\AllTests.cpp" />
+    <ClCompile Include="..\..\..\Client.cpp" />
+    <ClCompile Include="ARM\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\Test.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ARM\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="ARM\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\AllTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Client.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Test.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Test.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{018b42bd-0e54-4809-aa0f-ed9a99549c2f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{ebf72243-0068-45d4-b34b-a32381a65cb4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{e1f48491-97df-4c68-9a30-9d54db11c2e3}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{6287df3e-a1c5-41ea-87a2-bc4c63681c31}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{dc2eb5a8-d4f6-4f43-a152-f7d89c80e116}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{f92551a4-a61d-4c75-87a5-1f1afa5da9b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{4eb15042-9d06-4c9e-9912-d8e2d85b700e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{c0828946-a43e-4b30-a460-ecbe98bbe38d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{7ec67956-5fff-4971-8095-8d15539912bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{a6c72cf7-d607-4a55-a7aa-ea9707f20eaf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{05aa2c6a-7653-4d3d-a0e5-c14ffb324136}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{84b72ace-981e-40c5-a025-b5eeeea22f88}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{4eb8d5c3-15b8-40c1-ae34-6ed4cfe46e2d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{6fb7b9b0-b8c0-4e02-b908-2925291c4fb9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{8866f4d3-7d58-4db6-956a-e76a0b7bb887}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{33096b31-fe2e-4b60-a894-49b9937099fc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{a0889403-4366-4e6b-8c52-82285e0ce60b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{b189bcaf-04d7-4934-a216-db581bfcb6d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{dc2102b8-4a5b-45bd-abda-62d0f58e44e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{f3c60666-3de1-4b52-b4ea-57d3fa562c60}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{70527ae1-6744-4dfc-a785-b039e4a07589}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="ARM\Debug\Test.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="ARM\Release\Test.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\Test.ice">
+      <Filter>Slice Files</Filter>
+    </SliceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/client/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/server/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E474F2DA-3C50-4717-9270-C23FD72A6CB7}</ProjectGuid>
+    <Keyword>DynamicLibrary</Keyword>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>Ice_scope_server</TargetName>
+    <GenerateManifest>true</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>Ice_scope_server</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>Ice_scope_server</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <TargetName>Ice_scope_server</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>Ice_scope_server</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <TargetName>Ice_scope_server</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <WindowsMetadataFile />
+      <TypeLibraryResourceID />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\Test.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Server.cpp" />
+    <ClCompile Include="ARM\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\TestI.h" />
+    <ClInclude Include="ARM\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="ARM\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Test.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Test.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Test.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Test.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Test.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Test.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{2180ae00-b21a-4538-93da-d7914b56e409}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{6c0c699c-1ae2-495c-ac4c-256f488a5a58}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{cb994208-915e-471d-80bc-c62f3819fe16}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{227d0e36-314a-4853-9462-b3358ee9d8b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{f2a7530c-678f-4510-a40c-3101ea0e109f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{e8a39cb9-3d0e-4ad7-bda2-a900e342ba7c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{a3230ce0-33f8-4975-ab98-65432dcd7b74}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{bd1a6c26-8a8a-4df5-8221-dd578156a6db}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{d9be87fd-3c0b-46ca-9a6b-8c4c629a878c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{9276df37-ce21-4b4f-a6f4-e6a4f52d2607}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{950c480d-61a1-44b3-9842-9db6fd5e2724}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{d021112d-55ad-48e8-a42c-dc8d35db8258}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{db9523a2-c5d2-440f-a3e7-93d313bc20c2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{0ebe110f-b58b-4fdc-ad9e-7ef66b79feca}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{11c70010-4ad1-44da-9849-4a4201711b57}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{522975b0-253a-4c99-bd71-10a75823e2d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{b16e1214-d7ec-4ef4-b217-3e26eb528505}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{343f0098-98b8-483d-8bb2-c5668e0d3a42}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{b172b94d-e0d6-4186-a64a-d2eeebe3442c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{23f4de9d-aa10-4b3c-a1ec-46fc0ec0c169}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{ba0ba96e-8dbf-4545-ac23-53dacf24a0ea}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\TestI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Test.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="ARM\Debug\Test.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Test.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Test.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="ARM\Release\Test.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Test.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\Test.ice">
+      <Filter>Slice Files</Filter>
+    </SliceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/scope/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/Server.cpp	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,324 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#include <Ice/Ice.h>
+#include <TestHelper.h>
+#include <Test.h>
+
+using namespace std;
+
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+class I1 : public Test::I
+{
+public:
+
+    virtual Test::S opS(ICE_IN(Test::S), Test::S&, const Ice::Current&);
+    virtual Test::SSeq opSSeq(ICE_IN(Test::SSeq), Test::SSeq&, const Ice::Current&);
+    virtual Test::SMap opSMap(ICE_IN(Test::SMap), Test::SMap&, const Ice::Current&);
+
+    virtual Test::CPtr opC(ICE_IN(Test::CPtr), Test::CPtr&, const Ice::Current&);
+    virtual Test::CSeq opCSeq(ICE_IN(Test::CSeq), Test::CSeq&, const Ice::Current&);
+    virtual Test::CMap opCMap(ICE_IN(Test::CMap), Test::CMap&, const Ice::Current&);
+
+    virtual void shutdown(const Ice::Current&);
+};
+
+class I2 : public Test::Inner::Inner2::I
+{
+public:
+
+    virtual Test::Inner::Inner2::S
+    opS(ICE_IN(Test::Inner::Inner2::S), Test::Inner::Inner2::S&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::SSeq
+    opSSeq(ICE_IN(Test::Inner::Inner2::SSeq), Test::Inner::Inner2::SSeq&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::SMap
+    opSMap(ICE_IN(Test::Inner::Inner2::SMap), Test::Inner::Inner2::SMap&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::CPtr
+    opC(ICE_IN(Test::Inner::Inner2::CPtr), Test::Inner::Inner2::CPtr&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::CSeq
+    opCSeq(ICE_IN(Test::Inner::Inner2::CSeq), Test::Inner::Inner2::CSeq&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::CMap
+    opCMap(ICE_IN(Test::Inner::Inner2::CMap), Test::Inner::Inner2::CMap&, const Ice::Current&);
+
+    virtual void shutdown(const Ice::Current&);
+};
+
+class I3 : public Test::Inner::I
+{
+public:
+
+    virtual Test::Inner::Inner2::S
+    opS(ICE_IN(Test::Inner::Inner2::S), Test::Inner::Inner2::S&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::SSeq
+    opSSeq(ICE_IN(Test::Inner::Inner2::SSeq), Test::Inner::Inner2::SSeq&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::SMap
+    opSMap(ICE_IN(Test::Inner::Inner2::SMap), Test::Inner::Inner2::SMap&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::CPtr
+    opC(ICE_IN(Test::Inner::Inner2::CPtr), Test::Inner::Inner2::CPtr&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::CSeq
+    opCSeq(ICE_IN(Test::Inner::Inner2::CSeq), Test::Inner::Inner2::CSeq&, const Ice::Current&);
+
+    virtual Test::Inner::Inner2::CMap
+    opCMap(ICE_IN(Test::Inner::Inner2::CMap), Test::Inner::Inner2::CMap&, const Ice::Current&);
+
+    virtual void shutdown(const Ice::Current&);
+};
+
+class I4 : public Inner::Test::Inner2::I
+{
+public:
+
+    virtual Test::S
+    opS(ICE_IN(Test::S), Test::S&, const Ice::Current&);
+
+    virtual Test::SSeq
+    opSSeq(ICE_IN(Test::SSeq), Test::SSeq&, const Ice::Current&);
+
+    virtual Test::SMap
+    opSMap(ICE_IN(Test::SMap), Test::SMap&, const Ice::Current&);
+
+    virtual Test::CPtr
+    opC(ICE_IN(Test::CPtr), Test::CPtr&, const Ice::Current&);
+
+    virtual Test::CSeq
+    opCSeq(ICE_IN(Test::CSeq), Test::CSeq&, const Ice::Current&);
+
+    virtual Test::CMap
+    opCMap(ICE_IN(Test::CMap), Test::CMap&, const Ice::Current&);
+
+    virtual void shutdown(const Ice::Current&);
+};
+
+//
+// I1 implementation
+//
+Test::S
+I1::opS(ICE_IN(Test::S) s1, Test::S& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::SSeq
+I1::opSSeq(ICE_IN(Test::SSeq) s1, Test::SSeq& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::SMap
+I1::opSMap(ICE_IN(Test::SMap) s1, Test::SMap& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::CPtr
+I1::opC(ICE_IN(Test::CPtr) c1, Test::CPtr& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+Test::CSeq
+I1::opCSeq(ICE_IN(Test::CSeq) c1, Test::CSeq& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+Test::CMap
+I1::opCMap(ICE_IN(Test::CMap) c1, Test::CMap& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+void
+I1::shutdown(const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+}
+
+//
+// I2 implementation
+//
+Test::Inner::Inner2::S
+I2::opS(ICE_IN(Test::Inner::Inner2::S) s1, Test::Inner::Inner2::S& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::Inner::Inner2::SSeq
+I2::opSSeq(ICE_IN(Test::Inner::Inner2::SSeq) s1, Test::Inner::Inner2::SSeq& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::Inner::Inner2::SMap
+I2::opSMap(ICE_IN(Test::Inner::Inner2::SMap) s1, Test::Inner::Inner2::SMap& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::Inner::Inner2::CPtr
+I2::opC(ICE_IN(Test::Inner::Inner2::CPtr) c1, Test::Inner::Inner2::CPtr& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+Test::Inner::Inner2::CSeq
+I2::opCSeq(ICE_IN(Test::Inner::Inner2::CSeq) c1, Test::Inner::Inner2::CSeq& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+Test::Inner::Inner2::CMap
+I2::opCMap(ICE_IN(Test::Inner::Inner2::CMap) c1, Test::Inner::Inner2::CMap& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+void
+I2::shutdown(const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+}
+
+//
+// I3 implementation
+//
+Test::Inner::Inner2::S
+I3::opS(ICE_IN(Test::Inner::Inner2::S) s1, Test::Inner::Inner2::S& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::Inner::Inner2::SSeq
+I3::opSSeq(ICE_IN(Test::Inner::Inner2::SSeq) s1, Test::Inner::Inner2::SSeq& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::Inner::Inner2::SMap
+I3::opSMap(ICE_IN(Test::Inner::Inner2::SMap) s1, Test::Inner::Inner2::SMap& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::Inner::Inner2::CPtr
+I3::opC(ICE_IN(Test::Inner::Inner2::CPtr) c1, Test::Inner::Inner2::CPtr& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+Test::Inner::Inner2::CSeq
+I3::opCSeq(ICE_IN(Test::Inner::Inner2::CSeq) c1, Test::Inner::Inner2::CSeq& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+Test::Inner::Inner2::CMap
+I3::opCMap(ICE_IN(Test::Inner::Inner2::CMap) c1, Test::Inner::Inner2::CMap& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+void
+I3::shutdown(const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+}
+
+//
+// I4 implementation
+//
+Test::S
+I4::opS(ICE_IN(Test::S) s1, Test::S& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::SSeq
+I4::opSSeq(ICE_IN(Test::SSeq) s1, Test::SSeq& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::SMap
+I4::opSMap(ICE_IN(Test::SMap) s1, Test::SMap& s2, const Ice::Current&)
+{
+    s2 = s1;
+    return s1;
+}
+
+Test::CPtr
+I4::opC(ICE_IN(Test::CPtr) c1, Test::CPtr& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+Test::CSeq
+I4::opCSeq(ICE_IN(Test::CSeq) c1, Test::CSeq& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+Test::CMap
+I4::opCMap(ICE_IN(Test::CMap) c1, Test::CMap& c2, const Ice::Current&)
+{
+    c2 = c1;
+    return c1;
+}
+
+void
+I4::shutdown(const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+}
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    adapter->add(ICE_MAKE_SHARED(I1), Ice::stringToIdentity("i1"));
+    adapter->add(ICE_MAKE_SHARED(I2), Ice::stringToIdentity("i2"));
+    adapter->add(ICE_MAKE_SHARED(I3), Ice::stringToIdentity("i3"));
+    adapter->add(ICE_MAKE_SHARED(I4), Ice::stringToIdentity("i4"));
+    adapter->activate();
+    serverReady();
+    communicator->waitForShutdown();
+}
+
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/scope/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,136 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq s1, out CSeq s2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1900 && _MSC_VER < 2000) && defined(NDEBUG) && defined(ICE_CPP11_MAPPING)
+//
 // Work-around for strange VS2017 15.5 optimizer bug, see ICE-8611
+//
+#if defined(_MSC_VER) && (_MSC_VER >= 1900 && _MSC_VER < 2000) && defined(NDEBUG) && defined(ICE_CPP11_MAPPING)
 #   pragma optimize("g", off)
 #endif
 
@@ -218,15 +215,18 @@
     }
 }
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1900 && _MSC_VER < 2000) && defined(NDEBUG) && defined(ICE_CPP11_MAPPING)
+//
 // See above
+//
+#if defined(_MSC_VER) && (_MSC_VER >= 1900 && _MSC_VER < 2000) && defined(NDEBUG) && defined(ICE_CPP11_MAPPING)
 #   pragma optimize("g", on)
 #endif
 
 TestIntfPrxPtr
-allTests(const CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    const string endp = getTestEndpoint(communicator, 0);
+    CommunicatorPtr communicator = helper->communicator();
+    const string endp = helper->getTestEndpoint();
     cout << "testing stringToProxy... " << flush;
     ObjectPrxPtr base = communicator->stringToProxy("asm:" + endp);
     test(base);
@@ -279,8 +279,7 @@
     obj = ICE_CHECKED_CAST(TestIntfPrx, base);
     try
     {
-        ICE_CHECKED_CAST(TestIntfPrx,
-                         communicator->stringToProxy("category/unknown:" + getTestEndpoint(communicator, 0)));
+        ICE_CHECKED_CAST(TestIntfPrx, communicator->stringToProxy("category/unknown:" + endp));
     }
     catch(const ObjectNotExistException&)
     {
@@ -294,8 +293,7 @@
     obj = ICE_CHECKED_CAST(TestIntfPrx, base);
     try
     {
-        ICE_CHECKED_CAST(TestIntfPrx,
-                         communicator->stringToProxy("anothercategory/unknown:" + getTestEndpoint(communicator, 0)));
+        ICE_CHECKED_CAST(TestIntfPrx, communicator->stringToProxy("anothercategory/unknown:" + endp));
     }
     catch(const ObjectNotExistException&)
     {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&);
-    TestIntfPrxPtr obj = allTests(communicator);
-    obj->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    TestIntfPrxPtr allTests(Test::TestHelper*);
+    TestIntfPrxPtr obj = allTests(this);
+    obj->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Collocated.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Collocated.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Collocated.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Collocated.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <Ice/Application.h>
 #include <ServantLocatorI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 using namespace Ice;
 
@@ -87,11 +79,19 @@
     }
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, ""), "");
@@ -99,28 +99,8 @@
     adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("asm"));
     adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation"));
 
-    Test::TestIntfPrxPtr allTests(const CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    Test::TestIntfPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Collocated)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = $(test-client-sources) ServantLocatorI.cpp
 $(test)_server_sources = $(test-server-sources) ServantLocatorI.cpp
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -345,14 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -344,14 +344,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -352,14 +352,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -273,16 +273,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -30,7 +30,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5B0C8615-BB38-41DE-A2B7-EC0835.0.442}</ProjectGuid>
+    <ProjectGuid>{5B0C8615-BB38-41DE-A2B7-EC0835000000}</ProjectGuid>
     <Keyword>DynamicLibrary</Keyword>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -275,16 +275,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -279,16 +279,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -286,16 +286,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/ServantLocatorI.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/ServantLocatorI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/ServantLocatorI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <ServantLocatorI.h>
 #ifdef ICE_AMD_TEST
@@ -13,7 +8,7 @@
 #else
 #   include <Test.h>
 #endif
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #include <stdexcept>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/ServantLocatorI.h zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/ServantLocatorI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/ServantLocatorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/ServantLocatorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SERVANT_LOCATOR_I_H
 #define SERVANT_LOCATOR_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <Ice/Application.h>
 #include <ServantLocatorI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 
-DEFINE_TEST("serveramd")
-
 using namespace std;
 using namespace Ice;
 
@@ -86,10 +78,18 @@
     }
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerAMD::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -99,28 +99,8 @@
     adapter->add(ICE_MAKE_SHARED(TestAMDI), Ice::stringToIdentity("asm"));
     adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     adapter->waitForDeactivate();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <Ice/Application.h>
 #include <ServantLocatorI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 using namespace Ice;
 
@@ -87,10 +79,18 @@
     }
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -100,28 +100,8 @@
     adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("asm"));
     adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     adapter->waitForDeactivate();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
@@ -142,7 +137,7 @@
 }
 
 void
-TestAMDI::asyncExceptionAsync(function<void()> response,
+TestAMDI::asyncExceptionAsync(function<void()>,
                               function<void(exception_ptr)> error,
                               const Current&)
 {
@@ -159,7 +154,7 @@
 
 void
 TestAMDI::shutdownAsync(function<void()> response,
-                        function<void(exception_ptr)> error,
+                        function<void(exception_ptr)>,
                         const Current& current)
 {
     current.adapter->deactivate();
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TESTAMD_I_H
 #define TESTAMD_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/servantLocator/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/servantLocator/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/services/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/services/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/Glacier2.h>
 #include <IceStorm/IceStorm.h>
 #include <IceGrid/IceGrid.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -55,12 +50,12 @@
     }
 
     virtual void
-    connectFailed(const Glacier2::SessionHelperPtr&, const Ice::Exception& ex)
+    connectFailed(const Glacier2::SessionHelperPtr&, const Ice::Exception&)
     {
     }
 
     virtual void
-    createdCommunicator(const Glacier2::SessionHelperPtr& session)
+    createdCommunicator(const Glacier2::SessionHelperPtr&)
     {
     }
 };
@@ -69,7 +64,7 @@
 {
 public:
 
-    int run(int argc, char* argv[])
+    int run(int, char*[])
     {
         _factory = ICE_MAKE_SHARED(Glacier2::SessionFactoryHelper, ICE_MAKE_SHARED(SessionCallbackI));
         return EXIT_SUCCESS;
@@ -85,8 +80,9 @@
 } // Anonymous namespace end
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     {
         cout << "Testing Glacier2 stub... " << flush;
         char** argv = 0;
@@ -143,7 +139,7 @@
     {
         cout << "Testing IceGrid stub... " << flush;
 
-        Ice::ObjectPrxPtr base = communicator->stringToProxy("test:" + getTestEndpoint(communicator, 0));
+        Ice::ObjectPrxPtr base = communicator->stringToProxy("test:" + helper->getTestEndpoint());
         IceGrid::RegistryPrxPtr registry = ICE_UNCHECKED_CAST(IceGrid::RegistryPrx, base);
         IceGrid::AdminSessionPrxPtr session;
         IceGrid::AdminPrxPtr admin;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/services/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/services/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-DEFINE_TEST("client")
-
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.NullHandleAbort", "0");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator(), initData);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.NullHandleAbort", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/services/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/services/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-$(test)_dependencies = Glacier2 IceStorm IceGrid Ice TestCommon
+$(test)_dependencies = Glacier2 IceStorm IceGrid TestCommon IceSSL Ice
 
 tests += $(test)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -349,14 +349,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/services/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/services/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/services/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/services/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/services/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <ClientPrivate.h>
 
 using namespace std;
@@ -369,9 +364,10 @@
 };
 
 TestIntfPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    Ice::ObjectPrxPtr obj = communicator->stringToProxy("Test:" + getTestEndpoint(communicator, 0));
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    Ice::ObjectPrxPtr obj = communicator->stringToProxy("Test:" + helper->getTestEndpoint());
     TestIntfPrxPtr test = ICE_CHECKED_CAST(TestIntfPrx, obj);
 
     cout << "base... " << flush;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-DEFINE_TEST("client")
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Client::run(int argc, char** argv)
 {
-    TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&);
-    TestIntfPrxPtr Test = allTests(communicator);
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    TestIntfPrxPtr allTests(Test::TestHelper*);
+    TestIntfPrxPtr Test = allTests(this);
     Test->shutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_sliceflags              := -I$(test)
 $(test)_client_sources          = $(test-client-sources) ClientPrivate.ice
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -464,14 +464,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -505,14 +505,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -505,14 +505,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -370,16 +370,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -376,16 +376,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -377,16 +377,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-DEFINE_TEST("serveramd")
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+ServerAMD::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("Test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-DEFINE_TEST("server")
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("Test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return  run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestAMDI.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace Test;
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TESTAMDI_H
 #define TESTAMDI_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestI.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace Test;
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/exceptions/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/exceptions/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TESTI_H
 #define TESTI_H
 
 #include <ServerPrivate.h>
-#include <TestCommon.h>
 
 class TestI : public virtual Test::TestIntf
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <ClientPrivate.h>
 
 using namespace std;
@@ -754,9 +749,10 @@
 }
 
 TestIntfPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    Ice::ObjectPrxPtr obj = communicator->stringToProxy("Test:" + getTestEndpoint(communicator, 0));
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    Ice::ObjectPrxPtr obj = communicator->stringToProxy("Test:" + helper->getTestEndpoint());
     TestIntfPrxPtr test = ICE_CHECKED_CAST(TestIntfPrx, obj);
 
     cout << "base as Object... " << flush;
@@ -3136,8 +3132,7 @@
         //
         // Sending more than 254 objects exercises the encoding for object ids.
         //
-        int i;
-        for(i = 0; i < 300; ++i)
+        for(int i = 0; i < 300; ++i)
         {
             PCDerived2Ptr p2 = ICE_MAKE_SHARED(PCDerived2);
             p2->pi = i;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <ClientPrivate.h>
 
 using namespace std;
 using namespace Test;
 
-DEFINE_TEST("client")
-
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&);
-    TestIntfPrxPtr Test = allTests(communicator);
-    Test->shutdown();
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        //
-        // For this test, we enable object collection.
-        //
-        initData.properties->setProperty("Ice.CollectObjects", "1");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    //
+    // For this test, we enable object collection.
+    //
+    properties->setProperty("Ice.CollectObjects", "1");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    TestIntfPrxPtr allTests(Test::TestHelper*);
+    TestIntfPrxPtr prx = allTests(this);
+    prx->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_sliceflags              := -I$(test)
 $(test)_client_sources          = $(test-client-sources) ClientPrivate.ice
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -464,14 +464,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -505,14 +505,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -505,14 +505,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -370,16 +370,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -376,16 +376,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -377,16 +377,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ServerAMD.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ServerAMD.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ServerAMD.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ServerAMD.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestAMDI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-DEFINE_TEST("serveramd")
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+ServerAMD::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = communicator->getProperties();
-    properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000");
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+#ifndef ICE_CPP11_MAPPING
+    properties->setProperty("Ice.CollectObjects", "1");
+#endif
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI);
     adapter->add(object, Ice::stringToIdentity("Test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-#ifndef ICE_CPP11_MAPPING
-        initData.properties->setProperty("Ice.CollectObjects", "1");
-#endif
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(ServerAMD)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-DEFINE_TEST("server")
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = communicator->getProperties();
-    properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 2000");
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+#ifndef ICE_CPP11_MAPPING
+    properties->setProperty("Ice.CollectObjects", "1");
+#endif
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 2000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI);
     adapter->add(object, Ice::stringToIdentity("Test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-#ifndef ICE_CPP11_MAPPING
-        initData.properties->setProperty("Ice.CollectObjects", "1");
-#endif
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ServerPrivate.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ServerPrivate.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestAMD.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestAMD.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestAMDI.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestAMDI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestAMDI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestAMDI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestAMDI.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace Test;
 using namespace std;
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestAMDI.h zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestAMDI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestAMDI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestAMDI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TESTI_H
 #define TESTI_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestI.h>
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace Test;
 using namespace std;
@@ -441,15 +436,21 @@
     return p1;
 }
 
+#ifdef ICE_CPP11_MAPPING
 BPtr
 TestI::returnTest3(ICE_IN(BPtr) p1, ICE_IN(BPtr) p2, const ::Ice::Current&)
 {
-#ifdef ICE_CPP11_MAPPING
     _values.push_back(p1);
     _values.push_back(p2);
-#endif
     return p1;
 }
+#else
+BPtr
+TestI::returnTest3(ICE_IN(BPtr) p1, ICE_IN(BPtr), const ::Ice::Current&)
+{
+    return p1;
+}
+#endif
 
 SS3
 TestI::sequenceTest(ICE_IN(SS1Ptr) p1, ICE_IN(SS2Ptr) p2, const ::Ice::Current&)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/slicing/objects/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/slicing/objects/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TESTI_H
 #define TESTI_H
 
 #include <ServerPrivate.h>
-#include <TestCommon.h>
 
 class TestI : public virtual Test::TestIntf
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stream/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/stream/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/stream/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stream/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+
+#ifdef _MSC_VER
+#   pragma warning(disable:4244) // '=': conversion from 'int' to 'Ice::Short', possible loss of data
+#endif
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 using namespace Test::Sub;
@@ -85,22 +82,22 @@
 template<class S>
 struct StreamWriter<TestObjectWriter, S>
 {
-    static void write(S* ostr, const TestObjectWriter&) { assert(false); }
+    static void write(S*, const TestObjectWriter&) { assert(false); }
 };
 template<class S>
 struct StreamReader<TestObjectWriter, S>
 {
-    static void read(S* istr, TestObjectWriter&) { assert(false); }
+    static void read(S*, TestObjectWriter&) { assert(false); }
 };
 template<class S>
 struct StreamWriter<TestObjectReader, S>
 {
-    static void write(S* ostr, const TestObjectReader&) { assert(false); }
+    static void write(S*, const TestObjectReader&) { assert(false); }
 };
 template<class S>
 struct StreamReader<TestObjectReader, S>
 {
-    static void read(S* istr, TestObjectReader&) { assert(false); }
+    static void read(S*, TestObjectReader&) { assert(false); }
 };
 }
 #endif
@@ -227,9 +224,10 @@
 };
 #endif
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
 #ifdef ICE_CPP11_MAPPING
     MyClassFactoryWrapper factoryWrapper;
     function<Ice::ValuePtr(const string&)> f =
@@ -901,8 +899,8 @@
         test(arr2S[2].size() == arrS[2].size());
 
 #ifdef ICE_CPP11_MAPPING
-        auto clearS = [](MyClassS& arr) {
-            for(MyClassS::iterator p = arr.begin(); p != arr.end(); ++p)
+        auto clearS = [](MyClassS& arr3) {
+            for(MyClassS::iterator p = arr3.begin(); p != arr3.end(); ++p)
             {
                 if(*p)
                 {
@@ -912,8 +910,8 @@
                 }
             }
         };
-        auto clearSS = [clearS](MyClassSS& arr) {
-            for(MyClassSS::iterator p = arr.begin(); p != arr.end(); ++p)
+        auto clearSS = [clearS](MyClassSS& arr3) {
+            for(MyClassSS::iterator p = arr3.begin(); p != arr3.end(); ++p)
             {
                 clearS(*p);
             }
@@ -1334,36 +1332,21 @@
     }
 
     cout << "ok" << endl;
-    return 0;
 }
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
+public:
 
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -324,14 +324,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -264,16 +264,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/uwp/packages.config zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/uwp/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/stream/msbuild/uwp/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stream/msbuild/uwp/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stream/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/stream/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/stream/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stream/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 #include <iostream>
 #include <locale.h>
 
-DEFINE_TEST("client")
+#ifdef _MSC_VER
+#   pragma warning(disable:4127) // conditional expression is constant
+#   pragma warning(disable:4310) // cast truncates constant value
+#endif
 
 using namespace std;
 
 static bool useLocale = false;
 static bool useIconv = true;
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
 #ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
     Ice::registerIceStringConverter(false);
 #endif
 
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-
     string narrowEncoding;
     string wideEncoding;
 
@@ -109,10 +111,9 @@
 
 #endif
 
-        Ice::CommunicatorPtr communicator = Ice::initialize(initData);
+        Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
         Test::MyObjectPrxPtr proxy =
-            ICE_UNCHECKED_CAST(Test::MyObjectPrx,
-                               communicator->stringToProxy("test:" + getTestEndpoint(communicator, 0)));
+            ICE_UNCHECKED_CAST(Test::MyObjectPrx, communicator->stringToProxy("test:" + getTestEndpoint()));
 
         char oe = char(0xBD); // A single character in ISO Latin 9
         string msg = string("tu me fends le c") + oe + "ur!";
@@ -145,7 +146,6 @@
         test(identStr == "cat/tu me fends le c\\305\\223ur!");
         test(Ice::stringToIdentity(identStr) == ident);
 
-        communicator->destroy();
         cout << "ok" << endl;
     }
 
@@ -159,12 +159,11 @@
     }
     propValue += " windows=28605";
 
-    initData.properties->setProperty("Ice.Plugin.IceStringConverter", propValue);
+    properties->setProperty("Ice.Plugin.IceStringConverter", propValue);
 
-    Ice::CommunicatorPtr communicator = Ice::initialize(initData);
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     Test::MyObjectPrxPtr proxy =
-        ICE_UNCHECKED_CAST(Test::MyObjectPrx,
-                           communicator->stringToProxy("test:" + getTestEndpoint(communicator, 0)));
+        ICE_UNCHECKED_CAST(Test::MyObjectPrx, communicator->stringToProxy("test:" + getTestEndpoint()));
 
     char oe = char(0xBD); // A single character in ISO Latin 9
     string msg = string("tu me fends le c") + oe + "ur!";
@@ -184,7 +183,6 @@
     cout << "ok" << endl;
 
     proxy->shutdown();
-    communicator->destroy();
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client);
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_ldflags      = $(iconv_ldflags)
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -300,14 +300,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -340,14 +340,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -234,16 +234,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -269,16 +269,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("server");
-
 using namespace std;
 
 //
@@ -40,47 +33,23 @@
     }
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyObjectI), Ice::stringToIdentity("test"));
     adapter->activate();
-
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/stringConverter/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/stringConverter/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/Locator.h>
 #include <Ice/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
 Test::PriorityPrxPtr
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing server priority... " << flush;
-    string ref = "test:" + getTestEndpoint(communicator, 0) + " -t 10000";
+    string ref = "test:" + helper->getTestEndpoint() + " -t 10000";
     Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    Test::PriorityPrxPtr allTests(const Ice::CommunicatorPtr&);
-    Test::PriorityPrxPtr priority = allTests(communicator);
-
-    priority->shutdown();
+public:
 
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Test::PriorityPrxPtr allTests(Test::TestHelper*);
+    Test::PriorityPrxPtr priority = allTests(this);
 
-    return status;
+    priority->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs := client server servercustom
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     Ice::PropertiesPtr properties = communicator->getProperties();
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 10000");
 
     //
     // First try to use an invalid priority.
@@ -51,36 +54,6 @@
     adapter->add(object, Ice::stringToIdentity("test"));
     adapter->activate();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class ServerCustomThreadPool : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+ServerCustomThreadPool::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     Ice::PropertiesPtr properties = communicator->getProperties();
     properties->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0) + " -t 10000");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 10000");
     communicator->getProperties()->setProperty("TestAdapter.ThreadPool.Size", "1");
 
     //
@@ -55,36 +58,6 @@
     adapter->add(object, Ice::stringToIdentity("test"));
     adapter->activate();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(ServerCustomThreadPool)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/test.py zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/test.py
--- zeroc-ice-3.7.1/cpp/test/Ice/threadPoolPriority/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/threadPoolPriority/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 if not isinstance(platform, Darwin) and (isinstance(platform, Windows) or os.getuid() == 0):
     TestSuite(__file__, [
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/timeout/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <TestI.h>
 
@@ -111,9 +106,10 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
-    string sref = "timeout:" + getTestEndpoint(communicator, 0);
+    Ice::CommunicatorPtr communicator = helper->communicator();
+    string sref = "timeout:" + helper->getTestEndpoint();
     Ice::ObjectPrxPtr obj = communicator->stringToProxy(sref);
     test(obj);
 
@@ -121,7 +117,7 @@
     test(timeout);
 
     ControllerPrxPtr controller =
-        ICE_CHECKED_CAST(ControllerPrx, communicator->stringToProxy("controller:" + getTestEndpoint(communicator, 1)));
+        ICE_CHECKED_CAST(ControllerPrx, communicator->stringToProxy("controller:" + helper->getTestEndpoint(1)));
     test(controller);
 
     cout << "testing connect timeout... " << flush;
@@ -147,7 +143,7 @@
         //
         // Expect success.
         //
-        TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_timeout(2000));
+        TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_timeout(-1));
         controller->holdAdapter(100);
         try
         {
@@ -191,8 +187,8 @@
         controller->holdAdapter(100);
         try
         {
-            ByteSeq seq(1000000);
-            to->sendData(seq);
+            ByteSeq seq2(1000000);
+            to->sendData(seq2);
         }
         catch(const Ice::TimeoutException&)
         {
@@ -471,7 +467,7 @@
         controller->holdAdapter(-1);
         IceUtil::Time now = IceUtil::Time::now();
         ich.release()->destroy();
-        test(IceUtil::Time::now() - now < IceUtil::Time::milliSeconds(700));
+        test(IceUtil::Time::now() - now < IceUtil::Time::milliSeconds(1000));
         controller->resumeAdapter();
         timeout->op(); // Ensure adapter is active.
     }
@@ -484,7 +480,7 @@
         Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TimeoutCollocated");
         adapter->activate();
 
-        TimeoutPrxPtr timeout = ICE_UNCHECKED_CAST(TimeoutPrx, adapter->addWithUUID(ICE_MAKE_SHARED(TimeoutI)));
+        timeout = ICE_UNCHECKED_CAST(TimeoutPrx, adapter->addWithUUID(ICE_MAKE_SHARED(TimeoutI)));
         timeout = timeout->ice_invocationTimeout(100);
         try
         {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/timeout/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,71 +1,54 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
+
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
 
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-
-        //
-        // For this test, we want to disable retries.
-        //
-        initData.properties->setProperty("Ice.RetryIntervals", "-1");
+    //
+    // For this test, we want to disable retries.
+    //
+    properties->setProperty("Ice.RetryIntervals", "-1");
 
 #if TARGET_OS_IPHONE != 0
-        //
-        // COMPILERFIX: Disable connect timeout introduced for
-        // workaround to iOS device hangs when using SSL
-        //
-        initData.properties->setProperty("Ice.Override.ConnectTimeout", "");
+    //
+    // COMPILERFIX: Disable connect timeout introduced for
+    // workaround to iOS device hangs when using SSL
+    //
+    properties->setProperty("Ice.Override.ConnectTimeout", "");
 #endif
 
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties->setProperty("Ice.TCP.SndSize", "50000");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    properties->setProperty("Ice.Warn.Connections", "0");
+
+    //
+    // Limit the send buffer size, this test relies on the socket
+    // send() blocking after sending a given amount of data.
+    //
+    properties->setProperty("Ice.TCP.SndSize", "50000");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/Makefile.mk zeroc-ice-3.7.2/cpp/test/Ice/timeout/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources = $(test-client-sources) TestI.cpp
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -343,14 +343,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -266,16 +266,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/timeout/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,54 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
-    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1));
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+
+#if TARGET_OS_IPHONE != 0
+    //
+    // COMPILERFIX: Disable connect timeout introduced for
+    // workaround to iOS device hangs when using SSL
+    //
+    properties->setProperty("Ice.Override.ConnectTimeout", "");
+#endif
+
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    properties->setProperty("Ice.Warn.Connections", "0");
+
+    //
+    // The client sends large messages to cause the transport
+    // buffers to fill up.
+    //
+    properties->setProperty("Ice.MessageSizeMax", "20000");
+
+    //
+    // Limit the recv buffer size, this test relies on the socket
+    // send() blocking after sending a given amount of data.
+    //
+    properties->setProperty("Ice.TCP.RcvSize", "50000");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
+    communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
     communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -30,55 +59,8 @@
     controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller"));
     controllerAdapter->activate();
 
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-
-#if TARGET_OS_IPHONE != 0
-        //
-        // COMPILERFIX: Disable connect timeout introduced for
-        // workaround to iOS device hangs when using SSL
-        //
-        initData.properties->setProperty("Ice.Override.ConnectTimeout", "");
-#endif
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        //
-        // The client sends large messages to cause the transport
-        // buffers to fill up.
-        //
-        initData.properties->setProperty("Ice.MessageSizeMax", "20000");
-
-        //
-        // Limit the recv buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties->setProperty("Ice.TCP.RcvSize", "50000");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/timeout/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <TestI.h>
 #include <Ice/Ice.h>
@@ -47,7 +42,7 @@
 }
 
 void
-TimeoutI::sleep(Ice::Int to, const Ice::Current& c)
+TimeoutI::sleep(Ice::Int to, const Ice::Current&)
 {
     IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(to));
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/timeout/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/timeout/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/timeout/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/timeout/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class TimeoutI : public virtual Test::Timeout
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/AllTests.cpp zeroc-ice-3.7.2/cpp/test/Ice/udp/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -60,8 +55,9 @@
 ICE_DEFINE_PTR(PingReplyIPtr, PingReplyI);
 
 void
-allTests(const CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     communicator->getProperties()->setProperty("ReplyAdapter.Endpoints", "udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ReplyAdapter");
     PingReplyIPtr replyI = ICE_MAKE_SHARED(PingReplyI);
@@ -69,11 +65,11 @@
     adapter->activate();
 
     cout << "testing udp... " << flush;
-    ObjectPrxPtr base = communicator->stringToProxy("test -d:" + getTestEndpoint(communicator, 0, "udp"));
+    ObjectPrxPtr base = communicator->stringToProxy("test -d:" + helper->getTestEndpoint("udp"));
     TestIntfPrxPtr obj = ICE_UNCHECKED_CAST(TestIntfPrx, base);
 
     int nRetry = 5;
-    bool ret;
+    bool ret = false;
     while(nRetry-- > 0)
     {
         replyI->reset();
@@ -137,14 +133,14 @@
     ostringstream endpoint;
     if(communicator->getProperties()->getProperty("Ice.IPv6") == "1")
     {
-        endpoint << "udp -h \"ff15::1:1\" -p " << getTestPort(communicator->getProperties(), 10);
+        endpoint << "udp -h \"ff15::1:1\" -p " << helper->getTestPort(10);
 #if defined(__APPLE__) || defined(_WIN32)
         endpoint << " --interface \"::1\""; // Use loopback to prevent other machines to answer. the multicast requests.
 #endif
     }
     else
     {
-        endpoint << "udp -h 239.255.1.1 -p " << getTestPort(communicator->getProperties(), 10);
+        endpoint << "udp -h 239.255.1.1 -p " << helper->getTestPort(10);
 #if defined(__APPLE__) || defined(_WIN32)
         endpoint << " --interface 127.0.0.1"; // Use loopback to prevent other machines to answer.
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/Client.cpp zeroc-ice-3.7.2/cpp/test/Ice/udp/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,59 +1,40 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.UDP.RcvSize", "16384");
+    properties->setProperty("Ice.UDP.SndSize", "16384");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 
     int num = argc == 2 ? atoi(argv[1]) : 1;
     for(int i = 0; i < num; i++)
     {
         ostringstream os;
-        os << "control:" << getTestEndpoint(communicator, i, "tcp");
+        os << "control:" << getTestEndpoint(i, "tcp");
         ICE_UNCHECKED_CAST(TestIntfPrx, communicator->stringToProxy(os.str()))->shutdown();
     }
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.UDP.RcvSize", "16384");
-        initData.properties->setProperty("Ice.UDP.SndSize", "16384");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -265,15 +265,15 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/server/packages.config zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -271,16 +271,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/Server.cpp zeroc-ice-3.7.2/cpp/test/Ice/udp/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,88 +1,68 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = communicator->getProperties();
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    properties->setProperty("Ice.UDP.SndSize", "16384");
+    properties->setProperty("Ice.UDP.RcvSize", "16384");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
     int num = argc == 2 ? atoi(argv[1]) : 0;
 
-    properties->setProperty("ControlAdapter.Endpoints", getTestEndpoint(communicator, num, "tcp"));
+    communicator->getProperties()->setProperty("ControlAdapter.Endpoints", getTestEndpoint(num, "tcp"));
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ControlAdapter");
     adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("control"));
     adapter->activate();
 
     if(num == 0)
     {
-        properties->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, num, "udp"));
+        communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(num, "udp"));
         Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter");
         adapter2->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test"));
         adapter2->activate();
     }
 
     ostringstream endpoint;
-    if(properties->getProperty("Ice.IPv6") == "1")
+    if(communicator->getProperties()->getProperty("Ice.IPv6") == "1")
     {
-        endpoint << "udp -h \"ff15::1:1\" -p " << getTestPort(properties, 10);
+        endpoint << "udp -h \"ff15::1:1\" -p " << getTestPort(10);
 #if defined(__APPLE__) || defined(_WIN32)
         endpoint << " --interface \"::1\""; // Use loopback to prevent other machines to answer.
 #endif
     }
     else
     {
-        endpoint << "udp -h 239.255.1.1 -p " << getTestPort(properties, 10);
+        endpoint << "udp -h 239.255.1.1 -p " << getTestPort(10);
 #if defined(__APPLE__) || defined(_WIN32)
         endpoint << " --interface 127.0.0.1"; // Use loopback to prevent other machines to answer.
 #endif
     }
-    properties->setProperty("McastTestAdapter.Endpoints", endpoint.str());
+    communicator->getProperties()->setProperty("McastTestAdapter.Endpoints", endpoint.str());
     Ice::ObjectAdapterPtr mcastAdapter = communicator->createObjectAdapter("McastTestAdapter");
     mcastAdapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("test"));
     mcastAdapter->activate();
 
-    TEST_READY
+    serverReady();
 
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceUDP(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.UDP.SndSize", "16384");
-        initData.properties->setProperty("Ice.UDP.RcvSize", "16384");
-
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/Test.ice zeroc-ice-3.7.2/cpp/test/Ice/udp/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/TestI.cpp zeroc-ice-3.7.2/cpp/test/Ice/udp/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/Ice/udp/TestI.h zeroc-ice-3.7.2/cpp/test/Ice/udp/TestI.h
--- zeroc-ice-3.7.1/cpp/test/Ice/udp/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Ice/udp/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class TestIntfI : public Test::TestIntf
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceBox/admin/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     string ref = "DemoIceBox/admin:default -p 9996 -t 10000";
     Ice::ObjectPrxPtr admin = communicator->stringToProxy(ref);
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/Client.cpp zeroc-ice-3.7.2/cpp/test/IceBox/admin/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& comm)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(comm);
-
-    //
-    // Shutdown the IceBox server.
-    //
-    ICE_UNCHECKED_CAST(Ice::ProcessPrx, comm->stringToProxy("DemoIceBox/admin -f Process:default -p 9996"))->shutdown();
+public:
 
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-    int status;
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
 
-    Ice::CommunicatorPtr communicator;
+    void allTests(Test::TestHelper*);
+    allTests(this);
 
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Default.Host", "127.0.0.1");
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
+    //
+    // Shutdown the IceBox server.
+    //
+    ICE_UNCHECKED_CAST(Ice::ProcessPrx,
+                       communicator->stringToProxy("DemoIceBox/admin -f Process:default -p 9996"))->shutdown();
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceBox/admin/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries := $(test)_TestService
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/testservice/packages.config zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/testservice/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/testservice/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/testservice/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -263,10 +263,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -366,14 +366,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/Service.cpp zeroc-ice-3.7.2/cpp/test/IceBox/admin/Service.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/Test.ice zeroc-ice-3.7.2/cpp/test/IceBox/admin/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceBox/admin/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/admin/TestI.h zeroc-ice-3.7.2/cpp/test/IceBox/admin/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceBox/admin/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/admin/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceBox/configuration/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
 void
-allTests(const Ice::CommunicatorPtr& com)
+allTests(Test::TestHelper* helper)
 {
-    TestIntfPrxPtr service1 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + getTestEndpoint(com, 0)));
-    TestIntfPrxPtr service2 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + getTestEndpoint(com, 1)));
-    TestIntfPrxPtr service3 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + getTestEndpoint(com, 2)));
-    TestIntfPrxPtr service4 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + getTestEndpoint(com, 3)));
+    Ice::CommunicatorPtr com = helper->communicator();
+    TestIntfPrxPtr service1 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + helper->getTestEndpoint(0)));
+    TestIntfPrxPtr service2 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + helper->getTestEndpoint(1)));
+    TestIntfPrxPtr service3 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + helper->getTestEndpoint(2)));
+    TestIntfPrxPtr service4 = ICE_UNCHECKED_CAST(TestIntfPrx, com->stringToProxy("test:" + helper->getTestEndpoint(3)));
 
     if(service1->getProperty("IceBox.InheritProperties") == "")
     {
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Client.cpp zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& comm)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(comm);
+public:
+
+    void run(int, char**);
+};
 
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
     //
     // Shutdown the IceBox server.
     //
-    ICE_UNCHECKED_CAST(Ice::ProcessPrx, comm->stringToProxy("DemoIceBox/admin -f Process:default -p 9996"))->shutdown();
-
-    return EXIT_SUCCESS;
+    ICE_UNCHECKED_CAST(Ice::ProcessPrx,
+                       communicator->stringToProxy("DemoIceBox/admin -f Process:default -p 9996"))->shutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Default.Host", "127.0.0.1");
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries := $(test)_TestService
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/testservice/packages.config zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/testservice/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/testservice/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/testservice/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -263,10 +263,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -366,14 +366,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Service.cpp zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Service.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Test.ice zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceBox/configuration/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBox/configuration/TestI.h zeroc-ice-3.7.2/cpp/test/IceBox/configuration/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceBox/configuration/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBox/configuration/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceBridge/simple/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -83,13 +78,14 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing connection to bridge... " << flush;
-    Ice::ObjectPrx base = communicator->stringToProxy("test:" + getTestEndpoint(communicator, 1) + ":" +
-                                                         getTestEndpoint(communicator, 1, "udp"));
-    test(base);
-    Test::MyClassPrx cl = Ice::checkedCast<Test::MyClassPrx>(base);
+    Ice::ObjectPrx prx = communicator->stringToProxy("test:" + helper->getTestEndpoint(1) + ":" +
+                                                      helper->getTestEndpoint(1, "udp"));
+    test(prx);
+    Test::MyClassPrx cl = Ice::checkedCast<Test::MyClassPrx>(prx);
     cl->ice_ping();
     cout << "ok" << endl;
 
@@ -132,7 +128,7 @@
                 // The bridge forwards the CloseConnectionException from the server as an
                 // UnknownLocalException. It eventually closes the connection when notified
                 // of the connection close.
-                test(ex.unknown.find("CloseConnectionException") >= 0);
+                test(ex.unknown.find("CloseConnectionException") != string::npos);
             }
             IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1));
         }
@@ -237,7 +233,7 @@
 
     cout << "testing router... " << flush;
     {
-        Ice::ObjectPrx base = communicator->stringToProxy("Ice/RouterFinder:" + getTestEndpoint(communicator, 1));
+        Ice::ObjectPrx base = communicator->stringToProxy("Ice/RouterFinder:" + helper->getTestEndpoint(1));
         Ice::RouterFinderPrx finder = Ice::checkedCast<Ice::RouterFinderPrx>(base);
         Ice::RouterPrx router = finder->getRouter();
         base = communicator->stringToProxy("test")->ice_router(router);
@@ -272,7 +268,7 @@
     cout << "ok" << endl;
 
     cout << "testing bridge shutdown... " << flush;
-    Ice::ObjectPrx admin = communicator->stringToProxy("IceBridge/admin:" + getTestEndpoint(communicator, 2, "tcp"));
+    Ice::ObjectPrx admin = communicator->stringToProxy("IceBridge/admin:" + helper->getTestEndpoint(2, "tcp"));
     Ice::ProcessPrx process = Ice::checkedCast<Ice::ProcessPrx>(admin->ice_facet("Process"));
     process->shutdown();
     cout << "ok" << endl;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/Client.cpp zeroc-ice-3.7.2/cpp/test/IceBridge/simple/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
+    void run(int argc, char** argv);
+};
+
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#   ifdef ICE_HAS_BT
-    Ice::registerIceBT(false);
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.RetryIntervals", "-1");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.RetryIntervals", "-1");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -301,14 +301,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -345,14 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/Server.cpp zeroc-ice-3.7.2/cpp/test/IceBridge/simple/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Dispatch", "0");
+
+    // Make sure requests are serialized, this is required for the ordering test.
+    properties->setProperty("Ice.ThreadPool.Server.Serialize", "1");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
     communicator->getProperties()->setProperty("TestAdapter.Endpoints",
-                                               getTestEndpoint(communicator, 0) + ":" +
-                                               getTestEndpoint(communicator, 0, "udp"));
+                                               getTestEndpoint() + ":" +
+                                               getTestEndpoint("udp"));
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(MyClassI), Ice::stringToIdentity("test"));
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-
-        // Make sure requests are serialized, this is required for the ordering test.
-        initData.properties->setProperty("Ice.ThreadPool.Server.Serialize", "1");
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/Test.ice zeroc-ice-3.7.2/cpp/test/IceBridge/simple/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceBridge/simple/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Test;
@@ -146,7 +141,7 @@
 }
 
 void
-MyClassI::waitCounter(int value, const Ice::Current& c)
+MyClassI::waitCounter(int value, const Ice::Current&)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
     while(_counter != value)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/TestI.h zeroc-ice-3.7.2/cpp/test/IceBridge/simple/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceBridge/simple/test.py zeroc-ice-3.7.2/cpp/test/IceBridge/simple/test.py
--- zeroc-ice-3.7.1/cpp/test/IceBridge/simple/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceBridge/simple/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__file__, [ClientServerTestCase(servers=[IceBridge(), Server()])])
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -16,8 +11,9 @@
 using namespace Test;
 
 void
-allTests(const CommunicatorPtr& communicator, int num)
+allTests(Test::TestHelper* helper, int num)
 {
+    CommunicatorPtr communicator = helper->communicator();
     vector<ControllerPrxPtr> proxies;
     vector<ControllerPrxPtr> indirectProxies;
     for(int i = 0; i < num; ++i)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Client.cpp zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,62 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
-DEFINE_TEST("client")
-
 using namespace std;
 using namespace Test;
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    int num = argc == 2 ? atoi(argv[1]) : 1;
+public:
 
-    void allTests(const Ice::CommunicatorPtr&, int);
-    allTests(communicator, num);
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL();
-    Ice::registerIceWS();
-#endif
     //
     // Explicitly register the IceDiscovery plugin to test registerIceDiscovery.
     //
     Ice::registerIceDiscovery();
 
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    int num = argc == 2 ? atoi(argv[1]) : 1;
 
-    return status;
+    void allTests(Test::TestHelper*, int);
+    allTests(this, num);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-$(test)_dependencies = IceDiscovery Ice TestCommon
+$(test)_dependencies = IceDiscovery TestCommon IceSSL Ice
 
 tests += $(test)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -325,14 +325,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -350,14 +350,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Server.cpp zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+#ifdef ICE_STATIC_LIBS
+    Ice::registerIceDiscovery();
+#endif
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     Ice::PropertiesPtr properties = communicator->getProperties();
 
     int num = argc == 2 ? atoi(argv[1]) : 0;
 
-    {
-        ostringstream os;
-        os << getTestEndpoint(communicator, num);
-        properties->setProperty("ControlAdapter.Endpoints", os.str());
-    }
+    properties->setProperty("ControlAdapter.Endpoints", getTestEndpoint(num));
+
     {
         ostringstream os;
         os << "control" << num;
@@ -41,40 +43,9 @@
     }
     adapter->activate();
 
-    TEST_READY
+    serverReady();
 
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL();
-    Ice::registerIceWS();
-    Ice::registerIceDiscovery();
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Test.ice zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
@@ -36,7 +31,7 @@
 }
 
 void
-ControllerI::deactivateObjectAdapter(ICE_IN(string) name, const Ice::Current& current)
+ControllerI::deactivateObjectAdapter(ICE_IN(string) name, const Ice::Current&)
 {
     _adapters[name]->destroy();
     _adapters.erase(name);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/TestI.h zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceDiscovery/simple/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceDiscovery/simple/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
 
 #include <Test.h>
-#include <TestCommon.h>
 
 class TestIntfI : public Test::TestIntf
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/activation/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
 #include <IceUtil/Thread.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -86,8 +81,9 @@
 typedef IceUtil::Handle<PingThread> PingThreadPtr;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
@@ -95,11 +91,13 @@
     IceGrid::QueryPrx query = IceGrid::QueryPrx::checkedCast(
         communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Query"));
 
-    IceGrid::AdminSessionPrx session = registry->createAdminSession("foo", "bar");
+    IceGrid::AdminSessionPrx adminSession = registry->createAdminSession("foo", "bar");
 
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    adminSession->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
-    IceGrid::AdminPrx admin = session->getAdmin();
+    IceGrid::AdminPrx admin = adminSession->getAdmin();
     test(admin);
 
     admin->startServer("node-1");
@@ -619,17 +617,23 @@
     try
     {
         test(admin->getServerState("server2") == IceGrid::Inactive);
-        TestIntfPrx obj = TestIntfPrx::checkedCast(communicator->stringToProxy("server2"));
-        waitForServerState(admin, "server2", IceGrid::Active);
-        obj->fail();
-        waitForServerState(admin, "server2", IceGrid::Inactive);
-        try
+        TestIntfPrx obj = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server2"));
+        while(true)
         {
             obj->ice_ping();
-            test(false);
-        }
-        catch(const Ice::NoEndpointException&)
-        {
+            waitForServerState(admin, "server2", IceGrid::Active);
+            IceUtil::Time now = IceUtil::Time::now();
+            obj->fail();
+            waitForServerState(admin, "server2", IceGrid::Inactive);
+            try
+            {
+                obj->ice_ping();
+                test(IceUtil::Time::now() - now >= IceUtil::Time::seconds(2));
+            }
+            catch(const Ice::NoEndpointException&)
+            {
+                break; // Success
+            }
         }
         test(!admin->isServerEnabled("server2"));
         nRetry = 0;
@@ -738,5 +742,5 @@
     admin->stopServer("node-1");
     admin->stopServer("node-2");
 
-    session->destroy();
+    adminSession->destroy();
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
-{
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-    int status;
-    Ice::CommunicatorPtr communicator;
+public:
 
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_dependencies = IceGrid Glacier2
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,44 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Thread.h>
 #include <TestI.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
+};
+
+class TestActivationFailure : public std::runtime_error
+{
+public:
 
+    TestActivationFailure(const string& what_arg) :
+        runtime_error(what_arg)
+    {
+    }
 };
 
-int
-Server::run(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    Ice::PropertiesPtr properties = communicator()->getProperties();
-    args = properties->parseCommandLineOptions("", args);
-    Ice::stringSeqToArgs(args, argc, argv);
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
     if(properties->getPropertyAsInt("FailOnStartup") > 0)
     {
-        return EXIT_FAILURE;
+        throw TestActivationFailure("FailOnStartup");
     }
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
-    TestI* test = new TestI();
-    Ice::ObjectPtr obj = test;
-    adapter->add(test, Ice::stringToIdentity(properties->getProperty("Ice.Admin.ServerId")));
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    TestIPtr testI = ICE_MAKE_SHARED(TestI);
+    adapter->add(testI, Ice::stringToIdentity(properties->getProperty("Ice.Admin.ServerId")));
 
     int delay = properties->getPropertyAsInt("ActivationDelay");
     if(delay > 0)
@@ -44,7 +46,6 @@
         IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(delay));
     }
 
-    shutdownOnInterrupt();
     try
     {
         adapter->activate();
@@ -52,8 +53,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
+    communicator->waitForShutdown();
 
     delay = properties->getPropertyAsInt("DeactivationDelay");
     if(delay > 0)
@@ -61,13 +61,29 @@
         IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(delay));
     }
 
-    return test->isFailed() ? EXIT_FAILURE : EXIT_SUCCESS;
+    if(testI->isFailed())
+    {
+        throw TestActivationFailure("test failed");
+    }
 }
 
 int
-main(int argc, char* argv[])
+main(int argc, char** argv)
 {
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
+    int status = 0;
+    try
+    {
+        Server server;
+        server.run(argc, argv);
+    }
+    catch(const TestActivationFailure&)
+    {
+        status = 1; // excpected failure
+    }
+    catch(const std::exception& ex)
+    {
+        std::cerr << "error: " << ex.what() << std::endl;
+        status = 1;
+    }
+    return status;
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/activation/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/activation/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
@@ -27,5 +22,5 @@
 
     bool _failed;
 };
-
+ICE_DEFINE_PTR(TestIPtr, TestI);
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/activation/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/activation/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/activation/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/activation/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 if isinstance(platform, Windows) or os.getuid() != 0:
     TestSuite(__file__, [IceGridTestCase()], multihost=False)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/admin/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/admin/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/admin/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/admin/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # This Makefile.mk is necessary to get this test to build because the
 # test doesn't have a Client.cpp file.
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/admin/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/admin/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/admin/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/admin/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/admin/msbuild/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/admin/msbuild/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/admin/msbuild/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/admin/msbuild/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -91,9 +91,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -165,11 +165,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/admin/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/admin/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/admin/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/admin/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
-
+    void run(int, char**);
 };
 
-int
-Server::run(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = communicator()->getProperties()->parseCommandLineOptions("TestAdapter", args);
-    Ice::stringSeqToArgs(args, argc, argv);
-
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
-    shutdownOnInterrupt();
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     try
     {
         adapter->activate();
@@ -35,15 +26,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/admin/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/admin/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/admin/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/admin/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceGridAdminTestCase(IceGridTestCase):
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Thread.h>
 #include <IceUtil/Random.h>
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
 #include <Glacier2/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -269,13 +264,16 @@
 typedef IceUtil::Handle<StressClient> StressClientPtr;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
     AdminSessionPrx session = registry->createAdminSession("foo", "bar");
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    session->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
     AdminPrx admin = session->getAdmin();
     test(admin);
@@ -1000,8 +998,8 @@
         cout << "ok" << endl;
         cout << "testing application updates with allocated objects... " << flush;
         {
-            SessionPrx session1 = registry->createSession("Client1", "");
-            SessionPrx session2 = registry->createSession("Client2", "");
+            session1 = registry->createSession("Client1", "");
+            session2 = registry->createSession("Client2", "");
 
             ServerDescriptorPtr objectAllocOriginal = admin->getServerInfo("ObjectAllocation").descriptor;
             ServerDescriptorPtr objectAllocUpdate = ServerDescriptorPtr::dynamicCast(objectAllocOriginal->ice_clone());
@@ -1097,7 +1095,6 @@
             test(session1);
             session1->ice_ping();
 
-            Ice::ObjectPrx obj;
             obj = session1->allocateObjectById(allocatable)->ice_connectionId("client1")->ice_router(router1);
             obj->ice_ping();
             session1->releaseObject(allocatable);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs = client server verifier
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -85,9 +85,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -165,11 +165,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/PermissionsVerifier.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = communicator()->getProperties();
-
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = properties->parseCommandLineOptions("Test", args);
-    Ice::stringSeqToArgs(args, argc, argv);
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::PropertiesPtr properties = communicator->getProperties();
 
     string name = properties->getProperty("Ice.ProgramName");
 
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Server");
     adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable"));
     adapter->add(new TestI(properties), Ice::stringToIdentity("nonallocatable"));
     adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable1"));
@@ -43,7 +35,6 @@
     adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable31"));
     adapter->add(new TestI(properties), Ice::stringToIdentity("allocatable41"));
 
-    shutdownOnInterrupt();
     try
     {
         adapter->activate();
@@ -51,15 +42,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/allocation/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/allocation/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 if isinstance(platform, Windows) or os.getuid() != 0:
     TestSuite(__file__, [IceGridTestCase(exevars={ "verifier.dir": "verifier" })], runOnMainThread=True, multihost=False)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
 #include <IceUtil/Thread.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 #include <fstream>
@@ -376,8 +371,9 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& comm)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr comm = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         comm->stringToProxy(comm->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
@@ -387,7 +383,9 @@
 
     AdminSessionPrx session = registry->createAdminSession("foo", "bar");
 
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    session->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
     AdminPrx admin = session->getAdmin();
     test(admin);
@@ -744,8 +742,9 @@
 }
 
 void
-allTestsWithTarget(const Ice::CommunicatorPtr& comm)
+allTestsWithTarget(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr comm = helper->communicator();
     RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         comm->stringToProxy(comm->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+
     bool withTarget = false;
     if(argc > 1)
     {
@@ -37,40 +41,14 @@
 
     if(!withTarget)
     {
-        void allTests(const Ice::CommunicatorPtr&);
-        allTests(communicator);
+        void allTests(Test::TestHelper*);
+        allTests(this);
     }
     else
     {
-        void allTestsWithTarget(const Ice::CommunicatorPtr&);
-        allTestsWithTarget(communicator);
+        void allTestsWithTarget(Test::TestHelper*);
+        allTestsWithTarget(this);
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries := $(test)_TestService
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -361,12 +361,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,63 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <fstream>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int argc, char* argv[])
-{
-    Ice::PropertiesPtr properties = communicator()->getProperties();
-
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = properties->parseCommandLineOptions("Test", args);
-    Ice::stringSeqToArgs(args, argc, argv);
-
-    string name = properties->getProperty("Ice.ProgramName");
-    Ice::ObjectAdapterPtr adapter;
-
-    if(!properties->getProperty("ReplicatedAdapter").empty())
-    {
-        adapter = communicator()->createObjectAdapter("ReplicatedAdapter");
-        adapter->activate();
-    }
-
-    adapter = communicator()->createObjectAdapter("Server");
-    Ice::ObjectPtr object = new TestI(properties);
-    adapter->add(object, Ice::stringToIdentity(name));
-    shutdownOnInterrupt();
-    try
-    {
-        adapter->activate();
-    }
-    catch(const Ice::ObjectAdapterDeactivatedException&)
-    {
-    }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
     //
     // Test if MY_ENV_VARIABLE is set.
@@ -106,7 +67,29 @@
     test(value5 != 0 && string(value5) == "BAR;12");
 #endif
 
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+
+    Ice::PropertiesPtr properties = communicator->getProperties();
+    string name = properties->getProperty("Ice.ProgramName");
+    Ice::ObjectAdapterPtr adapter;
+
+    if(!properties->getProperty("ReplicatedAdapter").empty())
+    {
+        adapter = communicator->createObjectAdapter("ReplicatedAdapter");
+        adapter->activate();
+    }
+
+    adapter = communicator->createObjectAdapter("Server");
+    Ice::ObjectPtr object = new TestI(properties);
+    adapter->add(object, Ice::stringToIdentity(name));
+    try
+    {
+        adapter->activate();
+    }
+    catch(const Ice::ObjectAdapterDeactivatedException&)
+    {
+    }
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Service.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Service.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
@@ -35,7 +30,7 @@
 // Factory function
 //
 ICE_DECLSPEC_EXPORT ::IceBox::Service*
-create(CommunicatorPtr communicator)
+create(CommunicatorPtr)
 {
     return new ServiceI;
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/deployer/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/deployer/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 clientProps=lambda process, current: { "TestDir" : current.getBuildDir("server") }
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Thread.h>
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 #include <iterator>
@@ -20,14 +15,17 @@
 using namespace IceGrid;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
     AdminSessionPrx session = registry->createAdminSession("foo", "bar");
 
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    session->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
     AdminPrx admin = session->getAdmin();
     test(admin);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_dependencies = IceGrid Glacier2
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = communicator()->getProperties();
-
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = properties->parseCommandLineOptions("Test", args);
-    Ice::stringSeqToArgs(args, argc, argv);
-
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::PropertiesPtr properties = communicator->getProperties();
     string name = properties->getProperty("Ice.ProgramName");
-
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Server");
     Ice::ObjectPtr object = new TestI(properties);
     adapter->add(object, Ice::stringToIdentity(name));
 
-    shutdownOnInterrupt();
     try
     {
         adapter->activate();
@@ -43,15 +32,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/distribution/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/distribution/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,14 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceGridDistributionTestCase(IceGridTestCase):
 
     def setupClientSide(self, current):
         IceGridTestCase.setupClientSide(self, current)
 
-        datadir = os.path.join(self.getPath(), "data")
+        datadir = os.path.join(current.testsuite.getPath(), "data")
 
         files = [
           [ "original/rootfile", "rootfile" ],
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/fileLock/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/fileLock/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/fileLock/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/fileLock/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceGridAdminTestCase(IceGridTestCase):
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Thread.h>
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -149,14 +144,17 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
     AdminSessionPrx session = registry->createAdminSession("foo", "bar");
 
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    session->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
     AdminPrx admin = session->getAdmin();
     test(admin);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries := $(test)_TestService
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -361,12 +361,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = communicator()->getProperties();
-
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = properties->parseCommandLineOptions("Test", args);
-    Ice::stringSeqToArgs(args, argc, argv);
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::PropertiesPtr properties = communicator->getProperties();
 
     string name = properties->getProperty("Ice.ProgramName");
 
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Server");
     Ice::ObjectPtr object = new TestI(adapter, properties);
     adapter->add(object, Ice::stringToIdentity(name));
 
-    shutdownOnInterrupt();
     try
     {
         adapter->activate();
@@ -43,15 +34,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Service.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Service.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
@@ -35,7 +30,7 @@
 // Factory function
 //
 ICE_DECLSPEC_EXPORT ::IceBox::Service*
-create(CommunicatorPtr communicator)
+create(CommunicatorPtr)
 {
     return new ServiceI;
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/noRestartUpdate/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/noRestartUpdate/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceGridNoRestartUpdateTestCase(IceGridTestCase):
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/BuiltinSequences.h>
 #include <IceGrid/IceGrid.h>
 #include <IceUtil/Thread.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <set>
 
@@ -105,8 +100,9 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& comm)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr comm = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         comm->stringToProxy(comm->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
@@ -115,7 +111,9 @@
     test(query);
     AdminSessionPrx session = registry->createAdminSession("foo", "bar");
 
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    session->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
     AdminPrx admin = session->getAdmin();
     test(admin);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
-{
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-    int status;
-    Ice::CommunicatorPtr communicator;
+public:
 
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_libraries := $(test)_TestService $(test)_RegistryPlugin
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -91,9 +91,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -165,11 +165,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -361,12 +361,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
 
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceGrid;
@@ -80,11 +75,11 @@
 
         string server = p->second;
         Ice::StringSeq filteredAdapters;
-        for(Ice::StringSeq::const_iterator p = adpts.begin(); p != adpts.end(); ++p)
+        for(Ice::StringSeq::const_iterator q = adpts.begin(); q != adpts.end(); ++q)
         {
-            if(_facade->getAdapterServer(*p) == server)
+            if(_facade->getAdapterServer(*q) == server)
             {
-                filteredAdapters.push_back(*p);
+                filteredAdapters.push_back(*q);
             }
         }
         return filteredAdapters;
@@ -105,7 +100,7 @@
     }
 
     virtual Ice::ObjectProxySeq
-    filter(const string& type, const Ice::ObjectProxySeq& objects, const Ice::ConnectionPtr&, const Ice::Context& ctx)
+    filter(const string& /*type*/, const Ice::ObjectProxySeq& objects, const Ice::ConnectionPtr&, const Ice::Context& ctx)
     {
         Ice::Context::const_iterator p = ctx.find("server");
         if(p == ctx.end())
@@ -115,11 +110,11 @@
 
         string server = p->second;
         Ice::ObjectProxySeq filteredObjects;
-        for(Ice::ObjectProxySeq::const_iterator p = objects.begin(); p != objects.end(); ++p)
+        for(Ice::ObjectProxySeq::const_iterator q = objects.begin(); q != objects.end(); ++q)
         {
-            if(_facade->getAdapterServer((*p)->ice_getAdapterId()) == server)
+            if(_facade->getAdapterServer((*q)->ice_getAdapterId()) == server)
             {
-                filteredObjects.push_back(*p);
+                filteredObjects.push_back(*q);
             }
         }
         return filteredObjects;
@@ -140,7 +135,7 @@
     }
 
     virtual Ice::StringSeq
-    filter(const string& id, const Ice::StringSeq& adapters, const Ice::ConnectionPtr& con, const Ice::Context& ctx)
+    filter(const string& /*id*/, const Ice::StringSeq& adapters, const Ice::ConnectionPtr& /*con*/, const Ice::Context& ctx)
     {
         Ice::Context::const_iterator p = ctx.find("server");
         if(p == ctx.end() || p->second == _exclude)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int, char**)
+void
+Server::run(int argc, char** argv)
 {
-    Ice::ObjectAdapterPtr adpt = communicator()->createObjectAdapter("ReplicatedAdapter");
-    Ice::PropertiesPtr properties = communicator()->getProperties();
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::ObjectAdapterPtr adpt = communicator->createObjectAdapter("ReplicatedAdapter");
+    Ice::PropertiesPtr properties = communicator->getProperties();
     Ice::ObjectPtr object = new TestI(properties);
     adpt->add(object, Ice::stringToIdentity(properties->getProperty("Ice.ProgramName")));
     adpt->add(object, Ice::stringToIdentity(properties->getProperty("Identity")));
-    shutdownOnInterrupt();
     try
     {
         adpt->activate();
-        communicator()->getAdmin();
+        communicator->getAdmin();
     }
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
@@ -44,14 +39,7 @@
         // servant.
         //
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    return app.main(argc, argv);
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Service.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Service.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Service.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Service.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
@@ -35,7 +30,7 @@
 // Factory function
 //
 ICE_DECLSPEC_EXPORT ::IceBox::Service*
-create(CommunicatorPtr communicator)
+create(CommunicatorPtr)
 {
     return new ServiceI;
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replicaGroup/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replicaGroup/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 registryProps = {
     "Ice.Plugin.RegistryPlugin" : "RegistryPlugin:createRegistryPlugin",
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replication/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/BuiltinSequences.h>
 #include <Ice/Locator.h>
 #include <IceGrid/IceGrid.h>
 #include <IceUtil/Thread.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -247,16 +242,19 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& comm)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr comm = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         comm->stringToProxy(comm->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
 
-    AdminSessionPrx session = registry->createAdminSession("foo", "bar");
+    AdminSessionPrx adminSession = registry->createAdminSession("foo", "bar");
 
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    adminSession->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
-    AdminPrx admin = session->getAdmin();
+    AdminPrx admin = adminSession->getAdmin();
     test(admin);
 
     map<string, string> params;
@@ -779,22 +777,24 @@
     params["id"] = "Node1";
     instantiateServer(admin, "IceGridNode", params);
 
-    //
-    // Add an application which is using Node1. Otherwise, when a
-    // registry restarts it would throw aways the proxy of the nodes
-    // because the node isn't used by any application.
-    //
-    ApplicationDescriptor app;
-    app.name = "DummyApp";
-    app.nodes["Node1"].description = "dummy node";
-    try
     {
-        masterAdmin->addApplication(app);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        test(false);
+        //
+        // Add an application which is using Node1. Otherwise, when a
+        // registry restarts it would throw aways the proxy of the nodes
+        // because the node isn't used by any application.
+        //
+        ApplicationDescriptor app;
+        app.name = "DummyApp";
+        app.nodes["Node1"].description = "dummy node";
+        try
+        {
+            masterAdmin->addApplication(app);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            test(false);
+        }
     }
 
     //
@@ -992,8 +992,8 @@
         {
             cerr << ex << endl;
 
-            ApplicationInfo app = admin->getApplicationInfo("Test");
-            cerr << "properties-override = " << app.descriptor.variables["properties-override"] << endl;
+            ApplicationInfo appInfo = admin->getApplicationInfo("Test");
+            cerr << "properties-override = " << appInfo.descriptor.variables["properties-override"] << endl;
 
             PropertyDescriptorSeq& seq = admin->getServerInfo("Node1").descriptor->propertySet.properties;
             for(PropertyDescriptorSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
-{
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
 {
-    int status;
-    Ice::CommunicatorPtr communicator;
+public:
 
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_dependencies = IceGrid Glacier2
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int, char**)
+void
+Server::run(int argc, char** argv)
 {
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
-    Ice::ObjectPtr object = new TestI();
-    adapter->add(object, Ice::stringToIdentity(communicator()->getProperties()->getProperty("Identity")));
-    shutdownOnInterrupt();
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    adapter->add(new TestI(), Ice::stringToIdentity(communicator->getProperties()->getProperty("Identity")));
     try
     {
         adapter->activate();
@@ -34,14 +28,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    return app.main(argc, argv);
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/replication/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/replication/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/replication/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/replication/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/replication/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/replication/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 clientProps = lambda process, current: { "ServerDir" : current.getBuildDir("server") }
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/session/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Thread.h>
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
 #include <Glacier2/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -108,7 +103,7 @@
     }
 
     virtual void
-    applicationInit(int serial, const ApplicationInfoSeq& apps, const Ice::Current&)
+    applicationInit(int serialP, const ApplicationInfoSeq& apps, const Ice::Current&)
     {
         Lock sync(*this);
         for(ApplicationInfoSeq::const_iterator p = apps.begin(); p != apps.end(); ++p)
@@ -118,27 +113,27 @@
                 this->applications.insert(make_pair(p->descriptor.name, *p));
             }
         }
-        updated(updateSerial(serial, "init update"));
+        updated(updateSerial(serialP, "init update"));
     }
 
     virtual void
-    applicationAdded(int serial, const ApplicationInfo& app, const Ice::Current&)
+    applicationAdded(int serialP, const ApplicationInfo& app, const Ice::Current&)
     {
         Lock sync(*this);
         this->applications.insert(make_pair(app.descriptor.name, app));
-        updated(updateSerial(serial, "application added `" + app.descriptor.name + "'"));
+        updated(updateSerial(serialP, "application added `" + app.descriptor.name + "'"));
     }
 
     virtual void
-    applicationRemoved(int serial, const std::string& name, const Ice::Current&)
+    applicationRemoved(int serialP, const std::string& name, const Ice::Current&)
     {
         Lock sync(*this);
         this->applications.erase(name);
-        updated(updateSerial(serial, "application removed `" + name + "'"));
+        updated(updateSerial(serialP, "application removed `" + name + "'"));
     }
 
     virtual void
-    applicationUpdated(int serial, const ApplicationUpdateInfo& info, const Ice::Current&)
+    applicationUpdated(int serialP, const ApplicationUpdateInfo& info, const Ice::Current&)
     {
         Lock sync(*this);
         const ApplicationUpdateDescriptor& desc = info.descriptor;
@@ -150,7 +145,7 @@
         {
             this->applications[desc.name].descriptor.variables[p->first] = p->second;
         }
-        updated(updateSerial(serial, "application updated `" + desc.name + "'"));
+        updated(updateSerial(serialP, "application updated `" + desc.name + "'"));
     }
 
     int serial;
@@ -159,9 +154,9 @@
 private:
 
     string
-    updateSerial(int serial, const string& update)
+    updateSerial(int serialP, const string& update)
     {
-        this->serial = serial;
+        serial = serialP;
         ostringstream os;
         os << update << " (serial = " << serial << ")";
         return os.str();
@@ -178,12 +173,12 @@
     }
 
     virtual void
-    adapterInit(const AdapterInfoSeq& adapters, const Ice::Current&)
+    adapterInit(const AdapterInfoSeq& adaptersP, const Ice::Current&)
     {
         Lock sync(*this);
-        for(AdapterInfoSeq::const_iterator q = adapters.begin(); q != adapters.end(); ++q)
+        for(AdapterInfoSeq::const_iterator q = adaptersP.begin(); q != adaptersP.end(); ++q)
         {
-            this->adapters.insert(make_pair(q->id, *q));
+            adapters.insert(make_pair(q->id, *q));
         }
         updated(updateSerial(0, "init update"));
     }
@@ -192,7 +187,7 @@
     adapterAdded(const AdapterInfo& info, const Ice::Current&)
     {
         Lock sync(*this);
-        this->adapters.insert(make_pair(info.id, info));
+        adapters.insert(make_pair(info.id, info));
         updated(updateSerial(0, "adapter added `" + info.id + "'"));
     }
 
@@ -200,7 +195,7 @@
     adapterUpdated(const AdapterInfo& info, const Ice::Current&)
     {
         Lock sync(*this);
-        this->adapters[info.id] = info;
+        adapters[info.id] = info;
         updated(updateSerial(0, "adapter updated `" + info.id + "'"));
     }
 
@@ -208,7 +203,7 @@
     adapterRemoved(const string& id, const Ice::Current&)
     {
         Lock sync(*this);
-        this->adapters.erase(id);
+        adapters.erase(id);
         updated(updateSerial(0, "adapter removed `" + id + "'"));
     }
 
@@ -218,9 +213,9 @@
 private:
 
     string
-    updateSerial(int serial, const string& update)
+    updateSerial(int serialP, const string& update)
     {
-        this->serial = serial;
+        serial = serialP;
         ostringstream os;
         os << update << " (serial = " << serial << ")";
         return os.str();
@@ -237,12 +232,12 @@
     }
 
     virtual void
-    objectInit(const ObjectInfoSeq& objects, const Ice::Current&)
+    objectInit(const ObjectInfoSeq& objectsP, const Ice::Current&)
     {
         Lock sync(*this);
-        for(ObjectInfoSeq::const_iterator r = objects.begin(); r != objects.end(); ++r)
+        for(ObjectInfoSeq::const_iterator r = objectsP.begin(); r != objectsP.end(); ++r)
         {
-            this->objects.insert(make_pair(r->proxy->ice_getIdentity(), *r));
+            objects.insert(make_pair(r->proxy->ice_getIdentity(), *r));
         }
         updated(updateSerial(0, "init update"));
     }
@@ -251,7 +246,7 @@
     objectAdded(const ObjectInfo& info, const Ice::Current&)
     {
         Lock sync(*this);
-        this->objects.insert(make_pair(info.proxy->ice_getIdentity(), info));
+        objects.insert(make_pair(info.proxy->ice_getIdentity(), info));
         updated(updateSerial(0, "object added `" + info.proxy->ice_toString() + "'"));
     }
 
@@ -259,7 +254,7 @@
     objectUpdated(const ObjectInfo& info, const Ice::Current&)
     {
         Lock sync(*this);
-        this->objects[info.proxy->ice_getIdentity()] = info;
+        objects[info.proxy->ice_getIdentity()] = info;
         updated(updateSerial(0, "object updated `" + info.proxy->ice_toString() + "'"));
     }
 
@@ -267,7 +262,7 @@
     objectRemoved(const Ice::Identity& id, const Ice::Current& current)
     {
         Lock sync(*this);
-        this->objects.erase(id);
+        objects.erase(id);
         updated(updateSerial(0, "object removed `" +
                              current.adapter->getCommunicator()->identityToString(id) + "'"));
     }
@@ -278,9 +273,9 @@
 private:
 
     string
-    updateSerial(int serial, const string& update)
+    updateSerial(int serialP, const string& update)
     {
-        this->serial = serial;
+        serial = serialP;
         ostringstream os;
         os << update << " (serial = " << serial << ")";
         return os.str();
@@ -478,22 +473,25 @@
 testFailedAndPrintObservers(const char* expr, const char* file, unsigned int line)
 {
     ObserverBase::printStack();
-    testFailed(expr, file, line);
+    Test::testFailed(expr, file, line);
 }
 
 #undef test
 #define test(ex) ((ex) ? ((void)0) : testFailedAndPrintObservers(#ex, __FILE__, __LINE__))
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     bool encoding10 = communicator->getProperties()->getProperty("Ice.Default.EncodingVersion") == "1.0";
 
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
 
     AdminSessionPrx session = registry->createAdminSession("admin3", "test3");
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    session->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
     AdminPrx admin = session->getAdmin();
     test(admin);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/session/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/session/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs = client server verifier
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -296,12 +296,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/verifier/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/verifier/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/verifier/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/verifier/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/PermissionsVerifier.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/session/PermissionsVerifier.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/PermissionsVerifier.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/PermissionsVerifier.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/PermissionsVerifier.h>
 #include <IceSSL/Plugin.h>
 #include <Test.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
@@ -26,30 +21,30 @@
         {
             throw Test::ExtendedPermissionDeniedException("reason");
         }
-        return (userId == "admin1" && passwd == "test1") || (userId == "admin2" && passwd == "test2") ||
-                (userId == "admin3" && passwd == "test3");
+        return (userId == "admin1" && passwd == "test1") ||
+               (userId == "admin2" && passwd == "test2") ||
+               (userId == "admin3" && passwd == "test3");
     }
 };
 
-class PermissionsVerifierServer : public Ice::Application
+class PermissionsVerifierServer : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[])
-    {
-        Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("PermissionsVerifier");
-        adapter->add(new AdminPermissionsVerifierI, Ice::stringToIdentity("AdminPermissionsVerifier"));
-        adapter->activate();
-        communicator()->waitForShutdown();
-        return EXIT_SUCCESS;
-    }
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+PermissionsVerifierServer::run(int argc, char** argv)
 {
-    PermissionsVerifierServer app;
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    initData.properties->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-    return app.main(argc, argv, initData);
+    shutdownOnInterrupt();
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("PermissionsVerifier");
+    adapter->add(new AdminPermissionsVerifierI, Ice::stringToIdentity("AdminPermissionsVerifier"));
+    adapter->activate();
+    communicator->waitForShutdown();
 }
+
+DEFINE_TEST(PermissionsVerifierServer)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/session/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Glacier2/PermissionsVerifier.h>
 #include <IceSSL/Plugin.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -53,25 +48,25 @@
     }
 };
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int, char**)
+void
+Server::run(int argc, char** argv)
 {
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server");
-    if(communicator()->getProperties()->getPropertyAsInt("AddPermissionsVerifiers") > 0)
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Server");
+    if(communicator->getProperties()->getPropertyAsInt("AddPermissionsVerifiers") > 0)
     {
         adapter->add(new ClientPermissionsVerifierI(), Ice::stringToIdentity("ClientPermissionsVerifier"));
         adapter->add(new SSLPermissionsVerifierI(), Ice::stringToIdentity("SSLPermissionsVerifier"));
     }
     adapter->activate();
 
-    shutdownOnInterrupt();
     try
     {
         adapter->activate();
@@ -79,15 +74,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/session/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/session/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/session/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/session/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/session/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceGridSessionTestCase(IceGridTestCase):
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/simple/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing stringToProxy... " << flush;
     Ice::ObjectPrxPtr base = communicator->stringToProxy("test @ TestAdapter");
     test(base);
@@ -178,7 +174,7 @@
                     intf = " --interface \"" + intf + "\"";
                 }
                 ostringstream port;
-                port << getTestPort(initData.properties, 99);
+                port << TestHelper::getTestPort(initData.properties, 99);
                 initData.properties->setProperty("IceLocatorDiscovery.Lookup",
                                                  "udp -h " + multicast + " --interface unknown:" +
                                                  "udp -h " + multicast + " -p " + port.str() + intf);
@@ -208,8 +204,9 @@
 }
 
 void
-allTestsWithDeploy(const Ice::CommunicatorPtr& communicator)
+allTestsWithDeploy(Test::TestHelper* helper)
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     cout << "testing stringToProxy... " << flush;
     Ice::ObjectPrxPtr base = communicator->stringToProxy("test @ TestAdapter");
     test(base);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 using namespace Test;
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
+#ifdef ICE_STATIC_LIBS
+    Ice::registerIceLocatorDiscovery(false);
+#endif
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+
     bool withDeploy = false;
 
     for(int i = 1; i < argc; ++i)
@@ -31,46 +38,14 @@
 
     if(!withDeploy)
     {
-        void allTests(const Ice::CommunicatorPtr&);
-        allTests(communicator);
+        void allTests(Test::TestHelper*);
+        allTests(this);
     }
     else
     {
-        void allTestsWithDeploy(const Ice::CommunicatorPtr&);
-        allTestsWithDeploy(communicator);
+        void allTestsWithDeploy(Test::TestHelper*);
+        allTestsWithDeploy(this);
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-    Ice::registerIceLocatorDiscovery(false);
-#endif
-    int status;
-
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 Ice TestCommon
+$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 TestCommon IceSSL Ice
 
 tests += $(test)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -344,12 +344,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
-
+    void run(int, char**);
 };
 
-int
-Server::run(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = communicator()->getProperties()->parseCommandLineOptions("TestAdapter", args);
-    Ice::stringSeqToArgs(args, argc, argv);
-
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
-    Ice::ObjectPtr object = ICE_MAKE_SHARED(TestI);
-    string id = communicator()->getProperties()->getPropertyWithDefault("Identity", "test");
-    adapter->add(object, Ice::stringToIdentity(id));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+    string id = communicator->getProperties()->getPropertyWithDefault("Identity", "test");
+    adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity(id));
 
-    shutdownOnInterrupt();
     try
     {
         adapter->activate();
@@ -40,19 +31,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/simple/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/simple/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/simple/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/simple/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/simple/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/update/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Thread.h>
 #include <Ice/Ice.h>
 #include <IceGrid/IceGrid.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -63,14 +58,17 @@
 }
 
 void
-allTests(const Ice::CommunicatorPtr& communicator)
+allTests(Test::TestHelper* helper)
 {
+    const Ice::CommunicatorPtr& communicator = helper->communicator();
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
     test(registry);
     AdminSessionPrx session = registry->createAdminSession("foo", "bar");
 
-    session->ice_getConnection()->setACM(registry->getACMTimeout(), IceUtil::None, Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
+    session->ice_getConnection()->setACM(registry->getACMTimeout(),
+                                         IceUtil::None,
+                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
 
     AdminPrx admin = session->getAdmin();
     test(admin);
@@ -1193,6 +1191,11 @@
             admin->startServer("Server");
             test(admin->getServerState("Server") == Active);
         }
+        catch(const ServerStartException& ex)
+        {
+            cerr << ex << "\nreason = " << ex.reason << endl;
+            test(false);
+        }
         catch(const Ice::Exception& ex)
         {
             cerr << ex << endl;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/Client.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/update/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
+public:
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    Ice::CommunicatorPtr communicator;
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
+    void run(int, char**);
+};
 
-    return status;
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
+    void allTests(Test::TestHelper*);
+    allTests(this);
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceGrid/update/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_dependencies = IceGrid Glacier2
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -320,12 +320,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -86,9 +86,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -337,12 +337,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/Server.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/update/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-class Server : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int argc, char* argv[]);
+    void run(int, char**);
 };
 
-int
-Server::run(int argc, char* argv[])
+void
+Server::run(int argc, char** argv)
 {
-    Ice::PropertiesPtr properties = communicator()->getProperties();
-
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    args = properties->parseCommandLineOptions("Test", args);
-    Ice::stringSeqToArgs(args, argc, argv);
-
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    Ice::PropertiesPtr properties = communicator->getProperties();
     string name = properties->getProperty("Ice.ProgramName");
 
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Server");
     Ice::ObjectPtr object = new TestI(properties);
     adapter->add(object, Ice::stringToIdentity(name));
 
-    shutdownOnInterrupt();
     try
     {
         adapter->activate();
@@ -43,15 +33,7 @@
     catch(const Ice::ObjectAdapterDeactivatedException&)
     {
     }
-    communicator()->waitForShutdown();
-    ignoreInterrupt();
-    return EXIT_SUCCESS;
+    communicator->waitForShutdown();
 }
 
-int
-main(int argc, char* argv[])
-{
-    Server app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/Test.ice zeroc-ice-3.7.2/cpp/test/IceGrid/update/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceGrid/update/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/TestI.h zeroc-ice-3.7.2/cpp/test/IceGrid/update/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceGrid/update/test.py zeroc-ice-3.7.2/cpp/test/IceGrid/update/test.py
--- zeroc-ice-3.7.1/cpp/test/IceGrid/update/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceGrid/update/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceGridUpdateTestCase(IceGridTestCase):
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/certs/makecerts.py zeroc-ice-3.7.2/cpp/test/IceSSL/certs/makecerts.py
--- zeroc-ice-3.7.1/cpp/test/IceSSL/certs/makecerts.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/certs/makecerts.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2015-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 import os, sys, socket, getopt
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/AllTests.cpp zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/AllTests.cpp
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/AllTests.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/AllTests.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceSSL/IceSSL.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <fstream>
 #include <algorithm>
 
 #include <Ice/UniqueRef.h>
+
+#ifdef _MSC_VER
+#   pragma warning(disable:4189) // 'elCapitanUpdate2OrLower': local variable is initialized but not referenced
+#endif
+
 #if defined(__APPLE__)
-#  include <sys/sysctl.h>
-#  if TARGET_OS_IPHONE != 0
-#    include <IceSSL/SecureTransportUtil.h> // For loadCertificateChain
-#  endif
+#   include <sys/sysctl.h>
+#   if TARGET_OS_IPHONE != 0
+#       include <IceSSL/SecureTransportUtil.h> // For loadCertificateChain
+#   endif
 #elif defined(ICE_OS_UWP)
-#  include <ppltasks.h>
-#  include <nserror.h>
+#   include <ppltasks.h>
+#   include <nserror.h>
+
 using namespace concurrency;
 using namespace Platform;
 using namespace Windows::Foundation;
@@ -31,6 +32,7 @@
 using namespace Windows::Storage::Streams;
 using namespace Windows::Security::Cryptography;
 using namespace Windows::Security::Cryptography::Certificates;
+
 #endif
 
 #ifdef ICE_CPP11_MAPPING
@@ -40,22 +42,22 @@
 #endif
 
 #if defined(__APPLE__)
-#  define ICE_USE_SECURE_TRANSPORT 1
-#if defined(__APPLE__) && TARGET_OS_IPHONE != 0
-#  define ICE_USE_SECURE_TRANSPORT_IOS 1
-#else
-#  define ICE_USE_SECURE_TRANSPORT_MACOS 1
-#endif
+#   define ICE_USE_SECURE_TRANSPORT 1
+#   if defined(__APPLE__) && TARGET_OS_IPHONE != 0
+#       define ICE_USE_SECURE_TRANSPORT_IOS 1
+#   else
+#       define ICE_USE_SECURE_TRANSPORT_MACOS 1
+#   endif
 #elif defined(_WIN32)
-#  if !defined(ICE_OS_UWP) && !defined(ICE_USE_OPENSSL)
-#    define ICE_USE_SCHANNEL 1
-#  endif
+#   if !defined(ICE_OS_UWP) && !defined(ICE_USE_OPENSSL)
+#       define ICE_USE_SCHANNEL 1
+#   endif
 #else
-#  define ICE_USE_OPENSSL 1
+#   define ICE_USE_OPENSSL 1
 #endif
 
 #if defined(_WIN32) && defined(ICE_USE_OPENSSL)
-#  include <IceSSL/OpenSSL.h>
+#   include <IceSSL/OpenSSL.h>
 #endif
 
 using namespace std;
@@ -248,7 +250,7 @@
             do
             {
                 if((next = CertFindCertificateInStore(p12, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0,
-                                                      CERT_FIND_ANY, 0, next)))
+                                                      CERT_FIND_ANY, 0, next)) != 0)
                 {
                     if(CertAddCertificateContextToStore(_store, next, CERT_STORE_ADD_ALWAYS, &newCert))
                     {
@@ -389,7 +391,7 @@
 {
 public:
 
-    ImportCerts(const string& defaultDir, const char* certificates[])
+    ImportCerts(const string& /*defaultDir*/, const char* /*certificates*/[])
     {
         // Nothing to do.
     }
@@ -400,7 +402,7 @@
 };
 #endif
 
-class PasswordPromptI
+class PasswordPromptI ICE_FINAL
 #ifndef ICE_CPP11_MAPPING
  : public IceSSL::PasswordPrompt
 #endif
@@ -429,7 +431,7 @@
 };
 ICE_DEFINE_PTR(PasswordPromptIPtr, PasswordPromptI);
 
-class CertificateVerifierI
+class CertificateVerifierI ICE_FINAL
 #ifndef ICE_CPP11_MAPPING
 : public IceSSL::CertificateVerifier
 #endif
@@ -685,8 +687,13 @@
 }
 
 Test::ServerFactoryPrxPtr
-allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
+allTests(Test::TestHelper* helper, const string& testDir, bool p12)
+#else
+allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
+#endif
 {
+    Ice::CommunicatorPtr communicator = helper->communicator();
     bool elCapitanUpdate2OrLower = false;
 #ifdef __APPLE__
     bool isElCapitanOrGreater = false;
@@ -706,7 +713,7 @@
         elCapitanUpdate2OrLower = (majorVersion == 15) && (minorVersion <= 2);
     }
 #endif
-    string factoryRef = "factory:" + getTestEndpoint(communicator, 0, "tcp");
+    string factoryRef = "factory:" + helper->getTestEndpoint("tcp");
     ObjectPrxPtr base = communicator->stringToProxy(factoryRef);
     test(base);
     Test::ServerFactoryPrxPtr factory = ICE_CHECKED_CAST(Test::ServerFactoryPrx, base);
@@ -1630,9 +1637,9 @@
         test(fact);
 
         {
-            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
+            d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
             d["IceSSL.VerifyPeer"] = "0";
-            Test::ServerPrxPtr server = fact->createServer(d);
+            server = fact->createServer(d);
             try
             {
                 info = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, server->ice_getConnection()->getInfo());
@@ -1666,12 +1673,12 @@
         test(fact);
 
         {
-            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai1", "");
+            d = createServerProps(defaultProps, p12, "s_rsa_cai1", "");
             d["IceSSL.VerifyPeer"] = "0";
-            Test::ServerPrxPtr server = fact->createServer(d);
+            server = fact->createServer(d);
             try
             {
-                ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, server->ice_getConnection()->getInfo());
+                server->ice_getConnection()->getInfo();
                 import.cleanup();
                 test(false);
             }
@@ -1700,9 +1707,9 @@
         fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
         test(fact);
         {
-            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai1", "");
+            d = createServerProps(defaultProps, p12, "s_rsa_cai1", "");
             d["IceSSL.VerifyPeer"] = "0";
-            Test::ServerPrxPtr server = fact->createServer(d);
+            server = fact->createServer(d);
             try
             {
                 info = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, server->ice_getConnection()->getInfo());
@@ -1719,12 +1726,12 @@
         }
 
         {
-            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "");
+            d = createServerProps(defaultProps, p12, "s_rsa_cai2", "");
             d["IceSSL.VerifyPeer"] = "0";
-            Test::ServerPrxPtr server = fact->createServer(d);
+            server = fact->createServer(d);
             try
             {
-                ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, server->ice_getConnection()->getInfo());
+                server->ice_getConnection()->getInfo();
                 import.cleanup();
                 test(false);
             }
@@ -1748,9 +1755,9 @@
         test(fact);
 
         {
-            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "");
+            d = createServerProps(defaultProps, p12, "s_rsa_cai2", "");
             d["IceSSL.VerifyPeer"] = "0";
-            Test::ServerPrxPtr server = fact->createServer(d);
+            server = fact->createServer(d);
             try
             {
                 info = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, server->ice_getConnection()->getInfo());
@@ -1780,9 +1787,9 @@
         test(fact);
 
         {
-            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "cacert1");
+            d = createServerProps(defaultProps, p12, "s_rsa_cai2", "cacert1");
             d["IceSSL.VerifyPeer"] = "2";
-            Test::ServerPrxPtr server = fact->createServer(d);
+            server = fact->createServer(d);
             try
             {
                 server->ice_getConnection();
@@ -1807,10 +1814,10 @@
         }
 
         {
-            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "cacert1");
+            d = createServerProps(defaultProps, p12, "s_rsa_cai2", "cacert1");
             d["IceSSL.VerifyPeer"] = "2";
             d["IceSSL.VerifyDepthMax"] = "4";
-            Test::ServerPrxPtr server = fact->createServer(d);
+            server = fact->createServer(d);
             try
             {
                 server->ice_getConnection();
@@ -1933,8 +1940,8 @@
         CertificateVerifierIPtr verifier = ICE_MAKE_SHARED(CertificateVerifierI);
 
 #ifdef ICE_CPP11_MAPPING
-        plugin->setCertificateVerifier([verifier](const shared_ptr<IceSSL::ConnectionInfo>& info)
-                                       { return verifier->verify(info); });
+        plugin->setCertificateVerifier([verifier](const shared_ptr<IceSSL::ConnectionInfo>& infoP)
+                                       { return verifier->verify(infoP); });
 #else
         plugin->setCertificateVerifier(verifier);
 #endif
@@ -2009,8 +2016,8 @@
         CertificateVerifierIPtr verifier = ICE_MAKE_SHARED(CertificateVerifierI);
 
 #ifdef ICE_CPP11_MAPPING
-        plugin->setCertificateVerifier([verifier](const shared_ptr<IceSSL::ConnectionInfo>& info)
-                                       { return verifier->verify(info); });
+        plugin->setCertificateVerifier([verifier](const shared_ptr<IceSSL::ConnectionInfo>& infoP)
+                                       { return verifier->verify(infoP); });
 #else
         plugin->setCertificateVerifier(verifier);
 #endif
@@ -2042,74 +2049,80 @@
     cout << "testing protocols... " << flush;
     {
 #  ifndef ICE_USE_SECURE_TRANSPORT
-        //
-        // This should fail because the client and server have no protocol
-        // in common.
-        //
-        InitializationData initData;
-        initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
-        initData.properties->setProperty("IceSSL.VerifyPeer", "0");
-        initData.properties->setProperty("IceSSL.Protocols", "tls1_1");
-        CommunicatorPtr comm = initialize(initData);
-
-        Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
-        test(fact);
-        Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
-        d["IceSSL.VerifyPeer"] = "0";
-        d["IceSSL.Protocols"] = "tls1_2";
-        Test::ServerPrxPtr server = fact->createServer(d);
-        try
-        {
-            server->ice_ping();
-            test(false);
-        }
-        catch(const ProtocolException&)
-        {
-            // Expected on some platforms.
-        }
-        catch(const ConnectionLostException&)
-        {
-            // Expected on some platforms.
-        }
-        catch(const LocalException& ex)
-        {
-            cerr << ex << endl;
-            test(false);
-        }
-        fact->destroyServer(server);
-        comm->destroy();
-
-        //
-        // This should succeed.
-        //
-        comm = initialize(initData);
-        fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
-        test(fact);
-        d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
-        d["IceSSL.VerifyPeer"] = "0";
-        d["IceSSL.Protocols"] = "tls1_1, tls1_2";
-        server = fact->createServer(d);
-        try
-        {
-            server->ice_ping();
-        }
-        catch(const LocalException& ex)
         {
             //
-            // OpenSSL < 1.0 doesn't support tls 1.1 so it will fail, we ignore the error in this case.
+            // This should fail because the client and server have no protocol
+            // in common.
             //
-#ifdef ICE_USE_OPENSSL
-            if(openSSLVersion < 0x1000000)
-#endif
+            InitializationData initData;
+            initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
+            initData.properties->setProperty("IceSSL.VerifyPeer", "0");
+            initData.properties->setProperty("IceSSL.Protocols", "tls1_1");
+            CommunicatorPtr comm = initialize(initData);
+
+            Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
+            test(fact);
+            Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
+            d["IceSSL.VerifyPeer"] = "0";
+            d["IceSSL.Protocols"] = "tls1_2";
+            Test::ServerPrxPtr server = fact->createServer(d);
+            try
+            {
+                server->ice_ping();
+                test(false);
+            }
+            catch(const ProtocolException&)
+            {
+                // Expected on some platforms.
+            }
+            catch(const ConnectionLostException&)
+            {
+                // Expected on some platforms.
+            }
+            catch(const LocalException& ex)
             {
                 cerr << ex << endl;
                 test(false);
             }
+            fact->destroyServer(server);
+            comm->destroy();
+
+            //
+            // This should succeed.
+            //
+            comm = initialize(initData);
+            fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
+            test(fact);
+            d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
+            d["IceSSL.VerifyPeer"] = "0";
+            d["IceSSL.Protocols"] = "tls1_1, tls1_2";
+            server = fact->createServer(d);
+            try
+            {
+                server->ice_ping();
+            }
+            catch(const LocalException& ex)
+            {
+                //
+                // OpenSSL < 1.0 doesn't support tls 1.1 so it will fail, we ignore the error in this case.
+                //
+#ifdef ICE_USE_OPENSSL
+                if(openSSLVersion < 0x1000000)
+#endif
+                {
+                    cerr << ex << endl;
+                    test(false);
+                }
+            }
+            fact->destroyServer(server);
+            comm->destroy();
         }
-        fact->destroyServer(server);
-        comm->destroy();
 
         //
+        // Skip the test if OpenSSL was build without SSL3 support
+        //
+#if !defined(OPENSSL_NO_SSL3_METHOD)
+        //
         // This should fail because the client only accept SSLv3 and the server
         // use the default protocol set that disables SSLv3
         //
@@ -2146,6 +2159,7 @@
             fact->destroyServer(server);
             comm->destroy();
         }
+#endif
 
         //
         // SSLv3 is now disabled by default with some SSL implementations.
@@ -2183,69 +2197,71 @@
         // enabled protocol versions. See the test bellow.
         //
 
-        //
-        // This should fail because the client and server have no protocol
-        // in common.
-        //
-        InitializationData initData;
-        initData.properties = createClientProps(defaultProps, p12);
-        initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
-        initData.properties->setProperty("IceSSL.VerifyPeer", "0");
-        initData.properties->setProperty("IceSSL.ProtocolVersionMax", "tls1");
-        initData.properties->setProperty("IceSSL.ProtocolVersionMin", "tls1");
-        CommunicatorPtr comm = initialize(initData);
-        Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
-        test(fact);
-        Test::Properties d = createServerProps(defaultProps, p12);
-        d["IceSSL.Ciphers"] = "(DH_anon*)";
-        d["IceSSL.VerifyPeer"] = "0";
-        d["IceSSL.ProtocolVersionMax"] = "tls1_2";
-        d["IceSSL.ProtocolVersionMin"] = "tls1_2";
-        Test::ServerPrxPtr server = fact->createServer(d);
-        try
-        {
-            server->ice_ping();
-            test(false);
-        }
-        catch(const ProtocolException&)
-        {
-            // Expected on some platforms.
-        }
-        catch(const ConnectionLostException&)
         {
-            // Expected on some platforms.
-        }
-        catch(const LocalException& ex)
-        {
-            cerr << ex << endl;
-            test(false);
-        }
-        fact->destroyServer(server);
-        comm->destroy();
+            //
+            // This should fail because the client and server have no protocol
+            // in common.
+            //
+            InitializationData initData;
+            initData.properties = createClientProps(defaultProps, p12);
+            initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
+            initData.properties->setProperty("IceSSL.VerifyPeer", "0");
+            initData.properties->setProperty("IceSSL.ProtocolVersionMax", "tls1");
+            initData.properties->setProperty("IceSSL.ProtocolVersionMin", "tls1");
+            CommunicatorPtr comm = initialize(initData);
+            Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
+            test(fact);
+            Test::Properties d = createServerProps(defaultProps, p12);
+            d["IceSSL.Ciphers"] = "(DH_anon*)";
+            d["IceSSL.VerifyPeer"] = "0";
+            d["IceSSL.ProtocolVersionMax"] = "tls1_2";
+            d["IceSSL.ProtocolVersionMin"] = "tls1_2";
+            Test::ServerPrxPtr server = fact->createServer(d);
+            try
+            {
+                server->ice_ping();
+                test(false);
+            }
+            catch(const ProtocolException&)
+            {
+                // Expected on some platforms.
+            }
+            catch(const ConnectionLostException&)
+            {
+                // Expected on some platforms.
+            }
+            catch(const LocalException& ex)
+            {
+                cerr << ex << endl;
+                test(false);
+            }
+            fact->destroyServer(server);
+            comm->destroy();
 
-        //
-        // This should succeed.
-        //
-        comm = initialize(initData);
-        fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
-        test(fact);
-        d = createServerProps(defaultProps, p12);
-        d["IceSSL.Ciphers"] = "(DH_anon*)";
-        d["IceSSL.VerifyPeer"] = "0";
-        d["IceSSL.ProtocolVersionMax"] = "tls1";
-        d["IceSSL.ProtocolVersionMin"] = "ssl3";
-        server = fact->createServer(d);
-        try
-        {
-            server->ice_ping();
-        }
-        catch(const LocalException& ex)
-        {
-            cerr << ex << endl;
-            test(false);
+            //
+            // This should succeed.
+            //
+            comm = initialize(initData);
+            fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
+            test(fact);
+            d = createServerProps(defaultProps, p12);
+            d["IceSSL.Ciphers"] = "(DH_anon*)";
+            d["IceSSL.VerifyPeer"] = "0";
+            d["IceSSL.ProtocolVersionMax"] = "tls1";
+            d["IceSSL.ProtocolVersionMin"] = "ssl3";
+            server = fact->createServer(d);
+            try
+            {
+                server->ice_ping();
+            }
+            catch(const LocalException& ex)
+            {
+                cerr << ex << endl;
+                test(false);
+            }
+            fact->destroyServer(server);
+            comm->destroy();
         }
-        fact->destroyServer(server);
-        comm->destroy();
 
         //
         // This should fail because the client only accept SSLv3 and the server
@@ -2588,6 +2604,13 @@
 #ifndef ICE_OS_UWP
     cout << "testing ciphers... " << flush;
     {
+
+        //
+        // With OpenSSL 1.1.1 the initialization will success because TLS 1.3
+        // ciphersuites are still enabled. They are not affected by IceSSL.Ciphers
+        // properties
+        //
+#  if !(defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010100fL)
         InitializationData initData;
         initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
         initData.properties->setProperty("IceSSL.Ciphers", "UNKNOWN");
@@ -2599,6 +2622,7 @@
         catch(const Ice::PluginInitializationException&)
         {
         }
+#  endif
     }
 #  ifndef ICE_USE_SCHANNEL
     {
@@ -2610,6 +2634,13 @@
         initData.properties = createClientProps(defaultProps, p12);
 #    ifdef ICE_USE_OPENSSL
         initData.properties->setProperty("IceSSL.Ciphers", anonCiphers);
+#       if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010100fL
+        //
+        // With OpenSSL 1.1 disable tls1.3 so that client and server negotiate
+        // an anon cipher
+        //
+        initData.properties->setProperty("IceSSL.Protocols", "tls1_2,tls1_1");
+#       endif
 #    else
         initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
 #    endif
@@ -2916,6 +2947,13 @@
         //
         initData.properties = createClientProps(defaultProps, p12);
         initData.properties->setProperty("IceSSL.Ciphers", "ADH");
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010100fL
+        //
+        // With OpenSSL 1.1 disable tls1.3 so that client and server negotiate
+        // an anon cipher
+        //
+        initData.properties->setProperty("IceSSL.Protocols", "tls1_2,tls1_1");
+#endif
         comm = initialize(initData);
         fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
         test(fact);
@@ -4250,9 +4288,9 @@
             {
                 try
                 {
-                    Ice::WSConnectionInfoPtr info =
+                    Ice::WSConnectionInfoPtr wsinfo =
                         ICE_DYNAMIC_CAST(Ice::WSConnectionInfo, p->ice_getConnection()->getInfo());
-                    IceSSL::ConnectionInfoPtr sslInfo = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, info->underlying);
+                    IceSSL::ConnectionInfoPtr sslInfo = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, wsinfo->underlying);
                     test(sslInfo->verified);
                     break;
                 }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Client.cpp zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,68 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceSSL/IceSSL.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 #if defined(ICE_USE_OPENSSL)
-#  include <IceSSL/OpenSSL.h>
+#   include <IceSSL/OpenSSL.h>
 #endif
 
-DEFINE_TEST("client")
-
 using namespace std;
 
-int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    string testdir;
-#if TARGET_OS_IPHONE == 0
-    if(argc < 2)
-    {
-        cerr << "Usage: " << argv[0] << " testdir" << endl;
-        return 1;
-    }
-    testdir = argv[1];
-#endif
-
-    Test::ServerFactoryPrxPtr allTests(const Ice::CommunicatorPtr&, const string&, bool);
+public:
 
-    try
-    {
-        cerr << "testing with PKCS12 certificates..." << endl;
-        Test::ServerFactoryPrxPtr factory = allTests(communicator, testdir, true);
-#if TARGET_OS_IPHONE == 0 && !defined(ICE_OS_UWP)
-        cerr << "testing with PEM certificates..." << endl;
-        factory = allTests(communicator, testdir, false);
-#endif
-        if(factory)
-        {
-            factory->shutdown();
-        }
-    }
-    catch(const IceSSL::CertificateReadException& ex)
-    {
-        cout << "couldn't read certificate: " << ex.reason << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const std::exception& ex)
+    Client() : Test::TestHelper(false)
     {
-        cout << "unexpected exception: " << ex.what() << endl;
-        return EXIT_FAILURE;
     }
-    return EXIT_SUCCESS;
-}
 
-int
-main(int argc, char* argv[])
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
     //
     // Explicitly register the IceSSL plugin to test registerIceSSL. The tests
@@ -77,25 +40,30 @@
     Ice::registerIceWS(true);
 #endif
 
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    string testdir;
+#if TARGET_OS_IPHONE == 0
+    if(argc < 2)
     {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
+        ostringstream os;
+        os << "Usage: " << argv[0] << " testdir";
+        throw std::invalid_argument(os.str());
     }
+    testdir = argv[1];
+#endif
 
-    if(communicator)
+    Test::ServerFactoryPrxPtr allTests(Test::TestHelper*, const string&, bool);
+
+    cerr << "testing with PKCS12 certificates..." << endl;
+    Test::ServerFactoryPrxPtr factory = allTests(this, testdir, true);
+#if TARGET_OS_IPHONE == 0 && !defined(ICE_OS_UWP)
+    cerr << "testing with PEM certificates..." << endl;
+    factory = allTests(this, testdir, false);
+#endif
+    if(factory)
     {
-        communicator->destroy();
+        factory->shutdown();
     }
-
-    return status;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-$(test)_dependencies = IceSSL Ice TestCommon
+$(test)_dependencies = TestCommon IceSSL Ice
 
 #
 # Disable var tracking assignments for Linux with this test
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -341,14 +341,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -85,11 +85,12 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets')" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -344,13 +345,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
-  <package id="zeroc.openssl.v120" version="1.0.2.5" targetFramework="native" />
-  <package id="zeroc.openssl.v140" version="1.0.2.5" targetFramework="native" />
+  <package id="zeroc.openssl.v120" version="1.0.2.6" targetFramework="native" />
+  <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" />
+  <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/server/packages.config zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/server/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/server/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/server/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -342,14 +342,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
-  <package id="zeroc.openssl.v120" version="1.0.2.5" targetFramework="native" />
-  <package id="zeroc.openssl.v140" version="1.0.2.5" targetFramework="native" />
+  <package id="zeroc.openssl.v120" version="1.0.2.6" targetFramework="native" />
+  <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" />
+  <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -85,11 +85,12 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets')" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -350,13 +351,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.5\build\native\zeroc.openssl.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.5\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -76,10 +76,10 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -265,16 +265,16 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Server.cpp zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Server.cpp
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Server.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Server.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,76 +1,48 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #if defined(ICE_USE_OPENSSL)
 #  include <IceSSL/OpenSSL.h>
 #endif
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     string testdir;
 #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
     if(argc < 2)
     {
-        cerr << "Usage: " << argv[0] << " testdir" << endl;
-        return 1;
+        ostringstream os;
+        os << "Usage: " << argv[0] << " testdir";
+        throw invalid_argument(os.str());
     }
     testdir = string(argv[1]) + "/../certs";
 #else
     testdir = "certs";
 #endif
 
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0, "tcp"));
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint("tcp"));
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("factory");
     adapter->add(ICE_MAKE_SHARED(ServerFactoryI, testdir), id);
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Test.ice zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Test.ice
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/TestI.cpp zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/TestI.cpp
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/TestI.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/TestI.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Thread.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <IceSSL/Plugin.h>
 #include <IceSSL/ConnectionInfo.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/TestI.h zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/TestI.h
--- zeroc-ice-3.7.1/cpp/test/IceSSL/configuration/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceSSL/configuration/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_I_H
 #define TEST_I_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Event.ice zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Event.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Event.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Event.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs        = publisher subscriber
 $(test)_dependencies    = IceStorm Ice TestCommon
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/publisher/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/publisher/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/publisher/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/publisher/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -295,12 +295,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Publisher.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Publisher.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Publisher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Publisher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Event.h>
 
 using namespace std;
@@ -17,101 +12,77 @@
 using namespace IceStorm;
 using namespace Test;
 
-int
-run(int, char* argv[], const CommunicatorPtr& communicator)
+class Publisher : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Publisher::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    const string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `IceStormAdmin.TopicManager.Default' is not set";
+        throw runtime_error(os.str());
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
-    }
-
-    TopicPrx fed1;
-    try
-    {
-        fed1 = manager->retrieve("fed1");
-    }
-    catch(const NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-
-    }
-
-    TopicPrx fed2;
-    try
-    {
-        fed2 = manager->retrieve("fed2");
-    }
-    catch(const NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-
-    }
-
-    TopicPrx fed3;
-    try
-    {
-        fed3 = manager->retrieve("fed3");
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw runtime_error(os.str());
     }
-    catch(const NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
 
-    }
+    TopicPrx fed1 = manager->retrieve("fed1");
+    TopicPrx fed2 = manager->retrieve("fed2");
+    TopicPrx fed3 = manager->retrieve("fed3");
 
     EventPrx eventFed1 = EventPrx::uncheckedCast(fed1->getPublisher()->ice_oneway());
     EventPrx eventFed2 = EventPrx::uncheckedCast(fed2->getPublisher()->ice_oneway());
     EventPrx eventFed3 = EventPrx::uncheckedCast(fed3->getPublisher()->ice_oneway());
 
     Ice::Context context;
-    int i;
 
     context["cost"] = "0";
-    for(i = 0; i < 10; ++i)
+    for(int i = 0; i < 10; ++i)
     {
         eventFed1->pub("fed1:0", context);
     }
 
     context["cost"] = "10";
-    for(i = 0; i < 10; ++i)
+    for(int i = 0; i < 10; ++i)
     {
         eventFed1->pub("fed1:10", context);
     }
 
     context["cost"] = "15";
-    for(i = 0; i < 10; ++i)
+    for(int i = 0; i < 10; ++i)
     {
         eventFed1->pub("fed1:15", context);
     }
 
     context["cost"] = "0";
-    for(i = 0; i < 10; ++i)
+    for(int i = 0; i < 10; ++i)
     {
         eventFed2->pub("fed2:0", context);
     }
 
     context["cost"] = "5";
-    for(i = 0; i < 10; ++i)
+    for(int i = 0; i < 10; ++i)
     {
         eventFed2->pub("fed2:5", context);
     }
 
     context["cost"] = "0";
-    for(i = 0; i < 10; ++i)
+    for(int i = 0; i < 10; ++i)
     {
         eventFed3->pub("fed3:0", context);
     }
@@ -123,31 +94,6 @@
     EventPrx::uncheckedCast(eventFed1->ice_twoway())->ice_ping();
     EventPrx::uncheckedCast(eventFed2->ice_twoway())->ice_ping();
     EventPrx::uncheckedCast(eventFed3->ice_twoway())->ice_ping();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Publisher)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Subscriber.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Subscriber.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/Subscriber.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/Subscriber.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Event.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -23,19 +18,14 @@
 {
 public:
 
-    EventI(const CommunicatorPtr& communicator) :
-        _communicator(communicator)
-    {
-    }
-
     virtual void
-    pub(const string&, const Ice::Current&)
+    pub(const string&, const Ice::Current& current)
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_countMutex);
 
         if(++_count == 30 + 40 + 30)
         {
-            _communicator->shutdown();
+            current.adapter->getCommunicator()->shutdown();
         }
     }
 
@@ -43,8 +33,6 @@
 
 private:
 
-    CommunicatorPtr _communicator;
-
     static int _count;
 };
 
@@ -83,13 +71,20 @@
     cerr <<
         "Options:\n"
         "-h, --help           Show this message.\n"
-        "-b                   Use batch reliability.\n"
-        ;
+        "-b                   Use batch reliability.\n";
 }
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Subscriber : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Subscriber::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     bool batch = false;
 
     int idx = 1;
@@ -108,44 +103,40 @@
         else if(strcmp(argv[idx], "-h") == 0 || strcmp(argv[idx], "--help") == 0)
         {
             usage(argv[0]);
-            return EXIT_SUCCESS;
+            return;
         }
         else if(argv[idx][0] == '-')
         {
-            cerr << argv[0] << ": unknown option `" << argv[idx] << "'" << endl;
             usage(argv[0]);
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << argv[0] <<": unknown option `" << argv[idx] << "'";
+            throw invalid_argument(os.str());
         }
     }
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        throw runtime_error("property `IceStormAdmin.TopicManager.Default' is not set");
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw runtime_error(os.str());
     }
 
     ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SubscriberAdapter", "default");
-    EventIPtr eventFed1 = new EventI(communicator);
-    EventIPtr eventFed2 = new EventI(communicator);
-    EventIPtr eventFed3 = new EventI(communicator);
-
     //
     // Activate the servants.
     //
-    ObjectPrx objFed1 = adapter->addWithUUID(eventFed1);
-    ObjectPrx objFed2 = adapter->addWithUUID(eventFed2);
-    ObjectPrx objFed3 = adapter->addWithUUID(eventFed3);
+    ObjectPrx objFed1 = adapter->addWithUUID(new EventI());
+    ObjectPrx objFed2 = adapter->addWithUUID(new EventI());
+    ObjectPrx objFed3 = adapter->addWithUUID(new EventI());
 
     IceStorm::QoS qos;
     if(batch)
@@ -161,21 +152,9 @@
         objFed3 = objFed1->ice_oneway();
     }
 
-    TopicPrx fed1;
-    TopicPrx fed2;
-    TopicPrx fed3;
-
-    try
-    {
-        fed1 = manager->retrieve("fed1");
-        fed2 = manager->retrieve("fed2");
-        fed3 = manager->retrieve("fed3");
-    }
-    catch(const IceStorm::NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx fed1 = manager->retrieve("fed1");
+    TopicPrx fed2 = manager->retrieve("fed2");
+    TopicPrx fed3 = manager->retrieve("fed3");
 
     fed1->subscribeAndGetPublisher(qos, objFed1);
     fed2->subscribeAndGetPublisher(qos, objFed2);
@@ -187,31 +166,6 @@
     fed1->unsubscribe(objFed1);
     fed2->unsubscribe(objFed2);
     fed3->unsubscribe(objFed3);
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Subscriber)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/federation/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceStormFederationTestCase(IceStormTestCase):
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Event.ice zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Event.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Event.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Event.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs        = publisher subscriber
 $(test)_dependencies    = IceStorm Ice TestCommon
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -295,12 +295,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Publisher.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Publisher.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Publisher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Publisher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,69 +1,49 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Options.h>
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Event.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceStorm;
 using namespace Test;
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Publisher : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Publisher::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtilInternal::Options opts;
     opts.addOpt("", "count", IceUtilInternal::Options::NeedArg);
-
-    try
-    {
-        opts.parse(argc, (const char**)argv);
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
-    }
+    opts.parse(argc, (const char**)argv);
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        throw runtime_error("property `IceStormAdmin.TopicManager.Default' is not set");
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
-    }
-
-    TopicPrx fed1;
-    try
-    {
-        fed1 = manager->retrieve("fed1");
-    }
-    catch(const NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-
+        throw runtime_error("`" + managerProxy + "' is not running");
     }
 
+    TopicPrx fed1 = manager->retrieve("fed1");
     EventPrx eventFed1 = EventPrx::uncheckedCast(fed1->getPublisher()->ice_oneway());
 
     string arg = opts.optArg("count");
@@ -92,31 +72,6 @@
         --count;
         IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(1));
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Publisher)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Subscriber.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Subscriber.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/Subscriber.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/Subscriber.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Event.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #include <fcntl.h>
+
 #ifdef _WIN32
 #   include <io.h>
 #else
@@ -31,19 +27,14 @@
 {
 public:
 
-    EventI(const CommunicatorPtr& communicator) :
-        _communicator(communicator)
-    {
-    }
-
     virtual void
-    pub(const string&, const Ice::Current&)
+    pub(const string&, const Ice::Current& current)
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_countMutex);
 
         if(++_count == 10)
         {
-            _communicator->shutdown();
+            current.adapter->getCommunicator()->shutdown();
         }
     }
 
@@ -51,8 +42,6 @@
 
 private:
 
-    CommunicatorPtr _communicator;
-
     static int _count;
 };
 
@@ -95,9 +84,17 @@
         ;
 }
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Subscriber : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Subscriber::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     bool batch = false;
 
     int idx = 1;
@@ -116,40 +113,41 @@
         else if(strcmp(argv[idx], "-h") == 0 || strcmp(argv[idx], "--help") == 0)
         {
             usage(argv[0]);
-            return EXIT_SUCCESS;
+            return;
         }
         else if(argv[idx][0] == '-')
         {
-            cerr << argv[0] << ": unknown option `" << argv[idx] << "'" << endl;
             usage(argv[0]);
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << argv[0] << ": unknown option `" << argv[idx] << "'";
+            throw invalid_argument(os.str());
         }
     }
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    const string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
     ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SubscriberAdapter", "default");
-    EventIPtr eventFed1 = new EventI(communicator);
 
     //
     // Activate the servants.
     //
-    ObjectPrx obj = adapter->addWithUUID(eventFed1);
+    ObjectPrx obj = adapter->addWithUUID(new EventI());
 
     IceStorm::QoS qos;
     if(batch)
@@ -161,17 +159,7 @@
         obj = obj->ice_oneway();
     }
 
-    TopicPrx fed1;
-
-    try
-    {
-        fed1 = manager->retrieve("fed1");
-    }
-    catch(const IceStorm::NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx fed1 = manager->retrieve("fed1");
 
     fed1->subscribeAndGetPublisher(qos, obj);
 
@@ -180,31 +168,6 @@
     communicator->waitForShutdown();
 
     fed1->unsubscribe(obj);
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Subscriber)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/federation2/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/federation2/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Publisher/subscriber test cases, publisher publishes on TestIceStorm1 instance(s) and
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/Client.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/Client.cpp	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,92 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#include <Ice/Ice.h>
+#include <IceStorm/IceStorm.h>
+#include <TestHelper.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceStorm;
+using namespace Test;
+
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    PropertiesPtr properties = communicator->getProperties();
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
+    if(managerProxy.empty())
+    {
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
+    }
+
+    IceStorm::TopicManagerPrx manager =
+        IceStorm::TopicManagerPrx::checkedCast(communicator->stringToProxy(managerProxy));
+    if(!manager)
+    {
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
+    }
+
+    if(argc != 2)
+    {
+        throw invalid_argument("client create|check");
+    }
+
+    string action(argv[1]);
+    if(action == "create")
+    {
+        //
+        // Create topics
+        //
+        cerr << "creating topics and links..." << flush;
+        TopicPrx linkTo = 0;
+        for(int i = 0; i < 10; ++i)
+        {
+            ostringstream topicName;
+            topicName << "topic" << i;
+            TopicPrx topic = manager->create(topicName.str());
+            if(linkTo)
+            {
+                topic->link(linkTo, i + 1);
+            }
+            linkTo = topic;
+        }
+        cerr << "ok" << endl;
+
+        //
+        // Create a subscriber for each topic
+        //
+        cerr << "create a susbscriber for each topic... ";
+        for(int i = 0; i < 10; ++i)
+        {
+            ostringstream topicName;
+            topicName << "topic" << i;
+            TopicPrx topic = manager->retrieve(topicName.str());
+            test(topic);
+
+            ostringstream subscriber;
+            subscriber << "subscriber" << i << ":default -h 10000";
+            topic->subscribeAndGetPublisher(IceStorm::QoS(), communicator->stringToProxy(subscriber.str()));
+        }
+        cerr << "ok" << endl;
+    }
+    else
+    {
+        test(action == "check");
+    }
+}
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/Makefile.mk	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,10 @@
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+$(test)_programs        = client
+$(test)_dependencies    = IceStorm Ice TestCommon
+
+$(test)_client_sources  = Client.cpp
+
+tests += $(test)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Cpp11-Debug|Win32">
+      <Configuration>Cpp11-Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Debug|x64">
+      <Configuration>Cpp11-Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Release|Win32">
+      <Configuration>Cpp11-Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Cpp11-Release|x64">
+      <Configuration>Cpp11-Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Client.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7D48DD81-247D-467E-B94C-D23EC94BDAB0}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile />
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj.filters zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{908d3c81-3756-42f5-ba9e-23baeb3fdde6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f54ac765-2ba1-40bc-92c2-5f8af6c4a3c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{e0d94eba-4a39-495d-88b1-5199d4c19bad}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Client.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/msbuild/client/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/msbuild/client/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/msbuild/client/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/msbuild/client/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/persistent/test.py	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/persistent/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+icestorm1 = IceStorm(createDb=True, cleanDb=False)
+icestorm2 = IceStorm(createDb=False, cleanDb=True)
+
+
+def test(value):
+    if not value:
+        raise RuntimeError("test failed")
+
+
+class IceStormPersistentTestCase(TestCase):
+
+    def __init__(self, name, icestorm, *args, **kargs):
+        TestCase.__init__(self, name, *args, **kargs)
+        self.icestorm = icestorm
+
+    def init(self, mapping, testsuite):
+        TestCase.init(self, mapping, testsuite)
+        self.servers = [self.icestorm]
+
+    def runWithDriver(self, current):
+        current.driver.runClientServerTestCase(current)
+
+    def teardownClientSide(self, current, success):
+        admin = IceStormAdmin(instance=self.icestorm, quiet=True,
+                              args=["-e", "topics {}".format(self.icestorm.getInstanceName())])
+        admin.run(current, exitstatus=0)
+        #
+        # Ensure all topics have been restored from the storage
+        #
+        topics = admin.getOutput(current).split()
+        test(len(topics) == 10)
+        for i in range(0, 10):
+            topic = topics[i]
+            admin = IceStormAdmin(instance=self.icestorm, quiet=True,
+                                  args=["-e",
+                                        "current {0};subscribers {1}".format(self.icestorm.getInstanceName(), topic)])
+            admin.run(current, exitstatus=0)
+            subscribers = admin.getOutput(current).split()[2:]
+            test("subscriber{0}".format(i) in subscribers)
+            if i > 0:
+                test("IceStorm/topic.topic{0}".format(i - 1) in subscribers)
+
+        self.icestorm.shutdown(current)
+
+class PersistentClient(IceStormProcess, Client):
+
+    processType = "client"
+
+    def __init__(self, instanceName=None, instance=None, *args, **kargs):
+        Client.__init__(self, *args, **kargs)
+        IceStormProcess.__init__(self, instanceName, instance)
+
+    getParentProps = Client.getProps # Used by IceStormProcess to get the client properties
+
+TestSuite(__file__, [
+    IceStormPersistentTestCase("persistent create", icestorm1,
+                               client=ClientTestCase(client=PersistentClient(instance=icestorm1, args=["create"]))),
+    IceStormPersistentTestCase("persistent check", icestorm2,
+                               client=ClientTestCase(client=PersistentClient(instance=icestorm2, args=["check"]))),
+], multihost=False)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs        = publisher subscriber sub
 $(test)_dependencies    = IceStorm Ice TestCommon
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -295,12 +295,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/sub/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/sub/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/sub/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/sub/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Publisher.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Publisher.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Publisher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Publisher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/IceUtil.h>
 #include <IceStorm/IceStorm.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Single.h>
 
 using namespace std;
@@ -19,9 +14,17 @@
 using namespace IceStorm;
 using namespace Test;
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Publisher : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Publisher::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtilInternal::Options opts;
     opts.addOpt("", "cycle");
 
@@ -31,25 +34,27 @@
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": " << e.reason;
+        throw invalid_argument(os.str());
     }
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(
         communicator->stringToProxy(managerProxy));
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
     TopicPrx topic;
@@ -68,8 +73,9 @@
         }
         catch(const IceStorm::NoSuchTopic& e)
         {
-            cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << argv[0] << ": NoSuchTopic: " << e.name;
+            throw invalid_argument(os.str());
         }
     }
     assert(topic);
@@ -94,8 +100,9 @@
         }
         if(single.size() <= 1)
         {
-            cerr << argv[0] << ": Not enough endpoints in publisher proxy" << endl;
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << argv[0] << ": Not enough endpoints in publisher proxy";
+            throw invalid_argument(os.str());
         }
         int which = 0;
         for(int i = 0; i < 1000; ++i)
@@ -112,31 +119,6 @@
             single->event(i);
         }
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Publisher)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Single.ice zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Single.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Single.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Single.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Sub.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Sub.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Sub.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Sub.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Options.h>
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Single.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -27,9 +22,17 @@
     virtual void event(int, const Current&) {}
 };
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Sub : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Sub::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtilInternal::Options opts;
     opts.addOpt("", "id", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "unsub");
@@ -40,39 +43,32 @@
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": error: " << e.reason;
+        throw invalid_argument(os.str());
     }
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
     ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SingleAdapter", "default");
 
-    TopicPrx topic;
-    try
-    {
-        topic = manager->retrieve("single");
-    }
-    catch(const IceStorm::NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx topic = manager->retrieve("single");
 
     Ice::ObjectPrx prx = adapter->add(new SingleI(), stringToIdentity(opts.optArg("id")));
     if(opts.isSet("unsub"))
@@ -85,31 +81,6 @@
         qos["persistent"] = "true";
         topic->subscribeAndGetPublisher(qos, prx);
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Sub)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Subscriber.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Subscriber.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/Subscriber.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/Subscriber.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Options.h>
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Single.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -72,9 +67,17 @@
 };
 typedef IceUtil::Handle<SingleI> SingleIPtr;
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Subscriber : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Subscriber::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtilInternal::Options opts;
     opts.addOpt("", "ordered");
     opts.addOpt("", "twoway");
@@ -86,25 +89,27 @@
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": error: " << e.reason;
+        throw invalid_argument(os.str());
     }
 
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
     ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SingleAdapter", "default");
@@ -125,8 +130,9 @@
         }
         catch(const IceStorm::NoSuchTopic& e)
         {
-            cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << argv[0] << ": NoSuchTopic: " << e.name;
+            throw invalid_argument(os.str());
         }
     }
 
@@ -142,12 +148,12 @@
     IceStorm::QoS qos;
     if(opts.isSet("ordered"))
     {
-        sub = new SingleI(communicator, "twoway ordered", events);
+        sub = new SingleI(communicator.communicator(), "twoway ordered", events);
         qos["reliability"] = "ordered";
     }
     else
     {
-        sub = new SingleI(communicator, "twoway", events);
+        sub = new SingleI(communicator.communicator(), "twoway", events);
     }
 
     Ice::ObjectPrx prx = adapter->addWithUUID(sub);
@@ -177,31 +183,6 @@
     sub->waitForEvents();
 
     topic->unsubscribe(prx);
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Subscriber)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/rep1/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/rep1/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Make sure IceStorm and the subscriber use the same buffer size for
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/application.xml zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/application.xml
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/application.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/application.xml	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,4 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 
 <icegrid>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/Client.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Single.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -56,29 +51,29 @@
 };
 typedef IceUtil::Handle<SingleI> SingleIPtr;
 
-int
-run(int, char* argv[], const CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     ObjectPrx base = communicator->stringToProxy("Test.IceStorm/TopicManager");
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `Test.IceStorm/TopicManager' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `Test.IceStorm/TopicManager' is not running";
+        throw invalid_argument(os.str());
     }
 
     ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SingleAdapter", "default:udp");
 
-    TopicPrx topic;
-    try
-    {
-        topic = manager->create("single");
-    }
-    catch(const IceStorm::TopicExists& e)
-    {
-        cerr << argv[0] << ": TopicExists: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx topic = manager->create("single");
 
     //
     // Create subscribers with different QoS.
@@ -108,31 +103,6 @@
     }
 
     sub->waitForEvents();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_dependencies    = IceStorm Ice TestCommon
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -295,12 +295,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/Single.ice zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/Single.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/Single.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/Single.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repgrid/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repgrid/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 if isinstance(platform, Windows) or os.getuid() != 0:
     TestSuite(__file__, [ IceGridTestCase(icegridregistry=IceGridRegistryMaster(),
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Control.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Control.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Control.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Control.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Controller.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Control : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Control::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     if(argc < 2)
     {
-        cerr << "Usage: " << argv[0] << " proxy" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << "Usage: " << argv[0] << " proxy";
+        throw invalid_argument(os.str());
     }
 
     ControllerPrx control = ControllerPrx::uncheckedCast(communicator->stringToProxy(argv[1]));
     control->stop();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Control)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Controller.ice zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Controller.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Controller.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Controller.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs        = publisher subscriber control
 $(test)_dependencies    = IceStorm Ice TestCommon
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -418,9 +418,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -496,12 +496,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/control/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/control/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/control/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/control/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -418,9 +418,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -456,12 +456,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -418,9 +418,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -496,12 +496,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Publisher.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Publisher.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Publisher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Publisher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include <IceStorm/IceStorm.h>
 #include <Single.h>
 #include <Controller.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -81,37 +76,37 @@
 };
 typedef IceUtil::Handle<PublishThread> PublishThreadPtr;
 
-int
-run(int, char* argv[], const CommunicatorPtr& communicator)
+class Publisher : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Publisher::run(int argc, char** argv)
 {
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(
         communicator->stringToProxy(managerProxy));
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
-    }
-
-    TopicPrx topic;
-    try
-    {
-        topic = manager->retrieve("single");
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
-    catch(const NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
 
-    }
+    TopicPrx topic = manager->retrieve("single");
     assert(topic);
 
     //
@@ -132,31 +127,6 @@
 
     t->destroy();
     t->getThreadControl().join();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Publisher)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Single.ice zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Single.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Single.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Single.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Subscriber.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Subscriber.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/Subscriber.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/Subscriber.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Single.h>
 #include <Controller.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -58,38 +53,37 @@
 };
 typedef IceUtil::Handle<SingleI> SingleIPtr;
 
-int
-run(int, char* argv[], const CommunicatorPtr& communicator)
+class Subscriber : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Subscriber::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
     ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("SingleAdapter", "default");
-
-    TopicPrx topic;
-    try
-    {
-        topic = manager->retrieve("single");
-    }
-    catch(const IceStorm::NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx topic = manager->retrieve("single");
 
     SingleIPtr sub = new SingleI();
     Ice::ObjectPrx prx = adapter->addWithUUID(sub);
@@ -123,31 +117,6 @@
     communicator->waitForShutdown();
 
     cout << sub->nevents() << endl;
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Subscriber)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/repstress/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/repstress/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Make sure IceStorm and the subscriber use the same buffer size for
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/single/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs        = publisher subscriber
 $(test)_dependencies    = IceStorm Ice TestCommon
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/publisher/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/publisher/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/publisher/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/publisher/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -295,12 +295,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/subscriber/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/subscriber/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/subscriber/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/subscriber/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/Publisher.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/single/Publisher.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/Publisher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/Publisher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Single.h>
 
 using namespace std;
@@ -17,36 +12,36 @@
 using namespace IceStorm;
 using namespace Test;
 
-int
-run(int, char* argv[], const CommunicatorPtr& communicator)
+class Publisher : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Publisher::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(
         communicator->stringToProxy(managerProxy));
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
-    TopicPrx topic;
-    try
-    {
-        topic = manager->retrieve("single");
-    }
-    catch(const NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx topic = manager->retrieve("single");
     assert(topic);
 
     //
@@ -58,32 +53,6 @@
     {
         single->event(i);
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Publisher)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/Single.ice zeroc-ice-3.7.2/cpp/test/IceStorm/single/Single.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/Single.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/Single.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/Subscriber.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/single/Subscriber.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/Subscriber.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/Subscriber.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
 #include <Single.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -21,8 +16,7 @@
 {
 public:
 
-    SingleI(const CommunicatorPtr& communicator, const string& name) :
-        _communicator(communicator),
+    SingleI(const string& name) :
         _name(name),
         _count(0),
         _last(0)
@@ -102,7 +96,6 @@
 
 private:
 
-    CommunicatorPtr _communicator;
     const string _name;
     int _count;
     int _last;
@@ -110,24 +103,33 @@
 };
 typedef IceUtil::Handle<SingleI> SingleIPtr;
 
-int
-run(int, char* argv[], const CommunicatorPtr& communicator)
+class Subscriber : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Subscriber::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     PropertiesPtr properties = communicator->getProperties();
-    const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default";
-    string managerProxy = properties->getProperty(managerProxyProperty);
+    string managerProxy = properties->getProperty("IceStormAdmin.TopicManager.Default");
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `IceStormAdmin.TopicManager.Default' is not set";
+        throw invalid_argument(os.str());
     }
 
     ObjectPrx base = communicator->stringToProxy(managerProxy);
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base);
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
     // Use 2 default endpoints to test per-request load balancing
@@ -148,16 +150,7 @@
         }
     }
 
-    TopicPrx topic;
-    try
-    {
-        topic = manager->retrieve("single");
-    }
-    catch(const IceStorm::NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx topic = manager->retrieve("single");
 
     //
     // Test subscriber identity that is too long
@@ -182,31 +175,31 @@
     vector<Ice::Identity> subscriberIdentities;
 
     {
-        subscribers.push_back(new SingleI(communicator, "default"));
+        subscribers.push_back(new SingleI("default"));
         Ice::ObjectPrx object = adapter->addWithUUID(subscribers.back())->ice_oneway();
         subscriberIdentities.push_back(object->ice_getIdentity());
         topic->subscribeAndGetPublisher(IceStorm::QoS(), object);
     }
     {
-        subscribers.push_back(new SingleI(communicator, "oneway"));
+        subscribers.push_back(new SingleI("oneway"));
         Ice::ObjectPrx object = adapter->addWithUUID(subscribers.back())->ice_oneway();
         subscriberIdentities.push_back(object->ice_getIdentity());
         topic->subscribeAndGetPublisher(IceStorm::QoS(), object);
     }
     {
-        subscribers.push_back(new SingleI(communicator, "twoway"));
+        subscribers.push_back(new SingleI("twoway"));
         Ice::ObjectPrx object = adapter->addWithUUID(subscribers.back());
         subscriberIdentities.push_back(object->ice_getIdentity());
         topic->subscribeAndGetPublisher(IceStorm::QoS(), object);
     }
     {
-        subscribers.push_back(new SingleI(communicator, "batch"));
+        subscribers.push_back(new SingleI("batch"));
         Ice::ObjectPrx object = adapter->addWithUUID(subscribers.back())->ice_batchOneway();
         subscriberIdentities.push_back(object->ice_getIdentity());
         topic->subscribeAndGetPublisher(IceStorm::QoS(), object);
     }
     {
-        subscribers.push_back(new SingleI(communicator, "twoway ordered")); // Ordered
+        subscribers.push_back(new SingleI("twoway ordered")); // Ordered
         IceStorm::QoS qos;
         qos["reliability"] = "ordered";
         Ice::ObjectPrx object = adapter->addWithUUID(subscribers.back());
@@ -215,7 +208,7 @@
     }
 
     {
-        subscribers.push_back(new SingleI(communicator, "per-request load balancing"));
+        subscribers.push_back(new SingleI("per-request load balancing"));
         IceStorm::QoS qos;
         qos["locatorCacheTimeout"] = "10";
         qos["connectionCached"] = "0";
@@ -229,7 +222,7 @@
         // packet loss, see bug 1784).
         communicator->getProperties()->setProperty("UdpAdapter3.ThreadPool.Size", "1");
         ObjectAdapterPtr adpt = communicator->createObjectAdapterWithEndpoints("UdpAdapter3", "udp");
-        subscribers.push_back(new SingleI(communicator, "datagram"));
+        subscribers.push_back(new SingleI("datagram"));
         Ice::ObjectPrx object = adpt->addWithUUID(subscribers.back())->ice_datagram();
         subscriberIdentities.push_back(object->ice_getIdentity());
         adpt->activate();
@@ -241,7 +234,7 @@
         // packet loss, see bug 1784).
         communicator->getProperties()->setProperty("UdpAdapter4.ThreadPool.Size", "1");
         ObjectAdapterPtr adpt = communicator->createObjectAdapterWithEndpoints("UdpAdapter4", "udp");
-        subscribers.push_back(new SingleI(communicator, "batch datagram"));
+        subscribers.push_back(new SingleI("batch datagram"));
         Ice::ObjectPrx object = adpt->addWithUUID(subscribers.back())->ice_batchDatagram();
         subscriberIdentities.push_back(object->ice_getIdentity());
         adpt->activate();
@@ -261,32 +254,6 @@
     {
         (*p)->waitForEvents();
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Subscriber)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/single/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/single/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/single/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/single/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Make sure the subscriber uses a larger size receive buffer size then
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Event.ice zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Event.ice
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Event.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Event.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_programs        = publisher subscriber
 $(test)_dependencies    = IceStorm Ice TestCommon
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/publisher/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/publisher/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/publisher/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/publisher/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -295,12 +295,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -257,9 +257,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -335,12 +335,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Publisher.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Publisher.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Publisher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Publisher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceUtil/Options.h>
 #include <IceStorm/IceStorm.h>
 #include <Event.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceStorm;
 using namespace Test;
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Publisher : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Publisher::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtilInternal::Options opts;
     opts.addOpt("", "events", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "oneway");
@@ -32,8 +35,9 @@
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": error: " << e.reason;
+        throw invalid_argument(os.str());
     }
 
     int events = 1000;
@@ -44,8 +48,9 @@
     }
     if(events <= 0)
     {
-        cerr << argv[0] << ": events must be > 0." << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": events must be > 0.";
+        throw invalid_argument(os.str());
     }
 
     bool oneway = opts.isSet("oneway");
@@ -56,29 +61,21 @@
     string managerProxy = properties->getProperty(managerProxyProperty);
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `" << managerProxyProperty << "' is not set";
+        throw invalid_argument(os.str());
     }
 
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(
         communicator->stringToProxy(managerProxy));
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
-    TopicPrx topic;
-    try
-    {
-        topic = manager->retrieve("fed1");
-    }
-    catch(const NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-
-    }
+    TopicPrx topic = manager->retrieve("fed1");
 
     EventPrx twowayProxy = EventPrx::uncheckedCast(topic->getPublisher()->ice_twoway());
     EventPrx proxy;
@@ -109,31 +106,6 @@
         //
         twowayProxy->ice_ping();
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Publisher)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Subscriber.cpp zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Subscriber.cpp
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/Subscriber.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/Subscriber.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceStorm/IceStorm.h>
@@ -16,7 +11,7 @@
 #include <Event.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
@@ -169,7 +164,7 @@
             current.adapter->deactivate();
             _count = _total;
             {
-                IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_remainingMutex);
+                IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync2(_remainingMutex);
                 --_remaining;
                 if(_remaining == 0)
                 {
@@ -304,9 +299,17 @@
 
 }
 
-int
-run(int argc, char* argv[], const CommunicatorPtr& communicator)
+class Subscriber : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Subscriber::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     IceUtilInternal::Options opts;
     opts.addOpt("", "events", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "qos", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
@@ -321,8 +324,9 @@
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": error: " << e.reason;
+        throw invalid_argument(os.str());
     }
 
     int events = 1000;
@@ -333,8 +337,9 @@
     }
     if(events <= 0)
     {
-        cerr << argv[0] << ": events must be > 0." << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": events must be > 0.";
+        throw invalid_argument(os.str());
     }
 
     IceStorm::QoS cmdLineQos;
@@ -345,8 +350,9 @@
         string::size_type off = q->find(",");
         if(off == string::npos)
         {
-            cerr << argv[0] << ": parse error: no , in QoS" << endl;
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << argv[0] << ": parse error: no , in QoS";
+            throw invalid_argument(os.str());
         }
         cmdLineQos[q->substr(0, off)] = q->substr(off+1);
     }
@@ -364,8 +370,9 @@
     }
     if(events <= 0)
     {
-        cerr << argv[0] << ": events must be > 0." << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": events must be > 0.";
+        throw invalid_argument(os.str());
     }
 
     PropertiesPtr properties = communicator->getProperties();
@@ -373,16 +380,18 @@
     string managerProxy = properties->getProperty(managerProxyProperty);
     if(managerProxy.empty())
     {
-        cerr << argv[0] << ": property `" << managerProxyProperty << "' is not set" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": property `" << managerProxyProperty << "' is not set";
+        throw invalid_argument(os.str());
     }
 
     IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(
         communicator->stringToProxy(managerProxy));
     if(!manager)
     {
-        cerr << argv[0] << ": `" << managerProxy << "' is not running" << endl;
-        return EXIT_FAILURE;
+        ostringstream os;
+        os << argv[0] << ": `" << managerProxy << "' is not running";
+        throw invalid_argument(os.str());
     }
 
     vector<Subscription> subs;
@@ -395,7 +404,7 @@
             os << "SubscriberAdapter" << i;
             Subscription item;
             item.adapter = communicator->createObjectAdapterWithEndpoints(os.str(), "default");
-            item.servant = new ErraticEventI(communicator, events);
+            item.servant = new ErraticEventI(communicator.communicator(), events);
             item.qos["reliability"] = "twoway";
             subs.push_back(item);
         }
@@ -404,7 +413,7 @@
     {
         Subscription item;
         item.adapter = communicator->createObjectAdapterWithEndpoints("SubscriberAdapter", "default");
-        item.servant = new SlowEventI(communicator, events);
+        item.servant = new SlowEventI(communicator.communicator(), events);
         item.qos = cmdLineQos;
         subs.push_back(item);
     }
@@ -414,11 +423,11 @@
         item1.adapter = communicator->createObjectAdapterWithEndpoints("MaxQueueAdapter", "default");
         if(maxQueueDropEvents)
         {
-            item1.servant = new MaxQueueEventI(communicator, maxQueueDropEvents, events, false);
+            item1.servant = new MaxQueueEventI(communicator.communicator(), maxQueueDropEvents, events, false);
         }
         else
         {
-            item1.servant = new MaxQueueEventI(communicator, maxQueueRemoveSub, events, true);
+            item1.servant = new MaxQueueEventI(communicator.communicator(), maxQueueRemoveSub, events, true);
         }
         item1.qos = cmdLineQos;
         item1.activate = false;
@@ -426,7 +435,7 @@
 
         Subscription item2;
         item2.adapter = communicator->createObjectAdapterWithEndpoints("ControllerAdapter", "default");
-        item2.servant = new ControllerEventI(communicator, events, item1.adapter);
+        item2.servant = new ControllerEventI(communicator.communicator(), events, item1.adapter);
         item2.qos["reliability"] = "oneway";
         subs.push_back(item2);
     }
@@ -438,25 +447,16 @@
         map<string, string>::const_iterator p = item.qos.find("reliability");
         if(p != item.qos.end() && p->second == "ordered")
         {
-            item.servant = new OrderEventI(communicator, events);
+            item.servant = new OrderEventI(communicator.communicator(), events);
         }
         else
         {
-            item.servant = new CountEventI(communicator, events);
+            item.servant = new CountEventI(communicator.communicator(), events);
         }
         subs.push_back(item);
     }
 
-    TopicPrx topic;
-    try
-    {
-        topic = manager->retrieve("fed1");
-    }
-    catch(const IceStorm::NoSuchTopic& e)
-    {
-        cerr << argv[0] << ": NoSuchTopic: " << e.name << endl;
-        return EXIT_FAILURE;
-    }
+    TopicPrx topic = manager->retrieve("fed1");
 
     {
         for(vector<Subscription>::iterator p = subs.begin(); p != subs.end(); ++p)
@@ -509,36 +509,12 @@
             topic->unsubscribe(p->obj);
             if(p->servant->count() != events)
             {
-                cerr << "expected " << events << " events but got " << p->servant->count() << " events." << endl;
-                return EXIT_FAILURE;
+                ostringstream os;
+                os << "expected " << events << " events but got " << p->servant->count() << " events.";
+                throw invalid_argument(os.str());
             }
         }
     }
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    int status;
-    CommunicatorPtr communicator;
-    InitializationData initData = getTestInitData(argc, argv);
-    try
-    {
-        communicator = initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Subscriber)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceStorm/stress/test.py zeroc-ice-3.7.2/cpp/test/IceStorm/stress/test.py
--- zeroc-ice-3.7.1/cpp/test/IceStorm/stress/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceStorm/stress/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Publisher/subscriber test cases, publisher publishes on TestIceStorm1 instance(s) and
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/Makefile.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-$(test)_programs            = workqueue match
-
-$(test)_workqueue_sources   = WorkQueue.cpp
-$(test)_match_sources       = Match.cpp
-
-tests += $(test)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/Match.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/Match.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/Match.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/Match.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/Thread.h>
-#include <IceUtil/Time.h>
-#include <IceUtil/Cond.h>
-#include <IceUtil/Options.h>
-#include <iostream>
-
-using namespace std;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-enum State
-{
-    StateStart,
-    StatePlayerA,
-    StatePlayerB,
-    StateGameOver
-};
-
-struct Game
-{
-    IceUtil::Mutex mutex;
-    IceUtil::Cond cond;
-    State state;
-    int hits;
-    bool broadcast;
-    bool noise;
-};
-
-class Player : public Thread
-{
-public:
-
-    Player(Game* game, State which) :
-        _game(game), _which(which)
-    {
-    }
-
-    virtual void
-    run()
-    {
-        Mutex::Lock sync(_game->mutex);
-        while(_game->state < StateGameOver)
-        {
-            ++_game->hits;
-            _game->state = _which;
-            if(_game->broadcast)
-            {
-                _game->cond.broadcast();
-            }
-            else
-            {
-                _game->cond.signal();
-            }
-            do
-            {
-                _game->cond.wait(sync);
-                if(_game->state == _which && !_game->noise)
-                {
-                    cout << endl << "PLAYER-" << ((_which == StatePlayerA) ? "B" : "A")
-                         << ": Supurious wakeup" << endl;
-                }
-            }
-            while(_game->state == _which);
-        }
-    }
-
-private:
-
-    Game* _game;
-    State _which;
-};
-typedef Handle<Player> PlayerPtr;
-
-int
-main(int argc, char** argv)
-{
-    Options opts;
-    opts.addOpt("t", "timeout", Options::NeedArg, "5");
-    opts.addOpt("b", "broadcast");
-    try
-    {
-        opts.parse(argc, (const char**)argv);
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
-    }
-
-    Game game;
-    game.hits = 0;
-    game.state = StateStart;
-    game.broadcast = opts.isSet("b");
-    game.noise = false;
-
-    PlayerPtr playerA = new Player(&game, StatePlayerA);
-    playerA->start();
-    PlayerPtr playerB = new Player(&game, StatePlayerB);
-    playerB->start();
-
-    cout << "running spurious wake test (" << ((game.broadcast) ? "broadcast" : "signal") << ")... " << flush;
-
-    ThreadControl::sleep(Time::seconds(atoi(opts.optArg("t").c_str())));
-
-    if(game.broadcast)
-    {
-        {
-            Mutex::Lock sync(game.mutex);
-            game.noise = true;
-        }
-        for(int i =0 ; i < 100000; ++i)
-        {
-            game.cond.broadcast();
-        }
-        {
-            Mutex::Lock sync(game.mutex);
-            game.noise = false;
-        }
-    }
-
-    {
-        Mutex::Lock sync(game.mutex);
-        game.state = StateGameOver;
-        game.cond.broadcast();
-    }
-
-    playerA->getThreadControl().join();
-    playerB->getThreadControl().join();
-
-    cout << game.hits << " ok" << endl;
-
-    return 0;
-}
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Cpp11-Debug|Win32">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Debug|x64">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|Win32">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|x64">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Match.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7AAF5067-EBBB-46BA-934B-0337EE844B69}</ProjectGuid>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup>
-    <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And  '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
-  </Target>
-</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj.filters zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj.filters	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/match/match.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\Match.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Slice Files">
-      <UniqueIdentifier>{ca6eb7e2-a924-4b6b-b463-066d9a1600b4}</UniqueIdentifier>
-      <Extensions>ice</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/match/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/match/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/match/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/match/packages.config	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/workqueue/packages.config	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
-</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Cpp11-Debug|Win32">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Debug|x64">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|Win32">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|x64">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\WorkQueue.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6859C86F-E845-4CC3-9667-549638D1BBE4}</ProjectGuid>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup>
-    <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And  '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
-  </Target>
-</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj.filters zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj.filters	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/msbuild/workqueue/workqueue.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\WorkQueue.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Slice Files">
-      <UniqueIdentifier>{01df4dcc-910e-494c-9854-66c29e6f1fa6}</UniqueIdentifier>
-      <Extensions>ice</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/WorkQueue.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/WorkQueue.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/condvar/WorkQueue.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/condvar/WorkQueue.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,310 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/Thread.h>
-#include <IceUtil/Time.h>
-#include <IceUtil/Monitor.h>
-#include <IceUtil/Options.h>
-
-#include <iostream>
-#include <list>
-
-using namespace std;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-class CountDown : public Monitor<Mutex>, public Shared
-{
-public:
-
-    CountDown(int count) : _count(count) { }
-
-    void decrement()
-    {
-        Monitor<Mutex>::Lock lock(*this);
-        assert(_count > 0);
-        --_count;
-        if(_count == 0)
-        {
-            notifyAll();
-        }
-    }
-
-    void waitZero()
-    {
-        Monitor<Mutex>::Lock lock(*this);
-        while(_count > 0)
-        {
-            wait();
-        }
-    }
-
-private:
-
-    int _count;
-};
-typedef Handle<CountDown> CountDownPtr;
-
-class Queue: public Monitor<Mutex>, public Shared
-{
-public:
-
-    Queue(bool broadcast) :
-        _broadcast(broadcast), _terminate(false)
-    {
-    }
-
-    void
-    put(const int& item)
-    {
-        Monitor<Mutex>::Lock lock(*this);
-        _q.push_back(item);
-        if(_broadcast)
-        {
-            notifyAll();
-        }
-        else
-        {
-            notify();
-        }
-    }
-
-    void
-    terminate()
-    {
-        Monitor<Mutex>::Lock lock(*this);
-        _terminate = true;
-        notifyAll();
-    }
-
-    bool
-    timedGet(int& ret, const Time& timeout)
-    {
-        Monitor<Mutex>::Lock lock(*this);
-        if(_q.empty())
-        {
-            timedWait(timeout);
-        }
-
-        // We only report the termination sentinel when the queue is
-        // empty.
-        if(_q.empty())
-        {
-            if(_terminate)
-            {
-                ret = -1;
-            }
-            return false;
-        }
-
-        assert(!_q.empty());
-        ret = _q.front();
-        if(ret % 100 == 0)
-        {
-            cout << "." << flush;
-        }
-        _q.pop_front();
-        return true;
-    }
-
-    int
-    get()
-    {
-        Monitor<Mutex>::Lock lock(*this);
-        while(_q.empty() && !_terminate)
-        {
-            wait();
-        }
-
-        // We only report the termination sentinel when the queue is
-        // empty.
-        if(_q.empty())
-        {
-            assert(_terminate);
-            return -1;
-        }
-
-        assert(!_q.empty());
-        int ret = _q.front();
-        if(ret % 100 == 0)
-        {
-            cout << "." << flush;
-        }
-        _q.pop_front();
-        return ret;
-    }
-
-private:
-    const bool _broadcast;
-    bool _terminate;
-    list<int> _q;
-};
-typedef Handle<Queue> QueuePtr;
-
-class TestThread : public Thread
-{
-public:
-
-    TestThread(const CountDownPtr& cd, const QueuePtr& q, bool poll) :
-        _cd(cd), _q(q), _poll(poll)
-    {
-    }
-    virtual void
-    run()
-    {
-        _cd->decrement();
-        while(true)
-        {
-            int res = 0;
-            if(_poll)
-            {
-                _q->timedGet(res, Time::milliSeconds(10));
-            }
-            else
-            {
-                res = _q->get();
-            }
-            if(res == -1)
-            {
-                return;
-            }
-        }
-    }
-
-private:
-    const CountDownPtr _cd;
-    const QueuePtr _q;
-    const bool _poll;
-};
-typedef Handle<TestThread> TestThreadPtr;
-
-class EnqueueThread : public Thread
-{
-public:
-
-    EnqueueThread(const CountDownPtr& cd, const QueuePtr& q, int v) :
-        _cd(cd), _q(q), _v(v)
-    {
-    }
-
-    virtual void
-    run()
-    {
-        _cd->decrement();
-        // Forever
-        if(_v == 0)
-        {
-            while(true)
-            {
-                _q->put(_v++);
-                ThreadControl::yield();
-            }
-        }
-        else
-        {
-            while(_v > 0)
-            {
-                _q->put(_v);
-                --_v;
-                ThreadControl::yield();
-            }
-        }
-    }
-
-private:
-
-    const CountDownPtr _cd;
-    const QueuePtr _q;
-    int _v;
-};
-typedef Handle<EnqueueThread> EnqueueThreadPtr;
-
-int
-main(int argc, char** argv)
-{
-    Options opts;
-    opts.addOpt("n", "events", Options::NeedArg, "5000");
-    opts.addOpt("v", "verbose");
-    try
-    {
-        opts.parse(argc, (const char**)argv);
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        cerr << argv[0] << ": " << e.reason << endl;
-        return EXIT_FAILURE;
-    }
-
-    srand(0);
-
-    //
-    // if n = 0 then we'll enqueue forever. Otherwise the test will
-    // terminate after n events have been enqueued by each enqueue
-    // thread.
-    //
-    int n = atoi(opts.optArg("n").c_str());
-
-    cout << "running signal/broadcast timeout test" << flush;
-    QueuePtr signalQ = new Queue(false);
-
-    QueuePtr broadcastQ = new Queue(true);
-
-    CountDownPtr cd = new CountDown(210);
-    list<TestThreadPtr> testThreads;
-    list<EnqueueThreadPtr> enqThreads;
-    int i;
-
-    for(i = 0; i < 100; i++)
-    {
-        TestThreadPtr p = new TestThread(cd, signalQ, i % 2 != 0);
-        p->start();
-        testThreads.push_back(p);
-    }
-    for(i = 0; i < 5; i++)
-    {
-        EnqueueThreadPtr p = new EnqueueThread(cd, signalQ, n);
-        p->start();
-        enqThreads.push_back(p);
-    }
-
-    for(i = 0; i < 100; i++)
-    {
-        TestThreadPtr p = new TestThread(cd, broadcastQ, i % 2 != 0);
-        p->start();
-        testThreads.push_back(p);
-    }
-    for(i = 0; i < 5; i++)
-    {
-        EnqueueThreadPtr p = new EnqueueThread(cd, broadcastQ, n);
-        p->start();
-        enqThreads.push_back(p);
-    }
-    cd->waitZero();
-
-    while(!enqThreads.empty())
-    {
-        EnqueueThreadPtr p = enqThreads.front();
-        enqThreads.pop_front();
-        p->getThreadControl().join();
-    }
-
-    signalQ->terminate();
-    broadcastQ->terminate();
-
-    while(!testThreads.empty())
-    {
-        TestThreadPtr p = testThreads.front();
-        testThreads.pop_front();
-        p->getThreadControl().join();
-    }
-
-    cout << " ok" << endl;
-
-    return 0;
-}
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Thread.h>
 #include <IceUtil/Time.h>
@@ -20,7 +15,15 @@
     cout << "Handling signal " << signal << endl;
 }
 
-int main()
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int, char**)
 {
     {
         cout << "First ignore CTRL+C and the like for 10 seconds (try it!)" << endl;
@@ -33,7 +36,7 @@
     }
     cout << "And another 10 seconds after ~CtrlCHandler" << endl;
     ThreadControl::sleep(Time::seconds(10));
-
     cout << "ok" << endl;
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 tests += $(test)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/test.py zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/test.py
--- zeroc-ice-3.7.1/cpp/test/IceUtil/ctrlCHandler/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/ctrlCHandler/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Dummy file to not run this test which is only ran manually.
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/inputUtil/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/inputUtil/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/inputUtil/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/inputUtil/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/InputUtil.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Options.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #include <vector>
 
@@ -31,8 +26,15 @@
 const Int64 Int64Max = 0x7fffffffffffffffLL;
 #endif
 
-int
-main(int, char**)
+class Client : public Test::TestHelper
+{
+public:
+
+    virtual void run(int argc, char* argv[]);
+};
+
+void
+Client::run(int, char**)
 {
     cout << "testing string-to-64-bit integer conversion... " << flush;
 
@@ -242,6 +244,6 @@
         test(!IceUtilInternal::splitString("a\"b", ":", ss));
     }
     cout << "ok" << endl;
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/inputUtil/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/inputUtil/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/inputUtil/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/inputUtil/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/priority/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <stdlib.h>
-#include <TestCommon.h>
-
+#include <TestHelper.h>
 #include <TestSuite.h>
 #include <IceUtil/MutexProtocol.h>
 
@@ -36,22 +30,22 @@
 
 #endif
 
-int
-main(int, char**)
+class Client : public Test::TestHelper
 {
-    try
-    {
-        initializeTestSuite();
+public:
 
-        for(list<TestBasePtr>::const_iterator p = allTests.begin(); p != allTests.end(); ++p)
-        {
-            (*p)->start();
-        }
-    }
-    catch(const TestFailed& e)
+    void run(int, char**);
+};
+
+void
+Client::run(int, char**)
+{
+    initializeTestSuite();
+
+    for(list<TestBasePtr>::const_iterator p = allTests.begin(); p != allTests.end(); ++p)
     {
-        cout << "test " << e.name << " failed" << endl;
-        return EXIT_FAILURE;
+        (*p)->start();
     }
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceUtil/priority/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp))
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/priority/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -182,13 +182,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/priority/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/PriorityInversion.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/priority/PriorityInversion.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/PriorityInversion.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/PriorityInversion.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <PriorityInversion.h>
 #include <IceUtil/Thread.h>
@@ -15,7 +10,7 @@
 #include <IceUtil/RecMutex.h>
 
 #include <sstream>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <vector>
 #include <map>
 
@@ -328,11 +323,12 @@
 void
 PriorityInversionTest::run()
 {
-    int cores, high, medium, low, timeout;
-    timeout = 30;
+
 #ifdef _WIN32
     return; //Priority inversion is not supported by WIN32
 #else
+    int cores, high, medium, low, timeout;
+    timeout = 30;
     try
     {
         IceUtil::Mutex m;
@@ -345,7 +341,6 @@
     high = 45;
     medium = 35;
     low = 1;
-#endif
 
     {
         Monitor<Mutex> monitor;
@@ -442,4 +437,5 @@
             }
         }
     }
+#endif
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/PriorityInversion.h zeroc-ice-3.7.2/cpp/test/IceUtil/priority/PriorityInversion.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/PriorityInversion.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/PriorityInversion.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef PRIORITY_INVERSION_TEST_H
 #define PRIORITY_INVERSION_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestBase.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestBase.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestBase.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestBase.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestBase.h zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestBase.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestBase.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestBase.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_BASE_H
 #define TEST_BASE_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/test.py zeroc-ice-3.7.2/cpp/test/IceUtil/priority/test.py
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 if not isinstance(platform, Darwin) and (isinstance(platform, Windows) or os.getuid() == 0):
     TestSuite(__name__)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestSuite.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestSuite.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestSuite.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestSuite.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/MutexProtocol.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestSuite.h zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestSuite.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TestSuite.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TestSuite.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_SUITE_H
 #define TEST_SUITE_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/ThreadPriority.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/priority/ThreadPriority.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/ThreadPriority.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/ThreadPriority.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <ThreadPriority.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/ThreadPriority.h zeroc-ice-3.7.2/cpp/test/IceUtil/priority/ThreadPriority.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/ThreadPriority.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/ThreadPriority.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef THREAD_PRIORITY_TEST_H
 #define THREAD_PRIORITY_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TimerPriority.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TimerPriority.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TimerPriority.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TimerPriority.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Timer.h>
 #include <TimerPriority.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TimerPriority.h zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TimerPriority.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/priority/TimerPriority.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/priority/TimerPriority.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TIMER_PRIORITY_TEST_H
 #define TIMER_PRIORITY_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/sha1/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/sha1/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/sha1/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/sha1/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/SHA1.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
@@ -75,7 +70,15 @@
 
 }
 
-int main(int argc, char* argv[])
+class Client : public Test::TestHelper
+{
+public:
+
+    virtual void run(int argc, char* argv[]);
+};
+
+void
+Client::run(int, char*[])
 {
     cout << "Testing sha1 hash computation... ";
     for(int i = 0; i < itemsSize; ++i)
@@ -110,5 +113,6 @@
         test(item->digest == digest);
     }
     cout << "ok" << endl;
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/sha1/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/sha1/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/sha1/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/sha1/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/sha1/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/sha1/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/sha1/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/sha1/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringUtil.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #include <fstream>
 
@@ -96,12 +91,20 @@
 
 }
 
-int main(int argc, char* argv[])
+class Client : public Test::TestHelper
+{
+public:
+
+    virtual void run(int argc, char* argv[]);
+};
+
+void
+Client::run(int, char*[])
 {
     if(IceUtilInternal::stackTraceImpl() == IceUtilInternal::STNone)
     {
         cout << "This Ice build cannot capture stack traces" << endl;
-        return EXIT_SUCCESS;
+        return;
     }
 
     bool optimized = false;
@@ -128,6 +131,12 @@
 #    elif(_MSC_VER >= 1910)
         filename += "-vc141";
 #   endif
+#elif defined(__apple_build_version__)
+#   if(__apple_build_version__ >= 10001145)
+        filename += "-xcode10";
+    #else
+        filename += "-xcode9";
+    #endif
 #endif
     }
     else
@@ -163,8 +172,10 @@
 
         if(!ifs)
         {
-            cout << "cannot open `" << filename << "`, failed!" << endl;
-            return EXIT_FAILURE;
+            ostringstream os;
+            os << "cannot open `" << filename << "`, failed!";
+            cout << os.str() << endl;
+            throw invalid_argument(os.str());
         }
 
         // Show which template we use:
@@ -229,6 +240,6 @@
         }
     }
     cout << "ok" << endl;
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -212,13 +212,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux	2019-02-05 18:03:04.000000000 +0000
@@ -7,4 +7,6 @@
 client
 client
 client
-  9 __libc_start_main in
+client
+client
+ 11 __libc_start_main in
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux.libbacktrace+ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux.libbacktrace+
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux.libbacktrace+	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux.libbacktrace+	2019-02-05 18:03:04.000000000 +0000
@@ -6,5 +6,6 @@
   5 third at
   6 second at
   7 first at
-  8 main at
-  9
+  8 Client::run(int, char**) at
+  9 int Test::runTest<Client>(int, char**) at
+ 10 main at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,12 @@
-  0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7.1.dylib
-  1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.1.dylib
-  2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib
-  3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib
+  0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7.2.dylib
+  1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.2.dylib
+  2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib
+  3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib
   4 (anonymous namespace)::Thrower::fifth() in client
   5 (anonymous namespace)::Thrower::forth() in client
   6 (anonymous namespace)::Thrower::third() in client
   7 (anonymous namespace)::Thrower::second() in client
   8 (anonymous namespace)::Thrower::first() in client
-  9 main in client
- 10 start in libdyld.dylib
+  9 Client::run(int, char**) in client
+ 10 int Test::runTest<Client>(int, char**) in client
+ 11 main in client
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win32 zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win32
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win32	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win32	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,10 @@
-  0 IceUtil::Exception::Exception
-  1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper
-  2 IceUtil::NullHandleException::NullHandleException
-  3 `anonymous namespace'::Thrower::fifth
-  4 `anonymous namespace'::Thrower::forth
-  5 `anonymous namespace'::Thrower::third
-  6 `anonymous namespace'::Thrower::second
-  7 `anonymous namespace'::Thrower::first
-  8 main
+  0 IceUtil::Exception::Exception at
+  1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper<IceUtil::NullHandleException> at
+  2 IceUtil::NullHandleException::NullHandleException at
+  3 `anonymous namespace'::Thrower::fifth at
+  4 `anonymous namespace'::Thrower::forth at
+  5 `anonymous namespace'::Thrower::third at
+  6 `anonymous namespace'::Thrower::second at
+  7 `anonymous namespace'::Thrower::first at
+  8 Client::run at
+  9 Test::runTest<Client> at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win64 zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win64
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win64	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.debug.Win64	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,10 @@
-  0 IceUtil::Exception::Exception
-  1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper
-  2 IceUtil::NullHandleException::NullHandleException
-  3 `anonymous namespace'::Thrower::fifth
-  4 `anonymous namespace'::Thrower::forth
-  5 `anonymous namespace'::Thrower::third
-  6 `anonymous namespace'::Thrower::second
-  7 `anonymous namespace'::Thrower::first
-  8 main
+  0 IceUtil::Exception::Exception at
+  1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper<IceUtil::NullHandleException> at
+  2 IceUtil::NullHandleException::NullHandleException at
+  3 `anonymous namespace'::Thrower::fifth at
+  4 `anonymous namespace'::Thrower::forth at
+  5 `anonymous namespace'::Thrower::third at
+  6 `anonymous namespace'::Thrower::second at
+  7 `anonymous namespace'::Thrower::first at
+  8 Client::run at
+  9 Test::runTest<Client> at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release.macOS zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release.macOS
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release.macOS	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release.macOS	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-  0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib
-  1 main in client
-  2 start in libdyld.dylib
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win32 zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win32
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win32	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win32	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,3 @@
-0 IceUtil::NullHandleException::NullHandleException
-1 main
+  0 IceUtil::NullHandleException::NullHandleException at
+  1 Client::run at
+  2 Test::runTest<Client> at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64 zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,5 @@
   0 IceUtil::Exception::Exception at
   1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper<IceUtil::NullHandleException> at
   2 IceUtil::NullHandleException::NullHandleException at
-  3 main at
+  3 Client::run at
+  4 Test::runTest<Client> at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64 zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64	2019-02-05 18:03:04.000000000 +0000
@@ -4,4 +4,5 @@
   3 `anonymous namespace'::Thrower::third at
   4 `anonymous namespace'::Thrower::second at
   5 `anonymous namespace'::Thrower::first at
-  6 main at
+  6 Client::run at
+  7 Test::runTest<Client> at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release.Win32 zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release.Win32
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release.Win32	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release.Win32	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,4 @@
-  0 IceUtil::NullHandleException::NullHandleException
-  1 `anonymous namespace'::Thrower::fifth
-  2 main
+ 0 IceUtil::NullHandleException::NullHandleException at
+ 1 `anonymous namespace'::Thrower::fifth at
+ 2 Client::run at
+ 3 Test::runTest<Client> at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release.Win64 zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release.Win64
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release.Win64	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release.Win64	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,5 @@
   0 IceUtil::Exception::Exception at
   1 IceUtil::NullHandleException::NullHandleException at
   2 `anonymous namespace'::Thrower::fifth at
-  3 main at
+  3 Client::run at
+  4 Test::runTest<Client> at
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+  0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib
+  1 (anonymous namespace)::Thrower::fifth() in client
+  2 (anonymous namespace)::Thrower::forth() in client
+  3 (anonymous namespace)::Thrower::third() in client
+  4 (anonymous namespace)::Thrower::second() in client
+  5 Client::run(int, char**) in client
+  6 int Test::runTest<Client>(int, char**) in client
+  7 start in libdyld.dylib
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,3 @@
+  0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.2.dylib
+  1 Client::run(int, char**) in client
+  2 int Test::runTest<Client>(int, char**) in client
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/test.py zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/test.py
--- zeroc-ice-3.7.1/cpp/test/IceUtil/stacktrace/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/stacktrace/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, options = { "cpp11" : [False] })
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/AliveTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/AliveTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/AliveTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/AliveTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <AliveTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/AliveTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/AliveTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/AliveTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/AliveTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ALIVE_TEST_H
 #define ALIVE_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <stdlib.h>
-#include <TestCommon.h>
-
+#include <TestHelper.h>
 #include <TestSuite.h>
 
 using namespace std;
 
-int
-main(int, char**)
+class Client : public Test::TestHelper
 {
-    try
-    {
-        initializeTestSuite();
+public:
 
-        for(list<TestBasePtr>::const_iterator p = allTests.begin(); p != allTests.end(); ++p)
-        {
-            (*p)->start();
-        }
-    }
-    catch(const TestFailed& e)
+    void run(int, char**);
+};
+
+void
+Client::run(int, char**)
+{
+    initializeTestSuite();
+
+    for(list<TestBasePtr>::const_iterator p = allTests.begin(); p != allTests.end(); ++p)
     {
-        cout << "test " << e.name << " failed" << endl;
-        return EXIT_FAILURE;
+        (*p)->start();
     }
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CountDownLatchTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CountDownLatchTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CountDownLatchTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/CountDownLatch.h>
 
 #include <CountDownLatchTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CountDownLatchTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CountDownLatchTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CountDownLatchTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CountDownLatchTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef COUNT_DOWN_LATCH_TEST_H
 #define COUNT_DOWN_LATCH_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CreateTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CreateTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CreateTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CreateTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <CreateTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CreateTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CreateTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/CreateTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/CreateTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef CREATE_TEST_H
 #define CREATE_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/Makefile.mk zeroc-ice-3.7.2/cpp/test/IceUtil/thread/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp))
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorMutexTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorMutexTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorMutexTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <MonitorMutexTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorMutexTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorMutexTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorMutexTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorMutexTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef MONITOR_MUTEX_TEST_H
 #define MONITOR_MUTEX_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <MonitorRecMutexTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorRecMutexTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MonitorRecMutexTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MonitorRecMutexTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef MONITOR_REC_MUTEX_TEST_H
 #define MONITOR_REC_MUTEX_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/thread/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -194,13 +194,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/thread/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MutexTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MutexTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MutexTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MutexTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <MutexTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MutexTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MutexTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/MutexTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/MutexTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef MUTEX_TEST_H
 #define MUTEX_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/RecMutexTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/RecMutexTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/RecMutexTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/RecMutexTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <RecMutexTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/RecMutexTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/RecMutexTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/RecMutexTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/RecMutexTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef REC_MUTEX_TEST_H
 #define REC_MUTEX_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/SleepTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/SleepTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/SleepTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/SleepTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <stdio.h>
 
 #include <SleepTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/SleepTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/SleepTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/SleepTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/SleepTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLEEP_TEST_H
 #define SLEEP_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/StartTest.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/StartTest.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/StartTest.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/StartTest.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
 #include <stdio.h>
 
 #include <StartTest.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace IceUtil;
@@ -64,8 +59,8 @@
     {
         for(int j = 0; j < 40; j++)
         {
-            Thread* t = new StartTestThread;
-            t->start().detach();
+            Thread* thread = new StartTestThread;
+            thread->start().detach();
         }
         ThreadControl::sleep(Time::milliSeconds(5));
     }
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/StartTest.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/StartTest.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/StartTest.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/StartTest.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef START_TEST_H
 #define START_TEST_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestBase.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestBase.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestBase.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestBase.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestBase.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestBase.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestBase.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestBase.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_BASE_H
 #define TEST_BASE_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestSuite.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestSuite.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestSuite.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestSuite.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <TestSuite.h>
+#include <TestBase.h>
+#include <list>
 #include <CountDownLatchTest.h>
 #include <MutexTest.h>
 #include <RecMutexTest.h>
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestSuite.h zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestSuite.h
--- zeroc-ice-3.7.1/cpp/test/IceUtil/thread/TestSuite.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/thread/TestSuite.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_SUITE_H
 #define TEST_SUITE_H
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/timer/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/timer/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/timer/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/timer/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Timer.h>
-#include <TestCommon.h>
+#include <IceUtil/Random.h>
+#include <TestHelper.h>
 
 #include <vector>
 
@@ -151,7 +147,16 @@
 };
 ICE_DEFINE_PTR(DestroyTaskPtr, DestroyTask);
 
-int main(int, char**)
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int argc, char* argv[]);
+
+};
+
+void
+Client::run(int, char*[])
 {
     cout << "testing timer... " << flush;
     {
@@ -197,7 +202,7 @@
                 tasks.push_back(ICE_MAKE_SHARED(TestTask, IceUtil::Time::milliSeconds(500 + i * 50)));
             }
 
-            random_shuffle(tasks.begin(), tasks.end());
+            IceUtilInternal::shuffle(tasks.begin(), tasks.end());
             vector<TestTaskPtr>::const_iterator p;
             for(p = tasks.begin(); p != tasks.end(); ++p)
             {
@@ -274,6 +279,6 @@
         }
     }
     cout << "ok" << endl;
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/timer/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/timer/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/timer/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/timer/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/timer/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/timer/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/timer/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/timer/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #ifdef _WIN32
 #   include <io.h>
@@ -17,6 +12,10 @@
 #endif
 #include <fstream>
 
+#ifdef _MSC_VER
+#   pragma warning(disable:4127) // conditional expression is constant
+#endif
+
 // Uncomment to include performance testing
 //#define TEST_PERF
 
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/test.py zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/test.py
--- zeroc-ice-3.7.1/cpp/test/IceUtil/unicode/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/unicode/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, [ ClientTestCase(client=SimpleClient(args=["{testdir}"])) ])
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/uuid/Client.cpp zeroc-ice-3.7.2/cpp/test/IceUtil/uuid/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/IceUtil/uuid/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/uuid/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/UUID.h>
 #include <IceUtil/Random.h>
@@ -13,7 +8,7 @@
 #include <IceUtil/Thread.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <set>
 #include <vector>
 
@@ -178,7 +173,15 @@
     }
 }
 
-int main(int argc, char* argv[])
+class Client : public Test::TestHelper
+{
+public:
+
+    virtual void run(int argc, char* argv[]);
+};
+
+void
+Client::run(int argc, char* argv[])
 {
     long howMany = 300000;
     int threadCount = 3;
@@ -187,36 +190,33 @@
     if(argc > 3)
     {
         usage(argv[0]);
-        return EXIT_FAILURE;
+        throw std::invalid_argument("too many arguments");
     }
-    else if(argc == 3)
+
+    if(argc > 1)
     {
         howMany = atol(argv[1]);
-        if (howMany == 0)
+        if(howMany == 0)
         {
             usage(argv[0]);
-            return EXIT_FAILURE;
+            throw invalid_argument("argv[1] howMany is not a number");
         }
+    }
+
+    if(argc > 2)
+    {
+
         threadCount = atoi(argv[2]);
         if(threadCount <= 0)
         {
             usage(argv[0]);
-            return EXIT_FAILURE;
+            throw invalid_argument("argv[2] threadCount is not a number");
         }
         verbose = true;
     }
-    else if(argc == 2)
-    {
-        howMany = atol(argv[1]);
-        if (howMany == 0)
-        {
-            usage(argv[0]);
-            return EXIT_FAILURE;
-        }
-    }
 
     runTest<string, GenerateUUID>(threadCount, GenerateUUID(), howMany, verbose, "UUID");
     runTest<string, GenerateRandomString>(threadCount, GenerateRandomString(), howMany, verbose, "string");
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client);
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/uuid/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/IceUtil/uuid/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/IceUtil/uuid/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/uuid/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -89,10 +89,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -170,13 +170,13 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/IceUtil/uuid/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/IceUtil/uuid/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/IceUtil/uuid/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/IceUtil/uuid/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/include/TestCommon.h zeroc-ice-3.7.2/cpp/test/include/TestCommon.h
--- zeroc-ice-3.7.1/cpp/test/include/TestCommon.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/include/TestCommon.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef TEST_COMMON_H
-#define TEST_COMMON_H
-
-#include <IceUtil/Config.h>
-
-#if defined(_MSC_VER) && !defined(TEST_API_EXPORTS)
-#   pragma comment(lib, ICE_LIBNAME("testcommon"))
-#endif
-
-#include <Ice/CommunicatorF.h>
-#include <Ice/ProxyF.h>
-#include <Ice/Initialize.h>
-
-#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
-#   include <Ice/Initialize.h>
-#   include <Ice/Logger.h>
-#   include <Ice/LocalException.h>
-#endif
-
-#include <IceUtil/IceUtil.h>
-
-#ifndef TEST_API
-#   if defined(ICE_STATIC_LIBS)
-#       define TEST_API /**/
-#   elif defined(TEST_API_EXPORTS)
-#       define TEST_API ICE_DECLSPEC_EXPORT
-#   else
-#       define TEST_API ICE_DECLSPEC_IMPORT
-#   endif
-#endif
-
-void
-inline print(const std::string& msg)
-{
-    std::cout << msg << std::flush;
-}
-
-void
-inline println(const std::string& msg)
-{
-    std::cout << msg << std::endl;
-}
-
-TEST_API std::string getTestEndpoint(const Ice::CommunicatorPtr&, int, const std::string& = std::string());
-TEST_API std::string getTestEndpoint(const Ice::PropertiesPtr&, int, const std::string& = std::string());
-TEST_API std::string getTestProtocol(const Ice::PropertiesPtr&);
-TEST_API std::string getTestHost(const Ice::PropertiesPtr&);
-TEST_API int getTestPort(const Ice::PropertiesPtr&, int);
-TEST_API Ice::InitializationData getTestInitData(int&, char*[]);
-
-#if !defined(ICE_OS_UWP) && (TARGET_OS_IPHONE == 0)
-
-void
-inline testFailed(const char* expr, const char* file, unsigned int line)
-{
-    std::cout << "failed!" << std::endl;
-    std::cout << file << ':' << line << ": assertion `" << expr << "' failed" << std::endl;
-    abort();
-}
-
-#define DEFINE_TEST(name)
-#define TEST_READY
-
-#else
-
-#include <TestHelper.h>
-
-namespace Test
-{
-
-extern MainHelper* helper;
-
-class MainHelperInit
-{
-public:
-
-    MainHelperInit(MainHelper* r, const std::string& name, bool redirect)
-    {
-        helper = r;
-
-        if(redirect)
-        {
-            _previousLogger = Ice::getProcessLogger();
-            Ice::setProcessLogger(Ice::getProcessLogger()->cloneWithPrefix(name));
-
-            _previousCoutBuffer = std::cout.rdbuf();
-            std::cout.rdbuf(r);
-
-            _previousCerrBuffer = std::cerr.rdbuf();
-            std::cerr.rdbuf(r);
-        }
-    }
-
-    ~MainHelperInit()
-    {
-        if(_previousLogger)
-        {
-            Ice::setProcessLogger(_previousLogger);
-            std::cout.rdbuf(_previousCoutBuffer);
-            std::cerr.rdbuf(_previousCerrBuffer);
-        }
-    }
-
-private:
-
-    Ice::LoggerPtr _previousLogger;
-    std::streambuf* _previousCoutBuffer;
-    std::streambuf* _previousCerrBuffer;
-};
-
-//
-// Redefine main as Test::mainEntryPoint
-//
-#define main Test::mainEntryPoint
-int mainEntryPoint(int, char**);
-
-}
-
-class TestFailedException
-{
-};
-
-void
-inline testFailed(const char* expr, const char* file, unsigned int line)
-{
-    std::cout << "failed!" << std::endl;
-    std::cout << file << ':' << line << ": assertion `" << expr << "' failed" << std::endl;
-    throw TestFailedException();
-}
-
-#define DEFINE_TEST(name) \
-   Test::MainHelper* Test::helper; \
-   Ice::CommunicatorPtr communicatorInstance; \
-   extern "C" { \
-      ICE_DECLSPEC_EXPORT void dllTestShutdown(); \
-      void dllTestShutdown() \
-      { \
-          if(communicatorInstance) \
-          { \
-              communicatorInstance->destroy(); \
-          } \
-      } \
-      ICE_DECLSPEC_EXPORT int dllMain(int, char**, Test::MainHelper*); \
-      int dllMain(int argc, char** argv, Test::MainHelper* helper) \
-      { \
-          Test::MainHelperInit init(helper, name, helper->redirect());  \
-          int status; \
-          try \
-          { \
-              status = Test::mainEntryPoint(argc, argv); \
-          } \
-          catch(const TestFailedException&) \
-          { \
-              status = 1; \
-          } \
-          communicatorInstance = ICE_NULLPTR; \
-          return status; \
-      } \
-   }
-
-#define TEST_READY Test::helper->serverReady(); \
-    communicatorInstance = communicator;
-
-#endif
-
-#define test(ex) ((ex) ? ((void)0) : testFailed(#ex, __FILE__, __LINE__))
-
-#endif
diff -Nru zeroc-ice-3.7.1/cpp/test/include/TestHelper.h zeroc-ice-3.7.2/cpp/test/include/TestHelper.h
--- zeroc-ice-3.7.1/cpp/test/include/TestHelper.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/include/TestHelper.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_HELPER_H
 #define TEST_HELPER_H
@@ -15,75 +10,193 @@
 #include <string>
 #include <iostream>
 
+#include <IceUtil/Config.h>
+
+#if defined(_MSC_VER) && !defined(TEST_API_EXPORTS)
+#   pragma comment(lib, ICE_LIBNAME("testcommon"))
+#endif
+
+#include <Ice/CommunicatorF.h>
+#include <Ice/ProxyF.h>
+#include <Ice/Initialize.h>
+#include <Ice/Logger.h>
+#include <Ice/LocalException.h>
+
+#include <IceUtil/IceUtil.h>
+
+#ifndef TEST_API
+#   if defined(ICE_STATIC_LIBS)
+#       define TEST_API /**/
+#   elif defined(TEST_API_EXPORTS)
+#       define TEST_API ICE_DECLSPEC_EXPORT
+#   else
+#       define TEST_API ICE_DECLSPEC_IMPORT
+#   endif
+#endif
+
 namespace Test
 {
 
-class MainHelper : public std::streambuf
+class TEST_API ControllerHelper
+#ifndef ICE_CPP11_MAPPING
+    : public virtual IceUtil::Shared
+#endif
 {
 public:
 
-    MainHelper()
-    {
-        setp(&data[0], &data[sizeof(data) - 1]);
-    }
+    virtual std::string loggerPrefix() const = 0;
+    virtual void print(const std::string&) = 0;
 
     virtual void serverReady() = 0;
+    virtual void communicatorInitialized(const Ice::CommunicatorPtr&) = 0;
+};
+ICE_DEFINE_PTR(ControllerHelperPtr, ControllerHelper);
 
-    virtual void shutdown() = 0;
+#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
 
-    virtual void waitForCompleted() = 0;
+//
+// streambuf redirection implementation
+//
+class StreamHelper : public std::streambuf
+{
+public:
 
-    virtual bool redirect() = 0;
+    StreamHelper();
+    ~StreamHelper();
 
-    virtual void print(const std::string& msg) = 0;
+    void setControllerHelper(ControllerHelper*);
 
-    virtual void
-    flush()
-    {
-    }
+    virtual void flush();
+    virtual void newLine();
 
-    virtual void
-    newLine()
-    {
-        print("\n");
-    }
+private:
+
+    virtual int sync();
+    virtual int overflow(int);
+    virtual int sputc(char);
+
+    IceUtil::Mutex _mutex;
+    ControllerHelper* _controllerHelper;
+    char data[1024];
+    Ice::LoggerPtr _previousLogger;
+    std::streambuf* _previousCoutBuffer;
+    std::streambuf* _previousCerrBuffer;
+};
+#endif
+
+class TEST_API TestHelper
+{
+public:
+
+    TestHelper(bool registerPlugins = true);
+    virtual ~TestHelper();
+
+    void setControllerHelper(ControllerHelper*);
+
+    std::string getTestEndpoint(const std::string&);
+    std::string getTestEndpoint(int num = 0, const std::string& prot = "");
+    static std::string getTestEndpoint(const Ice::PropertiesPtr& properties, int num = 0, const std::string& prot = "");
+
+    std::string getTestHost();
+    static std::string getTestHost(const Ice::PropertiesPtr&);
+
+    std::string getTestProtocol();
+    static std::string getTestProtocol(const Ice::PropertiesPtr&);
+
+    int getTestPort(int port = 0);
+    static int getTestPort(const Ice::PropertiesPtr&, int port = 0);
+
+    static Ice::PropertiesPtr
+    createTestProperties(int&, char*[]);
+
+    Ice::CommunicatorPtr
+    initialize(int& argc, char* argv[], const Ice::PropertiesPtr& properties = ICE_NULLPTR);
+
+    Ice::CommunicatorPtr initialize(int&, char*[], const Ice::InitializationData&);
+
+    Ice::CommunicatorPtr communicator() const;
+
+    void serverReady();
+    void shutdown();
+
+    void shutdownOnInterrupt();
+
+    virtual void run(int argc, char* argv[]) = 0;
 
 private:
 
-    //
-    // streambuf redirection implementation
-    //
+    ControllerHelper* _controllerHelper;
+    Ice::CommunicatorPtr _communicator;
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
+    IceUtil::CtrlCHandler* _ctrlCHandler;
+#endif
+};
+
+#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
+
+class TestFailedException
+{
+};
+
+void
+inline testFailed(const char* expr, const char* file, unsigned int line)
+{
+    std::cout << "failed!" << std::endl;
+    std::cout << file << ':' << line << ": assertion `" << expr << "' failed" << std::endl;
+    throw TestFailedException();
+}
+
+#else
+
+void
+inline testFailed(const char* expr, const char* file, unsigned int line)
+{
+    std::cout << "failed!" << std::endl;
+    std::cout << file << ':' << line << ": assertion `" << expr << "' failed" << std::endl;
+    abort();
+}
 
-    int sync()
+template<typename T>
+int
+runTest(int argc, char* argv[])
+{
+    int status = 0;
+    try
     {
-        std::streamsize n = pptr() - pbase();
-        print(std::string(pbase(), static_cast<int>(n)));
-        pbump(-static_cast<int>(pptr() - pbase()));
-        return 0;
+        T helper;
+        helper.run(argc, argv);
     }
-
-    int overflow(int ch)
+    catch(const std::exception& ex)
     {
-        sync();
-        if(ch != EOF)
-        {
-            assert(pptr() != epptr());
-            sputc(ch);
-        }
-        return 0;
+        std::cerr << "error: " << ex.what() << std::endl;
+        status = 1;
     }
+    return status;
+}
+#endif
 
-    int sputc(char c)
-    {
-        if(c == '\n')
-        {
-            pubsync();
-        }
-        return std::streambuf::sputc(c);
+}
+
+#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
+#   define DEFINE_TEST(HELPER)                                \
+    extern "C"                                                \
+    {                                                         \
+        ICE_DECLSPEC_EXPORT Test::TestHelper* createHelper()  \
+        {                                                     \
+            return new HELPER();                              \
+        }                                                     \
+    }
+
+#else
+
+#   define DEFINE_TEST(HELPER)                          \
+    int main(int argc, char** argv)                     \
+    {                                                   \
+        return Test::runTest<HELPER>(argc, argv);       \
     }
 
-    char data[1024];
-};
+#endif
+
+#define test(ex) ((ex) ? ((void)0) : ::Test::testFailed(#ex, __FILE__, __LINE__))
 
-}
 #endif
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/bundles/BundleInfo.plist zeroc-ice-3.7.2/cpp/test/ios/bundles/BundleInfo.plist
--- zeroc-ice-3.7.1/cpp/test/ios/bundles/BundleInfo.plist	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/bundles/BundleInfo.plist	2019-02-05 18:03:04.000000000 +0000
@@ -43,6 +43,6 @@
 	<key>DTXcodeBuild</key>
 	<string>4H127</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2013-2018 ZeroC. All rights reserved.</string>
+	<string>Copyright © ZeroC. All rights reserved.</string>
 </dict>
 </plist>
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Bundle/ControllerI.mm zeroc-ice-3.7.2/cpp/test/ios/controller/Bundle/ControllerI.mm
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Bundle/ControllerI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Bundle/ControllerI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <Foundation/Foundation.h>
 
@@ -15,7 +10,7 @@
 
 #include <dlfcn.h>
 
-@protocol ViewController
+@protocol ControllerView
 -(void) print:(NSString*)msg;
 -(void) println:(NSString*)msg;
 @end
@@ -26,47 +21,47 @@
 namespace
 {
 
-    typedef int (*MAIN_ENTRY_POINT)(int argc, char** argv, Test::MainHelper* helper);
-    typedef int (*SHUTDOWN_ENTRY_POINT)();
+    typedef Test::TestHelper* (*CREATE_HELPER_ENTRY_POINT)();
 
-    class MainHelperI : public Test::MainHelper, private IceUtil::Monitor<IceUtil::Mutex>, public IceUtil::Thread
+    class ControllerHelperI : public Test::ControllerHelper,
+                              private IceUtil::Monitor<IceUtil::Mutex>,
+                              public IceUtil::Thread
     {
     public:
 
-        MainHelperI(id<ViewController>, const string&, const StringSeq&);
-        virtual ~MainHelperI();
+        ControllerHelperI(id<ControllerView>, const string&, const StringSeq&);
+        virtual ~ControllerHelperI();
 
-        virtual void serverReady();
-        virtual void shutdown();
-        virtual void waitForCompleted() {}
-        virtual bool redirect();
+        virtual string loggerPrefix() const;
         virtual void print(const std::string&);
+        virtual void serverReady();
+        virtual void communicatorInitialized(const Ice::CommunicatorPtr&);
 
-        virtual void run();
-
-        void completed(int);
+        void shutdown();
+        string getOutput() const;
         void waitReady(int) const;
         int waitSuccess(int) const;
-        string getOutput() const;
+
+        virtual void run();
+        void completed(int);
 
     private:
 
-        id<ViewController> _controller;
+        id<ControllerView> _controller;
         std::string _dll;
         StringSeq _args;
-        CFBundleRef _handle;
-        SHUTDOWN_ENTRY_POINT _dllTestShutdown;
         bool _ready;
         bool _completed;
         int _status;
         std::ostringstream _out;
+        Ice::CommunicatorPtr _communicator;
     };
 
     class ProcessI : public Process
     {
     public:
 
-        ProcessI(id<ViewController>, MainHelperI*);
+        ProcessI(id<ControllerView>, ControllerHelperI*);
         virtual ~ProcessI();
 
         void waitReady(int, const Ice::Current&);
@@ -75,15 +70,15 @@
 
     private:
 
-        id<ViewController> _controller;
-        IceUtil::Handle<MainHelperI> _helper;
+        id<ControllerView> _controller;
+        IceUtil::Handle<ControllerHelperI> _helper;
     };
 
     class ProcessControllerI : public ProcessController
     {
     public:
 
-        ProcessControllerI(id<ViewController>, NSString*, NSString*);
+        ProcessControllerI(id<ControllerView>, NSString*, NSString*);
 
 #ifdef ICE_CPP11_MAPPING
         virtual shared_ptr<ProcessPrx> start(string, string, StringSeq, const Ice::Current&);
@@ -95,46 +90,42 @@
 
     private:
 
-        id<ViewController> _controller;
+        id<ControllerView> _controller;
         string _ipv4;
         string _ipv6;
     };
 
-    class ControllerHelper
+    class ControllerI
     {
     public:
 
-        ControllerHelper(id<ViewController>, NSString*, NSString*);
-        virtual ~ControllerHelper();
+        ControllerI(id<ControllerView>, NSString*, NSString*);
+        virtual ~ControllerI();
 
     private:
 
         Ice::CommunicatorPtr _communicator;
     };
 
+    Test::StreamHelper streamRedirect;
 }
 
-MainHelperI::MainHelperI(id<ViewController> controller, const string& dll, const StringSeq& args) :
-_controller(controller),
-_dll(dll),
-_args(args),
-_ready(false),
-_completed(false),
-_status(0)
+ControllerHelperI::ControllerHelperI(id<ControllerView> controller, const string& dll, const StringSeq& args) :
+    _controller(controller),
+    _dll(dll),
+    _args(args),
+    _ready(false),
+    _completed(false),
+    _status(0)
 {
 }
 
-MainHelperI::~MainHelperI()
+ControllerHelperI::~ControllerHelperI()
 {
-    if(_handle)
-    {
-        CFBundleUnloadExecutable(_handle);
-        CFRelease(_handle);
-    }
 }
 
 void
-MainHelperI::serverReady()
+ControllerHelperI::serverReady()
 {
     Lock sync(*this);
     _ready = true;
@@ -142,43 +133,34 @@
 }
 
 void
-MainHelperI::shutdown()
+ControllerHelperI::communicatorInitialized(const Ice::CommunicatorPtr& communicator)
 {
     Lock sync(*this);
-    if(_completed)
-    {
-        return;
-    }
-
-    if(_dllTestShutdown)
-    {
-        _dllTestShutdown();
-    }
+    _communicator = communicator;
 }
 
-bool
-MainHelperI::redirect()
+string
+ControllerHelperI::loggerPrefix() const
 {
-    return _dll.find("client") != string::npos || _dll.find("collocated") != string::npos;
+    return _dll;
 }
 
 void
-MainHelperI::print(const std::string& msg)
+ControllerHelperI::print(const std::string& msg)
 {
     _out << msg;
-    //[_controller println:[NSString stringWithUTF8String:msg.c_str()]];
 }
 
 void
-MainHelperI::run()
+ControllerHelperI::run()
 {
     NSString* bundlePath = [[NSBundle mainBundle] privateFrameworksPath];
 
     bundlePath = [bundlePath stringByAppendingPathComponent:[NSString stringWithUTF8String:_dll.c_str()]];
 
     NSURL* bundleURL = [NSURL fileURLWithPath:bundlePath];
-    _handle = CFBundleCreate(NULL, (CFURLRef)bundleURL);
-    if(!_handle)
+    CFBundleRef handle = CFBundleCreate(NULL, (CFURLRef)bundleURL);
+    if(!handle)
     {
         print([[NSString stringWithFormat:@"Could not find bundle %@", bundlePath] UTF8String]);
         completed(EXIT_FAILURE);
@@ -186,7 +168,7 @@
     }
 
     CFErrorRef error = nil;
-    Boolean loaded = CFBundleLoadExecutableAndReturnError(_handle, &error);
+    Boolean loaded = CFBundleLoadExecutableAndReturnError(handle, &error);
     if(error != nil || !loaded)
     {
         print([[(__bridge NSError *)error description] UTF8String]);
@@ -199,7 +181,7 @@
     //
     void* sym = 0;
     int attempts = 0;
-    while((sym = CFBundleGetFunctionPointerForName(_handle, CFSTR("dllTestShutdown"))) == 0 && attempts < 5)
+    while((sym = CFBundleGetFunctionPointerForName(handle, CFSTR("createHelper"))) == 0 && attempts < 5)
     {
         attempts++;
         [NSThread sleepForTimeInterval:0.2];
@@ -207,32 +189,19 @@
 
     if(sym == 0)
     {
-        NSString* err = [NSString stringWithFormat:@"Could not get function pointer dllTestShutdown from bundle %@",
+        NSString* err = [NSString stringWithFormat:@"Could not get function pointer createHelper from bundle %@",
                          bundlePath];
         print([err UTF8String]);
         completed(EXIT_FAILURE);
         return;
     }
-    /*
-    else if(attempts > 0)
-    {
-        print([[NSString stringWithFormat:@"************ found dllTestShutdown after %d failed attempt(s)", attempts] UTF8String]);
-    }
-    */
-
-    _dllTestShutdown = (SHUTDOWN_ENTRY_POINT)sym;
 
-    sym = CFBundleGetFunctionPointerForName(_handle, CFSTR("dllMain"));
-    if(sym == 0)
+    if(_dll.find("client") != string::npos || _dll.find("collocated") != string::npos)
     {
-        NSString* err = [NSString stringWithFormat:@"Could not get function pointer dllMain from bundle %@",
-                         bundlePath];
-        print([err UTF8String]);
-        completed(EXIT_FAILURE);
-        return;
+        streamRedirect.setControllerHelper(this);
     }
 
-    MAIN_ENTRY_POINT dllMain = (MAIN_ENTRY_POINT)sym;
+    CREATE_HELPER_ENTRY_POINT createHelper = (CREATE_HELPER_ENTRY_POINT)sym;
     char** argv = new char*[_args.size() + 1];
     for(unsigned int i = 0; i < _args.size(); ++i)
     {
@@ -241,30 +210,54 @@
     argv[_args.size()] = 0;
     try
     {
-        completed(dllMain(static_cast<int>(_args.size()), argv, this));
+        IceInternal::UniquePtr<Test::TestHelper> helper(createHelper());
+        helper->setControllerHelper(this);
+        helper->run(static_cast<int>(_args.size()), argv);
+        completed(0);
     }
     catch(const std::exception& ex)
     {
         print("unexpected exception while running `" + _args[0] + "':\n" + ex.what());
+        completed(1);
     }
     catch(...)
     {
         print("unexpected unknown exception while running `" + _args[0] + "'");
+        completed(1);
     }
     delete[] argv;
+
+    if(_dll.find("client") != string::npos || _dll.find("collocated") != string::npos)
+    {
+        streamRedirect.setControllerHelper(0);
+    }
+
+    CFBundleUnloadExecutable(handle);
+    CFRelease(handle);
 }
 
 void
-MainHelperI::completed(int status)
+ControllerHelperI::completed(int status)
 {
     Lock sync(*this);
     _completed = true;
     _status = status;
+    _communicator = 0;
     notifyAll();
 }
 
 void
-MainHelperI::waitReady(int timeout) const
+ControllerHelperI::shutdown()
+{
+    Lock sync(*this);
+    if(_communicator)
+    {
+        _communicator->shutdown();
+    }
+}
+
+void
+ControllerHelperI::waitReady(int timeout) const
 {
     Lock sync(*this);
     while(!_ready && !_completed)
@@ -281,7 +274,7 @@
 }
 
 int
-MainHelperI::waitSuccess(int timeout) const
+ControllerHelperI::waitSuccess(int timeout) const
 {
     Lock sync(*this);
     while(!_completed)
@@ -295,13 +288,15 @@
 }
 
 string
-MainHelperI::getOutput() const
+ControllerHelperI::getOutput() const
 {
     assert(_completed);
     return _out.str();
 }
 
-ProcessI::ProcessI(id<ViewController> controller, MainHelperI* helper) : _controller(controller), _helper(helper)
+ProcessI::ProcessI(id<ControllerView> controller, ControllerHelperI* helper) :
+    _controller(controller),
+    _helper(helper)
 {
 }
 
@@ -330,7 +325,7 @@
     return _helper->getOutput();
 }
 
-ProcessControllerI::ProcessControllerI(id<ViewController> controller, NSString* ipv4, NSString* ipv6) :
+ProcessControllerI::ProcessControllerI(id<ControllerView> controller, NSString* ipv4, NSString* ipv6) :
     _controller(controller), _ipv4([ipv4 UTF8String]), _ipv6([ipv6 UTF8String])
 {
 }
@@ -343,10 +338,12 @@
 ProcessControllerI::start(const string& testSuite, const string& exe, const StringSeq& args, const Ice::Current& c)
 #endif
 {
+    StringSeq newArgs = args;
     std::string prefix = std::string("test/") + testSuite;
     replace(prefix.begin(), prefix.end(), '/', '_');
+    newArgs.insert(newArgs.begin(), testSuite + ' ' + exe);
     [_controller println:[NSString stringWithFormat:@"starting %s %s... ", testSuite.c_str(), exe.c_str()]];
-    IceUtil::Handle<MainHelperI> helper = new MainHelperI(_controller, prefix + '/' + exe + ".bundle", args);
+    IceUtil::Handle<ControllerHelperI> helper(new ControllerHelperI(_controller, prefix + '/' + exe + ".bundle", newArgs));
 
     //
     // Use a 768KB thread stack size for the objects test. This is necessary when running the
@@ -366,7 +363,7 @@
     return ipv6 ? _ipv6 : _ipv4;
 }
 
-ControllerHelper::ControllerHelper(id<ViewController> controller, NSString* ipv4, NSString* ipv6)
+ControllerI::ControllerI(id<ControllerView> controller, NSString* ipv4, NSString* ipv6)
 {
     Ice::registerIceDiscovery();
 
@@ -393,30 +390,30 @@
     adapter->activate();
 }
 
-ControllerHelper::~ControllerHelper()
+ControllerI::~ControllerI()
 {
     _communicator->destroy();
     _communicator = 0;
 }
 
-static ControllerHelper* controllerHelper = 0;
+static ControllerI* controllerI = 0;
 
 extern "C"
 {
 
 void
-startController(id<ViewController> controller, NSString* ipv4, NSString* ipv6)
+startController(id<ControllerView> controller, NSString* ipv4, NSString* ipv6)
 {
-    controllerHelper = new ControllerHelper(controller, ipv4, ipv6);
+    controllerI = new ControllerI(controller, ipv4, ipv6);
 }
 
 void
 stopController()
 {
-    if(controllerHelper)
+    if(controllerI)
     {
-        delete controllerHelper;
-        controllerHelper = 0;
+        delete controllerI;
+        controllerI = 0;
     }
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Bundle/Info.plist zeroc-ice-3.7.2/cpp/test/ios/controller/Bundle/Info.plist
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Bundle/Info.plist	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Bundle/Info.plist	2019-02-05 18:03:04.000000000 +0000
@@ -19,7 +19,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2013-2018 ZeroC, Inc. All rights reserved.</string>
+	<string>Copyright © ZeroC, Inc. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/AppDelegate.h zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/AppDelegate.h
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/AppDelegate.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/AppDelegate.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <UIKit/UIKit.h>
 
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/AppDelegate.m zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/AppDelegate.m
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/AppDelegate.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/AppDelegate.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import "AppDelegate.h"
 
@@ -17,6 +12,10 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+
+    // Ensure device does not become idle
+    [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+
     return YES;
 }
 
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/Base.lproj/Main.storyboard zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/Base.lproj/Main.storyboard
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/Base.lproj/Main.storyboard	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/Base.lproj/Main.storyboard	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ControllerView" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <pickerView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xR3-DO-y6j" userLabel="InterfaceIPv6">
+                            <pickerView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xR3-DO-y6j" userLabel="InterfaceIPv4">
                                 <rect key="frame" x="40" y="49" width="296" height="75"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <connections>
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ControllerView.h zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ControllerView.h
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ControllerView.h	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ControllerView.h	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,23 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol ControllerView
+-(void) print:(NSString*)msg;
+-(void) println:(NSString*)msg;
+@end
+
+@interface ControllerView : UIViewController<ControllerView, UIPickerViewDataSource, UIPickerViewDelegate>
+{
+@private
+    IBOutlet UIPickerView* interfaceIPv4;
+    IBOutlet UIPickerView* interfaceIPv6;
+    IBOutlet UITextView* output;
+    void (*startController)(id<ControllerView>, NSString*, NSString*);
+    void (*stopController)(id<ControllerView>);
+    NSMutableArray* interfacesIPv4;
+    NSMutableArray* interfacesIPv6;
+}
+@end
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ControllerView.m zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ControllerView.m
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ControllerView.m	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ControllerView.m	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,173 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#import "ControllerView.h"
+
+#include <ifaddrs.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+
+@implementation ControllerView
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    //
+    // Load the controller bundle.
+    //
+    NSString* bundlePath = [[NSBundle mainBundle] privateFrameworksPath];
+#ifdef ICE_CPP11_MAPPING
+    const char* bundle = "Cpp11ControllerBundle.bundle";
+#else
+    const char* bundle = "Cpp98ControllerBundle.bundle";
+#endif
+    bundlePath = [bundlePath stringByAppendingPathComponent:[NSString stringWithUTF8String:bundle]];
+
+    NSURL* bundleURL = [NSURL fileURLWithPath:bundlePath];
+    CFBundleRef handle = CFBundleCreate(NULL, (CFURLRef)bundleURL);
+    if(!handle)
+    {
+        [self println:[NSString stringWithFormat:@"Could not find bundle %@", bundlePath]];
+        return;
+    }
+
+    CFErrorRef error = nil;
+    Boolean loaded = CFBundleLoadExecutableAndReturnError(handle, &error);
+    if(error != nil || !loaded)
+    {
+        [self println:[(__bridge NSError *)error description]];
+        return;
+    }
+
+    startController = CFBundleGetFunctionPointerForName(handle, CFSTR("startController"));
+    if(startController == 0)
+    {
+        NSString* err = [NSString stringWithFormat:@"Could not get function pointer startController from bundle %@",
+                         bundlePath];
+        [self println:err];
+        return;
+    }
+
+    stopController = CFBundleGetFunctionPointerForName(handle, CFSTR("stopController"));
+    if(stopController == 0)
+    {
+        NSString* err = [NSString stringWithFormat:@"Could not get function pointer stopController from bundle %@",
+                         bundlePath];
+        [self println:err];
+        return;
+    }
+
+    //
+    // Search for local network interfaces
+    //
+    interfacesIPv4 = [NSMutableArray array];
+    [interfacesIPv4 addObject:@"127.0.0.1"];
+    interfacesIPv6 = [NSMutableArray array];
+    [interfacesIPv6 addObject:@"::1"];
+    struct ifaddrs* ifap;
+    if(getifaddrs(&ifap) == 0)
+    {
+        struct ifaddrs* curr = ifap;
+        while(curr != 0)
+        {
+            if(curr->ifa_addr && curr->ifa_flags & IFF_UP && !(curr->ifa_flags & IFF_LOOPBACK))
+            {
+                if(curr->ifa_addr->sa_family == AF_INET)
+                {
+                    char buf[INET_ADDRSTRLEN];
+                    const struct sockaddr_in *addr = (const struct sockaddr_in*)curr->ifa_addr;
+                    if(inet_ntop(AF_INET, &addr->sin_addr, buf, INET_ADDRSTRLEN))
+                    {
+                        [interfacesIPv4 addObject:[NSString stringWithUTF8String:buf]];
+                    }
+                }
+                else if(curr->ifa_addr->sa_family == AF_INET6)
+                {
+                    char buf[INET6_ADDRSTRLEN];
+                    const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6*)curr->ifa_addr;
+                    if(inet_ntop(AF_INET6, &addr6->sin6_addr, buf, INET6_ADDRSTRLEN))
+                    {
+                        [interfacesIPv6 addObject:[NSString stringWithUTF8String:buf]];
+                    }
+                }
+            }
+            curr = curr->ifa_next;
+        }
+        freeifaddrs(ifap);
+    }
+
+    // By default, use the loopback
+    [interfaceIPv4 selectRow:0 inComponent:0 animated:NO];
+    [interfaceIPv6 selectRow:0 inComponent:0 animated:NO];
+    (*startController)(self,
+                       [interfacesIPv4 objectAtIndex:[interfaceIPv4 selectedRowInComponent:0]],
+                       [interfacesIPv6 objectAtIndex:[interfaceIPv6 selectedRowInComponent:0]]);
+}
+
+- (void) dealloc
+{
+    (*stopController)(self);
+}
+
+-(void) write:(NSString*)msg
+{
+    [output insertText:msg];
+    [output layoutIfNeeded];
+    [output scrollRangeToVisible:NSMakeRange([output.text length] - 1, 1)];
+}
+
+#pragma mark ControllerView
+
+-(void) print:(NSString*)msg
+{
+    [self performSelectorOnMainThread:@selector(write:) withObject:msg waitUntilDone:NO];
+}
+-(void) println:(NSString*)msg
+{
+    [self print:[msg stringByAppendingString:@"\n"]];
+}
+
+#pragma mark UIPickerViewDelegate
+
+- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
+{
+    if(pickerView == interfaceIPv4)
+    {
+        return [interfacesIPv4 objectAtIndex:row];
+    }
+    else
+    {
+        return [interfacesIPv6 objectAtIndex:row];
+    }
+}
+
+- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
+{
+    (*stopController)(self);
+    (*startController)(self,
+                       [interfacesIPv4 objectAtIndex:[interfaceIPv4 selectedRowInComponent:0]],
+                       [interfacesIPv6 objectAtIndex:[interfaceIPv6 selectedRowInComponent:0]]);
+}
+
+#pragma mark UIPickerViewDataSource
+
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
+{
+    return 1;
+}
+
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
+{
+    if(pickerView == interfaceIPv4)
+    {
+        return interfacesIPv4.count;
+    }
+    else
+    {
+        return interfacesIPv6.count;
+    }
+}
+
+@end
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/main.m zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/main.m
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/main.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/main.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ViewController.h zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ViewController.h
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ViewController.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ViewController.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#import <UIKit/UIKit.h>
-
-@protocol ViewController
--(void) print:(NSString*)msg;
--(void) println:(NSString*)msg;
-@end
-
-@interface ViewController : UIViewController<ViewController, UIPickerViewDataSource, UIPickerViewDelegate>
-{
-@private
-    IBOutlet UIPickerView* interfaceIPv4;
-    IBOutlet UIPickerView* interfaceIPv6;
-    IBOutlet UITextView* output;
-    void (*startController)(id<ViewController>, NSString*, NSString*);
-    void (*stopController)(id<ViewController>);
-    NSMutableArray* interfacesIPv4;
-    NSMutableArray* interfacesIPv6;
-}
-@end
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ViewController.m zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ViewController.m
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Classes/ViewController.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Classes/ViewController.m	1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#import "ViewController.h"
-
-#include <ifaddrs.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-
-@implementation ViewController
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-
-    //
-    // Load the controller bundle.
-    //
-    NSString* bundlePath = [[NSBundle mainBundle] privateFrameworksPath];
-#ifdef ICE_CPP11_MAPPING
-    const char* bundle = "Cpp11ControllerBundle.bundle";
-#else
-    const char* bundle = "Cpp98ControllerBundle.bundle";
-#endif
-    bundlePath = [bundlePath stringByAppendingPathComponent:[NSString stringWithUTF8String:bundle]];
-
-    NSURL* bundleURL = [NSURL fileURLWithPath:bundlePath];
-    CFBundleRef handle = CFBundleCreate(NULL, (CFURLRef)bundleURL);
-    if(!handle)
-    {
-        [self println:[NSString stringWithFormat:@"Could not find bundle %@", bundlePath]];
-        return;
-    }
-
-    CFErrorRef error = nil;
-    Boolean loaded = CFBundleLoadExecutableAndReturnError(handle, &error);
-    if(error != nil || !loaded)
-    {
-        [self println:[(__bridge NSError *)error description]];
-        return;
-    }
-
-    startController = CFBundleGetFunctionPointerForName(handle, CFSTR("startController"));
-    if(startController == 0)
-    {
-        NSString* err = [NSString stringWithFormat:@"Could not get function pointer startController from bundle %@",
-                         bundlePath];
-        [self println:err];
-        return;
-    }
-
-    stopController = CFBundleGetFunctionPointerForName(handle, CFSTR("stopController"));
-    if(stopController == 0)
-    {
-        NSString* err = [NSString stringWithFormat:@"Could not get function pointer stopController from bundle %@",
-                         bundlePath];
-        [self println:err];
-        return;
-    }
-
-    //
-    // Search for local network interfaces
-    //
-    interfacesIPv4 = [NSMutableArray array];
-    [interfacesIPv4 addObject:@"127.0.0.1"];
-    interfacesIPv6 = [NSMutableArray array];
-    [interfacesIPv6 addObject:@"::1"];
-    struct ifaddrs* ifap;
-    if(getifaddrs(&ifap) == 0)
-    {
-        struct ifaddrs* curr = ifap;
-        while(curr != 0)
-        {
-            if(curr->ifa_addr && curr->ifa_flags & IFF_UP && !(curr->ifa_flags & IFF_LOOPBACK))
-            {
-                if(curr->ifa_addr->sa_family == AF_INET)
-                {
-                    char buf[INET_ADDRSTRLEN];
-                    const struct sockaddr_in *addr = (const struct sockaddr_in*)curr->ifa_addr;
-                    if(inet_ntop(AF_INET, &addr->sin_addr, buf, INET_ADDRSTRLEN))
-                    {
-                        [interfacesIPv4 addObject:[NSString stringWithUTF8String:buf]];
-                    }
-                }
-                else if(curr->ifa_addr->sa_family == AF_INET6)
-                {
-                    char buf[INET6_ADDRSTRLEN];
-                    const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6*)curr->ifa_addr;
-                    if(inet_ntop(AF_INET6, &addr6->sin6_addr, buf, INET6_ADDRSTRLEN))
-                    {
-                        [interfacesIPv6 addObject:[NSString stringWithUTF8String:buf]];
-                    }
-                }
-            }
-            curr = curr->ifa_next;
-        }
-        freeifaddrs(ifap);
-    }
-
-    // By default, use the loopback
-    [interfaceIPv4 selectRow:0 inComponent:0 animated:NO];
-    [interfaceIPv6 selectRow:0 inComponent:0 animated:NO];
-    (*startController)(self,
-                       [interfacesIPv4 objectAtIndex:[interfaceIPv4 selectedRowInComponent:0]],
-                       [interfacesIPv6 objectAtIndex:[interfaceIPv6 selectedRowInComponent:0]]);
-}
-
-- (void) dealloc
-{
-    (*stopController)(self);
-}
-
--(void) write:(NSString*)msg
-{
-    [output insertText:msg];
-    [output layoutIfNeeded];
-    [output scrollRangeToVisible:NSMakeRange([output.text length] - 1, 1)];
-}
-
-#pragma mark ViewController
-
--(void) print:(NSString*)msg
-{
-    [self performSelectorOnMainThread:@selector(write:) withObject:msg waitUntilDone:NO];
-}
--(void) println:(NSString*)msg
-{
-    [self print:[msg stringByAppendingString:@"\n"]];
-}
-
-#pragma mark UIPickerViewDelegate
-
-- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
-{
-    if(pickerView == interfaceIPv4)
-    {
-        return [interfacesIPv4 objectAtIndex:row];
-    }
-    else
-    {
-        return [interfacesIPv6 objectAtIndex:row];
-    }
-}
-
-- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
-{
-    (*stopController)(self);
-    (*startController)(self,
-                       [interfacesIPv4 objectAtIndex:[interfaceIPv4 selectedRowInComponent:0]],
-                       [interfacesIPv6 objectAtIndex:[interfaceIPv6 selectedRowInComponent:0]]);
-}
-
-#pragma mark UIPickerViewDataSource
-
-- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
-{
-    return 1;
-}
-
-- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
-{
-    if(pickerView == interfaceIPv4)
-    {
-        return interfacesIPv4.count;
-    }
-    else
-    {
-        return interfacesIPv6.count;
-    }
-}
-
-@end
diff -Nru "/tmp/woxfVAWQuO/zeroc-ice-3.7.1/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj" "/tmp/8caLpp1yxR/zeroc-ice-3.7.2/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj"
--- "/tmp/woxfVAWQuO/zeroc-ice-3.7.1/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj"	2018-04-20 15:02:08.000000000 +0000
+++ "/tmp/8caLpp1yxR/zeroc-ice-3.7.2/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj"	2019-02-05 18:03:04.000000000 +0000
@@ -12,14 +12,12 @@
 		1419EB471E028A3A00352FD7 /* Controller.ice in Sources */ = {isa = PBXBuildFile; fileRef = 1419EB441E028A0700352FD7 /* Controller.ice */; };
 		143A09B11EB38CAD00C8F91F /* cacert.pem in Resources */ = {isa = PBXBuildFile; fileRef = 143A09B01EB38CAD00C8F91F /* cacert.pem */; };
 		1440D8761E0187BA00CF7ED3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14B70D0F1E0160FD00118DE3 /* UIKit.framework */; };
-		1440D8841E0188A600CF7ED3 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1440D8821E0188A600CF7ED3 /* Info.plist */; };
 		1440D88A1E0189F300CF7ED3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1440D8891E0189F300CF7ED3 /* Foundation.framework */; };
 		1440D88B1E018A2600CF7ED3 /* Cpp11ControllerBundle.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1440D86C1E0186FF00CF7ED3 /* Cpp11ControllerBundle.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		1440D88C1E018B0C00CF7ED3 /* ControllerI.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1440D8811E0188A600CF7ED3 /* ControllerI.mm */; };
 		148ABA1A1DFB12C800594F70 /* client.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA171DFB12C800594F70 /* client.p12 */; };
 		148ABA1B1DFB12C800594F70 /* server.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA181DFB12C800594F70 /* server.p12 */; };
 		148ABA1D1DFB12DB00594F70 /* certs in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA1C1DFB12DB00594F70 /* certs */; };
-		148ABA431DFEEAEE00594F70 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C5B1DF98FD8002AE61B /* ViewController.m */; };
 		148ABA441DFEEAEE00594F70 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C581DF98FD8002AE61B /* AppDelegate.m */; };
 		148ABA451DFEEAEE00594F70 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C551DF98FD8002AE61B /* main.m */; };
 		148ABA481DFEEAEE00594F70 /* client.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA171DFB12C800594F70 /* client.p12 */; };
@@ -30,7 +28,6 @@
 		148ABA4E1DFEEAEE00594F70 /* certs in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA1C1DFB12DB00594F70 /* certs */; };
 		14905C561DF98FD8002AE61B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C551DF98FD8002AE61B /* main.m */; };
 		14905C591DF98FD8002AE61B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C581DF98FD8002AE61B /* AppDelegate.m */; };
-		14905C5C1DF98FD8002AE61B /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C5B1DF98FD8002AE61B /* ViewController.m */; };
 		14905C5F1DF98FD8002AE61B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14905C5D1DF98FD8002AE61B /* Main.storyboard */; };
 		14905C611DF98FD8002AE61B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 14905C601DF98FD8002AE61B /* Assets.xcassets */; };
 		14905C641DF98FD8002AE61B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14905C621DF98FD8002AE61B /* LaunchScreen.storyboard */; };
@@ -41,6 +38,10 @@
 		14E398361E01B18100A89291 /* Cpp98ControllerBundle.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 14E398311E01B14B00A89291 /* Cpp98ControllerBundle.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		14E398381E01B30500A89291 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14E398371E01B30500A89291 /* CFNetwork.framework */; };
 		14E398391E01B30E00A89291 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14E398371E01B30500A89291 /* CFNetwork.framework */; };
+		8267256920A9EF6E0089EA2D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8267256820A9EF6E0089EA2D /* Security.framework */; };
+		8267256A20A9F0210089EA2D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8267256820A9EF6E0089EA2D /* Security.framework */; };
+		828491FE20C82DAB00B4B721 /* ControllerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 82A1B91620C0081200B3535B /* ControllerView.m */; };
+		82A1B91820C0081200B3535B /* ControllerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 82A1B91620C0081200B3535B /* ControllerView.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
@@ -126,8 +127,6 @@
 		14905C551DF98FD8002AE61B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		14905C571DF98FD8002AE61B /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		14905C581DF98FD8002AE61B /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		14905C5A1DF98FD8002AE61B /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		14905C5B1DF98FD8002AE61B /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		14905C5E1DF98FD8002AE61B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		14905C601DF98FD8002AE61B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		14905C631DF98FD8002AE61B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -135,6 +134,9 @@
 		14B70D0F1E0160FD00118DE3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		14E398311E01B14B00A89291 /* Cpp98ControllerBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Cpp98ControllerBundle.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		14E398371E01B30500A89291 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+		8267256820A9EF6E0089EA2D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		82A1B91620C0081200B3535B /* ControllerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ControllerView.m; sourceTree = "<group>"; };
+		82A1B91720C0081200B3535B /* ControllerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ControllerView.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -142,6 +144,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8267256920A9EF6E0089EA2D /* Security.framework in Frameworks */,
 				14E398391E01B30E00A89291 /* CFNetwork.framework in Frameworks */,
 				1440D8761E0187BA00CF7ED3 /* UIKit.framework in Frameworks */,
 				1440D88A1E0189F300CF7ED3 /* Foundation.framework in Frameworks */,
@@ -166,6 +169,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8267256A20A9F0210089EA2D /* Security.framework in Frameworks */,
 				14E398381E01B30500A89291 /* CFNetwork.framework in Frameworks */,
 				14E398291E01B14B00A89291 /* UIKit.framework in Frameworks */,
 				14E3982B1E01B14B00A89291 /* Foundation.framework in Frameworks */,
@@ -212,10 +216,10 @@
 		14905C531DF98FD8002AE61B /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				82A1B91720C0081200B3535B /* ControllerView.h */,
+				82A1B91620C0081200B3535B /* ControllerView.m */,
 				14905C571DF98FD8002AE61B /* AppDelegate.h */,
 				14905C581DF98FD8002AE61B /* AppDelegate.m */,
-				14905C5A1DF98FD8002AE61B /* ViewController.h */,
-				14905C5B1DF98FD8002AE61B /* ViewController.m */,
 				14905C5D1DF98FD8002AE61B /* Main.storyboard */,
 				14905C621DF98FD8002AE61B /* LaunchScreen.storyboard */,
 				14905C601DF98FD8002AE61B /* Assets.xcassets */,
@@ -246,6 +250,7 @@
 		14B70D0C1E0160F700118DE3 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				8267256820A9EF6E0089EA2D /* Security.framework */,
 				14E398371E01B30500A89291 /* CFNetwork.framework */,
 				1440D8891E0189F300CF7ED3 /* Foundation.framework */,
 				14B70D0F1E0160FD00118DE3 /* UIKit.framework */,
@@ -414,7 +419,6 @@
 				14905C611DF98FD8002AE61B /* Assets.xcassets in Resources */,
 				14905C5F1DF98FD8002AE61B /* Main.storyboard in Resources */,
 				148ABA1D1DFB12DB00594F70 /* certs in Resources */,
-				1440D8841E0188A600CF7ED3 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -472,7 +476,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				148ABA431DFEEAEE00594F70 /* ViewController.m in Sources */,
+				828491FE20C82DAB00B4B721 /* ControllerView.m in Sources */,
 				148ABA441DFEEAEE00594F70 /* AppDelegate.m in Sources */,
 				148ABA451DFEEAEE00594F70 /* main.m in Sources */,
 			);
@@ -482,7 +486,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				14905C5C1DF98FD8002AE61B /* ViewController.m in Sources */,
+				82A1B91820C0081200B3535B /* ControllerView.m in Sources */,
 				14905C591DF98FD8002AE61B /* AppDelegate.m in Sources */,
 				14905C561DF98FD8002AE61B /* main.m in Sources */,
 			);
@@ -543,16 +547,23 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					ICE_CPP11_MAPPING,
-					"$(inherited)",
+					ICE_STATIC_LIBS,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
+				);
 				INFOPLIST_FILE = Bundle/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/cpp11-xcodesdk",
+					"-lTestCommon++11",
 					"-lIceDiscovery++11",
+					"-lIceSSL++11",
 					"-lIce++11",
 					"-lbz2",
 					"-liconv",
@@ -577,13 +588,20 @@
 					ICE_STATIC_LIBS,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
+				);
 				INFOPLIST_FILE = Bundle/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/cpp11-xcodesdk",
+					"-lTestCommon++11",
 					"-lIceDiscovery++11",
+					"-lIceSSL++11",
 					"-lIce++11",
 					"-lbz2",
 					"-liconv",
@@ -605,11 +623,16 @@
 					ICE_STATIC_LIBS,
 					ICE_CPP11_MAPPING,
 				);
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Classes/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/cpp11-xcodesdk",
+					"-lTestCommon++11",
 					"-lIce++11",
+					"-lIceSSL++11",
 					"-lIceDiscovery++11",
 					"-lbz2",
 					"-liconv",
@@ -630,12 +653,17 @@
 					ICE_STATIC_LIBS,
 					ICE_CPP11_MAPPING,
 				);
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Classes/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/cpp11-xcodesdk",
+					"-lTestCommon++11",
 					"-lIce++11",
 					"-lIceDiscovery++11",
+					"-lIceSSL++11",
 					"-lbz2",
 					"-liconv",
 				);
@@ -648,7 +676,6 @@
 		14905C661DF98FD8002AE61B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -700,7 +727,6 @@
 		14905C671DF98FD8002AE61B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -755,8 +781,12 @@
 				DEVELOPMENT_TEAM = U4TBVKNQ7F;
 				INFOPLIST_FILE = Classes/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/xcodesdk",
+					"-lIceSSL",
+					"-lTestCommon",
 					"-lIce",
 					"-lIceDiscovery",
 					"-lbz2",
@@ -776,8 +806,12 @@
 				DEVELOPMENT_TEAM = U4TBVKNQ7F;
 				INFOPLIST_FILE = Classes/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/xcodesdk",
+					"-lIceSSL",
+					"-lTestCommon",
 					"-lIce",
 					"-lIceDiscovery",
 					"-lbz2",
@@ -802,12 +836,19 @@
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
+				);
 				INFOPLIST_FILE = Bundle/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/xcodesdk",
+					"-lTestCommon",
+					"-lIceSSL",
 					"-lIceDiscovery",
 					"-lIce",
 					"-lbz2",
@@ -830,12 +871,19 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = ICE_STATIC_LIBS;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
+				);
 				INFOPLIST_FILE = Bundle/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
+					"-L../../Common/build/$(PLATFORM_NAME)/xcodesdk",
+					"-lTestCommon",
+					"-lIceSSL",
 					"-lIceDiscovery",
 					"-lIce",
 					"-lbz2",
diff -Nru zeroc-ice-3.7.1/cpp/test/ios/controller/Makefile.mk zeroc-ice-3.7.2/cpp/test/ios/controller/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/ios/controller/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/ios/controller/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_type                 = xcode
 $(project)_platforms            = iphonesimulator iphoneos
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/CaseInsensitive.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/CaseInsensitive.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/CaseInsensitive.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/CaseInsensitive.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,65 +1,65 @@
-CaseInsensitive.ice:18: redefinition of operation `op' as operation `op'
-CaseInsensitive.ice:24: operation `oP' differs only in capitalization from operation `op'
-CaseInsensitive.ice:24: redefinition of operation `op' as operation `oP'
-CaseInsensitive.ice:30: redefinition of data member `l' as operation `l'
-CaseInsensitive.ice:36: operation `L' differs only in capitalization from data member `l'
-CaseInsensitive.ice:36: redefinition of data member `l' as operation `L'
-CaseInsensitive.ice:43: module `M1' is capitalized inconsistently with its previous name: `m1'
-CaseInsensitive.ice:45: redefinition of class `c1' as module
-CaseInsensitive.ice:47: module `C1' differs only in capitalization from class name `c1'
-CaseInsensitive.ice:52: redefinition of parameter `aa'
-CaseInsensitive.ice:53: parameter `BB' differs only in capitalization from parameter `bb'
-CaseInsensitive.ice:53: `BB' has changed meaning
-CaseInsensitive.ice:58: operation `I4' differs only in capitalization from enclosing interface name `i4'
-CaseInsensitive.ice:63: interface name `i5' cannot be used as operation name
-CaseInsensitive.ice:73: operation `op' is already defined as an operation in a base interface or class
-CaseInsensitive.ice:78: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class
-CaseInsensitive.ice:88: operation `l' is already defined as a data member in a base interface or class
-CaseInsensitive.ice:93: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class
-CaseInsensitive.ice:93: warning: classes with operations are deprecated
-CaseInsensitive.ice:99: operation `L' differs only in capitalization from data member `l'
-CaseInsensitive.ice:99: redefinition of data member `l' as operation `L'
-CaseInsensitive.ice:104: data member `l' is already defined as a data member in a base interface or class
-CaseInsensitive.ice:109: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class
-CaseInsensitive.ice:114: warning: classes with operations are deprecated
-CaseInsensitive.ice:115: data member `l' differs only in capitalization from operation `L'
-CaseInsensitive.ice:121: redefinition of exception member `l'
-CaseInsensitive.ice:127: exception member `L' differs only in capitalization from exception member `l'
-CaseInsensitive.ice:127: `L' has changed meaning
-CaseInsensitive.ice:147: exception member `l' is already defined in a base exception
-CaseInsensitive.ice:152: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception
-CaseInsensitive.ice:158: redefinition of struct member `l'
-CaseInsensitive.ice:164: member `L' differs only in capitalization from member `l'
-CaseInsensitive.ice:164: `L' has changed meaning
-CaseInsensitive.ice:180: sequence `LS' differs only in capitalization from sequence `ls'
-CaseInsensitive.ice:181: redefinition of module `m1' as sequence
-CaseInsensitive.ice:182: sequence `M1' differs only in capitalization from module `m1'
-CaseInsensitive.ice:185: dictionary `D' differs only in capitalization from dictionary `d'
-CaseInsensitive.ice:186: redefinition of module `m1' as dictionary
-CaseInsensitive.ice:187: dictionary `M1' differs only in capitalization from module `m1'
-CaseInsensitive.ice:190: enumeration `eN1' differs only in capitalization from enumeration `en1'
-CaseInsensitive.ice:191: redefinition of module `m1' as enumeration
-CaseInsensitive.ice:192: enumeration `M1' differs only in capitalization from module `m1'
-CaseInsensitive.ice:193: enumerator `EN1' differs only in capitalization from `en1'
-CaseInsensitive.ice:211: interface name `base' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Base'
-CaseInsensitive.ice:211: redefinition of interface `Derived'
-CaseInsensitive.ice:218: exception name `E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
-CaseInsensitive.ice:225: sequence name `S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
-CaseInsensitive.ice:226: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
-CaseInsensitive.ice:227: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
-CaseInsensitive.ice:228: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
-CaseInsensitive.ice:234: interface name `derived' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Derived'
-CaseInsensitive.ice:243: parameter `Param' differs only in capitalization from parameter `param'
-CaseInsensitive.ice:243: `Param' has changed meaning
-CaseInsensitive.ice:245: exception name `E1' is capitalized inconsistently with its previous name: `::Test::e1'
-CaseInsensitive.ice:247: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
-CaseInsensitive.ice:248: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
-CaseInsensitive.ice:249: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
-CaseInsensitive.ice:251: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
-CaseInsensitive.ice:252: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
-CaseInsensitive.ice:253: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
-CaseInsensitive.ice:271: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces
-CaseInsensitive.ice:286: warning: classes with operations are deprecated
-CaseInsensitive.ice:288: parameter `BASE1' differs only in capitalization from parameter `base1'
-CaseInsensitive.ice:288: `BASE1' has changed meaning
-CaseInsensitive.ice:318: data member `x' differs only in capitalization from data member `X', which is defined in a base interface or class
+CaseInsensitive.ice:11: redefinition of operation `op' as operation `op'
+CaseInsensitive.ice:17: operation `oP' differs only in capitalization from operation `op'
+CaseInsensitive.ice:17: redefinition of operation `op' as operation `oP'
+CaseInsensitive.ice:23: redefinition of data member `l' as operation `l'
+CaseInsensitive.ice:29: operation `L' differs only in capitalization from data member `l'
+CaseInsensitive.ice:29: redefinition of data member `l' as operation `L'
+CaseInsensitive.ice:36: module `M1' is capitalized inconsistently with its previous name: `m1'
+CaseInsensitive.ice:38: redefinition of class `c1' as module
+CaseInsensitive.ice:40: module `C1' differs only in capitalization from class name `c1'
+CaseInsensitive.ice:45: redefinition of parameter `aa'
+CaseInsensitive.ice:46: parameter `BB' differs only in capitalization from parameter `bb'
+CaseInsensitive.ice:46: `BB' has changed meaning
+CaseInsensitive.ice:51: operation `I4' differs only in capitalization from enclosing interface name `i4'
+CaseInsensitive.ice:56: interface name `i5' cannot be used as operation name
+CaseInsensitive.ice:66: operation `op' is already defined as an operation in a base interface or class
+CaseInsensitive.ice:71: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class
+CaseInsensitive.ice:81: operation `l' is already defined as a data member in a base interface or class
+CaseInsensitive.ice:86: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class
+CaseInsensitive.ice:86: warning: classes with operations are deprecated
+CaseInsensitive.ice:92: operation `L' differs only in capitalization from data member `l'
+CaseInsensitive.ice:92: redefinition of data member `l' as operation `L'
+CaseInsensitive.ice:97: data member `l' is already defined as a data member in a base interface or class
+CaseInsensitive.ice:102: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class
+CaseInsensitive.ice:107: warning: classes with operations are deprecated
+CaseInsensitive.ice:108: data member `l' differs only in capitalization from operation `L'
+CaseInsensitive.ice:114: redefinition of exception member `l'
+CaseInsensitive.ice:120: exception member `L' differs only in capitalization from exception member `l'
+CaseInsensitive.ice:120: `L' has changed meaning
+CaseInsensitive.ice:140: exception member `l' is already defined in a base exception
+CaseInsensitive.ice:145: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception
+CaseInsensitive.ice:151: redefinition of struct member `l'
+CaseInsensitive.ice:157: member `L' differs only in capitalization from member `l'
+CaseInsensitive.ice:157: `L' has changed meaning
+CaseInsensitive.ice:173: sequence `LS' differs only in capitalization from sequence `ls'
+CaseInsensitive.ice:174: redefinition of module `m1' as sequence
+CaseInsensitive.ice:175: sequence `M1' differs only in capitalization from module `m1'
+CaseInsensitive.ice:178: dictionary `D' differs only in capitalization from dictionary `d'
+CaseInsensitive.ice:179: redefinition of module `m1' as dictionary
+CaseInsensitive.ice:180: dictionary `M1' differs only in capitalization from module `m1'
+CaseInsensitive.ice:183: enumeration `eN1' differs only in capitalization from enumeration `en1'
+CaseInsensitive.ice:184: redefinition of module `m1' as enumeration
+CaseInsensitive.ice:185: enumeration `M1' differs only in capitalization from module `m1'
+CaseInsensitive.ice:186: enumerator `EN1' differs only in capitalization from `en1'
+CaseInsensitive.ice:204: interface name `base' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Base'
+CaseInsensitive.ice:204: redefinition of interface `Derived'
+CaseInsensitive.ice:211: exception name `E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
+CaseInsensitive.ice:218: sequence name `S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
+CaseInsensitive.ice:219: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
+CaseInsensitive.ice:220: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
+CaseInsensitive.ice:221: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1'
+CaseInsensitive.ice:227: interface name `derived' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Derived'
+CaseInsensitive.ice:236: parameter `Param' differs only in capitalization from parameter `param'
+CaseInsensitive.ice:236: `Param' has changed meaning
+CaseInsensitive.ice:238: exception name `E1' is capitalized inconsistently with its previous name: `::Test::e1'
+CaseInsensitive.ice:240: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
+CaseInsensitive.ice:241: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
+CaseInsensitive.ice:242: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
+CaseInsensitive.ice:244: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
+CaseInsensitive.ice:245: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
+CaseInsensitive.ice:246: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1'
+CaseInsensitive.ice:264: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces
+CaseInsensitive.ice:279: warning: classes with operations are deprecated
+CaseInsensitive.ice:281: parameter `BASE1' differs only in capitalization from parameter `base1'
+CaseInsensitive.ice:281: `BASE1' has changed meaning
+CaseInsensitive.ice:311: data member `x' differs only in capitalization from data member `X', which is defined in a base interface or class
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/CaseInsensitive.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/CaseInsensitive.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/CaseInsensitive.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/CaseInsensitive.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ChangedMeaning.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ChangedMeaning.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ChangedMeaning.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ChangedMeaning.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,23 @@
-ChangedMeaning.ice:50: `M' has changed meaning
-ChangedMeaning.ice:56: `M' has changed meaning
-ChangedMeaning.ice:63: `i1' has changed meaning
-ChangedMeaning.ice:64: `i2' has changed meaning
-ChangedMeaning.ice:85: `e1' has changed meaning
-ChangedMeaning.ice:86: `e2' has changed meaning
-ChangedMeaning.ice:98: `c1' has changed meaning
-ChangedMeaning.ice:99: `c2' has changed meaning
-ChangedMeaning.ice:120: `CounterSeq' has changed meaning
-ChangedMeaning.ice:129: redefinition of parameter `param'
-ChangedMeaning.ice:147: `E' is not an exception
-ChangedMeaning.ice:147: `E' has changed meaning
-ChangedMeaning.ice:154: `E' has changed meaning
-ChangedMeaning.ice:160: `E' has changed meaning
-ChangedMeaning.ice:195: data member `X' differs only in capitalization from data member `x'
-ChangedMeaning.ice:195: `X' has changed meaning
-ChangedMeaning.ice:201: member `X' differs only in capitalization from member `x'
-ChangedMeaning.ice:201: `X' has changed meaning
-ChangedMeaning.ice:206: parameter `A' differs only in capitalization from parameter `a'
-ChangedMeaning.ice:206: `A' has changed meaning
-ChangedMeaning.ice:214: redefinition of operation `x' as data member `x'
-ChangedMeaning.ice:226: exception member `X' differs only in capitalization from exception member `x'
-ChangedMeaning.ice:226: `X' has changed meaning
+ChangedMeaning.ice:45: `M' has changed meaning
+ChangedMeaning.ice:51: `M' has changed meaning
+ChangedMeaning.ice:58: `i1' has changed meaning
+ChangedMeaning.ice:59: `i2' has changed meaning
+ChangedMeaning.ice:79: `e1' has changed meaning
+ChangedMeaning.ice:80: `e2' has changed meaning
+ChangedMeaning.ice:90: `c1' has changed meaning
+ChangedMeaning.ice:91: `c2' has changed meaning
+ChangedMeaning.ice:108: `CounterSeq' has changed meaning
+ChangedMeaning.ice:117: redefinition of parameter `param'
+ChangedMeaning.ice:135: `E' is not an exception
+ChangedMeaning.ice:135: `E' has changed meaning
+ChangedMeaning.ice:142: `E' has changed meaning
+ChangedMeaning.ice:148: `E' has changed meaning
+ChangedMeaning.ice:183: data member `X' differs only in capitalization from data member `x'
+ChangedMeaning.ice:183: `X' has changed meaning
+ChangedMeaning.ice:189: member `X' differs only in capitalization from member `x'
+ChangedMeaning.ice:189: `X' has changed meaning
+ChangedMeaning.ice:194: parameter `A' differs only in capitalization from parameter `a'
+ChangedMeaning.ice:194: `A' has changed meaning
+ChangedMeaning.ice:202: redefinition of operation `x' as data member `x'
+ChangedMeaning.ice:214: exception member `X' differs only in capitalization from exception member `x'
+ChangedMeaning.ice:214: `X' has changed meaning
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ChangedMeaning.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ChangedMeaning.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ChangedMeaning.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ChangedMeaning.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]] // for classes with operations
 
@@ -80,11 +75,9 @@
 
 module E
 {
-
     exception ee1 extends e1 {}
     exception e1 {}            // Changed meaning
     exception e2 extends e2 {} // Changed meaning
-
 }
 
 interface c1 {}
@@ -93,22 +86,17 @@
 
 module C
 {
-
     class cc1 implements c1 {}
     class c1 {}                // Changed meaning
     class c2 extends c2 {}     // Changed meaning
-
 }
 
 enum color { blue }
 
 module B
 {
-
     const color fc = blue;
-
     interface blue {}          // OK as of Ice 3.7 (enumerators are in their enum's namespace)
-
 }
 
 enum counter { one, two }
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ClassRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ClassRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ClassRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ClassRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-ClassRedefinition.ice:17: redefinition of class `Class1'
-ClassRedefinition.ice:21: redefinition of class `Class2'
+ClassRedefinition.ice:10: redefinition of class `Class1'
+ClassRedefinition.ice:14: redefinition of class `Class2'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ClassRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ClassRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ClassRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ClassRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ConstDef.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ConstDef.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ConstDef.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ConstDef.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,31 @@
-ConstDef.ice:75: `XXX' is not defined
-ConstDef.ice:76: redefinition of constant `f11' as constant
-ConstDef.ice:77: constant `F10' differs only in capitalization from constant `f10'
-ConstDef.ice:80: constant `ic2' has illegal type
-ConstDef.ice:81: constant `ic3' has illegal type: `Object'
-ConstDef.ice:83: initializer of type `long' is incompatible with the type `bool' of constant `ic4'
-ConstDef.ice:84: initializer of type `string' is incompatible with the type `byte' of constant `ic5'
-ConstDef.ice:85: initializer of type `double' is incompatible with the type `short' of constant `ic6'
-ConstDef.ice:86: type of initializer is incompatible with the type `int' of constant `ic7'
-ConstDef.ice:87: initializer of type `bool' is incompatible with the type `long' of constant `ic8'
-ConstDef.ice:89: missing constant name
-ConstDef.ice:92: `two' does not designate an enumerator of `::Test::color'
-ConstDef.ice:93: type of initializer is incompatible with the type of constant `ic10'
-ConstDef.ice:109: integer constant `-9223372036854775809' out of range
-ConstDef.ice:110: integer constant `+9223372036854775808' out of range
-ConstDef.ice:114: initializer `-2147483649' for constant `i3' out of range for type int
-ConstDef.ice:115: initializer `2147483648' for constant `i4' out of range for type int
-ConstDef.ice:119: initializer `-32769' for constant `s3' out of range for type short
-ConstDef.ice:120: initializer `32768' for constant `s4' out of range for type short
-ConstDef.ice:124: initializer `-1' for constant `b3' out of range for type byte
-ConstDef.ice:125: initializer `256' for constant `b4' out of range for type byte
-ConstDef.ice:137: initializer `32767' for constant `c5' out of range for type byte
-ConstDef.ice:138: initializer `2147483647' for constant `c6' out of range for type short
-ConstDef.ice:139: initializer `9223372036854775807' for constant `c7' out of range for type int
-ConstDef.ice:150: warning: unknown escape sequence `\g'
-ConstDef.ice:151: unknown escape sequence in string literal: `\u000N'
-ConstDef.ice:152: unknown escape sequence in string literal: `\U0000000K'
-ConstDef.ice:153: octal escape sequence out of range: `\455'
-ConstDef.ice:154: no hex digit in hex escape sequence
-ConstDef.ice:155: a universal character name cannot designate a surrogate: `\uD83C'
-ConstDef.ice:155: a universal character name cannot designate a surrogate: `\uDF4C'
+ConstDef.ice:68: `XXX' is not defined
+ConstDef.ice:69: redefinition of constant `f11' as constant
+ConstDef.ice:70: constant `F10' differs only in capitalization from constant `f10'
+ConstDef.ice:73: constant `ic2' has illegal type
+ConstDef.ice:74: constant `ic3' has illegal type: `Object'
+ConstDef.ice:76: initializer of type `long' is incompatible with the type `bool' of constant `ic4'
+ConstDef.ice:77: initializer of type `string' is incompatible with the type `byte' of constant `ic5'
+ConstDef.ice:78: initializer of type `double' is incompatible with the type `short' of constant `ic6'
+ConstDef.ice:79: type of initializer is incompatible with the type `int' of constant `ic7'
+ConstDef.ice:80: initializer of type `bool' is incompatible with the type `long' of constant `ic8'
+ConstDef.ice:82: missing constant name
+ConstDef.ice:85: `two' does not designate an enumerator of `::Test::color'
+ConstDef.ice:86: type of initializer is incompatible with the type of constant `ic10'
+ConstDef.ice:102: integer constant `-9223372036854775809' out of range
+ConstDef.ice:103: integer constant `+9223372036854775808' out of range
+ConstDef.ice:107: initializer `-2147483649' for constant `i3' out of range for type int
+ConstDef.ice:108: initializer `2147483648' for constant `i4' out of range for type int
+ConstDef.ice:112: initializer `-32769' for constant `s3' out of range for type short
+ConstDef.ice:113: initializer `32768' for constant `s4' out of range for type short
+ConstDef.ice:117: initializer `-1' for constant `b3' out of range for type byte
+ConstDef.ice:118: initializer `256' for constant `b4' out of range for type byte
+ConstDef.ice:130: initializer `32767' for constant `c5' out of range for type byte
+ConstDef.ice:131: initializer `2147483647' for constant `c6' out of range for type short
+ConstDef.ice:132: initializer `9223372036854775807' for constant `c7' out of range for type int
+ConstDef.ice:143: warning: unknown escape sequence `\g'
+ConstDef.ice:144: unknown escape sequence in string literal: `\u000N'
+ConstDef.ice:145: unknown escape sequence in string literal: `\U0000000K'
+ConstDef.ice:146: octal escape sequence out of range: `\455'
+ConstDef.ice:147: no hex digit in hex escape sequence
+ConstDef.ice:148: a universal character name cannot designate a surrogate: `\uD83C'
+ConstDef.ice:148: a universal character name cannot designate a surrogate: `\uDF4C'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ConstDef.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ConstDef.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ConstDef.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ConstDef.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DataMemberRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DataMemberRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DataMemberRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DataMemberRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
-DataMemberRedefinition.ice:18: redefinition of data member `member' as data member `member'
-DataMemberRedefinition.ice:28: data member `x' is already defined as an operation in a base interface or class
-DataMemberRedefinition.ice:38: operation `x' is already defined as a data member in a base interface or class
-DataMemberRedefinition.ice:48: data member `x' is already defined as a data member in a base interface or class
-DataMemberRedefinition.ice:54: redefinition of struct member `member'
+DataMemberRedefinition.ice:13: redefinition of data member `member' as data member `member'
+DataMemberRedefinition.ice:23: data member `x' is already defined as an operation in a base interface or class
+DataMemberRedefinition.ice:33: operation `x' is already defined as a data member in a base interface or class
+DataMemberRedefinition.ice:43: data member `x' is already defined as a data member in a base interface or class
+DataMemberRedefinition.ice:49: redefinition of struct member `member'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]] // for classes with operations
 
@@ -54,5 +49,4 @@
     int member;
 }
 
-
 }
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DeclaratorMissing.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DeclaratorMissing.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DeclaratorMissing.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DeclaratorMissing.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,4 @@
-DeclaratorMissing.ice:17: missing parameter name
-DeclaratorMissing.ice:17: missing parameter name
-DeclaratorMissing.ice:18: missing parameter name
-DeclaratorMissing.ice:18: missing parameter name
+DeclaratorMissing.ice:10: missing parameter name
+DeclaratorMissing.ice:10: missing parameter name
+DeclaratorMissing.ice:11: missing parameter name
+DeclaratorMissing.ice:11: missing parameter name
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DeclaratorMissing.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DeclaratorMissing.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DeclaratorMissing.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DerivedRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DerivedRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DerivedRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DerivedRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
-DerivedRedefinition.ice:23: operation `op' is already defined as an operation in a base interface or class
-DerivedRedefinition.ice:24: operation `op' is already defined as an operation in a base interface or class
-DerivedRedefinition.ice:40: operation `op' is already defined as an operation in a base interface or class
-DerivedRedefinition.ice:44: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces
-DerivedRedefinition.ice:49: data member `l' is already defined as a data member in a base interface or class
-DerivedRedefinition.ice:51: data member `l' is already defined as a data member in a base interface or class
+DerivedRedefinition.ice:16: operation `op' is already defined as an operation in a base interface or class
+DerivedRedefinition.ice:17: operation `op' is already defined as an operation in a base interface or class
+DerivedRedefinition.ice:33: operation `op' is already defined as an operation in a base interface or class
+DerivedRedefinition.ice:37: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces
+DerivedRedefinition.ice:42: data member `l' is already defined as a data member in a base interface or class
+DerivedRedefinition.ice:44: data member `l' is already defined as a data member in a base interface or class
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DerivedRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DerivedRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DerivedRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DictionaryRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DictionaryRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DictionaryRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DictionaryRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-DictionaryRedefinition.ice:18: redefinition of dictionary `foo' as dictionary
+DictionaryRedefinition.ice:11: redefinition of dictionary `foo' as dictionary
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
-DummyAtGlobalLevel.ice:11: `Foo': an interface can be defined only at module scope
-DummyAtGlobalLevel.ice:12: `UndefinedException' is not defined
-DummyAtGlobalLevel.ice:13: keyword `class' cannot be used as exception name
-DummyAtGlobalLevel.ice:16: `IntSeq': a sequence can be defined only at module scope
-DummyAtGlobalLevel.ice:19: `S': a structure can be defined only at module scope
-DummyAtGlobalLevel.ice:23: `StringDict': a dictionary can be defined only at module scope
-DummyAtGlobalLevel.ice:25: `E': an enumeration can be defined only at module scope
-DummyAtGlobalLevel.ice:27: `x': a constant can be defined only at module scope
+DummyAtGlobalLevel.ice:6: `Foo': an interface can be defined only at module scope
+DummyAtGlobalLevel.ice:7: `UndefinedException' is not defined
+DummyAtGlobalLevel.ice:8: keyword `class' cannot be used as exception name
+DummyAtGlobalLevel.ice:11: `IntSeq': a sequence can be defined only at module scope
+DummyAtGlobalLevel.ice:14: `S': a structure can be defined only at module scope
+DummyAtGlobalLevel.ice:18: `StringDict': a dictionary can be defined only at module scope
+DummyAtGlobalLevel.ice:20: `E': an enumeration can be defined only at module scope
+DummyAtGlobalLevel.ice:22: `x': a constant can be defined only at module scope
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 interface Foo
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateParameter.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateParameter.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateParameter.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateParameter.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
-DuplicateParameter.ice:18: redefinition of parameter `s'
-DuplicateParameter.ice:19: redefinition of parameter `s'
-DuplicateParameter.ice:20: redefinition of parameter `s'
-DuplicateParameter.ice:21: redefinition of parameter `i'
-DuplicateParameter.ice:27: redefinition of parameter `s'
-DuplicateParameter.ice:28: redefinition of parameter `s'
-DuplicateParameter.ice:29: redefinition of parameter `s'
-DuplicateParameter.ice:30: redefinition of parameter `i'
+DuplicateParameter.ice:13: redefinition of parameter `s'
+DuplicateParameter.ice:14: redefinition of parameter `s'
+DuplicateParameter.ice:15: redefinition of parameter `s'
+DuplicateParameter.ice:16: redefinition of parameter `i'
+DuplicateParameter.ice:22: redefinition of parameter `s'
+DuplicateParameter.ice:23: redefinition of parameter `s'
+DuplicateParameter.ice:24: redefinition of parameter `s'
+DuplicateParameter.ice:25: redefinition of parameter `i'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateParameter.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateParameter.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateParameter.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateParameter.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]] // for classes with operations
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateThrows.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateThrows.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateThrows.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateThrows.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,4 @@
-DuplicateThrows.ice:17: operation `op' has a throws clause with a duplicate exception: `e'
-DuplicateThrows.ice:18: operation `op' has a throws clause with a duplicate exception: `e'
-DuplicateThrows.ice:19: operation `op' has a throws clause with a duplicate exception: `e2'
-DuplicateThrows.ice:20: operation `op' has a throws clause with duplicate exceptions: `e', `e2'
+DuplicateThrows.ice:10: operation `op' has a throws clause with a duplicate exception: `e'
+DuplicateThrows.ice:11: operation `op' has a throws clause with a duplicate exception: `e'
+DuplicateThrows.ice:12: operation `op' has a throws clause with a duplicate exception: `e2'
+DuplicateThrows.ice:13: operation `op' has a throws clause with duplicate exceptions: `e', `e2'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateThrows.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateThrows.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/DuplicateThrows.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/DuplicateThrows.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumEmpty.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumEmpty.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumEmpty.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumEmpty.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-EnumEmpty.ice:15: enum `foo' must have at least one enumerator
+EnumEmpty.ice:8: enum `foo' must have at least one enumerator
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumEmpty.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumEmpty.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumEmpty.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumEmpty.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorDuplication.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorDuplication.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorDuplication.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorDuplication.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-EnumeratorDuplication.ice:16: enumerator `B' has the same value as enumerator `A'
-EnumeratorDuplication.ice:18: enumerator `D' has the same value as enumerator `C'
+EnumeratorDuplication.ice:11: enumerator `B' has the same value as enumerator `A'
+EnumeratorDuplication.ice:13: enumerator `D' has the same value as enumerator `C'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-EnumeratorRedefinition.ice:17: redefinition of enumerator `A'
+EnumeratorRedefinition.ice:10: redefinition of enumerator `A'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorValues.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorValues.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorValues.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorValues.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
-EnumeratorValues.ice:17: value for enumerator `C' is out of range
-EnumeratorValues.ice:17: enumerator `C' has the same value as enumerator `B'
-EnumeratorValues.ice:18: value for enumerator `D' is out of range
-EnumeratorValues.ice:19: value for enumerator `E' is out of range
-EnumeratorValues.ice:20: value for enumerator `F' is out of range
+EnumeratorValues.ice:12: value for enumerator `C' is out of range
+EnumeratorValues.ice:12: enumerator `C' has the same value as enumerator `B'
+EnumeratorValues.ice:13: value for enumerator `D' is out of range
+EnumeratorValues.ice:14: value for enumerator `E' is out of range
+EnumeratorValues.ice:15: value for enumerator `F' is out of range
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorValues.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorValues.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumeratorValues.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumeratorValues.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-EnumRedefinition.ice:16: redefinition of enumeration `E1' as enumeration
+EnumRedefinition.ice:9: redefinition of enumeration `E1' as enumeration
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/EnumRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/EnumRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ExceptionRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ExceptionRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ExceptionRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ExceptionRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-ExceptionRedefinition.ice:14: redefinition of exception `Base' as exception
-ExceptionRedefinition.ice:16: redefinition of exception `Derived' as exception
+ExceptionRedefinition.ice:9: redefinition of exception `Base' as exception
+ExceptionRedefinition.ice:11: redefinition of exception `Derived' as exception
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/forward/Forward.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/forward/Forward.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/forward/Forward.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/forward/Forward.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,4 @@
+module test
+{
+class F;
+}
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeyword.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeyword.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeyword.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeyword.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,85 +1,85 @@
-IdentAsKeyword.ice:15: syntax error
-IdentAsKeyword.ice:17: `Void': an exception can be defined only at module scope
-IdentAsKeyword.ice:18: keyword `int' cannot be used as exception name
-IdentAsKeyword.ice:18: `int': an exception can be defined only at module scope
-IdentAsKeyword.ice:20: `OUT': a structure can be defined only at module scope
-IdentAsKeyword.ice:21: keyword `double' cannot be used as struct name
-IdentAsKeyword.ice:21: `double': a structure can be defined only at module scope
-IdentAsKeyword.ice:23: `s1': a structure can be defined only at module scope
-IdentAsKeyword.ice:24: `s2': a structure can be defined only at module scope
-IdentAsKeyword.ice:24: keyword `byte' cannot be used as data member name
-IdentAsKeyword.ice:25: `s3': a structure can be defined only at module scope
-IdentAsKeyword.ice:26: `s4': a structure can be defined only at module scope
-IdentAsKeyword.ice:26: keyword `byte' cannot be used as data member name
-IdentAsKeyword.ice:28: `inTERface': a class can be defined only at module scope
-IdentAsKeyword.ice:29: keyword `interface' cannot be used as class name
-IdentAsKeyword.ice:29: `interface': a class can be defined only at module scope
-IdentAsKeyword.ice:31: `MOdule': a class can be defined only at module scope
-IdentAsKeyword.ice:32: keyword `module' cannot be used as class name
-IdentAsKeyword.ice:32: `module': a class can be defined only at module scope
-IdentAsKeyword.ice:34: `C': a class can be defined only at module scope
-IdentAsKeyword.ice:35: `C': a class can be defined only at module scope
-IdentAsKeyword.ice:35: keyword `extends' cannot be used as data member name
-IdentAsKeyword.ice:36: `D': a class can be defined only at module scope
-IdentAsKeyword.ice:36: keyword `extends' cannot be used as data member name
-IdentAsKeyword.ice:38: keyword `local' cannot be used as interface name
-IdentAsKeyword.ice:38: `local': an interface can be defined only at module scope
-IdentAsKeyword.ice:39: `Local': an interface can be defined only at module scope
-IdentAsKeyword.ice:41: keyword `Object' cannot be used as interface name
-IdentAsKeyword.ice:41: `Object': an interface can be defined only at module scope
-IdentAsKeyword.ice:42: `object': an interface can be defined only at module scope
-IdentAsKeyword.ice:43: keyword `long' cannot be used as interface name
-IdentAsKeyword.ice:43: `long': an interface can be defined only at module scope
-IdentAsKeyword.ice:45: `impLEments': a sequence can be defined only at module scope
-IdentAsKeyword.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments'
-IdentAsKeyword.ice:46: keyword `implements' cannot be used as sequence name
-IdentAsKeyword.ice:47: `short': a sequence can be defined only at module scope
-IdentAsKeyword.ice:47: keyword `short' cannot be used as sequence name
+IdentAsKeyword.ice:8: syntax error
+IdentAsKeyword.ice:10: `Void': an exception can be defined only at module scope
+IdentAsKeyword.ice:11: keyword `int' cannot be used as exception name
+IdentAsKeyword.ice:11: `int': an exception can be defined only at module scope
+IdentAsKeyword.ice:13: `OUT': a structure can be defined only at module scope
+IdentAsKeyword.ice:14: keyword `double' cannot be used as struct name
+IdentAsKeyword.ice:14: `double': a structure can be defined only at module scope
+IdentAsKeyword.ice:16: `s1': a structure can be defined only at module scope
+IdentAsKeyword.ice:17: `s2': a structure can be defined only at module scope
+IdentAsKeyword.ice:17: keyword `byte' cannot be used as data member name
+IdentAsKeyword.ice:18: `s3': a structure can be defined only at module scope
+IdentAsKeyword.ice:19: `s4': a structure can be defined only at module scope
+IdentAsKeyword.ice:19: keyword `byte' cannot be used as data member name
+IdentAsKeyword.ice:21: `inTERface': a class can be defined only at module scope
+IdentAsKeyword.ice:22: keyword `interface' cannot be used as class name
+IdentAsKeyword.ice:22: `interface': a class can be defined only at module scope
+IdentAsKeyword.ice:24: `MOdule': a class can be defined only at module scope
+IdentAsKeyword.ice:25: keyword `module' cannot be used as class name
+IdentAsKeyword.ice:25: `module': a class can be defined only at module scope
+IdentAsKeyword.ice:27: `C': a class can be defined only at module scope
+IdentAsKeyword.ice:28: `C': a class can be defined only at module scope
+IdentAsKeyword.ice:28: keyword `extends' cannot be used as data member name
+IdentAsKeyword.ice:29: `D': a class can be defined only at module scope
+IdentAsKeyword.ice:29: keyword `extends' cannot be used as data member name
+IdentAsKeyword.ice:31: keyword `local' cannot be used as interface name
+IdentAsKeyword.ice:31: `local': an interface can be defined only at module scope
+IdentAsKeyword.ice:32: `Local': an interface can be defined only at module scope
+IdentAsKeyword.ice:34: keyword `Object' cannot be used as interface name
+IdentAsKeyword.ice:34: `Object': an interface can be defined only at module scope
+IdentAsKeyword.ice:35: `object': an interface can be defined only at module scope
+IdentAsKeyword.ice:36: keyword `long' cannot be used as interface name
+IdentAsKeyword.ice:36: `long': an interface can be defined only at module scope
+IdentAsKeyword.ice:38: `impLEments': a sequence can be defined only at module scope
+IdentAsKeyword.ice:39: sequence `implements' differs only in capitalization from sequence `impLEments'
+IdentAsKeyword.ice:39: keyword `implements' cannot be used as sequence name
+IdentAsKeyword.ice:40: `short': a sequence can be defined only at module scope
+IdentAsKeyword.ice:40: keyword `short' cannot be used as sequence name
+IdentAsKeyword.ice:42: syntax error
+IdentAsKeyword.ice:43: `moDule' is not defined
+IdentAsKeyword.ice:45: `throws': a dictionary can be defined only at module scope
+IdentAsKeyword.ice:45: keyword `throws' cannot be used as dictionary name
+IdentAsKeyword.ice:46: dictionary `thRows' differs only in capitalization from dictionary `throws'
+IdentAsKeyword.ice:47: `LOCALobject': a dictionary can be defined only at module scope
 IdentAsKeyword.ice:49: syntax error
-IdentAsKeyword.ice:50: `moDule' is not defined
-IdentAsKeyword.ice:52: `throws': a dictionary can be defined only at module scope
-IdentAsKeyword.ice:52: keyword `throws' cannot be used as dictionary name
-IdentAsKeyword.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws'
-IdentAsKeyword.ice:54: `LOCALobject': a dictionary can be defined only at module scope
-IdentAsKeyword.ice:56: syntax error
-IdentAsKeyword.ice:57: `MODULE' is not defined
-IdentAsKeyword.ice:59: syntax error
-IdentAsKeyword.ice:60: `d4': a dictionary can be defined only at module scope
-IdentAsKeyword.ice:62: syntax error
-IdentAsKeyword.ice:63: `VOID' is an exception, which cannot be used as a type
-IdentAsKeyword.ice:65: keyword `local' cannot be used as enumeration name
-IdentAsKeyword.ice:65: `local': an enumeration can be defined only at module scope
-IdentAsKeyword.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local'
-IdentAsKeyword.ice:68: `e1': an enumeration can be defined only at module scope
-IdentAsKeyword.ice:68: keyword `long' cannot be used as enumerator
-IdentAsKeyword.ice:68: keyword `byte' cannot be used as enumerator
-IdentAsKeyword.ice:69: `e2': an enumeration can be defined only at module scope
-IdentAsKeyword.ice:71: `i1': an interface can be defined only at module scope
-IdentAsKeyword.ice:72: `i2': an interface can be defined only at module scope
-IdentAsKeyword.ice:74: `i3': an interface can be defined only at module scope
-IdentAsKeyword.ice:75: `i4': an interface can be defined only at module scope
-IdentAsKeyword.ice:77: `i5': an interface can be defined only at module scope
-IdentAsKeyword.ice:77: syntax error
-IdentAsKeyword.ice:78: `i6': an interface can be defined only at module scope
-IdentAsKeyword.ice:80: `i7': an interface can be defined only at module scope
-IdentAsKeyword.ice:81: `i8': an interface can be defined only at module scope
-IdentAsKeyword.ice:83: `i9': an interface can be defined only at module scope
-IdentAsKeyword.ice:84: `i10': an interface can be defined only at module scope
-IdentAsKeyword.ice:86: `true': an interface can be defined only at module scope
-IdentAsKeyword.ice:88: illegal leading underscore in identifier `_a'
-IdentAsKeyword.ice:88: `_a': an interface can be defined only at module scope
-IdentAsKeyword.ice:89: illegal leading underscore in identifier `_true'
-IdentAsKeyword.ice:89: `_true': an interface can be defined only at module scope
-IdentAsKeyword.ice:90: illegal leading underscore in identifier `_true'
-IdentAsKeyword.ice:90: `_true': an interface can be defined only at module scope
-IdentAsKeyword.ice:92: illegal trailing underscore in identifier `b_'
-IdentAsKeyword.ice:92: `b_': an interface can be defined only at module scope
-IdentAsKeyword.ice:94: illegal double underscore in identifier `b__c'
-IdentAsKeyword.ice:94: `b__c': an interface can be defined only at module scope
-IdentAsKeyword.ice:95: illegal double underscore in identifier `b___c'
-IdentAsKeyword.ice:95: `b___c': an interface can be defined only at module scope
-IdentAsKeyword.ice:97: illegal underscore in identifier `a_b'
-IdentAsKeyword.ice:97: `a_b': an interface can be defined only at module scope
-IdentAsKeyword.ice:98: illegal underscore in identifier `a_b_c'
-IdentAsKeyword.ice:98: `a_b_c': an interface can be defined only at module scope
-IdentAsKeyword.ice:100: syntax error
+IdentAsKeyword.ice:50: `MODULE' is not defined
+IdentAsKeyword.ice:52: syntax error
+IdentAsKeyword.ice:53: `d4': a dictionary can be defined only at module scope
+IdentAsKeyword.ice:55: syntax error
+IdentAsKeyword.ice:56: `VOID' is an exception, which cannot be used as a type
+IdentAsKeyword.ice:58: keyword `local' cannot be used as enumeration name
+IdentAsKeyword.ice:58: `local': an enumeration can be defined only at module scope
+IdentAsKeyword.ice:59: enumeration `LOCAL' differs only in capitalization from enumeration `local'
+IdentAsKeyword.ice:61: `e1': an enumeration can be defined only at module scope
+IdentAsKeyword.ice:61: keyword `long' cannot be used as enumerator
+IdentAsKeyword.ice:61: keyword `byte' cannot be used as enumerator
+IdentAsKeyword.ice:62: `e2': an enumeration can be defined only at module scope
+IdentAsKeyword.ice:64: `i1': an interface can be defined only at module scope
+IdentAsKeyword.ice:65: `i2': an interface can be defined only at module scope
+IdentAsKeyword.ice:67: `i3': an interface can be defined only at module scope
+IdentAsKeyword.ice:68: `i4': an interface can be defined only at module scope
+IdentAsKeyword.ice:70: `i5': an interface can be defined only at module scope
+IdentAsKeyword.ice:70: syntax error
+IdentAsKeyword.ice:71: `i6': an interface can be defined only at module scope
+IdentAsKeyword.ice:73: `i7': an interface can be defined only at module scope
+IdentAsKeyword.ice:74: `i8': an interface can be defined only at module scope
+IdentAsKeyword.ice:76: `i9': an interface can be defined only at module scope
+IdentAsKeyword.ice:77: `i10': an interface can be defined only at module scope
+IdentAsKeyword.ice:79: `true': an interface can be defined only at module scope
+IdentAsKeyword.ice:81: illegal leading underscore in identifier `_a'
+IdentAsKeyword.ice:81: `_a': an interface can be defined only at module scope
+IdentAsKeyword.ice:82: illegal leading underscore in identifier `_true'
+IdentAsKeyword.ice:82: `_true': an interface can be defined only at module scope
+IdentAsKeyword.ice:83: illegal leading underscore in identifier `_true'
+IdentAsKeyword.ice:83: `_true': an interface can be defined only at module scope
+IdentAsKeyword.ice:85: illegal trailing underscore in identifier `b_'
+IdentAsKeyword.ice:85: `b_': an interface can be defined only at module scope
+IdentAsKeyword.ice:87: illegal double underscore in identifier `b__c'
+IdentAsKeyword.ice:87: `b__c': an interface can be defined only at module scope
+IdentAsKeyword.ice:88: illegal double underscore in identifier `b___c'
+IdentAsKeyword.ice:88: `b___c': an interface can be defined only at module scope
+IdentAsKeyword.ice:90: illegal underscore in identifier `a_b'
+IdentAsKeyword.ice:90: `a_b': an interface can be defined only at module scope
+IdentAsKeyword.ice:91: illegal underscore in identifier `a_b_c'
+IdentAsKeyword.ice:91: `a_b_c': an interface can be defined only at module scope
+IdentAsKeyword.ice:93: syntax error
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeyword.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeyword.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeyword.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,83 +1,83 @@
-IdentAsKeywordUnderscore.ice:15: syntax error
-IdentAsKeywordUnderscore.ice:17: `Void': an exception can be defined only at module scope
-IdentAsKeywordUnderscore.ice:18: keyword `int' cannot be used as exception name
-IdentAsKeywordUnderscore.ice:18: `int': an exception can be defined only at module scope
-IdentAsKeywordUnderscore.ice:20: `OUT': a structure can be defined only at module scope
-IdentAsKeywordUnderscore.ice:21: keyword `double' cannot be used as struct name
-IdentAsKeywordUnderscore.ice:21: `double': a structure can be defined only at module scope
-IdentAsKeywordUnderscore.ice:23: `s1': a structure can be defined only at module scope
-IdentAsKeywordUnderscore.ice:24: `s2': a structure can be defined only at module scope
-IdentAsKeywordUnderscore.ice:24: keyword `byte' cannot be used as data member name
-IdentAsKeywordUnderscore.ice:25: `s3': a structure can be defined only at module scope
-IdentAsKeywordUnderscore.ice:26: `s4': a structure can be defined only at module scope
-IdentAsKeywordUnderscore.ice:26: keyword `byte' cannot be used as data member name
-IdentAsKeywordUnderscore.ice:28: `inTERface': a class can be defined only at module scope
-IdentAsKeywordUnderscore.ice:29: keyword `interface' cannot be used as class name
-IdentAsKeywordUnderscore.ice:29: `interface': a class can be defined only at module scope
-IdentAsKeywordUnderscore.ice:31: `MOdule': a class can be defined only at module scope
-IdentAsKeywordUnderscore.ice:32: keyword `module' cannot be used as class name
-IdentAsKeywordUnderscore.ice:32: `module': a class can be defined only at module scope
-IdentAsKeywordUnderscore.ice:34: `C': a class can be defined only at module scope
-IdentAsKeywordUnderscore.ice:35: `C': a class can be defined only at module scope
-IdentAsKeywordUnderscore.ice:35: keyword `extends' cannot be used as data member name
-IdentAsKeywordUnderscore.ice:36: `D': a class can be defined only at module scope
-IdentAsKeywordUnderscore.ice:36: keyword `extends' cannot be used as data member name
-IdentAsKeywordUnderscore.ice:38: keyword `local' cannot be used as interface name
-IdentAsKeywordUnderscore.ice:38: `local': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:39: `Local': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:41: keyword `Object' cannot be used as interface name
-IdentAsKeywordUnderscore.ice:41: `Object': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:42: `object': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:43: keyword `long' cannot be used as interface name
-IdentAsKeywordUnderscore.ice:43: `long': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:45: `impLEments': a sequence can be defined only at module scope
-IdentAsKeywordUnderscore.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments'
-IdentAsKeywordUnderscore.ice:46: keyword `implements' cannot be used as sequence name
-IdentAsKeywordUnderscore.ice:47: `short': a sequence can be defined only at module scope
-IdentAsKeywordUnderscore.ice:47: keyword `short' cannot be used as sequence name
-IdentAsKeywordUnderscore.ice:49: syntax error
-IdentAsKeywordUnderscore.ice:50: `moDule' is not defined
-IdentAsKeywordUnderscore.ice:52: `throws': a dictionary can be defined only at module scope
-IdentAsKeywordUnderscore.ice:52: keyword `throws' cannot be used as dictionary name
-IdentAsKeywordUnderscore.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws'
-IdentAsKeywordUnderscore.ice:54: `LOCALobject': a dictionary can be defined only at module scope
-IdentAsKeywordUnderscore.ice:56: syntax error
-IdentAsKeywordUnderscore.ice:57: `MODULE' is not defined
-IdentAsKeywordUnderscore.ice:59: syntax error
-IdentAsKeywordUnderscore.ice:60: `d4': a dictionary can be defined only at module scope
-IdentAsKeywordUnderscore.ice:62: syntax error
-IdentAsKeywordUnderscore.ice:63: `VOID' is an exception, which cannot be used as a type
-IdentAsKeywordUnderscore.ice:65: keyword `local' cannot be used as enumeration name
-IdentAsKeywordUnderscore.ice:65: `local': an enumeration can be defined only at module scope
-IdentAsKeywordUnderscore.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local'
-IdentAsKeywordUnderscore.ice:68: `e1': an enumeration can be defined only at module scope
-IdentAsKeywordUnderscore.ice:68: keyword `long' cannot be used as enumerator
-IdentAsKeywordUnderscore.ice:68: keyword `byte' cannot be used as enumerator
-IdentAsKeywordUnderscore.ice:69: `e2': an enumeration can be defined only at module scope
-IdentAsKeywordUnderscore.ice:71: `i1': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:72: `i2': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:74: `i3': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:75: `i4': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:77: `i5': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:77: syntax error
-IdentAsKeywordUnderscore.ice:78: `i6': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:80: `i7': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:81: `i8': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:83: `i9': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:84: `i10': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:86: `true': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:88: illegal leading underscore in identifier `_a'
-IdentAsKeywordUnderscore.ice:88: `_a': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:89: illegal leading underscore in identifier `_true'
-IdentAsKeywordUnderscore.ice:89: `_true': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:90: illegal leading underscore in identifier `_true'
-IdentAsKeywordUnderscore.ice:90: `_true': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:92: illegal trailing underscore in identifier `b_'
-IdentAsKeywordUnderscore.ice:92: `b_': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:94: illegal double underscore in identifier `b__c'
-IdentAsKeywordUnderscore.ice:94: `b__c': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:95: illegal double underscore in identifier `b___c'
-IdentAsKeywordUnderscore.ice:95: `b___c': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:97: `a_b': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:98: `a_b_c': an interface can be defined only at module scope
-IdentAsKeywordUnderscore.ice:100: syntax error
+IdentAsKeywordUnderscore.ice:10: syntax error
+IdentAsKeywordUnderscore.ice:12: `Void': an exception can be defined only at module scope
+IdentAsKeywordUnderscore.ice:13: keyword `int' cannot be used as exception name
+IdentAsKeywordUnderscore.ice:13: `int': an exception can be defined only at module scope
+IdentAsKeywordUnderscore.ice:15: `OUT': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:16: keyword `double' cannot be used as struct name
+IdentAsKeywordUnderscore.ice:16: `double': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:18: `s1': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:19: `s2': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:19: keyword `byte' cannot be used as data member name
+IdentAsKeywordUnderscore.ice:20: `s3': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:21: `s4': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:21: keyword `byte' cannot be used as data member name
+IdentAsKeywordUnderscore.ice:23: `inTERface': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:24: keyword `interface' cannot be used as class name
+IdentAsKeywordUnderscore.ice:24: `interface': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:26: `MOdule': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:27: keyword `module' cannot be used as class name
+IdentAsKeywordUnderscore.ice:27: `module': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:29: `C': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:30: `C': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:30: keyword `extends' cannot be used as data member name
+IdentAsKeywordUnderscore.ice:31: `D': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:31: keyword `extends' cannot be used as data member name
+IdentAsKeywordUnderscore.ice:33: keyword `local' cannot be used as interface name
+IdentAsKeywordUnderscore.ice:33: `local': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:34: `Local': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:36: keyword `Object' cannot be used as interface name
+IdentAsKeywordUnderscore.ice:36: `Object': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:37: `object': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:38: keyword `long' cannot be used as interface name
+IdentAsKeywordUnderscore.ice:38: `long': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:40: `impLEments': a sequence can be defined only at module scope
+IdentAsKeywordUnderscore.ice:41: sequence `implements' differs only in capitalization from sequence `impLEments'
+IdentAsKeywordUnderscore.ice:41: keyword `implements' cannot be used as sequence name
+IdentAsKeywordUnderscore.ice:42: `short': a sequence can be defined only at module scope
+IdentAsKeywordUnderscore.ice:42: keyword `short' cannot be used as sequence name
+IdentAsKeywordUnderscore.ice:44: syntax error
+IdentAsKeywordUnderscore.ice:45: `moDule' is not defined
+IdentAsKeywordUnderscore.ice:47: `throws': a dictionary can be defined only at module scope
+IdentAsKeywordUnderscore.ice:47: keyword `throws' cannot be used as dictionary name
+IdentAsKeywordUnderscore.ice:48: dictionary `thRows' differs only in capitalization from dictionary `throws'
+IdentAsKeywordUnderscore.ice:49: `LOCALobject': a dictionary can be defined only at module scope
+IdentAsKeywordUnderscore.ice:51: syntax error
+IdentAsKeywordUnderscore.ice:52: `MODULE' is not defined
+IdentAsKeywordUnderscore.ice:54: syntax error
+IdentAsKeywordUnderscore.ice:55: `d4': a dictionary can be defined only at module scope
+IdentAsKeywordUnderscore.ice:57: syntax error
+IdentAsKeywordUnderscore.ice:58: `VOID' is an exception, which cannot be used as a type
+IdentAsKeywordUnderscore.ice:60: keyword `local' cannot be used as enumeration name
+IdentAsKeywordUnderscore.ice:60: `local': an enumeration can be defined only at module scope
+IdentAsKeywordUnderscore.ice:61: enumeration `LOCAL' differs only in capitalization from enumeration `local'
+IdentAsKeywordUnderscore.ice:63: `e1': an enumeration can be defined only at module scope
+IdentAsKeywordUnderscore.ice:63: keyword `long' cannot be used as enumerator
+IdentAsKeywordUnderscore.ice:63: keyword `byte' cannot be used as enumerator
+IdentAsKeywordUnderscore.ice:64: `e2': an enumeration can be defined only at module scope
+IdentAsKeywordUnderscore.ice:66: `i1': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:67: `i2': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:69: `i3': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:70: `i4': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:72: `i5': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:72: syntax error
+IdentAsKeywordUnderscore.ice:73: `i6': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:75: `i7': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:76: `i8': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:78: `i9': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:79: `i10': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:81: `true': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:83: illegal leading underscore in identifier `_a'
+IdentAsKeywordUnderscore.ice:83: `_a': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:84: illegal leading underscore in identifier `_true'
+IdentAsKeywordUnderscore.ice:84: `_true': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:85: illegal leading underscore in identifier `_true'
+IdentAsKeywordUnderscore.ice:85: `_true': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:87: illegal trailing underscore in identifier `b_'
+IdentAsKeywordUnderscore.ice:87: `b_': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:89: illegal double underscore in identifier `b__c'
+IdentAsKeywordUnderscore.ice:89: `b__c': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:90: illegal double underscore in identifier `b___c'
+IdentAsKeywordUnderscore.ice:90: `b___c': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:92: `a_b': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:93: `a_b_c': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:95: syntax error
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
 
+[["underscore"]]
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDeclaration.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDeclaration.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDeclaration.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDeclaration.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-IllegalDeclaration.ice:15: exceptions cannot be forward declared
-IllegalDeclaration.ice:16: structs cannot be forward declared
+IllegalDeclaration.ice:5: exceptions cannot be forward declared
+IllegalDeclaration.ice:6: structs cannot be forward declared
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDeclaration.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDeclaration.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDeclaration.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
-
-
-
 
 exception E;
 struct S;
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDictionary.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDictionary.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDictionary.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDictionary.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,11 @@
-IllegalDictionary.ice:22: dictionary `b1' uses an illegal key type
-IllegalDictionary.ice:23: dictionary `b2' uses an illegal key type
-IllegalDictionary.ice:24: dictionary `b3' uses an illegal key type
-IllegalDictionary.ice:25: dictionary `b4' uses an illegal key type
-IllegalDictionary.ice:26: dictionary `b5' uses an illegal key type
-IllegalDictionary.ice:29: warning: use of sequences in dictionary keys has been deprecated
-IllegalDictionary.ice:32: dictionary `b6' uses an illegal key type
-IllegalDictionary.ice:35: warning: use of sequences in dictionary keys has been deprecated
-IllegalDictionary.ice:49: dictionary `b8' uses an illegal key type
-IllegalDictionary.ice:55: warning: use of sequences in dictionary keys has been deprecated
-IllegalDictionary.ice:57: dictionary `b9' uses an illegal key type
+IllegalDictionary.ice:15: dictionary `b1' uses an illegal key type
+IllegalDictionary.ice:16: dictionary `b2' uses an illegal key type
+IllegalDictionary.ice:17: dictionary `b3' uses an illegal key type
+IllegalDictionary.ice:18: dictionary `b4' uses an illegal key type
+IllegalDictionary.ice:19: dictionary `b5' uses an illegal key type
+IllegalDictionary.ice:22: warning: use of sequences in dictionary keys has been deprecated
+IllegalDictionary.ice:25: dictionary `b6' uses an illegal key type
+IllegalDictionary.ice:28: warning: use of sequences in dictionary keys has been deprecated
+IllegalDictionary.ice:42: dictionary `b8' uses an illegal key type
+IllegalDictionary.ice:48: warning: use of sequences in dictionary keys has been deprecated
+IllegalDictionary.ice:50: dictionary `b9' uses an illegal key type
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDictionary.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDictionary.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalDictionary.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalDictionary.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalIdentifier.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalIdentifier.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalIdentifier.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalIdentifier.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
-IllegalIdentifier.ice:18: illegal input character: '\357'
-IllegalIdentifier.ice:18: syntax error
-IllegalIdentifier.ice:18: illegal input character: '\273'
-IllegalIdentifier.ice:18: illegal input character: '\277'
-IllegalIdentifier.ice:26: illegal input character: '\305'
-IllegalIdentifier.ice:26: illegal input character: '\222'
-IllegalIdentifier.ice:28: illegal input character: '\305'
-IllegalIdentifier.ice:28: illegal input character: '\223'
-IllegalIdentifier.ice:29: syntax error
+IllegalIdentifier.ice:12: illegal input character: '\357'
+IllegalIdentifier.ice:12: syntax error
+IllegalIdentifier.ice:12: illegal input character: '\273'
+IllegalIdentifier.ice:12: illegal input character: '\277'
+IllegalIdentifier.ice:20: illegal input character: '\305'
+IllegalIdentifier.ice:20: illegal input character: '\222'
+IllegalIdentifier.ice:22: illegal input character: '\305'
+IllegalIdentifier.ice:22: illegal input character: '\223'
+IllegalIdentifier.ice:23: syntax error
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalIdentifier.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalIdentifier.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalIdentifier.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalIdentifier.ice	2019-02-05 18:03:04.000000000 +0000
@@ -2,15 +2,9 @@
 // NOTE: Keep the initial blank line. This is necessary to avoid a problem
 // with system-provided mcpp versions that don't include ZeroC's BOM patch.
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
 
 //
 // Check that UTF-8 BOM is rejected when not at start of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalLocal.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalLocal.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalLocal.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalLocal.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,25 @@
-IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1'
-IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2'
-IllegalLocal.ice:23: warning: classes implementing interfaces are deprecated
-IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2'
-IllegalLocal.ice:25: warning: classes implementing interfaces are deprecated
-IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'
-IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'
-IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'
-IllegalLocal.ice:41: cannot create proxy for local interface `i2'
-IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'
-IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'
-IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'
-IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'
-IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'
-IllegalLocal.ice:56: non-local sequence `los' cannot have local element type
-IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated
-IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type
-IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type
-IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated
-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type
-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type
-IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'
-IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'
-IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'
-IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type
+IllegalLocal.ice:10: local interface `i2' cannot have non-local base interface `i1'
+IllegalLocal.ice:12: non-local interface `i3' cannot have local base interface `i2'
+IllegalLocal.ice:16: warning: classes implementing interfaces are deprecated
+IllegalLocal.ice:18: non-local class `c2' cannot have local base interface `i2'
+IllegalLocal.ice:18: warning: classes implementing interfaces are deprecated
+IllegalLocal.ice:24: non-local interface `i' cannot have operation `op' throwing local exception `le'
+IllegalLocal.ice:27: non-local exception `le2' cannot have local base exception `le'
+IllegalLocal.ice:33: non-local class`c3' cannot contain local member `lo1'
+IllegalLocal.ice:34: cannot create proxy for local interface `i2'
+IllegalLocal.ice:34: non-local class`c3' cannot contain local member `lo2'
+IllegalLocal.ice:35: non-local class`c3' cannot contain local member `lo3'
+IllegalLocal.ice:36: non-local class`c3' cannot contain local member `ls'
+IllegalLocal.ice:41: non-local struct`s1' cannot contain local member `ls'
+IllegalLocal.ice:46: non-local exception`e3' cannot contain local member `ls'
+IllegalLocal.ice:49: non-local sequence `los' cannot have local element type
+IllegalLocal.ice:52: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:52: non-local dictionary `d1' cannot have local key type
+IllegalLocal.ice:53: non-local dictionary `d2' cannot have local value type
+IllegalLocal.ice:54: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:54: non-local dictionary `d3' cannot have local key type
+IllegalLocal.ice:54: non-local dictionary `d3' cannot have local value type
+IllegalLocal.ice:59: non-local struct`s2' cannot contain local member `m'
+IllegalLocal.ice:65: non-local struct`s3' cannot contain local member `e'
+IllegalLocal.ice:70: non-local interface `i5' cannot have local parameter `p' in operation `op'
+IllegalLocal.ice:71: non-local interface `i5' cannot have operation `op2' with local return type
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalLocal.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalLocal.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalLocal.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalLocal.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalMI.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalMI.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalMI.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalMI.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,26 @@
-IllegalMI.ice:63: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:93: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:122: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:151: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:204: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:232: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:260: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:290: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:354: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:388: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:421: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:455: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:489: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:523: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:558: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:593: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:628: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:663: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:699: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:786: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:830: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:977: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1051: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1125: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1197: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:1269: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:53: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:83: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:112: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:141: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:194: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:222: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:250: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:280: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:344: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:378: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:411: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:445: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:479: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:513: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:548: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:583: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:618: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:653: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:689: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:776: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:820: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:967: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1041: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1115: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1187: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1259: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalMI.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalMI.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalMI.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalMI.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
-
-
-
 
 module M1
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,26 @@
-IllegalUseOfKeyword.ice:15: keyword `module' cannot be used as exception name
-IllegalUseOfKeyword.ice:15: exceptions cannot be forward declared
-IllegalUseOfKeyword.ice:16: keyword `void' cannot be used as exception name
-IllegalUseOfKeyword.ice:21: keyword `exception' cannot be used as struct name
-IllegalUseOfKeyword.ice:21: structs cannot be forward declared
-IllegalUseOfKeyword.ice:22: keyword `class' cannot be used as struct name
-IllegalUseOfKeyword.ice:27: keyword `interface' cannot be used as class name
-IllegalUseOfKeyword.ice:28: keyword `struct' cannot be used as class name
-IllegalUseOfKeyword.ice:34: keyword `local' cannot be used as interface name
-IllegalUseOfKeyword.ice:35: keyword `extends' cannot be used as interface name
-IllegalUseOfKeyword.ice:42: keyword `implements' cannot be used as operation name
-IllegalUseOfKeyword.ice:44: keyword `throws' cannot be used as parameter name
-IllegalUseOfKeyword.ice:44: keyword `void' cannot be used as parameter name
-IllegalUseOfKeyword.ice:46: keyword `byte' cannot be used as parameter name
-IllegalUseOfKeyword.ice:46: keyword `short' cannot be used as parameter name
-IllegalUseOfKeyword.ice:51: keyword `int' cannot be used as data member name
-IllegalUseOfKeyword.ice:52: keyword `long' cannot be used as data member name
-IllegalUseOfKeyword.ice:53: keyword `float' cannot be used as data member name
-IllegalUseOfKeyword.ice:54: keyword `double' cannot be used as data member name
-IllegalUseOfKeyword.ice:57: keyword `Object' cannot be used as sequence name
-IllegalUseOfKeyword.ice:59: keyword `LocalObject' cannot be used as dictionary name
-IllegalUseOfKeyword.ice:61: keyword `string' cannot be used as enumeration name
-IllegalUseOfKeyword.ice:68: keyword `sequence' cannot be used as enumerator
-IllegalUseOfKeyword.ice:69: keyword `dictionary' cannot be used as enumerator
-IllegalUseOfKeyword.ice:70: keyword `enum' cannot be used as enumerator
-IllegalUseOfKeyword.ice:74: illegal inheritance from type Object
+IllegalUseOfKeyword.ice:10: keyword `module' cannot be used as exception name
+IllegalUseOfKeyword.ice:10: exceptions cannot be forward declared
+IllegalUseOfKeyword.ice:11: keyword `void' cannot be used as exception name
+IllegalUseOfKeyword.ice:16: keyword `exception' cannot be used as struct name
+IllegalUseOfKeyword.ice:16: structs cannot be forward declared
+IllegalUseOfKeyword.ice:17: keyword `class' cannot be used as struct name
+IllegalUseOfKeyword.ice:22: keyword `interface' cannot be used as class name
+IllegalUseOfKeyword.ice:23: keyword `struct' cannot be used as class name
+IllegalUseOfKeyword.ice:29: keyword `local' cannot be used as interface name
+IllegalUseOfKeyword.ice:30: keyword `extends' cannot be used as interface name
+IllegalUseOfKeyword.ice:37: keyword `implements' cannot be used as operation name
+IllegalUseOfKeyword.ice:39: keyword `throws' cannot be used as parameter name
+IllegalUseOfKeyword.ice:39: keyword `void' cannot be used as parameter name
+IllegalUseOfKeyword.ice:41: keyword `byte' cannot be used as parameter name
+IllegalUseOfKeyword.ice:41: keyword `short' cannot be used as parameter name
+IllegalUseOfKeyword.ice:46: keyword `int' cannot be used as data member name
+IllegalUseOfKeyword.ice:47: keyword `long' cannot be used as data member name
+IllegalUseOfKeyword.ice:48: keyword `float' cannot be used as data member name
+IllegalUseOfKeyword.ice:49: keyword `double' cannot be used as data member name
+IllegalUseOfKeyword.ice:52: keyword `Object' cannot be used as sequence name
+IllegalUseOfKeyword.ice:54: keyword `LocalObject' cannot be used as dictionary name
+IllegalUseOfKeyword.ice:56: keyword `string' cannot be used as enumeration name
+IllegalUseOfKeyword.ice:63: keyword `sequence' cannot be used as enumerator
+IllegalUseOfKeyword.ice:64: keyword `dictionary' cannot be used as enumerator
+IllegalUseOfKeyword.ice:65: keyword `enum' cannot be used as enumerator
+IllegalUseOfKeyword.ice:69: illegal inheritance from type Object
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]] // for classes with operations
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/include/IcePrefix.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/include/IcePrefix.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/include/IcePrefix.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/include/IcePrefix.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module IceSomething {}
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceMismatch.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceMismatch.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceMismatch.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceMismatch.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
-InterfaceMismatch.ice:16: class `Foo1' was declared as interface
-InterfaceMismatch.ice:17: class `Foo1' was declared as interface
-InterfaceMismatch.ice:20: class `Foo2' was defined as interface
-InterfaceMismatch.ice:23: interface `Foo3' was declared as class
-InterfaceMismatch.ice:24: interface `Foo3' was declared as class
-InterfaceMismatch.ice:27: interface `Foo4' was defined as class
+InterfaceMismatch.ice:9: class `Foo1' was declared as interface
+InterfaceMismatch.ice:10: class `Foo1' was declared as interface
+InterfaceMismatch.ice:13: class `Foo2' was defined as interface
+InterfaceMismatch.ice:16: interface `Foo3' was declared as class
+InterfaceMismatch.ice:17: interface `Foo3' was declared as class
+InterfaceMismatch.ice:20: interface `Foo4' was defined as class
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceMismatch.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceMismatch.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceMismatch.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-InterfaceRedefinition.ice:16: redefinition of interface `Intf1'
-InterfaceRedefinition.ice:20: redefinition of interface `Intf2'
+InterfaceRedefinition.ice:9: redefinition of interface `Intf1'
+InterfaceRedefinition.ice:13: redefinition of interface `Intf2'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/LocalMismatch.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/LocalMismatch.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/LocalMismatch.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/LocalMismatch.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
-LocalMismatch.ice:16: local `Intf1' was declared non-local
-LocalMismatch.ice:17: local `Intf1' was declared non-local
-LocalMismatch.ice:20: local `Intf2' was defined non-local
-LocalMismatch.ice:23: non-local `Intf3' was declared local
-LocalMismatch.ice:24: non-local `Intf3' was declared local
-LocalMismatch.ice:27: non-local `Intf4' was defined local
-LocalMismatch.ice:30: local `Class1' was declared non-local
-LocalMismatch.ice:31: local `Class1' was declared non-local
-LocalMismatch.ice:34: local `Class2' was defined non-local
-LocalMismatch.ice:37: non-local `Class3' was declared local
-LocalMismatch.ice:38: non-local `Class3' was declared local
-LocalMismatch.ice:41: non-local `Class4' was defined local
+LocalMismatch.ice:9: local `Intf1' was declared non-local
+LocalMismatch.ice:10: local `Intf1' was declared non-local
+LocalMismatch.ice:13: local `Intf2' was defined non-local
+LocalMismatch.ice:16: non-local `Intf3' was declared local
+LocalMismatch.ice:17: non-local `Intf3' was declared local
+LocalMismatch.ice:20: non-local `Intf4' was defined local
+LocalMismatch.ice:23: local `Class1' was declared non-local
+LocalMismatch.ice:24: local `Class1' was declared non-local
+LocalMismatch.ice:27: local `Class2' was defined non-local
+LocalMismatch.ice:30: non-local `Class3' was declared local
+LocalMismatch.ice:31: non-local `Class3' was declared local
+LocalMismatch.ice:34: non-local `Class4' was defined local
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/LocalMismatch.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/LocalMismatch.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/LocalMismatch.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/LocalMismatch.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-NameCanNotBeUsed.ice:17: class name `Foo' cannot be used as operation name
-NameCanNotBeUsed.ice:23: interface name `IFoo' cannot be used as operation name
+NameCanNotBeUsed.ice:10: class name `Foo' cannot be used as operation name
+NameCanNotBeUsed.ice:16: interface name `IFoo' cannot be used as operation name
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotClassOrInterface.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotClassOrInterface.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotClassOrInterface.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotClassOrInterface.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
-NotClassOrInterface.ice:19: `Seq' is not an interface
-NotClassOrInterface.ice:20: `Seq' is not a class
-NotClassOrInterface.ice:21: `Sequence3' is not an interface
-NotClassOrInterface.ice:21: `Sequence2' is not an interface
-NotClassOrInterface.ice:21: `Sequence1' is not an interface
-NotClassOrInterface.ice:22: `Seq' is not a class
-NotClassOrInterface.ice:22: `Sequence3' is not an interface
-NotClassOrInterface.ice:22: `Sequence2' is not an interface
-NotClassOrInterface.ice:22: `Sequence1' is not an interface
+NotClassOrInterface.ice:12: `Seq' is not an interface
+NotClassOrInterface.ice:13: `Seq' is not a class
+NotClassOrInterface.ice:14: `Sequence3' is not an interface
+NotClassOrInterface.ice:14: `Sequence2' is not an interface
+NotClassOrInterface.ice:14: `Sequence1' is not an interface
+NotClassOrInterface.ice:15: `Seq' is not a class
+NotClassOrInterface.ice:15: `Sequence3' is not an interface
+NotClassOrInterface.ice:15: `Sequence2' is not an interface
+NotClassOrInterface.ice:15: `Sequence1' is not an interface
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotClassOrInterface.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotClassOrInterface.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotClassOrInterface.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotException.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotException.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotException.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotException.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,4 @@
-NotException.ice:24: `C' is not an exception
-NotException.ice:25: `S' is not an exception
-NotException.ice:26: `D' is not an exception
-NotException.ice:27: keyword `int' cannot be used as exception name
+NotException.ice:14: `C' is not an exception
+NotException.ice:15: `S' is not an exception
+NotException.ice:16: `D' is not an exception
+NotException.ice:17: keyword `int' cannot be used as exception name
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotException.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotException.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotException.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotException.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
-
-
-
 
 module M
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotType.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotType.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotType.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotType.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,15 @@
-NotType.ice:21: `Mod' is not a type
-NotType.ice:22: `Mod' is not a type
-NotType.ice:23: `Mod' is not a type
-NotType.ice:24: `Mod' is not a type
-NotType.ice:25: `Module3' is not a type
-NotType.ice:25: `Module2' is not a type
-NotType.ice:25: `Module1' is not a type
-NotType.ice:26: `Mod' is not a type
-NotType.ice:26: `Module3' is not a type
-NotType.ice:26: `Module2' is not a type
-NotType.ice:26: `Module1' is not a type
-NotType.ice:34: `E' is an exception, which cannot be used as a type
-NotType.ice:35: struct `S' must have at least one member
-NotType.ice:39: `E' is an exception, which cannot be used as a type
-NotType.ice:39: `E' is an exception, which cannot be used as a type
+NotType.ice:14: `Mod' is not a type
+NotType.ice:15: `Mod' is not a type
+NotType.ice:16: `Mod' is not a type
+NotType.ice:17: `Mod' is not a type
+NotType.ice:18: `Module3' is not a type
+NotType.ice:18: `Module2' is not a type
+NotType.ice:18: `Module1' is not a type
+NotType.ice:19: `Mod' is not a type
+NotType.ice:19: `Module3' is not a type
+NotType.ice:19: `Module2' is not a type
+NotType.ice:19: `Module1' is not a type
+NotType.ice:27: `E' is an exception, which cannot be used as a type
+NotType.ice:28: struct `S' must have at least one member
+NotType.ice:32: `E' is an exception, which cannot be used as a type
+NotType.ice:32: `E' is an exception, which cannot be used as a type
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotType.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotType.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/NotType.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/NotType.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OperationRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OperationRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OperationRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OperationRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-OperationRedefinition.ice:18: redefinition of operation `operation' as operation `operation'
+OperationRedefinition.ice:13: redefinition of operation `operation' as operation `operation'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OperationRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OperationRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OperationRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OperationRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]] // for classes with operations
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalMembers.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalMembers.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalMembers.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalMembers.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,33 @@
-OptionalMembers.ice:26: missing tag for optional
-OptionalMembers.ice:27: missing tag for optional
-OptionalMembers.ice:28: `abc' is not defined
+OptionalMembers.ice:21: missing tag for optional
+OptionalMembers.ice:22: missing tag for optional
+OptionalMembers.ice:23: `abc' is not defined
+OptionalMembers.ice:24: tag for optional is out of range
+OptionalMembers.ice:25: tag for optional is out of range
+OptionalMembers.ice:26: tag for optional is out of range
+OptionalMembers.ice:28: tag for optional data member `m8' is already in use
 OptionalMembers.ice:29: tag for optional is out of range
+OptionalMembers.ice:29: invalid tag `C3' for optional
 OptionalMembers.ice:30: tag for optional is out of range
-OptionalMembers.ice:31: tag for optional is out of range
-OptionalMembers.ice:33: tag for optional data member `m8' is already in use
-OptionalMembers.ice:34: tag for optional is out of range
-OptionalMembers.ice:34: invalid tag `C3' for optional
-OptionalMembers.ice:35: tag for optional is out of range
-OptionalMembers.ice:35: invalid tag `C4' for optional
-OptionalMembers.ice:36: invalid tag `C5' for optional
-OptionalMembers.ice:38: tag for optional data member `m13' is already in use
-OptionalMembers.ice:39: enumerator `e2' could designate `::Test::E::e2' or `::Test::Ebis::e2' or `::Test::Eter::e2'
-OptionalMembers.ice:40: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated
-OptionalMembers.ice:41: tag for optional data member `m16' is already in use
-OptionalMembers.ice:56: missing tag for optional
-OptionalMembers.ice:57: missing tag for optional
-OptionalMembers.ice:58: `abc' is not defined
+OptionalMembers.ice:30: invalid tag `C4' for optional
+OptionalMembers.ice:31: invalid tag `C5' for optional
+OptionalMembers.ice:33: tag for optional data member `m13' is already in use
+OptionalMembers.ice:34: enumerator `e2' could designate `::Test::E::e2' or `::Test::Ebis::e2' or `::Test::Eter::e2'
+OptionalMembers.ice:35: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated
+OptionalMembers.ice:36: tag for optional data member `m16' is already in use
+OptionalMembers.ice:51: missing tag for optional
+OptionalMembers.ice:52: missing tag for optional
+OptionalMembers.ice:53: `abc' is not defined
+OptionalMembers.ice:54: tag for optional is out of range
+OptionalMembers.ice:55: tag for optional is out of range
+OptionalMembers.ice:56: tag for optional is out of range
+OptionalMembers.ice:58: tag for optional data member `m8' is already in use
 OptionalMembers.ice:59: tag for optional is out of range
+OptionalMembers.ice:59: invalid tag `C3' for optional
 OptionalMembers.ice:60: tag for optional is out of range
-OptionalMembers.ice:61: tag for optional is out of range
-OptionalMembers.ice:63: tag for optional data member `m8' is already in use
-OptionalMembers.ice:64: tag for optional is out of range
-OptionalMembers.ice:64: invalid tag `C3' for optional
-OptionalMembers.ice:65: tag for optional is out of range
-OptionalMembers.ice:65: invalid tag `C4' for optional
-OptionalMembers.ice:66: invalid tag `C5' for optional
-OptionalMembers.ice:68: tag for optional data member `m13' is already in use
-OptionalMembers.ice:70: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated
-OptionalMembers.ice:71: tag for optional data member `m16' is already in use
-OptionalMembers.ice:86: optional data members not supported in struct
-OptionalMembers.ice:87: optional data members not supported in struct
+OptionalMembers.ice:60: invalid tag `C4' for optional
+OptionalMembers.ice:61: invalid tag `C5' for optional
+OptionalMembers.ice:63: tag for optional data member `m13' is already in use
+OptionalMembers.ice:65: warning: referencing enumerator `::Test::E::e3' without its enumeration's scope is deprecated
+OptionalMembers.ice:66: tag for optional data member `m16' is already in use
+OptionalMembers.ice:81: optional data members not supported in struct
+OptionalMembers.ice:82: optional data members not supported in struct
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalMembers.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalMembers.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalMembers.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalMembers.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalParams.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalParams.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalParams.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalParams.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,40 @@
-OptionalParams.ice:25: missing tag for optional
-OptionalParams.ice:26: missing tag for optional
-OptionalParams.ice:27: `abc' is not defined
+OptionalParams.ice:20: missing tag for optional
+OptionalParams.ice:21: missing tag for optional
+OptionalParams.ice:22: `abc' is not defined
+OptionalParams.ice:23: tag for optional is out of range
+OptionalParams.ice:24: tag for optional is out of range
+OptionalParams.ice:25: tag for optional is out of range
+OptionalParams.ice:27: tag for optional is out of range
+OptionalParams.ice:27: invalid tag `C3' for optional
 OptionalParams.ice:28: tag for optional is out of range
-OptionalParams.ice:29: tag for optional is out of range
-OptionalParams.ice:30: tag for optional is out of range
-OptionalParams.ice:32: tag for optional is out of range
-OptionalParams.ice:32: invalid tag `C3' for optional
-OptionalParams.ice:33: tag for optional is out of range
-OptionalParams.ice:33: invalid tag `C4' for optional
-OptionalParams.ice:34: invalid tag `C5' for optional
-OptionalParams.ice:37: syntax error
-OptionalParams.ice:39: missing tag for optional
-OptionalParams.ice:40: missing tag for optional
-OptionalParams.ice:41: `abc' is not defined
+OptionalParams.ice:28: invalid tag `C4' for optional
+OptionalParams.ice:29: invalid tag `C5' for optional
+OptionalParams.ice:32: syntax error
+OptionalParams.ice:34: missing tag for optional
+OptionalParams.ice:35: missing tag for optional
+OptionalParams.ice:36: `abc' is not defined
+OptionalParams.ice:37: tag for optional is out of range
+OptionalParams.ice:38: tag for optional is out of range
+OptionalParams.ice:39: tag for optional is out of range
+OptionalParams.ice:41: tag for optional is out of range
+OptionalParams.ice:41: invalid tag `C3' for optional
 OptionalParams.ice:42: tag for optional is out of range
-OptionalParams.ice:43: tag for optional is out of range
-OptionalParams.ice:44: tag for optional is out of range
-OptionalParams.ice:46: tag for optional is out of range
-OptionalParams.ice:46: invalid tag `C3' for optional
-OptionalParams.ice:47: tag for optional is out of range
-OptionalParams.ice:47: invalid tag `C4' for optional
-OptionalParams.ice:48: invalid tag `C5' for optional
-OptionalParams.ice:50: warning: referencing enumerator `::Test::E::e2' without its enumeration's scope is deprecated
-OptionalParams.ice:52: missing tag for optional
-OptionalParams.ice:53: missing tag for optional
-OptionalParams.ice:54: `abc' is not defined
+OptionalParams.ice:42: invalid tag `C4' for optional
+OptionalParams.ice:43: invalid tag `C5' for optional
+OptionalParams.ice:45: warning: referencing enumerator `::Test::E::e2' without its enumeration's scope is deprecated
+OptionalParams.ice:47: missing tag for optional
+OptionalParams.ice:48: missing tag for optional
+OptionalParams.ice:49: `abc' is not defined
+OptionalParams.ice:50: tag for optional is out of range
+OptionalParams.ice:51: tag for optional is out of range
+OptionalParams.ice:52: tag for optional is out of range
+OptionalParams.ice:54: tag for optional is out of range
+OptionalParams.ice:54: invalid tag `C3' for optional
 OptionalParams.ice:55: tag for optional is out of range
-OptionalParams.ice:56: tag for optional is out of range
-OptionalParams.ice:57: tag for optional is out of range
-OptionalParams.ice:59: tag for optional is out of range
-OptionalParams.ice:59: invalid tag `C3' for optional
-OptionalParams.ice:60: tag for optional is out of range
-OptionalParams.ice:60: invalid tag `C4' for optional
-OptionalParams.ice:61: invalid tag `C5' for optional
-OptionalParams.ice:63: enumerator `e1' could designate `::Test::E::e1' or `::Test::Ebis::e1'
-OptionalParams.ice:67: tag for optional parameter `o' is already in use
-OptionalParams.ice:68: tag for optional parameter `o' is already in use
-OptionalParams.ice:69: tag for optional parameter `o' is already in use
-OptionalParams.ice:70: tag for optional parameter `o' is already in use
+OptionalParams.ice:55: invalid tag `C4' for optional
+OptionalParams.ice:56: invalid tag `C5' for optional
+OptionalParams.ice:58: enumerator `e1' could designate `::Test::E::e1' or `::Test::Ebis::e1'
+OptionalParams.ice:62: tag for optional parameter `o' is already in use
+OptionalParams.ice:63: tag for optional parameter `o' is already in use
+OptionalParams.ice:64: tag for optional parameter `o' is already in use
+OptionalParams.ice:65: tag for optional parameter `o' is already in use
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalParams.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalParams.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/OptionalParams.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/OptionalParams.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-ParamsOutOfOrder.ice:17: `l3': in parameters cannot follow out parameters
-ParamsOutOfOrder.ice:18: `l3': in parameters cannot follow out parameters
+ParamsOutOfOrder.ice:10: `l3': in parameters cannot follow out parameters
+ParamsOutOfOrder.ice:11: `l3': in parameters cannot follow out parameters
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsClass.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsClass.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsClass.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsClass.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-RedefinitionAsClass.ice:16: declaration of already defined `Sequence1' as class
-RedefinitionAsClass.ice:19: redefinition of sequence `Sequence2' as class
+RedefinitionAsClass.ice:9: declaration of already defined `Sequence1' as class
+RedefinitionAsClass.ice:12: redefinition of sequence `Sequence2' as class
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-RedefinitionAsDataMember.ice:18: redefinition of operation `operation' as data member `operation'
+RedefinitionAsDataMember.ice:13: redefinition of operation `operation' as data member `operation'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]] // for classes with operations
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-RedefinitionAsDictionary.ice:16: redefinition of class `C' as dictionary
+RedefinitionAsDictionary.ice:9: redefinition of class `C' as dictionary
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-RedefinitionAsEnum.ice:16: redefinition of class `C' as enumeration
+RedefinitionAsEnum.ice:9: redefinition of class `C' as enumeration
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,2 @@
-RedefinitionAsInterface.ice:16: declaration of already defined `Sequence1' as interface
-RedefinitionAsInterface.ice:19: redefinition of sequence `Sequence2' as interface
+RedefinitionAsInterface.ice:9: declaration of already defined `Sequence1' as interface
+RedefinitionAsInterface.ice:12: redefinition of sequence `Sequence2' as interface
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsModule.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsModule.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsModule.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsModule.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-RedefinitionAsModule.ice:16: redefinition of sequence `Seq' as module
+RedefinitionAsModule.ice:9: redefinition of sequence `Seq' as module
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-RedefinitionAsOperation.ice:18: redefinition of data member `member' as operation `member'
+RedefinitionAsOperation.ice:11: redefinition of data member `member' as operation `member'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-RedefinitionAsSequence.ice:16: redefinition of class `C' as sequence
+RedefinitionAsSequence.ice:9: redefinition of class `C' as sequence
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Reserved.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Reserved.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Reserved.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Reserved.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,19 @@
-Reserved.ice:32: illegal identifier `Prx': `Prx' suffix is reserved
-Reserved.ice:33: illegal identifier `abcPrx': `Prx' suffix is reserved
-Reserved.ice:34: illegal identifier `Ptr': `Ptr' suffix is reserved
-Reserved.ice:35: illegal identifier `abcPtr': `Ptr' suffix is reserved
-Reserved.ice:36: illegal identifier `Helper': `Helper' suffix is reserved
-Reserved.ice:37: illegal identifier `abcHelper': `Helper' suffix is reserved
-Reserved.ice:38: illegal identifier `Holder': `Holder' suffix is reserved
-Reserved.ice:39: illegal identifier `abcHolder': `Holder' suffix is reserved
+Reserved.ice:22: illegal identifier `Prx': `Prx' suffix is reserved
+Reserved.ice:23: illegal identifier `abcPrx': `Prx' suffix is reserved
+Reserved.ice:24: illegal identifier `Ptr': `Ptr' suffix is reserved
+Reserved.ice:25: illegal identifier `abcPtr': `Ptr' suffix is reserved
+Reserved.ice:26: illegal identifier `Helper': `Helper' suffix is reserved
+Reserved.ice:27: illegal identifier `abcHelper': `Helper' suffix is reserved
+Reserved.ice:28: illegal identifier `Holder': `Holder' suffix is reserved
+Reserved.ice:29: illegal identifier `abcHolder': `Holder' suffix is reserved
+Reserved.ice:30: illegal identifier `Ice': `Ice' prefix is reserved
+Reserved.ice:31: illegal identifier `ice': `ice' prefix is reserved
+Reserved.ice:31: constant `ice' differs only in capitalization from constant `Ice'
+Reserved.ice:32: illegal identifier `icea': `ice' prefix is reserved
+Reserved.ice:33: illegal identifier `Iceblah': `Ice' prefix is reserved
+Reserved.ice:34: illegal identifier `IceFoo': `Ice' prefix is reserved
+Reserved.ice:35: illegal identifier `icecream': `ice' prefix is reserved
+Reserved.ice:36: illegal identifier `ICEpick': `ICE' prefix is reserved
+Reserved.ice:37: illegal identifier `iCEaxe': `iCE' prefix is reserved
 Reserved.ice:40: illegal identifier `Ice': `Ice' prefix is reserved
-Reserved.ice:41: illegal identifier `ice': `ice' prefix is reserved
-Reserved.ice:41: constant `ice' differs only in capitalization from constant `Ice'
-Reserved.ice:42: illegal identifier `icea': `ice' prefix is reserved
-Reserved.ice:43: illegal identifier `Iceblah': `Ice' prefix is reserved
-Reserved.ice:44: illegal identifier `IceFoo': `Ice' prefix is reserved
-Reserved.ice:45: illegal identifier `icecream': `ice' prefix is reserved
-Reserved.ice:46: illegal identifier `ICEpick': `ICE' prefix is reserved
-Reserved.ice:47: illegal identifier `iCEaxe': `iCE' prefix is reserved
-Reserved.ice:50: illegal identifier `Ice': `Ice' prefix is reserved
-Reserved.ice:51: illegal identifier `IceFoo': `Ice' prefix is reserved
+Reserved.ice:41: illegal identifier `IceFoo': `Ice' prefix is reserved
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Reserved.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Reserved.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Reserved.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Reserved.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
-
-
-
 
 #include <include/IcePrefix.ice>        // No error should be caused by this file
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SelfContainment.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SelfContainment.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SelfContainment.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SelfContainment.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-SelfContainment.ice:18: struct `x' cannot contain itself
+SelfContainment.ice:11: struct `x' cannot contain itself
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SelfContainment.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SelfContainment.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SelfContainment.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SelfContainment.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SequenceRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SequenceRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SequenceRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SequenceRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-SequenceRedefinition.ice:16: redefinition of sequence `Seq' as sequence
+SequenceRedefinition.ice:9: redefinition of sequence `Seq' as sequence
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SequenceRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/SequenceRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/SequenceRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructMembers.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructMembers.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructMembers.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructMembers.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
-StructMembers.ice:17: struct `s1' must have at least one member
-StructMembers.ice:49: missing data member name
-StructMembers.ice:55: missing data member name
-StructMembers.ice:55: `;' missing after definition
-StructMembers.ice:59: missing data member name
-StructMembers.ice:65: missing data member name
-StructMembers.ice:65: `;' missing after definition
+StructMembers.ice:10: struct `s1' must have at least one member
+StructMembers.ice:42: missing data member name
+StructMembers.ice:48: missing data member name
+StructMembers.ice:48: `;' missing after definition
+StructMembers.ice:52: missing data member name
+StructMembers.ice:58: missing data member name
+StructMembers.ice:58: `;' missing after definition
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructMembers.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructMembers.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructMembers.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructMembers.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructRedefinition.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructRedefinition.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructRedefinition.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructRedefinition.err	2019-02-05 18:03:04.000000000 +0000
@@ -1 +1 @@
-StructRedefinition.ice:14: redefinition of struct `Struct1' as struct
+StructRedefinition.ice:9: redefinition of struct `Struct1' as struct
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructRedefinition.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructRedefinition.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/StructRedefinition.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/StructRedefinition.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/test.py zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/test.py
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,24 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import glob
+import os
+import shutil
+
 
 class SliceErrorDetectionTestCase(ClientTestCase):
 
     def runClientSide(self, current):
-        testdir = self.getPath()
+        testdir = current.testsuite.getPath()
         slice2cpp = SliceTranslator("slice2cpp")
 
+        outdir = "{0}/tmp".format(testdir)
+        if os.path.exists(outdir):
+            shutil.rmtree(outdir)
+        os.mkdir(outdir)
+
         files = glob.glob("{0}/*.ice".format(testdir))
         files.sort()
         try:
@@ -23,8 +26,6 @@
                 current.write(os.path.basename(file) + "... ")
 
                 args = ["-I.", file, "--output-dir", "tmp"]
-                if file.find("Underscore") >= 0:
-                    args.append("--underscore")
 
                 # Don't print out slice2cpp output and expect failures
                 slice2cpp.run(current, args=args, exitstatus=0 if file.find("Warning") >= 0 else 1)
@@ -46,8 +47,15 @@
                     i = i + 1
                 else:
                     current.writeln("ok")
+
+            for language in ["cpp", "cs", "html", "java", "js", "matlab", "objc", "php", "py", "rb"]:
+                compiler = SliceTranslator('slice2%s' % language)
+                if not os.path.isfile(compiler.getCommandLine(current)):
+                    continue
+                compiler.run(current, args=["forward/Forward.ice", "--output-dir", "tmp"])
+            current.writeln("ok")
         finally:
-            for file in glob.glob("{0}/tmp/*".format(testdir)):
-                current.files.append(file)
+            if os.path.exists(outdir):
+                shutil.rmtree(outdir)
 
 TestSuite(__name__, [ SliceErrorDetectionTestCase() ])
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/tmp/.gitignore zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/tmp/.gitignore
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/tmp/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/tmp/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-*
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Undefined.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Undefined.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Undefined.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Undefined.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,11 @@
-Undefined.ice:15: `Foo' is not defined
-Undefined.ice:16: `Foo' is not defined
-Undefined.ice:17: `Foo' is not defined
-Undefined.ice:18: `Foo' is not defined
-Undefined.ice:19: `Foo3' is not defined
-Undefined.ice:19: `Foo2' is not defined
-Undefined.ice:19: `Foo1' is not defined
-Undefined.ice:20: `Foo' is not defined
-Undefined.ice:20: `Foo3' is not defined
-Undefined.ice:20: `Foo2' is not defined
-Undefined.ice:20: `Foo1' is not defined
+Undefined.ice:8: `Foo' is not defined
+Undefined.ice:9: `Foo' is not defined
+Undefined.ice:10: `Foo' is not defined
+Undefined.ice:11: `Foo' is not defined
+Undefined.ice:12: `Foo3' is not defined
+Undefined.ice:12: `Foo2' is not defined
+Undefined.ice:12: `Foo1' is not defined
+Undefined.ice:13: `Foo' is not defined
+Undefined.ice:13: `Foo3' is not defined
+Undefined.ice:13: `Foo2' is not defined
+Undefined.ice:13: `Foo1' is not defined
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Undefined.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Undefined.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/Undefined.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/Undefined.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningClassProxy.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningClassProxy.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningClassProxy.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningClassProxy.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
-WarningClassProxy.ice:14: warning: proxy for a class is deprecated
+WarningClassProxy.ice:9: warning: proxy for a class is deprecated
+WarningClassProxy.ice:13: warning: proxy for a class is deprecated
 WarningClassProxy.ice:18: warning: proxy for a class is deprecated
 WarningClassProxy.ice:23: warning: proxy for a class is deprecated
-WarningClassProxy.ice:28: warning: proxy for a class is deprecated
-WarningClassProxy.ice:31: warning: proxy for a class is deprecated
-WarningClassProxy.ice:32: warning: proxy for a class is deprecated
+WarningClassProxy.ice:26: warning: proxy for a class is deprecated
+WarningClassProxy.ice:27: warning: proxy for a class is deprecated
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningClassProxy.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningClassProxy.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningClassProxy.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningClassProxy.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInterfaceByValue.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
-WarningInterfaceByValue.ice:14: warning: interface by value is deprecated
+WarningInterfaceByValue.ice:9: warning: interface by value is deprecated
+WarningInterfaceByValue.ice:13: warning: interface by value is deprecated
 WarningInterfaceByValue.ice:18: warning: interface by value is deprecated
 WarningInterfaceByValue.ice:23: warning: interface by value is deprecated
-WarningInterfaceByValue.ice:28: warning: interface by value is deprecated
-WarningInterfaceByValue.ice:35: warning: interface by value is deprecated
-WarningInterfaceByValue.ice:38: warning: interface by value is deprecated
-WarningInterfaceByValue.ice:39: warning: interface by value is deprecated
+WarningInterfaceByValue.ice:30: warning: interface by value is deprecated
+WarningInterfaceByValue.ice:33: warning: interface by value is deprecated
+WarningInterfaceByValue.ice:34: warning: interface by value is deprecated
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInvalidMetaData.err	2019-02-05 18:03:04.000000000 +0000
@@ -9,13 +9,13 @@
 WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:dll-export:'
 WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:include'
 WarningInvalidMetaData.ice: warning: ignoring invalid global metadata `cpp:include:'
-WarningInvalidMetaData.ice:37: warning: ignoring metadata `cpp:noexcept' for non local interface
-WarningInvalidMetaData.ice:40: warning: ignoring invalid metadata `cpp:type:std::list< ::std::string>' for operation with void return type
-WarningInvalidMetaData.ice:43: warning: ignoring invalid metadata `cpp:view-type:std::experimental::string_view' for operation with void return type
-WarningInvalidMetaData.ice:46: warning: ignoring invalid metadata `cpp:array' for operation with void return type
-WarningInvalidMetaData.ice:49: warning: ignoring invalid metadata `cpp:range' for operation with void return type
-WarningInvalidMetaData.ice:54: warning: ignoring invalid metadata `cpp:class'
-WarningInvalidMetaData.ice:54: warning: ignoring invalid metadata `cpp:comparable'
-WarningInvalidMetaData.ice:59: warning: ignoring invalid metadata `cpp:const'
-WarningInvalidMetaData.ice:59: warning: ignoring invalid metadata `cpp:ice_print'
-WarningInvalidMetaData.ice:65: warning: ignoring invalid metadata `cpp:virtual'
+WarningInvalidMetaData.ice:32: warning: ignoring metadata `cpp:noexcept' for non local interface
+WarningInvalidMetaData.ice:35: warning: ignoring invalid metadata `cpp:type:std::list< ::std::string>' for operation with void return type
+WarningInvalidMetaData.ice:38: warning: ignoring invalid metadata `cpp:view-type:std::experimental::string_view' for operation with void return type
+WarningInvalidMetaData.ice:41: warning: ignoring invalid metadata `cpp:array' for operation with void return type
+WarningInvalidMetaData.ice:44: warning: ignoring invalid metadata `cpp:range' for operation with void return type
+WarningInvalidMetaData.ice:49: warning: ignoring invalid metadata `cpp:class'
+WarningInvalidMetaData.ice:49: warning: ignoring invalid metadata `cpp:comparable'
+WarningInvalidMetaData.ice:54: warning: ignoring invalid metadata `cpp:const'
+WarningInvalidMetaData.ice:54: warning: ignoring invalid metadata `cpp:ice_print'
+WarningInvalidMetaData.ice:60: warning: ignoring invalid metadata `cpp:virtual'
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["cpp:header-ext:hh"]]
 [["cpp:header-ext:hh"]]
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:invalid-metadata"]]
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WrongProxyType.err zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WrongProxyType.err
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WrongProxyType.err	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WrongProxyType.err	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
-WrongProxyType.ice:16: warning: use of sequences in dictionary keys has been deprecated
-WrongProxyType.ice:20: `Seq' must be class or interface
-WrongProxyType.ice:21: `Seq' must be class or interface
-WrongProxyType.ice:22: `Seq' must be class or interface
-WrongProxyType.ice:24: `Dict' must be class or interface
-WrongProxyType.ice:25: `Dict' must be class or interface
-WrongProxyType.ice:26: `Dict' must be class or interface
+WrongProxyType.ice:9: warning: use of sequences in dictionary keys has been deprecated
+WrongProxyType.ice:13: `Seq' must be class or interface
+WrongProxyType.ice:14: `Seq' must be class or interface
+WrongProxyType.ice:15: `Seq' must be class or interface
+WrongProxyType.ice:17: `Dict' must be class or interface
+WrongProxyType.ice:18: `Dict' must be class or interface
+WrongProxyType.ice:19: `Dict' must be class or interface
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WrongProxyType.ice zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WrongProxyType.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/errorDetection/WrongProxyType.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/errorDetection/WrongProxyType.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/cpp/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/escape/Client.cpp zeroc-ice-3.7.2/cpp/test/Slice/escape/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Slice/escape/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/escape/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Key.h>
 #include <Clash.h>
 
@@ -176,9 +171,17 @@
     test(_cpp_and::_cpp_xor_eq == 0);
 }
 
-int
-run(const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int argc, char** argv)
 {
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(ICE_MAKE_SHARED(charI), Ice::stringToIdentity("test"));
@@ -186,24 +189,9 @@
 
     cout << "Testing operation name... " << flush;
     _cpp_and::charPrxPtr p = ICE_UNCHECKED_CAST(_cpp_and::charPrx,
-        adapter->createProxy(Ice::stringToIdentity("test")));
+                                                adapter->createProxy(Ice::stringToIdentity("test")));
     p->_cpp_explicit();
     cout << "ok" << endl;
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-    try
-    {
-        Ice::CommunicatorHolder ich(argc, argv);
-        return run(ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/escape/Key.ice zeroc-ice-3.7.2/cpp/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 [["suppress-warning:deprecated"]]
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/escape/Makefile.mk zeroc-ice-3.7.2/cpp/test/Slice/escape/Makefile.mk
--- zeroc-ice-3.7.1/cpp/test/Slice/escape/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/escape/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = Client.cpp Clash.ice Key.ice
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/escape/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Slice/escape/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Slice/escape/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/escape/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -501,14 +501,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/escape/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Slice/escape/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Slice/escape/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/escape/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/headers/test.py zeroc-ice-3.7.2/cpp/test/Slice/headers/test.py
--- zeroc-ice-3.7.1/cpp/test/Slice/headers/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/headers/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import glob
 
@@ -23,7 +18,7 @@
         os.symlink("dir2", os.path.join("slices", "linktodir2"))
 
         basedir = self.testsuite.getPath()
-        slicedir = current.driver.getSliceDir(self.mapping, current)
+        slicedir = component.getSliceDir(self.mapping, current)
         os.symlink(slicedir, "iceslices")
 
         def runTest(args):
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/macros/Client.cpp zeroc-ice-3.7.2/cpp/test/Slice/macros/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Slice/macros/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/macros/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace Test;
 using namespace std;
 
-int
-main(int argc, char* argv[])
+class Client : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
+
+void
+Client::run(int, char**)
 {
-    int status = EXIT_SUCCESS;
-    try
-    {
-        cout << "testing Slice predefined macros... " << flush;
-        DefaultPtr d = ICE_MAKE_SHARED(Default);
-        test(d->x == 10);
-        test(d->y == 10);
-
-        CppOnlyPtr c = ICE_MAKE_SHARED(CppOnly);
-        test(c->lang == "cpp");
-        test(c->version == ICE_INT_VERSION);
-        cout << "ok" << endl;
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-    return status;
+    cout << "testing Slice predefined macros... " << flush;
+    DefaultPtr d = ICE_MAKE_SHARED(Default);
+    test(d->x == 10);
+    test(d->y == 10);
+
+    CppOnlyPtr c = ICE_MAKE_SHARED(CppOnly);
+    test(c->lang == "cpp");
+    test(c->version == ICE_INT_VERSION);
+    cout << "ok" << endl;
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/macros/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Slice/macros/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Slice/macros/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/macros/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -340,14 +340,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/macros/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Slice/macros/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Slice/macros/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/macros/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/macros/Test.ice zeroc-ice-3.7.2/cpp/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This macro sets the default value only when compiling with slice2cpp.
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/parser/CircularA.ice zeroc-ice-3.7.2/cpp/test/Slice/parser/CircularA.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/parser/CircularA.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/parser/CircularA.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/parser/CircularB.ice zeroc-ice-3.7.2/cpp/test/Slice/parser/CircularB.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/parser/CircularB.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/parser/CircularB.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/parser/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Slice/parser/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Slice/parser/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/parser/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -421,10 +421,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -502,14 +502,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/parser/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Slice/parser/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Slice/parser/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/parser/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/structure/Client.cpp zeroc-ice-3.7.2/cpp/test/Slice/structure/Client.cpp
--- zeroc-ice-3.7.1/cpp/test/Slice/structure/Client.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/structure/Client.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 
 using namespace std;
@@ -262,25 +257,18 @@
     cout << "ok" << endl;
 }
 
-int
-run(const Ice::CommunicatorPtr& communicator)
+class Client : public Test::TestHelper
 {
-    allTests(communicator);
+public:
 
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-    try
-    {
-        Ice::CommunicatorHolder ich(argc, argv);
-        return run(ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
+    Ice::CommunicatorHolder ich = initialize(argc, argv);
+    allTests(ich.communicator());
 }
+
+DEFINE_TEST(Client)
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/structure/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Slice/structure/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Slice/structure/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/structure/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -340,14 +340,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/structure/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Slice/structure/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Slice/structure/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/structure/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/structure/Test.ice zeroc-ice-3.7.2/cpp/test/Slice/structure/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/structure/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/structure/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["cpp:include:list"]]
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/unicodePaths/test.py zeroc-ice-3.7.2/cpp/test/Slice/unicodePaths/test.py
--- zeroc-ice-3.7.1/cpp/test/Slice/unicodePaths/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/unicodePaths/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import shutil, locale
 
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj zeroc-ice-3.7.2/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj
--- zeroc-ice-3.7.1/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -90,10 +90,10 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -339,14 +339,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.1\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.1\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.props') )" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.1\build\native\zeroc.ice.v100.targets') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/utf8BOM/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/Slice/utf8BOM/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/Slice/utf8BOM/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/utf8BOM/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.v100" version="3.7.1" targetFramework="Native" />
-  <package id="zeroc.ice.v120" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.v100" version="3.7.2" targetFramework="Native" />
+  <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/Slice/utf8BOM/Test.ice zeroc-ice-3.7.2/cpp/test/Slice/utf8BOM/Test.ice
--- zeroc-ice-3.7.1/cpp/test/Slice/utf8BOM/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/Slice/utf8BOM/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/App.xaml zeroc-ice-3.7.2/cpp/test/uwp/controller/App.xaml
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/App.xaml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/App.xaml	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <Application
-    x:Class="Controller.App"
+    x:Class="Test.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Controller">
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/App.xaml.cpp zeroc-ice-3.7.2/cpp/test/uwp/controller/App.xaml.cpp
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/App.xaml.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/App.xaml.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "pch.h"
-#include "ViewController.xaml.h"
+#include "ControllerView.xaml.h"
 #include <ppltasks.h>
 
-using namespace Controller;
+using namespace Test;
 
 using namespace Platform;
 using namespace Windows::ApplicationModel;
@@ -63,7 +58,7 @@
 
     // Create a Frame to act navigation context and navigate to the first page
     auto rootFrame = ref new Frame();
-    if(!rootFrame->Navigate(TypeName(ViewController::typeid)))
+    if(!rootFrame->Navigate(TypeName(ControllerView::typeid)))
     {
         throw ref new FailureException("Failed to create initial page");
     }
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/App.xaml.h zeroc-ice-3.7.2/cpp/test/uwp/controller/App.xaml.h
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/App.xaml.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/App.xaml.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include "App.g.h"
 
-namespace Controller
+namespace Test
 {
 /// <summary>
 /// Provides application-specific behavior to supplement the default Application class.
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/ControllerView.xaml zeroc-ice-3.7.2/cpp/test/uwp/controller/ControllerView.xaml
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/ControllerView.xaml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/ControllerView.xaml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,34 @@
+<Page
+    x:Class="Test.ControllerView"
+    IsTabStop="false"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Controller"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0">
+            <TextBlock Text="ZeroC - UWP Controller"
+                       Style="{StaticResource TitleStyle}"
+                       Margin="5"
+                       VerticalAlignment="Bottom" TextWrapping="Wrap"/>
+        </StackPanel>
+        <ComboBox Grid.Row="1" Header="IPv4 Address" Name="ipv4Addresses " HorizontalAlignment="Stretch"
+                  SelectionChanged="Hostname_SelectionChanged"></ComboBox>
+        <ListBox Margin="5" Grid.Row="2" x:Name="Output" Background="LightGray"></ListBox>
+        <StackPanel Grid.Row="3" VerticalAlignment="Bottom">
+            <TextBlock Text="Copyright (c) ZeroC, Inc. All rights reserved."
+                       Style="{StaticResource FooterStyle}"
+                       Margin="5"
+                       TextWrapping="Wrap"/>
+        </StackPanel>
+    </Grid>
+</Page>
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/ControllerView.xaml.cpp zeroc-ice-3.7.2/cpp/test/uwp/controller/ControllerView.xaml.cpp
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/ControllerView.xaml.cpp	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/ControllerView.xaml.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,513 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#include "ControllerView.xaml.h"
+
+#include <Ice/Ice.h>
+#include <Controller.h>
+#include <TestHelper.h>
+
+#include <string>
+#include <iostream>
+#include <memory>
+#include <condition_variable>
+
+using namespace std;
+using namespace Test;
+using namespace Test::Common;
+
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+using namespace Windows::Networking::Connectivity;
+
+using namespace Platform::Collections;
+
+namespace
+{
+
+typedef Test::TestHelper* (*CREATE_HELPER_ENTRY_POINT)();
+
+class ControllerHelperI : public Test::ControllerHelper,
+                          public enable_shared_from_this<Test::ControllerHelper>
+{
+public:
+
+    ControllerHelperI(const string&, const StringSeq&);
+
+    virtual std::string loggerPrefix() const;
+    virtual void print(const std::string&);
+    virtual void serverReady();
+    virtual void communicatorInitialized(const shared_ptr<Ice::Communicator>&);
+
+    void run();
+    void completed(int);
+
+    int waitSuccess(int) const;
+    void waitReady(int) const;
+    std::string getOutput() const;
+    void join();
+    void shutdown();
+
+private:
+
+    string _dll;
+    StringSeq _args;
+    bool _ready;
+    bool _completed;
+    int _status;
+    ostringstream _out;
+    thread _thread;
+    mutable mutex _mutex;
+    mutable condition_variable _condition;
+    //
+    // DLL cache
+    //
+    static std::map<std::string, HINSTANCE> _dlls;
+    HINSTANCE loadDll(const string&);
+
+    shared_ptr<Ice::Communicator> _communicator;
+};
+
+std::map<std::string, HINSTANCE> ControllerHelperI::_dlls;
+
+class ProcessI : public Process
+{
+public:
+
+    ProcessI(const shared_ptr<ControllerHelperI>&);
+
+    void waitReady(int, const Ice::Current&);
+    int waitSuccess(int, const Ice::Current&);
+    string terminate(const Ice::Current&);
+
+private:
+
+    shared_ptr<ControllerHelperI> _controllerHelper;
+};
+
+class ProcessControllerI : public ProcessController
+{
+public:
+
+    ProcessControllerI(ControllerView^);
+    shared_ptr<ProcessPrx> start(string, string, StringSeq, const Ice::Current&);
+    virtual string getHost(string, bool, const Ice::Current&);
+
+private:
+
+    ControllerView^ _controller;
+    string _host;
+};
+
+class ControllerI
+{
+public:
+
+    ControllerI(ControllerView^);
+    virtual ~ControllerI();
+
+    void
+    registerProcessController(ControllerView^,
+                              const shared_ptr<Ice::ObjectAdapter>&,
+                              const shared_ptr<ProcessControllerRegistryPrx>&,
+                              const shared_ptr<ProcessControllerPrx>&);
+
+private:
+
+    shared_ptr<Ice::Communicator> _communicator;
+    shared_ptr<Test::Common::ProcessControllerRegistryPrx> _registry;
+};
+
+Test::StreamHelper streamRedirect;
+
+}
+
+ControllerHelperI::ControllerHelperI(const string& dll, const StringSeq& args) :
+    _dll(dll),
+    _args(args),
+    _ready(false),
+    _completed(false),
+    _status(0)
+{
+}
+
+string
+ControllerHelperI::loggerPrefix() const
+{
+    return _dll;
+}
+
+void
+ControllerHelperI::print(const std::string& msg)
+{
+    _out << msg;
+}
+
+void
+ControllerHelperI::serverReady()
+{
+    unique_lock<mutex> lock(_mutex);
+    _ready = true;
+    _condition.notify_all();
+}
+
+void
+ControllerHelperI::communicatorInitialized(const shared_ptr<Ice::Communicator>& communicator)
+{
+    unique_lock<mutex> lock(_mutex);
+    _communicator = communicator;
+}
+
+void
+ControllerHelperI::run()
+{
+    thread t([this]()
+    {
+        HINSTANCE hnd = loadDll(_dll);
+        if(hnd == 0)
+        {
+            ostringstream os;
+            os << "failed to load `" << _dll << "': error code: " << GetLastError();
+            print(os.str());
+            completed(1);
+            return;
+        }
+
+        FARPROC sym = GetProcAddress(hnd, "createHelper");
+        if(sym == 0)
+        {
+            print("failed to find createHelper function from `" + _dll + "'");
+            completed(1);
+            return;
+        }
+
+        CREATE_HELPER_ENTRY_POINT createHelper = reinterpret_cast<CREATE_HELPER_ENTRY_POINT>(sym);
+        char** argv = new char*[_args.size() + 1];
+        for(unsigned int i = 0; i < _args.size(); ++i)
+        {
+            argv[i] = const_cast<char*>(_args[i].c_str());
+        }
+        argv[_args.size()] = 0;
+
+        if(_dll.find("client") != string::npos || _dll.find("collocated") != string::npos)
+        {
+            streamRedirect.setControllerHelper(this);
+        }
+        try
+        {
+            auto helper = unique_ptr<Test::TestHelper>(createHelper());
+            helper->setControllerHelper(this);
+            helper->run(static_cast<int>(_args.size()), argv);
+            completed(0);
+        }
+        catch(const std::exception& ex)
+        {
+            print("unexpected exception while running `" + _args[0] + "':\n" + ex.what());
+            completed(1);
+        }
+        catch(...)
+        {
+            print("unexpected unknown exception while running `" + _args[0] + "'");
+            completed(1);
+        }
+        if(_dll.find("client") != string::npos || _dll.find("collocated") != string::npos)
+        {
+            streamRedirect.setControllerHelper(0);
+        }
+        delete[] argv;
+    });
+    _thread = move(t);
+}
+
+void
+ControllerHelperI::join()
+{
+    _thread.join();
+}
+
+void
+ControllerHelperI::completed(int status)
+{
+    unique_lock<mutex> lock(_mutex);
+    _completed = true;
+    _status = status;
+    _communicator = nullptr;
+    _condition.notify_all();
+}
+
+void
+ControllerHelperI::waitReady(int timeout) const
+{
+    unique_lock<mutex> lock(_mutex);
+    while(!_ready && !_completed)
+    {
+        if(_condition.wait_for(lock, chrono::seconds(timeout)) == cv_status::timeout)
+        {
+            throw ProcessFailedException("timed out waiting for the process to be ready");
+        }
+    }
+    if(_completed && _status == EXIT_FAILURE)
+    {
+        throw ProcessFailedException(_out.str());
+    }
+}
+
+int
+ControllerHelperI::waitSuccess(int timeout) const
+{
+    unique_lock<mutex> lock(_mutex);
+    while(!_completed)
+    {
+        if(_condition.wait_for(lock, chrono::seconds(timeout)) == cv_status::timeout)
+        {
+            throw ProcessFailedException("timed out waiting for the process to succeed");
+        }
+    }
+    return _status;
+}
+
+string
+ControllerHelperI::getOutput() const
+{
+    assert(_completed);
+    return _out.str();
+}
+
+void
+ControllerHelperI::shutdown()
+{
+    unique_lock<mutex> lock(_mutex);
+    if(_communicator)
+    {
+        _communicator->shutdown();
+    }
+}
+
+HINSTANCE
+ControllerHelperI::loadDll(const string& name)
+{
+    unique_lock<mutex> lock(_mutex);
+    map<string, HINSTANCE>::iterator p = _dlls.find(name);
+    if (p == _dlls.end())
+    {
+        HINSTANCE hnd = LoadPackagedLibrary(Ice::stringToWstring(name).c_str(), 0);
+        p = _dlls.insert(make_pair(name, hnd)).first;
+    }
+    return p->second;
+}
+
+ProcessI::ProcessI(const shared_ptr<ControllerHelperI>& controllerHelper) :
+    _controllerHelper(controllerHelper)
+{
+}
+
+void
+ProcessI::waitReady(int timeout, const Ice::Current&)
+{
+    _controllerHelper->waitReady(timeout);
+}
+
+int
+ProcessI::waitSuccess(int timeout, const Ice::Current&)
+{
+    return _controllerHelper->waitSuccess(timeout);
+}
+
+string
+ProcessI::terminate(const Ice::Current& current)
+{
+    _controllerHelper->shutdown();
+    current.adapter->remove(current.id);
+    _controllerHelper->join();
+    return _controllerHelper->getOutput();
+}
+
+ProcessControllerI::ProcessControllerI(ControllerView^ controller) :
+    _controller(controller),
+    _host(_controller->getHost())
+{
+}
+
+shared_ptr<ProcessPrx>
+ProcessControllerI::start(string testSuite, string exe, StringSeq args, const Ice::Current& c)
+{
+    ostringstream os;
+    os << "starting " << testSuite << " " << exe << "... ";
+    _controller->println(os.str());
+    replace(testSuite.begin(), testSuite.end(), '/', '_');
+    args.insert(args.begin(), testSuite + '_' + exe + ".dll");
+    auto helper = make_shared<ControllerHelperI>(testSuite + '_' + exe + ".dll", args);
+    helper->run();
+    return Ice::uncheckedCast<ProcessPrx>(c.adapter->addWithUUID(make_shared<ProcessI>(helper)));
+}
+
+string
+ProcessControllerI::getHost(string, bool, const Ice::Current&)
+{
+    return _host;
+}
+
+ControllerI::ControllerI(ControllerView^ controller)
+{
+    Ice::InitializationData initData = Ice::InitializationData();
+    initData.properties = Ice::createProperties();
+    initData.properties->setProperty("Ice.ThreadPool.Client.SizeMax", "10");
+    initData.properties->setProperty("Ice.Default.Host", "127.0.0.1");
+    initData.properties->setProperty("Ice.Override.ConnectTimeout", "1000");
+    //initData.properties->setProperty("Ice.Trace.Network", "3");
+    //initData.properties->setProperty("Ice.Trace.Protocol", "1");
+    initData.properties->setProperty("ControllerAdapter.AdapterId", Ice::generateUUID());
+
+    _communicator = Ice::initialize(initData);
+
+    auto registry = Ice::uncheckedCast<ProcessControllerRegistryPrx>(
+        _communicator->stringToProxy("Util/ProcessControllerRegistry:tcp -h 127.0.0.1 -p 15001"));
+    shared_ptr<Ice::ObjectAdapter> adapter = _communicator->createObjectAdapterWithEndpoints("ControllerAdapter", "");
+    Ice::Identity ident = { "ProcessController", "UWP"};
+    auto processController =
+        Ice::uncheckedCast<ProcessControllerPrx>(adapter->add(make_shared<ProcessControllerI>(controller), ident));
+    adapter->activate();
+
+    registerProcessController(controller, adapter, registry, processController);
+}
+
+void
+ControllerI::registerProcessController(ControllerView^ controller,
+                                       const shared_ptr<Ice::ObjectAdapter>& adapter,
+                                       const shared_ptr<ProcessControllerRegistryPrx>& registry,
+                                       const shared_ptr<ProcessControllerPrx>& processController)
+{
+    registry->ice_pingAsync(
+        [this, controller, adapter, registry, processController]()
+        {
+            auto connection = registry->ice_getCachedConnection();
+            connection->setAdapter(adapter);
+            connection->setACM(5, Ice::ACMClose::CloseOff, Ice::ACMHeartbeat::HeartbeatAlways);
+            connection->setCloseCallback([=](const shared_ptr<Ice::Connection>&)
+                {
+                    controller->println("connection with process controller registry closed");
+                    std::this_thread::sleep_for(2s);
+                    registerProcessController(controller, adapter, registry, processController);
+                });
+
+            registry->setProcessControllerAsync(processController, nullptr,
+                [controller](exception_ptr e)
+                {
+                    try
+                    {
+                        rethrow_exception(e);
+                    }
+                    catch(const Ice::CommunicatorDestroyedException&)
+                    {
+                    }
+                    catch(const std::exception& ex)
+                    {
+                        ostringstream os;
+                        os << "unexpected exception while connecting to process controller registry:\n" << ex.what();
+                        controller->println(os.str());
+                    }
+                });
+        },
+        [this, controller, adapter, registry, processController](exception_ptr e)
+        {
+            try
+            {
+                rethrow_exception(e);
+            }
+            catch(const Ice::ConnectFailedException&)
+            {
+                std::this_thread::sleep_for(2s);
+                registerProcessController(controller, adapter, registry, processController);
+            }
+            catch(const Ice::TimeoutException&)
+            {
+                std::this_thread::sleep_for(2s);
+                registerProcessController(controller, adapter, registry, processController);
+            }
+            catch(const Ice::CommunicatorDestroyedException&)
+            {
+            }
+            catch(const std::exception& ex)
+            {
+                ostringstream os;
+                os << "unexpected exception while connecting to process controller registry:\n" << ex.what();
+                controller->println(os.str());
+            }
+        });
+}
+
+ControllerI::~ControllerI()
+{
+    _communicator->destroy();
+}
+
+static ControllerI* controllerI = 0;
+
+ControllerView::ControllerView()
+{
+    InitializeComponent();
+    auto hostnames = NetworkInformation::GetHostNames();
+    ipv4Addresses->Items->Append("127.0.0.1");
+    for(unsigned int i = 0; i < hostnames->Size; ++i)
+    {
+        auto hostname = hostnames->GetAt(i);
+        if(hostname->Type == Windows::Networking::HostNameType::Ipv4)
+        {
+            ipv4Addresses->Items->Append(hostname->RawName);
+        }
+    }
+    ipv4Addresses->SelectedIndex = 0;
+}
+
+string
+ControllerView::getHost() const
+{
+    return Ice::wstringToString(ipv4Addresses->SelectedItem->ToString()->Data());
+}
+
+void
+ControllerView::Hostname_SelectionChanged(Platform::Object^, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^)
+{
+    if(controllerI)
+    {
+        delete controllerI;
+        controllerI = 0;
+    }
+    controllerI = new ControllerI(this);
+}
+
+void
+ControllerView::println(const string& s)
+{
+    if(!s.empty())
+    {
+        Dispatcher->RunAsync(
+            CoreDispatcherPriority::Normal,
+            ref new DispatchedHandler([=]()
+                                      {
+                                          Output->Items->Append(ref new String(Ice::stringToWstring(s).c_str()));
+                                          Output->SelectedIndex = Output->Items->Size - 1;
+                                          Output->ScrollIntoView(Output->SelectedItem);
+                                      }));
+    }
+}
+
+ControllerView::~ControllerView()
+{
+    if(controllerI)
+    {
+        delete controllerI;
+        controllerI = 0;
+    }
+}
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/ControllerView.xaml.h zeroc-ice-3.7.2/cpp/test/uwp/controller/ControllerView.xaml.h
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/ControllerView.xaml.h	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/ControllerView.xaml.h	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <ControllerView.g.h>
+#include <collection.h>
+#include <map>
+#include <string>
+#include <memory>
+#include <mutex>
+
+namespace
+{
+class ControllerI;
+class ProcessControllerI;
+}
+
+namespace Test
+{
+
+[Windows::Foundation::Metadata::WebHostHidden]
+public ref class ControllerView sealed
+{
+public:
+
+    ControllerView();
+    virtual ~ControllerView();
+
+private:
+
+    friend class ControllerI;
+    friend class ProcessControllerI;
+    void println(const std::string&);
+    std::string getHost() const;
+    void Hostname_SelectionChanged(Platform::Object^, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^);
+};
+
+}
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/cpp/test/uwp/controller/msbuild/controller_TemporaryKey.pfx and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/cpp/test/uwp/controller/msbuild/controller_TemporaryKey.pfx differ
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/msbuild/controller.vcxproj zeroc-ice-3.7.2/cpp/test/uwp/controller/msbuild/controller.vcxproj
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/msbuild/controller.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/msbuild/controller.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
+  <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{194C78A4-129A-4947-B891-2B538DB72C07}</ProjectGuid>
     <RootNamespace>uwp</RootNamespace>
@@ -101,7 +101,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <PackageCertificateKeyFile>controller_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>E7BFC05.0.403170FE986292019448DD325BB206</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>06555BDC756B9167A160C8EB3E5F5A4D0C4AA836</PackageCertificateThumbprint>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -154,8 +154,8 @@
     <ClInclude Include="..\App.xaml.h">
       <DependentUpon>..\App.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="..\ViewController.xaml.h">
-      <DependentUpon>..\ViewController.xaml</DependentUpon>
+    <ClInclude Include="..\ControllerView.xaml.h">
+      <DependentUpon>..\ControllerView.xaml</DependentUpon>
     </ClInclude>
     <ClInclude Include="ARM\Debug\Controller.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -210,7 +210,7 @@
     <ApplicationDefinition Include="..\App.xaml">
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="..\ViewController.xaml">
+    <Page Include="..\ControllerView.xaml">
       <SubType>Designer</SubType>
     </Page>
     <Page Include="..\StandardStyles.xaml" />
@@ -234,8 +234,8 @@
       <DependentUpon>..\App.xaml</DependentUpon>
     </ClCompile>
     <ClCompile Include="..\pch.cpp" />
-    <ClCompile Include="..\ViewController.xaml.cpp">
-      <DependentUpon>..\ViewController.xaml</DependentUpon>
+    <ClCompile Include="..\ControllerView.xaml.cpp">
+      <DependentUpon>..\ControllerView.xaml</DependentUpon>
     </ClCompile>
     <ClCompile Include="ARM\Debug\Controller.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -329,6 +329,30 @@
     <None Include="..\..\..\IceSSL\certs\s_rsa_ca1_pub.pem">
       <DeploymentContent>true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Debug\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Release\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Debug\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Release\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Debug\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Release\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Debug\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Release\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="controller_TemporaryKey.pfx" />
     <SliceCompile Include="..\..\..\..\..\scripts\Controller.ice" />
     <None Include="packages.config" />
@@ -1895,26 +1919,26 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
+    <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
     <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.1\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.2\build\native\zeroc.ice.uwp.v141.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.2\build\native\zeroc.ice.uwp.v141.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.2\build\native\zeroc.ice.uwp.v141.props'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.2\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.2\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.2\build\native\zeroc.ice.uwp.v140.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters zeroc-ice-3.7.2/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters	2019-02-05 18:03:04.000000000 +0000
@@ -130,7 +130,7 @@
     <ClCompile Include="x64\Release\Controller.cpp">
       <Filter>Source Files\x64\Release</Filter>
     </ClCompile>
-    <ClCompile Include="..\ViewController.xaml.cpp" />
+    <ClCompile Include="..\ControllerView.xaml.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\App.xaml.h" />
@@ -152,7 +152,7 @@
     <ClInclude Include="x64\Release\Controller.h">
       <Filter>Header Files\x64\Release</Filter>
     </ClInclude>
-    <ClInclude Include="..\ViewController.xaml.h" />
+    <ClInclude Include="..\ControllerView.xaml.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\LockScreenLogo.scale-200.png">
@@ -184,7 +184,7 @@
     <Page Include="..\StandardStyles.xaml">
       <Filter>Styles</Filter>
     </Page>
-    <Page Include="..\ViewController.xaml" />
+    <Page Include="..\ControllerView.xaml" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\..\certs\cacert.der">
@@ -1779,6 +1779,30 @@
       <Filter>Tests\ARM\Release</Filter>
     </None>
     <None Include="packages.config" />
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Release\Ice_scope_client.dll">
+      <Filter>Tests\x64\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Release\Ice_scope_server.dll">
+      <Filter>Tests\x64\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Debug\Ice_scope_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Debug\Ice_scope_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Debug\Ice_scope_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Debug\Ice_scope_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Release\Ice_scope_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Release\Ice_scope_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\..\..\scripts\Controller.ice">
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/msbuild/packages.config zeroc-ice-3.7.2/cpp/test/uwp/controller/msbuild/packages.config
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.uwp.v140" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v140.x86" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
-  <package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v140.x86" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x64" version="3.7.2" targetFramework="native" />
+  <package id="zeroc.ice.uwp.v141.x86" version="3.7.2" targetFramework="native" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/Package.appxmanifest zeroc-ice-3.7.2/cpp/test/uwp/controller/Package.appxmanifest
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/Package.appxmanifest	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/Package.appxmanifest	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
-  <Identity Name="ice-uwp-controller" Publisher="CN=ZeroC" Version="1.0.0.0" />
+  <Identity Name="ice-uwp-controller.cpp" Publisher="CN=ZeroC" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="f4c6cdff-3ef9-43fb-8094-d50c547e70f6" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Ice UWP Controller</DisplayName>
@@ -26,8 +26,8 @@
     <Capability Name="internetClientServer" />
     <Capability Name="internetClient" />
     <Capability Name="privateNetworkClientServer" />
-  <rescap:Capability Name="extendedBackgroundTaskTime" />
-  <rescap:Capability Name="extendedExecutionUnconstrained" />
+    <rescap:Capability Name="extendedBackgroundTaskTime" />
+    <rescap:Capability Name="extendedExecutionUnconstrained" />
   </Capabilities>
   <Extensions>
     <Extension Category="windows.certificates">
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/ViewController.xaml zeroc-ice-3.7.2/cpp/test/uwp/controller/ViewController.xaml
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/ViewController.xaml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/ViewController.xaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-<Page
-    x:Class="Controller.ViewController"
-    IsTabStop="false"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Controller"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0">
-            <TextBlock Text="ZeroC - UWP Controller"
-                       Style="{StaticResource TitleStyle}"
-                       Margin="5"
-                       VerticalAlignment="Bottom" TextWrapping="Wrap"/>
-        </StackPanel>
-        <ComboBox Grid.Row="1" Header="IPv4 Address" Name="ipv4Addresses " HorizontalAlignment="Stretch"
-                  SelectionChanged="Hostname_SelectionChanged"></ComboBox>
-        <ListBox Margin="5" Grid.Row="2" x:Name="Output" Background="LightGray"></ListBox>
-        <StackPanel Grid.Row="3" VerticalAlignment="Bottom">
-            <TextBlock Text="Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved."
-                       Style="{StaticResource FooterStyle}"
-                       Margin="5"
-                       TextWrapping="Wrap"/>
-        </StackPanel>
-    </Grid>
-</Page>
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/ViewController.xaml.cpp zeroc-ice-3.7.2/cpp/test/uwp/controller/ViewController.xaml.cpp
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/ViewController.xaml.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/ViewController.xaml.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,507 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include "ViewController.xaml.h"
-
-#include <Ice/Ice.h>
-#include <Controller.h>
-#include <TestHelper.h>
-
-#include <string>
-#include <iostream>
-#include <memory>
-#include <condition_variable>
-
-using namespace std;
-using namespace Controller;
-using namespace Test::Common;
-
-using namespace Platform;
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::UI::Core;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-using namespace Windows::UI::Xaml::Data;
-using namespace Windows::UI::Xaml::Input;
-using namespace Windows::UI::Xaml::Media;
-using namespace Windows::UI::Xaml::Navigation;
-
-using namespace Windows::Networking::Connectivity;
-
-using namespace Platform::Collections;
-
-namespace
-{
-
-typedef int(*MAIN_ENTRY_POINT)(int, char**, Test::MainHelper*);
-typedef int(*SHUTDOWN_ENTRY_POINT)();
-
-class MainHelperI : public Test::MainHelper
-{
-public:
-
-    MainHelperI(ViewController^, const string&, const StringSeq&);
-
-    virtual void serverReady();
-    virtual void shutdown();
-    virtual void waitForCompleted()
-    {
-    }
-    virtual bool redirect();
-    virtual void print(const std::string&);
-
-    virtual void run();
-    void join();
-    void completed(int);
-    void waitReady(int) const;
-    int waitSuccess(int) const;
-    string getOutput() const;
-
-private:
-
-    ViewController^ _controller;
-    string _dll;
-    StringSeq _args;
-    FARPROC _dllTestShutdown;
-    bool _ready;
-    bool _completed;
-    int _status;
-    ostringstream _out;
-    thread _thread;
-    mutable mutex _mutex;
-    mutable condition_variable _condition;
-};
-
-class ProcessI : public Process
-{
-public:
-
-    ProcessI(ViewController^, shared_ptr<MainHelperI>);
-
-    void waitReady(int, const Ice::Current&);
-    int waitSuccess(int, const Ice::Current&);
-    string terminate(const Ice::Current&);
-
-private:
-
-    ViewController^ _controller;
-    shared_ptr<MainHelperI> _helper;
-};
-
-class ProcessControllerI : public ProcessController
-{
-public:
-
-    ProcessControllerI(ViewController^);
-    shared_ptr<ProcessPrx> start(string, string, StringSeq, const Ice::Current&);
-    virtual string getHost(string, bool, const Ice::Current&);
-
-private:
-
-    ViewController^ _controller;
-    string _host;
-};
-
-class ControllerHelper
-{
-public:
-
-    ControllerHelper(ViewController^);
-    virtual ~ControllerHelper();
-
-    void
-    registerProcessController(ViewController^,
-                              const Ice::ObjectAdapterPtr&,
-                              const shared_ptr<ProcessControllerRegistryPrx>&,
-                              const shared_ptr<ProcessControllerPrx>&);
-
-private:
-
-    shared_ptr<Ice::Communicator> _communicator;
-    shared_ptr<Test::Common::ProcessControllerRegistryPrx> _registry;
-};
-
-}
-
-MainHelperI::MainHelperI(ViewController^ controller, const string& dll, const StringSeq& args) :
-    _controller(controller),
-    _dll(dll),
-    _args(args),
-    _ready(false),
-    _completed(false),
-    _status(0)
-{
-}
-
-void
-MainHelperI::serverReady()
-{
-    unique_lock<mutex> lock(_mutex);
-    _ready = true;
-    _condition.notify_all();
-}
-
-void
-MainHelperI::shutdown()
-{
-    unique_lock<mutex> lock(_mutex);
-    if(_completed)
-    {
-        return;
-    }
-
-    if(_dllTestShutdown)
-    {
-        _dllTestShutdown();
-    }
-}
-
-bool
-MainHelperI::redirect()
-{
-    return _dll.find("client") != string::npos || _dll.find("collocated") != string::npos;
-}
-
-void
-
-MainHelperI::print(const std::string& msg)
-{
-    _out << msg;
-    //_controller->println(msg);
-}
-
-void
-MainHelperI::run()
-{
-    thread t([this]()
-    {
-        HINSTANCE hnd = _controller->loadDll(_dll);
-        if(hnd == 0)
-        {
-            ostringstream os;
-            os << "failed to load `" << _dll << "': error code: " << GetLastError();
-            print(os.str());
-            completed(EXIT_FAILURE);
-            return;
-        }
-
-        _dllTestShutdown = GetProcAddress(hnd, "dllTestShutdown");
-        if(_dllTestShutdown == 0)
-        {
-            print("failed to find dllTestShutdown function from `" + _dll + "'");
-            completed(EXIT_FAILURE);
-            return;
-        }
-
-        FARPROC sym = GetProcAddress(hnd, "dllMain");
-        if(sym == 0)
-        {
-            print("failed to find dllMain function from `" + _dll + "'");
-            completed(EXIT_FAILURE);
-            return;
-        }
-
-        MAIN_ENTRY_POINT dllMain = reinterpret_cast<MAIN_ENTRY_POINT>(sym);
-        char** argv = new char*[_args.size() + 1];
-        for(unsigned int i = 0; i < _args.size(); ++i)
-        {
-            argv[i] = const_cast<char*>(_args[i].c_str());
-        }
-        argv[_args.size()] = 0;
-        try
-        {
-            completed(dllMain(static_cast<int>(_args.size()), argv, this));
-        }
-        catch(const std::exception& ex)
-        {
-            print("unexpected exception while running `" + _args[0] + "':\n" + ex.what());
-            completed(EXIT_FAILURE);
-        }
-        catch(...)
-        {
-            print("unexpected unknown exception while running `" + _args[0] + "'");
-            completed(EXIT_FAILURE);
-        }
-        delete[] argv;
-    });
-    _thread = move(t);
-}
-
-void
-MainHelperI::join()
-{
-    _thread.join();
-}
-
-void
-MainHelperI::completed(int status)
-{
-    unique_lock<mutex> lock(_mutex);
-    _completed = true;
-    _status = status;
-    _condition.notify_all();
-}
-
-void
-MainHelperI::waitReady(int timeout) const
-{
-    unique_lock<mutex> lock(_mutex);
-    while(!_ready && !_completed)
-    {
-
-        if(_condition.wait_for(lock, chrono::seconds(timeout)) == cv_status::timeout)
-        {
-            throw ProcessFailedException("timed out waiting for the process to be ready");
-        }
-    }
-    if(_completed && _status == EXIT_FAILURE)
-    {
-        throw ProcessFailedException(_out.str());
-    }
-}
-
-int
-MainHelperI::waitSuccess(int timeout) const
-{
-    unique_lock<mutex> lock(_mutex);
-    while(!_completed)
-    {
-        if(_condition.wait_for(lock, chrono::seconds(timeout)) == cv_status::timeout)
-        {
-            throw ProcessFailedException("timed out waiting for the process to succeed");
-        }
-    }
-    return _status;
-}
-
-string
-MainHelperI::getOutput() const
-{
-    assert(_completed);
-    return _out.str();
-}
-
-ProcessI::ProcessI(ViewController^ controller, shared_ptr<MainHelperI> helper) : _controller(controller), _helper(helper)
-{
-}
-
-void
-ProcessI::waitReady(int timeout, const Ice::Current&)
-{
-    _helper->waitReady(timeout);
-}
-
-int
-ProcessI::waitSuccess(int timeout, const Ice::Current&)
-{
-    return _helper->waitSuccess(timeout);
-}
-
-string
-ProcessI::terminate(const Ice::Current& current)
-{
-    _helper->shutdown();
-    current.adapter->remove(current.id);
-    _helper->join();
-    return _helper->getOutput();
-}
-
-ProcessControllerI::ProcessControllerI(ViewController^ controller) :
-    _controller(controller),
-    _host(_controller->getHost())
-{
-}
-
-shared_ptr<ProcessPrx>
-ProcessControllerI::start(string testSuite, string exe, StringSeq args, const Ice::Current& c)
-{
-    ostringstream os;
-    os << "starting " << testSuite << " " << exe << "... ";
-    _controller->println(os.str());
-    replace(testSuite.begin(), testSuite.end(), '/', '_');
-    args.insert(args.begin(), testSuite + '_' + exe + ".dll");
-    auto helper = make_shared<MainHelperI>(_controller, testSuite + '_' + exe + ".dll", args);
-    helper->run();
-    return Ice::uncheckedCast<ProcessPrx>(c.adapter->addWithUUID(make_shared<ProcessI>(_controller, helper)));
-}
-
-string
-ProcessControllerI::getHost(string, bool, const Ice::Current&)
-{
-    return _host;
-}
-
-ControllerHelper::ControllerHelper(ViewController^ controller)
-{
-    Ice::InitializationData initData = Ice::InitializationData();
-    initData.properties = Ice::createProperties();
-    initData.properties->setProperty("Ice.ThreadPool.Client.SizeMax", "10");
-    initData.properties->setProperty("Ice.Default.Host", "127.0.0.1");
-    initData.properties->setProperty("Ice.Override.ConnectTimeout", "1000");
-    //initData.properties->setProperty("Ice.Trace.Network", "3");
-    //initData.properties->setProperty("Ice.Trace.Protocol", "1");
-    initData.properties->setProperty("ControllerAdapter.AdapterId", Ice::generateUUID());
-
-    _communicator = Ice::initialize(initData);
-
-    auto registry = Ice::uncheckedCast<ProcessControllerRegistryPrx>(
-        _communicator->stringToProxy("Util/ProcessControllerRegistry:tcp -h 127.0.0.1 -p 15001"));
-    Ice::ObjectAdapterPtr adapter = _communicator->createObjectAdapterWithEndpoints("ControllerAdapter", "");
-    Ice::Identity ident = { "ProcessController", "UWP"};
-    auto processController =
-        Ice::uncheckedCast<ProcessControllerPrx>(adapter->add(make_shared<ProcessControllerI>(controller), ident));
-    adapter->activate();
-
-    registerProcessController(controller, adapter, registry, processController);
-}
-
-void
-ControllerHelper::registerProcessController(ViewController^ controller,
-                                            const Ice::ObjectAdapterPtr& adapter,
-                                            const shared_ptr<ProcessControllerRegistryPrx>& registry,
-                                            const shared_ptr<ProcessControllerPrx>& processController)
-{
-    registry->ice_pingAsync(
-        [this, controller, adapter, registry, processController]()
-        {
-            auto connection = registry->ice_getCachedConnection();
-            connection->setAdapter(adapter);
-            connection->setACM(5, Ice::ACMClose::CloseOff, Ice::ACMHeartbeat::HeartbeatAlways);
-            connection->setCloseCallback([=](const shared_ptr<Ice::Connection>&)
-                {
-                    controller->println("connection with process controller registry closed");
-                    std::this_thread::sleep_for(2s);
-                    registerProcessController(controller, adapter, registry, processController);
-                });
-
-            registry->setProcessControllerAsync(processController, nullptr,
-                [controller](exception_ptr e)
-                {
-                    try
-                    {
-                        rethrow_exception(e);
-                    }
-                    catch(const Ice::CommunicatorDestroyedException&)
-                    {
-                    }
-                    catch(const std::exception& ex)
-                    {
-                        ostringstream os;
-                        os << "unexpected exception while connecting to process controller registry:\n" << ex.what();
-                        controller->println(os.str());
-                    }
-                });
-        },
-        [this, controller, adapter, registry, processController](exception_ptr e)
-        {
-            try
-            {
-                rethrow_exception(e);
-            }
-            catch(const Ice::ConnectFailedException&)
-            {
-                std::this_thread::sleep_for(2s);
-                registerProcessController(controller, adapter, registry, processController);
-            }
-            catch(const Ice::TimeoutException&)
-            {
-                std::this_thread::sleep_for(2s);
-                registerProcessController(controller, adapter, registry, processController);
-            }
-            catch(const Ice::CommunicatorDestroyedException&)
-            {
-            }
-            catch(const std::exception& ex)
-            {
-                ostringstream os;
-                os << "unexpected exception while connecting to process controller registry:\n" << ex.what();
-                controller->println(os.str());
-            }
-        });
-}
-
-ControllerHelper::~ControllerHelper()
-{
-    _communicator->destroy();
-}
-
-static ControllerHelper* controllerHelper = 0;
-
-ViewController::ViewController()
-{
-    InitializeComponent();
-    auto hostnames = NetworkInformation::GetHostNames();
-    ipv4Addresses->Items->Append("127.0.0.1");
-    for(unsigned int i = 0; i < hostnames->Size; ++i)
-    {
-        auto hostname = hostnames->GetAt(i);
-        if(hostname->Type == Windows::Networking::HostNameType::Ipv4)
-        {
-            ipv4Addresses->Items->Append(hostname->RawName);
-        }
-    }
-    ipv4Addresses->SelectedIndex = 0;
-}
-
-string
-ViewController::getHost() const
-{
-    return Ice::wstringToString(ipv4Addresses->SelectedItem->ToString()->Data());
-}
-
-void
-ViewController::Hostname_SelectionChanged(Platform::Object^, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^)
-{
-    if(controllerHelper)
-    {
-        delete controllerHelper;
-        controllerHelper = 0;
-    }
-    controllerHelper = new ControllerHelper(this);
-}
-
-void
-ViewController::println(const string& s)
-{
-    if(s.empty())
-    {
-        return;
-    }
-    this->Dispatcher->RunAsync(CoreDispatcherPriority::Normal, ref new DispatchedHandler(
-        [=]()
-        {
-            Output->Items->Append(ref new String(Ice::stringToWstring(s).c_str()));
-            Output->SelectedIndex = Output->Items->Size - 1;
-            Output->ScrollIntoView(Output->SelectedItem);
-        }));
-}
-
-HINSTANCE
-ViewController::loadDll(const string& name)
-{
-    unique_lock<mutex> lock(_mutex);
-    map<string, HINSTANCE>::iterator p = _dlls.find(name);
-    if(p == _dlls.end())
-    {
-        HINSTANCE hnd = LoadPackagedLibrary(Ice::stringToWstring(name).c_str(), 0);
-        p = _dlls.insert(make_pair(name, hnd)).first;
-    }
-    return p->second;
-}
-
-ViewController::~ViewController()
-{
-    if(controllerHelper)
-    {
-        delete controllerHelper;
-        controllerHelper = 0;
-    }
-}
diff -Nru zeroc-ice-3.7.1/cpp/test/uwp/controller/ViewController.xaml.h zeroc-ice-3.7.2/cpp/test/uwp/controller/ViewController.xaml.h
--- zeroc-ice-3.7.1/cpp/test/uwp/controller/ViewController.xaml.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/cpp/test/uwp/controller/ViewController.xaml.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#pragma once
-
-#include <ViewController.g.h>
-#include <collection.h>
-#include <map>
-#include <string>
-#include <memory>
-#include <mutex>
-
-namespace
-{
-class MainHelperI;
-class ProcessControllerI;
-class ControllerHelper;
-}
-
-namespace Controller
-{
-
-[Windows::Foundation::Metadata::WebHostHidden]
-public ref class ViewController sealed
-{
-public:
-
-    ViewController();
-    virtual ~ViewController();
-
-private:
-
-    friend class MainHelperI;
-    friend class ProcessControllerI;
-    friend class ControllerHelper;
-    HINSTANCE loadDll(const std::string&);
-    void unloadDll(const std::string&);
-    void println(const std::string&);
-    std::string getHost() const;
-    void Hostname_SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^ e);
-
-    std::map<std::string, HINSTANCE> _dlls;
-    std::mutex _mutex;
-};
-
-}
diff -Nru zeroc-ice-3.7.1/csharp/allTests.py zeroc-ice-3.7.2/csharp/allTests.py
--- zeroc-ice-3.7.1/csharp/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/csharp/Directory.Build.props zeroc-ice-3.7.2/csharp/Directory.Build.props
--- zeroc-ice-3.7.1/csharp/Directory.Build.props	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/Directory.Build.props	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">netcoreapp2.1</AppTargetFramework>
+    </PropertyGroup>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/Makefile zeroc-ice-3.7.2/csharp/Makefile
--- zeroc-ice-3.7.1/csharp/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 all:
 	dotnet msbuild msbuild/ice.proj /m
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/iceboxnet.exe.config.release zeroc-ice-3.7.2/csharp/msbuild/iceboxnet.exe.config.release
--- zeroc-ice-3.7.1/csharp/msbuild/iceboxnet.exe.config.release	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/iceboxnet.exe.config.release	2019-02-05 18:03:04.000000000 +0000
@@ -4,11 +4,13 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Ice"  culture="neutral" publicKeyToken="@PublicKeyToken@"/>
-        <codeBase version="3.7.1.0" href="@AssemblyDir@\Ice.dll"/>
+        <codeBase version="3.7.2.0" href="@AssemblyDir@\Ice.dll"/>
+        <bindingRedirect oldVersion="3.7.0.0-3.7.1.0" newVersion="3.7.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="IceBox"  culture="neutral" publicKeyToken="@PublicKeyToken@"/>
-        <codeBase version="3.7.1.0" href="@AssemblyDir@\IceBox.dll"/>
+        <codeBase version="3.7.2.0" href="@AssemblyDir@\IceBox.dll"/>
+        <bindingRedirect oldVersion="3.7.0.0-3.7.1.0" newVersion="3.7.2.0" />
       </dependentAssembly>
       <!--
            This allows iceboxnet to load the IceSSL plug-in using a strong name. We omit the
@@ -17,7 +19,8 @@
       -->
       <dependentAssembly>
         <assemblyIdentity name="IceSSL"/>
-        <codeBase version="3.7.1.0" href="@AssemblyDir@\IceSSL.dll"/>
+        <codeBase version="3.7.2.0" href="@AssemblyDir@\IceSSL.dll"/>
+        <bindingRedirect oldVersion="3.7.0.0-3.7.1.0" newVersion="3.7.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/ice.common.props zeroc-ice-3.7.2/csharp/msbuild/ice.common.props
--- zeroc-ice-3.7.1/csharp/msbuild/ice.common.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/ice.common.props	2019-02-05 18:03:04.000000000 +0000
@@ -2,9 +2,9 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- Required for the project configurations to show up in settings editor -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Any CPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Any CPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
   </PropertyGroup>
 
   <PropertyGroup>
@@ -34,12 +34,17 @@
           <Choose>
               <When Condition="'$(OS)' == 'Windows_NT'">
                   <Choose>
-                      <When Condition="Exists('$(IceHome)\cpp\bin\x64\$(Configuration)')">
+                      <When Condition="Exists('$(IceHome)\cpp\bin\$(CppPlatform)\$(Configuration)\slice2cs.exe')">
+                          <PropertyGroup>
+                              <IceToolsPath>$(IceHome)\cpp\bin\$(CppPlatform)\$(Configuration)</IceToolsPath>
+                          </PropertyGroup>
+                      </When>
+                      <When Condition="Exists('$(IceHome)\cpp\bin\x64\$(Configuration)\slice2cs.exe')">
                           <PropertyGroup>
                               <IceToolsPath>$(IceHome)\cpp\bin\x64\$(Configuration)</IceToolsPath>
                           </PropertyGroup>
                       </When>
-                      <When Condition="Exists('$(IceHome)\cpp\bin\Win32\$(Configuration)')">
+                      <When Condition="Exists('$(IceHome)\cpp\bin\Win32\$(Configuration)\slice2cs.exe')">
                           <PropertyGroup>
                               <IceToolsPath>$(IceHome)\cpp\bin\Win32\$(Configuration)</IceToolsPath>
                           </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/ice.net45.test.sln zeroc-ice-3.7.2/csharp/msbuild/ice.net45.test.sln
--- zeroc-ice-3.7.1/csharp/msbuild/ice.net45.test.sln	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/ice.net45.test.sln	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ice", "Ice", "{484370F6-E5AC-4355-8667-4E4E79CEF6FE}"
 EndProject
@@ -65,7 +65,7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "..\test\Ice\dictMapping\msbuild\server\net45\server.csproj", "{85C22F42-368F-451B-BA88-C1983290459F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "serveramd", "..\test\Ice\dictMapping\msbuild\serveramd\net45\serveramd.csproj", "{7633BEAC-89D4-4DC8-9148-583039550610}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "serveramd", "..\test\Ice\dictMapping\msbuild\serveramd\net45\serveramd.csproj", "{7633BEAC-89D4-4DC8-9148-583039000000}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dispatcher", "dispatcher", "{6384544E-257A-4BE3-9A5B-5CAFC5CDAF71}"
 EndProject
@@ -399,6 +399,18 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Ice\logger\msbuild\client\net45\client.csproj", "{0DEFD2EE-77CF-48AA-B67F-B9B84BDD301A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scope", "scope", "{F6EE8CEA-A87E-48C0-9840-A5E3D3C4C51D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Ice\scope\msbuild\client\net45\client.csproj", "{EDF26324-B301-4C47-975E-CD9C3FDE3D50}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "..\test\Ice\scope\msbuild\server\net45\server.csproj", "{81A5EA86-74C3-45BD-B04E-FB21983302F2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "namespacemd", "namespacemd", "{1B87FBB5-12E7-41D8-9135-9D00544508C8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Ice\namespacemd\msbuild\client\net45\client.csproj", "{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "..\test\Ice\namespacemd\msbuild\server\net45\server.csproj", "{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -649,18 +661,18 @@
 		{85C22F42-368F-451B-BA88-C1983290459F}.Release|x64.Build.0 = Release|x64
 		{85C22F42-368F-451B-BA88-C1983290459F}.Release|x86.ActiveCfg = Release|Win32
 		{85C22F42-368F-451B-BA88-C1983290459F}.Release|x86.Build.0 = Release|Win32
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Debug|x64.ActiveCfg = Debug|x64
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Debug|x64.Build.0 = Debug|x64
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Debug|x86.ActiveCfg = Debug|Win32
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Debug|x86.Build.0 = Debug|Win32
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Release|x64.ActiveCfg = Release|x64
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Release|x64.Build.0 = Release|x64
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Release|x86.ActiveCfg = Release|Win32
-		{7633BEAC-89D4-4DC8-9148-583039550610}.Release|x86.Build.0 = Release|Win32
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Debug|x64.ActiveCfg = Debug|x64
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Debug|x64.Build.0 = Debug|x64
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Debug|x86.ActiveCfg = Debug|Win32
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Debug|x86.Build.0 = Debug|Win32
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Release|x64.ActiveCfg = Release|x64
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Release|x64.Build.0 = Release|x64
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Release|x86.ActiveCfg = Release|Win32
+		{7633BEAC-89D4-4DC8-9148-583039000000}.Release|x86.Build.0 = Release|Win32
 		{4516442E-BB9C-4FED-ADE9-FD6464C872B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4516442E-BB9C-4FED-ADE9-FD6464C872B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4516442E-BB9C-4FED-ADE9-FD6464C872B0}.Debug|x64.ActiveCfg = Debug|x64
@@ -1993,6 +2005,54 @@
 		{0DEFD2EE-77CF-48AA-B67F-B9B84BDD301A}.Release|x64.Build.0 = Release|x64
 		{0DEFD2EE-77CF-48AA-B67F-B9B84BDD301A}.Release|x86.ActiveCfg = Release|Win32
 		{0DEFD2EE-77CF-48AA-B67F-B9B84BDD301A}.Release|x86.Build.0 = Release|Win32
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Debug|x64.ActiveCfg = Debug|x64
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Debug|x64.Build.0 = Debug|x64
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Debug|x86.ActiveCfg = Debug|Win32
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Debug|x86.Build.0 = Debug|Win32
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Release|x64.ActiveCfg = Release|x64
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Release|x64.Build.0 = Release|x64
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Release|x86.ActiveCfg = Release|Win32
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50}.Release|x86.Build.0 = Release|Win32
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Debug|x64.ActiveCfg = Debug|x64
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Debug|x64.Build.0 = Debug|x64
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Debug|x86.ActiveCfg = Debug|Win32
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Debug|x86.Build.0 = Debug|Win32
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Release|x64.ActiveCfg = Release|x64
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Release|x64.Build.0 = Release|x64
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Release|x86.ActiveCfg = Release|Win32
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2}.Release|x86.Build.0 = Release|Win32
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Debug|x64.ActiveCfg = Debug|x64
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Debug|x64.Build.0 = Debug|x64
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Debug|x86.ActiveCfg = Debug|Win32
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Debug|x86.Build.0 = Debug|Win32
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Release|x64.ActiveCfg = Release|x64
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Release|x64.Build.0 = Release|x64
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Release|x86.ActiveCfg = Release|Win32
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}.Release|x86.Build.0 = Release|Win32
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Debug|x64.ActiveCfg = Debug|x64
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Debug|x64.Build.0 = Debug|x64
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Debug|x86.ActiveCfg = Debug|Win32
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Debug|x86.Build.0 = Debug|Win32
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Release|x64.ActiveCfg = Release|x64
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Release|x64.Build.0 = Release|x64
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Release|x86.ActiveCfg = Release|Win32
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2028,7 +2088,7 @@
 		{2381FF65-ECFF-47A2-B46E-251CD63C2049} = {6C78B6E3-67EC-4B59-922F-5D1352BDE282}
 		{7FC1FB01-A532-4080-9279-AFC04CC831AA} = {6C78B6E3-67EC-4B59-922F-5D1352BDE282}
 		{85C22F42-368F-451B-BA88-C1983290459F} = {6C78B6E3-67EC-4B59-922F-5D1352BDE282}
-		{7633BEAC-89D4-4DC8-9148-583039550610} = {6C78B6E3-67EC-4B59-922F-5D1352BDE282}
+		{7633BEAC-89D4-4DC8-9148-583039000000} = {6C78B6E3-67EC-4B59-922F-5D1352BDE282}
 		{6384544E-257A-4BE3-9A5B-5CAFC5CDAF71} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE}
 		{4516442E-BB9C-4FED-ADE9-FD6464C872B0} = {6384544E-257A-4BE3-9A5B-5CAFC5CDAF71}
 		{C8D7663E-AA76-43AE-B3F5-304F11DB9138} = {6384544E-257A-4BE3-9A5B-5CAFC5CDAF71}
@@ -2188,5 +2248,14 @@
 		{D3D00FEC-1F86-4072-AF46-4B658DA407EE} = {9F6CB750-59D9-4806-9BDA-FB1FB688C19D}
 		{2B125DAA-60E8-4236-81FE-D8131FF746CA} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE}
 		{0DEFD2EE-77CF-48AA-B67F-B9B84BDD301A} = {2B125DAA-60E8-4236-81FE-D8131FF746CA}
+		{F6EE8CEA-A87E-48C0-9840-A5E3D3C4C51D} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE}
+		{EDF26324-B301-4C47-975E-CD9C3FDE3D50} = {F6EE8CEA-A87E-48C0-9840-A5E3D3C4C51D}
+		{81A5EA86-74C3-45BD-B04E-FB21983302F2} = {F6EE8CEA-A87E-48C0-9840-A5E3D3C4C51D}
+		{1B87FBB5-12E7-41D8-9135-9D00544508C8} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE}
+		{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29} = {1B87FBB5-12E7-41D8-9135-9D00544508C8}
+		{D8F04A5C-9692-4A62-93BD-81483EBEA8F5} = {1B87FBB5-12E7-41D8-9135-9D00544508C8}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {15DF2743-037C-4EFD-A711-205BC13C746F}
 	EndGlobalSection
 EndGlobal
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/ice.netstandard2.0.test.sln zeroc-ice-3.7.2/csharp/msbuild/ice.netstandard2.0.test.sln
--- zeroc-ice-3.7.1/csharp/msbuild/ice.netstandard2.0.test.sln	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/ice.netstandard2.0.test.sln	2019-02-05 18:03:04.000000000 +0000
@@ -758,6 +758,18 @@
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Slice\escape\msbuild\client\netstandard2.0\client.csproj", "{E6DC2FC3-3949-49B2-9AE1-F48BE3D70C4E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scope", "scope", "{A1152815-0E00-4E4C-B13E-E466550D83AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\scope\msbuild\client\netstandard2.0\client.csproj", "{B4061AF6-374C-4011-9CE7-B9D69F106317}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server", "..\test\Ice\scope\msbuild\server\netstandard2.0\server.csproj", "{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "namespacemd", "namespacemd", "{2988E030-1F8E-490B-B8A3-D1F02073500A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\namespacemd\msbuild\client\netstandard2.0\client.csproj", "{C56E9BC5-37E6-4001-A45C-D11E64C7385E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server", "..\test\Ice\namespacemd\msbuild\server\netstandard2.0\server.csproj", "{33983EDC-CF67-4697-81D4-AA5337733FE0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2304,6 +2316,54 @@
 		{E6DC2FC3-3949-49B2-9AE1-F48BE3D70C4E}.Release|x64.Build.0 = Release|Any CPU
 		{E6DC2FC3-3949-49B2-9AE1-F48BE3D70C4E}.Release|x86.ActiveCfg = Release|Any CPU
 		{E6DC2FC3-3949-49B2-9AE1-F48BE3D70C4E}.Release|x86.Build.0 = Release|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Release|x64.Build.0 = Release|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4061AF6-374C-4011-9CE7-B9D69F106317}.Release|x86.Build.0 = Release|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Release|x64.Build.0 = Release|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA}.Release|x86.Build.0 = Release|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Debug|x64.Build.0 = Debug|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Debug|x86.Build.0 = Debug|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Release|x64.ActiveCfg = Release|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Release|x64.Build.0 = Release|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E}.Release|x86.Build.0 = Release|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Debug|x64.Build.0 = Debug|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Debug|x86.Build.0 = Debug|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Release|x64.ActiveCfg = Release|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Release|x64.Build.0 = Release|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Release|x86.ActiveCfg = Release|Any CPU
+		{33983EDC-CF67-4697-81D4-AA5337733FE0}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2686,6 +2746,12 @@
 		{D7715309-9BCF-4025-BFEF-5FF12D16E9FF} = {AAA333D5-68CA-471F-ACCB-F1A68656D1D4}
 		{072A9C19-7C42-4C37-B919-A591DF07103C} = {D7715309-9BCF-4025-BFEF-5FF12D16E9FF}
 		{E6DC2FC3-3949-49B2-9AE1-F48BE3D70C4E} = {072A9C19-7C42-4C37-B919-A591DF07103C}
+		{A1152815-0E00-4E4C-B13E-E466550D83AB} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25}
+		{B4061AF6-374C-4011-9CE7-B9D69F106317} = {A1152815-0E00-4E4C-B13E-E466550D83AB}
+		{F67DF0EA-3830-4D17-B60B-0F6BAD76AEAA} = {A1152815-0E00-4E4C-B13E-E466550D83AB}
+		{2988E030-1F8E-490B-B8A3-D1F02073500A} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25}
+		{C56E9BC5-37E6-4001-A45C-D11E64C7385E} = {2988E030-1F8E-490B-B8A3-D1F02073500A}
+		{33983EDC-CF67-4697-81D4-AA5337733FE0} = {2988E030-1F8E-490B-B8A3-D1F02073500A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {647B3637-5175-460B-86AA-95BBD22CDE63}
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/ice.nuget.targets zeroc-ice-3.7.2/csharp/msbuild/ice.nuget.targets
--- zeroc-ice-3.7.1/csharp/msbuild/ice.nuget.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/ice.nuget.targets	2019-02-05 18:03:04.000000000 +0000
@@ -5,14 +5,14 @@
 
     <!-- For CSharp we use Slice compiler from x64 Release builds -->
     <ItemGroup>
-        <SliceCompilers Include="$(IceSrcRootDir)..\cpp\bin\x64\Release\slice2cs.exe;
-                                 $(IceSrcRootDir)..\cpp\bin\x64\Release\slice2html.exe" />
+        <SliceCompilers Include="$(IceSrcRootDir)..\cpp\bin\$(CppPlatform)\$(Configuration)\slice2cs.exe;
+                                 $(IceSrcRootDir)..\cpp\bin\$(CppPlatform)\$(Configuration)\slice2html.exe" />
 
         <!-- With .Net Core we have to pack the dependencies next iceboxnet.dll  -->
         <IceBoxNet45 Include="$(IceSrcRootDir)bin\net45\iceboxnet.exe;
                               $(IceSrcRootDir)bin\net45\iceboxnet.pdb"/>
 
-        <IceBoxNetStandard Include="$(IceSrcRootDir)bin\netcoreapp2.0\publish\*"
+        <IceBoxNetStandard Include="$(IceSrcRootDir)bin\netcoreapp2.1\publish\*"
                            Condition="'$(BuildNetStandardTargets)' == 'true'"/>
 
         <Assemblies Include="$(IceSrcRootDir)lib\**\*.dll;
@@ -30,7 +30,7 @@
         <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)"/>
         <Copy SourceFiles="@(SliceCompilers)" DestinationFolder="$(PackageDirectory)\tools"/>
         <Copy SourceFiles="@(IceBoxNet45)" DestinationFolder="$(PackageDirectory)\tools\net45"/>
-        <Copy SourceFiles="@(IceBoxNetStandard)" DestinationFolder="$(PackageDirectory)\tools\netcoreapp2.0"
+        <Copy SourceFiles="@(IceBoxNetStandard)" DestinationFolder="$(PackageDirectory)\tools\netcoreapp2.1"
               Condition="'$(BuildNetStandardTargets)' == 'true'"/>
     </Target>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/ice.proj zeroc-ice-3.7.2/csharp/msbuild/ice.proj
--- zeroc-ice-3.7.1/csharp/msbuild/ice.proj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/ice.proj	2019-02-05 18:03:04.000000000 +0000
@@ -2,14 +2,20 @@
     <PropertyGroup Condition="'$(Configuration)' == ''">
         <Configuration>Release</Configuration>
     </PropertyGroup>
-
-    <PropertyGroup Condition="'$(IceTestsTargetFrameworks)' == ''">
-        <IceTestsTargetFrameworks>netcoreapp2.0</IceTestsTargetFrameworks>
+    <PropertyGroup>
+        <CppPlatform Condition="'$(Platform)' == 'x64'">x64</CppPlatform>
+        <CppPlatform Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'Win32'">Win32</CppPlatform>
+
+        <UwpPlatform Condition="'$(Platform)' == 'x64'">x64</UwpPlatform>
+        <UwpPlatform Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'Win32'">x86</UwpPlatform>
+
+        <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</DefaultPlatformToolset>
+        <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</DefaultPlatformToolset>
+        <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</DefaultPlatformToolset>
+        <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v141</DefaultPlatformToolset>
     </PropertyGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\icebuilder.props" />
-    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"
-            Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props')"/>
 
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\ice.common.targets" />
 
@@ -17,9 +23,9 @@
       <Exec Command="rmdir /s /q $(MSBuildThisFileDirectory)packages" Condition="Exists('$(MSBuildThisFileDirectory)packages')" />
     </Target>
 
-    <!-- NET Standard on Windows requires Visual Studio 2017 -->
+    <!-- NET Standard on Windows requires Visual Studio 2017 or Visual Studio 2019 -->
     <Choose>
-        <When Condition="'$(DefaultPlatformToolset)' == 'v141' or '$(OS)' != 'Windows_NT'">
+        <When Condition="'$(VisualStudioVersion)' == '15.0' or '$(VisualStudioVersion)' == '16.0' or '$(OS)' != 'Windows_NT'">
             <PropertyGroup>
                 <BuildNetStandardTargets>true</BuildNetStandardTargets>
             </PropertyGroup>
@@ -33,7 +39,7 @@
 
     <!-- Targets required to build Slice compilers -->
     <Choose>
-        <When Condition="'$(DefaultPlatformToolset)' == 'v120' or '$(OS)' != 'Windows_NT'">
+        <When Condition="'$(MSBuildToolsVersion)' == '12.0' or '$(OS)' != 'Windows_NT'">
             <ItemGroup>
                 <SliceCompilers Include="slice2cs;slice2html"/>
             </ItemGroup>
@@ -55,7 +61,7 @@
         <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"
                  Targets="@(SliceCompilers)"
                  BuildInParallel="true"
-                 Properties="Platform=$(Platform);Configuration=$(Configuration)"
+                 Properties="Platform=$(CppPlatform);Configuration=$(Configuration)"
                  Condition="'$(OS)' == 'Windows_NT'"/>
 
         <Exec Command="make @(SliceCompilers->'%(Identity)', ' ')"
@@ -66,20 +72,20 @@
     <ItemGroup>
         <!-- .NET 4.5 Solution files -->
         <Net45DistSolution Include="ice.net45.sln">
-          <Properties>Configuration=$(Configuration);Platform=Any CPU</Properties>
+          <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
         </Net45DistSolution>
 
         <Net45TestSolution Include="ice.net45.test.sln">
-          <Properties>Configuration=$(Configuration);Platform=Any CPU</Properties>
+          <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
         </Net45TestSolution>
 
         <!-- .NET Standard Solution files -->
         <NetStandardDistSolution Include="ice.netstandard2.0.sln">
-          <Properties>Configuration=$(Configuration);Platform=Any CPU</Properties>
+          <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
         </NetStandardDistSolution>
 
         <NetStandardTestSolution Include="ice.netstandard2.0.test.sln">
-          <Properties>Configuration=$(Configuration);Platform=Any CPU;IceTestsTargetFrameworks=$(IceTestsTargetFrameworks)</Properties>
+          <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
         </NetStandardTestSolution>
     </ItemGroup>
 
@@ -140,7 +146,6 @@
     </Target>
 
     <!-- NET Standard Targets -->
-
     <Target Name="NuGetRestoreNetStandardDist"
             Condition="'$(ICE_BIN_DIST)' != 'all' and '$(BuildNetStandardTargets)' == 'true'">
         <MSBuild Projects="@(NetStandardDistSolution)"
@@ -223,16 +228,20 @@
         <RemoveDir Directories="zeroc.ice.net" />
 
         <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBox\msbuild\icebox\netstandard2.0\icebox.csproj"
-                 Properties="Configuration=$(Configuration);Platform=Any CPU;TargetFramework=netcoreapp2.0"
+                 Properties="Configuration=$(Configuration);Platform=Any CPU"
                  Targets="Publish"
                  Condition="'$(BuildNetStandardTargets)' == 'true'"/>
 
         <MSBuild Projects="ice.nuget.targets"
-                 Properties="PackageDirectory=zeroc.ice.net;BuildNetStandardTargets=$(BuildNetStandardTargets)"/>
+                 Properties="PackageDirectory=zeroc.ice.net;BuildNetStandardTargets=$(BuildNetStandardTargets);
+                             CppPlatform=$(CppPlatform);Configuration=$(Configuration)"/>
 
         <Copy SourceFiles="zeroc.ice.net.nuspec"
               DestinationFolder="zeroc.ice.net" />
 
+        <Copy SourceFiles="$(MSBuildThisFileDirectory)THIRD_PARTY_LICENSE.txt"
+              DestinationFiles="zeroc.ice.net\THIRD_PARTY_LICENSE.txt" />
+
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE"
               DestinationFiles="zeroc.ice.net\ICE_LICENSE.txt" />
 
@@ -261,7 +270,7 @@
 
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.dll;
                            $(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.pdb"
-              DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp2.0"
+              DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp2.1"
               Condition="'$(BuildNetStandardTargets)' == 'true'"/>
 
         <Copy SourceFiles="zeroc.ice.net.props"
@@ -275,7 +284,7 @@
         <RemoveDir Directories="zeroc.ice.net" />
 
         <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBox\msbuild\icebox\netstandard2.0\icebox.csproj"
-                 Properties="Configuration=$(Configuration);Platform=Any CPU;TargetFramework=netcoreapp2.0"
+                 Properties="Configuration=$(Configuration);Platform=Any CPU"
                  Targets="Publish"/>
         <MSBuild Projects="zeroc.ice.net.csproj" Targets="Restore;Pack"/>
         <RemoveDir Directories="obj"/>
@@ -285,4 +294,42 @@
     <Target Name="NuGetPack"
             DependsOnTargets="WindowsNuGetPack;UnixNuGetPack">
     </Target>
+
+    <!-- UWP Xamarin Builds -->
+    <Target Name="UWPXamarinBuild" DependsOnTargets="BuildNetStandardDist" Condition="'$(OS)' == 'Windows_NT'">
+        <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.xamarin.test.sln" />
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\test\xamarin\controller.UWP\controller.UWP.csproj"
+                 Properties="Configuration=$(Configuration);Platform=$(UWPPlatform)"/>
+    </Target>
+
+    <!-- Android Xamarin Builds -->
+    <Target Name="AndroidXamarinBuildOnWindows" DependsOnTargets="BuildNetStandardDist" Condition="'$(OS)' == 'Windows_NT'">
+        <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.xamarin.test.sln" />
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\test\xamarin\controller.Android\controller.Android.csproj"
+                 Properties="Configuration=$(Configuration);Platform=AnyCPU"
+                 Targets="SignAndroidPackage"/>
+    </Target>
+
+    <Target Name="AndroidXamarinBuildOnMac" DependsOnTargets="" Condition="'$(OS)' == 'Unix'">
+        <!-- We use exec to build the distribution instead of adding it to the DependsOnTargets as we have to use
+             "dotnet msbuid" to build the distribution and "msbuild" from Visual Studio to build the test controller -->
+        <Exec Command="dotnet msbuild $(MSBuildThisFileDirectory)ice.proj /t:BuildDist" />
+        <Exec Command="nuget restore $(MSBuildThisFileDirectory)ice.xamarin.test.sln" />
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\test\xamarin\controller.Android\controller.Android.csproj"
+                 Properties="Configuration=$(Configuration);Platform=AnyCPU"
+                 Targets="SignAndroidPackage"/>
+    </Target>
+
+    <Target Name="AndroidXamarinBuild" DependsOnTargets="AndroidXamarinBuildOnWindows;AndroidXamarinBuildOnMac"/>
+
+    <!-- iOS Xamarin Builds -->
+    <Target Name="iOSXamarinBuild" Condition="'$(OS)' == 'Unix'">
+        <!-- We use exec to build the distribution instead of adding it to the DependsOnTargets as we have to use
+             "dotnet msbuid" to build the distribution and "msbuild" from Visual Studio to build the test controller -->
+        <Exec Command="dotnet msbuild $(MSBuildThisFileDirectory)ice.proj /t:BuildDist" />
+        <Exec Command="nuget restore $(MSBuildThisFileDirectory)ice.xamarin.test.sln" />
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\test\xamarin\controller.iOS\controller.iOS.csproj"
+                 Properties="Configuration=$(Configuration)"/>
+    </Target>
+
 </Project>
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/msbuild/ice-release-key.snk and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/msbuild/ice-release-key.snk differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/msbuild/ice-release-pub-key.snk and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/msbuild/ice-release-pub-key.snk differ
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/ice.sign.targets zeroc-ice-3.7.2/csharp/msbuild/ice.sign.targets
--- zeroc-ice-3.7.1/csharp/msbuild/ice.sign.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/ice.sign.targets	2019-02-05 18:03:04.000000000 +0000
@@ -4,24 +4,23 @@
     <TimeStampServer>http://timestamp.digicert.com</TimeStampServer>
     <SignCommandSHA1>signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(TimeStampServer)</SignCommandSHA1>
     <SignCommandSHA256>signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /tr $(TimeStampServer) /td sha256 /fd sha256 /as</SignCommandSHA256>
-    <SignTarget>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</SignTarget>
   </PropertyGroup>
 
   <Target Name="SignPackage" AfterTargets="AfterCompile"
-          Condition="Exists('$(SIGN_CERTIFICATE)') and (!Exists('$(IntermediateOutputPath)sign.log') or $([System.IO.File]::GetLastWriteTime('$(SignTarget)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)sign.log').Ticks))">
-    <Message Text="Signing $(SignTarget)" />
+          Condition="'$(OS)' == 'Windows_NT' and Exists('$(SIGN_CERTIFICATE)') and (!Exists('$(IntermediateOutputPath)sign.log') or $([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)$(TargetName)$(TargetExt)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)sign.log').Ticks))">
+    <Message Text="Signing $(IntermediateOutputPath)$(TargetName)$(TargetExt)" />
 
-    <Exec Command="$(SignCommandSHA1) $(SignTarget)" EchoOff="yes"/>
-    <Exec Command="$(SignCommandSHA256) $(SignTarget)" EchoOff="yes"
+    <Exec Command="$(SignCommandSHA1) &quot;$(IntermediateOutputPath)$(TargetName)$(TargetExt)&quot;" EchoOff="yes"/>
+    <Exec Command="$(SignCommandSHA256) &quot;$(IntermediateOutputPath)$(TargetName)$(TargetExt)&quot;" EchoOff="yes"
           Condition="'$(DefaultPlatformToolset)' != 'v100'"/>
 
     <WriteLinesToFile File                = "$(IntermediateOutputPath)sign.log"
                       Encoding            = "Unicode"
                       Overwrite           = "true"
-                      Lines               = "Signing $(SignTarget)"/>
+                      Lines               = "Signing $(IntermediateOutputPath)$(TargetName)$(TargetExt)"/>
   </Target>
 
-  <Target Name="SignPackageClean" AfterTargets="Clean">
+  <Target Name="SignPackageClean" AfterTargets="Clean" Condition="'$(OS)' == 'Windows_NT' ">
      <Delete Files="$(IntermediateOutputPath)sign.log" />
   </Target>
 
@@ -38,11 +37,13 @@
 
   <!-- If both KEYFILE and PUBLIC_KEYFILE are set we re-sign the assembly using KEYFILE after it has been build -->
   <Target Name="StrongNameSignPackage" BeforeTargets="SignPackage"
-          Condition="'$(KEYFILE)' != '' And '$(PUBLIC_KEYFILE)' != '' and (!Exists('$(IntermediateOutputPath)strongname.sign.log') or $([System.IO.File]::GetLastWriteTime('$(SignTarget)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)strongname.sign.log').Ticks))">
-    <Exec Command="sn -Ra $(SignTarget) $(KEYFILE)"/>
-    <WriteLinesToFile File                = "$(IntermediateOutputPath)strongname.sign.log"
-                      Encoding            = "Unicode"
-                      Overwrite           = "true"
-                      Lines               = "Signing $(SignTarget)"/>
+          Condition="'$(OS)' == 'Windows_NT' and '$(KEYFILE)' != '' and '$(PUBLIC_KEYFILE)' != '' and (!Exists('$(IntermediateOutputPath)strongname.sign.log') or $([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)$(TargetName)$(TargetExt)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)strongname.sign.log').Ticks))">
+      <Message Text="IntermediateOutputPath: $(IntermediateOutputPath)"/>
+      <Message Text="TargetName: $(TargetName)$(TargetExt)"/>
+      <Exec Command="sn -Ra &quot;$(IntermediateOutputPath)$(TargetName)$(TargetExt)&quot; &quot;$(KEYFILE)&quot;"/>
+      <WriteLinesToFile File                = "$(IntermediateOutputPath)strongname.sign.log"
+                        Encoding            = "Unicode"
+                        Overwrite           = "true"
+                        Lines               = "Signing $(IntermediateOutputPath)$(TargetName)$(TargetExt)"/>
   </Target>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/ice.xamarin.test.sln zeroc-ice-3.7.2/csharp/msbuild/ice.xamarin.test.sln
--- zeroc-ice-3.7.1/csharp/msbuild/ice.xamarin.test.sln	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/ice.xamarin.test.sln	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,2122 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "controller.Android", "..\test\xamarin\controller.Android\controller.Android.csproj", "{62B1BE59-435A-480B-8807-03A42623BA1A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "controller.iOS", "..\test\xamarin\controller.iOS\controller.iOS.csproj", "{FD70EC29-8D51-4F4F-8AD7-64170F22575D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "controller.UWP", "..\test\xamarin\controller.UWP\controller.UWP.csproj", "{00218ACB-5695-4935-BAE1-F47B13989E9B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "controller", "..\test\xamarin\controller\controller.csproj", "{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testcommon", "..\test\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj", "{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FDF2D71D-81F6-4D9F-A1B2-811399CA98B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ice", "Ice", "{484E315B-A0A7-4BB5-8128-02DA7708E3DE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "acm", "acm", "{B45B0A8F-AA7F-4E19-8B07-DEE60CCC0426}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\acm\msbuild\test\netstandard2.0\test.csproj", "{F98C37DC-6484-4958-8D70-BD941A2F8F33}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "adapterDeactivation", "adapterDeactivation", "{1972D071-B981-43F3-8171-F268F57AB1A0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\adapterDeactivation\msbuild\test\netstandard2.0\test.csproj", "{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ami", "ami", "{38CCD9BB-576F-4DB3-9928-756D4FD73CBE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\ami\msbuild\test\netstandard2.0\test.csproj", "{F949076A-E4E8-4662-8099-211F47199863}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "binding", "binding", "{3758776C-A23F-4FDA-A406-2354908A3E43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\binding\msbuild\test\netstandard2.0\test.csproj", "{723D6742-BFAC-4265-84C5-60EB6AB60A2C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{722AB792-C978-4633-A82A-02781EA97ECD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\checksum\msbuild\test\netstandard2.0\test.csproj", "{0205DBD3-3A5C-4342-B511-79439D4A7801}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "defaultServant", "defaultServant", "{552AB952-499C-4B62-9F09-90BAA194FBE1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\defaultServant\msbuild\test\netstandard2.0\test.csproj", "{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "defaultValue", "defaultValue", "{816AF508-01A3-4B01-A699-949F65B25446}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\defaultValue\msbuild\test\netstandard2.0\test.csproj", "{53E8D95F-DB44-4E2C-A081-99DE5B37F287}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dictMapping", "dictMapping", "{8EB84516-E587-4EC1-B59E-5DABF47A5C40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\dictMapping\msbuild\test\netstandard2.0\test.csproj", "{23B0209F-89D7-40D3-BC3B-341828929087}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "enums", "enums", "{7FD1EE11-6DF7-4C05-B24A-B69D138B9769}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\enums\msbuild\test\netstandard2.0\test.csproj", "{D44F7836-C10D-4470-975B-A09EF73B90B2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "exceptions", "exceptions", "{F26F29C8-30CA-4261-AA5B-9F61B252FE8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\exceptions\msbuild\test\netstandard2.0\test.csproj", "{12A3579A-2082-46DB-902F-6377F722E1E7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "facets", "facets", "{D43387B9-67C0-48EA-BA5F-7DF77FECC623}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\facets\msbuild\test\netstandard2.0\test.csproj", "{D57CAED3-8E65-40B1-AB3C-439E17CCB883}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hold", "hold", "{562E233D-EF39-43B1-A2A1-509BB5C85481}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\hold\msbuild\test\netstandard2.0\test.csproj", "{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "info", "info", "{E5098B39-C3C4-443D-9659-6439B66BF7CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\info\msbuild\test\netstandard2.0\test.csproj", "{52E684CF-8511-4998-9DC9-A9EF4C06DD66}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "inheritance", "inheritance", "{521E4159-10F6-42F1-91CD-04039065F2B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\inheritance\msbuild\test\netstandard2.0\test.csproj", "{D08551B3-2CF2-4F33-A901-76850D3575A3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "interceptor", "interceptor", "{0C5BC375-D9B0-406C-BB6A-CFE7A7643F30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\interceptor\msbuild\test\netstandard2.0\test.csproj", "{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "invoke", "invoke", "{260EAF61-B212-4E69-8FA4-BB0819CAEDD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\invoke\msbuild\test\netstandard2.0\test.csproj", "{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "location", "location", "{6A8E1B61-4331-4865-9575-9507690EEA42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\location\msbuild\test\netstandard2.0\test.csproj", "{1951FEA6-8C7B-453D-9856-B4C50FF12075}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "objects", "objects", "{4D7539A2-A109-4C87-B392-33B7C864BF20}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\objects\msbuild\test\netstandard2.0\test.csproj", "{14183942-5E4A-4C85-9A22-EF3304B225D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "operations", "operations", "{612D4D4A-4056-4A7B-A9B6-F01264852C23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\operations\msbuild\test\netstandard2.0\test.csproj", "{AA1A3A35-D870-438C-8D21-A78211B7059A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "optional", "optional", "{153D4FEE-25AD-4182-AB53-C7F24861CCD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\optional\msbuild\test\netstandard2.0\test.csproj", "{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "namespacemd", "namespacemd", "{76132143-9859-4F3C-9AB5-24E9905CAB77}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\namespacemd\msbuild\test\netstandard2.0\test.csproj", "{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "proxy", "proxy", "{1E33ACEE-1485-4452-B0FD-319E69AE0ACA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\proxy\msbuild\test\netstandard2.0\test.csproj", "{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "retry", "retry", "{0EFC0D41-16DD-44D1-AA35-DFC9C002F630}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\retry\msbuild\test\netstandard2.0\test.csproj", "{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scope", "scope", "{6C41B7FA-D096-47AD-B3AA-A414C53130B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\scope\msbuild\test\netstandard2.0\test.csproj", "{B82E30D0-C708-4298-A4D9-23096CC0FC37}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "seqMapping", "seqMapping", "{C6877DA9-5210-4A0D-8ACD-C2918409A128}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\seqMapping\msbuild\test\netstandard2.0\test.csproj", "{68CF8556-120A-4FFF-B210-4BD27F27B44F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "serialize", "serialize", "{2F8411A2-5AA9-4DCE-95E9-8D7908CF4761}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\serialize\msbuild\test\netstandard2.0\test.csproj", "{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "servantLocator", "servantLocator", "{CCCA3C2A-9197-4A04-A804-91E0786F325A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\servantLocator\msbuild\test\netstandard2.0\test.csproj", "{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stream", "stream", "{7FA498AC-C5B6-4B93-A80F-03290E1A0034}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\stream\msbuild\test\netstandard2.0\test.csproj", "{C9516047-F8C7-40FF-B035-DEF4F009AF1E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "threadPoolPriority", "threadPoolPriority", "{DDB43470-FAE8-4A08-B5A6-4B9C76B85AFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\threadPoolPriority\msbuild\test\netstandard2.0\test.csproj", "{58562454-2EA2-4879-A2F5-E32AE32063A9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "timeout", "timeout", "{DD26F674-C90B-4443-B310-437CF2A48A0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\timeout\msbuild\test\netstandard2.0\test.csproj", "{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "udp", "udp", "{1DCDA28D-9DB1-4C17-A4C0-4130F51BB169}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\udp\msbuild\test\netstandard2.0\test.csproj", "{433C2F7E-BB22-489C-A9B9-86F641560D78}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "admin", "admin", "{6EC98DF3-02B7-4211-945A-CA0BF0D64D76}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\admin\msbuild\test\netstandard2.0\test.csproj", "{F5396081-48EE-4728-B9E4-C2CF008376C3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
+		Ad-Hoc|ARM = Ad-Hoc|ARM
+		Ad-Hoc|iPhone = Ad-Hoc|iPhone
+		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+		Ad-Hoc|x64 = Ad-Hoc|x64
+		Ad-Hoc|x86 = Ad-Hoc|x86
+		AppStore|Any CPU = AppStore|Any CPU
+		AppStore|ARM = AppStore|ARM
+		AppStore|iPhone = AppStore|iPhone
+		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+		AppStore|x64 = AppStore|x64
+		AppStore|x86 = AppStore|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|ARM.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|ARM.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|iPhone.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|x64.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|x64.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|x86.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.AppStore|x86.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|x64.Build.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|x86.Build.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|ARM.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|ARM.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|iPhone.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|x64.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|x64.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|x64.Deploy.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|x86.ActiveCfg = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|x86.Build.0 = Release|Any CPU
+		{62B1BE59-435A-480B-8807-03A42623BA1A}.Release|x86.Deploy.0 = Release|Any CPU
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|Any CPU.Deploy.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|ARM.Build.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|ARM.Deploy.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|iPhone.Deploy.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Ad-Hoc|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|x64.Build.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|x64.Deploy.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|x86.Build.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Ad-Hoc|x86.Deploy.0 = Ad-Hoc|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|Any CPU.Build.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|Any CPU.Deploy.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|ARM.Build.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|ARM.Deploy.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|iPhone.Deploy.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|iPhoneSimulator.Deploy.0 = AppStore|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|x64.ActiveCfg = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|x64.Build.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|x64.Deploy.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|x86.ActiveCfg = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|x86.Build.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.AppStore|x86.Deploy.0 = AppStore|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|ARM.Build.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|ARM.Deploy.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|iPhone.Build.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|iPhone.Deploy.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|x64.ActiveCfg = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|x64.Build.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|x64.Deploy.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|x86.ActiveCfg = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|x86.Build.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Debug|x86.Deploy.0 = Debug|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|Any CPU.Build.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|Any CPU.Deploy.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|ARM.ActiveCfg = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|ARM.Build.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|ARM.Deploy.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|iPhone.ActiveCfg = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|iPhone.Build.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|iPhone.Deploy.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|x64.ActiveCfg = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|x64.Build.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|x64.Deploy.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|x86.ActiveCfg = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|x86.Build.0 = Release|iPhone
+		{FD70EC29-8D51-4F4F-8AD7-64170F22575D}.Release|x86.Deploy.0 = Release|iPhone
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|Any CPU.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|ARM.Build.0 = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|iPhone.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|iPhone.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|iPhone.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|x64.Build.0 = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|x64.Deploy.0 = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|x86.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|x86.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Ad-Hoc|x86.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|Any CPU.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|Any CPU.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|Any CPU.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|ARM.ActiveCfg = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|ARM.Build.0 = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|ARM.Deploy.0 = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|iPhone.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|iPhone.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|iPhone.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|iPhoneSimulator.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|iPhoneSimulator.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|x64.ActiveCfg = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|x64.Build.0 = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|x64.Deploy.0 = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|x86.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|x86.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.AppStore|x86.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|Any CPU.Build.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|Any CPU.Deploy.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|ARM.ActiveCfg = Debug|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|ARM.Build.0 = Debug|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|ARM.Deploy.0 = Debug|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|iPhone.ActiveCfg = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|iPhone.Build.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|iPhone.Deploy.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|iPhoneSimulator.Deploy.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|x64.ActiveCfg = Debug|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|x64.Build.0 = Debug|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|x64.Deploy.0 = Debug|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|x86.ActiveCfg = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|x86.Build.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Debug|x86.Deploy.0 = Debug|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|Any CPU.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|Any CPU.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|Any CPU.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|ARM.ActiveCfg = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|ARM.Build.0 = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|ARM.Deploy.0 = Release|ARM
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|iPhone.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|iPhone.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|iPhone.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|iPhoneSimulator.Deploy.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|x64.ActiveCfg = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|x64.Build.0 = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|x64.Deploy.0 = Release|x64
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|x86.ActiveCfg = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|x86.Build.0 = Release|x86
+		{00218ACB-5695-4935-BAE1-F47B13989E9B}.Release|x86.Deploy.0 = Release|x86
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|Any CPU.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|ARM.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|iPhone.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|x64.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Ad-Hoc|x86.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|Any CPU.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|ARM.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|iPhone.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|x64.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|x64.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|x86.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.AppStore|x86.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|ARM.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|ARM.ActiveCfg = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|ARM.Build.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|ARM.Deploy.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|iPhone.Build.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|x64.Build.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|x64.Deploy.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|x86.Build.0 = Release|Any CPU
+		{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}.Release|x86.Deploy.0 = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|x64.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.AppStore|x86.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|x64.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Debug|x86.Build.0 = Debug|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|ARM.Build.0 = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|iPhone.Build.0 = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|x64.ActiveCfg = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|x64.Build.0 = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|x86.ActiveCfg = Release|Any CPU
+		{A62BF5E3-AD66-4EDB-9BBA-3E9BD6148425}.Release|x86.Build.0 = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|x64.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.AppStore|x86.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|x64.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Debug|x86.Build.0 = Debug|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|ARM.Build.0 = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|iPhone.Build.0 = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|x64.ActiveCfg = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|x64.Build.0 = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|x86.ActiveCfg = Release|Any CPU
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33}.Release|x86.Build.0 = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|x64.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|ARM.Build.0 = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|iPhone.Build.0 = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|x64.Build.0 = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591}.Release|x86.Build.0 = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|x64.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.AppStore|x86.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|x64.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Debug|x86.Build.0 = Debug|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|ARM.Build.0 = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|iPhone.Build.0 = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|x64.ActiveCfg = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|x64.Build.0 = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|x86.ActiveCfg = Release|Any CPU
+		{F949076A-E4E8-4662-8099-211F47199863}.Release|x86.Build.0 = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|x64.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.AppStore|x86.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|x64.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Debug|x86.Build.0 = Debug|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|ARM.Build.0 = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|iPhone.Build.0 = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x64.ActiveCfg = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x64.Build.0 = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x86.ActiveCfg = Release|Any CPU
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x86.Build.0 = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x64.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x86.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|ARM.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x64.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x86.Build.0 = Debug|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|ARM.ActiveCfg = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|ARM.Build.0 = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhone.Build.0 = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x64.ActiveCfg = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x64.Build.0 = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x86.ActiveCfg = Release|Any CPU
+		{0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x86.Build.0 = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|x64.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|x64.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Debug|x86.Build.0 = Debug|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|ARM.Build.0 = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|iPhone.Build.0 = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|x64.ActiveCfg = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|x64.Build.0 = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|x86.ActiveCfg = Release|Any CPU
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Release|x86.Build.0 = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|x64.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.AppStore|x86.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|ARM.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|x64.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Debug|x86.Build.0 = Debug|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|ARM.ActiveCfg = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|ARM.Build.0 = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|iPhone.Build.0 = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|x64.ActiveCfg = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|x64.Build.0 = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|x86.ActiveCfg = Release|Any CPU
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287}.Release|x86.Build.0 = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|x64.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.AppStore|x86.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|ARM.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|x64.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Debug|x86.Build.0 = Debug|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|ARM.ActiveCfg = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|ARM.Build.0 = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|iPhone.Build.0 = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|x64.ActiveCfg = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|x64.Build.0 = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|x86.ActiveCfg = Release|Any CPU
+		{23B0209F-89D7-40D3-BC3B-341828929087}.Release|x86.Build.0 = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|x64.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.AppStore|x86.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Debug|x86.Build.0 = Debug|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|ARM.Build.0 = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|iPhone.Build.0 = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|x64.Build.0 = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{D44F7836-C10D-4470-975B-A09EF73B90B2}.Release|x86.Build.0 = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|x64.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.AppStore|x86.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|ARM.Build.0 = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|iPhone.Build.0 = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|x64.Build.0 = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{12A3579A-2082-46DB-902F-6377F722E1E7}.Release|x86.Build.0 = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|x64.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.AppStore|x86.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|x64.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Debug|x86.Build.0 = Debug|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|ARM.Build.0 = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|iPhone.Build.0 = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|x64.ActiveCfg = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|x64.Build.0 = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|x86.ActiveCfg = Release|Any CPU
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883}.Release|x86.Build.0 = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|x64.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.AppStore|x86.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|ARM.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|x64.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Debug|x86.Build.0 = Debug|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|ARM.ActiveCfg = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|ARM.Build.0 = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|iPhone.Build.0 = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|x64.ActiveCfg = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|x64.Build.0 = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|x86.ActiveCfg = Release|Any CPU
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997}.Release|x86.Build.0 = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|x64.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.AppStore|x86.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|ARM.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|x64.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Debug|x86.Build.0 = Debug|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|ARM.ActiveCfg = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|ARM.Build.0 = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|iPhone.Build.0 = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|x64.ActiveCfg = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|x64.Build.0 = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|x86.ActiveCfg = Release|Any CPU
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66}.Release|x86.Build.0 = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|x64.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.AppStore|x86.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Debug|x86.Build.0 = Debug|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|ARM.Build.0 = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|iPhone.Build.0 = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|x64.Build.0 = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|x86.ActiveCfg = Release|Any CPU
+		{D08551B3-2CF2-4F33-A901-76850D3575A3}.Release|x86.Build.0 = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|x64.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.AppStore|x86.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|ARM.Build.0 = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|iPhone.Build.0 = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|x64.Build.0 = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C}.Release|x86.Build.0 = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|x64.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.AppStore|x86.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|x64.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Debug|x86.Build.0 = Debug|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|ARM.Build.0 = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|iPhone.Build.0 = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|x64.ActiveCfg = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|x64.Build.0 = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|x86.ActiveCfg = Release|Any CPU
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B}.Release|x86.Build.0 = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|x64.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.AppStore|x86.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|x64.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Debug|x86.Build.0 = Debug|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|ARM.Build.0 = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|iPhone.Build.0 = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|x64.ActiveCfg = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|x64.Build.0 = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|x86.ActiveCfg = Release|Any CPU
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075}.Release|x86.Build.0 = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|x64.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.AppStore|x86.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|ARM.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|ARM.ActiveCfg = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|ARM.Build.0 = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|iPhone.Build.0 = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|x64.Build.0 = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{14183942-5E4A-4C85-9A22-EF3304B225D9}.Release|x86.Build.0 = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|x64.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.AppStore|x86.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|x64.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Debug|x86.Build.0 = Debug|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|ARM.Build.0 = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|iPhone.Build.0 = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|x64.ActiveCfg = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|x64.Build.0 = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|x86.ActiveCfg = Release|Any CPU
+		{AA1A3A35-D870-438C-8D21-A78211B7059A}.Release|x86.Build.0 = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|x64.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.AppStore|x86.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|ARM.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Debug|x86.Build.0 = Debug|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|ARM.ActiveCfg = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|ARM.Build.0 = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|iPhone.Build.0 = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|x64.Build.0 = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79}.Release|x86.Build.0 = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|x64.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|ARM.Build.0 = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|iPhone.Build.0 = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|x64.Build.0 = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F}.Release|x86.Build.0 = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|x64.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.AppStore|x86.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|ARM.Build.0 = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|iPhone.Build.0 = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|x64.Build.0 = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3}.Release|x86.Build.0 = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|x64.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.AppStore|x86.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|ARM.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|x64.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Debug|x86.Build.0 = Debug|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|ARM.ActiveCfg = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|ARM.Build.0 = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|iPhone.Build.0 = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|x64.ActiveCfg = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|x64.Build.0 = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|x86.ActiveCfg = Release|Any CPU
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501}.Release|x86.Build.0 = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|x64.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.AppStore|x86.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|x64.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Debug|x86.Build.0 = Debug|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|ARM.Build.0 = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|iPhone.Build.0 = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|x64.ActiveCfg = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|x64.Build.0 = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|x86.ActiveCfg = Release|Any CPU
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37}.Release|x86.Build.0 = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|x64.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.AppStore|x86.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|x64.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Debug|x86.Build.0 = Debug|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|ARM.Build.0 = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|iPhone.Build.0 = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|x64.ActiveCfg = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|x64.Build.0 = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|x86.ActiveCfg = Release|Any CPU
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F}.Release|x86.Build.0 = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|x64.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.AppStore|x86.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|x64.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Debug|x86.Build.0 = Debug|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|ARM.Build.0 = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|iPhone.Build.0 = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|x64.ActiveCfg = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|x64.Build.0 = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|x86.ActiveCfg = Release|Any CPU
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B}.Release|x86.Build.0 = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|x64.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.AppStore|x86.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|x64.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Debug|x86.Build.0 = Debug|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|ARM.Build.0 = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|iPhone.Build.0 = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|x64.ActiveCfg = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|x64.Build.0 = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|x86.ActiveCfg = Release|Any CPU
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A}.Release|x86.Build.0 = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|x64.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.AppStore|x86.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|x64.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Debug|x86.Build.0 = Debug|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|ARM.Build.0 = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|iPhone.Build.0 = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|x64.Build.0 = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E}.Release|x86.Build.0 = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|x64.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.AppStore|x86.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|ARM.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|x64.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Debug|x86.Build.0 = Debug|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|ARM.ActiveCfg = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|ARM.Build.0 = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|iPhone.Build.0 = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|x64.ActiveCfg = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|x64.Build.0 = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|x86.ActiveCfg = Release|Any CPU
+		{58562454-2EA2-4879-A2F5-E32AE32063A9}.Release|x86.Build.0 = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|x64.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.AppStore|x86.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|ARM.Build.0 = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|iPhone.Build.0 = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|x64.Build.0 = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D}.Release|x86.Build.0 = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|x64.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.AppStore|x86.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|ARM.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|x64.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Debug|x86.Build.0 = Debug|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|ARM.ActiveCfg = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|ARM.Build.0 = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|iPhone.Build.0 = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|x64.ActiveCfg = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|x64.Build.0 = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|x86.ActiveCfg = Release|Any CPU
+		{433C2F7E-BB22-489C-A9B9-86F641560D78}.Release|x86.Build.0 = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|x64.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.AppStore|x86.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Debug|x86.Build.0 = Debug|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|ARM.Build.0 = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|iPhone.Build.0 = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|x64.Build.0 = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5396081-48EE-4728-B9E4-C2CF008376C3}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{484E315B-A0A7-4BB5-8128-02DA7708E3DE} = {FDF2D71D-81F6-4D9F-A1B2-811399CA98B9}
+		{B45B0A8F-AA7F-4E19-8B07-DEE60CCC0426} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{F98C37DC-6484-4958-8D70-BD941A2F8F33} = {B45B0A8F-AA7F-4E19-8B07-DEE60CCC0426}
+		{1972D071-B981-43F3-8171-F268F57AB1A0} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{3F2F54AA-CE8A-4862-A7C1-CFDB52AB5591} = {1972D071-B981-43F3-8171-F268F57AB1A0}
+		{38CCD9BB-576F-4DB3-9928-756D4FD73CBE} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{F949076A-E4E8-4662-8099-211F47199863} = {38CCD9BB-576F-4DB3-9928-756D4FD73CBE}
+		{3758776C-A23F-4FDA-A406-2354908A3E43} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{723D6742-BFAC-4265-84C5-60EB6AB60A2C} = {3758776C-A23F-4FDA-A406-2354908A3E43}
+		{722AB792-C978-4633-A82A-02781EA97ECD} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{0205DBD3-3A5C-4342-B511-79439D4A7801} = {722AB792-C978-4633-A82A-02781EA97ECD}
+		{552AB952-499C-4B62-9F09-90BAA194FBE1} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E} = {552AB952-499C-4B62-9F09-90BAA194FBE1}
+		{816AF508-01A3-4B01-A699-949F65B25446} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{53E8D95F-DB44-4E2C-A081-99DE5B37F287} = {816AF508-01A3-4B01-A699-949F65B25446}
+		{8EB84516-E587-4EC1-B59E-5DABF47A5C40} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{23B0209F-89D7-40D3-BC3B-341828929087} = {8EB84516-E587-4EC1-B59E-5DABF47A5C40}
+		{7FD1EE11-6DF7-4C05-B24A-B69D138B9769} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{D44F7836-C10D-4470-975B-A09EF73B90B2} = {7FD1EE11-6DF7-4C05-B24A-B69D138B9769}
+		{F26F29C8-30CA-4261-AA5B-9F61B252FE8D} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{12A3579A-2082-46DB-902F-6377F722E1E7} = {F26F29C8-30CA-4261-AA5B-9F61B252FE8D}
+		{D43387B9-67C0-48EA-BA5F-7DF77FECC623} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{D57CAED3-8E65-40B1-AB3C-439E17CCB883} = {D43387B9-67C0-48EA-BA5F-7DF77FECC623}
+		{562E233D-EF39-43B1-A2A1-509BB5C85481} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{4F7AD3B5-E8F1-40FF-92B3-F6508F0F3997} = {562E233D-EF39-43B1-A2A1-509BB5C85481}
+		{E5098B39-C3C4-443D-9659-6439B66BF7CC} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{52E684CF-8511-4998-9DC9-A9EF4C06DD66} = {E5098B39-C3C4-443D-9659-6439B66BF7CC}
+		{521E4159-10F6-42F1-91CD-04039065F2B1} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{D08551B3-2CF2-4F33-A901-76850D3575A3} = {521E4159-10F6-42F1-91CD-04039065F2B1}
+		{0C5BC375-D9B0-406C-BB6A-CFE7A7643F30} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{EF7F3C57-F971-4D32-9368-B6B6C50CFE3C} = {0C5BC375-D9B0-406C-BB6A-CFE7A7643F30}
+		{260EAF61-B212-4E69-8FA4-BB0819CAEDD4} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{9E6FA72E-0FED-41DA-ACFD-B157008AC65B} = {260EAF61-B212-4E69-8FA4-BB0819CAEDD4}
+		{6A8E1B61-4331-4865-9575-9507690EEA42} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{1951FEA6-8C7B-453D-9856-B4C50FF12075} = {6A8E1B61-4331-4865-9575-9507690EEA42}
+		{4D7539A2-A109-4C87-B392-33B7C864BF20} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{14183942-5E4A-4C85-9A22-EF3304B225D9} = {4D7539A2-A109-4C87-B392-33B7C864BF20}
+		{612D4D4A-4056-4A7B-A9B6-F01264852C23} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{AA1A3A35-D870-438C-8D21-A78211B7059A} = {612D4D4A-4056-4A7B-A9B6-F01264852C23}
+		{153D4FEE-25AD-4182-AB53-C7F24861CCD4} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{FA714D0F-528A-49F5-A2A8-51AAD5CD4D79} = {153D4FEE-25AD-4182-AB53-C7F24861CCD4}
+		{76132143-9859-4F3C-9AB5-24E9905CAB77} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{3E6D14B4-FB21-45EF-9B04-1AEC4F9DD72F} = {76132143-9859-4F3C-9AB5-24E9905CAB77}
+		{1E33ACEE-1485-4452-B0FD-319E69AE0ACA} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{30CE285A-6718-4D2A-B95C-95BF5B9DB5F3} = {1E33ACEE-1485-4452-B0FD-319E69AE0ACA}
+		{0EFC0D41-16DD-44D1-AA35-DFC9C002F630} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{90CE9B4D-CA44-4421-AFAE-9DAE646D6501} = {0EFC0D41-16DD-44D1-AA35-DFC9C002F630}
+		{6C41B7FA-D096-47AD-B3AA-A414C53130B1} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{B82E30D0-C708-4298-A4D9-23096CC0FC37} = {6C41B7FA-D096-47AD-B3AA-A414C53130B1}
+		{C6877DA9-5210-4A0D-8ACD-C2918409A128} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{68CF8556-120A-4FFF-B210-4BD27F27B44F} = {C6877DA9-5210-4A0D-8ACD-C2918409A128}
+		{2F8411A2-5AA9-4DCE-95E9-8D7908CF4761} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{8BB02A6B-DB53-4878-B16A-D21C4F88D24B} = {2F8411A2-5AA9-4DCE-95E9-8D7908CF4761}
+		{CCCA3C2A-9197-4A04-A804-91E0786F325A} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{28D70BA1-8833-4E5F-B32E-7BF9E7B6BF4A} = {CCCA3C2A-9197-4A04-A804-91E0786F325A}
+		{7FA498AC-C5B6-4B93-A80F-03290E1A0034} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{C9516047-F8C7-40FF-B035-DEF4F009AF1E} = {7FA498AC-C5B6-4B93-A80F-03290E1A0034}
+		{DDB43470-FAE8-4A08-B5A6-4B9C76B85AFE} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{58562454-2EA2-4879-A2F5-E32AE32063A9} = {DDB43470-FAE8-4A08-B5A6-4B9C76B85AFE}
+		{DD26F674-C90B-4443-B310-437CF2A48A0D} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{6A8B2B7D-8DE4-4F63-B65A-BFFCBBE8872D} = {DD26F674-C90B-4443-B310-437CF2A48A0D}
+		{1DCDA28D-9DB1-4C17-A4C0-4130F51BB169} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{433C2F7E-BB22-489C-A9B9-86F641560D78} = {1DCDA28D-9DB1-4C17-A4C0-4130F51BB169}
+		{6EC98DF3-02B7-4211-945A-CA0BF0D64D76} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE}
+		{F5396081-48EE-4728-B9E4-C2CF008376C3} = {6EC98DF3-02B7-4211-945A-CA0BF0D64D76}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {474C088E-213C-4DD9-90A1-39E367B61560}
+	EndGlobalSection
+EndGlobal
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/THIRD_PARTY_LICENSE.txt zeroc-ice-3.7.2/csharp/msbuild/THIRD_PARTY_LICENSE.txt
--- zeroc-ice-3.7.1/csharp/msbuild/THIRD_PARTY_LICENSE.txt	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/THIRD_PARTY_LICENSE.txt	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,76 @@
+License agreement for bzip2/libbzip2:
+--------------------------------------
+
+--------------------------------------------------------------------------
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2010 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must
+   not claim that you wrote the original software.  If you use this
+   software in a product, an acknowledgment in the product
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@bzip.org
+bzip2/libbzip2 version 1.0.6 of 6 September 2010
+
+--------------------------------------------------------------------------
+
+License agreement for MCPP:
+----------------------------
+
+/*-
+ * Copyright (c) 1998, 2002-2008 Kiyoshi Matsui <kmatsui@t3.rim.or.jp>
+ * All rights reserved.
+ *
+ * This software including the files in this directory is provided under
+ * the following license.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/zeroc.ice.net.csproj zeroc-ice-3.7.2/csharp/msbuild/zeroc.ice.net.csproj
--- zeroc-ice-3.7.1/csharp/msbuild/zeroc.ice.net.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/zeroc.ice.net.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,14 +10,14 @@
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <PackageId>zeroc.ice.net</PackageId>
         <Title>ZeroC Ice for .NET</Title>
-        <PackageVersion>3.7.1</PackageVersion>
+        <PackageVersion>3.7.2</PackageVersion>
         <Authors>ZeroC</Authors>
         <PackageLicenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</PackageLicenseUrl>
         <PackageProjectUrl>https://github.com/zeroc-ice/ice</PackageProjectUrl>
         <PackageIconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</PackageIconUrl>
-        <Copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</Copyright>
+        <Copyright>Copyright (c) ZeroC, Inc. All rights reserved</Copyright>
         <Description>Ice C#/.NET SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</Description>
-        <PackageReleaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</PackageReleaseNotes>
+        <PackageReleaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</PackageReleaseNotes>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <PackageTags>ice</PackageTags>
     </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/zeroc.ice.net.nuspec zeroc-ice-3.7.2/csharp/msbuild/zeroc.ice.net.nuspec
--- zeroc-ice-3.7.1/csharp/msbuild/zeroc.ice.net.nuspec	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/zeroc.ice.net.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -3,15 +3,15 @@
     <metadata>
         <id>zeroc.ice.net</id>
         <title>ZeroC Ice for .NET</title>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
         <authors>ZeroC</authors>
-        <copyright>Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved</copyright>
-        <licenseUrl>https://raw.githubusercontent.com/zeroc-ice/ice/3.7/ICE_LICENSE</licenseUrl>
+        <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+        <license type="expression">GPL-2.0-only</license>
         <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
         <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Ice C#/.NET SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
-        <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</releaseNotes>
+        <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
         <tags>ice</tags>
     </metadata>
 </package>
diff -Nru zeroc-ice-3.7.1/csharp/msbuild/zeroc.ice.net.props zeroc-ice-3.7.2/csharp/msbuild/zeroc.ice.net.props
--- zeroc-ice-3.7.1/csharp/msbuild/zeroc.ice.net.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/msbuild/zeroc.ice.net.props	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009-2018 ZeroC, Inc. All rights reserved. -->
+<!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <IceVersion>3.7.1</IceVersion>
-        <IceIntVersion>30701</IceIntVersion>
+        <IceVersion>3.7.2</IceVersion>
+        <IceIntVersion>30702</IceIntVersion>
         <IceVersionMM>3.7</IceVersionMM>
         <IceSoVersion>37</IceSoVersion>
         <IceHome>$(MSBuildThisFileDirectory)..</IceHome>
diff -Nru zeroc-ice-3.7.1/csharp/README.md zeroc-ice-3.7.2/csharp/README.md
--- zeroc-ice-3.7.1/csharp/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -15,6 +15,7 @@
   * [Compiling Ice for \.NET on Linux or macOS](#compiling-ice-for-net-on-linux-or-macos)
 * [Running the Tests](#running-the-tests)
 * [NuGet Package](#nuget-package)
+* [Building Ice for Xamarin Test Suite](#building-ice-for-xamarin-test-suite)
 
 ## Building on Windows
 
@@ -26,7 +27,7 @@
 
 In order to build Ice for .NET from source, you need all of the following:
  - a [supported version][3] of Visual Studio
- - the [.NET Core 2.0 SDK][4], if you use Visual Studio 2017
+ - the [.NET Core 2.1 SDK][4], if you use Visual Studio 2017
 
 > Note: Visual Studio 2017 version 15.3.0 or higher is required for .NET Core
 > builds.
@@ -47,31 +48,32 @@
 are placed in the `lib\net45` and `lib\netstandard2.0` folders respectively.
 
 > Note: the assemblies for .NET Standard 2.0 are created only when you build with
-> Visual Studio 2017.
+> Visual Studio 2017 or greater.
 
 You can skip the build of the test suite with the `BuildDist` target:
 ```
 msbuild msbuild\ice.proj /t:BuildDist
 ```
 
-The `Net45Build`, `Net45BuildDist`, `NetStandardBuild` and `NetStandardBuildDist` targets
+The `BuildNet45`, `BuildNet45Dist`, `BuildNetStandard` and `BuildNetStandardDist` targets
 allow you to build assemblies only for the .NET Framework 4.5 or .NET Standard 2.0,
 with or without the test suite.
 
-The target framework for the .NET Standard tests is `netcoreapp2.0` by default. You can
-target other frameworks by setting the `IceTestsTargetFrameworks` property to one or more
-Target Framework Monikers (TFMs), for example:
+The iceboxnet and test applications target `netcoreapp2.1`. You can change the target framework
+by setting the `AppTargetFrameworks` property to a different Target Framework Monikers (TFMs)
+value, for example:
 ```
-msbuild msbuild\ice.proj /p:"IceTestsTargetFrameworks=net461;netcoreapp2.0"
+msbuild msbuild\ice.proj /p:"AppTargetFrameworks=net462"
 ```
 
-This builds the test programs for `net461` and `netcoreapp2.0` (in separate folders).
-The target frameworks you specify must implement .NET Standard 2.0.
+This builds the test programs for `net462`. The target frameworks you specify must
+implement .NET Standard 2.0.
 
-#### Strong Name Signatures for .NET Framework 4.5 Assemblies
+#### Strong Name Signatures
+
+You can add Strong Naming signatures to the Ice assemblies by setting the following
+environment variables before building these assemblies:
 
-You can add Strong Naming signatures to the Ice assemblies for .NET Framework 4.5
-by setting the following environment variables before building these assemblies:
  - PUBLIC_KEYFILE Identity public key used to delay sign the assembly
  - KEYFILE Identity full key pair used to sign the assembly
 
@@ -85,6 +87,8 @@
 the build using PUBLIC_KEYFILE and re-signed after the build using KEYFILE.
 This can be used for generating [Enhanced Strong Naming][5] signatures.
 
+*Strong Name Signatures can be generated only from Windows builds.*
+
 #### Authenticode Signatures
 
 You can sign the Ice binaries with Authenticode by setting the following
@@ -92,7 +96,7 @@
  - SIGN_CERTIFICATE to your Authenticode certificate
  - SIGN_PASSWORD to the certificate password
 
-*Temporary limitation: assembly signing applies only to .NET Framework 4.5 assemblies at present.*
+*Authenticode can be generated only from Windows builds.*
 
 #### Building only the Test Suite
 
@@ -107,7 +111,7 @@
 
 ### Linux and macOS Build Requirements
 
-You need the [.NET Core 2.0 SDK][5] to build Ice for .NET from source.
+You need the [.NET Core 2.1 SDK][4] to build Ice for .NET from source.
 
 ### Compiling Ice for .NET on Linux or macOS
 
@@ -147,11 +151,23 @@
 failure, the tests abort with `failed`.
 
 On Windows, `allTests.py` executes by default the tests for .NET Framework 4.5.
-In order to execute the tests for a target framework that implements .NET Standard
-2.0, add the `--netframework` option with the moniker of a target framework used
-to build the tests. For example:
+In order to execute the tests with .NET Core framework add the `--dotnetcore` option.
+For example:
+```
+python allTests.py --dotnetcore
+```
+
+If you build the test against a different target framework you must use `--framework` option
+with the corresponding target framework.
+
+For example to run test build against .NET Framework 4.6.2:
 ```
-python allTests.py --netframework netcoreapp2.0
+python allTests.py --framework=net462
+```
+
+And to run test build against .NET Core 3.0:
+```
+python allTests.py --dotnetcore --framework=netcoreapp3.0
 ```
 
 ## NuGet Package
@@ -170,8 +186,94 @@
 
 *Temporary limitation: you currently cannot create NuGet packages on Linux and macOS.*
 
+## Building Ice for Xamarin Test Suite
+
+The `msbuild\ice.xamarin.test.sln` Visual Studio solution allows building
+the Ice test suite as a Xamarin application that can be deployed on iOS, Android
+or UWP platforms.
+
+The Xamarin test suite uses the Ice assemblies for .NET Standard 2.0. either
+from the source distribution or using the zeroc.ice.net NuGet package. If using
+the assembles from the source distribution, they must be built before this
+application.
+
+### Building on Windows
+
+#### Windows Build Requirements
+
+* Visual Studio 2017 with following workloads:
+  * Universal Windows Platform development
+  * Mobile development with .NET
+  * .NET Core cross-platform development
+
+#### Building the Android test controller
+
+Open a Visual Studio 2017 command prompt:
+
+```
+MSBuild msbuild\ice.proj /t:AndroidXamarinBuild
+```
+
+#### Building the UWP test controller
+
+Open a Visual Studio 2017 command prompt:
+
+```
+MSBuild msbuild\ice.proj /t:UWPXamarinBuild
+```
+
+#### Running the Android test suite
+
+```
+set PATH=%LOCALAPPDATA%\Android\sdk\tools\bin;%PATH%
+set PATH=%LOCALAPPDATA%\Android\sdk\platform-tools;%PATH%
+set PATH=%LOCALAPPDATA%\Android\sdk\emulator;%PATH%
+
+python allTests.py --android --controller-app --config Release --platform x64
+```
+
+#### Running the UWP test suite
+
+```
+python allTests.py --uwp --controller-app --config Release --platform x64
+```
+
+### Building on macOS
+
+#### macOS Build Requirements
+
+* Visual Studio for Mac
+
+#### Building the Android test controller
+
+```
+msbuild msbuild/ice.proj /t:AndroidXamarinBuild
+```
+
+#### Building the iOS test controller
+
+```
+msbuild msbuild/ice.proj /t:iOSXamarinBuild
+```
+
+#### Running the Android test suite
+
+```
+export PATH=~/Library/Android/sdk/tools/bin:$PATH
+export PATH=~/Library/Android/sdk/platform-tools:$PATH
+export PATH=~/Library/Android/sdk/emulator:$PATH
+
+python allTests.py --android --controller-app --config Release --platform x64
+```
+
+#### Running the iOS test suite
+
+```
+python allTests.py --controller-app --config Release --platform iphonesimulator
+```
+
 [1]: https://zeroc.com/distributions/ice
 [2]: https://blogs.msdn.microsoft.com/dotnet/2017/08/14/announcing-net-standard-2-0
-[3]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.1
-[4]: https://www.microsoft.com/net/download
+[3]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2
+[4]: https://dotnet.microsoft.com/download/dotnet-core/2.1
 [5]: https://docs.microsoft.com/en-us/dotnet/framework/app-domains/enhanced-strong-naming
diff -Nru zeroc-ice-3.7.1/csharp/src/Glacier2/Application.cs zeroc-ice-3.7.2/csharp/src/Glacier2/Application.cs
--- zeroc-ice-3.7.1/csharp/src/Glacier2/Application.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Glacier2/Application.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/src/Glacier2/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/Glacier2/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/Glacier2/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Glacier2/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/Glacier2/msbuild/net45/glacier2.csproj zeroc-ice-3.7.2/csharp/src/Glacier2/msbuild/net45/glacier2.csproj
--- zeroc-ice-3.7.1/csharp/src/Glacier2/msbuild/net45/glacier2.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Glacier2/msbuild/net45/glacier2.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{D765A8A0-01C2-4EEE-B6C0-5DD6F9C1087A}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Glacier2</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\Glacier2.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj zeroc-ice-3.7.2/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj
--- zeroc-ice-3.7.1/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -17,4 +17,5 @@
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/Glacier2/SessionCallback.cs zeroc-ice-3.7.2/csharp/src/Glacier2/SessionCallback.cs
--- zeroc-ice-3.7.1/csharp/src/Glacier2/SessionCallback.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Glacier2/SessionCallback.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
diff -Nru zeroc-ice-3.7.1/csharp/src/Glacier2/SessionFactoryHelper.cs zeroc-ice-3.7.2/csharp/src/Glacier2/SessionFactoryHelper.cs
--- zeroc-ice-3.7.1/csharp/src/Glacier2/SessionFactoryHelper.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Glacier2/SessionFactoryHelper.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Text;
diff -Nru zeroc-ice-3.7.1/csharp/src/Glacier2/SessionHelper.cs zeroc-ice-3.7.2/csharp/src/Glacier2/SessionHelper.cs
--- zeroc-ice-3.7.1/csharp/src/Glacier2/SessionHelper.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Glacier2/SessionHelper.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Acceptor.cs zeroc-ice-3.7.2/csharp/src/Ice/Acceptor.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Acceptor.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Acceptor.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ACM.cs zeroc-ice-3.7.2/csharp/src/Ice/ACM.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ACM.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ACM.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Application.cs zeroc-ice-3.7.2/csharp/src/Ice/Application.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Application.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Application.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Arrays.cs zeroc-ice-3.7.2/csharp/src/Ice/Arrays.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Arrays.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Arrays.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/Ice/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/AssemblyUtil.cs zeroc-ice-3.7.2/csharp/src/Ice/AssemblyUtil.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/AssemblyUtil.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/AssemblyUtil.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -21,10 +16,12 @@
         public static readonly bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
         public static readonly bool isMacOS = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
         public static readonly bool isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+        public static readonly bool isMono = RuntimeInformation.FrameworkDescription.Contains("Mono");
 #else
         public static readonly bool isWindows = true;
         public static readonly bool isMacOS = false;
         public static readonly bool isLinux = false;
+        public static readonly bool isMono = false;
 #endif
         public static Type findType(Instance instance, string csharpId)
         {
@@ -140,28 +137,35 @@
 
         private static void loadReferencedAssemblies(Assembly a)
         {
-            AssemblyName[] names = a.GetReferencedAssemblies();
-            foreach(AssemblyName name in names)
+            try
             {
-                if(!_loadedAssemblies.ContainsKey(name.FullName))
+                AssemblyName[] names = a.GetReferencedAssemblies();
+                foreach(AssemblyName name in names)
                 {
-                    try
+                    if(!_loadedAssemblies.ContainsKey(name.FullName))
                     {
-                        Assembly ra = Assembly.Load(name);
-                        //
-                        // The value of name.FullName may not match that of ra.FullName, so
-                        // we record the assembly using both keys.
-                        //
-                        _loadedAssemblies[name.FullName] = ra;
-                        _loadedAssemblies[ra.FullName] = ra;
-                        loadReferencedAssemblies(ra);
-                    }
-                    catch(Exception)
-                    {
-                        // Ignore assemblies that cannot be loaded.
+                        try
+                        {
+                            Assembly ra = Assembly.Load(name);
+                            //
+                            // The value of name.FullName may not match that of ra.FullName, so
+                            // we record the assembly using both keys.
+                            //
+                            _loadedAssemblies[name.FullName] = ra;
+                            _loadedAssemblies[ra.FullName] = ra;
+                            loadReferencedAssemblies(ra);
+                        }
+                        catch(Exception)
+                        {
+                            // Ignore assemblies that cannot be loaded.
+                        }
                     }
                 }
             }
+            catch(PlatformNotSupportedException)
+            {
+                // Some platforms like UWP do not support using GetReferencedAssemblies
+            }
         }
 
         private static Hashtable _loadedAssemblies = new Hashtable(); // <string, Assembly> pairs.
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/AsyncIOThread.cs zeroc-ice-3.7.2/csharp/src/Ice/AsyncIOThread.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/AsyncIOThread.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/AsyncIOThread.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/AsyncResult.cs zeroc-ice-3.7.2/csharp/src/Ice/AsyncResult.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/AsyncResult.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/AsyncResult.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/BatchRequestInterceptor.cs zeroc-ice-3.7.2/csharp/src/Ice/BatchRequestInterceptor.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/BatchRequestInterceptor.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/BatchRequestInterceptor.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/BatchRequestQueue.cs zeroc-ice-3.7.2/csharp/src/Ice/BatchRequestQueue.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/BatchRequestQueue.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/BatchRequestQueue.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Buffer.cs zeroc-ice-3.7.2/csharp/src/Ice/Buffer.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Buffer.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Buffer.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ByteBuffer.cs zeroc-ice-3.7.2/csharp/src/Ice/ByteBuffer.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ByteBuffer.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ByteBuffer.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Runtime.InteropServices;
@@ -323,16 +318,13 @@
             return v;
         }
 
-        unsafe
         public short getShort(int pos)
         {
             checkUnderflow(pos, 2);
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[pos])
-                {
-                    _valBytes.shortVal = *((short*)p);
-                }
+                _valBytes.b0 = _bytes[pos];
+                _valBytes.b1 = _bytes[pos + 1];
             }
             else
             {
@@ -363,17 +355,14 @@
             _position += len;
         }
 
-        unsafe
         public ByteBuffer putShort(short val)
         {
             checkOverflow(2);
             _valBytes.shortVal = val;
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[_position])
-                {
-                    *((short*)p) = _valBytes.shortVal;
-                }
+                _bytes[_position] = _valBytes.b0;
+                _bytes[_position + 1] = _valBytes.b1;
             }
             else
             {
@@ -406,16 +395,15 @@
             return this;
         }
 
-        unsafe
         public int getInt()
         {
             checkUnderflow(4);
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[_position])
-                {
-                    _valBytes.intVal = *((int*)p);
-                }
+                _valBytes.b0 = _bytes[_position];
+                _valBytes.b1 = _bytes[_position + 1];
+                _valBytes.b2 = _bytes[_position + 2];
+                _valBytes.b3 = _bytes[_position + 3];
             }
             else
             {
@@ -458,7 +446,6 @@
             return this;
         }
 
-        unsafe
         public ByteBuffer putInt(int pos, int val)
         {
             if(pos < 0)
@@ -472,10 +459,10 @@
             _valBytes.intVal = val;
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[pos])
-                {
-                    *((int*)p) = _valBytes.intVal;
-                }
+                _bytes[pos] = _valBytes.b0;
+                _bytes[pos + 1] = _valBytes.b1;
+                _bytes[pos + 2] = _valBytes.b2;
+                _bytes[pos + 3] = _valBytes.b3;
             }
             else
             {
@@ -518,16 +505,19 @@
             return v;
         }
 
-        unsafe
         public long getLong(int pos)
         {
             checkUnderflow(pos, 8);
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[pos])
-                {
-                    _valBytes.longVal = *((long*)p);
-                }
+                _valBytes.b0 = _bytes[pos];
+                _valBytes.b1 = _bytes[pos + 1];
+                _valBytes.b2 = _bytes[pos + 2];
+                _valBytes.b3 = _bytes[pos + 3];
+                _valBytes.b4 = _bytes[pos + 4];
+                _valBytes.b5 = _bytes[pos + 5];
+                _valBytes.b6 = _bytes[pos + 6];
+                _valBytes.b7 = _bytes[pos + 7];
             }
             else
             {
@@ -570,17 +560,20 @@
             _position += len;
         }
 
-        unsafe
         public ByteBuffer putLong(long val)
         {
             checkOverflow(8);
             _valBytes.longVal = val;
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[_position])
-                {
-                    *((long*)p) = _valBytes.longVal;
-                }
+                _bytes[_position] = _valBytes.b0;
+                _bytes[_position + 1] = _valBytes.b1;
+                _bytes[_position + 2] = _valBytes.b2;
+                _bytes[_position + 3] = _valBytes.b3;
+                _bytes[_position + 4] = _valBytes.b4;
+                _bytes[_position + 5] = _valBytes.b5;
+                _bytes[_position + 6] = _valBytes.b6;
+                _bytes[_position + 7] = _valBytes.b7;
             }
             else
             {
@@ -625,16 +618,15 @@
             return this;
         }
 
-        unsafe
         public float getFloat()
         {
             checkUnderflow(4);
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[_position])
-                {
-                    _valBytes.floatVal = *((float*)p);
-                }
+                _valBytes.b0 = _bytes[_position];
+                _valBytes.b1 = _bytes[_position + 1];
+                _valBytes.b2 = _bytes[_position + 2];
+                _valBytes.b3 = _bytes[_position + 3];
             }
             else
             {
@@ -670,17 +662,16 @@
             _position += len;
         }
 
-        unsafe
         public ByteBuffer putFloat(float val)
         {
             checkOverflow(4);
             _valBytes.floatVal = val;
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[_position])
-                {
-                    *((float*)p) = _valBytes.floatVal;
-                }
+                _bytes[_position] = _valBytes.b0;
+                _bytes[_position + 1] = _valBytes.b1;
+                _bytes[_position + 2] = _valBytes.b2;
+                _bytes[_position + 3] = _valBytes.b3;
             }
             else
             {
@@ -717,16 +708,19 @@
             return this;
         }
 
-        unsafe
         public double getDouble()
         {
             checkUnderflow(8);
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[_position])
-                {
-                    _valBytes.doubleVal = *((double*)p);
-                }
+                _valBytes.b0 = _bytes[_position];
+                _valBytes.b1 = _bytes[_position + 1];
+                _valBytes.b2 = _bytes[_position + 2];
+                _valBytes.b3 = _bytes[_position + 3];
+                _valBytes.b4 = _bytes[_position + 4];
+                _valBytes.b5 = _bytes[_position + 5];
+                _valBytes.b6 = _bytes[_position + 6];
+                _valBytes.b7 = _bytes[_position + 7];
             }
             else
             {
@@ -770,17 +764,20 @@
             _position += len;
         }
 
-        unsafe
         public ByteBuffer putDouble(double val)
         {
             checkOverflow(8);
             _valBytes.doubleVal = val;
             if(NO._o == _order)
             {
-                fixed(byte* p = &_bytes[_position])
-                {
-                    *((double*)p) = _valBytes.doubleVal;
-                }
+                _bytes[_position] = _valBytes.b0;
+                _bytes[_position + 1] = _valBytes.b1;
+                _bytes[_position + 2] = _valBytes.b2;
+                _bytes[_position + 3] = _valBytes.b3;
+                _bytes[_position + 4] = _valBytes.b4;
+                _bytes[_position + 5] = _valBytes.b5;
+                _bytes[_position + 6] = _valBytes.b6;
+                _bytes[_position + 7] = _valBytes.b7;
             }
             else
             {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/BZip2.cs zeroc-ice-3.7.2/csharp/src/Ice/BZip2.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/BZip2.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/BZip2.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -16,10 +11,10 @@
 
     internal static class SafeNativeMethods
     {
-        [DllImport("bzip2.dll", EntryPoint="BZ2_bzlibVersion")]
+        [DllImport("bzip2.dll", EntryPoint="BZ2_bzlibVersion", ExactSpelling=true)]
         internal static extern IntPtr windowsBZ2_bzlibVersion();
 
-        [DllImport("bzip2.dll", EntryPoint="BZ2_bzBuffToBuffCompress")]
+        [DllImport("bzip2.dll", EntryPoint="BZ2_bzBuffToBuffCompress", ExactSpelling=true)]
         internal static extern int windowsBZ2_bzBuffToBuffCompress(byte[] dest,
                                                                    ref int destLen,
                                                                    byte[] source,
@@ -28,7 +23,7 @@
                                                                    int verbosity,
                                                                    int workFactor);
 
-        [DllImport("bzip2.dll", EntryPoint="BZ2_bzBuffToBuffDecompress")]
+        [DllImport("bzip2.dll", EntryPoint="BZ2_bzBuffToBuffDecompress", ExactSpelling=true)]
         internal static extern int windowsBZ2_bzBuffToBuffDecompress(byte[] dest,
                                                                      ref int destLen,
                                                                      byte[] source,
@@ -36,10 +31,10 @@
                                                                      int small,
                                                                      int verbosity);
 
-        [DllImport("libbz2.so.1", EntryPoint="BZ2_bzlibVersion")]
+        [DllImport("libbz2.so.1", EntryPoint="BZ2_bzlibVersion", ExactSpelling=true)]
         internal static extern IntPtr unixBZ2_bzlibVersion();
 
-        [DllImport("libbz2.so.1", EntryPoint="BZ2_bzBuffToBuffCompress")]
+        [DllImport("libbz2.so.1", EntryPoint="BZ2_bzBuffToBuffCompress", ExactSpelling=true)]
         internal static extern int unixBZ2_bzBuffToBuffCompress(byte[] dest,
                                                                 ref int destLen,
                                                                 byte[] source,
@@ -48,7 +43,7 @@
                                                                 int verbosity,
                                                                 int workFactor);
 
-        [DllImport("libbz2.so.1", EntryPoint="BZ2_bzBuffToBuffDecompress")]
+        [DllImport("libbz2.so.1", EntryPoint="BZ2_bzBuffToBuffDecompress", ExactSpelling=true)]
         internal static extern int unixBZ2_bzBuffToBuffDecompress(byte[] dest,
                                                                   ref int destLen,
                                                                   byte[] source,
@@ -56,10 +51,10 @@
                                                                   int small,
                                                                   int verbosity);
 
-        [DllImport("libbz2.dylib", EntryPoint="BZ2_bzlibVersion")]
+        [DllImport("libbz2.dylib", EntryPoint="BZ2_bzlibVersion", ExactSpelling=true)]
         internal static extern IntPtr macOSBZ2_bzlibVersion();
 
-        [DllImport("libbz2.dylib", EntryPoint="BZ2_bzBuffToBuffCompress")]
+        [DllImport("libbz2.dylib", EntryPoint="BZ2_bzBuffToBuffCompress", ExactSpelling=true)]
         internal static extern int macOSBZ2_bzBuffToBuffCompress(byte[] dest,
                                                                  ref int destLen,
                                                                  byte[] source,
@@ -68,7 +63,7 @@
                                                                  int verbosity,
                                                                  int workFactor);
 
-        [DllImport("libbz2.dylib", EntryPoint="BZ2_bzBuffToBuffDecompress")]
+        [DllImport("libbz2.dylib", EntryPoint="BZ2_bzBuffToBuffDecompress", ExactSpelling=true)]
         internal static extern int macOSBZ2_bzBuffToBuffDecompress(byte[] dest,
                                                                    ref int destLen,
                                                                    byte[] source,
@@ -122,15 +117,15 @@
                 }
                 _bzlibInstalled = true;
             }
-            catch(DllNotFoundException)
-            {
-                // Expected -- bzip2 lib not installed or not in PATH.
-            }
             catch(EntryPointNotFoundException)
             {
                 string lib = AssemblyUtil.isWindows ? "bzip2.dll" : "libbz2.so.1";
                 Console.Error.WriteLine("warning: found " + lib + " but entry point BZ2_bzlibVersion is missing.");
             }
+            catch(TypeLoadException)
+            {
+                // Expected -- bzip2 lib not installed or not in PATH.
+            }
             catch(BadImageFormatException ex)
             {
                 string lib = AssemblyUtil.isWindows ? "bzip2.dll" : "libbz2.so.1";
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Collections.cs zeroc-ice-3.7.2/csharp/src/Ice/Collections.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Collections.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Collections.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/CollocatedRequestHandler.cs zeroc-ice-3.7.2/csharp/src/Ice/CollocatedRequestHandler.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/CollocatedRequestHandler.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/CollocatedRequestHandler.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/CommunicatorI.cs zeroc-ice-3.7.2/csharp/src/Ice/CommunicatorI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/CommunicatorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/CommunicatorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Compare.cs zeroc-ice-3.7.2/csharp/src/Ice/Compare.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Compare.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Compare.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ConnectionFactory.cs zeroc-ice-3.7.2/csharp/src/Ice/ConnectionFactory.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ConnectionFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ConnectionFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -1377,8 +1372,12 @@
 
                 string s = "couldn't accept connection:\n" + ex + '\n' + _acceptor.ToString();
                 _instance.initializationData().logger.error(s);
-                _adapter.getThreadPool().finish(this);
-                closeAcceptor();
+                if(_acceptorStarted)
+                {
+                    _acceptorStarted = false;
+                    _adapter.getThreadPool().finish(this);
+                    closeAcceptor();
+                }
             }
             return _state < StateClosed;
         }
@@ -1447,6 +1446,8 @@
                         {
                             string s = "can't accept more connections:\n" + ex + '\n' + _acceptor.ToString();
                             _instance.initializationData().logger.error(s);
+                            Debug.Assert(_acceptorStarted);
+                            _acceptorStarted = false;
                             _adapter.getThreadPool().finish(this);
                             closeAcceptor();
                         }
@@ -1507,9 +1508,15 @@
             {
                 if(_state < StateClosed)
                 {
+                    //
+                    // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
+                    // because of an unexpected error), try to restart the acceptor in 1 second.
+                    //
+                    _instance.timer().schedule(new StartAcceptor(this), 1000);
                     return;
                 }
-                Debug.Assert(_state == StateClosed);
+
+                Debug.Assert(_state >= StateClosed);
                 setState(StateFinished);
             }
         }
@@ -1709,6 +1716,7 @@
                 {
                     if(_acceptorStarted)
                     {
+                        _acceptorStarted = false;
                         _adapter.getThreadPool().finish(this);
                         closeAcceptor();
                     }
@@ -1794,17 +1802,8 @@
                 _instance.initializationData().logger.trace(_instance.traceLevels().networkCat, s.ToString());
             }
 
-            _acceptorStarted = false;
+            Debug.Assert(!_acceptorStarted);
             _acceptor.close();
-
-            //
-            // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
-            // because of an unexpected error), try to restart the acceptor in 5 seconds.
-            //
-            if(_state == StateHolding || _state == StateActive)
-            {
-                _instance.timer().schedule(new StartAcceptor(this), 1000);
-            }
         }
 
         private void warning(Ice.LocalException ex)
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ConnectionI.cs zeroc-ice-3.7.2/csharp/src/Ice/ConnectionI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ConnectionI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ConnectionI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ConnectionRequestHandler.cs zeroc-ice-3.7.2/csharp/src/Ice/ConnectionRequestHandler.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ConnectionRequestHandler.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ConnectionRequestHandler.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Connector.cs zeroc-ice-3.7.2/csharp/src/Ice/Connector.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Connector.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Connector.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ConnectRequestHandler.cs zeroc-ice-3.7.2/csharp/src/Ice/ConnectRequestHandler.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ConnectRequestHandler.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ConnectRequestHandler.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/DefaultsAndOverrides.cs zeroc-ice-3.7.2/csharp/src/Ice/DefaultsAndOverrides.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/DefaultsAndOverrides.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/DefaultsAndOverrides.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Net;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/DispatchInterceptor.cs zeroc-ice-3.7.2/csharp/src/Ice/DispatchInterceptor.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/DispatchInterceptor.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/DispatchInterceptor.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/EndpointFactory.cs zeroc-ice-3.7.2/csharp/src/Ice/EndpointFactory.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/EndpointFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/EndpointFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/EndpointFactoryManager.cs zeroc-ice-3.7.2/csharp/src/Ice/EndpointFactoryManager.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/EndpointFactoryManager.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/EndpointFactoryManager.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/EndpointHostResolver.cs zeroc-ice-3.7.2/csharp/src/Ice/EndpointHostResolver.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/EndpointHostResolver.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/EndpointHostResolver.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/EndpointI.cs zeroc-ice-3.7.2/csharp/src/Ice/EndpointI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/EndpointI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/EndpointI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/EventHandler.cs zeroc-ice-3.7.2/csharp/src/Ice/EventHandler.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/EventHandler.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/EventHandler.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Exception.cs zeroc-ice-3.7.2/csharp/src/Ice/Exception.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Exception.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Exception.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Globalization;
@@ -41,8 +36,8 @@
                 Debug.Assert(false);
             }
 
-            throw new Ice.UnexpectedObjectException("expected element of type `" + expected + "' but received '" + type,
-                                                    type, expected);
+            throw new Ice.UnexpectedObjectException("expected element of type `" + expected + "' but received `" +
+                                                    type + "'", type, expected);
         }
 
         public static void throwMemoryLimitException(int requested, int maximum)
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/FormatType.cs zeroc-ice-3.7.2/csharp/src/Ice/FormatType.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/FormatType.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/FormatType.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/HttpParser.cs zeroc-ice-3.7.2/csharp/src/Ice/HttpParser.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/HttpParser.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/HttpParser.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ImplicitContextI.cs zeroc-ice-3.7.2/csharp/src/Ice/ImplicitContextI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ImplicitContextI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ImplicitContextI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Incoming.cs zeroc-ice-3.7.2/csharp/src/Ice/Incoming.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Incoming.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Incoming.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
@@ -527,8 +522,12 @@
                     {
                         for(Ice.ConnectionInfo p = _current.con.getInfo(); p != null; p = p.underlying)
                         {
-                            Ice.IPConnectionInfo ipinfo = p as Ice.IPConnectionInfo;
-                            output.print("\nremote host: " + ipinfo.remoteAddress + " remote port: " + ipinfo.remotePort);
+                            if(p is Ice.IPConnectionInfo)
+                            {
+                                Ice.IPConnectionInfo ipinfo = p as Ice.IPConnectionInfo;
+                                output.print("\nremote host: " + ipinfo.remoteAddress + " remote port: " + ipinfo.remotePort);
+                                break;
+                            }
                         }
                     }
                     catch(Ice.LocalException)
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/InputStream.cs zeroc-ice-3.7.2/csharp/src/Ice/InputStream.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/InputStream.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/InputStream.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Instance.cs zeroc-ice-3.7.2/csharp/src/Ice/Instance.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Instance.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Instance.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -670,9 +665,39 @@
             _initData.threadStop = threadStop;
         }
 
+        //
+        // Return the C# class associated with this Slice type-id
+        // Used for both non-local Slice classes and exceptions
+        //
         public Type resolveClass(string id)
         {
-            Type c = AssemblyUtil.findType(this, typeToClass(id));
+            // First attempt corresponds to no cs:namespace metadata in the
+            // enclosing top-level module
+            //
+            string className = typeToClass(id);
+            Type c = AssemblyUtil.findType(this, className);
+
+            //
+            // If this fails, look for helper classes in the typeIdNamespaces namespace(s)
+            //
+            if(c == null && _initData.typeIdNamespaces != null)
+            {
+                foreach(var ns in _initData.typeIdNamespaces)
+                {
+                    Type helper = AssemblyUtil.findType(this, ns + "." + className);
+                    if(helper != null)
+                    {
+                        try
+                        {
+                            c = helper.GetProperty("targetClass").PropertyType;
+                            break; // foreach
+                        }
+                        catch(Exception)
+                        {
+                        }
+                    }
+                }
+            }
 
             //
             // Ensure the class is instantiable.
@@ -687,19 +712,33 @@
 
         public string resolveCompactId(int compactId)
         {
-            String className = "IceCompactId.TypeId_" + compactId;
-            try
+            string[] defaultVal = {"IceCompactId"};
+            var compactIdNamespaces = new List<string>(defaultVal);
+
+            if(_initData.typeIdNamespaces != null)
             {
-                Type c = AssemblyUtil.findType(this, className);
-                if(c != null)
-                {
-                    return (string)c.GetField("typeId").GetValue(null);
-                }
+                compactIdNamespaces.AddRange(_initData.typeIdNamespaces);
             }
-            catch(Exception)
+
+            string result = "";
+
+            foreach(var ns in compactIdNamespaces)
             {
+                string className = ns + ".TypeId_" + compactId;
+                try
+                {
+                    Type c = AssemblyUtil.findType(this, className);
+                    if(c != null)
+                    {
+                       result = (string)c.GetField("typeId").GetValue(null);
+                       break; // foreach
+                    }
+                }
+                catch(Exception)
+                {
+                }
             }
-            return "";
+            return result;
         }
 
         private static string typeToClass(string id)
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/InstrumentationI.cs zeroc-ice-3.7.2/csharp/src/Ice/InstrumentationI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/InstrumentationI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/InstrumentationI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/IPEndpointI.cs zeroc-ice-3.7.2/csharp/src/Ice/IPEndpointI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/IPEndpointI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/IPEndpointI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -61,7 +56,7 @@
 
             override public bool datagram()
             {
-                return _endpoint.datagram();;
+                return _endpoint.datagram();
             }
 
             override public bool secure()
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/LocatorInfo.cs zeroc-ice-3.7.2/csharp/src/Ice/LocatorInfo.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/LocatorInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/LocatorInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/LoggerAdminI.cs zeroc-ice-3.7.2/csharp/src/Ice/LoggerAdminI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/LoggerAdminI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/LoggerAdminI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -185,7 +180,7 @@
 
         //
         // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to
-        // remote logggers
+        // remote loggers
         //
         if(sendLogCommunicator != null)
         {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/LoggerAdminLoggerI.cs zeroc-ice-3.7.2/csharp/src/Ice/LoggerAdminLoggerI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/LoggerAdminLoggerI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/LoggerAdminLoggerI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/LoggerI.cs zeroc-ice-3.7.2/csharp/src/Ice/LoggerI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/LoggerI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/LoggerI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
@@ -88,8 +83,8 @@
 
         protected abstract void write(string message);
 
-        internal string _prefix = "";
-        internal string _formattedPrefix = "";
+        internal readonly string _prefix;
+        internal readonly string _formattedPrefix;
         internal string _date = null;
         internal string _time = null;
 
@@ -147,10 +142,12 @@
 
     public class ConsoleListener : TraceListener
     {
-        public ConsoleListener()
+        public override bool IsThreadSafe
         {
-            _date = "d";
-            _time = "HH:mm:ss:fff";
+            get
+            {
+                return true;
+            }
         }
 
         public override void TraceEvent(TraceEventCache cache, string source, TraceEventType type,
@@ -188,8 +185,8 @@
             System.Console.Error.WriteLine(message);
         }
 
-        internal string _date = null;
-        internal string _time = null;
+        internal const string _date = "d";
+        internal const string _time = "HH:mm:ss:fff";
     }
 
     public sealed class TraceLoggerI : LoggerI
@@ -206,22 +203,14 @@
 
         public override void trace(string category, string message)
         {
-            string s = format(category, message);
-            lock(_globalMutex)
-            {
-                Trace.TraceInformation(s);
-                Trace.Flush();
-            }
+            Trace.TraceInformation(format(category, message));
+            Trace.Flush();
         }
 
         public override void warning(string message)
         {
-            string s = format("warning", message);
-            lock(_globalMutex)
-            {
-                Trace.TraceWarning(s);
-                Trace.Flush();
-            }
+            Trace.TraceWarning(format("warning", message));
+            Trace.Flush();
         }
 
         public override void error(string message)
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/LoggerPlugin.cs zeroc-ice-3.7.2/csharp/src/Ice/LoggerPlugin.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/LoggerPlugin.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/LoggerPlugin.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/MetricsAdminI.cs zeroc-ice-3.7.2/csharp/src/Ice/MetricsAdminI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/MetricsAdminI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/MetricsAdminI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/MetricsObserverI.cs zeroc-ice-3.7.2/csharp/src/Ice/MetricsObserverI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/MetricsObserverI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/MetricsObserverI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceMX
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/msbuild/net45/ice.csproj zeroc-ice-3.7.2/csharp/src/Ice/msbuild/net45/ice.csproj
--- zeroc-ice-3.7.1/csharp/src/Ice/msbuild/net45/ice.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/msbuild/net45/ice.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{7CB4715E-DD8B-48F8-B478-27B8BD4008C7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Ice</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\Ice.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj zeroc-ice-3.7.2/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj
--- zeroc-ice-3.7.1/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -14,4 +14,5 @@
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Network.cs zeroc-ice-3.7.2/csharp/src/Ice/Network.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Network.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Network.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -262,9 +257,6 @@
         public static Socket createServerSocket(bool udp, AddressFamily family, int protocol)
         {
             Socket socket = createSocket(udp, family);
-            //
-            // The IPv6Only enumerator was added in .NET 4.
-            //
             if(family == AddressFamily.InterNetworkV6 && protocol != EnableIPv4)
             {
                 try
@@ -449,7 +441,7 @@
                 {
                     socket.SetSocketOption(SocketOptionLevel.IP,
                                            SocketOptionName.MulticastInterface,
-                                           IPAddress.HostToNetworkOrder(getInterfaceIndex(iface, family)));
+                                           getInterfaceAddress(iface, family).GetAddressBytes());
                 }
                 else
                 {
@@ -471,25 +463,26 @@
                 var indexes = new HashSet<int>();
                 foreach(string intf in getInterfacesForMulticast(iface, getProtocolSupport(group)))
                 {
-                    int index = getInterfaceIndex(intf, group.AddressFamily);
-                    if(!indexes.Contains(index))
+                    if(group.AddressFamily == AddressFamily.InterNetwork)
                     {
-                        indexes.Add(index);
-                        if(group.AddressFamily == AddressFamily.InterNetwork)
+                        MulticastOption option;
+                        IPAddress addr = getInterfaceAddress(intf, group.AddressFamily);
+                        if(addr == null)
                         {
-                            MulticastOption option;
-                            if(index == -1)
-                            {
-                                option = new MulticastOption(group);
-                            }
-                            else
-                            {
-                                option = new MulticastOption(group, index);
-                            }
-                            s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, option);
+                            option = new MulticastOption(group);
                         }
                         else
                         {
+                            option = new MulticastOption(group, addr);
+                        }
+                        s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, option);
+                    }
+                    else
+                    {
+                        int index = getInterfaceIndex(intf, group.AddressFamily);
+                        if(!indexes.Contains(index))
+                        {
+                            indexes.Add(index);
                             IPv6MulticastOption option;
                             if(index == -1)
                             {
@@ -1179,6 +1172,88 @@
             return null;
         }
 
+        private static IPAddress
+        getInterfaceAddress(string iface, AddressFamily family)
+        {
+            if(iface.Length == 0)
+            {
+                return null;
+            }
+
+            //
+            // The iface parameter must either be an IP address, an
+            // index or the name of an interface. If it's an index we
+            // just return it. If it's an IP addess we search for an
+            // interface which has this IP address. If it's a name we
+            // search an interface with this name.
+            //
+
+            try
+            {
+                return IPAddress.Parse(iface);
+            }
+            catch(FormatException)
+            {
+            }
+
+            NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
+            try
+            {
+                int index = int.Parse(iface, CultureInfo.InvariantCulture);
+                foreach(NetworkInterface ni in nics)
+                {
+                    IPInterfaceProperties ipProps = ni.GetIPProperties();
+                    int interfaceIndex = -1;
+                    if(family == AddressFamily.InterNetwork)
+                    {
+                        IPv4InterfaceProperties ipv4Props = ipProps.GetIPv4Properties();
+                        if(ipv4Props != null && ipv4Props.Index == index)
+                        {
+                            interfaceIndex = ipv4Props.Index;
+                        }
+                    }
+                    else
+                    {
+                        IPv6InterfaceProperties ipv6Props = ipProps.GetIPv6Properties();
+                        if(ipv6Props != null && ipv6Props.Index == index)
+                        {
+                            interfaceIndex = ipv6Props.Index;
+                        }
+                    }
+                    if(interfaceIndex >= 0)
+                    {
+                        foreach(UnicastIPAddressInformation a in ipProps.UnicastAddresses)
+                        {
+                            if(a.Address.AddressFamily == family)
+                            {
+                                return a.Address;
+                            }
+                        }
+                    }
+                }
+            }
+            catch(FormatException)
+            {
+            }
+
+            foreach(NetworkInterface ni in nics)
+            {
+                if(ni.Name == iface)
+                {
+                    IPInterfaceProperties ipProps = ni.GetIPProperties();
+                    foreach(UnicastIPAddressInformation a in ipProps.UnicastAddresses)
+                    {
+                        if(a.Address.AddressFamily == family)
+                        {
+                            return a.Address;
+                        }
+                    }
+                }
+            }
+
+            throw new ArgumentException("couldn't find interface `" + iface + "'");
+        }
+
         private static int
         getInterfaceIndex(string iface, AddressFamily family)
         {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/NetworkProxy.cs zeroc-ice-3.7.2/csharp/src/Ice/NetworkProxy.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/NetworkProxy.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/NetworkProxy.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ObjectAdapterFactory.cs zeroc-ice-3.7.2/csharp/src/Ice/ObjectAdapterFactory.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ObjectAdapterFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ObjectAdapterFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ObjectAdapterI.cs zeroc-ice-3.7.2/csharp/src/Ice/ObjectAdapterI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ObjectAdapterI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ObjectAdapterI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Object.cs zeroc-ice-3.7.2/csharp/src/Ice/Object.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Object.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Object.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Threading.Tasks;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ObserverHelper.cs zeroc-ice-3.7.2/csharp/src/Ice/ObserverHelper.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ObserverHelper.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ObserverHelper.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/OpaqueEndpointI.cs zeroc-ice-3.7.2/csharp/src/Ice/OpaqueEndpointI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/OpaqueEndpointI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/OpaqueEndpointI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Optional.cs zeroc-ice-3.7.2/csharp/src/Ice/Optional.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Optional.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Optional.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Options.cs zeroc-ice-3.7.2/csharp/src/Ice/Options.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Options.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Options.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/OutgoingAsync.cs zeroc-ice-3.7.2/csharp/src/Ice/OutgoingAsync.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/OutgoingAsync.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/OutgoingAsync.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -185,10 +180,11 @@
 
         public void attachRemoteObserver(Ice.ConnectionInfo info, Ice.Endpoint endpt, int requestId)
         {
-            if(observer_ != null)
+            Ice.Instrumentation.InvocationObserver observer = getObserver();
+            if(observer != null)
             {
                 int size = os_.size() - Protocol.headerSize - 4;
-                childObserver_ = getObserver().getRemoteObserver(info, endpt, requestId, size);
+                childObserver_ = observer.getRemoteObserver(info, endpt, requestId, size);
                 if(childObserver_ != null)
                 {
                     childObserver_.attach();
@@ -198,10 +194,11 @@
 
         public void attachCollocatedObserver(Ice.ObjectAdapter adapter, int requestId)
         {
-            if(observer_ != null)
+            Ice.Instrumentation.InvocationObserver observer = getObserver();
+            if(observer != null)
             {
                 int size = os_.size() - Protocol.headerSize - 4;
-                childObserver_ = getObserver().getCollocatedObserver(adapter, requestId, size);
+                childObserver_ = observer.getCollocatedObserver(adapter, requestId, size);
                 if(childObserver_ != null)
                 {
                     childObserver_.attach();
@@ -1344,7 +1341,7 @@
 
             try
             {
-                var flushBatch = new FlushBatch(this, instance_, _observer);
+                var flushBatch = new FlushBatch(this, instance_, observer_);
                 bool compress;
                 int batchRequestNum = con.getBatchRequestQueue().swap(flushBatch.getOs(), out compress);
                 if(batchRequestNum == 0)
@@ -1379,11 +1376,7 @@
         public void invoke(string operation, Ice.CompressBatch compressBatch, bool synchronous)
         {
             synchronous_ = synchronous;
-            _observer = ObserverHelper.get(instance_, operation);
-            if(_observer != null)
-            {
-                _observer.attach();
-            }
+            observer_ = ObserverHelper.get(instance_, operation);
             instance_.outgoingConnectionFactory().flushAsyncBatchRequests(compressBatch, this);
             instance_.objectAdapterFactory().flushAsyncBatchRequests(compressBatch, this);
             check(true);
@@ -1415,7 +1408,6 @@
         }
 
         private int _useCount;
-        private Ice.Instrumentation.InvocationObserver _observer;
     };
 
     public abstract class TaskCompletionCallback<T> : TaskCompletionSource<T>, OutgoingAsyncCompletionCallback
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/OutputBase.cs zeroc-ice-3.7.2/csharp/src/Ice/OutputBase.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/OutputBase.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/OutputBase.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceUtilInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/OutputStream.cs zeroc-ice-3.7.2/csharp/src/Ice/OutputStream.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/OutputStream.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/OutputStream.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Patcher.cs zeroc-ice-3.7.2/csharp/src/Ice/Patcher.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Patcher.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Patcher.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/PluginManagerI.cs zeroc-ice-3.7.2/csharp/src/Ice/PluginManagerI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/PluginManagerI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/PluginManagerI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
@@ -35,6 +30,18 @@
     {
         private static string _kindOfObject = "plugin";
 
+        internal static void registerPluginFactory(string name, PluginFactory factory, bool loadOnInit)
+        {
+            if(!_factories.ContainsKey(name))
+            {
+                _factories[name] = factory;
+                if(loadOnInit)
+                {
+                    _loadOnInitialization.Add(name);
+                }
+            }
+        }
+
         public void initializePlugins()
         {
             if(_initialized)
@@ -189,6 +196,42 @@
         public void loadPlugins(ref string[] cmdArgs)
         {
             Debug.Assert(_communicator != null);
+            string prefix = "Ice.Plugin.";
+            Properties properties = _communicator.getProperties();
+            Dictionary<string, string> plugins = properties.getPropertiesForPrefix(prefix);
+
+            //
+            // First, load static plugin factories which were setup to load on
+            // communicator initialization. If a matching plugin property is
+            // set, we load the plugin with the plugin specification. The
+            // entryPoint will be ignored but the rest of the plugin
+            // specification might be used.
+            //
+            foreach(var name in _loadOnInitialization)
+            {
+                string key = "Ice.Plugin." + name + ".clr";
+                string r = null;
+                plugins.TryGetValue(key, out r);
+                if(r != null)
+                {
+                    plugins.Remove("Ice.Plugin." + name);
+                }
+                else
+                {
+                    key = "Ice.Plugin." + name;
+                    plugins.TryGetValue(key, out r);
+                }
+
+                if(r != null)
+                {
+                    loadPlugin(name, r, ref cmdArgs);
+                    plugins.Remove(key);
+                }
+                else
+                {
+                    loadPlugin(name, "", ref cmdArgs);
+                }
+            }
 
             //
             // Load and initialize the plug-ins defined in the property set
@@ -206,9 +249,6 @@
             // specified plug-ins in the specified order, then load any
             // remaining plug-ins.
             //
-            string prefix = "Ice.Plugin.";
-            Properties properties = _communicator.getProperties();
-            Dictionary<string, string> plugins = properties.getPropertiesForPrefix(prefix);
 
             string[] loadOrder = properties.getPropertyAsList("Ice.PluginLoadOrder");
             for(int i = 0; i < loadOrder.Length; ++i)
@@ -226,20 +266,20 @@
                 }
 
                 string key = "Ice.Plugin." + loadOrder[i] + ".clr";
-                bool hasKey = plugins.ContainsKey(key);
-                if(hasKey)
+                string value = null;
+                plugins.TryGetValue(key, out value);
+                if(value != null)
                 {
                     plugins.Remove("Ice.Plugin." + loadOrder[i]);
                 }
                 else
                 {
                     key = "Ice.Plugin." + loadOrder[i];
-                    hasKey = plugins.ContainsKey(key);
+                    plugins.TryGetValue(key, out value);
                 }
 
-                if(hasKey)
+                if(value != null)
                 {
-                    string value = plugins[key];
                     loadPlugin(loadOrder[i], value, ref cmdArgs);
                     plugins.Remove(key);
                 }
@@ -312,147 +352,159 @@
         {
             Debug.Assert(_communicator != null);
 
-            //
-            // Split the entire property value into arguments. An entry point containing spaces
-            // must be enclosed in quotes.
-            //
             string[] args = null;
-            try
+            string entryPoint = null;
+            if(pluginSpec.Length > 0)
             {
-                args = IceUtilInternal.Options.split(pluginSpec);
-            }
-            catch(IceUtilInternal.Options.BadQuote ex)
-            {
-                PluginInitializationException e = new PluginInitializationException();
-                e.reason = "invalid arguments for plug-in `" + name + "':\n" + ex.Message;
-                throw e;
-            }
+                //
+                // Split the entire property value into arguments. An entry point containing spaces
+                // must be enclosed in quotes.
+                //
+                try
+                {
+                    args = IceUtilInternal.Options.split(pluginSpec);
+                }
+                catch(IceUtilInternal.Options.BadQuote ex)
+                {
+                    PluginInitializationException e = new PluginInitializationException();
+                    e.reason = "invalid arguments for plug-in `" + name + "':\n" + ex.Message;
+                    throw e;
+                }
 
-            Debug.Assert(args.Length > 0);
+                Debug.Assert(args.Length > 0);
 
-            string entryPoint = args[0];
+                entryPoint = args[0];
 
-            //
-            // Shift the arguments.
-            //
-            string[] tmp = new string[args.Length - 1];
-            Array.Copy(args, 1, tmp, 0, args.Length - 1);
-            args = tmp;
+                //
+                // Shift the arguments.
+                //
+                string[] tmp = new string[args.Length - 1];
+                Array.Copy(args, 1, tmp, 0, args.Length - 1);
+                args = tmp;
 
-            //
-            // Convert command-line options into properties. First
-            // we convert the options from the plug-in
-            // configuration, then we convert the options from the
-            // application command-line.
-            //
-            Properties properties = _communicator.getProperties();
-            args = properties.parseCommandLineOptions(name, args);
-            cmdArgs = properties.parseCommandLineOptions(name, cmdArgs);
+                //
+                // Convert command-line options into properties. First
+                // we convert the options from the plug-in
+                // configuration, then we convert the options from the
+                // application command-line.
+                //
+                Properties properties = _communicator.getProperties();
+                args = properties.parseCommandLineOptions(name, args);
+                cmdArgs = properties.parseCommandLineOptions(name, cmdArgs);
+            }
 
+            string err = "unable to load plug-in `" + entryPoint + "': ";
             //
-            // Extract the assembly name and the class name.
+            // Always check the static plugin factory table first, it takes
+            // precedence over the the entryPoint specified in the plugin
+            // property value.
             //
-            string err = "unable to load plug-in `" + entryPoint + "': ";
-            int sepPos = entryPoint.IndexOf(':');
-            if(sepPos != -1)
+            PluginFactory pluginFactory = null;
+            if(!_factories.TryGetValue(name, out pluginFactory))
             {
-                const string driveLetters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-                if(entryPoint.Length > 3 &&
-                   sepPos == 1 &&
-                   driveLetters.IndexOf(entryPoint[0]) != -1 &&
-                   (entryPoint[2] == '\\' || entryPoint[2] == '/'))
+                //
+                // Extract the assembly name and the class name.
+                //
+                int sepPos = entryPoint.IndexOf(':');
+                if(sepPos != -1)
                 {
-                    sepPos = entryPoint.IndexOf(':', 3);
+                    const string driveLetters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+                    if(entryPoint.Length > 3 &&
+                       sepPos == 1 &&
+                       driveLetters.IndexOf(entryPoint[0]) != -1 &&
+                       (entryPoint[2] == '\\' || entryPoint[2] == '/'))
+                    {
+                        sepPos = entryPoint.IndexOf(':', 3);
+                    }
+                }
+                if(sepPos == -1)
+                {
+                    PluginInitializationException e = new PluginInitializationException();
+                    e.reason = err + "invalid entry point format";
+                    throw e;
                 }
-            }
-            if(sepPos == -1)
-            {
-                PluginInitializationException e = new PluginInitializationException();
-                e.reason = err + "invalid entry point format";
-                throw e;
-            }
 
-            System.Reflection.Assembly pluginAssembly = null;
-            string assemblyName = entryPoint.Substring(0, sepPos);
-            string className = entryPoint.Substring(sepPos + 1);
+                System.Reflection.Assembly pluginAssembly = null;
+                string assemblyName = entryPoint.Substring(0, sepPos);
+                string className = entryPoint.Substring(sepPos + 1);
 
-            try
-            {
-                //
-                // First try to load the assembly using Assembly.Load, which will succeed
-                // if a fully-qualified name is provided or if a partial name has been qualified
-                // in configuration. If that fails, try Assembly.LoadFrom(), which will succeed
-                // if a file name is configured or a partial name is configured and DEVPATH is used.
-                //
-                // We catch System.Exception as this can fail with System.ArgumentNullException
-                // or System.IO.IOException depending of the .NET framework and platform.
-                //
                 try
                 {
-                    pluginAssembly = System.Reflection.Assembly.Load(assemblyName);
-                }
-                catch(System.Exception ex)
-                {
+                    //
+                    // First try to load the assembly using Assembly.Load, which will succeed
+                    // if a fully-qualified name is provided or if a partial name has been qualified
+                    // in configuration. If that fails, try Assembly.LoadFrom(), which will succeed
+                    // if a file name is configured or a partial name is configured and DEVPATH is used.
+                    //
+                    // We catch System.Exception as this can fail with System.ArgumentNullException
+                    // or System.IO.IOException depending of the .NET framework and platform.
+                    //
                     try
                     {
-                        pluginAssembly = System.Reflection.Assembly.LoadFrom(assemblyName);
+                        pluginAssembly = System.Reflection.Assembly.Load(assemblyName);
                     }
-                    catch(System.IO.IOException)
+                    catch(System.Exception ex)
                     {
-                         throw ex;
+                        try
+                        {
+                            pluginAssembly = System.Reflection.Assembly.LoadFrom(assemblyName);
+                        }
+                        catch(System.IO.IOException)
+                        {
+                            throw ex;
+                        }
                     }
                 }
-            }
-            catch(System.Exception ex)
-            {
-                PluginInitializationException e = new PluginInitializationException();
-                e.reason = err + "unable to load assembly: `" + assemblyName + "': " + ex.ToString();
-                throw e;
-            }
+                catch(System.Exception ex)
+                {
+                    PluginInitializationException e = new PluginInitializationException();
+                    e.reason = err + "unable to load assembly: `" + assemblyName + "': " + ex.ToString();
+                    throw e;
+                }
 
-            //
-            // Instantiate the class.
-            //
-            PluginFactory pluginFactory = null;
-            System.Type c = null;
-            try
-            {
-                c = pluginAssembly.GetType(className, true);
-            }
-            catch(System.Exception ex)
-            {
-                PluginInitializationException e = new PluginInitializationException(ex);
-                e.reason = err + "GetType failed for `" + className + "'";
-                throw e;
-            }
+                //
+                // Instantiate the class.
+                //
+                System.Type c = null;
+                try
+                {
+                    c = pluginAssembly.GetType(className, true);
+                }
+                catch(System.Exception ex)
+                {
+                    PluginInitializationException e = new PluginInitializationException(ex);
+                    e.reason = err + "GetType failed for `" + className + "'";
+                    throw e;
+                }
 
-            try
-            {
-                pluginFactory = (PluginFactory)IceInternal.AssemblyUtil.createInstance(c);
-                if(pluginFactory == null)
+                try
                 {
-                    PluginInitializationException e = new PluginInitializationException();
-                    e.reason = err + "can't find constructor for `" + className + "'";
+                    pluginFactory = (PluginFactory)IceInternal.AssemblyUtil.createInstance(c);
+                    if(pluginFactory == null)
+                    {
+                        PluginInitializationException e = new PluginInitializationException();
+                        e.reason = err + "can't find constructor for `" + className + "'";
+                        throw e;
+                    }
+                }
+                catch(InvalidCastException ex)
+                {
+                    PluginInitializationException e = new PluginInitializationException(ex);
+                    e.reason = err + "InvalidCastException to Ice.PluginFactory";
+                    throw e;
+                }
+                catch(UnauthorizedAccessException ex)
+                {
+                    PluginInitializationException e = new PluginInitializationException(ex);
+                    e.reason = err + "UnauthorizedAccessException: " + ex.ToString();
+                    throw e;
+                }
+                catch(System.Exception ex)
+                {
+                    PluginInitializationException e = new PluginInitializationException(ex);
+                    e.reason = err + "System.Exception: " + ex.ToString();
                     throw e;
                 }
-            }
-            catch(InvalidCastException ex)
-            {
-                PluginInitializationException e = new PluginInitializationException(ex);
-                e.reason = err + "InvalidCastException to Ice.PluginFactory";
-                throw e;
-            }
-            catch(UnauthorizedAccessException ex)
-            {
-                PluginInitializationException e = new PluginInitializationException(ex);
-                e.reason = err + "UnauthorizedAccessException: " + ex.ToString();
-                throw e;
-            }
-            catch(System.Exception ex)
-            {
-                PluginInitializationException e = new PluginInitializationException(ex);
-                e.reason = err + "System.Exception: " + ex.ToString();
-                throw e;
             }
 
             Plugin plugin = null;
@@ -506,5 +558,8 @@
         private Communicator _communicator;
         private ArrayList _plugins;
         private bool _initialized;
+
+        private static Dictionary<string, PluginFactory> _factories = new Dictionary<string, PluginFactory>();
+        private static List<string> _loadOnInitialization = new List<string>();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ProcessI.cs zeroc-ice-3.7.2/csharp/src/Ice/ProcessI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ProcessI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ProcessI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/PropertiesAdminI.cs zeroc-ice-3.7.2/csharp/src/Ice/PropertiesAdminI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/PropertiesAdminI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/PropertiesAdminI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/PropertiesI.cs zeroc-ice-3.7.2/csharp/src/Ice/PropertiesI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/PropertiesI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/PropertiesI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections;
@@ -313,9 +308,12 @@
         public void load(string file)
         {
 #if NET45
-            if(file.StartsWith("HKLM\\", StringComparison.Ordinal))
+            if(file.StartsWith("HKCU\\", StringComparison.Ordinal) ||
+               file.StartsWith("HKLM\\", StringComparison.Ordinal))
             {
-                RegistryKey iceKey = Registry.LocalMachine.OpenSubKey(file.Substring(5));
+                RegistryKey key =
+                    file.StartsWith("HKCU\\", StringComparison.Ordinal) ? Registry.CurrentUser : Registry.LocalMachine;
+                RegistryKey iceKey = key.OpenSubKey(file.Substring(file.IndexOf("\\") + 1));
                 if(iceKey == null)
                 {
                     Ice.InitializationException ex = new Ice.InitializationException();
@@ -377,14 +375,8 @@
             }
         }
 
-        internal PropertiesI(PropertiesI p)
+        internal PropertiesI(PropertiesI p) : this()
         {
-            //
-            // NOTE: we can't just do a shallow copy of the map as the map values
-            // would otherwise be shared between the two PropertiesI object.
-            //
-            //_properties = new Dictionary<string, PropertyValue>(p._properties);
-            _properties = new Dictionary<string, PropertyValue>();
             foreach(KeyValuePair<string, PropertyValue> entry in p._properties)
             {
                 _properties[entry.Key] = new PropertyValue(entry.Value);
@@ -396,20 +388,10 @@
             _properties = new Dictionary<string, PropertyValue>();
         }
 
-        internal PropertiesI(ref string[] args, Properties defaults)
+        internal PropertiesI(ref string[] args, Properties defaults) : this()
         {
-            if(defaults == null)
+            if(defaults != null)
             {
-                _properties = new Dictionary<string, PropertyValue>();
-            }
-            else
-            {
-                //
-                // NOTE: we can't just do a shallow copy of the map as the map values
-                // would otherwise be shared between the two PropertiesI object.
-                //
-                //_properties = ((PropertiesI)defaults)._properties;
-                _properties = new Dictionary<string, PropertyValue>();
                 foreach(KeyValuePair<string, PropertyValue> entry in ((PropertiesI)defaults)._properties)
                 {
                     _properties[entry.Key] = new PropertyValue(entry.Value);
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Property.cs zeroc-ice-3.7.2/csharp/src/Ice/Property.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Property.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Property.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/PropertyNames.cs zeroc-ice-3.7.2/csharp/src/Ice/PropertyNames.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/PropertyNames.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/PropertyNames.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 14 10:24:07 2018
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -183,6 +178,7 @@
              new Property(@"^Ice\.TCP\.SndSize$", false, null),
              new Property(@"^Ice\.UseApplicationClassLoader$", false, null),
              new Property(@"^Ice\.UseSyslog$", false, null),
+             new Property(@"^Ice\.UseSystemdJournal$", false, null),
              new Property(@"^Ice\.Warn\.AMICallback$", false, null),
              new Property(@"^Ice\.Warn\.Connections$", false, null),
              new Property(@"^Ice\.Warn\.Datagrams$", false, null),
@@ -192,7 +188,7 @@
              new Property(@"^Ice\.Warn\.UnusedProperties$", false, null),
              new Property(@"^Ice\.CacheMessageBuffers$", false, null),
              new Property(@"^Ice\.ThreadInterruptSafe$", false, null),
-             new Property(@"^Ice\.Voip$", false, null),
+             new Property(@"^Ice\.Voip$", true, null),
              null
         };
 
@@ -510,6 +506,43 @@
              new Property(@"^IceGridAdmin\.Host$", false, null),
              new Property(@"^IceGridAdmin\.Port$", false, null),
              new Property(@"^IceGridAdmin\.InstanceName$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ACM\.Timeout$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ACM\.Heartbeat$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ACM\.Close$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ACM$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.AdapterId$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Endpoints$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.EndpointSelection$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.ConnectionCached$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.PreferSecure$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.LocatorCacheTimeout$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.InvocationTimeout$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.Locator$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.Router$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.CollocationOptimized$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator\.Context\.[^\s]+$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Locator$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.PublishedEndpoints$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ReplicaGroupId$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.EndpointSelection$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.ConnectionCached$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.PreferSecure$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.LocatorCacheTimeout$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.InvocationTimeout$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.Locator$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.Router$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.CollocationOptimized$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router\.Context\.[^\s]+$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.Router$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ProxyOptions$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.Size$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.SizeMax$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.SizeWarn$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.StackSize$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.Serialize$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.ThreadIdleTime$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.ThreadPriority$", false, null),
+             new Property(@"^IceGridAdmin\.Server\.MessageSizeMax$", false, null),
              new Property(@"^IceGridAdmin\.Discovery\.Address$", false, null),
              new Property(@"^IceGridAdmin\.Discovery\.Interface$", false, null),
              new Property(@"^IceGridAdmin\.Discovery\.Lookup$", false, null),
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Protocol.cs zeroc-ice-3.7.2/csharp/src/Ice/Protocol.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Protocol.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Protocol.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ProtocolInstance.cs zeroc-ice-3.7.2/csharp/src/Ice/ProtocolInstance.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ProtocolInstance.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ProtocolInstance.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Net;
 
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ProtocolPluginFacade.cs zeroc-ice-3.7.2/csharp/src/Ice/ProtocolPluginFacade.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ProtocolPluginFacade.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ProtocolPluginFacade.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Proxy.cs zeroc-ice-3.7.2/csharp/src/Ice/Proxy.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Proxy.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Proxy.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ProxyFactory.cs zeroc-ice-3.7.2/csharp/src/Ice/ProxyFactory.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ProxyFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ProxyFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ProxyIdentityKey.cs zeroc-ice-3.7.2/csharp/src/Ice/ProxyIdentityKey.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ProxyIdentityKey.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ProxyIdentityKey.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Globalization;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Reference.cs zeroc-ice-3.7.2/csharp/src/Ice/Reference.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Reference.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Reference.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ReferenceFactory.cs zeroc-ice-3.7.2/csharp/src/Ice/ReferenceFactory.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ReferenceFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ReferenceFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ReplyStatus.cs zeroc-ice-3.7.2/csharp/src/Ice/ReplyStatus.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ReplyStatus.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ReplyStatus.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/RequestHandler.cs zeroc-ice-3.7.2/csharp/src/Ice/RequestHandler.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/RequestHandler.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/RequestHandler.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/RequestHandlerFactory.cs zeroc-ice-3.7.2/csharp/src/Ice/RequestHandlerFactory.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/RequestHandlerFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/RequestHandlerFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ResponseHandler.cs zeroc-ice-3.7.2/csharp/src/Ice/ResponseHandler.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ResponseHandler.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ResponseHandler.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using Ice.Instrumentation;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/RetryQueue.cs zeroc-ice-3.7.2/csharp/src/Ice/RetryQueue.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/RetryQueue.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/RetryQueue.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/RouterInfo.cs zeroc-ice-3.7.2/csharp/src/Ice/RouterInfo.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/RouterInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/RouterInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ServantManager.cs zeroc-ice-3.7.2/csharp/src/Ice/ServantManager.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ServantManager.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ServantManager.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/SliceChecksums.cs zeroc-ice-3.7.2/csharp/src/Ice/SliceChecksums.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/SliceChecksums.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/SliceChecksums.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/SlicedData.cs zeroc-ice-3.7.2/csharp/src/Ice/SlicedData.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/SlicedData.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/SlicedData.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/SocketOperation.cs zeroc-ice-3.7.2/csharp/src/Ice/SocketOperation.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/SocketOperation.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/SocketOperation.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/StreamSocket.cs zeroc-ice-3.7.2/csharp/src/Ice/StreamSocket.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/StreamSocket.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/StreamSocket.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -361,6 +356,15 @@
         private int read(ByteBuffer buf)
         {
             Debug.Assert(_fd != null);
+            if(AssemblyUtil.isMono)
+            {
+                //
+                // Mono on Android and iOS don't support the use of synchronous socket
+                // operations on a non-blocking socket. Returning 0 here forces the caller to schedule
+                // an asynchronous operation.
+                //
+                return 0;
+            }
             int read = 0;
             while(buf.hasRemaining())
             {
@@ -398,7 +402,15 @@
         private int write(ByteBuffer buf)
         {
             Debug.Assert(_fd != null);
-
+            if(AssemblyUtil.isMono)
+            {
+                //
+                // Mono on Android and iOS don't support the use of synchronous socket
+                // operations on a non-blocking socket. Returning 0 here forces the caller to schedule
+                // an asynchronous operation.
+                //
+                return 0;
+            }
             int packetSize = buf.remaining();
             if(AssemblyUtil.isWindows)
             {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/StreamWrapper.cs zeroc-ice-3.7.2/csharp/src/Ice/StreamWrapper.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/StreamWrapper.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/StreamWrapper.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/StringUtil.cs zeroc-ice-3.7.2/csharp/src/Ice/StringUtil.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/StringUtil.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/StringUtil.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Text;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/TcpAcceptor.cs zeroc-ice-3.7.2/csharp/src/Ice/TcpAcceptor.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/TcpAcceptor.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/TcpAcceptor.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/TcpConnector.cs zeroc-ice-3.7.2/csharp/src/Ice/TcpConnector.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/TcpConnector.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/TcpConnector.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/TcpEndpointI.cs zeroc-ice-3.7.2/csharp/src/Ice/TcpEndpointI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/TcpEndpointI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/TcpEndpointI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/TcpTransceiver.cs zeroc-ice-3.7.2/csharp/src/Ice/TcpTransceiver.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/TcpTransceiver.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/TcpTransceiver.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ThreadHookPlugin.cs zeroc-ice-3.7.2/csharp/src/Ice/ThreadHookPlugin.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ThreadHookPlugin.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ThreadHookPlugin.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ThreadPool.cs zeroc-ice-3.7.2/csharp/src/Ice/ThreadPool.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ThreadPool.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ThreadPool.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/TieBase.cs zeroc-ice-3.7.2/csharp/src/Ice/TieBase.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/TieBase.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/TieBase.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Time.cs zeroc-ice-3.7.2/csharp/src/Ice/Time.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Time.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Time.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Timer.cs zeroc-ice-3.7.2/csharp/src/Ice/Timer.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Timer.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Timer.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // NOTE: We don't use C# timers, the API is quite a bit different from
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/TraceLevels.cs zeroc-ice-3.7.2/csharp/src/Ice/TraceLevels.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/TraceLevels.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/TraceLevels.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/TraceUtil.cs zeroc-ice-3.7.2/csharp/src/Ice/TraceUtil.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/TraceUtil.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/TraceUtil.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Transceiver.cs zeroc-ice-3.7.2/csharp/src/Ice/Transceiver.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Transceiver.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Transceiver.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/UdpConnector.cs zeroc-ice-3.7.2/csharp/src/Ice/UdpConnector.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/UdpConnector.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/UdpConnector.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/UdpEndpointI.cs zeroc-ice-3.7.2/csharp/src/Ice/UdpEndpointI.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/UdpEndpointI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/UdpEndpointI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/UdpTransceiver.cs zeroc-ice-3.7.2/csharp/src/Ice/UdpTransceiver.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/UdpTransceiver.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/UdpTransceiver.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
@@ -49,23 +44,6 @@
                 {
                     throw new Ice.ConnectFailedException(ex);
                 }
-            }
-
-            if(_state <= StateConnectPending)
-            {
-                //
-                // On Windows, we delay the join for the mcast group after the connection
-                // establishment succeeds. This is necessary for older Windows versions
-                // where joining the group fails if the socket isn't bound. See ICE-5113.
-                //
-                if(Network.isMulticast((IPEndPoint)_addr))
-                {
-                    Network.setMcastGroup(_fd, ((IPEndPoint)_addr).Address, _mcastInterface);
-                    if(_mcastTtl != -1)
-                    {
-                        Network.setMcastTtl(_fd, _mcastTtl, _addr.AddressFamily);
-                    }
-                }
                 _state = StateConnected;
             }
 
@@ -241,7 +219,7 @@
                         }
                     }
 
-                    // TODO: Workaround for https://github.com/dotnet/corefx/pull/6666
+                    // TODO: Workaround for https://github.com/dotnet/corefx/issues/31182
                     if(_state == StateConnected ||
                        AssemblyUtil.isMacOS && _fd.AddressFamily == AddressFamily.InterNetworkV6 && _fd.DualMode)
                     {
@@ -329,7 +307,7 @@
 
             try
             {
-                // TODO: Workaround for https://github.com/dotnet/corefx/pull/6666
+                // TODO: Workaround for https://github.com/dotnet/corefx/issues/31182
                 if(_state == StateConnected ||
                    AssemblyUtil.isMacOS && _fd.AddressFamily == AddressFamily.InterNetworkV6 && _fd.DualMode)
                 {
@@ -383,7 +361,7 @@
                     throw new SocketException((int)_readEventArgs.SocketError);
                 }
                 ret = _readEventArgs.BytesTransferred;
-                // TODO: Workaround for https://github.com/dotnet/corefx/pull/6666
+                // TODO: Workaround for https://github.com/dotnet/corefx/issues/31182
                 if(_state != StateConnected &&
                    !(AssemblyUtil.isMacOS && _fd.AddressFamily == AddressFamily.InterNetworkV6 && _fd.DualMode))
                 {
@@ -702,7 +680,6 @@
             _writeEventArgs.Completed += new EventHandler<SocketAsyncEventArgs>(ioCompleted);
 
             _mcastInterface = mcastInterface;
-            _mcastTtl = mcastTtl;
             _state = StateNeedConnect;
             _incoming = false;
 
@@ -717,6 +694,10 @@
                     {
                         Network.setMcastInterface(_fd, _mcastInterface, _addr.AddressFamily);
                     }
+                    if(mcastTtl != -1)
+                    {
+                        Network.setMcastTtl(_fd, mcastTtl, _addr.AddressFamily);
+                    }
                 }
             }
             catch(Ice.LocalException)
@@ -894,7 +875,6 @@
         private IPEndPoint _mcastAddr = null;
         private EndPoint _peerAddr = null;
         private string _mcastInterface = null;
-        private int _mcastTtl = -1;
 
         private int _port = 0;
         private bool _bound = false;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/UnknownSlicedValue.cs zeroc-ice-3.7.2/csharp/src/Ice/UnknownSlicedValue.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/UnknownSlicedValue.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/UnknownSlicedValue.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace Ice
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Util.cs zeroc-ice-3.7.2/csharp/src/Ice/Util.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Util.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Util.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Threading;
@@ -106,6 +101,11 @@
         /// The value factory manager.
         /// </summary>
         public ValueFactoryManager valueFactoryManager;
+
+        /// <summary>
+        /// The list of TypeId namespaces. Default is Ice.TypeId.
+        /// </summary>
+        public string[] typeIdNamespaces = { "Ice.TypeId" };
     }
 
     /// <summary>
@@ -515,7 +515,7 @@
         /// <returns>The Ice version.</returns>
         public static string stringVersion()
         {
-            return "3.7.1"; // "A.B.C", with A=major, B=minor, C=patch
+            return "3.7.2"; // "A.B.C", with A=major, B=minor, C=patch
         }
 
         /// <summary>
@@ -526,7 +526,7 @@
         /// <returns>The Ice version.</returns>
         public static int intVersion()
         {
-            return 30701; // AABBCC, with AA=major, BB=minor, CC=patch
+            return 30702; // AABBCC, with AA=major, BB=minor, CC=patch
         }
 
         /// <summary>
@@ -609,6 +609,11 @@
             return string.Format("{0}.{1}", major, minor);
         }
 
+        public static void registerPluginFactory(string name, PluginFactory factory, bool loadOnInit)
+        {
+            PluginManagerI.registerPluginFactory(name, factory, loadOnInit);
+        }
+
         public static readonly ProtocolVersion currentProtocol =
             new ProtocolVersion(IceInternal.Protocol.protocolMajor, IceInternal.Protocol.protocolMinor);
 
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/Value.cs zeroc-ice-3.7.2/csharp/src/Ice/Value.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/Value.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/Value.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.ComponentModel;
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ValueFactoryManager.cs zeroc-ice-3.7.2/csharp/src/Ice/ValueFactoryManager.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ValueFactoryManager.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ValueFactoryManager.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/ValueWriter.cs zeroc-ice-3.7.2/csharp/src/Ice/ValueWriter.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/ValueWriter.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/ValueWriter.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/WSAcceptor.cs zeroc-ice-3.7.2/csharp/src/Ice/WSAcceptor.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/WSAcceptor.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/WSAcceptor.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/WSConnector.cs zeroc-ice-3.7.2/csharp/src/Ice/WSConnector.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/WSConnector.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/WSConnector.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/WSEndpoint.cs zeroc-ice-3.7.2/csharp/src/Ice/WSEndpoint.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/WSEndpoint.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/WSEndpoint.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/Ice/WSTransceiver.cs zeroc-ice-3.7.2/csharp/src/Ice/WSTransceiver.cs
--- zeroc-ice-3.7.1/csharp/src/Ice/WSTransceiver.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/Ice/WSTransceiver.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceInternal
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceBox/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/IceBox/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/IceBox/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceBox/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IceBox/AssemblyInfoExe.cs zeroc-ice-3.7.2/csharp/src/IceBox/AssemblyInfoExe.cs
--- zeroc-ice-3.7.1/csharp/src/IceBox/AssemblyInfoExe.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceBox/AssemblyInfoExe.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj zeroc-ice-3.7.2/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj
--- zeroc-ice-3.7.1/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     <AssemblyName>iceboxnet</AssemblyName>
     <Version>$(IceVersion)</Version>
     <OutputPath>../../../../../bin</OutputPath>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="../../../AssemblyInfoExe.cs" />
@@ -18,4 +18,5 @@
     <ProjectReference Include="../../../../IceSSL/msbuild/netstandard2.0/icessl.csproj" />
     <ProjectReference Include="../../iceboxlib/netstandard2.0/iceboxlib.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceBox/msbuild/iceboxlib/net45/iceboxlib.csproj zeroc-ice-3.7.2/csharp/src/IceBox/msbuild/iceboxlib/net45/iceboxlib.csproj
--- zeroc-ice-3.7.1/csharp/src/IceBox/msbuild/iceboxlib/net45/iceboxlib.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceBox/msbuild/iceboxlib/net45/iceboxlib.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{FF25599C-3654-4DF3-8078-B8235341DF83}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IceBox</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\..\lib\net45\IceBox.XML</DocumentationFile>
     <OutputPath>..\..\..\..\..\lib\net45\</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj zeroc-ice-3.7.2/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj
--- zeroc-ice-3.7.1/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -17,4 +17,5 @@
   <ItemGroup>
     <ProjectReference Include="../../../../Ice/msbuild/netstandard2.0/ice.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceBox/Server.cs zeroc-ice-3.7.2/csharp/src/IceBox/Server.cs
--- zeroc-ice-3.7.1/csharp/src/IceBox/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceBox/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
@@ -15,68 +10,82 @@
 
 public class Server
 {
-    public class App : Ice.Application
+    private static void usage()
+    {
+        Console.Error.WriteLine("Usage: iceboxnet [options] --Ice.Config=<file>\n");
+        Console.Error.WriteLine(
+            "Options:\n" +
+            "-h, --help           Show this message.\n" +
+            "-v, --version        Display the Ice version."
+        );
+    }
+
+    private static int run(Ice.Communicator communicator, string[] args)
     {
-        private static void usage()
+        const string prefix = "IceBox.Service.";
+        Ice.Properties properties = communicator.getProperties();
+        Dictionary<string, string> services = properties.getPropertiesForPrefix(prefix);
+
+        var argSeq = new List<string>(args);
+        foreach(KeyValuePair<string, string> pair in services)
         {
-            Console.Error.WriteLine("Usage: iceboxnet [options] --Ice.Config=<file>\n");
-            Console.Error.WriteLine(
-                "Options:\n" +
-                "-h, --help           Show this message.\n"
-            );
+            string name = pair.Key.Substring(prefix.Length);
+            argSeq.RemoveAll(v => v.StartsWith("--" + name));
         }
 
-        public override int run(string[] args)
+        foreach(string arg in args)
         {
-            List<string> argSeq = new List<string>(args);
-            const string prefix = "IceBox.Service.";
-            Ice.Properties properties = communicator().getProperties();
-            Dictionary<string, string> services = properties.getPropertiesForPrefix(prefix);
-            foreach(KeyValuePair<string, string> pair in services)
+            if(arg.Equals("-h") || arg.Equals("--help"))
             {
-                string name = pair.Key.Substring(prefix.Length);
-                for(int i = 0; i < argSeq.Count; ++i)
-                {
-                    if(argSeq[i].StartsWith("--" + name, StringComparison.CurrentCulture))
-                    {
-                        argSeq.RemoveAt(i);
-                        i--;
-                    }
-                }
+                usage();
+                return 0;
             }
-
-            foreach(string s in argSeq)
+            else if(arg.Equals("-v") || arg.Equals("--version"))
             {
-                if(s.Equals("-h") || s.Equals("--help"))
-                {
-                    usage();
-                    return 0;
-                }
-                else if(s.Equals("-v") || s.Equals("--version"))
-                {
-                    Console.Out.WriteLine(Ice.Util.stringVersion());
-                    return 0;
-                }
-                else
-                {
-                    Console.Error.WriteLine("Server: unknown option `" + s + "'");
-                    usage();
-                    return 1;
-                }
+                Console.Out.WriteLine(Ice.Util.stringVersion());
+                return 0;
+            }
+            else
+            {
+                Console.Error.WriteLine("IceBox.Server: unknown option `" + arg + "'");
+                usage();
+                return 1;
             }
-
-            ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator(), args);
-            return serviceManagerImpl.run();
         }
+
+        ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator, args);
+        return serviceManagerImpl.run();
     }
 
     public static int Main(string[] args)
     {
+        int status = 0;
+
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties();
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
-        App server = new App();
-        return server.main(args, initData);
+
+        try
+        {
+            using(var communicator = Ice.Util.initialize(ref args, initData))
+            {
+                Console.CancelKeyPress += (sender, eventArgs) =>
+                {
+                    eventArgs.Cancel = true;
+                    communicator.shutdown();
+                };
+
+                status = run(communicator, args);
+            }
+        }
+        catch(Exception ex)
+        {
+            Console.Error.WriteLine(ex);
+            status = 1;
+        }
+
+        return status;
     }
 }
+
 }
diff -Nru zeroc-ice-3.7.1/csharp/src/IceBox/ServiceManagerI.cs zeroc-ice-3.7.2/csharp/src/IceBox/ServiceManagerI.cs
--- zeroc-ice-3.7.1/csharp/src/IceBox/ServiceManagerI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceBox/ServiceManagerI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections;
@@ -407,14 +402,6 @@
             }
 
             //
-            // Don't move after the adapter activation. This allows
-            // applications to wait for the service manager to be
-            // reachable before sending a signal to shutdown the
-            //
-            //
-            Ice.Application.shutdownOnInterrupt();
-
-            //
             // Register "this" as a facet to the Admin object and create Admin object
             //
             try
diff -Nru zeroc-ice-3.7.1/csharp/src/IceDiscovery/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/IceDiscovery/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/IceDiscovery/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceDiscovery/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IceDiscovery/LocatorI.cs zeroc-ice-3.7.2/csharp/src/IceDiscovery/LocatorI.cs
--- zeroc-ice-3.7.1/csharp/src/IceDiscovery/LocatorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceDiscovery/LocatorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceDiscovery
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceDiscovery/LookupI.cs zeroc-ice-3.7.2/csharp/src/IceDiscovery/LookupI.cs
--- zeroc-ice-3.7.1/csharp/src/IceDiscovery/LookupI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceDiscovery/LookupI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceDiscovery
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceDiscovery/msbuild/net45/icediscovery.csproj zeroc-ice-3.7.2/csharp/src/IceDiscovery/msbuild/net45/icediscovery.csproj
--- zeroc-ice-3.7.1/csharp/src/IceDiscovery/msbuild/net45/icediscovery.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceDiscovery/msbuild/net45/icediscovery.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{CFFB222B-19D5-499E-B833-B0F7E523B16F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IceDiscovery</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\IceDiscovery.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45\</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj zeroc-ice-3.7.2/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj
--- zeroc-ice-3.7.1/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -17,4 +17,5 @@
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceDiscovery/PluginI.cs zeroc-ice-3.7.2/csharp/src/IceDiscovery/PluginI.cs
--- zeroc-ice-3.7.1/csharp/src/IceDiscovery/PluginI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceDiscovery/PluginI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceDiscovery
 {
@@ -153,4 +148,12 @@
         private Ice.LocatorPrx _defaultLocator;
     }
 
+    public class Util
+    {
+        public static void
+        registerIceDiscovery(bool loadOnInitialize)
+        {
+            Ice.Util.registerPluginFactory("IceDiscovery", new PluginFactory(), loadOnInitialize);
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/src/IceGrid/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/IceGrid/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/IceGrid/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceGrid/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IceGrid/msbuild/net45/icegrid.csproj zeroc-ice-3.7.2/csharp/src/IceGrid/msbuild/net45/icegrid.csproj
--- zeroc-ice-3.7.1/csharp/src/IceGrid/msbuild/net45/icegrid.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceGrid/msbuild/net45/icegrid.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{1153F70C-80E9-469A-952F-5117DAEE71A9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IceGrid</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\IceGrid.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45\</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj zeroc-ice-3.7.2/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj
--- zeroc-ice-3.7.1/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -18,4 +18,5 @@
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
     <ProjectReference Include="../../../Glacier2/msbuild/netstandard2.0/glacier2.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/msbuild/net45/icelocatordiscovery.csproj zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/msbuild/net45/icelocatordiscovery.csproj
--- zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/msbuild/net45/icelocatordiscovery.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/msbuild/net45/icelocatordiscovery.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{8D8AA726-3A35-407B-BD38-BEA828EEE727}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IceLocatorDiscovery</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\IceLocatorDiscovery.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45\</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj
--- zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -17,4 +17,5 @@
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/PluginI.cs zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/PluginI.cs
--- zeroc-ice-3.7.1/csharp/src/IceLocatorDiscovery/PluginI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceLocatorDiscovery/PluginI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceLocatorDiscovery
 {
@@ -733,4 +728,13 @@
         private Ice.LocatorPrx _locatorPrx;
         private Ice.LocatorPrx _defaultLocator;
     }
+
+    public class Util
+    {
+        public static void
+        registerIceLocatorDiscovery(bool loadOnInitialize)
+        {
+            Ice.Util.registerPluginFactory("IceLocatorDiscovery", new PluginFactory(), loadOnInitialize);
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/src/IcePatch2/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/IcePatch2/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/IcePatch2/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IcePatch2/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IcePatch2/msbuild/icepatch2.csproj zeroc-ice-3.7.2/csharp/src/IcePatch2/msbuild/icepatch2.csproj
--- zeroc-ice-3.7.1/csharp/src/IcePatch2/msbuild/icepatch2.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IcePatch2/msbuild/icepatch2.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{6479EE9D-5730-44BC-B564-97211E1B54C5}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IcePatch2</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\Assemblies\IcePatch2.XML</DocumentationFile>
     <NoWarn>1591;618</NoWarn>
   </PropertyGroup>
diff -Nru zeroc-ice-3.7.1/csharp/src/IcePatch2/msbuild/net45/icepatch2.csproj zeroc-ice-3.7.2/csharp/src/IcePatch2/msbuild/net45/icepatch2.csproj
--- zeroc-ice-3.7.1/csharp/src/IcePatch2/msbuild/net45/icepatch2.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IcePatch2/msbuild/net45/icepatch2.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{6479EE9D-5730-44BC-B564-97211E1B54C5}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IcePatch2</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\IcePatch2.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45\</OutputPath>
     <NoWarn>1591;618</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/AcceptorI.cs zeroc-ice-3.7.2/csharp/src/IceSSL/AcceptorI.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/AcceptorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/AcceptorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
@@ -71,7 +66,8 @@
             //
             // .NET requires that a certificate be supplied.
             //
-            if(instance.certs().Count == 0)
+            var certs = instance.certs();
+            if(certs == null || certs.Count == 0)
             {
                 Ice.SecurityException ex = new Ice.SecurityException();
                 ex.reason = "IceSSL: certificate required for server endpoint";
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/IceSSL/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/ConnectorI.cs zeroc-ice-3.7.2/csharp/src/IceSSL/ConnectorI.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/ConnectorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/ConnectorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/EndpointI.cs zeroc-ice-3.7.2/csharp/src/IceSSL/EndpointI.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/EndpointI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/EndpointI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/Instance.cs zeroc-ice-3.7.2/csharp/src/IceSSL/Instance.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/Instance.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/Instance.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/msbuild/net45/icessl.csproj zeroc-ice-3.7.2/csharp/src/IceSSL/msbuild/net45/icessl.csproj
--- zeroc-ice-3.7.1/csharp/src/IceSSL/msbuild/net45/icessl.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/msbuild/net45/icessl.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{B763DADE-440B-46BC-9CC0-BF0CF9D43182}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IceSSL</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\IceSSL.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45\</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj zeroc-ice-3.7.2/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj
--- zeroc-ice-3.7.1/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -17,4 +17,5 @@
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/Plugin.cs zeroc-ice-3.7.2/csharp/src/IceSSL/Plugin.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/Plugin.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/Plugin.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/PluginI.cs zeroc-ice-3.7.2/csharp/src/IceSSL/PluginI.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/PluginI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/PluginI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Security.Cryptography.X509Certificates;
 
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/RFC2253.cs zeroc-ice-3.7.2/csharp/src/IceSSL/RFC2253.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/RFC2253.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/RFC2253.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // See RFC 2253 and RFC 1779.
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/SSLEngine.cs zeroc-ice-3.7.2/csharp/src/IceSSL/SSLEngine.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/SSLEngine.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/SSLEngine.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
@@ -70,8 +65,22 @@
             // Protocols selects which protocols to enable, by default we only enable TLS1.0
             // TLS1.1 and TLS1.2 to avoid security issues with SSLv3
             //
-            _protocols = parseProtocols(
-                properties.getPropertyAsListWithDefault(prefix + "Protocols", new string[]{"TLS1_0", "TLS1_1", "TLS1_2"}));
+            var protocols = properties.getPropertyAsList(prefix + "Protocols");
+            if(protocols.Length > 0)
+            {
+                _protocols = parseProtocols(protocols);
+            }
+            else
+            {
+                _protocols = 0;
+                foreach(int v in Enum.GetValues(typeof(SslProtocols)))
+                {
+                    if(v > (int)SslProtocols.Ssl3 && v != (int)SslProtocols.Default)
+                    {
+                        _protocols |= (SslProtocols)v;
+                    }
+                }
+            }
             //
             // CheckCertName determines whether we compare the name in a peer's
             // certificate against its hostname.
@@ -667,6 +676,12 @@
                             protocol = "Tls12";
                             break;
                         }
+                        case "TLS1_3":
+                        case "TLSV1_3":
+                        {
+                            protocol = "Tls13";
+                            break;
+                        }
                         default:
                         {
                             break;
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/TransceiverI.cs zeroc-ice-3.7.2/csharp/src/IceSSL/TransceiverI.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/TransceiverI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/TransceiverI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/TrustManager.cs zeroc-ice-3.7.2/csharp/src/IceSSL/TrustManager.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/TrustManager.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/TrustManager.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
diff -Nru zeroc-ice-3.7.1/csharp/src/IceSSL/Util.cs zeroc-ice-3.7.2/csharp/src/IceSSL/Util.cs
--- zeroc-ice-3.7.1/csharp/src/IceSSL/Util.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceSSL/Util.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 namespace IceSSL
 {
@@ -15,9 +10,10 @@
 
     public sealed class Util
     {
-        public static X509Certificate2 createCertificate(string certPEM)
+        public static void
+        registerIceSSL(bool loadOnInitialize)
         {
-            return new X509Certificate2(System.Text.Encoding.ASCII.GetBytes(certPEM));
+            Ice.Util.registerPluginFactory("IceSSL", new PluginFactory(), loadOnInitialize);
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/src/IceStorm/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/src/IceStorm/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/src/IceStorm/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceStorm/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -19,8 +14,8 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
 
 [assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/src/IceStorm/msbuild/net45/icestorm.csproj zeroc-ice-3.7.2/csharp/src/IceStorm/msbuild/net45/icestorm.csproj
--- zeroc-ice-3.7.1/csharp/src/IceStorm/msbuild/net45/icestorm.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceStorm/msbuild/net45/icestorm.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,6 @@
     <ProjectGuid>{A77D65F6-31CF-4BFD-A7DF-E7F509B98573}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>IceStorm</AssemblyName>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>..\..\..\..\lib\net45\IceStorm.XML</DocumentationFile>
     <OutputPath>..\..\..\..\lib\net45\</OutputPath>
     <NoWarn>1591</NoWarn>
diff -Nru zeroc-ice-3.7.1/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj zeroc-ice-3.7.2/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj
--- zeroc-ice-3.7.1/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -17,4 +17,5 @@
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/Callback.ice zeroc-ice-3.7.2/csharp/test/Glacier2/application/Callback.ice
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/CallbackI.cs zeroc-ice-3.7.2/csharp/test/Glacier2/application/CallbackI.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/CallbackI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/CallbackI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/Client.cs zeroc-ice-3.7.2/csharp/test/Glacier2/application/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
@@ -18,7 +13,7 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
     class CallbackReceiverI : Test.CallbackReceiverDisp_
     {
@@ -121,56 +116,53 @@
         private CallbackReceiverI _receiver;
     }
 
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        _initData = base.getInitData(ref args);
-        _initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return _initData;
-    }
-
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
         Application app = new Application();
-        _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                            getTestEndpoint(_initData.properties, 50));
-        int status = app.main(args, _initData);
-
-        Console.Out.Write("testing stringToProxy for process object... ");
-        Console.Out.Flush();
-        Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:" +
-                                                                 getTestEndpoint(communicator().getProperties(), 51));
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing checked cast for admin object... ");
-        Console.Out.Flush();
-        Ice.ProcessPrx process = Ice.ProcessPrxHelper.checkedCast(processBase);
-        test(process != null);
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing Glacier2 shutdown... ");
-        Console.Out.Flush();
-        process.shutdown();
-        try
+
+        Ice.Properties properties = createTestProperties(ref args);
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = properties.ice_clone_();
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        initData.properties.setProperty("Ice.Default.Router",
+                                        "Glacier2/router:" + getTestEndpoint(initData.properties, 50));
+        if(app.main(args, initData) != 0)
         {
-            process.ice_ping();
             test(false);
         }
-        catch(Ice.LocalException)
+
+        using(var communicator = initialize(properties))
         {
+            Console.Out.Write("testing stringToProxy for process object... ");
+            Console.Out.Flush();
+            Ice.ObjectPrx processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
             Console.Out.WriteLine("ok");
-        }
 
-        test(app._restart == 5);
-        test(app._destroyed);
+            Console.Out.Write("testing checked cast for admin object... ");
+            Console.Out.Flush();
+            Ice.ProcessPrx process = Ice.ProcessPrxHelper.checkedCast(processBase);
+            test(process != null);
+            Console.Out.WriteLine("ok");
 
-        return status;
+            Console.Out.Write("testing Glacier2 shutdown... ");
+            Console.Out.Flush();
+            process.shutdown();
+            try
+            {
+                process.ice_ping();
+                test(false);
+            }
+            catch(Ice.LocalException)
+            {
+                Console.Out.WriteLine("ok");
+            }
+            test(app._restart == 5);
+            test(app._destroyed);
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
-
-    private Ice.InitializationData _initData;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Glacier2, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glacier2, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Glacier2.dll</HintPath>
     </Reference>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CallbackI.cs">
       <Link>CallbackI.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Callback.cs"/>
+    <Compile Include="generated\Callback.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Callback.ice">
       <Link>Callback.ice</Link>
     </SliceCompile>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../CallbackI.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Callback.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../CallbackI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Callback.cs">
+      <SliceCompileSource>../../../Callback.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Callback.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CallbackI.cs">
       <Link>CallbackI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Callback.cs"/>
+    <Compile Include="generated\Callback.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Callback.ice">
       <Link>Callback.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../CallbackI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Callback.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../CallbackI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Callback.cs">
+      <SliceCompileSource>../../../Callback.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Callback.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/application/Server.cs zeroc-ice-3.7.2/csharp/test/Glacier2/application/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/application/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/application/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,24 +11,25 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        communicator().getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
-        communicator().createObjectAdapter("DeactivatedAdapter");
-
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            communicator.getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+            communicator.createObjectAdapter("DeactivatedAdapter");
+
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/Callback.ice zeroc-ice-3.7.2/csharp/test/Glacier2/router/Callback.ice
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/CallbackI.cs zeroc-ice-3.7.2/csharp/test/Glacier2/router/CallbackI.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/CallbackI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/CallbackI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/Client.cs zeroc-ice-3.7.2/csharp/test/Glacier2/router/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
@@ -18,439 +13,435 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.ObjectPrx routerBase;
-        {
-            Console.Out.Write("testing stringToProxy for router... ");
-            Console.Out.Flush();
-            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(50));
-            Console.Out.WriteLine("ok");
-        }
-
-        Glacier2.RouterPrx router;
-        {
-            Console.Out.Write("testing checked cast for router... ");
-            Console.Out.Flush();
-            router = Glacier2.RouterPrxHelper.checkedCast(routerBase);
-            test(router != null);
-            Console.Out.WriteLine("ok");
-        }
-
-        {
-            Console.Out.Write("testing router finder... ");
-            Console.Out.Flush();
-            Ice.RouterFinderPrx finder = Ice.RouterFinderPrxHelper.uncheckedCast(
-                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
-            test(finder.getRouter().ice_getIdentity().Equals(router.ice_getIdentity()));
-            Console.Out.WriteLine("ok");
-        }
-
-        {
-            Console.Out.Write("installing router with communicator... ");
-            Console.Out.Flush();
-            communicator().setDefaultRouter(router);
-            Console.Out.WriteLine("ok");
-        }
-
-        {
-            Console.Out.Write("getting the session timeout... ");
-            Console.Out.Flush();
-            long timeout = router.getSessionTimeout();
-            test(timeout == 30);
-            Console.Out.WriteLine("ok");
-        }
-
-        Ice.ObjectPrx @base;
-
-        {
-            Console.Out.Write("testing stringToProxy for server object... ");
-            Console.Out.Flush();
-            @base = communicator().stringToProxy("c1/callback:" + getTestEndpoint(0));
-            Console.Out.WriteLine("ok");
-        }
-
+        Ice.Properties properties = createTestProperties(ref args);
+        //
+        // We must disable connection warnings, because we attempt to
+        // ping the router before session establishment, as well as
+        // after session destruction. Both will cause a
+        // ConnectionLostException.
+        //
+        properties.setProperty("Ice.Warn.Connections", "0");
+        using(var communicator = initialize(properties))
         {
-            Console.Out.Write("trying to ping server before session creation... ");
-            Console.Out.Flush();
-            try
-            {
-                @base.ice_ping();
-                test(false);
-            }
-            catch(Ice.ConnectionLostException)
+            Ice.ObjectPrx routerBase;
             {
+                Console.Out.Write("testing stringToProxy for router... ");
+                Console.Out.Flush();
+                routerBase = communicator.stringToProxy("Glacier2/router:" + getTestEndpoint(50));
                 Console.Out.WriteLine("ok");
             }
-            catch(Ice.SocketException)
-            {
-                test(false);
-            }
-        }
 
-        {
-            Console.Out.Write("trying to create session with wrong password... ");
-            Console.Out.Flush();
-            try
-            {
-                router.createSession("userid", "xxx");
-                test(false);
-            }
-            catch(Glacier2.PermissionDeniedException)
+            Glacier2.RouterPrx router;
             {
+                Console.Out.Write("testing checked cast for router... ");
+                Console.Out.Flush();
+                router = Glacier2.RouterPrxHelper.checkedCast(routerBase);
+                test(router != null);
                 Console.Out.WriteLine("ok");
             }
-            catch(Glacier2.CannotCreateSessionException)
-            {
-                test(false);
-            }
-        }
 
-        {
-            Console.Out.Write("trying to destroy non-existing session... ");
-            Console.Out.Flush();
-            try
             {
-                router.destroySession();
-                test(false);
+                Console.Out.Write("testing router finder... ");
+                Console.Out.Flush();
+                Ice.RouterFinderPrx finder =
+                    Ice.RouterFinderPrxHelper.uncheckedCast(communicator.stringToProxy("Ice/RouterFinder:" +
+                                                                                       getTestEndpoint(50)));
+                test(finder.getRouter().ice_getIdentity().Equals(router.ice_getIdentity()));
+                Console.Out.WriteLine("ok");
             }
-            catch(Glacier2.SessionNotExistException)
+
             {
+                Console.Out.Write("installing router with communicator... ");
+                Console.Out.Flush();
+                communicator.setDefaultRouter(router);
                 Console.Out.WriteLine("ok");
             }
-        }
 
-        {
-            Console.Out.Write("creating session with correct password... ");
-            Console.Out.Flush();
-            try
             {
-                router.createSession("userid", "abc123");
+                Console.Out.Write("getting the session timeout... ");
+                Console.Out.Flush();
+                long timeout = router.getSessionTimeout();
+                test(timeout == 30);
+                Console.Out.WriteLine("ok");
             }
-            catch(Glacier2.PermissionDeniedException)
+
+            Ice.ObjectPrx @base;
+
             {
-                test(false);
+                Console.Out.Write("testing stringToProxy for server object... ");
+                Console.Out.Flush();
+                @base = communicator.stringToProxy("c1/callback:" + getTestEndpoint(0));
+                Console.Out.WriteLine("ok");
             }
-            catch(Glacier2.CannotCreateSessionException)
+
             {
-                test(false);
+                Console.Out.Write("trying to ping server before session creation... ");
+                Console.Out.Flush();
+                try
+                {
+                    @base.ice_ping();
+                    test(false);
+                }
+                catch(Ice.ConnectionLostException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
+                catch(Ice.SocketException)
+                {
+                    test(false);
+                }
             }
-            Console.Out.WriteLine("ok");
-        }
 
-        {
-            Console.Out.Write("trying to create a second session... ");
-            Console.Out.Flush();
-            try
             {
-                router.createSession("userid", "abc123");
-                test(false);
+                Console.Out.Write("trying to create session with wrong password... ");
+                Console.Out.Flush();
+                try
+                {
+                    router.createSession("userid", "xxx");
+                    test(false);
+                }
+                catch(Glacier2.PermissionDeniedException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
+                catch(Glacier2.CannotCreateSessionException)
+                {
+                    test(false);
+                }
             }
-            catch(Glacier2.PermissionDeniedException)
+
             {
-                test(false);
+                Console.Out.Write("trying to destroy non-existing session... ");
+                Console.Out.Flush();
+                try
+                {
+                    router.destroySession();
+                    test(false);
+                }
+                catch(Glacier2.SessionNotExistException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
             }
-            catch(Glacier2.CannotCreateSessionException)
+
             {
+                Console.Out.Write("creating session with correct password... ");
+                Console.Out.Flush();
+                try
+                {
+                    router.createSession("userid", "abc123");
+                }
+                catch(Glacier2.PermissionDeniedException)
+                {
+                    test(false);
+                }
+                catch(Glacier2.CannotCreateSessionException)
+                {
+                    test(false);
+                }
                 Console.Out.WriteLine("ok");
             }
-        }
-
-        {
-            Console.Out.Write("pinging server after session creation... ");
-            Console.Out.Flush();
-            @base.ice_ping();
-            Console.Out.WriteLine("ok");
-        }
 
-        {
-            Console.Out.Write("pinging object with client endpoint... ");
-            Ice.ObjectPrx baseC = communicator().stringToProxy("collocated:" + getTestEndpoint(50));
-            try
-            {
-                baseC.ice_ping();
-            }
-            catch(Ice.ObjectNotExistException)
             {
+                Console.Out.Write("trying to create a second session... ");
+                Console.Out.Flush();
+                try
+                {
+                    router.createSession("userid", "abc123");
+                    test(false);
+                }
+                catch(Glacier2.PermissionDeniedException)
+                {
+                    test(false);
+                }
+                catch(Glacier2.CannotCreateSessionException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
             }
-            Console.Out.WriteLine("ok");
-        }
-
-        CallbackPrx twoway;
-
-        {
-            Console.Out.Write("testing checked cast for server object... ");
-            Console.Out.Flush();
-            twoway = CallbackPrxHelper.checkedCast(@base);
-            test(twoway != null);
-            Console.Out.WriteLine("ok");
-        }
-
-        Ice.ObjectAdapter adapter;
-
-        {
-            Console.Out.Write("creating and activating callback receiver adapter... ");
-            Console.Out.Flush();
-            communicator().getProperties().setProperty("Ice.PrintAdapterReady", "0");
-            adapter = communicator().createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
-            adapter.activate();
-            Console.Out.WriteLine("ok");
-        }
-
-        String category;
-
-        {
-            Console.Out.Write("getting category from router... ");
-            Console.Out.Flush();
-            category = router.getCategoryForClient();
-            Console.Out.WriteLine("ok");
-        }
-
-        CallbackReceiverI callbackReceiverImpl;
-        Ice.Object callbackReceiver;
-        CallbackReceiverPrx twowayR;
-        CallbackReceiverPrx fakeTwowayR;
-
-        {
-            Console.Out.Write("creating and adding callback receiver object... ");
-            Console.Out.Flush();
-            callbackReceiverImpl = new CallbackReceiverI();
-            callbackReceiver = callbackReceiverImpl;
-            Ice.Identity callbackReceiverIdent = new Ice.Identity();
-            callbackReceiverIdent.name = "callbackReceiver";
-            callbackReceiverIdent.category = category;
-            twowayR = CallbackReceiverPrxHelper.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
-            Ice.Identity fakeCallbackReceiverIdent = new Ice.Identity();
-            fakeCallbackReceiverIdent.name = "callbackReceiver";
-            fakeCallbackReceiverIdent.category = "dummy";
-            fakeTwowayR = CallbackReceiverPrxHelper.uncheckedCast(
-                adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
-            Console.Out.WriteLine("ok");
-        }
-
-        {
-            Console.Out.Write("testing oneway callback... ");
-            Console.Out.Flush();
-            CallbackPrx oneway = CallbackPrxHelper.uncheckedCast(twoway.ice_oneway());
-            CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
-            Dictionary<string, string> context = new Dictionary<string, string>();
-            context["_fwd"] =  "o";
-            oneway.initiateCallback(onewayR, context);
-            callbackReceiverImpl.callbackOK();
-            Console.Out.WriteLine("ok");
-        }
 
-        {
-            Console.Out.Write("testing twoway callback... ");
-            Console.Out.Flush();
-            Dictionary<string, string> context = new Dictionary<string, string>();
-            context["_fwd"] = "t";
-            twoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            Console.Out.WriteLine("ok");
-        }
-
-        {
-            Console.Out.Write("ditto, but with user exception... ");
-            Console.Out.Flush();
-            Dictionary<string, string> context = new Dictionary<string, string>();
-            context["_fwd"] = "t";
-            try
-            {
-                twoway.initiateCallbackEx(twowayR, context);
-                test(false);
-            }
-            catch(CallbackException ex)
             {
-                test(ex.someValue == 3.14);
-                test(ex.someString.Equals("3.14"));
+                Console.Out.Write("pinging server after session creation... ");
+                Console.Out.Flush();
+                @base.ice_ping();
+                Console.Out.WriteLine("ok");
             }
-            callbackReceiverImpl.callbackOK();
-            Console.Out.WriteLine("ok");
-        }
 
-        {
-            Console.Out.Write("trying twoway callback with fake category... ");
-            Console.Out.Flush();
-            Dictionary<string, string> context = new Dictionary<string, string>();
-            context["_fwd"] = "t";
-            try
-            {
-                twoway.initiateCallback(fakeTwowayR, context);
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException)
             {
+                Console.Out.Write("pinging object with client endpoint... ");
+                Ice.ObjectPrx baseC = communicator.stringToProxy("collocated:" + getTestEndpoint(50));
+                try
+                {
+                    baseC.ice_ping();
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                }
                 Console.Out.WriteLine("ok");
             }
-        }
 
-        {
-            Console.Out.Write("testing whether other allowed category is accepted... ");
-            Console.Out.Flush();
-            Dictionary<string, string> context = new Dictionary<string, string>();
-            context["_fwd"] =  "t";
-            CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-                twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback")));
-            otherCategoryTwoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            Console.Out.WriteLine("ok");
-        }
+            CallbackPrx twoway;
 
-        {
-            Console.Out.Write("testing whether disallowed category gets rejected... ");
-            Console.Out.Flush();
-            Dictionary<string, string> context = new Dictionary<string, string>();
-            context["_fwd"] = "t";
-            try
-            {
-                CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-                    twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback")));
-                otherCategoryTwoway.initiateCallback(twowayR, context);
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException)
             {
+                Console.Out.Write("testing checked cast for server object... ");
+                Console.Out.Flush();
+                twoway = CallbackPrxHelper.checkedCast(@base);
+                test(twoway != null);
                 Console.Out.WriteLine("ok");
             }
-        }
 
-        {
-            Console.Out.Write("testing whether user-id as category is accepted... ");
-            Console.Out.Flush();
-            Dictionary<string, string> context = new Dictionary<string, string>();
-            context["_fwd"] = "t";
-            CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-                twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback")));
-            otherCategoryTwoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            Console.Out.WriteLine("ok");
-        }
+            Ice.ObjectAdapter adapter;
 
-        if(args.Length >= 1 && args[0].Equals("--shutdown"))
-        {
-            Console.Out.Write("testing server shutdown... ");
-            Console.Out.Flush();
-            twoway.shutdown();
-            // No ping, otherwise the router prints a warning message if it's
-            // started with --Ice.Warn.Connections.
-            Console.Out.WriteLine("ok");
-            /*
-              try
-              {
-                  base.ice_ping();
-                  test(false);
-              }
-              // If we use the glacier router, the exact exception reason gets
-              // lost.
-              catch(Ice.UnknownLocalException ex)
-              {
-                  Console.Out.WriteLine("ok");
-              }
-            */
-        }
-
-        {
-            Console.Out.Write("destroying session... ");
-            Console.Out.Flush();
-            try
             {
-                router.destroySession();
+                Console.Out.Write("creating and activating callback receiver adapter... ");
+                Console.Out.Flush();
+                communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+                adapter = communicator.createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
+                adapter.activate();
+                Console.Out.WriteLine("ok");
             }
-            catch(Ice.LocalException)
+
+            String category;
+
             {
-                test(false);
+                Console.Out.Write("getting category from router... ");
+                Console.Out.Flush();
+                category = router.getCategoryForClient();
+                Console.Out.WriteLine("ok");
             }
 
-            Console.Out.WriteLine("ok");
-        }
+            CallbackReceiverI callbackReceiverImpl;
+            Ice.Object callbackReceiver;
+            CallbackReceiverPrx twowayR;
+            CallbackReceiverPrx fakeTwowayR;
 
-        {
-            Console.Out.Write("trying to ping server after session destruction... ");
-            Console.Out.Flush();
-            try
             {
-                @base.ice_ping();
-                test(false);
+                Console.Out.Write("creating and adding callback receiver object... ");
+                Console.Out.Flush();
+                callbackReceiverImpl = new CallbackReceiverI();
+                callbackReceiver = callbackReceiverImpl;
+                Ice.Identity callbackReceiverIdent = new Ice.Identity();
+                callbackReceiverIdent.name = "callbackReceiver";
+                callbackReceiverIdent.category = category;
+                twowayR = CallbackReceiverPrxHelper.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
+                Ice.Identity fakeCallbackReceiverIdent = new Ice.Identity();
+                fakeCallbackReceiverIdent.name = "callbackReceiver";
+                fakeCallbackReceiverIdent.category = "dummy";
+                fakeTwowayR =
+                    CallbackReceiverPrxHelper.uncheckedCast(adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
+                Console.Out.WriteLine("ok");
             }
-            catch(Ice.ConnectionLostException)
+
             {
+                Console.Out.Write("testing oneway callback... ");
+                Console.Out.Flush();
+                CallbackPrx oneway = CallbackPrxHelper.uncheckedCast(twoway.ice_oneway());
+                CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
+                Dictionary<string, string> context = new Dictionary<string, string>();
+                context["_fwd"] =  "o";
+                oneway.initiateCallback(onewayR, context);
+                callbackReceiverImpl.callbackOK();
                 Console.Out.WriteLine("ok");
             }
-            catch(Ice.SocketException)
+
             {
-                test(false);
+                Console.Out.Write("testing twoway callback... ");
+                Console.Out.Flush();
+                Dictionary<string, string> context = new Dictionary<string, string>();
+                context["_fwd"] = "t";
+                twoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
+                Console.Out.WriteLine("ok");
             }
-        }
 
-        if(args.Length >= 1 && args[0].Equals("--shutdown"))
-        {
             {
-                Console.Out.Write("uninstalling router with communicator... ");
+                Console.Out.Write("ditto, but with user exception... ");
                 Console.Out.Flush();
-                communicator().setDefaultRouter(null);
+                Dictionary<string, string> context = new Dictionary<string, string>();
+                context["_fwd"] = "t";
+                try
+                {
+                    twoway.initiateCallbackEx(twowayR, context);
+                    test(false);
+                }
+                catch(CallbackException ex)
+                {
+                    test(ex.someValue == 3.14);
+                    test(ex.someString.Equals("3.14"));
+                }
+                callbackReceiverImpl.callbackOK();
                 Console.Out.WriteLine("ok");
             }
 
-            Ice.ObjectPrx processBase;
-
             {
-                Console.Out.Write("testing stringToProxy for admin object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
-                Console.Out.WriteLine("ok");
+                Console.Out.Write("trying twoway callback with fake category... ");
+                Console.Out.Flush();
+                Dictionary<string, string> context = new Dictionary<string, string>();
+                context["_fwd"] = "t";
+                try
+                {
+                    twoway.initiateCallback(fakeTwowayR, context);
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
             }
 
-/*
             {
-                Console.Out.Write("uninstalling router with process object... ");
-                processBase.ice_router(null);
+                Console.Out.Write("testing whether other allowed category is accepted... ");
+                Console.Out.Flush();
+                Dictionary<string, string> context = new Dictionary<string, string>();
+                context["_fwd"] =  "t";
+                CallbackPrx otherCategoryTwoway =
+                    CallbackPrxHelper.uncheckedCast(twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback")));
+                otherCategoryTwoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
                 Console.Out.WriteLine("ok");
             }
-*/
 
-            Ice.ProcessPrx process;
+            {
+                Console.Out.Write("testing whether disallowed category gets rejected... ");
+                Console.Out.Flush();
+                Dictionary<string, string> context = new Dictionary<string, string>();
+                context["_fwd"] = "t";
+                try
+                {
+                    CallbackPrx otherCategoryTwoway =
+                        CallbackPrxHelper.uncheckedCast(twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback")));
+                    otherCategoryTwoway.initiateCallback(twowayR, context);
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
+            }
 
             {
-                Console.Out.Write("testing checked cast for process object... ");
-                process = Ice.ProcessPrxHelper.checkedCast(processBase);
-                test(process != null);
+                Console.Out.Write("testing whether user-id as category is accepted... ");
+                Console.Out.Flush();
+                Dictionary<string, string> context = new Dictionary<string, string>();
+                context["_fwd"] = "t";
+                CallbackPrx otherCategoryTwoway =
+                    CallbackPrxHelper.uncheckedCast(twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback")));
+                otherCategoryTwoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
                 Console.Out.WriteLine("ok");
             }
 
-            Console.Out.Write("testing Glacier2 shutdown... ");
-            process.shutdown();
-            try
+            if(args.Length >= 1 && args[0].Equals("--shutdown"))
             {
-                process.ice_ping();
-                test(false);
+                Console.Out.Write("testing server shutdown... ");
+                Console.Out.Flush();
+                twoway.shutdown();
+                // No ping, otherwise the router prints a warning message if it's
+                // started with --Ice.Warn.Connections.
+                Console.Out.WriteLine("ok");
+                /*
+                  try
+                  {
+                  base.ice_ping();
+                  test(false);
+                  }
+                  // If we use the glacier router, the exact exception reason gets
+                  // lost.
+                  catch(Ice.UnknownLocalException ex)
+                  {
+                  Console.Out.WriteLine("ok");
+                  }
+                */
             }
-            catch(Ice.LocalException)
+
             {
+                Console.Out.Write("destroying session... ");
+                Console.Out.Flush();
+                try
+                {
+                    router.destroySession();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+
                 Console.Out.WriteLine("ok");
             }
-        }
 
-        return 0;
-    }
+            {
+                Console.Out.Write("trying to ping server after session destruction... ");
+                Console.Out.Flush();
+                try
+                {
+                    @base.ice_ping();
+                    test(false);
+                }
+                catch(Ice.ConnectionLostException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
+                catch(Ice.SocketException)
+                {
+                    test(false);
+                }
+            }
+
+            if(args.Length >= 1 && args[0].Equals("--shutdown"))
+            {
+                {
+                    Console.Out.Write("uninstalling router with communicator... ");
+                    Console.Out.Flush();
+                    communicator.setDefaultRouter(null);
+                    Console.Out.WriteLine("ok");
+                }
+
+                Ice.ObjectPrx processBase;
+
+                {
+                    Console.Out.Write("testing stringToProxy for admin object... ");
+                    processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
+                    Console.Out.WriteLine("ok");
+                }
+
+                /*
+                  {
+                  Console.Out.Write("uninstalling router with process object... ");
+                  processBase.ice_router(null);
+                  Console.Out.WriteLine("ok");
+                  }
+                */
 
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        //
-        // We must disable connection warnings, because we attempt to
-        // ping the router before session establishment, as well as
-        // after session destruction. Both will cause a
-        // ConnectionLostException.
-        //
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
+                Ice.ProcessPrx process;
+
+                {
+                    Console.Out.Write("testing checked cast for process object... ");
+                    process = Ice.ProcessPrxHelper.checkedCast(processBase);
+                    test(process != null);
+                    Console.Out.WriteLine("ok");
+                }
+
+                Console.Out.Write("testing Glacier2 shutdown... ");
+                process.shutdown();
+                try
+                {
+                    process.ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
+            }
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Glacier2, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glacier2, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Glacier2.dll</HintPath>
     </Reference>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CallbackI.cs">
       <Link>CallbackI.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Callback.cs"/>
+    <Compile Include="generated\Callback.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Callback.ice">
       <Link>Callback.ice</Link>
     </SliceCompile>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../CallbackI.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Callback.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../CallbackI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Callback.cs">
+      <SliceCompileSource>../../../Callback.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Callback.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CallbackI.cs">
       <Link>CallbackI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Callback.cs"/>
+    <Compile Include="generated\Callback.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Callback.ice">
       <Link>Callback.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../CallbackI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Callback.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../CallbackI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Callback.cs">
+      <SliceCompileSource>../../../Callback.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Callback.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/router/Server.cs zeroc-ice-3.7.2/csharp/test/Glacier2/router/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/router/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/router/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -17,24 +12,41 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category.
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category.
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category.
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid.
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+
+            //
+            // The test allows "c1" as category.
+            //
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("c1/callback"));
+
+            //
+            // The test allows "c2" as category.
+            //
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("c2/callback"));
+
+            //
+            // The test rejects "c3" as category.
+            //
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("c3/callback"));
+
+            //
+            // The test allows the prefixed userid.
+            //
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("_userid/callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/Callback.ice zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/Callback.ice
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/CallbackI.cs zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/CallbackI.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/CallbackI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/CallbackI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/Client.cs zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
@@ -18,7 +13,7 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
     public class SessionCallback1 : Glacier2.SessionCallback
     {
@@ -199,256 +194,268 @@
         private Client _app;
     }
 
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        string protocol = getTestProtocol();
-        string host = getTestHost();
-
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new SessionCallback1(this));
-
-        //
-        // Test to create a session with wrong userid/password
-        //
-        lock(this)
-        {
-            Console.Out.Write("testing SessionHelper connect with wrong userid/password... ");
-            Console.Out.Flush();
-
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "xxx");
-            while(true)
-            {
-                try
-                {
-                    Monitor.Wait(this, 30000);
-                    break;
-                }
-                catch(ThreadInterruptedException)
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = createTestProperties(ref args);
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        initData.properties.setProperty("Ice.Default.Router",
+                                        "Glacier2/router:" + getTestEndpoint(initData.properties, 50));
+        initData.dispatcher = delegate(Action action, Ice.Connection connection)
+            {
+                action();
+            };
+
+        using(var communicator = initialize(initData))
+        {
+            string protocol = getTestProtocol();
+            string host = getTestHost();
+
+            Glacier2.SessionFactoryHelper factory = new Glacier2.SessionFactoryHelper(initData, new SessionCallback1(this));
+            Glacier2.SessionHelper session = null;
+
+            //
+            // Test to create a session with wrong userid/password
+            //
+            lock(this)
+            {
+                Console.Out.Write("testing SessionHelper connect with wrong userid/password... ");
+                Console.Out.Flush();
+
+                factory.setProtocol(protocol);
+                session  = factory.connect("userid", "xxx");
+                while(true)
                 {
+                    try
+                    {
+                        Monitor.Wait(this, 30000);
+                        break;
+                    }
+                    catch(ThreadInterruptedException)
+                    {
+                    }
                 }
+                test(!session.isConnected());
             }
-            test(!_session.isConnected());
-        }
 
-        _initData.properties.setProperty("Ice.Default.Router", "");
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new SessionCallback4(this));
-        lock(this)
-        {
-            Console.Out.Write("testing SessionHelper connect interrupt... ");
-            Console.Out.Flush();
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(1));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
+            initData.properties.setProperty("Ice.Default.Router", "");
+            factory = new Glacier2.SessionFactoryHelper(initData, new SessionCallback4(this));
+            lock(this)
+            {
+                Console.Out.Write("testing SessionHelper connect interrupt... ");
+                Console.Out.Flush();
+                factory.setRouterHost(host);
+                factory.setPort(getTestPort(1));
+                factory.setProtocol(protocol);
+                session = factory.connect("userid", "abc123");
 
-            Thread.Sleep(100);
-            _session.destroy();
+                Thread.Sleep(100);
+                session.destroy();
 
-            while(true)
-            {
-                try
-                {
-                    Monitor.Wait(this, 30000);
-                    break;
-                }
-                catch(ThreadInterruptedException)
+                while(true)
                 {
+                    try
+                    {
+                        Monitor.Wait(this, 30000);
+                        break;
+                    }
+                    catch(ThreadInterruptedException)
+                    {
+                    }
                 }
+                test(!session.isConnected());
             }
-            test(!_session.isConnected());
-        }
 
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new SessionCallback2(this));
-        lock(this)
-        {
-            Console.Out.Write("testing SessionHelper connect... ");
-            Console.Out.Flush();
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(50));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
-            while(true)
+            factory = new Glacier2.SessionFactoryHelper(initData, new SessionCallback2(this));
+            lock(this)
             {
+                Console.Out.Write("testing SessionHelper connect... ");
+                Console.Out.Flush();
+                factory.setRouterHost(host);
+                factory.setPort(getTestPort(50));
+                factory.setProtocol(protocol);
+                session = factory.connect("userid", "abc123");
+                while(true)
+                {
+                    try
+                    {
+                        Monitor.Wait(this, 30000);
+                        break;
+                    }
+                    catch(ThreadInterruptedException)
+                    {
+                    }
+                }
+
+                Console.Out.Write("testing SessionHelper isConnected after connect... ");
+                Console.Out.Flush();
+                test(session.isConnected());
+                Console.Out.WriteLine("ok");
+
+                Console.Out.Write("testing SessionHelper categoryForClient after connect... ");
+                Console.Out.Flush();
                 try
                 {
-                    Monitor.Wait(this, 30000);
-                    break;
+                    test(!session.categoryForClient().Equals(""));
                 }
-                catch(ThreadInterruptedException)
+                catch(Glacier2.SessionNotExistException)
                 {
+                    test(false);
                 }
-            }
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing SessionHelper isConnected after connect... ");
-            Console.Out.Flush();
-            test(_session.isConnected());
-            Console.Out.WriteLine("ok");
+                test(session.session() == null);
 
-            Console.Out.Write("testing SessionHelper categoryForClient after connect... ");
-            Console.Out.Flush();
-            try
-            {
-                test(!_session.categoryForClient().Equals(""));
-            }
-            catch(Glacier2.SessionNotExistException)
-            {
-                test(false);
-            }
-            Console.Out.WriteLine("ok");
+                Console.Out.Write("testing stringToProxy for server object... ");
+                Console.Out.Flush();
+                Ice.ObjectPrx @base = session.communicator().stringToProxy("callback:" + getTestEndpoint(0));
+                Console.Out.WriteLine("ok");
 
-            test(_session.session() == null);
+                Console.Out.Write("pinging server after session creation... ");
+                Console.Out.Flush();
+                @base.ice_ping();
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing stringToProxy for server object... ");
-            Console.Out.Flush();
-            Ice.ObjectPrx @base = _session.communicator().stringToProxy("callback:" + getTestEndpoint(0));
-            Console.Out.WriteLine("ok");
+                Console.Out.Write("testing checked cast for server object... ");
+                Console.Out.Flush();
+                CallbackPrx twoway = CallbackPrxHelper.checkedCast(@base);
+                test(twoway != null);
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("pinging server after session creation... ");
-            Console.Out.Flush();
-            @base.ice_ping();
-            Console.Out.WriteLine("ok");
+                Console.Out.Write("testing server shutdown... ");
+                Console.Out.Flush();
+                twoway.shutdown();
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing checked cast for server object... ");
-            Console.Out.Flush();
-            CallbackPrx twoway = CallbackPrxHelper.checkedCast(@base);
-            test(twoway != null);
-            Console.Out.WriteLine("ok");
+                test(session.communicator() != null);
+                Console.Out.Write("testing SessionHelper destroy... ");
+                Console.Out.Flush();
+                session.destroy();
+                while(true)
+                {
+                    try
+                    {
+                        Monitor.Wait(this);
+                        break;
+                    }
+                    catch(ThreadInterruptedException)
+                    {
+                    }
+                }
 
-            Console.Out.Write("testing server shutdown... ");
-            Console.Out.Flush();
-            twoway.shutdown();
-            Console.Out.WriteLine("ok");
+                Console.Out.Write("testing SessionHelper isConnected after destroy... ");
+                Console.Out.Flush();
+                test(session.isConnected() == false);
+                Console.Out.WriteLine("ok");
 
-            test(_session.communicator() != null);
-            Console.Out.Write("testing SessionHelper destroy... ");
-            Console.Out.Flush();
-            _session.destroy();
-            while(true)
-            {
+                Console.Out.Write("testing SessionHelper categoryForClient after destroy... ");
+                Console.Out.Flush();
                 try
                 {
-                    Monitor.Wait(this);
-                    break;
+                    test(!session.categoryForClient().Equals(""));
+                    test(false);
                 }
-                catch(ThreadInterruptedException)
+                catch(Glacier2.SessionNotExistException)
                 {
                 }
-            }
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing SessionHelper isConnected after destroy... ");
-            Console.Out.Flush();
-            test(_session.isConnected() == false);
-            Console.Out.WriteLine("ok");
+                Console.Out.Write("testing SessionHelper session after destroy... ");
+                test(session.session() == null);
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing SessionHelper categoryForClient after destroy... ");
-            Console.Out.Flush();
-            try
-            {
-                test(!_session.categoryForClient().Equals(""));
-                test(false);
-            }
-            catch(Glacier2.SessionNotExistException)
-            {
-            }
-            Console.Out.WriteLine("ok");
+                Console.Out.Write("testing SessionHelper communicator after destroy... ");
+                Console.Out.Flush();
+                try
+                {
+                    test(session.communicator() != null);
+                    session.communicator().stringToProxy("dummy");
+                    test(false);
+                }
+                catch(Ice.CommunicatorDestroyedException)
+                {
+                }
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing SessionHelper session after destroy... ");
-            test(_session.session() == null);
-            Console.Out.WriteLine("ok");
+                Console.Out.Write("uninstalling router with communicator... ");
+                Console.Out.Flush();
+                communicator.setDefaultRouter(null);
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing SessionHelper communicator after destroy... ");
-            Console.Out.Flush();
-            try
-            {
-                test(_session.communicator() != null);
-                _session.communicator().stringToProxy("dummy");
-                test(false);
-            }
-            catch(Ice.CommunicatorDestroyedException)
-            {
-            }
-            Console.Out.WriteLine("ok");
+                Ice.ObjectPrx processBase;
+                {
+                    Console.Out.Write("testing stringToProxy for process object... ");
+                    processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
+                    Console.Out.WriteLine("ok");
+                }
 
-            Console.Out.Write("uninstalling router with communicator... ");
-            Console.Out.Flush();
-            communicator().setDefaultRouter(null);
-            Console.Out.WriteLine("ok");
+                Ice.ProcessPrx process;
+                {
+                    Console.Out.Write("testing checked cast for admin object... ");
+                    process = Ice.ProcessPrxHelper.checkedCast(processBase);
+                    test(process != null);
+                    Console.Out.WriteLine("ok");
+                }
 
-            Ice.ObjectPrx processBase;
-            {
-                Console.Out.Write("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
-                Console.Out.WriteLine("ok");
+                Console.Out.Write("testing Glacier2 shutdown... ");
+                process.shutdown();
+                try
+                {
+                    process.ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                    Console.Out.WriteLine("ok");
+                }
             }
 
-            Ice.ProcessPrx process;
+            factory = new Glacier2.SessionFactoryHelper(initData, new SessionCallback3(this));
+            lock(this)
             {
-                Console.Out.Write("testing checked cast for admin object... ");
-                process = Ice.ProcessPrxHelper.checkedCast(processBase);
-                test(process != null);
-                Console.Out.WriteLine("ok");
-            }
+                Console.Out.Write("testing SessionHelper connect after router shutdown... ");
+                Console.Out.Flush();
 
-            Console.Out.Write("testing Glacier2 shutdown... ");
-            process.shutdown();
-            try
-            {
-                process.ice_ping();
-                test(false);
-            }
-            catch(Ice.LocalException)
-            {
-                Console.Out.WriteLine("ok");
-            }
-        }
+                factory.setRouterHost(host);
+                factory.setPort(getTestPort(50));
+                factory.setProtocol(protocol);
+                session = factory.connect("userid", "abc123");
+                while(true)
+                {
+                    try
+                    {
+                        Monitor.Wait(this);
+                        break;
+                    }
+                    catch(ThreadInterruptedException)
+                    {
+                    }
+                }
 
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new SessionCallback3(this));
-        lock(this)
-        {
-            Console.Out.Write("testing SessionHelper connect after router shutdown... ");
-            Console.Out.Flush();
+                Console.Out.Write("testing SessionHelper isConnect after connect failure... ");
+                Console.Out.Flush();
+                test(session.isConnected() == false);
+                Console.Out.WriteLine("ok");
 
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(50));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
-            while(true)
-            {
+                Console.Out.Write("testing SessionHelper communicator after connect failure... ");
+                Console.Out.Flush();
                 try
                 {
-                    Monitor.Wait(this);
-                    break;
+                    test(session.communicator() != null);
+                    session.communicator().stringToProxy("dummy");
+                    test(false);
                 }
-                catch(ThreadInterruptedException)
+                catch(Ice.CommunicatorDestroyedException)
                 {
                 }
-            }
-
-            Console.Out.Write("testing SessionHelper isConnect after connect failure... ");
-            Console.Out.Flush();
-            test(_session.isConnected() == false);
-            Console.Out.WriteLine("ok");
+                Console.Out.WriteLine("ok");
 
-            Console.Out.Write("testing SessionHelper communicator after connect failure... ");
-            Console.Out.Flush();
-            try
-            {
-                test(_session.communicator() != null);
-                _session.communicator().stringToProxy("dummy");
-                test(false);
-            }
-            catch(Ice.CommunicatorDestroyedException)
-            {
+                Console.Out.Write("testing SessionHelper destroy after connect failure... ");
+                Console.Out.Flush();
+                session.destroy();
+                Console.Out.WriteLine("ok");
             }
-            Console.Out.WriteLine("ok");
-
-            Console.Out.Write("testing SessionHelper destroy after connect failure... ");
-            Console.Out.Flush();
-            _session.destroy();
-            Console.Out.WriteLine("ok");
         }
-
-        return 0;
     }
 
     public void
@@ -460,26 +467,8 @@
         }
     }
 
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        _initData = base.getInitData(ref args);
-        _initData.properties.setProperty("Ice.Warn.Connections", "0");
-        _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                         getTestEndpoint(_initData.properties, 50));
-        _initData.dispatcher = delegate(Action action, Ice.Connection connection)
-        {
-            action();
-        };
-        return _initData;
-    }
-
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
-
-    private Glacier2.SessionHelper _session;
-    private Glacier2.SessionFactoryHelper _factory;
-    private Ice.InitializationData _initData;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Glacier2, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glacier2, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Glacier2.dll</HintPath>
     </Reference>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CallbackI.cs">
       <Link>CallbackI.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Callback.cs"/>
+    <Compile Include="generated\Callback.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Callback.ice">
       <Link>Callback.ice</Link>
     </SliceCompile>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../CallbackI.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Callback.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../CallbackI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Callback.cs">
+      <SliceCompileSource>../../../Callback.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Callback.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CallbackI.cs">
       <Link>CallbackI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Callback.cs"/>
+    <Compile Include="generated\Callback.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Callback.ice">
       <Link>Callback.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../CallbackI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Callback.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../CallbackI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Callback.cs">
+      <SliceCompileSource>../../../Callback.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Callback.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/Server.cs zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Glacier2/sessionHelper/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Glacier2/sessionHelper/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,24 +11,25 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        communicator().getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
-        communicator().createObjectAdapter("DeactivatedAdapter");
-
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            communicator.getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+            communicator.createObjectAdapter("DeactivatedAdapter");
+
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/acm/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,655 +1,671 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
+using System.IO;
 using System.Globalization;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Test;
 
-class LoggerI : Ice.Logger
+namespace Ice
 {
-    public LoggerI(string name)
-    {
-        _name = name;
-    }
-
-    public void start()
-    {
-        lock(this)
-        {
-            _started = true;
-            dump();
-        }
-    }
-
-    public void print(string msg)
+    namespace acm
     {
-        lock(this)
+        class LoggerI : Ice.Logger
         {
-            _messages.Add(msg);
-            if(_started)
+            public LoggerI(string name, TextWriter output)
             {
-                dump();
+                _name = name;
+                _output = output;
             }
-        }
-    }
 
-    public void trace(string category, string message)
-    {
-        lock(this)
-        {
-            System.Text.StringBuilder s = new System.Text.StringBuilder(_name);
-            s.Append(' ');
-            s.Append(System.DateTime.Now.ToString(_date, CultureInfo.CurrentCulture));
-            s.Append(' ');
-            s.Append(System.DateTime.Now.ToString(_time, CultureInfo.CurrentCulture));
-            s.Append(' ');
-            s.Append("[");
-            s.Append(category);
-            s.Append("] ");
-            s.Append(message);
-            _messages.Add(s.ToString());
-            if(_started)
+            public void start()
             {
-                dump();
+                lock(this)
+                {
+                    _started = true;
+                    dump();
+                }
             }
-        }
-    }
 
-    public void warning(string message)
-    {
-        lock(this)
-        {
-            System.Text.StringBuilder s = new System.Text.StringBuilder(_name);
-            s.Append(' ');
-            s.Append(System.DateTime.Now.ToString(_date, CultureInfo.CurrentCulture));
-            s.Append(' ');
-            s.Append(System.DateTime.Now.ToString(_time, CultureInfo.CurrentCulture));
-            s.Append(" warning : ");
-            s.Append(message);
-            _messages.Add(s.ToString());
-            if(_started)
+            public void print(string msg)
             {
-                dump();
+                lock(this)
+                {
+                    _messages.Add(msg);
+                    if(_started)
+                    {
+                        dump();
+                    }
+                }
             }
-        }
-    }
 
-    public void error(string message)
-    {
-        lock(this)
-        {
-            System.Text.StringBuilder s = new System.Text.StringBuilder(_name);
-            s.Append(' ');
-            s.Append(System.DateTime.Now.ToString(_date, CultureInfo.CurrentCulture));
-            s.Append(' ');
-            s.Append(System.DateTime.Now.ToString(_time, CultureInfo.CurrentCulture));
-            s.Append(" error : ");
-            s.Append(message);
-            _messages.Add(s.ToString());
-            if(_started)
+            public void trace(string category, string message)
             {
-                dump();
+                lock(this)
+                {
+                    System.Text.StringBuilder s = new System.Text.StringBuilder(_name);
+                    s.Append(' ');
+                    s.Append(DateTime.Now.ToString(_date, CultureInfo.CurrentCulture));
+                    s.Append(' ');
+                    s.Append(DateTime.Now.ToString(_time, CultureInfo.CurrentCulture));
+                    s.Append(' ');
+                    s.Append("[");
+                    s.Append(category);
+                    s.Append("] ");
+                    s.Append(message);
+                    _messages.Add(s.ToString());
+                    if(_started)
+                    {
+                        dump();
+                    }
+                }
             }
-        }
-    }
-
-    public string getPrefix()
-    {
-        return "";
-    }
-
-    public Ice.Logger cloneWithPrefix(string prefix)
-    {
-        return this;
-    }
 
-    private void dump()
-    {
-        foreach(string line in _messages)
-        {
-            System.Console.Error.WriteLine(line);
-        }
-        _messages.Clear();
-    }
-
-    private string _name;
-    private bool _started;
-    private readonly static string _date = "d";
-    private readonly static string _time = "HH:mm:ss:fff";
-
-    private List<string> _messages = new List<string>();
-}
-
-abstract class TestCase
-{
-    public TestCase(string name, RemoteCommunicatorPrx com)
-    {
-        _name = name;
-        _com = com;
-        _logger = new LoggerI(_name);
-
-        _clientACMTimeout = -1;
-        _clientACMClose = -1;
-        _clientACMHeartbeat = -1;
-
-        _serverACMTimeout = -1;
-        _serverACMClose = -1;
-        _serverACMHeartbeat = -1;
-
-        _heartbeat = 0;
-        _closed = false;
-    }
-
-    public void init()
-    {
-        _adapter = _com.createObjectAdapter(_serverACMTimeout, _serverACMClose, _serverACMHeartbeat);
-
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = _com.ice_getCommunicator().getProperties().ice_clone_();
-        initData.logger = _logger;
-        initData.properties.setProperty("Ice.ACM.Timeout", "2");
-        if(_clientACMTimeout >= 0)
-        {
-            initData.properties.setProperty("Ice.ACM.Client.Timeout", _clientACMTimeout.ToString());
-        }
-        if(_clientACMClose >= 0)
-        {
-            initData.properties.setProperty("Ice.ACM.Client.Close", _clientACMClose.ToString());
-        }
-        if(_clientACMHeartbeat >= 0)
-        {
-            initData.properties.setProperty("Ice.ACM.Client.Heartbeat", _clientACMHeartbeat.ToString());
-        }
-        //initData.properties.setProperty("Ice.Trace.Protocol", "2");
-        //initData.properties.setProperty("Ice.Trace.Network", "2");
-        _communicator = Ice.Util.initialize(initData);
-        _thread = new Thread(this.run);
-    }
-
-    public void start()
-    {
-        _thread.Start();
-    }
-
-    public void destroy()
-    {
-        _adapter.deactivate();
-        _communicator.destroy();
-    }
-
-    public void join()
-    {
-        System.Console.Out.Write("testing " + _name + "... ");
-        System.Console.Out.Flush();
-        _logger.start();
-        _thread.Join();
-        if(_msg == null)
-        {
-            System.Console.Out.WriteLine("ok");
-        }
-        else
-        {
-            System.Console.Out.WriteLine("failed! " + _msg);
-            throw new System.Exception();
-        }
-    }
-
-    public void run()
-    {
-        TestIntfPrx proxy = TestIntfPrxHelper.uncheckedCast(_communicator.stringToProxy(
-                                                                _adapter.getTestIntf().ToString()));
-        try
-        {
-            proxy.ice_getConnection().setCloseCallback(_=>
+            public void warning(string message)
             {
                 lock(this)
                 {
-                    _closed = true;
-                    Monitor.Pulse(this);
+                    System.Text.StringBuilder s = new System.Text.StringBuilder(_name);
+                    s.Append(' ');
+                    s.Append(DateTime.Now.ToString(_date, CultureInfo.CurrentCulture));
+                    s.Append(' ');
+                    s.Append(DateTime.Now.ToString(_time, CultureInfo.CurrentCulture));
+                    s.Append(" warning : ");
+                    s.Append(message);
+                    _messages.Add(s.ToString());
+                    if(_started)
+                    {
+                        dump();
+                    }
                 }
-            });
+            }
 
-            proxy.ice_getConnection().setHeartbeatCallback(_=>
+            public void error(string message)
             {
                 lock(this)
                 {
-                    ++_heartbeat;
+                    System.Text.StringBuilder s = new System.Text.StringBuilder(_name);
+                    s.Append(' ');
+                    s.Append(DateTime.Now.ToString(_date, CultureInfo.CurrentCulture));
+                    s.Append(' ');
+                    s.Append(DateTime.Now.ToString(_time, CultureInfo.CurrentCulture));
+                    s.Append(" error : ");
+                    s.Append(message);
+                    _messages.Add(s.ToString());
+                    if(_started)
+                    {
+                        dump();
+                    }
                 }
-            });
+            }
 
-            runTestCase(_adapter, proxy);
-        }
-        catch(Exception ex)
-        {
-            _msg = "unexpected exception:\n" + ex.ToString();
-        }
-    }
+            public string getPrefix()
+            {
+                return "";
+            }
 
-    public void waitForClosed()
-    {
-        lock(this)
-        {
-            long now = IceInternal.Time.currentMonotonicTimeMillis();
-            while(!_closed)
+            public Ice.Logger cloneWithPrefix(string prefix)
             {
-                Monitor.Wait(this, 2000);
-                if(IceInternal.Time.currentMonotonicTimeMillis() - now > 2000)
+                return this;
+            }
+
+            private void dump()
+            {
+                foreach(string line in _messages)
                 {
-                    System.Diagnostics.Debug.Assert(false); // Waited for more than 2s for close, something's wrong.
-                    throw new System.Exception();
+                    _output.WriteLine(line);
                 }
+                _messages.Clear();
             }
-        }
-    }
-
-    public abstract void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy);
-
-    public void setClientACM(int timeout, int close, int heartbeat)
-    {
-        _clientACMTimeout = timeout;
-        _clientACMClose = close;
-        _clientACMHeartbeat = heartbeat;
-    }
-
-    public void  setServerACM(int timeout, int close, int heartbeat)
-    {
-        _serverACMTimeout = timeout;
-        _serverACMClose = close;
-        _serverACMHeartbeat = heartbeat;
-    }
 
-    private string _name;
-    private RemoteCommunicatorPrx _com;
-    private string _msg;
-    private LoggerI _logger;
-    private System.Threading.Thread _thread;
-
-    private Ice.Communicator _communicator;
-    private RemoteObjectAdapterPrx _adapter;
-
-    private int _clientACMTimeout;
-    private int _clientACMClose;
-    private int _clientACMHeartbeat;
-    private int _serverACMTimeout;
-    private int _serverACMClose;
-    private int _serverACMHeartbeat;
+            private string _name;
+            private bool _started;
+            private readonly static string _date = "d";
+            private readonly static string _time = "HH:mm:ss:fff";
+            private TextWriter _output;
 
-    protected int _heartbeat;
-    protected bool _closed;
-}
-
-public class AllTests : TestCommon.AllTests
-{
-    class InvocationHeartbeatTest : TestCase
-    {
-        public InvocationHeartbeatTest(RemoteCommunicatorPrx com) : base("invocation heartbeat", com)
-        {
-            setServerACM(1, -1, -1); // Faster ACM to make sure we receive enough ACM heartbeats
+            private List<string> _messages = new List<string>();
         }
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
+        abstract class TestCase
         {
-            proxy.sleep(4);
-
-            lock(this)
+            public TestCase(string name, Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper)
             {
-                test(_heartbeat >= 4);
-            }
-        }
-    }
+                _name = name;
+                _com = com;
+                _output = helper.getWriter();
+                _logger = new LoggerI(_name, _output);
+                _helper = helper;
 
-    class InvocationHeartbeatOnHoldTest : TestCase
-    {
-        public InvocationHeartbeatOnHoldTest(RemoteCommunicatorPrx com) :
-            base("invocation with heartbeat on hold", com)
-        {
-                // Use default ACM configuration.
-        }
+                _clientACMTimeout = -1;
+                _clientACMClose = -1;
+                _clientACMHeartbeat = -1;
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            try
-            {
-                // When the OA is put on hold, connections shouldn't
-                // send heartbeats, the invocation should therefore
-                // fail.
-                proxy.sleepAndHold(10);
-                test(false);
+                _serverACMTimeout = -1;
+                _serverACMClose = -1;
+                _serverACMHeartbeat = -1;
+
+                _heartbeat = 0;
+                _closed = false;
             }
-            catch(Ice.ConnectionTimeoutException)
+
+            public void init()
             {
-                adapter.activate();
-                proxy.interruptSleep();
+                _adapter = _com.createObjectAdapter(_serverACMTimeout, _serverACMClose, _serverACMHeartbeat);
 
-                waitForClosed();
+                Ice.InitializationData initData = new Ice.InitializationData();
+                initData.properties = _com.ice_getCommunicator().getProperties().ice_clone_();
+                initData.logger = _logger;
+                initData.properties.setProperty("Ice.ACM.Timeout", "2");
+                if(_clientACMTimeout >= 0)
+                {
+                    initData.properties.setProperty("Ice.ACM.Client.Timeout", _clientACMTimeout.ToString());
+                }
+                if(_clientACMClose >= 0)
+                {
+                    initData.properties.setProperty("Ice.ACM.Client.Close", _clientACMClose.ToString());
+                }
+                if(_clientACMHeartbeat >= 0)
+                {
+                    initData.properties.setProperty("Ice.ACM.Client.Heartbeat", _clientACMHeartbeat.ToString());
+                }
+                //initData.properties.setProperty("Ice.Trace.Protocol", "2");
+                //initData.properties.setProperty("Ice.Trace.Network", "2");
+                _communicator = _helper.initialize(initData);
+                _thread = new Thread(this.run);
             }
-        }
-    }
 
-    class InvocationNoHeartbeatTest : TestCase
-    {
-        public InvocationNoHeartbeatTest(RemoteCommunicatorPrx com) : base("invocation with no heartbeat", com)
-        {
-            setServerACM(2, 2, 0); // Disable heartbeat on invocations
-        }
-
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            try
+            public void start()
             {
-                // Heartbeats are disabled on the server, the
-                // invocation should fail since heartbeats are
-                // expected.
-                proxy.sleep(10);
-                test(false);
+                _thread.Start();
             }
-            catch(Ice.ConnectionTimeoutException)
+
+            public void destroy()
             {
-                proxy.interruptSleep();
+                _adapter.deactivate();
+                _communicator.destroy();
+            }
 
-                waitForClosed();
-                lock(this)
+            public void join()
+            {
+                _output.Write("testing " + _name + "... ");
+                _output.Flush();
+                _logger.start();
+                _thread.Join();
+                if(_msg == null)
                 {
-                    test(_heartbeat == 0);
+                    _output.WriteLine("ok");
+                }
+                else
+                {
+                    _output.WriteLine("failed! " + _msg);
+                    throw new System.Exception();
                 }
             }
-        }
-    }
 
-    class InvocationHeartbeatCloseOnIdleTest : TestCase
-    {
-        public InvocationHeartbeatCloseOnIdleTest(RemoteCommunicatorPrx com) :
-            base("invocation with no heartbeat and close on idle", com)
-        {
-            setClientACM(1, 1, 0); // Only close on idle.
-            setServerACM(1, 2, 0); // Disable heartbeat on invocations
-        }
+            public void run()
+            {
+                var proxy = Test.TestIntfPrxHelper.uncheckedCast(_communicator.stringToProxy(
+                                                                        _adapter.getTestIntf().ToString()));
+                try
+                {
+                    proxy.ice_getConnection().setCloseCallback(_ =>
+                    {
+                        lock(this)
+                        {
+                            _closed = true;
+                            Monitor.Pulse(this);
+                        }
+                    });
+
+                    proxy.ice_getConnection().setHeartbeatCallback(_ =>
+                    {
+                        lock(this)
+                        {
+                            ++_heartbeat;
+                        }
+                    });
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            // No close on invocation, the call should succeed this
-            // time.
-            proxy.sleep(3);
+                    runTestCase(_adapter, proxy);
+                }
+                catch(Exception ex)
+                {
+                    _msg = "unexpected exception:\n" + ex.ToString();
+                }
+            }
 
-            lock(this)
+            public void waitForClosed()
             {
-                test(_heartbeat == 0);
-                test(!_closed);
+                lock(this)
+                {
+                    long now = IceInternal.Time.currentMonotonicTimeMillis();
+                    while(!_closed)
+                    {
+                        Monitor.Wait(this, 2000);
+                        if(IceInternal.Time.currentMonotonicTimeMillis() - now > 2000)
+                        {
+                            System.Diagnostics.Debug.Assert(false); // Waited for more than 2s for close, something's wrong.
+                            throw new System.Exception();
+                        }
+                    }
+                }
             }
-        }
-    }
 
-    class CloseOnIdleTest : TestCase
-    {
-        public CloseOnIdleTest(RemoteCommunicatorPrx com) : base("close on idle", com)
-        {
-            setClientACM(1, 1, 0); // Only close on idle
-        }
+            public abstract void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy);
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            Thread.Sleep(3000); // Idle for 3 seconds
+            public void setClientACM(int timeout, int close, int heartbeat)
+            {
+                _clientACMTimeout = timeout;
+                _clientACMClose = close;
+                _clientACMHeartbeat = heartbeat;
+            }
 
-            waitForClosed();
-            lock(this)
+            public void setServerACM(int timeout, int close, int heartbeat)
             {
-                test(_heartbeat == 0);
+                _serverACMTimeout = timeout;
+                _serverACMClose = close;
+                _serverACMHeartbeat = heartbeat;
             }
-        }
-    }
 
-    class CloseOnInvocationTest : TestCase
-    {
-        public CloseOnInvocationTest(RemoteCommunicatorPrx com) : base("close on invocation", com)
-        {
-            setClientACM(1, 2, 0); // Only close on invocation
-        }
+            private string _name;
+            private Test.RemoteCommunicatorPrx _com;
+            private string _msg;
+            private LoggerI _logger;
+            private global::Test.TestHelper _helper;
+            private TextWriter _output;
+            private Thread _thread;
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            Thread.Sleep(3000); // Idle for 3 seconds
+            private Ice.Communicator _communicator;
+            private Test.RemoteObjectAdapterPrx _adapter;
 
-            lock(this)
-            {
-                test(_heartbeat == 0);
-                test(!_closed);
-            }
-        }
-    }
+            private int _clientACMTimeout;
+            private int _clientACMClose;
+            private int _clientACMHeartbeat;
+            private int _serverACMTimeout;
+            private int _serverACMClose;
+            private int _serverACMHeartbeat;
 
-    class CloseOnIdleAndInvocationTest : TestCase
-    {
-        public CloseOnIdleAndInvocationTest(RemoteCommunicatorPrx com) : base("close on idle and invocation", com)
-        {
-            setClientACM(1, 3, 0); // Only close on idle and invocation
+            protected int _heartbeat;
+            protected bool _closed;
         }
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
+        public class AllTests : global::Test.AllTests
         {
-            //
-            // Put the adapter on hold. The server will not respond to
-            // the graceful close. This allows to test whether or not
-            // the close is graceful or forceful.
-            //
-            adapter.hold();
-            Thread.Sleep(3000); // Idle for 3 seconds
-
-            lock(this)
+            class InvocationHeartbeatTest : TestCase
             {
-                test(_heartbeat == 0);
-                test(!_closed); // Not closed yet because of graceful close.
-            }
+                public InvocationHeartbeatTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("invocation heartbeat", com, helper)
+                {
+                    setServerACM(1, -1, -1); // Faster ACM to make sure we receive enough ACM heartbeats
+                }
 
-            adapter.activate();
-            Thread.Sleep(1000);
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    proxy.sleep(4);
 
-            waitForClosed();
-        }
-    }
+                    lock(this)
+                    {
+                        test(_heartbeat >= 4);
+                    }
+                }
+            }
 
-    class ForcefulCloseOnIdleAndInvocationTest : TestCase
-    {
-        public ForcefulCloseOnIdleAndInvocationTest(RemoteCommunicatorPrx com) :
-            base("forceful close on idle and invocation", com)
-        {
-            setClientACM(1, 4, 0); // Only close on idle and invocation
-        }
+            class InvocationHeartbeatOnHoldTest : TestCase
+            {
+                public InvocationHeartbeatOnHoldTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("invocation with heartbeat on hold", com, helper)
+                {
+                    // Use default ACM configuration.
+                }
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            adapter.hold();
-            Thread.Sleep(3000); // Idle for 3 seconds
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    try
+                    {
+                        // When the OA is put on hold, connections shouldn't
+                        // send heartbeats, the invocation should therefore
+                        // fail.
+                        proxy.sleepAndHold(10);
+                        test(false);
+                    }
+                    catch(Ice.ConnectionTimeoutException)
+                    {
+                        adapter.activate();
+                        proxy.interruptSleep();
 
-            waitForClosed();
-            lock(this)
-            {
-                test(_heartbeat == 0);
+                        waitForClosed();
+                    }
+                }
             }
-        }
-    }
 
-    class HeartbeatOnIdleTest : TestCase
-    {
-        public HeartbeatOnIdleTest(RemoteCommunicatorPrx com) : base("heartbeat on idle", com)
-        {
-            setServerACM(1, -1, 2); // Enable server heartbeats.
-        }
+            class InvocationNoHeartbeatTest : TestCase
+            {
+                public InvocationNoHeartbeatTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("invocation with no heartbeat", com, helper)
+                {
+                    setServerACM(2, 2, 0); // Disable heartbeat on invocations
+                }
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            Thread.Sleep(3000);
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    try
+                    {
+                        // Heartbeats are disabled on the server, the
+                        // invocation should fail since heartbeats are
+                        // expected.
+                        proxy.sleep(10);
+                        test(false);
+                    }
+                    catch(Ice.ConnectionTimeoutException)
+                    {
+                        proxy.interruptSleep();
+
+                        waitForClosed();
+                        lock(this)
+                        {
+                            test(_heartbeat == 0);
+                        }
+                    }
+                }
+            }
 
-            lock(this)
+            class InvocationHeartbeatCloseOnIdleTest : TestCase
             {
-                test(_heartbeat >= 3);
-            }
-        }
-    }
+                public InvocationHeartbeatCloseOnIdleTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("invocation with no heartbeat and close on idle", com, helper)
+                {
+                    setClientACM(1, 1, 0); // Only close on idle.
+                    setServerACM(1, 2, 0); // Disable heartbeat on invocations
+                }
 
-    class HeartbeatAlwaysTest : TestCase
-    {
-        public HeartbeatAlwaysTest(RemoteCommunicatorPrx com) : base("heartbeat always", com)
-        {
-            setServerACM(1, -1, 3); // Enable server heartbeats.
-        }
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    // No close on invocation, the call should succeed this
+                    // time.
+                    proxy.sleep(3);
+
+                    lock(this)
+                    {
+                        test(_heartbeat == 0);
+                        test(!_closed);
+                    }
+                }
+            }
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            for(int i = 0; i < 10; i++)
+            class CloseOnIdleTest : TestCase
             {
-                proxy.ice_ping();
-                Thread.Sleep(300);
+                public CloseOnIdleTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("close on idle", com, helper)
+                {
+                    setClientACM(1, 1, 0); // Only close on idle
+                }
+
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    Thread.Sleep(3000); // Idle for 3 seconds
+
+                    waitForClosed();
+                    lock(this)
+                    {
+                        test(_heartbeat == 0);
+                    }
+                }
             }
 
-            lock(this)
+            class CloseOnInvocationTest : TestCase
             {
-                test(_heartbeat >= 3);
+                public CloseOnInvocationTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("close on invocation", com, helper)
+                {
+                    setClientACM(1, 2, 0); // Only close on invocation
+                }
+
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    Thread.Sleep(3000); // Idle for 3 seconds
+
+                    lock(this)
+                    {
+                        test(_heartbeat == 0);
+                        test(!_closed);
+                    }
+                }
             }
-        }
-    }
 
-    class HeartbeatManualTest : TestCase
-    {
-        public HeartbeatManualTest(RemoteCommunicatorPrx com) : base("manual heartbeats", com)
-        {
-            //
-            // Disable heartbeats.
-            //
-            setClientACM(10, -1, 0);
-            setServerACM(10, -1, 0);
-        }
+            class CloseOnIdleAndInvocationTest : TestCase
+            {
+                public CloseOnIdleAndInvocationTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("close on idle and invocation", com, helper)
+                {
+                    setClientACM(1, 3, 0); // Only close on idle and invocation
+                }
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            proxy.startHeartbeatCount();
-            Ice.Connection con = proxy.ice_getConnection();
-            con.heartbeat();
-            con.heartbeat();
-            con.heartbeat();
-            con.heartbeat();
-            con.heartbeat();
-            proxy.waitForHeartbeatCount(5);
-        }
-    }
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    //
+                    // Put the adapter on hold. The server will not respond to
+                    // the graceful close. This allows to test whether or not
+                    // the close is graceful or forceful.
+                    //
+                    adapter.hold();
+                    Thread.Sleep(3000); // Idle for 3 seconds
+
+                    lock(this)
+                    {
+                        test(_heartbeat == 0);
+                        test(!_closed); // Not closed yet because of graceful close.
+                    }
 
-    class SetACMTest : TestCase
-    {
-        public SetACMTest(RemoteCommunicatorPrx com) : base("setACM/getACM", com)
-        {
-            setClientACM(15, 4, 0);
-        }
+                    adapter.activate();
+                    Thread.Sleep(1000);
 
-        public override void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy)
-        {
-            Ice.Connection con = proxy.ice_getCachedConnection();
+                    waitForClosed();
+                }
+            }
 
-            try
+            class ForcefulCloseOnIdleAndInvocationTest : TestCase
             {
-                con.setACM(-19, Ice.Util.None, Ice.Util.None);
-                test(false);
+                public ForcefulCloseOnIdleAndInvocationTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("forceful close on idle and invocation", com, helper)
+                {
+                    setClientACM(1, 4, 0); // Only close on idle and invocation
+                }
+
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    adapter.hold();
+                    Thread.Sleep(3000); // Idle for 3 seconds
+
+                    waitForClosed();
+                    lock(this)
+                    {
+                        test(_heartbeat == 0);
+                    }
+                }
             }
-            catch(ArgumentException)
+
+            class HeartbeatOnIdleTest : TestCase
             {
-            }
+                public HeartbeatOnIdleTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("heartbeat on idle", com, helper)
+                {
+                    setServerACM(1, -1, 2); // Enable server heartbeats.
+                }
 
-            Ice.ACM acm;
-            acm = con.getACM();
-            test(acm.timeout == 15);
-            test(acm.close == Ice.ACMClose.CloseOnIdleForceful);
-            test(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatOff);
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    Thread.Sleep(3000);
 
-            con.setACM(Ice.Util.None, Ice.Util.None, Ice.Util.None);
-            acm = con.getACM();
-            test(acm.timeout == 15);
-            test(acm.close == Ice.ACMClose.CloseOnIdleForceful);
-            test(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatOff);
+                    lock(this)
+                    {
+                        test(_heartbeat >= 3);
+                    }
+                }
+            }
 
-            con.setACM(1,
-                                                   Ice.ACMClose.CloseOnInvocationAndIdle,
-                                                   Ice.ACMHeartbeat.HeartbeatAlways);
-            acm = con.getACM();
-            test(acm.timeout == 1);
-            test(acm.close == Ice.ACMClose.CloseOnInvocationAndIdle);
-            test(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatAlways);
+            class HeartbeatAlwaysTest : TestCase
+            {
+                public HeartbeatAlwaysTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("heartbeat always", com, helper)
+                {
+                    setServerACM(1, -1, 3); // Enable server heartbeats.
+                }
 
-            proxy.startHeartbeatCount();
-            proxy.waitForHeartbeatCount(2);
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    for(int i = 0; i < 10; i++)
+                    {
+                        proxy.ice_ping();
+                        Thread.Sleep(300);
+                    }
+
+                    lock(this)
+                    {
+                        test(_heartbeat >= 3);
+                    }
+                }
+            }
 
-            var t1 = new TaskCompletionSource<object>();
-            con.setCloseCallback(_ => { t1.SetResult(null); });
+            class HeartbeatManualTest : TestCase
+            {
+                public HeartbeatManualTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("manual heartbeats", com, helper)
+                {
+                    //
+                    // Disable heartbeats.
+                    //
+                    setClientACM(10, -1, 0);
+                    setServerACM(10, -1, 0);
+                }
 
-            con.close(Ice.ConnectionClose.Gracefully);
-            test(t1.Task.Result == null);
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    proxy.startHeartbeatCount();
+                    Ice.Connection con = proxy.ice_getConnection();
+                    con.heartbeat();
+                    con.heartbeat();
+                    con.heartbeat();
+                    con.heartbeat();
+                    con.heartbeat();
+                    proxy.waitForHeartbeatCount(5);
+                }
+            }
 
-            try
+            class SetACMTest : TestCase
             {
-                con.throwException();
-                test(false);
+                public SetACMTest(Test.RemoteCommunicatorPrx com, global::Test.TestHelper helper) :
+                    base("setACM/getACM", com, helper)
+                {
+                    setClientACM(15, 4, 0);
+                }
+
+                public override void runTestCase(Test.RemoteObjectAdapterPrx adapter, Test.TestIntfPrx proxy)
+                {
+                    Ice.Connection con = proxy.ice_getCachedConnection();
+
+                    try
+                    {
+                        con.setACM(-19, Ice.Util.None, Ice.Util.None);
+                        test(false);
+                    }
+                    catch(ArgumentException)
+                    {
+                    }
+
+                    Ice.ACM acm;
+                    acm = con.getACM();
+                    test(acm.timeout == 15);
+                    test(acm.close == Ice.ACMClose.CloseOnIdleForceful);
+                    test(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatOff);
+
+                    con.setACM(Ice.Util.None, Ice.Util.None, Ice.Util.None);
+                    acm = con.getACM();
+                    test(acm.timeout == 15);
+                    test(acm.close == Ice.ACMClose.CloseOnIdleForceful);
+                    test(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatOff);
+
+                    con.setACM(1, Ice.ACMClose.CloseOnInvocationAndIdle, Ice.ACMHeartbeat.HeartbeatAlways);
+                    acm = con.getACM();
+                    test(acm.timeout == 1);
+                    test(acm.close == Ice.ACMClose.CloseOnInvocationAndIdle);
+                    test(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatAlways);
+
+                    proxy.startHeartbeatCount();
+                    proxy.waitForHeartbeatCount(2);
+
+                    var t1 = new TaskCompletionSource<object>();
+                    con.setCloseCallback(_ => { t1.SetResult(null); });
+
+                    con.close(Ice.ConnectionClose.Gracefully);
+                    test(t1.Task.Result == null);
+
+                    try
+                    {
+                        con.throwException();
+                        test(false);
+                    }
+                    catch(Ice.ConnectionManuallyClosedException)
+                    {
+                    }
+
+                    var t2 = new TaskCompletionSource<object>();
+                    con.setCloseCallback(_ => { t2.SetResult(null); });
+                    test(t2.Task.Result == null);
+
+                    con.setHeartbeatCallback(_ => { test(false); });
+                }
             }
-            catch(Ice.ConnectionManuallyClosedException)
+
+            public static void allTests(global::Test.TestHelper helper)
             {
-            }
+                Ice.Communicator communicator = helper.communicator();
+                string @ref = "communicator:" + helper.getTestEndpoint(0);
+                var com = Test.RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(@ref));
 
-            var t2 = new TaskCompletionSource<object>();
-            con.setCloseCallback(_ => { t2.SetResult(null); });
-            test(t2.Task.Result == null);
+                var output = helper.getWriter();
 
-            con.setHeartbeatCallback(_ => { test(false); });
-        }
-    }
+                List<TestCase> tests = new List<TestCase>();
 
-    public static void allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        string @ref = "communicator:" + app.getTestEndpoint(0);
-        RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(@ref));
-
-        List<TestCase> tests = new List<TestCase>();
-
-        tests.Add(new InvocationHeartbeatTest(com));
-        tests.Add(new InvocationHeartbeatOnHoldTest(com));
-        tests.Add(new InvocationNoHeartbeatTest(com));
-        tests.Add(new InvocationHeartbeatCloseOnIdleTest(com));
-
-        tests.Add(new CloseOnIdleTest(com));
-        tests.Add(new CloseOnInvocationTest(com));
-        tests.Add(new CloseOnIdleAndInvocationTest(com));
-        tests.Add(new ForcefulCloseOnIdleAndInvocationTest(com));
-
-        tests.Add(new HeartbeatOnIdleTest(com));
-        tests.Add(new HeartbeatAlwaysTest(com));
-        tests.Add(new HeartbeatManualTest(com));
-        tests.Add(new SetACMTest(com));
+                tests.Add(new InvocationHeartbeatTest(com, helper));
+                tests.Add(new InvocationHeartbeatOnHoldTest(com, helper));
+                tests.Add(new InvocationNoHeartbeatTest(com, helper));
+                tests.Add(new InvocationHeartbeatCloseOnIdleTest(com, helper));
 
-        foreach(TestCase test in tests)
-        {
-            test.init();
-        }
-        foreach(TestCase test in tests)
-        {
-            test.start();
-        }
-        foreach(TestCase test in tests)
-        {
-            test.join();
-        }
-        foreach(TestCase test in tests)
-        {
-            test.destroy();
-        }
+                tests.Add(new CloseOnIdleTest(com, helper));
+                tests.Add(new CloseOnInvocationTest(com, helper));
+                tests.Add(new CloseOnIdleAndInvocationTest(com, helper));
+                tests.Add(new ForcefulCloseOnIdleAndInvocationTest(com, helper));
+
+                tests.Add(new HeartbeatOnIdleTest(com, helper));
+                tests.Add(new HeartbeatAlwaysTest(com, helper));
+                tests.Add(new HeartbeatManualTest(com, helper));
+                tests.Add(new SetACMTest(com, helper));
+
+                foreach(TestCase test in tests)
+                {
+                    test.init();
+                }
+                foreach(TestCase test in tests)
+                {
+                    test.start();
+                }
+                foreach(TestCase test in tests)
+                {
+                    test.join();
+                }
+                foreach(TestCase test in tests)
+                {
+                    test.destroy();
+                }
 
-        Console.Out.Write("shutting down... ");
-        Console.Out.Flush();
-        com.shutdown();
-        Console.WriteLine("ok");
+                output.Write("shutting down... ");
+                output.Flush();
+                com.shutdown();
+                output.WriteLine("ok");
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/acm/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace acm
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            override public void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.Connections", "0");
+                using(var communicator = initialize(properties))
+                {
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,26 +43,26 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.acm</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/acm/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("TestAdapter.ACM.Timeout", "0");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Identity id = Ice.Util.stringToIdentity("communicator");
-        adapter.add(new RemoteCommunicatorI(), id);
-        adapter.activate();
-
-        communicator().getProperties().setProperty("Ice.PrintAdapterReady", "0");
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.ACM.Timeout", "1");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace acm
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.Connections", "0");
+                properties.setProperty("Ice.ACM.Timeout", "1");
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0");
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    var id = Util.stringToIdentity("communicator");
+                    adapter.add(new RemoteCommunicatorI(), id);
+                    adapter.activate();
+                    serverReady();
+                    communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.acm"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/acm/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/acm/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/acm/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/acm/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,153 +1,152 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class RemoteCommunicatorI : RemoteCommunicatorDisp_
+namespace Ice
 {
-    public override RemoteObjectAdapterPrx
-    createObjectAdapter(int timeout, int close, int heartbeat, Ice.Current current)
+    namespace acm
     {
-        Ice.Communicator com = current.adapter.getCommunicator();
-        Ice.Properties properties = com.getProperties();
-        string protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        string host = properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
-
-        string name = System.Guid.NewGuid().ToString();
-        if(timeout >= 0)
-        {
-            properties.setProperty(name + ".ACM.Timeout", timeout.ToString());
-        }
-        if(close >= 0)
-        {
-            properties.setProperty(name + ".ACM.Close", close.ToString());
-        }
-        if(heartbeat >= 0)
+        public class RemoteCommunicatorI : Test.RemoteCommunicatorDisp_
         {
-            properties.setProperty(name + ".ACM.Heartbeat", heartbeat.ToString());
-        }
-        properties.setProperty(name + ".ThreadPool.Size", "2");
-        Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, protocol + " -h \"" + host + "\"");
-        return RemoteObjectAdapterPrxHelper.uncheckedCast(
-            current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter)));
-    }
+            public override Test.RemoteObjectAdapterPrx
+            createObjectAdapter(int timeout, int close, int heartbeat, Ice.Current current)
+            {
+                Ice.Communicator com = current.adapter.getCommunicator();
+                Ice.Properties properties = com.getProperties();
+                string protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+                string host = properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
 
-    public override void
-    shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-}
+                string name = System.Guid.NewGuid().ToString();
+                if(timeout >= 0)
+                {
+                    properties.setProperty(name + ".ACM.Timeout", timeout.ToString());
+                }
+                if(close >= 0)
+                {
+                    properties.setProperty(name + ".ACM.Close", close.ToString());
+                }
+                if(heartbeat >= 0)
+                {
+                    properties.setProperty(name + ".ACM.Heartbeat", heartbeat.ToString());
+                }
+                properties.setProperty(name + ".ThreadPool.Size", "2");
+                Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, protocol + " -h \"" + host + "\"");
+                return Test.RemoteObjectAdapterPrxHelper.uncheckedCast(
+                    current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter)));
+            }
 
-public class RemoteObjectAdapterI : RemoteObjectAdapterDisp_
-{
-    public RemoteObjectAdapterI(Ice.ObjectAdapter adapter)
-    {
-        _adapter = adapter;
-        _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(),
-                                                                 Ice.Util.stringToIdentity("test")));
-        _adapter.activate();
-    }
+            public override void
+            shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+        }
 
-    public override TestIntfPrx getTestIntf(Ice.Current current)
-    {
-        return _testIntf;
-    }
+        public class RemoteObjectAdapterI : Test.RemoteObjectAdapterDisp_
+        {
+            public RemoteObjectAdapterI(Ice.ObjectAdapter adapter)
+            {
+                _adapter = adapter;
+                _testIntf = Test.TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), Util.stringToIdentity("test")));
+                _adapter.activate();
+            }
 
-    public override void activate(Ice.Current current)
-    {
-        _adapter.activate();
-    }
+            public override Test.TestIntfPrx getTestIntf(Ice.Current current)
+            {
+                return _testIntf;
+            }
 
-    public override void hold(Ice.Current current)
-    {
-        _adapter.hold();
-    }
+            public override void activate(Ice.Current current)
+            {
+                _adapter.activate();
+            }
 
-    public override void deactivate(Ice.Current current)
-    {
-        try
-        {
-            _adapter.destroy();
-        }
-        catch(Ice.ObjectAdapterDeactivatedException)
-        {
-        }
-    }
+            public override void hold(Ice.Current current)
+            {
+                _adapter.hold();
+            }
 
-    private Ice.ObjectAdapter _adapter;
-    private TestIntfPrx _testIntf;
-}
+            public override void deactivate(Ice.Current current)
+            {
+                try
+                {
+                    _adapter.destroy();
+                }
+                catch(Ice.ObjectAdapterDeactivatedException)
+                {
+                }
+            }
 
-public class TestI : TestIntfDisp_
-{
-    public override void sleep(int delay, Ice.Current current)
-    {
-        lock(this)
-        {
-            System.Threading.Monitor.Wait(this, delay * 1000);
+            private Ice.ObjectAdapter _adapter;
+            private Test.TestIntfPrx _testIntf;
         }
-    }
 
-    public override void sleepAndHold(int delay, Ice.Current current)
-    {
-        lock(this)
+        public class TestI : Test.TestIntfDisp_
         {
-            current.adapter.hold();
-            System.Threading.Monitor.Wait(this, delay * 1000);
-        }
-    }
+            public override void sleep(int delay, Ice.Current current)
+            {
+                lock(this)
+                {
+                    System.Threading.Monitor.Wait(this, delay * 1000);
+                }
+            }
 
-    public override void interruptSleep(Ice.Current current)
-    {
-        lock(this)
-        {
-            System.Threading.Monitor.PulseAll(this);
-        }
-    }
+            public override void sleepAndHold(int delay, Ice.Current current)
+            {
+                lock(this)
+                {
+                    current.adapter.hold();
+                    System.Threading.Monitor.Wait(this, delay * 1000);
+                }
+            }
 
-    class HeartbeatCallbackI
-    {
-        public void heartbeat(Ice.Connection c)
-        {
-            lock(this)
+            public override void interruptSleep(Ice.Current current)
             {
-                ++_count;
-                System.Threading.Monitor.PulseAll(this);
+                lock(this)
+                {
+                    System.Threading.Monitor.PulseAll(this);
+                }
             }
-        }
 
-        public void waitForCount(int count)
-        {
-            lock(this)
+            class HeartbeatCallbackI
             {
-                while(_count < count)
+                public void heartbeat(Ice.Connection c)
+                {
+                    lock(this)
+                    {
+                        ++_count;
+                        System.Threading.Monitor.PulseAll(this);
+                    }
+                }
+
+                public void waitForCount(int count)
                 {
-                    System.Threading.Monitor.Wait(this);
+                    lock(this)
+                    {
+                        while(_count < count)
+                        {
+                            System.Threading.Monitor.Wait(this);
+                        }
+                    }
                 }
+
+                private int _count = 0;
             }
-        }
 
-        private int _count = 0;
-    }
+            public override void startHeartbeatCount(Ice.Current current)
+            {
+                _callback = new HeartbeatCallbackI();
+                current.con.setHeartbeatCallback(_callback.heartbeat);
+            }
 
-    public override void startHeartbeatCount(Ice.Current current)
-    {
-        _callback = new HeartbeatCallbackI();
-        current.con.setHeartbeatCallback(_callback.heartbeat);
-    }
+            public override void waitForHeartbeatCount(int count, Ice.Current current)
+            {
+                System.Diagnostics.Debug.Assert(_callback != null);
+                _callback.waitForCount(count);
+            }
 
-    public override void waitForHeartbeatCount(int count, Ice.Current current)
-    {
-        System.Diagnostics.Debug.Assert(_callback != null);
-        _callback.waitForCount(count);
-    }
+            private HeartbeatCallbackI _callback;
+        }
 
-    private HeartbeatCallbackI _callback;
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,205 +1,208 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static TestIntfPrx allTests(TestCommon.Application app)
+    namespace adapterDeactivation
     {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        string @ref = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
-        test(@base != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        TestIntfPrx obj = TestIntfPrxHelper.checkedCast(@base);
-        test(obj != null);
-        test(obj.Equals(@base));
-        WriteLine("ok");
-
-        {
-            Write("creating/destroying/recreating object adapter... ");
-            Flush();
-            Ice.ObjectAdapter adapter =
-                communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
-            try
-            {
-                communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
-                test(false);
-            }
-            catch (Ice.AlreadyRegisteredException)
-            {
-            }
-            adapter.destroy();
-
-            //
-            // Use a different port than the first adapter to avoid an "address already in use" error.
-            //
-            adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
-            adapter.destroy();
-            Console.Out.WriteLine("ok");
-        }
-
-        Write("creating/activating/deactivating object adapter in one operation... ");
-        Flush();
-        obj.transient();
-        obj.end_transient(obj.begin_transient());
-        WriteLine("ok");
-
-        {
-            Write("testing connection closure... ");
-            Flush();
-            for(int i = 0; i < 10; ++i)
-            {
-                Ice.InitializationData initData = new Ice.InitializationData();
-                initData.properties = communicator.getProperties().ice_clone_();
-                Ice.Communicator comm = Ice.Util.initialize(initData);
-                comm.stringToProxy("test:" + app.getTestEndpoint(0)).begin_ice_ping();
-                comm.destroy();
-            }
-            WriteLine("ok");
-        }
-
-        Write("testing object adapter published endpoints... ");
-        Flush();
-        {
-            communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 30000");
-            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("PAdapter");
-            test(adapter.getPublishedEndpoints().Length == 1);
-            Ice.Endpoint endpt = adapter.getPublishedEndpoints()[0];
-            test(endpt.ToString().Equals("tcp -h localhost -p 12345 -t 30000"));
-            Ice.ObjectPrx prx =
-                communicator.stringToProxy("dummy:tcp -h localhost -p 12346 -t 20000:tcp -h localhost -p 12347 -t 10000");
-            adapter.setPublishedEndpoints(prx.ice_getEndpoints());
-            test(adapter.getPublishedEndpoints().Length == 2);
-            Ice.Identity id = new Ice.Identity();
-            id.name = "dummy";
-            test(IceUtilInternal.Arrays.Equals(adapter.createProxy(id).ice_getEndpoints(), prx.ice_getEndpoints()));
-            test(IceUtilInternal.Arrays.Equals(adapter.getPublishedEndpoints(), prx.ice_getEndpoints()));
-            adapter.refreshPublishedEndpoints();
-            test(adapter.getPublishedEndpoints().Length == 1);
-            test(adapter.getPublishedEndpoints()[0].Equals(endpt));
-            communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 20000");
-            adapter.refreshPublishedEndpoints();
-            test(adapter.getPublishedEndpoints().Length == 1);
-            test(adapter.getPublishedEndpoints()[0].ToString().Equals("tcp -h localhost -p 12345 -t 20000"));
-            adapter.destroy();
-            test(adapter.getPublishedEndpoints().Length == 0);
-        }
-        WriteLine("ok");
-
-        if(obj.ice_getConnection() != null)
-        {
-            Write("testing object adapter with bi-dir connection... ");
-            Flush();
-            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
-            obj.ice_getConnection().setAdapter(adapter);
-            obj.ice_getConnection().setAdapter(null);
-            adapter.deactivate();
-            try
-            {
-                obj.ice_getConnection().setAdapter(adapter);
-                test(false);
-            }
-            catch(Ice.ObjectAdapterDeactivatedException)
-            {
-            }
-            WriteLine("ok");
-        }
-
-        Write("testing object adapter with router... ");
-        Flush();
+        public class AllTests : global::Test.AllTests
         {
-            Ice.Identity routerId = new Ice.Identity();
-            routerId.name = "router";
-            Ice.RouterPrx router = Ice.RouterPrxHelper.uncheckedCast(@base.ice_identity(routerId).ice_connectionId("rc"));
-            Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithRouter("", router);
-            test(adapter.getPublishedEndpoints().Length == 1);
-            test(adapter.getPublishedEndpoints()[0].ToString().Equals("tcp -h localhost -p 23456 -t 30000"));
-            adapter.refreshPublishedEndpoints();
-            test(adapter.getPublishedEndpoints().Length == 1);
-            test(adapter.getPublishedEndpoints()[0].ToString().Equals("tcp -h localhost -p 23457 -t 30000"));
-            try
-            {
-                adapter.setPublishedEndpoints(router.ice_getEndpoints());
-                test(false);
-            }
-            catch(ArgumentException)
+            public static Test.TestIntfPrx allTests(global::Test.TestHelper helper)
             {
-                // Expected.
-            }
-            adapter.destroy();
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                string @ref = "test:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
+                test(@base != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                var obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                test(obj != null);
+                test(obj.Equals(@base));
+                output.WriteLine("ok");
+
+                {
+                    output.Write("creating/destroying/recreating object adapter... ");
+                    output.Flush();
+                    Ice.ObjectAdapter adapter =
+                        communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
+                    try
+                    {
+                        communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
+                        test(false);
+                    }
+                    catch(Ice.AlreadyRegisteredException)
+                    {
+                    }
+                    adapter.destroy();
+
+                    //
+                    // Use a different port than the first adapter to avoid an "address already in use" error.
+                    //
+                    adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
+                    adapter.destroy();
+                    output.WriteLine("ok");
+                }
+
+                output.Write("creating/activating/deactivating object adapter in one operation... ");
+                output.Flush();
+                obj.transient();
+                obj.end_transient(obj.begin_transient());
+                output.WriteLine("ok");
+
+                {
+                    output.Write("testing connection closure... ");
+                    output.Flush();
+                    for(int i = 0; i < 10; ++i)
+                    {
+                        Ice.InitializationData initData = new Ice.InitializationData();
+                        initData.properties = communicator.getProperties().ice_clone_();
+                        Ice.Communicator comm = Ice.Util.initialize(initData);
+                        comm.stringToProxy("test:" + helper.getTestEndpoint(0)).begin_ice_ping();
+                        comm.destroy();
+                    }
+                    output.WriteLine("ok");
+                }
+
+                output.Write("testing object adapter published endpoints... ");
+                output.Flush();
+                {
+                    communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 30000");
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("PAdapter");
+                    test(adapter.getPublishedEndpoints().Length == 1);
+                    Ice.Endpoint endpt = adapter.getPublishedEndpoints()[0];
+                    test(endpt.ToString().Equals("tcp -h localhost -p 12345 -t 30000"));
+                    Ice.ObjectPrx prx =
+                        communicator.stringToProxy("dummy:tcp -h localhost -p 12346 -t 20000:tcp -h localhost -p 12347 -t 10000");
+                    adapter.setPublishedEndpoints(prx.ice_getEndpoints());
+                    test(adapter.getPublishedEndpoints().Length == 2);
+                    Ice.Identity id = new Ice.Identity();
+                    id.name = "dummy";
+                    test(IceUtilInternal.Arrays.Equals(adapter.createProxy(id).ice_getEndpoints(), prx.ice_getEndpoints()));
+                    test(IceUtilInternal.Arrays.Equals(adapter.getPublishedEndpoints(), prx.ice_getEndpoints()));
+                    adapter.refreshPublishedEndpoints();
+                    test(adapter.getPublishedEndpoints().Length == 1);
+                    test(adapter.getPublishedEndpoints()[0].Equals(endpt));
+                    communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 20000");
+                    adapter.refreshPublishedEndpoints();
+                    test(adapter.getPublishedEndpoints().Length == 1);
+                    test(adapter.getPublishedEndpoints()[0].ToString().Equals("tcp -h localhost -p 12345 -t 20000"));
+                    adapter.destroy();
+                    test(adapter.getPublishedEndpoints().Length == 0);
+                }
+                output.WriteLine("ok");
+
+                if(obj.ice_getConnection() != null)
+                {
+                    output.Write("testing object adapter with bi-dir connection... ");
+                    output.Flush();
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
+                    obj.ice_getConnection().setAdapter(adapter);
+                    obj.ice_getConnection().setAdapter(null);
+                    adapter.deactivate();
+                    try
+                    {
+                        obj.ice_getConnection().setAdapter(adapter);
+                        test(false);
+                    }
+                    catch(Ice.ObjectAdapterDeactivatedException)
+                    {
+                    }
+                    output.WriteLine("ok");
+                }
+
+                output.Write("testing object adapter with router... ");
+                output.Flush();
+                {
+                    Ice.Identity routerId = new Ice.Identity();
+                    routerId.name = "router";
+                    Ice.RouterPrx router =
+                        Ice.RouterPrxHelper.uncheckedCast(@base.ice_identity(routerId).ice_connectionId("rc"));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithRouter("", router);
+                    test(adapter.getPublishedEndpoints().Length == 1);
+                    test(adapter.getPublishedEndpoints()[0].ToString().Equals("tcp -h localhost -p 23456 -t 30000"));
+                    adapter.refreshPublishedEndpoints();
+                    test(adapter.getPublishedEndpoints().Length == 1);
+                    test(adapter.getPublishedEndpoints()[0].ToString().Equals("tcp -h localhost -p 23457 -t 30000"));
+                    try
+                    {
+                        adapter.setPublishedEndpoints(router.ice_getEndpoints());
+                        test(false);
+                    }
+                    catch(ArgumentException)
+                    {
+                        // Expected.
+                    }
+                    adapter.destroy();
+
+                    try
+                    {
+                        routerId.name = "test";
+                        router = Ice.RouterPrxHelper.uncheckedCast(@base.ice_identity(routerId));
+                        communicator.createObjectAdapterWithRouter("", router);
+                        test(false);
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // Expected: the "test" object doesn't implement Ice::Router!
+                    }
+
+                    try
+                    {
+                        router = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("test:" +
+                                                                                              helper.getTestEndpoint(1)));
+                        communicator.createObjectAdapterWithRouter("", router);
+                        test(false);
+                    }
+                    catch(Ice.ConnectFailedException)
+                    {
+                    }
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing object adapter creation with port in use... ");
+                output.Flush();
+                {
+                    var adapter1 = communicator.createObjectAdapterWithEndpoints("Adpt1", helper.getTestEndpoint(10));
+                    try
+                    {
+                        communicator.createObjectAdapterWithEndpoints("Adpt2", helper.getTestEndpoint(10));
+                        test(false);
+                    }
+                    catch(Ice.LocalException)
+                    {
+                        // Expected can't re-use the same endpoint.
+                    }
+                    adapter1.destroy();
+                }
+                output.WriteLine("ok");
+
+                output.Write("deactivating object adapter in the server... ");
+                output.Flush();
+                obj.deactivate();
+                output.WriteLine("ok");
+
+                output.Write("testing whether server is gone... ");
+                output.Flush();
+                try
+                {
+                    obj.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                    output.WriteLine("ok");
+                }
 
-            try
-            {
-                routerId.name = "test";
-                router = Ice.RouterPrxHelper.uncheckedCast(@base.ice_identity(routerId));
-                communicator.createObjectAdapterWithRouter("", router);
-                test(false);
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // Expected: the "test" object doesn't implement Ice::Router!
-            }
-
-            try
-            {
-                router = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(1)));
-                communicator.createObjectAdapterWithRouter("", router);
-                test(false);
-            }
-            catch(Ice.ConnectFailedException)
-            {
+                return obj;
             }
         }
-        WriteLine("ok");
-
-        Write("testing object adapter creation with port in use... ");
-        Flush();
-        {
-            var adapter1 = communicator.createObjectAdapterWithEndpoints("Adpt1", app.getTestEndpoint(10));
-            try
-            {
-                communicator.createObjectAdapterWithEndpoints("Adpt2", app.getTestEndpoint(10));
-                test(false);
-            }
-            catch(Ice.LocalException)
-            {
-                // Expected can't re-use the same endpoint.
-            }
-            adapter1.destroy();
-        }
-        WriteLine("ok");
-
-        Write("deactivating object adapter in the server... ");
-        Flush();
-        obj.deactivate();
-        WriteLine("ok");
-
-        Write("testing whether server is gone... ");
-        Flush();
-        try
-        {
-            obj.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-            WriteLine("ok");
-        }
-
-        return obj;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace adapterDeactivation
     {
-        AllTests.allTests(this);
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,40 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-
-        //
-        // 2 threads are necessary to dispatch the collocated transient() call with AMI
-        //
-        communicator().getProperties().setProperty("TestAdapter.ThreadPool.Size", "2");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ServantLocator locator = new ServantLocatorI();
-        adapter.addServantLocator(locator, "");
-
-        AllTests.allTests(this);
-
-        adapter.waitForDeactivate();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace adapterDeactivation
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+
+                    //
+                    // 2 threads are necessary to dispatch the collocated transient() call with AMI
+                    //
+                    communicator.getProperties().setProperty("TestAdapter.ThreadPool.Size", "2");
+
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    var locator = new ServantLocatorI();
+                    adapter.addServantLocator(locator, "");
+
+                    AllTests.allTests(this);
+
+                    adapter.waitForDeactivate();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/CookieI.cs zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/CookieI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/CookieI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/CookieI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class CookieI : Cookie
+namespace Ice
 {
-    public override string message()
+    namespace adapterDeactivation
     {
-        return "blahblah";
+        public sealed class CookieI : Test.Cookie
+        {
+            public override string message()
+            {
+                return "blahblah";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <IceBuilderOutputDir>generated</IceBuilderOutputDir>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -52,14 +52,14 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -73,15 +73,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../CookieI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../CookieI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CookieI.cs">
       <Link>CookieI.cs</Link>
@@ -49,24 +49,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <Compile Include="../../../CookieI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../CookieI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.adapterDeactivation</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../CookieI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/ServantLocatorI.cs zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/ServantLocatorI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/ServantLocatorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/ServantLocatorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,109 +1,110 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using Test;
 using System.Text;
 
-public class RouterI : Ice.RouterDisp_
-{
-    public override Ice.ObjectPrx getClientProxy(out Ice.Optional<bool> hasRoutingTable, Ice.Current current)
-    {
-        hasRoutingTable = false;
-        return null;
-    }
-
-    public override Ice.ObjectPrx getServerProxy(Ice.Current current)
-    {
-        StringBuilder s = new StringBuilder("dummy:tcp -h localhost -p ");
-        s.Append(_nextPort++);
-        s.Append(" -t 30000");
-        return current.adapter.getCommunicator().stringToProxy(s.ToString());
-    }
-
-    public override Ice.ObjectPrx[] addProxies(Ice.ObjectPrx[] proxies, Ice.Current current)
-    {
-        return null;
-    }
-
-    private int _nextPort = 23456;
-}
-
-public sealed class ServantLocatorI : Ice.ServantLocator
+namespace Ice
 {
-    public ServantLocatorI()
-    {
-        _deactivated = false;
-    }
-
-    ~ServantLocatorI()
+    namespace adapterDeactivation
     {
-        lock(this)
+        public class RouterI : Ice.RouterDisp_
         {
-            test(_deactivated);
-        }
-    }
+            public override Ice.ObjectPrx getClientProxy(out Ice.Optional<bool> hasRoutingTable,
+                Ice.Current current)
+            {
+                hasRoutingTable = false;
+                return null;
+            }
+
+            public override Ice.ObjectPrx getServerProxy(Ice.Current current)
+            {
+                StringBuilder s = new StringBuilder("dummy:tcp -h localhost -p ");
+                s.Append(_nextPort++);
+                s.Append(" -t 30000");
+                return current.adapter.getCommunicator().stringToProxy(s.ToString());
+            }
+
+            public override Ice.ObjectPrx[] addProxies(Ice.ObjectPrx[] proxies, Ice.Current current)
+            {
+                return null;
+            }
+
+            private int _nextPort = 23456;
+        }
+
+        public sealed class ServantLocatorI : Ice.ServantLocator
+        {
+            public ServantLocatorI()
+            {
+                _deactivated = false;
+            }
+
+            ~ServantLocatorI()
+            {
+                lock(this)
+                {
+                    test(_deactivated);
+                }
+            }
+
+            private static void test(bool b)
+            {
+                if(!b)
+                {
+                    throw new System.Exception();
+                }
+            }
+
+            public Ice.Object locate(Ice.Current current, out System.Object cookie)
+            {
+                lock(this)
+                {
+                    test(!_deactivated);
+                }
+
+                if(current.id.name.Equals("router"))
+                {
+                    cookie = null;
+                    return _router;
+                }
+
+                test(current.id.category.Length == 0);
+                test(current.id.name.Equals("test"));
+
+                cookie = new CookieI();
+
+                return new TestI();
+            }
+
+            public void finished(Ice.Current current, Ice.Object servant, System.Object cookie)
+            {
+                lock(this)
+                {
+                    test(!_deactivated);
+                }
+
+                if(current.id.name.Equals("router"))
+                {
+                    return;
+                }
+
+                Test.Cookie co = (Test.Cookie) cookie;
+                test(co.message().Equals("blahblah"));
+            }
+
+            public void deactivate(string category)
+            {
+                lock(this)
+                {
+                    test(!_deactivated);
+
+                    _deactivated = true;
+                }
+            }
 
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new System.Exception();
+            private bool _deactivated;
+            private RouterI _router = new RouterI();
         }
     }
-
-    public Ice.Object locate(Ice.Current current, out System.Object cookie)
-    {
-        lock(this)
-        {
-            test(!_deactivated);
-        }
-
-        if(current.id.name.Equals("router"))
-        {
-            cookie = null;
-            return _router;
-        }
-
-        test(current.id.category.Length == 0);
-        test(current.id.name.Equals("test"));
-
-        cookie = new CookieI();
-
-        return new TestI();
-    }
-
-    public void finished(Ice.Current current, Ice.Object servant, System.Object cookie)
-    {
-        lock(this)
-        {
-            test(!_deactivated);
-        }
-
-        if(current.id.name.Equals("router"))
-        {
-            return;
-        }
-
-        Cookie co = (Cookie) cookie;
-        test(co.message().Equals("blahblah"));
-    }
-
-    public void deactivate(string category)
-    {
-        lock(this)
-        {
-            test(!_deactivated);
-
-            _deactivated = true;
-        }
-    }
-
-    private bool _deactivated;
-    private RouterI _router = new RouterI();
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace adapterDeactivation
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ServantLocator locator = new ServantLocatorI();
-        adapter.addServantLocator(locator, "");
-        adapter.activate();
-        adapter.waitForDeactivate();
-        return 0;
-    }
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.ServantLocator locator = new ServantLocatorI();
+                    adapter.addServantLocator(locator, "");
+                    adapter.activate();
+                    serverReady();
+                    adapter.waitForDeactivate();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.adapterDeactivation"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/adapterDeactivation/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/adapterDeactivation/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class TestI : TestIntfDisp_
+namespace Ice
 {
-    public override void transient(Ice.Current current)
+    namespace adapterDeactivation
     {
-        Ice.Communicator communicator = current.adapter.getCommunicator();
+        public sealed class TestI : Test.TestIntfDisp_
+        {
+            public override void transient(Ice.Current current)
+            {
+                Ice.Communicator communicator = current.adapter.getCommunicator();
 
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
-        adapter.activate();
-        adapter.destroy();
-    }
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default");
+                adapter.activate();
+                adapter.destroy();
+            }
 
-    public override void deactivate(Ice.Current current)
-    {
-        current.adapter.deactivate();
-        System.Threading.Thread.Sleep(100);
+            public override void deactivate(Ice.Current current)
+            {
+                current.adapter.deactivate();
+                System.Threading.Thread.Sleep(100);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/admin/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,594 +1,617 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 
-using Test;
-
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    static void
-    testFacets(Ice.Communicator com, bool builtInFacets)
+    namespace admin
     {
-        if(builtInFacets)
-        {
-            test(com.findAdminFacet("Properties") != null);
-            test(com.findAdminFacet("Process") != null);
-            test(com.findAdminFacet("Logger") != null);
-            test(com.findAdminFacet("Metrics") != null);
-        }
-
-        TestFacet f1 = new TestFacetI();
-        TestFacet f2 = new TestFacetI();
-        TestFacet f3 = new TestFacetI();
-
-        com.addAdminFacet(f1, "Facet1");
-        com.addAdminFacet(f2, "Facet2");
-        com.addAdminFacet(f3, "Facet3");
-
-        test(com.findAdminFacet("Facet1") == f1);
-        test(com.findAdminFacet("Facet2") == f2);
-        test(com.findAdminFacet("Facet3") == f3);
-        test(com.findAdminFacet("Bogus") == null);
-
-        Dictionary<string, Ice.Object> facetMap = com.findAllAdminFacets();
-        if(builtInFacets)
-        {
-            test(facetMap.Count == 7);
-            test(facetMap.ContainsKey("Properties"));
-            test(facetMap.ContainsKey("Process"));
-            test(facetMap.ContainsKey("Logger"));
-            test(facetMap.ContainsKey("Metrics"));
-        }
-        else
+        public class AllTests : global::Test.AllTests
         {
-            test(facetMap.Count >= 3);
-        }
-        test(facetMap.ContainsKey("Facet1"));
-        test(facetMap.ContainsKey("Facet2"));
-        test(facetMap.ContainsKey("Facet3"));
-
-        try
-        {
-            com.addAdminFacet(f1, "Facet1");
-            test(false);
-        }
-        catch(Ice.AlreadyRegisteredException)
-        {
-            // Expected
-        }
-
-        try
-        {
-            com.removeAdminFacet("Bogus");
-            test(false);
-        }
-        catch(Ice.NotRegisteredException)
-        {
-            // Expected
-        }
-
-        com.removeAdminFacet("Facet1");
-        com.removeAdminFacet("Facet2");
-        com.removeAdminFacet("Facet3");
-
-        try
-        {
-            com.removeAdminFacet("Facet1");
-            test(false);
-        }
-        catch(Ice.NotRegisteredException)
-        {
-            // Expected
-        }
-    }
-
-    public static void allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing communicator operations... ");
-        Flush();
-        {
-            //
-            // Test: Exercise addAdminFacet, findAdminFacet, removeAdminFacet with a typical configuration.
-            //
-            Ice.InitializationData init = new Ice.InitializationData();
-            init.properties = Ice.Util.createProperties();
-            init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            init.properties.setProperty("Ice.Admin.InstanceName", "Test");
-            Ice.Communicator com = Ice.Util.initialize(init);
-            testFacets(com, true);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Verify that the operations work correctly in the presence of facet filters.
-            //
-            Ice.InitializationData init = new Ice.InitializationData();
-            init.properties = Ice.Util.createProperties();
-            init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            init.properties.setProperty("Ice.Admin.InstanceName", "Test");
-            init.properties.setProperty("Ice.Admin.Facets", "Properties");
-            Ice.Communicator com = Ice.Util.initialize(init);
-            testFacets(com, false);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Verify that the operations work correctly with the Admin object disabled.
-            //
-            Ice.Communicator com = Ice.Util.initialize();
-            testFacets(com, false);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Verify that the operations work correctly with Ice.Admin.Enabled=1
-            //
-            Ice.InitializationData init = new Ice.InitializationData();
-            init.properties = Ice.Util.createProperties();
-            init.properties.setProperty("Ice.Admin.Enabled", "1");
-            Ice.Communicator com = Ice.Util.initialize(init);
-            test(com.getAdmin() == null);
-            Ice.Identity id = Ice.Util.stringToIdentity("test-admin");
-            try
-            {
-                com.createAdmin(null, id);
-                test(false);
-            }
-            catch(Ice.InitializationException)
+            static void
+            testFacets(Ice.Communicator com, bool builtInFacets)
             {
-            }
-
-            Ice.ObjectAdapter adapter = com.createObjectAdapter("");
-            test(com.createAdmin(adapter, id) != null);
-            test(com.getAdmin() != null);
-
-            testFacets(com, true);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Verify that the operations work correctly when creation of the Admin object is delayed.
-            //
-            Ice.InitializationData init = new Ice.InitializationData();
-            init.properties = Ice.Util.createProperties();
-            init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            init.properties.setProperty("Ice.Admin.InstanceName", "Test");
-            init.properties.setProperty("Ice.Admin.DelayCreation", "1");
-            Ice.Communicator com = Ice.Util.initialize(init);
-            testFacets(com, true);
-            com.getAdmin();
-            testFacets(com, true);
-            com.destroy();
-        }
-        WriteLine("ok");
-
-        string @ref = "factory:" + app.getTestEndpoint(0) + " -t 10000";
-        RemoteCommunicatorFactoryPrx factory =
-            RemoteCommunicatorFactoryPrxHelper.uncheckedCast(communicator.stringToProxy(@ref));
-
-        Write("testing process facet... ");
-        Flush();
-        {
-            //
-            // Test: Verify that Process::shutdown() operation shuts down the communicator.
-            //
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
-            proc.shutdown();
-            com.waitForShutdown();
-            com.destroy();
-        }
-        WriteLine("ok");
+                if(builtInFacets)
+                {
+                    test(com.findAdminFacet("Properties") != null);
+                    test(com.findAdminFacet("Process") != null);
+                    test(com.findAdminFacet("Logger") != null);
+                    test(com.findAdminFacet("Metrics") != null);
+                }
 
-        Write("testing properties facet... ");
-        Flush();
-        {
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            props.Add("Prop1", "1");
-            props.Add("Prop2", "2");
-            props.Add("Prop3", "3");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
-
-            //
-            // Test: PropertiesAdmin::getProperty()
-            //
-            test(pa.getProperty("Prop2").Equals("2"));
-            test(pa.getProperty("Bogus").Equals(""));
-
-            //
-            // Test: PropertiesAdmin::getProperties()
-            //
-            Dictionary<string, string> pd = pa.getPropertiesForPrefix("");
-            test(pd.Count == 5);
-            test(pd["Ice.Admin.Endpoints"].Equals("tcp -h 127.0.0.1"));
-            test(pd["Ice.Admin.InstanceName"].Equals("Test"));
-            test(pd["Prop1"].Equals("1"));
-            test(pd["Prop2"].Equals("2"));
-            test(pd["Prop3"].Equals("3"));
-
-            Dictionary<string, string> changes;
-
-            //
-            // Test: PropertiesAdmin::setProperties()
-            //
-            Dictionary<string, string> setProps = new Dictionary<string, string>();
-            setProps.Add("Prop1", "10"); // Changed
-            setProps.Add("Prop2", "20"); // Changed
-            setProps.Add("Prop3", ""); // Removed
-            setProps.Add("Prop4", "4"); // Added
-            setProps.Add("Prop5", "5"); // Added
-            pa.setProperties(setProps);
-            test(pa.getProperty("Prop1").Equals("10"));
-            test(pa.getProperty("Prop2").Equals("20"));
-            test(pa.getProperty("Prop3").Equals(""));
-            test(pa.getProperty("Prop4").Equals("4"));
-            test(pa.getProperty("Prop5").Equals("5"));
-            changes = com.getChanges();
-            test(changes.Count == 5);
-            test(changes["Prop1"].Equals("10"));
-            test(changes["Prop2"].Equals("20"));
-            test(changes["Prop3"].Equals(""));
-            test(changes["Prop4"].Equals("4"));
-            test(changes["Prop5"].Equals("5"));
-            pa.setProperties(setProps);
-            changes = com.getChanges();
-            test(changes.Count == 0);
+                Test.TestFacet f1 = new TestFacetI();
+                Test.TestFacet f2 = new TestFacetI();
+                Test.TestFacet f3 = new TestFacetI();
+
+                com.addAdminFacet(f1, "Facet1");
+                com.addAdminFacet(f2, "Facet2");
+                com.addAdminFacet(f3, "Facet3");
+
+                test(com.findAdminFacet("Facet1") == f1);
+                test(com.findAdminFacet("Facet2") == f2);
+                test(com.findAdminFacet("Facet3") == f3);
+                test(com.findAdminFacet("Bogus") == null);
 
-            com.destroy();
-        }
-        WriteLine("ok");
+                Dictionary<string, Ice.Object> facetMap = com.findAllAdminFacets();
+                if(builtInFacets)
+                {
+                    test(facetMap.Count == 7);
+                    test(facetMap.ContainsKey("Properties"));
+                    test(facetMap.ContainsKey("Process"));
+                    test(facetMap.ContainsKey("Logger"));
+                    test(facetMap.ContainsKey("Metrics"));
+                }
+                else
+                {
+                    test(facetMap.Count >= 3);
+                }
+                test(facetMap.ContainsKey("Facet1"));
+                test(facetMap.ContainsKey("Facet2"));
+                test(facetMap.ContainsKey("Facet3"));
 
-        Write("testing logger facet... ");
-        Flush();
-        {
-            Dictionary<String, String> props = new Dictionary<String, String>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            props.Add("NullLogger", "1");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-
-            com.trace("testCat", "trace");
-            com.warning("warning");
-            com.error("error");
-            com.print("print");
-
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.LoggerAdminPrx logger = Ice.LoggerAdminPrxHelper.checkedCast(obj, "Logger");
-            test(logger != null);
-
-            string prefix = null;
-
-            //
-            // Get all
-            //
-            Ice.LogMessage[] logMessages = logger.getLog(null, null, -1, out prefix);
-
-            test(logMessages.Length == 4);
-            test(prefix.Equals("NullLogger"));
-            test(logMessages[0].traceCategory.Equals("testCat") && logMessages[0].message.Equals("trace"));
-            test(logMessages[1].message.Equals("warning"));
-            test(logMessages[2].message.Equals("error"));
-            test(logMessages[3].message.Equals("print"));
-
-            //
-            // Get only errors and warnings
-            //
-            com.error("error2");
-            com.print("print2");
-            com.trace("testCat", "trace2");
-            com.warning("warning2");
+                try
+                {
+                    com.addAdminFacet(f1, "Facet1");
+                    test(false);
+                }
+                catch(Ice.AlreadyRegisteredException)
+                {
+                    // Expected
+                }
 
-            Ice.LogMessageType[] messageTypes = {Ice.LogMessageType.ErrorMessage, Ice.LogMessageType.WarningMessage};
+                try
+                {
+                    com.removeAdminFacet("Bogus");
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException)
+                {
+                    // Expected
+                }
 
-            logMessages = logger.getLog(messageTypes, null, -1, out prefix);
+                com.removeAdminFacet("Facet1");
+                com.removeAdminFacet("Facet2");
+                com.removeAdminFacet("Facet3");
 
-            test(logMessages.Length == 4);
-            test(prefix.Equals("NullLogger"));
+                try
+                {
+                    com.removeAdminFacet("Facet1");
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException)
+                {
+                    // Expected
+                }
+            }
 
-            foreach(var msg in logMessages)
+            public static void allTests(global::Test.TestHelper helper)
             {
-                test(msg.type == Ice.LogMessageType.ErrorMessage || msg.type == Ice.LogMessageType.WarningMessage);
-            }
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing communicator operations... ");
+                output.Flush();
+                {
+                    //
+                    // Test: Exercise addAdminFacet, findAdminFacet, removeAdminFacet with a typical configuration.
+                    //
+                    Ice.InitializationData init = new Ice.InitializationData();
+                    init.properties = Ice.Util.createProperties();
+                    init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    init.properties.setProperty("Ice.Admin.InstanceName", "Test");
+                    Ice.Communicator com = Ice.Util.initialize(init);
+                    testFacets(com, true);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Verify that the operations work correctly in the presence of facet filters.
+                    //
+                    Ice.InitializationData init = new Ice.InitializationData();
+                    init.properties = Ice.Util.createProperties();
+                    init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    init.properties.setProperty("Ice.Admin.InstanceName", "Test");
+                    init.properties.setProperty("Ice.Admin.Facets", "Properties");
+                    Ice.Communicator com = Ice.Util.initialize(init);
+                    testFacets(com, false);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Verify that the operations work correctly with the Admin object disabled.
+                    //
+                    Ice.Communicator com = Ice.Util.initialize();
+                    testFacets(com, false);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Verify that the operations work correctly with Ice.Admin.Enabled=1
+                    //
+                    Ice.InitializationData init = new Ice.InitializationData();
+                    init.properties = Ice.Util.createProperties();
+                    init.properties.setProperty("Ice.Admin.Enabled", "1");
+                    Ice.Communicator com = Ice.Util.initialize(init);
+                    test(com.getAdmin() == null);
+                    Ice.Identity id = Ice.Util.stringToIdentity("test-admin");
+                    try
+                    {
+                        com.createAdmin(null, id);
+                        test(false);
+                    }
+                    catch(Ice.InitializationException)
+                    {
+                    }
+
+                    Ice.ObjectAdapter adapter = com.createObjectAdapter("");
+                    test(com.createAdmin(adapter, id) != null);
+                    test(com.getAdmin() != null);
 
-            //
-            // Get only errors and traces with Cat = "testCat"
-            //
-            com.trace("testCat2", "A");
-            com.trace("testCat", "trace3");
-            com.trace("testCat2", "B");
-
-            messageTypes = new Ice.LogMessageType[]{Ice.LogMessageType.ErrorMessage, Ice.LogMessageType.TraceMessage};
-            string[] categories = {"testCat"};
-            logMessages = logger.getLog(messageTypes, categories, -1, out prefix);
-            test(logMessages.Length == 5);
-            test(prefix.Equals("NullLogger"));
+                    testFacets(com, true);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Verify that the operations work correctly when creation of the Admin object is delayed.
+                    //
+                    Ice.InitializationData init = new Ice.InitializationData();
+                    init.properties = Ice.Util.createProperties();
+                    init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    init.properties.setProperty("Ice.Admin.InstanceName", "Test");
+                    init.properties.setProperty("Ice.Admin.DelayCreation", "1");
+                    Ice.Communicator com = Ice.Util.initialize(init);
+                    testFacets(com, true);
+                    com.getAdmin();
+                    testFacets(com, true);
+                    com.destroy();
+                }
+                output.WriteLine("ok");
 
-            foreach(var msg in logMessages)
-            {
-                test(msg.type == Ice.LogMessageType.ErrorMessage ||
-                     (msg.type == Ice.LogMessageType.TraceMessage && msg.traceCategory.Equals("testCat")));
-            }
+                string @ref = "factory:" + helper.getTestEndpoint(0) + " -t 10000";
+                Test.RemoteCommunicatorFactoryPrx factory =
+                    Test.RemoteCommunicatorFactoryPrxHelper.uncheckedCast(communicator.stringToProxy(@ref));
 
-            //
-            // Same, but limited to last 2 messages (trace3 + error3)
-            //
-            com.error("error3");
-
-            logMessages = logger.getLog(messageTypes, categories, 2, out prefix);
-            test(logMessages.Length == 2);
-            test(prefix.Equals("NullLogger"));
-
-            test(logMessages[0].message.Equals("trace3"));
-            test(logMessages[1].message.Equals("error3"));
-
-            //
-            // Now, test RemoteLogger
-            //
-            Ice.ObjectAdapter adapter =
-                communicator.createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost");
-
-            RemoteLoggerI remoteLogger = new RemoteLoggerI();
-
-            Ice.RemoteLoggerPrx myProxy = Ice.RemoteLoggerPrxHelper.uncheckedCast(adapter.addWithUUID(remoteLogger));
-
-            adapter.activate();
-
-            //
-            // No filtering
-            //
-            logMessages = logger.getLog(null, null, -1, out prefix);
-            remoteLogger.checkNextInit(prefix, logMessages);
-
-            logger.attachRemoteLogger(myProxy, null, null, -1);
-            remoteLogger.wait(1);
-
-            remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace", "testCat");
-            remoteLogger.checkNextLog(Ice.LogMessageType.WarningMessage, "rwarning", "");
-            remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror", "");
-            remoteLogger.checkNextLog(Ice.LogMessageType.PrintMessage, "rprint", "");
-
-            com.trace("testCat", "rtrace");
-            com.warning("rwarning");
-            com.error("rerror");
-            com.print("rprint");
-
-            remoteLogger.wait(4);
-
-            test(logger.detachRemoteLogger(myProxy));
-            test(!logger.detachRemoteLogger(myProxy));
-
-            //
-            // Use Error + Trace with "traceCat" filter with 4 limit
-            //
-            logMessages = logger.getLog(messageTypes, categories, 4, out prefix);
-            test(logMessages.Length == 4);
-            remoteLogger.checkNextInit(prefix, logMessages);
-
-            logger.attachRemoteLogger(myProxy, messageTypes, categories, 4);
-            remoteLogger.wait(1);
-
-            remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace2", "testCat");
-            remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror2", "");
-
-            com.warning("rwarning2");
-            com.trace("testCat", "rtrace2");
-            com.warning("rwarning3");
-            com.error("rerror2");
-            com.print("rprint2");
-
-            remoteLogger.wait(2);
-
-            //
-            // Attempt reconnection with slightly different proxy
-            //
-            try
-            {
-                logger.attachRemoteLogger(Ice.RemoteLoggerPrxHelper.uncheckedCast(myProxy.ice_oneway()),
-                                          messageTypes, categories, 4);
-                test(false);
-            }
-            catch(Ice.RemoteLoggerAlreadyAttachedException)
-            {
-                // expected
-            }
+                output.Write("testing process facet... ");
+                output.Flush();
+                {
+                    //
+                    // Test: Verify that Process::shutdown() operation shuts down the communicator.
+                    //
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
+                    proc.shutdown();
+                    com.waitForShutdown();
+                    com.destroy();
+                }
+                output.WriteLine("ok");
 
-            com.destroy();
-        }
-        WriteLine("ok");
+                output.Write("testing properties facet... ");
+                output.Flush();
+                {
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    props.Add("Prop1", "1");
+                    props.Add("Prop2", "2");
+                    props.Add("Prop3", "3");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
+
+                    //
+                    // Test: PropertiesAdmin::getProperty()
+                    //
+                    test(pa.getProperty("Prop2").Equals("2"));
+                    test(pa.getProperty("Bogus").Equals(""));
+
+                    //
+                    // Test: PropertiesAdmin::getProperties()
+                    //
+                    Dictionary<string, string> pd = pa.getPropertiesForPrefix("");
+                    test(pd.Count == 5);
+                    test(pd["Ice.Admin.Endpoints"].Equals("tcp -h 127.0.0.1"));
+                    test(pd["Ice.Admin.InstanceName"].Equals("Test"));
+                    test(pd["Prop1"].Equals("1"));
+                    test(pd["Prop2"].Equals("2"));
+                    test(pd["Prop3"].Equals("3"));
+
+                    Dictionary<string, string> changes;
+
+                    //
+                    // Test: PropertiesAdmin::setProperties()
+                    //
+                    Dictionary<string, string> setProps = new Dictionary<string, string>();
+                    setProps.Add("Prop1", "10"); // Changed
+                    setProps.Add("Prop2", "20"); // Changed
+                    setProps.Add("Prop3", ""); // Removed
+                    setProps.Add("Prop4", "4"); // Added
+                    setProps.Add("Prop5", "5"); // Added
+                    pa.setProperties(setProps);
+                    test(pa.getProperty("Prop1").Equals("10"));
+                    test(pa.getProperty("Prop2").Equals("20"));
+                    test(pa.getProperty("Prop3").Equals(""));
+                    test(pa.getProperty("Prop4").Equals("4"));
+                    test(pa.getProperty("Prop5").Equals("5"));
+                    changes = com.getChanges();
+                    test(changes.Count == 5);
+                    test(changes["Prop1"].Equals("10"));
+                    test(changes["Prop2"].Equals("20"));
+                    test(changes["Prop3"].Equals(""));
+                    test(changes["Prop4"].Equals("4"));
+                    test(changes["Prop5"].Equals("5"));
+                    pa.setProperties(setProps);
+                    changes = com.getChanges();
+                    test(changes.Count == 0);
 
-        Write("testing custom facet... ");
-        Flush();
-        {
-            //
-            // Test: Verify that the custom facet is present.
-            //
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            TestFacetPrx tf = TestFacetPrxHelper.checkedCast(obj, "TestFacet");
-            tf.op();
-            com.destroy();
-        }
-        WriteLine("ok");
+                    com.destroy();
+                }
+                output.WriteLine("ok");
 
-        Write("testing facet filtering... ");
-        Flush();
-        {
-            //
-            // Test: Set Ice.Admin.Facets to expose only the Properties facet,
-            // meaning no other facet is available.
-            //
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            props.Add("Ice.Admin.Facets", "Properties");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
-            test(proc == null);
-            TestFacetPrx tf = TestFacetPrxHelper.checkedCast(obj, "TestFacet");
-            test(tf == null);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Set Ice.Admin.Facets to expose only the Process facet,
-            // meaning no other facet is available.
-            //
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            props.Add("Ice.Admin.Facets", "Process");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
-            test(pa == null);
-            TestFacetPrx tf = TestFacetPrxHelper.checkedCast(obj, "TestFacet");
-            test(tf == null);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Set Ice.Admin.Facets to expose only the TestFacet facet,
-            // meaning no other facet is available.
-            //
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            props.Add("Ice.Admin.Facets", "TestFacet");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
-            test(pa == null);
-            Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
-            test(proc == null);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Set Ice.Admin.Facets to expose two facets. Use whitespace to separate the
-            // facet names.
-            //
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            props.Add("Ice.Admin.Facets", "Properties TestFacet");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
-            test(pa.getProperty("Ice.Admin.InstanceName").Equals("Test"));
-            TestFacetPrx tf = TestFacetPrxHelper.checkedCast(obj, "TestFacet");
-            tf.op();
-            Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
-            test(proc == null);
-            com.destroy();
-        }
-        {
-            //
-            // Test: Set Ice.Admin.Facets to expose two facets. Use a comma to separate the
-            // facet names.
-            //
-            Dictionary<string, string> props = new Dictionary<string, string>();
-            props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
-            props.Add("Ice.Admin.InstanceName", "Test");
-            props.Add("Ice.Admin.Facets", "TestFacet, Process");
-            RemoteCommunicatorPrx com = factory.createCommunicator(props);
-            Ice.ObjectPrx obj = com.getAdmin();
-            Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
-            test(pa == null);
-            TestFacetPrx tf = TestFacetPrxHelper.checkedCast(obj, "TestFacet");
-            tf.op();
-            Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
-            proc.shutdown();
-            com.waitForShutdown();
-            com.destroy();
-        }
-        WriteLine("ok");
+                output.Write("testing logger facet... ");
+                output.Flush();
+                {
+                    Dictionary<String, String> props = new Dictionary<String, String>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    props.Add("NullLogger", "1");
+                    var com = factory.createCommunicator(props);
+
+                    com.trace("testCat", "trace");
+                    com.warning("warning");
+                    com.error("error");
+                    com.print("print");
+
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.LoggerAdminPrx logger = Ice.LoggerAdminPrxHelper.checkedCast(obj, "Logger");
+                    test(logger != null);
+
+                    string prefix = null;
+
+                    //
+                    // Get all
+                    //
+                    Ice.LogMessage[] logMessages = logger.getLog(null, null, -1, out prefix);
+
+                    test(logMessages.Length == 4);
+                    test(prefix.Equals("NullLogger"));
+                    test(logMessages[0].traceCategory.Equals("testCat") && logMessages[0].message.Equals("trace"));
+                    test(logMessages[1].message.Equals("warning"));
+                    test(logMessages[2].message.Equals("error"));
+                    test(logMessages[3].message.Equals("print"));
+
+                    //
+                    // Get only errors and warnings
+                    //
+                    com.error("error2");
+                    com.print("print2");
+                    com.trace("testCat", "trace2");
+                    com.warning("warning2");
+
+                    Ice.LogMessageType[] messageTypes = {
+                                Ice.LogMessageType.ErrorMessage,
+                                Ice.LogMessageType.WarningMessage
+                            };
+
+                    logMessages = logger.getLog(messageTypes, null, -1, out prefix);
+
+                    test(logMessages.Length == 4);
+                    test(prefix.Equals("NullLogger"));
+
+                    foreach(var msg in logMessages)
+                    {
+                        test(msg.type == Ice.LogMessageType.ErrorMessage ||
+                             msg.type == Ice.LogMessageType.WarningMessage);
+                    }
+
+                    //
+                    // Get only errors and traces with Cat = "testCat"
+                    //
+                    com.trace("testCat2", "A");
+                    com.trace("testCat", "trace3");
+                    com.trace("testCat2", "B");
+
+                    messageTypes = new Ice.LogMessageType[] {
+                                Ice.LogMessageType.ErrorMessage,
+                                Ice.LogMessageType.TraceMessage
+                            };
+                    string[] categories = { "testCat" };
+                    logMessages = logger.getLog(messageTypes, categories, -1, out prefix);
+                    test(logMessages.Length == 5);
+                    test(prefix.Equals("NullLogger"));
+
+                    foreach(var msg in logMessages)
+                    {
+                        test(msg.type == Ice.LogMessageType.ErrorMessage ||
+                            (msg.type == Ice.LogMessageType.TraceMessage && msg.traceCategory.Equals("testCat")));
+                    }
+
+                    //
+                    // Same, but limited to last 2 messages(trace3 + error3)
+                    //
+                    com.error("error3");
+
+                    logMessages = logger.getLog(messageTypes, categories, 2, out prefix);
+                    test(logMessages.Length == 2);
+                    test(prefix.Equals("NullLogger"));
+
+                    test(logMessages[0].message.Equals("trace3"));
+                    test(logMessages[1].message.Equals("error3"));
+
+                    //
+                    // Now, test RemoteLogger
+                    //
+                    Ice.ObjectAdapter adapter =
+                        communicator.createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost");
+
+                    RemoteLoggerI remoteLogger = new RemoteLoggerI();
+
+                    Ice.RemoteLoggerPrx myProxy =
+                        Ice.RemoteLoggerPrxHelper.uncheckedCast(adapter.addWithUUID(remoteLogger));
+
+                    adapter.activate();
+
+                    //
+                    // No filtering
+                    //
+                    logMessages = logger.getLog(null, null, -1, out prefix);
+
+                    logger.attachRemoteLogger(myProxy, null, null, -1);
+                    remoteLogger.wait(1);
+
+                    foreach(var m in logMessages)
+                    {
+                        remoteLogger.checkNextInit(prefix, m.type, m.message, m.traceCategory);
+                    }
+
+                    com.trace("testCat", "rtrace");
+                    com.warning("rwarning");
+                    com.error("rerror");
+                    com.print("rprint");
+
+                    remoteLogger.wait(4);
+
+                    remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace", "testCat");
+                    remoteLogger.checkNextLog(Ice.LogMessageType.WarningMessage, "rwarning", "");
+                    remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror", "");
+                    remoteLogger.checkNextLog(Ice.LogMessageType.PrintMessage, "rprint", "");
+
+                    test(logger.detachRemoteLogger(myProxy));
+                    test(!logger.detachRemoteLogger(myProxy));
+
+                    //
+                    // Use Error + Trace with "traceCat" filter with 4 limit
+                    //
+                    logMessages = logger.getLog(messageTypes, categories, 4, out prefix);
+                    test(logMessages.Length == 4);
+
+                    logger.attachRemoteLogger(myProxy, messageTypes, categories, 4);
+                    remoteLogger.wait(1);
+
+                    foreach(var m in logMessages)
+                    {
+                        remoteLogger.checkNextInit(prefix, m.type, m.message, m.traceCategory);
+                    }
+
+                    com.warning("rwarning2");
+                    com.trace("testCat", "rtrace2");
+                    com.warning("rwarning3");
+                    com.error("rerror2");
+                    com.print("rprint2");
+
+                    remoteLogger.wait(2);
+
+                    remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace2", "testCat");
+                    remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror2", "");
+
+                    //
+                    // Attempt reconnection with slightly different proxy
+                    //
+                    try
+                    {
+                        logger.attachRemoteLogger(Ice.RemoteLoggerPrxHelper.uncheckedCast(myProxy.ice_oneway()),
+                                                  messageTypes, categories, 4);
+                        test(false);
+                    }
+                    catch(Ice.RemoteLoggerAlreadyAttachedException)
+                    {
+                        // expected
+                    }
 
-        factory.shutdown();
-    }
+                    com.destroy();
+                }
+                output.WriteLine("ok");
 
-    private class RemoteLoggerI : Ice.RemoteLoggerDisp_
-    {
-        override public void init(string prefix, Ice.LogMessage[] logMessages, Ice.Current current)
-        {
-            lock(this)
-            {
-                test(prefix.Equals(_expectedPrefix));
-                test(Enumerable.SequenceEqual(logMessages, _expectedInitMessages));
-                _receivedCalls++;
-                Monitor.PulseAll(this);
-            }
-        }
+                output.Write("testing custom facet... ");
+                output.Flush();
+                {
+                    //
+                    // Test: Verify that the custom facet is present.
+                    //
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    var tf = Test.TestFacetPrxHelper.checkedCast(obj, "TestFacet");
+                    tf.op();
+                    com.destroy();
+                }
+                output.WriteLine("ok");
 
-        override public void log(Ice.LogMessage logMessage, Ice.Current current)
-        {
-            lock(this)
-            {
-                Ice.LogMessage front = _expectedLogMessages.Dequeue();
-                test(front.type == logMessage.type && front.message.Equals(logMessage.message) &&
-                     front.traceCategory.Equals(logMessage.traceCategory));
+                output.Write("testing facet filtering... ");
+                output.Flush();
+                {
+                    //
+                    // Test: Set Ice.Admin.Facets to expose only the Properties facet,
+                    // meaning no other facet is available.
+                    //
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    props.Add("Ice.Admin.Facets", "Properties");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
+                    test(proc == null);
+                    var tf = Test.TestFacetPrxHelper.checkedCast(obj, "TestFacet");
+                    test(tf == null);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Set Ice.Admin.Facets to expose only the Process facet,
+                    // meaning no other facet is available.
+                    //
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    props.Add("Ice.Admin.Facets", "Process");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
+                    test(pa == null);
+                    var tf = Test.TestFacetPrxHelper.checkedCast(obj, "TestFacet");
+                    test(tf == null);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Set Ice.Admin.Facets to expose only the TestFacet facet,
+                    // meaning no other facet is available.
+                    //
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    props.Add("Ice.Admin.Facets", "TestFacet");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
+                    test(pa == null);
+                    Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
+                    test(proc == null);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Set Ice.Admin.Facets to expose two facets. Use whitespace to separate the
+                    // facet names.
+                    //
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    props.Add("Ice.Admin.Facets", "Properties TestFacet");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
+                    test(pa.getProperty("Ice.Admin.InstanceName").Equals("Test"));
+                    var tf = Test.TestFacetPrxHelper.checkedCast(obj, "TestFacet");
+                    tf.op();
+                    Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
+                    test(proc == null);
+                    com.destroy();
+                }
+                {
+                    //
+                    // Test: Set Ice.Admin.Facets to expose two facets. Use a comma to separate the
+                    // facet names.
+                    //
+                    Dictionary<string, string> props = new Dictionary<string, string>();
+                    props.Add("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
+                    props.Add("Ice.Admin.InstanceName", "Test");
+                    props.Add("Ice.Admin.Facets", "TestFacet, Process");
+                    var com = factory.createCommunicator(props);
+                    Ice.ObjectPrx obj = com.getAdmin();
+                    Ice.PropertiesAdminPrx pa = Ice.PropertiesAdminPrxHelper.checkedCast(obj, "Properties");
+                    test(pa == null);
+                    var tf = Test.TestFacetPrxHelper.checkedCast(obj, "TestFacet");
+                    tf.op();
+                    Ice.ProcessPrx proc = Ice.ProcessPrxHelper.checkedCast(obj, "Process");
+                    proc.shutdown();
+                    com.waitForShutdown();
+                    com.destroy();
+                }
+                output.WriteLine("ok");
 
-                _receivedCalls++;
-                Monitor.PulseAll(this);
+                factory.shutdown();
             }
-        }
 
-        internal void checkNextInit(string prefix, Ice.LogMessage[] logMessages)
-        {
-            lock(this)
+            private class RemoteLoggerI : Ice.RemoteLoggerDisp_
             {
-                _expectedPrefix = prefix;
-                _expectedInitMessages = logMessages;
-            }
-        }
+                override public void init(string prefix, Ice.LogMessage[] messages, Ice.Current current)
+                {
+                    lock(this)
+                    {
+                        _prefix = prefix;
+                        foreach(var message in messages)
+                        {
+                            _initMessages.Enqueue(message);
+                        }
+                        _receivedCalls++;
+                        Monitor.PulseAll(this);
+                    }
+                }
 
-        internal void checkNextLog(Ice.LogMessageType messageType,string message, string category)
-        {
-            lock(this)
-            {
-                Ice.LogMessage logMessage = new Ice.LogMessage(messageType, 0, category, message);
-                _expectedLogMessages.Enqueue(logMessage);
-            }
-        }
+                override public void log(Ice.LogMessage message, Ice.Current current)
+                {
+                    lock(this)
+                    {
+                        _logMessages.Enqueue(message);
+                        _receivedCalls++;
+                        Monitor.PulseAll(this);
+                    }
+                }
 
-        internal void wait(int calls)
-        {
-            lock(this)
-            {
-                _receivedCalls -= calls;
+                internal void checkNextInit(string prefix, Ice.LogMessageType type, string message, string category)
+                {
+                    lock(this)
+                    {
+                        test(_prefix.Equals(prefix));
+                        test(_initMessages.Count > 0);
+                        var logMessage = _initMessages.Dequeue();
+                        test(logMessage.type == type);
+                        test(logMessage.message.Equals(message));
+                        test(logMessage.traceCategory.Equals(category));
+                    }
+                }
 
-                while(_receivedCalls < 0)
+                internal void checkNextLog(Ice.LogMessageType type, string message, string category)
                 {
-                    Monitor.Wait(this);
+                    lock(this)
+                    {
+                        test(_logMessages.Count > 0);
+                        var logMessage = _logMessages.Dequeue();
+                        test(logMessage.type == type);
+                        test(logMessage.message.Equals(message));
+                        test(logMessage.traceCategory.Equals(category));
+                    }
                 }
+
+                internal void wait(int calls)
+                {
+                    lock(this)
+                    {
+                        _receivedCalls -= calls;
+
+                        while(_receivedCalls < 0)
+                        {
+                            Monitor.Wait(this);
+                        }
+                    }
+                }
+
+                private int _receivedCalls = 0;
+                private string _prefix;
+                private readonly Queue<Ice.LogMessage> _initMessages = new Queue<Ice.LogMessage>();
+                private readonly Queue<Ice.LogMessage> _logMessages = new Queue<Ice.LogMessage>();
             }
         }
-
-        private int _receivedCalls = 0;
-        private string _expectedPrefix;
-        private Ice.LogMessage[] _expectedInitMessages;
-        private readonly Queue<Ice.LogMessage> _expectedLogMessages = new Queue<Ice.LogMessage>();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/admin/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace admin
     {
-        AllTests.allTests(this);
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -46,24 +46,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.admin</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/admin/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 10000");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Identity id = Ice.Util.stringToIdentity("factory");
-        adapter.add(new RemoteCommunicatorFactoryI(), id);
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace admin
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 10000");
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.Identity id = Ice.Util.stringToIdentity("factory");
+                    adapter.add(new RemoteCommunicatorFactoryI(), id);
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/admin/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
 
 #include <Ice/Properties.ice>
 
+["cs:namespace:Ice.admin"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/admin/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/admin/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/admin/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/admin/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,173 +1,172 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
 using System.Diagnostics;
 using System.Collections.Generic;
 
-public class TestFacetI : TestFacetDisp_
-{
-    override public void op(Ice.Current current)
-    {
-    }
-}
-
-public class RemoteCommunicatorI : RemoteCommunicatorDisp_
-{
-    public RemoteCommunicatorI(Ice.Communicator communicator)
-    {
-        _communicator = communicator;
-    }
-
-    override public Ice.ObjectPrx getAdmin(Ice.Current current)
-    {
-        return _communicator.getAdmin();
-    }
-
-    override public Dictionary<string, string> getChanges(Ice.Current current)
-    {
-        lock(this)
-        {
-            return _changes;
-        }
-    }
-
-    override public void print(string message, Ice.Current current)
-    {
-        _communicator.getLogger().print(message);
-    }
-
-    override public void trace(string category, string message, Ice.Current current)
-    {
-        _communicator.getLogger().trace(category, message);
-    }
-
-    override public void warning(string message, Ice.Current current)
-    {
-        _communicator.getLogger().warning(message);
-    }
-
-    override public void error(string message, Ice.Current current)
-    {
-        _communicator.getLogger().error(message);
-    }
-
-    override public void shutdown(Ice.Current current)
-    {
-        _communicator.shutdown();
-    }
-
-    override public void waitForShutdown(Ice.Current current)
-    {
-        //
-        // Note that we are executing in a thread of the *main* communicator,
-        // not the one that is being shut down.
-        //
-        _communicator.waitForShutdown();
-    }
-
-    override public void destroy(Ice.Current current)
-    {
-        _communicator.destroy();
-    }
-
-    public void updated(Dictionary<string, string> changes)
-    {
-        lock(this)
-        {
-            _changes = changes;
-        }
-    }
-
-    private Ice.Communicator _communicator;
-    private Dictionary<string, string> _changes;
-}
-
-public class RemoteCommunicatorFactoryI : RemoteCommunicatorFactoryDisp_
+namespace Ice
 {
-    override public RemoteCommunicatorPrx createCommunicator(Dictionary<string, string> props, Ice.Current current)
+    namespace admin
     {
-        //
-        // Prepare the property set using the given properties.
-        //
-        Ice.InitializationData init = new Ice.InitializationData();
-        init.properties = Ice.Util.createProperties();
-        foreach(KeyValuePair<string, string> e in props)
-        {
-            init.properties.setProperty(e.Key, e.Value);
-        }
-
-        if(init.properties.getPropertyAsInt("NullLogger") > 0)
-        {
-            init.logger = new NullLogger();
-        }
-
-        //
-        // Initialize a new communicator.
-        //
-        Ice.Communicator communicator = Ice.Util.initialize(init);
-
-        //
-        // Install a custom admin facet.
-        //
-        communicator.addAdminFacet(new TestFacetI(), "TestFacet");
-
-        //
-        // The RemoteCommunicator servant also implements PropertiesAdminUpdateCallback.
-        // Set the callback on the admin facet.
-        //
-        RemoteCommunicatorI servant = new RemoteCommunicatorI(communicator);
-        Ice.Object propFacet = communicator.findAdminFacet("Properties");
-
-        if(propFacet != null)
-        {
-            Ice.NativePropertiesAdmin admin = (Ice.NativePropertiesAdmin)propFacet;
-            Debug.Assert(admin != null);
-            admin.addUpdateCallback(servant.updated);
-        }
-
-        Ice.ObjectPrx proxy = current.adapter.addWithUUID(servant);
-        return RemoteCommunicatorPrxHelper.uncheckedCast(proxy);
-    }
-
-    override public void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    private class NullLogger : Ice.Logger
-    {
-        public void print(string message)
-        {
-        }
-
-        public void trace(string category, string message)
-        {
-        }
-
-        public void warning(string message)
-        {
-        }
-
-        public void error(string message)
-        {
-        }
-
-        public string getPrefix()
-        {
-            return "NullLogger";
-        }
-
-        public Ice.Logger cloneWithPrefix(string prefix)
+        public class TestFacetI : Test.TestFacetDisp_
         {
-            return this;
+            override public void op(Ice.Current current)
+            {
+            }
+        }
+
+        public class RemoteCommunicatorI : Test.RemoteCommunicatorDisp_
+        {
+            public RemoteCommunicatorI(Ice.Communicator communicator)
+            {
+                _communicator = communicator;
+            }
+
+            override public Ice.ObjectPrx getAdmin(Ice.Current current)
+            {
+                return _communicator.getAdmin();
+            }
+
+            override public Dictionary<string, string> getChanges(Ice.Current current)
+            {
+                lock(this)
+                {
+                    return _changes;
+                }
+            }
+
+            override public void print(string message, Ice.Current current)
+            {
+                _communicator.getLogger().print(message);
+            }
+
+            override public void trace(string category, string message, Ice.Current current)
+            {
+                _communicator.getLogger().trace(category, message);
+            }
+
+            override public void warning(string message, Ice.Current current)
+            {
+                _communicator.getLogger().warning(message);
+            }
+
+            override public void error(string message, Ice.Current current)
+            {
+                _communicator.getLogger().error(message);
+            }
+
+            override public void shutdown(Ice.Current current)
+            {
+                _communicator.shutdown();
+            }
+
+            override public void waitForShutdown(Ice.Current current)
+            {
+                //
+                // Note that we are executing in a thread of the *main* communicator,
+                // not the one that is being shut down.
+                //
+                _communicator.waitForShutdown();
+            }
+
+            override public void destroy(Ice.Current current)
+            {
+                _communicator.destroy();
+            }
+
+            public void updated(Dictionary<string, string> changes)
+            {
+                lock(this)
+                {
+                    _changes = changes;
+                }
+            }
+
+            private Ice.Communicator _communicator;
+            private Dictionary<string, string> _changes;
+        }
+
+        public class RemoteCommunicatorFactoryI : Test.RemoteCommunicatorFactoryDisp_
+        {
+            override public Test.RemoteCommunicatorPrx createCommunicator(Dictionary<string, string> props, Ice.Current current)
+            {
+                //
+                // Prepare the property set using the given properties.
+                //
+                Ice.InitializationData init = new Ice.InitializationData();
+                init.properties = Ice.Util.createProperties();
+                foreach(KeyValuePair<string, string> e in props)
+                {
+                    init.properties.setProperty(e.Key, e.Value);
+                }
+
+                if(init.properties.getPropertyAsInt("NullLogger") > 0)
+                {
+                    init.logger = new NullLogger();
+                }
+
+                //
+                // Initialize a new communicator.
+                //
+                Ice.Communicator communicator = Ice.Util.initialize(init);
+
+                //
+                // Install a custom admin facet.
+                //
+                communicator.addAdminFacet(new TestFacetI(), "TestFacet");
+
+                //
+                // The RemoteCommunicator servant also implements PropertiesAdminUpdateCallback.
+                // Set the callback on the admin facet.
+                //
+                RemoteCommunicatorI servant = new RemoteCommunicatorI(communicator);
+                Ice.Object propFacet = communicator.findAdminFacet("Properties");
+
+                if(propFacet != null)
+                {
+                    Ice.NativePropertiesAdmin admin =(Ice.NativePropertiesAdmin)propFacet;
+                    Debug.Assert(admin != null);
+                    admin.addUpdateCallback(servant.updated);
+                }
+
+                Ice.ObjectPrx proxy = current.adapter.addWithUUID(servant);
+                return Test.RemoteCommunicatorPrxHelper.uncheckedCast(proxy);
+            }
+
+            override public void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            private class NullLogger : Ice.Logger
+            {
+                public void print(string message)
+                {
+                }
+
+                public void trace(string category, string message)
+                {
+                }
+
+                public void warning(string message)
+                {
+                }
+
+                public void error(string message)
+                {
+                }
+
+                public string getPrefix()
+                {
+                    return "NullLogger";
+                }
+
+                public Ice.Logger cloneWithPrefix(string prefix)
+                {
+                    return this;
+                }
+            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/ami/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,3875 +1,3849 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public class PingReplyI : Test.PingReplyDisp_
+    namespace ami
     {
-        public override void reply(Ice.Current current)
-        {
-            lock(this)
-            {
-                ++_replies;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
-
-        public void reset()
-        {
-            lock(this)
-            {
-                 _replies = 0;
-            }
-        }
-
-        public bool waitReply(int expectedReplies, long timeout)
+        public class AllTests : global::Test.AllTests
         {
-            lock(this)
+            public class PingReplyI : Test.PingReplyDisp_
             {
-                long end = IceInternal.Time.currentMonotonicTimeMillis() + timeout;
-                while(_replies < expectedReplies)
+                public override void reply(Ice.Current current)
                 {
-                    int delay = (int)(end - IceInternal.Time.currentMonotonicTimeMillis());
-                    if(delay > 0)
-                    {
-                        System.Threading.Monitor.Wait(this, delay);
-                    }
-                    else
-                    {
-                        break;
-                    }
+                    _received = true;
                 }
-                return _replies == expectedReplies;
-            }
-        }
-
-        private int _replies = 0;
-    }
-
-    private class Cookie
-    {
-        public Cookie(int i)
-        {
-            val = i;
-        }
 
-        public int val;
-    }
-
-    public class Progress : IProgress<bool>
-    {
-        public Progress(Action<bool> report)
-        {
-            _report = report;
-        }
-
-        public void Report(bool sentSynchronously)
-        {
-            _report(sentSynchronously);
-        }
-
-        Action<bool> _report;
-    }
-
-    public class ProgresCallback : IProgress<bool>
-    {
-        public bool Sent
-        {
-            get
-            {
-                lock(this)
+                public bool checkReceived()
                 {
-                    return _sent;
-                }
-            }
-            set
-            {
-                lock(this)
-                {
-                    _sent = value;
+                    return _received;
                 }
+
+                private bool _received = false;
             }
-        }
 
-        public bool SentSynchronously
-        {
-            get
+            private class Cookie
             {
-                lock(this)
+                public Cookie(int i)
                 {
-                    return _sentSynchronously;
+                    val = i;
                 }
+
+                public int val;
             }
-            set
+
+            public class Progress : IProgress<bool>
             {
-                lock(this)
+                public Progress(Action<bool> report)
                 {
-                    _sentSynchronously = value;
+                    _report = report;
                 }
-            }
-        }
-
-        public void Report(bool sentSynchronously)
-        {
-            SentSynchronously = sentSynchronously;
-            Sent = true;
-        }
-
-        private bool _sent = false;
-        private bool _sentSynchronously = false;
-    }
 
-    private class CallbackBase
-    {
-        internal CallbackBase()
-        {
-            _called = false;
-        }
-
-        public virtual void check()
-        {
-            lock(this)
-            {
-                while(!_called)
+                public void Report(bool sentSynchronously)
                 {
-                    System.Threading.Monitor.Wait(this);
+                    _report(sentSynchronously);
                 }
-                _called = false;
-            }
-        }
-
-        public virtual void called()
-        {
-            lock(this)
-            {
-                Debug.Assert(!_called);
-                _called = true;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
-
-        private bool _called;
-    }
-
-    private class AsyncCallback : CallbackBase
-    {
-        public AsyncCallback()
-        {
-        }
-
-        public AsyncCallback(Cookie cookie)
-        {
-            _cookie = cookie;
-        }
-
-        public void
-        isA(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            test(result.getProxy().end_ice_isA(result));
-            called();
-        }
-
-        public void
-        ping(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            result.getProxy().end_ice_ping(result);
-            called();
-        }
-
-        public void
-        id(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            test(result.getProxy().end_ice_id(result).Equals("::Test::TestIntf"));
-            called();
-        }
-
-        public void
-        ids(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            test(result.getProxy().end_ice_ids(result).Length == 2);
-            called();
-        }
-
-        public void
-        connection(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            test(result.getProxy().end_ice_getConnection(result) != null);
-            called();
-        }
-
-        public void
-        op(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
-            called();
-        }
-
-        public void
-        opWithResult(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            test(TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithResult(result) == 15);
-            called();
-        }
-
-        public void
-        opWithUE(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            try
-            {
-                TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithUE(result);
-                test(false);
-            }
-            catch(TestIntfException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        isAEx(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            try
-            {
-                result.getProxy().end_ice_isA(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        pingEx(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            try
-            {
-                result.getProxy().end_ice_ping(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
 
-        public void
-        idEx(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            try
-            {
-                result.getProxy().end_ice_id(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
+                Action<bool> _report;
             }
-        }
 
-        public void
-        idsEx(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            try
-            {
-                result.getProxy().end_ice_ids(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException)
+            public class ProgresCallback : IProgress<bool>
             {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        connectionEx(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            try
-            {
-                result.getProxy().end_ice_getConnection(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        opEx(Ice.AsyncResult result)
-        {
-            test(result.AsyncState == _cookie);
-            try
-            {
-                TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
-
-        private Cookie _cookie;
-    }
-
-    private class ResponseCallback : CallbackBase
-    {
-        public ResponseCallback()
-        {
-        }
-
-        public void
-        isA(bool r)
-        {
-            test(r);
-            called();
-        }
-
-        public void
-        ping()
-        {
-            called();
-        }
-
-        public void
-        id(string id)
-        {
-            test(id.Equals("::Test::TestIntf"));
-            called();
-        }
-
-        public void
-        ids(string[] ids)
-        {
-            test(ids.Length == 2);
-            called();
-        }
-
-        public void
-        connection(Ice.Connection conn)
-        {
-            test(conn != null);
-            called();
-        }
+                public bool Sent
+                {
+                    get
+                    {
+                        lock(this)
+                        {
+                            return _sent;
+                        }
+                    }
+                    set
+                    {
+                        lock(this)
+                        {
+                            _sent = value;
+                        }
+                    }
+                }
 
-        public void
-        op()
-        {
-            called();
-        }
+                public bool SentSynchronously
+                {
+                    get
+                    {
+                        lock(this)
+                        {
+                            return _sentSynchronously;
+                        }
+                    }
+                    set
+                    {
+                        lock(this)
+                        {
+                            _sentSynchronously = value;
+                        }
+                    }
+                }
 
-        public void
-        opWithResult(int r)
-        {
-            test(r == 15);
-            called();
-        }
+                public void Report(bool sentSynchronously)
+                {
+                    SentSynchronously = sentSynchronously;
+                    Sent = true;
+                }
 
-        public void
-        opWithUE(Ice.Exception e)
-        {
-            try
-            {
-                throw e;
+                private bool _sent = false;
+                private bool _sentSynchronously = false;
             }
-            catch(TestIntfException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
-
-    }
-
-    private class ExceptionCallback : CallbackBase
-    {
-        public ExceptionCallback()
-        {
-        }
-
-        public void
-        isA(bool r)
-        {
-            test(false);
-        }
-
-        public void
-        ping()
-        {
-            test(false);
-        }
-
-        public void
-        id(string id)
-        {
-            test(false);
-        }
-
-        public void
-        ids(string[] ids)
-        {
-            test(false);
-        }
 
-        public void
-        connection(Ice.Connection conn)
-        {
-            test(false);
-        }
-
-        public void
-        op()
-        {
-            test(false);
-        }
-
-        public void
-        opWithUE(Ice.Exception e)
-        {
-            try
+            private class CallbackBase
             {
-                throw e;
-            }
-            catch(TestIntfException)
-            {
-                called();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        ex(Ice.Exception ex)
-        {
-            test(ex is Ice.NoEndpointException);
-            called();
-        }
-
-        public void
-        noEx(Ice.Exception ex)
-        {
-            test(false);
-        }
-    }
-
-    private class SentCallback : CallbackBase
-    {
-        public SentCallback()
-        {
-            _thread = Thread.CurrentThread;
-        }
-
-        public void
-        isA(bool r)
-        {
-        }
-
-        public void
-        ping()
-        {
-        }
-
-        public void
-        id(string s)
-        {
-        }
-
-        public void
-        ids(string[] s)
-        {
-        }
-
-        public void
-        opAsync(Ice.AsyncResult r)
-        {
-        }
-
-        public void
-        op()
-        {
-        }
-
-        public void
-        ex(Ice.Exception ex)
-        {
-        }
-
-        public void
-        sentAsync(Ice.AsyncResult r)
-        {
-            test(r.sentSynchronously() && _thread == Thread.CurrentThread ||
-                 !r.sentSynchronously() && _thread != Thread.CurrentThread);
-            called();
-        }
-
-        public void
-        sent(bool ss)
-        {
-            test(ss && _thread == Thread.CurrentThread || !ss && _thread != Thread.CurrentThread);
-
-            called();
-        }
-
-        Thread _thread;
-    }
-
-    private class FlushCallback : CallbackBase
-    {
-        public FlushCallback()
-        {
-            _thread = Thread.CurrentThread;
-        }
-
-        public FlushCallback(Cookie cookie)
-        {
-            _thread = Thread.CurrentThread;
-            _cookie = cookie;
-        }
-
-        public void
-        completedAsync(Ice.AsyncResult r)
-        {
-            test(false);
-        }
-
-        public void
-        exception(Ice.Exception ex)
-        {
-            test(false);
-        }
-
-        public void
-        sentAsync(Ice.AsyncResult r)
-        {
-            test(r.AsyncState == _cookie);
-            test(r.sentSynchronously() && _thread == Thread.CurrentThread ||
-                 !r.sentSynchronously() && _thread != Thread.CurrentThread);
-            called();
-        }
-
-        public void
-        sent(bool sentSynchronously)
-        {
-            test(sentSynchronously && _thread == Thread.CurrentThread ||
-                 !sentSynchronously && _thread != Thread.CurrentThread);
-            called();
-        }
-
-        Cookie _cookie;
-        Thread _thread;
-    }
-
-    private class FlushExCallback : CallbackBase
-    {
-        public FlushExCallback()
-        {
-        }
-
-        public FlushExCallback(Cookie cookie)
-        {
-            _cookie = cookie;
-        }
-
-        public void
-        completedAsync(Ice.AsyncResult r)
-        {
-            test(r.AsyncState == _cookie);
-            try
-            {
-                if(r.getConnection() != null)
+                internal CallbackBase()
                 {
-                    r.getConnection().end_flushBatchRequests(r);
+                    _called = false;
                 }
-                else
+
+                public virtual void check()
                 {
-                    r.getProxy().end_ice_flushBatchRequests(r);
+                    lock(this)
+                    {
+                        while(!_called)
+                        {
+                            Monitor.Wait(this);
+                        }
+                        _called = false;
+                    }
                 }
-                test(false);
-            }
-            catch(Ice.LocalException)
-            {
-                called();
-            }
-        }
-
-        public void
-        exception(Ice.Exception ex)
-        {
-            called();
-        }
-
-        public void
-        sentAsync(Ice.AsyncResult r)
-        {
-            test(false);
-        }
-
-        public void
-        sent(bool sentSynchronously)
-        {
-            test(false);
-        }
-
-        Cookie _cookie;
-    }
-
-    enum ThrowType { LocalException, UserException, OtherException };
 
-    private class Thrower : CallbackBase
-    {
-        public Thrower(ThrowType t)
-        {
-            _t = t;
-        }
-
-        public void
-        opAsync(Ice.AsyncResult r)
-        {
-            called();
-            throwEx();
-        }
-
-        public void
-        op()
-        {
-            called();
-            throwEx();
-        }
-
-        public void
-        noOp()
-        {
-        }
-
-        public void
-        ex(Ice.Exception ex)
-        {
-            called();
-            throwEx();
-        }
-
-        public void
-        sent(bool ss)
-        {
-            called();
-            throwEx();
-        }
+                public virtual void called()
+                {
+                    lock(this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        Monitor.Pulse(this);
+                    }
+                }
 
-        private void
-        throwEx()
-        {
-            switch(_t)
-            {
-            case ThrowType.LocalException:
-            {
-                throw new Ice.ObjectNotExistException();
-            }
-            case ThrowType.UserException:
-            {
-                throw new TestIntfException();
+                private bool _called;
             }
-            case ThrowType.OtherException:
-            {
-                throw new Exception();
-            }
-            default:
-            {
-                Debug.Assert(false);
-                break;
-            }
-            }
-        }
-
-        ThrowType _t;
-    }
-
-    public static void allTests(TestCommon.Application app, bool collocated)
-    {
-        Ice.Communicator communicator = app.communicator();
-        string sref = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx obj = communicator.stringToProxy(sref);
-        test(obj != null);
-
-        Test.TestIntfPrx p = Test.TestIntfPrxHelper.uncheckedCast(obj);
-        sref = "testController:" + app.getTestEndpoint(1);
-        obj = communicator.stringToProxy(sref);
-        test(obj != null);
-
-        Test.TestIntfControllerPrx testController = Test.TestIntfControllerPrxHelper.uncheckedCast(obj);
 
-        Write("testing async invocation...");
-        Flush();
-        {
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-
-            test(p.ice_isAAsync("::Test::TestIntf").Result);
-            test(p.ice_isAAsync("::Test::TestIntf", ctx).Result);
-
-            p.ice_pingAsync().Wait();
-            p.ice_pingAsync(ctx).Wait();
-
-            test(p.ice_idAsync().Result.Equals("::Test::TestIntf"));
-            test(p.ice_idAsync(ctx).Result.Equals("::Test::TestIntf"));
-
-            test(p.ice_idsAsync().Result.Length == 2);
-            test(p.ice_idsAsync(ctx).Result.Length == 2);
-
-            if(!collocated)
+            private class AsyncCallback : CallbackBase
             {
-                test(p.ice_getConnectionAsync().Result != null);
-            }
-
-            p.opAsync().Wait();
-            p.opAsync(ctx).Wait();
+                public AsyncCallback()
+                {
+                }
 
-            test(p.opWithResultAsync().Result == 15);
-            test(p.opWithResultAsync(ctx).Result == 15);
+                public AsyncCallback(Cookie cookie)
+                {
+                    _cookie = cookie;
+                }
 
-            try
-            {
-                p.opWithUEAsync().Wait();
-                test(false);
-            }
-            catch(AggregateException ae)
-            {
-                ae.Handle(ex => ex is Test.TestIntfException);
-            }
+                public void
+                isA(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
+                    test(result.getProxy().end_ice_isA(result));
+                    called();
+                }
 
-            try
-            {
-                p.opWithUEAsync(ctx).Wait();
-                test(false);
-            }
-            catch(AggregateException ae)
-            {
-                ae.Handle(ex => ex is Test.TestIntfException);
-            }
-        }
-        WriteLine("ok");
+                public void
+                ping(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
+                    result.getProxy().end_ice_ping(result);
+                    called();
+                }
 
-        Write("testing async/await...");
-        Flush();
-        {
-            Task.Run(async () =>
+                public void
+                id(Ice.AsyncResult result)
                 {
-                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+                    test(result.AsyncState == _cookie);
+                    test(result.getProxy().end_ice_id(result).Equals("::Test::TestIntf"));
+                    called();
+                }
 
-                    test(await p.ice_isAAsync("::Test::TestIntf"));
-                    test(await p.ice_isAAsync("::Test::TestIntf", ctx));
+                public void
+                ids(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
+                    test(result.getProxy().end_ice_ids(result).Length == 2);
+                    called();
+                }
 
-                    await p.ice_pingAsync();
-                    await p.ice_pingAsync(ctx);
+                public void
+                connection(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
+                    test(result.getProxy().end_ice_getConnection(result) != null);
+                    called();
+                }
 
-                    var id = await p.ice_idAsync();
-                    test(id.Equals("::Test::TestIntf"));
-                    id = await p.ice_idAsync(ctx);
-                    test(id.Equals("::Test::TestIntf"));
+                public void
+                op(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
+                    Test.TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
+                    called();
+                }
 
-                    var ids = await p.ice_idsAsync();
-                    test(ids.Length == 2);
-                    ids = await p.ice_idsAsync(ctx);
-                    test(ids.Length == 2);
+                public void
+                opWithResult(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
+                    test(Test.TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithResult(result) == 15);
+                    called();
+                }
 
-                    if(!collocated)
+                public void
+                opWithUE(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
+                    try
                     {
-                        var conn = await p.ice_getConnectionAsync();
-                        test(conn != null);
+                        Test.TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithUE(result);
+                        test(false);
                     }
+                    catch(Test.TestIntfException)
+                    {
+                        called();
+                    }
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
+                }
 
-                    await p.opAsync();
-                    await p.opAsync(ctx);
-
-                    var result = await p.opWithResultAsync();
-                    test(result == 15);
-                    result = await p.opWithResultAsync(ctx);
-                    test(result == 15);
-
+                public void
+                isAEx(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
                     try
                     {
-                        await p.opWithUEAsync();
+                        result.getProxy().end_ice_isA(result);
                         test(false);
                     }
-                    catch(System.Exception ex)
+                    catch(Ice.NoEndpointException)
+                    {
+                        called();
+                    }
+                    catch(Ice.Exception)
                     {
-                        test(ex is Test.TestIntfException);
+                        test(false);
                     }
+                }
 
+                public void
+                pingEx(Ice.AsyncResult result)
+                {
+                    test(result.AsyncState == _cookie);
                     try
                     {
-                        await p.opWithUEAsync(ctx);
+                        result.getProxy().end_ice_ping(result);
                         test(false);
                     }
-                    catch(System.Exception ex)
+                    catch(Ice.NoEndpointException)
                     {
-                        test(ex is Test.TestIntfException);
+                        called();
                     }
-                }).Wait();
-        }
-        WriteLine("ok");
-
-        Write("testing async continuations...");
-        Flush();
-        {
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-
-            p.ice_isAAsync("::Test::TestIntf").ContinueWith(previous =>
-                {
-                    test(previous.Result);
-                }).Wait();
-
-            p.ice_isAAsync("::Test::TestIntf", ctx).ContinueWith(previous =>
-                {
-                    test(previous.Result);
-                }).Wait();
-
-            p.ice_pingAsync().ContinueWith(previous =>
-                {
-                    previous.Wait();
-                }).Wait();
-
-            p.ice_pingAsync(ctx).ContinueWith(previous =>
-                {
-                    previous.Wait();
-                }).Wait();
-
-            p.ice_idAsync().ContinueWith(previous =>
-                {
-                    test(previous.Result.Equals("::Test::TestIntf"));
-                }).Wait();
-
-            p.ice_idAsync(ctx).ContinueWith(previous =>
-                {
-                    test(previous.Result.Equals("::Test::TestIntf"));
-                }).Wait();
-
-            p.ice_idsAsync().ContinueWith(previous =>
-                {
-                    test(previous.Result.Length == 2);
-                }).Wait();
-
-            p.ice_idsAsync(ctx).ContinueWith(previous =>
-                {
-                    test(previous.Result.Length == 2);
-                }).Wait();
-
-            if(!collocated)
-            {
-                p.ice_getConnectionAsync().ContinueWith(previous =>
+                    catch(Ice.Exception)
                     {
-                        test(previous.Result != null);
-                    }).Wait();
-            }
-
-            p.opAsync().ContinueWith(previous => previous.Wait()).Wait();
-            p.opAsync(ctx).ContinueWith(previous => previous.Wait()).Wait();
+                        test(false);
+                    }
+                }
 
-            p.opWithResultAsync().ContinueWith(previous =>
+                public void
+                idEx(Ice.AsyncResult result)
                 {
-                    test(previous.Result == 15);
-                }).Wait();
+                    test(result.AsyncState == _cookie);
+                    try
+                    {
+                        result.getProxy().end_ice_id(result);
+                        test(false);
+                    }
+                    catch(Ice.NoEndpointException)
+                    {
+                        called();
+                    }
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
+                }
 
-            p.opWithResultAsync(ctx).ContinueWith(previous =>
+                public void
+                idsEx(Ice.AsyncResult result)
                 {
-                    test(previous.Result == 15);
-                }).Wait();
+                    test(result.AsyncState == _cookie);
+                    try
+                    {
+                        result.getProxy().end_ice_ids(result);
+                        test(false);
+                    }
+                    catch(Ice.NoEndpointException)
+                    {
+                        called();
+                    }
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
+                }
 
-            p.opWithUEAsync().ContinueWith(previous =>
+                public void
+                connectionEx(Ice.AsyncResult result)
                 {
+                    test(result.AsyncState == _cookie);
                     try
                     {
-                        previous.Wait();
+                        result.getProxy().end_ice_getConnection(result);
+                        test(false);
                     }
-                    catch(AggregateException ae)
+                    catch(Ice.NoEndpointException)
                     {
-                        ae.Handle(ex => ex is Test.TestIntfException);
+                        called();
                     }
-                }).Wait();
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
+                }
 
-            p.opWithUEAsync(ctx).ContinueWith(previous =>
+                public void
+                opEx(Ice.AsyncResult result)
                 {
+                    test(result.AsyncState == _cookie);
                     try
                     {
-                        previous.Wait();
+                        Test.TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
+                        test(false);
                     }
-                    catch(AggregateException ae)
+                    catch(Ice.NoEndpointException)
                     {
-                        ae.Handle(ex => ex is Test.TestIntfException);
+                        called();
                     }
-                }).Wait();
-        }
-        WriteLine("ok");
-
-        Write("testing begin/end invocation... ");
-        Flush();
-        {
-            Ice.AsyncResult result;
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-
-            result = p.begin_ice_isA("::Test::TestIntf");
-            test(p.end_ice_isA(result));
-            result = p.begin_ice_isA("::Test::TestIntf", ctx);
-            test(p.end_ice_isA(result));
-
-            result = p.begin_ice_ping();
-            p.end_ice_ping(result);
-            result = p.begin_ice_ping(ctx);
-            p.end_ice_ping(result);
-
-            result = p.begin_ice_id();
-            test(p.end_ice_id(result).Equals("::Test::TestIntf"));
-            result = p.begin_ice_id(ctx);
-            test(p.end_ice_id(result).Equals("::Test::TestIntf"));
-
-            result = p.begin_ice_ids();
-            test(p.end_ice_ids(result).Length == 2);
-            result = p.begin_ice_ids(ctx);
-            test(p.end_ice_ids(result).Length == 2);
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
+                }
 
-            if(!collocated)
-            {
-                result = p.begin_ice_getConnection();
-                test(p.end_ice_getConnection(result) != null);
+                private Cookie _cookie;
             }
 
-            result = p.begin_op();
-            p.end_op(result);
-            result = p.begin_op(ctx);
-            p.end_op(result);
-
-            result = p.begin_opWithResult();
-            test(p.end_opWithResult(result) == 15);
-            result = p.begin_opWithResult(ctx);
-            test(p.end_opWithResult(result) == 15);
-
-            result = p.begin_opWithUE();
-            try
-            {
-                p.end_opWithUE(result);
-                test(false);
-            }
-            catch(Test.TestIntfException)
-            {
-            }
-            result = p.begin_opWithUE(ctx);
-            try
+            private class ResponseCallback : CallbackBase
             {
-                p.end_opWithUE(result);
-                test(false);
-            }
-            catch(Test.TestIntfException)
-            {
-            }
-        }
-        WriteLine("ok");
-
-        Write("testing async callback... ");
-        Flush();
-        {
-            AsyncCallback cb = new AsyncCallback();
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-            Cookie cookie = new Cookie(5);
-            AsyncCallback cbWC = new AsyncCallback(cookie);
-
-            p.begin_ice_isA("::Test::TestIntf", cb.isA, null);
-            cb.check();
-            p.begin_ice_isA("::Test::TestIntf", cbWC.isA, cookie);
-            cbWC.check();
-            p.begin_ice_isA("::Test::TestIntf", ctx, cb.isA, null);
-            cb.check();
-            p.begin_ice_isA("::Test::TestIntf", ctx, cbWC.isA, cookie);
-            cbWC.check();
-
-            p.begin_ice_ping(cb.ping, null);
-            cb.check();
-            p.begin_ice_ping(cbWC.ping, cookie);
-            cbWC.check();
-            p.begin_ice_ping(ctx, cb.ping, null);
-            cb.check();
-            p.begin_ice_ping(ctx, cbWC.ping, cookie);
-            cbWC.check();
-
-            p.begin_ice_id(cb.id, null);
-            cb.check();
-            p.begin_ice_id(cbWC.id, cookie);
-            cbWC.check();
-            p.begin_ice_id(ctx, cb.id, null);
-            cb.check();
-            p.begin_ice_id(ctx, cbWC.id, cookie);
-            cbWC.check();
-
-            p.begin_ice_ids(cb.ids, null);
-            cb.check();
-            p.begin_ice_ids(cbWC.ids, cookie);
-            cbWC.check();
-            p.begin_ice_ids(ctx, cb.ids, null);
-            cb.check();
-            p.begin_ice_ids(ctx, cbWC.ids, cookie);
-            cbWC.check();
-
-            if(!collocated)
-            {
-                p.begin_ice_getConnection(cb.connection, null);
-                cb.check();
-                p.begin_ice_getConnection(cbWC.connection, cookie);
-                cbWC.check();
-            }
-
-            p.begin_op(cb.op, null);
-            cb.check();
-            p.begin_op(cbWC.op, cookie);
-            cbWC.check();
-            p.begin_op(ctx, cb.op, null);
-            cb.check();
-            p.begin_op(ctx, cbWC.op, cookie);
-            cbWC.check();
-
-            p.begin_opWithResult(cb.opWithResult, null);
-            cb.check();
-            p.begin_opWithResult(cbWC.opWithResult, cookie);
-            cbWC.check();
-            p.begin_opWithResult(ctx, cb.opWithResult, null);
-            cb.check();
-            p.begin_opWithResult(ctx, cbWC.opWithResult, cookie);
-            cbWC.check();
-
-            p.begin_opWithUE(cb.opWithUE, null);
-            cb.check();
-            p.begin_opWithUE(cbWC.opWithUE, cookie);
-            cbWC.check();
-            p.begin_opWithUE(ctx, cb.opWithUE, null);
-            cb.check();
-            p.begin_opWithUE(ctx, cbWC.opWithUE, cookie);
-            cbWC.check();
-        }
-        WriteLine("ok");
-
-        Write("testing response callback... ");
-        Flush();
-        {
-            ResponseCallback cb = new ResponseCallback();
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-
-            p.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.isA, null);
-            cb.check();
-            p.begin_ice_isA("::Test::TestIntf", ctx).whenCompleted(cb.isA, null);
-            cb.check();
-
-            p.begin_ice_ping().whenCompleted(cb.ping, null);
-            cb.check();
-            p.begin_ice_ping(ctx).whenCompleted(cb.ping, null);
-            cb.check();
-
-            p.begin_ice_id().whenCompleted(cb.id, null);
-            cb.check();
-            p.begin_ice_id(ctx).whenCompleted(cb.id, null);
-            cb.check();
-
-            p.begin_ice_ids().whenCompleted(cb.ids, null);
-            cb.check();
-            p.begin_ice_ids(ctx).whenCompleted(cb.ids, null);
-            cb.check();
+                public ResponseCallback()
+                {
+                }
 
-            if(!collocated)
-            {
-                p.begin_ice_getConnection().whenCompleted(cb.connection, null);
-                cb.check();
-            }
+                public void
+                isA(bool r)
+                {
+                    test(r);
+                    called();
+                }
 
-            p.begin_op().whenCompleted(cb.op, null);
-            cb.check();
-            p.begin_op(ctx).whenCompleted(cb.op, null);
-            cb.check();
-
-            p.begin_opWithResult().whenCompleted(cb.opWithResult, null);
-            cb.check();
-            p.begin_opWithResult(ctx).whenCompleted(cb.opWithResult, null);
-            cb.check();
-
-            p.begin_opWithUE().whenCompleted(cb.op, cb.opWithUE);
-            cb.check();
-            p.begin_opWithUE(ctx).whenCompleted(cb.op, cb.opWithUE);
-            cb.check();
-        }
-        WriteLine("ok");
+                public void
+                ping()
+                {
+                    called();
+                }
 
-        Write("testing lambda callback... ");
-        Flush();
-        {
-            ResponseCallback cb = new ResponseCallback();
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
+                public void
+                id(string id)
+                {
+                    test(id.Equals("::Test::TestIntf"));
+                    called();
+                }
 
-            p.begin_ice_isA("::Test::TestIntf").whenCompleted(
-                (bool r) =>
+                public void
+                ids(string[] ids)
                 {
-                    cb.isA(r);
-                }, null);
-            cb.check();
-            p.begin_ice_isA("::Test::TestIntf", ctx).whenCompleted(
-                (bool r) =>
-                {
-                    cb.isA(r);
-                }, null);
-            cb.check();
-
-            p.begin_ice_ping().whenCompleted(
-                () =>
-                {
-                    cb.ping();
-                }, null);
-            cb.check();
-            p.begin_ice_ping(ctx).whenCompleted(
-                () =>
-                {
-                    cb.ping();
-                }, null);
-            cb.check();
-
-            p.begin_ice_id().whenCompleted(
-                (string id) =>
-                {
-                    cb.id(id);
-                }, null);
-            cb.check();
-            p.begin_ice_id(ctx).whenCompleted(
-                (string id) =>
-                {
-                    cb.id(id);
-                }, null);
-            cb.check();
-
-            p.begin_ice_ids().whenCompleted(
-                (string[] ids) =>
-                {
-                    cb.ids(ids);
-                }, null);
-            cb.check();
-            p.begin_ice_ids(ctx).whenCompleted(
-                (string[] ids) =>
-                {
-                    cb.ids(ids);
-                }, null);
-            cb.check();
+                    test(ids.Length == 2);
+                    called();
+                }
 
-            if(!collocated)
-            {
-                p.begin_ice_getConnection().whenCompleted(
-                    (Ice.Connection conn) =>
-                    {
-                        cb.connection(conn);
-                    }, null);
-                cb.check();
-            }
+                public void
+                connection(Ice.Connection conn)
+                {
+                    test(conn != null);
+                    called();
+                }
 
-            p.begin_op().whenCompleted(
-                () =>
+                public void
+                op()
                 {
-                    cb.op();
-                }, null);
-            cb.check();
-            p.begin_op(ctx).whenCompleted(
-                () =>
-                {
-                    cb.op();
-                }, null);
-            cb.check();
-
-            p.begin_opWithResult().whenCompleted(
-                (int r) =>
-                {
-                    cb.opWithResult(r);
-                }, null);
-            cb.check();
-            p.begin_opWithResult(ctx).whenCompleted(
-                (int r) =>
-                {
-                    cb.opWithResult(r);
-                }, null);
-            cb.check();
-
-            p.begin_opWithUE().whenCompleted(
-                () =>
-                {
-                    cb.op();
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.opWithUE(ex);
-                });
-            cb.check();
-            p.begin_opWithUE(ctx).whenCompleted(
-                () =>
-                {
-                    cb.op();
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.opWithUE(ex);
-                });
-            cb.check();
-        }
-        WriteLine("ok");
+                    called();
+                }
 
-        Write("testing local exceptions... ");
-        Flush();
-        {
-            Test.TestIntfPrx indirect = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            Ice.AsyncResult r;
+                public void
+                opWithResult(int r)
+                {
+                    test(r == 15);
+                    called();
+                }
 
-            r = indirect.begin_op();
-            try
-            {
-                indirect.end_op(r);
-                test(false);
-            }
-            catch(Ice.NoEndpointException)
-            {
-            }
+                public void
+                opWithUE(Ice.Exception e)
+                {
+                    try
+                    {
+                        throw e;
+                    }
+                    catch(Test.TestIntfException)
+                    {
+                        called();
+                    }
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
+                }
 
-            try
-            {
-                r = ((Test.TestIntfPrx)p.ice_oneway()).begin_opWithResult();
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
             }
 
-            //
-            // Check that CommunicatorDestroyedException is raised directly.
-            //
-            if(p.ice_getConnection() != null)
+            private class ExceptionCallback : CallbackBase
             {
-                Ice.InitializationData initData = new Ice.InitializationData();
-                initData.properties = communicator.getProperties().ice_clone_();
-                Ice.Communicator ic = Ice.Util.initialize(initData);
-                Ice.ObjectPrx o = ic.stringToProxy(p.ToString());
-                Test.TestIntfPrx p2 = Test.TestIntfPrxHelper.checkedCast(o);
-                ic.destroy();
+                public ExceptionCallback()
+                {
+                }
 
-                try
+                public void
+                isA(bool r)
                 {
-                    p2.begin_op();
                     test(false);
                 }
-                catch(Ice.CommunicatorDestroyedException)
+
+                public void
+                ping()
                 {
-                    // Expected.
+                    test(false);
                 }
-            }
-        }
-        WriteLine("ok");
-
-        Write("testing local exceptions with async tasks... ");
-        Flush();
-        {
-            Test.TestIntfPrx indirect = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
 
-            try
-            {
-                indirect.opAsync().Wait();
-                test(false);
-            }
-            catch(System.AggregateException ae)
-            {
-                ae.Handle((ex) =>
+                public void
+                id(string id)
                 {
-                    return ex is Ice.NoEndpointException;
-                });
-            }
+                    test(false);
+                }
 
-            try
-            {
-                ((Test.TestIntfPrx)p.ice_oneway()).opWithResultAsync();
-                test(false);
-            }
-            catch(Ice.TwowayOnlyException)
-            {
-            }
+                public void
+                ids(string[] ids)
+                {
+                    test(false);
+                }
 
-            //
-            // Check that CommunicatorDestroyedException is raised directly.
-            //
-            if(p.ice_getConnection() != null)
-            {
-                Ice.InitializationData initData = new Ice.InitializationData();
-                initData.properties = communicator.getProperties().ice_clone_();
-                Ice.Communicator ic = Ice.Util.initialize(initData);
-                Ice.ObjectPrx o = ic.stringToProxy(p.ToString());
-                Test.TestIntfPrx p2 = Test.TestIntfPrxHelper.checkedCast(o);
-                ic.destroy();
+                public void
+                connection(Ice.Connection conn)
+                {
+                    test(false);
+                }
 
-                try
+                public void
+                op()
                 {
-                    p2.opAsync();
                     test(false);
                 }
-                catch(Ice.CommunicatorDestroyedException)
+
+                public void
+                opWithUE(Ice.Exception e)
                 {
-                    // Expected.
+                    try
+                    {
+                        throw e;
+                    }
+                    catch(Test.TestIntfException)
+                    {
+                        called();
+                    }
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
                 }
-            }
-        }
-        WriteLine("ok");
 
-        Write("testing local exceptions with async callback... ");
-        Flush();
-        {
-            Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            AsyncCallback cb = new AsyncCallback();
-            Cookie cookie = new Cookie(5);
-            AsyncCallback cbWC = new AsyncCallback(cookie);
-
-            i.begin_ice_isA("::Test::TestIntf", cb.isAEx, null);
-            cb.check();
-            i.begin_ice_isA("::Test::TestIntf", cbWC.isAEx, cookie);
-            cbWC.check();
-
-            i.begin_ice_ping(cb.pingEx, null);
-            cb.check();
-            i.begin_ice_ping(cbWC.pingEx, cookie);
-            cbWC.check();
-
-            i.begin_ice_id(cb.idEx, null);
-            cb.check();
-            i.begin_ice_id(cbWC.idEx, cookie);
-            cbWC.check();
-
-            i.begin_ice_ids(cb.idsEx, null);
-            cb.check();
-            i.begin_ice_ids(cbWC.idsEx, cookie);
-            cbWC.check();
+                public void
+                ex(Ice.Exception ex)
+                {
+                    test(ex is Ice.NoEndpointException);
+                    called();
+                }
 
-            if(!collocated)
-            {
-                i.begin_ice_getConnection(cb.connectionEx, null);
-                cb.check();
-                i.begin_ice_getConnection(cbWC.connectionEx, cookie);
-                cbWC.check();
+                public void
+                noEx(Ice.Exception ex)
+                {
+                    test(false);
+                }
             }
 
-            i.begin_op(cb.opEx, null);
-            cb.check();
-            i.begin_op(cbWC.opEx, cookie);
-            cbWC.check();
-        }
-        WriteLine("ok");
-
-        Write("testing local exceptions with response callback... ");
-        Flush();
-        {
-            Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            ExceptionCallback cb = new ExceptionCallback();
-
-            i.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.isA, cb.ex);
-            cb.check();
-
-            i.begin_ice_ping().whenCompleted(cb.ping, cb.ex);
-            cb.check();
-
-            i.begin_ice_id().whenCompleted(cb.id, cb.ex);
-            cb.check();
-
-            i.begin_ice_ids().whenCompleted(cb.ids, cb.ex);
-            cb.check();
-
-            if(!collocated)
+            private class SentCallback : CallbackBase
             {
-                i.begin_ice_getConnection().whenCompleted(cb.connection, cb.ex);
-                cb.check();
-            }
-
-            i.begin_op().whenCompleted(cb.op, cb.ex);
-            cb.check();
-        }
-        WriteLine("ok");
-
-        Write("testing local exceptions with lambda callback... ");
-        Flush();
-        {
-            Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            ExceptionCallback cb = new ExceptionCallback();
-
-            i.begin_ice_isA("::Test::TestIntf").whenCompleted(
-                (bool r) =>
+                public SentCallback()
                 {
-                    cb.isA(r);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.ex(ex);
-                });
-            cb.check();
+                    _thread = Thread.CurrentThread;
+                }
 
-            i.begin_ice_ping().whenCompleted(
-                () =>
+                public void
+                isA(bool r)
                 {
-                    cb.ping();
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.ex(ex);
-                });
-            cb.check();
+                }
 
-            i.begin_ice_id().whenCompleted(
-                (string id) =>
+                public void
+                ping()
                 {
-                    cb.id(id);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.ex(ex);
-                });
-            cb.check();
+                }
 
-            i.begin_ice_ids().whenCompleted(
-                (string[] ids) =>
-                {
-                    cb.ids(ids);
-                },
-                (Ice.Exception ex) =>
+                public void
+                id(string s)
                 {
-                    cb.ex(ex);
-                });
-            cb.check();
-
-            if(!collocated)
-            {
-                i.begin_ice_getConnection().whenCompleted(
-                    (Ice.Connection conn) =>
-                    {
-                        cb.connection(conn);
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                        cb.ex(ex);
-                    });
-                cb.check();
-            }
+                }
 
-            i.begin_op().whenCompleted(
-                () =>
+                public void
+                ids(string[] s)
                 {
-                    cb.op();
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.ex(ex);
-                });
-            cb.check();
-        }
-        WriteLine("ok");
-
-        Write("testing exception callback... ");
-        Flush();
-        {
-            Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            ExceptionCallback cb = new ExceptionCallback();
-
-            i.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.ex);
-            cb.check();
-
-            i.begin_op().whenCompleted(cb.ex);
-            cb.check();
-
-            i.begin_opWithResult().whenCompleted(cb.ex);
-            cb.check();
-
-            i.begin_opWithUE().whenCompleted(cb.ex);
-            cb.check();
+                }
 
-            // Ensures no exception is called when response is received
-            p.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.noEx);
-            p.begin_op().whenCompleted(cb.noEx);
-            p.begin_opWithResult().whenCompleted(cb.noEx);
+                public void
+                opAsync(Ice.AsyncResult r)
+                {
+                }
 
-            // If response is a user exception, it should be received.
-            p.begin_opWithUE().whenCompleted(cb.opWithUE);
-            cb.check();
-        }
-        WriteLine("ok");
+                public void
+                op()
+                {
+                }
 
-        Write("testing exception with async task... ");
-        Flush();
-        {
-            Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            ExceptionCallback cb = new ExceptionCallback();
+                public void
+                ex(Ice.Exception ex)
+                {
+                }
 
-            try
-            {
-                i.ice_isAAsync("::Test::TestIntf").Wait();
-                test(false);
-            }
-            catch(AggregateException)
-            {
-            }
+                public void
+                sentAsync(Ice.AsyncResult r)
+                {
+                    test(r.sentSynchronously() && _thread == Thread.CurrentThread ||
+                         !r.sentSynchronously() && _thread != Thread.CurrentThread);
+                    called();
+                }
 
-            try
-            {
-                i.opAsync().Wait();
-                test(false);
-            }
-            catch(AggregateException)
-            {
-            }
+                public void
+                sent(bool ss)
+                {
+                    test(ss && _thread == Thread.CurrentThread || !ss && _thread != Thread.CurrentThread);
 
-            try
-            {
-                i.opWithResultAsync().Wait();
-                test(false);
-            }
-            catch(AggregateException)
-            {
-            }
+                    called();
+                }
 
-            try
-            {
-                i.opWithUEAsync().Wait();
-                test(false);
-            }
-            catch(AggregateException)
-            {
+                Thread _thread;
             }
 
-            // Ensures no exception is called when response is received
-            test(p.ice_isAAsync("::Test::TestIntf").Result);
-            p.opAsync().Wait();
-            p.opWithResultAsync().Wait();
-
-            // If response is a user exception, it should be received.
-            try
+            private class FlushCallback : CallbackBase
             {
-                p.opWithUEAsync().Wait();
-                test(false);
-            }
-            catch(AggregateException ae)
-            {
-                ae.Handle((ex) =>
-                {
-                    return ex is Test.TestIntfException;
-                });
-            }
-        }
-        WriteLine("ok");
-
-        Write("testing lambda exception callback... ");
-        Flush();
-        {
-            Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            ExceptionCallback cb = new ExceptionCallback();
-
-            i.begin_ice_isA("::Test::TestIntf").whenCompleted(
-                (Ice.Exception ex) =>
+                public FlushCallback()
                 {
-                    cb.ex(ex);
-                });
-            cb.check();
+                    _thread = Thread.CurrentThread;
+                }
 
-            i.begin_op().whenCompleted(
-                (Ice.Exception ex) =>
+                public FlushCallback(Cookie cookie)
                 {
-                    cb.ex(ex);
-                });
-
-            cb.check();
+                    _thread = Thread.CurrentThread;
+                    _cookie = cookie;
+                }
 
-            i.begin_opWithResult().whenCompleted(
-                (Ice.Exception ex) =>
+                public void
+                completedAsync(Ice.AsyncResult r)
                 {
-                    cb.ex(ex);
-                });
-            cb.check();
+                    test(false);
+                }
 
-            i.begin_opWithUE().whenCompleted(
-                (Ice.Exception ex) =>
+                public void
+                exception(Ice.Exception ex)
                 {
-                    cb.ex(ex);
-                });
-            cb.check();
+                    test(false);
+                }
 
-            // Ensures no exception is called when response is received
-            p.begin_ice_isA("::Test::TestIntf").whenCompleted(
-                (Ice.Exception ex) =>
-                {
-                    cb.noEx(ex);
-                });
-            p.begin_op().whenCompleted(
-                 (Ice.Exception ex) =>
+                public void
+                sentAsync(Ice.AsyncResult r)
                 {
-                    cb.noEx(ex);
-                });
-            p.begin_opWithResult().whenCompleted(
-                 (Ice.Exception ex) =>
-                {
-                    cb.noEx(ex);
-                });
+                    test(r.AsyncState == _cookie);
+                    test(r.sentSynchronously() && _thread == Thread.CurrentThread ||
+                         !r.sentSynchronously() && _thread != Thread.CurrentThread);
+                    called();
+                }
 
-            // If response is a user exception, it should be received.
-            p.begin_opWithUE().whenCompleted(
-                 (Ice.Exception ex) =>
+                public void
+                sent(bool sentSynchronously)
                 {
-                    cb.opWithUE(ex);
-                });
-            cb.check();
-        }
-        WriteLine("ok");
-
-        Write("testing sent callback... ");
-        Flush();
-        {
-            SentCallback cb = new SentCallback();
-
-            p.begin_ice_isA("").whenCompleted(cb.isA, cb.ex).whenSent(cb.sent);
-            cb.check();
-
-            p.begin_ice_ping().whenCompleted(cb.ping, cb.ex).whenSent(cb.sent);
-            cb.check();
-
-            p.begin_ice_id().whenCompleted(cb.id, cb.ex).whenSent(cb.sent);
-            cb.check();
-
-            p.begin_ice_ids().whenCompleted(cb.ids, cb.ex).whenSent(cb.sent);
-            cb.check();
-
-            p.begin_op().whenCompleted(cb.op, cb.ex).whenSent(cb.sent);
-            cb.check();
-
-            p.begin_op(cb.opAsync, null).whenSent(cb.sentAsync);
-            cb.check();
+                    test(sentSynchronously && _thread == Thread.CurrentThread ||
+                         !sentSynchronously && _thread != Thread.CurrentThread);
+                    called();
+                }
 
-            p.begin_op().whenCompleted(cb.ex).whenSent(cb.sent);
-            cb.check();
+                Cookie _cookie;
+                Thread _thread;
+            }
 
-            List<SentCallback> cbs = new List<SentCallback>();
-            byte[] seq = new byte[10024];
-            (new System.Random()).NextBytes(seq);
-            testController.holdAdapter();
-            try
+            private class FlushExCallback : CallbackBase
             {
-                Ice.AsyncResult r;
-                do
+                public FlushExCallback()
                 {
-                    SentCallback cb2 = new SentCallback();
-                    r = p.begin_opWithPayload(seq).whenCompleted(cb2.ex).whenSent(cb2.sent);
-                    cbs.Add(cb2);
                 }
-                while(r.sentSynchronously());
-            }
-            finally
-            {
-                testController.resumeAdapter();
-            }
-            foreach(SentCallback cb3 in cbs)
-            {
-                cb3.check();
-            }
-        }
-        WriteLine("ok");
 
-        Write("testing progress callback... ");
-        Flush();
-        {
-            {
-                SentCallback cb = new SentCallback();
+                public FlushExCallback(Cookie cookie)
+                {
+                    _cookie = cookie;
+                }
 
-                System.Threading.Tasks.Task t = p.ice_isAAsync("",
-                    progress: new Progress(sentSynchronously =>
+                public void
+                completedAsync(Ice.AsyncResult r)
+                {
+                    test(r.AsyncState == _cookie);
+                    try
                     {
-                        cb.sent(sentSynchronously);
-                    }));
-                cb.check();
-                t.Wait();
-
-                t = p.ice_pingAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.sent(sentSynchronously);
-                    }));
-                cb.check();
-                t.Wait();
-
-                t = p.ice_idAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.sent(sentSynchronously);
-                    }));
-                cb.check();
-                t.Wait();
-
-                t = p.ice_idsAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.sent(sentSynchronously);
-                    }));
-                cb.check();
-                t.Wait();
-
-                t = p.opAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.sent(sentSynchronously);
-                    }));
-                cb.check();
-                t.Wait();
-            }
-
-            List<Task> tasks = new List<Task>();
-            byte[] seq = new byte[10024];
-            (new System.Random()).NextBytes(seq);
-            testController.holdAdapter();
-            try
-            {
-                Task t = null;
-                ProgresCallback cb;
-                do
-                {
-                    cb = new ProgresCallback();
-                    t = p.opWithPayloadAsync(seq, progress: cb);
-                    tasks.Add(t);
+                        if(r.getConnection() != null)
+                        {
+                            r.getConnection().end_flushBatchRequests(r);
+                        }
+                        else
+                        {
+                            r.getProxy().end_ice_flushBatchRequests(r);
+                        }
+                        test(false);
+                    }
+                    catch(Ice.LocalException)
+                    {
+                        called();
+                    }
                 }
-                while(cb.SentSynchronously);
-            }
-            finally
-            {
-                testController.resumeAdapter();
-            }
-            foreach(Task t in tasks)
-            {
-                t.Wait();
-            }
-        }
-        WriteLine("ok");
-
-        Write("testing lambda sent callback... ");
-        Flush();
-        {
-            SentCallback cb = new SentCallback();
 
-            p.begin_ice_isA("").whenCompleted(
-                (bool r) =>
-                {
-                    cb.isA(r);
-                },
-                (Ice.Exception ex) =>
+                public void
+                exception(Ice.Exception ex)
                 {
-                    cb.ex(ex);
+                    called();
                 }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
 
-            p.begin_ice_ping().whenCompleted(
-                () =>
-                {
-                    cb.ping();
-                },
-                (Ice.Exception ex) =>
+                public void
+                sentAsync(Ice.AsyncResult r)
                 {
-                    cb.ex(ex);
+                    test(false);
                 }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
 
-            p.begin_ice_id().whenCompleted(
-                (string id) =>
-                {
-                    cb.id(id);
-                },
-                (Ice.Exception ex) =>
+                public void
+                sent(bool sentSynchronously)
                 {
-                    cb.ex(ex);
+                    test(false);
                 }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
 
-            p.begin_ice_ids().whenCompleted(
-                (string[] ids) =>
-                {
-                    cb.ids(ids);
-                },
-                (Ice.Exception ex) =>
+                Cookie _cookie;
+            }
+
+            enum ThrowType { LocalException, UserException, OtherException };
+
+            private class Thrower : CallbackBase
+            {
+                public Thrower(ThrowType t)
                 {
-                    cb.ex(ex);
+                    _t = t;
                 }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
 
-            p.begin_op().whenCompleted(
-                () =>
+                public void
+                opAsync(Ice.AsyncResult r)
                 {
-                    cb.op();
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.ex(ex);
+                    called();
+                    throwEx();
                 }
-            ).whenSent(
-                (bool sentSynchronously) =>
+
+                public void
+                op()
                 {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
+                    called();
+                    throwEx();
+                }
 
-            p.begin_op(cb.opAsync, null).whenSent(
-                (Ice.AsyncResult r) =>
+                public void
+                noOp()
                 {
-                    cb.sentAsync(r);
-                });
-            cb.check();
+                }
 
-            p.begin_op().whenCompleted(
-                (Ice.Exception ex) =>
+                public void
+                ex(Ice.Exception ex)
                 {
-                    cb.ex(ex);
+                    called();
+                    throwEx();
                 }
-            ).whenSent(
-                (bool sentSynchronously) =>
+
+                public void
+                sent(bool ss)
                 {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
+                    called();
+                    throwEx();
+                }
 
-            List<SentCallback> cbs = new List<SentCallback>();
-            byte[] seq = new byte[10024];
-            (new System.Random()).NextBytes(seq);
-            testController.holdAdapter();
-            try
-            {
-                Ice.AsyncResult r;
-                do
+                private void
+                throwEx()
                 {
-                    SentCallback cb2 = new SentCallback();
-                    r = p.begin_opWithPayload(seq).whenCompleted(
-                        (Ice.Exception ex) =>
+                    switch(_t)
+                    {
+                        case ThrowType.LocalException:
                         {
-                            cb2.ex(ex);
+                            throw new Ice.ObjectNotExistException();
                         }
-                    ).whenSent(
-                        (bool sentSynchronously) =>
+                        case ThrowType.UserException:
                         {
-                            cb2.sent(sentSynchronously);
-                        });
-                    cbs.Add(cb2);
+                            throw new Test.TestIntfException();
+                        }
+                        case ThrowType.OtherException:
+                        {
+                            throw new System.Exception();
+                        }
+                        default:
+                        {
+                            Debug.Assert(false);
+                            break;
+                        }
+                    }
                 }
-                while(r.sentSynchronously());
-            }
-            finally
-            {
-                testController.resumeAdapter();
+
+                ThrowType _t;
             }
-            foreach(SentCallback cb3 in cbs)
+
+            public static void allTests(global::Test.TestHelper helper, bool collocated)
             {
-                cb3.check();
-            }
-        }
-        WriteLine("ok");
+                Ice.Communicator communicator = helper.communicator();
+                string sref = "test:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx obj = communicator.stringToProxy(sref);
+                test(obj != null);
 
-        Write("testing illegal arguments... ");
-        Flush();
-        {
-            Ice.AsyncResult result;
+                Test.TestIntfPrx p = Test.TestIntfPrxHelper.uncheckedCast(obj);
+                sref = "testController:" + helper.getTestEndpoint(1);
+                obj = communicator.stringToProxy(sref);
+                test(obj != null);
 
-            result = p.begin_op();
-            p.end_op(result);
-            try
-            {
-                p.end_op(result);
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
-            }
+                Test.TestIntfControllerPrx testController = Test.TestIntfControllerPrxHelper.uncheckedCast(obj);
 
-            result = p.begin_op();
-            try
-            {
-                p.end_opWithResult(result);
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
-            }
+                var output = helper.getWriter();
 
-            try
-            {
-                p.end_op(null);
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
-            }
-        }
-        WriteLine("ok");
+                output.Write("testing async invocation...");
+                output.Flush();
+                {
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
 
-        Write("testing unexpected exceptions... ");
-        Flush();
-        {
-            Test.TestIntfPrx q = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            ThrowType[] throwEx = new ThrowType[]{ ThrowType.LocalException,
-                                                   ThrowType.UserException,
-                                                   ThrowType.OtherException };
+                    test(p.ice_isAAsync("::Test::TestIntf").Result);
+                    test(p.ice_isAAsync("::Test::TestIntf", ctx).Result);
 
-            for(int i = 0; i < 3; ++i)
-            {
-                Thrower cb = new Thrower(throwEx[i]);
+                    p.ice_pingAsync().Wait();
+                    p.ice_pingAsync(ctx).Wait();
 
-                p.begin_op(cb.opAsync, null);
-                cb.check();
+                    test(p.ice_idAsync().Result.Equals("::Test::TestIntf"));
+                    test(p.ice_idAsync(ctx).Result.Equals("::Test::TestIntf"));
 
-                p.begin_op().whenCompleted(cb.op, null);
-                cb.check();
+                    test(p.ice_idsAsync().Result.Length == 2);
+                    test(p.ice_idsAsync(ctx).Result.Length == 2);
 
-                p.begin_op().whenCompleted(
-                    () =>
+                    if(!collocated)
                     {
-                        cb.op();
-                    }, null);
-                cb.check();
+                        test(p.ice_getConnectionAsync().Result != null);
+                    }
+
+                    p.opAsync().Wait();
+                    p.opAsync(ctx).Wait();
 
-                try
+                    test(p.opWithResultAsync().Result == 15);
+                    test(p.opWithResultAsync(ctx).Result == 15);
+
+                    try
+                    {
+                        p.opWithUEAsync().Wait();
+                        test(false);
+                    }
+                    catch(AggregateException ae)
+                    {
+                        ae.Handle(ex => ex is Test.TestIntfException);
+                    }
+
+                    try
+                    {
+                        p.opWithUEAsync(ctx).Wait();
+                        test(false);
+                    }
+                    catch(AggregateException ae)
+                    {
+                        ae.Handle(ex => ex is Test.TestIntfException);
+                    }
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing async/await...");
+                output.Flush();
                 {
-                    p.opAsync().ContinueWith(
-                        (t) =>
+                    Task.Run(async() =>
                         {
-                            cb.op();
+                            Dictionary<string, string> ctx = new Dictionary<string, string>();
+
+                            test(await p.ice_isAAsync("::Test::TestIntf"));
+                            test(await p.ice_isAAsync("::Test::TestIntf", ctx));
+
+                            await p.ice_pingAsync();
+                            await p.ice_pingAsync(ctx);
+
+                            var id = await p.ice_idAsync();
+                            test(id.Equals("::Test::TestIntf"));
+                            id = await p.ice_idAsync(ctx);
+                            test(id.Equals("::Test::TestIntf"));
+
+                            var ids = await p.ice_idsAsync();
+                            test(ids.Length == 2);
+                            ids = await p.ice_idsAsync(ctx);
+                            test(ids.Length == 2);
+
+                            if(!collocated)
+                            {
+                                var conn = await p.ice_getConnectionAsync();
+                                test(conn != null);
+                            }
+
+                            await p.opAsync();
+                            await p.opAsync(ctx);
+
+                            var result = await p.opWithResultAsync();
+                            test(result == 15);
+                            result = await p.opWithResultAsync(ctx);
+                            test(result == 15);
+
+                            try
+                            {
+                                await p.opWithUEAsync();
+                                test(false);
+                            }
+                            catch(System.Exception ex)
+                            {
+                                test(ex is Test.TestIntfException);
+                            }
+
+                            try
+                            {
+                                await p.opWithUEAsync(ctx);
+                                test(false);
+                            }
+                            catch(System.Exception ex)
+                            {
+                                test(ex is Test.TestIntfException);
+                            }
                         }).Wait();
-                    test(false);
                 }
-                catch(AggregateException)
+                output.WriteLine("ok");
+
+                output.Write("testing async continuations...");
+                output.Flush();
                 {
-                }
-                cb.check();
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+
+                    p.ice_isAAsync("::Test::TestIntf").ContinueWith(previous =>
+                        {
+                            test(previous.Result);
+                        }).Wait();
 
-                q.begin_op().whenCompleted(cb.op, cb.ex);
-                cb.check();
+                    p.ice_isAAsync("::Test::TestIntf", ctx).ContinueWith(previous =>
+                        {
+                            test(previous.Result);
+                        }).Wait();
 
-                q.begin_op().whenCompleted(
-                    () =>
-                    {
-                        cb.op();
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                        cb.ex(ex);
-                    });
-                cb.check();
+                    p.ice_pingAsync().ContinueWith(previous =>
+                        {
+                            previous.Wait();
+                        }).Wait();
 
-                q.begin_op().whenCompleted(cb.ex);
-                cb.check();
+                    p.ice_pingAsync(ctx).ContinueWith(previous =>
+                        {
+                            previous.Wait();
+                        }).Wait();
+
+                    p.ice_idAsync().ContinueWith(previous =>
+                        {
+                            test(previous.Result.Equals("::Test::TestIntf"));
+                        }).Wait();
+
+                    p.ice_idAsync(ctx).ContinueWith(previous =>
+                        {
+                            test(previous.Result.Equals("::Test::TestIntf"));
+                        }).Wait();
 
-                q.begin_op().whenCompleted(
-                    (Ice.Exception ex) =>
+                    p.ice_idsAsync().ContinueWith(previous =>
+                        {
+                            test(previous.Result.Length == 2);
+                        }).Wait();
+
+                    p.ice_idsAsync(ctx).ContinueWith(previous =>
+                        {
+                            test(previous.Result.Length == 2);
+                        }).Wait();
+
+                    if(!collocated)
                     {
-                        cb.ex(ex);
-                    });
-                cb.check();
+                        p.ice_getConnectionAsync().ContinueWith(previous =>
+                            {
+                                test(previous.Result != null);
+                            }).Wait();
+                    }
 
-                try
-                {
-                    q.opAsync().ContinueWith(
-                        (t) =>
+                    p.opAsync().ContinueWith(previous => previous.Wait()).Wait();
+                    p.opAsync(ctx).ContinueWith(previous => previous.Wait()).Wait();
+
+                    p.opWithResultAsync().ContinueWith(previous =>
+                        {
+                            test(previous.Result == 15);
+                        }).Wait();
+
+                    p.opWithResultAsync(ctx).ContinueWith(previous =>
+                        {
+                            test(previous.Result == 15);
+                        }).Wait();
+
+                    p.opWithUEAsync().ContinueWith(previous =>
                         {
                             try
                             {
-                                t.Wait();
-                                test(false);
+                                previous.Wait();
                             }
-                            catch(AggregateException ex)
+                            catch(AggregateException ae)
                             {
-                                cb.ex((Ice.Exception)ex.InnerException);
+                                ae.Handle(ex => ex is Test.TestIntfException);
+                            }
+                        }).Wait();
+
+                    p.opWithUEAsync(ctx).ContinueWith(previous =>
+                        {
+                            try
+                            {
+                                previous.Wait();
+                            }
+                            catch(AggregateException ae)
+                            {
+                                ae.Handle(ex => ex is Test.TestIntfException);
                             }
                         }).Wait();
-                    test(false);
                 }
-                catch(AggregateException)
+                output.WriteLine("ok");
+
+                output.Write("testing begin/end invocation... ");
+                output.Flush();
                 {
-                }
-                cb.check();
+                    Ice.AsyncResult result;
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
 
-                p.begin_op().whenCompleted(cb.noOp, cb.ex).whenSent(cb.sent);
-                cb.check();
+                    result = p.begin_ice_isA("::Test::TestIntf");
+                    test(p.end_ice_isA(result));
+                    result = p.begin_ice_isA("::Test::TestIntf", ctx);
+                    test(p.end_ice_isA(result));
+
+                    result = p.begin_ice_ping();
+                    p.end_ice_ping(result);
+                    result = p.begin_ice_ping(ctx);
+                    p.end_ice_ping(result);
+
+                    result = p.begin_ice_id();
+                    test(p.end_ice_id(result).Equals("::Test::TestIntf"));
+                    result = p.begin_ice_id(ctx);
+                    test(p.end_ice_id(result).Equals("::Test::TestIntf"));
+
+                    result = p.begin_ice_ids();
+                    test(p.end_ice_ids(result).Length == 2);
+                    result = p.begin_ice_ids(ctx);
+                    test(p.end_ice_ids(result).Length == 2);
 
-                p.begin_op().whenCompleted(
-                    () =>
+                    if(!collocated)
                     {
-                        cb.noOp();
-                    },
-                    (Ice.Exception ex) =>
+                        result = p.begin_ice_getConnection();
+                        test(p.end_ice_getConnection(result) != null);
+                    }
+
+                    result = p.begin_op();
+                    p.end_op(result);
+                    result = p.begin_op(ctx);
+                    p.end_op(result);
+
+                    result = p.begin_opWithResult();
+                    test(p.end_opWithResult(result) == 15);
+                    result = p.begin_opWithResult(ctx);
+                    test(p.end_opWithResult(result) == 15);
+
+                    result = p.begin_opWithUE();
+                    try
                     {
-                        cb.ex(ex);
+                        p.end_opWithUE(result);
+                        test(false);
                     }
-                ).whenSent(
-                    (bool sentSynchronously) =>
+                    catch(Test.TestIntfException)
                     {
-                        cb.sent(sentSynchronously);
-                    });
-                cb.check();
-
-                p.opAsync(progress: new Progress(sentSynchronously =>
+                    }
+                    result = p.begin_opWithUE(ctx);
+                    try
                     {
-                        cb.sent(sentSynchronously);
-                    })).Wait();
-                cb.check();
-            }
-        }
-        WriteLine("ok");
+                        p.end_opWithUE(result);
+                        test(false);
+                    }
+                    catch(Test.TestIntfException)
+                    {
+                    }
+                }
+                output.WriteLine("ok");
 
-        Write("testing batch requests with proxy... ");
-        Flush();
-        {
-            test(p.ice_batchOneway().begin_ice_flushBatchRequests().sentSynchronously());
+                output.Write("testing async callback... ");
+                output.Flush();
+                {
+                    AsyncCallback cb = new AsyncCallback();
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+                    Cookie cookie = new Cookie(5);
+                    AsyncCallback cbWC = new AsyncCallback(cookie);
 
-            Cookie cookie = new Cookie(5);
+                    p.begin_ice_isA("::Test::TestIntf", cb.isA, null);
+                    cb.check();
+                    p.begin_ice_isA("::Test::TestIntf", cbWC.isA, cookie);
+                    cbWC.check();
+                    p.begin_ice_isA("::Test::TestIntf", ctx, cb.isA, null);
+                    cb.check();
+                    p.begin_ice_isA("::Test::TestIntf", ctx, cbWC.isA, cookie);
+                    cbWC.check();
 
-            {
-                //
-                // AsyncResult.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                Ice.AsyncResult r = b1.begin_opBatch();
-                test(r.IsCompleted);
-                test(!r.isSent());
-                b1.opBatch();
-                FlushCallback cb = new FlushCallback(cookie);
-                r = b1.begin_ice_flushBatchRequests(cb.completedAsync, cookie);
-                r.whenSent(cb.sentAsync);
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(2));
-            }
+                    p.begin_ice_ping(cb.ping, null);
+                    cb.check();
+                    p.begin_ice_ping(cbWC.ping, cookie);
+                    cbWC.check();
+                    p.begin_ice_ping(ctx, cb.ping, null);
+                    cb.check();
+                    p.begin_ice_ping(ctx, cbWC.ping, cookie);
+                    cbWC.check();
 
-            if(p.ice_getConnection() != null)
-            {
-                //
-                // AsyncResult exception.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                FlushCallback cb = new FlushCallback(cookie);
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(cb.completedAsync, cookie);
-                r.whenSent(cb.sentAsync);
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(1));
-            }
+                    p.begin_ice_id(cb.id, null);
+                    cb.check();
+                    p.begin_ice_id(cbWC.id, cookie);
+                    cbWC.check();
+                    p.begin_ice_id(ctx, cb.id, null);
+                    cb.check();
+                    p.begin_ice_id(ctx, cbWC.id, cookie);
+                    cbWC.check();
 
-            {
-                //
-                // Type-safe.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.opBatch();
-                FlushCallback cb = new FlushCallback();
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
-                r.whenCompleted(cb.exception);
-                r.whenSent(cb.sent);
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(2));
-            }
+                    p.begin_ice_ids(cb.ids, null);
+                    cb.check();
+                    p.begin_ice_ids(cbWC.ids, cookie);
+                    cbWC.check();
+                    p.begin_ice_ids(ctx, cb.ids, null);
+                    cb.check();
+                    p.begin_ice_ids(ctx, cbWC.ids, cookie);
+                    cbWC.check();
 
-            if(p.ice_getConnection() != null)
-            {
-                //
-                // Type-safe exception.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                FlushCallback cb = new FlushCallback();
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
-                r.whenCompleted(cb.exception);
-                r.whenSent(cb.sent);
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(1));
-            }
-        }
-        WriteLine("ok");
+                    if(!collocated)
+                    {
+                        p.begin_ice_getConnection(cb.connection, null);
+                        cb.check();
+                        p.begin_ice_getConnection(cbWC.connection, cookie);
+                        cbWC.check();
+                    }
 
-        Write("testing batch requests with proxy and async tasks... ");
-        Flush();
-        {
-            {
-                FlushCallback cb = new FlushCallback();
-                System.Threading.Tasks.Task t = p.ice_batchOneway().ice_flushBatchRequestsAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.sent(sentSynchronously);
-                    }));
-                cb.check();
-                t.Wait();
-            }
+                    p.begin_op(cb.op, null);
+                    cb.check();
+                    p.begin_op(cbWC.op, cookie);
+                    cbWC.check();
+                    p.begin_op(ctx, cb.op, null);
+                    cb.check();
+                    p.begin_op(ctx, cbWC.op, cookie);
+                    cbWC.check();
 
-            {
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                var bf = b1.opBatchAsync();
-                test(bf.IsCompleted);
-                FlushCallback cb = new FlushCallback();
-                System.Threading.Tasks.Task t = b1.ice_flushBatchRequestsAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.sent(sentSynchronously);
-                    }));
-
-                cb.check();
-                t.Wait();
-                test(p.waitForBatch(2));
-            }
+                    p.begin_opWithResult(cb.opWithResult, null);
+                    cb.check();
+                    p.begin_opWithResult(cbWC.opWithResult, cookie);
+                    cbWC.check();
+                    p.begin_opWithResult(ctx, cb.opWithResult, null);
+                    cb.check();
+                    p.begin_opWithResult(ctx, cbWC.opWithResult, cookie);
+                    cbWC.check();
 
-            if(p.ice_getConnection() != null)
-            {
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                FlushCallback cb = new FlushCallback();
-                System.Threading.Tasks.Task t = b1.ice_flushBatchRequestsAsync(
-                    progress:new Progress(sentSynchronously =>
-                    {
-                        cb.sent(sentSynchronously);
-                    }));
-                cb.check();
-                t.Wait();
-                test(p.waitForBatch(1));
-            }
-        }
-        WriteLine("ok");
+                    p.begin_opWithUE(cb.opWithUE, null);
+                    cb.check();
+                    p.begin_opWithUE(cbWC.opWithUE, cookie);
+                    cbWC.check();
+                    p.begin_opWithUE(ctx, cb.opWithUE, null);
+                    cb.check();
+                    p.begin_opWithUE(ctx, cbWC.opWithUE, cookie);
+                    cbWC.check();
+                }
+                output.WriteLine("ok");
 
-        Write("testing batch requests with proxy and lambda... ");
-        Flush();
-        {
-            test(p.ice_batchOneway().begin_ice_flushBatchRequests().sentSynchronously());
+                output.Write("testing response callback... ");
+                output.Flush();
+                {
+                    ResponseCallback cb = new ResponseCallback();
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+
+                    p.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.isA, null);
+                    cb.check();
+                    p.begin_ice_isA("::Test::TestIntf", ctx).whenCompleted(cb.isA, null);
+                    cb.check();
 
-            Cookie cookie = new Cookie(5);
+                    p.begin_ice_ping().whenCompleted(cb.ping, null);
+                    cb.check();
+                    p.begin_ice_ping(ctx).whenCompleted(cb.ping, null);
+                    cb.check();
 
-            {
-                //
-                // AsyncResult.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.opBatch();
-                FlushCallback cb = new FlushCallback(cookie);
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
-                    (Ice.AsyncResult result) =>
-                    {
-                        cb.completedAsync(result);
-                    }, cookie);
-                r.whenSent(
-                    (Ice.AsyncResult result) =>
-                    {
-                        cb.sentAsync(result);
-                    });
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(2));
-
-                FlushCallback cb2 = new FlushCallback(cookie);
-                Ice.AsyncResult r2 = b1.begin_ice_flushBatchRequests(
-                    (Ice.AsyncResult result) =>
-                    {
-                        cb2.completedAsync(result);
-                    }, cookie);
-                r2.whenSent(
-                    (Ice.AsyncResult result) =>
-                    {
-                        cb2.sentAsync(result);
-                    });
-                cb2.check();
-                test(r2.isSent());
-                test(r2.IsCompleted);
-            }
+                    p.begin_ice_id().whenCompleted(cb.id, null);
+                    cb.check();
+                    p.begin_ice_id(ctx).whenCompleted(cb.id, null);
+                    cb.check();
 
-            if(p.ice_getConnection() != null)
-            {
-                //
-                // AsyncResult exception.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                FlushCallback cb = new FlushCallback(cookie);
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
-                    (Ice.AsyncResult result) =>
-                    {
-                        cb.completedAsync(result);
-                    }, cookie);
-                r.whenSent(
-                    (Ice.AsyncResult result) =>
-                    {
-                        cb.sentAsync(result);
-                    });
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(1));
-            }
+                    p.begin_ice_ids().whenCompleted(cb.ids, null);
+                    cb.check();
+                    p.begin_ice_ids(ctx).whenCompleted(cb.ids, null);
+                    cb.check();
 
-            {
-                //
-                // Type-safe.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.opBatch();
-                FlushCallback cb = new FlushCallback();
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
-                r.whenCompleted(
-                    (Ice.Exception ex) =>
-                    {
-                        cb.exception(ex);
-                    });
-                r.whenSent(
-                    (bool sentSynchronously) =>
-                    {
-                        cb.sent(sentSynchronously);
-                    });
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(2));
-            }
+                    if(!collocated)
+                    {
+                        p.begin_ice_getConnection().whenCompleted(cb.connection, null);
+                        cb.check();
+                    }
 
-            if(p.ice_getConnection() != null)
-            {
-                //
-                // Type-safe exception.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                FlushCallback cb = new FlushCallback();
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
-                r.whenCompleted(
-                    (Ice.Exception ex) =>
-                    {
-                        cb.exception(ex);
-                    });
-                r.whenSent(
-                    (bool sentSynchronously) =>
-                    {
-                        cb.sent(sentSynchronously);
-                    });
-                cb.check();
-                test(r.isSent());
-                test(r.IsCompleted);
-                test(p.waitForBatch(1));
-            }
-        }
-        WriteLine("ok");
+                    p.begin_op().whenCompleted(cb.op, null);
+                    cb.check();
+                    p.begin_op(ctx).whenCompleted(cb.op, null);
+                    cb.check();
 
-        if(p.ice_getConnection() != null)
-        {
-            Write("testing batch requests with connection... ");
-            Flush();
-            {
+                    p.begin_opWithResult().whenCompleted(cb.opWithResult, null);
+                    cb.check();
+                    p.begin_opWithResult(ctx).whenCompleted(cb.opWithResult, null);
+                    cb.check();
+
+                    p.begin_opWithUE().whenCompleted(cb.op, cb.opWithUE);
+                    cb.check();
+                    p.begin_opWithUE(ctx).whenCompleted(cb.op, cb.opWithUE);
+                    cb.check();
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing lambda callback... ");
+                output.Flush();
                 {
-                    //
-                    // Async task.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                     p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    SentCallback cb = new SentCallback();
-                    Task t = b1.ice_getConnection().flushBatchRequestsAsync(
-                        Ice.CompressBatch.BasedOnProxy,
-                        progress:new Progress(
-                            sentSyncrhonously =>
+                    ResponseCallback cb = new ResponseCallback();
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+
+                    p.begin_ice_isA("::Test::TestIntf").whenCompleted(
+                       (bool r) =>
+                        {
+                            cb.isA(r);
+                        }, null);
+                    cb.check();
+                    p.begin_ice_isA("::Test::TestIntf", ctx).whenCompleted(
+                       (bool r) =>
+                        {
+                            cb.isA(r);
+                        }, null);
+                    cb.check();
+
+                    p.begin_ice_ping().whenCompleted(
+                       () =>
+                        {
+                            cb.ping();
+                        }, null);
+                    cb.check();
+                    p.begin_ice_ping(ctx).whenCompleted(
+                       () =>
+                        {
+                            cb.ping();
+                        }, null);
+                    cb.check();
+
+                    p.begin_ice_id().whenCompleted(
+                       (string id) =>
+                        {
+                            cb.id(id);
+                        }, null);
+                    cb.check();
+                    p.begin_ice_id(ctx).whenCompleted(
+                       (string id) =>
+                        {
+                            cb.id(id);
+                        }, null);
+                    cb.check();
+
+                    p.begin_ice_ids().whenCompleted(
+                       (string[] ids) =>
+                        {
+                            cb.ids(ids);
+                        }, null);
+                    cb.check();
+                    p.begin_ice_ids(ctx).whenCompleted(
+                       (string[] ids) =>
+                        {
+                            cb.ids(ids);
+                        }, null);
+                    cb.check();
+
+                    if(!collocated)
+                    {
+                        p.begin_ice_getConnection().whenCompleted(
+                           (Ice.Connection conn) =>
                             {
-                                cb.sent(sentSyncrhonously);
-                            }));
+                                cb.connection(conn);
+                            }, null);
+                        cb.check();
+                    }
 
+                    p.begin_op().whenCompleted(
+                       () =>
+                        {
+                            cb.op();
+                        }, null);
+                    cb.check();
+                    p.begin_op(ctx).whenCompleted(
+                       () =>
+                        {
+                            cb.op();
+                        }, null);
+                    cb.check();
+
+                    p.begin_opWithResult().whenCompleted(
+                       (int r) =>
+                        {
+                            cb.opWithResult(r);
+                        }, null);
+                    cb.check();
+                    p.begin_opWithResult(ctx).whenCompleted(
+                       (int r) =>
+                        {
+                            cb.opWithResult(r);
+                        }, null);
+                    cb.check();
+
+                    p.begin_opWithUE().whenCompleted(
+                       () =>
+                        {
+                            cb.op();
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.opWithUE(ex);
+                        });
+                    cb.check();
+                    p.begin_opWithUE(ctx).whenCompleted(
+                       () =>
+                        {
+                            cb.op();
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.opWithUE(ex);
+                        });
                     cb.check();
-                    t.Wait();
-                    test(t.IsCompleted);
-                    test(p.waitForBatch(2));
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing local exceptions... ");
+                output.Flush();
                 {
-                    //
-                    // Async task exception.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    Task t = b1.ice_getConnection().flushBatchRequestsAsync(
-                        Ice.CompressBatch.BasedOnProxy,
-                        progress: new Progress(
-                            sentSynchronously =>
-                            {
-                                test(false);
-                            }));
+                    Test.TestIntfPrx indirect = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    Ice.AsyncResult r;
+
+                    r = indirect.begin_op();
                     try
                     {
-                        t.Wait();
+                        indirect.end_op(r);
                         test(false);
                     }
-                    catch(System.AggregateException)
+                    catch(Ice.NoEndpointException)
                     {
                     }
-                    test(p.opBatchCount() == 0);
-                }
 
-                Cookie cookie = new Cookie(5);
+                    try
+                    {
+                        r =((Test.TestIntfPrx)p.ice_oneway()).begin_opWithResult();
+                        test(false);
+                    }
+                    catch(ArgumentException)
+                    {
+                    }
 
-                {
                     //
-                    // AsyncResult.
+                    // Check that CommunicatorDestroyedException is raised directly.
                     //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                     p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        cb.completedAsync,
-                        cookie);
-                    r.whenSent(cb.sentAsync);
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
-                }
+                    if(p.ice_getConnection() != null)
+                    {
+                        Ice.InitializationData initData = new Ice.InitializationData();
+                        initData.properties = communicator.getProperties().ice_clone_();
+                        Ice.Communicator ic = helper.initialize(initData);
+                        Ice.ObjectPrx o = ic.stringToProxy(p.ToString());
+                        Test.TestIntfPrx p2 = Test.TestIntfPrxHelper.checkedCast(o);
+                        ic.destroy();
 
-                {
-                    //
-                    // AsyncResult exception.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushExCallback cb = new FlushExCallback(cookie);
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        cb.completedAsync,
-                        cookie);
-                    r.whenSent(cb.sentAsync);
-                    cb.check();
-                    test(!r.isSent());
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
+                        try
+                        {
+                            p2.begin_op();
+                            test(false);
+                        }
+                        catch(Ice.CommunicatorDestroyedException)
+                        {
+                            // Expected.
+                        }
+                    }
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing local exceptions with async tasks... ");
+                output.Flush();
                 {
+                    Test.TestIntfPrx indirect = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+
+                    try
+                    {
+                        indirect.opAsync().Wait();
+                        test(false);
+                    }
+                    catch(AggregateException ae)
+                    {
+                        ae.Handle((ex) =>
+                        {
+                            return ex is Ice.NoEndpointException;
+                        });
+                    }
+
+                    try
+                    {
+                       ((Test.TestIntfPrx)p.ice_oneway()).opWithResultAsync();
+                        test(false);
+                    }
+                    catch(Ice.TwowayOnlyException)
+                    {
+                    }
+
                     //
-                    // Type-safe.
+                    // Check that CommunicatorDestroyedException is raised directly.
                     //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(cb.exception);
-                    r.whenSent(cb.sent);
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
+                    if(p.ice_getConnection() != null)
+                    {
+                        Ice.InitializationData initData = new Ice.InitializationData();
+                        initData.properties = communicator.getProperties().ice_clone_();
+                        Ice.Communicator ic = helper.initialize(initData);
+                        Ice.ObjectPrx o = ic.stringToProxy(p.ToString());
+                        Test.TestIntfPrx p2 = Test.TestIntfPrxHelper.checkedCast(o);
+                        ic.destroy();
+
+                        try
+                        {
+                            p2.opAsync();
+                            test(false);
+                        }
+                        catch(Ice.CommunicatorDestroyedException)
+                        {
+                            // Expected.
+                        }
+                    }
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing local exceptions with async callback... ");
+                output.Flush();
                 {
-                    //
-                    // Type-safe exception.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushExCallback cb = new FlushExCallback();
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(cb.exception);
-                    r.whenSent(cb.sent);
-                    cb.check();
-                    test(!r.isSent());
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
-            }
-            WriteLine("ok");
-        }
+                    Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    AsyncCallback cb = new AsyncCallback();
+                    Cookie cookie = new Cookie(5);
+                    AsyncCallback cbWC = new AsyncCallback(cookie);
 
-        if(p.ice_getConnection() != null)
-        {
-            Write("testing batch requests with connection and lambda... ");
-            Flush();
-            {
-                Cookie cookie = new Cookie(5);
+                    i.begin_ice_isA("::Test::TestIntf", cb.isAEx, null);
+                    cb.check();
+                    i.begin_ice_isA("::Test::TestIntf", cbWC.isAEx, cookie);
+                    cbWC.check();
 
-                {
-                    //
-                    // AsyncResult.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.completedAsync(result);
-                        }, cookie);
-                    r.whenSent(
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.sentAsync(result);
-                        });
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
+                    i.begin_ice_ping(cb.pingEx, null);
+                    cb.check();
+                    i.begin_ice_ping(cbWC.pingEx, cookie);
+                    cbWC.check();
+
+                    i.begin_ice_id(cb.idEx, null);
+                    cb.check();
+                    i.begin_ice_id(cbWC.idEx, cookie);
+                    cbWC.check();
+
+                    i.begin_ice_ids(cb.idsEx, null);
+                    cb.check();
+                    i.begin_ice_ids(cbWC.idsEx, cookie);
+                    cbWC.check();
+
+                    if(!collocated)
+                    {
+                        i.begin_ice_getConnection(cb.connectionEx, null);
+                        cb.check();
+                        i.begin_ice_getConnection(cbWC.connectionEx, cookie);
+                        cbWC.check();
+                    }
+
+                    i.begin_op(cb.opEx, null);
+                    cb.check();
+                    i.begin_op(cbWC.opEx, cookie);
+                    cbWC.check();
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing local exceptions with response callback... ");
+                output.Flush();
                 {
-                    //
-                    // AsyncResult exception.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushExCallback cb = new FlushExCallback(cookie);
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.completedAsync(result);
-                        }, cookie);
-                    r.whenSent(
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.sentAsync(result);
-                        });
-                    cb.check();
-                    test(!r.isSent());
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
+                    Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    ExceptionCallback cb = new ExceptionCallback();
+
+                    i.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.isA, cb.ex);
+                    cb.check();
+
+                    i.begin_ice_ping().whenCompleted(cb.ping, cb.ex);
+                    cb.check();
+
+                    i.begin_ice_id().whenCompleted(cb.id, cb.ex);
+                    cb.check();
+
+                    i.begin_ice_ids().whenCompleted(cb.ids, cb.ex);
+                    cb.check();
+
+                    if(!collocated)
+                    {
+                        i.begin_ice_getConnection().whenCompleted(cb.connection, cb.ex);
+                        cb.check();
+                    }
+
+                    i.begin_op().whenCompleted(cb.op, cb.ex);
+                    cb.check();
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing local exceptions with lambda callback... ");
+                output.Flush();
                 {
-                    //
-                    // Type-safe.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(
-                        (Ice.Exception ex) =>
+                    Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    ExceptionCallback cb = new ExceptionCallback();
+
+                    i.begin_ice_isA("::Test::TestIntf").whenCompleted(
+                       (bool r) =>
                         {
-                            cb.exception(ex);
-                        });
-                    r.whenSent(
-                        (bool sentSynchronously) =>
+                            cb.isA(r);
+                        },
+                       (Ice.Exception ex) =>
                         {
-                            cb.sent(sentSynchronously);
+                            cb.ex(ex);
                         });
                     cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
-                }
 
-                {
-                    //
-                    // Type-safe exception.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushExCallback cb = new FlushExCallback();
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(
-                        (Ice.Exception ex) =>
+                    i.begin_ice_ping().whenCompleted(
+                       () =>
                         {
-                            cb.exception(ex);
+                            cb.ping();
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
                         });
-                    r.whenSent(
-                        (bool sentSynchronously) =>
+                    cb.check();
+
+                    i.begin_ice_id().whenCompleted(
+                       (string id) =>
                         {
-                            cb.sent(sentSynchronously);
+                            cb.id(id);
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
                         });
                     cb.check();
-                    test(!r.isSent());
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
-            }
-            WriteLine("ok");
 
-            Write("testing batch requests with communicator... ");
-            Flush();
-            {
-                {
-                    //
-                    // Async task - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
+                    i.begin_ice_ids().whenCompleted(
+                       (string[] ids) =>
+                        {
+                            cb.ids(ids);
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        });
+                    cb.check();
 
-                    SentCallback cb = new SentCallback();
-                    Task t = communicator.flushBatchRequestsAsync(
-                        Ice.CompressBatch.BasedOnProxy,
-                        progress: new Progress(
-                            sentSynchronously =>
+                    if(!collocated)
+                    {
+                        i.begin_ice_getConnection().whenCompleted(
+                           (Ice.Connection conn) =>
                             {
-                                cb.sent(sentSynchronously);
-                            }));
+                                cb.connection(conn);
+                            },
+                           (Ice.Exception ex) =>
+                            {
+                                cb.ex(ex);
+                            });
+                        cb.check();
+                    }
+
+                    i.begin_op().whenCompleted(
+                       () =>
+                        {
+                            cb.op();
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        });
                     cb.check();
-                    t.Wait();
-                    test(t.IsCompleted);
-                    test(p.waitForBatch(2));
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing exception callback... ");
+                output.Flush();
                 {
-                    //
-                    // Async task exception - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    SentCallback cb = new SentCallback();
-                    Task t = communicator.flushBatchRequestsAsync(
-                        Ice.CompressBatch.BasedOnProxy,
-                        progress:new Progress(
-                            sentSynchronously =>
-                            {
-                                cb.sent(sentSynchronously);
-                            }));
-                    cb.check(); // Exceptions are ignored!
-                    t.Wait();
-                    test(t.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
+                    Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    ExceptionCallback cb = new ExceptionCallback();
 
-                {
-                    //
-                    // Async task - 2 connections.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b1.opBatch();
-                    b2.opBatch();
-                    b2.opBatch();
+                    i.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.ex);
+                    cb.check();
 
-                    SentCallback cb = new SentCallback();
-                    Task t = communicator.flushBatchRequestsAsync(
-                        Ice.CompressBatch.BasedOnProxy,
-                        new Progress(sentSynchronously =>
-                            {
-                                cb.sent(sentSynchronously);
-                            }));
+                    i.begin_op().whenCompleted(cb.ex);
                     cb.check();
-                    t.Wait();
-                    test(t.IsCompleted);
-                    test(p.waitForBatch(4));
-                }
 
-                {
-                    //
-                    // AsyncResult exception - 2 connections - 1 failure.
-                    //
-                    // All connections should be flushed even if there are failures on some connections.
-                    // Exceptions should not be reported.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    SentCallback cb = new SentCallback();
-                    Task t = communicator.flushBatchRequestsAsync(
-                        Ice.CompressBatch.BasedOnProxy,
-                        new Progress(
-                            sentSynchronously =>
-                            {
-                                cb.sent(sentSynchronously);
-                            }));
-                    cb.check(); // Exceptions are ignored!
-                    t.Wait();
-                    test(t.IsCompleted);
-                    test(p.waitForBatch(1));
-                }
+                    i.begin_opWithResult().whenCompleted(cb.ex);
+                    cb.check();
 
-                {
-                    //
-                    // Async task exception - 2 connections - 2 failures.
-                    //
-                    // The sent callback should be invoked even if all connections fail.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    SentCallback cb = new SentCallback();
-                    Task t = communicator.flushBatchRequestsAsync(
-                        Ice.CompressBatch.BasedOnProxy,
-                        new Progress(
-                            sentSynchronously =>
-                            {
-                                cb.sent(sentSynchronously);
-                            }));
-                    cb.check(); // Exceptions are ignored!
-                    t.Wait();
-                    test(t.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
+                    i.begin_opWithUE().whenCompleted(cb.ex);
+                    cb.check();
 
-                Cookie cookie = new Cookie(5);
+                    // Ensures no exception is called when response is received
+                    p.begin_ice_isA("::Test::TestIntf").whenCompleted(cb.noEx);
+                    p.begin_op().whenCompleted(cb.noEx);
+                    p.begin_opWithResult().whenCompleted(cb.noEx);
 
-                {
-                    //
-                    // AsyncResult - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
-                                                                              cb.completedAsync,
-                                                                              cookie);
-                    r.whenSent(cb.sentAsync);
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
+                    // If response is a user exception, it should be received.
+                    p.begin_opWithUE().whenCompleted(cb.opWithUE);
+                    cb.check();
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing exception with async task... ");
+                output.Flush();
                 {
-                    //
-                    // AsyncResult exception - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
-                                                                              cb.completedAsync,
-                                                                              cookie);
-                    r.whenSent(cb.sentAsync);
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
+                    Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    ExceptionCallback cb = new ExceptionCallback();
 
-                {
-                    //
-                    // AsyncResult - 2 connections.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b1.opBatch();
-                    b2.opBatch();
-                    b2.opBatch();
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
-                                                                              cb.completedAsync,
-                                                                              cookie);
-                    r.whenSent(cb.sentAsync);
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(4));
-                }
+                    try
+                    {
+                        i.ice_isAAsync("::Test::TestIntf").Wait();
+                        test(false);
+                    }
+                    catch(AggregateException)
+                    {
+                    }
 
-                {
-                    //
-                    // AsyncResult exception - 2 connections - 1 failure.
-                    //
-                    // All connections should be flushed even if there are failures on some connections.
-                    // Exceptions should not be reported.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
-                                                                              cb.completedAsync,
-                                                                              cookie);
-                    r.whenSent(cb.sentAsync);
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(1));
-                }
+                    try
+                    {
+                        i.opAsync().Wait();
+                        test(false);
+                    }
+                    catch(AggregateException)
+                    {
+                    }
 
-                {
-                    //
-                    // AsyncResult exception - 2 connections - 2 failures.
-                    //
-                    // The sent callback should be invoked even if all connections fail.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
-                                                                              cb.completedAsync,
-                                                                              cookie);
-                    r.whenSent(cb.sentAsync);
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
+                    try
+                    {
+                        i.opWithResultAsync().Wait();
+                        test(false);
+                    }
+                    catch(AggregateException)
+                    {
+                    }
 
-                {
-                    //
-                    // Type-safe - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(cb.exception);
-                    r.whenSent(cb.sent);
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
-                }
+                    try
+                    {
+                        i.opWithUEAsync().Wait();
+                        test(false);
+                    }
+                    catch(AggregateException)
+                    {
+                    }
 
-                {
-                    //
-                    // Type-safe exception - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(cb.exception);
-                    r.whenSent(cb.sent);
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
+                    // Ensures no exception is called when response is received
+                    test(p.ice_isAAsync("::Test::TestIntf").Result);
+                    p.opAsync().Wait();
+                    p.opWithResultAsync().Wait();
 
-                {
-                    //
-                    // 2 connections.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b1.opBatch();
-                    b2.opBatch();
-                    b2.opBatch();
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(cb.exception);
-                    r.whenSent(cb.sent);
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(4));
+                    // If response is a user exception, it should be received.
+                    try
+                    {
+                        p.opWithUEAsync().Wait();
+                        test(false);
+                    }
+                    catch(AggregateException ae)
+                    {
+                        ae.Handle((ex) =>
+                        {
+                            return ex is Test.TestIntfException;
+                        });
+                    }
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing lambda exception callback... ");
+                output.Flush();
                 {
-                    //
-                    // Exception - 2 connections - 1 failure.
-                    //
-                    // All connections should be flushed even if there are failures on some connections.
-                    // Exceptions should not be reported.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(cb.exception);
-                    r.whenSent(cb.sent);
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(1));
-                }
+                    Test.TestIntfPrx i = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    ExceptionCallback cb = new ExceptionCallback();
 
-                {
-                    //
-                    // Exception - 2 connections - 2 failures.
-                    //
-                    // The sent callback should be invoked even if all connections fail.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(cb.exception);
-                    r.whenSent(cb.sent);
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
-            }
-            WriteLine("ok");
+                    i.begin_ice_isA("::Test::TestIntf").whenCompleted(
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        });
+                    cb.check();
 
-            Write("testing batch requests with communicator with lambda... ");
-            Flush();
-            {
-                Cookie cookie = new Cookie(5);
+                    i.begin_op().whenCompleted(
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        });
 
-                {
-                    //
-                    // AsyncResult - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.completedAsync(result);
-                        }, cookie);
-                    r.whenSent(
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.sentAsync(result);
-                        });
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
-                }
+                    cb.check();
 
-                {
-                    //
-                    // AsyncResult exception - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.completedAsync(result);
-                        }, cookie);
-                    r.whenSent(
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.sentAsync(result);
-                        });
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
+                    i.begin_opWithResult().whenCompleted(
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        });
+                    cb.check();
 
-                {
-                    //
-                    // AsyncResult - 2 connections.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b1.opBatch();
-                    b2.opBatch();
-                    b2.opBatch();
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.completedAsync(result);
-                        }, cookie);
-                    r.whenSent(
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.sentAsync(result);
-                        });
-                    cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(4));
+                    i.begin_opWithUE().whenCompleted(
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        });
+                    cb.check();
+
+                    // Ensures no exception is called when response is received
+                    p.begin_ice_isA("::Test::TestIntf").whenCompleted(
+                       (Ice.Exception ex) =>
+                        {
+                            cb.noEx(ex);
+                        });
+                    p.begin_op().whenCompleted(
+                        (Ice.Exception ex) =>
+                        {
+                            cb.noEx(ex);
+                        });
+                    p.begin_opWithResult().whenCompleted(
+                        (Ice.Exception ex) =>
+                        {
+                            cb.noEx(ex);
+                        });
+
+                    // If response is a user exception, it should be received.
+                    p.begin_opWithUE().whenCompleted(
+                        (Ice.Exception ex) =>
+                        {
+                            cb.opWithUE(ex);
+                        });
+                    cb.check();
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing sent callback... ");
+                output.Flush();
                 {
-                    //
-                    // AsyncResult exception - 2 connections - 1 failure.
-                    //
-                    // All connections should be flushed even if there are failures on some connections.
-                    // Exceptions should not be reported.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.completedAsync(result);
-                        }, cookie);
-                    r.whenSent(
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.sentAsync(result);
-                        });
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(1));
+                    SentCallback cb = new SentCallback();
+
+                    p.begin_ice_isA("").whenCompleted(cb.isA, cb.ex).whenSent(cb.sent);
+                    cb.check();
+
+                    p.begin_ice_ping().whenCompleted(cb.ping, cb.ex).whenSent(cb.sent);
+                    cb.check();
+
+                    p.begin_ice_id().whenCompleted(cb.id, cb.ex).whenSent(cb.sent);
+                    cb.check();
+
+                    p.begin_ice_ids().whenCompleted(cb.ids, cb.ex).whenSent(cb.sent);
+                    cb.check();
+
+                    p.begin_op().whenCompleted(cb.op, cb.ex).whenSent(cb.sent);
+                    cb.check();
+
+                    p.begin_op(cb.opAsync, null).whenSent(cb.sentAsync);
+                    cb.check();
+
+                    p.begin_op().whenCompleted(cb.ex).whenSent(cb.sent);
+                    cb.check();
+
+                    List<SentCallback> cbs = new List<SentCallback>();
+                    byte[] seq = new byte[10024];
+                   (new Random()).NextBytes(seq);
+                    testController.holdAdapter();
+                    try
+                    {
+                        Ice.AsyncResult r;
+                        do
+                        {
+                            SentCallback cb2 = new SentCallback();
+                            r = p.begin_opWithPayload(seq).whenCompleted(cb2.ex).whenSent(cb2.sent);
+                            cbs.Add(cb2);
+                        }
+                        while(r.sentSynchronously());
+                    }
+                    finally
+                    {
+                        testController.resumeAdapter();
+                    }
+                    foreach(SentCallback cb3 in cbs)
+                    {
+                        cb3.check();
+                    }
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing progress callback... ");
+                output.Flush();
                 {
-                    //
-                    // AsyncResult exception - 2 connections - 2 failures.
-                    //
-                    // The sent callback should be invoked even if all connections fail.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback(cookie);
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.completedAsync(result);
-                        }, cookie);
-                    r.whenSent(
-                        (Ice.AsyncResult result) =>
-                        {
-                            cb.sentAsync(result);
-                        });
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
+                    {
+                        SentCallback cb = new SentCallback();
+
+                        Task t = p.ice_isAAsync("",
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            }));
+                        cb.check();
+                        t.Wait();
+
+                        t = p.ice_pingAsync(
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            }));
+                        cb.check();
+                        t.Wait();
+
+                        t = p.ice_idAsync(
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            }));
+                        cb.check();
+                        t.Wait();
+
+                        t = p.ice_idsAsync(
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            }));
+                        cb.check();
+                        t.Wait();
+
+                        t = p.opAsync(
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            }));
+                        cb.check();
+                        t.Wait();
+                    }
+
+                    List<Task> tasks = new List<Task>();
+                    byte[] seq = new byte[10024];
+                   (new Random()).NextBytes(seq);
+                    testController.holdAdapter();
+                    try
+                    {
+                        Task t = null;
+                        ProgresCallback cb;
+                        do
+                        {
+                            cb = new ProgresCallback();
+                            t = p.opWithPayloadAsync(seq, progress: cb);
+                            tasks.Add(t);
+                        }
+                        while(cb.SentSynchronously);
+                    }
+                    finally
+                    {
+                        testController.resumeAdapter();
+                    }
+                    foreach(Task t in tasks)
+                    {
+                        t.Wait();
+                    }
                 }
+                output.WriteLine("ok");
 
+                output.Write("testing lambda sent callback... ");
+                output.Flush();
                 {
-                    //
-                    // Type-safe - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(
-                        (Ice.Exception ex) =>
+                    SentCallback cb = new SentCallback();
+
+                    p.begin_ice_isA("").whenCompleted(
+                       (bool r) =>
                         {
-                            cb.exception(ex);
-                        });
-                    r.whenSent(
-                        (bool sentSynchronously) =>
+                            cb.isA(r);
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        }
+                    ).whenSent(
+                       (bool sentSynchronously) =>
                         {
                             cb.sent(sentSynchronously);
                         });
                     cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(2));
-                }
 
-                {
-                    //
-                    // Type-safe exception - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(
-                        (Ice.Exception ex) =>
+                    p.begin_ice_ping().whenCompleted(
+                       () =>
                         {
-                            cb.exception(ex);
-                        });
-                    r.whenSent(
-                        (bool sentSynchronously) =>
+                            cb.ping();
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        }
+                    ).whenSent(
+                       (bool sentSynchronously) =>
                         {
                             cb.sent(sentSynchronously);
                         });
                     cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
 
-                {
-                    //
-                    // 2 connections.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b1.opBatch();
-                    b2.opBatch();
-                    b2.opBatch();
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(
-                        (Ice.Exception ex) =>
+                    p.begin_ice_id().whenCompleted(
+                       (string id) =>
                         {
-                            cb.exception(ex);
-                        });
-                    r.whenSent(
-                        (bool sentSynchronously) =>
+                            cb.id(id);
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        }
+                    ).whenSent(
+                       (bool sentSynchronously) =>
                         {
                             cb.sent(sentSynchronously);
                         });
                     cb.check();
-                    test(r.isSent());
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(4));
-                }
 
-                {
-                    //
-                    // Exception - 2 connections - 1 failure.
-                    //
-                    // All connections should be flushed even if there are failures on some connections.
-                    // Exceptions should not be reported.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(
-                        (Ice.Exception ex) =>
+                    p.begin_ice_ids().whenCompleted(
+                       (string[] ids) =>
                         {
-                            cb.exception(ex);
-                        });
-                    r.whenSent(
-                        (bool sentSynchronously) =>
+                            cb.ids(ids);
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        }
+                    ).whenSent(
+                       (bool sentSynchronously) =>
                         {
                             cb.sent(sentSynchronously);
                         });
                     cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.waitForBatch(1));
-                }
 
-                {
-                    //
-                    // Exception - 2 connections - 2 failures.
-                    //
-                    // The sent callback should be invoked even if all connections fail.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    r.whenCompleted(
-                        (Ice.Exception ex) =>
+                    p.begin_op().whenCompleted(
+                       () =>
                         {
-                            cb.exception(ex);
-                        });
-                    r.whenSent(
-                        (bool sentSynchronously) =>
+                            cb.op();
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        }
+                    ).whenSent(
+                       (bool sentSynchronously) =>
                         {
                             cb.sent(sentSynchronously);
                         });
                     cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.IsCompleted);
-                    test(p.opBatchCount() == 0);
-                }
-            }
-            WriteLine("ok");
-        }
-
-        Write("testing async/await... ");
-        Flush();
-        Func<Task> task = async () =>
-        {
-            try
-            {
-                await p.opAsync();
 
-                var r = await p.opWithResultAsync();
-                test(r == 15);
-
-                try
-                {
-                    await p.opWithUEAsync();
-                }
-                catch(TestIntfException)
-                {
-                }
-
-                // Operations implemented with amd and async.
-                await p.opAsyncDispatchAsync();
-
-                r = await p.opWithResultAsyncDispatchAsync();
-                test(r == 15);
+                    p.begin_op(cb.opAsync, null).whenSent(
+                       (Ice.AsyncResult r) =>
+                        {
+                            cb.sentAsync(r);
+                        });
+                    cb.check();
 
-                try
-                {
-                    await p.opWithUEAsyncDispatchAsync();
-                    test(false);
-                }
-                catch(TestIntfException)
-                {
-                }
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // Expected with cross testing, this opXxxAsyncDispatch methods are C# only.
-            }
-        };
-        task().Wait();
-        WriteLine("ok");
+                    p.begin_op().whenCompleted(
+                       (Ice.Exception ex) =>
+                        {
+                            cb.ex(ex);
+                        }
+                    ).whenSent(
+                       (bool sentSynchronously) =>
+                        {
+                            cb.sent(sentSynchronously);
+                        });
+                    cb.check();
 
-        if(p.ice_getConnection() != null)
-        {
-            Write("testing async Task cancellation... ");
-            Flush();
-            {
-                var cs1 = new CancellationTokenSource();
-                var cs2 = new CancellationTokenSource();
-                var cs3 = new CancellationTokenSource();
-                Task t1;
-                Task t2;
-                Task t3;
-                try
-                {
-                    testController.holdAdapter();
-                    ProgresCallback cb = null;
+                    List<SentCallback> cbs = new List<SentCallback>();
                     byte[] seq = new byte[10024];
-                    for(int i = 0; i < 200; ++i) // 2MB
+                   (new System.Random()).NextBytes(seq);
+                    testController.holdAdapter();
+                    try
+                    {
+                        Ice.AsyncResult r;
+                        do
+                        {
+                            SentCallback cb2 = new SentCallback();
+                            r = p.begin_opWithPayload(seq).whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb2.ex(ex);
+                                }
+                            ).whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb2.sent(sentSynchronously);
+                                });
+                            cbs.Add(cb2);
+                        }
+                        while(r.sentSynchronously());
+                    }
+                    finally
+                    {
+                        testController.resumeAdapter();
+                    }
+                    foreach(SentCallback cb3 in cbs)
                     {
-                        cb = new ProgresCallback();
-                        p.opWithPayloadAsync(seq, progress: cb);
+                        cb3.check();
                     }
+                }
+                output.WriteLine("ok");
 
-                    test(!cb.Sent);
+                output.Write("testing illegal arguments... ");
+                output.Flush();
+                {
+                    Ice.AsyncResult result;
 
-                    t1 = p.ice_pingAsync(cancel: cs1.Token);
-                    t2 = p.ice_pingAsync(cancel: cs2.Token);
-                    cs3.Cancel();
-                    t3 = p.ice_pingAsync(cancel: cs3.Token);
-                    cs1.Cancel();
-                    cs2.Cancel();
+                    result = p.begin_op();
+                    p.end_op(result);
                     try
                     {
-                        t1.Wait();
+                        p.end_op(result);
                         test(false);
                     }
-                    catch(AggregateException ae)
+                    catch(System.ArgumentException)
                     {
-                        ae.Handle(ex =>
-                        {
-                            return ex is Ice.InvocationCanceledException;
-                        });
                     }
+
+                    result = p.begin_op();
                     try
                     {
-                        t2.Wait();
+                        p.end_opWithResult(result);
                         test(false);
                     }
-                    catch(AggregateException ae)
+                    catch(System.ArgumentException)
                     {
-                        ae.Handle(ex =>
-                        {
-                            return ex is Ice.InvocationCanceledException;
-                        });
                     }
 
                     try
                     {
-                        t3.Wait();
+                        p.end_op(null);
                         test(false);
                     }
-                    catch(AggregateException ae)
+                    catch(System.ArgumentException)
                     {
-                        ae.Handle(ex =>
-                        {
-                            return ex is Ice.InvocationCanceledException;
-                        });
                     }
-
                 }
-                finally
-                {
-                    testController.resumeAdapter();
-                    p.ice_ping();
-                }
-            }
-            WriteLine("ok");
-        }
+                output.WriteLine("ok");
 
-        Write("testing AsyncResult operations... ");
-        Flush();
-        {
-            {
-                testController.holdAdapter();
-                Ice.AsyncResult r1;
-                Ice.AsyncResult r2;
-                try
+                output.Write("testing unexpected exceptions... ");
+                output.Flush();
                 {
-                    r1 = p.begin_op();
-                    byte[] seq = new byte[10024];
-                    (new System.Random()).NextBytes(seq);
-                    while((r2 = p.begin_opWithPayload(seq)).sentSynchronously());
+                    Test.TestIntfPrx q = Test.TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+                    ThrowType[] throwEx = new ThrowType[]{ ThrowType.LocalException,
+                                                   ThrowType.UserException,
+                                                   ThrowType.OtherException };
 
-                    if(p.ice_getConnection() != null)
+                    for(int i = 0; i < 3; ++i)
                     {
-                        test(r1.sentSynchronously() && r1.isSent() && !r1.isCompleted_() ||
-                             !r1.sentSynchronously() && !r1.isCompleted_());
+                        Thrower cb = new Thrower(throwEx[i]);
 
-                        test(!r2.sentSynchronously() && !r2.isCompleted_());
+                        p.begin_op(cb.opAsync, null);
+                        cb.check();
 
-                        test(!r1.IsCompleted && !r1.CompletedSynchronously);
-                        test(!r2.IsCompleted && !r2.CompletedSynchronously);
-                    }
-                }
-                finally
-                {
-                    testController.resumeAdapter();
-                }
+                        p.begin_op().whenCompleted(cb.op, null);
+                        cb.check();
 
-                WaitHandle w1 = r1.AsyncWaitHandle;
-                WaitHandle w2 = r2.AsyncWaitHandle;
+                        p.begin_op().whenCompleted(
+                           () =>
+                            {
+                                cb.op();
+                            }, null);
+                        cb.check();
+
+                        try
+                        {
+                            p.opAsync().ContinueWith(
+                               (t) =>
+                                {
+                                    cb.op();
+                                }).Wait();
+                            test(false);
+                        }
+                        catch(AggregateException)
+                        {
+                        }
+                        cb.check();
 
-                r1.waitForSent();
-                test(r1.isSent());
+                        q.begin_op().whenCompleted(cb.op, cb.ex);
+                        cb.check();
 
-                r2.waitForSent();
-                test(r2.isSent());
+                        q.begin_op().whenCompleted(
+                           () =>
+                            {
+                                cb.op();
+                            },
+                           (Ice.Exception ex) =>
+                            {
+                                cb.ex(ex);
+                            });
+                        cb.check();
 
-                r1.waitForCompleted();
-                test(r1.isCompleted_());
-                w1.WaitOne();
+                        q.begin_op().whenCompleted(cb.ex);
+                        cb.check();
 
-                r2.waitForCompleted();
-                test(r2.isCompleted_());
-                w2.WaitOne();
+                        q.begin_op().whenCompleted(
+                           (Ice.Exception ex) =>
+                            {
+                                cb.ex(ex);
+                            });
+                        cb.check();
+
+                        try
+                        {
+                            q.opAsync().ContinueWith(
+                               (t) =>
+                                {
+                                    try
+                                    {
+                                        t.Wait();
+                                        test(false);
+                                    }
+                                    catch(AggregateException ex)
+                                    {
+                                        cb.ex((Ice.Exception)ex.InnerException);
+                                    }
+                                }).Wait();
+                            test(false);
+                        }
+                        catch(AggregateException)
+                        {
+                        }
+                        cb.check();
 
-                test(r1.getOperation().Equals("op"));
-                test(r2.getOperation().Equals("opWithPayload"));
-            }
+                        p.begin_op().whenCompleted(cb.noOp, cb.ex).whenSent(cb.sent);
+                        cb.check();
 
-            {
-                Ice.AsyncResult r;
+                        p.begin_op().whenCompleted(
+                           () =>
+                            {
+                                cb.noOp();
+                            },
+                           (Ice.Exception ex) =>
+                            {
+                                cb.ex(ex);
+                            }
+                        ).whenSent(
+                           (bool sentSynchronously) =>
+                            {
+                                cb.sent(sentSynchronously);
+                            });
+                        cb.check();
 
-                //
-                // Twoway
-                //
-                r = p.begin_ice_ping();
-                test(r.getOperation().Equals("ice_ping"));
-                test(r.getConnection() == null); // Expected
-                test(r.getCommunicator() == communicator);
-                test(r.getProxy() == p);
-                p.end_ice_ping(r);
-
-                Test.TestIntfPrx p2;
-
-                //
-                // Oneway
-                //
-                p2 = p.ice_oneway() as Test.TestIntfPrx;
-                r = p2.begin_ice_ping();
-                test(r.getOperation().Equals("ice_ping"));
-                test(r.getConnection() == null); // Expected
-                test(r.getCommunicator() == communicator);
-                test(r.getProxy() == p2);
-
-                //
-                // Batch request via proxy
-                //
-                p2 = p.ice_batchOneway() as Test.TestIntfPrx;
-                p2.ice_ping();
-                r = p2.begin_ice_flushBatchRequests();
-                test(r.getConnection() == null); // Expected
-                test(r.getCommunicator() == communicator);
-                test(r.getProxy() == p2);
-                p2.end_ice_flushBatchRequests(r);
+                        p.opAsync(progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            })).Wait();
+                        cb.check();
+                    }
+                }
+                output.WriteLine("ok");
 
-                if(p.ice_getConnection() != null)
+                output.Write("testing batch requests with proxy... ");
+                output.Flush();
                 {
-                    //
-                    // Batch request via connection
-                    //
-                    Ice.Connection con = p.ice_getConnection();
-                    p2 = p.ice_batchOneway() as Test.TestIntfPrx;
-                    p2.ice_ping();
-                    r = con.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    test(r.getConnection() == con);
-                    test(r.getCommunicator() == communicator);
-                    test(r.getProxy() == null); // Expected
-                    con.end_flushBatchRequests(r);
+                    test(p.ice_batchOneway().begin_ice_flushBatchRequests().sentSynchronously());
 
-                    //
-                    // Batch request via communicator
-                    //
-                    p2 = p.ice_batchOneway() as Test.TestIntfPrx;
-                    p2.ice_ping();
-                    r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-                    test(r.getConnection() == null); // Expected
-                    test(r.getCommunicator() == communicator);
-                    test(r.getProxy() == null); // Expected
-                    communicator.end_flushBatchRequests(r);
-                }
-            }
+                    Cookie cookie = new Cookie(5);
 
-            if(p.ice_getConnection() != null)
-            {
-                Ice.AsyncResult r1 = null;
-                Ice.AsyncResult r2 = null;
-                testController.holdAdapter();
-                try
-                {
-                    Ice.AsyncResult r = null;
-                    byte[] seq = new byte[10024];
-                    for(int i = 0; i < 200; ++i) // 2MB
                     {
-                        r = p.begin_opWithPayload(seq);
+                        //
+                        // AsyncResult.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        Ice.AsyncResult r = b1.begin_opBatch();
+                        test(r.IsCompleted);
+                        test(!r.isSent());
+                        b1.opBatch();
+                        FlushCallback cb = new FlushCallback(cookie);
+                        r = b1.begin_ice_flushBatchRequests(cb.completedAsync, cookie);
+                        r.whenSent(cb.sentAsync);
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(2));
                     }
 
-                    test(!r.isSent());
-
-                    r1 = p.begin_ice_ping();
-                    r2 = p.begin_ice_id();
-                    r1.cancel();
-                    r2.cancel();
-                    try
+                    if(p.ice_getConnection() != null)
                     {
-                        p.end_ice_ping(r1);
-                        test(false);
+                        //
+                        // AsyncResult exception.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        FlushCallback cb = new FlushCallback(cookie);
+                        Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(cb.completedAsync, cookie);
+                        r.whenSent(cb.sentAsync);
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(1));
                     }
-                    catch(Ice.InvocationCanceledException)
+
                     {
+                        //
+                        // Type-safe.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.opBatch();
+                        FlushCallback cb = new FlushCallback();
+                        Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
+                        r.whenCompleted(cb.exception);
+                        r.whenSent(cb.sent);
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(2));
                     }
-                    try
+
+                    if(p.ice_getConnection() != null)
                     {
-                        p.end_ice_id(r2);
-                        test(false);
+                        //
+                        // Type-safe exception.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        FlushCallback cb = new FlushCallback();
+                        Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
+                        r.whenCompleted(cb.exception);
+                        r.whenSent(cb.sent);
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(1));
+                    }
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing batch requests with proxy and async tasks... ");
+                output.Flush();
+                {
+                    {
+                        FlushCallback cb = new FlushCallback();
+                        Task t = p.ice_batchOneway().ice_flushBatchRequestsAsync(
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            }));
+                        cb.check();
+                        t.Wait();
                     }
-                    catch(Ice.InvocationCanceledException)
+
                     {
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        var bf = b1.opBatchAsync();
+                        test(bf.IsCompleted);
+                        FlushCallback cb = new FlushCallback();
+                        Task t = b1.ice_flushBatchRequestsAsync(
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.sent(sentSynchronously);
+                            }));
+
+                        cb.check();
+                        t.Wait();
+                        test(p.waitForBatch(2));
                     }
 
+                    if(p.ice_getConnection() != null)
+                    {
+                        test(p.opBatchCount() == 0);
+                        Test.TestIntfPrx b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        FlushCallback cb = new FlushCallback();
+                        Task t = b1.ice_flushBatchRequestsAsync(
+                            progress: new Progress(sentSynchronously =>
+                             {
+                                 cb.sent(sentSynchronously);
+                             }));
+                        cb.check();
+                        t.Wait();
+                        test(p.waitForBatch(1));
+                    }
                 }
-                finally
-                {
-                    testController.resumeAdapter();
-                    p.ice_ping();
-                    test(!r1.isSent() && r1.isCompleted_());
-                    test(!r2.isSent() && r2.isCompleted_());
-                }
+                output.WriteLine("ok");
 
-                testController.holdAdapter();
-                try
+                output.Write("testing batch requests with proxy and lambda... ");
+                output.Flush();
                 {
-                    r1 = p.begin_op();
-                    r2 = p.begin_ice_id();
-                    r1.waitForSent();
-                    r2.waitForSent();
-                    r1.cancel();
-                    r2.cancel();
-                    try
+                    test(p.ice_batchOneway().begin_ice_flushBatchRequests().sentSynchronously());
+
+                    Cookie cookie = new Cookie(5);
+
                     {
-                        p.end_op(r1);
-                        test(false);
+                        //
+                        // AsyncResult.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.opBatch();
+                        FlushCallback cb = new FlushCallback(cookie);
+                        Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
+                           (Ice.AsyncResult result) =>
+                            {
+                                cb.completedAsync(result);
+                            }, cookie);
+                        r.whenSent(
+                           (Ice.AsyncResult result) =>
+                            {
+                                cb.sentAsync(result);
+                            });
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(2));
+
+                        FlushCallback cb2 = new FlushCallback(cookie);
+                        Ice.AsyncResult r2 = b1.begin_ice_flushBatchRequests(
+                           (Ice.AsyncResult result) =>
+                            {
+                                cb2.completedAsync(result);
+                            }, cookie);
+                        r2.whenSent(
+                           (Ice.AsyncResult result) =>
+                            {
+                                cb2.sentAsync(result);
+                            });
+                        cb2.check();
+                        test(r2.isSent());
+                        test(r2.IsCompleted);
                     }
-                    catch(Ice.InvocationCanceledException)
+
+                    if(p.ice_getConnection() != null)
                     {
+                        //
+                        // AsyncResult exception.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        FlushCallback cb = new FlushCallback(cookie);
+                        Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
+                           (Ice.AsyncResult result) =>
+                            {
+                                cb.completedAsync(result);
+                            }, cookie);
+                        r.whenSent(
+                           (Ice.AsyncResult result) =>
+                            {
+                                cb.sentAsync(result);
+                            });
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(1));
                     }
-                    try
+
                     {
-                        p.end_ice_id(r2);
-                        test(false);
+                        //
+                        // Type-safe.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.opBatch();
+                        FlushCallback cb = new FlushCallback();
+                        Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
+                        r.whenCompleted(
+                           (Ice.Exception ex) =>
+                            {
+                                cb.exception(ex);
+                            });
+                        r.whenSent(
+                           (bool sentSynchronously) =>
+                            {
+                                cb.sent(sentSynchronously);
+                            });
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(2));
                     }
-                    catch(Ice.InvocationCanceledException)
+
+                    if(p.ice_getConnection() != null)
                     {
+                        //
+                        // Type-safe exception.
+                        //
+                        test(p.opBatchCount() == 0);
+                        var b1 =(Test.TestIntfPrx)p.ice_batchOneway();
+                        b1.opBatch();
+                        b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        FlushCallback cb = new FlushCallback();
+                        Ice.AsyncResult r = b1.begin_ice_flushBatchRequests();
+                        r.whenCompleted(
+                           (Ice.Exception ex) =>
+                            {
+                                cb.exception(ex);
+                            });
+                        r.whenSent(
+                           (bool sentSynchronously) =>
+                            {
+                                cb.sent(sentSynchronously);
+                            });
+                        cb.check();
+                        test(r.isSent());
+                        test(r.IsCompleted);
+                        test(p.waitForBatch(1));
                     }
                 }
-                finally
+                output.WriteLine("ok");
+
+                if(p.ice_getConnection() != null)
                 {
-                    testController.resumeAdapter();
-                }
-            }
-        }
-        WriteLine("ok");
+                    output.Write("testing batch requests with connection... ");
+                    output.Flush();
+                    {
+                        {
+                            //
+                            // Async task.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                             p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            SentCallback cb = new SentCallback();
+                            Task t = b1.ice_getConnection().flushBatchRequestsAsync(
+                                Ice.CompressBatch.BasedOnProxy,
+                                progress: new Progress(
+                                    sentSyncrhonously =>
+                                    {
+                                        cb.sent(sentSyncrhonously);
+                                    }));
+
+                            cb.check();
+                            t.Wait();
+                            test(t.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
 
-        if(p.ice_getConnection() != null && p.supportsAMD())
-        {
-            Write("testing graceful close connection with wait... ");
-            Flush();
-            {
-                //
-                // Local case: begin a request, close the connection gracefully, and make sure it waits
-                // for the request to complete.
-                //
-                Ice.Connection con = p.ice_getConnection();
-                CallbackBase cb = new CallbackBase();
-                con.setCloseCallback(_ =>
-                    {
-                        cb.called();
-                    });
-                Task t = p.sleepAsync(100);
-                con.close(Ice.ConnectionClose.GracefullyWithWait);
-                t.Wait(); // Should complete successfully.
-                cb.check();
-            }
-            {
-                //
-                // Remote case.
-                //
-                byte[] seq = new byte[1024 * 10];
-
-                //
-                // Send multiple opWithPayload, followed by a close and followed by multiple opWithPaylod.
-                // The goal is to make sure that none of the opWithPayload fail even if the server closes
-                // the connection gracefully in between.
-                //
-                int maxQueue = 2;
-                bool done = false;
-                while(!done && maxQueue < 50)
-                {
-                    done = true;
-                    p.ice_ping();
-                    List<Task> results = new List<Task>();
-                    for(int i = 0; i < maxQueue; ++i)
-                    {
-                        results.Add(p.opWithPayloadAsync(seq));
-                    }
+                        {
+                            //
+                            // Async task exception.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            Task t = b1.ice_getConnection().flushBatchRequestsAsync(
+                                Ice.CompressBatch.BasedOnProxy,
+                                progress: new Progress(
+                                    sentSynchronously =>
+                                    {
+                                        test(false);
+                                    }));
+                            try
+                            {
+                                t.Wait();
+                                test(false);
+                            }
+                            catch(System.AggregateException)
+                            {
+                            }
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        Cookie cookie = new Cookie(5);
+
+                        {
+                            //
+                            // AsyncResult.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                             p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                                cb.completedAsync,
+                                cookie);
+                            r.whenSent(cb.sentAsync);
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushExCallback cb = new FlushExCallback(cookie);
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                                cb.completedAsync,
+                                cookie);
+                            r.whenSent(cb.sentAsync);
+                            cb.check();
+                            test(!r.isSent());
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // Type-safe.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(cb.exception);
+                            r.whenSent(cb.sent);
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
 
-                    ProgresCallback cb = new ProgresCallback();
-                    p.closeAsync(CloseMode.GracefullyWithWait, progress:cb);
+                        {
+                            //
+                            // Type-safe exception.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushExCallback cb = new FlushExCallback();
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(cb.exception);
+                            r.whenSent(cb.sent);
+                            cb.check();
+                            test(!r.isSent());
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+                    }
+                    output.WriteLine("ok");
+                }
 
-                    if(!cb.SentSynchronously)
+                if(p.ice_getConnection() != null)
+                {
+                    output.Write("testing batch requests with connection and lambda... ");
+                    output.Flush();
                     {
-                        for(int i = 0; i < maxQueue; i++)
+                        Cookie cookie = new Cookie(5);
+
                         {
-                            cb = new ProgresCallback();
-                            Task t = p.opWithPayloadAsync(seq, progress:cb);
-                            results.Add(t);
-                            if(cb.SentSynchronously)
-                            {
-                                done = false;
-                                maxQueue *= 2;
-                                break;
-                            }
+                            //
+                            // AsyncResult.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.completedAsync(result);
+                                }, cookie);
+                            r.whenSent(
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.sentAsync(result);
+                                });
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushExCallback cb = new FlushExCallback(cookie);
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.completedAsync(result);
+                                }, cookie);
+                            r.whenSent(
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.sentAsync(result);
+                                });
+                            cb.check();
+                            test(!r.isSent());
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // Type-safe.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb.exception(ex);
+                                });
+                            r.whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb.sent(sentSynchronously);
+                                });
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // Type-safe exception.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushExCallback cb = new FlushExCallback();
+                            Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb.exception(ex);
+                                });
+                            r.whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb.sent(sentSynchronously);
+                                });
+                            cb.check();
+                            test(!r.isSent());
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
                         }
                     }
-                    else
+                    output.WriteLine("ok");
+
+                    output.Write("testing batch requests with communicator... ");
+                    output.Flush();
                     {
-                        maxQueue *= 2;
-                        done = false;
+                        {
+                            //
+                            // Async task - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+
+                            SentCallback cb = new SentCallback();
+                            Task t = communicator.flushBatchRequestsAsync(
+                                Ice.CompressBatch.BasedOnProxy,
+                                progress: new Progress(
+                                    sentSynchronously =>
+                                    {
+                                        cb.sent(sentSynchronously);
+                                    }));
+                            cb.check();
+                            t.Wait();
+                            test(t.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // Async task exception - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            SentCallback cb = new SentCallback();
+                            Task t = communicator.flushBatchRequestsAsync(
+                                Ice.CompressBatch.BasedOnProxy,
+                                progress: new Progress(
+                                    sentSynchronously =>
+                                    {
+                                        cb.sent(sentSynchronously);
+                                    }));
+                            cb.check(); // Exceptions are ignored!
+                            t.Wait();
+                            test(t.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // Async task - 2 connections.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b1.opBatch();
+                            b2.opBatch();
+                            b2.opBatch();
+
+                            SentCallback cb = new SentCallback();
+                            Task t = communicator.flushBatchRequestsAsync(
+                                Ice.CompressBatch.BasedOnProxy,
+                                new Progress(sentSynchronously =>
+                                    {
+                                        cb.sent(sentSynchronously);
+                                    }));
+                            cb.check();
+                            t.Wait();
+                            test(t.IsCompleted);
+                            test(p.waitForBatch(4));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception - 2 connections - 1 failure.
+                            //
+                            // All connections should be flushed even if there are failures on some connections.
+                            // Exceptions should not be reported.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            SentCallback cb = new SentCallback();
+                            Task t = communicator.flushBatchRequestsAsync(
+                                Ice.CompressBatch.BasedOnProxy,
+                                new Progress(
+                                    sentSynchronously =>
+                                    {
+                                        cb.sent(sentSynchronously);
+                                    }));
+                            cb.check(); // Exceptions are ignored!
+                            t.Wait();
+                            test(t.IsCompleted);
+                            test(p.waitForBatch(1));
+                        }
+
+                        {
+                            //
+                            // Async task exception - 2 connections - 2 failures.
+                            //
+                            // The sent callback should be invoked even if all connections fail.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            SentCallback cb = new SentCallback();
+                            Task t = communicator.flushBatchRequestsAsync(
+                                Ice.CompressBatch.BasedOnProxy,
+                                new Progress(
+                                    sentSynchronously =>
+                                    {
+                                        cb.sent(sentSynchronously);
+                                    }));
+                            cb.check(); // Exceptions are ignored!
+                            t.Wait();
+                            test(t.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        Cookie cookie = new Cookie(5);
+
+                        {
+                            //
+                            // AsyncResult - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+                                                                                      cb.completedAsync,
+                                                                                      cookie);
+                            r.whenSent(cb.sentAsync);
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+                                                                                      cb.completedAsync,
+                                                                                      cookie);
+                            r.whenSent(cb.sentAsync);
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // AsyncResult - 2 connections.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b1.opBatch();
+                            b2.opBatch();
+                            b2.opBatch();
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+                                                                                      cb.completedAsync,
+                                                                                      cookie);
+                            r.whenSent(cb.sentAsync);
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(4));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception - 2 connections - 1 failure.
+                            //
+                            // All connections should be flushed even if there are failures on some connections.
+                            // Exceptions should not be reported.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            var cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+                                                                                      cb.completedAsync,
+                                                                                      cookie);
+                            r.whenSent(cb.sentAsync);
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(1));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception - 2 connections - 2 failures.
+                            //
+                            // The sent callback should be invoked even if all connections fail.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+                                                                                      cb.completedAsync,
+                                                                                      cookie);
+                            r.whenSent(cb.sentAsync);
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // Type-safe - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(cb.exception);
+                            r.whenSent(cb.sent);
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // Type-safe exception - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(cb.exception);
+                            r.whenSent(cb.sent);
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // 2 connections.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b1.opBatch();
+                            b2.opBatch();
+                            b2.opBatch();
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(cb.exception);
+                            r.whenSent(cb.sent);
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(4));
+                        }
+
+                        {
+                            //
+                            // Exception - 2 connections - 1 failure.
+                            //
+                            // All connections should be flushed even if there are failures on some connections.
+                            // Exceptions should not be reported.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(cb.exception);
+                            r.whenSent(cb.sent);
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(1));
+                        }
+
+                        {
+                            //
+                            // Exception - 2 connections - 2 failures.
+                            //
+                            // The sent callback should be invoked even if all connections fail.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(cb.exception);
+                            r.whenSent(cb.sent);
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
                     }
-                    foreach(Task q in results)
+                    output.WriteLine("ok");
+
+                    output.Write("testing batch requests with communicator with lambda... ");
+                    output.Flush();
                     {
-                        q.Wait();
+                        Cookie cookie = new Cookie(5);
+
+                        {
+                            //
+                            // AsyncResult - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.completedAsync(result);
+                                }, cookie);
+                            r.whenSent(
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.sentAsync(result);
+                                });
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.completedAsync(result);
+                                }, cookie);
+                            r.whenSent(
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.sentAsync(result);
+                                });
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // AsyncResult - 2 connections.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b1.opBatch();
+                            b2.opBatch();
+                            b2.opBatch();
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.completedAsync(result);
+                                }, cookie);
+                            r.whenSent(
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.sentAsync(result);
+                                });
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(4));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception - 2 connections - 1 failure.
+                            //
+                            // All connections should be flushed even if there are failures on some connections.
+                            // Exceptions should not be reported.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.completedAsync(result);
+                                }, cookie);
+                            r.whenSent(
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.sentAsync(result);
+                                });
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(1));
+                        }
+
+                        {
+                            //
+                            // AsyncResult exception - 2 connections - 2 failures.
+                            //
+                            // The sent callback should be invoked even if all connections fail.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback(cookie);
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                                Ice.CompressBatch.BasedOnProxy,
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.completedAsync(result);
+                                }, cookie);
+                            r.whenSent(
+                               (Ice.AsyncResult result) =>
+                                {
+                                    cb.sentAsync(result);
+                                });
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // Type-safe - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.opBatch();
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb.exception(ex);
+                                });
+                            r.whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb.sent(sentSynchronously);
+                                });
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(2));
+                        }
+
+                        {
+                            //
+                            // Type-safe exception - 1 connection.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                                 p.ice_getIdentity()).ice_batchOneway());
+                            b1.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb.exception(ex);
+                                });
+                            r.whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb.sent(sentSynchronously);
+                                });
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
+
+                        {
+                            //
+                            // 2 connections.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b1.opBatch();
+                            b2.opBatch();
+                            b2.opBatch();
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb.exception(ex);
+                                });
+                            r.whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb.sent(sentSynchronously);
+                                });
+                            cb.check();
+                            test(r.isSent());
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(4));
+                        }
+
+                        {
+                            //
+                            // Exception - 2 connections - 1 failure.
+                            //
+                            // All connections should be flushed even if there are failures on some connections.
+                            // Exceptions should not be reported.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb.exception(ex);
+                                });
+                            r.whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb.sent(sentSynchronously);
+                                });
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.waitForBatch(1));
+                        }
+
+                        {
+                            //
+                            // Exception - 2 connections - 2 failures.
+                            //
+                            // The sent callback should be invoked even if all connections fail.
+                            //
+                            test(p.opBatchCount() == 0);
+                            var b1 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            var b2 = Test.TestIntfPrxHelper.uncheckedCast(
+                                p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                            b2.ice_getConnection(); // Ensure connection is established.
+                            b1.opBatch();
+                            b2.opBatch();
+                            b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            FlushCallback cb = new FlushCallback();
+                            Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            r.whenCompleted(
+                               (Ice.Exception ex) =>
+                                {
+                                    cb.exception(ex);
+                                });
+                            r.whenSent(
+                               (bool sentSynchronously) =>
+                                {
+                                    cb.sent(sentSynchronously);
+                                });
+                            cb.check();
+                            test(r.isSent()); // Exceptions are ignored!
+                            test(r.IsCompleted);
+                            test(p.opBatchCount() == 0);
+                        }
                     }
+                    output.WriteLine("ok");
                 }
-            }
-            WriteLine("ok");
 
-            Write("testing graceful close connection without wait... ");
-            Flush();
-            {
-                //
-                // Local case: start an operation and then close the connection gracefully on the client side
-                // without waiting for the pending invocation to complete. There will be no retry and we expect the
-                // invocation to fail with ConnectionManuallyClosedException.
-                //
-                p = (TestIntfPrx)p.ice_connectionId("CloseGracefully"); // Start with a new connection.
-                Ice.Connection con = p.ice_getConnection();
-                CallbackBase cb = new CallbackBase();
-                Task t = p.startDispatchAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.called();
-                    }));
-                cb.check(); // Ensure the request was sent before we close the connection.
-                con.close(Ice.ConnectionClose.Gracefully);
-                try
+                output.Write("testing async/await... ");
+                output.Flush();
+                Func<Task> task = async() =>
                 {
-                    t.Wait();
-                    test(false);
-                }
-                catch(System.AggregateException ex)
-                {
-                    test(ex.InnerException is Ice.ConnectionManuallyClosedException);
-                    test((ex.InnerException as Ice.ConnectionManuallyClosedException).graceful);
-                }
-                p.finishDispatch();
+                    try
+                    {
+                        await p.opAsync();
 
-                //
-                // Remote case: the server closes the connection gracefully, which means the connection
-                // will not be closed until all pending dispatched requests have completed.
-                //
-                con = p.ice_getConnection();
-                cb = new CallbackBase();
-                con.setCloseCallback(_ =>
-                    {
-                        cb.called();
-                    });
-                t = p.sleepAsync(100);
-                p.close(CloseMode.Gracefully); // Close is delayed until sleep completes.
-                cb.check();
-                t.Wait();
-            }
-            WriteLine("ok");
+                        var r = await p.opWithResultAsync();
+                        test(r == 15);
 
-            Write("testing forceful close connection... ");
-            Flush();
-            {
-                //
-                // Local case: start an operation and then close the connection forcefully on the client side.
-                // There will be no retry and we expect the invocation to fail with ConnectionManuallyClosedException.
-                //
-                p.ice_ping();
-                Ice.Connection con = p.ice_getConnection();
-                CallbackBase cb = new CallbackBase();
-                Task t = p.startDispatchAsync(
-                    progress: new Progress(sentSynchronously =>
-                    {
-                        cb.called();
-                    }));
-                cb.check(); // Ensure the request was sent before we close the connection.
-                con.close(Ice.ConnectionClose.Forcefully);
-                try
-                {
-                    t.Wait();
-                    test(false);
-                }
-                catch(System.AggregateException ex)
-                {
-                    test(ex.InnerException is Ice.ConnectionManuallyClosedException);
-                    test(!(ex.InnerException as Ice.ConnectionManuallyClosedException).graceful);
-                }
-                p.finishDispatch();
+                        try
+                        {
+                            await p.opWithUEAsync();
+                        }
+                        catch(Test.TestIntfException)
+                        {
+                        }
+
+                            // Operations implemented with amd and async.
+                            await p.opAsyncDispatchAsync();
+
+                        r = await p.opWithResultAsyncDispatchAsync();
+                        test(r == 15);
+
+                        try
+                        {
+                            await p.opWithUEAsyncDispatchAsync();
+                            test(false);
+                        }
+                        catch(Test.TestIntfException)
+                        {
+                        }
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                            // Expected with cross testing, this opXxxAsyncDispatch methods are C# only.
+                        }
+                };
+                task().Wait();
+                output.WriteLine("ok");
 
-                //
-                // Remote case: the server closes the connection forcefully. This causes the request to fail
-                // with a ConnectionLostException. Since the close() operation is not idempotent, the client
-                // will not retry.
-                //
-                try
+                if(p.ice_getConnection() != null)
                 {
-                    p.close(CloseMode.Forcefully);
-                    test(false);
+                    output.Write("testing async Task cancellation... ");
+                    output.Flush();
+                    {
+                        var cs1 = new CancellationTokenSource();
+                        var cs2 = new CancellationTokenSource();
+                        var cs3 = new CancellationTokenSource();
+                        Task t1;
+                        Task t2;
+                        Task t3;
+                        try
+                        {
+                            testController.holdAdapter();
+                            ProgresCallback cb = null;
+                            byte[] seq = new byte[10024];
+                            for(int i = 0; i < 200; ++i) // 2MB
+                            {
+                                cb = new ProgresCallback();
+                                p.opWithPayloadAsync(seq, progress: cb);
+                            }
+
+                            test(!cb.Sent);
+
+                            t1 = p.ice_pingAsync(cancel: cs1.Token);
+                            t2 = p.ice_pingAsync(cancel: cs2.Token);
+                            cs3.Cancel();
+                            t3 = p.ice_pingAsync(cancel: cs3.Token);
+                            cs1.Cancel();
+                            cs2.Cancel();
+                            try
+                            {
+                                t1.Wait();
+                                test(false);
+                            }
+                            catch(AggregateException ae)
+                            {
+                                ae.Handle(ex =>
+                                {
+                                    return ex is Ice.InvocationCanceledException;
+                                });
+                            }
+                            try
+                            {
+                                t2.Wait();
+                                test(false);
+                            }
+                            catch(AggregateException ae)
+                            {
+                                ae.Handle(ex =>
+                                {
+                                    return ex is Ice.InvocationCanceledException;
+                                });
+                            }
+
+                            try
+                            {
+                                t3.Wait();
+                                test(false);
+                            }
+                            catch(AggregateException ae)
+                            {
+                                ae.Handle(ex =>
+                                {
+                                    return ex is Ice.InvocationCanceledException;
+                                });
+                            }
+
+                        }
+                        finally
+                        {
+                            testController.resumeAdapter();
+                            p.ice_ping();
+                        }
+                    }
+                    output.WriteLine("ok");
                 }
-                catch(Ice.ConnectionLostException)
+
+                output.Write("testing AsyncResult operations... ");
+                output.Flush();
                 {
-                    // Expected.
+                    {
+                        testController.holdAdapter();
+                        Ice.AsyncResult r1;
+                        Ice.AsyncResult r2;
+                        try
+                        {
+                            r1 = p.begin_op();
+                            byte[] seq = new byte[10024];
+                           (new System.Random()).NextBytes(seq);
+                            while((r2 = p.begin_opWithPayload(seq)).sentSynchronously()) ;
+
+                            if(p.ice_getConnection() != null)
+                            {
+                                test(r1.sentSynchronously() && r1.isSent() && !r1.isCompleted_() ||
+                                     !r1.sentSynchronously() && !r1.isCompleted_());
+
+                                test(!r2.sentSynchronously() && !r2.isCompleted_());
+
+                                test(!r1.IsCompleted && !r1.CompletedSynchronously);
+                                test(!r2.IsCompleted && !r2.CompletedSynchronously);
+                            }
+                        }
+                        finally
+                        {
+                            testController.resumeAdapter();
+                        }
+
+                        WaitHandle w1 = r1.AsyncWaitHandle;
+                        WaitHandle w2 = r2.AsyncWaitHandle;
+
+                        r1.waitForSent();
+                        test(r1.isSent());
+
+                        r2.waitForSent();
+                        test(r2.isSent());
+
+                        r1.waitForCompleted();
+                        test(r1.isCompleted_());
+                        w1.WaitOne();
+
+                        r2.waitForCompleted();
+                        test(r2.isCompleted_());
+                        w2.WaitOne();
+
+                        test(r1.getOperation().Equals("op"));
+                        test(r2.getOperation().Equals("opWithPayload"));
+                    }
+
+                    {
+                        Ice.AsyncResult r;
+
+                        //
+                        // Twoway
+                        //
+                        r = p.begin_ice_ping();
+                        test(r.getOperation().Equals("ice_ping"));
+                        test(r.getConnection() == null); // Expected
+                        test(r.getCommunicator() == communicator);
+                        test(r.getProxy() == p);
+                        p.end_ice_ping(r);
+
+                        Test.TestIntfPrx p2;
+
+                        //
+                        // Oneway
+                        //
+                        p2 = p.ice_oneway() as Test.TestIntfPrx;
+                        r = p2.begin_ice_ping();
+                        test(r.getOperation().Equals("ice_ping"));
+                        test(r.getConnection() == null); // Expected
+                        test(r.getCommunicator() == communicator);
+                        test(r.getProxy() == p2);
+
+                        //
+                        // Batch request via proxy
+                        //
+                        p2 = p.ice_batchOneway() as Test.TestIntfPrx;
+                        p2.ice_ping();
+                        r = p2.begin_ice_flushBatchRequests();
+                        test(r.getConnection() == null); // Expected
+                        test(r.getCommunicator() == communicator);
+                        test(r.getProxy() == p2);
+                        p2.end_ice_flushBatchRequests(r);
+
+                        if(p.ice_getConnection() != null)
+                        {
+                            //
+                            // Batch request via connection
+                            //
+                            Ice.Connection con = p.ice_getConnection();
+                            p2 = p.ice_batchOneway() as Test.TestIntfPrx;
+                            p2.ice_ping();
+                            r = con.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            test(r.getConnection() == con);
+                            test(r.getCommunicator() == communicator);
+                            test(r.getProxy() == null); // Expected
+                            con.end_flushBatchRequests(r);
+
+                            //
+                            // Batch request via communicator
+                            //
+                            p2 = p.ice_batchOneway() as Test.TestIntfPrx;
+                            p2.ice_ping();
+                            r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                            test(r.getConnection() == null); // Expected
+                            test(r.getCommunicator() == communicator);
+                            test(r.getProxy() == null); // Expected
+                            communicator.end_flushBatchRequests(r);
+                        }
+                    }
+
+                    if(p.ice_getConnection() != null)
+                    {
+                        Ice.AsyncResult r1 = null;
+                        Ice.AsyncResult r2 = null;
+                        testController.holdAdapter();
+                        try
+                        {
+                            Ice.AsyncResult r = null;
+                            byte[] seq = new byte[10024];
+                            for(int i = 0; i < 200; ++i) // 2MB
+                            {
+                                r = p.begin_opWithPayload(seq);
+                            }
+
+                            test(!r.isSent());
+
+                            r1 = p.begin_ice_ping();
+                            r2 = p.begin_ice_id();
+                            r1.cancel();
+                            r2.cancel();
+                            try
+                            {
+                                p.end_ice_ping(r1);
+                                test(false);
+                            }
+                            catch(Ice.InvocationCanceledException)
+                            {
+                            }
+                            try
+                            {
+                                p.end_ice_id(r2);
+                                test(false);
+                            }
+                            catch(Ice.InvocationCanceledException)
+                            {
+                            }
+
+                        }
+                        finally
+                        {
+                            testController.resumeAdapter();
+                            p.ice_ping();
+                            test(!r1.isSent() && r1.isCompleted_());
+                            test(!r2.isSent() && r2.isCompleted_());
+                        }
+
+                        testController.holdAdapter();
+                        try
+                        {
+                            r1 = p.begin_op();
+                            r2 = p.begin_ice_id();
+                            r1.waitForSent();
+                            r2.waitForSent();
+                            r1.cancel();
+                            r2.cancel();
+                            try
+                            {
+                                p.end_op(r1);
+                                test(false);
+                            }
+                            catch(Ice.InvocationCanceledException)
+                            {
+                            }
+                            try
+                            {
+                                p.end_ice_id(r2);
+                                test(false);
+                            }
+                            catch(Ice.InvocationCanceledException)
+                            {
+                            }
+                        }
+                        finally
+                        {
+                            testController.resumeAdapter();
+                        }
+                    }
                 }
-            }
-            WriteLine("ok");
-        }
+                output.WriteLine("ok");
 
-        Write("testing ice_scheduler... ");
-        Flush();
-        {
-            p.ice_pingAsync().ContinueWith(
-                (t) =>
+                if(p.ice_getConnection() != null && p.supportsAMD())
                 {
-                    test(Thread.CurrentThread.Name == null ||
-                         !Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
-                }).Wait();
+                    output.Write("testing graceful close connection with wait... ");
+                    output.Flush();
+                    {
+                        //
+                        // Local case: begin a request, close the connection gracefully, and make sure it waits
+                        // for the request to complete.
+                        //
+                        Ice.Connection con = p.ice_getConnection();
+                        CallbackBase cb = new CallbackBase();
+                        con.setCloseCallback(_ =>
+                            {
+                                cb.called();
+                            });
+                        Task t = p.sleepAsync(100);
+                        con.close(Ice.ConnectionClose.GracefullyWithWait);
+                        t.Wait(); // Should complete successfully.
+                        cb.check();
+                    }
+                    {
+                        //
+                        // Remote case.
+                        //
+                        byte[] seq = new byte[1024 * 10];
 
-            p.ice_pingAsync().ContinueWith(
-                (t) =>
-                {
-                    test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
-                }, p.ice_scheduler()).Wait();
+                        //
+                        // Send multiple opWithPayload, followed by a close and followed by multiple opWithPaylod.
+                        // The goal is to make sure that none of the opWithPayload fail even if the server closes
+                        // the connection gracefully in between.
+                        //
+                        int maxQueue = 2;
+                        bool done = false;
+                        while(!done && maxQueue < 50)
+                        {
+                            done = true;
+                            p.ice_ping();
+                            List<Task> results = new List<Task>();
+                            for(int i = 0; i < maxQueue; ++i)
+                            {
+                                results.Add(p.opWithPayloadAsync(seq));
+                            }
 
-            {
-                TaskCompletionSource<int> s1 = new TaskCompletionSource<int>();
-                TaskCompletionSource<int> s2 = new TaskCompletionSource<int>();
-                Task t1 = s1.Task;
-                Task t2 = s2.Task;
-                Task t3 = null;
-                Task t4 = null;
-                p.ice_pingAsync().ContinueWith(
-                    (t) =>
+                            ProgresCallback cb = new ProgresCallback();
+                            p.closeAsync(Test.CloseMode.GracefullyWithWait, progress: cb);
+
+                            if(!cb.SentSynchronously)
+                            {
+                                for(int i = 0; i < maxQueue; i++)
+                                {
+                                    cb = new ProgresCallback();
+                                    Task t = p.opWithPayloadAsync(seq, progress: cb);
+                                    results.Add(t);
+                                    if(cb.SentSynchronously)
+                                    {
+                                        done = false;
+                                        maxQueue *= 2;
+                                        break;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                maxQueue *= 2;
+                                done = false;
+                            }
+                            foreach(Task q in results)
+                            {
+                                q.Wait();
+                            }
+                        }
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("testing graceful close connection without wait... ");
+                    output.Flush();
                     {
-                        test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
                         //
-                        // t1 Continuation run in the thread that completes it.
+                        // Local case: start an operation and then close the connection gracefully on the client side
+                        // without waiting for the pending invocation to complete. There will be no retry and we expect the
+                        // invocation to fail with ConnectionManuallyClosedException.
                         //
-                        var id = Thread.CurrentThread.ManagedThreadId;
-                        t3 = t1.ContinueWith(prev =>
+                        p =(Test.TestIntfPrx)p.ice_connectionId("CloseGracefully"); // Start with a new connection.
+                        Ice.Connection con = p.ice_getConnection();
+                        CallbackBase cb = new CallbackBase();
+                        Task t = p.startDispatchAsync(
+                            progress: new Progress(sentSynchronously =>
                             {
-                                test(id == Thread.CurrentThread.ManagedThreadId);
-                            },
-                            CancellationToken.None,
-                            TaskContinuationOptions.ExecuteSynchronously,
-                            p.ice_scheduler());
-                        s1.SetResult(1);
+                                cb.called();
+                            }));
+                        cb.check(); // Ensure the request was sent before we close the connection.
+                        con.close(Ice.ConnectionClose.Gracefully);
+                        try
+                        {
+                            t.Wait();
+                            test(false);
+                        }
+                        catch(System.AggregateException ex)
+                        {
+                            test(ex.InnerException is Ice.ConnectionManuallyClosedException);
+                            test((ex.InnerException as Ice.ConnectionManuallyClosedException).graceful);
+                        }
+                        p.finishDispatch();
 
                         //
-                        // t2 completed from the main thread
+                        // Remote case: the server closes the connection gracefully, which means the connection
+                        // will not be closed until all pending dispatched requests have completed.
                         //
-                        t4 = t2.ContinueWith(prev =>
+                        con = p.ice_getConnection();
+                        cb = new CallbackBase();
+                        con.setCloseCallback(_ =>
                             {
-                                test(id != Thread.CurrentThread.ManagedThreadId);
-                                test(Thread.CurrentThread.Name == null ||
-                                     !Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
-                            },
-                            CancellationToken.None,
-                            TaskContinuationOptions.ExecuteSynchronously,
-                            p.ice_scheduler());
-                    }, p.ice_scheduler()).Wait();
-                s2.SetResult(1);
-                Task.WaitAll(t1, t2, t3, t4);
-            }
+                                cb.called();
+                            });
+                        t = p.sleepAsync(100);
+                        p.close(Test.CloseMode.Gracefully); // Close is delayed until sleep completes.
+                        cb.check();
+                        t.Wait();
+                    }
+                    output.WriteLine("ok");
 
-            if(!collocated)
-            {
-                Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
-                PingReplyI replyI = new PingReplyI();
-                Test.PingReplyPrx reply = Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI));
-                adapter.activate();
-
-                p.ice_getConnection().setAdapter(adapter);
-                p.pingBiDir(reply.ice_getIdentity());
-                replyI.waitReply(1, 100);
-                adapter.destroy();
-            }
-        }
-        WriteLine("ok");
+                    output.Write("testing forceful close connection... ");
+                    output.Flush();
+                    {
+                        //
+                        // Local case: start an operation and then close the connection forcefully on the client side.
+                        // There will be no retry and we expect the invocation to fail with ConnectionManuallyClosedException.
+                        //
+                        p.ice_ping();
+                        Ice.Connection con = p.ice_getConnection();
+                        CallbackBase cb = new CallbackBase();
+                        Task t = p.startDispatchAsync(
+                            progress: new Progress(sentSynchronously =>
+                            {
+                                cb.called();
+                            }));
+                        cb.check(); // Ensure the request was sent before we close the connection.
+                        con.close(Ice.ConnectionClose.Forcefully);
+                        try
+                        {
+                            t.Wait();
+                            test(false);
+                        }
+                        catch(AggregateException ex)
+                        {
+                            test(ex.InnerException is Ice.ConnectionManuallyClosedException);
+                            test(!(ex.InnerException as Ice.ConnectionManuallyClosedException).graceful);
+                        }
+                        p.finishDispatch();
 
-        Write("testing result struct... ");
-        Flush();
-        {
-            var q = Test.Outer.Inner.TestIntfPrxHelper.uncheckedCast(
-                communicator.stringToProxy("test2:" + app.getTestEndpoint(0)));
-            q.opAsync(1).ContinueWith(t =>
-                {
-                    var r = t.Result;
-                    test(r.returnValue == 1);
-                    test(r.j == 1);
-                }).Wait();
-        }
-        WriteLine("ok");
+                        //
+                        // Remote case: the server closes the connection forcefully. This causes the request to fail
+                        // with a ConnectionLostException. Since the close() operation is not idempotent, the client
+                        // will not retry.
+                        //
+                        try
+                        {
+                            p.close(Test.CloseMode.Forcefully);
+                            test(false);
+                        }
+                        catch(Ice.ConnectionLostException)
+                        {
+                            // Expected.
+                        }
+                    }
+                    output.WriteLine("ok");
+                }
+
+                output.Write("testing ice_scheduler... ");
+                output.Flush();
+                {
+                    p.ice_pingAsync().ContinueWith(
+                       (t) =>
+                        {
+                            test(Thread.CurrentThread.Name == null ||
+                                 !Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
+                        }).Wait();
+
+                    p.ice_pingAsync().ContinueWith(
+                       (t) =>
+                        {
+                            test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
+                        }, p.ice_scheduler()).Wait();
+
+                    {
+                        TaskCompletionSource<int> s1 = new TaskCompletionSource<int>();
+                        TaskCompletionSource<int> s2 = new TaskCompletionSource<int>();
+                        Task t1 = s1.Task;
+                        Task t2 = s2.Task;
+                        Task t3 = null;
+                        Task t4 = null;
+                        p.ice_pingAsync().ContinueWith(
+                           (t) =>
+                            {
+                                test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
+                                    //
+                                    // t1 Continuation run in the thread that completes it.
+                                    //
+                                    var id = Thread.CurrentThread.ManagedThreadId;
+                                t3 = t1.ContinueWith(prev =>
+                                    {
+                                        test(id == Thread.CurrentThread.ManagedThreadId);
+                                    },
+                                    CancellationToken.None,
+                                    TaskContinuationOptions.ExecuteSynchronously,
+                                    p.ice_scheduler());
+                                s1.SetResult(1);
+
+                                    //
+                                    // t2 completed from the main thread
+                                    //
+                                    t4 = t2.ContinueWith(prev =>
+                                                {
+                                                    test(id != Thread.CurrentThread.ManagedThreadId);
+                                                    test(Thread.CurrentThread.Name == null ||
+                                                         !Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Client"));
+                                                },
+                                                CancellationToken.None,
+                                                TaskContinuationOptions.ExecuteSynchronously,
+                                                p.ice_scheduler());
+                            }, p.ice_scheduler()).Wait();
+                        s2.SetResult(1);
+                        Task.WaitAll(t1, t2, t3, t4);
+                    }
+
+                    if(!collocated)
+                    {
+                        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
+                        PingReplyI replyI = new PingReplyI();
+                        var reply = Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI));
+                        adapter.activate();
+
+                        p.ice_getConnection().setAdapter(adapter);
+                        p.pingBiDir(reply);
+                        test(replyI.checkReceived());
+                        adapter.destroy();
+                    }
+                }
+                output.WriteLine("ok");
 
-        p.shutdown();
+                output.Write("testing result struct... ");
+                output.Flush();
+                {
+                    var q = Test.Outer.Inner.TestIntfPrxHelper.uncheckedCast(
+                        communicator.stringToProxy("test2:" + helper.getTestEndpoint(0)));
+                    q.opAsync(1).ContinueWith(t =>
+                        {
+                            var r = t.Result;
+                            test(r.returnValue == 1);
+                            test(r.j == 1);
+                        }).Wait();
+                }
+                output.WriteLine("ok");
+
+                p.shutdown();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/ami/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this, false);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        //
-        // We use a client thread pool with more than one thread to test
-        // that task inlining works.
-        //
-        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "5");
-
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace ami
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.AMICallback", "0");
+                properties.setProperty("Ice.Warn.Connections", "0");
+
+                //
+                // We use a client thread pool with more than one thread to test
+                // that task inlining works.
+                //
+                properties.setProperty("Ice.ThreadPool.Client.Size", "5");
+
+                //
+                // Limit the send buffer size, this test relies on the socket
+                // send() blocking after sending a given amount of data.
+                //
+                properties.setProperty("Ice.TCP.SndSize", "50000");
+                using(var communicator = initialize(properties))
+                {
+                    AllTests.allTests(this, false);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/ami/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,62 +1,53 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.add(new TestII(), Ice.Util.stringToIdentity("test2"));
-        //adapter.activate(); // Collocated test doesn't need to activate the OA
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Collocated test doesn't need to activate the OA
-
-        AllTests.allTests(this, true);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-        //
-        // We use a client thread pool with more than one thread to test
-        // that task inlining works.
-        //
-        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "5");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace ami
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                Ice.Properties properties = createTestProperties(ref args);
+
+                properties.setProperty("Ice.Warn.AMICallback", "0");
+                //
+                // Limit the send buffer size, this test relies on the socket
+                // send() blocking after sending a given amount of data.
+                //
+                properties.setProperty("Ice.TCP.SndSize", "50000");
+                //
+                // We use a client thread pool with more than one thread to test
+                // that task inlining works.
+                //
+                properties.setProperty("Ice.ThreadPool.Client.Size", "5");
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+                    communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+                    adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+                    adapter.add(new TestII(), Ice.Util.stringToIdentity("test2"));
+                    //adapter.activate(); // Collocated test doesn't need to activate the OA
+                    adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+                    //adapter2.activate(); // Collocated test doesn't need to activate the OA
+
+                    AllTests.allTests(this, true);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
     <SliceCompile Include="../../../Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
@@ -21,12 +24,12 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -46,14 +46,14 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -67,15 +67,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.ami</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/ami/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,68 +1,58 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.add(new TestII(), Ice.Util.stringToIdentity("test2"));
-        adapter.activate();
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ServerIdleTime", "30");
-
-        //
-        // Disable collocation optimization to test async/await dispatch.
-        //
-        initData.properties.setProperty("Ice.Default.CollocationOptimized", "0");
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-        //
-        // Limit the recv buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace ami
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                Ice.Properties properties = createTestProperties(ref args);
+
+                //
+                // Disable collocation optimization to test async/await dispatch.
+                //
+                properties.setProperty("Ice.Default.CollocationOptimized", "0");
+
+                //
+                // This test kills connections, so we don't want warnings.
+                //
+                properties.setProperty("Ice.Warn.Connections", "0");
+
+                //
+                // Limit the recv buffer size, this test relies on the socket
+                // send() blocking after sending a given amount of data.
+                //
+                properties.setProperty("Ice.TCP.RcvSize", "50000");
+
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+                    communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+                    adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+                    adapter.add(new TestII(), Ice.Util.stringToIdentity("test2"));
+                    adapter.activate();
+                    adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+                    adapter2.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Identity.ice>
 
+["cs:namespace:Ice.ami"]
 module Test
 {
 
@@ -55,7 +51,7 @@
     ["amd"] void opWithUEAsyncDispatch()
         throws TestIntfException;
 
-    void pingBiDir(Ice::Identity id);
+    void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/ami/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/ami/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/ami/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/ami/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,245 +1,247 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using Test;
 
-public class TestI : TestIntfDisp_
+namespace Ice
 {
-    protected static void test(bool b)
+    namespace ami
     {
-        if(!b)
+        public class TestI : Test.TestIntfDisp_
         {
-            Debug.Assert(false);
-            throw new Exception();
-        }
-    }
-
-    public TestI()
-    {
-    }
-
-    override public void
-    op(Ice.Current current)
-    {
-    }
+            protected static void test(bool b)
+            {
+                if(!b)
+                {
+                    Debug.Assert(false);
+                    throw new System.Exception();
+                }
+            }
 
-    override public int
-    opWithResult(Ice.Current current)
-    {
-        return 15;
-    }
+            public TestI()
+            {
+            }
 
-    override public void
-    opWithUE(Ice.Current current)
-    {
-        throw new TestIntfException();
-    }
+            override public void
+            op(Ice.Current current)
+            {
+            }
 
-    override public void
-    opWithPayload(byte[] seq, Ice.Current current)
-    {
-    }
+            override public int
+            opWithResult(Ice.Current current)
+            {
+                return 15;
+            }
 
-    override public void
-    opBatch(Ice.Current current)
-    {
-        lock(this)
-        {
-            ++_batchCount;
-            System.Threading.Monitor.Pulse(this);
-        }
-    }
+            override public void
+            opWithUE(Ice.Current current)
+            {
+                throw new Test.TestIntfException();
+            }
 
-    override public int
-    opBatchCount(Ice.Current current)
-    {
-        lock(this)
-        {
-            return _batchCount;
-        }
-    }
+            override public void
+            opWithPayload(byte[] seq, Ice.Current current)
+            {
+            }
 
-    override public bool
-    waitForBatch(int count, Ice.Current current)
-    {
-        lock(this)
-        {
-            while(_batchCount < count)
+            override public void
+            opBatch(Ice.Current current)
             {
-                System.Threading.Monitor.Wait(this, 10000);
+                lock(this)
+                {
+                    ++_batchCount;
+                    Monitor.Pulse(this);
+                }
             }
-            bool result = count == _batchCount;
-            _batchCount = 0;
-            return result;
-        }
-    }
 
-    override public void
-    close(CloseMode mode, Ice.Current current)
-    {
-        current.con.close((Ice.ConnectionClose)((int)mode));
-    }
+            override public int
+            opBatchCount(Ice.Current current)
+            {
+                lock(this)
+                {
+                    return _batchCount;
+                }
+            }
 
-    override public void
-    sleep(int ms, Ice.Current current)
-    {
-        Thread.Sleep(ms);
-    }
+            override public bool
+            waitForBatch(int count, Ice.Current current)
+            {
+                lock(this)
+                {
+                    while(_batchCount < count)
+                    {
+                        Monitor.Wait(this, 10000);
+                    }
+                    bool result = count == _batchCount;
+                    _batchCount = 0;
+                    return result;
+                }
+            }
 
-    override public void
-    shutdown(Ice.Current current)
-    {
-        lock(this)
-        {
-            _shutdown = true;
-            if(_pending != null)
+            override public void
+            close(Test.CloseMode mode, Ice.Current current)
             {
-                _pending.SetResult(null);
-                _pending  = null;
+                current.con.close((Ice.ConnectionClose)((int)mode));
             }
-            current.adapter.getCommunicator().shutdown();
-        }
-    }
 
-    override public bool
-    supportsAMD(Ice.Current current)
-    {
-        return true;
-    }
+            override public void
+            sleep(int ms, Ice.Current current)
+            {
+                Thread.Sleep(ms);
+            }
 
-    override public bool
-    supportsFunctionalTests(Ice.Current current)
-    {
-        return false;
-    }
+            override public void
+            shutdown(Ice.Current current)
+            {
+                lock(this)
+                {
+                    _shutdown = true;
+                    if(_pending != null)
+                    {
+                        _pending.SetResult(null);
+                        _pending = null;
+                    }
+                    current.adapter.getCommunicator().shutdown();
+                }
+            }
 
-    override public async Task
-    opAsyncDispatchAsync(Ice.Current current)
-    {
-        await System.Threading.Tasks.Task.Delay(10);
-    }
+            override public bool
+            supportsAMD(Ice.Current current)
+            {
+                return true;
+            }
 
-    override public async Task<int>
-    opWithResultAsyncDispatchAsync(Ice.Current current)
-    {
-        await System.Threading.Tasks.Task.Delay(10);
-        test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
-        var r = await self(current).opWithResultAsync();
-        test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
-        return r;
-    }
+            override public bool
+            supportsFunctionalTests(Ice.Current current)
+            {
+                return false;
+            }
 
-    override public async Task
-    opWithUEAsyncDispatchAsync(Ice.Current current)
-    {
-        test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
-        await System.Threading.Tasks.Task.Delay(10);
-        test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
-        await self(current).opWithUEAsync();
-    }
+            override public async Task
+            opAsyncDispatchAsync(Ice.Current current)
+            {
+                await Task.Delay(10);
+            }
 
-    override public void
-    pingBiDir(Ice.Identity id, Ice.Current current)
-    {
-        PingReplyPrx p = PingReplyPrxHelper.uncheckedCast(current.con.createProxy(id));
-        p.replyAsync().ContinueWith(
-            (t) =>
+            override public async Task<int>
+            opWithResultAsyncDispatchAsync(Ice.Current current)
             {
+                await Task.Delay(10);
                 test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
-            },
-            p.ice_scheduler()).Wait();
-    }
+                var r = await self(current).opWithResultAsync();
+                test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
+                return r;
+            }
 
-    TestIntfPrx
-    self(Ice.Current current)
-    {
-        return TestIntfPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
-    }
+            override public async Task
+            opWithUEAsyncDispatchAsync(Ice.Current current)
+            {
+                test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
+                await Task.Delay(10);
+                test(Thread.CurrentThread.Name.Contains("Ice.ThreadPool.Server"));
+                await self(current).opWithUEAsync();
+            }
 
-    override public Task
-    startDispatchAsync(Ice.Current current)
-    {
-        lock(this)
-        {
-            if(_shutdown)
+            override public void
+            pingBiDir(Test.PingReplyPrx reply, Ice.Current current)
             {
-                // Ignore, this can occur with the forcefull connection close test, shutdown can be dispatch
-                // before start dispatch.
-                var v = new TaskCompletionSource<object>();
-                v.SetResult(null);
-                return v.Task;
+                reply = Test.PingReplyPrxHelper.uncheckedCast(reply.ice_fixed(current.con));
+                Thread dispatchThread = Thread.CurrentThread;
+                reply.replyAsync().ContinueWith(
+                   (t) =>
+                    {
+                        Thread callbackThread = Thread.CurrentThread;
+                        test(dispatchThread != callbackThread);
+                        test(callbackThread.Name.Contains("Ice.ThreadPool.Server"));
+                    },
+                    reply.ice_scheduler()).Wait();
             }
-            else if(_pending != null)
+
+            Test.TestIntfPrx
+            self(Ice.Current current)
             {
-                _pending.SetResult(null);
+                return Test.TestIntfPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
             }
-            _pending = new TaskCompletionSource<object>();
-            return _pending.Task;
-        }
-    }
 
-    override public void
-    finishDispatch(Ice.Current current)
-    {
-        lock(this)
-        {
-            if(_shutdown)
+            override public Task
+            startDispatchAsync(Ice.Current current)
             {
-                return;
+                lock(this)
+                {
+                    if(_shutdown)
+                    {
+                        // Ignore, this can occur with the forcefull connection close test, shutdown can be dispatch
+                        // before start dispatch.
+                        var v = new TaskCompletionSource<object>();
+                        v.SetResult(null);
+                        return v.Task;
+                    }
+                    else if(_pending != null)
+                    {
+                        _pending.SetResult(null);
+                    }
+                    _pending = new TaskCompletionSource<object>();
+                    return _pending.Task;
+                }
             }
-            else if(_pending != null) // Pending might not be set yet if startDispatch is dispatch out-of-order
+
+            override public void
+            finishDispatch(Ice.Current current)
             {
-                _pending.SetResult(null);
-                _pending  = null;
+                lock(this)
+                {
+                    if(_shutdown)
+                    {
+                        return;
+                    }
+                    else if(_pending != null) // Pending might not be set yet if startDispatch is dispatch out-of-order
+                    {
+                        _pending.SetResult(null);
+                        _pending = null;
+                    }
+                }
             }
+
+            private int _batchCount;
+            private bool _shutdown;
+            private TaskCompletionSource<object> _pending = null;
         }
-    }
 
-    private int _batchCount;
-    private bool _shutdown;
-    private TaskCompletionSource<object> _pending = null;
-}
+        public class TestII : Test.Outer.Inner.TestIntfDisp_
+        {
+            override public int
+            op(int i, out int j, Ice.Current current)
+            {
+                j = i;
+                return i;
+            }
+        }
 
-public class TestII : Test.Outer.Inner.TestIntfDisp_
-{
-    override public int
-    op(int i, out int j, Ice.Current current)
-    {
-        j = i;
-        return i;
-    }
-}
+        public class TestControllerI : Test.TestIntfControllerDisp_
+        {
+            override public void
+            holdAdapter(Ice.Current current)
+            {
+                _adapter.hold();
+            }
 
-public class TestControllerI : TestIntfControllerDisp_
-{
-    override public void
-    holdAdapter(Ice.Current current)
-    {
-        _adapter.hold();
-    }
+            override public void
+            resumeAdapter(Ice.Current current)
+            {
+                _adapter.activate();
+            }
 
-    override public void
-    resumeAdapter(Ice.Current current)
-    {
-        _adapter.activate();
-    }
+            public
+            TestControllerI(Ice.ObjectAdapter adapter)
+            {
+                _adapter = adapter;
+            }
 
-    public
-    TestControllerI(Ice.ObjectAdapter adapter)
-    {
-        _adapter = adapter;
+            private Ice.ObjectAdapter _adapter;
+        }
     }
-
-    private Ice.ObjectAdapter _adapter;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/application/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/application/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/application/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/application/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/application/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/application/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/application/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/application/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,44 +17,43 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/application/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/application/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/application/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/application/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/application/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -4,13 +4,13 @@
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs"/>
     <Compile Include="../../../Client.cs"/>
   </ItemGroup>
   <ItemGroup>
@@ -19,7 +19,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/application/test.py zeroc-ice-3.7.2/csharp/test/Ice/application/test.py
--- zeroc-ice-3.7.1/csharp/test/Ice/application/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/application/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Run this test manually
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/assemblies/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Linq;
@@ -19,50 +14,41 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : Test.TestHelper
 {
-    public static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    public static int Main(string[] args)
+    public override void run(string[] args)
     {
-        int status = 0;
-        try
+        Console.Out.Write("testing preloading assemblies... ");
+        Console.Out.Flush();
+        User.UserInfo info = new User.UserInfo();
+
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.PreloadAssemblies", "0");
+
+        string assembly =
+            String.Format("{0}/core.dll",
+                          Path.GetFileName(Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase)));
+        using(var communicator = initialize(properties))
         {
-            Console.Out.Write("testing preloading assemblies... ");
-            Console.Out.Flush();
-            User.UserInfo info = new User.UserInfo();
-            Ice.InitializationData id = new Ice.InitializationData();
-            id.properties = Ice.Util.createProperties();
-            id.properties.setProperty("Ice.PreloadAssemblies", "0");
-
-            string assembly =
-                String.Format("{0}/core.dll",
-                              Path.GetFileName(Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase)));
-            Ice.Communicator ic = Ice.Util.initialize(id);
             test(AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault((e) =>
                     {
                         return e.CodeBase.EndsWith(assembly, StringComparison.InvariantCultureIgnoreCase);
                     }) == null);
-            ic.destroy();
-            id.properties.setProperty("Ice.PreloadAssemblies", "1");
-            ic = Ice.Util.initialize(id);
+        }
+        properties.setProperty("Ice.PreloadAssemblies", "1");
+        using(var communicator = initialize(properties))
+        {
             test(AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault((e) =>
                     {
                         return e.CodeBase.EndsWith(assembly, StringComparison.InvariantCultureIgnoreCase);
                     }) != null);
-            Console.Out.WriteLine("ok");
-        }
-        catch(Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
         }
-        return status;
+
+        Console.Out.WriteLine("ok");
+    }
+
+    public static int Main(string[] args)
+    {
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,33 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\user\net45\user.csproj">
@@ -48,15 +51,15 @@
       <Name>user</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -4,12 +4,13 @@
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs"/>
     <Compile Include="../../../Client.cs"/>
   </ItemGroup>
   <ItemGroup>
@@ -21,7 +22,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/core/net45/core.csproj zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/core/net45/core.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/core/net45/core.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/core/net45/core.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,39 +17,38 @@
     <AssemblyName>Core</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>..\..</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <SliceCompile Include="..\..\..\Core.ice"/>
-    <None Include="packages.config"/>
+    <SliceCompile Include="..\..\..\Core.ice" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="generated\Core.cs"/>
+    <Compile Include="generated\Core.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/core/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/core/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/core/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/core/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/core/netstandard2.0/core.csproj zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/core/netstandard2.0/core.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/core/netstandard2.0/core.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/core/netstandard2.0/core.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>core</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -10,20 +10,25 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
   </ItemGroup>
   <ItemGroup>
-    <SliceCompile Include="../../../Core.ice"/>
+    <SliceCompile Include="../../../Core.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="generated\Core.cs">
+      <SliceCompileSource>../../../Core.ice</SliceCompileSource>
+    </Compile>
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/user/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/user/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/user/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/user/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/user/net45/user.csproj zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/user/net45/user.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/user/net45/user.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/user/net45/user.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,29 +17,28 @@
     <AssemblyName>User</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>..\..</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <SliceCompile Include="..\..\..\User.ice"/>
+    <None Include="packages.config" />
+    <SliceCompile Include="..\..\..\User.ice" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="generated\User.cs"/>
+    <Compile Include="generated\User.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\net45\core.csproj">
@@ -46,8 +46,8 @@
       <Name>core</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <IncludeDirectories>..\..\..</IncludeDirectories>
@@ -57,9 +57,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/assemblies/msbuild/user/netstandard2.0/user.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>user</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -14,23 +14,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
   </ItemGroup>
   <ItemGroup>
-    <SliceCompile Include="../../../User.ice"/>
+    <SliceCompile Include="../../../User.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../core/netstandard2.0/core.csproj"/>
+    <ProjectReference Include="../../core/netstandard2.0/core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="generated\User.cs">
+      <SliceCompileSource>../../../User.ice</SliceCompileSource>
+    </Compile>
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/Acceptor.cs zeroc-ice-3.7.2/csharp/test/Ice/background/Acceptor.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/Acceptor.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/Acceptor.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 internal class Acceptor : IceInternal.Acceptor
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/background/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
@@ -193,16 +188,16 @@
         private Thread _thread;
     }
 
-    public static Test.BackgroundPrx allTests(TestCommon.Application app)
+    public static Test.BackgroundPrx allTests(Test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        string sref = "background:" + app.getTestEndpoint(0);
+        Ice.Communicator communicator = helper.communicator();
+        string sref = "background:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         BackgroundPrx background = BackgroundPrxHelper.uncheckedCast(obj);
 
-        sref = "backgroundController:" + app.getTestEndpoint(1, "tcp");
+        sref = "backgroundController:" + helper.getTestEndpoint(1, "tcp");
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -242,7 +237,7 @@
         Console.Out.Flush();
         {
             Ice.LocatorPrx locator;
-            obj = communicator.stringToProxy("locator:" + app.getTestEndpoint(0)).ice_invocationTimeout(250);
+            obj = communicator.stringToProxy("locator:" + helper.getTestEndpoint(0)).ice_invocationTimeout(250);
             locator = Ice.LocatorPrxHelper.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_locator(locator).ice_oneway();
 
@@ -257,7 +252,7 @@
             }
             backgroundController.resumeCall("findAdapterById");
 
-            obj = communicator.stringToProxy("locator:" + app.getTestEndpoint(0));
+            obj = communicator.stringToProxy("locator:" + helper.getTestEndpoint(0));
             locator = Ice.LocatorPrxHelper.uncheckedCast(obj);
             obj = obj.ice_locator(locator);
             obj.ice_ping();
@@ -283,7 +278,7 @@
         {
             Ice.RouterPrx router;
 
-            obj = communicator.stringToProxy("router:" + app.getTestEndpoint(0)).ice_invocationTimeout(250);
+            obj = communicator.stringToProxy("router:" + helper.getTestEndpoint(0)).ice_invocationTimeout(250);
             router = Ice.RouterPrxHelper.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_router(router).ice_oneway();
 
@@ -298,7 +293,7 @@
             }
             backgroundController.resumeCall("getClientProxy");
 
-            obj = communicator.stringToProxy("router:" + app.getTestEndpoint(0));
+            obj = communicator.stringToProxy("router:" + helper.getTestEndpoint(0));
             router = Ice.RouterPrxHelper.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_router(router);
             BackgroundPrx bg = BackgroundPrxHelper.uncheckedCast(obj);
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/BackgroundControllerI.cs zeroc-ice-3.7.2/csharp/test/Ice/background/BackgroundControllerI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/BackgroundControllerI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/BackgroundControllerI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/BackgroundI.cs zeroc-ice-3.7.2/csharp/test/Ice/background/BackgroundI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/BackgroundI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/BackgroundI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/background/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,46 +11,44 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        PluginI plugin = new PluginI(communicator());
-        plugin.initialize();
-        communicator().getPluginManager().addPlugin("Test", plugin);
-        Test.BackgroundPrx background = AllTests.allTests(this);
-        background.shutdown();
-        return 0;
-    }
+        Ice.Properties properties = createTestProperties(ref args);
 
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
         //
         // For this test, we want to disable retries.
         //
-        initData.properties.setProperty("Ice.RetryIntervals", "-1");
+        properties.setProperty("Ice.RetryIntervals", "-1");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+        properties.setProperty("Ice.TCP.SndSize", "50000");
 
         //
         // Setup the test transport plug-in.
         //
-        string defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-        return initData;
+        properties.setProperty("Ice.Default.Protocol",
+                               "test-" + properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp"));
+
+        using(var communicator = initialize(properties))
+        {
+            PluginI plugin = new PluginI(communicator);
+            plugin.initialize();
+            communicator.getPluginManager().addPlugin("Test", plugin);
+            Test.BackgroundPrx background = AllTests.allTests(this);
+            background.shutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/Configuration.cs zeroc-ice-3.7.2/csharp/test/Ice/background/Configuration.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/Configuration.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/Configuration.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 internal class Configuration
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/Connector.cs zeroc-ice-3.7.2/csharp/test/Ice/background/Connector.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/Connector.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/Connector.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 internal class Connector : IceInternal.Connector
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/EndpointFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/background/EndpointFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/EndpointFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/EndpointFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/EndpointI.cs zeroc-ice-3.7.2/csharp/test/Ice/background/EndpointI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/EndpointI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/EndpointI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Acceptor.cs">
       <Link>Acceptor.cs</Link>
@@ -64,24 +64,24 @@
     <Compile Include="..\..\..\Transceiver.cs">
       <Link>Transceiver.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../Acceptor.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../Configuration.cs"/>
-    <Compile Include="../../../Connector.cs"/>
-    <Compile Include="../../../EndpointFactory.cs"/>
-    <Compile Include="../../../EndpointI.cs"/>
-    <Compile Include="../../../PluginI.cs"/>
-    <Compile Include="../../../Transceiver.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Acceptor.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Configuration.cs" />
+    <Compile Include="../../../Connector.cs" />
+    <Compile Include="../../../EndpointFactory.cs" />
+    <Compile Include="../../../EndpointI.cs" />
+    <Compile Include="../../../PluginI.cs" />
+    <Compile Include="../../../Transceiver.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Acceptor.cs">
       <Link>Acceptor.cs</Link>
@@ -67,24 +67,24 @@
     <Compile Include="..\..\..\Transceiver.cs">
       <Link>Transceiver.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../Acceptor.cs"/>
-    <Compile Include="../../../BackgroundControllerI.cs"/>
-    <Compile Include="../../../BackgroundI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <Compile Include="../../../Configuration.cs"/>
-    <Compile Include="../../../Connector.cs"/>
-    <Compile Include="../../../EndpointFactory.cs"/>
-    <Compile Include="../../../EndpointI.cs"/>
-    <Compile Include="../../../PluginI.cs"/>
-    <Compile Include="../../../Transceiver.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Acceptor.cs" />
+    <Compile Include="../../../BackgroundControllerI.cs" />
+    <Compile Include="../../../BackgroundI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../Configuration.cs" />
+    <Compile Include="../../../Connector.cs" />
+    <Compile Include="../../../EndpointFactory.cs" />
+    <Compile Include="../../../EndpointI.cs" />
+    <Compile Include="../../../PluginI.cs" />
+    <Compile Include="../../../Transceiver.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/PluginI.cs zeroc-ice-3.7.2/csharp/test/Ice/background/PluginI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/PluginI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/PluginI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 internal class PluginI : Ice.Plugin
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/background/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.IO;
@@ -18,7 +13,7 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
     internal class LocatorI : Ice.LocatorDisp_
     {
@@ -78,70 +73,67 @@
         private BackgroundControllerI _controller;
     }
 
-    public override int run(string[] args)
-    {
-        PluginI plugin = new PluginI(communicator());
-        plugin.initialize();
-        communicator().getPluginManager().addPlugin("Test", plugin);
-
-        //
-        // When running as a MIDlet the properties for the server may be
-        // overridden by configuration. If it isn't then we assume
-        // defaults.
-        //
-        if(communicator().getProperties().getProperty("TestAdapter.Endpoints").Length == 0)
-        {
-            communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        }
-        if(communicator().getProperties().getProperty("ControllerAdapter.Endpoints").Length == 0)
-        {
-            communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
-            communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
-        }
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        BackgroundControllerI backgroundController = new BackgroundControllerI(adapter);
-
-        adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background"));
-        adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator"));
-        adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router"));
-        adapter.activate();
-
-        adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController"));
-        adapter2.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
+    public override void run(string[] args)
     {
-        Ice.InitializationData initData = base.getInitData(ref args);
-
+        var properties = createTestProperties(ref args);
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
 
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
         //
         // Setup the test transport plug-in.
         //
-        string defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-        return initData;
+        properties.setProperty("Ice.Default.Protocol",
+                               "test-" + properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp"));
+
+        using(var communicator = initialize(properties))
+        {
+            PluginI plugin = new PluginI(communicator);
+            plugin.initialize();
+            communicator.getPluginManager().addPlugin("Test", plugin);
+
+            //
+            // When running as a MIDlet the properties for the server may be
+            // overridden by configuration. If it isn't then we assume
+            // defaults.
+            //
+            if(communicator.getProperties().getProperty("TestAdapter.Endpoints").Length == 0)
+            {
+                communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            }
+
+            if(communicator.getProperties().getProperty("ControllerAdapter.Endpoints").Length == 0)
+            {
+                communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+                communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+            }
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+            BackgroundControllerI backgroundController = new BackgroundControllerI(adapter);
+
+            adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background"));
+            adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator"));
+            adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router"));
+            adapter.activate();
+
+            adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController"));
+            adapter2.activate();
+
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/background/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/background/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/background/Transceiver.cs zeroc-ice-3.7.2/csharp/test/Ice/background/Transceiver.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/background/Transceiver.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/background/Transceiver.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/binding/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,951 +1,952 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    private static string getAdapterNameWithAMI(TestIntfPrx testIntf)
+    namespace binding
     {
-        object m = new object();
-        string result = null;
-        testIntf.begin_getAdapterName().whenCompleted(
-            (string name) =>
+        public class AllTests : global::Test.AllTests
+        {
+            private static string getAdapterNameWithAMI(Test.TestIntfPrx testIntf)
             {
+                object m = new object();
+                string result = null;
+                testIntf.begin_getAdapterName().whenCompleted(
+                   (string name) =>
+                    {
+                        lock(m)
+                        {
+                            result = name;
+                            System.Threading.Monitor.Pulse(m);
+                        }
+                    },
+                   (Ice.Exception ex) =>
+                    {
+                        test(false);
+                    });
                 lock(m)
                 {
-                    result = name;
-                    System.Threading.Monitor.Pulse(m);
+                    while(result == null)
+                    {
+                        System.Threading.Monitor.Wait(m);
+                    }
+                    return result;
                 }
-            },
-            (Ice.Exception ex) =>
-            {
-                test(false);
-            });
-        lock(m)
-        {
-            while(result == null)
-            {
-                System.Threading.Monitor.Wait(m);
-            }
-            return result;
-        }
-    }
-
-    private static void shuffle(ref List<RemoteObjectAdapterPrx> array)
-    {
-        for (int i = 0; i < array.Count - 1; ++i)
-        {
-            int r = _rand.Next(array.Count - i) + i;
-            Debug.Assert(r >= i && r < array.Count);
-            if (r != i)
-            {
-                RemoteObjectAdapterPrx tmp = array[i];
-                array[i] = array[r];
-                array[r] = tmp;
             }
-        }
-    }
 
-    private static TestIntfPrx createTestIntfPrx(List<RemoteObjectAdapterPrx> adapters)
-    {
-        List<Ice.Endpoint> endpoints = new List<Ice.Endpoint>();
-        TestIntfPrx obj = null;
-        IEnumerator<RemoteObjectAdapterPrx> p = adapters.GetEnumerator();
-        while(p.MoveNext())
-        {
-            obj = p.Current.getTestIntf();
-            foreach(Ice.Endpoint e in obj.ice_getEndpoints())
-            {
-                endpoints.Add(e);
-            }
-        }
-        return TestIntfPrxHelper.uncheckedCast(obj.ice_endpoints(endpoints.ToArray()));
-    }
-
-    private static void deactivate(RemoteCommunicatorPrx communicator, List<RemoteObjectAdapterPrx> adapters)
-    {
-        IEnumerator<RemoteObjectAdapterPrx> p = adapters.GetEnumerator();
-        while (p.MoveNext())
-        {
-            communicator.deactivateObjectAdapter(p.Current);
-        }
-    }
-
-    private class StringComparator : IComparer<String>
-    {
-        public int Compare(String l, String r)
-        {
-            return l.CompareTo(r);
-        }
-    };
-
-    public static void allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        string @ref = "communicator:" + app.getTestEndpoint(0);
-        RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(@ref));
-
-        System.Random rand = new System.Random(unchecked((int)System.DateTime.Now.Ticks));
-
-        Write("testing binding with single endpoint... ");
-        Flush();
-        {
-            RemoteObjectAdapterPrx adapter = com.createObjectAdapter("Adapter", "default");
-
-            TestIntfPrx test1 = adapter.getTestIntf();
-            TestIntfPrx test2 = adapter.getTestIntf();
-            test(test1.ice_getConnection() == test2.ice_getConnection());
-
-            test1.ice_ping();
-            test2.ice_ping();
-
-            com.deactivateObjectAdapter(adapter);
-
-            TestIntfPrx test3 = TestIntfPrxHelper.uncheckedCast(test1);
-            test(test3.ice_getConnection() == test1.ice_getConnection());
-            test(test3.ice_getConnection() == test2.ice_getConnection());
-
-            try
-            {
-                test3.ice_ping();
-                test(false);
-            }
-            catch(Ice.ConnectFailedException)
-            {
-            }
-            catch(Ice.ConnectTimeoutException)
+            private static void shuffle(ref List<Test.RemoteObjectAdapterPrx> array)
             {
+                for(int i = 0; i < array.Count - 1; ++i)
+                {
+                    int r = _rand.Next(array.Count - i) + i;
+                    Debug.Assert(r >= i && r < array.Count);
+                    if(r != i)
+                    {
+                        var tmp = array[i];
+                        array[i] = array[r];
+                        array[r] = tmp;
+                    }
+                }
             }
-        }
-        WriteLine("ok");
 
-        Write("testing binding with multiple endpoints... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("Adapter11", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter12", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter13", "default"));
-
-            //
-            // Ensure that when a connection is opened it's reused for new
-            // proxies and that all endpoints are eventually tried.
-            //
-            List<string> names = new List<string>();
-            names.Add("Adapter11");
-            names.Add("Adapter12");
-            names.Add("Adapter13");
-            while(names.Count > 0)
+            private static Test.TestIntfPrx createTestIntfPrx(List<Test.RemoteObjectAdapterPrx> adapters)
             {
-                List<RemoteObjectAdapterPrx> adpts = new List<RemoteObjectAdapterPrx>(adapters);
-
-                TestIntfPrx test1 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test2 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test3 = createTestIntfPrx(adpts);
-                test1.ice_ping();
-                test(test1.ice_getConnection() == test2.ice_getConnection());
-                test(test2.ice_getConnection() == test3.ice_getConnection());
-
-                names.Remove(test1.getAdapterName());
-                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                List<Ice.Endpoint> endpoints = new List<Ice.Endpoint>();
+                Test.TestIntfPrx obj = null;
+                IEnumerator<Test.RemoteObjectAdapterPrx> p = adapters.GetEnumerator();
+                while(p.MoveNext())
+                {
+                    obj = p.Current.getTestIntf();
+                    foreach(Ice.Endpoint e in obj.ice_getEndpoints())
+                    {
+                        endpoints.Add(e);
+                    }
+                }
+                return Test.TestIntfPrxHelper.uncheckedCast(obj.ice_endpoints(endpoints.ToArray()));
             }
 
-            //
-            // Ensure that the proxy correctly caches the connection (we
-            // always send the request over the same connection.)
-            //
+            private static void deactivate(Test.RemoteCommunicatorPrx communicator, List<Test.RemoteObjectAdapterPrx> adapters)
             {
-                foreach(RemoteObjectAdapterPrx adpt in adapters)
+                IEnumerator<Test.RemoteObjectAdapterPrx> p = adapters.GetEnumerator();
+                while(p.MoveNext())
                 {
-                    adpt.getTestIntf().ice_ping();
+                    communicator.deactivateObjectAdapter(p.Current);
                 }
+            }
 
-                TestIntfPrx t = createTestIntfPrx(adapters);
-                string name = t.getAdapterName();
-                int nRetry = 10;
-                int i;
-                for(i = 0; i < nRetry && t.getAdapterName().Equals(name); i++);
-                test(i == nRetry);
-
-                foreach(RemoteObjectAdapterPrx adpt in adapters)
+            private class StringComparator : IComparer<String>
+            {
+                public int Compare(String l, String r)
                 {
-                    adpt.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    return l.CompareTo(r);
                 }
-            }
+            };
 
-            //
-            // Deactivate an adapter and ensure that we can still
-            // establish the connection to the remaining adapters.
-            //
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
-            names.Add("Adapter12");
-            names.Add("Adapter13");
-            while(names.Count > 0)
+            public static void allTests(global::Test.TestHelper helper)
             {
-                List<RemoteObjectAdapterPrx> adpts = new List<RemoteObjectAdapterPrx>(adapters);
+                Ice.Communicator communicator = helper.communicator();
+                string @ref = "communicator:" + helper.getTestEndpoint(0);
+                Test.RemoteCommunicatorPrx com = Test.RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(@ref));
 
-                TestIntfPrx test1 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test2 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test3 = createTestIntfPrx(adpts);
+                var rand = new Random(unchecked((int)DateTime.Now.Ticks));
+                var output = helper.getWriter();
 
-                test(test1.ice_getConnection() == test2.ice_getConnection());
-                test(test2.ice_getConnection() == test3.ice_getConnection());
+                output.Write("testing binding with single endpoint... ");
+                output.Flush();
+                {
+                    Test.RemoteObjectAdapterPrx adapter = com.createObjectAdapter("Adapter", "default");
 
-                names.Remove(test1.getAdapterName());
-                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            }
+                    var test1 = adapter.getTestIntf();
+                    var test2 = adapter.getTestIntf();
+                    test(test1.ice_getConnection() == test2.ice_getConnection());
 
-            //
-            // Deactivate an adapter and ensure that we can still
-            // establish the connection to the remaining adapter.
-            //
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]);
-            TestIntfPrx obj = createTestIntfPrx(adapters);
-            test(obj.getAdapterName().Equals("Adapter12"));
+                    test1.ice_ping();
+                    test2.ice_ping();
 
-            deactivate(com, adapters);
-        }
-        WriteLine("ok");
+                    com.deactivateObjectAdapter(adapter);
 
-        Write("testing binding with multiple random endpoints... ");
-        Flush();
-        {
-            RemoteObjectAdapterPrx[] adapters = new RemoteObjectAdapterPrx[5];
-            adapters[0] = com.createObjectAdapter("AdapterRandom11", "default");
-            adapters[1] = com.createObjectAdapter("AdapterRandom12", "default");
-            adapters[2] = com.createObjectAdapter("AdapterRandom13", "default");
-            adapters[3] = com.createObjectAdapter("AdapterRandom14", "default");
-            adapters[4] = com.createObjectAdapter("AdapterRandom15", "default");
-
-            int count = 20;
-            int adapterCount = adapters.Length;
-            while(--count > 0)
-            {
-                TestIntfPrx[] proxies;
-                if(count == 1)
-                {
-                    com.deactivateObjectAdapter(adapters[4]);
-                    --adapterCount;
-                }
-                proxies = new TestIntfPrx[10];
+                    var test3 = Test.TestIntfPrxHelper.uncheckedCast(test1);
+                    test(test3.ice_getConnection() == test1.ice_getConnection());
+                    test(test3.ice_getConnection() == test2.ice_getConnection());
 
-                int i;
-                for(i = 0; i < proxies.Length; ++i)
-                {
-                    RemoteObjectAdapterPrx[] adpts = new RemoteObjectAdapterPrx[rand.Next(adapters.Length)];
-                    if(adpts.Length == 0)
+                    try
+                    {
+                        test3.ice_ping();
+                        test(false);
+                    }
+                    catch(Ice.ConnectFailedException)
                     {
-                        adpts = new RemoteObjectAdapterPrx[1];
                     }
-                    for(int j = 0; j < adpts.Length; ++j)
+                    catch(Ice.ConnectTimeoutException)
                     {
-                        adpts[j] = adapters[rand.Next(adapters.Length)];
                     }
-                    proxies[i] = createTestIntfPrx(new List<RemoteObjectAdapterPrx>(adpts));
                 }
+                output.WriteLine("ok");
 
-                for(i = 0; i < proxies.Length; i++)
+                output.Write("testing binding with multiple endpoints... ");
+                output.Flush();
                 {
-                    proxies[i].begin_getAdapterName();
-                }
-                for(i = 0; i < proxies.Length; i++)
-                {
-                    try
-                    {
-                        proxies[i].ice_ping();
-                    }
-                    catch(Ice.LocalException)
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("Adapter11", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter12", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter13", "default"));
+
+                    //
+                    // Ensure that when a connection is opened it's reused for new
+                    // proxies and that all endpoints are eventually tried.
+                    //
+                    List<string> names = new List<string>();
+                    names.Add("Adapter11");
+                    names.Add("Adapter12");
+                    names.Add("Adapter13");
+                    while(names.Count > 0)
                     {
+                        var adpts = new List<Test.RemoteObjectAdapterPrx>(adapters);
+
+                        var test1 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test2 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test3 = createTestIntfPrx(adpts);
+                        test1.ice_ping();
+                        test(test1.ice_getConnection() == test2.ice_getConnection());
+                        test(test2.ice_getConnection() == test3.ice_getConnection());
+
+                        names.Remove(test1.getAdapterName());
+                        test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                     }
-                }
 
-                List<Ice.Connection> connections = new List<Ice.Connection>();
-                for(i = 0; i < proxies.Length; i++)
-                {
-                    if(proxies[i].ice_getCachedConnection() != null)
+                    //
+                    // Ensure that the proxy correctly caches the connection(we
+                    // always send the request over the same connection.)
+                    //
                     {
-                        if(!connections.Contains(proxies[i].ice_getCachedConnection()))
+                        foreach(var adpt in adapters)
                         {
-                            connections.Add(proxies[i].ice_getCachedConnection());
+                            adpt.getTestIntf().ice_ping();
                         }
-                    }
-                }
-                test(connections.Count <= adapterCount);
 
-                foreach(RemoteObjectAdapterPrx a in adapters)
-                {
-                    try
-                    {
-                        a.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        var t = createTestIntfPrx(adapters);
+                        string name = t.getAdapterName();
+                        int nRetry = 10;
+                        int i;
+                        for(i = 0; i < nRetry && t.getAdapterName().Equals(name); i++) ;
+                        test(i == nRetry);
+
+                        foreach(var adpt in adapters)
+                        {
+                            adpt.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        }
                     }
-                    catch(Ice.LocalException)
+
+                    //
+                    // Deactivate an adapter and ensure that we can still
+                    // establish the connection to the remaining adapters.
+                    //
+                    com.deactivateObjectAdapter((Test.RemoteObjectAdapterPrx)adapters[0]);
+                    names.Add("Adapter12");
+                    names.Add("Adapter13");
+                    while(names.Count > 0)
+                    {
+                        var adpts = new List<Test.RemoteObjectAdapterPrx>(adapters);
+
+                        var test1 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test2 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test3 = createTestIntfPrx(adpts);
+
+                        test(test1.ice_getConnection() == test2.ice_getConnection());
+                        test(test2.ice_getConnection() == test3.ice_getConnection());
+
+                        names.Remove(test1.getAdapterName());
+                        test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    }
+
+                    //
+                    // Deactivate an adapter and ensure that we can still
+                    // establish the connection to the remaining adapter.
+                    //
+                    com.deactivateObjectAdapter((Test.RemoteObjectAdapterPrx)adapters[2]);
+                    var obj = createTestIntfPrx(adapters);
+                    test(obj.getAdapterName().Equals("Adapter12"));
+
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing binding with multiple random endpoints... ");
+                output.Flush();
+                {
+                    var adapters = new Test.RemoteObjectAdapterPrx[5];
+                    adapters[0] = com.createObjectAdapter("AdapterRandom11", "default");
+                    adapters[1] = com.createObjectAdapter("AdapterRandom12", "default");
+                    adapters[2] = com.createObjectAdapter("AdapterRandom13", "default");
+                    adapters[3] = com.createObjectAdapter("AdapterRandom14", "default");
+                    adapters[4] = com.createObjectAdapter("AdapterRandom15", "default");
+
+                    int count = 20;
+                    int adapterCount = adapters.Length;
+                    while(--count > 0)
                     {
-                        // Expected if adapter is down.
-                    }
-                }
-            }
-        }
-        WriteLine("ok");
+                        Test.TestIntfPrx[] proxies;
+                        if(count == 1)
+                        {
+                            com.deactivateObjectAdapter(adapters[4]);
+                            --adapterCount;
+                        }
+                        proxies = new Test.TestIntfPrx[10];
 
-        Write("testing binding with multiple endpoints and AMI... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("AdapterAMI11", "default"));
-            adapters.Add(com.createObjectAdapter("AdapterAMI12", "default"));
-            adapters.Add(com.createObjectAdapter("AdapterAMI13", "default"));
-
-            //
-            // Ensure that when a connection is opened it's reused for new
-            // proxies and that all endpoints are eventually tried.
-            //
-            List<string> names = new List<string>();
-            names.Add("AdapterAMI11");
-            names.Add("AdapterAMI12");
-            names.Add("AdapterAMI13");
-            while(names.Count > 0)
-            {
-                List<RemoteObjectAdapterPrx> adpts = new List<RemoteObjectAdapterPrx>(adapters);
+                        int i;
+                        for(i = 0; i < proxies.Length; ++i)
+                        {
+                            var adpts = new Test.RemoteObjectAdapterPrx[rand.Next(adapters.Length)];
+                            if(adpts.Length == 0)
+                            {
+                                adpts = new Test.RemoteObjectAdapterPrx[1];
+                            }
+                            for(int j = 0; j < adpts.Length; ++j)
+                            {
+                                adpts[j] = adapters[rand.Next(adapters.Length)];
+                            }
+                            proxies[i] = createTestIntfPrx(new List<Test.RemoteObjectAdapterPrx>(adpts));
+                        }
 
-                TestIntfPrx test1 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test2 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test3 = createTestIntfPrx(adpts);
-                test1.ice_ping();
-                test(test1.ice_getConnection() == test2.ice_getConnection());
-                test(test2.ice_getConnection() == test3.ice_getConnection());
+                        for(i = 0; i < proxies.Length; i++)
+                        {
+                            proxies[i].begin_getAdapterName();
+                        }
+                        for(i = 0; i < proxies.Length; i++)
+                        {
+                            try
+                            {
+                                proxies[i].ice_ping();
+                            }
+                            catch(Ice.LocalException)
+                            {
+                            }
+                        }
 
-                names.Remove(getAdapterNameWithAMI(test1));
-                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            }
+                        List<Ice.Connection> connections = new List<Ice.Connection>();
+                        for(i = 0; i < proxies.Length; i++)
+                        {
+                            if(proxies[i].ice_getCachedConnection() != null)
+                            {
+                                if(!connections.Contains(proxies[i].ice_getCachedConnection()))
+                                {
+                                    connections.Add(proxies[i].ice_getCachedConnection());
+                                }
+                            }
+                        }
+                        test(connections.Count <= adapterCount);
 
-            //
-            // Ensure that the proxy correctly caches the connection (we
-            // always send the request over the same connection.)
-            //
-            {
-                foreach(RemoteObjectAdapterPrx adpt in adapters)
-                {
-                    adpt.getTestIntf().ice_ping();
+                        foreach(var a in adapters)
+                        {
+                            try
+                            {
+                                a.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                            }
+                            catch(Ice.LocalException)
+                            {
+                                // Expected if adapter is down.
+                            }
+                        }
+                    }
                 }
+                output.WriteLine("ok");
 
-                TestIntfPrx t = createTestIntfPrx(adapters);
-                string name = getAdapterNameWithAMI(t);
-                int nRetry = 10;
-                int i;
-                for(i = 0; i < nRetry && getAdapterNameWithAMI(t).Equals(name); i++);
-                test(i == nRetry);
-
-                foreach(RemoteObjectAdapterPrx adpt in adapters)
+                output.Write("testing binding with multiple endpoints and AMI... ");
+                output.Flush();
                 {
-                    adpt.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                }
-            }
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("AdapterAMI11", "default"));
+                    adapters.Add(com.createObjectAdapter("AdapterAMI12", "default"));
+                    adapters.Add(com.createObjectAdapter("AdapterAMI13", "default"));
+
+                    //
+                    // Ensure that when a connection is opened it's reused for new
+                    // proxies and that all endpoints are eventually tried.
+                    //
+                    List<string> names = new List<string>();
+                    names.Add("AdapterAMI11");
+                    names.Add("AdapterAMI12");
+                    names.Add("AdapterAMI13");
+                    while(names.Count > 0)
+                    {
+                        var adpts = new List<Test.RemoteObjectAdapterPrx>(adapters);
+
+                        var test1 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test2 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test3 = createTestIntfPrx(adpts);
+                        test1.ice_ping();
+                        test(test1.ice_getConnection() == test2.ice_getConnection());
+                        test(test2.ice_getConnection() == test3.ice_getConnection());
+
+                        names.Remove(getAdapterNameWithAMI(test1));
+                        test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    }
+
+                    //
+                    // Ensure that the proxy correctly caches the connection(we
+                    // always send the request over the same connection.)
+                    //
+                    {
+                        foreach(var adpt in adapters)
+                        {
+                            adpt.getTestIntf().ice_ping();
+                        }
 
-            //
-            // Deactivate an adapter and ensure that we can still
-            // establish the connection to the remaining adapters.
-            //
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
-            names.Add("AdapterAMI12");
-            names.Add("AdapterAMI13");
-            while(names.Count > 0)
-            {
-                List<RemoteObjectAdapterPrx> adpts = new List<RemoteObjectAdapterPrx>(adapters);
+                        var t = createTestIntfPrx(adapters);
+                        string name = getAdapterNameWithAMI(t);
+                        int nRetry = 10;
+                        int i;
+                        for(i = 0; i < nRetry && getAdapterNameWithAMI(t).Equals(name); i++) ;
+                        test(i == nRetry);
 
-                TestIntfPrx test1 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test2 = createTestIntfPrx(adpts);
-                shuffle(ref adpts);
-                TestIntfPrx test3 = createTestIntfPrx(adpts);
+                        foreach(var adpt in adapters)
+                        {
+                            adpt.getTestIntf().ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        }
+                    }
 
-                test(test1.ice_getConnection() == test2.ice_getConnection());
-                test(test2.ice_getConnection() == test3.ice_getConnection());
+                    //
+                    // Deactivate an adapter and ensure that we can still
+                    // establish the connection to the remaining adapters.
+                    //
+                    com.deactivateObjectAdapter(adapters[0]);
+                    names.Add("AdapterAMI12");
+                    names.Add("AdapterAMI13");
+                    while(names.Count > 0)
+                    {
+                        var adpts = new List<Test.RemoteObjectAdapterPrx>(adapters);
+
+                        var test1 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test2 = createTestIntfPrx(adpts);
+                        shuffle(ref adpts);
+                        var test3 = createTestIntfPrx(adpts);
+
+                        test(test1.ice_getConnection() == test2.ice_getConnection());
+                        test(test2.ice_getConnection() == test3.ice_getConnection());
+
+                        names.Remove(getAdapterNameWithAMI(test1));
+                        test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    }
+
+                    //
+                    // Deactivate an adapter and ensure that we can still
+                    // establish the connection to the remaining adapter.
+                    //
+                    com.deactivateObjectAdapter(adapters[2]);
+                    var obj = createTestIntfPrx(adapters);
+                    test(getAdapterNameWithAMI(obj).Equals("AdapterAMI12"));
+
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing random endpoint selection... ");
+                output.Flush();
+                {
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("Adapter21", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter22", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter23", "default"));
+
+                    var obj = createTestIntfPrx(adapters);
+                    test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
+
+                    var names = new List<string>();
+                    names.Add("Adapter21");
+                    names.Add("Adapter22");
+                    names.Add("Adapter23");
+                    while(names.Count > 0)
+                    {
+                        names.Remove(obj.getAdapterName());
+                        obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    }
+
+                    obj = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Random));
+                    test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
+
+                    names.Add("Adapter21");
+                    names.Add("Adapter22");
+                    names.Add("Adapter23");
+                    while(names.Count > 0)
+                    {
+                        names.Remove(obj.getAdapterName());
+                        obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    }
+
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing ordered endpoint selection... ");
+                output.Flush();
+                {
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("Adapter31", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter32", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter33", "default"));
+
+                    var obj = createTestIntfPrx(adapters);
+                    obj = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
+                    test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
+                    int nRetry = 3;
+                    int i;
+
+                    //
+                    // Ensure that endpoints are tried in order by deactiving the adapters
+                    // one after the other.
+                    //
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter31"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[0]);
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter32"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[1]);
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter33"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[2]);
 
-                names.Remove(getAdapterNameWithAMI(test1));
-                test1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            }
+                    try
+                    {
+                        obj.getAdapterName();
+                    }
+                    catch(Ice.ConnectFailedException)
+                    {
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                    }
 
-            //
-            // Deactivate an adapter and ensure that we can still
-            // establish the connection to the remaining adapter.
-            //
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]);
-            TestIntfPrx obj = createTestIntfPrx(adapters);
-            test(getAdapterNameWithAMI(obj).Equals("AdapterAMI12"));
+                    Ice.Endpoint[] endpoints = obj.ice_getEndpoints();
 
-            deactivate(com, adapters);
-        }
-       WriteLine("ok");
+                    adapters.Clear();
 
-        Write("testing random endpoint selection... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("Adapter21", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter22", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter23", "default"));
-
-            TestIntfPrx obj = createTestIntfPrx(adapters);
-            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
-
-            List<string> names = new List<string>();
-            names.Add("Adapter21");
-            names.Add("Adapter22");
-            names.Add("Adapter23");
-            while(names.Count > 0)
-            {
-                names.Remove(obj.getAdapterName());
-                obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            }
-
-            obj = TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Random));
-            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
+                    //
+                    // Now, re-activate the adapters with the same endpoints in the opposite
+                    // order.
+                    //
+                    adapters.Add(com.createObjectAdapter("Adapter36", endpoints[2].ToString()));
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter36"); i++) ;
+                    test(i == nRetry);
+                    obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    adapters.Add(com.createObjectAdapter("Adapter35", endpoints[1].ToString()));
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter35"); i++) ;
+                    test(i == nRetry);
+                    obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    adapters.Add(com.createObjectAdapter("Adapter34", endpoints[0].ToString()));
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter34"); i++) ;
+                    test(i == nRetry);
 
-            names.Add("Adapter21");
-            names.Add("Adapter22");
-            names.Add("Adapter23");
-            while(names.Count > 0)
-            {
-                names.Remove(obj.getAdapterName());
-                obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            }
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
 
-            deactivate(com, adapters);
-        }
-        WriteLine("ok");
+                output.Write("testing per request binding with single endpoint... ");
+                output.Flush();
+                {
+                    var adapter = com.createObjectAdapter("Adapter41", "default");
 
-        Write("testing ordered endpoint selection... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("Adapter31", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter32", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter33", "default"));
-
-            TestIntfPrx obj = createTestIntfPrx(adapters);
-            obj = TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
-            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
-            int nRetry = 3;
-            int i;
-
-            //
-            // Ensure that endpoints are tried in order by deactiving the adapters
-            // one after the other.
-            //
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter31"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter32"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[1]);
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter33"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]);
+                    var test1 = Test.TestIntfPrxHelper.uncheckedCast(adapter.getTestIntf().ice_connectionCached(false));
+                    var test2 = Test.TestIntfPrxHelper.uncheckedCast(adapter.getTestIntf().ice_connectionCached(false));
+                    test(!test1.ice_isConnectionCached());
+                    test(!test2.ice_isConnectionCached());
+                    test(test1.ice_getConnection() != null && test2.ice_getConnection() != null);
+                    test(test1.ice_getConnection() == test2.ice_getConnection());
 
-            try
-            {
-                obj.getAdapterName();
-            }
-            catch(Ice.ConnectFailedException)
-            {
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-            }
+                    test1.ice_ping();
 
-            Ice.Endpoint[] endpoints = obj.ice_getEndpoints();
+                    com.deactivateObjectAdapter(adapter);
 
-            adapters.Clear();
+                    var test3 = Test.TestIntfPrxHelper.uncheckedCast(test1);
+                    try
+                    {
+                        test(test3.ice_getConnection() == test1.ice_getConnection());
+                        test(false);
+                    }
+                    catch(Ice.ConnectFailedException)
+                    {
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                    }
+                }
+                output.WriteLine("ok");
 
-            //
-            // Now, re-activate the adapters with the same endpoints in the opposite
-            // order.
-            //
-            adapters.Add(com.createObjectAdapter("Adapter36", endpoints[2].ToString()));
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter36"); i++);
-            test(i == nRetry);
-            obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            adapters.Add(com.createObjectAdapter("Adapter35", endpoints[1].ToString()));
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter35"); i++);
-            test(i == nRetry);
-            obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            adapters.Add(com.createObjectAdapter("Adapter34", endpoints[0].ToString()));
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter34"); i++);
-            test(i == nRetry);
+                output.Write("testing per request binding with multiple endpoints... ");
+                output.Flush();
+                {
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("Adapter51", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter52", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter53", "default"));
 
-            deactivate(com, adapters);
-        }
-        WriteLine("ok");
+                    var obj = Test.TestIntfPrxHelper.uncheckedCast(createTestIntfPrx(adapters).ice_connectionCached(false));
+                    test(!obj.ice_isConnectionCached());
 
-        Write("testing per request binding with single endpoint... ");
-        Flush();
-        {
-            RemoteObjectAdapterPrx adapter = com.createObjectAdapter("Adapter41", "default");
+                    List<string> names = new List<string>();
+                    names.Add("Adapter51");
+                    names.Add("Adapter52");
+                    names.Add("Adapter53");
+                    while(names.Count > 0)
+                    {
+                        names.Remove(obj.getAdapterName());
+                    }
 
-            TestIntfPrx test1 = TestIntfPrxHelper.uncheckedCast(adapter.getTestIntf().ice_connectionCached(false));
-            TestIntfPrx test2 = TestIntfPrxHelper.uncheckedCast(adapter.getTestIntf().ice_connectionCached(false));
-            test(!test1.ice_isConnectionCached());
-            test(!test2.ice_isConnectionCached());
-            test(test1.ice_getConnection() != null && test2.ice_getConnection() != null);
-            test(test1.ice_getConnection() == test2.ice_getConnection());
+                    com.deactivateObjectAdapter(adapters[0]);
 
-            test1.ice_ping();
+                    names.Add("Adapter52");
+                    names.Add("Adapter53");
+                    while(names.Count > 0)
+                    {
+                        names.Remove(obj.getAdapterName());
+                    }
 
-            com.deactivateObjectAdapter(adapter);
+                    com.deactivateObjectAdapter(adapters[2]);
 
-            TestIntfPrx test3 = TestIntfPrxHelper.uncheckedCast(test1);
-            try
-            {
-                test(test3.ice_getConnection() == test1.ice_getConnection());
-                test(false);
-            }
-            catch(Ice.ConnectFailedException)
-            {
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-            }
-        }
-        WriteLine("ok");
+                    test(obj.getAdapterName().Equals("Adapter52"));
 
-        Write("testing per request binding with multiple endpoints... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("Adapter51", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter52", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter53", "default"));
-
-            TestIntfPrx obj = TestIntfPrxHelper.uncheckedCast(createTestIntfPrx(adapters).ice_connectionCached(false));
-            test(!obj.ice_isConnectionCached());
-
-            List<string> names = new List<string>();
-            names.Add("Adapter51");
-            names.Add("Adapter52");
-            names.Add("Adapter53");
-            while(names.Count > 0)
-            {
-                names.Remove(obj.getAdapterName());
-            }
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
 
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
+                output.Write("testing per request binding with multiple endpoints and AMI... ");
+                output.Flush();
+                {
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("AdapterAMI51", "default"));
+                    adapters.Add(com.createObjectAdapter("AdapterAMI52", "default"));
+                    adapters.Add(com.createObjectAdapter("AdapterAMI53", "default"));
 
-            names.Add("Adapter52");
-            names.Add("Adapter53");
-            while(names.Count > 0)
-            {
-                names.Remove(obj.getAdapterName());
-            }
+                    var obj = Test.TestIntfPrxHelper.uncheckedCast(createTestIntfPrx(adapters).ice_connectionCached(false));
+                    test(!obj.ice_isConnectionCached());
 
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]);
+                    var names = new List<string>();
+                    names.Add("AdapterAMI51");
+                    names.Add("AdapterAMI52");
+                    names.Add("AdapterAMI53");
+                    while(names.Count > 0)
+                    {
+                        names.Remove(getAdapterNameWithAMI(obj));
+                    }
 
-            test(obj.getAdapterName().Equals("Adapter52"));
+                    com.deactivateObjectAdapter(adapters[0]);
 
-            deactivate(com, adapters);
-        }
-        WriteLine("ok");
+                    names.Add("AdapterAMI52");
+                    names.Add("AdapterAMI53");
+                    while(names.Count > 0)
+                    {
+                        names.Remove(getAdapterNameWithAMI(obj));
+                    }
 
-        Write("testing per request binding with multiple endpoints and AMI... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("AdapterAMI51", "default"));
-            adapters.Add(com.createObjectAdapter("AdapterAMI52", "default"));
-            adapters.Add(com.createObjectAdapter("AdapterAMI53", "default"));
-
-            TestIntfPrx obj = TestIntfPrxHelper.uncheckedCast(createTestIntfPrx(adapters).ice_connectionCached(false));
-            test(!obj.ice_isConnectionCached());
-
-            List<string> names = new List<string>();
-            names.Add("AdapterAMI51");
-            names.Add("AdapterAMI52");
-            names.Add("AdapterAMI53");
-            while(names.Count > 0)
-            {
-                names.Remove(getAdapterNameWithAMI(obj));
-            }
+                    com.deactivateObjectAdapter(adapters[2]);
 
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
+                    test(getAdapterNameWithAMI(obj).Equals("AdapterAMI52"));
 
-            names.Add("AdapterAMI52");
-            names.Add("AdapterAMI53");
-            while(names.Count > 0)
-            {
-                names.Remove(getAdapterNameWithAMI(obj));
-            }
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
 
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]);
+                output.Write("testing per request binding and ordered endpoint selection... ");
+                output.Flush();
+                {
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("Adapter61", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter62", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter63", "default"));
 
-            test(getAdapterNameWithAMI(obj).Equals("AdapterAMI52"));
+                    var obj = createTestIntfPrx(adapters);
+                    obj = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
+                    test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
+                    obj = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_connectionCached(false));
+                    test(!obj.ice_isConnectionCached());
+                    int nRetry = 3;
+                    int i;
 
-            deactivate(com, adapters);
-        }
-        WriteLine("ok");
+                    //
+                    // Ensure that endpoints are tried in order by deactiving the adapters
+                    // one after the other.
+                    //
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter61"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[0]);
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter62"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[1]);
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter63"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[2]);
 
-        Write("testing per request binding and ordered endpoint selection... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("Adapter61", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter62", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter63", "default"));
-
-            TestIntfPrx obj = createTestIntfPrx(adapters);
-            obj = TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
-            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
-            obj = TestIntfPrxHelper.uncheckedCast(obj.ice_connectionCached(false));
-            test(!obj.ice_isConnectionCached());
-            int nRetry = 3;
-            int i;
-
-            //
-            // Ensure that endpoints are tried in order by deactiving the adapters
-            // one after the other.
-            //
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter61"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter62"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[1]);
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter63"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]);
+                    try
+                    {
+                        obj.getAdapterName();
+                    }
+                    catch(Ice.ConnectFailedException)
+                    {
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                    }
 
-            try
-            {
-                obj.getAdapterName();
-            }
-            catch(Ice.ConnectFailedException)
-            {
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-            }
+                    Ice.Endpoint[] endpoints = obj.ice_getEndpoints();
+
+                    adapters.Clear();
+
+                    //
+                    // Now, re-activate the adapters with the same endpoints in the opposite
+                    // order.
+                    //
+                    adapters.Add(com.createObjectAdapter("Adapter66", endpoints[2].ToString()));
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter66"); i++) ;
+                    test(i == nRetry);
+                    adapters.Add(com.createObjectAdapter("Adapter65", endpoints[1].ToString()));
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter65"); i++) ;
+                    test(i == nRetry);
+                    adapters.Add(com.createObjectAdapter("Adapter64", endpoints[0].ToString()));
+                    for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter64"); i++) ;
+                    test(i == nRetry);
+
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing per request binding and ordered endpoint selection and AMI... ");
+                output.Flush();
+                {
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("AdapterAMI61", "default"));
+                    adapters.Add(com.createObjectAdapter("AdapterAMI62", "default"));
+                    adapters.Add(com.createObjectAdapter("AdapterAMI63", "default"));
+
+                    var obj = createTestIntfPrx(adapters);
+                    obj = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
+                    test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
+                    obj = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_connectionCached(false));
+                    test(!obj.ice_isConnectionCached());
+                    int nRetry = 3;
+                    int i;
+
+                    //
+                    // Ensure that endpoints are tried in order by deactiving the adapters
+                    // one after the other.
+                    //
+                    for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI61"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[0]);
+                    for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI62"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[1]);
+                    for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI63"); i++) ;
+                    test(i == nRetry);
+                    com.deactivateObjectAdapter(adapters[2]);
 
-            Ice.Endpoint[] endpoints = obj.ice_getEndpoints();
+                    try
+                    {
+                        obj.getAdapterName();
+                    }
+                    catch(Ice.ConnectFailedException)
+                    {
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                    }
 
-            adapters.Clear();
+                    Ice.Endpoint[] endpoints = obj.ice_getEndpoints();
 
-            //
-            // Now, re-activate the adapters with the same endpoints in the opposite
-            // order.
-            //
-            adapters.Add(com.createObjectAdapter("Adapter66", endpoints[2].ToString()));
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter66"); i++);
-            test(i == nRetry);
-            adapters.Add(com.createObjectAdapter("Adapter65", endpoints[1].ToString()));
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter65"); i++);
-            test(i == nRetry);
-            adapters.Add(com.createObjectAdapter("Adapter64", endpoints[0].ToString()));
-            for(i = 0; i < nRetry && obj.getAdapterName().Equals("Adapter64"); i++);
-            test(i == nRetry);
+                    adapters.Clear();
 
-            deactivate(com, adapters);
-        }
-        WriteLine("ok");
+                    //
+                    // Now, re-activate the adapters with the same endpoints in the opposite
+                    // order.
+                    //
+                    adapters.Add(com.createObjectAdapter("AdapterAMI66", endpoints[2].ToString()));
+                    for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI66"); i++) ;
+                    test(i == nRetry);
+                    adapters.Add(com.createObjectAdapter("AdapterAMI65", endpoints[1].ToString()));
+                    for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI65"); i++) ;
+                    test(i == nRetry);
+                    adapters.Add(com.createObjectAdapter("AdapterAMI64", endpoints[0].ToString()));
+                    for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI64"); i++) ;
+                    test(i == nRetry);
 
-        Write("testing per request binding and ordered endpoint selection and AMI... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("AdapterAMI61", "default"));
-            adapters.Add(com.createObjectAdapter("AdapterAMI62", "default"));
-            adapters.Add(com.createObjectAdapter("AdapterAMI63", "default"));
-
-            TestIntfPrx obj = createTestIntfPrx(adapters);
-            obj = TestIntfPrxHelper.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
-            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
-            obj = TestIntfPrxHelper.uncheckedCast(obj.ice_connectionCached(false));
-            test(!obj.ice_isConnectionCached());
-            int nRetry = 3;
-            int i;
-
-            //
-            // Ensure that endpoints are tried in order by deactiving the adapters
-            // one after the other.
-            //
-            for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI61"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
-            for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI62"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[1]);
-            for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI63"); i++);
-            test(i == nRetry);
-            com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[2]);
+                    deactivate(com, adapters);
+                }
+                output.WriteLine("ok");
 
-            try
-            {
-                obj.getAdapterName();
-            }
-            catch(Ice.ConnectFailedException)
-            {
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-            }
+                output.Write("testing endpoint mode filtering... ");
+                output.Flush();
+                {
+                    var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                    adapters.Add(com.createObjectAdapter("Adapter71", "default"));
+                    adapters.Add(com.createObjectAdapter("Adapter72", "udp"));
 
-            Ice.Endpoint[] endpoints = obj.ice_getEndpoints();
+                    var obj = createTestIntfPrx(adapters);
+                    test(obj.getAdapterName().Equals("Adapter71"));
 
-            adapters.Clear();
+                    var testUDP = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_datagram());
+                    test(obj.ice_getConnection() != testUDP.ice_getConnection());
+                    try
+                    {
+                        testUDP.getAdapterName();
+                    }
+                    catch(Ice.TwowayOnlyException)
+                    {
+                    }
+                }
+                output.WriteLine("ok");
+                if(communicator.getProperties().getProperty("Ice.Plugin.IceSSL").Length > 0)
+                {
+                    output.Write("testing unsecure vs. secure endpoints... ");
+                    output.Flush();
+                    {
+                        var adapters = new List<Test.RemoteObjectAdapterPrx>();
+                        adapters.Add(com.createObjectAdapter("Adapter81", "ssl"));
+                        adapters.Add(com.createObjectAdapter("Adapter82", "tcp"));
 
-            //
-            // Now, re-activate the adapters with the same endpoints in the opposite
-            // order.
-            //
-            adapters.Add(com.createObjectAdapter("AdapterAMI66", endpoints[2].ToString()));
-            for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI66"); i++);
-            test(i == nRetry);
-            adapters.Add(com.createObjectAdapter("AdapterAMI65", endpoints[1].ToString()));
-            for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI65"); i++);
-            test(i == nRetry);
-            adapters.Add(com.createObjectAdapter("AdapterAMI64", endpoints[0].ToString()));
-            for(i = 0; i < nRetry && getAdapterNameWithAMI(obj).Equals("AdapterAMI64"); i++);
-            test(i == nRetry);
+                        var obj = createTestIntfPrx(adapters);
+                        int i;
+                        for(i = 0; i < 5; i++)
+                        {
+                            test(obj.getAdapterName().Equals("Adapter82"));
+                            obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        }
 
-            deactivate(com, adapters);
-        }
-        WriteLine("ok");
+                        var testSecure = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_secure(true));
+                        test(testSecure.ice_isSecure());
+                        testSecure = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_secure(false));
+                        test(!testSecure.ice_isSecure());
+                        testSecure = Test.TestIntfPrxHelper.uncheckedCast(obj.ice_secure(true));
+                        test(testSecure.ice_isSecure());
+                        test(obj.ice_getConnection() != testSecure.ice_getConnection());
 
-        Write("testing endpoint mode filtering... ");
-        Flush();
-        {
-            List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-            adapters.Add(com.createObjectAdapter("Adapter71", "default"));
-            adapters.Add(com.createObjectAdapter("Adapter72", "udp"));
-
-            TestIntfPrx obj = createTestIntfPrx(adapters);
-            test(obj.getAdapterName().Equals("Adapter71"));
-
-            TestIntfPrx testUDP = TestIntfPrxHelper.uncheckedCast(obj.ice_datagram());
-            test(obj.ice_getConnection() != testUDP.ice_getConnection());
-            try
-            {
-                testUDP.getAdapterName();
-            }
-            catch(Ice.TwowayOnlyException)
-            {
-            }
-        }
-        WriteLine("ok");
-        if(communicator.getProperties().getProperty("Ice.Plugin.IceSSL").Length > 0)
-        {
-            Write("testing unsecure vs. secure endpoints... ");
-            Flush();
-            {
-                List<RemoteObjectAdapterPrx> adapters = new List<RemoteObjectAdapterPrx>();
-                adapters.Add(com.createObjectAdapter("Adapter81", "ssl"));
-                adapters.Add(com.createObjectAdapter("Adapter82", "tcp"));
-
-                TestIntfPrx obj = createTestIntfPrx(adapters);
-                int i;
-                for(i = 0; i < 5; i++)
-                {
-                    test(obj.getAdapterName().Equals("Adapter82"));
-                    obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                }
+                        com.deactivateObjectAdapter(adapters[1]);
 
-                TestIntfPrx testSecure = TestIntfPrxHelper.uncheckedCast(obj.ice_secure(true));
-                test(testSecure.ice_isSecure());
-                testSecure = TestIntfPrxHelper.uncheckedCast(obj.ice_secure(false));
-                test(!testSecure.ice_isSecure());
-                testSecure = TestIntfPrxHelper.uncheckedCast(obj.ice_secure(true));
-                test(testSecure.ice_isSecure());
-                test(obj.ice_getConnection() != testSecure.ice_getConnection());
+                        for(i = 0; i < 5; i++)
+                        {
+                            test(obj.getAdapterName().Equals("Adapter81"));
+                            obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        }
 
-                com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[1]);
+                        com.createObjectAdapter("Adapter83",(obj.ice_getEndpoints()[1]).ToString()); // Reactive tcp OA.
 
-                for(i = 0; i < 5; i++)
-                {
-                    test(obj.getAdapterName().Equals("Adapter81"));
-                    obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                }
+                        for(i = 0; i < 5; i++)
+                        {
+                            test(obj.getAdapterName().Equals("Adapter83"));
+                            obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        }
 
-                com.createObjectAdapter("Adapter83", (obj.ice_getEndpoints()[1]).ToString()); // Reactive tcp OA.
+                        com.deactivateObjectAdapter(adapters[0]);
+                        try
+                        {
+                            testSecure.ice_ping();
+                            test(false);
+                        }
+                        catch(Ice.ConnectFailedException)
+                        {
+                        }
+                        catch(Ice.ConnectTimeoutException)
+                        {
+                        }
 
-                for(i = 0; i < 5; i++)
-                {
-                    test(obj.getAdapterName().Equals("Adapter83"));
-                    obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        deactivate(com, adapters);
+                    }
+                    output.WriteLine("ok");
                 }
 
-                com.deactivateObjectAdapter((RemoteObjectAdapterPrx)adapters[0]);
-                try
                 {
-                    testSecure.ice_ping();
-                    test(false);
-                }
-                catch(Ice.ConnectFailedException)
-                {
-                }
-                catch(Ice.ConnectTimeoutException)
-                {
-                }
-
-                deactivate(com, adapters);
-            }
-            WriteLine("ok");
-        }
+                    output.Write("testing ipv4 & ipv6 connections... ");
+                    output.Flush();
 
-        {
-            Write("testing ipv4 & ipv6 connections... ");
-            Flush();
+                    Ice.Properties ipv4 = Ice.Util.createProperties();
+                    ipv4.setProperty("Ice.IPv4", "1");
+                    ipv4.setProperty("Ice.IPv6", "0");
+                    ipv4.setProperty("Adapter.Endpoints", "tcp -h localhost");
+
+                    Ice.Properties ipv6 = Ice.Util.createProperties();
+                    ipv6.setProperty("Ice.IPv4", "0");
+                    ipv6.setProperty("Ice.IPv6", "1");
+                    ipv6.setProperty("Adapter.Endpoints", "tcp -h localhost");
+
+                    Ice.Properties bothPreferIPv4 = Ice.Util.createProperties();
+                    bothPreferIPv4.setProperty("Ice.IPv4", "1");
+                    bothPreferIPv4.setProperty("Ice.IPv6", "1");
+                    bothPreferIPv4.setProperty("Ice.PreferIPv6Address", "0");
+                    bothPreferIPv4.setProperty("Adapter.Endpoints", "tcp -h localhost");
+
+                    Ice.Properties bothPreferIPv6 = Ice.Util.createProperties();
+                    bothPreferIPv6.setProperty("Ice.IPv4", "1");
+                    bothPreferIPv6.setProperty("Ice.IPv6", "1");
+                    bothPreferIPv6.setProperty("Ice.PreferIPv6Address", "1");
+                    bothPreferIPv6.setProperty("Adapter.Endpoints", "tcp -h localhost");
+
+                    List<Ice.Properties> clientProps = new List<Ice.Properties>();
+                    clientProps.Add(ipv4);
+                    clientProps.Add(ipv6);
+                    clientProps.Add(bothPreferIPv4);
+                    clientProps.Add(bothPreferIPv6);
+
+                    string endpoint = "tcp -p " + helper.getTestPort(2).ToString();
+
+                    Ice.Properties anyipv4 = ipv4.ice_clone_();
+                    anyipv4.setProperty("Adapter.Endpoints", endpoint);
+                    anyipv4.setProperty("Adapter.PublishedEndpoints", endpoint + " -h 127.0.0.1");
+
+                    Ice.Properties anyipv6 = ipv6.ice_clone_();
+                    anyipv6.setProperty("Adapter.Endpoints", endpoint);
+                    anyipv6.setProperty("Adapter.PublishedEndpoints", endpoint + " -h \".1\"");
+
+                    Ice.Properties anyboth = Ice.Util.createProperties();
+                    anyboth.setProperty("Ice.IPv4", "1");
+                    anyboth.setProperty("Ice.IPv6", "1");
+                    anyboth.setProperty("Adapter.Endpoints", endpoint);
+                    anyboth.setProperty("Adapter.PublishedEndpoints", endpoint + " -h \"::1\":" + endpoint + " -h 127.0.0.1");
+
+                    Ice.Properties localipv4 = ipv4.ice_clone_();
+                    localipv4.setProperty("Adapter.Endpoints", "tcp -h 127.0.0.1");
+
+                    Ice.Properties localipv6 = ipv6.ice_clone_();
+                    localipv6.setProperty("Adapter.Endpoints", "tcp -h \"::1\"");
+
+                    List<Ice.Properties> serverProps = new List<Ice.Properties>(clientProps);
+                    serverProps.Add(anyipv4);
+                    serverProps.Add(anyipv6);
+                    serverProps.Add(anyboth);
+                    serverProps.Add(localipv4);
+                    serverProps.Add(localipv6);
+
+                    bool ipv6NotSupported = false;
+                    foreach(Ice.Properties p in serverProps)
+                    {
+                        Ice.InitializationData serverInitData = new Ice.InitializationData();
+                        serverInitData.properties = p;
+                        Ice.Communicator serverCommunicator = Ice.Util.initialize(serverInitData);
+                        Ice.ObjectAdapter oa;
+                        try
+                        {
+                            oa = serverCommunicator.createObjectAdapter("Adapter");
+                            oa.activate();
+                        }
+                        catch(Ice.DNSException)
+                        {
+                            serverCommunicator.destroy();
+                            continue; // IP version not supported.
+                        }
+                        catch(Ice.SocketException)
+                        {
+                            if(p == ipv6)
+                            {
+                                ipv6NotSupported = true;
+                            }
+                            serverCommunicator.destroy();
+                            continue; // IP version not supported.
+                        }
 
-            Ice.Properties ipv4 = Ice.Util.createProperties();
-            ipv4.setProperty("Ice.IPv4", "1");
-            ipv4.setProperty("Ice.IPv6", "0");
-            ipv4.setProperty("Adapter.Endpoints", "tcp -h localhost");
-
-            Ice.Properties ipv6 = Ice.Util.createProperties();
-            ipv6.setProperty("Ice.IPv4", "0");
-            ipv6.setProperty("Ice.IPv6", "1");
-            ipv6.setProperty("Adapter.Endpoints", "tcp -h localhost");
-
-            Ice.Properties bothPreferIPv4 = Ice.Util.createProperties();
-            bothPreferIPv4.setProperty("Ice.IPv4", "1");
-            bothPreferIPv4.setProperty("Ice.IPv6", "1");
-            bothPreferIPv4.setProperty("Ice.PreferIPv6Address", "0");
-            bothPreferIPv4.setProperty("Adapter.Endpoints", "tcp -h localhost");
-
-            Ice.Properties bothPreferIPv6 = Ice.Util.createProperties();
-            bothPreferIPv6.setProperty("Ice.IPv4", "1");
-            bothPreferIPv6.setProperty("Ice.IPv6", "1");
-            bothPreferIPv6.setProperty("Ice.PreferIPv6Address", "1");
-            bothPreferIPv6.setProperty("Adapter.Endpoints", "tcp -h localhost");
-
-            List<Ice.Properties> clientProps = new List<Ice.Properties>();
-            clientProps.Add(ipv4);
-            clientProps.Add(ipv6);
-            clientProps.Add(bothPreferIPv4);
-            clientProps.Add(bothPreferIPv6);
-
-            string endpoint = "tcp -p " + app.getTestPort(2).ToString();
-
-            Ice.Properties anyipv4 = ipv4.ice_clone_();
-            anyipv4.setProperty("Adapter.Endpoints", endpoint);
-            anyipv4.setProperty("Adapter.PublishedEndpoints", endpoint + " -h 127.0.0.1");
-
-            Ice.Properties anyipv6 = ipv6.ice_clone_();
-            anyipv6.setProperty("Adapter.Endpoints", endpoint);
-            anyipv6.setProperty("Adapter.PublishedEndpoints", endpoint + " -h \".1\"");
-
-            Ice.Properties anyboth = Ice.Util.createProperties();
-            anyboth.setProperty("Ice.IPv4", "1");
-            anyboth.setProperty("Ice.IPv6", "1");
-            anyboth.setProperty("Adapter.Endpoints", endpoint);
-            anyboth.setProperty("Adapter.PublishedEndpoints", endpoint + " -h \"::1\":" + endpoint + " -h 127.0.0.1");
-
-            Ice.Properties localipv4 = ipv4.ice_clone_();
-            localipv4.setProperty("Adapter.Endpoints", "tcp -h 127.0.0.1");
-
-            Ice.Properties localipv6 = ipv6.ice_clone_();
-            localipv6.setProperty("Adapter.Endpoints", "tcp -h \"::1\"");
-
-            List<Ice.Properties> serverProps = new List<Ice.Properties>(clientProps);
-            serverProps.Add(anyipv4);
-            serverProps.Add(anyipv6);
-            serverProps.Add(anyboth);
-            serverProps.Add(localipv4);
-            serverProps.Add(localipv6);
+                        Ice.ObjectPrx prx = oa.createProxy(Ice.Util.stringToIdentity("dummy"));
+                        try
+                        {
+                            prx.ice_collocationOptimized(false).ice_ping();
+                        }
+                        catch(Ice.LocalException)
+                        {
+                            serverCommunicator.destroy();
+                            continue; // IP version not supported.
+                        }
 
-            bool ipv6NotSupported = false;
-            foreach(Ice.Properties p in serverProps)
-            {
-                Ice.InitializationData serverInitData = new Ice.InitializationData();
-                serverInitData.properties = p;
-                Ice.Communicator serverCommunicator = Ice.Util.initialize(serverInitData);
-                Ice.ObjectAdapter oa;
-                try
-                {
-                    oa = serverCommunicator.createObjectAdapter("Adapter");
-                    oa.activate();
-                }
-                catch(Ice.DNSException)
-                {
-                    serverCommunicator.destroy();
-                    continue; // IP version not supported.
-                }
-                catch(Ice.SocketException)
-                {
-                    if(p == ipv6)
-                    {
-                        ipv6NotSupported = true;
+                        string strPrx = prx.ToString();
+                        foreach(Ice.Properties q in clientProps)
+                        {
+                            Ice.InitializationData clientInitData = new Ice.InitializationData();
+                            clientInitData.properties = q;
+                            Ice.Communicator clientCommunicator = Ice.Util.initialize(clientInitData);
+                            prx = clientCommunicator.stringToProxy(strPrx);
+                            try
+                            {
+                                prx.ice_ping();
+                                test(false);
+                            }
+                            catch(Ice.ObjectNotExistException)
+                            {
+                                // Expected, no object registered.
+                            }
+                            catch(Ice.DNSException)
+                            {
+                                // Expected if no IPv4 or IPv6 address is
+                                // associated to localhost or if trying to connect
+                                // to an any endpoint with the wrong IP version,
+                                // e.g.: resolving an IPv4 address when only IPv6
+                                // is enabled fails with a DNS exception.
+                            }
+                            catch(Ice.SocketException)
+                            {
+                                test((p == ipv4 && q == ipv6) ||(p == ipv6 && q == ipv4) ||
+                                    (p == bothPreferIPv4 && q == ipv6) ||(p == bothPreferIPv6 && q == ipv4) ||
+                                    (p == bothPreferIPv6 && q == ipv6 && ipv6NotSupported) ||
+                                    (p == anyipv4 && q == ipv6) ||(p == anyipv6 && q == ipv4) ||
+                                    (p == localipv4 && q == ipv6) ||(p == localipv6 && q == ipv4) ||
+                                    (p == ipv6 && q == bothPreferIPv4) ||(p == ipv6 && q == bothPreferIPv6) ||
+                                    (p == bothPreferIPv6 && q == ipv6));
+                            }
+                            clientCommunicator.destroy();
+                        }
+                        serverCommunicator.destroy();
                     }
-                    serverCommunicator.destroy();
-                    continue; // IP version not supported.
-                }
 
-                Ice.ObjectPrx prx = oa.createProxy(Ice.Util.stringToIdentity("dummy"));
-                try
-                {
-                    prx.ice_collocationOptimized(false).ice_ping();
-                }
-                catch(Ice.LocalException)
-                {
-                    serverCommunicator.destroy();
-                    continue; // IP version not supported.
+                    output.WriteLine("ok");
                 }
-
-                string strPrx = prx.ToString();
-                foreach(Ice.Properties q in clientProps)
-                {
-                    Ice.InitializationData clientInitData = new Ice.InitializationData();
-                    clientInitData.properties = q;
-                    Ice.Communicator clientCommunicator = Ice.Util.initialize(clientInitData);
-                    prx = clientCommunicator.stringToProxy(strPrx);
-                    try
-                    {
-                        prx.ice_ping();
-                        test(false);
-                    }
-                    catch(Ice.ObjectNotExistException)
-                    {
-                        // Expected, no object registered.
-                    }
-                    catch(Ice.DNSException)
-                    {
-                        // Expected if no IPv4 or IPv6 address is
-                        // associated to localhost or if trying to connect
-                        // to an any endpoint with the wrong IP version,
-                        // e.g.: resolving an IPv4 address when only IPv6
-                        // is enabled fails with a DNS exception.
-                    }
-                    catch(Ice.SocketException)
-                    {
-                        test((p == ipv4 && q == ipv6) || (p == ipv6 && q == ipv4) ||
-                             (p == bothPreferIPv4 && q == ipv6) || (p == bothPreferIPv6 && q == ipv4) ||
-                             (p == bothPreferIPv6 && q == ipv6 && ipv6NotSupported) ||
-                             (p == anyipv4 && q == ipv6) || (p == anyipv6 && q == ipv4) ||
-                             (p == localipv4 && q == ipv6) || (p == localipv6 && q == ipv4) ||
-                             (p == ipv6 && q == bothPreferIPv4) || (p == ipv6 && q == bothPreferIPv6) ||
-                             (p == bothPreferIPv6 && q == ipv6));
-                    }
-                    clientCommunicator.destroy();
-                }
-                serverCommunicator.destroy();
+                com.shutdown();
             }
 
-            WriteLine("ok");
+            private static Random _rand = new Random(unchecked((int)DateTime.Now.Ticks));
         }
-        com.shutdown();
     }
-
-    private static System.Random _rand = new System.Random(unchecked((int)System.DateTime.Now.Ticks));
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/binding/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace binding
     {
-        AllTests.allTests(this);
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\RemoteCommunicatorI.cs">
       <Link>RemoteCommunicatorI.cs</Link>
@@ -49,24 +49,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../RemoteCommunicatorI.cs"/>
-    <Compile Include="../../../RemoteObjectAdapterI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../RemoteCommunicatorI.cs" />
+    <Compile Include="../../../RemoteObjectAdapterI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.binding</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../RemoteCommunicatorI.cs" />
+    <Compile Include="../../../RemoteObjectAdapterI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/RemoteCommunicatorI.cs zeroc-ice-3.7.2/csharp/test/Ice/binding/RemoteCommunicatorI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/RemoteCommunicatorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/RemoteCommunicatorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,64 +1,56 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class RemoteCommunicatorI : RemoteCommunicatorDisp_
+namespace Ice
 {
-
-    public RemoteCommunicatorI(TestCommon.Application app)
-    {
-        _app = app;
-    }
-
-    public override RemoteObjectAdapterPrx
-    createObjectAdapter(string name, string endpts, Ice.Current current)
+    namespace binding
     {
-        int retry = 5;
-        while(true)
+        public class RemoteCommunicatorI : Test.RemoteCommunicatorDisp_
         {
-            try
+            public override Test.RemoteObjectAdapterPrx
+            createObjectAdapter(string name, string endpts, Ice.Current current)
             {
-                string endpoints = endpts;
-                if(endpoints.IndexOf("-p") < 0)
+                int retry = 5;
+                while(true)
                 {
-                    endpoints = _app.getTestEndpoint(_nextPort++, endpoints);
+                    try
+                    {
+                        Ice.Communicator communicator = current.adapter.getCommunicator();
+                        string endpoints = endpts;
+                        if(endpoints.IndexOf("-p") < 0)
+                        {
+                            endpoints = global::Test.TestHelper.getTestEndpoint(communicator.getProperties(), _nextPort++, endpoints);
+                        }
+
+                        communicator.getProperties().setProperty(name + ".ThreadPool.Size", "1");
+                        Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints(name, endpoints);
+                        return Test.RemoteObjectAdapterPrxHelper.uncheckedCast(
+                            current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter)));
+                    }
+                    catch(Ice.SocketException)
+                    {
+                        if(--retry == 0)
+                        {
+                            throw;
+                        }
+                    }
                 }
-
-                Ice.Communicator com = current.adapter.getCommunicator();
-                com.getProperties().setProperty(name + ".ThreadPool.Size", "1");
-                Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, endpoints);
-                return RemoteObjectAdapterPrxHelper.uncheckedCast(
-                    current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter)));
             }
-            catch(Ice.SocketException)
+
+            public override void
+            deactivateObjectAdapter(Test.RemoteObjectAdapterPrx adapter, Ice.Current current)
             {
-                if(--retry == 0)
-                {
-                    throw;
-                }
+                adapter.deactivate(); // Collocated call.
             }
-        }
-    }
 
-    public override void
-    deactivateObjectAdapter(RemoteObjectAdapterPrx adapter, Ice.Current current)
-    {
-        adapter.deactivate(); // Collocated call.
-    }
+            public override void
+            shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
 
-    public override void
-    shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
+            private int _nextPort = 10;
+        }
     }
-
-    private TestCommon.Application _app;
-    private int _nextPort = 10;
-};
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/RemoteObjectAdapterI.cs zeroc-ice-3.7.2/csharp/test/Ice/binding/RemoteObjectAdapterI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/RemoteObjectAdapterI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/RemoteObjectAdapterI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,41 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class RemoteObjectAdapterI : RemoteObjectAdapterDisp_
+namespace Ice
 {
-    public RemoteObjectAdapterI(Ice.ObjectAdapter adapter)
+    namespace binding
     {
-        _adapter = adapter;
-        _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(),
-                                                    Ice.Util.stringToIdentity("test")));
-        _adapter.activate();
-    }
+        public class RemoteObjectAdapterI : Test.RemoteObjectAdapterDisp_
+        {
+            public RemoteObjectAdapterI(Ice.ObjectAdapter adapter)
+            {
+                _adapter = adapter;
+                _testIntf = Test.TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(),
+                                                            Ice.Util.stringToIdentity("test")));
+                _adapter.activate();
+            }
 
-    public override TestIntfPrx
-    getTestIntf(Ice.Current current)
-    {
-        return _testIntf;
-    }
+            public override Test.TestIntfPrx
+            getTestIntf(Ice.Current current)
+            {
+                return _testIntf;
+            }
 
-    public override void
-    deactivate(Ice.Current current)
-    {
-        try
-        {
-            _adapter.destroy();
-        }
-        catch(Ice.ObjectAdapterDeactivatedException)
-        {
+            public override void
+            deactivate(Ice.Current current)
+            {
+                try
+                {
+                    _adapter.destroy();
+                }
+                catch(Ice.ObjectAdapterDeactivatedException)
+                {
+                }
+            }
+
+            private Ice.ObjectAdapter _adapter;
+            private Test.TestIntfPrx _testIntf;
         }
     }
-
-    private Ice.ObjectAdapter _adapter;
-    private TestIntfPrx _testIntf;
-};
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/binding/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Identity id = Ice.Util.stringToIdentity("communicator");
-        adapter.add(new RemoteCommunicatorI(this), id);
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ServerIdleTime", "30");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace binding
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                Ice.Properties properties = createTestProperties(ref args);
+                properties.setProperty("Ice.ServerIdleTime", "30");
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.Identity id = Ice.Util.stringToIdentity("communicator");
+                    adapter.add(new RemoteCommunicatorI(), id);
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.binding"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/binding/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/binding/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/binding/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/binding/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class TestI : TestIntfDisp_
+namespace Ice
 {
-    public override string getAdapterName(Ice.Current current)
+    namespace binding
     {
-        return current.adapter.getName();
+        public class TestI : Test.TestIntfDisp_
+        {
+            public override string getAdapterName(Ice.Current current)
+            {
+                return current.adapter.getName();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/checksum/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,80 +1,82 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static Test.ChecksumPrx
-    allTests(TestCommon.Application app, bool collocated)
+    namespace checksum
     {
-        Ice.Communicator communicator = app.communicator();
-        string rf = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
-        test(baseProxy != null);
-
-        Test.ChecksumPrx checksum = Test.ChecksumPrxHelper.checkedCast(baseProxy);
-        test(checksum != null);
-
-        //
-        // Verify that no checksums are present for local types.
-        //
-        Console.Out.Write("testing checksums... ");
-        Console.Out.Flush();
-        foreach(KeyValuePair<string, string> entry in Ice.SliceChecksums.checksums)
-        {
-            string key = entry.Key;
-            int pos = key.IndexOf("Local");
-            test(pos == -1);
-        }
-
-        //
-        // Get server's Slice checksums.
-        //
-        Dictionary<string, string> d = checksum.getSliceChecksums();
-
-        //
-        // Compare the checksums. For a type FooN whose name ends in an integer N,
-        // we assume that the server's type does not change for N = 1, and does
-        // change for N > 1.
-        //
-        char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
-        foreach(KeyValuePair<string, string> entry in d)
+        public class AllTests : global::Test.AllTests
         {
-            string key = entry.Key;
-            int start = key.IndexOfAny(digits);
-            if(start != -1)
+            public static Test.ChecksumPrx
+            allTests(global::Test.TestHelper helper, bool collocated)
             {
-                int end = start;
-                while(end < key.Length && char.IsDigit(key[end]))
+                var output = helper.getWriter();
+                Ice.Communicator communicator = helper.communicator();
+                string rf = "test:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
+                test(baseProxy != null);
+
+                Test.ChecksumPrx checksum = Test.ChecksumPrxHelper.checkedCast(baseProxy);
+                test(checksum != null);
+
+                //
+                // Verify that no checksums are present for local types.
+                //
+                output.Write("testing checksums... ");
+                output.Flush();
+                foreach(KeyValuePair<string, string> entry in Ice.SliceChecksums.checksums)
                 {
-                    end++;
+                    string key = entry.Key;
+                    int pos = key.IndexOf("Local");
+                    test(pos == -1);
                 }
-                int n = int.Parse(key.Substring(start, end - start));
-
-                string value = Ice.SliceChecksums.checksums[key];
-                test(value != null);
 
-                if(n <= 1)
+                //
+                // Get server's Slice checksums.
+                //
+                Dictionary<string, string> d = checksum.getSliceChecksums();
+
+                //
+                // Compare the checksums. For a type FooN whose name ends in an integer N,
+                // we assume that the server's type does not change for N = 1, and does
+                // change for N > 1.
+                //
+                char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+                foreach(KeyValuePair<string, string> entry in d)
                 {
-                    test(value.Equals(entry.Value));
+                    string key = entry.Key;
+                    int start = key.IndexOfAny(digits);
+                    if(start != -1)
+                    {
+                        int end = start;
+                        while(end < key.Length && char.IsDigit(key[end]))
+                        {
+                            end++;
+                        }
+                        int n = int.Parse(key.Substring(start, end - start));
+
+                        string value = Ice.SliceChecksums.checksums[key];
+                        test(value != null);
+
+                        if(n <= 1)
+                        {
+                            test(value.Equals(entry.Value));
+                        }
+                        else
+                        {
+                            test(!value.Equals(entry.Value));
+                        }
+                    }
                 }
-                else
-                {
-                    test(!value.Equals(entry.Value));
-                }
-            }
-        }
 
-        Console.Out.WriteLine("ok");
+                output.WriteLine("ok");
 
-        return checksum;
+                return checksum;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/checksum/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
-using System.Diagnostics;
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace checksum
     {
-        Test.ChecksumPrx checksum = AllTests.allTests(this, false);
-        checksum.shutdown();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var checksum = AllTests.allTests(this, false);
+                    checksum.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/ClientTypes.ice zeroc-ice-3.7.2/csharp/test/Ice/checksum/ClientTypes.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/ClientTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/ClientTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,21 +43,21 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
-    <Compile Include="generated\ClientTypes.cs"/>
+    <Compile Include="generated\Test.cs" />
+    <Compile Include="generated\ClientTypes.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
     <SliceCompile Include="..\..\..\ClientTypes.ice">
       <Link>ClientTypes.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <AdditionalOptions>--checksum</AdditionalOptions>
@@ -67,9 +67,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
-    <SliceCompile Include="../../../ClientTypes.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\ClientTypes.cs">
+      <SliceCompileSource>../../../ClientTypes.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../ClientTypes.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,8 +43,8 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
-    <Compile Include="generated\ServerTypes.cs"/>
+    <Compile Include="generated\Test.cs" />
+    <Compile Include="generated\ServerTypes.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Test.ice">
@@ -53,11 +53,11 @@
     <SliceCompile Include="..\..\..\ServerTypes.ice">
       <Link>ServerTypes.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <AdditionalOptions>--checksum</AdditionalOptions>
@@ -67,9 +67,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
-    <SliceCompile Include="../../../ServerTypes.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\ServerTypes.cs">
+      <SliceCompileSource>../../../ServerTypes.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../ServerTypes.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.checksum</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/checksum/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace checksum
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object @object = new Test.ChecksumI();
-        adapter.add(@object, Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new ChecksumI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/ServerTypes.ice zeroc-ice-3.7.2/csharp/test/Ice/checksum/ServerTypes.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/ServerTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/ServerTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/checksum/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/SliceChecksumDict.ice>
 
+["cs:namespace:Ice.checksum"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/checksum/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/checksum/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/checksum/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/checksum/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 
-namespace Test
+namespace Ice
 {
-    public sealed class ChecksumI : ChecksumDisp_
+    namespace checksum
     {
-        public ChecksumI()
-        {
-        }
 
-        public override Dictionary<string, string> getSliceChecksums(Ice.Current current)
+        public sealed class ChecksumI : Test.ChecksumDisp_
         {
-            return Ice.SliceChecksums.checksums;
-        }
+            public ChecksumI()
+            {
+            }
 
-        public override void shutdown(Ice.Current current)
-        {
-            current.adapter.getCommunicator().shutdown();
+            public override Dictionary<string, string> getSliceChecksums(Ice.Current current)
+            {
+                return Ice.SliceChecksums.checksums;
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,168 +1,160 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
 
-public class AllTests
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    public static void
-    allTests(TestCommon.Application app)
+    namespace defaultServant
     {
-        Ice.Communicator communicator = app.communicator();
-        Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost");
-        oa.activate();
-
-        Ice.Object servant = new MyObjectI();
-
-        //
-        // Register default servant with category "foo"
-        //
-        oa.addDefaultServant(servant, "foo");
-
-        //
-        // Start test
-        //
-        Console.Out.Write("testing single category... ");
-        Console.Out.Flush();
-
-        Ice.Object r = oa.findDefaultServant("foo");
-        test(r == servant);
-
-        r = oa.findDefaultServant("bar");
-        test(r == null);
-
-        Ice.Identity identity = new Ice.Identity();
-        identity.category = "foo";
-
-        string[] names = new string[] { "foo", "bar", "x", "y", "abcdefg" };
-
-        Test.MyObjectPrx prx = null;
-        for(int idx = 0; idx < 5; ++idx)
-        {
-            identity.name = names[idx];
-            prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
-            prx.ice_ping();
-            test(prx.getName() == names[idx]);
-        }
-
-        identity.name = "ObjectNotExist";
-        prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
-        try
-        {
-            prx.ice_ping();
-            test(false);
-        }
-        catch(Ice.ObjectNotExistException)
-        {
-            // Expected
-        }
-
-        try
-        {
-            prx.getName();
-            test(false);
-        }
-        catch(Ice.ObjectNotExistException)
-        {
-            // Expected
-        }
-
-        identity.name = "FacetNotExist";
-        prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
-        try
-        {
-            prx.ice_ping();
-            test(false);
-        }
-        catch(Ice.FacetNotExistException)
+        public class AllTests : global::Test.AllTests
         {
-            // Expected
-        }
-
-        try
-        {
-            prx.getName();
-            test(false);
-        }
-        catch(Ice.FacetNotExistException)
-        {
-            // Expected
-        }
-
-        identity.category = "bar";
-        for(int idx = 0; idx < 5; idx++)
-        {
-            identity.name = names[idx];
-            prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
-
-            try
-            {
-                prx.ice_ping();
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException)
+            public static void
+            allTests(global::Test.TestHelper helper)
             {
-                // Expected
-            }
+                var output = helper.getWriter();
+                Ice.Communicator communicator = helper.communicator();
+                Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost");
+                oa.activate();
+
+                Ice.Object servant = new MyObjectI();
+
+                //
+                // Register default servant with category "foo"
+                //
+                oa.addDefaultServant(servant, "foo");
+
+                //
+                // Start test
+                //
+                output.Write("testing single category... ");
+                output.Flush();
+
+                Ice.Object r = oa.findDefaultServant("foo");
+                test(r == servant);
+
+                r = oa.findDefaultServant("bar");
+                test(r == null);
+
+                Ice.Identity identity = new Ice.Identity();
+                identity.category = "foo";
+
+                string[] names = new string[] { "foo", "bar", "x", "y", "abcdefg" };
+
+                Test.MyObjectPrx prx = null;
+                for(int idx = 0; idx < 5; ++idx)
+                {
+                    identity.name = names[idx];
+                    prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
+                    prx.ice_ping();
+                    test(prx.getName() == names[idx]);
+                }
+
+                identity.name = "ObjectNotExist";
+                prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
+                try
+                {
+                    prx.ice_ping();
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    // Expected
+                }
+
+                try
+                {
+                    prx.getName();
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    // Expected
+                }
+
+                identity.name = "FacetNotExist";
+                prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
+                try
+                {
+                    prx.ice_ping();
+                    test(false);
+                }
+                catch(Ice.FacetNotExistException)
+                {
+                    // Expected
+                }
+
+                try
+                {
+                    prx.getName();
+                    test(false);
+                }
+                catch(Ice.FacetNotExistException)
+                {
+                    // Expected
+                }
+
+                identity.category = "bar";
+                for(int idx = 0; idx < 5; idx++)
+                {
+                    identity.name = names[idx];
+                    prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
+
+                    try
+                    {
+                        prx.ice_ping();
+                        test(false);
+                    }
+                    catch(Ice.ObjectNotExistException)
+                    {
+                        // Expected
+                    }
+
+                    try
+                    {
+                        prx.getName();
+                        test(false);
+                    }
+                    catch(Ice.ObjectNotExistException)
+                    {
+                        // Expected
+                    }
+                }
+
+                oa.removeDefaultServant("foo");
+                identity.category = "foo";
+                prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
+                try
+                {
+                    prx.ice_ping();
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    // Expected
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("testing default category... ");
+                output.Flush();
+
+                oa.addDefaultServant(servant, "");
+
+                r = oa.findDefaultServant("bar");
+                test(r == null);
+
+                r = oa.findDefaultServant("");
+                test(r == servant);
+
+                for(int idx = 0; idx < 5; ++idx)
+                {
+                    identity.name = names[idx];
+                    prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
+                    prx.ice_ping();
+                    test(prx.getName() == names[idx]);
+                }
 
-            try
-            {
-                prx.getName();
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException)
-            {
-                // Expected
+                output.WriteLine("ok");
             }
         }
-
-        oa.removeDefaultServant("foo");
-        identity.category = "foo";
-        prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
-        try
-        {
-            prx.ice_ping();
-        }
-        catch(Ice.ObjectNotExistException)
-        {
-            // Expected
-        }
-
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing default category... ");
-        Console.Out.Flush();
-
-        oa.addDefaultServant(servant, "");
-
-        r = oa.findDefaultServant("bar");
-        test(r == null);
-
-        r = oa.findDefaultServant("");
-        test(r == servant);
-
-        for(int idx = 0; idx < 5; ++idx)
-        {
-            identity.name = names[idx];
-            prx = Test.MyObjectPrxHelper.uncheckedCast(oa.createProxy(identity));
-            prx.ice_ping();
-            test(prx.getName() == names[idx]);
-        }
-
-        Console.Out.WriteLine("ok");
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace defaultServant
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -46,24 +46,24 @@
     <Compile Include="..\..\..\MyObjectI.cs">
       <Link>MyObjectI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../MyObjectI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../MyObjectI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.defaultServant</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../MyObjectI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/MyObjectI.cs zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/MyObjectI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/MyObjectI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/MyObjectI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,44 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class MyObjectI : Test.MyObjectDisp_
+namespace Ice
 {
-    public override void
-    ice_ping(Ice.Current current)
+    namespace defaultServant
     {
-        string name = current.id.name;
-
-        if(name == "ObjectNotExist")
-        {
-            throw new Ice.ObjectNotExistException();
-        }
-        else if(name == "FacetNotExist")
+        public sealed class MyObjectI : Test.MyObjectDisp_
         {
-            throw new Ice.FacetNotExistException();
-        }
-    }
+            public override void
+            ice_ping(Ice.Current current)
+            {
+                string name = current.id.name;
 
-    public override string
-    getName(Ice.Current current)
-    {
-        string name = current.id.name;
+                if(name == "ObjectNotExist")
+                {
+                    throw new Ice.ObjectNotExistException();
+                }
+                else if(name == "FacetNotExist")
+                {
+                    throw new Ice.FacetNotExistException();
+                }
+            }
 
-        if(name == "ObjectNotExist")
-        {
-            throw new Ice.ObjectNotExistException();
-        }
-        else if(name == "FacetNotExist")
-        {
-            throw new Ice.FacetNotExistException();
-        }
+            public override string
+            getName(Ice.Current current)
+            {
+                string name = current.id.name;
+
+                if(name == "ObjectNotExist")
+                {
+                    throw new Ice.ObjectNotExistException();
+                }
+                else if(name == "FacetNotExist")
+                {
+                    throw new Ice.FacetNotExistException();
+                }
 
-        return name;
+                return name;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultServant/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultServant/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.defaultServant"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,310 +1,312 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static void allTests()
+    namespace defaultValue
     {
-        Write("testing default values... ");
-        Flush();
-
-        {
-            Test.Struct1 v = new Test.Struct1();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 254);
-            test(v.s == 16000);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == (float)5.1);
-            test(v.d == 6.2);
-            test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
-            test(v.c1 == Test.Color.red);
-            test(v.c2 == Test.Color.green);
-            test(v.c3 == Test.Color.blue);
-            test(v.nc1 == Test.Nested.Color.red);
-            test(v.nc2 == Test.Nested.Color.green);
-            test(v.nc3 == Test.Nested.Color.blue);
-            test(v.noDefault.Equals(""));
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.Struct2 v = new Test.Struct2();
-            test(v.boolTrue == Test.ConstBool.value);
-            test(v.b == Test.ConstByte.value);
-            test(v.s == Test.ConstShort.value);
-            test(v.i == Test.ConstInt.value);
-            test(v.l == Test.ConstLong.value);
-            test(v.f == Test.ConstFloat.value);
-            test(v.d == Test.ConstDouble.value);
-            test(v.str.Equals(Test.ConstString.value));
-            test(v.c1 == Test.ConstColor1.value);
-            test(v.c2 == Test.ConstColor2.value);
-            test(v.c3 == Test.ConstColor3.value);
-            test(v.nc1 == Test.ConstNestedColor1.value);
-            test(v.nc2 == Test.ConstNestedColor2.value);
-            test(v.nc3 == Test.ConstNestedColor3.value);
-            test(v.zeroI == Test.ConstZeroI.value);
-            test(v.zeroL == Test.ConstZeroL.value);
-            test(v.zeroF == Test.ConstZeroF.value);
-            test(v.zeroDotF == Test.ConstZeroDotF.value);
-            test(v.zeroD == Test.ConstZeroD.value);
-            test(v.zeroDotD == Test.ConstZeroDotD.value);
-        }
-
-        {
-            Test.Struct3 v = new Test.Struct3();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            //test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
-            //test(v.str.Equals("foo bar"));
-            test(v.c1 == Test.Color.red);
-            test(v.c2 == Test.Color.green);
-            test(v.c3 == Test.Color.blue);
-            test(v.nc1 == Test.Nested.Color.red);
-            test(v.nc2 == Test.Nested.Color.green);
-            test(v.nc3 == Test.Nested.Color.blue);
-            //test(v.noDefault == null);
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.Struct4 v = new Test.Struct4();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            //test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
-            //test(v.str.Equals("foo bar"));
-            test(v.c1 == Test.Color.red);
-            test(v.c2 == Test.Color.green);
-            test(v.c3 == Test.Color.blue);
-            test(v.nc1 == Test.Nested.Color.red);
-            test(v.nc2 == Test.Nested.Color.green);
-            test(v.nc3 == Test.Nested.Color.blue);
-            //test(v.noDefault == null);
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.Base v = new Test.Base();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
-            test(v.noDefault.Equals(""));
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.Derived v = new Test.Derived();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
-            test(v.c1 == Test.Color.red);
-            test(v.c2 == Test.Color.green);
-            test(v.c3 == Test.Color.blue);
-            test(v.nc1 == Test.Nested.Color.red);
-            test(v.nc2 == Test.Nested.Color.green);
-            test(v.nc3 == Test.Nested.Color.blue);
-            test(v.noDefault.Equals(""));
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.BaseEx v = new Test.BaseEx();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007");
-            test(v.noDefault.Equals(""));
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.DerivedEx v = new Test.DerivedEx();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007");
-            test(v.noDefault.Equals(""));
-            test(v.c1 == Test.Color.red);
-            test(v.c2 == Test.Color.green);
-            test(v.c3 == Test.Color.blue);
-            test(v.nc1 == Test.Nested.Color.red);
-            test(v.nc2 == Test.Nested.Color.green);
-            test(v.nc3 == Test.Nested.Color.blue);
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.ClassProperty v = new Test.ClassProperty();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            test(v.str.Equals("foo bar"));
-            test(v.noDefault.Equals(""));
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.StructProperty v = new Test.StructProperty();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        {
-            Test.ExceptionProperty v = new Test.ExceptionProperty();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b == 1);
-            test(v.s == 2);
-            test(v.i == 3);
-            test(v.l == 4);
-            test(v.f == 5.1F);
-            test(v.d == 6.2);
-            test(v.str.Equals("foo bar"));
-            test(v.noDefault.Equals(""));
-            test(v.zeroI == 0);
-            test(v.zeroL == 0);
-            test(v.zeroF == 0);
-            test(v.zeroDotF == 0);
-            test(v.zeroD == 0);
-            test(v.zeroDotD == 0);
-        }
-
-        WriteLine("ok");
-
-        Write("testing default constructor... ");
-        Flush();
+        public class AllTests : global::Test.AllTests
         {
-            Test.StructNoDefaults v = new Test.StructNoDefaults();
-            test(v.bo == false);
-            test(v.b == 0);
-            test(v.s == 0);
-            test(v.i == 0);
-            test(v.l == 0);
-            test(v.f == 0.0);
-            test(v.d == 0.0);
-            test(v.str.Equals(""));
-            test(v.c1 == Test.Color.red);
-            test(v.bs == null);
-            test(v.iseq == null);
-            test(v.st.a == 0);
-            test(v.st2 != null);
-            test(v.dict == null);
-
-            Test.ExceptionNoDefaults e = new Test.ExceptionNoDefaults();
-            test(e.str.Equals(""));
-            test(e.c1 == Test.Color.red);
-            test(e.bs == null);
-            test(e.st.a == 0);
-            test(e.st2 != null);
-            test(e.dict == null);
-
-            Test.ClassNoDefaults cl = new Test.ClassNoDefaults();
-            test(cl.str.Equals(""));
-            test(cl.c1 == Test.Color.red);
-            test(cl.bs == null);
-            test(cl.st.a == 0);
-            test(cl.st2 != null);
-            test(cl.dict == null);
+            public static void allTests(global::Test.TestHelper helper)
+            {
+                var output = helper.getWriter();
+                output.Write("testing default values... ");
+                output.Flush();
+
+                {
+                    Test.Struct1 v = new Test.Struct1();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 254);
+                    test(v.s == 16000);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f ==(float)5.1);
+                    test(v.d == 6.2);
+                    test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
+                    test(v.c1 == Test.Color.red);
+                    test(v.c2 == Test.Color.green);
+                    test(v.c3 == Test.Color.blue);
+                    test(v.nc1 == Test.Nested.Color.red);
+                    test(v.nc2 == Test.Nested.Color.green);
+                    test(v.nc3 == Test.Nested.Color.blue);
+                    test(v.noDefault.Equals(""));
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.Struct2 v = new Test.Struct2();
+                    test(v.boolTrue == Test.ConstBool.value);
+                    test(v.b == Test.ConstByte.value);
+                    test(v.s == Test.ConstShort.value);
+                    test(v.i == Test.ConstInt.value);
+                    test(v.l == Test.ConstLong.value);
+                    test(v.f == Test.ConstFloat.value);
+                    test(v.d == Test.ConstDouble.value);
+                    test(v.str.Equals(Test.ConstString.value));
+                    test(v.c1 == Test.ConstColor1.value);
+                    test(v.c2 == Test.ConstColor2.value);
+                    test(v.c3 == Test.ConstColor3.value);
+                    test(v.nc1 == Test.ConstNestedColor1.value);
+                    test(v.nc2 == Test.ConstNestedColor2.value);
+                    test(v.nc3 == Test.ConstNestedColor3.value);
+                    test(v.zeroI == Test.ConstZeroI.value);
+                    test(v.zeroL == Test.ConstZeroL.value);
+                    test(v.zeroF == Test.ConstZeroF.value);
+                    test(v.zeroDotF == Test.ConstZeroDotF.value);
+                    test(v.zeroD == Test.ConstZeroD.value);
+                    test(v.zeroDotD == Test.ConstZeroDotD.value);
+                }
+
+                {
+                    Test.Struct3 v = new Test.Struct3();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    //test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
+                    //test(v.str.Equals("foo bar"));
+                    test(v.c1 == Test.Color.red);
+                    test(v.c2 == Test.Color.green);
+                    test(v.c3 == Test.Color.blue);
+                    test(v.nc1 == Test.Nested.Color.red);
+                    test(v.nc2 == Test.Nested.Color.green);
+                    test(v.nc3 == Test.Nested.Color.blue);
+                    //test(v.noDefault == null);
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.Struct4 v = new Test.Struct4();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    //test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
+                    //test(v.str.Equals("foo bar"));
+                    test(v.c1 == Test.Color.red);
+                    test(v.c2 == Test.Color.green);
+                    test(v.c3 == Test.Color.blue);
+                    test(v.nc1 == Test.Nested.Color.red);
+                    test(v.nc2 == Test.Nested.Color.green);
+                    test(v.nc3 == Test.Nested.Color.blue);
+                    //test(v.noDefault == null);
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.Base v = new Test.Base();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
+                    test(v.noDefault.Equals(""));
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.Derived v = new Test.Derived();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    test(v.str.Equals("foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007"));
+                    test(v.c1 == Test.Color.red);
+                    test(v.c2 == Test.Color.green);
+                    test(v.c3 == Test.Color.blue);
+                    test(v.nc1 == Test.Nested.Color.red);
+                    test(v.nc2 == Test.Nested.Color.green);
+                    test(v.nc3 == Test.Nested.Color.blue);
+                    test(v.noDefault.Equals(""));
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.BaseEx v = new Test.BaseEx();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007");
+                    test(v.noDefault.Equals(""));
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.DerivedEx v = new Test.DerivedEx();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b? \u0007 \u0007");
+                    test(v.noDefault.Equals(""));
+                    test(v.c1 == Test.Color.red);
+                    test(v.c2 == Test.Color.green);
+                    test(v.c3 == Test.Color.blue);
+                    test(v.nc1 == Test.Nested.Color.red);
+                    test(v.nc2 == Test.Nested.Color.green);
+                    test(v.nc3 == Test.Nested.Color.blue);
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.ClassProperty v = new Test.ClassProperty();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    test(v.str.Equals("foo bar"));
+                    test(v.noDefault.Equals(""));
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.StructProperty v = new Test.StructProperty();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                {
+                    Test.ExceptionProperty v = new Test.ExceptionProperty();
+                    test(!v.boolFalse);
+                    test(v.boolTrue);
+                    test(v.b == 1);
+                    test(v.s == 2);
+                    test(v.i == 3);
+                    test(v.l == 4);
+                    test(v.f == 5.1F);
+                    test(v.d == 6.2);
+                    test(v.str.Equals("foo bar"));
+                    test(v.noDefault.Equals(""));
+                    test(v.zeroI == 0);
+                    test(v.zeroL == 0);
+                    test(v.zeroF == 0);
+                    test(v.zeroDotF == 0);
+                    test(v.zeroD == 0);
+                    test(v.zeroDotD == 0);
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("testing default constructor... ");
+                output.Flush();
+                {
+                    Test.StructNoDefaults v = new Test.StructNoDefaults();
+                    test(v.bo == false);
+                    test(v.b == 0);
+                    test(v.s == 0);
+                    test(v.i == 0);
+                    test(v.l == 0);
+                    test(v.f == 0.0);
+                    test(v.d == 0.0);
+                    test(v.str.Equals(""));
+                    test(v.c1 == Test.Color.red);
+                    test(v.bs == null);
+                    test(v.iseq == null);
+                    test(v.st.a == 0);
+                    test(v.st2 != null);
+                    test(v.dict == null);
+
+                    Test.ExceptionNoDefaults e = new Test.ExceptionNoDefaults();
+                    test(e.str.Equals(""));
+                    test(e.c1 == Test.Color.red);
+                    test(e.bs == null);
+                    test(e.st.a == 0);
+                    test(e.st2 != null);
+                    test(e.dict == null);
+
+                    Test.ClassNoDefaults cl = new Test.ClassNoDefaults();
+                    test(cl.str.Equals(""));
+                    test(cl.c1 == Test.Color.red);
+                    test(cl.bs == null);
+                    test(cl.st.a == 0);
+                    test(cl.st2 != null);
+                    test(cl.dict == null);
+                }
+                output.WriteLine("ok");
+            }
         }
-        WriteLine("ok");
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace defaultValue
     {
-        AllTests.allTests();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                AllTests.allTests(this);
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.defaultValue</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 //
 // Suppress warnings
 //
-[["suppress-warning:invalid-metadata, deprecated"]]
+[["suppress-warning:invalid-metadata, deprecated", "cs:typeid-namespace:Ice.defaultValue.TypeId"]]
+["cs:namespace:Ice.defaultValue"]
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static Test.MyClassPrx allTests(TestCommon.Application app, bool collocated)
+    namespace dictMapping
     {
-        Ice.Communicator communicator = app.communicator();
-        Flush();
-        string rf = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
-        Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
+        public class AllTests : global::Test.AllTests
+        {
+            public static Test.MyClassPrx allTests(global::Test.TestHelper helper, bool collocated)
+            {
+                var communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Flush();
+                string rf = "test:" + helper.getTestEndpoint(0);
+                var baseProxy = communicator.stringToProxy(rf);
+                var cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
 
-        Write("testing twoway operations... ");
-        Flush();
-        Twoways.twoways(communicator, cl);
-        WriteLine("ok");
+                output.Write("testing twoway operations... ");
+                output.Flush();
+                Twoways.twoways(communicator, cl);
+                output.WriteLine("ok");
 
-        if(!collocated)
-        {
-            Write("testing twoway operations with AMI... ");
-            Flush();
-            TwowaysAMI.twowaysAMI(communicator, cl);
-            WriteLine("ok");
+                if(!collocated)
+                {
+                    output.Write("testing twoway operations with AMI... ");
+                    output.Flush();
+                    TwowaysAMI.twowaysAMI(communicator, cl);
+                    output.WriteLine("ok");
+                }
+                return cl;
+            }
         }
-        return cl;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        Test.MyClassPrx myClass = AllTests.allTests(this, false);
-
-        Console.Out.Write("shutting down server... ");
-        Console.Out.Flush();
-        myClass.shutdown();
-        Console.Out.WriteLine("ok");
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace dictMapping
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var output = getWriter();
+                    var myClass = AllTests.allTests(this, false);
+                    output.Write("shutting down server... ");
+                    output.Flush();
+                    myClass.shutdown();
+                    output.WriteLine("ok");
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this, true);
-
-        return 0;
-    }
-
-    public static int Main(String[] args)
+    namespace dictMapping
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+                    //adapter.activate(); // Don't activate OA to ensure collocation is used.
+                    AllTests.allTests(this, true);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -49,24 +49,24 @@
     <Compile Include="..\..\..\TwowaysAMI.cs">
       <Link>TwowaysAMI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../Twoways.cs"/>
-    <Compile Include="../../../TwowaysAMI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -52,14 +52,14 @@
     <Compile Include="..\..\..\TwowaysAMI.cs">
       <Link>TwowaysAMI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -73,15 +73,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../MyClassI.cs"/>
-    <Compile Include="../../../Twoways.cs"/>
-    <Compile Include="../../../TwowaysAMI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../MyClassI.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyClassI.cs">
       <Link>MyClassI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyClassI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyClassI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7633BEAC-89D4-4DC8-9148-5830395.0.40}</ProjectGuid>
+    <ProjectGuid>{7633BEAC-89D4-4DC8-9148-583039000000}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyClassAMDI.cs">
       <Link>MyClassAMDI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Server.cs">
-      <Link>Server.cs</Link>
+    <Compile Include="..\..\..\ServerAMD.cs">
+      <Link>ServerAMD.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyClassAMDI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyClassAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.dictMapping</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="../../../MyClassI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="..\..\..\MyClassAMDI.cs" Link="MyClassAMDI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/MyClassAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/MyClassAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/MyClassAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/MyClassAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,69 +1,72 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Test;
 
-public sealed class MyClassI : MyClassDisp_
+namespace Ice
 {
-    public override Task shutdownAsync(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-        return null;
-    }
-
-    public override Task<MyClass_OpNVResult>
-    opNVAsync(Dictionary<int, int> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpNVResult>(new MyClass_OpNVResult(i, i));
-    }
-
-    public override Task<MyClass_OpNRResult>
-    opNRAsync(Dictionary<string, string> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpNRResult>(new MyClass_OpNRResult(i, i));
-    }
-
-    public override Task<MyClass_OpNDVResult>
-    opNDVAsync(Dictionary<string, Dictionary<int, int>> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpNDVResult>(new MyClass_OpNDVResult(i, i));
-    }
-
-    public override Task<MyClass_OpNDRResult>
-    opNDRAsync(Dictionary<string, Dictionary<string, string>> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpNDRResult>(new MyClass_OpNDRResult(i, i));
-    }
-
-    public override Task<MyClass_OpNDAISResult>
-    opNDAISAsync(Dictionary<string, int[]> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpNDAISResult>(new MyClass_OpNDAISResult(i, i));
-    }
-
-    public override Task<MyClass_OpNDGISResult>
-    opNDGISAsync(Dictionary<string, List<int>> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpNDGISResult>(new MyClass_OpNDGISResult(i, i));
-    }
-
-    public override Task<MyClass_OpNDASSResult>
-    opNDASSAsync(Dictionary<string, string[]> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpNDASSResult>(new MyClass_OpNDASSResult(i, i));
-    }
-
-    public override Task<MyClass_OpNDGSSResult>
-    opNDGSSAsync(Dictionary<string, List<string>> i, Ice.Current current)
+    namespace dictMapping
     {
-        return Task.FromResult<MyClass_OpNDGSSResult>(new MyClass_OpNDGSSResult(i, i));
+        namespace AMD
+        {
+            public sealed class MyClassI : Test.MyClassDisp_
+            {
+                public override Task shutdownAsync(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                    return null;
+                }
+
+                public override Task<Test.MyClass_OpNVResult>
+                opNVAsync(Dictionary<int, int> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNVResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpNRResult>
+                opNRAsync(Dictionary<string, string> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNRResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpNDVResult>
+                opNDVAsync(Dictionary<string, Dictionary<int, int>> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNDVResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpNDRResult>
+                opNDRAsync(Dictionary<string, Dictionary<string, string>> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNDRResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpNDAISResult>
+                opNDAISAsync(Dictionary<string, int[]> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNDAISResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpNDGISResult>
+                opNDGISAsync(Dictionary<string, List<int>> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNDGISResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpNDASSResult>
+                opNDASSAsync(Dictionary<string, string[]> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNDASSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpNDGSSResult>
+                opNDGSSAsync(Dictionary<string, List<string>> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpNDGSSResult(i, i));
+                }
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/MyClassI.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/MyClassI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/MyClassI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/MyClassI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,81 +1,82 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 
-public sealed class MyClassI : Test.MyClassDisp_
+namespace Ice
 {
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    public override Dictionary<int, int> opNV(Dictionary<int, int> i, out Dictionary<int, int> o,
-                                              Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Dictionary<string, string> opNR(Dictionary<string, string> i, out Dictionary<string, string> o,
-                                                    Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Dictionary<string, Dictionary<int, int>> opNDV(Dictionary<string, Dictionary<int, int>> i,
-                                                                   out Dictionary<string, Dictionary<int, int>> o,
-                                                                   Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Dictionary<string, Dictionary<string, string>> opNDR(Dictionary<
-                                                               string, Dictionary<string, string>> i,
-                                                               out Dictionary<string, Dictionary<string, string>> o,
-                                                               Ice.Current current)
+    namespace dictMapping
     {
-        o = i;
-        return i;
-    }
+        public sealed class MyClassI : Test.MyClassDisp_
+        {
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
 
-    public override Dictionary<string, int[]> opNDAIS(Dictionary<string, int[]> i,
-                                                      out Dictionary<string, int[]> o,
+            public override Dictionary<int, int> opNV(Dictionary<int, int> i, out Dictionary<int, int> o,
                                                       Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Dictionary<string, List<int>> opNDGIS(Dictionary<string, List<int>> i,
-                                                          out Dictionary<string, List<int>> o,
-                                                          Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Dictionary<string, string[]> opNDASS(Dictionary<string, string[]> i,
-                                                         out Dictionary<string, string[]> o,
-                                                         Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Dictionary<string, List<string>> opNDGSS(Dictionary<string, List<string>> i,
-                                                             out Dictionary<string, List<string>> o,
-                                                             Ice.Current current)
-    {
-        o = i;
-        return i;
+            {
+                o = i;
+                return i;
+            }
+
+            public override Dictionary<string, string> opNR(Dictionary<string, string> i, out Dictionary<string, string> o,
+                                                            Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Dictionary<string, Dictionary<int, int>> opNDV(Dictionary<string, Dictionary<int, int>> i,
+                                                                           out Dictionary<string, Dictionary<int, int>> o,
+                                                                           Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Dictionary<string, Dictionary<string, string>> opNDR(Dictionary<
+                                                                       string, Dictionary<string, string>> i,
+                                                                       out Dictionary<string, Dictionary<string, string>> o,
+                                                                       Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Dictionary<string, int[]> opNDAIS(Dictionary<string, int[]> i,
+                                                              out Dictionary<string, int[]> o,
+                                                              Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Dictionary<string, List<int>> opNDGIS(Dictionary<string, List<int>> i,
+                                                                  out Dictionary<string, List<int>> o,
+                                                                  Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Dictionary<string, string[]> opNDASS(Dictionary<string, string[]> i,
+                                                                 out Dictionary<string, string[]> o,
+                                                                 Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Dictionary<string, List<string>> opNDGSS(Dictionary<string, List<string>> i,
+                                                                     out Dictionary<string, List<string>> o,
+                                                                     Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/ServerAMD.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace dictMapping
+    {
+        namespace AMD
+        {
+            public class Server : TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    using(var communicator = initialize(ref args))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+                        adapter.activate();
+                        serverReady();
+                        communicator.waitForShutdown();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return TestDriver.runTest<Server>(args);
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace dictMapping
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.dictMapping.AMD"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.dictMapping"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/TwowaysAMI.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/TwowaysAMI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/TwowaysAMI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/TwowaysAMI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,269 +1,267 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Diagnostics;
 using System.Collections.Generic;
-using Test;
-using System.Threading.Tasks;
 
-public class TwowaysAMI
+namespace Ice
 {
-    private static void test(bool b)
+    namespace dictMapping
     {
-        if(!b)
-        {
-            throw new System.SystemException();
-        }
-    }
-
-    private class CallbackBase
-    {
-        internal CallbackBase()
-        {
-            _called = false;
-        }
-
-        public virtual void check()
+        public class TwowaysAMI
         {
-            lock(this)
+            private static void test(bool b)
             {
-                while(!_called)
+                if(!b)
                 {
-                    System.Threading.Monitor.Wait(this);
+                    throw new System.SystemException();
                 }
-
-                _called = false;
             }
-        }
 
-        public virtual void called()
-        {
-            lock(this)
+            private class CallbackBase
             {
-                Debug.Assert(!_called);
-                _called = true;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
+                internal CallbackBase()
+                {
+                    _called = false;
+                }
 
-        private bool _called;
-    }
+                public virtual void check()
+                {
+                    lock(this)
+                    {
+                        while(!_called)
+                        {
+                            System.Threading.Monitor.Wait(this);
+                        }
 
-    private class Callback
-    {
-        public void opNVI(Ice.AsyncResult result)
-        {
-            Dictionary<int, int> i = (Dictionary<int, int>)result.AsyncState;
-            Dictionary<int, int> o;
-            Dictionary<int, int> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNV(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                        _called = false;
+                    }
+                }
 
-        public void opNRI(Ice.AsyncResult result)
-        {
-            Dictionary<string, string> i = (Dictionary<string, string>)result.AsyncState;
-            Dictionary<string, string> o;
-            Dictionary<string, string> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNR(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public virtual void called()
+                {
+                    lock(this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        System.Threading.Monitor.Pulse(this);
+                    }
+                }
 
-        public void opNDVI(Ice.AsyncResult result)
-        {
-            Dictionary<string, Dictionary<int, int>> i = (Dictionary<string, Dictionary<int, int>>)result.AsyncState;
-            Dictionary<string, Dictionary<int, int>> o;
-            Dictionary<string, Dictionary<int, int>> r =
-                MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDV(out o, result);
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                private bool _called;
             }
-            callback.called();
-        }
 
-        public void opNDRI(Ice.AsyncResult result)
-        {
-            Dictionary<string, Dictionary<string, string>> i =
-                (Dictionary<string, Dictionary<string, string>>)result.AsyncState;
-            Dictionary<string, Dictionary<string, string>> o;
-            Dictionary<string, Dictionary<string, string>> r =
-                MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDR(out o, result);
-            foreach(string key in i.Keys)
+            private class Callback
             {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-            callback.called();
-        }
+                public void opNVI(Ice.AsyncResult result)
+                {
+                    Dictionary<int, int> i =(Dictionary<int, int>)result.AsyncState;
+                    Dictionary<int, int> o;
+                    Dictionary<int, int> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNV(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opNDAISI(Ice.AsyncResult result)
-        {
-            Dictionary<string, int[]> i = (Dictionary<string, int[]>)result.AsyncState;
-            Dictionary<string, int[]> o;
-            Dictionary<string, int[]> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDAIS(out o, result);
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-            callback.called();
-        }
+                public void opNRI(Ice.AsyncResult result)
+                {
+                    Dictionary<string, string> i =(Dictionary<string, string>)result.AsyncState;
+                    Dictionary<string, string> o;
+                    Dictionary<string, string> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNR(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opNDGISI(Ice.AsyncResult result)
-        {
-            Dictionary<string, List<int>> i = (Dictionary<string, List<int>>)result.AsyncState;
-            Dictionary<string, List<int>> o;
-            Dictionary<string, List<int>> r =
-                MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDGIS(out o, result);
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-            callback.called();
-        }
+                public void opNDVI(Ice.AsyncResult result)
+                {
+                    Dictionary<string, Dictionary<int, int>> i =(Dictionary<string, Dictionary<int, int>>)result.AsyncState;
+                    Dictionary<string, Dictionary<int, int>> o;
+                    Dictionary<string, Dictionary<int, int>> r =
+                        Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDV(out o, result);
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                    callback.called();
+                }
 
-        public void opNDASSI(Ice.AsyncResult result)
-        {
-            Dictionary<string, string[]> i = (Dictionary<string,string[]>)result.AsyncState;
-            Dictionary<string, string[]> o;
-            Dictionary<string, string[]> r =
-                MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDASS(out o, result);
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-            callback.called();
-        }
+                public void opNDRI(Ice.AsyncResult result)
+                {
+                    Dictionary<string, Dictionary<string, string>> i =
+                       (Dictionary<string, Dictionary<string, string>>)result.AsyncState;
+                    Dictionary<string, Dictionary<string, string>> o;
+                    Dictionary<string, Dictionary<string, string>> r =
+                        Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDR(out o, result);
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                    callback.called();
+                }
 
-        public void opNDGSSI(Ice.AsyncResult result)
-        {
-            Dictionary<string, List<string>> i = (Dictionary<string,List<string>>)result.AsyncState;
-            Dictionary<string, List<string>> o;
-            Dictionary<string, List<string>> r =
-                MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDGSS(out o, result);
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-            callback.called();
-        }
+                public void opNDAISI(Ice.AsyncResult result)
+                {
+                    Dictionary<string, int[]> i =(Dictionary<string, int[]>)result.AsyncState;
+                    Dictionary<string, int[]> o;
+                    Dictionary<string, int[]> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDAIS(out o, result);
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                    callback.called();
+                }
 
-        public virtual void check()
-        {
-            callback.check();
-        }
+                public void opNDGISI(Ice.AsyncResult result)
+                {
+                    Dictionary<string, List<int>> i =(Dictionary<string, List<int>>)result.AsyncState;
+                    Dictionary<string, List<int>> o;
+                    Dictionary<string, List<int>> r =
+                        Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDGIS(out o, result);
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                    callback.called();
+                }
 
-        private CallbackBase callback = new CallbackBase();
-    }
+                public void opNDASSI(Ice.AsyncResult result)
+                {
+                    Dictionary<string, string[]> i =(Dictionary<string, string[]>)result.AsyncState;
+                    Dictionary<string, string[]> o;
+                    Dictionary<string, string[]> r =
+                        Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDASS(out o, result);
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                    callback.called();
+                }
 
-    internal static void twowaysAMI(Ice.Communicator communicator, Test.MyClassPrx p)
-    {
-        {
-            Dictionary<int, int> i = new Dictionary<int, int>();
-            i[0] = 1;
-            i[1] = 0;
-
-            Callback cb = new Callback();
-            p.begin_opNV(i, null, cb.opNVI, i);
-            cb.check();
-        }
+                public void opNDGSSI(Ice.AsyncResult result)
+                {
+                    Dictionary<string, List<string>> i =(Dictionary<string, List<string>>)result.AsyncState;
+                    Dictionary<string, List<string>> o;
+                    Dictionary<string, List<string>> r =
+                        Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opNDGSS(out o, result);
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                    callback.called();
+                }
 
-        {
-            Dictionary<string, string> i = new Dictionary<string, string>();
-            i["a"] = "b";
-            i["b"] = "a";
-
-            Callback cb = new Callback();
-            p.begin_opNR(i, null, cb.opNRI, i);
-            cb.check();
-        }
+                public virtual void check()
+                {
+                    callback.check();
+                }
 
-        {
-            Dictionary<string, Dictionary<int, int>> i = new Dictionary<string, Dictionary<int, int>>();
-            Dictionary<int, int> id = new Dictionary<int, int>();
-            id[0] = 1;
-            id[1] = 0;
-            i["a"] = id;
-            i["b"] = id;
-
-            Callback cb = new Callback();
-            p.begin_opNDV(i, null, cb.opNDVI, i);
-            cb.check();
-        }
+                private CallbackBase callback = new CallbackBase();
+            }
 
-        {
-            Dictionary<string, Dictionary<string, string>> i = new Dictionary<string, Dictionary<string, string>>();
-            Dictionary<string, string> id = new Dictionary<string, string>();
-            id["a"] = "b";
-            id["b"] = "a";
-            i["a"] = id;
-            i["b"] = id;
-
-            Callback cb = new Callback();
-            p.begin_opNDR(i, null, cb.opNDRI, i);
-            cb.check();
-        }
+            internal static void twowaysAMI(Ice.Communicator communicator, Test.MyClassPrx p)
+            {
+                {
+                    Dictionary<int, int> i = new Dictionary<int, int>();
+                    i[0] = 1;
+                    i[1] = 0;
+
+                    Callback cb = new Callback();
+                    p.begin_opNV(i, null, cb.opNVI, i);
+                    cb.check();
+                }
 
-        {
-            int[] ii = new int[] { 1, 2 };
-            Dictionary<string, int[]> i = new Dictionary<string, int[]>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Callback cb = new Callback();
-            p.begin_opNDAIS(i, null, cb.opNDAISI, i);
-            cb.check();
-        }
+                {
+                    Dictionary<string, string> i = new Dictionary<string, string>();
+                    i["a"] = "b";
+                    i["b"] = "a";
+
+                    Callback cb = new Callback();
+                    p.begin_opNR(i, null, cb.opNRI, i);
+                    cb.check();
+                }
 
-        {
-            List<int> ii = new List<int>();
-            ii.Add(1);
-            ii.Add(2);
-            Dictionary<string, List<int>> i = new Dictionary<string, List<int>>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Callback cb = new Callback();
-            p.begin_opNDGIS(i, null, cb.opNDGISI, i);
-            cb.check();
-        }
+                {
+                    Dictionary<string, Dictionary<int, int>> i = new Dictionary<string, Dictionary<int, int>>();
+                    Dictionary<int, int> id = new Dictionary<int, int>();
+                    id[0] = 1;
+                    id[1] = 0;
+                    i["a"] = id;
+                    i["b"] = id;
+
+                    Callback cb = new Callback();
+                    p.begin_opNDV(i, null, cb.opNDVI, i);
+                    cb.check();
+                }
 
-        {
-            string[] ii = new string[] { "a", "b" };
-            Dictionary<string, string[]> i = new Dictionary<string, string[]>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Callback cb = new Callback();
-            p.begin_opNDASS(i, null, cb.opNDASSI, i);
-            cb.check();
-        }
+                {
+                    Dictionary<string, Dictionary<string, string>> i = new Dictionary<string, Dictionary<string, string>>();
+                    Dictionary<string, string> id = new Dictionary<string, string>();
+                    id["a"] = "b";
+                    id["b"] = "a";
+                    i["a"] = id;
+                    i["b"] = id;
+
+                    Callback cb = new Callback();
+                    p.begin_opNDR(i, null, cb.opNDRI, i);
+                    cb.check();
+                }
 
-        {
-            List<string> ii = new List<string>();
-            ii.Add("a");
-            ii.Add("b");
-            Dictionary<string, List<string>> i = new Dictionary<string, List<string>>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Callback cb = new Callback();
-            p.begin_opNDGSS(i, null, cb.opNDGSSI, i);
-            cb.check();
+                {
+                    int[] ii = new int[] { 1, 2 };
+                    Dictionary<string, int[]> i = new Dictionary<string, int[]>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Callback cb = new Callback();
+                    p.begin_opNDAIS(i, null, cb.opNDAISI, i);
+                    cb.check();
+                }
+
+                {
+                    List<int> ii = new List<int>();
+                    ii.Add(1);
+                    ii.Add(2);
+                    Dictionary<string, List<int>> i = new Dictionary<string, List<int>>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Callback cb = new Callback();
+                    p.begin_opNDGIS(i, null, cb.opNDGISI, i);
+                    cb.check();
+                }
+
+                {
+                    string[] ii = new string[] { "a", "b" };
+                    Dictionary<string, string[]> i = new Dictionary<string, string[]>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Callback cb = new Callback();
+                    p.begin_opNDASS(i, null, cb.opNDASSI, i);
+                    cb.check();
+                }
+
+                {
+                    List<string> ii = new List<string>();
+                    ii.Add("a");
+                    ii.Add("b");
+                    Dictionary<string, List<string>> i = new Dictionary<string, List<string>>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Callback cb = new Callback();
+                    p.begin_opNDGSS(i, null, cb.opNDGSSI, i);
+                    cb.check();
+                }
+            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Twoways.cs zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Twoways.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dictMapping/Twoways.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dictMapping/Twoways.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,160 +1,160 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
-using Test;
 
-class Twoways
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new System.Exception();
-        }
-    }
-
-    internal static void twoways(Ice.Communicator communicator, Test.MyClassPrx p)
+    namespace dictMapping
     {
+        class Twoways
         {
-            Dictionary<int, int> i = new Dictionary<int, int>();
-            i[0] = 1;
-            i[1] = 0;
-
-            Dictionary<int, int> o;
-            Dictionary<int, int> r;
-            r = p.opNV(i, out o);
-
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
-
-        {
-            Dictionary<string, string> i = new Dictionary<string, string>();
-            i["a"] = "b";
-            i["b"] = "a";
-
-            Dictionary<string, string> o;
-            Dictionary<string, string> r;
-            r = p.opNR(i, out o);
-
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
-
-        {
-            Dictionary<string, Dictionary<int, int>> i = new Dictionary<string, Dictionary<int, int>>();
-            Dictionary<int, int> id = new Dictionary<int, int>();
-            id[0] = 1;
-            id[1] = 0;
-            i["a"] = id;
-            i["b"] = id;
-
-            Dictionary<string, Dictionary<int, int>> o;
-            Dictionary<string, Dictionary<int, int>> r;
-            r = p.opNDV(i, out o);
-
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-        }
-
-        {
-            Dictionary<string, Dictionary<string, string>> i = new Dictionary<string, Dictionary<string, string>>();
-            Dictionary<string, string> id = new Dictionary<string, string>();
-            id["a"] = "b";
-            id["b"] = "a";
-            i["a"] = id;
-            i["b"] = id;
-
-            Dictionary<string, Dictionary<string, string>> o;
-            Dictionary<string, Dictionary<string, string>> r;
-            r = p.opNDR(i, out o);
-
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-        }
-
-        {
-            int[] ii = new int[] { 1, 2 };
-            Dictionary<string, int[]> i = new Dictionary<string, int[]>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Dictionary<string, int[]> o;
-            Dictionary<string, int[]> r;
-            r = p.opNDAIS(i, out o);
-
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-        }
-
-        {
-            List<int> ii = new List<int>();
-            ii.Add(1);
-            ii.Add(2);
-            Dictionary<string, List<int>> i = new Dictionary<string, List<int>>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Dictionary<string, List<int>> o;
-            Dictionary<string, List<int>> r;
-            r = p.opNDGIS(i, out o);
-
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-        }
-
-        {
-            string[] ii = new string[] { "a", "b" };
-            Dictionary<string, string[]> i = new Dictionary<string, string[]>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Dictionary<string, string[]> o;
-            Dictionary<string, string[]> r;
-            r = p.opNDASS(i, out o);
-
-            foreach(string key in i.Keys)
-            {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
-            }
-        }
-
-        {
-            List<string> ii = new List<string>();
-            ii.Add("a");
-            ii.Add("b");
-            Dictionary<string, List<string>> i = new Dictionary<string, List<string>>();
-            i["a"] = ii;
-            i["b"] = ii;
-
-            Dictionary<string, List<string>> o;
-            Dictionary<string, List<string>> r;
-            r = p.opNDGSS(i, out o);
-
-            foreach(string key in i.Keys)
+            private static void test(bool b)
             {
-                test(Ice.CollectionComparer.Equals(i[key], o[key]));
-                test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                if(!b)
+                {
+                    throw new System.Exception();
+                }
+            }
+
+            internal static void twoways(Ice.Communicator communicator, Test.MyClassPrx p)
+            {
+                {
+                    Dictionary<int, int> i = new Dictionary<int, int>();
+                    i[0] = 1;
+                    i[1] = 0;
+
+                    Dictionary<int, int> o;
+                    Dictionary<int, int> r;
+                    r = p.opNV(i, out o);
+
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
+
+                {
+                    Dictionary<string, string> i = new Dictionary<string, string>();
+                    i["a"] = "b";
+                    i["b"] = "a";
+
+                    Dictionary<string, string> o;
+                    Dictionary<string, string> r;
+                    r = p.opNR(i, out o);
+
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
+
+                {
+                    Dictionary<string, Dictionary<int, int>> i = new Dictionary<string, Dictionary<int, int>>();
+                    Dictionary<int, int> id = new Dictionary<int, int>();
+                    id[0] = 1;
+                    id[1] = 0;
+                    i["a"] = id;
+                    i["b"] = id;
+
+                    Dictionary<string, Dictionary<int, int>> o;
+                    Dictionary<string, Dictionary<int, int>> r;
+                    r = p.opNDV(i, out o);
+
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                }
+
+                {
+                    Dictionary<string, Dictionary<string, string>> i = new Dictionary<string, Dictionary<string, string>>();
+                    Dictionary<string, string> id = new Dictionary<string, string>();
+                    id["a"] = "b";
+                    id["b"] = "a";
+                    i["a"] = id;
+                    i["b"] = id;
+
+                    Dictionary<string, Dictionary<string, string>> o;
+                    Dictionary<string, Dictionary<string, string>> r;
+                    r = p.opNDR(i, out o);
+
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                }
+
+                {
+                    int[] ii = new int[] { 1, 2 };
+                    Dictionary<string, int[]> i = new Dictionary<string, int[]>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Dictionary<string, int[]> o;
+                    Dictionary<string, int[]> r;
+                    r = p.opNDAIS(i, out o);
+
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                }
+
+                {
+                    List<int> ii = new List<int>();
+                    ii.Add(1);
+                    ii.Add(2);
+                    Dictionary<string, List<int>> i = new Dictionary<string, List<int>>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Dictionary<string, List<int>> o;
+                    Dictionary<string, List<int>> r;
+                    r = p.opNDGIS(i, out o);
+
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                }
+
+                {
+                    string[] ii = new string[] { "a", "b" };
+                    Dictionary<string, string[]> i = new Dictionary<string, string[]>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Dictionary<string, string[]> o;
+                    Dictionary<string, string[]> r;
+                    r = p.opNDASS(i, out o);
+
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                }
+
+                {
+                    List<string> ii = new List<string>();
+                    ii.Add("a");
+                    ii.Add("b");
+                    Dictionary<string, List<string>> i = new Dictionary<string, List<string>>();
+                    i["a"] = ii;
+                    i["b"] = ii;
+
+                    Dictionary<string, List<string>> o;
+                    Dictionary<string, List<string>> r;
+                    r = p.opNDGSS(i, out o);
+
+                    foreach(string key in i.Keys)
+                    {
+                        test(Ice.CollectionComparer.Equals(i[key], o[key]));
+                        test(Ice.CollectionComparer.Equals(i[key], r[key]));
+                    }
+                }
             }
         }
     }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -13,7 +8,7 @@
 using System.Threading;
 using Test;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
     public class Progress : IProgress<bool>
     {
@@ -36,9 +31,10 @@
 
     private class Callback
     {
-        internal Callback()
+        internal Callback(System.IO.TextWriter output)
         {
             _called = false;
+            _output = output;
         }
 
         public void check()
@@ -63,7 +59,7 @@
         {
             if(!(ex is Ice.NoEndpointException))
             {
-                WriteLine(ex.ToString());
+                _output.WriteLine(ex.ToString());
                 test(false);
             }
             test(Dispatcher.isDispatcherThread());
@@ -79,7 +75,7 @@
         {
             if(!(ex is Ice.CommunicatorDestroyedException))
             {
-                WriteLine(ex.ToString());
+                _output.WriteLine(ex.ToString());
                 test(false);
             }
         }
@@ -100,29 +96,31 @@
         }
 
         private bool _called;
+        private System.IO.TextWriter _output;
     }
 
-    public static void allTests(TestCommon.Application app)
+    public static void allTests(Test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        string sref = "test:" + app.getTestEndpoint(0);
+        var output = helper.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        string sref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         Test.TestIntfPrx p = Test.TestIntfPrxHelper.uncheckedCast(obj);
 
-        sref = "testController:" + app.getTestEndpoint(1);
+        sref = "testController:" + helper.getTestEndpoint(1);
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         Test.TestIntfControllerPrx testController = Test.TestIntfControllerPrxHelper.uncheckedCast(obj);
 
-        Write("testing dispatcher... ");
-        Flush();
+        output.Write("testing dispatcher... ");
+        output.Flush();
         {
             p.op();
 
-            Callback cb = new Callback();
+            Callback cb = new Callback(output);
             p.begin_op().whenCompleted(cb.response, cb.exception);
             cb.check();
 
@@ -134,7 +132,7 @@
             // Expect InvocationTimeoutException.
             //
             {
-                Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(250));
+                Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(10));
                 to.begin_sleep(500).whenCompleted(
                     () =>
                     {
@@ -160,14 +158,14 @@
             testController.resumeAdapter();
             r.waitForCompleted();
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing dispatcher with continuations... ");
-        Flush();
+        output.Write("testing dispatcher with continuations... ");
+        output.Flush();
         {
             p.op();
 
-            Callback cb = new Callback();
+            Callback cb = new Callback(output);
             System.Action<Task> continuation = (Task previous) =>
             {
                 try
@@ -199,7 +197,7 @@
             // Expect InvocationTimeoutException.
             //
             {
-                Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(250));
+                Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(20));
                 to.sleepAsync(500).ContinueWith(
                     previous =>
                     {
@@ -232,7 +230,7 @@
             // Expect InvocationTimeoutException.
             //
             {
-                Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(250));
+                Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(10));
                 to.sleepAsync(500).ContinueWith(
                     previous =>
                     {
@@ -282,10 +280,10 @@
             testController.resumeAdapter();
             t.Wait();
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing dispatcher with async/await... ");
-        Flush();
+        output.Write("testing dispatcher with async/await... ");
+        output.Flush();
         {
             TaskCompletionSource<object> t = new TaskCompletionSource<object>();
             p.opAsync().ContinueWith(async previous => // Execute the code below from the Ice client thread pool
@@ -306,7 +304,7 @@
                         test(Dispatcher.isDispatcherThread());
                     }
 
-                    Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(250));
+                    Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(10));
                     try
                     {
                         await to.sleepAsync(500);
@@ -326,7 +324,7 @@
 
             t.Task.Wait();
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
         p.shutdown();
     }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,37 +11,34 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-        initData.dispatcher = new Dispatcher().dispatch;
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    public override void run(string[] args)
     {
-        Client app = new Client();
         try
         {
-            return app.runmain(args);
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = createTestProperties(ref args);
+            initData.properties.setProperty("Ice.Warn.AMICallback", "0");
+            //
+            // Limit the send buffer size, this test relies on the socket
+            // send() blocking after sending a given amount of data.
+            //
+            initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+            initData.dispatcher = new Dispatcher().dispatch;
+            using(var communicator = initialize(initData))
+            {
+                AllTests.allTests(this);
+            }
         }
         finally
         {
             Dispatcher.terminate();
         }
     }
+
+    public static int Main(string[] args)
+    {
+        return Test.TestDriver.runTest<Client>(args);
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,44 +11,42 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Collocated : TestCommon.Application
+public class Collocated : Test.TestHelper
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        initData.dispatcher = new Dispatcher().dispatch;
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    public override void run(string[] args)
     {
-        Collocated app = new Collocated();
         try
         {
-            return app.runmain(args);
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = createTestProperties(ref args);
+            initData.properties.setProperty("Ice.Warn.AMICallback", "0");
+            initData.dispatcher = new Dispatcher().dispatch;
+
+            using(var communicator = initialize(initData))
+            {
+                communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+                communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+                adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+                //adapter.activate(); // Don't activate OA to ensure collocation is used.
+                adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+                //adapter2.activate(); // Don't activate OA to ensure collocation is used.
+
+                AllTests.allTests(this);
+            }
         }
         finally
         {
             Dispatcher.terminate();
         }
     }
+
+    public static int Main(string[] args)
+    {
+        return Test.TestDriver.runTest<Collocated>(args);
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Dispatcher.cs zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Dispatcher.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Dispatcher.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Dispatcher.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -46,24 +46,24 @@
     <Compile Include="..\..\..\Dispatcher.cs">
       <Link>Dispatcher.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Dispatcher.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Dispatcher.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -49,14 +49,14 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -70,15 +70,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Dispatcher.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Dispatcher.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Dispatcher.cs">
       <Link>Dispatcher.cs</Link>
@@ -46,24 +46,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Dispatcher.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Dispatcher.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,49 +11,47 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
+    public override void run(string[] args)
     {
-        Ice.InitializationData initData = base.getInitData(ref args);
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = createTestProperties(ref args);
         initData.properties.setProperty("Ice.ServerIdleTime", "30");
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
         initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        initData.dispatcher = new Dispatcher().dispatch;
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
         try
         {
-            return app.runmain(args);
+            initData.dispatcher = new Dispatcher().dispatch;
+
+            using(var communicator = initialize(initData))
+            {
+                communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+                communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+                adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+                adapter.activate();
+                adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+                adapter2.activate();
+
+                communicator.waitForShutdown();
+            }
         }
         finally
         {
             Dispatcher.terminate();
         }
     }
+
+    public static int Main(string[] args)
+    {
+        return Test.TestDriver.runTest<Server>(args);
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/dispatcher/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/dispatcher/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System.Threading;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/echo/BlobjectI.cs zeroc-ice-3.7.2/csharp/test/Ice/echo/BlobjectI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/echo/BlobjectI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/echo/BlobjectI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 using System.Threading.Tasks;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/echo/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/echo/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/echo/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/echo/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/echo/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/echo/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/echo/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/echo/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\BlobjectI.cs">
       <Link>BlobjectI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/echo/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../BlobjectI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../BlobjectI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/echo/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/echo/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/echo/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/echo/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,7 +11,7 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
     private class EchoI : Test.EchoDisp_
     {
@@ -43,22 +38,22 @@
         private BlobjectI _blob;
     }
 
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        BlobjectI blob = new BlobjectI();
-        adapter.addDefaultServant(blob, "");
-        adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            BlobjectI blob = new BlobjectI();
+            adapter.addDefaultServant(blob, "");
+            adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/echo/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/echo/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/echo/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/echo/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/enums/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,197 +1,231 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static TestIntfPrx allTests(TestCommon.Application app)
+    namespace enums
     {
-        Ice.Communicator communicator = app.communicator();
-        string sref = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx obj = communicator.stringToProxy(sref);
-        test(obj != null);
-        TestIntfPrx proxy = TestIntfPrxHelper.uncheckedCast(obj);
-        test(proxy != null);
-
-        Console.Out.Write("testing enum values... ");
-        Console.Out.Flush();
-
-        test((int)ByteEnum.benum1 == 0);
-        test((int)ByteEnum.benum2 == 1);
-        test((int)ByteEnum.benum3 == ByteConst1.value);
-        test((int)ByteEnum.benum4 == ByteConst1.value + 1);
-        test((int)ByteEnum.benum5 == ShortConst1.value);
-        test((int)ByteEnum.benum6 == ShortConst1.value + 1);
-        test((int)ByteEnum.benum7 == IntConst1.value);
-        test((int)ByteEnum.benum8 == IntConst1.value + 1);
-        test((int)ByteEnum.benum9 == LongConst1.value);
-        test((int)ByteEnum.benum10 == LongConst1.value + 1);
-        test((int)ByteEnum.benum11 == ByteConst2.value);
-
-        test((int)ShortEnum.senum1 == 3);
-        test((int)ShortEnum.senum2 == 4);
-        test((int)ShortEnum.senum3 == ByteConst1.value);
-        test((int)ShortEnum.senum4 == ByteConst1.value + 1);
-        test((int)ShortEnum.senum5 == ShortConst1.value);
-        test((int)ShortEnum.senum6 == ShortConst1.value + 1);
-        test((int)ShortEnum.senum7 == IntConst1.value);
-        test((int)ShortEnum.senum8 == IntConst1.value + 1);
-        test((int)ShortEnum.senum9 == LongConst1.value);
-        test((int)ShortEnum.senum10 == LongConst1.value + 1);
-        test((int)ShortEnum.senum11 == ShortConst2.value);
-
-        test((int)IntEnum.ienum1 == 0);
-        test((int)IntEnum.ienum2 == 1);
-        test((int)IntEnum.ienum3 == ByteConst1.value);
-        test((int)IntEnum.ienum4 == ByteConst1.value + 1);
-        test((int)IntEnum.ienum5 == ShortConst1.value);
-        test((int)IntEnum.ienum6 == ShortConst1.value + 1);
-        test((int)IntEnum.ienum7 == IntConst1.value);
-        test((int)IntEnum.ienum8 == IntConst1.value + 1);
-        test((int)IntEnum.ienum9 == LongConst1.value);
-        test((int)IntEnum.ienum10 == LongConst1.value + 1);
-        test((int)IntEnum.ienum11 == IntConst2.value);
-        test((int)IntEnum.ienum12 == LongConst2.value);
-
-        test((int)SimpleEnum.red == 0);
-        test((int)SimpleEnum.green == 1);
-        test((int)SimpleEnum.blue == 2);
-
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing enum streaming... ");
-        Console.Out.Flush();
-
-        Ice.OutputStream ostr;
-        byte[] bytes;
-
-        bool encoding_1_0 = communicator.getProperties().getProperty("Ice.Default.EncodingVersion").Equals("1.0");
-
-        ostr = new Ice.OutputStream(communicator);
-        ostr.writeEnum((int)ByteEnum.benum11, (int)ByteEnum.benum11);
-        bytes = ostr.finished();
-        test(bytes.Length == 1); // ByteEnum should require one byte
-
-        ostr = new Ice.OutputStream(communicator);
-        ostr.writeEnum((int)ShortEnum.senum11, (int)ShortEnum.senum11);
-        bytes = ostr.finished();
-        test(bytes.Length == (encoding_1_0 ? 2 : 5));
-
-        ostr = new Ice.OutputStream(communicator);
-        ostr.writeEnum((int)IntEnum.ienum11, (int)IntEnum.ienum12);
-        bytes = ostr.finished();
-        test(bytes.Length == (encoding_1_0 ? 4 : 5));
-
-        ostr = new Ice.OutputStream(communicator);
-        ostr.writeEnum((int)SimpleEnum.blue, (int)SimpleEnum.blue);
-        bytes = ostr.finished();
-        test(bytes.Length == 1); // SimpleEnum should require one byte
-
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing enum operations... ");
-        Console.Out.Flush();
-
-        ByteEnum byteEnum;
-        test(proxy.opByte(ByteEnum.benum1, out byteEnum) == ByteEnum.benum1);
-        test(byteEnum == ByteEnum.benum1);
-        test(proxy.opByte(ByteEnum.benum11, out byteEnum) == ByteEnum.benum11);
-        test(byteEnum == ByteEnum.benum11);
-
-        ShortEnum shortEnum;
-        test(proxy.opShort(ShortEnum.senum1, out shortEnum) == ShortEnum.senum1);
-        test(shortEnum == ShortEnum.senum1);
-        test(proxy.opShort(ShortEnum.senum11, out shortEnum) == ShortEnum.senum11);
-        test(shortEnum == ShortEnum.senum11);
-
-        IntEnum intEnum;
-        test(proxy.opInt(IntEnum.ienum1, out intEnum) == IntEnum.ienum1);
-        test(intEnum == IntEnum.ienum1);
-        test(proxy.opInt(IntEnum.ienum11, out intEnum) == IntEnum.ienum11);
-        test(intEnum == IntEnum.ienum11);
-        test(proxy.opInt(IntEnum.ienum12, out intEnum) == IntEnum.ienum12);
-        test(intEnum == IntEnum.ienum12);
-
-        SimpleEnum s;
-        test(proxy.opSimple(SimpleEnum.green, out s) == SimpleEnum.green);
-        test(s == SimpleEnum.green);
-
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing enum sequences operations... ");
-        Console.Out.Flush();
-
-        {
-            ByteEnum[] b1 = new ByteEnum[11]
-                    { ByteEnum.benum1, ByteEnum.benum2, ByteEnum.benum3, ByteEnum.benum4, ByteEnum.benum5,
-                      ByteEnum.benum6, ByteEnum.benum7, ByteEnum.benum8, ByteEnum.benum9, ByteEnum.benum10,
-                      ByteEnum.benum11};
-
-            ByteEnum[] b2;
-            ByteEnum[] b3 = proxy.opByteSeq(b1, out b2);
-
-            for(int i = 0; i < b1.Length; ++i)
-            {
-                test(b1[i] == b2[i]);
-                test(b1[i] == b3[i]);
-            }
-        }
-
-        {
-            ShortEnum[] s1 = new ShortEnum[11]
-                    { ShortEnum.senum1, ShortEnum.senum2, ShortEnum.senum3, ShortEnum.senum4, ShortEnum.senum5,
-                      ShortEnum.senum6, ShortEnum.senum7, ShortEnum.senum8, ShortEnum.senum9, ShortEnum.senum10,
-                      ShortEnum.senum11};
-
-            ShortEnum[] s2;
-            ShortEnum[] s3 = proxy.opShortSeq(s1, out s2);
-
-            for(int i = 0; i < s1.Length; ++i)
-            {
-                test(s1[i] == s2[i]);
-                test(s1[i] == s3[i]);
-            }
-        }
-
+        public class AllTests : global::Test.AllTests
         {
-            IntEnum[] i1 = new IntEnum[11]
-                    { IntEnum.ienum1, IntEnum.ienum2, IntEnum.ienum3, IntEnum.ienum4, IntEnum.ienum5,
-                      IntEnum.ienum6, IntEnum.ienum7, IntEnum.ienum8, IntEnum.ienum9, IntEnum.ienum10,
-                      IntEnum.ienum11};
-
-            IntEnum[] i2;
-            IntEnum[] i3 = proxy.opIntSeq(i1, out i2);
-
-            for(int i = 0; i < i1.Length; ++i)
+            public static Test.TestIntfPrx allTests(global::Test.TestHelper helper)
             {
-                test(i1[i] == i2[i]);
-                test(i1[i] == i3[i]);
-            }
-        }
-
-        {
-            SimpleEnum[] s1 = new SimpleEnum[3]
-                    { SimpleEnum.red, SimpleEnum.green, SimpleEnum.blue };
+                Ice.Communicator communicator = helper.communicator();
+                string sref = "test:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx obj = communicator.stringToProxy(sref);
+                test(obj != null);
+                var proxy = Test.TestIntfPrxHelper.uncheckedCast(obj);
+                test(proxy != null);
+
+                var output = helper.getWriter();
+
+                output.Write("testing enum values... ");
+                output.Flush();
+
+                test((int)Test.ByteEnum.benum1 == 0);
+                test((int)Test.ByteEnum.benum2 == 1);
+                test((int)Test.ByteEnum.benum3 == Test.ByteConst1.value);
+                test((int)Test.ByteEnum.benum4 == Test.ByteConst1.value + 1);
+                test((int)Test.ByteEnum.benum5 == Test.ShortConst1.value);
+                test((int)Test.ByteEnum.benum6 == Test.ShortConst1.value + 1);
+                test((int)Test.ByteEnum.benum7 == Test.IntConst1.value);
+                test((int)Test.ByteEnum.benum8 == Test.IntConst1.value + 1);
+                test((int)Test.ByteEnum.benum9 == Test.LongConst1.value);
+                test((int)Test.ByteEnum.benum10 == Test.LongConst1.value + 1);
+                test((int)Test.ByteEnum.benum11 == Test.ByteConst2.value);
+
+                test((int)Test.ShortEnum.senum1 == 3);
+                test((int)Test.ShortEnum.senum2 == 4);
+                test((int)Test.ShortEnum.senum3 == Test.ByteConst1.value);
+                test((int)Test.ShortEnum.senum4 == Test.ByteConst1.value + 1);
+                test((int)Test.ShortEnum.senum5 == Test.ShortConst1.value);
+                test((int)Test.ShortEnum.senum6 == Test.ShortConst1.value + 1);
+                test((int)Test.ShortEnum.senum7 == Test.IntConst1.value);
+                test((int)Test.ShortEnum.senum8 == Test.IntConst1.value + 1);
+                test((int)Test.ShortEnum.senum9 == Test.LongConst1.value);
+                test((int)Test.ShortEnum.senum10 == Test.LongConst1.value + 1);
+                test((int)Test.ShortEnum.senum11 == Test.ShortConst2.value);
+
+                test((int)Test.IntEnum.ienum1 == 0);
+                test((int)Test.IntEnum.ienum2 == 1);
+                test((int)Test.IntEnum.ienum3 == Test.ByteConst1.value);
+                test((int)Test.IntEnum.ienum4 == Test.ByteConst1.value + 1);
+                test((int)Test.IntEnum.ienum5 == Test.ShortConst1.value);
+                test((int)Test.IntEnum.ienum6 == Test.ShortConst1.value + 1);
+                test((int)Test.IntEnum.ienum7 == Test.IntConst1.value);
+                test((int)Test.IntEnum.ienum8 == Test.IntConst1.value + 1);
+                test((int)Test.IntEnum.ienum9 == Test.LongConst1.value);
+                test((int)Test.IntEnum.ienum10 == Test.LongConst1.value + 1);
+                test((int)Test.IntEnum.ienum11 == Test.IntConst2.value);
+                test((int)Test.IntEnum.ienum12 == Test.LongConst2.value);
+
+                test((int)Test.SimpleEnum.red == 0);
+                test((int)Test.SimpleEnum.green == 1);
+                test((int)Test.SimpleEnum.blue == 2);
+
+                output.WriteLine("ok");
+
+                output.Write("testing enum streaming... ");
+                output.Flush();
+
+                Ice.OutputStream ostr;
+                byte[] bytes;
+
+                bool encoding_1_0 = communicator.getProperties().getProperty("Ice.Default.EncodingVersion").Equals("1.0");
+
+                ostr = new Ice.OutputStream(communicator);
+                ostr.writeEnum((int)Test.ByteEnum.benum11,(int)Test.ByteEnum.benum11);
+                bytes = ostr.finished();
+                test(bytes.Length == 1); // ByteEnum should require one byte
+
+                ostr = new Ice.OutputStream(communicator);
+                ostr.writeEnum((int)Test.ShortEnum.senum11,(int)Test.ShortEnum.senum11);
+                bytes = ostr.finished();
+                test(bytes.Length ==(encoding_1_0 ? 2 : 5));
+
+                ostr = new Ice.OutputStream(communicator);
+                ostr.writeEnum((int)Test.IntEnum.ienum11,(int)Test.IntEnum.ienum12);
+                bytes = ostr.finished();
+                test(bytes.Length ==(encoding_1_0 ? 4 : 5));
+
+                ostr = new Ice.OutputStream(communicator);
+                ostr.writeEnum((int)Test.SimpleEnum.blue,(int)Test.SimpleEnum.blue);
+                bytes = ostr.finished();
+                test(bytes.Length == 1); // SimpleEnum should require one byte
+
+                output.WriteLine("ok");
+
+                output.Write("testing enum operations... ");
+                output.Flush();
+
+                Test.ByteEnum byteEnum;
+                test(proxy.opByte(Test.ByteEnum.benum1, out byteEnum) == Test.ByteEnum.benum1);
+                test(byteEnum == Test.ByteEnum.benum1);
+                test(proxy.opByte(Test.ByteEnum.benum11, out byteEnum) == Test.ByteEnum.benum11);
+                test(byteEnum == Test.ByteEnum.benum11);
+
+                Test.ShortEnum shortEnum;
+                test(proxy.opShort(Test.ShortEnum.senum1, out shortEnum) == Test.ShortEnum.senum1);
+                test(shortEnum == Test.ShortEnum.senum1);
+                test(proxy.opShort(Test.ShortEnum.senum11, out shortEnum) == Test.ShortEnum.senum11);
+                test(shortEnum == Test.ShortEnum.senum11);
+
+                Test.IntEnum intEnum;
+                test(proxy.opInt(Test.IntEnum.ienum1, out intEnum) == Test.IntEnum.ienum1);
+                test(intEnum == Test.IntEnum.ienum1);
+                test(proxy.opInt(Test.IntEnum.ienum11, out intEnum) == Test.IntEnum.ienum11);
+                test(intEnum == Test.IntEnum.ienum11);
+                test(proxy.opInt(Test.IntEnum.ienum12, out intEnum) == Test.IntEnum.ienum12);
+                test(intEnum == Test.IntEnum.ienum12);
+
+                Test.SimpleEnum s;
+                test(proxy.opSimple(Test.SimpleEnum.green, out s) == Test.SimpleEnum.green);
+                test(s == Test.SimpleEnum.green);
+
+                output.WriteLine("ok");
+
+                output.Write("testing enum sequences operations... ");
+                output.Flush();
+
+                {
+                    var b1 = new Test.ByteEnum[11]
+                            {
+                                    Test.ByteEnum.benum1,
+                                    Test.ByteEnum.benum2,
+                                    Test.ByteEnum.benum3,
+                                    Test.ByteEnum.benum4,
+                                    Test.ByteEnum.benum5,
+                                    Test.ByteEnum.benum6,
+                                    Test.ByteEnum.benum7,
+                                    Test.ByteEnum.benum8,
+                                    Test.ByteEnum.benum9,
+                                    Test.ByteEnum.benum10,
+                                    Test.ByteEnum.benum11
+                            };
+
+                    Test.ByteEnum[] b2;
+                    Test.ByteEnum[] b3 = proxy.opByteSeq(b1, out b2);
+
+                    for(int i = 0; i < b1.Length; ++i)
+                    {
+                        test(b1[i] == b2[i]);
+                        test(b1[i] == b3[i]);
+                    }
+                }
+
+                {
+                    var s1 = new Test.ShortEnum[11]
+                        {
+                                Test.ShortEnum.senum1,
+                                Test.ShortEnum.senum2,
+                                Test.ShortEnum.senum3,
+                                Test.ShortEnum.senum4,
+                                Test.ShortEnum.senum5,
+                                Test.ShortEnum.senum6,
+                                Test.ShortEnum.senum7,
+                                Test.ShortEnum.senum8,
+                                Test.ShortEnum.senum9,
+                                Test.ShortEnum.senum10,
+                                Test.ShortEnum.senum11
+                        };
+
+                    Test.ShortEnum[] s2;
+                    Test.ShortEnum[] s3 = proxy.opShortSeq(s1, out s2);
+
+                    for(int i = 0; i < s1.Length; ++i)
+                    {
+                        test(s1[i] == s2[i]);
+                        test(s1[i] == s3[i]);
+                    }
+                }
+
+                {
+                    Test.IntEnum[] i1 = new Test.IntEnum[11]
+                            {
+                                    Test.IntEnum.ienum1,
+                                    Test.IntEnum.ienum2,
+                                    Test.IntEnum.ienum3,
+                                    Test.IntEnum.ienum4,
+                                    Test.IntEnum.ienum5,
+                                    Test.IntEnum.ienum6,
+                                    Test.IntEnum.ienum7,
+                                    Test.IntEnum.ienum8,
+                                    Test.IntEnum.ienum9,
+                                    Test.IntEnum.ienum10,
+                                    Test.IntEnum.ienum11
+                            };
+
+                    Test.IntEnum[] i2;
+                    Test.IntEnum[] i3 = proxy.opIntSeq(i1, out i2);
+
+                    for(int i = 0; i < i1.Length; ++i)
+                    {
+                        test(i1[i] == i2[i]);
+                        test(i1[i] == i3[i]);
+                    }
+                }
+
+                {
+                    var s1 = new Test.SimpleEnum[3]
+                            {
+                                    Test.SimpleEnum.red,
+                                    Test.SimpleEnum.green,
+                                    Test.SimpleEnum.blue
+                            };
+
+                    Test.SimpleEnum[] s2;
+                    Test.SimpleEnum[] s3 = proxy.opSimpleSeq(s1, out s2);
+
+                    for(int i = 0; i < s1.Length; ++i)
+                    {
+                        test(s1[i] == s2[i]);
+                        test(s1[i] == s3[i]);
+                    }
+                }
 
-            SimpleEnum[] s2;
-            SimpleEnum[] s3 = proxy.opSimpleSeq(s1, out s2);
-
-            for(int i = 0; i < s1.Length; ++i)
-            {
-                test(s1[i] == s2[i]);
-                test(s1[i] == s3[i]);
+                output.WriteLine("ok");
+                return proxy;
             }
         }
-
-        Console.Out.WriteLine("ok");
-        return proxy;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/enums/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace enums
     {
-        Test.TestIntfPrx proxy = AllTests.allTests(this);
-        proxy.shutdown();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var proxy = AllTests.allTests(this);
+                    proxy.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.enums</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/enums/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ServerIdleTime", "30");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace enums
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                Ice.Properties properties = createTestProperties(ref args);
+                properties.setProperty("Ice.ServerIdleTime", "30");
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.enums"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/enums/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/enums/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/enums/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/enums/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,70 +1,69 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class TestI : TestIntfDisp_
+namespace Ice
 {
-    public TestI()
-    {
-    }
-
-    public override Test.ByteEnum opByte(Test.ByteEnum b1, out Test.ByteEnum b2, Ice.Current current)
-    {
-        b2 = b1;
-        return b1;
-    }
-
-    public override Test.ShortEnum opShort(Test.ShortEnum s1, out Test.ShortEnum s2, Ice.Current current)
-    {
-        s2 = s1;
-        return s1;
-    }
-
-    public override Test.IntEnum opInt(Test.IntEnum i1, out Test.IntEnum i2, Ice.Current current)
-    {
-        i2 = i1;
-        return i1;
-    }
-
-    public override Test.SimpleEnum opSimple(Test.SimpleEnum s1, out Test.SimpleEnum s2, Ice.Current current)
-    {
-        s2 = s1;
-        return s1;
-    }
-
-    public override Test.ByteEnum[] opByteSeq(Test.ByteEnum[] b1, out Test.ByteEnum[] b2, Ice.Current current)
-    {
-        b2 = b1;
-        return b1;
-    }
-
-    public override Test.ShortEnum[] opShortSeq(Test.ShortEnum[] s1, out Test.ShortEnum[] s2, Ice.Current current)
-    {
-        s2 = s1;
-        return s1;
-    }
-
-    public override Test.IntEnum[] opIntSeq(Test.IntEnum[] i1, out Test.IntEnum[] i2, Ice.Current current)
-    {
-        i2 = i1;
-        return i1;
-    }
-
-    public override Test.SimpleEnum[] opSimpleSeq(Test.SimpleEnum[] s1, out Test.SimpleEnum[] s2, Ice.Current current)
-    {
-        s2 = s1;
-        return s1;
-    }
-
-    public override void shutdown(Ice.Current current)
+    namespace enums
     {
-        current.adapter.getCommunicator().shutdown();
+        public class TestI : Test.TestIntfDisp_
+        {
+            public TestI()
+            {
+            }
+
+            public override Test.ByteEnum opByte(Test.ByteEnum b1, out Test.ByteEnum b2, Ice.Current current)
+            {
+                b2 = b1;
+                return b1;
+            }
+
+            public override Test.ShortEnum opShort(Test.ShortEnum s1, out Test.ShortEnum s2, Ice.Current current)
+            {
+                s2 = s1;
+                return s1;
+            }
+
+            public override Test.IntEnum opInt(Test.IntEnum i1, out Test.IntEnum i2, Ice.Current current)
+            {
+                i2 = i1;
+                return i1;
+            }
+
+            public override Test.SimpleEnum opSimple(Test.SimpleEnum s1, out Test.SimpleEnum s2, Ice.Current current)
+            {
+                s2 = s1;
+                return s1;
+            }
+
+            public override Test.ByteEnum[] opByteSeq(Test.ByteEnum[] b1, out Test.ByteEnum[] b2, Ice.Current current)
+            {
+                b2 = b1;
+                return b1;
+            }
+
+            public override Test.ShortEnum[] opShortSeq(Test.ShortEnum[] s1, out Test.ShortEnum[] s2, Ice.Current current)
+            {
+                s2 = s1;
+                return s1;
+            }
+
+            public override Test.IntEnum[] opIntSeq(Test.IntEnum[] i1, out Test.IntEnum[] i2, Ice.Current current)
+            {
+                i2 = i1;
+                return i1;
+            }
+
+            public override Test.SimpleEnum[] opSimpleSeq(Test.SimpleEnum[] s1, out Test.SimpleEnum[] s2, Ice.Current current)
+            {
+                s2 = s1;
+                return s1;
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,938 +1,478 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
 using System.Threading;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    private class Callback
+    namespace exceptions
     {
-        internal Callback()
-        {
-            _called = false;
-        }
-
-        public virtual void check()
+        public class AllTests : global::Test.AllTests
         {
-            lock(this)
+            private class Callback
             {
-                while(!_called)
+                internal Callback()
                 {
-                    Monitor.Wait(this);
+                    _called = false;
                 }
 
-                _called = false;
-            }
-        }
-
-        public virtual void called()
-        {
-            lock(this)
-            {
-                Debug.Assert(!_called);
-                _called = true;
-                Monitor.Pulse(this);
-            }
-        }
-
-        private bool _called;
-    }
-
-    public static ThrowerPrx allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        {
-            Write("testing object adapter registration exceptions... ");
-            Ice.ObjectAdapter first;
-            try
-            {
-                first = communicator.createObjectAdapter("TestAdapter0");
-            }
-            catch(Ice.InitializationException)
-            {
-                // Expected
-            }
-
-            communicator.getProperties().setProperty("TestAdapter0.Endpoints", "tcp -h *");
-            first = communicator.createObjectAdapter("TestAdapter0");
-            try
-            {
-                communicator.createObjectAdapter("TestAdapter0");
-                test(false);
-            }
-            catch(Ice.AlreadyRegisteredException)
-            {
-                // Expected.
-            }
-
-            try
-            {
-                Ice.ObjectAdapter second =
-                    communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011");
-                test(false);
-
-                //
-                // Quell mono error that variable second isn't used.
-                //
-                second.deactivate();
-            }
-            catch(Ice.AlreadyRegisteredException)
-            {
-                // Expected
-            }
-            first.deactivate();
-            WriteLine("ok");
-        }
-
-        {
-            Write("testing servant registration exceptions... ");
-            communicator.getProperties().setProperty("TestAdapter1.Endpoints", "tcp -h *");
-            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1");
-            Ice.Object obj = new EmptyI();
-            adapter.add(obj, Ice.Util.stringToIdentity("x"));
-            try
-            {
-                adapter.add(obj, Ice.Util.stringToIdentity("x"));
-                test(false);
-            }
-            catch(Ice.AlreadyRegisteredException)
-            {
-            }
-
-            try
-            {
-                adapter.add(obj, Ice.Util.stringToIdentity(""));
-                test(false);
-            }
-            catch(Ice.IllegalIdentityException e)
-            {
-                test(e.id.name.Equals(""));
-            }
+                public virtual void check()
+                {
+                    lock(this)
+                    {
+                        while(!_called)
+                        {
+                            Monitor.Wait(this);
+                        }
 
-            try
-            {
-                adapter.add(null, Ice.Util.stringToIdentity("x"));
-                test(false);
-            }
-            catch(Ice.IllegalServantException)
-            {
-            }
+                        _called = false;
+                    }
+                }
 
-            adapter.remove(Ice.Util.stringToIdentity("x"));
-            try
-            {
-                adapter.remove(Ice.Util.stringToIdentity("x"));
-                test(false);
-            }
-            catch(Ice.NotRegisteredException)
-            {
-            }
-            adapter.deactivate();
-            WriteLine("ok");
-        }
+                public virtual void called()
+                {
+                    lock(this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        Monitor.Pulse(this);
+                    }
+                }
 
-        {
-            Write("testing servant locator registration exceptions... ");
-            communicator.getProperties().setProperty("TestAdapter2.Endpoints", "tcp -h *");
-            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter2");
-            Ice.ServantLocator loc = new ServantLocatorI();
-            adapter.addServantLocator(loc, "x");
-            try
-            {
-                adapter.addServantLocator(loc, "x");
-                test(false);
-            }
-            catch(Ice.AlreadyRegisteredException)
-            {
+                private bool _called;
             }
 
-            adapter.deactivate();
-            WriteLine("ok");
-        }
-
-        {
-            Write("testing object factory registration exception... ");
-            communicator.getValueFactoryManager().add( _ => { return null; }, "::x");
-            try
+            public static Test.ThrowerPrx allTests(global::Test.TestHelper helper)
             {
-                communicator.getValueFactoryManager().add( _ => { return null; }, "::x");
-                test(false);
-            }
-            catch(Ice.AlreadyRegisteredException)
-            {
-            }
-            WriteLine("ok");
-        }
-
-        Write("testing stringToProxy... ");
-        Flush();
-        String @ref = "thrower:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
-        test(@base != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        ThrowerPrx thrower = ThrowerPrxHelper.checkedCast(@base);
-
-        test(thrower != null);
-        test(thrower.Equals(@base));
-        WriteLine("ok");
-
-        Write("catching exact types... ");
-        Flush();
-
-        try
-        {
-            thrower.throwAasA(1);
-            test(false);
-        }
-        catch(A ex)
-        {
-            test(ex.aMem == 1);
-        }
-        catch(Exception ex)
-        {
-            System.Console.WriteLine(ex);
-            test(false);
-        }
-
-        try
-        {
-            thrower.throwAorDasAorD(1);
-            test(false);
-        }
-        catch(A ex)
-        {
-            test(ex.aMem == 1);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            thrower.throwAorDasAorD(-1);
-            test(false);
-        }
-        catch(D ex)
-        {
-            test(ex.dMem == - 1);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            thrower.throwBasB(1, 2);
-            test(false);
-        }
-        catch(B ex)
-        {
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            thrower.throwCasC(1, 2, 3);
-            test(false);
-        }
-        catch(C ex)
-        {
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-            test(ex.cMem == 3);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        WriteLine("ok");
-
-        Write("catching base types... ");
-        Flush();
-
-        try
-        {
-            thrower.throwBasB(1, 2);
-            test(false);
-        }
-        catch(A ex)
-        {
-            test(ex.aMem == 1);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            thrower.throwCasC(1, 2, 3);
-            test(false);
-        }
-        catch(B ex)
-        {
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        WriteLine("ok");
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                {
+                    output.Write("testing object adapter registration exceptions... ");
+                    Ice.ObjectAdapter first;
+                    try
+                    {
+                        first = communicator.createObjectAdapter("TestAdapter0");
+                    }
+                    catch(Ice.InitializationException)
+                    {
+                        // Expected
+                    }
 
-        Write("catching derived types... ");
-        Flush();
+                    communicator.getProperties().setProperty("TestAdapter0.Endpoints", "tcp -h *");
+                    first = communicator.createObjectAdapter("TestAdapter0");
+                    try
+                    {
+                        communicator.createObjectAdapter("TestAdapter0");
+                        test(false);
+                    }
+                    catch(Ice.AlreadyRegisteredException)
+                    {
+                        // Expected.
+                    }
 
-        try
-        {
-            thrower.throwBasA(1, 2);
-            test(false);
-        }
-        catch(B ex)
-        {
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
+                    try
+                    {
+                        Ice.ObjectAdapter second =
+                            communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011");
+                        test(false);
 
-        try
-        {
-            thrower.throwCasA(1, 2, 3);
-            test(false);
-        }
-        catch(C ex)
-        {
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-            test(ex.cMem == 3);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
+                        //
+                        // Quell mono error that variable second isn't used.
+                        //
+                        second.deactivate();
+                    }
+                    catch(Ice.AlreadyRegisteredException)
+                    {
+                        // Expected
+                    }
+                    first.deactivate();
+                    output.WriteLine("ok");
+                }
 
-        try
-        {
-            thrower.throwCasB(1, 2, 3);
-            test(false);
-        }
-        catch(C ex)
-        {
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-            test(ex.cMem == 3);
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
+                {
+                    output.Write("testing servant registration exceptions... ");
+                    communicator.getProperties().setProperty("TestAdapter1.Endpoints", "tcp -h *");
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1");
+                    Ice.Object obj = new EmptyI();
+                    adapter.add(obj, Ice.Util.stringToIdentity("x"));
+                    try
+                    {
+                        adapter.add(obj, Ice.Util.stringToIdentity("x"));
+                        test(false);
+                    }
+                    catch(Ice.AlreadyRegisteredException)
+                    {
+                    }
 
-        WriteLine("ok");
+                    try
+                    {
+                        adapter.add(obj, Ice.Util.stringToIdentity(""));
+                        test(false);
+                    }
+                    catch(Ice.IllegalIdentityException e)
+                    {
+                        test(e.id.name.Equals(""));
+                    }
 
-        if(thrower.supportsUndeclaredExceptions())
-        {
-            Write("catching unknown user exception... ");
-            Flush();
+                    try
+                    {
+                        adapter.add(null, Ice.Util.stringToIdentity("x"));
+                        test(false);
+                    }
+                    catch(Ice.IllegalServantException)
+                    {
+                    }
 
-            try
-            {
-                thrower.throwUndeclaredA(1);
-                test(false);
-            }
-            catch(Ice.UnknownUserException)
-            {
-            }
-            catch(Exception)
-            {
-                test(false);
-            }
+                    adapter.remove(Ice.Util.stringToIdentity("x"));
+                    try
+                    {
+                        adapter.remove(Ice.Util.stringToIdentity("x"));
+                        test(false);
+                    }
+                    catch(Ice.NotRegisteredException)
+                    {
+                    }
+                    adapter.deactivate();
+                    output.WriteLine("ok");
+                }
 
-            try
-            {
-                thrower.throwUndeclaredB(1, 2);
-                test(false);
-            }
-            catch(Ice.UnknownUserException)
-            {
-            }
-            catch(Exception)
-            {
-                test(false);
-            }
+                {
+                    output.Write("testing servant locator registration exceptions... ");
+                    communicator.getProperties().setProperty("TestAdapter2.Endpoints", "tcp -h *");
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter2");
+                    Ice.ServantLocator loc = new ServantLocatorI();
+                    adapter.addServantLocator(loc, "x");
+                    try
+                    {
+                        adapter.addServantLocator(loc, "x");
+                        test(false);
+                    }
+                    catch(Ice.AlreadyRegisteredException)
+                    {
+                    }
 
-            try
-            {
-                thrower.throwUndeclaredC(1, 2, 3);
-                test(false);
-            }
-            catch(Ice.UnknownUserException)
-            {
-            }
-            catch(Exception)
-            {
-                test(false);
-            }
+                    adapter.deactivate();
+                    output.WriteLine("ok");
+                }
 
-            WriteLine("ok");
-        }
+                {
+                    output.Write("testing object factory registration exception... ");
+                    communicator.getValueFactoryManager().add(_ => { return null; }, "::x");
+                    try
+                    {
+                        communicator.getValueFactoryManager().add(_ => { return null; }, "::x");
+                        test(false);
+                    }
+                    catch(Ice.AlreadyRegisteredException)
+                    {
+                    }
+                    output.WriteLine("ok");
+                }
 
-        if(thrower.ice_getConnection() != null)
-        {
-            Write("testing memory limit marshal exception...");
-            Flush();
-            try
-            {
-                thrower.throwMemoryLimitException(null);
-                test(false);
-            }
-            catch(Ice.MemoryLimitException)
-            {
-            }
-            catch(Exception)
-            {
-                test(false);
-            }
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                String @ref = "thrower:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
+                test(@base != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                var thrower = Test.ThrowerPrxHelper.checkedCast(@base);
+
+                test(thrower != null);
+                test(thrower.Equals(@base));
+                output.WriteLine("ok");
 
-            try
-            {
-                thrower.throwMemoryLimitException(new byte[20 * 1024]); // 20KB
-                test(false);
-            }
-            catch(Ice.ConnectionLostException)
-            {
-            }
-            catch(Ice.UnknownLocalException)
-            {
-                // Expected with JS bidir server
-            }
-            catch(Exception)
-            {
-                test(false);
-            }
+                output.Write("catching exact types... ");
+                output.Flush();
 
-            try
-            {
-                ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(
-                    communicator.stringToProxy("thrower:" + app.getTestEndpoint(1)));
                 try
                 {
-                    thrower2.throwMemoryLimitException(new byte[2 * 1024 * 1024]); // 2MB (no limits)
+                    thrower.throwAasA(1);
+                    test(false);
+                }
+                catch(Test.A ex)
+                {
+                    test(ex.aMem == 1);
                 }
-                catch(Ice.MemoryLimitException)
+                catch(Exception ex)
                 {
+                    Console.WriteLine(ex);
+                    test(false);
                 }
-                ThrowerPrx thrower3 = ThrowerPrxHelper.uncheckedCast(
-                    communicator.stringToProxy("thrower:" + app.getTestEndpoint(2)));
+
                 try
                 {
-                    thrower3.throwMemoryLimitException(new byte[1024]); // 1KB limit
+                    thrower.throwAorDasAorD(1);
                     test(false);
                 }
-                catch(Ice.ConnectionLostException)
+                catch(Test.A ex)
                 {
+                    test(ex.aMem == 1);
+                }
+                catch(Exception)
+                {
+                    test(false);
                 }
-            }
-            catch(Ice.ConnectionRefusedException)
-            {
-                // Expected with JS bidir server
-            }
-
-            WriteLine("ok");
-        }
-
-        Write("catching object not exist exception... ");
-        Flush();
-
-        {
-            Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
-            try
-            {
-                ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
-                thrower2.ice_ping();
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException ex)
-            {
-                test(ex.id.Equals(id));
-            }
-            catch(Exception)
-            {
-                test(false);
-            }
-        }
-
-        WriteLine("ok");
-
-        Write("catching facet not exist exception... ");
-        Flush();
-
-        try
-        {
-            ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower, "no such facet");
-            try
-            {
-                thrower2.ice_ping();
-                test(false);
-            }
-            catch(Ice.FacetNotExistException ex)
-            {
-                test(ex.facet.Equals("no such facet"));
-            }
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        WriteLine("ok");
-
-        Write("catching operation not exist exception... ");
-        Flush();
-
-        try
-        {
-            WrongOperationPrx thrower2 = WrongOperationPrxHelper.uncheckedCast(thrower);
-            thrower2.noSuchOperation();
-            test(false);
-        }
-        catch(Ice.OperationNotExistException ex)
-        {
-            test(ex.operation.Equals("noSuchOperation"));
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-
-        WriteLine("ok");
-
-        Write("catching unknown local exception... ");
-        Flush();
-
-        try
-        {
-            thrower.throwLocalException();
-            test(false);
-        }
-        catch(Ice.UnknownLocalException)
-        {
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-        try
-        {
-            thrower.throwLocalExceptionIdempotent();
-            test(false);
-        }
-        catch(Ice.UnknownLocalException)
-        {
-        }
-        catch(Ice.OperationNotExistException)
-        {
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
 
-        WriteLine("ok");
+                try
+                {
+                    thrower.throwAorDasAorD(-1);
+                    test(false);
+                }
+                catch(Test.D ex)
+                {
+                    test(ex.dMem == -1);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        Write("catching unknown non-Ice exception... ");
-        Flush();
+                try
+                {
+                    thrower.throwBasB(1, 2);
+                    test(false);
+                }
+                catch(Test.B ex)
+                {
+                    test(ex.aMem == 1);
+                    test(ex.bMem == 2);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        try
-        {
-            thrower.throwNonIceException();
-            test(false);
-        }
-        catch(Ice.UnknownException)
-        {
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
+                try
+                {
+                    thrower.throwCasC(1, 2, 3);
+                    test(false);
+                }
+                catch(Test.C ex)
+                {
+                    test(ex.aMem == 1);
+                    test(ex.bMem == 2);
+                    test(ex.cMem == 3);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("testing asynchronous exceptions... ");
-        Flush();
+                output.Write("catching base types... ");
+                output.Flush();
 
-        try
-        {
-            thrower.throwAfterResponse();
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
+                try
+                {
+                    thrower.throwBasB(1, 2);
+                    test(false);
+                }
+                catch(Test.A ex)
+                {
+                    test(ex.aMem == 1);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        try
-        {
-            thrower.throwAfterException();
-            test(false);
-        }
-        catch(A)
-        {
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
+                try
+                {
+                    thrower.throwCasC(1, 2, 3);
+                    test(false);
+                }
+                catch(Test.B ex)
+                {
+                    test(ex.aMem == 1);
+                    test(ex.bMem == 2);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching exact types with AMI mapping... ");
-        Flush();
+                output.Write("catching derived types... ");
+                output.Flush();
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwAasA(1).whenCompleted(
-                () =>
+                try
                 {
+                    thrower.throwBasA(1, 2);
                     test(false);
-                },
-                (Ice.Exception exc) =>
+                }
+                catch(Test.B ex)
                 {
-                    test(exc is A);
-                    A ex = exc as A;
                     test(ex.aMem == 1);
-                    cb.called();
-                });
-            cb.check();
-        }
+                    test(ex.bMem == 2);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwAorDasAorD(1).whenCompleted(
-                () =>
+                try
                 {
+                    thrower.throwCasA(1, 2, 3);
                     test(false);
-                },
-                (Ice.Exception exc) =>
+                }
+                catch(Test.C ex)
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(A ex)
-                    {
-                        test(ex.aMem == 1);
-                    }
-                    catch(D ex)
-                    {
-                        test(ex.dMem == -1);
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                    test(ex.aMem == 1);
+                    test(ex.bMem == 2);
+                    test(ex.cMem == 3);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwAorDasAorD(-1).whenCompleted(
-                () =>
+                try
                 {
+                    thrower.throwCasB(1, 2, 3);
                     test(false);
-                },
-                (Ice.Exception exc) =>
+                }
+                catch(Test.C ex)
                 {
-                     try
-                    {
-                        throw exc;
-                    }
-                    catch(A ex)
+                    test(ex.aMem == 1);
+                    test(ex.bMem == 2);
+                    test(ex.cMem == 3);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                output.WriteLine("ok");
+
+                if(thrower.supportsUndeclaredExceptions())
+                {
+                    output.Write("catching unknown user exception... ");
+                    output.Flush();
+
+                    try
                     {
-                        test(ex.aMem == 1);
+                        thrower.throwUndeclaredA(1);
+                        test(false);
                     }
-                    catch(D ex)
+                    catch(Ice.UnknownUserException)
                     {
-                        test(ex.dMem == -1);
                     }
                     catch(Exception)
                     {
                         test(false);
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwBasB(1, 2).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
-                {
                     try
                     {
-                        throw exc;
+                        thrower.throwUndeclaredB(1, 2);
+                        test(false);
                     }
-                    catch(B ex)
+                    catch(Ice.UnknownUserException)
                     {
-                        test(ex.aMem == 1);
-                        test(ex.bMem == 2);
                     }
                     catch(Exception)
                     {
                         test(false);
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwCasC(1, 2, 3).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
-                {
                     try
                     {
-                        throw exc;
+                        thrower.throwUndeclaredC(1, 2, 3);
+                        test(false);
                     }
-                    catch(C ex)
+                    catch(Ice.UnknownUserException)
                     {
-                        test(ex.aMem == 1);
-                        test(ex.bMem == 2);
-                        test(ex.cMem == 3);
                     }
                     catch(Exception)
                     {
                         test(false);
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
-
-        WriteLine("ok");
 
-        Write("catching derived types with new AMI mapping... ");
-        Flush();
+                    output.WriteLine("ok");
+                }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwBasA(1, 2).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                if(thrower.ice_getConnection() != null)
                 {
+                    output.Write("testing memory limit marshal exception...");
+                    output.Flush();
                     try
                     {
-                        throw exc;
+                        thrower.throwMemoryLimitException(null);
+                        test(false);
                     }
-                    catch(B ex)
+                    catch(Ice.MemoryLimitException)
                     {
-                        test(ex.aMem == 1);
-                        test(ex.bMem == 2);
                     }
                     catch(Exception)
                     {
                         test(false);
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwCasA(1, 2, 3).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
-                {
-                     try
-                    {
-                        throw exc;
-                    }
-                    catch(C ex)
-                    {
-                        test(ex.aMem == 1);
-                        test(ex.bMem == 2);
-                        test(ex.cMem == 3);
-                    }
-                    catch(Exception)
+                    try
                     {
+                        thrower.throwMemoryLimitException(new byte[20 * 1024]); // 20KB
                         test(false);
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
-
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwCasB(1, 2, 3).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
-                {
-                     try
+                    catch(Ice.ConnectionLostException)
                     {
-                        throw exc;
                     }
-                    catch(C ex)
+                    catch(Ice.UnknownLocalException)
                     {
-                        test(ex.aMem == 1);
-                        test(ex.bMem == 2);
-                        test(ex.cMem == 3);
+                        // Expected with JS bidir server
                     }
                     catch(Exception)
                     {
                         test(false);
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
 
-        WriteLine("ok");
-
-        if(thrower.supportsUndeclaredExceptions())
-        {
-            Write("catching unknown user exception with new AMI mapping... ");
-            Flush();
-
-            {
-                Callback cb = new Callback();
-                thrower.begin_throwUndeclaredA(1).whenCompleted(
-                    () =>
-                    {
-                        test(false);
-                    },
-                    (Ice.Exception exc) =>
+                    try
                     {
+                        var thrower2 = Test.ThrowerPrxHelper.uncheckedCast(
+                            communicator.stringToProxy("thrower:" + helper.getTestEndpoint(1)));
                         try
                         {
-                            throw exc;
+                            thrower2.throwMemoryLimitException(new byte[2 * 1024 * 1024]); // 2MB(no limits)
                         }
-                        catch(Ice.UnknownUserException)
+                        catch(Ice.MemoryLimitException)
                         {
                         }
-                        catch(Exception)
-                        {
-                            test(false);
-                        }
-                        cb.called();
-                    });
-                cb.check();
-            }
-
-            {
-                Callback cb = new Callback();
-                thrower.begin_throwUndeclaredB(1, 2).whenCompleted(
-                    () =>
-                    {
-                        test(false);
-                    },
-                    (Ice.Exception exc) =>
-                    {
+                        var thrower3 = Test.ThrowerPrxHelper.uncheckedCast(
+                            communicator.stringToProxy("thrower:" + helper.getTestEndpoint(2)));
                         try
                         {
-                            throw exc;
-                        }
-                        catch(Ice.UnknownUserException)
-                        {
-                        }
-                        catch(Exception)
-                        {
+                            thrower3.throwMemoryLimitException(new byte[1024]); // 1KB limit
                             test(false);
                         }
-                        cb.called();
-                    });
-                cb.check();
-            }
-
-            {
-                Callback cb = new Callback();
-                thrower.begin_throwUndeclaredC(1, 2, 3).whenCompleted(
-                    () =>
-                    {
-                        test(false);
-                    },
-                    (Ice.Exception exc) =>
-                    {
-                        try
-                        {
-                            throw exc;
-                        }
-                        catch(Ice.UnknownUserException)
+                        catch(Ice.ConnectionLostException)
                         {
                         }
-                        catch(Exception)
-                        {
-                            test(false);
-                        }
-                        cb.called();
-                    });
-                cb.check();
-            }
+                    }
+                    catch(Ice.ConnectionRefusedException)
+                    {
+                        // Expected with JS bidir server
+                    }
 
-            WriteLine("ok");
-        }
+                    output.WriteLine("ok");
+                }
 
-        Write("catching object not exist exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching object not exist exception... ");
+                output.Flush();
 
-        {
-            Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
-            ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
-            Callback cb = new Callback();
-            thrower2.begin_throwAasA(1).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
                 {
+                    Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
                     try
                     {
-                        throw exc;
+                        var thrower2 = Test.ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
+                        thrower2.ice_ping();
+                        test(false);
                     }
                     catch(Ice.ObjectNotExistException ex)
                     {
@@ -942,438 +482,899 @@
                     {
                         test(false);
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching facet not exist exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching facet not exist exception... ");
+                output.Flush();
 
-        {
-            ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower, "no such facet");
-            Callback cb = new Callback();
-            thrower2.begin_throwAasA(1).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                try
                 {
+                    var thrower2 = Test.ThrowerPrxHelper.uncheckedCast(thrower, "no such facet");
                     try
                     {
-                        throw exc;
+                        thrower2.ice_ping();
+                        test(false);
                     }
                     catch(Ice.FacetNotExistException ex)
                     {
                         test(ex.facet.Equals("no such facet"));
                     }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching operation not exist exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching operation not exist exception... ");
+                output.Flush();
 
-        {
-            Callback cb = new Callback();
-            WrongOperationPrx thrower4 = WrongOperationPrxHelper.uncheckedCast(thrower);
-            thrower4.begin_noSuchOperation().whenCompleted(
-                () =>
+                try
                 {
+                    var thrower2 = Test.WrongOperationPrxHelper.uncheckedCast(thrower);
+                    thrower2.noSuchOperation();
                     test(false);
-                },
-                (Ice.Exception exc) =>
+                }
+                catch(Ice.OperationNotExistException ex)
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.OperationNotExistException ex)
-                    {
-                        test(ex.operation.Equals("noSuchOperation"));
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                    test(ex.operation.Equals("noSuchOperation"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching unknown local exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching unknown local exception... ");
+                output.Flush();
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwLocalException().whenCompleted(
-                () =>
+                try
                 {
+                    thrower.throwLocalException();
                     test(false);
-                },
-                (Ice.Exception exc) =>
+                }
+                catch(Ice.UnknownLocalException)
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.UnknownLocalException)
-                    {
-                    }
-                    catch(Ice.OperationNotExistException)
-                    {
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+                try
+                {
+                    thrower.throwLocalExceptionIdempotent();
+                    test(false);
+                }
+                catch(Ice.UnknownLocalException)
+                {
+                }
+                catch(Ice.OperationNotExistException)
+                {
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwLocalExceptionIdempotent().whenCompleted(
-                () =>
+                output.WriteLine("ok");
+
+                output.Write("catching unknown non-Ice exception... ");
+                output.Flush();
+
+                try
                 {
+                    thrower.throwNonIceException();
                     test(false);
-                },
-                (Ice.Exception exc) =>
+                }
+                catch(Ice.UnknownException)
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.UnknownLocalException)
-                    {
-                    }
-                    catch(Ice.OperationNotExistException)
-                    {
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching unknown non-Ice exception with new AMI mapping... ");
-        Flush();
+                output.Write("testing asynchronous exceptions... ");
+                output.Flush();
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwNonIceException().whenCompleted(
-                () =>
+                try
+                {
+                    thrower.throwAfterResponse();
+                }
+                catch(Exception)
                 {
                     test(false);
-                },
-                (Ice.Exception exc) =>
+                }
+
+                try
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.UnknownException)
-                    {
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                    thrower.throwAfterException();
+                    test(false);
+                }
+                catch(Test.A)
+                {
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        if(thrower.supportsUndeclaredExceptions())
-        {
-            Write("catching unknown user exception with new AMI mapping... ");
-            Flush();
+                output.Write("catching exact types with AMI mapping... ");
+                output.Flush();
 
-            {
-                Callback cb = new Callback();
-                thrower.begin_throwUndeclaredA(1).whenCompleted(
-                    () =>
-                    {
-                        test(false);
-                    },
-                    (Ice.Exception exc) =>
-                    {
-                        try
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwAasA(1).whenCompleted(
+                       () =>
                         {
-                            throw exc;
-                        }
-                        catch(Ice.UnknownUserException)
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
                         {
-                        }
-                        catch(Exception)
+                            test(exc is Test.A);
+                            var ex = exc as Test.A;
+                            test(ex.aMem == 1);
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwAorDasAorD(1).whenCompleted(
+                       () =>
                         {
                             test(false);
-                        }
-                        cb.called();
-                    });
-                cb.check();
-            }
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Test.A ex)
+                            {
+                                test(ex.aMem == 1);
+                            }
+                            catch(Test.D ex)
+                            {
+                                test(ex.dMem == -1);
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-            {
-                Callback cb = new Callback();
-                thrower.begin_throwUndeclaredB(1, 2).whenCompleted(
-                    () =>
-                    {
-                        test(false);
-                    },
-                    (Ice.Exception exc) =>
-                    {
-                        try
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwAorDasAorD(-1).whenCompleted(
+                       () =>
                         {
-                            throw exc;
-                        }
-                        catch(Ice.UnknownUserException)
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
                         {
-                        }
-                        catch(Exception)
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Test.A ex)
+                            {
+                                test(ex.aMem == 1);
+                            }
+                            catch(Test.D ex)
+                            {
+                                test(ex.dMem == -1);
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwBasB(1, 2).whenCompleted(
+                       () =>
                         {
                             test(false);
-                        }
-                        cb.called();
-                    });
-                cb.check();
-            }
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Test.B ex)
+                            {
+                                test(ex.aMem == 1);
+                                test(ex.bMem == 2);
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-            {
-                Callback cb = new Callback();
-                thrower.begin_throwUndeclaredC(1, 2, 3).whenCompleted(
-                    () =>
-                    {
-                        test(false);
-                    },
-                    (Ice.Exception exc) =>
-                    {
-                        try
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwCasC(1, 2, 3).whenCompleted(
+                       () =>
                         {
-                            throw exc;
-                        }
-                        catch(Ice.UnknownUserException)
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
                         {
-                        }
-                        catch(Exception)
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Test.C ex)
+                            {
+                                test(ex.aMem == 1);
+                                test(ex.bMem == 2);
+                                test(ex.cMem == 3);
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("catching derived types with new AMI mapping... ");
+                output.Flush();
+
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwBasA(1, 2).whenCompleted(
+                       () =>
                         {
                             test(false);
-                        }
-                        cb.called();
-                    });
-                cb.check();
-            }
-
-            WriteLine("ok");
-        }
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Test.B ex)
+                            {
+                                test(ex.aMem == 1);
+                                test(ex.bMem == 2);
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-        Write("catching object not exist exception with new AMI mapping... ");
-        Flush();
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwCasA(1, 2, 3).whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Test.C ex)
+                            {
+                                test(ex.aMem == 1);
+                                test(ex.bMem == 2);
+                                test(ex.cMem == 3);
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-        {
-            Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
-            ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
-            Callback cb = new Callback();
-            thrower2.begin_throwAasA(1).whenCompleted(
-                () =>
                 {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                    Callback cb = new Callback();
+                    thrower.begin_throwCasB(1, 2, 3).whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Test.C ex)
+                            {
+                                test(ex.aMem == 1);
+                                test(ex.bMem == 2);
+                                test(ex.cMem == 3);
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                if(thrower.supportsUndeclaredExceptions())
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.ObjectNotExistException ex)
-                    {
-                        test(ex.id.Equals(id));
-                    }
-                    catch(Exception)
+                    output.Write("catching unknown user exception with new AMI mapping... ");
+                    output.Flush();
+
                     {
-                        test(false);
+                        Callback cb = new Callback();
+                        thrower.begin_throwUndeclaredA(1).whenCompleted(
+                           () =>
+                            {
+                                test(false);
+                            },
+                           (Ice.Exception exc) =>
+                            {
+                                try
+                                {
+                                    throw exc;
+                                }
+                                catch(Ice.UnknownUserException)
+                                {
+                                }
+                                catch(Exception)
+                                {
+                                    test(false);
+                                }
+                                cb.called();
+                            });
+                        cb.check();
+                    }
+
+                    {
+                        Callback cb = new Callback();
+                        thrower.begin_throwUndeclaredB(1, 2).whenCompleted(
+                           () =>
+                            {
+                                test(false);
+                            },
+                           (Ice.Exception exc) =>
+                            {
+                                try
+                                {
+                                    throw exc;
+                                }
+                                catch(Ice.UnknownUserException)
+                                {
+                                }
+                                catch(Exception)
+                                {
+                                    test(false);
+                                }
+                                cb.called();
+                            });
+                        cb.check();
+                    }
+
+                    {
+                        Callback cb = new Callback();
+                        thrower.begin_throwUndeclaredC(1, 2, 3).whenCompleted(
+                           () =>
+                            {
+                                test(false);
+                            },
+                           (Ice.Exception exc) =>
+                            {
+                                try
+                                {
+                                    throw exc;
+                                }
+                                catch(Ice.UnknownUserException)
+                                {
+                                }
+                                catch(Exception)
+                                {
+                                    test(false);
+                                }
+                                cb.called();
+                            });
+                        cb.check();
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
 
-        WriteLine("ok");
+                    output.WriteLine("ok");
+                }
 
-        Write("catching facet not exist exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching object not exist exception with new AMI mapping... ");
+                output.Flush();
 
-        {
-            ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower, "no such facet");
-            Callback cb = new Callback();
-            thrower2.begin_throwAasA(1).whenCompleted(
-                () =>
                 {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                    Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
+                    var thrower2 = Test.ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
+                    Callback cb = new Callback();
+                    thrower2.begin_throwAasA(1).whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.ObjectNotExistException ex)
+                            {
+                                test(ex.id.Equals(id));
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("catching facet not exist exception with new AMI mapping... ");
+                output.Flush();
+
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.FacetNotExistException ex)
-                    {
-                        test(ex.facet.Equals("no such facet"));
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                    var thrower2 = Test.ThrowerPrxHelper.uncheckedCast(thrower, "no such facet");
+                    Callback cb = new Callback();
+                    thrower2.begin_throwAasA(1).whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.FacetNotExistException ex)
+                            {
+                                test(ex.facet.Equals("no such facet"));
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching operation not exist exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching operation not exist exception with new AMI mapping... ");
+                output.Flush();
 
-        {
-            Callback cb = new Callback();
-            WrongOperationPrx thrower4 = WrongOperationPrxHelper.uncheckedCast(thrower);
-            thrower4.begin_noSuchOperation().whenCompleted(
-                () =>
                 {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                    Callback cb = new Callback();
+                    var thrower4 = Test.WrongOperationPrxHelper.uncheckedCast(thrower);
+                    thrower4.begin_noSuchOperation().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.OperationNotExistException ex)
+                            {
+                                test(ex.operation.Equals("noSuchOperation"));
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("catching unknown local exception with new AMI mapping... ");
+                output.Flush();
+
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.OperationNotExistException ex)
-                    {
-                        test(ex.operation.Equals("noSuchOperation"));
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    thrower.begin_throwLocalException().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.UnknownLocalException)
+                            {
+                            }
+                            catch(Ice.OperationNotExistException)
+                            {
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwLocalExceptionIdempotent().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.UnknownLocalException)
+                            {
+                            }
+                            catch(Ice.OperationNotExistException)
+                            {
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching unknown local exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching unknown non-Ice exception with new AMI mapping... ");
+                output.Flush();
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwLocalException().whenCompleted(
-                () =>
                 {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                    Callback cb = new Callback();
+                    thrower.begin_throwNonIceException().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.UnknownException)
+                            {
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                if(thrower.supportsUndeclaredExceptions())
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.UnknownLocalException)
-                    {
-                    }
-                    catch(Ice.OperationNotExistException)
-                    {
-                    }
-                    catch(Exception)
+                    output.Write("catching unknown user exception with new AMI mapping... ");
+                    output.Flush();
+
                     {
-                        test(false);
+                        Callback cb = new Callback();
+                        thrower.begin_throwUndeclaredA(1).whenCompleted(
+                           () =>
+                            {
+                                test(false);
+                            },
+                           (Ice.Exception exc) =>
+                            {
+                                try
+                                {
+                                    throw exc;
+                                }
+                                catch(Ice.UnknownUserException)
+                                {
+                                }
+                                catch(Exception)
+                                {
+                                    test(false);
+                                }
+                                cb.called();
+                            });
+                        cb.check();
+                    }
+
+                    {
+                        Callback cb = new Callback();
+                        thrower.begin_throwUndeclaredB(1, 2).whenCompleted(
+                           () =>
+                            {
+                                test(false);
+                            },
+                           (Ice.Exception exc) =>
+                            {
+                                try
+                                {
+                                    throw exc;
+                                }
+                                catch(Ice.UnknownUserException)
+                                {
+                                }
+                                catch(Exception)
+                                {
+                                    test(false);
+                                }
+                                cb.called();
+                            });
+                        cb.check();
+                    }
+
+                    {
+                        Callback cb = new Callback();
+                        thrower.begin_throwUndeclaredC(1, 2, 3).whenCompleted(
+                           () =>
+                            {
+                                test(false);
+                            },
+                           (Ice.Exception exc) =>
+                            {
+                                try
+                                {
+                                    throw exc;
+                                }
+                                catch(Ice.UnknownUserException)
+                                {
+                                }
+                                catch(Exception)
+                                {
+                                    test(false);
+                                }
+                                cb.called();
+                            });
+                        cb.check();
                     }
-                    cb.called();
-                });
-            cb.check();
-        }
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwLocalExceptionIdempotent().whenCompleted(
-                () =>
+                    output.WriteLine("ok");
+                }
+
+                output.Write("catching object not exist exception with new AMI mapping... ");
+                output.Flush();
+
                 {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                    Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
+                    var thrower2 = Test.ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
+                    Callback cb = new Callback();
+                    thrower2.begin_throwAasA(1).whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.ObjectNotExistException ex)
+                            {
+                                test(ex.id.Equals(id));
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("catching facet not exist exception with new AMI mapping... ");
+                output.Flush();
+
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.UnknownLocalException)
-                    {
-                    }
-                    catch(Ice.OperationNotExistException)
-                    {
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                    var thrower2 = Test.ThrowerPrxHelper.uncheckedCast(thrower, "no such facet");
+                    Callback cb = new Callback();
+                    thrower2.begin_throwAasA(1).whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.FacetNotExistException ex)
+                            {
+                                test(ex.facet.Equals("no such facet"));
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("catching unknown non-Ice exception with new AMI mapping... ");
-        Flush();
+                output.Write("catching operation not exist exception with new AMI mapping... ");
+                output.Flush();
 
-        {
-            Callback cb = new Callback();
-            thrower.begin_throwNonIceException().whenCompleted(
-                () =>
                 {
-                    test(false);
-                },
-                (Ice.Exception exc) =>
+                    Callback cb = new Callback();
+                    var thrower4 = Test.WrongOperationPrxHelper.uncheckedCast(thrower);
+                    thrower4.begin_noSuchOperation().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.OperationNotExistException ex)
+                            {
+                                test(ex.operation.Equals("noSuchOperation"));
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("catching unknown local exception with new AMI mapping... ");
+                output.Flush();
+
                 {
-                    try
-                    {
-                        throw exc;
-                    }
-                    catch(Ice.UnknownException)
-                    {
-                    }
-                    catch(Exception)
-                    {
-                        test(false);
-                    }
-                    cb.called();
-                });
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    thrower.begin_throwLocalException().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.UnknownLocalException)
+                            {
+                            }
+                            catch(Ice.OperationNotExistException)
+                            {
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
 
-        WriteLine("ok");
-        return thrower;
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwLocalExceptionIdempotent().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.UnknownLocalException)
+                            {
+                            }
+                            catch(Ice.OperationNotExistException)
+                            {
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("catching unknown non-Ice exception with new AMI mapping... ");
+                output.Flush();
+
+                {
+                    Callback cb = new Callback();
+                    thrower.begin_throwNonIceException().whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception exc) =>
+                        {
+                            try
+                            {
+                                throw exc;
+                            }
+                            catch(Ice.UnknownException)
+                            {
+                            }
+                            catch(Exception)
+                            {
+                                test(false);
+                            }
+                            cb.called();
+                        });
+                    cb.check();
+                }
+
+                output.WriteLine("ok");
+                return thrower;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        ThrowerPrx thrower = AllTests.allTests(this);
-        thrower.shutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace exceptions
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.exceptions.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.Warn.Connections", "0");
+                initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var thrower = AllTests.allTests(this);
+                    thrower.shutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object obj = new ThrowerI();
-        adapter.add(obj, Ice.Util.stringToIdentity("thrower"));
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace exceptions
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.exceptions.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.Warn.Connections", "0");
+                initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+                initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.Object obj = new ThrowerI();
+                    adapter.add(obj, Ice.Util.stringToIdentity("thrower"));
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/EmptyAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/EmptyAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/EmptyAMDI.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/EmptyAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,16 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+namespace Ice
+{
+    namespace exceptions
+    {
+        namespace AMD
+        {
+            public sealed class EmptyI : Test.EmptyDisp_
+            {
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/EmptyI.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/EmptyI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/EmptyI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/EmptyI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class EmptyI : Test.EmptyDisp_
+namespace Ice
 {
+    namespace exceptions
+    {
+        public sealed class EmptyI : Test.EmptyDisp_
+        {
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -49,24 +49,24 @@
     <Compile Include="..\..\..\ServantLocatorI.cs">
       <Link>ServantLocatorI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../EmptyI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -52,14 +52,14 @@
     <Compile Include="..\..\..\ThrowerI.cs">
       <Link>ThrowerI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -73,15 +73,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../ThrowerI.cs"/>
-    <Compile Include="../../../EmptyI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../ThrowerI.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\EmptyI.cs">
       <Link>EmptyI.cs</Link>
@@ -49,24 +49,24 @@
     <Compile Include="..\..\..\ThrowerI.cs">
       <Link>ThrowerI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../ThrowerI.cs"/>
-    <Compile Include="../../../EmptyI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../ThrowerI.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,57 +17,56 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\EmptyI.cs">
-      <Link>EmptyI.cs</Link>
+    <Compile Include="..\..\..\EmptyAMDI.cs">
+      <Link>EmptyAMDI.cs</Link>
     </Compile>
     <Compile Include="..\..\..\ServantLocatorI.cs">
       <Link>ServantLocatorI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Server.cs">
-      <Link>Server.cs</Link>
+    <Compile Include="..\..\..\ServerAMD.cs">
+      <Link>ServerAMD.cs</Link>
     </Compile>
     <Compile Include="..\..\..\ThrowerAMDI.cs">
       <Link>ThrowerAMDI.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../ThrowerAMDI.cs"/>
-    <Compile Include="../../../EmptyI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../ThrowerAMDI.cs" />
+    <Compile Include="../../../EmptyAMDI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.exceptions</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../EmptyAMDI.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="../../../ThrowerAMDI.cs" />
+    <Compile Include="../../../ThrowerI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>..\..\..\TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="..\..\..\TestAMD.ice" Link="TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ServantLocatorI.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ServantLocatorI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ServantLocatorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ServantLocatorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class ServantLocatorI : Ice.ServantLocator
+namespace Ice
 {
-    public Ice.Object locate(Ice.Current curr, out System.Object cookie)
+    namespace exceptions
     {
-        cookie = null;
-        return null;
-    }
+        public sealed class ServantLocatorI : Ice.ServantLocator
+        {
+            public Ice.Object locate(Ice.Current curr, out System.Object cookie)
+            {
+                cookie = null;
+                return null;
+            }
 
-    public void finished(Ice.Current curr, Ice.Object servant, System.Object cookie)
-    {
-    }
+            public void finished(Ice.Current curr, Ice.Object servant, System.Object cookie)
+            {
+            }
 
-    public void deactivate(string category)
-    {
+            public void deactivate(string category)
+            {
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ServerAMD.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,80 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace exceptions
+    {
+        namespace AMD
+        {
+            public sealed class DummyLogger : Ice.Logger
+            {
+                public void print(string message)
+                {
+                }
+
+                public void trace(string category, string message)
+                {
+                }
+
+                public void warning(string message)
+                {
+                }
+
+                public void error(string message)
+                {
+                }
+
+                public string getPrefix()
+                {
+                    return "";
+                }
+
+                public Ice.Logger cloneWithPrefix(string prefix)
+                {
+                    return new DummyLogger();
+                }
+            }
+
+            public class Server : TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    Ice.Properties properties = createTestProperties(ref args);
+                    properties.setProperty("Ice.Warn.Dispatch", "0");
+                    properties.setProperty("Ice.Warn.Connections", "0");
+                    properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+                    using(var communicator = initialize(properties))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+                        communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0");
+                        communicator.getProperties().setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
+                        communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1");
+
+                        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                        Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+                        Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
+                        Ice.Object obj = new ThrowerI();
+                        adapter.add(obj, Ice.Util.stringToIdentity("thrower"));
+                        adapter2.add(obj, Ice.Util.stringToIdentity("thrower"));
+                        adapter3.add(obj, Ice.Util.stringToIdentity("thrower"));
+                        adapter.activate();
+                        adapter2.activate();
+                        adapter3.activate();
+                        serverReady();
+                        communicator.waitForShutdown();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return TestDriver.runTest<Server>(args);
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,85 +1,77 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public sealed class DummyLogger : Ice.Logger
+namespace Ice
 {
-    public void print(string message)
-    {
-    }
-
-    public void trace(string category, string message)
-    {
-    }
-
-    public void warning(string message)
-    {
-    }
-
-    public void error(string message)
-    {
-    }
-
-    public string getPrefix()
-    {
-        return "";
-    }
-
-    public Ice.Logger cloneWithPrefix(string prefix)
-    {
-        return new DummyLogger();
-    }
-}
-
-public class Server : TestCommon.Application
-{
-    public override int run(string[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter2");
-        Ice.ObjectAdapter adapter3 = communicator().createObjectAdapter("TestAdapter3");
-        Ice.Object obj = new ThrowerI();
-        adapter.add(obj, Ice.Util.stringToIdentity("thrower"));
-        adapter2.add(obj, Ice.Util.stringToIdentity("thrower"));
-        adapter3.add(obj, Ice.Util.stringToIdentity("thrower"));
-        adapter.activate();
-        adapter2.activate();
-        adapter3.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0");
-        initData.properties.setProperty("TestAdapter3.Endpoints", getTestEndpoint(initData.properties, 2));
-        initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace exceptions
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public sealed class DummyLogger : Ice.Logger
+        {
+            public void print(string message)
+            {
+            }
+
+            public void trace(string category, string message)
+            {
+            }
+
+            public void warning(string message)
+            {
+            }
+
+            public void error(string message)
+            {
+            }
+
+            public string getPrefix()
+            {
+                return "";
+            }
+
+            public Ice.Logger cloneWithPrefix(string prefix)
+            {
+                return new DummyLogger();
+            }
+        }
+
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+                properties.setProperty("Ice.Warn.Connections", "0");
+                properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+                    communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0");
+                    communicator.getProperties().setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
+                    communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1");
+
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+                    Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
+                    Ice.Object obj = new ThrowerI();
+                    adapter.add(obj, Ice.Util.stringToIdentity("thrower"));
+                    adapter2.add(obj, Ice.Util.stringToIdentity("thrower"));
+                    adapter3.add(obj, Ice.Util.stringToIdentity("thrower"));
+                    adapter.activate();
+                    adapter2.activate();
+                    adapter3.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/exceptions/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/BuiltinSequences.ice>
 
+[["cs:typeid-namespace:Ice.exceptions.AMD.TypeId"]]
+
+["cs:namespace:Ice.exceptions.AMD"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/BuiltinSequences.ice>
 
+[["cs:typeid-namespace:Ice.exceptions.TypeId"]]
+
+["cs:namespace:Ice.exceptions"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ThrowerAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ThrowerAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ThrowerAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ThrowerAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,156 +1,159 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Test;
 
-public class ThrowerI : ThrowerDisp_
+namespace Ice
 {
-    public ThrowerI()
-    {
-    }
-
-    public override Task
-    shutdownAsync(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-        return null;
-    }
-
-    public override Task<bool>
-    supportsUndeclaredExceptionsAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(true);
-    }
-
-    public override Task<bool>
-    supportsAssertExceptionAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(false);
-    }
-
-    public override Task
-    throwAasAAsync(int a, Ice.Current current)
-    {
-        throw new A(a);
-    }
-
-    public override Task
-    throwAorDasAorDAsync(int a, Ice.Current current)
+    namespace exceptions
     {
-        if(a > 0)
+        namespace AMD
         {
-            throw new A(a);
+            public class ThrowerI : Test.ThrowerDisp_
+            {
+                public ThrowerI()
+                {
+                }
+
+                public override Task
+                shutdownAsync(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                    return null;
+                }
+
+                public override Task<bool>
+                supportsUndeclaredExceptionsAsync(Ice.Current current)
+                {
+                    return Task.FromResult(true);
+                }
+
+                public override Task<bool>
+                supportsAssertExceptionAsync(Ice.Current current)
+                {
+                    return Task.FromResult(false);
+                }
+
+                public override Task
+                throwAasAAsync(int a, Ice.Current current)
+                {
+                    throw new Test.A(a);
+                }
+
+                public override Task
+                throwAorDasAorDAsync(int a, Ice.Current current)
+                {
+                    if(a > 0)
+                    {
+                        throw new Test.A(a);
+                    }
+                    else
+                    {
+                        throw new Test.D(a);
+                    }
+                }
+
+                public override Task
+                throwBasAAsync(int a, int b, Ice.Current current)
+                {
+                    //throw new B(a, b);
+                    var s = new TaskCompletionSource<object>();
+                    s.SetException(new Test.B(a, b));
+                    return s.Task;
+                }
+
+                public override Task
+                throwBasBAsync(int a, int b, Ice.Current current)
+                {
+                    throw new Test.B(a, b);
+                }
+
+                public override Task
+                throwCasAAsync(int a, int b, int c, Ice.Current current)
+                {
+                    throw new Test.C(a, b, c);
+                }
+
+                public override Task
+                throwCasBAsync(int a, int b, int c, Ice.Current current)
+                {
+                    throw new Test.C(a, b, c);
+                }
+
+                public override Task
+                throwCasCAsync(int a, int b, int c, Ice.Current current)
+                {
+                    throw new Test.C(a, b, c);
+                }
+
+                public override Task
+                throwUndeclaredAAsync(int a, Ice.Current current)
+                {
+                    throw new Test.A(a);
+                }
+
+                public override Task
+                throwUndeclaredBAsync(int a, int b, Ice.Current current)
+                {
+                    throw new Test.B(a, b);
+                }
+
+                public override Task
+                throwUndeclaredCAsync(int a, int b, int c, Ice.Current current)
+                {
+                    throw new Test.C(a, b, c);
+                }
+
+                public override Task
+                throwLocalExceptionAsync(Ice.Current current)
+                {
+                    throw new Ice.TimeoutException();
+                }
+
+                public override Task
+                throwNonIceExceptionAsync(Ice.Current current)
+                {
+                    throw new System.Exception();
+                }
+
+                public override Task
+                throwAssertExceptionAsync(Ice.Current current)
+                {
+                    Debug.Assert(false);
+                    return null;
+                }
+
+                public override Task<byte[]>
+                throwMemoryLimitExceptionAsync(byte[] seq, Ice.Current current)
+                {
+                    return Task.FromResult(new byte[1024 * 20]); // 20KB is over the configured 10KB message size max.
+                }
+
+                public override Task
+                throwLocalExceptionIdempotentAsync(Ice.Current current)
+                {
+                    throw new Ice.TimeoutException();
+                }
+
+                public override Task
+                throwAfterResponseAsync(Ice.Current current)
+                {
+                    // Only supported with callback based AMD API
+                    return null;
+                    //throw new Exception();
+                }
+
+                public override Task
+                throwAfterExceptionAsync(Ice.Current current)
+                {
+                    // Only supported with callback based AMD API
+                    throw new Test.A();
+                    //throw new Exception();
+                }
+            }
         }
-        else
-        {
-            throw new D(a);
-        }
-    }
-
-    public override Task
-    throwBasAAsync(int a, int b, Ice.Current current)
-    {
-        //throw new B(a, b);
-        var s = new TaskCompletionSource<object>();
-        s.SetException(new B(a,b));
-        return s.Task;
-    }
-
-    public override Task
-    throwBasBAsync(int a, int b, Ice.Current current)
-    {
-        throw new B(a, b);
-    }
-
-    public override Task
-    throwCasAAsync(int a, int b, int c, Ice.Current current)
-    {
-        throw new C(a, b, c);
-    }
-
-    public override Task
-    throwCasBAsync(int a, int b, int c, Ice.Current current)
-    {
-        throw new C(a, b, c);
-    }
-
-    public override Task
-    throwCasCAsync(int a, int b, int c, Ice.Current current)
-    {
-        throw new C(a, b, c);
-    }
-
-    public override Task
-    throwUndeclaredAAsync(int a, Ice.Current current)
-    {
-        throw new A(a);
-    }
-
-    public override Task
-    throwUndeclaredBAsync(int a, int b, Ice.Current current)
-    {
-        throw new B(a, b);
-    }
-
-    public override Task
-    throwUndeclaredCAsync(int a, int b, int c, Ice.Current current)
-    {
-        throw new C(a, b, c);
-    }
-
-    public override Task
-    throwLocalExceptionAsync(Ice.Current current)
-    {
-        throw new Ice.TimeoutException();
-    }
-
-    public override Task
-    throwNonIceExceptionAsync(Ice.Current current)
-    {
-        throw new Exception();
-    }
-
-    public override Task
-    throwAssertExceptionAsync(Ice.Current current)
-    {
-        Debug.Assert(false);
-        return null;
-    }
-
-    public override Task<byte[]>
-    throwMemoryLimitExceptionAsync(byte[] seq, Ice.Current current)
-    {
-        return Task.FromResult<byte[]>(new byte[1024 * 20]); // 20KB is over the configured 10KB message size max.
-    }
-
-    public override Task
-    throwLocalExceptionIdempotentAsync(Ice.Current current)
-    {
-        throw new Ice.TimeoutException();
-    }
-
-    public override Task
-    throwAfterResponseAsync(Ice.Current current)
-    {
-        // Only supported with callback based AMD API
-        return null;
-        //throw new Exception();
-    }
-
-    public override Task
-    throwAfterExceptionAsync(Ice.Current current)
-    {
-        // Only supported with callback based AMD API
-        throw new A();
-        //throw new Exception();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ThrowerI.cs zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ThrowerI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/exceptions/ThrowerI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/exceptions/ThrowerI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,153 +1,153 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
-using Test;
 
-public sealed class ThrowerI : ThrowerDisp_
+namespace Ice
 {
-    public ThrowerI()
-    {
-    }
-
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    public override bool supportsUndeclaredExceptions(Ice.Current current)
-    {
-        return true;
-    }
-
-    public override bool supportsAssertException(Ice.Current current)
-    {
-        return false;
-    }
-
-    public override void throwAasA(int a, Ice.Current current)
-    {
-        A ex = new A();
-        ex.aMem = a;
-        throw ex;
-    }
-
-    public override void throwAorDasAorD(int a, Ice.Current current)
+    namespace exceptions
     {
-        if(a > 0)
+        public sealed class ThrowerI : Test.ThrowerDisp_
         {
-            A ex = new A();
-            ex.aMem = a;
-            throw ex;
+            public ThrowerI()
+            {
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            public override bool supportsUndeclaredExceptions(Ice.Current current)
+            {
+                return true;
+            }
+
+            public override bool supportsAssertException(Ice.Current current)
+            {
+                return false;
+            }
+
+            public override void throwAasA(int a, Ice.Current current)
+            {
+                var ex = new Test.A();
+                ex.aMem = a;
+                throw ex;
+            }
+
+            public override void throwAorDasAorD(int a, Ice.Current current)
+            {
+                if(a > 0)
+                {
+                    var ex = new Test.A();
+                    ex.aMem = a;
+                    throw ex;
+                }
+                else
+                {
+                    var ex = new Test.D();
+                    ex.dMem = a;
+                    throw ex;
+                }
+            }
+
+            public override void throwBasA(int a, int b, Ice.Current current)
+            {
+                throwBasB(a, b, current);
+            }
+
+            public override void throwBasB(int a, int b, Ice.Current current)
+            {
+                var ex = new Test.B();
+                ex.aMem = a;
+                ex.bMem = b;
+                throw ex;
+            }
+
+            public override void throwCasA(int a, int b, int c, Ice.Current current)
+            {
+                throwCasC(a, b, c, current);
+            }
+
+            public override void throwCasB(int a, int b, int c, Ice.Current current)
+            {
+                throwCasC(a, b, c, current);
+            }
+
+            public override void throwCasC(int a, int b, int c, Ice.Current current)
+            {
+                var ex = new Test.C();
+                ex.aMem = a;
+                ex.bMem = b;
+                ex.cMem = c;
+                throw ex;
+            }
+
+            public override void throwLocalException(Ice.Current current)
+            {
+                throw new Ice.TimeoutException();
+            }
+
+            public override void throwNonIceException(Ice.Current current)
+            {
+                throw new System.Exception();
+            }
+
+            public override void throwAssertException(Ice.Current current)
+            {
+                Debug.Assert(false);
+            }
+
+            public override byte[] throwMemoryLimitException(byte[] seq, Ice.Current current)
+            {
+                return new byte[1024 * 20]; // 20KB is over the configured 10KB message size max.
+            }
+
+            public override void throwLocalExceptionIdempotent(Ice.Current current)
+            {
+                throw new Ice.TimeoutException();
+            }
+
+            public override void throwUndeclaredA(int a, Ice.Current current)
+            {
+                var ex = new Test.A();
+                ex.aMem = a;
+                throw ex;
+            }
+
+            public override void throwUndeclaredB(int a, int b, Ice.Current current)
+            {
+                var ex = new Test.B();
+                ex.aMem = a;
+                ex.bMem = b;
+                throw ex;
+            }
+
+            public override void throwUndeclaredC(int a, int b, int c, Ice.Current current)
+            {
+                var ex = new Test.C();
+                ex.aMem = a;
+                ex.bMem = b;
+                ex.cMem = c;
+                throw ex;
+            }
+
+            public override void throwAfterResponse(Ice.Current current)
+            {
+                //
+                // Only relevant for AMD.
+                //
+            }
+
+            public override void throwAfterException(Ice.Current current)
+            {
+                //
+                // Only relevant for AMD.
+                //
+                throw new Test.A();
+            }
         }
-        else
-        {
-            D ex = new D();
-            ex.dMem = a;
-            throw ex;
-        }
-    }
-
-    public override void throwBasA(int a, int b, Ice.Current current)
-    {
-        throwBasB(a, b, current);
-    }
-
-    public override void throwBasB(int a, int b, Ice.Current current)
-    {
-        B ex = new B();
-        ex.aMem = a;
-        ex.bMem = b;
-        throw ex;
-    }
-
-    public override void throwCasA(int a, int b, int c, Ice.Current current)
-    {
-        throwCasC(a, b, c, current);
-    }
-
-    public override void throwCasB(int a, int b, int c, Ice.Current current)
-    {
-        throwCasC(a, b, c, current);
-    }
-
-    public override void throwCasC(int a, int b, int c, Ice.Current current)
-    {
-        C ex = new C();
-        ex.aMem = a;
-        ex.bMem = b;
-        ex.cMem = c;
-        throw ex;
-    }
-
-    public override void throwLocalException(Ice.Current current)
-    {
-        throw new Ice.TimeoutException();
-    }
-
-    public override void throwNonIceException(Ice.Current current)
-    {
-        throw new Exception();
-    }
-
-    public override void throwAssertException(Ice.Current current)
-    {
-        Debug.Assert(false);
-    }
-
-    public override byte[] throwMemoryLimitException(byte[] seq, Ice.Current current)
-    {
-        return new byte[1024 * 20]; // 20KB is over the configured 10KB message size max.
-    }
-
-    public override void throwLocalExceptionIdempotent(Ice.Current current)
-    {
-        throw new Ice.TimeoutException();
-    }
-
-    public override void throwUndeclaredA(int a, Ice.Current current)
-    {
-        A ex = new A();
-        ex.aMem = a;
-        throw ex;
-    }
-
-    public override void throwUndeclaredB(int a, int b, Ice.Current current)
-    {
-        B ex = new B();
-        ex.aMem = a;
-        ex.bMem = b;
-        throw ex;
-    }
-
-    public override void throwUndeclaredC(int a, int b, int c, Ice.Current current)
-    {
-        C ex = new C();
-        ex.aMem = a;
-        ex.bMem = b;
-        ex.cMem = c;
-        throw ex;
-    }
-
-    public override void throwAfterResponse(Ice.Current current)
-    {
-        //
-        // Only relevant for AMD.
-        //
-    }
-
-    public override void throwAfterException(Ice.Current current)
-    {
-        //
-        // Only relevant for AMD.
-        //
-        throw new A();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/AI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/AI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/AI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/AI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class AI : ADisp_
+namespace Ice
 {
-    public AI()
+    namespace facets
     {
-    }
+        public sealed class AI : Test.ADisp_
+        {
+            public AI()
+            {
+            }
 
-    public override string callA(Ice.Current current)
-    {
-        return "A";
+            public override string callA(Ice.Current current)
+            {
+                return "A";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,190 +1,190 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static GPrx allTests(TestCommon.Application app)
+    namespace facets
     {
-
-        Ice.Communicator communicator = app.communicator();
-
-        Write("testing Ice.Admin.Facets property... ");
-        test(communicator.getProperties().getPropertyAsList("Ice.Admin.Facets").Length == 0);
-        communicator.getProperties().setProperty("Ice.Admin.Facets", "foobar");
-        String[] facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
-        test(facetFilter.Length == 1 && facetFilter[0].Equals("foobar"));
-        communicator.getProperties().setProperty("Ice.Admin.Facets", "foo\\'bar");
-        facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
-        test(facetFilter.Length == 1 && facetFilter[0].Equals("foo'bar"));
-        communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar' toto 'titi'");
-        facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
-        test(facetFilter.Length == 3 && facetFilter[0].Equals("foo bar") && facetFilter[1].Equals("toto")
-             && facetFilter[2].Equals("titi"));
-        communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar\\' toto' 'titi'");
-        facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
-        test(facetFilter.Length == 2 && facetFilter[0].Equals("foo bar' toto") && facetFilter[1].Equals("titi"));
-        //  communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar' 'toto titi");
-        // facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
-        // test(facetFilter.Length == 0);
-        communicator.getProperties().setProperty("Ice.Admin.Facets", "");
-        WriteLine("ok");
-
-        Write("testing facet registration exceptions... ");
-        communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "tcp -h *");
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter");
-        Ice.Object obj = new EmptyI();
-        adapter.add(obj, Ice.Util.stringToIdentity("d"));
-        adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD");
-        try
-        {
-            adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD");
-            test(false);
-        }
-        catch(Ice.AlreadyRegisteredException)
-        {
-        }
-        adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD");
-        try
+        public class AllTests : global::Test.AllTests
         {
-            adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD");
-            test(false);
-        }
-        catch(Ice.NotRegisteredException)
-        {
-        }
-        WriteLine("ok");
+            public static Test.GPrx allTests(global::Test.TestHelper helper)
+            {
 
-        Write("testing removeAllFacets... ");
-        Ice.Object obj1 = new EmptyI();
-        Ice.Object obj2 = new EmptyI();
-        adapter.addFacet(obj1, Ice.Util.stringToIdentity("id1"), "f1");
-        adapter.addFacet(obj2, Ice.Util.stringToIdentity("id1"), "f2");
-        Ice.Object obj3 = new EmptyI();
-        adapter.addFacet(obj1, Ice.Util.stringToIdentity("id2"), "f1");
-        adapter.addFacet(obj2, Ice.Util.stringToIdentity("id2"), "f2");
-        adapter.addFacet(obj3, Ice.Util.stringToIdentity("id2"), "");
-        Dictionary<string, Ice.Object> fm
-            = adapter.removeAllFacets(Ice.Util.stringToIdentity("id1"));
-        test(fm.Count == 2);
-        test(fm["f1"] == obj1);
-        test(fm["f2"] == obj2);
-        try
-        {
-            adapter.removeAllFacets(Ice.Util.stringToIdentity("id1"));
-            test(false);
-        }
-        catch(Ice.NotRegisteredException)
-        {
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing Ice.Admin.Facets property... ");
+                test(communicator.getProperties().getPropertyAsList("Ice.Admin.Facets").Length == 0);
+                communicator.getProperties().setProperty("Ice.Admin.Facets", "foobar");
+                String[] facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
+                test(facetFilter.Length == 1 && facetFilter[0].Equals("foobar"));
+                communicator.getProperties().setProperty("Ice.Admin.Facets", "foo\\'bar");
+                facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
+                test(facetFilter.Length == 1 && facetFilter[0].Equals("foo'bar"));
+                communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar' toto 'titi'");
+                facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
+                test(facetFilter.Length == 3 && facetFilter[0].Equals("foo bar") && facetFilter[1].Equals("toto")
+                     && facetFilter[2].Equals("titi"));
+                communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar\\' toto' 'titi'");
+                facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
+                test(facetFilter.Length == 2 && facetFilter[0].Equals("foo bar' toto") && facetFilter[1].Equals("titi"));
+                // communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar' 'toto titi");
+                // facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
+                // test(facetFilter.Length == 0);
+                communicator.getProperties().setProperty("Ice.Admin.Facets", "");
+                output.WriteLine("ok");
+
+                output.Write("testing facet registration exceptions... ");
+                communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "tcp -h *");
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter");
+                Ice.Object obj = new EmptyI();
+                adapter.add(obj, Ice.Util.stringToIdentity("d"));
+                adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD");
+                try
+                {
+                    adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD");
+                    test(false);
+                }
+                catch(Ice.AlreadyRegisteredException)
+                {
+                }
+                adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD");
+                try
+                {
+                    adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD");
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException)
+                {
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing removeAllFacets... ");
+                Ice.Object obj1 = new EmptyI();
+                Ice.Object obj2 = new EmptyI();
+                adapter.addFacet(obj1, Ice.Util.stringToIdentity("id1"), "f1");
+                adapter.addFacet(obj2, Ice.Util.stringToIdentity("id1"), "f2");
+                Ice.Object obj3 = new EmptyI();
+                adapter.addFacet(obj1, Ice.Util.stringToIdentity("id2"), "f1");
+                adapter.addFacet(obj2, Ice.Util.stringToIdentity("id2"), "f2");
+                adapter.addFacet(obj3, Ice.Util.stringToIdentity("id2"), "");
+                Dictionary<string, Ice.Object> fm
+                    = adapter.removeAllFacets(Ice.Util.stringToIdentity("id1"));
+                test(fm.Count == 2);
+                test(fm["f1"] == obj1);
+                test(fm["f2"] == obj2);
+                try
+                {
+                    adapter.removeAllFacets(Ice.Util.stringToIdentity("id1"));
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException)
+                {
+                }
+                fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id2"));
+                test(fm.Count == 3);
+                test(fm["f1"] == obj1);
+                test(fm["f2"] == obj2);
+                test(fm[""] == obj3);
+                output.WriteLine("ok");
+
+                adapter.deactivate();
+
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                string @ref = "d:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx db = communicator.stringToProxy(@ref);
+                test(db != null);
+                output.WriteLine("ok");
+
+                output.Write("testing unchecked cast... ");
+                output.Flush();
+                Ice.ObjectPrx prx = Ice.ObjectPrxHelper.uncheckedCast(db);
+                test(prx.ice_getFacet().Length == 0);
+                prx = Ice.ObjectPrxHelper.uncheckedCast(db, "facetABCD");
+                test(prx.ice_getFacet() == "facetABCD");
+                Ice.ObjectPrx prx2 = Ice.ObjectPrxHelper.uncheckedCast(prx);
+                test(prx2.ice_getFacet() == "facetABCD");
+                Ice.ObjectPrx prx3 = Ice.ObjectPrxHelper.uncheckedCast(prx, "");
+                test(prx3.ice_getFacet().Length == 0);
+                var d = Test.DPrxHelper.uncheckedCast(db);
+                test(d.ice_getFacet().Length == 0);
+                var df = Test.DPrxHelper.uncheckedCast(db, "facetABCD");
+                test(df.ice_getFacet() == "facetABCD");
+                var df2 = Test.DPrxHelper.uncheckedCast(df);
+                test(df2.ice_getFacet() == "facetABCD");
+                var df3 = Test.DPrxHelper.uncheckedCast(df, "");
+                test(df3.ice_getFacet().Length == 0);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                prx = Ice.ObjectPrxHelper.checkedCast(db);
+                test(prx.ice_getFacet().Length == 0);
+                prx = Ice.ObjectPrxHelper.checkedCast(db, "facetABCD");
+                test(prx.ice_getFacet() == "facetABCD");
+                prx2 = Ice.ObjectPrxHelper.checkedCast(prx);
+                test(prx2.ice_getFacet() == "facetABCD");
+                prx3 = Ice.ObjectPrxHelper.checkedCast(prx, "");
+                test(prx3.ice_getFacet().Length == 0);
+                d = Test.DPrxHelper.checkedCast(db);
+                test(d.ice_getFacet().Length == 0);
+                df = Test.DPrxHelper.checkedCast(db, "facetABCD");
+                test(df.ice_getFacet() == "facetABCD");
+                df2 = Test.DPrxHelper.checkedCast(df);
+                test(df2.ice_getFacet() == "facetABCD");
+                df3 = Test.DPrxHelper.checkedCast(df, "");
+                test(df3.ice_getFacet().Length == 0);
+                output.WriteLine("ok");
+
+                output.Write("testing non-facets A, B, C, and D... ");
+                output.Flush();
+                d = Test.DPrxHelper.checkedCast(db);
+                test(d != null);
+                test(d.Equals(db));
+                test(d.callA().Equals("A"));
+                test(d.callB().Equals("B"));
+                test(d.callC().Equals("C"));
+                test(d.callD().Equals("D"));
+                output.WriteLine("ok");
+
+                output.Write("testing facets A, B, C, and D... ");
+                output.Flush();
+                df = Test.DPrxHelper.checkedCast(d, "facetABCD");
+                test(df != null);
+                test(df.callA().Equals("A"));
+                test(df.callB().Equals("B"));
+                test(df.callC().Equals("C"));
+                test(df.callD().Equals("D"));
+                output.WriteLine("ok");
+
+                output.Write("testing facets E and F... ");
+                output.Flush();
+                var ff = Test.FPrxHelper.checkedCast(d, "facetEF");
+                test(ff != null);
+                test(ff.callE().Equals("E"));
+                test(ff.callF().Equals("F"));
+                output.WriteLine("ok");
+
+                output.Write("testing facet G... ");
+                output.Flush();
+                var gf = Test.GPrxHelper.checkedCast(ff, "facetGH");
+                test(gf != null);
+                test(gf.callG().Equals("G"));
+                output.WriteLine("ok");
+
+                output.Write("testing whether casting preserves the facet... ");
+                output.Flush();
+                var hf = Test.HPrxHelper.checkedCast(gf);
+                test(hf != null);
+                test(hf.callG().Equals("G"));
+                test(hf.callH().Equals("H"));
+                output.WriteLine("ok");
+                return gf;
+            }
         }
-        fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id2"));
-        test(fm.Count == 3);
-        test(fm["f1"] == obj1);
-        test(fm["f2"] == obj2);
-        test(fm[""] == obj3);
-        WriteLine("ok");
-
-        adapter.deactivate();
-
-        Write("testing stringToProxy... ");
-        Flush();
-        string @ref = "d:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx db = communicator.stringToProxy(@ref);
-        test(db != null);
-        WriteLine("ok");
-
-        Write("testing unchecked cast... ");
-        Flush();
-        Ice.ObjectPrx prx = Ice.ObjectPrxHelper.uncheckedCast(db);
-        test(prx.ice_getFacet().Length == 0);
-        prx = Ice.ObjectPrxHelper.uncheckedCast(db, "facetABCD");
-        test(prx.ice_getFacet() == "facetABCD");
-        Ice.ObjectPrx prx2 = Ice.ObjectPrxHelper.uncheckedCast(prx);
-        test(prx2.ice_getFacet() == "facetABCD");
-        Ice.ObjectPrx prx3 = Ice.ObjectPrxHelper.uncheckedCast(prx, "");
-        test(prx3.ice_getFacet().Length == 0);
-        DPrx d = Test.DPrxHelper.uncheckedCast(db);
-        test(d.ice_getFacet().Length == 0);
-        DPrx df = Test.DPrxHelper.uncheckedCast(db, "facetABCD");
-        test(df.ice_getFacet() == "facetABCD");
-        DPrx df2 = Test.DPrxHelper.uncheckedCast(df);
-        test(df2.ice_getFacet() == "facetABCD");
-        DPrx df3 = Test.DPrxHelper.uncheckedCast(df, "");
-        test(df3.ice_getFacet().Length == 0);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        prx = Ice.ObjectPrxHelper.checkedCast(db);
-        test(prx.ice_getFacet().Length == 0);
-        prx = Ice.ObjectPrxHelper.checkedCast(db, "facetABCD");
-        test(prx.ice_getFacet() == "facetABCD");
-        prx2 = Ice.ObjectPrxHelper.checkedCast(prx);
-        test(prx2.ice_getFacet() == "facetABCD");
-        prx3 = Ice.ObjectPrxHelper.checkedCast(prx, "");
-        test(prx3.ice_getFacet().Length == 0);
-        d = Test.DPrxHelper.checkedCast(db);
-        test(d.ice_getFacet().Length == 0);
-        df = Test.DPrxHelper.checkedCast(db, "facetABCD");
-        test(df.ice_getFacet() == "facetABCD");
-        df2 = Test.DPrxHelper.checkedCast(df);
-        test(df2.ice_getFacet() == "facetABCD");
-        df3 = Test.DPrxHelper.checkedCast(df, "");
-        test(df3.ice_getFacet().Length == 0);
-        WriteLine("ok");
-
-        Write("testing non-facets A, B, C, and D... ");
-        Flush();
-        d = DPrxHelper.checkedCast(db);
-        test(d != null);
-        test(d.Equals(db));
-        test(d.callA().Equals("A"));
-        test(d.callB().Equals("B"));
-        test(d.callC().Equals("C"));
-        test(d.callD().Equals("D"));
-        WriteLine("ok");
-
-        Write("testing facets A, B, C, and D... ");
-        Flush();
-        df = DPrxHelper.checkedCast(d, "facetABCD");
-        test(df != null);
-        test(df.callA().Equals("A"));
-        test(df.callB().Equals("B"));
-        test(df.callC().Equals("C"));
-        test(df.callD().Equals("D"));
-        WriteLine("ok");
-
-        Write("testing facets E and F... ");
-        Flush();
-        FPrx ff = FPrxHelper.checkedCast(d, "facetEF");
-        test(ff != null);
-        test(ff.callE().Equals("E"));
-        test(ff.callF().Equals("F"));
-        WriteLine("ok");
-
-        Write("testing facet G... ");
-        Flush();
-        GPrx gf = GPrxHelper.checkedCast(ff, "facetGH");
-        test(gf != null);
-        test(gf.callG().Equals("G"));
-        WriteLine("ok");
-
-        Write("testing whether casting preserves the facet... ");
-        Flush();
-        HPrx hf = HPrxHelper.checkedCast(gf);
-        test(hf != null);
-        test(hf.callG().Equals("G"));
-        test(hf.callH().Equals("H"));
-        WriteLine("ok");
-        return gf;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/BI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/BI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/BI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/BI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class BI : BDisp_
+namespace Ice
 {
-    public BI()
+    namespace facets
     {
-    }
+        public sealed class BI : Test.BDisp_
+        {
+            public BI()
+            {
+            }
 
-    public override string callA(Ice.Current current)
-    {
-        return "A";
-    }
+            public override string callA(Ice.Current current)
+            {
+                return "A";
+            }
 
-    public override string callB(Ice.Current current)
-    {
-        return "B";
+            public override string callB(Ice.Current current)
+            {
+                return "B";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/CI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/CI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/CI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/CI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class CI : CDisp_
+namespace Ice
 {
-    public CI()
+    namespace facets
     {
-    }
+        public sealed class CI : Test.CDisp_
+        {
+            public CI()
+            {
+            }
 
-    public override string callA(Ice.Current current)
-    {
-        return "A";
-    }
+            public override string callA(Ice.Current current)
+            {
+                return "A";
+            }
 
-    public override string callC(Ice.Current current)
-    {
-        return "C";
+            public override string callC(Ice.Current current)
+            {
+                return "C";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace facets
     {
-        GPrx g = AllTests.allTests(this);
-        g.shutdown();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var g = AllTests.allTests(this);
+                    g.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object d = new DI();
-        adapter.add(d, Ice.Util.stringToIdentity("d"));
-        adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
-        Ice.Object f = new FI();
-        adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
-        Ice.Object h = new HI(communicator());
-        adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace facets
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.Object d = new DI();
+                    adapter.add(d, Ice.Util.stringToIdentity("d"));
+                    adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
+                    Ice.Object f = new FI();
+                    adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
+                    Ice.Object h = new HI(communicator);
+                    adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/DI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/DI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/DI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/DI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class DI : DDisp_
+namespace Ice
 {
-    public DI()
-    {
-    }
-
-    public override string callA(Ice.Current current)
-    {
-        return "A";
-    }
-
-    public override string callB(Ice.Current current)
-    {
-        return "B";
-    }
-
-    public override string callC(Ice.Current current)
-    {
-        return "C";
-    }
-
-    public override string callD(Ice.Current current)
+    namespace facets
     {
-        return "D";
+        public sealed class DI : Test.DDisp_
+        {
+            public DI()
+            {
+            }
+
+            public override string callA(Ice.Current current)
+            {
+                return "A";
+            }
+
+            public override string callB(Ice.Current current)
+            {
+                return "B";
+            }
+
+            public override string callC(Ice.Current current)
+            {
+                return "C";
+            }
+
+            public override string callD(Ice.Current current)
+            {
+                return "D";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/EI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/EI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/EI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/EI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class EI : EDisp_
+namespace Ice
 {
-    public EI()
+    namespace facets
     {
-    }
+        public sealed class EI : Test.EDisp_
+        {
+            public EI()
+            {
+            }
 
-    public override string callE(Ice.Current current)
-    {
-        return "E";
+            public override string callE(Ice.Current current)
+            {
+                return "E";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/EmptyI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/EmptyI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/EmptyI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/EmptyI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class EmptyI : Test.EmptyDisp_
+namespace Ice
 {
+    namespace facets
+    {
+        public sealed class EmptyI : Test.EmptyDisp_
+        {
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/FI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/FI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/FI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/FI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class FI : FDisp_
+namespace Ice
 {
-    public FI()
+    namespace facets
     {
-    }
+        public sealed class FI : Test.FDisp_
+        {
+            public FI()
+            {
+            }
 
-    public override string callE(Ice.Current current)
-    {
-        return "E";
-    }
+            public override string callE(Ice.Current current)
+            {
+                return "E";
+            }
 
-    public override string callF(Ice.Current current)
-    {
-        return "F";
+            public override string callF(Ice.Current current)
+            {
+                return "F";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/GI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/GI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/GI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/GI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class GI : GDisp_
+namespace Ice
 {
-    public GI(Ice.Communicator communicator)
+    namespace facets
     {
-        _communicator = communicator;
-    }
+        public sealed class GI : Test.GDisp_
+        {
+            public GI(Ice.Communicator communicator)
+            {
+                _communicator = communicator;
+            }
 
-    public override string callG(Ice.Current current)
-    {
-        return "G";
-    }
+            public override string callG(Ice.Current current)
+            {
+                return "G";
+            }
 
-    public override void shutdown(Ice.Current current)
-    {
-        _communicator.shutdown();
-    }
+            public override void shutdown(Ice.Current current)
+            {
+                _communicator.shutdown();
+            }
 
-    private Ice.Communicator _communicator;
+            private Ice.Communicator _communicator;
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/HI.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/HI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/HI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/HI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class HI : HDisp_
+namespace Ice
 {
-    public HI(Ice.Communicator communicator)
+    namespace facets
     {
-        _communicator = communicator;
-    }
+        public sealed class HI : Test.HDisp_
+        {
+            public HI(Ice.Communicator communicator)
+            {
+                _communicator = communicator;
+            }
+
+            public override string callG(Ice.Current current)
+            {
+                return "G";
+            }
+
+            public override string callH(Ice.Current current)
+            {
+                return "H";
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                _communicator.shutdown();
+            }
 
-    public override string callG(Ice.Current current)
-    {
-        return "G";
+            private Ice.Communicator _communicator;
+        }
     }
-
-    public override string callH(Ice.Current current)
-    {
-        return "H";
-    }
-
-    public override void shutdown(Ice.Current current)
-    {
-        _communicator.shutdown();
-    }
-
-    private Ice.Communicator _communicator;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -46,24 +46,24 @@
     <Compile Include="..\..\..\EmptyI.cs">
       <Link>EmptyI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../EmptyI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AI.cs">
       <Link>AI.cs</Link>
@@ -70,14 +70,14 @@
     <Compile Include="..\..\..\HI.cs">
       <Link>HI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -91,15 +91,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../AI.cs"/>
-    <Compile Include="../../../BI.cs"/>
-    <Compile Include="../../../CI.cs"/>
-    <Compile Include="../../../DI.cs"/>
-    <Compile Include="../../../EI.cs"/>
-    <Compile Include="../../../EmptyI.cs"/>
-    <Compile Include="../../../FI.cs"/>
-    <Compile Include="../../../GI.cs"/>
-    <Compile Include="../../../HI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../AI.cs" />
+    <Compile Include="../../../BI.cs" />
+    <Compile Include="../../../CI.cs" />
+    <Compile Include="../../../DI.cs" />
+    <Compile Include="../../../EI.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="../../../FI.cs" />
+    <Compile Include="../../../GI.cs" />
+    <Compile Include="../../../HI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AI.cs">
       <Link>AI.cs</Link>
@@ -67,24 +67,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AI.cs"/>
-    <Compile Include="../../../BI.cs"/>
-    <Compile Include="../../../CI.cs"/>
-    <Compile Include="../../../DI.cs"/>
-    <Compile Include="../../../EI.cs"/>
-    <Compile Include="../../../EmptyI.cs"/>
-    <Compile Include="../../../FI.cs"/>
-    <Compile Include="../../../GI.cs"/>
-    <Compile Include="../../../HI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AI.cs" />
+    <Compile Include="../../../BI.cs" />
+    <Compile Include="../../../CI.cs" />
+    <Compile Include="../../../DI.cs" />
+    <Compile Include="../../../EI.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="../../../FI.cs" />
+    <Compile Include="../../../GI.cs" />
+    <Compile Include="../../../HI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.facets</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../EmptyI.cs" />
+    <Compile Include="../../../AI.cs" />
+    <Compile Include="../../../BI.cs" />
+    <Compile Include="../../../CI.cs" />
+    <Compile Include="../../../DI.cs" />
+    <Compile Include="../../../EI.cs" />
+    <Compile Include="../../../FI.cs" />
+    <Compile Include="../../../GI.cs" />
+    <Compile Include="../../../HI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/facets/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object d = new DI();
-        adapter.add(d, Ice.Util.stringToIdentity("d"));
-        adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
-        Ice.Object f = new FI();
-        adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
-        Ice.Object h = new HI(communicator());
-        adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
-
-        adapter.activate();
-        communicator().waitForShutdown();
-
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace facets
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.Object d = new DI();
+                    adapter.add(d, Ice.Util.stringToIdentity("d"));
+                    adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
+                    Ice.Object f = new FI();
+                    adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
+                    Ice.Object h = new HI(communicator);
+                    adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/facets/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.facets"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
 using System.Collections.Generic;
+using System.IO;
 using Test;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
     private class Callback
     {
@@ -47,7 +43,7 @@
         private bool _called;
     }
 
-    private static void exceptAbortI(Ice.Exception ex)
+    private static void exceptAbortI(Ice.Exception ex, TextWriter output)
     {
         try
         {
@@ -64,31 +60,32 @@
         }
         catch(Exception)
         {
-            WriteLine(ex.ToString());
+            output.WriteLine(ex.ToString());
             test(false);
         }
     }
 
-    public static void allTests(TestCommon.Application app, List<int> ports)
+    public static void allTests(Test.TestHelper helper, List<int> ports)
     {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
+        Ice.Communicator communicator = helper.communicator();
+        var output = helper.getWriter();
+        output.Write("testing stringToProxy... ");
+        output.Flush();
         string refString = "test";
         for(int i = 0; i < ports.Count; i++)
         {
-            refString += ":" + app.getTestEndpoint(ports[i]);
+            refString += ":" + helper.getTestEndpoint(ports[i]);
         }
         Ice.ObjectPrx basePrx = communicator.stringToProxy(refString);
         test(basePrx != null);
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing checked cast... ");
-        Flush();
+        output.Write("testing checked cast... ");
+        output.Flush();
         TestIntfPrx obj = TestIntfPrxHelper.checkedCast(basePrx);
         test(obj != null);
         test(obj.Equals(basePrx));
-        WriteLine("ok");
+        output.WriteLine("ok");
 
         int oldPid = 0;
         bool ami = false;
@@ -102,17 +99,17 @@
 
             if(!ami)
             {
-                Write("testing server #" + i + "... ");
-                Flush();
+                output.Write("testing server #" + i + "... ");
+                output.Flush();
                 int pid = obj.pid();
                 test(pid != oldPid);
-                WriteLine("ok");
+                output.WriteLine("ok");
                 oldPid = pid;
             }
             else
             {
-                Write("testing server #" + i + " with AMI... ");
-                Flush();
+                output.Write("testing server #" + i + " with AMI... ");
+                output.Flush();
                 Callback cb = new Callback();
                 int pid = -1;
                 obj.begin_pid().whenCompleted(
@@ -123,12 +120,12 @@
                     },
                     (Ice.Exception ex) =>
                     {
-                        WriteLine(ex.ToString());
+                        output.WriteLine(ex.ToString());
                         test(false);
                     });
                 cb.check();
                 test(pid != oldPid);
-                WriteLine("ok");
+                output.WriteLine("ok");
                 oldPid = pid;
             }
 
@@ -136,14 +133,14 @@
             {
                 if(!ami)
                 {
-                    Write("shutting down server #" + i + "... ");
-                    Flush();
+                    output.Write("shutting down server #" + i + "... ");
+                    output.Flush();
                     obj.shutdown();
-                    WriteLine("ok");
+                    output.WriteLine("ok");
                 }
                 else
                 {
-                    Write("shutting down server #" + i + " with AMI... ");
+                    output.Write("shutting down server #" + i + " with AMI... ");
                     Callback cb = new Callback();
                     obj.begin_shutdown().whenCompleted(
                         () =>
@@ -152,19 +149,19 @@
                         },
                         (Ice.Exception ex) =>
                         {
-                            WriteLine(ex.ToString());
+                            output.WriteLine(ex.ToString());
                             test(false);
                         });
                     cb.check();
-                    WriteLine("ok");
+                    output.WriteLine("ok");
                 }
             }
             else if(j == 1 || i + 1 > ports.Count)
             {
                 if(!ami)
                 {
-                    Write("aborting server #" + i + "... ");
-                    Flush();
+                    output.Write("aborting server #" + i + "... ");
+                    output.Flush();
                     try
                     {
                         obj.abort();
@@ -172,21 +169,21 @@
                     }
                     catch(Ice.ConnectionLostException)
                     {
-                        WriteLine("ok");
+                        output.WriteLine("ok");
                     }
                     catch(Ice.ConnectFailedException)
                     {
-                        WriteLine("ok");
+                        output.WriteLine("ok");
                     }
                     catch(Ice.SocketException)
                     {
-                        WriteLine("ok");
+                        output.WriteLine("ok");
                     }
                 }
                 else
                 {
-                    Write("aborting server #" + i + " with AMI... ");
-                    Flush();
+                    output.Write("aborting server #" + i + " with AMI... ");
+                    output.Flush();
                     Callback cb = new Callback();
                     obj.begin_abort().whenCompleted(
                         () =>
@@ -195,19 +192,19 @@
                         },
                         (Ice.Exception ex) =>
                         {
-                            exceptAbortI(ex);
+                            exceptAbortI(ex, output);
                             cb.called();
                         });
                     cb.check();
-                    WriteLine("ok");
+                    output.WriteLine("ok");
                 }
             }
             else if(j == 2 || j == 3)
             {
                 if(!ami)
                 {
-                    Write("aborting server #" + i + " and #" + (i + 1) + " with idempotent call... ");
-                    Flush();
+                    output.Write("aborting server #" + i + " and #" + (i + 1) + " with idempotent call... ");
+                    output.Flush();
                     try
                     {
                         obj.idempotentAbort();
@@ -215,21 +212,21 @@
                     }
                     catch(Ice.ConnectionLostException)
                     {
-                        WriteLine("ok");
+                        output.WriteLine("ok");
                     }
                     catch(Ice.ConnectFailedException)
                     {
-                        WriteLine("ok");
+                        output.WriteLine("ok");
                     }
                     catch(Ice.SocketException)
                     {
-                        WriteLine("ok");
+                        output.WriteLine("ok");
                     }
                 }
                 else
                 {
-                    Write("aborting server #" + i + " and #" + (i + 1) + " with idempotent AMI call... ");
-                    Flush();
+                    output.Write("aborting server #" + i + " and #" + (i + 1) + " with idempotent AMI call... ");
+                    output.Flush();
                     Callback cb = new Callback();
                     obj.begin_idempotentAbort().whenCompleted(
                         () =>
@@ -238,11 +235,11 @@
                         },
                         (Ice.Exception ex) =>
                         {
-                            exceptAbortI(ex);
+                            exceptAbortI(ex, output);
                             cb.called();
                         });
                     cb.check();
-                    WriteLine("ok");
+                    output.WriteLine("ok");
                 }
                 ++i;
             }
@@ -252,8 +249,8 @@
             }
         }
 
-        Write("testing whether all servers are gone... ");
-        Flush();
+        output.Write("testing whether all servers are gone... ");
+        output.Flush();
         try
         {
             obj.ice_ping();
@@ -261,7 +258,7 @@
         }
         catch(Ice.LocalException)
         {
-            WriteLine("ok");
+            output.WriteLine("ok");
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
+using System.Linq;
+using System.Collections.Generic;
 
 [assembly: CLSCompliant(true)]
 
@@ -16,52 +13,25 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    private static void usage()
-    {
-        Console.Error.WriteLine("Usage: client port...");
-    }
-
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        System.Collections.Generic.List<int> ports = new System.Collections.Generic.List<int>();
-        for(int i = 0; i < args.Length; i++)
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.Warn.Connections", "0");
+        using(var communicator = initialize(properties))
         {
-            int port = 0;
-            try
+            List<int> ports = args.Select(v => Int32.Parse(v)).ToList();
+            if(ports.Count == 0)
             {
-                port = Int32.Parse(args[i]);
+                throw new ArgumentException("Client: no ports specified");
             }
-            catch(FormatException ex)
-            {
-                Console.Error.WriteLine(ex);
-                return 1;
-            }
-            ports.Add(port);
+            AllTests.allTests(this, ports);
         }
-
-        if(ports.Count == 0)
-        {
-            Console.Error.WriteLine("Client: no ports specified");
-            usage();
-            return 1;
-        }
-
-        AllTests.allTests(this, ports);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,30 +11,23 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    private static void usage()
-    {
-        Console.Error.WriteLine("Usage: Server port");
-    }
-
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.ServerIdleTime", "120");
         int port = 0;
         for(int i = 0; i < args.Length; i++)
         {
             if(args[i][0] == '-')
             {
-                Console.Error.WriteLine("Server: unknown option `" + args[i] + "'");
-                usage();
-                return 1;
+                throw new ArgumentException("Server: unknown option `" + args[i] + "'");
             }
 
             if(port != 0)
             {
-                Console.Error.WriteLine("Server: only one port can be specified");
-                usage();
-                return 1;
+                throw new ArgumentException("Server: only one port can be specified");
             }
 
             try
@@ -48,38 +36,28 @@
             }
             catch(FormatException)
             {
-                Console.Error.WriteLine("Server: invalid port");
-                usage();
-                return 1;
+                throw new ArgumentException("Server: invalid port");
             }
         }
 
         if(port <= 0)
         {
-            Console.Error.WriteLine("Server: no port specified");
-            usage();
-            return 1;
+            throw new ArgumentException("Server: no port specified");
         }
 
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(port));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object obj = new TestI();
-        adapter.add(obj, Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ServerIdleTime", "120");
-        return initData;
+        using(var communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(port));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object obj = new TestI();
+            adapter.add(obj, Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/faultTolerance/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/faultTolerance/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 using System.Threading;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hash/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/hash/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/hash/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hash/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -17,23 +12,11 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : Test.TestHelper
 {
-    private static void
-    test(bool b)
+    public override void run(string[] args)
     {
-        if (!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    public static int Main(string[] args)
-    {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
+        using(var communicator = initialize(ref args))
         {
             Console.Error.Write("testing proxy & endpoint hash algorithm collisions... ");
             Console.Error.Flush();
@@ -45,14 +28,10 @@
             int maxCollisions = 10;
             int maxIterations = 10000;
 
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            //initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:IceSSL.PluginFactory");
-            communicator = Ice.Util.initialize(ref args, initData);
             {
                 Random rand = new Random();
                 for(i = 0; proxyCollisions < maxCollisions &&
-                        endpointCollisions < maxCollisions  &&
+                        endpointCollisions < maxCollisions &&
                         i < maxIterations; ++i)
                 {
                     System.IO.StringWriter sw = new System.IO.StringWriter();
@@ -244,8 +223,7 @@
                 Random rand = new Random();
 
                 int exceptionCollisions = 0;
-                for(i = 0; i < maxIterations &&
-                        exceptionCollisions < maxCollisions; ++i)
+                for(i = 0; i < maxIterations && exceptionCollisions < maxCollisions; ++i)
                 {
                     Test.OtherException ex = new Test.OtherException(rand.Next(100), rand.Next(100), 0, false);
                     if(seenException.ContainsKey(ex.GetHashCode()))
@@ -276,10 +254,13 @@
                 Random rand = new Random();
 
                 int exceptionCollisions = 0;
-                for(i = 0; i < maxIterations &&
-                        exceptionCollisions < maxCollisions; ++i)
+                for(i = 0; i < maxIterations && exceptionCollisions < maxCollisions; ++i)
                 {
-                    Test.OtherException ex = new Test.OtherException(rand.Next(100) * 2^30, rand.Next(100) * 2^30, rand.Next(100) * 2^30, false);
+                    Test.OtherException ex = new Test.OtherException(rand.Next(100) * 2^30,
+                                                                     rand.Next(100) * 2^30,
+                                                                     rand.Next(100) * 2^30,
+                                                                     false);
+
                     if(seenException.ContainsKey(ex.GetHashCode()))
                     {
                         if(ex.Equals(seenException[ex.GetHashCode()]))
@@ -305,8 +286,7 @@
                 Random rand = new Random();
 
                 int exceptionCollisions = 0;
-                for(i = 0; i < maxIterations &&
-                        exceptionCollisions < maxCollisions; ++i)
+                for(i = 0; i < maxIterations && exceptionCollisions < maxCollisions; ++i)
                 {
                     int v = rand.Next(1000);
                     Test.BaseException ex = new Test.InvalidPointException(v);
@@ -358,7 +338,8 @@
                 int structCollisions = 0;
                 for(i = 0; i < maxIterations && structCollisions < maxCollisions; ++i)
                 {
-                    Test.PointF pf = new Test.PointF((float)rand.NextDouble(), (float)rand.NextDouble(),
+                    Test.PointF pf = new Test.PointF((float)rand.NextDouble(),
+                                                     (float)rand.NextDouble(),
                                                      (float)rand.NextDouble());
                     if(seenPointF.ContainsKey(pf.GetHashCode()))
                     {
@@ -383,7 +364,8 @@
                 structCollisions = 0;
                 for(i = 0; i < maxIterations && structCollisions < maxCollisions; ++i)
                 {
-                    Test.PointD pd = new Test.PointD(rand.NextDouble(), rand.NextDouble(),
+                    Test.PointD pd = new Test.PointD(rand.NextDouble(),
+                                                     rand.NextDouble(),
                                                      rand.NextDouble());
                     if(seenPointD.ContainsKey(pd.GetHashCode()))
                     {
@@ -443,7 +425,10 @@
                     colorPalette.colors = new Dictionary<int, Test.Color>();
                     for(int j = 0; j < 100; ++j)
                     {
-                        colorPalette.colors[j] = new Test.Color(rand.Next(255), rand.Next(255), rand.Next(255), rand.Next(255));
+                        colorPalette.colors[j] = new Test.Color(rand.Next(255),
+                                                                rand.Next(255),
+                                                                rand.Next(255),
+                                                                rand.Next(255));
                     }
 
                     if(seenColorPalette.ContainsKey(colorPalette.GetHashCode()))
@@ -520,18 +505,11 @@
                 test(structCollisions < maxCollisions);
             }
             Console.Error.WriteLine("ok");
-
-            if(communicator != null)
-            {
-                communicator.destroy();
-            }
-        }
-        catch(Exception ex)
-        {
-            Console.WriteLine(ex.ToString());
-            status = 1;
         }
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hash/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/hash/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/hash/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hash/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,45 +17,47 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hash/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/hash/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/hash/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hash/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hash/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hash/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/hash/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/hash/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hash/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/hold/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,222 +1,223 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    private class Condition
+    namespace hold
     {
-        public Condition(bool value)
-        {
-            _value = value;
-        }
-
-        public void
-        set(bool value)
-        {
-            lock(this)
-            {
-                _value = value;
-            }
-        }
-
-        public bool
-        value()
+        public class AllTests : global::Test.AllTests
         {
-            lock(this)
+            private class Condition
             {
-                return _value;
-            }
-        }
+                public Condition(bool value)
+                {
+                    _value = value;
+                }
 
-        private bool _value;
-    }
+                public void
+                set(bool value)
+                {
+                    lock(this)
+                    {
+                        _value = value;
+                    }
+                }
 
-    private class SetCB
-    {
-        public
-        SetCB(Condition condition, int expected)
-        {
-            _condition = condition;
-            _expected = expected;
-        }
+                public bool
+                value()
+                {
+                    lock(this)
+                    {
+                        return _value;
+                    }
+                }
 
-        public void
-        response(int value)
-        {
-            if(value != _expected)
-            {
-                _condition.set(false);
+                private bool _value;
             }
-        }
-
-        public void
-        exception(Ice.Exception ex)
-        {
-        }
-
-        private Condition _condition;
-        private int _expected;
-    }
 
-    public static void allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        String @ref = "hold:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
-        test(@base != null);
-        String refSerialized = "hold:" + app.getTestEndpoint(1);
-        Ice.ObjectPrx baseSerialized = communicator.stringToProxy(refSerialized);
-        test(baseSerialized != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        HoldPrx hold = HoldPrxHelper.checkedCast(@base);
-        HoldPrx holdOneway = HoldPrxHelper.uncheckedCast(@base.ice_oneway());
-        test(hold != null);
-        test(hold.Equals(@base));
-        HoldPrx holdSerialized = HoldPrxHelper.checkedCast(baseSerialized);
-        HoldPrx holdSerializedOneway = HoldPrxHelper.uncheckedCast(baseSerialized.ice_oneway());
-        test(holdSerialized != null);
-        test(holdSerialized.Equals(baseSerialized));
-        WriteLine("ok");
-
-        Write("changing state between active and hold rapidly... ");
-        Flush();
-        for(int i = 0; i < 100; ++i)
-        {
-            hold.putOnHold(0);
-        }
-        for(int i = 0; i < 100; ++i)
-        {
-            holdOneway.putOnHold(0);
-        }
-        for(int i = 0; i < 100; ++i)
-        {
-            holdSerialized.putOnHold(0);
-        }
-        for(int i = 0; i < 100; ++i)
-        {
-            holdSerializedOneway.putOnHold(0);
-        }
-        WriteLine("ok");
-
-        Write("testing without serialize mode... ");
-        Flush();
-        System.Random rand = new System.Random();
-        {
-            Condition cond = new Condition(true);
-            int value = 0;
-            Ice.AsyncResult result = null;
-            while(cond.value())
+            private class SetCB
             {
-                SetCB cb = new SetCB(cond, value);
-                result = hold.begin_set(++value, value < 500 ? rand.Next(5) : 0).whenCompleted(cb.response,
-                                                                                               cb.exception);
-                if(value % 100 == 0)
+                public
+                SetCB(Condition condition, int expected)
                 {
-                    result.waitForSent();
+                    _condition = condition;
+                    _expected = expected;
                 }
 
-                if(value > 100000)
+                public void
+                response(int value)
                 {
-                    // Don't continue, it's possible that out-of-order dispatch doesn't occur
-                    // after 100000 iterations and we don't want the test to last for too long
-                    // when this occurs.
-                    break;
+                    if(value != _expected)
+                    {
+                        _condition.set(false);
+                    }
                 }
-            }
-            test(value > 100000 || !cond.value());
-            result.waitForSent();
-        }
-        WriteLine("ok");
 
-        Write("testing with serialize mode... ");
-        Flush();
-        {
-            Condition cond = new Condition(true);
-            int value = 0;
-            Ice.AsyncResult result = null;
-            while(value < 3000 && cond.value())
-            {
-                SetCB cb = new SetCB(cond, value);
-                result = holdSerialized.begin_set(++value, 0).whenCompleted(cb.response, cb.exception);
-                if(value % 100 == 0)
+                public void
+                exception(Ice.Exception ex)
                 {
-                    result.waitForSent();
                 }
+
+                private Condition _condition;
+                private int _expected;
             }
-            result.waitForCompleted();
-            test(cond.value());
 
-            for(int i = 0; i < 10000; ++i)
+            public static void allTests(global::Test.TestHelper helper)
             {
-                holdSerializedOneway.setOneway(value + 1, value);
-                ++value;
-                if((i % 100) == 0)
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                String @ref = "hold:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
+                test(@base != null);
+                String refSerialized = "hold:" + helper.getTestEndpoint(1);
+                Ice.ObjectPrx baseSerialized = communicator.stringToProxy(refSerialized);
+                test(baseSerialized != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                var hold = Test.HoldPrxHelper.checkedCast(@base);
+                var holdOneway = Test.HoldPrxHelper.uncheckedCast(@base.ice_oneway());
+                test(hold != null);
+                test(hold.Equals(@base));
+                var holdSerialized = Test.HoldPrxHelper.checkedCast(baseSerialized);
+                var holdSerializedOneway = Test.HoldPrxHelper.uncheckedCast(baseSerialized.ice_oneway());
+                test(holdSerialized != null);
+                test(holdSerialized.Equals(baseSerialized));
+                output.WriteLine("ok");
+
+                output.Write("changing state between active and hold rapidly... ");
+                output.Flush();
+                for(int i = 0; i < 100; ++i)
                 {
-                    holdSerializedOneway.putOnHold(1);
+                    hold.putOnHold(0);
                 }
-            }
-        }
-        WriteLine("ok");
-
-        Write("testing serialization... ");
-        Flush();
-        {
-            int value = 0;
-            holdSerialized.set(value, 0);
-            Ice.AsyncResult result = null;
-            for(int i = 0; i < 10000; ++i)
-            {
-                // Create a new proxy for each request
-                result = ((HoldPrx)holdSerialized.ice_oneway()).begin_setOneway(value + 1, value);
-                ++value;
-                if((i % 100) == 0)
+                for(int i = 0; i < 100; ++i)
+                {
+                    holdOneway.putOnHold(0);
+                }
+                for(int i = 0; i < 100; ++i)
                 {
+                    holdSerialized.putOnHold(0);
+                }
+                for(int i = 0; i < 100; ++i)
+                {
+                    holdSerializedOneway.putOnHold(0);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing without serialize mode... ");
+                output.Flush();
+                Random rand = new Random();
+                {
+                    Condition cond = new Condition(true);
+                    int value = 0;
+                    Ice.AsyncResult result = null;
+                    while(cond.value())
+                    {
+                        SetCB cb = new SetCB(cond, value);
+                        result = hold.begin_set(++value, value < 500 ? rand.Next(5) : 0).whenCompleted(cb.response,
+                                                                                                       cb.exception);
+                        if(value % 100 == 0)
+                        {
+                            result.waitForSent();
+                        }
+
+                        if(value > 100000)
+                        {
+                            // Don't continue, it's possible that out-of-order dispatch doesn't occur
+                            // after 100000 iterations and we don't want the test to last for too long
+                            // when this occurs.
+                            break;
+                        }
+                    }
+                    test(value > 100000 || !cond.value());
                     result.waitForSent();
-                    holdSerialized.ice_ping(); // Ensure everything's dispatched.
-                    holdSerialized.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
                 }
-            }
-            result.waitForCompleted();
-        }
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("testing waitForHold... ");
-        Flush();
-        {
-            hold.waitForHold();
-            hold.waitForHold();
-            for(int i = 0; i < 1000; ++i)
-            {
-                holdOneway.ice_ping();
-                if((i % 20) == 0)
+                output.Write("testing with serialize mode... ");
+                output.Flush();
                 {
-                    hold.putOnHold(0);
-                }
+                    Condition cond = new Condition(true);
+                    int value = 0;
+                    Ice.AsyncResult result = null;
+                    while(value < 3000 && cond.value())
+                    {
+                        SetCB cb = new SetCB(cond, value);
+                        result = holdSerialized.begin_set(++value, 0).whenCompleted(cb.response, cb.exception);
+                        if(value % 100 == 0)
+                        {
+                            result.waitForSent();
+                        }
+                    }
+                    result.waitForCompleted();
+                    test(cond.value());
+
+                    for(int i = 0; i < 10000; ++i)
+                    {
+                        holdSerializedOneway.setOneway(value + 1, value);
+                        ++value;
+                        if((i % 100) == 0)
+                        {
+                            holdSerializedOneway.putOnHold(1);
+                        }
+                    }
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing serialization... ");
+                output.Flush();
+                {
+                    int value = 0;
+                    holdSerialized.set(value, 0);
+                    Ice.AsyncResult result = null;
+                    for(int i = 0; i < 10000; ++i)
+                    {
+                        // Create a new proxy for each request
+                        result =((Test.HoldPrx)holdSerialized.ice_oneway()).begin_setOneway(value + 1, value);
+                        ++value;
+                        if((i % 100) == 0)
+                        {
+                            result.waitForSent();
+                            holdSerialized.ice_ping(); // Ensure everything's dispatched.
+                            holdSerialized.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                        }
+                    }
+                    result.waitForCompleted();
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing waitForHold... ");
+                output.Flush();
+                {
+                    hold.waitForHold();
+                    hold.waitForHold();
+                    for(int i = 0; i < 1000; ++i)
+                    {
+                        holdOneway.ice_ping();
+                        if((i % 20) == 0)
+                        {
+                            hold.putOnHold(0);
+                        }
+                    }
+                    hold.putOnHold(-1);
+                    hold.ice_ping();
+                    hold.putOnHold(-1);
+                    hold.ice_ping();
+                }
+                output.WriteLine("ok");
+
+                output.Write("changing state to hold and shutting down server... ");
+                output.Flush();
+                hold.shutdown();
+                output.WriteLine("ok");
             }
-            hold.putOnHold(-1);
-            hold.ice_ping();
-            hold.putOnHold(-1);
-            hold.ice_ping();
         }
-        WriteLine("ok");
-
-        Write("changing state to hold and shutting down server... ");
-        Flush();
-        hold.shutdown();
-        WriteLine("ok");
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/hold/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace hold
     {
-        AllTests.allTests(this);
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/HoldI.cs zeroc-ice-3.7.2/csharp/test/Ice/hold/HoldI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/HoldI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/HoldI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,109 +1,108 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class HoldI : HoldDisp_
+namespace Ice
 {
-    private static void test(bool b)
+    namespace hold
     {
-        if(!b)
+        public sealed class HoldI : Test.HoldDisp_
         {
-            throw new System.Exception();
-        }
-    }
+            private static void test(bool b)
+            {
+                if(!b)
+                {
+                    throw new System.Exception();
+                }
+            }
 
-    public HoldI(Timer timer, Ice.ObjectAdapter adapter)
-    {
-        _timer = timer;
-        _adapter = adapter;
-    }
+            public HoldI(Timer timer, Ice.ObjectAdapter adapter)
+            {
+                _timer = timer;
+                _adapter = adapter;
+            }
 
-    public override void
-    putOnHold(int milliSeconds, Ice.Current current)
-    {
-        if(milliSeconds < 0)
-        {
-            _adapter.hold();
-        }
-        else if(milliSeconds == 0)
-        {
-            _adapter.hold();
-            _adapter.activate();
-        }
-        else
-        {
-            _timer.schedule(() =>
+            public override void
+            putOnHold(int milliSeconds, Ice.Current current)
             {
-                try
+                if(milliSeconds < 0)
                 {
-                    putOnHold(0, null);
+                    _adapter.hold();
                 }
-                catch(Ice.ObjectAdapterDeactivatedException)
+                else if(milliSeconds == 0)
                 {
+                    _adapter.hold();
+                    _adapter.activate();
                 }
-            }, milliSeconds);
-        }
-    }
+                else
+                {
+                    _timer.schedule(() =>
+                    {
+                        try
+                        {
+                            putOnHold(0, null);
+                        }
+                        catch(Ice.ObjectAdapterDeactivatedException)
+                        {
+                        }
+                    }, milliSeconds);
+                }
+            }
 
-    public override void
-    waitForHold(Ice.Current current)
-    {
-        _timer.schedule(() =>
-        {
-            try
+            public override void
+            waitForHold(Ice.Current current)
             {
-                current.adapter.waitForHold();
-                current.adapter.activate();
+                _timer.schedule(() =>
+                {
+                    try
+                    {
+                        current.adapter.waitForHold();
+                        current.adapter.activate();
+                    }
+                    catch(Ice.ObjectAdapterDeactivatedException)
+                    {
+                            //
+                            // This shouldn't occur. The test ensures all the waitForHold timers are
+                            // finished before shutting down the communicator.
+                            //
+                            test(false);
+                    }
+                }, 0);
             }
-            catch(Ice.ObjectAdapterDeactivatedException)
+
+            public override int
+            set(int value, int delay, Ice.Current current)
             {
-                //
-                // This shouldn't occur. The test ensures all the waitForHold timers are
-                // finished before shutting down the communicator.
-                //
-                test(false);
+                System.Threading.Thread.Sleep(delay);
+
+                lock(this)
+                {
+                    int tmp = _last;
+                    _last = value;
+                    return tmp;
+                }
             }
-        }, 0);
-    }
 
-    public override int
-    set(int value, int delay, Ice.Current current)
-    {
-        System.Threading.Thread.Sleep(delay);
+            public override void
+            setOneway(int value, int expected, Ice.Current current)
+            {
+                lock(this)
+                {
+                    test(_last == expected);
+                    _last = value;
+                }
+            }
 
-        lock(this)
-        {
-            int tmp = _last;
-            _last = value;
-            return tmp;
-        }
-    }
+            public override void
+            shutdown(Ice.Current current)
+            {
+                _adapter.hold();
+                _adapter.getCommunicator().shutdown();
+            }
 
-    public override void
-    setOneway(int value, int expected, Ice.Current current)
-    {
-        lock(this)
-        {
-            test(_last == expected);
-            _last = value;
+            private Ice.ObjectAdapter _adapter;
+            private int _last = 0;
+            private Timer _timer;
         }
     }
-
-    public override void
-    shutdown(Ice.Current current)
-    {
-        _adapter.hold();
-        _adapter.getCommunicator().shutdown();
-    }
-
-    private Ice.ObjectAdapter _adapter;
-    private int _last = 0;
-    private Timer _timer;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\HoldI.cs">
       <Link>HoldI.cs</Link>
@@ -51,24 +51,24 @@
     <Compile Include="..\..\..\Timer.cs">
       <Link>Timer.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../HoldI.cs"/>
-    <Compile Include="../../../Timer.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../HoldI.cs" />
+    <Compile Include="../../../Timer.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.hold</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../HoldI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../Timer.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/hold/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,52 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace hold
     {
-        Timer timer = new Timer();
-
-        communicator().getProperties().setProperty("TestAdapter1.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("TestAdapter1.ThreadPool.Size", "5");
-        communicator().getProperties().setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
-        communicator().getProperties().setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
-        communicator().getProperties().setProperty("TestAdapter1.ThreadPool.Serialize", "0");
-        Ice.ObjectAdapter adapter1 = communicator().createObjectAdapter("TestAdapter1");
-        adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold"));
-
-        communicator().getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
-        communicator().getProperties().setProperty("TestAdapter2.ThreadPool.Size", "5");
-        communicator().getProperties().setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
-        communicator().getProperties().setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
-        communicator().getProperties().setProperty("TestAdapter2.ThreadPool.Serialize", "1");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter2");
-        adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold"));
-
-        adapter1.activate();
-        adapter2.activate();
-
-        communicator().waitForShutdown();
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    Timer timer = new Timer();
+
+                    communicator.getProperties().setProperty("TestAdapter1.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Size", "5");
+                    communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
+                    communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
+                    communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Serialize", "0");
+                    Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1");
+                    adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold"));
+
+                    communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+                    communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Size", "5");
+                    communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
+                    communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
+                    communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Serialize", "1");
+                    Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+                    adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold"));
+
+                    adapter1.activate();
+                    adapter2.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+
+                    timer.shutdown();
+                    timer.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
 
-        timer.shutdown();
-        timer.waitForShutdown();
-
-        return 0;
-    }
-
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/hold/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.hold"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/hold/Timer.cs zeroc-ice-3.7.2/csharp/test/Ice/hold/Timer.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/hold/Timer.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/hold/Timer.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -13,110 +8,116 @@
 using System.Threading;
 
 //
-// The .NET Compact Framework doesn't support the System.Timers.Timer class.
+// TODO replace with System.Timers.Timer
 //
-public class Timer
+namespace Ice
 {
-    public delegate void Task();
-
-    private class Entry : IComparable<Entry>
+    namespace hold
     {
-        public Task task;
-        public long when;
-
-        public int CompareTo(Entry e)
+        public class Timer
         {
-            if(when < e.when)
+            public delegate void Task();
+
+            private class Entry : IComparable<Entry>
             {
-                return -1;
-            }
-            else if(when == e.when)
+                public Task task;
+                public long when;
+
+                public int CompareTo(Entry e)
+                {
+                    if(when < e.when)
+                    {
+                        return -1;
+                    }
+                    else if(when == e.when)
+                    {
+                        return 0;
+                    }
+                    else
+                    {
+                        return 1;
+                    }
+                }
+            };
+
+            public Timer()
             {
-                return 0;
+                _t = new Thread(new ThreadStart(run));
+                _t.Start();
             }
-            else
+
+            public void schedule(Task task, int milliseconds)
             {
-                return 1;
+                lock(this)
+                {
+                    Entry e = new Entry();
+                    e.task = task;
+                    e.when = currentMonotonicTimeMillis() + milliseconds;
+                    _tasks.Add(e);
+                    _tasks.Sort();
+                    Monitor.Pulse(this);
+                }
             }
-        }
-    };
-
-    public Timer()
-    {
-        _t = new Thread(new ThreadStart(run));
-        _t.Start();
-    }
-
-    public void schedule(Task task, int milliseconds)
-    {
-        lock(this)
-        {
-            Entry e = new Entry();
-            e.task = task;
-            e.when = currentMonotonicTimeMillis() + milliseconds;
-            _tasks.Add(e);
-            _tasks.Sort();
-            Monitor.Pulse(this);
-        }
-    }
 
-    public void shutdown()
-    {
-        lock(this)
-        {
-            Entry e = new Entry();
-            e.task = null;
-            e.when = 0;
-            _tasks.Add(e);
-            _tasks.Sort();
-            Monitor.Pulse(this);
-        }
-    }
+            public void shutdown()
+            {
+                lock(this)
+                {
+                    Entry e = new Entry();
+                    e.task = null;
+                    e.when = 0;
+                    _tasks.Add(e);
+                    _tasks.Sort();
+                    Monitor.Pulse(this);
+                }
+            }
 
-    public void waitForShutdown()
-    {
-        _t.Join();
-    }
+            public void waitForShutdown()
+            {
+                _t.Join();
+            }
 
-    private void run()
-    {
-        while(true)
-        {
-            Entry e;
-            lock(this)
+            private void run()
             {
                 while(true)
                 {
-                    while(_tasks.Count == 0)
+                    Entry e;
+                    lock(this)
                     {
-                        Monitor.Wait(this);
+                        while(true)
+                        {
+                            while(_tasks.Count == 0)
+                            {
+                                Monitor.Wait(this);
+                            }
+
+                            e = _tasks[0];
+                            if(e.task == null)
+                            {
+                                return;
+                            }
+                            long now = currentMonotonicTimeMillis();
+                            if(now >= e.when)
+                            {
+                                _tasks.RemoveAt(0);
+                                break;
+                            }
+                            Monitor.Wait(this,(int)(e.when - now));
+                        }
                     }
-
-                    e = _tasks[0];
-                    if(e.task == null)
-                    {
-                       return;
-                    }
-                    long now = currentMonotonicTimeMillis();
-                    if(now >= e.when)
-                    {
-                        _tasks.RemoveAt(0);
-                        break;
-                    }
-                    Monitor.Wait(this, (int)(e.when - now));
+                    e.task();
                 }
+
             }
-            e.task();
-        }
 
-    }
+            private long currentMonotonicTimeMillis()
+            {
+                return _sw.ElapsedMilliseconds;
+            }
+            private Stopwatch _sw = Stopwatch.StartNew();
 
-    private long currentMonotonicTimeMillis()
-    {
-        return _sw.ElapsedMilliseconds;
+            private Thread _t;
+            private List<Entry> _tasks = new List<Entry>();
+        }
     }
-    private Stopwatch _sw = Stopwatch.StartNew();
-
-    private Thread _t;
-    private List<Entry> _tasks = new List<Entry>();
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,57 +17,56 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
-    <Compile Include="generated\TestI.cs"/>
+    <Compile Include="generated\Test.cs" />
+    <Compile Include="generated\TestI.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target Inputs="$(IceToolsPath)slice2cs.exe;..\..\Test.ice" Name="BeforeBuild" Outputs="TestI.cs">
-    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs"/>
-    <MakeDir Condition="!Exists('generated')" Directories="generated"/>
-    <Exec Command="$(IceToolsPath)\slice2cs.exe --output-dir generated -I$(IceHome)\slice --impl ..\..\..\Test.ice"/>
+    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs" />
+    <MakeDir Condition="!Exists('generated')" Directories="generated" />
+    <Exec Command="$(IceToolsPath)\slice2cs.exe --output-dir generated -I$(IceHome)\slice --impl ..\..\..\Test.ice" />
   </Target>
   <Target Name="BeforeClean">
-    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs"/>
+    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs" />
   </Target>
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,54 +17,53 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
-    <Compile Include="generated\TestAMDI.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
+    <Compile Include="generated\TestAMDI.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target Inputs="$(IceToolsPath)slice2cs.exe;..\..\TestAMD.ice" Name="BeforeBuild" Outputs="TestAMDI.cs">
-    <Delete Condition="Exists('generated\TestAMDI.cs')" Files="generated\TestAMDI.cs"/>
-    <MakeDir Condition="!Exists('generated')" Directories="generated"/>
-    <Exec Command="$(IceToolsPath)\slice2cs.exe --output-dir generated -I$(IceHome)\slice --impl ..\..\..\TestAMD.ice"/>
+    <Delete Condition="Exists('generated\TestAMDI.cs')" Files="generated\TestAMDI.cs" />
+    <MakeDir Condition="!Exists('generated')" Directories="generated" />
+    <Exec Command="$(IceToolsPath)\slice2cs.exe --output-dir generated -I$(IceHome)\slice --impl ..\..\..\TestAMD.ice" />
   </Target>
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramdtie/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramdtie/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramdtie/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramdtie/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramdtie/net45/serveramdtie.csproj zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramdtie/net45/serveramdtie.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/serveramdtie/net45/serveramdtie.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/serveramdtie/net45/serveramdtie.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,54 +17,53 @@
     <AssemblyName>serveramdtie</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
-    <Compile Include="generated\TestAMDI.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
+    <Compile Include="generated\TestAMDI.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target Inputs="$(IceToolsPath)slice2cs.exe;..\..\TestAMD.ice" Name="BeforeBuild" Outputs="TestAMDI.cs">
-    <Delete Condition="Exists('generated\TestAMDI.cs')" Files="generated\TestAMDI.cs"/>
-    <MakeDir Condition="!Exists('generated')" Directories="generated"/>
-    <Exec Command="$(IceToolsPath)\slice2cs.exe --tie --output-dir generated -I$(IceHome)\slice --impl ..\..\..\TestAMD.ice"/>
+    <Delete Condition="Exists('generated\TestAMDI.cs')" Files="generated\TestAMDI.cs" />
+    <MakeDir Condition="!Exists('generated')" Directories="generated" />
+    <Exec Command="$(IceToolsPath)\slice2cs.exe --tie --output-dir generated -I$(IceHome)\slice --impl ..\..\..\TestAMD.ice" />
   </Target>
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/servertie/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/servertie/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/servertie/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/servertie/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/servertie/net45/servertie.csproj zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/servertie/net45/servertie.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/msbuild/servertie/net45/servertie.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/msbuild/servertie/net45/servertie.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,62 +17,61 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
-    <Compile Include="generated\TestI.cs"/>
+    <Compile Include="generated\Test.cs" />
+    <Compile Include="generated\TestI.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <AdditionalOptions>--tie</AdditionalOptions>
     </SliceCompile>
   </ItemDefinitionGroup>
   <Target Inputs="$(IceToolsPath)slice2cs.exe;..\..\Test.ice" Name="BeforeBuild" Outputs="TestI.cs">
-    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs"/>
-    <MakeDir Condition="!Exists('generated')" Directories="generated"/>
-    <Exec Command="$(IceToolsPath)\slice2cs.exe --tie --output-dir generated -I$(IceHome)\slice --impl ..\..\..\Test.ice"/>
+    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs" />
+    <MakeDir Condition="!Exists('generated')" Directories="generated" />
+    <Exec Command="$(IceToolsPath)\slice2cs.exe --tie --output-dir generated -I$(IceHome)\slice --impl ..\..\..\Test.ice" />
   </Target>
   <Target Name="BeforeClean">
-    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs"/>
+    <Delete Condition="Exists('generated\TestI.cs')" Files="generated\TestI.cs" />
   </Target>
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/impl/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,39 +11,35 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        //
-        // We don't want connection warnings because of the timeout test.
-        //
-        communicator().getProperties().setProperty("Ice.Warn.Connections", "0");
-
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new Test.MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
+        Ice.Properties properties = createTestProperties(ref args);
         //
         // Its possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we supress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        using(var communicator = initialize(properties))
+        {
+            //
+            // We don't want connection warnings because of the timeout test.
+            //
+            communicator.getProperties().setProperty("Ice.Warn.Connections", "0");
+
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new Test.MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/impl/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/impl/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/impl/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/impl/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/impl/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/info/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/info/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,245 +1,248 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    private static Ice.TCPEndpointInfo getTCPEndpointInfo(Ice.EndpointInfo info)
+    namespace info
     {
-        for(; info != null; info = info.underlying)
-        {
-            if(info is Ice.TCPEndpointInfo)
-            {
-                return info as Ice.TCPEndpointInfo;
-            }
-        }
-        return null;
-    }
-
-    private static Ice.TCPConnectionInfo getTCPConnectionInfo(Ice.ConnectionInfo info)
-    {
-        for(; info != null; info = info.underlying)
-        {
-            if(info is Ice.TCPConnectionInfo)
-            {
-                return info as Ice.TCPConnectionInfo;
-            }
-        }
-        return null;
-    }
-
-    public static void allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing proxy endpoint information... ");
-        Flush();
-        {
-            Ice.ObjectPrx p1 = communicator.stringToProxy(
-                            "test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:" +
-                            "udp -h udphost -p 10001 --interface eth0 --ttl 5 --sourceAddress 10.10.10.10:" +
-                            "opaque -e 1.8 -t 100 -v ABCD");
-
-            Ice.Endpoint[] endps = p1.ice_getEndpoints();
-
-            Ice.EndpointInfo info = endps[0].getInfo();
-            Ice.TCPEndpointInfo tcpEndpoint = getTCPEndpointInfo(info);
-            test(tcpEndpoint.host.Equals("tcphost"));
-            test(tcpEndpoint.port == 10000);
-            test(tcpEndpoint.sourceAddress.Equals("10.10.10.10"));
-            test(tcpEndpoint.timeout == 1200);
-            test(tcpEndpoint.compress);
-            test(!tcpEndpoint.datagram());
-
-            test(tcpEndpoint.type() == Ice.TCPEndpointType.value && !tcpEndpoint.secure() ||
-                 tcpEndpoint.type() == Ice.SSLEndpointType.value && tcpEndpoint.secure() ||
-                 tcpEndpoint.type() == Ice.WSEndpointType.value && !tcpEndpoint.secure() ||
-                 tcpEndpoint.type() == Ice.WSSEndpointType.value && tcpEndpoint.secure());
-            test(tcpEndpoint.type() == Ice.TCPEndpointType.value && info is Ice.TCPEndpointInfo ||
-                 tcpEndpoint.type() == Ice.SSLEndpointType.value && info is IceSSL.EndpointInfo ||
-                 tcpEndpoint.type() == Ice.WSEndpointType.value && info is Ice.WSEndpointInfo ||
-                 tcpEndpoint.type() == Ice.WSSEndpointType.value && info is Ice.WSEndpointInfo);
-
-            Ice.UDPEndpointInfo udpEndpoint = (Ice.UDPEndpointInfo)endps[1].getInfo();
-            test(udpEndpoint.host.Equals("udphost"));
-            test(udpEndpoint.port == 10001);
-            test(udpEndpoint.mcastInterface.Equals("eth0"));
-            test(udpEndpoint.mcastTtl == 5);
-            test(udpEndpoint.sourceAddress.Equals("10.10.10.10"));
-            test(udpEndpoint.timeout == -1);
-            test(!udpEndpoint.compress);
-            test(!udpEndpoint.secure());
-            test(udpEndpoint.datagram());
-            test(udpEndpoint.type() == 3);
-
-            Ice.OpaqueEndpointInfo opaqueEndpoint = (Ice.OpaqueEndpointInfo)endps[2].getInfo();
-            test(opaqueEndpoint.rawBytes.Length > 0);
-            test(opaqueEndpoint.rawEncoding.Equals(new Ice.EncodingVersion(1, 8)));
-        }
-        WriteLine("ok");
-
-        Ice.ObjectAdapter adapter;
-        Write("test object adapter endpoint information... ");
-        Flush();
-        {
-            string host = communicator.getProperties().getPropertyAsInt("Ice.IPv6") != 0 ? "::1" : "127.0.0.1";
-            communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -h \"" + host +
-                "\" -t 15000:udp -h \"" + host + "\"");
-            adapter = communicator.createObjectAdapter("TestAdapter");
-
-            Ice.Endpoint[] endpoints = adapter.getEndpoints();
-            test(endpoints.Length == 2);
-            Ice.Endpoint[] publishedEndpoints = adapter.getPublishedEndpoints();
-            test(IceUtilInternal.Arrays.Equals(endpoints, publishedEndpoints));
-
-            Ice.TCPEndpointInfo tcpEndpoint = getTCPEndpointInfo(endpoints[0].getInfo());
-            test(tcpEndpoint.type() == Ice.TCPEndpointType.value || tcpEndpoint.type() == Ice.SSLEndpointType.value ||
-                 tcpEndpoint.type() == Ice.WSEndpointType.value || tcpEndpoint.type() == Ice.WSSEndpointType.value);
-
-            test(tcpEndpoint.host.Equals(host));
-            test(tcpEndpoint.port > 0);
-            test(tcpEndpoint.timeout == 15000);
-
-            Ice.UDPEndpointInfo udpEndpoint = (Ice.UDPEndpointInfo)endpoints[1].getInfo();
-            test(udpEndpoint.host.Equals(host));
-            test(udpEndpoint.datagram());
-            test(udpEndpoint.port > 0);
-
-            endpoints = new Ice.Endpoint[]{endpoints[0]};
-            test(endpoints.Length == 1);
-            adapter.setPublishedEndpoints(endpoints);
-            publishedEndpoints = adapter.getPublishedEndpoints();
-            test(IceUtilInternal.Arrays.Equals(endpoints, publishedEndpoints));
-
-            adapter.destroy();
-
-            int port = app.getTestPort(1);
-            communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -h * -p " + port);
-            communicator.getProperties().setProperty("TestAdapter.PublishedEndpoints", app.getTestEndpoint(1));
-            adapter = communicator.createObjectAdapter("TestAdapter");
-
-            endpoints = adapter.getEndpoints();
-            test(endpoints.Length >= 1);
-            publishedEndpoints = adapter.getPublishedEndpoints();
-            test(publishedEndpoints.Length == 1);
-
-            foreach(Ice.Endpoint endpoint in endpoints)
-            {
-                tcpEndpoint = getTCPEndpointInfo(endpoint.getInfo());
-                test(tcpEndpoint.port == port);
-            }
-
-            tcpEndpoint = getTCPEndpointInfo(publishedEndpoints[0].getInfo());
-            test(tcpEndpoint.host.Equals("127.0.0.1"));
-            test(tcpEndpoint.port == port);
-
-            adapter.destroy();
-        }
-        WriteLine("ok");
-
-        int endpointPort = app.getTestPort(0);
-
-        Ice.ObjectPrx @base = communicator.stringToProxy("test:" +
-                                                         app.getTestEndpoint(0) + ":" +
-                                                         app.getTestEndpoint(0, "udp"));
-        TestIntfPrx testIntf = TestIntfPrxHelper.checkedCast(@base);
-
-        string defaultHost = communicator.getProperties().getProperty("Ice.Default.Host");
-
-        Write("test connection endpoint information... ");
-        Flush();
-        {
-            Ice.EndpointInfo info = @base.ice_getConnection().getEndpoint().getInfo();
-            Ice.TCPEndpointInfo tcpinfo = getTCPEndpointInfo(info);
-            test(tcpinfo.port == endpointPort);
-            test(!tcpinfo.compress);
-            test(tcpinfo.host.Equals(defaultHost));
-
-            Dictionary<string, string> ctx = testIntf.getEndpointInfoAsContext();
-            test(ctx["host"].Equals(tcpinfo.host));
-            test(ctx["compress"].Equals("false"));
-            int port = System.Int32.Parse(ctx["port"]);
-            test(port > 0);
-
-            info = @base.ice_datagram().ice_getConnection().getEndpoint().getInfo();
-            Ice.UDPEndpointInfo udp = (Ice.UDPEndpointInfo)info;
-            test(udp.port == endpointPort);
-            test(udp.host.Equals(defaultHost));
-        }
-        WriteLine("ok");
-
-        Write("testing connection information... ");
-        Flush();
+        public class AllTests : global::Test.AllTests
         {
-            Ice.Connection connection = @base.ice_getConnection();
-            connection.setBufferSize(1024, 2048);
-
-            Ice.ConnectionInfo info = connection.getInfo();
-            Ice.TCPConnectionInfo ipInfo = getTCPConnectionInfo(info);
-            test(!info.incoming);
-            test(info.adapterName.Length == 0);
-            test(ipInfo.remotePort == endpointPort);
-            test(ipInfo.localPort > 0);
-            if(defaultHost.Equals("127.0.0.1"))
-            {
-                test(ipInfo.localAddress.Equals(defaultHost));
-                test(ipInfo.remoteAddress.Equals(defaultHost));
-            }
-            test(ipInfo.rcvSize >= 1024);
-            test(ipInfo.sndSize >= 2048);
-
-            Dictionary<string, string> ctx = testIntf.getConnectionInfoAsContext();
-            test(ctx["incoming"].Equals("true"));
-            test(ctx["adapterName"].Equals("TestAdapter"));
-            test(ctx["remoteAddress"].Equals(ipInfo.localAddress));
-            test(ctx["localAddress"].Equals(ipInfo.remoteAddress));
-            test(ctx["remotePort"].Equals(ipInfo.localPort.ToString()));
-            test(ctx["localPort"].Equals(ipInfo.remotePort.ToString()));
-
-            if(@base.ice_getConnection().type().Equals("ws") || @base.ice_getConnection().type().Equals("wss"))
+            private static Ice.TCPEndpointInfo getTCPEndpointInfo(Ice.EndpointInfo info)
             {
-                Dictionary<string, string> headers = ((Ice.WSConnectionInfo)info).headers;
-                test(headers["Upgrade"].Equals("websocket"));
-                test(headers["Connection"].Equals("Upgrade"));
-                test(headers["Sec-WebSocket-Protocol"].Equals("ice.zeroc.com"));
-                test(headers["Sec-WebSocket-Accept"] != null);
-
-                test(ctx["ws.Upgrade"].Equals("websocket"));
-                test(ctx["ws.Connection"].Equals("Upgrade"));
-                test(ctx["ws.Sec-WebSocket-Protocol"].Equals("ice.zeroc.com"));
-                test(ctx["ws.Sec-WebSocket-Version"].Equals("13"));
-                test(ctx["ws.Sec-WebSocket-Key"] != null);
-            }
-
-            connection = @base.ice_datagram().ice_getConnection();
-            connection.setBufferSize(2048, 1024);
+                for(; info != null; info = info.underlying)
+                {
+                    if(info is Ice.TCPEndpointInfo)
+                    {
+                        return info as Ice.TCPEndpointInfo;
+                    }
+                }
+                return null;
+            }
+
+            private static Ice.TCPConnectionInfo getTCPConnectionInfo(Ice.ConnectionInfo info)
+            {
+                for(; info != null; info = info.underlying)
+                {
+                    if(info is Ice.TCPConnectionInfo)
+                    {
+                        return info as Ice.TCPConnectionInfo;
+                    }
+                }
+                return null;
+            }
+
+            public static void allTests(global::Test.TestHelper helper)
+            {
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing proxy endpoint information... ");
+                output.Flush();
+                {
+                    Ice.ObjectPrx p1 = communicator.stringToProxy(
+                                    "test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:" +
+                                    "udp -h udphost -p 10001 --interface eth0 --ttl 5 --sourceAddress 10.10.10.10:" +
+                                    "opaque -e 1.8 -t 100 -v ABCD");
+
+                    Ice.Endpoint[] endps = p1.ice_getEndpoints();
+
+                    Ice.EndpointInfo info = endps[0].getInfo();
+                    Ice.TCPEndpointInfo tcpEndpoint = getTCPEndpointInfo(info);
+                    test(tcpEndpoint.host.Equals("tcphost"));
+                    test(tcpEndpoint.port == 10000);
+                    test(tcpEndpoint.sourceAddress.Equals("10.10.10.10"));
+                    test(tcpEndpoint.timeout == 1200);
+                    test(tcpEndpoint.compress);
+                    test(!tcpEndpoint.datagram());
+
+                    test(tcpEndpoint.type() == Ice.TCPEndpointType.value && !tcpEndpoint.secure() ||
+                         tcpEndpoint.type() == Ice.SSLEndpointType.value && tcpEndpoint.secure() ||
+                         tcpEndpoint.type() == Ice.WSEndpointType.value && !tcpEndpoint.secure() ||
+                         tcpEndpoint.type() == Ice.WSSEndpointType.value && tcpEndpoint.secure());
+                    test(tcpEndpoint.type() == Ice.TCPEndpointType.value && info is Ice.TCPEndpointInfo ||
+                         tcpEndpoint.type() == Ice.SSLEndpointType.value && info is IceSSL.EndpointInfo ||
+                         tcpEndpoint.type() == Ice.WSEndpointType.value && info is Ice.WSEndpointInfo ||
+                         tcpEndpoint.type() == Ice.WSSEndpointType.value && info is Ice.WSEndpointInfo);
+
+                    Ice.UDPEndpointInfo udpEndpoint =(Ice.UDPEndpointInfo)endps[1].getInfo();
+                    test(udpEndpoint.host.Equals("udphost"));
+                    test(udpEndpoint.port == 10001);
+                    test(udpEndpoint.mcastInterface.Equals("eth0"));
+                    test(udpEndpoint.mcastTtl == 5);
+                    test(udpEndpoint.sourceAddress.Equals("10.10.10.10"));
+                    test(udpEndpoint.timeout == -1);
+                    test(!udpEndpoint.compress);
+                    test(!udpEndpoint.secure());
+                    test(udpEndpoint.datagram());
+                    test(udpEndpoint.type() == 3);
+
+                    Ice.OpaqueEndpointInfo opaqueEndpoint =(Ice.OpaqueEndpointInfo)endps[2].getInfo();
+                    test(opaqueEndpoint.rawBytes.Length > 0);
+                    test(opaqueEndpoint.rawEncoding.Equals(new Ice.EncodingVersion(1, 8)));
+                }
+                output.WriteLine("ok");
+
+                Ice.ObjectAdapter adapter;
+                output.Write("test object adapter endpoint information... ");
+                output.Flush();
+                {
+                    string host = communicator.getProperties().getPropertyAsInt("Ice.IPv6") != 0 ? "::1" : "127.0.0.1";
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -h \"" + host +
+                        "\" -t 15000:udp -h \"" + host + "\"");
+                    adapter = communicator.createObjectAdapter("TestAdapter");
+
+                    Ice.Endpoint[] endpoints = adapter.getEndpoints();
+                    test(endpoints.Length == 2);
+                    Ice.Endpoint[] publishedEndpoints = adapter.getPublishedEndpoints();
+                    test(IceUtilInternal.Arrays.Equals(endpoints, publishedEndpoints));
+
+                    Ice.TCPEndpointInfo tcpEndpoint = getTCPEndpointInfo(endpoints[0].getInfo());
+                    test(tcpEndpoint.type() == Ice.TCPEndpointType.value ||
+                         tcpEndpoint.type() == Ice.SSLEndpointType.value ||
+                         tcpEndpoint.type() == Ice.WSEndpointType.value ||
+                         tcpEndpoint.type() == Ice.WSSEndpointType.value);
+
+                    test(tcpEndpoint.host.Equals(host));
+                    test(tcpEndpoint.port > 0);
+                    test(tcpEndpoint.timeout == 15000);
+
+                    Ice.UDPEndpointInfo udpEndpoint =(Ice.UDPEndpointInfo)endpoints[1].getInfo();
+                    test(udpEndpoint.host.Equals(host));
+                    test(udpEndpoint.datagram());
+                    test(udpEndpoint.port > 0);
+
+                    endpoints = new Ice.Endpoint[] { endpoints[0] };
+                    test(endpoints.Length == 1);
+                    adapter.setPublishedEndpoints(endpoints);
+                    publishedEndpoints = adapter.getPublishedEndpoints();
+                    test(IceUtilInternal.Arrays.Equals(endpoints, publishedEndpoints));
+
+                    adapter.destroy();
+
+                    int port = helper.getTestPort(1);
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -h * -p " + port);
+                    communicator.getProperties().setProperty("TestAdapter.PublishedEndpoints", helper.getTestEndpoint(1));
+                    adapter = communicator.createObjectAdapter("TestAdapter");
+
+                    endpoints = adapter.getEndpoints();
+                    test(endpoints.Length >= 1);
+                    publishedEndpoints = adapter.getPublishedEndpoints();
+                    test(publishedEndpoints.Length == 1);
+
+                    foreach(Ice.Endpoint endpoint in endpoints)
+                    {
+                        tcpEndpoint = getTCPEndpointInfo(endpoint.getInfo());
+                        test(tcpEndpoint.port == port);
+                    }
+
+                    tcpEndpoint = getTCPEndpointInfo(publishedEndpoints[0].getInfo());
+                    test(tcpEndpoint.host.Equals("127.0.0.1"));
+                    test(tcpEndpoint.port == port);
+
+                    adapter.destroy();
+                }
+                output.WriteLine("ok");
+
+                int endpointPort = helper.getTestPort(0);
+
+                Ice.ObjectPrx @base = communicator.stringToProxy("test:" +
+                                                                 helper.getTestEndpoint(0) + ":" +
+                                                                 helper.getTestEndpoint(0, "udp"));
+                var testIntf = Test.TestIntfPrxHelper.checkedCast(@base);
+
+                string defaultHost = communicator.getProperties().getProperty("Ice.Default.Host");
+
+                output.Write("test connection endpoint information... ");
+                output.Flush();
+                {
+                    Ice.EndpointInfo info = @base.ice_getConnection().getEndpoint().getInfo();
+                    Ice.TCPEndpointInfo tcpinfo = getTCPEndpointInfo(info);
+                    test(tcpinfo.port == endpointPort);
+                    test(!tcpinfo.compress);
+                    test(tcpinfo.host.Equals(defaultHost));
+
+                    Dictionary<string, string> ctx = testIntf.getEndpointInfoAsContext();
+                    test(ctx["host"].Equals(tcpinfo.host));
+                    test(ctx["compress"].Equals("false"));
+                    int port = System.Int32.Parse(ctx["port"]);
+                    test(port > 0);
+
+                    info = @base.ice_datagram().ice_getConnection().getEndpoint().getInfo();
+                    Ice.UDPEndpointInfo udp =(Ice.UDPEndpointInfo)info;
+                    test(udp.port == endpointPort);
+                    test(udp.host.Equals(defaultHost));
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing connection information... ");
+                output.Flush();
+                {
+                    Ice.Connection connection = @base.ice_getConnection();
+                    connection.setBufferSize(1024, 2048);
+
+                    Ice.ConnectionInfo info = connection.getInfo();
+                    Ice.TCPConnectionInfo ipInfo = getTCPConnectionInfo(info);
+                    test(!info.incoming);
+                    test(info.adapterName.Length == 0);
+                    test(ipInfo.remotePort == endpointPort);
+                    test(ipInfo.localPort > 0);
+                    if(defaultHost.Equals("127.0.0.1"))
+                    {
+                        test(ipInfo.localAddress.Equals(defaultHost));
+                        test(ipInfo.remoteAddress.Equals(defaultHost));
+                    }
+                    test(ipInfo.rcvSize >= 1024);
+                    test(ipInfo.sndSize >= 2048);
+
+                    Dictionary<string, string> ctx = testIntf.getConnectionInfoAsContext();
+                    test(ctx["incoming"].Equals("true"));
+                    test(ctx["adapterName"].Equals("TestAdapter"));
+                    test(ctx["remoteAddress"].Equals(ipInfo.localAddress));
+                    test(ctx["localAddress"].Equals(ipInfo.remoteAddress));
+                    test(ctx["remotePort"].Equals(ipInfo.localPort.ToString()));
+                    test(ctx["localPort"].Equals(ipInfo.remotePort.ToString()));
+
+                    if(@base.ice_getConnection().type().Equals("ws") || @base.ice_getConnection().type().Equals("wss"))
+                    {
+                        Dictionary<string, string> headers =((Ice.WSConnectionInfo)info).headers;
+                        test(headers["Upgrade"].Equals("websocket"));
+                        test(headers["Connection"].Equals("Upgrade"));
+                        test(headers["Sec-WebSocket-Protocol"].Equals("ice.zeroc.com"));
+                        test(headers["Sec-WebSocket-Accept"] != null);
+
+                        test(ctx["ws.Upgrade"].Equals("websocket"));
+                        test(ctx["ws.Connection"].Equals("Upgrade"));
+                        test(ctx["ws.Sec-WebSocket-Protocol"].Equals("ice.zeroc.com"));
+                        test(ctx["ws.Sec-WebSocket-Version"].Equals("13"));
+                        test(ctx["ws.Sec-WebSocket-Key"] != null);
+                    }
+
+                    connection = @base.ice_datagram().ice_getConnection();
+                    connection.setBufferSize(2048, 1024);
+
+                    Ice.UDPConnectionInfo udpInfo =(Ice.UDPConnectionInfo)connection.getInfo();
+                    test(!udpInfo.incoming);
+                    test(udpInfo.adapterName.Length == 0);
+                    test(udpInfo.localPort > 0);
+                    test(udpInfo.remotePort == endpointPort);
+
+                    if(defaultHost.Equals("127.0.0.1"))
+                    {
+                        test(udpInfo.remoteAddress.Equals(defaultHost));
+                        test(udpInfo.localAddress.Equals(defaultHost));
+                    }
+                    test(udpInfo.rcvSize >= 2048);
+                    test(udpInfo.sndSize >= 1024);
+                }
+                output.WriteLine("ok");
 
-            Ice.UDPConnectionInfo udpInfo = (Ice.UDPConnectionInfo)connection.getInfo();
-            test(!udpInfo.incoming);
-            test(udpInfo.adapterName.Length == 0);
-            test(udpInfo.localPort > 0);
-            test(udpInfo.remotePort == endpointPort);
+                testIntf.shutdown();
 
-            if(defaultHost.Equals("127.0.0.1"))
-            {
-                test(udpInfo.remoteAddress.Equals(defaultHost));
-                test(udpInfo.localAddress.Equals(defaultHost));
+                communicator.shutdown();
+                communicator.waitForShutdown();
             }
-            test(udpInfo.rcvSize >= 2048);
-            test(udpInfo.sndSize >= 1024);
         }
-        WriteLine("ok");
-
-        testIntf.shutdown();
-
-        communicator.shutdown();
-        communicator.waitForShutdown();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/info/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/info/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace info
     {
-        AllTests.allTests(this);
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -51,24 +51,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceSSL.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceSSL.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.info</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceSSL.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/info/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/info/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + ":" +
-                                                   getTestEndpoint(0, "udp"));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace info
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                             getTestEndpoint(0) + ":" + getTestEndpoint(0, "udp"));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/Current.ice>
 
+["cs:namespace:Ice.info"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/info/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/info/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/info/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/info/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,92 +1,92 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using Test;
 using System.Collections.Generic;
 
-public class TestI : TestIntfDisp_
+namespace Ice
 {
-    private static Ice.IPEndpointInfo getIPEndpointInfo(Ice.EndpointInfo info)
+    namespace info
     {
-        for(; info != null; info = info.underlying)
+        public class TestI : Test.TestIntfDisp_
         {
-            if(info is Ice.IPEndpointInfo)
+            private static Ice.IPEndpointInfo getIPEndpointInfo(Ice.EndpointInfo info)
             {
-                return info as Ice.IPEndpointInfo;
+                for(; info != null; info = info.underlying)
+                {
+                    if(info is Ice.IPEndpointInfo)
+                    {
+                        return info as Ice.IPEndpointInfo;
+                    }
+                }
+                return null;
             }
-        }
-        return null;
-    }
 
-    private static Ice.IPConnectionInfo getIPConnectionInfo(Ice.ConnectionInfo info)
-    {
-        for(; info != null; info = info.underlying)
-        {
-            if(info is Ice.IPConnectionInfo)
+            private static Ice.IPConnectionInfo getIPConnectionInfo(Ice.ConnectionInfo info)
             {
-                return info as Ice.IPConnectionInfo;
+                for(; info != null; info = info.underlying)
+                {
+                    if(info is Ice.IPConnectionInfo)
+                    {
+                        return info as Ice.IPConnectionInfo;
+                    }
+                }
+                return null;
             }
-        }
-        return null;
-    }
-
-    override public void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    override public Dictionary<string, string> getEndpointInfoAsContext(Ice.Current c)
-    {
-        Dictionary<string, string> ctx = new Dictionary<string, string>();
-        Ice.EndpointInfo info = c.con.getEndpoint().getInfo();
-        ctx["timeout"] = info.timeout.ToString();
-        ctx["compress"] = info.compress ? "true" : "false";
-        ctx["datagram"] = info.datagram() ? "true" : "false";
-        ctx["secure"] = info.datagram() ? "true" : "false";
-        ctx["type"] = info.type().ToString();
-
-        Ice.IPEndpointInfo ipinfo = getIPEndpointInfo(info);
-        ctx["host"] = ipinfo.host;
-        ctx["port"] = ipinfo.port.ToString();
 
-        if(ipinfo is Ice.UDPEndpointInfo)
-        {
-            Ice.UDPEndpointInfo udp = (Ice.UDPEndpointInfo)ipinfo;
-            ctx["mcastInterface"] = udp.mcastInterface;
-            ctx["mcastTtl"] = udp.mcastTtl.ToString();
-        }
+            override public void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
 
-        return ctx;
-    }
+            override public Dictionary<string, string> getEndpointInfoAsContext(Ice.Current c)
+            {
+                Dictionary<string, string> ctx = new Dictionary<string, string>();
+                Ice.EndpointInfo info = c.con.getEndpoint().getInfo();
+                ctx["timeout"] = info.timeout.ToString();
+                ctx["compress"] = info.compress ? "true" : "false";
+                ctx["datagram"] = info.datagram() ? "true" : "false";
+                ctx["secure"] = info.datagram() ? "true" : "false";
+                ctx["type"] = info.type().ToString();
+
+                Ice.IPEndpointInfo ipinfo = getIPEndpointInfo(info);
+                ctx["host"] = ipinfo.host;
+                ctx["port"] = ipinfo.port.ToString();
+
+                if(ipinfo is Ice.UDPEndpointInfo)
+                {
+                    Ice.UDPEndpointInfo udp =(Ice.UDPEndpointInfo)ipinfo;
+                    ctx["mcastInterface"] = udp.mcastInterface;
+                    ctx["mcastTtl"] = udp.mcastTtl.ToString();
+                }
 
-    override public Dictionary<string, string> getConnectionInfoAsContext(Ice.Current c)
-    {
-        Dictionary<string, string> ctx = new Dictionary<string, string>();
-        Ice.ConnectionInfo info = c.con.getInfo();
-        ctx["adapterName"] = info.adapterName;
-        ctx["incoming"] = info.incoming ? "true" : "false";
-
-        Ice.IPConnectionInfo ipinfo = getIPConnectionInfo(info);
-        ctx["localAddress"] = ipinfo.localAddress;
-        ctx["localPort"] = ipinfo.localPort.ToString();
-        ctx["remoteAddress"] = ipinfo.remoteAddress;
-        ctx["remotePort"] = ipinfo.remotePort.ToString();
+                return ctx;
+            }
 
-        if(info is Ice.WSConnectionInfo)
-        {
-            Ice.WSConnectionInfo wsinfo = (Ice.WSConnectionInfo)info;
-            foreach(KeyValuePair<string, string> e in wsinfo.headers)
+            override public Dictionary<string, string> getConnectionInfoAsContext(Ice.Current c)
             {
-                ctx["ws." + e.Key] = e.Value;
+                Dictionary<string, string> ctx = new Dictionary<string, string>();
+                Ice.ConnectionInfo info = c.con.getInfo();
+                ctx["adapterName"] = info.adapterName;
+                ctx["incoming"] = info.incoming ? "true" : "false";
+
+                Ice.IPConnectionInfo ipinfo = getIPConnectionInfo(info);
+                ctx["localAddress"] = ipinfo.localAddress;
+                ctx["localPort"] = ipinfo.localPort.ToString();
+                ctx["remoteAddress"] = ipinfo.remoteAddress;
+                ctx["remotePort"] = ipinfo.remotePort.ToString();
+
+                if(info is Ice.WSConnectionInfo)
+                {
+                    Ice.WSConnectionInfo wsinfo =(Ice.WSConnectionInfo)info;
+                    foreach(KeyValuePair<string, string> e in wsinfo.headers)
+                    {
+                        ctx["ws." + e.Key] = e.Value;
+                    }
+                }
+
+                return ctx;
             }
         }
-
-        return ctx;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,225 +1,225 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static InitialPrx allTests(TestCommon.Application app)
+    namespace inheritance
     {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        string ref_Renamed = "initial:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx @base = communicator.stringToProxy(ref_Renamed);
-        test(@base != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        InitialPrx initial = InitialPrxHelper.checkedCast(@base);
-        test(initial != null);
-        test(initial.Equals(@base));
-        WriteLine("ok");
-
-        Write("getting proxies for class hierarchy... ");
-        Flush();
-        Test.MA.CAPrx ca = initial.caop();
-        Test.MB.CBPrx cb = initial.cbop();
-        Test.MA.CCPrx cc = initial.ccop();
-        Test.MA.CDPrx cd = initial.cdop();
-        test(ca != cb);
-        test(ca != cc);
-        test(ca != cd);
-        test(cb != cc);
-        test(cb != cd);
-        test(cc != cd);
-        WriteLine("ok");
-
-        Write("getting proxies for interface hierarchy... ");
-        Flush();
-        Test.MA.IAPrx ia = initial.iaop();
-        Test.MB.IB1Prx ib1 = initial.ib1op();
-        Test.MB.IB2Prx ib2 = initial.ib2op();
-        Test.MA.ICPrx ic = initial.icop();
-        test(ia != ib1);
-        test(ia != ib2);
-        test(ia != ic);
-        test(ib1 != ic);
-        test(ib2 != ic);
-        WriteLine("ok");
-
-        Write("invoking proxy operations on class hierarchy... ");
-        Flush();
-        Test.MA.CAPrx cao;
-        Test.MB.CBPrx cbo;
-        Test.MA.CCPrx cco;
-
-        cao = ca.caop(ca);
-        test(cao.Equals(ca));
-        cao = ca.caop(cb);
-        test(cao.Equals(cb));
-        cao = ca.caop(cc);
-        test(cao.Equals(cc));
-        cao = cb.caop(ca);
-        test(cao.Equals(ca));
-        cao = cb.caop(cb);
-        test(cao.Equals(cb));
-        cao = cb.caop(cc);
-        test(cao.Equals(cc));
-        cao = cc.caop(ca);
-        test(cao.Equals(ca));
-        cao = cc.caop(cb);
-        test(cao.Equals(cb));
-        cao = cc.caop(cc);
-        test(cao.Equals(cc));
-
-        cao = cb.cbop(cb);
-        test(cao.Equals(cb));
-        cbo = cb.cbop(cb);
-        test(cbo.Equals(cb));
-        cao = cb.cbop(cc);
-        test(cao.Equals(cc));
-        cbo = cb.cbop(cc);
-        test(cbo.Equals(cc));
-        cao = cc.cbop(cb);
-        test(cao.Equals(cb));
-        cbo = cc.cbop(cb);
-        test(cbo.Equals(cb));
-        cao = cc.cbop(cc);
-        test(cao.Equals(cc));
-        cbo = cc.cbop(cc);
-        test(cbo.Equals(cc));
-
-        cao = cc.ccop(cc);
-        test(cao.Equals(cc));
-        cbo = cc.ccop(cc);
-        test(cbo.Equals(cc));
-        cco = cc.ccop(cc);
-        test(cco.Equals(cc));
-        WriteLine("ok");
-
-        Write("ditto, but for interface hierarchy... ");
-        Flush();
-        Test.MA.IAPrx iao;
-        Test.MB.IB1Prx ib1o;
-        Test.MB.IB2Prx ib2o;
-        Test.MA.ICPrx ico;
-
-        iao = ia.iaop(ia);
-        test(iao.Equals(ia));
-        iao = ia.iaop(ib1);
-        test(iao.Equals(ib1));
-        iao = ia.iaop(ib2);
-        test(iao.Equals(ib2));
-        iao = ia.iaop(ic);
-        test(iao.Equals(ic));
-        iao = ib1.iaop(ia);
-        test(iao.Equals(ia));
-        iao = ib1.iaop(ib1);
-        test(iao.Equals(ib1));
-        iao = ib1.iaop(ib2);
-        test(iao.Equals(ib2));
-        iao = ib1.iaop(ic);
-        test(iao.Equals(ic));
-        iao = ib2.iaop(ia);
-        test(iao.Equals(ia));
-        iao = ib2.iaop(ib1);
-        test(iao.Equals(ib1));
-        iao = ib2.iaop(ib2);
-        test(iao.Equals(ib2));
-        iao = ib2.iaop(ic);
-        test(iao.Equals(ic));
-        iao = ic.iaop(ia);
-        test(iao.Equals(ia));
-        iao = ic.iaop(ib1);
-        test(iao.Equals(ib1));
-        iao = ic.iaop(ib2);
-        test(iao.Equals(ib2));
-        iao = ic.iaop(ic);
-        test(iao.Equals(ic));
-
-        iao = ib1.ib1op(ib1);
-        test(iao.Equals(ib1));
-        ib1o = ib1.ib1op(ib1);
-        test(ib1o.Equals(ib1));
-        iao = ib1.ib1op(ic);
-        test(iao.Equals(ic));
-        ib1o = ib1.ib1op(ic);
-        test(ib1o.Equals(ic));
-        iao = ic.ib1op(ib1);
-        test(iao.Equals(ib1));
-        ib1o = ic.ib1op(ib1);
-        test(ib1o.Equals(ib1));
-        iao = ic.ib1op(ic);
-        test(iao.Equals(ic));
-        ib1o = ic.ib1op(ic);
-        test(ib1o.Equals(ic));
-
-        iao = ib2.ib2op(ib2);
-        test(iao.Equals(ib2));
-        ib2o = ib2.ib2op(ib2);
-        test(ib2o.Equals(ib2));
-        iao = ib2.ib2op(ic);
-        test(iao.Equals(ic));
-        ib2o = ib2.ib2op(ic);
-        test(ib2o.Equals(ic));
-        iao = ic.ib2op(ib2);
-        test(iao.Equals(ib2));
-        ib2o = ic.ib2op(ib2);
-        test(ib2o.Equals(ib2));
-        iao = ic.ib2op(ic);
-        test(iao.Equals(ic));
-        ib2o = ic.ib2op(ic);
-        test(ib2o.Equals(ic));
-
-        iao = ic.icop(ic);
-        test(iao.Equals(ic));
-        ib1o = ic.icop(ic);
-        test(ib1o.Equals(ic));
-        ib2o = ic.icop(ic);
-        test(ib2o.Equals(ic));
-        ico = ic.icop(ic);
-        test(ico.Equals(ic));
-        WriteLine("ok");
-
-        Write("ditto, but for class implementing interfaces... ");
-        Flush();
-
-        cao = cd.caop(cd);
-        test(cao.Equals(cd));
-        cbo = cd.cbop(cd);
-        test(cbo.Equals(cd));
-        cco = cd.ccop(cd);
-        test(cco.Equals(cd));
-
-        iao = cd.iaop(cd);
-        test(iao.Equals(cd));
-        ib1o = cd.ib1op(cd);
-        test(ib1o.Equals(cd));
-        ib2o = cd.ib2op(cd);
-        test(ib2o.Equals(cd));
-
-        cao = cd.cdop(cd);
-        test(cao.Equals(cd));
-        cbo = cd.cdop(cd);
-        test(cbo.Equals(cd));
-        cco = cd.cdop(cd);
-        test(cco.Equals(cd));
-
-        iao = cd.cdop(cd);
-        test(iao.Equals(cd));
-        ib1o = cd.cdop(cd);
-        test(ib1o.Equals(cd));
-        ib2o = cd.cdop(cd);
-        test(ib2o.Equals(cd));
-        WriteLine("ok");
-        return initial;
+        public class AllTests : global::Test.AllTests
+        {
+            public static Test.InitialPrx allTests(global::Test.TestHelper helper)
+            {
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                string ref_Renamed = "initial:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx @base = communicator.stringToProxy(ref_Renamed);
+                test(@base != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                var initial = Test.InitialPrxHelper.checkedCast(@base);
+                test(initial != null);
+                test(initial.Equals(@base));
+                output.WriteLine("ok");
+
+                output.Write("getting proxies for class hierarchy... ");
+                output.Flush();
+                var ca = initial.caop();
+                var cb = initial.cbop();
+                var cc = initial.ccop();
+                var cd = initial.cdop();
+                test(ca != cb);
+                test(ca != cc);
+                test(ca != cd);
+                test(cb != cc);
+                test(cb != cd);
+                test(cc != cd);
+                output.WriteLine("ok");
+
+                output.Write("getting proxies for interface hierarchy... ");
+                output.Flush();
+                var ia = initial.iaop();
+                var ib1 = initial.ib1op();
+                var ib2 = initial.ib2op();
+                var ic = initial.icop();
+                test(ia != ib1);
+                test(ia != ib2);
+                test(ia != ic);
+                test(ib1 != ic);
+                test(ib2 != ic);
+                output.WriteLine("ok");
+
+                output.Write("invoking proxy operations on class hierarchy... ");
+                output.Flush();
+                Test.MA.CAPrx cao;
+                Test.MB.CBPrx cbo;
+                Test.MA.CCPrx cco;
+
+                cao = ca.caop(ca);
+                test(cao.Equals(ca));
+                cao = ca.caop(cb);
+                test(cao.Equals(cb));
+                cao = ca.caop(cc);
+                test(cao.Equals(cc));
+                cao = cb.caop(ca);
+                test(cao.Equals(ca));
+                cao = cb.caop(cb);
+                test(cao.Equals(cb));
+                cao = cb.caop(cc);
+                test(cao.Equals(cc));
+                cao = cc.caop(ca);
+                test(cao.Equals(ca));
+                cao = cc.caop(cb);
+                test(cao.Equals(cb));
+                cao = cc.caop(cc);
+                test(cao.Equals(cc));
+
+                cao = cb.cbop(cb);
+                test(cao.Equals(cb));
+                cbo = cb.cbop(cb);
+                test(cbo.Equals(cb));
+                cao = cb.cbop(cc);
+                test(cao.Equals(cc));
+                cbo = cb.cbop(cc);
+                test(cbo.Equals(cc));
+                cao = cc.cbop(cb);
+                test(cao.Equals(cb));
+                cbo = cc.cbop(cb);
+                test(cbo.Equals(cb));
+                cao = cc.cbop(cc);
+                test(cao.Equals(cc));
+                cbo = cc.cbop(cc);
+                test(cbo.Equals(cc));
+
+                cao = cc.ccop(cc);
+                test(cao.Equals(cc));
+                cbo = cc.ccop(cc);
+                test(cbo.Equals(cc));
+                cco = cc.ccop(cc);
+                test(cco.Equals(cc));
+                output.WriteLine("ok");
+
+                output.Write("ditto, but for interface hierarchy... ");
+                output.Flush();
+                Test.MA.IAPrx iao;
+                Test.MB.IB1Prx ib1o;
+                Test.MB.IB2Prx ib2o;
+                Test.MA.ICPrx ico;
+
+                iao = ia.iaop(ia);
+                test(iao.Equals(ia));
+                iao = ia.iaop(ib1);
+                test(iao.Equals(ib1));
+                iao = ia.iaop(ib2);
+                test(iao.Equals(ib2));
+                iao = ia.iaop(ic);
+                test(iao.Equals(ic));
+                iao = ib1.iaop(ia);
+                test(iao.Equals(ia));
+                iao = ib1.iaop(ib1);
+                test(iao.Equals(ib1));
+                iao = ib1.iaop(ib2);
+                test(iao.Equals(ib2));
+                iao = ib1.iaop(ic);
+                test(iao.Equals(ic));
+                iao = ib2.iaop(ia);
+                test(iao.Equals(ia));
+                iao = ib2.iaop(ib1);
+                test(iao.Equals(ib1));
+                iao = ib2.iaop(ib2);
+                test(iao.Equals(ib2));
+                iao = ib2.iaop(ic);
+                test(iao.Equals(ic));
+                iao = ic.iaop(ia);
+                test(iao.Equals(ia));
+                iao = ic.iaop(ib1);
+                test(iao.Equals(ib1));
+                iao = ic.iaop(ib2);
+                test(iao.Equals(ib2));
+                iao = ic.iaop(ic);
+                test(iao.Equals(ic));
+
+                iao = ib1.ib1op(ib1);
+                test(iao.Equals(ib1));
+                ib1o = ib1.ib1op(ib1);
+                test(ib1o.Equals(ib1));
+                iao = ib1.ib1op(ic);
+                test(iao.Equals(ic));
+                ib1o = ib1.ib1op(ic);
+                test(ib1o.Equals(ic));
+                iao = ic.ib1op(ib1);
+                test(iao.Equals(ib1));
+                ib1o = ic.ib1op(ib1);
+                test(ib1o.Equals(ib1));
+                iao = ic.ib1op(ic);
+                test(iao.Equals(ic));
+                ib1o = ic.ib1op(ic);
+                test(ib1o.Equals(ic));
+
+                iao = ib2.ib2op(ib2);
+                test(iao.Equals(ib2));
+                ib2o = ib2.ib2op(ib2);
+                test(ib2o.Equals(ib2));
+                iao = ib2.ib2op(ic);
+                test(iao.Equals(ic));
+                ib2o = ib2.ib2op(ic);
+                test(ib2o.Equals(ic));
+                iao = ic.ib2op(ib2);
+                test(iao.Equals(ib2));
+                ib2o = ic.ib2op(ib2);
+                test(ib2o.Equals(ib2));
+                iao = ic.ib2op(ic);
+                test(iao.Equals(ic));
+                ib2o = ic.ib2op(ic);
+                test(ib2o.Equals(ic));
+
+                iao = ic.icop(ic);
+                test(iao.Equals(ic));
+                ib1o = ic.icop(ic);
+                test(ib1o.Equals(ic));
+                ib2o = ic.icop(ic);
+                test(ib2o.Equals(ic));
+                ico = ic.icop(ic);
+                test(ico.Equals(ic));
+                output.WriteLine("ok");
+
+                output.Write("ditto, but for class implementing interfaces... ");
+                output.Flush();
+
+                cao = cd.caop(cd);
+                test(cao.Equals(cd));
+                cbo = cd.cbop(cd);
+                test(cbo.Equals(cd));
+                cco = cd.ccop(cd);
+                test(cco.Equals(cd));
+
+                iao = cd.iaop(cd);
+                test(iao.Equals(cd));
+                ib1o = cd.ib1op(cd);
+                test(ib1o.Equals(cd));
+                ib2o = cd.ib2op(cd);
+                test(ib2o.Equals(cd));
+
+                cao = cd.cdop(cd);
+                test(cao.Equals(cd));
+                cbo = cd.cdop(cd);
+                test(cbo.Equals(cd));
+                cco = cd.cdop(cd);
+                test(cco.Equals(cd));
+
+                iao = cd.cdop(cd);
+                test(iao.Equals(cd));
+                ib1o = cd.cdop(cd);
+                test(ib1o.Equals(cd));
+                ib2o = cd.cdop(cd);
+                test(ib2o.Equals(cd));
+                output.WriteLine("ok");
+                return initial;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CAI.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CAI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CAI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CAI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class CAI : Test.MA.CADisp_
+namespace Ice
 {
-    public CAI()
+    namespace inheritance
     {
-    }
+        public sealed class CAI : Test.MA.CADisp_
+        {
+            public CAI()
+            {
+            }
 
-    public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
-    {
-        return p;
+            public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CBI.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CBI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CBI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CBI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class CBI : Test.MB.CBDisp_
+namespace Ice
 {
-    public CBI()
+    namespace inheritance
     {
-    }
+        public sealed class CBI : Test.MB.CBDisp_
+        {
+            public CBI()
+            {
+            }
 
-    public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current)
-    {
-        return p;
+            public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CCI.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CCI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CCI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CCI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class CCI : Test.MA.CCDisp_
+namespace Ice
 {
-    public CCI()
+    namespace inheritance
     {
-    }
+        public sealed class CCI : Test.MA.CCDisp_
+        {
+            public CCI()
+            {
+            }
 
-    public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MA.CCPrx ccop(Test.MA.CCPrx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MA.CCPrx ccop(Test.MA.CCPrx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current)
-    {
-        return p;
+            public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CDI.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/CDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/CDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,51 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class CDI : Test.MA.CDDisp_
+namespace Ice
 {
-    public CDI()
-    {
-    }
-
-    public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public override Test.MA.CCPrx ccop(Test.MA.CCPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public override Test.MA.CDPrx cdop(Test.MA.CDPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current)
-    {
-        return p;
-    }
-
-    public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current)
+    namespace inheritance
     {
-        return p;
+        public sealed class CDI : Test.MA.CDDisp_
+        {
+            public CDI()
+            {
+            }
+
+            public override Test.MA.CAPrx caop(Test.MA.CAPrx p, Ice.Current current)
+            {
+                return p;
+            }
+
+            public override Test.MA.CCPrx ccop(Test.MA.CCPrx p, Ice.Current current)
+            {
+                return p;
+            }
+
+            public override Test.MA.CDPrx cdop(Test.MA.CDPrx p, Ice.Current current)
+            {
+                return p;
+            }
+
+            public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
+            {
+                return p;
+            }
+
+            public override Test.MB.CBPrx cbop(Test.MB.CBPrx p, Ice.Current current)
+            {
+                return p;
+            }
+
+            public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current)
+            {
+                return p;
+            }
+
+            public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace inheritance
     {
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var initial = AllTests.allTests(this);
+                    initial.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace inheritance
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object obj = new InitialI(adapter);
-        adapter.add(obj, Ice.Util.stringToIdentity("initial"));
-        AllTests.allTests(this);
-        return 0;
-    }
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new InitialI(adapter), Ice.Util.stringToIdentity("initial"));
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/IAI.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/IAI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/IAI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/IAI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class IAI : Test.MA.IADisp_
+namespace Ice
 {
-    public IAI()
+    namespace inheritance
     {
-    }
+        public sealed class IAI : Test.MA.IADisp_
+        {
+            public IAI()
+            {
+            }
 
-    public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
-    {
-        return p;
+            public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/IB1I.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/IB1I.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/IB1I.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/IB1I.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class IB1I : Test.MB.IB1Disp_
+namespace Ice
 {
-    public IB1I()
+    namespace inheritance
     {
-    }
+        public sealed class IB1I : Test.MB.IB1Disp_
+        {
+            public IB1I()
+            {
+            }
 
-    public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current)
-    {
-        return p;
+            public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/IB2I.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/IB2I.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/IB2I.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/IB2I.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class IB2I : Test.MB.IB2Disp_
+namespace Ice
 {
-    public IB2I()
+    namespace inheritance
     {
-    }
+        public sealed class IB2I : Test.MB.IB2Disp_
+        {
+            public IB2I()
+            {
+            }
 
-    public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current)
-    {
-        return p;
+            public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/ICI.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/ICI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/ICI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/ICI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class ICI : Test.MA.ICDisp_
+namespace Ice
 {
-    public ICI()
+    namespace inheritance
     {
-    }
+        public sealed class ICI : Test.MA.ICDisp_
+        {
+            public ICI()
+            {
+            }
 
-    public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MA.IAPrx iaop(Test.MA.IAPrx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MA.ICPrx icop(Test.MA.ICPrx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MA.ICPrx icop(Test.MA.ICPrx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current)
-    {
-        return p;
-    }
+            public override Test.MB.IB1Prx ib1op(Test.MB.IB1Prx p, Ice.Current current)
+            {
+                return p;
+            }
 
-    public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current)
-    {
-        return p;
+            public override Test.MB.IB2Prx ib2op(Test.MB.IB2Prx p, Ice.Current current)
+            {
+                return p;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/InitialI.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/InitialI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/InitialI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/InitialI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,77 +1,78 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class InitialI : Test.InitialDisp_
+namespace Ice
 {
-    public InitialI(Ice.ObjectAdapter adapter)
-    {
-        _ca = Test.MA.CAPrxHelper.uncheckedCast(adapter.addWithUUID(new CAI()));
-        _cb = Test.MB.CBPrxHelper.uncheckedCast(adapter.addWithUUID(new CBI()));
-        _cc = Test.MA.CCPrxHelper.uncheckedCast(adapter.addWithUUID(new CCI()));
-        _cd = Test.MA.CDPrxHelper.uncheckedCast(adapter.addWithUUID(new CDI()));
-        _ia = Test.MA.IAPrxHelper.uncheckedCast(adapter.addWithUUID(new IAI()));
-        _ib1 = Test.MB.IB1PrxHelper.uncheckedCast(adapter.addWithUUID(new IB1I()));
-        _ib2 = Test.MB.IB2PrxHelper.uncheckedCast(adapter.addWithUUID(new IB2I()));
-        _ic = Test.MA.ICPrxHelper.uncheckedCast(adapter.addWithUUID(new ICI()));
-    }
-
-    public override Test.MA.CAPrx caop(Ice.Current current)
+    namespace inheritance
     {
-        return _ca;
+        public sealed class InitialI : Test.InitialDisp_
+        {
+            public InitialI(Ice.ObjectAdapter adapter)
+            {
+                _ca = Test.MA.CAPrxHelper.uncheckedCast(adapter.addWithUUID(new CAI()));
+                _cb = Test.MB.CBPrxHelper.uncheckedCast(adapter.addWithUUID(new CBI()));
+                _cc = Test.MA.CCPrxHelper.uncheckedCast(adapter.addWithUUID(new CCI()));
+                _cd = Test.MA.CDPrxHelper.uncheckedCast(adapter.addWithUUID(new CDI()));
+                _ia = Test.MA.IAPrxHelper.uncheckedCast(adapter.addWithUUID(new IAI()));
+                _ib1 = Test.MB.IB1PrxHelper.uncheckedCast(adapter.addWithUUID(new IB1I()));
+                _ib2 = Test.MB.IB2PrxHelper.uncheckedCast(adapter.addWithUUID(new IB2I()));
+                _ic = Test.MA.ICPrxHelper.uncheckedCast(adapter.addWithUUID(new ICI()));
+            }
+
+            public override Test.MA.CAPrx caop(Ice.Current current)
+            {
+                return _ca;
+            }
+
+            public override Test.MB.CBPrx cbop(Ice.Current current)
+            {
+                return _cb;
+            }
+
+            public override Test.MA.CCPrx ccop(Ice.Current current)
+            {
+                return _cc;
+            }
+
+            public override Test.MA.CDPrx cdop(Ice.Current current)
+            {
+                return _cd;
+            }
+
+            public override Test.MA.IAPrx iaop(Ice.Current current)
+            {
+                return _ia;
+            }
+
+            public override Test.MB.IB1Prx ib1op(Ice.Current current)
+            {
+                return _ib1;
+            }
+
+            public override Test.MB.IB2Prx ib2op(Ice.Current current)
+            {
+                return _ib2;
+            }
+
+            public override Test.MA.ICPrx icop(Ice.Current current)
+            {
+                return _ic;
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            private Test.MA.CAPrx _ca;
+            private Test.MB.CBPrx _cb;
+            private Test.MA.CCPrx _cc;
+            private Test.MA.CDPrx _cd;
+            private Test.MA.IAPrx _ia;
+            private Test.MB.IB1Prx _ib1;
+            private Test.MB.IB2Prx _ib2;
+            private Test.MA.ICPrx _ic;
+        }
     }
-
-    public override Test.MB.CBPrx cbop(Ice.Current current)
-    {
-        return _cb;
-    }
-
-    public override Test.MA.CCPrx ccop(Ice.Current current)
-    {
-        return _cc;
-    }
-
-    public override Test.MA.CDPrx cdop(Ice.Current current)
-    {
-        return _cd;
-    }
-
-    public override Test.MA.IAPrx iaop(Ice.Current current)
-    {
-        return _ia;
-    }
-
-    public override Test.MB.IB1Prx ib1op(Ice.Current current)
-    {
-        return _ib1;
-    }
-
-    public override Test.MB.IB2Prx ib2op(Ice.Current current)
-    {
-        return _ib2;
-    }
-
-    public override Test.MA.ICPrx icop(Ice.Current current)
-    {
-        return _ic;
-    }
-
-    public override void  shutdown(Ice.Current current)
-    {
-       current.adapter.getCommunicator().shutdown();
-    }
-
-    private Test.MA.CAPrx _ca;
-    private Test.MB.CBPrx _cb;
-    private Test.MA.CCPrx _cc;
-    private Test.MA.CDPrx _cd;
-    private Test.MA.IAPrx _ia;
-    private Test.MB.IB1Prx _ib1;
-    private Test.MB.IB2Prx _ib2;
-    private Test.MA.ICPrx _ic;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -75,14 +75,14 @@
     <Compile Include="..\..\..\InitialI.cs">
       <Link>InitialI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -96,15 +96,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../CAI.cs"/>
-    <Compile Include="../../../CBI.cs"/>
-    <Compile Include="../../../CCI.cs"/>
-    <Compile Include="../../../CDI.cs"/>
-    <Compile Include="../../../IAI.cs"/>
-    <Compile Include="../../../IB1I.cs"/>
-    <Compile Include="../../../IB2I.cs"/>
-    <Compile Include="../../../ICI.cs"/>
-    <Compile Include="../../../InitialI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../CAI.cs" />
+    <Compile Include="../../../CBI.cs" />
+    <Compile Include="../../../CCI.cs" />
+    <Compile Include="../../../CDI.cs" />
+    <Compile Include="../../../IAI.cs" />
+    <Compile Include="../../../IB1I.cs" />
+    <Compile Include="../../../IB2I.cs" />
+    <Compile Include="../../../ICI.cs" />
+    <Compile Include="../../../InitialI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,7 +17,6 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,26 +57,26 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CAI.cs">
       <Link>CAI.cs</Link>
@@ -108,24 +108,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../CAI.cs"/>
-    <Compile Include="../../../CBI.cs"/>
-    <Compile Include="../../../CCI.cs"/>
-    <Compile Include="../../../CDI.cs"/>
-    <Compile Include="../../../IAI.cs"/>
-    <Compile Include="../../../IB1I.cs"/>
-    <Compile Include="../../../IB2I.cs"/>
-    <Compile Include="../../../ICI.cs"/>
-    <Compile Include="../../../InitialI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../CAI.cs" />
+    <Compile Include="../../../CBI.cs" />
+    <Compile Include="../../../CCI.cs" />
+    <Compile Include="../../../CDI.cs" />
+    <Compile Include="../../../IAI.cs" />
+    <Compile Include="../../../IB1I.cs" />
+    <Compile Include="../../../IB2I.cs" />
+    <Compile Include="../../../ICI.cs" />
+    <Compile Include="../../../InitialI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.inheritance</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+      <Compile Include="../../../AllTests.cs" />
+      <Compile Include="../../../CAI.cs" />
+      <Compile Include="../../../CBI.cs" />
+      <Compile Include="../../../CCI.cs" />
+      <Compile Include="../../../CDI.cs" />
+      <Compile Include="../../../Client.cs" />
+      <Compile Include="../../../Collocated.cs" />
+      <Compile Include="../../../IAI.cs" />
+      <Compile Include="../../../IB1I.cs" />
+      <Compile Include="../../../IB2I.cs" />
+      <Compile Include="../../../ICI.cs" />
+      <Compile Include="../../../InitialI.cs" />
+      <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace inheritance
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object @object = new InitialI(adapter);
-        adapter.add(@object, Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.Object @object = new InitialI(adapter);
+                    adapter.add(@object, Ice.Util.stringToIdentity("initial"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 [["suppress-warning:deprecated"]] // For classes with operations
-
+["cs:namespace:Ice.inheritance"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/interceptor/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,230 +1,211 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    private int run(Test.MyObjectPrx prx, InterceptorI interceptor)
-    {
-        Console.Out.Write("testing simple interceptor... ");
-        Console.Out.Flush();
-        test(interceptor.getLastOperation() == null);
-        test(!interceptor.getLastStatus());
-        prx.ice_ping();
-        test(interceptor.getLastOperation().Equals("ice_ping"));
-        test(!interceptor.getLastStatus());
-        String typeId = prx.ice_id();
-        test(interceptor.getLastOperation().Equals("ice_id"));
-        test(!interceptor.getLastStatus());
-        test(prx.ice_isA(typeId));
-        test(interceptor.getLastOperation().Equals("ice_isA"));
-        test(!interceptor.getLastStatus());
-        test(prx.add(33, 12) == 45);
-        test(interceptor.getLastOperation().Equals("add"));
-        test(!interceptor.getLastStatus());
-        Console.WriteLine("ok");
-        Console.Out.Write("testing retry... ");
-        Console.Out.Flush();
-        test(prx.addWithRetry(33, 12) == 45);
-        test(interceptor.getLastOperation().Equals("addWithRetry"));
-        test(!interceptor.getLastStatus());
-        Console.WriteLine("ok");
-        Console.Out.Write("testing user exception... ");
-        Console.Out.Flush();
-        try
-        {
-            prx.badAdd(33, 12);
-            test(false);
-        }
-        catch(Test.InvalidInputException)
-        {
-            // expected
-        }
-        test(interceptor.getLastOperation().Equals("badAdd"));
-        test(!interceptor.getLastStatus());
-        Console.WriteLine("ok");
-        Console.Out.Write("testing ONE... ");
-        Console.Out.Flush();
-        interceptor.clear();
-        try
-        {
-            prx.notExistAdd(33, 12);
-            test(false);
-        }
-        catch(Ice.ObjectNotExistException)
-        {
-            // expected
-        }
-        test(interceptor.getLastOperation().Equals("notExistAdd"));
-        test(!interceptor.getLastStatus());
-        Console.WriteLine("ok");
-        Console.Out.Write("testing system exception... ");
-        Console.Out.Flush();
-        interceptor.clear();
-        try
-        {
-            prx.badSystemAdd(33, 12);
-            test(false);
-        }
-        catch(Ice.UnknownException)
-        {
-            test(!prx.ice_isCollocationOptimized());
-        }
-        catch(MySystemException)
-        {
-            test(prx.ice_isCollocationOptimized());
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-        test(interceptor.getLastOperation().Equals("badSystemAdd"));
-        test(!interceptor.getLastStatus());
-        Console.WriteLine("ok");
-
-        return 0;
-    }
-
-    private int runAmd(Test.MyObjectPrx prx, InterceptorI interceptor)
+    namespace interceptor
     {
-        Console.Out.Write("testing simple interceptor... ");
-        Console.Out.Flush();
-        test(interceptor.getLastOperation() == null);
-        test(!interceptor.getLastStatus());
-        test(prx.amdAdd(33, 12) == 45);
-        test(interceptor.getLastOperation().Equals("amdAdd"));
-        test(interceptor.getLastStatus());
-        Console.WriteLine("ok");
-
-        Console.Out.Write("testing retry... ");
-        Console.Out.Flush();
-        test(prx.amdAddWithRetry(33, 12) == 45);
-        test(interceptor.getLastOperation().Equals("amdAddWithRetry"));
-        test(interceptor.getLastStatus());
-        Console.WriteLine("ok");
-
-        Console.Out.Write("testing user exception... ");
-        Console.Out.Flush();
-        try
+        public class Client : TestHelper
         {
-            prx.amdBadAdd(33, 12);
-            test(false);
+            private void runTest(Test.MyObjectPrx prx, InterceptorI interceptor)
+            {
+                var output = getWriter();
+                output.Write("testing simple interceptor... ");
+                output.Flush();
+                test(interceptor.getLastOperation() == null);
+                test(!interceptor.getLastStatus());
+                prx.ice_ping();
+                test(interceptor.getLastOperation().Equals("ice_ping"));
+                test(!interceptor.getLastStatus());
+                String typeId = prx.ice_id();
+                test(interceptor.getLastOperation().Equals("ice_id"));
+                test(!interceptor.getLastStatus());
+                test(prx.ice_isA(typeId));
+                test(interceptor.getLastOperation().Equals("ice_isA"));
+                test(!interceptor.getLastStatus());
+                test(prx.add(33, 12) == 45);
+                test(interceptor.getLastOperation().Equals("add"));
+                test(!interceptor.getLastStatus());
+                output.WriteLine("ok");
+                output.Write("testing retry... ");
+                output.Flush();
+                test(prx.addWithRetry(33, 12) == 45);
+                test(interceptor.getLastOperation().Equals("addWithRetry"));
+                test(!interceptor.getLastStatus());
+                output.WriteLine("ok");
+                output.Write("testing user exception... ");
+                output.Flush();
+                try
+                {
+                    prx.badAdd(33, 12);
+                    test(false);
+                }
+                catch(Test.InvalidInputException)
+                {
+                    // expected
+                }
+                test(interceptor.getLastOperation().Equals("badAdd"));
+                test(!interceptor.getLastStatus());
+                output.WriteLine("ok");
+                output.Write("testing ONE... ");
+                output.Flush();
+                interceptor.clear();
+                try
+                {
+                    prx.notExistAdd(33, 12);
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    // expected
+                }
+                test(interceptor.getLastOperation().Equals("notExistAdd"));
+                test(!interceptor.getLastStatus());
+                output.WriteLine("ok");
+                output.Write("testing system exception... ");
+                output.Flush();
+                interceptor.clear();
+                try
+                {
+                    prx.badSystemAdd(33, 12);
+                    test(false);
+                }
+                catch(Ice.UnknownException)
+                {
+                    test(!prx.ice_isCollocationOptimized());
+                }
+                catch(MySystemException)
+                {
+                    test(prx.ice_isCollocationOptimized());
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+                test(interceptor.getLastOperation().Equals("badSystemAdd"));
+                test(!interceptor.getLastStatus());
+                output.WriteLine("ok");
+            }
+
+            private void runAmdTest(Test.MyObjectPrx prx, InterceptorI interceptor)
+            {
+                var output = getWriter();
+                output.Write("testing simple interceptor... ");
+                output.Flush();
+                test(interceptor.getLastOperation() == null);
+                test(!interceptor.getLastStatus());
+                test(prx.amdAdd(33, 12) == 45);
+                test(interceptor.getLastOperation().Equals("amdAdd"));
+                test(interceptor.getLastStatus());
+                output.WriteLine("ok");
+
+                output.Write("testing retry... ");
+                output.Flush();
+                test(prx.amdAddWithRetry(33, 12) == 45);
+                test(interceptor.getLastOperation().Equals("amdAddWithRetry"));
+                test(interceptor.getLastStatus());
+                output.WriteLine("ok");
+
+                output.Write("testing user exception... ");
+                try
+                {
+                    prx.amdBadAdd(33, 12);
+                    test(false);
+                }
+                catch(Test.InvalidInputException)
+                {
+                    // expected
+                }
+                test(interceptor.getLastOperation().Equals("amdBadAdd"));
+                test(interceptor.getLastStatus());
+                Console.WriteLine("ok");
+
+                output.Write("testing ONE... ");
+                output.Flush();
+                interceptor.clear();
+                try
+                {
+                    prx.amdNotExistAdd(33, 12);
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    // expected
+                }
+                test(interceptor.getLastOperation().Equals("amdNotExistAdd"));
+                test(interceptor.getLastStatus());
+                output.WriteLine("ok");
+
+                output.Write("testing system exception... ");
+                output.Flush();
+                interceptor.clear();
+                try
+                {
+                    prx.amdBadSystemAdd(33, 12);
+                    test(false);
+                }
+                catch(Ice.UnknownException)
+                {
+                    test(!prx.ice_isCollocationOptimized());
+                }
+                catch(MySystemException)
+                {
+                    test(prx.ice_isCollocationOptimized());
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+                test(interceptor.getLastOperation().Equals("amdBadSystemAdd"));
+                test(interceptor.getLastStatus());
+                output.WriteLine("ok");
+            }
+
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    //
+                    // Create OA and servants
+                    //
+                    communicator.getProperties().setProperty("MyOA.AdapterId", "myOA");
+
+                    Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
+
+                    Ice.Object servant = new MyObjectI();
+                    InterceptorI interceptor = new InterceptorI(servant);
+
+                    Test.MyObjectPrx prx = Test.MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(interceptor));
+
+                    var output = getWriter();
+
+                    output.WriteLine("Collocation optimization on");
+                    runTest(prx, interceptor);
+                    output.WriteLine("Now with AMD");
+                    interceptor.clear();
+                    runAmdTest(prx, interceptor);
+
+                    oa.activate(); // Only necessary for non-collocation optimized tests
+
+                    output.WriteLine("Collocation optimization off");
+                    interceptor.clear();
+                    prx = Test.MyObjectPrxHelper.uncheckedCast(prx.ice_collocationOptimized(false));
+                    runTest(prx, interceptor);
+
+                    output.WriteLine("Now with AMD");
+                    interceptor.clear();
+                    runAmdTest(prx, interceptor);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
         }
-        catch(Test.InvalidInputException)
-        {
-            // expected
-        }
-        test(interceptor.getLastOperation().Equals("amdBadAdd"));
-        test(interceptor.getLastStatus());
-        Console.WriteLine("ok");
-
-        Console.Out.Write("testing ONE... ");
-        Console.Out.Flush();
-        interceptor.clear();
-        try
-        {
-            prx.amdNotExistAdd(33, 12);
-            test(false);
-        }
-        catch(Ice.ObjectNotExistException)
-        {
-            // expected
-        }
-        test(interceptor.getLastOperation().Equals("amdNotExistAdd"));
-        test(interceptor.getLastStatus());
-        Console.WriteLine("ok");
-
-        Console.Out.Write("testing system exception... ");
-        Console.Out.Flush();
-        interceptor.clear();
-        try
-        {
-            prx.amdBadSystemAdd(33, 12);
-            test(false);
-        }
-        catch(Ice.UnknownException)
-        {
-            test(!prx.ice_isCollocationOptimized());
-        }
-        catch(MySystemException)
-        {
-            test(prx.ice_isCollocationOptimized());
-        }
-        catch(Exception)
-        {
-            test(false);
-        }
-        test(interceptor.getLastOperation().Equals("amdBadSystemAdd"));
-        test(interceptor.getLastStatus());
-        Console.WriteLine("ok");
-        return 0;
-    }
-
-    public override int run(string[] args)
-    {
-        //
-        // Create OA and servants
-        //
-
-        communicator().getProperties().setProperty("MyOA.AdapterId", "myOA");
-
-        Ice.ObjectAdapter oa = communicator().createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
-
-        Ice.Object servant = new MyObjectI();
-        InterceptorI interceptor = new InterceptorI(servant);
-
-        Test.MyObjectPrx prx = Test.MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(interceptor));
-
-        Console.WriteLine("Collocation optimization on");
-        int rs = run(prx, interceptor);
-        if(rs != 0)
-        {
-            return rs;
-        }
-
-        Console.WriteLine("Now with AMD");
-        interceptor.clear();
-        rs = runAmd(prx, interceptor);
-        if(rs != 0)
-        {
-            return rs;
-        }
-
-        oa.activate(); // Only necessary for non-collocation optimized tests
-
-        Console.WriteLine("Collocation optimization off");
-        interceptor.clear();
-        prx = Test.MyObjectPrxHelper.uncheckedCast(prx.ice_collocationOptimized(false));
-        rs = run(prx, interceptor);
-        if(rs != 0)
-        {
-            return rs;
-        }
-
-        Console.WriteLine("Now with AMD");
-        interceptor.clear();
-        rs = runAmd(prx, interceptor);
-
-        return rs;
-    }
-
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/InterceptorI.cs zeroc-ice-3.7.2/csharp/test/Ice/interceptor/InterceptorI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/InterceptorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/InterceptorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,89 +1,90 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Threading.Tasks;
 
-class InterceptorI : Ice.DispatchInterceptor
+namespace Ice
 {
-    internal InterceptorI(Ice.Object servant)
+    namespace interceptor
     {
-        servant_ = servant;
-    }
-
-    protected static void
-    test(bool b)
-    {
-        if(!b)
+        class InterceptorI : Ice.DispatchInterceptor
         {
-            throw new Exception();
-        }
-    }
+            internal InterceptorI(Ice.Object servant)
+            {
+                servant_ = servant;
+            }
 
-    public override Task<Ice.OutputStream>
-    dispatch(Ice.Request request)
-    {
-        Ice.Current current = request.getCurrent();
-        lastOperation_ = current.operation;
+            protected static void
+            test(bool b)
+            {
+                if(!b)
+                {
+                    throw new System.Exception();
+                }
+            }
 
-        if(lastOperation_.Equals("addWithRetry") || lastOperation_.Equals("amdAddWithRetry"))
-        {
-            for(int i = 0; i < 10; ++i)
+            public override Task<Ice.OutputStream>
+            dispatch(Ice.Request request)
             {
-                try
+                Ice.Current current = request.getCurrent();
+                lastOperation_ = current.operation;
+
+                if(lastOperation_.Equals("addWithRetry") || lastOperation_.Equals("amdAddWithRetry"))
                 {
-                    var t = servant_.ice_dispatch(request);
-                    if(t != null && t.IsFaulted)
+                    for(int i = 0; i < 10; ++i)
                     {
-                        throw t.Exception.InnerException;
+                        try
+                        {
+                            var t = servant_.ice_dispatch(request);
+                            if(t != null && t.IsFaulted)
+                            {
+                                throw t.Exception.InnerException;
+                            }
+                            else
+                            {
+                                test(false);
+                            }
+                        }
+                        catch(Test.RetryException)
+                        {
+                            //
+                            // Expected, retry
+                            //
+                        }
                     }
-                    else
-                    {
-                        test(false);
-                    }
-                }
-                catch(Test.RetryException)
-                {
-                    //
-                    // Expected, retry
-                    //
+
+                    current.ctx["retry"] = "no";
                 }
-            }
 
-            current.ctx["retry"] = "no";
-        }
+                var task = servant_.ice_dispatch(request);
+                lastStatus_ = task != null;
+                return task;
+            }
 
-        var task = servant_.ice_dispatch(request);
-        lastStatus_ = task != null;
-        return task;
-    }
+            internal bool
+            getLastStatus()
+            {
+                return lastStatus_;
+            }
 
-    internal bool
-    getLastStatus()
-    {
-        return lastStatus_;
-    }
+            internal String
+            getLastOperation()
+            {
+                return lastOperation_;
+            }
 
-    internal String
-    getLastOperation()
-    {
-        return lastOperation_;
-    }
+            internal virtual void
+            clear()
+            {
+                lastOperation_ = null;
+                lastStatus_ = false;
+            }
 
-    internal virtual void
-    clear()
-    {
-        lastOperation_ = null;
-        lastStatus_ = false;
+            protected readonly Ice.Object servant_;
+            protected string lastOperation_;
+            protected bool lastStatus_ = false;
+        }
     }
-
-    protected readonly Ice.Object servant_;
-    protected string lastOperation_;
-    protected bool lastStatus_ = false;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
@@ -51,24 +51,24 @@
     <Compile Include="..\..\..\MyObjectI.cs">
       <Link>MyObjectI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../InterceptorI.cs"/>
-    <Compile Include="../../../MyObjectI.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../InterceptorI.cs" />
+    <Compile Include="../../../MyObjectI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.interceptor</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../InterceptorI.cs" />
+    <Compile Include="../../../MyObjectI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/MyObjectI.cs zeroc-ice-3.7.2/csharp/test/Ice/interceptor/MyObjectI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/MyObjectI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/MyObjectI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,119 +1,119 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Threading.Tasks;
 
-class MySystemException : Ice.SystemException
+namespace Ice
 {
-    public
-    MySystemException()
-    {
-    }
-
-    override public string
-    ice_id()
+    namespace interceptor
     {
-        return "::MySystemException";
-    }
-};
-
-class MyObjectI : Test.MyObjectDisp_
-{
-    protected static void
-    test(bool b)
-    {
-        if(!b)
+        class MySystemException : Ice.SystemException
         {
-            throw new Exception();
-        }
-    }
-
-    public override int
-    add(int x, int y, Ice.Current current)
-    {
-        return x + y;
-    }
-
-    public override int
-    addWithRetry(int x, int y, Ice.Current current)
-    {
-        test(current != null);
-        test(current.ctx != null);
+            public
+            MySystemException()
+            {
+            }
+
+            override public string
+            ice_id()
+            {
+                return "::MySystemException";
+            }
+        };
 
-        if(current.ctx.ContainsKey("retry") && current.ctx["retry"].Equals("no"))
+        class MyObjectI : Test.MyObjectDisp_
         {
-            return x + y;
+            protected static void
+            test(bool b)
+            {
+                if(!b)
+                {
+                    throw new System.Exception();
+                }
+            }
+
+            public override int
+            add(int x, int y, Ice.Current current)
+            {
+                return x + y;
+            }
+
+            public override int
+            addWithRetry(int x, int y, Ice.Current current)
+            {
+                test(current != null);
+                test(current.ctx != null);
+
+                if(current.ctx.ContainsKey("retry") && current.ctx["retry"].Equals("no"))
+                {
+                    return x + y;
+                }
+                throw new Test.RetryException();
+            }
+
+            public override int
+            badAdd(int x, int y, Ice.Current current)
+            {
+                throw new Test.InvalidInputException();
+            }
+
+            public override int
+            notExistAdd(int x, int y, Ice.Current current)
+            {
+                throw new Ice.ObjectNotExistException();
+            }
+
+            public override int
+            badSystemAdd(int x, int y, Ice.Current current)
+            {
+                throw new MySystemException();
+            }
+
+            //
+            // AMD
+            //
+            public override async Task<int>
+            amdAddAsync(int x, int y, Ice.Current current)
+            {
+                await Task.Delay(10);
+                return x + y;
+            }
+
+            public override async Task<int>
+            amdAddWithRetryAsync(int x, int y, Ice.Current current)
+            {
+                if(current.ctx.ContainsKey("retry") && current.ctx["retry"].Equals("no"))
+                {
+                    await Task.Delay(10);
+                    return x + y;
+                }
+                else
+                {
+                    throw new Test.RetryException();
+                }
+            }
+
+            public override async Task<int>
+            amdBadAddAsync(int x, int y, Ice.Current current)
+            {
+                await Task.Delay(10);
+                throw new Test.InvalidInputException();
+            }
+
+            public override async Task<int>
+            amdNotExistAddAsync(int x, int y, Ice.Current current)
+            {
+                await Task.Delay(10);
+                throw new Ice.ObjectNotExistException();
+            }
+
+            public override async Task<int>
+            amdBadSystemAddAsync(int x, int y, Ice.Current current)
+            {
+                await Task.Delay(10);
+                throw new MySystemException();
+            }
         }
-        throw new Test.RetryException();
-    }
-
-    public override int
-    badAdd(int x, int y, Ice.Current current)
-    {
-        throw new Test.InvalidInputException();
-    }
-
-    public override int
-    notExistAdd(int x, int y, Ice.Current current)
-    {
-        throw new Ice.ObjectNotExistException();
-    }
-
-    public override int
-    badSystemAdd(int x, int y, Ice.Current current)
-    {
-        throw new MySystemException();
-    }
-
-    //
-    // AMD
-    //
-    public override async Task<int>
-    amdAddAsync(int x, int y, Ice.Current current)
-    {
-        await Task.Delay(10);
-        return x + y;
-    }
-
-    public override async Task<int>
-    amdAddWithRetryAsync(int x, int y, Ice.Current current)
-    {
-        if(current.ctx.ContainsKey("retry") && current.ctx["retry"].Equals("no"))
-        {
-            await Task.Delay(10);
-            return x + y;
-        }
-        else
-        {
-            throw new Test.RetryException();
-        }
-    }
-
-    public override async Task<int>
-    amdBadAddAsync(int x, int y, Ice.Current current)
-    {
-        await Task.Delay(10);
-        throw new Test.InvalidInputException();
-    }
-
-    public override async Task<int>
-    amdNotExistAddAsync(int x, int y, Ice.Current current)
-    {
-        await Task.Delay(10);
-        throw new Ice.ObjectNotExistException();
-    }
-
-    public override async Task<int>
-    amdBadSystemAddAsync(int x, int y, Ice.Current current)
-    {
-        await Task.Delay(10);
-        throw new MySystemException();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/interceptor/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/interceptor/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/interceptor/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/interceptor/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.interceptor"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/invoke/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,423 +1,427 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    private static string testString = "This is a test string";
-
-    private class Cookie
-    {
-        public string getString()
-        {
-            return testString;
-        }
-    }
-
-    private class CallbackBase
-    {
-        internal CallbackBase()
-        {
-            _called = false;
-        }
-
-        public virtual void check()
-        {
-            lock(this)
-            {
-                while(!_called)
-                {
-                    System.Threading.Monitor.Wait(this);
-                }
-
-                _called = false;
-            }
-        }
-
-        public virtual void called()
-        {
-            lock(this)
-            {
-                Debug.Assert(!_called);
-                _called = true;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
-
-        private bool _called;
-    }
-
-    private class Callback
-    {
-        public Callback(Ice.Communicator communicator, bool useCookie)
-        {
-            _communicator = communicator;
-            _useCookie = useCookie;
-        }
-
-        public void opString(Ice.AsyncResult result)
-        {
-            string cmp = testString;
-            if(_useCookie)
-            {
-                Cookie cookie = (Cookie)result.AsyncState;
-                cmp = cookie.getString();
-            }
-
-            byte[] outEncaps;
-            if(result.getProxy().end_ice_invoke(out outEncaps, result))
-            {
-                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
-                inS.startEncapsulation();
-                string s = inS.readString();
-                test(s.Equals(cmp));
-                s = inS.readString();
-                test(s.Equals(cmp));
-                inS.endEncapsulation();
-                callback.called();
-            }
-            else
-            {
-                test(false);
-            }
-        }
-
-        public void opStringNC(bool ok, byte[] outEncaps)
-        {
-            if(ok)
-            {
-                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
-                inS.startEncapsulation();
-                string s = inS.readString();
-                test(s.Equals(testString));
-                s = inS.readString();
-                test(s.Equals(testString));
-                inS.endEncapsulation();
-                callback.called();
-            }
-            else
-            {
-                test(false);
-            }
-        }
-
-        public void opException(Ice.AsyncResult result)
-        {
-            if(_useCookie)
-            {
-                Cookie cookie = (Cookie)result.AsyncState;
-                test(cookie.getString().Equals(testString));
-            }
-
-            byte[] outEncaps;
-            if(result.getProxy().end_ice_invoke(out outEncaps, result))
-            {
-                test(false);
-            }
-            else
-            {
-                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
-                inS.startEncapsulation();
-                try
-                {
-                    inS.throwException();
-                }
-                catch(Test.MyException)
-                {
-                    inS.endEncapsulation();
-                    callback.called();
-                }
-                catch(Exception)
-                {
-                    test(false);
-                }
-            }
-        }
-
-        public void opExceptionNC(bool ok, byte[] outEncaps)
-        {
-            if(ok)
-            {
-                test(false);
-            }
-            else
-            {
-                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
-                inS.startEncapsulation();
-                try
-                {
-                    inS.throwException();
-                }
-                catch(Test.MyException)
-                {
-                    inS.endEncapsulation();
-                    callback.called();
-                }
-                catch(Exception)
-                {
-                    test(false);
-                }
-            }
-        }
-
-        public virtual void check()
-        {
-            callback.check();
-        }
-
-        private Ice.Communicator _communicator;
-        private bool _useCookie;
-
-        private CallbackBase callback = new CallbackBase();
-    }
-
-    public static Test.MyClassPrx allTests(TestCommon.Application app)
+    namespace invoke
     {
-        Ice.Communicator communicator = app.communicator();
-        Ice.ObjectPrx baseProxy = communicator.stringToProxy("test:" + app.getTestEndpoint(0));
-        Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
-        Test.MyClassPrx oneway = Test.MyClassPrxHelper.uncheckedCast(cl.ice_oneway());
-        Test.MyClassPrx batchOneway = Test.MyClassPrxHelper.uncheckedCast(cl.ice_batchOneway());
-
-        Write("testing ice_invoke... ");
-        Flush();
-
-        {
-            byte[] inEncaps, outEncaps;
-            if(!oneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps))
-            {
-                test(false);
-            }
-
-            test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
-            test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
-            test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
-            test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
-            batchOneway.ice_flushBatchRequests();
-
-            Ice.OutputStream outS = new Ice.OutputStream(communicator);
-            outS.startEncapsulation();
-            outS.writeString(testString);
-            outS.endEncapsulation();
-            inEncaps = outS.finished();
-
-            if(cl.ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, out outEncaps))
-            {
-                Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
-                inS.startEncapsulation();
-                string s = inS.readString();
-                test(s.Equals(testString));
-                s = inS.readString();
-                inS.endEncapsulation();
-                test(s.Equals(testString));
-            }
-            else
-            {
-                test(false);
-            }
-        }
-
-        for(int i = 0; i < 2; ++i)
+        public class AllTests : global::Test.AllTests
         {
-            byte[] outEncaps;
-            Dictionary<string, string> ctx = null;
-            if(i == 1)
-            {
-                ctx = new Dictionary<string, string>();
-                ctx["raise"] = "";
-            }
-
-            if(cl.ice_invoke("opException", Ice.OperationMode.Normal, null, out outEncaps, ctx))
-            {
-                test(false);
-            }
-            else
-            {
-                Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
-                inS.startEncapsulation();
-                try
-                {
-                    inS.throwException();
-                }
-                catch(Test.MyException)
-                {
-                    inS.endEncapsulation();
-                }
-                catch(Exception)
-                {
-                    test(false);
-                }
-            }
-        }
-
-        WriteLine("ok");
-
-        Write("testing asynchronous ice_invoke with Async Task API... ");
-        Flush();
-
-        {
-            try
-            {
-                oneway.ice_invokeAsync("opOneway", Ice.OperationMode.Normal, null).Wait();
-            }
-            catch(Exception)
-            {
-                test(false);
-            }
+            private static string testString = "This is a test string";
 
-            Ice.OutputStream outS = new Ice.OutputStream(communicator);
-            outS.startEncapsulation();
-            outS.writeString(testString);
-            outS.endEncapsulation();
-            byte[] inEncaps = outS.finished();
-
-            // begin_ice_invoke with no callback
-            var result = cl.ice_invokeAsync("opString", Ice.OperationMode.Normal, inEncaps).Result;
-            if(result.returnValue)
+            private class Cookie
             {
-                Ice.InputStream inS = new Ice.InputStream(communicator, result.outEncaps);
-                inS.startEncapsulation();
-                string s = inS.readString();
-                test(s.Equals(testString));
-                s = inS.readString();
-                inS.endEncapsulation();
-                test(s.Equals(testString));
-            }
-            else
-            {
-                test(false);
-            }
-        }
-
-        {
-            var result = cl.ice_invokeAsync("opException", Ice.OperationMode.Normal, null).Result;
-            if(result.returnValue)
-            {
-                test(false);
-            }
-            else
-            {
-                Ice.InputStream inS = new Ice.InputStream(communicator, result.outEncaps);
-                inS.startEncapsulation();
-                try
-                {
-                    inS.throwException();
-                }
-                catch(Test.MyException)
-                {
-                    inS.endEncapsulation();
-                }
-                catch(Exception)
+                public string getString()
                 {
-                    test(false);
+                    return testString;
+                }
+            }
+
+            private class CallbackBase
+            {
+                internal CallbackBase()
+                {
+                    _called = false;
+                }
+
+                public virtual void check()
+                {
+                    lock(this)
+                    {
+                        while(!_called)
+                        {
+                            System.Threading.Monitor.Wait(this);
+                        }
+
+                        _called = false;
+                    }
+                }
+
+                public virtual void called()
+                {
+                    lock(this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        System.Threading.Monitor.Pulse(this);
+                    }
+                }
+
+                private bool _called;
+            }
+
+            private class Callback
+            {
+                public Callback(Ice.Communicator communicator, bool useCookie)
+                {
+                    _communicator = communicator;
+                    _useCookie = useCookie;
+                }
+
+                public void opString(Ice.AsyncResult result)
+                {
+                    string cmp = testString;
+                    if(_useCookie)
+                    {
+                        Cookie cookie =(Cookie)result.AsyncState;
+                        cmp = cookie.getString();
+                    }
+
+                    byte[] outEncaps;
+                    if(result.getProxy().end_ice_invoke(out outEncaps, result))
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
+                        inS.startEncapsulation();
+                        string s = inS.readString();
+                        test(s.Equals(cmp));
+                        s = inS.readString();
+                        test(s.Equals(cmp));
+                        inS.endEncapsulation();
+                        callback.called();
+                    }
+                    else
+                    {
+                        test(false);
+                    }
+                }
+
+                public void opStringNC(bool ok, byte[] outEncaps)
+                {
+                    if(ok)
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
+                        inS.startEncapsulation();
+                        string s = inS.readString();
+                        test(s.Equals(testString));
+                        s = inS.readString();
+                        test(s.Equals(testString));
+                        inS.endEncapsulation();
+                        callback.called();
+                    }
+                    else
+                    {
+                        test(false);
+                    }
+                }
+
+                public void opException(Ice.AsyncResult result)
+                {
+                    if(_useCookie)
+                    {
+                        Cookie cookie =(Cookie)result.AsyncState;
+                        test(cookie.getString().Equals(testString));
+                    }
+
+                    byte[] outEncaps;
+                    if(result.getProxy().end_ice_invoke(out outEncaps, result))
+                    {
+                        test(false);
+                    }
+                    else
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
+                        inS.startEncapsulation();
+                        try
+                        {
+                            inS.throwException();
+                        }
+                        catch(Test.MyException)
+                        {
+                            inS.endEncapsulation();
+                            callback.called();
+                        }
+                        catch(Exception)
+                        {
+                            test(false);
+                        }
+                    }
+                }
+
+                public void opExceptionNC(bool ok, byte[] outEncaps)
+                {
+                    if(ok)
+                    {
+                        test(false);
+                    }
+                    else
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
+                        inS.startEncapsulation();
+                        try
+                        {
+                            inS.throwException();
+                        }
+                        catch(Test.MyException)
+                        {
+                            inS.endEncapsulation();
+                            callback.called();
+                        }
+                        catch(Exception)
+                        {
+                            test(false);
+                        }
+                    }
+                }
+
+                public virtual void check()
+                {
+                    callback.check();
+                }
+
+                private Ice.Communicator _communicator;
+                private bool _useCookie;
+
+                private CallbackBase callback = new CallbackBase();
+            }
+
+            public static Test.MyClassPrx allTests(global::Test.TestHelper helper)
+            {
+                Ice.Communicator communicator = helper.communicator();
+                Ice.ObjectPrx baseProxy = communicator.stringToProxy("test:" + helper.getTestEndpoint(0));
+                var cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
+                var oneway = Test.MyClassPrxHelper.uncheckedCast(cl.ice_oneway());
+                var batchOneway = Test.MyClassPrxHelper.uncheckedCast(cl.ice_batchOneway());
+
+                var output = helper.getWriter();
+                output.Write("testing ice_invoke... ");
+                output.Flush();
+
+                {
+                    byte[] inEncaps, outEncaps;
+                    if(!oneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps))
+                    {
+                        test(false);
+                    }
+
+                    test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
+                    test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
+                    test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
+                    test(batchOneway.ice_invoke("opOneway", Ice.OperationMode.Normal, null, out outEncaps));
+                    batchOneway.ice_flushBatchRequests();
+
+                    Ice.OutputStream outS = new Ice.OutputStream(communicator);
+                    outS.startEncapsulation();
+                    outS.writeString(testString);
+                    outS.endEncapsulation();
+                    inEncaps = outS.finished();
+
+                    if(cl.ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, out outEncaps))
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
+                        inS.startEncapsulation();
+                        string s = inS.readString();
+                        test(s.Equals(testString));
+                        s = inS.readString();
+                        inS.endEncapsulation();
+                        test(s.Equals(testString));
+                    }
+                    else
+                    {
+                        test(false);
+                    }
+                }
+
+                for(int i = 0; i < 2; ++i)
+                {
+                    byte[] outEncaps;
+                    Dictionary<string, string> ctx = null;
+                    if(i == 1)
+                    {
+                        ctx = new Dictionary<string, string>();
+                        ctx["raise"] = "";
+                    }
+
+                    if(cl.ice_invoke("opException", Ice.OperationMode.Normal, null, out outEncaps, ctx))
+                    {
+                        test(false);
+                    }
+                    else
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
+                        inS.startEncapsulation();
+
+                        try
+                        {
+                            inS.throwException();
+                        }
+                        catch(Test.MyException)
+                        {
+                            inS.endEncapsulation();
+                        }
+                        catch(Exception)
+                        {
+                            test(false);
+                        }
+                    }
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("testing asynchronous ice_invoke with Async Task API... ");
+                output.Flush();
+
+                {
+                    try
+                    {
+                        oneway.ice_invokeAsync("opOneway", Ice.OperationMode.Normal, null).Wait();
+                    }
+                    catch(Exception)
+                    {
+                        test(false);
+                    }
+
+                    Ice.OutputStream outS = new Ice.OutputStream(communicator);
+                    outS.startEncapsulation();
+                    outS.writeString(testString);
+                    outS.endEncapsulation();
+                    byte[] inEncaps = outS.finished();
+
+                    // begin_ice_invoke with no callback
+                    var result = cl.ice_invokeAsync("opString", Ice.OperationMode.Normal, inEncaps).Result;
+                    if(result.returnValue)
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(communicator, result.outEncaps);
+                        inS.startEncapsulation();
+                        string s = inS.readString();
+                        test(s.Equals(testString));
+                        s = inS.readString();
+                        inS.endEncapsulation();
+                        test(s.Equals(testString));
+                    }
+                    else
+                    {
+                        test(false);
+                    }
+                }
+
+                {
+                    var result = cl.ice_invokeAsync("opException", Ice.OperationMode.Normal, null).Result;
+                    if(result.returnValue)
+                    {
+                        test(false);
+                    }
+                    else
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(communicator, result.outEncaps);
+                        inS.startEncapsulation();
+                        try
+                        {
+                            inS.throwException();
+                        }
+                        catch(Test.MyException)
+                        {
+                            inS.endEncapsulation();
+                        }
+                        catch(Exception)
+                        {
+                            test(false);
+                        }
+                    }
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("testing asynchronous ice_invoke with AsyncResult API... ");
+                output.Flush();
+
+                {
+                    byte[] inEncaps, outEncaps;
+                    Ice.AsyncResult result = oneway.begin_ice_invoke("opOneway", Ice.OperationMode.Normal, null);
+                    if(!oneway.end_ice_invoke(out outEncaps, result))
+                    {
+                        test(false);
+                    }
+
+                    Ice.OutputStream outS = new Ice.OutputStream(communicator);
+                    outS.startEncapsulation();
+                    outS.writeString(testString);
+                    outS.endEncapsulation();
+                    inEncaps = outS.finished();
+
+                    // begin_ice_invoke with no callback
+                    result = cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps);
+                    if(cl.end_ice_invoke(out outEncaps, result))
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
+                        inS.startEncapsulation();
+                        string s = inS.readString();
+                        test(s.Equals(testString));
+                        s = inS.readString();
+                        inS.endEncapsulation();
+                        test(s.Equals(testString));
+                    }
+                    else
+                    {
+                        test(false);
+                    }
+
+                    // begin_ice_invoke with Callback
+                    Callback cb = new Callback(communicator, false);
+                    cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, cb.opString, null);
+                    cb.check();
+
+                    // begin_ice_invoke with Callback with cookie
+                    cb = new Callback(communicator, true);
+                    cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, cb.opString, new Cookie());
+                    cb.check();
+
+                    // begin_ice_invoke with Callback_Object_ice_invoke
+                    cb = new Callback(communicator, true);
+                    cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps).whenCompleted(cb.opStringNC, null);
+                    cb.check();
+                }
+
+                {
+                    // begin_ice_invoke with no callback
+                    Ice.AsyncResult result = cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null);
+                    byte[] outEncaps;
+                    if(cl.end_ice_invoke(out outEncaps, result))
+                    {
+                        test(false);
+                    }
+                    else
+                    {
+                        Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
+                        inS.startEncapsulation();
+                        try
+                        {
+                            inS.throwException();
+                        }
+                        catch(Test.MyException)
+                        {
+                            inS.endEncapsulation();
+                        }
+                        catch(Exception)
+                        {
+                            test(false);
+                        }
+                    }
+
+                    // begin_ice_invoke with Callback
+                    Callback cb = new Callback(communicator, false);
+                    cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null, cb.opException, null);
+                    cb.check();
+
+                    // begin_ice_invoke with Callback with cookie
+                    cb = new Callback(communicator, true);
+                    cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null, cb.opException, new Cookie());
+                    cb.check();
+
+                    // begin_ice_invoke with Callback_Object_ice_invoke
+                    cb = new Callback(communicator, true);
+                    cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null).whenCompleted(cb.opExceptionNC, null);
+                    cb.check();
                 }
-            }
-        }
 
-        WriteLine("ok");
-
-        Write("testing asynchronous ice_invoke with AsyncResult API... ");
-        Flush();
-
-        {
-            byte[] inEncaps, outEncaps;
-            Ice.AsyncResult result = oneway.begin_ice_invoke("opOneway", Ice.OperationMode.Normal, null);
-            if(!oneway.end_ice_invoke(out outEncaps, result))
-            {
-                test(false);
+                output.WriteLine("ok");
+                return cl;
             }
-
-            Ice.OutputStream outS = new Ice.OutputStream(communicator);
-            outS.startEncapsulation();
-            outS.writeString(testString);
-            outS.endEncapsulation();
-            inEncaps = outS.finished();
-
-            // begin_ice_invoke with no callback
-            result = cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps);
-            if(cl.end_ice_invoke(out outEncaps, result))
-            {
-                Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
-                inS.startEncapsulation();
-                string s = inS.readString();
-                test(s.Equals(testString));
-                s = inS.readString();
-                inS.endEncapsulation();
-                test(s.Equals(testString));
-            }
-            else
-            {
-                test(false);
-            }
-
-            // begin_ice_invoke with Callback
-            Callback cb = new Callback(communicator, false);
-            cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, cb.opString, null);
-            cb.check();
-
-            // begin_ice_invoke with Callback with cookie
-            cb = new Callback(communicator, true);
-            cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, cb.opString, new Cookie());
-            cb.check();
-
-            // begin_ice_invoke with Callback_Object_ice_invoke
-            cb = new Callback(communicator, true);
-            cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps).whenCompleted(cb.opStringNC, null);
-            cb.check();
-        }
-
-        {
-            // begin_ice_invoke with no callback
-            Ice.AsyncResult result = cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null);
-            byte[] outEncaps;
-            if(cl.end_ice_invoke(out outEncaps, result))
-            {
-                test(false);
-            }
-            else
-            {
-                Ice.InputStream inS = new Ice.InputStream(communicator, outEncaps);
-                inS.startEncapsulation();
-                try
-                {
-                    inS.throwException();
-                }
-                catch(Test.MyException)
-                {
-                    inS.endEncapsulation();
-                }
-                catch(Exception)
-                {
-                    test(false);
-                }
-            }
-
-            // begin_ice_invoke with Callback
-            Callback cb = new Callback(communicator, false);
-            cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null, cb.opException, null);
-            cb.check();
-
-            // begin_ice_invoke with Callback with cookie
-            cb = new Callback(communicator, true);
-            cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null, cb.opException, new Cookie());
-            cb.check();
-
-            // begin_ice_invoke with Callback_Object_ice_invoke
-            cb = new Callback(communicator, true);
-            cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null).whenCompleted(cb.opExceptionNC, null);
-            cb.check();
         }
 
-        WriteLine("ok");
-        return cl;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/BlobjectI.cs zeroc-ice-3.7.2/csharp/test/Ice/invoke/BlobjectI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/BlobjectI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/BlobjectI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,137 +1,138 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Threading.Tasks;
 
-public class BlobjectI : Ice.Blobject
+namespace Ice
 {
-    public override bool
-    ice_invoke(byte[] inParams, out byte[] outParams, Ice.Current current)
+    namespace invoke
     {
-        Ice.Communicator communicator = current.adapter.getCommunicator();
-        Ice.InputStream inS = new Ice.InputStream(communicator, inParams);
-        inS.startEncapsulation();
-        Ice.OutputStream outS = new Ice.OutputStream(communicator);
-        outS.startEncapsulation();
-        if(current.operation.Equals("opOneway"))
-        {
-            outParams = new byte[0];
-            return true;
-        }
-        else if(current.operation.Equals("opString"))
-        {
-            string s = inS.readString();
-            outS.writeString(s);
-            outS.writeString(s);
-            outS.endEncapsulation();
-            outParams = outS.finished();
-            return true;
-        }
-        else if(current.operation.Equals("opException"))
-        {
-            if(current.ctx.ContainsKey("raise"))
-            {
-                throw new Test.MyException();
-            }
-            Test.MyException ex = new Test.MyException();
-            outS.writeException(ex);
-            outS.endEncapsulation();
-            outParams = outS.finished();
-            return false;
-        }
-        else if(current.operation.Equals("shutdown"))
-        {
-            communicator.shutdown();
-            outParams = null;
-            return true;
-        }
-        else if(current.operation.Equals("ice_isA"))
+        public class BlobjectI : Ice.Blobject
         {
-            string s = inS.readString();
-            if(s.Equals("::Test::MyClass"))
-            {
-                outS.writeBool(true);
-            }
-            else
+            public override bool
+            ice_invoke(byte[] inParams, out byte[] outParams, Ice.Current current)
             {
-                outS.writeBool(false);
+                Ice.Communicator communicator = current.adapter.getCommunicator();
+                Ice.InputStream inS = new Ice.InputStream(communicator, inParams);
+                inS.startEncapsulation();
+                Ice.OutputStream outS = new Ice.OutputStream(communicator);
+                outS.startEncapsulation();
+                if(current.operation.Equals("opOneway"))
+                {
+                    outParams = new byte[0];
+                    return true;
+                }
+                else if(current.operation.Equals("opString"))
+                {
+                    string s = inS.readString();
+                    outS.writeString(s);
+                    outS.writeString(s);
+                    outS.endEncapsulation();
+                    outParams = outS.finished();
+                    return true;
+                }
+                else if(current.operation.Equals("opException"))
+                {
+                    if(current.ctx.ContainsKey("raise"))
+                    {
+                        throw new Test.MyException();
+                    }
+                    var ex = new Test.MyException();
+                    outS.writeException(ex);
+                    outS.endEncapsulation();
+                    outParams = outS.finished();
+                    return false;
+                }
+                else if(current.operation.Equals("shutdown"))
+                {
+                    communicator.shutdown();
+                    outParams = null;
+                    return true;
+                }
+                else if(current.operation.Equals("ice_isA"))
+                {
+                    string s = inS.readString();
+                    if(s.Equals("::Test::MyClass"))
+                    {
+                        outS.writeBool(true);
+                    }
+                    else
+                    {
+                        outS.writeBool(false);
+                    }
+                    outS.endEncapsulation();
+                    outParams = outS.finished();
+                    return true;
+                }
+                else
+                {
+                    Ice.OperationNotExistException ex = new Ice.OperationNotExistException();
+                    ex.id = current.id;
+                    ex.facet = current.facet;
+                    ex.operation = current.operation;
+                    throw ex;
+                }
             }
-            outS.endEncapsulation();
-            outParams = outS.finished();
-            return true;
-        }
-        else
-        {
-            Ice.OperationNotExistException ex = new Ice.OperationNotExistException();
-            ex.id = current.id;
-            ex.facet = current.facet;
-            ex.operation = current.operation;
-            throw ex;
         }
-    }
-}
 
-public class BlobjectAsyncI : Ice.BlobjectAsync
-{
-    public override Task<Ice.Object_Ice_invokeResult>
-    ice_invokeAsync(byte[] inParams, Ice.Current current)
-    {
-        Ice.Communicator communicator = current.adapter.getCommunicator();
-        Ice.InputStream inS = new Ice.InputStream(communicator, inParams);
-        inS.startEncapsulation();
-        Ice.OutputStream outS = new Ice.OutputStream(communicator);
-        outS.startEncapsulation();
-        if(current.operation.Equals("opOneway"))
-        {
-            return Task.FromResult<Ice.Object_Ice_invokeResult>(new Ice.Object_Ice_invokeResult(true, new byte[0]));
-        }
-        else if(current.operation.Equals("opString"))
-        {
-            string s = inS.readString();
-            outS.writeString(s);
-            outS.writeString(s);
-            outS.endEncapsulation();
-            return Task.FromResult<Ice.Object_Ice_invokeResult>(new Ice.Object_Ice_invokeResult(true, outS.finished()));
-        }
-        else if(current.operation.Equals("opException"))
+        public class BlobjectAsyncI : Ice.BlobjectAsync
         {
-            Test.MyException ex = new Test.MyException();
-            outS.writeException(ex);
-            outS.endEncapsulation();
-            return Task.FromResult<Ice.Object_Ice_invokeResult>(new Ice.Object_Ice_invokeResult(false, outS.finished()));
-        }
-        else if(current.operation.Equals("shutdown"))
-        {
-            communicator.shutdown();
-            return Task.FromResult<Ice.Object_Ice_invokeResult>(new Ice.Object_Ice_invokeResult(true, null));
-        }
-        else if(current.operation.Equals("ice_isA"))
-        {
-            string s = inS.readString();
-            if(s.Equals("::Test::MyClass"))
+            public override Task<Ice.Object_Ice_invokeResult>
+            ice_invokeAsync(byte[] inParams, Ice.Current current)
             {
-                outS.writeBool(true);
+                Ice.Communicator communicator = current.adapter.getCommunicator();
+                Ice.InputStream inS = new Ice.InputStream(communicator, inParams);
+                inS.startEncapsulation();
+                Ice.OutputStream outS = new Ice.OutputStream(communicator);
+                outS.startEncapsulation();
+                if(current.operation.Equals("opOneway"))
+                {
+                    return Task.FromResult(new Ice.Object_Ice_invokeResult(true, new byte[0]));
+                }
+                else if(current.operation.Equals("opString"))
+                {
+                    string s = inS.readString();
+                    outS.writeString(s);
+                    outS.writeString(s);
+                    outS.endEncapsulation();
+                    return Task.FromResult(new Ice.Object_Ice_invokeResult(true, outS.finished()));
+                }
+                else if(current.operation.Equals("opException"))
+                {
+                    Test.MyException ex = new Test.MyException();
+                    outS.writeException(ex);
+                    outS.endEncapsulation();
+                    return Task.FromResult(new Ice.Object_Ice_invokeResult(false, outS.finished()));
+                }
+                else if(current.operation.Equals("shutdown"))
+                {
+                    communicator.shutdown();
+                    return Task.FromResult(new Ice.Object_Ice_invokeResult(true, null));
+                }
+                else if(current.operation.Equals("ice_isA"))
+                {
+                    string s = inS.readString();
+                    if(s.Equals("::Test::MyClass"))
+                    {
+                        outS.writeBool(true);
+                    }
+                    else
+                    {
+                        outS.writeBool(false);
+                    }
+                    outS.endEncapsulation();
+                    return Task.FromResult(new Ice.Object_Ice_invokeResult(true, outS.finished()));
+                }
+                else
+                {
+                    Ice.OperationNotExistException ex = new Ice.OperationNotExistException();
+                    ex.id = current.id;
+                    ex.facet = current.facet;
+                    ex.operation = current.operation;
+                    throw ex;
+                }
             }
-            else
-            {
-                outS.writeBool(false);
-            }
-            outS.endEncapsulation();
-            return Task.FromResult<Ice.Object_Ice_invokeResult>(new Ice.Object_Ice_invokeResult(true, outS.finished()));
-        }
-        else
-        {
-            Ice.OperationNotExistException ex = new Ice.OperationNotExistException();
-            ex.id = current.id;
-            ex.facet = current.facet;
-            ex.operation = current.operation;
-            throw ex;
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/invoke/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace invoke
     {
-        Test.MyClassPrx myClass = AllTests.allTests(this);
-        myClass.shutdown();
-        return 0;
-    }
+        public class Client : global::Test.TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var myClass = AllTests.allTests(this);
+                    myClass.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\BlobjectI.cs">
       <Link>BlobjectI.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../BlobjectI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../BlobjectI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.invoke</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../BlobjectI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/invoke/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,81 +1,68 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using System.Linq;
+using Test;
 
-public class ServantLocatorI : Ice.ServantLocator
+namespace Ice
 {
-    public ServantLocatorI(bool async)
+    namespace invoke
     {
-        if(async)
-        {
-            _blobject = new BlobjectAsyncI();
-        }
-        else
+        public class ServantLocatorI : Ice.ServantLocator
         {
-            _blobject = new BlobjectI();
-        }
-    }
+            public ServantLocatorI(bool async)
+            {
+                if(async)
+                {
+                    _blobject = new BlobjectAsyncI();
+                }
+                else
+                {
+                    _blobject = new BlobjectI();
+                }
+            }
 
-    public Ice.Object
-    locate(Ice.Current current, out System.Object cookie)
-    {
-        cookie = null;
-        return _blobject;
-    }
+            public Ice.Object
+            locate(Ice.Current current, out System.Object cookie)
+            {
+                cookie = null;
+                return _blobject;
+            }
 
-    public void
-    finished(Ice.Current current, Ice.Object servant, System.Object cookie)
-    {
-    }
+            public void
+            finished(Ice.Current current, Ice.Object servant, System.Object cookie)
+            {
+            }
 
-    public void
-    deactivate(string category)
-    {
-    }
+            public void
+            deactivate(string category)
+            {
+            }
 
-    private Ice.Object _blobject;
-}
+            private Ice.Object _blobject;
+        }
 
-public class Server : TestCommon.Application
-{
-    public override int run(string[] args)
-    {
-        bool async = false;
-        for(int i = 0; i < args.Length; ++i)
+        public class Server : TestHelper
         {
-            if(args[i].Equals("--async"))
+            public override void run(string[] args)
             {
-               async = true;
+                bool async = args.Any(v => v.Equals("--async"));
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.addServantLocator(new ServantLocatorI(async), "");
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
             }
-        }
 
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI(async), "");
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
-
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/invoke/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/invoke/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/invoke/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/invoke/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["java:package:test.Ice.invoke"]]
+["cs:namespace:Ice.invoke"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/location/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,618 +1,624 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using Test;
 using System.Collections.Generic;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static void allTests(TestCommon.Application app)
+    namespace location
     {
-        Ice.Communicator communicator = app.communicator();
-        ServerManagerPrx manager = ServerManagerPrxHelper.checkedCast(
-                                        communicator.stringToProxy("ServerManager :" + app.getTestEndpoint(0)));
-        test(manager != null);
-        TestLocatorPrx locator = TestLocatorPrxHelper.uncheckedCast(communicator.getDefaultLocator());
-        test(locator != null);
-        TestLocatorRegistryPrx registry = TestLocatorRegistryPrxHelper.checkedCast(locator.getRegistry());
-        test(registry != null);
-
-        Write("testing stringToProxy... ");
-        Flush();
-        Ice.ObjectPrx @base = communicator.stringToProxy("test @ TestAdapter");
-        Ice.ObjectPrx base2 = communicator.stringToProxy("test @ TestAdapter");
-        Ice.ObjectPrx base3 = communicator.stringToProxy("test");
-        Ice.ObjectPrx base4 = communicator.stringToProxy("ServerManager");
-        Ice.ObjectPrx base5 = communicator.stringToProxy("test2");
-        Ice.ObjectPrx base6 = communicator.stringToProxy("test @ ReplicatedAdapter");
-        WriteLine("ok");
-
-        Write("testing ice_locator and ice_getLocator... ");
-        test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), communicator.getDefaultLocator()) == 0);
-        Ice.LocatorPrx anotherLocator =
-            Ice.LocatorPrxHelper.uncheckedCast(communicator.stringToProxy("anotherLocator"));
-        @base = @base.ice_locator(anotherLocator);
-        test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), anotherLocator) == 0);
-        communicator.setDefaultLocator(null);
-        @base = communicator.stringToProxy("test @ TestAdapter");
-        test(@base.ice_getLocator() == null);
-        @base = @base.ice_locator(anotherLocator);
-        test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), anotherLocator) == 0);
-        communicator.setDefaultLocator(locator);
-        @base = communicator.stringToProxy("test @ TestAdapter");
-        test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), communicator.getDefaultLocator()) == 0);
-
-        //
-        // We also test ice_router/ice_getRouter (perhaps we should add a
-        // test/Ice/router test?)
-        //
-        test(@base.ice_getRouter() == null);
-        Ice.RouterPrx anotherRouter = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("anotherRouter"));
-        @base = @base.ice_router(anotherRouter);
-        test(Ice.Util.proxyIdentityCompare(@base.ice_getRouter(), anotherRouter) == 0);
-        Ice.RouterPrx router = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("dummyrouter"));
-        communicator.setDefaultRouter(router);
-        @base = communicator.stringToProxy("test @ TestAdapter");
-        test(Ice.Util.proxyIdentityCompare(@base.ice_getRouter(), communicator.getDefaultRouter()) == 0);
-        communicator.setDefaultRouter(null);
-        @base = communicator.stringToProxy("test @ TestAdapter");
-        test(@base.ice_getRouter() == null);
-        WriteLine("ok");
-
-        Write("starting server... ");
-        Flush();
-        manager.startServer();
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        TestIntfPrx obj = TestIntfPrxHelper.checkedCast(@base);
-        test(obj != null);
-        TestIntfPrx obj2 = TestIntfPrxHelper.checkedCast(base2);
-        test(obj2 != null);
-        TestIntfPrx obj3 = TestIntfPrxHelper.checkedCast(base3);
-        test(obj3 != null);
-        ServerManagerPrx obj4 = ServerManagerPrxHelper.checkedCast(base4);
-        test(obj4 != null);
-        TestIntfPrx obj5 = TestIntfPrxHelper.checkedCast(base5);
-        test(obj5 != null);
-        TestIntfPrx obj6 = TestIntfPrxHelper.checkedCast(base6);
-        test(obj6 != null);
-        WriteLine("ok");
-
-        Write("testing id@AdapterId indirect proxy... ");
-        Flush();
-        obj.shutdown();
-        manager.startServer();
-        try
-        {
-            obj2.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        WriteLine("ok");
-
-        Write("testing id@ReplicaGroupId indirect proxy... ");
-        Flush();
-        obj.shutdown();
-        manager.startServer();
-        try
-        {
-            obj6.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        WriteLine("ok");
-
-        Write("testing identity indirect proxy... ");
-        Flush();
-        obj.shutdown();
-        manager.startServer();
-        try
-        {
-            obj3.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        try
-        {
-            obj2.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        obj.shutdown();
-        manager.startServer();
-        try
-        {
-            obj2.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        try
-        {
-            obj3.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        obj.shutdown();
-        manager.startServer();
-        try
-        {
-            obj2.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        obj.shutdown();
-        manager.startServer();
-        try
-        {
-            obj3.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        obj.shutdown();
-        manager.startServer();
-        try
+        public class AllTests : global::Test.AllTests
         {
-            obj5 = TestIntfPrxHelper.checkedCast(base5);
-            obj5.ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        WriteLine("ok");
+            public static void allTests(global::Test.TestHelper helper)
+            {
+                Ice.Communicator communicator = helper.communicator();
+                var manager = Test.ServerManagerPrxHelper.checkedCast(
+                                                communicator.stringToProxy("ServerManager :" + helper.getTestEndpoint(0)));
+                test(manager != null);
+                var locator = Test.TestLocatorPrxHelper.uncheckedCast(communicator.getDefaultLocator());
+                test(locator != null);
+                var registry = Test.TestLocatorRegistryPrxHelper.checkedCast(locator.getRegistry());
+                test(registry != null);
+
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                Ice.ObjectPrx @base = communicator.stringToProxy("test @ TestAdapter");
+                Ice.ObjectPrx base2 = communicator.stringToProxy("test @ TestAdapter");
+                Ice.ObjectPrx base3 = communicator.stringToProxy("test");
+                Ice.ObjectPrx base4 = communicator.stringToProxy("ServerManager");
+                Ice.ObjectPrx base5 = communicator.stringToProxy("test2");
+                Ice.ObjectPrx base6 = communicator.stringToProxy("test @ ReplicatedAdapter");
+                output.WriteLine("ok");
+
+                output.Write("testing ice_locator and ice_getLocator... ");
+                test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), communicator.getDefaultLocator()) == 0);
+                Ice.LocatorPrx anotherLocator =
+                    Ice.LocatorPrxHelper.uncheckedCast(communicator.stringToProxy("anotherLocator"));
+                @base = @base.ice_locator(anotherLocator);
+                test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), anotherLocator) == 0);
+                communicator.setDefaultLocator(null);
+                @base = communicator.stringToProxy("test @ TestAdapter");
+                test(@base.ice_getLocator() == null);
+                @base = @base.ice_locator(anotherLocator);
+                test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), anotherLocator) == 0);
+                communicator.setDefaultLocator(locator);
+                @base = communicator.stringToProxy("test @ TestAdapter");
+                test(Ice.Util.proxyIdentityCompare(@base.ice_getLocator(), communicator.getDefaultLocator()) == 0);
+
+                //
+                // We also test ice_router/ice_getRouter(perhaps we should add a
+                // test/Ice/router test?)
+                //
+                test(@base.ice_getRouter() == null);
+                Ice.RouterPrx anotherRouter =
+                    Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("anotherRouter"));
+                @base = @base.ice_router(anotherRouter);
+                test(Ice.Util.proxyIdentityCompare(@base.ice_getRouter(), anotherRouter) == 0);
+                Ice.RouterPrx router = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("dummyrouter"));
+                communicator.setDefaultRouter(router);
+                @base = communicator.stringToProxy("test @ TestAdapter");
+                test(Ice.Util.proxyIdentityCompare(@base.ice_getRouter(), communicator.getDefaultRouter()) == 0);
+                communicator.setDefaultRouter(null);
+                @base = communicator.stringToProxy("test @ TestAdapter");
+                test(@base.ice_getRouter() == null);
+                output.WriteLine("ok");
+
+                output.Write("starting server... ");
+                output.Flush();
+                manager.startServer();
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                var obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                test(obj != null);
+                var obj2 = Test.TestIntfPrxHelper.checkedCast(base2);
+                test(obj2 != null);
+                var obj3 = Test.TestIntfPrxHelper.checkedCast(base3);
+                test(obj3 != null);
+                var obj4 = Test.ServerManagerPrxHelper.checkedCast(base4);
+                test(obj4 != null);
+                var obj5 = Test.TestIntfPrxHelper.checkedCast(base5);
+                test(obj5 != null);
+                var obj6 = Test.TestIntfPrxHelper.checkedCast(base6);
+                test(obj6 != null);
+                output.WriteLine("ok");
+
+                output.Write("testing id@AdapterId indirect proxy... ");
+                output.Flush();
+                obj.shutdown();
+                manager.startServer();
+                try
+                {
+                    obj2.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                output.WriteLine("ok");
 
-        Write("testing proxy with unknown identity... ");
-        Flush();
-        try
-        {
-            @base = communicator.stringToProxy("unknown/unknown");
-            @base.ice_ping();
-            test(false);
-        }
-        catch(Ice.NotRegisteredException ex)
-        {
-            test(ex.kindOfObject.Equals("object"));
-            test(ex.id.Equals("unknown/unknown"));
-        }
-        WriteLine("ok");
+                output.Write("testing id@ReplicaGroupId indirect proxy... ");
+                output.Flush();
+                obj.shutdown();
+                manager.startServer();
+                try
+                {
+                    obj6.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                output.WriteLine("ok");
 
-        Write("testing proxy with unknown adapter... ");
-        Flush();
-        try
-        {
-            @base = communicator.stringToProxy("test @ TestAdapterUnknown");
-            @base.ice_ping();
-            test(false);
-        }
-        catch(Ice.NotRegisteredException ex)
-        {
-            test(ex.kindOfObject.Equals("object adapter"));
-            test(ex.id.Equals("TestAdapterUnknown"));
-        }
-        WriteLine("ok");
+                output.Write("testing identity indirect proxy... ");
+                output.Flush();
+                obj.shutdown();
+                manager.startServer();
+                try
+                {
+                    obj3.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                try
+                {
+                    obj2.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                obj.shutdown();
+                manager.startServer();
+                try
+                {
+                    obj2.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                try
+                {
+                    obj3.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                obj.shutdown();
+                manager.startServer();
+                try
+                {
+                    obj2.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                obj.shutdown();
+                manager.startServer();
+                try
+                {
+                    obj3.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                obj.shutdown();
+                manager.startServer();
+                try
+                {
+                    obj5 = Test.TestIntfPrxHelper.checkedCast(base5);
+                    obj5.ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                output.WriteLine("ok");
 
-        Write("testing locator cache timeout... ");
-        Flush();
+                output.Write("testing proxy with unknown identity... ");
+                output.Flush();
+                try
+                {
+                    @base = communicator.stringToProxy("unknown/unknown");
+                    @base.ice_ping();
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException ex)
+                {
+                    test(ex.kindOfObject.Equals("object"));
+                    test(ex.id.Equals("unknown/unknown"));
+                }
+                output.WriteLine("ok");
 
-        int count = locator.getRequestCount();
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-        test(++count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-        test(++count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-        test(count == locator.getRequestCount());
-        System.Threading.Thread.Sleep(1200); // 1200ms
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-        test(++count == locator.getRequestCount());
-
-        communicator.stringToProxy("test").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-        count += 2;
-        test(count == locator.getRequestCount());
-        communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
-        test(count == locator.getRequestCount());
-        System.Threading.Thread.Sleep(1200); // 1200ms
-        communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
-        count += 2;
-        test(count == locator.getRequestCount());
-
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(-1).ice_ping();
-        test(count == locator.getRequestCount());
-        communicator.stringToProxy("test").ice_locatorCacheTimeout(-1).ice_ping();
-        test(count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter").ice_ping();
-        test(count == locator.getRequestCount());
-        communicator.stringToProxy("test").ice_ping();
-        test(count == locator.getRequestCount());
-
-        test(communicator.stringToProxy("test").ice_locatorCacheTimeout(99).ice_getLocatorCacheTimeout() == 99);
-
-        WriteLine("ok");
-
-        Write("testing proxy from server... ");
-        Flush();
-        obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("test@TestAdapter"));
-        HelloPrx hello = obj.getHello();
-        test(hello.ice_getAdapterId().Equals("TestAdapter"));
-        hello.sayHello();
-        hello = obj.getReplicatedHello();
-        test(hello.ice_getAdapterId().Equals("ReplicatedAdapter"));
-        hello.sayHello();
-        WriteLine("ok");
-
-        Write("testing locator request queuing... ");
-        Flush();
-        hello = (HelloPrx)obj.getReplicatedHello().ice_locatorCacheTimeout(0).ice_connectionCached(false);
-        count = locator.getRequestCount();
-        hello.ice_ping();
-        test(++count == locator.getRequestCount());
-        List<Ice.AsyncResult<Test.Callback_Hello_sayHello> > results =
-            new List<Ice.AsyncResult<Test.Callback_Hello_sayHello> >();
-        for(int i = 0; i < 1000; i++)
-        {
-            Ice.AsyncResult<Test.Callback_Hello_sayHello> result = hello.begin_sayHello().
-                whenCompleted(
-                    () =>
-                    {
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                      test(false);
-                    });
-            results.Add(result);
-        }
-        foreach(Ice.AsyncResult<Test.Callback_Hello_sayHello> result in results)
-        {
-            result.waitForCompleted();
-        }
-        results.Clear();
-        test(locator.getRequestCount() > count && locator.getRequestCount() < count + 999);
-        if(locator.getRequestCount() > count + 800)
-        {
-            Write("queuing = " + (locator.getRequestCount() - count));
-        }
-        count = locator.getRequestCount();
-        hello = (HelloPrx)hello.ice_adapterId("unknown");
-        for(int i = 0; i < 1000; i++)
-        {
-            Ice.AsyncResult<Test.Callback_Hello_sayHello> result = hello.begin_sayHello().
-                whenCompleted(
-                    () =>
-                    {
-                        test(false);
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                        test(ex is Ice.NotRegisteredException);
-                    });
-            results.Add(result);
-        }
-        foreach(Ice.AsyncResult<Test.Callback_Hello_sayHello> result in results)
-        {
-            result.waitForCompleted();
-        }
-        results.Clear();
-        // XXX:
-        // Take into account the retries.
-        test(locator.getRequestCount() > count && locator.getRequestCount() < count + 1999);
-        if(locator.getRequestCount() > count + 800)
-        {
-            Write("queuing = " + (locator.getRequestCount() - count));
-        }
-        WriteLine("ok");
+                output.Write("testing proxy with unknown adapter... ");
+                output.Flush();
+                try
+                {
+                    @base = communicator.stringToProxy("test @ TestAdapterUnknown");
+                    @base.ice_ping();
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException ex)
+                {
+                    test(ex.kindOfObject.Equals("object adapter"));
+                    test(ex.id.Equals("TestAdapterUnknown"));
+                }
+                output.WriteLine("ok");
 
-        Write("testing adapter locator cache... ");
-        Flush();
-        try
-        {
-            communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            test(false);
-        }
-        catch(Ice.NotRegisteredException ex)
-        {
-            test(ex.kindOfObject == "object adapter");
-            test(ex.id.Equals("TestAdapter3"));
-        }
-        registry.setAdapterDirectProxy("TestAdapter3", locator.findAdapterById("TestAdapter"));
-        try
-        {
-            communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            registry.setAdapterDirectProxy("TestAdapter3", communicator.stringToProxy("dummy:tcp"));
-            communicator.stringToProxy("test@TestAdapter3").ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
+                output.Write("testing locator cache timeout... ");
+                output.Flush();
 
-        try
-        {
-            communicator.stringToProxy("test@TestAdapter3").ice_locatorCacheTimeout(0).ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        try
-        {
-            communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        registry.setAdapterDirectProxy("TestAdapter3", locator.findAdapterById("TestAdapter"));
-        try
-        {
-            communicator.stringToProxy("test@TestAdapter3").ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
-        WriteLine("ok");
+                Ice.ObjectPrx basencc = communicator.stringToProxy("test@TestAdapter").ice_connectionCached(false);
+                int count = locator.getRequestCount();
+                basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                test(++count == locator.getRequestCount());
+                basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                test(++count == locator.getRequestCount());
+                basencc.ice_locatorCacheTimeout(2).ice_ping(); // 2s timeout.
+                test(count == locator.getRequestCount());
+                System.Threading.Thread.Sleep(1300); // 1300ms
+                basencc.ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                test(++count == locator.getRequestCount());
+
+                communicator.stringToProxy("test").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                count += 2;
+                test(count == locator.getRequestCount());
+                communicator.stringToProxy("test").ice_locatorCacheTimeout(2).ice_ping(); // 2s timeout
+                test(count == locator.getRequestCount());
+                System.Threading.Thread.Sleep(1300); // 1300ms
+                communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
+                count += 2;
+                test(count == locator.getRequestCount());
+
+                communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(-1).ice_ping();
+                test(count == locator.getRequestCount());
+                communicator.stringToProxy("test").ice_locatorCacheTimeout(-1).ice_ping();
+                test(count == locator.getRequestCount());
+                communicator.stringToProxy("test@TestAdapter").ice_ping();
+                test(count == locator.getRequestCount());
+                communicator.stringToProxy("test").ice_ping();
+                test(count == locator.getRequestCount());
+
+                test(communicator.stringToProxy("test").ice_locatorCacheTimeout(99).ice_getLocatorCacheTimeout() == 99);
+
+                output.WriteLine("ok");
+
+                output.Write("testing proxy from server... ");
+                output.Flush();
+                obj = Test.TestIntfPrxHelper.checkedCast(communicator.stringToProxy("test@TestAdapter"));
+                var hello = obj.getHello();
+                test(hello.ice_getAdapterId().Equals("TestAdapter"));
+                hello.sayHello();
+                hello = obj.getReplicatedHello();
+                test(hello.ice_getAdapterId().Equals("ReplicatedAdapter"));
+                hello.sayHello();
+                output.WriteLine("ok");
+
+                output.Write("testing locator request queuing... ");
+                output.Flush();
+                hello =(Test.HelloPrx)obj.getReplicatedHello().ice_locatorCacheTimeout(0).ice_connectionCached(false);
+                count = locator.getRequestCount();
+                hello.ice_ping();
+                test(++count == locator.getRequestCount());
+                List<Ice.AsyncResult<Test.Callback_Hello_sayHello>> results =
+                    new List<Ice.AsyncResult<Test.Callback_Hello_sayHello>>();
+                for(int i = 0; i < 1000; i++)
+                {
+                    Ice.AsyncResult<Test.Callback_Hello_sayHello> result = hello.begin_sayHello().
+                        whenCompleted(
+                           () =>
+                            {
+                            },
+                           (Ice.Exception ex) =>
+                            {
+                                test(false);
+                            });
+                    results.Add(result);
+                }
+                foreach(Ice.AsyncResult<Test.Callback_Hello_sayHello> result in results)
+                {
+                    result.waitForCompleted();
+                }
+                results.Clear();
+                test(locator.getRequestCount() > count && locator.getRequestCount() < count + 999);
+                if(locator.getRequestCount() > count + 800)
+                {
+                    output.Write("queuing = " +(locator.getRequestCount() - count));
+                }
+                count = locator.getRequestCount();
+                hello =(Test.HelloPrx)hello.ice_adapterId("unknown");
+                for(int i = 0; i < 1000; i++)
+                {
+                    Ice.AsyncResult<Test.Callback_Hello_sayHello> result = hello.begin_sayHello().
+                        whenCompleted(
+                           () =>
+                            {
+                                test(false);
+                            },
+                           (Ice.Exception ex) =>
+                            {
+                                test(ex is Ice.NotRegisteredException);
+                            });
+                    results.Add(result);
+                }
+                foreach(Ice.AsyncResult<Test.Callback_Hello_sayHello> result in results)
+                {
+                    result.waitForCompleted();
+                }
+                results.Clear();
+                // XXX:
+                // Take into account the retries.
+                test(locator.getRequestCount() > count && locator.getRequestCount() < count + 1999);
+                if(locator.getRequestCount() > count + 800)
+                {
+                    output.Write("queuing = " +(locator.getRequestCount() - count));
+                }
+                output.WriteLine("ok");
 
-        Write("testing well-known object locator cache... ");
-        Flush();
-        registry.addObject(communicator.stringToProxy("test3@TestUnknown"));
-        try
-        {
-            communicator.stringToProxy("test3").ice_ping();
-            test(false);
-        }
-        catch(Ice.NotRegisteredException ex)
-        {
-            test(ex.kindOfObject == "object adapter");
-            test(ex.id.Equals("TestUnknown"));
-        }
-        registry.addObject(communicator.stringToProxy("test3@TestAdapter4")); // Update
-        registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:tcp"));
-        try
-        {
-            communicator.stringToProxy("test3").ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        registry.setAdapterDirectProxy("TestAdapter4", locator.findAdapterById("TestAdapter"));
-        try
-        {
-            communicator.stringToProxy("test3").ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
+                output.Write("testing adapter locator cache... ");
+                output.Flush();
+                try
+                {
+                    communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException ex)
+                {
+                    test(ex.kindOfObject == "object adapter");
+                    test(ex.id.Equals("TestAdapter3"));
+                }
+                registry.setAdapterDirectProxy("TestAdapter3", locator.findAdapterById("TestAdapter"));
+                try
+                {
+                    communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                    registry.setAdapterDirectProxy("TestAdapter3",
+                                                   communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
+                    communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
 
-        registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:tcp"));
-        try
-        {
-            communicator.stringToProxy("test3").ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
+                try
+                {
+                    communicator.stringToProxy("test@TestAdapter3").ice_locatorCacheTimeout(0).ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                try
+                {
+                    communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                registry.setAdapterDirectProxy("TestAdapter3", locator.findAdapterById("TestAdapter"));
+                try
+                {
+                    communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
+                output.WriteLine("ok");
 
-        try
-        {
-            communicator.stringToProxy("test@TestAdapter4").ice_locatorCacheTimeout(0).ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        try
-        {
-            communicator.stringToProxy("test@TestAdapter4").ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        try
-        {
-            communicator.stringToProxy("test3").ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
-        try
-        {
-            communicator.stringToProxy("test3").ice_ping();
-        }
-        catch(Ice.LocalException)
-        {
-            test(false);
-        }
+                output.Write("testing well-known object locator cache... ");
+                output.Flush();
+                registry.addObject(communicator.stringToProxy("test3@TestUnknown"));
+                try
+                {
+                    communicator.stringToProxy("test3").ice_ping();
+                    test(false);
+                }
+                catch(Ice.NotRegisteredException ex)
+                {
+                    test(ex.kindOfObject == "object adapter");
+                    test(ex.id.Equals("TestUnknown"));
+                }
+                registry.addObject(communicator.stringToProxy("test3@TestAdapter4")); // Update
+                registry.setAdapterDirectProxy("TestAdapter4",
+                                               communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
+                try
+                {
+                    communicator.stringToProxy("test3").ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                registry.setAdapterDirectProxy("TestAdapter4", locator.findAdapterById("TestAdapter"));
+                try
+                {
+                    communicator.stringToProxy("test3").ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
 
-        registry.addObject(communicator.stringToProxy("test4"));
-        try
-        {
-            communicator.stringToProxy("test4").ice_ping();
-            test(false);
-        }
-        catch(Ice.NoEndpointException)
-        {
-        }
-        WriteLine("ok");
+                registry.setAdapterDirectProxy("TestAdapter4",
+                                               communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
+                try
+                {
+                    communicator.stringToProxy("test3").ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
 
-        Write("testing locator cache background updates... ");
-        Flush();
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().ice_clone_();
-            initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
-            Ice.Communicator ic = Ice.Util.initialize(initData);
-
-            registry.setAdapterDirectProxy("TestAdapter5", locator.findAdapterById("TestAdapter"));
-            registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
-
-            count = locator.getRequestCount();
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            count += 3;
-            test(count == locator.getRequestCount());
-            registry.setAdapterDirectProxy("TestAdapter5", null);
-            registry.addObject(communicator.stringToProxy("test3:tcp"));
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            test(count == locator.getRequestCount());
-            System.Threading.Thread.Sleep(1200);
-
-            // The following request should trigger the background
-            // updates but still use the cached endpoints and
-            // therefore succeed.
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                try
+                {
+                    communicator.stringToProxy("test@TestAdapter4").ice_locatorCacheTimeout(0).ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                try
+                {
+                    communicator.stringToProxy("test@TestAdapter4").ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                try
+                {
+                    communicator.stringToProxy("test3").ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+                try
+                {
+                    communicator.stringToProxy("test3").ice_ping();
+                }
+                catch(Ice.LocalException)
+                {
+                    test(false);
+                }
 
-            try
-            {
-                while(true)
+                registry.addObject(communicator.stringToProxy("test4"));
+                try
                 {
-                    ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    System.Threading.Thread.Sleep(10);
+                    communicator.stringToProxy("test4").ice_ping();
+                    test(false);
                 }
-            }
-            catch(Ice.LocalException)
-            {
-                // Expected to fail once they endpoints have been updated in the background.
-            }
-            try
-            {
-                while(true)
+                catch(Ice.NoEndpointException)
+                {
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing locator cache background updates... ");
+                output.Flush();
                 {
+                    Ice.InitializationData initData = new Ice.InitializationData();
+                    initData.properties = communicator.getProperties().ice_clone_();
+                    initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
+                    Ice.Communicator ic = helper.initialize(initData);
+
+                    registry.setAdapterDirectProxy("TestAdapter5", locator.findAdapterById("TestAdapter"));
+                    registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+
+                    count = locator.getRequestCount();
+                    ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                    ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                    count += 3;
+                    test(count == locator.getRequestCount());
+                    registry.setAdapterDirectProxy("TestAdapter5", null);
+                    registry.addObject(communicator.stringToProxy("test3:" + helper.getTestEndpoint(99)));
+                    ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                    ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                    test(count == locator.getRequestCount());
+                    System.Threading.Thread.Sleep(1200);
+
+                    // The following request should trigger the background
+                    // updates but still use the cached endpoints and
+                    // therefore succeed.
+                    ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
                     ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    System.Threading.Thread.Sleep(10);
+
+                    try
+                    {
+                        while(true)
+                        {
+                            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                            System.Threading.Thread.Sleep(10);
+                        }
+                    }
+                    catch(Ice.LocalException)
+                    {
+                        // Expected to fail once they endpoints have been updated in the background.
+                    }
+                    try
+                    {
+                        while(true)
+                        {
+                            ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                            System.Threading.Thread.Sleep(10);
+                        }
+                    }
+                    catch(Ice.LocalException)
+                    {
+                        // Expected to fail once they endpoints have been updated in the background.
+                    }
+                    ic.destroy();
                 }
-            }
-            catch(Ice.LocalException)
-            {
-                // Expected to fail once they endpoints have been updated in the background.
-            }
-            ic.destroy();
-        }
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("testing proxy from server after shutdown... ");
-        Flush();
-        hello = obj.getReplicatedHello();
-        obj.shutdown();
-        manager.startServer();
-        hello.sayHello();
-        WriteLine("ok");
-
-        Write("testing object migration... ");
-        Flush();
-        hello = HelloPrxHelper.checkedCast(communicator.stringToProxy("hello"));
-        obj.migrateHello();
-        hello.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-        hello.sayHello();
-        obj.migrateHello();
-        hello.sayHello();
-        obj.migrateHello();
-        hello.sayHello();
-        WriteLine("ok");
-
-        Write("testing locator encoding resolution... ");
-        Flush();
-        hello = HelloPrxHelper.checkedCast(communicator.stringToProxy("hello"));
-        count = locator.getRequestCount();
-        communicator.stringToProxy("test@TestAdapter").ice_encodingVersion(Ice.Util.Encoding_1_1).ice_ping();
-        test(count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter10").ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
-        test(++count == locator.getRequestCount());
-        communicator.stringToProxy("test -e 1.0@TestAdapter10-2").ice_ping();
-        test(++count == locator.getRequestCount());
-        WriteLine("ok");
-
-        Write("shutdown server... ");
-        Flush();
-        obj.shutdown();
-        WriteLine("ok");
-
-        Write("testing whether server is gone... ");
-        Flush();
-        try
-        {
-            obj2.ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        try
-        {
-            obj3.ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        try
-        {
-            obj5.ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        WriteLine("ok");
+                output.Write("testing proxy from server after shutdown... ");
+                output.Flush();
+                hello = obj.getReplicatedHello();
+                obj.shutdown();
+                manager.startServer();
+                hello.sayHello();
+                output.WriteLine("ok");
+
+                output.Write("testing object migration... ");
+                output.Flush();
+                hello = Test.HelloPrxHelper.checkedCast(communicator.stringToProxy("hello"));
+                obj.migrateHello();
+                hello.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                hello.sayHello();
+                obj.migrateHello();
+                hello.sayHello();
+                obj.migrateHello();
+                hello.sayHello();
+                output.WriteLine("ok");
+
+                output.Write("testing locator encoding resolution... ");
+                output.Flush();
+                hello = Test.HelloPrxHelper.checkedCast(communicator.stringToProxy("hello"));
+                count = locator.getRequestCount();
+                communicator.stringToProxy("test@TestAdapter").ice_encodingVersion(Ice.Util.Encoding_1_1).ice_ping();
+                test(count == locator.getRequestCount());
+                communicator.stringToProxy("test@TestAdapter10").ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
+                test(++count == locator.getRequestCount());
+                communicator.stringToProxy("test -e 1.0@TestAdapter10-2").ice_ping();
+                test(++count == locator.getRequestCount());
+                output.WriteLine("ok");
+
+                output.Write("shutdown server... ");
+                output.Flush();
+                obj.shutdown();
+                output.WriteLine("ok");
+
+                output.Write("testing whether server is gone... ");
+                output.Flush();
+                try
+                {
+                    obj2.ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                try
+                {
+                    obj3.ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                try
+                {
+                    obj5.ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                output.WriteLine("ok");
 
-        Write("testing indirect proxies to collocated objects... ");
-        Flush();
+                output.Write("testing indirect proxies to collocated objects... ");
+                output.Flush();
 
-        //
-        // Set up test for calling a collocated object through an
-        // indirect, adapterless reference.
-        //
-        Ice.Properties properties = communicator.getProperties();
-        properties.setProperty("Ice.PrintAdapterReady", "0");
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Hello", "tcp -h *");
-        adapter.setLocator(locator);
-
-        Ice.Identity id = new Ice.Identity();
-        id.name = Guid.NewGuid().ToString();
-        registry.addObject(adapter.add(new HelloI(), id));
-        adapter.activate();
-
-        HelloPrx helloPrx = HelloPrxHelper.checkedCast(
-            communicator.stringToProxy("\"" + communicator.identityToString(id) + "\""));
-        test(helloPrx.ice_getConnection() == null);
-
-        adapter.deactivate();
-        WriteLine("ok");
-
-        Write("shutdown server manager... ");
-        Flush();
-        manager.shutdown();
-        WriteLine("ok");
+                //
+                // Set up test for calling a collocated object through an
+                // indirect, adapterless reference.
+                //
+                Ice.Properties properties = communicator.getProperties();
+                properties.setProperty("Ice.PrintAdapterReady", "0");
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Hello", "tcp -h *");
+                adapter.setLocator(locator);
+
+                Ice.Identity id = new Ice.Identity();
+                id.name = Guid.NewGuid().ToString();
+                registry.addObject(adapter.add(new HelloI(), id));
+                adapter.activate();
+
+                var helloPrx = Test.HelloPrxHelper.checkedCast(
+                    communicator.stringToProxy("\"" + communicator.identityToString(id) + "\""));
+                test(helloPrx.ice_getConnection() == null);
+
+                adapter.deactivate();
+                output.WriteLine("ok");
+
+                output.Write("shutdown server manager... ");
+                output.Flush();
+                manager.shutdown();
+                output.WriteLine("ok");
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/location/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace location
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                Ice.Properties properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(properties, 0));
+                using(var communicator = initialize(properties))
+                {
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/HelloI.cs zeroc-ice-3.7.2/csharp/test/Ice/location/HelloI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/HelloI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/HelloI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class HelloI : HelloDisp_
+namespace Ice
 {
-    public override void sayHello(Ice.Current current)
+    namespace location
     {
+        public class HelloI : Test.HelloDisp_
+        {
+            public override void sayHello(Ice.Current current)
+            {
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -51,24 +51,24 @@
     <Compile Include="..\..\..\HelloI.cs">
       <Link>HelloI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../HelloI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../HelloI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\HelloI.cs">
       <Link>HelloI.cs</Link>
@@ -60,24 +60,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../HelloI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <Compile Include="../../../ServerLocator.cs"/>
-    <Compile Include="../../../ServerLocatorRegistry.cs"/>
-    <Compile Include="../../../ServerManagerI.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../HelloI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../ServerLocator.cs" />
+    <Compile Include="../../../ServerLocatorRegistry.cs" />
+    <Compile Include="../../../ServerManagerI.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.location</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../HelloI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../ServerLocator.cs" />
+    <Compile Include="../../../ServerLocatorRegistry.cs" />
+    <Compile Include="../../../ServerManagerI.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/location/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,68 +1,55 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace location
     {
-        //
-        // Register the server manager. The server manager creates a new
-        // 'server' (a server isn't a different process, it's just a new
-        // communicator and object adapter).
-        //
-        Ice.Properties properties = communicator().getProperties();
-        properties.setProperty("Ice.ThreadPool.Server.Size", "2");
-        properties.setProperty("ServerManagerAdapter.Endpoints", getTestEndpoint(0));
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ServerManagerAdapter");
-
-        //
-        // We also register a sample server locator which implements the
-        // locator interface, this locator is used by the clients and the
-        // 'servers' created with the server manager interface.
-        //
-        ServerLocatorRegistry registry = new ServerLocatorRegistry();
-        Ice.Object @object = new ServerManagerI(registry, _initData, this);
-        adapter.add(@object, Ice.Util.stringToIdentity("ServerManager"));
-        registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager")));
-        Ice.LocatorRegistryPrx registryPrx = Ice.LocatorRegistryPrxHelper.uncheckedCast(
-                                                adapter.add(registry, Ice.Util.stringToIdentity("registry")));
-
-        ServerLocator locator = new ServerLocator(registry, registryPrx);
-        adapter.add(locator, Ice.Util.stringToIdentity("locator"));
-
-        adapter.activate();
-        communicator().waitForShutdown();
-
-        return 0;
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                //
+                // Register the server manager. The server manager creates a new
+                // 'server'(a server isn't a different process, it's just a new
+                // communicator and object adapter).
+                //
+                Ice.Properties properties = createTestProperties(ref args);
+                properties.setProperty("Ice.ThreadPool.Server.Size", "2");
+
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("ServerManagerAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter");
+
+                    //
+                    // We also register a sample server locator which implements the
+                    // locator interface, this locator is used by the clients and the
+                    // 'servers' created with the server manager interface.
+                    //
+                    ServerLocatorRegistry registry = new ServerLocatorRegistry();
+                    Ice.Object @object = new ServerManagerI(registry, this);
+                    adapter.add(@object, Ice.Util.stringToIdentity("ServerManager"));
+                    registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager")));
+                    Ice.LocatorRegistryPrx registryPrx =
+                        Ice.LocatorRegistryPrxHelper.uncheckedCast(adapter.add(registry, Ice.Util.stringToIdentity("registry")));
+
+                    ServerLocator locator = new ServerLocator(registry, registryPrx);
+                    adapter.add(locator, Ice.Util.stringToIdentity("locator"));
+
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        _initData = base.getInitData(ref args);
-        return _initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
-    }
-
-    private Ice.InitializationData _initData;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/ServerLocator.cs zeroc-ice-3.7.2/csharp/test/Ice/location/ServerLocator.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/ServerLocator.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/ServerLocator.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,64 +1,64 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 
-public class ServerLocator : Test.TestLocatorDisp_
+namespace Ice
 {
-    public ServerLocator(ServerLocatorRegistry registry, Ice.LocatorRegistryPrx registryPrx)
-    {
-        _registry = registry;
-        _registryPrx = registryPrx;
-        _requestCount = 0;
-    }
-
-    public override Task<Ice.ObjectPrx>
-    findAdapterByIdAsync(string adapter,  Ice.Current current)
+    namespace location
     {
-        ++_requestCount;
-        if(adapter.Equals("TestAdapter10") || adapter.Equals("TestAdapter10-2"))
+        public class ServerLocator : Test.TestLocatorDisp_
         {
-            Debug.Assert(current.encoding.Equals(Ice.Util.Encoding_1_0));
-            return Task.FromResult<Ice.ObjectPrx>(_registry.getAdapter("TestAdapter"));
+            public ServerLocator(ServerLocatorRegistry registry, Ice.LocatorRegistryPrx registryPrx)
+            {
+                _registry = registry;
+                _registryPrx = registryPrx;
+                _requestCount = 0;
+            }
+
+            public override Task<Ice.ObjectPrx>
+            findAdapterByIdAsync(string adapter, Ice.Current current)
+            {
+                ++_requestCount;
+                if(adapter.Equals("TestAdapter10") || adapter.Equals("TestAdapter10-2"))
+                {
+                    Debug.Assert(current.encoding.Equals(Ice.Util.Encoding_1_0));
+                    return Task.FromResult(_registry.getAdapter("TestAdapter"));
+                }
+                else
+                {
+                    // We add a small delay to make sure locator request queuing gets tested when
+                    // running the test on a fast machine
+                    System.Threading.Thread.Sleep(1);
+                    return Task.FromResult(_registry.getAdapter(adapter));
+                }
+            }
+
+            public override Task<Ice.ObjectPrx>
+            findObjectByIdAsync(Ice.Identity id, Ice.Current current)
+            {
+                ++_requestCount;
+                // We add a small delay to make sure locator request queuing gets tested when
+                // running the test on a fast machine
+                System.Threading.Thread.Sleep(1);
+                return Task.FromResult(_registry.getObject(id));
+            }
+
+            public override Ice.LocatorRegistryPrx getRegistry(Ice.Current current)
+            {
+                return _registryPrx;
+            }
+
+            public override int getRequestCount(Ice.Current current)
+            {
+                return _requestCount;
+            }
+
+            private ServerLocatorRegistry _registry;
+            private Ice.LocatorRegistryPrx _registryPrx;
+            private int _requestCount;
         }
-        else
-        {
-            // We add a small delay to make sure locator request queuing gets tested when
-            // running the test on a fast machine
-            System.Threading.Thread.Sleep(1);
-            return Task.FromResult<Ice.ObjectPrx>(_registry.getAdapter(adapter));
-        }
-    }
-
-    public override Task<Ice.ObjectPrx>
-    findObjectByIdAsync(Ice.Identity id,  Ice.Current current)
-    {
-        ++_requestCount;
-        // We add a small delay to make sure locator request queuing gets tested when
-        // running the test on a fast machine
-        System.Threading.Thread.Sleep(1);
-        return Task.FromResult<Ice.ObjectPrx>(_registry.getObject(id));
-    }
-
-    public override Ice.LocatorRegistryPrx getRegistry(Ice.Current current)
-    {
-        return _registryPrx;
     }
-
-    public override int getRequestCount(Ice.Current current)
-    {
-        return _requestCount;
-    }
-
-    private ServerLocatorRegistry _registry;
-    private Ice.LocatorRegistryPrx _registryPrx;
-    private int _requestCount;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/ServerLocatorRegistry.cs zeroc-ice-3.7.2/csharp/test/Ice/location/ServerLocatorRegistry.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/ServerLocatorRegistry.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/ServerLocatorRegistry.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,85 +1,86 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Collections;
 using System.Threading.Tasks;
 
-public class ServerLocatorRegistry : Test.TestLocatorRegistryDisp_
+namespace Ice
 {
-    public ServerLocatorRegistry()
-    {
-        _adapters = new Hashtable();
-        _objects = new Hashtable();
-    }
-
-    public override Task
-    setAdapterDirectProxyAsync(string adapter, Ice.ObjectPrx obj, Ice.Current current)
+    namespace location
     {
-        if(obj != null)
+        public class ServerLocatorRegistry : Test.TestLocatorRegistryDisp_
         {
-            _adapters[adapter] = obj;
-        }
-        else
-        {
-            _adapters.Remove(adapter);
-        }
-        return null;
-    }
+            public ServerLocatorRegistry()
+            {
+                _adapters = new Hashtable();
+                _objects = new Hashtable();
+            }
+
+            public override Task
+            setAdapterDirectProxyAsync(string adapter, Ice.ObjectPrx obj, Ice.Current current)
+            {
+                if(obj != null)
+                {
+                    _adapters[adapter] = obj;
+                }
+                else
+                {
+                    _adapters.Remove(adapter);
+                }
+                return null;
+            }
+
+            public override Task
+            setReplicatedAdapterDirectProxyAsync(string adapter, string replica, Ice.ObjectPrx obj,
+                Ice.Current current)
+            {
+                if(obj != null)
+                {
+                    _adapters[adapter] = obj;
+                    _adapters[replica] = obj;
+                }
+                else
+                {
+                    _adapters.Remove(adapter);
+                    _adapters.Remove(replica);
+                }
+                return null;
+            }
+
+            public override Task
+            setServerProcessProxyAsync(string id, Ice.ProcessPrx proxy, Ice.Current current)
+            {
+                return null;
+            }
+
+            public override void addObject(Ice.ObjectPrx obj, Ice.Current current = null)
+            {
+                _objects[obj.ice_getIdentity()] = obj;
+            }
+
+            public virtual Ice.ObjectPrx getAdapter(string adapter)
+            {
+                object obj = _adapters[adapter];
+                if(obj == null)
+                {
+                    throw new Ice.AdapterNotFoundException();
+                }
+                return(Ice.ObjectPrx)obj;
+            }
+
+            public virtual Ice.ObjectPrx getObject(Ice.Identity id)
+            {
+                object obj = _objects[id];
+                if(obj == null)
+                {
+                    throw new Ice.ObjectNotFoundException();
+                }
+                return(Ice.ObjectPrx)obj;
+            }
 
-    public override Task
-    setReplicatedAdapterDirectProxyAsync(string adapter, string replica, Ice.ObjectPrx obj,  Ice.Current current)
-    {
-        if(obj != null)
-        {
-            _adapters[adapter] = obj;
-            _adapters[replica] = obj;
-        }
-        else
-        {
-            _adapters.Remove(adapter);
-            _adapters.Remove(replica);
+            private Hashtable _adapters;
+            private Hashtable _objects;
         }
-        return null;
-    }
-
-    public override Task
-    setServerProcessProxyAsync(string id, Ice.ProcessPrx proxy,  Ice.Current current)
-    {
-        return null;
     }
-
-    public override void addObject(Ice.ObjectPrx obj, Ice.Current current = null)
-    {
-        _objects[obj.ice_getIdentity()] = obj;
-    }
-
-    public virtual Ice.ObjectPrx getAdapter(string adapter)
-    {
-        object obj = _adapters[adapter];
-        if(obj == null)
-        {
-            throw new Ice.AdapterNotFoundException();
-        }
-        return (Ice.ObjectPrx)obj;
-    }
-
-    public virtual Ice.ObjectPrx getObject(Ice.Identity id)
-    {
-        object obj = _objects[id];
-        if(obj == null)
-        {
-            throw new Ice.ObjectNotFoundException();
-        }
-        return (Ice.ObjectPrx)obj;
-    }
-
-    private Hashtable _adapters;
-    private Hashtable _objects;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/ServerManagerI.cs zeroc-ice-3.7.2/csharp/test/Ice/location/ServerManagerI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/ServerManagerI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/ServerManagerI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,114 +1,115 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections;
-using Test;
 
-public class ServerManagerI : ServerManagerDisp_
+namespace Ice
 {
-    internal ServerManagerI(ServerLocatorRegistry registry, Ice.InitializationData initData, TestCommon.Application app)
-    {
-        _registry = registry;
-        _communicators = new ArrayList();
-        _initData = initData;
-        _app = app;
-        _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
-        _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
-        _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
-    }
-
-    public override void startServer(Ice.Current current)
+    namespace location
     {
-        foreach(Ice.Communicator c in _communicators)
+        public class ServerManagerI : Test.ServerManagerDisp_
         {
-            c.waitForShutdown();
-            c.destroy();
-        }
-        _communicators.Clear();
-
-        //
-        // Simulate a server: create a new communicator and object
-        // adapter. The object adapter is started on a system allocated
-        // port. The configuration used here contains the Ice.Locator
-        // configuration variable. The new object adapter will register
-        // its endpoints with the locator and create references containing
-        // the adapter id instead of the endpoints.
-        //
-        Ice.Communicator serverCommunicator = Ice.Util.initialize(_initData);
-        _communicators.Add(serverCommunicator);
-
-        //
-        // Use fixed port to ensure that OA re-activation doesn't re-use previous port from
-        // another OA (e.g.: TestAdapter2 is re-activated using port of TestAdapter).
-        //
-        int nRetry = 10;
-        while(--nRetry > 0)
-        {
-            Ice.ObjectAdapter adapter = null;
-            Ice.ObjectAdapter adapter2 = null;
-            try
+            internal ServerManagerI(ServerLocatorRegistry registry, global::Test.TestHelper helper)
             {
-                serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints",
-                                                               _app.getTestEndpoint(_nextPort++));
-                serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints",
-                                                               _app.getTestEndpoint(_nextPort++));
-
-                adapter = serverCommunicator.createObjectAdapter("TestAdapter");
-                adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2");
-
-                Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:" + _app.getTestEndpoint(0));
-                adapter.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
-                adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
-
-                Ice.Object @object = new TestI(adapter, adapter2, _registry);
-                _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test")));
-                _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test2")));
-                adapter.add(@object, Ice.Util.stringToIdentity("test3"));
-
-                adapter.activate();
-                adapter2.activate();
-                break;
+                _registry = registry;
+                _communicators = new ArrayList();
+                _helper = helper;
             }
-            catch(Ice.SocketException ex)
+
+            public override void startServer(Ice.Current current)
             {
-                if(nRetry == 0)
+                foreach(Ice.Communicator c in _communicators)
                 {
-                    throw ex;
+                    c.waitForShutdown();
+                    c.destroy();
                 }
+                _communicators.Clear();
 
-                // Retry, if OA creation fails with EADDRINUSE (this can occur when running with JS web
-                // browser clients if the driver uses ports in the same range as this test, ICE-8148)
-                if(adapter != null)
+                //
+                // Simulate a server: create a new communicator and object
+                // adapter. The object adapter is started on a system allocated
+                // port. The configuration used here contains the Ice.Locator
+                // configuration variable. The new object adapter will register
+                // its endpoints with the locator and create references containing
+                // the adapter id instead of the endpoints.
+                //
+                Ice.InitializationData initData = new Ice.InitializationData();
+                initData.properties = _helper.communicator().getProperties().ice_clone_();
+                initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
+                initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+                initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
+
+                Ice.Communicator serverCommunicator = _helper.initialize(initData);
+                _communicators.Add(serverCommunicator);
+
+                //
+                // Use fixed port to ensure that OA re-activation doesn't re-use previous port from
+                // another OA(e.g.: TestAdapter2 is re-activated using port of TestAdapter).
+                //
+                int nRetry = 10;
+                while(--nRetry > 0)
                 {
-                    adapter.destroy();
+                    Ice.ObjectAdapter adapter = null;
+                    Ice.ObjectAdapter adapter2 = null;
+                    try
+                    {
+                        serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                                       _helper.getTestEndpoint(_nextPort++));
+                        serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints",
+                                                                       _helper.getTestEndpoint(_nextPort++));
+
+                        adapter = serverCommunicator.createObjectAdapter("TestAdapter");
+                        adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2");
+
+                        Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:" + _helper.getTestEndpoint(0));
+                        adapter.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
+                        adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
+
+                        Ice.Object @object = new TestI(adapter, adapter2, _registry);
+                        _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test")));
+                        _registry.addObject(adapter.add(@object, Ice.Util.stringToIdentity("test2")));
+                        adapter.add(@object, Ice.Util.stringToIdentity("test3"));
+
+                        adapter.activate();
+                        adapter2.activate();
+                        break;
+                    }
+                    catch(Ice.SocketException ex)
+                    {
+                        if(nRetry == 0)
+                        {
+                            throw ex;
+                        }
+
+                        // Retry, if OA creation fails with EADDRINUSE(this can occur when running with JS web
+                        // browser clients if the driver uses ports in the same range as this test, ICE-8148)
+                        if(adapter != null)
+                        {
+                            adapter.destroy();
+                        }
+                        if(adapter2 != null)
+                        {
+                            adapter2.destroy();
+                        }
+                    }
                 }
-                if(adapter2 != null)
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                foreach(Ice.Communicator c in _communicators)
                 {
-                    adapter2.destroy();
+                    c.destroy();
                 }
+                _communicators.Clear();
+                current.adapter.getCommunicator().shutdown();
             }
-        }
-    }
 
-    public override void shutdown(Ice.Current current)
-    {
-        foreach(Ice.Communicator c in _communicators)
-        {
-            c.destroy();
+            private ServerLocatorRegistry _registry;
+            private ArrayList _communicators;
+            private global::Test.TestHelper _helper;
+            private int _nextPort = 1;
         }
-        _communicators.Clear();
-        current.adapter.getCommunicator().shutdown();
     }
-
-    private ServerLocatorRegistry _registry;
-    private ArrayList _communicators;
-    private Ice.InitializationData _initData;
-    private TestCommon.Application _app;
-    private int _nextPort = 1;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/location/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/location/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/Locator.ice>
 
+["cs:namespace:Ice.location"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/location/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/location/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/location/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/location/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,56 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public class TestI : TestIntfDisp_
+namespace Ice
 {
-    internal TestI(Ice.ObjectAdapter adapter1, Ice.ObjectAdapter adapter2, ServerLocatorRegistry registry)
-    {
-        _adapter1 = adapter1;
-        _adapter2 = adapter2;
-        _registry = registry;
-
-        _registry.addObject(_adapter1.add(new HelloI(), Ice.Util.stringToIdentity("hello")));
-    }
-
-    public override void shutdown(Ice.Current current)
-    {
-        _adapter1.getCommunicator().shutdown();
-    }
-
-    public override HelloPrx getHello(Ice.Current current)
+    namespace location
     {
-        return HelloPrxHelper.uncheckedCast(_adapter1.createIndirectProxy(
-                                                        Ice.Util.stringToIdentity("hello")));
-    }
-
-    public override HelloPrx getReplicatedHello(Ice.Current current)
-    {
-        return HelloPrxHelper.uncheckedCast(_adapter1.createProxy(
-                                                        Ice.Util.stringToIdentity("hello")));
-    }
-
-    public override void migrateHello(Ice.Current current)
-    {
-        Ice.Identity id = Ice.Util.stringToIdentity("hello");
-        try
-        {
-            _registry.addObject(_adapter2.add(_adapter1.remove(id), id));
-        }
-        catch(Ice.NotRegisteredException)
+        public class TestI : Test.TestIntfDisp_
         {
-            _registry.addObject(_adapter1.add(_adapter2.remove(id), id));
+            internal TestI(Ice.ObjectAdapter adapter1,
+                           Ice.ObjectAdapter adapter2, ServerLocatorRegistry registry)
+            {
+                _adapter1 = adapter1;
+                _adapter2 = adapter2;
+                _registry = registry;
+
+                _registry.addObject(_adapter1.add(new HelloI(), Ice.Util.stringToIdentity("hello")));
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                _adapter1.getCommunicator().shutdown();
+            }
+
+            public override Test.HelloPrx getHello(Ice.Current current)
+            {
+                return Test.HelloPrxHelper.uncheckedCast(_adapter1.createIndirectProxy(
+                                                                Ice.Util.stringToIdentity("hello")));
+            }
+
+            public override Test.HelloPrx getReplicatedHello(Ice.Current current)
+            {
+                return Test.HelloPrxHelper.uncheckedCast(_adapter1.createProxy(
+                                                                Ice.Util.stringToIdentity("hello")));
+            }
+
+            public override void migrateHello(Ice.Current current)
+            {
+                Ice.Identity id = Ice.Util.stringToIdentity("hello");
+                try
+                {
+                    _registry.addObject(_adapter2.add(_adapter1.remove(id), id));
+                }
+                catch(Ice.NotRegisteredException)
+                {
+                    _registry.addObject(_adapter1.add(_adapter2.remove(id), id));
+                }
+            }
+
+            private Ice.ObjectAdapter _adapter1;
+            private Ice.ObjectAdapter _adapter2;
+            private ServerLocatorRegistry _registry;
         }
     }
-
-    private Ice.ObjectAdapter _adapter1;
-    private Ice.ObjectAdapter _adapter2;
-    private ServerLocatorRegistry _registry;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/logger/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/logger/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/logger/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/logger/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -17,17 +12,9 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : Test.TestHelper
 {
-    public static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    public static int Main(string[] args)
+    public override void run(string[] args)
     {
         Console.Out.Write("testing Ice.LogFile... ");
         Console.Out.Flush();
@@ -36,9 +23,9 @@
             File.Delete("log.txt");
         }
         var initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties();
+        initData.properties = createTestProperties(ref args);
         initData.properties.setProperty("Ice.LogFile", "log.txt");
-        using(var communicator = Ice.Util.initialize(initData))
+        using(var communicator = initialize(initData))
         {
             communicator.getLogger().trace("info", "my logger");
         }
@@ -46,6 +33,10 @@
         test(File.ReadAllText("log.txt").Contains("my logger"));
         File.Delete("log.txt");
         Console.Out.WriteLine("ok");
-        return 0;
+    }
+
+    public static int Main(string[] args)
+    {
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/logger/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/logger/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/logger/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/logger/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,41 +17,43 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/logger/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/logger/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/logger/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/logger/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/logger/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -4,13 +4,13 @@
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs"/>
     <Compile Include="../../../Client.cs"/>
   </ItemGroup>
   <ItemGroup>
@@ -19,7 +19,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/metrics/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
+using System.IO;
 
 using Test;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
     static IceMX.ConnectionMetrics
     getServerConnectionMetrics(IceMX.MetricsAdminPrx metrics, long expected)
@@ -81,7 +77,7 @@
     static string
     getPort(Ice.PropertiesAdminPrx p)
     {
-        return TestCommon.Application.getTestPort(p.ice_getCommunicator().getProperties(), 0).ToString();
+        return Test.TestHelper.getTestPort(p.ice_getCommunicator().getProperties(), 0).ToString();
     }
 
     static private Dictionary<string, string>
@@ -222,7 +218,8 @@
                   string map,
                   string attr,
                   string value,
-                  System.Action func)
+                  System.Action func,
+                  TextWriter output)
     {
         Dictionary<string, string> dict = new Dictionary<string, string>();
         dict.Add("IceMX.Metrics.View.Map." + map + ".GroupBy", attr);
@@ -244,13 +241,13 @@
         {
             if(value.Length > 0)
             {
-                WriteLine("no map `" + map + "' for group by = `" + attr + "'");
+                output.WriteLine("no map `" + map + "' for group by = `" + attr + "'");
                 test(false);
             }
         }
         else if(!view[map][0].id.Equals(value))
         {
-            WriteLine("invalid attribute value: " + attr + " = " + value + " got " + view[map][0].id);
+            output.WriteLine("invalid attribute value: " + attr + " = " + value + " got " + view[map][0].id);
             test(false);
         }
 
@@ -302,9 +299,10 @@
                   UpdateCallbackI update,
                   string map,
                   string attr,
-                  string value)
+                  string value,
+                  TextWriter output)
     {
-        testAttribute(metrics, props, update, map, attr, value, ()=> {});
+        testAttribute(metrics, props, update, map, attr, value, ()=> {}, output);
     }
 
     static void
@@ -362,18 +360,18 @@
     }
 
     static void
-    checkFailure(IceMX.MetricsAdminPrx m, string map, string id, string failure, int count)
+    checkFailure(IceMX.MetricsAdminPrx m, string map, string id, string failure, int count, TextWriter output)
     {
         IceMX.MetricsFailures f = m.getMetricsFailures("View", map, id);
         if(!f.failures.ContainsKey(failure))
         {
-            WriteLine("couldn't find failure `" + failure + "' for `" + id + "'");
+            output.WriteLine("couldn't find failure `" + failure + "' for `" + id + "'");
             test(false);
         }
         if(count > 0 && f.failures[failure] != count)
         {
-            Write("count for failure `" + failure + "' of `" + id + "' is different from expected: ");
-            WriteLine(count + " != " + f.failures[failure]);
+            output.Write("count for failure `" + failure + "' of `" + id + "' is different from expected: ");
+            output.WriteLine(count + " != " + f.failures[failure]);
             test(false);
         }
     }
@@ -389,22 +387,22 @@
         return m;
     }
 
-    public static MetricsPrx allTests(TestCommon.Application app, CommunicatorObserverI obsv)
+    public static MetricsPrx allTests(Test.TestHelper helper, CommunicatorObserverI obsv)
     {
-        Ice.Communicator communicator = app.communicator();
+        Ice.Communicator communicator = helper.communicator();
 
-        string host = app.getTestHost();
-        string port = app.getTestPort(0).ToString();
+        string host = helper.getTestHost();
+        string port = helper.getTestPort(0).ToString();
         string hostAndPort = host + ":" + port;
-        string protocol = app.getTestProtocol();
+        string protocol = helper.getTestProtocol();
         string endpoint = protocol + " -h " + host + " -p " + port;
         string timeout = communicator.getProperties().getPropertyWithDefault("Ice.Default.Timeout", "60000");
 
         MetricsPrx metrics = MetricsPrxHelper.checkedCast(communicator.stringToProxy("metrics:" + endpoint));
         bool collocated = metrics.ice_getConnection() == null;
-
-        Write("testing metrics admin facet checkedCast... ");
-        Flush();
+        var output = helper.getWriter();
+        output.Write("testing metrics admin facet checkedCast... ");
+        output.Flush();
         Ice.ObjectPrx admin = communicator.getAdmin();
         Ice.PropertiesAdminPrx clientProps = Ice.PropertiesAdminPrxHelper.checkedCast(admin, "Properties");
         IceMX.MetricsAdminPrx clientMetrics = IceMX.MetricsAdminPrxHelper.checkedCast(admin, "Metrics");
@@ -418,12 +416,12 @@
         UpdateCallbackI update = new UpdateCallbackI(serverProps);
         ((Ice.NativePropertiesAdmin)communicator.findAdminFacet("Properties")).addUpdateCallback(update.updated);
 
-        WriteLine("ok");
+        output.WriteLine("ok");
 
         Dictionary<string, string> props = new Dictionary<string, string>();
 
-        Write("testing group by none...");
-        Flush();
+        output.Write("testing group by none...");
+        output.Flush();
 
         props.Add("IceMX.Metrics.View.GroupBy", "none");
         updateProps(clientProps, serverProps, update, props, "");
@@ -435,10 +433,10 @@
                  view["Connection"][0].total == 1);
         }
         test(view["Thread"].Length == 1 && view["Thread"][0].current == 5 && view["Thread"][0].total == 5);
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing group by id...");
-        Flush();
+        output.Write("testing group by id...");
+        output.Flush();
 
         props["IceMX.Metrics.View.GroupBy"] = "id";
         updateProps(clientProps, serverProps, update, props, "");
@@ -497,7 +495,7 @@
 
         clearView(clientProps, serverProps, update);
 
-        WriteLine("ok");
+        output.WriteLine("ok");
 
         string type = "";
         string isSecure = "";
@@ -512,8 +510,8 @@
 
         if(!collocated)
         {
-            Write("testing connection metrics... ");
-            Flush();
+            output.Write("testing connection metrics... ");
+            output.Flush();
 
             props["IceMX.Metrics.View.Map.Connection.GroupBy"] = "none";
             updateProps(clientProps, serverProps, update, props, "Connection");
@@ -584,7 +582,7 @@
             test(map["active"].current == 1);
 
             ControllerPrx controller = ControllerPrxHelper.checkedCast(
-                communicator.stringToProxy("controller:" + app.getTestEndpoint(1)));
+                communicator.stringToProxy("controller:" + helper.getTestEndpoint(1)));
             controller.hold();
 
             map = toMap(clientMetrics.getMetricsView("View", out timestamp)["Connection"]);
@@ -633,45 +631,45 @@
             }
             test(cm1.failures == 2 && sm1.failures >= 2);
 
-            checkFailure(clientMetrics, "Connection", cm1.id, "::Ice::TimeoutException", 1);
-            checkFailure(clientMetrics, "Connection", cm1.id, "::Ice::ConnectTimeoutException", 1);
-            checkFailure(serverMetrics, "Connection", sm1.id, "::Ice::ConnectionLostException", 0);
+            checkFailure(clientMetrics, "Connection", cm1.id, "::Ice::TimeoutException", 1, output);
+            checkFailure(clientMetrics, "Connection", cm1.id, "::Ice::ConnectTimeoutException", 1, output);
+            checkFailure(serverMetrics, "Connection", sm1.id, "::Ice::ConnectionLostException", 0, output);
 
             MetricsPrx m = (MetricsPrx)metrics.ice_timeout(500).ice_connectionId("Con1");
             m.ice_ping();
 
-            testAttribute(clientMetrics, clientProps, update, "Connection", "parent", "Communicator");
+            testAttribute(clientMetrics, clientProps, update, "Connection", "parent", "Communicator", output);
             //testAttribute(clientMetrics, clientProps, update, "Connection", "id", "");
             testAttribute(clientMetrics, clientProps, update, "Connection", "endpoint",
-                          endpoint + " -t 500");
+                          endpoint + " -t 500", output);
 
-            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointType", type);
-            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointIsDatagram", "False");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointIsSecure", isSecure);
-            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointTimeout", "500");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointCompress", "False");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointHost", host);
-            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointPort", port);
-
-            testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "False");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", host);
-            //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", host);
-            testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", port);
-            testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
-            testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
+            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointType", type, output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointIsDatagram", "False", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointIsSecure", isSecure, output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointTimeout", "500", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointCompress", "False", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointHost", host, output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "endpointPort", port, output);
+
+            testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "False", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", host, output);
+            //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", host, output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", port, output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "", output);
+            testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "", output);
 
             m.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
             waitForCurrent(clientMetrics, "View", "Connection", 0);
             waitForCurrent(serverMetrics, "View", "Connection", 0);
 
-            WriteLine("ok");
+            output.WriteLine("ok");
 
-            Write("testing connection establishment metrics... ");
-            Flush();
+            output.Write("testing connection establishment metrics... ");
+            output.Flush();
 
             props["IceMX.Metrics.View.Map.ConnectionEstablishment.GroupBy"] = "id";
             updateProps(clientProps, serverProps, update, props, "ConnectionEstablishment");
@@ -702,29 +700,29 @@
             m1 = clientMetrics.getMetricsView("View", out timestamp)["ConnectionEstablishment"][0];
             test(m1.id.Equals(hostAndPort) && m1.total == 3 && m1.failures == 2);
 
-            checkFailure(clientMetrics, "ConnectionEstablishment", m1.id, "::Ice::ConnectTimeoutException", 2);
+            checkFailure(clientMetrics, "ConnectionEstablishment", m1.id, "::Ice::ConnectTimeoutException", 2, output);
 
             System.Action c = () => { connect(metrics); };
-            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "parent", "Communicator", c);
-            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "id", hostAndPort, c);
+            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "parent", "Communicator", c, output);
+            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "id", hostAndPort, c, output);
             testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpoint",
-                          endpoint + " -t " + timeout, c);
+                          endpoint + " -t " + timeout, c, output);
 
-            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointType", type, c);
+            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointType", type, c, output);
             testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointIsDatagram", "False",
-                          c);
+                          c, output);
             testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointIsSecure", isSecure,
-                          c);
-            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointTimeout", timeout, c);
+                          c, output);
+            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointTimeout", timeout, c, output);
             testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointCompress", "False",
-                          c);
-            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointHost", host, c);
-            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointPort", port, c);
+                          c, output);
+            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointHost", host, c, output);
+            testAttribute(clientMetrics, clientProps, update, "ConnectionEstablishment", "endpointPort", port, c, output);
 
-            WriteLine("ok");
+            output.WriteLine("ok");
 
-            Write("testing endpoint lookup metrics... ");
-            Flush();
+            output.Write("testing endpoint lookup metrics... ");
+            output.Flush();
 
             props["IceMX.Metrics.View.Map.ConnectionEstablishment.GroupBy"] = "id";
             updateProps(clientProps, serverProps, update, props, "EndpointLookup");
@@ -769,29 +767,29 @@
                  (!dnsException || m1.failures == 2));
             if(dnsException)
             {
-                checkFailure(clientMetrics, "EndpointLookup", m1.id, "::Ice::DNSException", 2);
+                checkFailure(clientMetrics, "EndpointLookup", m1.id, "::Ice::DNSException", 2, output);
             }
 
             c = () => { connect(prx); };
 
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "parent", "Communicator", c);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "parent", "Communicator", c, output);
             testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "id",
-                          prx.ice_getConnection().getEndpoint().ToString(), c);
+                          prx.ice_getConnection().getEndpoint().ToString(), c, output);
             testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpoint",
-                          prx.ice_getConnection().getEndpoint().ToString(), c);
+                          prx.ice_getConnection().getEndpoint().ToString(), c, output);
 
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointType", type, c);
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointIsDatagram", "False", c);
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointIsSecure", isSecure, c);
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointTimeout", "500", c);
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointCompress", "False", c);
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointHost", "localhost", c);
-            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointPort", port, c);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointType", type, c, output);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointIsDatagram", "False", c, output);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointIsSecure", isSecure, c, output);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointTimeout", "500", c, output);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointCompress", "False", c, output);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointHost", "localhost", c, output);
+            testAttribute(clientMetrics, clientProps, update, "EndpointLookup", "endpointPort", port, c, output);
 
-            WriteLine("ok");
+            output.WriteLine("ok");
         }
-        Write("testing dispatch metrics... ");
-        Flush();
+        output.Write("testing dispatch metrics... ");
+        output.Flush();
 
         props["IceMX.Metrics.View.Map.Dispatch.GroupBy"] = "operation";
         updateProps(clientProps, serverProps, update, props, "Dispatch");
@@ -856,61 +854,61 @@
 
         dm1 = (IceMX.DispatchMetrics)map["opWithLocalException"];
         test(dm1.current <= 1 && dm1.total == 1 && dm1.failures == 1 && dm1.userException == 0);
-        checkFailure(serverMetrics, "Dispatch", dm1.id, "::Ice::SyscallException", 1);
+        checkFailure(serverMetrics, "Dispatch", dm1.id, "::Ice::SyscallException", 1, output);
         test(dm1.size == 39 && dm1.replySize > 7); // Reply contains the exception stack depending on the OS.
 
         dm1 = (IceMX.DispatchMetrics)map["opWithRequestFailedException"];
         test(dm1.current <= 1 && dm1.total == 1 && dm1.failures == 1 && dm1.userException == 0);
-        checkFailure(serverMetrics, "Dispatch", dm1.id, "::Ice::ObjectNotExistException", 1);
+        checkFailure(serverMetrics, "Dispatch", dm1.id, "::Ice::ObjectNotExistException", 1, output);
         test(dm1.size == 47 && dm1.replySize == 40);
 
         dm1 = (IceMX.DispatchMetrics)map["opWithUnknownException"];
         test(dm1.current <= 1 && dm1.total == 1 && dm1.failures == 1 && dm1.userException == 0);
-        checkFailure(serverMetrics, "Dispatch", dm1.id, "System.ArgumentOutOfRangeException", 1);
+        checkFailure(serverMetrics, "Dispatch", dm1.id, "System.ArgumentOutOfRangeException", 1, output);
         test(dm1.size == 41 && dm1.replySize > 7); // Reply contains the exception stack depending on the OS.
 
         System.Action op = () => { invokeOp(metrics); };
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "parent", "TestAdapter", op);
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "id", "metrics [op]", op);
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "parent", "TestAdapter", op, output);
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "id", "metrics [op]", op, output);
 
         if(!collocated)
         {
             testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpoint",
-                          endpoint + " -t 60000", op);
+                          endpoint + " -t 60000", op, output);
             //testAttribute(serverMetrics, serverProps, update, "Dispatch", "connection", "", op);
 
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointType", type, op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointIsDatagram", "False", op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointIsSecure", isSecure, op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointTimeout", "60000", op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointCompress", "False", op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointHost", host, op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointPort", port, op);
-
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "True", op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", host, op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", port, op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", host, op);
-            //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", port, op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op);
-            testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op);
-        }
-
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "operation", "op", op);
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "identity", "metrics", op);
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "facet", "", op);
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "mode", "twoway", op);
-
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "context.entry1", "test", op);
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "context.entry2", "", op);
-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "context.entry3", "", op);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointType", type, op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointIsDatagram", "False", op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointIsSecure", isSecure, op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointTimeout", "60000", op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointCompress", "False", op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointHost", host, op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "endpointPort", port, op, output);
+
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "True", op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", host, op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", port, op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", host, op, output);
+            //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", port, op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op, output);
+            testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op, output);
+        }
+
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "operation", "op", op, output);
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "identity", "metrics", op, output);
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "facet", "", op, output);
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "mode", "twoway", op, output);
+
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "context.entry1", "test", op, output);
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "context.entry2", "", op, output);
+        testAttribute(serverMetrics, serverProps, update, "Dispatch", "context.entry3", "", op, output);
 
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing invocation metrics... ");
-        Flush();
+        output.Write("testing invocation metrics... ");
+        output.Flush();
 
         //
         // Tests for twoway
@@ -1052,7 +1050,7 @@
         rim1 = (IceMX.ChildInvocationMetrics)(collocated ? im1.collocated[0] : im1.remotes[0]);
         test(rim1.current == 0 && rim1.total == 3 && rim1.failures == 0);
         test(rim1.size == 117 && rim1.replySize > 7);
-        checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::UnknownLocalException", 3);
+        checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::UnknownLocalException", 3, output);
 
         im1 = (IceMX.InvocationMetrics)map["opWithRequestFailedException"];
         test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 0);
@@ -1060,7 +1058,7 @@
         rim1 = (IceMX.ChildInvocationMetrics)(collocated ? im1.collocated[0] : im1.remotes[0]);
         test(rim1.current == 0 && rim1.total == 3 && rim1.failures == 0);
         test(rim1.size == 141 && rim1.replySize == 120);
-        checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ObjectNotExistException", 3);
+        checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ObjectNotExistException", 3, output);
 
         im1 = (IceMX.InvocationMetrics)map["opWithUnknownException"];
         test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 0);
@@ -1068,35 +1066,41 @@
         rim1 = (IceMX.ChildInvocationMetrics)(collocated ? im1.collocated[0] : im1.remotes[0]);
         test(rim1.current == 0 && rim1.total == 3 && rim1.failures == 0);
         test(rim1.size == 123 && rim1.replySize > 7);
-        checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::UnknownException", 3);
+        checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::UnknownException", 3, output);
 
         if(!collocated)
         {
             im1 = (IceMX.InvocationMetrics)map["fail"];
-            test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.Length == 6);
+            if(!(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.Length == 6))
+            {
+                System.Console.Error.WriteLine("current: " + im1.current + " total: " + im1.total +
+                                               " failures: " + im1.failures + " retry: " + im1.retry +
+                                               " remotes: " + im1.remotes.Length);
+                test(false);
+            }
             test(im1.remotes[0].current == 0 && im1.remotes[0].total == 1 && im1.remotes[0].failures == 1);
             test(im1.remotes[1].current == 0 && im1.remotes[1].total == 1 && im1.remotes[1].failures == 1);
             test(im1.remotes[2].current == 0 && im1.remotes[2].total == 1 && im1.remotes[2].failures == 1);
             test(im1.remotes[3].current == 0 && im1.remotes[3].total == 1 && im1.remotes[3].failures == 1);
             test(im1.remotes[4].current == 0 && im1.remotes[4].total == 1 && im1.remotes[4].failures == 1);
             test(im1.remotes[5].current == 0 && im1.remotes[5].total == 1 && im1.remotes[5].failures == 1);
-            checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3);
+            checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, output);
         }
 
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "parent", "Communicator", op);
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "id", "metrics -t -e 1.1 [op]", op);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "parent", "Communicator", op, output);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "id", "metrics -t -e 1.1 [op]", op, output);
 
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "operation", "op", op);
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "identity", "metrics", op);
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "facet", "", op);
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "encoding", "1.1", op);
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "mode", "twoway", op);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "operation", "op", op, output);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "identity", "metrics", op, output);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "facet", "", op, output);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "encoding", "1.1", op, output);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "mode", "twoway", op, output);
         testAttribute(clientMetrics, clientProps, update, "Invocation", "proxy",
-                      "metrics -t -e 1.1:" + endpoint + " -t " + timeout, op);
+                      "metrics -t -e 1.1:" + endpoint + " -t " + timeout, op, output);
 
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "context.entry1", "test", op);
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "context.entry2", "", op);
-        testAttribute(clientMetrics, clientProps, update, "Invocation", "context.entry3", "", op);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "context.entry1", "test", op, output);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "context.entry2", "", op, output);
+        testAttribute(clientMetrics, clientProps, update, "Invocation", "context.entry3", "", op, output);
 
         //
         // Oneway tests
@@ -1122,7 +1126,7 @@
         test(rim1.size == 63 && rim1.replySize == 0);
 
         testAttribute(clientMetrics, clientProps, update, "Invocation", "mode", "oneway",
-                      () => { invokeOp(metricsOneway); });
+                      () => { invokeOp(metricsOneway); }, output);
 
         //
         // Batch oneway tests
@@ -1144,12 +1148,66 @@
         test(im1.remotes.Length == 0);
 
         testAttribute(clientMetrics, clientProps, update, "Invocation", "mode", "batch-oneway",
-                      () => { invokeOp(metricsBatchOneway); });
+                      () => { invokeOp(metricsBatchOneway); }, output);
+
+        //
+        // Tests flushBatchRequests
+        //
+        props["IceMX.Metrics.View.Map.Invocation.GroupBy"] = "operation";
+        props["IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"] = "localPort";
+        updateProps(clientProps, serverProps, update, props, "Invocation");
+
+        metricsBatchOneway = (MetricsPrx)metrics.ice_batchOneway();
+        metricsBatchOneway.op();
+
+        metricsBatchOneway.ice_flushBatchRequests();
+        metricsBatchOneway.ice_flushBatchRequestsAsync().Wait();
+
+        map = toMap(clientMetrics.getMetricsView("View", out timestamp)["Invocation"]);
+        test(map.Count == 2);
+
+        im1 = (IceMX.InvocationMetrics)map["ice_flushBatchRequests"];
+        test(im1.current <= 1 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+        if(!collocated)
+        {
+            test(im1.remotes.Length == 1); // The first operation got sent over a connection
+        }
+
+        if(!collocated)
+        {
+            clearView(clientProps, serverProps, update);
 
-        WriteLine("ok");
+            Ice.Connection con = metricsBatchOneway.ice_getConnection();
+
+            metricsBatchOneway = (MetricsPrx)metricsBatchOneway.ice_fixed(con);
+            metricsBatchOneway.op();
+
+            con.flushBatchRequests(Ice.CompressBatch.No);
+            con.flushBatchRequestsAsync(Ice.CompressBatch.No).Wait();
+
+            map = toMap(clientMetrics.getMetricsView("View", out timestamp)["Invocation"]);
+            test(map.Count == 3);
+
+            im1 = (IceMX.InvocationMetrics)map["flushBatchRequests"];
+            test(im1.current == 0 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+            test(im1.remotes.Length == 1); // The first operation got sent over a connection
+
+            clearView(clientProps, serverProps, update);
+            metricsBatchOneway.op();
+
+            communicator.flushBatchRequests(Ice.CompressBatch.No);
+            communicator.flushBatchRequestsAsync(Ice.CompressBatch.No).Wait();
+            map = toMap(clientMetrics.getMetricsView("View", out timestamp)["Invocation"]);
+            test(map.Count == 2);
+
+            im1 = (IceMX.InvocationMetrics)map["flushBatchRequests"];
+            test(im1.current <= 1 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+            test(im1.remotes.Length == 1); // The first operation got sent over a connection
+        }
+        output.WriteLine("ok");
 
-        Write("testing metrics view enable/disable...");
-        Flush();
+        output.Write("testing metrics view enable/disable...");
+        output.Flush();
 
         string[] disabledViews;
         props["IceMX.Metrics.View.GroupBy"] = "none";
@@ -1179,10 +1237,10 @@
         {
         }
 
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing instrumentation observer delegate... ");
-        Flush();
+        output.Write("testing instrumentation observer delegate... ");
+        output.Flush();
 
         test(obsv.threadObserver.getTotal() > 0);
         if(!collocated)
@@ -1244,7 +1302,7 @@
         //test(obsv.dispatchObserver.userExceptionCount > 0);
         test(obsv.invocationObserver.userExceptionCount > 0);
 
-        WriteLine("ok");
+        output.WriteLine("ok");
         return metrics;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/metrics/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -17,32 +12,29 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
-    {
-        Test.MetricsPrx metrics = AllTests.allTests(this, _observer);
-        metrics.shutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
+    public override void run(string[] args)
     {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.observer = _observer;
+        CommunicatorObserverI observer = new CommunicatorObserverI();
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.observer = observer;
+        initData.properties = createTestProperties(ref args);
         initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
+
+        using(var communicator = initialize(initData))
+        {
+            Test.MetricsPrx metrics = AllTests.allTests(this, observer);
+            metrics.shutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
-
-    static CommunicatorObserverI _observer = new CommunicatorObserverI();
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/metrics/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -17,44 +12,40 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Collocated : TestCommon.Application
+public class Collocated : Test.TestHelper
 {
-    public override int run(string[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        Ice.ObjectAdapter controllerAdapter = communicator().createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
-        //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        Test.MetricsPrx metrics = AllTests.allTests(this, _observer);
-        metrics.shutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
+    public override void run(string[] args)
     {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.observer = _observer;
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.metrics");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
+        CommunicatorObserverI observer = new CommunicatorObserverI();
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.observer = observer;
+        initData.properties = createTestProperties(ref args);
         initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
+
+        using(var communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+            //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used.
+
+            Test.MetricsPrx metrics = AllTests.allTests(this, observer);
+            metrics.shutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Collocated>(args);
     }
-
-    static CommunicatorObserverI _observer = new CommunicatorObserverI();
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/InstrumentationI.cs zeroc-ice-3.7.2/csharp/test/Ice/metrics/InstrumentationI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/InstrumentationI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/InstrumentationI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/MetricsAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/metrics/MetricsAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/MetricsAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/MetricsAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Threading.Tasks;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/MetricsI.cs zeroc-ice-3.7.2/csharp/test/Ice/metrics/MetricsI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/MetricsI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/MetricsI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -51,24 +51,24 @@
     <Compile Include="..\..\..\InstrumentationI.cs">
       <Link>InstrumentationI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../InstrumentationI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../InstrumentationI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -54,24 +54,24 @@
     <Compile Include="..\..\..\MetricsI.cs">
       <Link>MetricsI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../InstrumentationI.cs"/>
-    <Compile Include="../../../MetricsI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../InstrumentationI.cs" />
+    <Compile Include="../../../MetricsI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MetricsI.cs">
       <Link>MetricsI.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MetricsI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MetricsI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MetricsAMDI.cs">
       <Link>MetricsAMDI.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MetricsAMDI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MetricsAMDI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/metrics/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -18,39 +13,36 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
-        adapter.activate();
-
-        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        Ice.ObjectAdapter controllerAdapter = communicator().createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.Admin.Endpoints", "tcp");
+        properties.setProperty("Ice.Admin.InstanceName", "server");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+
+        using(var communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
+            adapter.activate();
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+            controllerAdapter.activate();
 
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties.setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/metrics/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/metrics/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/metrics/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/metrics/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/metrics/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/AllTests.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,103 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace namespacemd
+    {
+        public class AllTests : global::Test.AllTests
+        {
+            public static Test.InitialPrx allTests(TestHelper helper)
+            {
+                var communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                var @base = communicator.stringToProxy("initial:" + helper.getTestEndpoint(0));
+                test(@base != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                var initial = Test.InitialPrxHelper.checkedCast(@base);
+                test(initial != null);
+                test(initial.Equals(@base));
+                output.WriteLine("ok");
+
+                {
+                    output.Write("testing types without package... ");
+                    output.Flush();
+                    NoNamespace.C1 c1 = initial.getNoNamespaceC2AsC1();
+                    test(c1 != null);
+                    test(c1 is NoNamespace.C2);
+                    NoNamespace.C2 c2 = initial.getNoNamespaceC2AsC2();
+                    test(c2 != null);
+                    try
+                    {
+                        initial.throwNoNamespaceE2AsE1();
+                        test(false);
+                    }
+                    catch(NoNamespace.E1 ex)
+                    {
+                        test(ex is NoNamespace.E2);
+                    }
+                    try
+                    {
+                        initial.throwNoNamespaceE2AsE2();
+                        test(false);
+                    }
+                    catch(NoNamespace.E2)
+                    {
+                        // Expected
+                    }
+                    try
+                    {
+                        initial.throwNoNamespaceNotify();
+                        test(false);
+                    }
+                    catch(NoNamespace.@notify)
+                    {
+                        // Expected
+                    }
+                    output.WriteLine("ok");
+                }
+
+                {
+                    output.Write("testing types with package... ");
+                    output.Flush();
+
+                    {
+                        WithNamespace.C1 c1 = initial.getWithNamespaceC2AsC1();
+                        test(c1 != null);
+                        test(c1 is WithNamespace.C2);
+                        WithNamespace.C2 c2 = initial.getWithNamespaceC2AsC2();
+                        test(c2 != null);
+                        try
+                        {
+                            initial.throwWithNamespaceE2AsE1();
+                            test(false);
+                        }
+                        catch(WithNamespace.E1 ex)
+                        {
+                            test(ex is WithNamespace.E2);
+                        }
+                        try
+                        {
+                            initial.throwWithNamespaceE2AsE2();
+                            test(false);
+                        }
+                        catch(WithNamespace.E2)
+                        {
+                            // Expected
+                        }
+                        output.WriteLine("ok");
+                    }
+                }
+                return initial;
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Client.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,30 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace namespacemd
+    {
+        public class Client : TestHelper
+        {
+            override public void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+                using(var communicator = initialize(properties))
+                {
+                    var initial = AllTests.allTests(this);
+                    initial.shutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/.gitignore zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/.gitignore
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7 @@
+// Generated by makegitignore.py
+
+// IMPORTANT: Do not edit this file -- any edits made here will be lost!
+client
+server
+Test.cpp
+Test.h
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/InitialI.cs zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/InitialI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/InitialI.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/InitialI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,62 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+namespace Ice
+{
+    namespace namespacemd
+    {
+        public class InitialI : Test.InitialDisp_
+        {
+            public override NoNamespace.C1 getNoNamespaceC2AsC1(Current current = null)
+            {
+                return new NoNamespace.C2();
+            }
+
+            public override NoNamespace.C2 getNoNamespaceC2AsC2(Current current = null)
+            {
+                return new NoNamespace.C2();
+            }
+
+            public override WithNamespace.C1 getWithNamespaceC2AsC1(Current current = null)
+            {
+                return new WithNamespace.C2();
+            }
+
+            public override WithNamespace.C2 getWithNamespaceC2AsC2(Current current = null)
+            {
+                return new WithNamespace.C2();
+            }
+
+            public override void shutdown(Current current = null)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            public override void throwNoNamespaceE2AsE1(Current current = null)
+            {
+                throw new NoNamespace.E2();
+            }
+
+            public override void throwNoNamespaceE2AsE2(Current current = null)
+            {
+                throw new NoNamespace.E2();
+            }
+
+            public override void throwNoNamespaceNotify(Current current = null)
+            {
+                throw new NoNamespace.@notify();
+            }
+
+            public override void throwWithNamespaceE2AsE1(Current current = null)
+            {
+                throw new WithNamespace.E2();
+            }
+
+            public override void throwWithNamespaceE2AsE2(Current current = null)
+            {
+                throw new WithNamespace.E2();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/net45/client.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
+  <PropertyGroup Label="Globals">
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{2BB1FE54-54EF-4974-9F5D-ABFEC740AE29}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>client</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile>
+      <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir>
+      <IncludeDirectories>..\..\..</IncludeDirectories>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </SliceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+      <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\AllTests.cs">
+      <Link>AllTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Client.cs">
+      <Link>Client.cs</Link>
+    </Compile>
+    <Compile Include="generated\NoNamespace.cs">
+      <SliceCompileSource>..\..\..\NoNamespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Namespace.cs">
+      <SliceCompileSource>..\..\..\Namespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\Test.ice">
+      <Link>Test.ice</Link>
+    </SliceCompile>
+    <None Include="client.exe.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\NoNamespace.ice">
+      <Link>NoNamespace.ice</Link>
+    </SliceCompile>
+    <SliceCompile Include="..\..\..\Namespace.ice">
+      <Link>Namespace.ice</Link>
+    </SliceCompile>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
+  <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/net45/client.exe.config zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/net45/client.exe.config
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/net45/client.exe.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/net45/client.exe.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<configuration>
+    <runtime>
+        <developmentMode developerInstallation="true"/>
+    </runtime>
+</configuration>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/net45/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>client</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;3005</NoWarn>
+  </PropertyGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile>
+      <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir>
+      <IncludeDirectories>..\..\..</IncludeDirectories>
+      <AdditionalOptions></AdditionalOptions>
+    </SliceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\NoNamespace.cs">
+      <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Namespace.cs">
+      <SliceCompileSource>../../../Namespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../Namespace.ice" />
+    <SliceCompile Include="../../../NoNamespace.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/net45/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/net45/server.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
+  <PropertyGroup Label="Globals">
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <NoWarn>3005</NoWarn>
+  </PropertyGroup>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D8F04A5C-9692-4A62-93BD-81483EBEA8F5}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>server</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile>
+      <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir>
+      <IncludeDirectories>..\..\..</IncludeDirectories>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </SliceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+      <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\InitialI.cs">
+      <Link>InitialI.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Server.cs">
+      <Link>Server.cs</Link>
+    </Compile>
+    <Compile Include="generated\NoNamespace.cs">
+      <SliceCompileSource>..\..\..\NoNamespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Namespace.cs">
+      <SliceCompileSource>..\..\..\Namespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
+    <SliceCompile Include="..\..\..\Test.ice">
+      <Link>Test.ice</Link>
+    </SliceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\NoNamespace.ice">
+      <Link>NoNamespace.ice</Link>
+    </SliceCompile>
+    <SliceCompile Include="..\..\..\Namespace.ice">
+      <Link>Namespace.ice</Link>
+    </SliceCompile>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
+  <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/net45/server.exe.config zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/net45/server.exe.config
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/net45/server.exe.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/net45/server.exe.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<configuration>
+    <runtime>
+        <developmentMode developerInstallation="true"/>
+    </runtime>
+</configuration>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>server</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;3005</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;3005</NoWarn>
+  </PropertyGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile>
+      <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir>
+      <IncludeDirectories>..\..\..</IncludeDirectories>
+      <AdditionalOptions></AdditionalOptions>
+    </SliceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../InitialI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\NoNamespace.cs">
+      <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Namespace.cs">
+      <SliceCompileSource>../../../Namespace.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../Namespace.ice" />
+    <SliceCompile Include="../../../NoNamespace.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.namespacemd</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Label="IceBuilder">
+    <SliceCompile>
+      <OutputDir>$(MSBuildProjectDirectory)\generated</OutputDir>
+      <IncludeDirectories>..\..\..</IncludeDirectories>
+      <AdditionalOptions></AdditionalOptions>
+    </SliceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../InitialI.cs" />
+      <Compile Include="../../../Server.cs" />
+    <Compile Include="generated/NoNamespace.cs">
+      <SliceCompileSource>../../../NoNamespace.ice</SliceCompileSource>
+    </Compile>
+
+    <Compile Include="generated/Namespace.cs">
+      <SliceCompileSource>../../../Namespace.ice</SliceCompileSource>
+    </Compile>
+
+    <Compile Include="generated/Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+
+    <SliceCompile Include="../../../NoNamespace.ice" />
+    <SliceCompile Include="../../../Namespace.ice" />
+    <SliceCompile Include="../../../Test.ice" />
+
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Namespace.ice zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Namespace.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Namespace.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Namespace.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,29 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+["cs:namespace:Ice.namespacemd"]
+module WithNamespace
+{
+class C1
+{
+    int i;
+}
+
+class C2 extends C1
+{
+    long l;
+}
+
+exception E1
+{
+    int i;
+}
+
+exception E2 extends E1
+{
+    long l;
+}
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/NoNamespace.ice zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/NoNamespace.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/NoNamespace.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/NoNamespace.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,33 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+module NoNamespace
+{
+class C1
+{
+    int i;
+}
+
+class C2 extends C1
+{
+    long l;
+}
+
+exception E1
+{
+    int i;
+}
+
+exception E2 extends E1
+{
+    long l;
+}
+
+exception notify /* Test keyword escape. */
+{
+    int i;
+}
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Server.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,32 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace namespacemd
+    {
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/namespacemd/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/namespacemd/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,30 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Namespace.ice>
+#include <NoNamespace.ice>
+
+["cs:namespace:Ice.namespacemd"]
+module Test
+{
+
+interface Initial
+{
+    NoNamespace::C1 getNoNamespaceC2AsC1();
+    NoNamespace::C2 getNoNamespaceC2AsC2();
+    void throwNoNamespaceE2AsE1() throws NoNamespace::E1;
+    void throwNoNamespaceE2AsE2() throws NoNamespace::E2;
+    void throwNoNamespaceNotify() throws NoNamespace::notify;
+
+    WithNamespace::C1 getWithNamespaceC2AsC1();
+    WithNamespace::C2 getWithNamespaceC2AsC2();
+    void throwWithNamespaceE2AsE1() throws WithNamespace::E1;
+    void throwWithNamespaceE2AsE2() throws WithNamespace::E2;
+
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
     private static Ice.IPConnectionInfo getIPConnectionInfo(Ice.ConnectionInfo info)
     {
@@ -21,10 +16,10 @@
         return null;
     }
 
-    public static void allTests(TestCommon.Application app)
+    public static void allTests(Test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        string sref = "test:" + app.getTestEndpoint(0);
+        Ice.Communicator communicator = helper.communicator();
+        string sref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -36,31 +31,31 @@
 
         Test.TestIntfPrx testPrx = Test.TestIntfPrxHelper.checkedCast(obj);
         test(testPrx != null);
-
-        Write("testing connection... ");
-        Flush();
+        var output = helper.getWriter();
+        output.Write("testing connection... ");
+        output.Flush();
         {
             testPrx.ice_ping();
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing connection information... ");
-        Flush();
+        output.Write("testing connection information... ");
+        output.Flush();
         {
             Ice.IPConnectionInfo info = getIPConnectionInfo(testPrx.ice_getConnection().getInfo());
             test(info.remotePort == proxyPort); // make sure we are connected to the proxy port.
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("shutting down server... ");
-        Flush();
+        output.Write("shutting down server... ");
+        output.Flush();
         {
             testPrx.shutdown();
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing connection failure... ");
-        Flush();
+        output.Write("testing connection failure... ");
+        output.Flush();
         {
             try
             {
@@ -71,6 +66,6 @@
             {
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,17 +11,18 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        AllTests.allTests(this);
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            AllTests.allTests(this);
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,53 +17,52 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,7 +11,7 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
     class TestI : Test.TestIntfDisp_
     {
@@ -26,20 +21,21 @@
         }
     }
 
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
+        using(var communicator = initialize(ref args))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
 
-        communicator().waitForShutdown();
-        return 0;
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/networkProxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/networkProxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,450 +1,513 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
-using Test;
+using System.Collections.Generic;
 
-namespace Test
+namespace Ice
 {
-    public partial class IBase
-    {
-        partial void ice_initialize()
-        {
-            id = "My id";
-        }
-    }
-
-    public partial class IDerived
+    namespace objects
     {
-        partial void ice_initialize()
+        namespace Test
         {
-            name = "My name";
-        }
-    }
-
-    public partial class I2
-    {
-        public bool called
-        {
-            get;
-            set;
-        }
-
-        partial void ice_initialize()
-        {
-            called = true;
-        }
-    }
+            public partial class IBase
+            {
+                partial void ice_initialize()
+                {
+                    id = "My id";
+                }
+            }
 
-    public partial struct S1
-    {
-        partial void ice_initialize()
-        {
-            id = 1;
-        }
-    }
+            public partial class IDerived
+            {
+                partial void ice_initialize()
+                {
+                    name = "My name";
+                }
+            }
 
-    public partial class SC1
-    {
-        partial void ice_initialize()
-        {
-            id = "My id";
-        }
-    }
-}
+            public partial class I2
+            {
+                public bool called
+                {
+                    get;
+                    set;
+                }
 
-public class AllTests : TestCommon.AllTests
-{
-    public static Ice.Value MyValueFactory(string type)
-    {
-        if (type.Equals("::Test::B"))
-        {
-            return new BI();
-        }
-        else if (type.Equals("::Test::C"))
-        {
-            return new CI();
-        }
-        else if (type.Equals("::Test::D"))
-        {
-            return new DI();
-        }
-        else if (type.Equals("::Test::E"))
-        {
-            return new EI();
-        }
-        else if (type.Equals("::Test::F"))
-        {
-            return new FI();
-        }
-        else if (type.Equals("::Test::I"))
-        {
-            return new II();
-        }
-        else if (type.Equals("::Test::J"))
-        {
-            return new JI();
-        }
-        else if (type.Equals("::Test::H"))
-        {
-            return new HI();
-        }
-        Debug.Assert(false); // Should never be reached
-        return null;
-    }
+                partial void ice_initialize()
+                {
+                    called = true;
+                }
+            }
 
-    private class MyObjectFactory : Ice.ObjectFactory
-    {
-        public MyObjectFactory()
-        {
-            _destroyed = false;
-        }
+            public partial struct S1
+            {
+                partial void ice_initialize()
+                {
+                    id = 1;
+                }
+            }
 
-        ~MyObjectFactory()
-        {
-            Debug.Assert(_destroyed);
-        }
+            public partial class SC1
+            {
+                partial void ice_initialize()
+                {
+                    id = "My id";
+                }
+            }
 
-        public Ice.Value create(string type)
-        {
-            return null;
-        }
+            public class AllTests : global::Test.AllTests
+            {
+                public static Ice.Value MyValueFactory(string type)
+                {
+                    if(type.Equals("::Test::B"))
+                    {
+                        return new BI();
+                    }
+                    else if(type.Equals("::Test::C"))
+                    {
+                        return new CI();
+                    }
+                    else if(type.Equals("::Test::D"))
+                    {
+                        return new DI();
+                    }
+                    else if(type.Equals("::Test::E"))
+                    {
+                        return new EI();
+                    }
+                    else if(type.Equals("::Test::F"))
+                    {
+                        return new FI();
+                    }
+                    else if(type.Equals("::Test::I"))
+                    {
+                        return new II();
+                    }
+                    else if(type.Equals("::Test::J"))
+                    {
+                        return new JI();
+                    }
+                    else if(type.Equals("::Test::H"))
+                    {
+                        return new HI();
+                    }
+                    Debug.Assert(false); // Should never be reached
+                    return null;
+                }
 
-        public void
-        destroy()
-        {
-            _destroyed = true;
-        }
+                private class MyObjectFactory : Ice.ObjectFactory
+                {
+                    public MyObjectFactory()
+                    {
+                        _destroyed = false;
+                    }
+
+                    ~MyObjectFactory()
+                    {
+                        Debug.Assert(_destroyed);
+                    }
+
+                    public Ice.Value create(string type)
+                    {
+                        return null;
+                    }
+
+                    public void
+                    destroy()
+                    {
+                        _destroyed = true;
+                    }
 
-        private bool _destroyed;
-    }
+                    private bool _destroyed;
+                }
 
-    public static InitialPrx allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::B");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::C");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::D");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::E");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::F");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::H");
+                public static Test.InitialPrx allTests(global::Test.TestHelper helper)
+                {
+                    Ice.Communicator communicator = helper.communicator();
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::B");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::C");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::D");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::E");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::F");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::H");
 
-// Disable Obsolete warning/error
+                    // Disable Obsolete warning/error
 #pragma warning disable 612, 618
-        communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
+                    communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
 #pragma warning restore 612, 618
 
-        Write("testing stringToProxy... ");
-        Flush();
-        String @ref = "initial:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
-        test(@base != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        InitialPrx initial = InitialPrxHelper.checkedCast(@base);
-        test(initial != null);
-        test(initial.Equals(@base));
-        WriteLine("ok");
-
-        Write("getting B1... ");
-        Flush();
-        B b1 = initial.getB1();
-        test(b1 != null);
-        WriteLine("ok");
-
-        Write("getting B2... ");
-        Flush();
-        B b2 = initial.getB2();
-        test(b2 != null);
-        WriteLine("ok");
-
-        Write("getting C... ");
-        Flush();
-        C c = initial.getC();
-        test(c != null);
-        WriteLine("ok");
-
-        Write("getting D... ");
-        Flush();
-        D d = initial.getD();
-        test(d != null);
-        WriteLine("ok");
-
-        Write("checking consistency... ");
-        Flush();
-        test(b1 != b2);
-        //test(b1 != c);
-        //test(b1 != d);
-        //test(b2 != c);
-        //test(b2 != d);
-        //test(c != d);
-        test(b1.theB == b1);
-        test(b1.theC == null);
-        test(b1.theA is B);
-        test(((B) b1.theA).theA == b1.theA);
-        test(((B) b1.theA).theB == b1);
-        //test(((B)b1.theA).theC is C); // Redundant -- theC is always of type C
-        test(((C) (((B) b1.theA).theC)).theB == b1.theA);
-        test(b1.preMarshalInvoked);
-        test(b1.postUnmarshalInvoked);
-        test(b1.theA.preMarshalInvoked);
-        test(b1.theA.postUnmarshalInvoked);
-        test(((B)b1.theA).theC.preMarshalInvoked);
-        test(((B)b1.theA).theC.postUnmarshalInvoked);
-
-        // More tests possible for b2 and d, but I think this is already
-        // sufficient.
-        test(b2.theA == b2);
-        test(d.theC == null);
-        WriteLine("ok");
-
-        Write("getting B1, B2, C, and D all at once... ");
-        Flush();
-        B b1out;
-        B b2out;
-        C cout;
-        D dout;
-        initial.getAll(out b1out, out b2out, out cout, out dout);
-        test(b1out != null);
-        test(b2out != null);
-        test(cout != null);
-        test(dout != null);
-        WriteLine("ok");
-
-        Write("checking consistency... ");
-        Flush();
-        test(b1out != b2out);
-        test(b1out.theA == b2out);
-        test(b1out.theB == b1out);
-        test(b1out.theC == null);
-        test(b2out.theA == b2out);
-        test(b2out.theB == b1out);
-        test(b2out.theC == cout);
-        test(cout.theB == b2out);
-        test(dout.theA == b1out);
-        test(dout.theB == b2out);
-        test(dout.theC == null);
-        test(dout.preMarshalInvoked);
-        test(dout.postUnmarshalInvoked);
-        test(dout.theA.preMarshalInvoked);
-        test(dout.theA.postUnmarshalInvoked);
-        test(dout.theB.preMarshalInvoked);
-        test(dout.theB.postUnmarshalInvoked);
-        test(dout.theB.theC.preMarshalInvoked);
-        test(dout.theB.theC.postUnmarshalInvoked);
-
-        WriteLine("ok");
-
-        Write("testing protected members... ");
-        Flush();
-        EI e = (EI)initial.getE();
-        test(e != null && e.checkValues());
-        System.Reflection.BindingFlags flags = System.Reflection.BindingFlags.NonPublic |
-                                               System.Reflection.BindingFlags.Public |
-                                               System.Reflection.BindingFlags.Instance;
-        test(!typeof(E).GetField("i", flags).IsPublic && !typeof(E).GetField("i", flags).IsPrivate);
-        test(!typeof(E).GetField("s", flags).IsPublic && !typeof(E).GetField("s", flags).IsPrivate);
-        FI f = (FI)initial.getF();
-        test(f.checkValues());
-        test(((EI)f.e2).checkValues());
-        test(!typeof(F).GetField("e1", flags).IsPublic && !typeof(F).GetField("e1", flags).IsPrivate);
-        test(typeof(F).GetField("e2", flags).IsPublic && !typeof(F).GetField("e2", flags).IsPrivate);
-        WriteLine("ok");
-
-        Write("getting I, J and H... ");
-        Flush();
-        var i = initial.getI();
-        test(i != null);
-        var j = initial.getJ();
-        test(j != null);
-        var h = initial.getH();
-        test(h != null);
-        WriteLine("ok");
-
-        Write("getting D1... ");
-        Flush();
-        D1 d1 = new D1(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4"));
-        d1 = initial.getD1(d1);
-        test(d1.a1.name.Equals("a1"));
-        test(d1.a2.name.Equals("a2"));
-        test(d1.a3.name.Equals("a3"));
-        test(d1.a4.name.Equals("a4"));
-        WriteLine("ok");
-
-        Write("throw EDerived... ");
-        Flush();
-        try
-        {
-            initial.throwEDerived();
-            test(false);
-        }
-        catch(EDerived ederived)
-        {
-            test(ederived.a1.name.Equals("a1"));
-            test(ederived.a2.name.Equals("a2"));
-            test(ederived.a3.name.Equals("a3"));
-            test(ederived.a4.name.Equals("a4"));
-        }
-        WriteLine("ok");
+                    var output = helper.getWriter();
 
-        Write("setting G... ");
-        Flush();
-        try
-        {
-            initial.setG(new G(new S("hello"), "g"));
-        }
-        catch(Ice.OperationNotExistException)
-        {
-        }
-        WriteLine("ok");
+                    output.Write("testing stringToProxy... ");
+                    output.Flush();
+                    String @ref = "initial:" + helper.getTestEndpoint(0);
+                    Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
+                    test(@base != null);
+                    output.WriteLine("ok");
+
+                    output.Write("testing checked cast... ");
+                    output.Flush();
+                    var initial = Test.InitialPrxHelper.checkedCast(@base);
+                    test(initial != null);
+                    test(initial.Equals(@base));
+                    output.WriteLine("ok");
+
+                    output.Write("getting B1... ");
+                    output.Flush();
+                    B b1 = initial.getB1();
+                    test(b1 != null);
+                    output.WriteLine("ok");
+
+                    output.Write("getting B2... ");
+                    output.Flush();
+                    B b2 = initial.getB2();
+                    test(b2 != null);
+                    output.WriteLine("ok");
+
+                    output.Write("getting C... ");
+                    output.Flush();
+                    C c = initial.getC();
+                    test(c != null);
+                    output.WriteLine("ok");
+
+                    output.Write("getting D... ");
+                    output.Flush();
+                    D d = initial.getD();
+                    test(d != null);
+                    output.WriteLine("ok");
+
+                    output.Write("checking consistency... ");
+                    output.Flush();
+                    test(b1 != b2);
+                    //test(b1 != c);
+                    //test(b1 != d);
+                    //test(b2 != c);
+                    //test(b2 != d);
+                    //test(c != d);
+                    test(b1.theB == b1);
+                    test(b1.theC == null);
+                    test(b1.theA is B);
+                    test(((B)b1.theA).theA == b1.theA);
+                    test(((B)b1.theA).theB == b1);
+                    //test(((B)b1.theA).theC is C); // Redundant -- theC is always of type C
+                    test(((C)(((B)b1.theA).theC)).theB == b1.theA);
+                    test(b1.preMarshalInvoked);
+                    test(b1.postUnmarshalInvoked);
+                    test(b1.theA.preMarshalInvoked);
+                    test(b1.theA.postUnmarshalInvoked);
+                    test(((B)b1.theA).theC.preMarshalInvoked);
+                    test(((B)b1.theA).theC.postUnmarshalInvoked);
+
+                    // More tests possible for b2 and d, but I think this is already
+                    // sufficient.
+                    test(b2.theA == b2);
+                    test(d.theC == null);
+                    output.WriteLine("ok");
+
+                    output.Write("getting B1, B2, C, and D all at once... ");
+                    output.Flush();
+                    B b1out;
+                    B b2out;
+                    C cout;
+                    D dout;
+                    initial.getAll(out b1out, out b2out, out cout, out dout);
+                    test(b1out != null);
+                    test(b2out != null);
+                    test(cout != null);
+                    test(dout != null);
+                    output.WriteLine("ok");
+
+                    output.Write("checking consistency... ");
+                    output.Flush();
+                    test(b1out != b2out);
+                    test(b1out.theA == b2out);
+                    test(b1out.theB == b1out);
+                    test(b1out.theC == null);
+                    test(b2out.theA == b2out);
+                    test(b2out.theB == b1out);
+                    test(b2out.theC == cout);
+                    test(cout.theB == b2out);
+                    test(dout.theA == b1out);
+                    test(dout.theB == b2out);
+                    test(dout.theC == null);
+                    test(dout.preMarshalInvoked);
+                    test(dout.postUnmarshalInvoked);
+                    test(dout.theA.preMarshalInvoked);
+                    test(dout.theA.postUnmarshalInvoked);
+                    test(dout.theB.preMarshalInvoked);
+                    test(dout.theB.postUnmarshalInvoked);
+                    test(dout.theB.theC.preMarshalInvoked);
+                    test(dout.theB.theC.postUnmarshalInvoked);
+
+                    output.WriteLine("ok");
+
+                    output.Write("testing protected members... ");
+                    output.Flush();
+                    EI e =(EI)initial.getE();
+                    test(e != null && e.checkValues());
+                    System.Reflection.BindingFlags flags = System.Reflection.BindingFlags.NonPublic |
+                                                           System.Reflection.BindingFlags.Public |
+                                                           System.Reflection.BindingFlags.Instance;
+                    test(!typeof(E).GetField("i", flags).IsPublic && !typeof(E).GetField("i", flags).IsPrivate);
+                    test(!typeof(E).GetField("s", flags).IsPublic && !typeof(E).GetField("s", flags).IsPrivate);
+                    FI f =(FI)initial.getF();
+                    test(f.checkValues());
+                    test(((EI)f.e2).checkValues());
+                    test(!typeof(F).GetField("e1", flags).IsPublic && !typeof(F).GetField("e1", flags).IsPrivate);
+                    test(typeof(F).GetField("e2", flags).IsPublic && !typeof(F).GetField("e2", flags).IsPrivate);
+                    output.WriteLine("ok");
+
+                    output.Write("getting I, J and H... ");
+                    output.Flush();
+                    var i = initial.getI();
+                    test(i != null);
+                    var j = initial.getJ();
+                    test(j != null);
+                    var h = initial.getH();
+                    test(h != null);
+                    output.WriteLine("ok");
+
+                    output.Write("getting K... ");
+                    {
+                        output.Flush();
+                        var k = initial.getK();
+                        var l = k.value as L;
+                        test(l != null);
+                        test(l.data.Equals("l"));
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("testing Value as parameter... ");
+                    output.Flush();
+                    {
+                        Ice.Value v1 = new L("l");
+                        Ice.Value v2;
+                        Ice.Value v3 = initial.opValue(v1, out v2);
+                        test(((L)v2).data.Equals("l"));
+                        test(((L)v3).data.Equals("l"));
+                    }
+                    {
+                        L l = new L("l");
+                        Ice.Value[] v1 = new Ice.Value[]{ l };
+                        Ice.Value[] v2;
+                        Ice.Value[] v3 = initial.opValueSeq(v1, out v2);
+                        test(((L)v2[0]).data.Equals("l"));
+                        test(((L)v3[0]).data.Equals("l"));
+                    }
+                    {
+                        L l = new L("l");
+                        Dictionary<string, Ice.Value> v1 = new Dictionary<string, Ice.Value>{ {"l", l} };
+                        Dictionary<string, Ice.Value> v2;
+                        Dictionary<string, Ice.Value> v3 = initial.opValueMap(v1, out v2);
+                        test(((L)v2["l"]).data.Equals("l"));
+                        test(((L)v3["l"]).data.Equals("l"));
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("getting D1... ");
+                    output.Flush();
+                    D1 d1 = new D1(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4"));
+                    d1 = initial.getD1(d1);
+                    test(d1.a1.name.Equals("a1"));
+                    test(d1.a2.name.Equals("a2"));
+                    test(d1.a3.name.Equals("a3"));
+                    test(d1.a4.name.Equals("a4"));
+                    output.WriteLine("ok");
+
+                    output.Write("throw EDerived... ");
+                    output.Flush();
+                    try
+                    {
+                        initial.throwEDerived();
+                        test(false);
+                    }
+                    catch(EDerived ederived)
+                    {
+                        test(ederived.a1.name.Equals("a1"));
+                        test(ederived.a2.name.Equals("a2"));
+                        test(ederived.a3.name.Equals("a3"));
+                        test(ederived.a4.name.Equals("a4"));
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("setting G... ");
+                    output.Flush();
+                    try
+                    {
+                        initial.setG(new G(new S("hello"), "g"));
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("setting I... ");
+                    output.Flush();
+                    initial.setI(i);
+                    initial.setI(j);
+                    initial.setI(h);
+                    output.WriteLine("ok");
+
+                    output.Write("testing sequences...");
+                    output.Flush();
+                    try
+                    {
+                        Base[] inS = new Test.Base[0];
+                        Base[] outS;
+                        Base[] retS;
+                        retS = initial.opBaseSeq(inS, out outS);
+
+                        inS = new Test.Base[1];
+                        inS[0] = new Test.Base(new S(), "");
+                        retS = initial.opBaseSeq(inS, out outS);
+                        test(retS.Length == 1 && outS.Length == 1);
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("testing recursive type... ");
+                    output.Flush();
+                    var top = new Test.Recursive();
+                    var p = top;
+                    int depth = 0;
+                    try
+                    {
+                        for(; depth <= 1000; ++depth)
+                        {
+                            p.v = new Test.Recursive();
+                            p = p.v;
+                            if((depth < 10 &&(depth % 10) == 0) ||
+                              (depth < 1000 &&(depth % 100) == 0) ||
+                              (depth < 10000 &&(depth % 1000) == 0) ||
+                              (depth % 10000) == 0)
+                            {
+                                initial.setRecursive(top);
+                            }
+                        }
+                        test(!initial.supportsClassGraphDepthMax());
+                    }
+                    catch(Ice.UnknownLocalException)
+                    {
+                        // Expected marshal exception from the server(max class graph depth reached)
+                    }
+                    catch(Ice.UnknownException)
+                    {
+                        // Expected stack overflow from the server(Java only)
+                    }
+                    initial.setRecursive(new Test.Recursive());
+                    output.WriteLine("ok");
+
+                    output.Write("testing compact ID...");
+                    output.Flush();
+                    try
+                    {
+                        test(initial.getCompact() != null);
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("testing marshaled results...");
+                    output.Flush();
+                    b1 = initial.getMB();
+                    test(b1 != null && b1.theB == b1);
+                    b1 = initial.getAMDMBAsync().Result;
+                    test(b1 != null && b1.theB == b1);
+                    output.WriteLine("ok");
+
+                    output.Write("testing UnexpectedObjectException...");
+                    output.Flush();
+                    @ref = "uoet:" + helper.getTestEndpoint(0);
+                    @base = communicator.stringToProxy(@ref);
+                    test(@base != null);
+                    var uoet = Test.UnexpectedObjectExceptionTestPrxHelper.uncheckedCast(@base);
+                    test(uoet != null);
+                    try
+                    {
+                        uoet.op();
+                        test(false);
+                    }
+                    catch(Ice.UnexpectedObjectException ex)
+                    {
+                        test(ex.type.Equals("::Test::AlsoEmpty"));
+                        test(ex.expectedType.Equals("::Test::Empty"));
+                    }
+                    catch(System.Exception ex)
+                    {
+                        output.WriteLine(ex.ToString());
+                        test(false);
+                    }
+                    output.WriteLine("ok");
 
-        Write("setting I... ");
-        Flush();
-        initial.setI(i);
-        initial.setI(j);
-        initial.setI(h);
-        WriteLine("ok");
-
-        Write("testing sequences...");
-        Flush();
-        try
-        {
-            Base[] inS = new Base[0];
-            Base[] outS;
-            Base[] retS;
-            retS = initial.opBaseSeq(inS, out outS);
-
-            inS = new Base[1];
-            inS[0] = new Base(new S(), "");
-            retS = initial.opBaseSeq(inS, out outS);
-            test(retS.Length == 1 && outS.Length == 1);
-        }
-        catch(Ice.OperationNotExistException)
-        {
-        }
-        WriteLine("ok");
+                    // Disable Obsolete warning/error
+#pragma warning disable 612, 618
+                    output.Write("testing getting ObjectFactory...");
+                    output.Flush();
+                    test(communicator.findObjectFactory("TestOF") != null);
+                    output.WriteLine("ok");
+                    output.Write("testing getting ObjectFactory as ValueFactory...");
+                    output.Flush();
+                    test(communicator.getValueFactoryManager().find("TestOF") != null);
+                    output.WriteLine("ok");
+#pragma warning restore 612, 618
 
-        Write("testing recursive type... ");
-        Flush();
-        Recursive top = new Recursive();
-        Recursive p = top;
-        int depth = 0;
-        try
-        {
-            for(; depth <= 1000; ++depth)
-            {
-                p.v = new Recursive();
-                p = p.v;
-                if((depth < 10 && (depth % 10) == 0) ||
-                   (depth < 1000 && (depth % 100) == 0) ||
-                   (depth < 10000 && (depth % 1000) == 0) ||
-                   (depth % 10000) == 0)
-                {
-                    initial.setRecursive(top);
+                    output.Write("testing partial ice_initialize...");
+                    output.Flush();
+                    var ib1 = new IBase();
+                    test(ib1.id.Equals("My id"));
+                    var id1 = new IDerived();
+                    test(id1.id.Equals("My id"));
+                    test(id1.name.Equals("My name"));
+
+                    var id2 = new Test.IDerived2();
+                    test(id2.id.Equals("My id"));
+                    var i2 = new I2();
+                    test(i2.called);
+
+                    var s1 = new S1();
+                    // The struct default constructor do not call ice_initialize
+                    test(s1.id == 0);
+                    s1 = new S1(2);
+                    // The id should have the value set by ice_initialize and not 2
+                    test(s1.id == 1);
+
+                    var sc1 = new SC1();
+                    test(sc1.id.Equals("My id"));
+                    output.WriteLine("ok");
+
+                    output.Write("testing class containing complex dictionary... ");
+                    output.Flush();
+                    {
+                        var m = new Test.M();
+                        m.v = new Dictionary<StructKey, L>();
+                        var k1 = new StructKey(1, "1");
+                        m.v[k1] = new L("one");
+                        var k2 = new StructKey(2, "2");
+                        m.v[k2] = new L("two");
+                        Test.M m1;
+                        var m2 = initial.opM(m, out m1);
+                        test(m1.v.Count == 2);
+                        test(m2.v.Count == 2);
+
+                        test(m1.v[k1].data.Equals("one"));
+                        test(m2.v[k1].data.Equals("one"));
+
+                        test(m1.v[k2].data.Equals("two"));
+                        test(m2.v[k2].data.Equals("two"));
+
+                    }
+                    output.WriteLine("ok");
+                    return initial;
                 }
             }
-            test(!initial.supportsClassGraphDepthMax());
-        }
-        catch(Ice.UnknownLocalException)
-        {
-            // Expected marshal exception from the server (max class graph depth reached)
-        }
-        catch(Ice.UnknownException)
-        {
-            // Expected stack overflow from the server (Java only)
-        }
-        initial.setRecursive(new Recursive());
-        WriteLine("ok");
-
-        Write("testing compact ID...");
-        Flush();
-        try
-        {
-            test(initial.getCompact() != null);
-        }
-        catch(Ice.OperationNotExistException)
-        {
         }
-        WriteLine("ok");
-
-        Write("testing marshaled results...");
-        Flush();
-        b1 = initial.getMB();
-        test(b1 != null && b1.theB == b1);
-        b1 = initial.getAMDMBAsync().Result;
-        test(b1 != null && b1.theB == b1);
-        WriteLine("ok");
-
-        Write("testing UnexpectedObjectException...");
-        Flush();
-        @ref = "uoet:" + app.getTestEndpoint(0);
-        @base = communicator.stringToProxy(@ref);
-        test(@base != null);
-        UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrxHelper.uncheckedCast(@base);
-        test(uoet != null);
-        try
-        {
-            uoet.op();
-            test(false);
-        }
-        catch(Ice.UnexpectedObjectException ex)
-        {
-            test(ex.type.Equals("::Test::AlsoEmpty"));
-            test(ex.expectedType.Equals("::Test::Empty"));
-        }
-        catch(System.Exception ex)
-        {
-            WriteLine(ex.ToString());
-            test(false);
-        }
-        WriteLine("ok");
-
-// Disable Obsolete warning/error
-#pragma warning disable 612, 618
-        Write("testing getting ObjectFactory...");
-        Flush();
-        test(communicator.findObjectFactory("TestOF") != null);
-        WriteLine("ok");
-        Write("testing getting ObjectFactory as ValueFactory...");
-        Flush();
-        test(communicator.getValueFactoryManager().find("TestOF") != null);
-        WriteLine("ok");
-#pragma warning restore 612, 618
-
-        Write("testing partial ice_initialize...");
-        Flush();
-        var ib1 = new IBase();
-        test(ib1.id.Equals("My id"));
-        var id1 = new IDerived();
-        test(id1.id.Equals("My id"));
-        test(id1.name.Equals("My name"));
-
-        var id2 = new IDerived2();
-        test(id2.id.Equals("My id"));
-        var i2 = new I2();
-        test(i2.called);
-
-        var s1 = new S1();
-        // The struct default constructor do not call ice_initialize
-        test(s1.id == 0);
-        s1 = new S1(2);
-        // The id should have the value set by ice_initialize and not 2
-        test(s1.id == 1);
-
-        var sc1 = new SC1();
-        test(sc1.id.Equals("My id"));
-        WriteLine("ok");
-        return initial;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/BI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/BI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/BI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/BI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class BI : B
+namespace Ice
 {
-    public override void ice_preMarshal()
+    namespace objects
     {
-        preMarshalInvoked = true;
-    }
+        public sealed class BI : Test.B
+        {
+            public override void ice_preMarshal()
+            {
+                preMarshalInvoked = true;
+            }
 
-    public override void ice_postUnmarshal()
-    {
-        postUnmarshalInvoked = true;
+            public override void ice_postUnmarshal()
+            {
+                postUnmarshalInvoked = true;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/CI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/CI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/CI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/CI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class CI : C
+namespace Ice
 {
-    public override void ice_preMarshal()
+    namespace objects
     {
-        preMarshalInvoked = true;
-    }
+        public sealed class CI : Test.C
+        {
+            public override void ice_preMarshal()
+            {
+                preMarshalInvoked = true;
+            }
 
-    public override void ice_postUnmarshal()
-    {
-        postUnmarshalInvoked = true;
+            public override void ice_postUnmarshal()
+            {
+                postUnmarshalInvoked = true;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace objects
     {
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.objects.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    var initial = Test.AllTests.allTests(this);
+                    initial.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        var initial = new InitialI(adapter);
-        adapter.add(initial, Ice.Util.stringToIdentity("initial"));
-        UnexpectedObjectExceptionTestI uet = new UnexpectedObjectExceptionTestI();
-        adapter.add(uet, Ice.Util.stringToIdentity("uoet"));
-        AllTests.allTests(this);
-        // We must call shutdown even in the collocated case for cyclic dependency cleanup
-        initial.shutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace objects
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.objects.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    var initial = new InitialI(adapter);
+                    adapter.add(initial, Ice.Util.stringToIdentity("initial"));
+                    var uet = new UnexpectedObjectExceptionTestI();
+                    adapter.add(uet, Ice.Util.stringToIdentity("uoet"));
+                    Test.AllTests.allTests(this);
+                    // We must call shutdown even in the collocated case for cyclic dependency cleanup
+                    initial.shutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/DI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/DI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/DI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/DI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class DI : D
+namespace Ice
 {
-    public override void ice_preMarshal()
+    namespace objects
     {
-        preMarshalInvoked = true;
-    }
 
-    public override void ice_postUnmarshal()
-    {
-        postUnmarshalInvoked = true;
+        public sealed class DI : Test.D
+        {
+            public override void ice_preMarshal()
+            {
+                preMarshalInvoked = true;
+            }
+
+            public override void ice_postUnmarshal()
+            {
+                postUnmarshalInvoked = true;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/EI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/EI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/EI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/EI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class EI : E
+namespace Ice
 {
-    public EI() : base(1, "hello")
+    namespace objects
     {
-    }
+        public sealed class EI : Test.E
+        {
+            public EI() : base(1, "hello")
+            {
+            }
 
-    public bool checkValues()
-    {
-        return i == 1 && s.Equals("hello");
+            public bool checkValues()
+            {
+                return i == 1 && s.Equals("hello");
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/FI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/FI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/FI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/FI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class FI : F
+namespace Ice
 {
-    public FI()
+    namespace objects
     {
-    }
+        public sealed class FI : Test.F
+        {
+            public FI()
+            {
+            }
 
-    public FI(E e) : base(e, e)
-    {
-    }
+            public FI(Test.E e) : base(e, e)
+            {
+            }
 
-    public bool checkValues()
-    {
-        return e1 != null && e1 == e2;
+            public bool checkValues()
+            {
+                return e1 != null && e1 == e2;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/HI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/HI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/HI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/HI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class HI : H
+namespace Ice
 {
+    namespace objects
+    {
+        public sealed class HI : Test.H
+        {
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/II.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/II.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/II.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/II.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class II : Ice.InterfaceByValue
+namespace Ice
 {
-    public II() : base(Test.IDisp_.ice_staticId())
+    namespace objects
     {
+        public sealed class II : Ice.InterfaceByValue
+        {
+            public II() : base(Test.IDisp_.ice_staticId())
+            {
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/InitialI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/InitialI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/InitialI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/InitialI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,175 +1,208 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Threading.Tasks;
-using Test;
+using System.Collections.Generic;
 
-public sealed class InitialI : InitialDisp_
+namespace Ice
 {
-    public InitialI(Ice.ObjectAdapter adapter)
-    {
-        _adapter = adapter;
-        _b1 = new BI();
-        _b2 = new BI();
-        _c = new CI();
-        _d = new DI();
-        _e = new EI();
-        _f = new FI(_e);
-
-        _b1.theA = _b2; // Cyclic reference to another B
-        _b1.theB = _b1; // Self reference.
-        _b1.theC = null; // Null reference.
-
-        _b2.theA = _b2; // Self reference, using base.
-        _b2.theB = _b1; // Cyclic reference to another B
-        _b2.theC = _c; // Cyclic reference to a C.
-
-        _c.theB = _b2; // Cyclic reference to a B.
-
-        _d.theA = _b1; // Reference to a B.
-        _d.theB = _b2; // Reference to a B.
-        _d.theC = null; // Reference to a C.
-    }
-
-    public override void getAll(out B b1, out B b2, out C c, out D d, Ice.Current current)
-    {
-        b1 = _b1;
-        b2 = _b2;
-        c = _c;
-        d = _d;
-    }
-
-    public override B getB1(Ice.Current current)
-    {
-        return _b1;
-    }
-
-    public override B getB2(Ice.Current current)
+    namespace objects
     {
-        return _b2;
+        public sealed class InitialI : Test.InitialDisp_
+        {
+            public InitialI(Ice.ObjectAdapter adapter)
+            {
+                _adapter = adapter;
+                _b1 = new BI();
+                _b2 = new BI();
+                _c = new CI();
+                _d = new DI();
+                _e = new EI();
+                _f = new FI(_e);
+
+                _b1.theA = _b2; // Cyclic reference to another B
+                _b1.theB = _b1; // Self reference.
+                _b1.theC = null; // Null reference.
+
+                _b2.theA = _b2; // Self reference, using base.
+                _b2.theB = _b1; // Cyclic reference to another B
+                _b2.theC = _c; // Cyclic reference to a C.
+
+                _c.theB = _b2; // Cyclic reference to a B.
+
+                _d.theA = _b1; // Reference to a B.
+                _d.theB = _b2; // Reference to a B.
+                _d.theC = null; // Reference to a C.
+            }
+
+            public override void getAll(out Test.B b1, out Test.B b2, out Test.C c, out Test.D d, Ice.Current current)
+            {
+                b1 = _b1;
+                b2 = _b2;
+                c = _c;
+                d = _d;
+            }
+
+            public override Test.B getB1(Ice.Current current)
+            {
+                return _b1;
+            }
+
+            public override Test.B getB2(Ice.Current current)
+            {
+                return _b2;
+            }
+
+            public override Test.C getC(Ice.Current current)
+            {
+                return _c;
+            }
+
+            public override Test.D getD(Ice.Current current)
+            {
+                return _d;
+            }
+
+            public override Test.E getE(Ice.Current current)
+            {
+                return _e;
+            }
+
+            public override Test.F getF(Ice.Current current)
+            {
+                return _f;
+            }
+
+            public override Ice.Value getI(Ice.Current current)
+            {
+                return new II();
+            }
+
+            public override Ice.Value getJ(Ice.Current current)
+            {
+                return new JI();
+            }
+
+            public override Ice.Value getH(Ice.Current current)
+            {
+                return new HI();
+            }
+
+            public override Test.K getK(Ice.Current current)
+            {
+                return new Test.K(new Test.L("l"));
+            }
+
+            public override Ice.Value opValue(Ice.Value v1, out Ice.Value v2, Ice.Current current)
+            {
+                v2 = v1;
+                return v1;
+            }
+
+            public override Ice.Value[] opValueSeq(Ice.Value[] v1, out Ice.Value[] v2, Ice.Current current)
+            {
+                v2 = v1;
+                return v1;
+            }
+
+            public override Dictionary<string, Ice.Value>
+            opValueMap(Dictionary<string, Ice.Value> v1, out Dictionary<string, Ice.Value> v2,
+                       Ice.Current current)
+            {
+                v2 = v1;
+                return v1;
+            }
+
+            public override void setRecursive(Test.Recursive r, Ice.Current current)
+            {
+            }
+
+            public override bool supportsClassGraphDepthMax(Ice.Current current)
+            {
+                return true;
+            }
+
+            public override Test.D1 getD1(Test.D1 d1, Ice.Current current)
+            {
+                return d1;
+            }
+
+            public override void throwEDerived(Ice.Current current)
+            {
+                throw new Test.EDerived(new Test.A1("a1"), new Test.A1("a2"), new Test.A1("a3"), new Test.A1("a4"));
+            }
+
+            public override void setG(Test.G theG, Ice.Current current)
+            {
+            }
+
+            public override void setI(Ice.Value theI, Ice.Current current)
+            {
+            }
+
+            public override Test.Base[] opBaseSeq(Test.Base[] inS, out Test.Base[] outS, Ice.Current current)
+            {
+                outS = inS;
+                return inS;
+            }
+
+            public override Test.Compact getCompact(Ice.Current current)
+            {
+                return new Test.CompactExt();
+            }
+
+            public override void shutdown(Ice.Current current = null)
+            {
+                _adapter.getCommunicator().shutdown();
+            }
+
+            public override Test.Inner.A
+            getInnerA(Ice.Current current)
+            {
+                return new Test.Inner.A(_b1);
+            }
+
+            public override Test.Inner.Sub.A
+            getInnerSubA(Ice.Current current)
+            {
+                return new Test.Inner.Sub.A(new Test.Inner.A(_b1));
+            }
+
+            public override void throwInnerEx(Ice.Current current)
+            {
+                throw new Test.Inner.Ex("Inner::Ex");
+            }
+
+            public override void throwInnerSubEx(Ice.Current current)
+            {
+                throw new Test.Inner.Sub.Ex("Inner::Sub::Ex");
+            }
+
+            public override Test.Initial_GetMBMarshaledResult getMB(Ice.Current current)
+            {
+                return new Test.Initial_GetMBMarshaledResult(_b1, current);
+            }
+
+            public override Task<Test.Initial_GetAMDMBMarshaledResult> getAMDMBAsync(Ice.Current current)
+            {
+                return Task.FromResult(new Test.Initial_GetAMDMBMarshaledResult(_b1, current));
+            }
+
+            public override Test.M
+            opM(Test.M v1, out Test.M v2, Ice.Current current)
+            {
+                v2 = v1;
+                return v1;
+            }
+
+            private Ice.ObjectAdapter _adapter;
+            private Test.B _b1;
+            private Test.B _b2;
+            private Test.C _c;
+            private Test.D _d;
+            private Test.E _e;
+            private Test.F _f;
+        }
     }
-
-    public override C getC(Ice.Current current)
-    {
-        return _c;
-    }
-
-    public override D getD(Ice.Current current)
-    {
-        return _d;
-    }
-
-    public override E getE(Ice.Current current)
-    {
-        return _e;
-    }
-
-    public override F getF(Ice.Current current)
-    {
-        return _f;
-    }
-
-    public override Ice.Value getI(Ice.Current current)
-    {
-        return new II();
-    }
-
-    public override Ice.Value getJ(Ice.Current current)
-    {
-        return new JI();
-    }
-
-    public override Ice.Value getH(Ice.Current current)
-    {
-        return new HI();
-    }
-
-    public override void setRecursive(Recursive r, Ice.Current current)
-    {
-    }
-
-    public override bool supportsClassGraphDepthMax(Ice.Current current)
-    {
-        return true;
-    }
-
-    public override D1 getD1(D1 d1, Ice.Current current)
-    {
-        return d1;
-    }
-
-    public override void throwEDerived(Ice.Current current)
-    {
-        throw new EDerived(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4"));
-    }
-
-    public override void setG(G theG, Ice.Current current)
-    {
-    }
-
-    public override void setI(Ice.Value theI, Ice.Current current)
-    {
-    }
-
-    public override Base[] opBaseSeq(Base[] inS, out Base[] outS, Ice.Current current)
-    {
-        outS = inS;
-        return inS;
-    }
-
-    public override Compact getCompact(Ice.Current current)
-    {
-        return new CompactExt();
-    }
-
-    public override void shutdown(Ice.Current current = null)
-    {
-        _adapter.getCommunicator().shutdown();
-    }
-
-    public override Test.Inner.A
-    getInnerA(Ice.Current current)
-    {
-        return new Test.Inner.A(_b1);
-    }
-
-    public override Test.Inner.Sub.A
-    getInnerSubA(Ice.Current current)
-    {
-        return new Test.Inner.Sub.A(new Test.Inner.A(_b1));
-    }
-
-    public override void throwInnerEx(Ice.Current current)
-    {
-        throw new Test.Inner.Ex("Inner::Ex");
-    }
-
-    public override void throwInnerSubEx(Ice.Current current)
-    {
-        throw new Test.Inner.Sub.Ex("Inner::Sub::Ex");
-    }
-
-    public override Initial_GetMBMarshaledResult getMB(Ice.Current current)
-    {
-        return new Initial_GetMBMarshaledResult(_b1, current);
-    }
-
-    public override Task<Initial_GetAMDMBMarshaledResult> getAMDMBAsync(Ice.Current current)
-    {
-        return Task.FromResult(new Initial_GetAMDMBMarshaledResult(_b1, current));
-    }
-
-    private Ice.ObjectAdapter _adapter;
-    private B _b1;
-    private B _b2;
-    private C _c;
-    private D _d;
-    private E _e;
-    private F _f;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/JI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/JI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/JI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/JI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class JI : Ice.InterfaceByValue
+namespace Ice
 {
-    public JI() : base(Test.JDisp_.ice_staticId())
+    namespace objects
     {
+        public sealed class JI : Ice.InterfaceByValue
+        {
+            public JI() : base(Test.JDisp_.ice_staticId())
+            {
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -67,24 +67,24 @@
     <Compile Include="..\..\..\JI.cs">
       <Link>JI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../BI.cs"/>
-    <Compile Include="../../../CI.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../DI.cs"/>
-    <Compile Include="../../../EI.cs"/>
-    <Compile Include="../../../FI.cs"/>
-    <Compile Include="../../../HI.cs"/>
-    <Compile Include="../../../II.cs"/>
-    <Compile Include="../../../JI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../BI.cs" />
+    <Compile Include="../../../CI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../DI.cs" />
+    <Compile Include="../../../EI.cs" />
+    <Compile Include="../../../FI.cs" />
+    <Compile Include="../../../HI.cs" />
+    <Compile Include="../../../II.cs" />
+    <Compile Include="../../../JI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -73,14 +73,14 @@
     <Compile Include="..\..\..\UnexpectedObjectExceptionTestI.cs">
       <Link>UnexpectedObjectExceptionTestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -94,15 +94,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../BI.cs"/>
-    <Compile Include="../../../CI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <Compile Include="../../../DI.cs"/>
-    <Compile Include="../../../EI.cs"/>
-    <Compile Include="../../../FI.cs"/>
-    <Compile Include="../../../HI.cs"/>
-    <Compile Include="../../../II.cs"/>
-    <Compile Include="../../../InitialI.cs"/>
-    <Compile Include="../../../JI.cs"/>
-    <Compile Include="../../../UnexpectedObjectExceptionTestI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../BI.cs" />
+    <Compile Include="../../../CI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../DI.cs" />
+    <Compile Include="../../../EI.cs" />
+    <Compile Include="../../../FI.cs" />
+    <Compile Include="../../../HI.cs" />
+    <Compile Include="../../../II.cs" />
+    <Compile Include="../../../InitialI.cs" />
+    <Compile Include="../../../JI.cs" />
+    <Compile Include="../../../UnexpectedObjectExceptionTestI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\BI.cs">
       <Link>BI.cs</Link>
@@ -70,24 +70,24 @@
     <Compile Include="..\..\..\UnexpectedObjectExceptionTestI.cs">
       <Link>UnexpectedObjectExceptionTestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../BI.cs"/>
-    <Compile Include="../../../CI.cs"/>
-    <Compile Include="../../../DI.cs"/>
-    <Compile Include="../../../EI.cs"/>
-    <Compile Include="../../../FI.cs"/>
-    <Compile Include="../../../HI.cs"/>
-    <Compile Include="../../../II.cs"/>
-    <Compile Include="../../../InitialI.cs"/>
-    <Compile Include="../../../JI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <Compile Include="../../../UnexpectedObjectExceptionTestI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../BI.cs" />
+    <Compile Include="../../../CI.cs" />
+    <Compile Include="../../../DI.cs" />
+    <Compile Include="../../../EI.cs" />
+    <Compile Include="../../../FI.cs" />
+    <Compile Include="../../../HI.cs" />
+    <Compile Include="../../../II.cs" />
+    <Compile Include="../../../InitialI.cs" />
+    <Compile Include="../../../JI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../UnexpectedObjectExceptionTestI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.objects</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../BI.cs" />
+    <Compile Include="../../../CI.cs" />
+    <Compile Include="../../../DI.cs" />
+    <Compile Include="../../../EI.cs" />
+    <Compile Include="../../../FI.cs" />
+    <Compile Include="../../../HI.cs" />
+    <Compile Include="../../../II.cs" />
+    <Compile Include="../../../JI.cs" />
+    <Compile Include="../../../InitialI.cs" />
+    <Compile Include="../../../UnexpectedObjectExceptionTestI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,69 +1,62 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public static Ice.Value MyValueFactory(string type)
+    namespace objects
     {
-        if(type.Equals("::Test::I"))
-        {
-            return new II();
-        }
-        else if(type.Equals("::Test::J"))
+        public class Server : TestHelper
         {
-            return new JI();
+            public static Ice.Value MyValueFactory(string type)
+            {
+                if(type.Equals("::Test::I"))
+                {
+                    return new II();
+                }
+                else if(type.Equals("::Test::J"))
+                {
+                    return new JI();
+                }
+                else if(type.Equals("::Test::H"))
+                {
+                    return new HI();
+                }
+                Debug.Assert(false); // Should never be reached
+                return null;
+            }
+
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.objects.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J");
+                    communicator.getValueFactoryManager().add(MyValueFactory, "::Test::H");
+
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.Object @object = new InitialI(adapter);
+                    adapter.add(@object, Ice.Util.stringToIdentity("initial"));
+                    @object = new UnexpectedObjectExceptionTestI();
+                    adapter.add(@object, Ice.Util.stringToIdentity("uoet"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
         }
-        else if(type.Equals("::Test::H"))
-        {
-            return new HI();
-        }
-        Debug.Assert(false); // Should never be reached
-        return null;
-    }
-
-    public override int run(string[] args)
-    {
-        communicator().getValueFactoryManager().add(MyValueFactory, "::Test::I");
-        communicator().getValueFactoryManager().add(MyValueFactory, "::Test::J");
-        communicator().getValueFactoryManager().add(MyValueFactory, "::Test::H");
-
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object @object = new InitialI(adapter);
-        adapter.add(@object, Ice.Util.stringToIdentity("initial"));
-        @object = new UnexpectedObjectExceptionTestI();
-        adapter.add(@object, Ice.Util.stringToIdentity("uoet"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["suppress-warning:deprecated"]] // For classes with operations
-
+[["cs:typeid-namespace:Ice.objects.TypeId", "suppress-warning:deprecated"]] // For classes with operations
+["cs:namespace:Ice.objects"]
 module Test
 {
 
@@ -172,6 +167,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 interface Initial
 {
     void shutdown();
@@ -190,9 +211,15 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -209,6 +236,8 @@
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 class Empty
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs zeroc-ice-3.7.2/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class UnexpectedObjectExceptionTestI : Ice.Blobject
+namespace Ice
 {
-    public override bool ice_invoke(byte[] inParams, out byte[] outParams, Ice.Current current)
+    namespace objects
     {
-        Ice.Communicator communicator = current.adapter.getCommunicator();
-        Ice.OutputStream @out = new Ice.OutputStream(communicator);
-        @out.startEncapsulation(current.encoding, Ice.FormatType.DefaultFormat);
-        AlsoEmpty ae = new AlsoEmpty();
-        @out.writeValue(ae);
-        @out.writePendingValues();
-        @out.endEncapsulation();
-        outParams = @out.finished();
-        return true;
+        public sealed class UnexpectedObjectExceptionTestI : Ice.Blobject
+        {
+            public override bool ice_invoke(byte[] inParams, out byte[] outParams, Ice.Current current)
+            {
+                var communicator = current.adapter.getCommunicator();
+                var @out = new Ice.OutputStream(communicator);
+                @out.startEncapsulation(current.encoding, Ice.FormatType.DefaultFormat);
+                var ae = new Test.AlsoEmpty();
+                @out.writeValue(ae);
+                @out.writePendingValues();
+                @out.endEncapsulation();
+                outParams = @out.finished();
+                return true;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,59 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static Test.MyClassPrx allTests(TestCommon.Application app)
+    namespace operations
     {
-        Ice.Communicator communicator = app.communicator();
-        Flush();
-        string rf = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
-        Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
-        Test.MyDerivedClassPrx derivedProxy = Test.MyDerivedClassPrxHelper.checkedCast(cl);
-
-        Write("testing twoway operations... ");
-        Flush();
-        Twoways.twoways(app, cl);
-        Twoways.twoways(app, derivedProxy);
-        derivedProxy.opDerived();
-        WriteLine("ok");
-
-        Write("testing oneway operations... ");
-        Flush();
-        Oneways.oneways(app, cl);
-        WriteLine("ok");
-
-        Write("testing twoway operations with AMI... ");
-        Flush();
-        TwowaysAMI.twowaysAMI(app, cl);
-        TwowaysAMI.twowaysAMI(app, derivedProxy);
-        WriteLine("ok");
-
-        Write("testing oneway operations with AMI... ");
-        Flush();
-        OnewaysAMI.onewaysAMI(app, cl);
-        WriteLine("ok");
-
-        Write("testing batch oneway operations... ");
-        Flush();
-        BatchOneways.batchOneways(cl);
-        BatchOneways.batchOneways(derivedProxy);
-        WriteLine("ok");
-
-        Write("testing batch AMI oneway operations... ");
-        Flush();
-        BatchOnewaysAMI.batchOneways(cl);
-        BatchOnewaysAMI.batchOneways(derivedProxy);
-        WriteLine("ok");
-        return cl;
+        public class AllTests : global::Test.AllTests
+        {
+            public static Test.MyClassPrx allTests(global::Test.TestHelper helper)
+            {
+                Ice.Communicator communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Flush();
+                string rf = "test:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
+                var cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
+                var derivedProxy = Test.MyDerivedClassPrxHelper.checkedCast(cl);
+
+                output.Write("testing twoway operations... ");
+                output.Flush();
+                Twoways.twoways(helper, cl);
+                Twoways.twoways(helper, derivedProxy);
+                derivedProxy.opDerived();
+                output.WriteLine("ok");
+
+                output.Write("testing oneway operations... ");
+                output.Flush();
+                Oneways.oneways(helper, cl);
+                output.WriteLine("ok");
+
+                output.Write("testing twoway operations with AMI... ");
+                output.Flush();
+                TwowaysAMI.twowaysAMI(helper, cl);
+                TwowaysAMI.twowaysAMI(helper, derivedProxy);
+                output.WriteLine("ok");
+
+                output.Write("testing oneway operations with AMI... ");
+                output.Flush();
+                OnewaysAMI.onewaysAMI(helper, cl);
+                output.WriteLine("ok");
+
+                output.Write("testing batch oneway operations... ");
+                output.Flush();
+                BatchOneways.batchOneways(helper, cl);
+                BatchOneways.batchOneways(helper, derivedProxy);
+                output.WriteLine("ok");
+
+                output.Write("testing batch AMI oneway operations... ");
+                output.Flush();
+                BatchOnewaysAMI.batchOneways(cl);
+                BatchOnewaysAMI.batchOneways(derivedProxy);
+                output.WriteLine("ok");
+                return cl;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/BatchOnewaysAMI.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/BatchOnewaysAMI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/BatchOnewaysAMI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/BatchOnewaysAMI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,120 +1,121 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
 
-class BatchOnewaysAMI
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    private class Callback
+    namespace operations
     {
-        internal Callback()
+        class BatchOnewaysAMI
         {
-            _called = false;
-        }
-
-        public void check()
-        {
-            lock(this)
+            private static void test(bool b)
             {
-                while(!_called)
+                if (!b)
                 {
-                    System.Threading.Monitor.Wait(this);
+                    throw new System.Exception();
                 }
-
-                _called = false;
             }
-        }
 
-        public void called()
-        {
-            lock(this)
+            private class Callback
             {
-                Debug.Assert(!_called);
-                _called = true;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
+                internal Callback()
+                {
+                    _called = false;
+                }
 
-        private bool _called;
-    }
+                public void check()
+                {
+                    lock (this)
+                    {
+                        while (!_called)
+                        {
+                            System.Threading.Monitor.Wait(this);
+                        }
 
-    internal static void batchOneways(Test.MyClassPrx p)
-    {
-        byte[] bs1 = new byte[10  * 1024];
+                        _called = false;
+                    }
+                }
 
-        Test.MyClassPrx batch = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
-        batch.end_ice_flushBatchRequests(batch.begin_ice_flushBatchRequests());
+                public void called()
+                {
+                    lock (this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        System.Threading.Monitor.Pulse(this);
+                    }
+                }
 
-        test(batch.begin_ice_flushBatchRequests().isSent());
-        test(batch.begin_ice_flushBatchRequests().isCompleted_());
-        test(batch.begin_ice_flushBatchRequests().sentSynchronously());
+                private bool _called;
+            }
 
-        for(int i = 0 ; i < 30 ; ++i)
-        {
-            batch.begin_opByteSOneway(bs1).whenCompleted(
-                () =>
+            internal static void batchOneways(Test.MyClassPrx p)
+            {
+                byte[] bs1 = new byte[10 * 1024];
+
+                Test.MyClassPrx batch = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
+                batch.end_ice_flushBatchRequests(batch.begin_ice_flushBatchRequests());
+
+                test(batch.begin_ice_flushBatchRequests().isSent());
+                test(batch.begin_ice_flushBatchRequests().isCompleted_());
+                test(batch.begin_ice_flushBatchRequests().sentSynchronously());
+
+                for (int i = 0; i < 30; ++i)
                 {
-                },
-                (Ice.Exception ex) =>
+                    batch.begin_opByteSOneway(bs1).whenCompleted(
+                        () =>
+                        {
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            test(false);
+                        });
+                }
+
+                int count = 0;
+                while (count < 27) // 3 * 9 requests auto-flushed.
                 {
-                    test(false);
-                });
-        }
+                    count += p.opByteSOnewayCallCount();
+                    System.Threading.Thread.Sleep(10);
+                }
 
-        int count = 0;
-        while(count < 27) // 3 * 9 requests auto-flushed.
-        {
-            count += p.opByteSOnewayCallCount();
-            System.Threading.Thread.Sleep(10);
-        }
+                if (batch.ice_getConnection() != null)
+                {
+                    Test.MyClassPrx batch1 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
+                    Test.MyClassPrx batch2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
 
-        if(batch.ice_getConnection() != null)
-        {
-            Test.MyClassPrx batch1 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
-            Test.MyClassPrx batch2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
+                    batch1.begin_ice_ping();
+                    batch2.begin_ice_ping();
+                    batch1.end_ice_flushBatchRequests(batch1.begin_ice_flushBatchRequests());
+                    batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    batch1.begin_ice_ping();
+                    batch2.begin_ice_ping();
 
-            batch1.begin_ice_ping();
-            batch2.begin_ice_ping();
-            batch1.end_ice_flushBatchRequests(batch1.begin_ice_flushBatchRequests());
-            batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            batch1.begin_ice_ping();
-            batch2.begin_ice_ping();
+                    batch1.ice_getConnection();
+                    batch2.ice_getConnection();
 
-            batch1.ice_getConnection();
-            batch2.ice_getConnection();
+                    batch1.begin_ice_ping();
+                    batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
-            batch1.begin_ice_ping();
-            batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    batch1.begin_ice_ping();
+                    batch2.begin_ice_ping();
+                }
 
-            batch1.begin_ice_ping();
-            batch2.begin_ice_ping();
+                Ice.Identity identity = new Ice.Identity();
+                identity.name = "invalid";
+                Ice.ObjectPrx batch3 = batch.ice_identity(identity);
+                batch3.begin_ice_ping();
+                batch3.end_ice_flushBatchRequests(batch3.begin_ice_flushBatchRequests());
+
+                // Make sure that a bogus batch request doesn't cause troubles to other ones.
+                batch3.begin_ice_ping();
+                batch.begin_ice_ping();
+                batch.end_ice_flushBatchRequests(batch.begin_ice_flushBatchRequests());
+                batch.begin_ice_ping();
+            }
         }
-
-        Ice.Identity identity = new Ice.Identity();
-        identity.name = "invalid";
-        Ice.ObjectPrx batch3 = batch.ice_identity(identity);
-        batch3.begin_ice_ping();
-        batch3.end_ice_flushBatchRequests(batch3.begin_ice_flushBatchRequests());
-
-        // Make sure that a bogus batch request doesn't cause troubles to other ones.
-        batch3.begin_ice_ping();
-        batch.begin_ice_ping();
-        batch.end_ice_flushBatchRequests(batch.begin_ice_flushBatchRequests());
-        batch.begin_ice_ping();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/BatchOneways.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/BatchOneways.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/BatchOneways.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/BatchOneways.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,212 +1,211 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
 
-class BatchOneways
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    class BatchRequestInterceptorI
+    namespace operations
     {
-        public void enqueue(Ice.BatchRequest request, int count, int size)
+        class BatchOneways
         {
-            test(request.getOperation().Equals("opByteSOneway") || request.getOperation().Equals("ice_ping"));
-            test(request.getProxy().ice_isBatchOneway());
-
-            if(count > 0)
+            private static void test(bool b)
             {
-                test(_lastRequestSize + _size == size);
+                if (!b)
+                {
+                    throw new System.Exception();
+                }
             }
-            _count = count;
-            _size = size;
 
-            if(_size + request.getSize() > 25000)
+            class BatchRequestInterceptorI
             {
-                request.getProxy().begin_ice_flushBatchRequests();
-                _size = 18; // header
-            }
+                public void enqueue(Ice.BatchRequest request, int count, int size)
+                {
+                    test(request.getOperation().Equals("opByteSOneway") || request.getOperation().Equals("ice_ping"));
+                    test(request.getProxy().ice_isBatchOneway());
+
+                    if (count > 0)
+                    {
+                        test(_lastRequestSize + _size == size);
+                    }
+                    _count = count;
+                    _size = size;
+
+                    if (_size + request.getSize() > 25000)
+                    {
+                        request.getProxy().begin_ice_flushBatchRequests();
+                        _size = 18; // header
+                    }
+
+                    if (_enabled)
+                    {
+                        _lastRequestSize = request.getSize();
+                        ++_count;
+                        request.enqueue();
+                    }
+                }
+
+                public void setEnqueue(bool enabled)
+                {
+                    _enabled = enabled;
+                }
+
+                public int count()
+                {
+                    return _count;
+                }
+
+                private bool _enabled;
+                private int _count;
+                private int _size;
+                private int _lastRequestSize;
+            };
 
-            if(_enabled)
+            internal static void batchOneways(global::Test.TestHelper helper, Test.MyClassPrx p)
             {
-                _lastRequestSize = request.getSize();
-                ++_count;
-                request.enqueue();
-            }
-        }
+                byte[] bs1 = new byte[10 * 1024];
 
-        public void setEnqueue(bool enabled)
-        {
-            _enabled = enabled;
-        }
-
-        public int count()
-        {
-            return _count;
-        }
-
-        private bool _enabled;
-        private int _count;
-        private int _size;
-        private int _lastRequestSize;
-    };
+                Test.MyClassPrx batch = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
+                batch.ice_flushBatchRequests(); // Empty flush
 
-    internal static void batchOneways(Test.MyClassPrx p)
-    {
-        byte[] bs1 = new byte[10  * 1024];
+                p.opByteSOnewayCallCount(); // Reset the call count
 
-        Test.MyClassPrx batch = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
-        batch.ice_flushBatchRequests(); // Empty flush
-
-        p.opByteSOnewayCallCount(); // Reset the call count
-
-        for(int i = 0 ; i < 30 ; ++i)
-        {
-            try
-            {
-                batch.opByteSOneway(bs1);
-                test(true);
-            }
-            catch(Ice.MemoryLimitException)
-            {
-                test(false);
+                for (int i = 0; i < 30; ++i)
+                {
+                    try
+                    {
+                        batch.opByteSOneway(bs1);
+                        test(true);
+                    }
+                    catch (Ice.MemoryLimitException)
+                    {
+                        test(false);
+                    }
+                }
+
+                int count = 0;
+                while (count < 27) // 3 * 9 requests auto-flushed.
+                {
+                    count += p.opByteSOnewayCallCount();
+                    System.Threading.Thread.Sleep(10);
+                }
+
+                if (batch.ice_getConnection() != null)
+                {
+                    Test.MyClassPrx batch1 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
+                    Test.MyClassPrx batch2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
+
+                    batch1.ice_ping();
+                    batch2.ice_ping();
+                    batch1.ice_flushBatchRequests();
+                    batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    batch1.ice_ping();
+                    batch2.ice_ping();
+
+                    batch1.ice_getConnection();
+                    batch2.ice_getConnection();
+
+                    batch1.ice_ping();
+                    batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    batch1.ice_ping();
+                    batch2.ice_ping();
+                }
+
+                Ice.Identity identity = new Ice.Identity();
+                identity.name = "invalid";
+                Ice.ObjectPrx batch3 = batch.ice_identity(identity);
+                batch3.ice_ping();
+                batch3.ice_flushBatchRequests();
+
+                // Make sure that a bogus batch request doesn't cause troubles to other ones.
+                batch3.ice_ping();
+                batch.ice_ping();
+                batch.ice_flushBatchRequests();
+                batch.ice_ping();
+
+                if (batch.ice_getConnection() != null)
+                {
+                    Ice.InitializationData initData = new Ice.InitializationData();
+                    initData.properties = p.ice_getCommunicator().getProperties().ice_clone_();
+                    BatchRequestInterceptorI interceptor = new BatchRequestInterceptorI();
+                    initData.batchRequestInterceptor = interceptor.enqueue;
+                    Ice.Communicator ic = helper.initialize(initData);
+
+                    batch = Test.MyClassPrxHelper.uncheckedCast(ic.stringToProxy(p.ToString()).ice_batchOneway());
+
+                    test(interceptor.count() == 0);
+                    batch.ice_ping();
+                    batch.ice_ping();
+                    batch.ice_ping();
+                    test(interceptor.count() == 0);
+
+                    interceptor.setEnqueue(true);
+                    batch.ice_ping();
+                    batch.ice_ping();
+                    batch.ice_ping();
+                    test(interceptor.count() == 3);
+
+                    batch.ice_flushBatchRequests();
+                    batch.ice_ping();
+                    test(interceptor.count() == 1);
+
+                    batch.opByteSOneway(bs1);
+                    test(interceptor.count() == 2);
+                    batch.opByteSOneway(bs1);
+                    test(interceptor.count() == 3);
+
+                    batch.opByteSOneway(bs1); // This should trigger the flush
+                    batch.ice_ping();
+                    test(interceptor.count() == 2);
+
+                    ic.destroy();
+                }
+
+                p.ice_ping();
+
+                bool supportsCompress = true;
+                try
+                {
+                    supportsCompress = p.supportsCompress();
+                }
+                catch (Ice.OperationNotExistException)
+                {
+                }
+
+                if (supportsCompress && p.ice_getConnection() != null &&
+                   p.ice_getCommunicator().getProperties().getProperty("Ice.Override.Compress").Equals(""))
+                {
+                    Ice.ObjectPrx prx = p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway();
+
+                    Test.MyClassPrx batchC1 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_compress(false));
+                    Test.MyClassPrx batchC2 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_compress(true));
+                    Test.MyClassPrx batchC3 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_identity(identity));
+
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.Yes);
+
+                    batchC2.opByteSOneway(bs1);
+                    batchC2.opByteSOneway(bs1);
+                    batchC2.opByteSOneway(bs1);
+                    batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.No);
+
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+
+                    batchC1.opByteSOneway(bs1);
+                    batchC2.opByteSOneway(bs1);
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+
+                    batchC1.opByteSOneway(bs1);
+                    batchC3.opByteSOneway(bs1);
+                    batchC1.opByteSOneway(bs1);
+                    batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+                }
             }
         }
-
-        int count = 0;
-        while(count < 27) // 3 * 9 requests auto-flushed.
-        {
-            count += p.opByteSOnewayCallCount();
-            System.Threading.Thread.Sleep(10);
-        }
-
-        if(batch.ice_getConnection() != null)
-        {
-            Test.MyClassPrx batch1 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
-            Test.MyClassPrx batch2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_batchOneway());
-
-            batch1.ice_ping();
-            batch2.ice_ping();
-            batch1.ice_flushBatchRequests();
-            batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            batch1.ice_ping();
-            batch2.ice_ping();
-
-            batch1.ice_getConnection();
-            batch2.ice_getConnection();
-
-            batch1.ice_ping();
-            batch1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            batch1.ice_ping();
-            batch2.ice_ping();
-        }
-
-        Ice.Identity identity = new Ice.Identity();
-        identity.name = "invalid";
-        Ice.ObjectPrx batch3 = batch.ice_identity(identity);
-        batch3.ice_ping();
-        batch3.ice_flushBatchRequests();
-
-        // Make sure that a bogus batch request doesn't cause troubles to other ones.
-        batch3.ice_ping();
-        batch.ice_ping();
-        batch.ice_flushBatchRequests();
-        batch.ice_ping();
-
-        if(batch.ice_getConnection() != null)
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = p.ice_getCommunicator().getProperties().ice_clone_();
-            BatchRequestInterceptorI interceptor = new BatchRequestInterceptorI();
-            initData.batchRequestInterceptor = interceptor.enqueue;
-            Ice.Communicator ic = Ice.Util.initialize(initData);
-
-            batch = Test.MyClassPrxHelper.uncheckedCast(ic.stringToProxy(p.ToString()).ice_batchOneway());
-
-            test(interceptor.count() == 0);
-            batch.ice_ping();
-            batch.ice_ping();
-            batch.ice_ping();
-            test(interceptor.count() == 0);
-
-            interceptor.setEnqueue(true);
-            batch.ice_ping();
-            batch.ice_ping();
-            batch.ice_ping();
-            test(interceptor.count() == 3);
-
-            batch.ice_flushBatchRequests();
-            batch.ice_ping();
-            test(interceptor.count() == 1);
-
-            batch.opByteSOneway(bs1);
-            test(interceptor.count() == 2);
-            batch.opByteSOneway(bs1);
-            test(interceptor.count() == 3);
-
-            batch.opByteSOneway(bs1); // This should trigger the flush
-            batch.ice_ping();
-            test(interceptor.count() == 2);
-
-            ic.destroy();
-        }
-
-        p.ice_ping();
-
-        bool supportsCompress = true;
-        try
-        {
-            supportsCompress = p.supportsCompress();
-        }
-        catch(Ice.OperationNotExistException)
-        {
-        }
-
-        if(supportsCompress && p.ice_getConnection() != null &&
-           p.ice_getCommunicator().getProperties().getProperty("Ice.Override.Compress").Equals(""))
-        {
-            Ice.ObjectPrx prx = p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway();
-
-            Test.MyClassPrx batchC1 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_compress(false));
-            Test.MyClassPrx batchC2 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_compress(true));
-            Test.MyClassPrx batchC3 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_identity(identity));
-
-            batchC1.opByteSOneway(bs1);
-            batchC1.opByteSOneway(bs1);
-            batchC1.opByteSOneway(bs1);
-            batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.Yes);
-
-            batchC2.opByteSOneway(bs1);
-            batchC2.opByteSOneway(bs1);
-            batchC2.opByteSOneway(bs1);
-            batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.No);
-
-            batchC1.opByteSOneway(bs1);
-            batchC1.opByteSOneway(bs1);
-            batchC1.opByteSOneway(bs1);
-            batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-
-            batchC1.opByteSOneway(bs1);
-            batchC2.opByteSOneway(bs1);
-            batchC1.opByteSOneway(bs1);
-            batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-
-            batchC1.opByteSOneway(bs1);
-            batchC3.opByteSOneway(bs1);
-            batchC1.opByteSOneway(bs1);
-            batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
-        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,47 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace operations
     {
-        Test.MyClassPrx myClass = AllTests.allTests(this);
-
-        Console.Out.Write("testing server shutdown... ");
-        Console.Out.Flush();
-        myClass.shutdown();
-        try
+        public class Client : TestHelper
         {
-            myClass.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
-            throw new System.Exception();
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+                initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+                initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
+                using(var communicator = initialize(initData))
+                {
+                    var myClass = AllTests.allTests(this);
+
+                    Console.Out.Write("testing server shutdown... ");
+                    Console.Out.Flush();
+                    myClass.shutdown();
+                    try
+                    {
+                        myClass.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+                        test(false);
+                    }
+                    catch (Ice.LocalException)
+                    {
+                        Console.Out.WriteLine("ok");
+                    }
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
         }
-        catch(Ice.LocalException)
-        {
-            Console.Out.WriteLine("ok");
-        }
-
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-        initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,45 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace operations
     {
-        communicator().getProperties().setProperty("TestAdapter.AdapterId", "test");
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        if(prx.ice_getConnection() != null)
+        public class Collocated : TestHelper
         {
-            throw new Exception();
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+                initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+                initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.AdapterId", "test");
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                    //adapter.activate(); // Don't activate OA to ensure collocation is used.
+
+                    if(prx.ice_getConnection() != null)
+                    {
+                        throw new System.Exception();
+                    }
+
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
         }
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-        initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Collocated app = new Collocated();
-        return app.runmain(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -61,24 +61,24 @@
     <Compile Include="..\..\..\TwowaysAMI.cs">
       <Link>TwowaysAMI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../BatchOneways.cs"/>
-    <Compile Include="../../../BatchOnewaysAMI.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../Oneways.cs"/>
-    <Compile Include="../../../OnewaysAMI.cs"/>
-    <Compile Include="../../../Twoways.cs"/>
-    <Compile Include="../../../TwowaysAMI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../BatchOneways.cs" />
+    <Compile Include="../../../BatchOnewaysAMI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Oneways.cs" />
+    <Compile Include="../../../OnewaysAMI.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -64,14 +64,14 @@
     <Compile Include="..\..\..\TwowaysAMI.cs">
       <Link>TwowaysAMI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -85,15 +85,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../BatchOneways.cs"/>
-    <Compile Include="../../../BatchOnewaysAMI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <Compile Include="../../../MyDerivedClassI.cs"/>
-    <Compile Include="../../../Oneways.cs"/>
-    <Compile Include="../../../OnewaysAMI.cs"/>
-    <Compile Include="../../../Twoways.cs"/>
-    <Compile Include="../../../TwowaysAMI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../BatchOneways.cs" />
+    <Compile Include="../../../BatchOnewaysAMI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../MyDerivedClassI.cs" />
+    <Compile Include="../../../Oneways.cs" />
+    <Compile Include="../../../OnewaysAMI.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyDerivedClassI.cs">
       <Link>MyDerivedClassI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyDerivedClassI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,51 +17,50 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyDerivedClassAMDI.cs">
       <Link>MyDerivedClassAMDI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Server.cs">
-      <Link>Server.cs</Link>
+    <Compile Include="..\..\..\ServerAMD.cs">
+      <Link>ServerAMD.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyDerivedClassAMDI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramdtie/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramdtie/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramdtie/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramdtie/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramdtie/net45/serveramdtie.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramdtie/net45/serveramdtie.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramdtie/net45/serveramdtie.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramdtie/net45/serveramdtie.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,51 +17,50 @@
     <AssemblyName>serveramdtie</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyDerivedClassAMDTieI.cs">
       <Link>MyDerivedClassAMDTieI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Server.cs">
-      <Link>Server.cs</Link>
+    <Compile Include="..\..\..\ServerAMDTie.cs">
+      <Link>ServerAMDTie.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramdtie.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramdtie.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/serveramdtie/netstandard2.0/serveramdtie.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramdtie</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyDerivedClassAMDTieI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassAMDTieI.cs" />
+    <Compile Include="../../../ServerAMDTie.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/servertie/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/servertie/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/servertie/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/servertie/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/servertie/net45/servertie.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/servertie/net45/servertie.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/servertie/net45/servertie.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/servertie/net45/servertie.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,51 +17,50 @@
     <AssemblyName>servertie</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyDerivedClassTieI.cs">
       <Link>MyDerivedClassTieI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Server.cs">
-      <Link>Server.cs</Link>
+    <Compile Include="..\..\..\ServerTie.cs">
+      <Link>ServerTie.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="servertie.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="servertie.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/servertie/netstandard2.0/servertie.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>servertie</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyDerivedClassTieI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassTieI.cs" />
+    <Compile Include="../../../ServerTie.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.operations</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../BatchOneways.cs" />
+    <Compile Include="../../../BatchOnewaysAMI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Oneways.cs" />
+    <Compile Include="../../../OnewaysAMI.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="../../../MyDerivedClassI.cs" />
+    <Compile Include="../../../MyDerivedClassTieI.cs" />
+    <Compile Include="../../../MyDerivedClassAMDI.cs" />
+    <Compile Include="../../../MyDerivedClassAMDTieI.cs" />
+
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="../../../ServerAMDTie.cs" />
+    <Compile Include="../../../ServerTie.cs" />
+
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,995 +1,1000 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-using Test;
-
-public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if (!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    internal class Thread_opVoid : TaskCompletionSource<object>
+    namespace operations
     {
-        public Thread_opVoid()
-        {
-        }
-
-        public void Start()
-        {
-            lock(this)
-            {
-                _thread = new Thread(new ThreadStart(Run));
-                _thread.Start();
-            }
-        }
-
-        public void Run()
+        namespace AMD
         {
-            SetResult(null);
-        }
-
-        public void Join()
-        {
-            lock(this)
+            public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
             {
-                _thread.Join();
-            }
-        }
-
-        private Thread _thread;
-    }
-
-    //
-    // Override the Object "pseudo" operations to verify the operation mode.
-    //
-    public override bool ice_isA(String id, Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return base.ice_isA(id, current);
-    }
-
-    public override void ice_ping(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        base.ice_ping(current);
-    }
-
-    public override string[] ice_ids(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return base.ice_ids(current);
-    }
-
-    public override string ice_id(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return base.ice_id(current);
-    }
-
-    public override Task shutdownAsync(Ice.Current current)
-    {
-        while(_opVoidThread != null)
-        {
-            _opVoidThread.Join();
-            _opVoidThread = null;
-        }
-
-        current.adapter.getCommunicator().shutdown();
-        return null;
-    }
-
-    public override Task<bool> supportsCompressAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(true);
-    }
-
-    public override Task opVoidAsync(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Normal);
-
-        while(_opVoidThread != null)
-        {
-            _opVoidThread.Join();
-            _opVoidThread = null;
-        }
-
-        _opVoidThread = new Thread_opVoid();
-        _opVoidThread.Start();
-        return _opVoidThread.Task;
-    }
-
-    public override Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpBoolResult>(new MyClass_OpBoolResult(p2, p1));
-    }
-
-    public override Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current)
-    {
-        bool[] p3 = new bool[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        bool[] r = new bool[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-
-        return Task.FromResult<MyClass_OpBoolSResult>(new MyClass_OpBoolSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpBoolSSResult>
-    opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current)
-    {
-        bool[][] p3 = new bool[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        bool[][] r = new bool[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-
-        return Task.FromResult<MyClass_OpBoolSSResult>(new MyClass_OpBoolSSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpByteResult>
-    opByteAsync(byte p1, byte p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpByteResult>(new MyClass_OpByteResult(p1, (byte)(p1 ^ p2)));
-    }
-
-    public override Task<MyClass_OpByteBoolDResult>
-    opByteBoolDAsync(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2, Ice.Current current)
-    {
-        Dictionary<byte, bool> p3 = p1;
-        Dictionary<byte, bool> r = new Dictionary<byte, bool>();
-        foreach(KeyValuePair<byte, bool> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<byte, bool> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-
-        return Task.FromResult<MyClass_OpByteBoolDResult>(new MyClass_OpByteBoolDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpByteSResult>
-    opByteSAsync(byte[] p1, byte[] p2, Ice.Current current)
-    {
-        byte[] p3 = new byte[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
-
-        byte[] r = new byte[p1.Length + p2.Length];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-
-        return Task.FromResult<MyClass_OpByteSResult>(new MyClass_OpByteSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpByteSSResult>
-    opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current)
-    {
-        byte[][] p3 = new byte[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
-
-        byte[][] r = new byte[p1.Length + p2.Length][];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-
-        return Task.FromResult<MyClass_OpByteSSResult>(new MyClass_OpByteSSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpFloatDoubleResult>
-    opFloatDoubleAsync(float p1, double p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpFloatDoubleResult>(new MyClass_OpFloatDoubleResult(p2, p1, p2));
-    }
-
-    public override Task<MyClass_OpFloatDoubleSResult>
-    opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current)
-    {
-        float[] p3 = p1;
-
-        double[] p4 = new double[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
-
-        double[] r = new double[p2.Length + p1.Length];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[p2.Length + i] = p1[i];
-        }
-
-        return Task.FromResult<MyClass_OpFloatDoubleSResult>(new MyClass_OpFloatDoubleSResult(r, p3, p4));
-    }
+                private static void test(bool b)
+                {
+                    if (!b)
+                    {
+                        throw new System.Exception();
+                    }
+                }
+
+                internal class Thread_opVoid : TaskCompletionSource<object>
+                {
+                    public Thread_opVoid()
+                    {
+                    }
+
+                    public void Start()
+                    {
+                        lock (this)
+                        {
+                            _thread = new Thread(new ThreadStart(Run));
+                            _thread.Start();
+                        }
+                    }
+
+                    public void Run()
+                    {
+                        SetResult(null);
+                    }
+
+                    public void Join()
+                    {
+                        lock (this)
+                        {
+                            _thread.Join();
+                        }
+                    }
+
+                    private Thread _thread;
+                }
+
+                //
+                // Override the Object "pseudo" operations to verify the operation mode.
+                //
+                public override bool ice_isA(String id, Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Nonmutating);
+                    return base.ice_isA(id, current);
+                }
+
+                public override void ice_ping(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Nonmutating);
+                    base.ice_ping(current);
+                }
+
+                public override string[] ice_ids(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Nonmutating);
+                    return base.ice_ids(current);
+                }
+
+                public override string ice_id(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Nonmutating);
+                    return base.ice_id(current);
+                }
+
+                public override Task shutdownAsync(Ice.Current current)
+                {
+                    while (_opVoidThread != null)
+                    {
+                        _opVoidThread.Join();
+                        _opVoidThread = null;
+                    }
+
+                    current.adapter.getCommunicator().shutdown();
+                    return null;
+                }
+
+                public override Task<bool> supportsCompressAsync(Ice.Current current)
+                {
+                    return Task.FromResult<bool>(true);
+                }
+
+                public override Task opVoidAsync(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Normal);
+
+                    while (_opVoidThread != null)
+                    {
+                        _opVoidThread.Join();
+                        _opVoidThread = null;
+                    }
+
+                    _opVoidThread = new Thread_opVoid();
+                    _opVoidThread.Start();
+                    return _opVoidThread.Task;
+                }
+
+                public override Task<Test.MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpBoolResult(p2, p1));
+                }
+
+                public override Task<Test.MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current)
+                {
+                    bool[] p3 = new bool[p1.Length + p2.Length];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    bool[] r = new bool[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+
+                    return Task.FromResult(new Test.MyClass_OpBoolSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpBoolSSResult>
+                opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current)
+                {
+                    bool[][] p3 = new bool[p1.Length + p2.Length][];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    bool[][] r = new bool[p1.Length][];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+
+                    return Task.FromResult(new Test.MyClass_OpBoolSSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpByteResult>
+                opByteAsync(byte p1, byte p2, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpByteResult(p1, (byte)(p1 ^ p2)));
+                }
+
+                public override Task<Test.MyClass_OpByteBoolDResult>
+                opByteBoolDAsync(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2, Ice.Current current)
+                {
+                    Dictionary<byte, bool> p3 = p1;
+                    Dictionary<byte, bool> r = new Dictionary<byte, bool>();
+                    foreach (KeyValuePair<byte, bool> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<byte, bool> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+
+                    return Task.FromResult(new Test.MyClass_OpByteBoolDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpByteSResult>
+                opByteSAsync(byte[] p1, byte[] p2, Ice.Current current)
+                {
+                    byte[] p3 = new byte[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        p3[i] = p1[p1.Length - (i + 1)];
+                    }
+
+                    byte[] r = new byte[p1.Length + p2.Length];
+                    Array.Copy(p1, r, p1.Length);
+                    Array.Copy(p2, 0, r, p1.Length, p2.Length);
+
+                    return Task.FromResult(new Test.MyClass_OpByteSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpByteSSResult>
+                opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current)
+                {
+                    byte[][] p3 = new byte[p1.Length][];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        p3[i] = p1[p1.Length - (i + 1)];
+                    }
+
+                    byte[][] r = new byte[p1.Length + p2.Length][];
+                    Array.Copy(p1, r, p1.Length);
+                    Array.Copy(p2, 0, r, p1.Length, p2.Length);
+
+                    return Task.FromResult(new Test.MyClass_OpByteSSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpFloatDoubleResult>
+                opFloatDoubleAsync(float p1, double p2, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpFloatDoubleResult(p2, p1, p2));
+                }
+
+                public override Task<Test.MyClass_OpFloatDoubleSResult>
+                opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current)
+                {
+                    float[] p3 = p1;
+
+                    double[] p4 = new double[p2.Length];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p4[i] = p2[p2.Length - (i + 1)];
+                    }
+
+                    double[] r = new double[p2.Length + p1.Length];
+                    Array.Copy(p2, r, p2.Length);
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[p2.Length + i] = p1[i];
+                    }
+
+                    return Task.FromResult(new Test.MyClass_OpFloatDoubleSResult(r, p3, p4));
+                }
+
+                public override Task<Test.MyClass_OpFloatDoubleSSResult>
+                opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current)
+                {
+                    var p3 = p1;
+
+                    var p4 = new double[p2.Length][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p4[i] = p2[p2.Length - (i + 1)];
+                    }
+
+                    var r = new double[p2.Length + p2.Length][];
+                    Array.Copy(p2, r, p2.Length);
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        r[p2.Length + i] = new double[p2[i].Length];
+                        for (int j = 0; j < p2[i].Length; j++)
+                        {
+                            r[p2.Length + i][j] = p2[i][j];
+                        }
+                    }
+
+                    return Task.FromResult(new Test.MyClass_OpFloatDoubleSSResult(r, p3, p4));
+                }
+
+                public override Task<Test.MyClass_OpLongFloatDResult>
+                opLongFloatDAsync(Dictionary<long, float> p1, Dictionary<long, float> p2, Ice.Current current)
+                {
+                    var p3 = p1;
+                    var r = new Dictionary<long, float>();
+                    foreach (KeyValuePair<long, float> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<long, float> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+
+                    return Task.FromResult(new Test.MyClass_OpLongFloatDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpMyClassResult>
+                opMyClassAsync(Test.MyClassPrx p1, Ice.Current current)
+                {
+                    var p2 = p1;
+                    var p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
+                                                            Ice.Util.stringToIdentity("noSuchIdentity")));
+                    return Task.FromResult(new Test.MyClass_OpMyClassResult(
+                        Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3));
+                }
+
+                public override Task<Test.MyClass_OpMyEnumResult>
+                opMyEnumAsync(Test.MyEnum p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpMyEnumResult(Test.MyEnum.enum3, p1));
+                }
+
+                public override Task<Test.MyClass_OpShortIntDResult>
+                opShortIntDAsync(Dictionary<short, int> p1, Dictionary<short, int> p2, Ice.Current current)
+                {
+                    var p3 = p1;
+                    var r = new Dictionary<short, int>();
+                    foreach (KeyValuePair<short, int> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<short, int> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpShortIntDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpShortIntLongResult>
+                opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpShortIntLongResult(p3, p1, p2, p3));
+                }
+
+                public override Task<Test.MyClass_OpShortIntLongSResult>
+                opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current)
+                {
+                    var p4 = p1;
+                    var p5 = new int[p2.Length];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p5[i] = p2[p2.Length - (i + 1)];
+                    }
+                    var p6 = new long[p3.Length + p3.Length];
+                    Array.Copy(p3, p6, p3.Length);
+                    Array.Copy(p3, 0, p6, p3.Length, p3.Length);
+                    return Task.FromResult(new Test.MyClass_OpShortIntLongSResult(p3, p4, p5, p6));
+                }
+
+                public override Task<Test.MyClass_OpShortIntLongSSResult>
+                opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current)
+                {
+                    var p4 = p1;
+
+                    var p5 = new int[p2.Length][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p5[i] = p2[p2.Length - (i + 1)];
+                    }
+
+                    var p6 = new long[p3.Length + p3.Length][];
+                    Array.Copy(p3, p6, p3.Length);
+                    Array.Copy(p3, 0, p6, p3.Length, p3.Length);
+                    return Task.FromResult(new Test.MyClass_OpShortIntLongSSResult(p3, p4, p5, p6));
+                }
+
+                public override Task<Test.MyClass_OpStringResult>
+                opStringAsync(string p1, string p2, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpStringResult(p1 + " " + p2, p2 + " " + p1));
+                }
+
+                public override Task<Test.MyClass_OpStringMyEnumDResult>
+                opStringMyEnumDAsync(Dictionary<string, Test.MyEnum> p1, Dictionary<string, Test.MyEnum> p2, Ice.Current current)
+                {
+                    var p3 = p1;
+                    var r = new Dictionary<string, Test.MyEnum>();
+                    foreach (KeyValuePair<string, Test.MyEnum> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<string, Test.MyEnum> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringMyEnumDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpMyEnumStringDResult>
+                opMyEnumStringDAsync(Dictionary<Test.MyEnum, string> p1, Dictionary<Test.MyEnum, string> p2, Ice.Current current)
+                {
+                    var p3 = p1;
+                    var r = new Dictionary<Test.MyEnum, string>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<Test.MyEnum, string> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpMyEnumStringDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpMyStructMyEnumDResult>
+                opMyStructMyEnumDAsync(Dictionary<Test.MyStruct, Test.MyEnum> p1,
+                                       Dictionary<Test.MyStruct, Test.MyEnum> p2, Ice.Current current)
+                {
+                    var p3 = p1;
+                    var r = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpMyStructMyEnumDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpByteBoolDSResult>
+                opByteBoolDSAsync(Dictionary<byte, bool>[] p1, Dictionary<byte, bool>[] p2, Ice.Current current)
+                {
+                    var p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    var r = new Dictionary<byte, bool>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpByteBoolDSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpShortIntDSResult>
+                opShortIntDSAsync(Dictionary<short, int>[] p1, Dictionary<short, int>[] p2, Ice.Current current)
+                {
+                    var p3 = new Dictionary<short, int>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    var r = new Dictionary<short, int>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpShortIntDSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpLongFloatDSResult>
+                opLongFloatDSAsync(Dictionary<long, float>[] p1, Dictionary<long, float>[] p2, Ice.Current current)
+                {
+                    var p3 = new Dictionary<long, float>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    var r = new Dictionary<long, float>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpLongFloatDSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringStringDSResult>
+                opStringStringDSAsync(Dictionary<string, string>[] p1, Dictionary<string, string>[] p2, Ice.Current current)
+                {
+                    var p3 = new Dictionary<string, string>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    var r = new Dictionary<string, string>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringStringDSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringMyEnumDSResult>
+                opStringMyEnumDSAsync(Dictionary<string, Test.MyEnum>[] p1, Dictionary<string, Test.MyEnum>[] p2, Ice.Current current)
+                {
+                    var p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    var r = new Dictionary<string, Test.MyEnum>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringMyEnumDSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpMyEnumStringDSResult>
+                opMyEnumStringDSAsync(Dictionary<Test.MyEnum, string>[] p1, Dictionary<Test.MyEnum, string>[] p2, Ice.Current current)
+                {
+                    var p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    var r = new Dictionary<Test.MyEnum, string>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpMyEnumStringDSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpMyStructMyEnumDSResult>
+                opMyStructMyEnumDSAsync(Dictionary<Test.MyStruct, Test.MyEnum>[] p1,
+                                        Dictionary<Test.MyStruct, Test.MyEnum>[] p2,
+                                        Ice.Current current)
+                {
+                    var p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    var r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpMyStructMyEnumDSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpByteByteSDResult>
+                opByteByteSDAsync(Dictionary<byte, byte[]> p1, Dictionary<byte, byte[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<byte, byte[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpByteByteSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpBoolBoolSDResult>
+                opBoolBoolSDAsync(Dictionary<bool, bool[]> p1, Dictionary<bool, bool[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<bool, bool[]>();
+                    foreach (KeyValuePair<bool, bool[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<bool, bool[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpBoolBoolSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpShortShortSDResult>
+                opShortShortSDAsync(Dictionary<short, short[]> p1, Dictionary<short, short[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<short, short[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpShortShortSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpIntIntSDResult>
+                opIntIntSDAsync(Dictionary<int, int[]> p1, Dictionary<int, int[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<int, int[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpIntIntSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpLongLongSDResult>
+                opLongLongSDAsync(Dictionary<long, long[]> p1, Dictionary<long, long[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<long, long[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpLongLongSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringFloatSDResult>
+                opStringFloatSDAsync(Dictionary<string, float[]> p1, Dictionary<string, float[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<string, float[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringFloatSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringDoubleSDResult>
+                opStringDoubleSDAsync(Dictionary<string, double[]> p1, Dictionary<string, double[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<string, double[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult<Test.MyClass_OpStringDoubleSDResult>(new Test.MyClass_OpStringDoubleSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringStringSDResult>
+                opStringStringSDAsync(Dictionary<string, string[]> p1, Dictionary<string, string[]> p2, Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<string, string[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult<Test.MyClass_OpStringStringSDResult>(new Test.MyClass_OpStringStringSDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpMyEnumMyEnumSDResult>
+                opMyEnumMyEnumSDAsync(Dictionary<Test.MyEnum, Test.MyEnum[]> p1, Dictionary<Test.MyEnum, Test.MyEnum[]> p2,
+                    Ice.Current current)
+                {
+                    var p3 = p2;
+                    var r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpMyEnumMyEnumSDResult(r, p3));
+                }
+
+                public override Task<int[]>
+                opIntSAsync(int[] s, Ice.Current current)
+                {
+                    var r = new int[s.Length];
+                    for (int i = 0; i < s.Length; ++i)
+                    {
+                        r[i] = -s[i];
+                    }
+                    return Task.FromResult(r);
+                }
+
+                public override Task<Dictionary<string, string>>
+                opContextAsync(Ice.Current current)
+                {
+                    return Task.FromResult(current.ctx);
+                }
+
+                public override Task
+                opByteSOnewayAsync(byte[] s, Ice.Current current)
+                {
+                    lock (this)
+                    {
+                        ++_opByteSOnewayCallCount;
+                    }
+                    return null;
+                }
+
+                public override Task<int>
+                opByteSOnewayCallCountAsync(Ice.Current current)
+                {
+                    lock (this)
+                    {
+                        var count = _opByteSOnewayCallCount;
+                        _opByteSOnewayCallCount = 0;
+                        return Task.FromResult<int>(count);
+                    }
+                }
+
+                public override Task
+                opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current)
+                {
+                    var d = 1278312346.0 / 13.0;
+                    test(p1 == d);
+                    for (int i = 0; i < p2.Length; ++i)
+                    {
+                        test(p2[i] == d);
+                    }
+                    return null;
+                }
+
+                public override Task<Test.MyClass_OpStringSResult>
+                opStringSAsync(string[] p1, string[] p2, Ice.Current current)
+                {
+                    var p3 = new string[p1.Length + p2.Length];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    var r = new string[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringSSResult>
+                opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current)
+                {
+                    var p3 = new string[p1.Length + p2.Length][];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+                    var r = new string[p2.Length][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        r[i] = p2[p2.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringSSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringSSSResult>
+                opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current)
+                {
+                    var p3 = new string[p1.Length + p2.Length][][];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    var r = new string[p2.Length][][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        r[i] = p2[p2.Length - (i + 1)];
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringSSSResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStringStringDResult>
+                opStringStringDAsync(Dictionary<string, string> p1, Dictionary<string, string> p2, Ice.Current current)
+                {
+                    var p3 = p1;
+                    var r = new Dictionary<string, string>();
+                    foreach (var e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (var e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return Task.FromResult(new Test.MyClass_OpStringStringDResult(r, p3));
+                }
+
+                public override Task<Test.MyClass_OpStructResult>
+                opStructAsync(Test.Structure p1, Test.Structure p2, Ice.Current current)
+                {
+                    var p3 = p1;
+                    p3.s.s = "a new string";
+                    return Task.FromResult(new Test.MyClass_OpStructResult(p2, p3));
+                }
+
+                public override Task
+                opIdempotentAsync(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Idempotent);
+                    return null;
+                }
+
+                public override Task
+                opNonmutatingAsync(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Nonmutating);
+                    return null;
+                }
+
+                public override Task
+                opDerivedAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task<byte>
+                opByte1Async(byte value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<short>
+                opShort1Async(short value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<int>
+                opInt1Async(int value, Ice.Current current)
+                {
+                    return Task.FromResult<int>(value);
+                }
+
+                public override Task<long>
+                opLong1Async(long value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<float>
+                opFloat1Async(float value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<double>
+                opDouble1Async(double value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<string>
+                opString1Async(string value, Ice.Current current)
+                {
+                    return Task.FromResult<string>(value);
+                }
+
+                public override Task<string[]>
+                opStringS1Async(string[] value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<Dictionary<byte, bool>>
+                opByteBoolD1Async(Dictionary<byte, bool> value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<string[]>
+                opStringS2Async(string[] value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<Dictionary<byte, bool>>
+                opByteBoolD2Async(Dictionary<byte, bool> value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<Test.MyClass1>
+                opMyClass1Async(Test.MyClass1 value, Ice.Current current)
+                {
+                    return Task.FromResult<Test.MyClass1>(value);
+                }
+
+                public override Task<Test.MyStruct1>
+                opMyStruct1Async(Test.MyStruct1 value, Ice.Current current)
+                {
+                    return Task.FromResult(value);
+                }
+
+                public override Task<string[]>
+                opStringLiteralsAsync(Ice.Current current)
+                {
+                    return Task.FromResult(new string[]
+                        {
+                                Test.s0.value,
+                                Test.s1.value,
+                                Test.s2.value,
+                                Test.s3.value,
+                                Test.s4.value,
+                                Test.s5.value,
+                                Test.s6.value,
+                                Test.s7.value,
+                                Test.s8.value,
+                                Test.s9.value,
+                                Test.s10.value,
+
+                                Test.sw0.value,
+                                Test.sw1.value,
+                                Test.sw2.value,
+                                Test.sw3.value,
+                                Test.sw4.value,
+                                Test.sw5.value,
+                                Test.sw6.value,
+                                Test.sw7.value,
+                                Test.sw8.value,
+                                Test.sw9.value,
+                                Test.sw10.value,
+
+                                Test.ss0.value,
+                                Test.ss1.value,
+                                Test.ss2.value,
+                                Test.ss3.value,
+                                Test.ss4.value,
+                                Test.ss5.value,
+
+                                Test.su0.value,
+                                Test.su1.value,
+                                Test.su2.value
+                        });
+                }
+
+                public override Task<string[]>
+                opWStringLiteralsAsync(Ice.Current current)
+                {
+                    return Task.FromResult(new string[]
+                        {
+                                Test.s0.value,
+                                Test.s1.value,
+                                Test.s2.value,
+                                Test.s3.value,
+                                Test.s4.value,
+                                Test.s5.value,
+                                Test.s6.value,
+                                Test.s7.value,
+                                Test.s8.value,
+                                Test.s9.value,
+                                Test.s10.value,
+
+                                Test.sw0.value,
+                                Test.sw1.value,
+                                Test.sw2.value,
+                                Test.sw3.value,
+                                Test.sw4.value,
+                                Test.sw5.value,
+                                Test.sw6.value,
+                                Test.sw7.value,
+                                Test.sw8.value,
+                                Test.sw9.value,
+                                Test.sw10.value,
+
+                                Test.ss0.value,
+                                Test.ss1.value,
+                                Test.ss2.value,
+                                Test.ss3.value,
+                                Test.ss4.value,
+                                Test.ss5.value,
+
+                                Test.su0.value,
+                                Test.su1.value,
+                                Test.su2.value
+                        });
+                }
+
+                public override async Task<Test.MyClass_OpMStruct1MarshaledResult>
+                opMStruct1Async(Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
+                }
+
+                public override async Task<Test.MyClass_OpMStruct2MarshaledResult>
+                opMStruct2Async(Test.Structure p1, Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
+                }
+
+                public override async Task<Test.MyClass_OpMSeq1MarshaledResult>
+                opMSeq1Async(Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
+                }
+
+                public override async Task<Test.MyClass_OpMSeq2MarshaledResult>
+                opMSeq2Async(string[] p1, Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
+                }
+
+                public override async Task<Test.MyClass_OpMDict1MarshaledResult>
+                opMDict1Async(Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
+                }
+
+                public override async Task<Test.MyClass_OpMDict2MarshaledResult>
+                opMDict2Async(Dictionary<string, string> p1, Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
+                }
 
-    public override Task<MyClass_OpFloatDoubleSSResult>
-    opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current)
-    {
-        var p3 = p1;
-
-        var p4 = new double[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
-
-        var r = new double[p2.Length + p2.Length][];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[p2.Length + i] = new double[p2[i].Length];
-            for(int j = 0; j < p2[i].Length; j++)
-            {
-                r[p2.Length + i][j] = p2[i][j];
+                private Thread_opVoid _opVoidThread;
+                private int _opByteSOnewayCallCount = 0;
             }
         }
-
-        return Task.FromResult<MyClass_OpFloatDoubleSSResult>(new MyClass_OpFloatDoubleSSResult(r, p3, p4));
-    }
-
-    public override Task<MyClass_OpLongFloatDResult>
-    opLongFloatDAsync(Dictionary<long, float> p1, Dictionary<long, float> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<long, float>();
-        foreach(KeyValuePair<long, float> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<long, float> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-
-        return Task.FromResult<MyClass_OpLongFloatDResult>(new MyClass_OpLongFloatDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpMyClassResult>
-    opMyClassAsync(MyClassPrx p1, Ice.Current current)
-    {
-        var p2 = p1;
-        var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
-                                                Ice.Util.stringToIdentity("noSuchIdentity")));
-        return Task.FromResult<MyClass_OpMyClassResult>(new MyClass_OpMyClassResult(
-            MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3));
-    }
-
-    public override Task<MyClass_OpMyEnumResult>
-    opMyEnumAsync(MyEnum p1, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpMyEnumResult>(new MyClass_OpMyEnumResult(MyEnum.enum3, p1));
-    }
-
-    public override Task<MyClass_OpShortIntDResult>
-    opShortIntDAsync(Dictionary<short, int> p1, Dictionary<short, int> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<short, int>();
-        foreach(KeyValuePair<short, int> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<short, int> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpShortIntDResult>(new MyClass_OpShortIntDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpShortIntLongResult>
-    opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpShortIntLongResult>(new MyClass_OpShortIntLongResult(p3, p1, p2, p3));
-    }
-
-    public override Task<MyClass_OpShortIntLongSResult>
-    opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current)
-    {
-        var p4 = p1;
-        var p5 = new int[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
-        var p6 = new long[p3.Length + p3.Length];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
-        return Task.FromResult<MyClass_OpShortIntLongSResult>(new MyClass_OpShortIntLongSResult(p3, p4, p5, p6));
-    }
-
-    public override Task<MyClass_OpShortIntLongSSResult>
-    opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current)
-    {
-        var p4 = p1;
-
-        var p5 = new int[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
-
-        var p6 = new long[p3.Length + p3.Length][];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
-        return Task.FromResult<MyClass_OpShortIntLongSSResult>(new MyClass_OpShortIntLongSSResult(p3, p4, p5, p6));
-    }
-
-    public override Task<MyClass_OpStringResult>
-    opStringAsync(string p1, string p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpStringResult>(new MyClass_OpStringResult(p1 + " " + p2, p2 + " " + p1));
     }
-
-    public override Task<MyClass_OpStringMyEnumDResult>
-    opStringMyEnumDAsync(Dictionary<string, MyEnum> p1, Dictionary<string, MyEnum> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<string, Test.MyEnum>();
-        foreach(KeyValuePair<string, Test.MyEnum> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, Test.MyEnum> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringMyEnumDResult>(new MyClass_OpStringMyEnumDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpMyEnumStringDResult>
-    opMyEnumStringDAsync(Dictionary<MyEnum, string> p1, Dictionary<MyEnum, string> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<MyEnum, string>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<MyEnum, string> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpMyEnumStringDResult>(new MyClass_OpMyEnumStringDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpMyStructMyEnumDResult>
-    opMyStructMyEnumDAsync(Dictionary<MyStruct, MyEnum> p1,
-                           Dictionary<MyStruct, MyEnum> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<MyStruct, MyEnum>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpMyStructMyEnumDResult>(new MyClass_OpMyStructMyEnumDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpByteBoolDSResult>
-    opByteBoolDSAsync(Dictionary<byte, bool>[] p1, Dictionary<byte, bool>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<byte, bool>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpByteBoolDSResult>(new MyClass_OpByteBoolDSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpShortIntDSResult>
-    opShortIntDSAsync(Dictionary<short, int>[] p1, Dictionary<short, int>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<short, int>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<short, int>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpShortIntDSResult>(new MyClass_OpShortIntDSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpLongFloatDSResult>
-    opLongFloatDSAsync(Dictionary<long, float>[] p1, Dictionary<long, float>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<long, float>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<long, float>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpLongFloatDSResult>(new MyClass_OpLongFloatDSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringStringDSResult>
-    opStringStringDSAsync(Dictionary<string, string>[] p1, Dictionary<string, string>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<string, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<string, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringStringDSResult>(new MyClass_OpStringStringDSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringMyEnumDSResult>
-    opStringMyEnumDSAsync(Dictionary<string, MyEnum>[] p1, Dictionary<string, MyEnum>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<string, MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<string, MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringMyEnumDSResult>(new MyClass_OpStringMyEnumDSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpMyEnumStringDSResult>
-    opMyEnumStringDSAsync(Dictionary<MyEnum, string>[] p1, Dictionary<MyEnum, string>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<MyEnum, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<MyEnum, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpMyEnumStringDSResult>(new MyClass_OpMyEnumStringDSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpMyStructMyEnumDSResult>
-    opMyStructMyEnumDSAsync(Dictionary<MyStruct, MyEnum>[] p1, Dictionary<MyStruct, MyEnum>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<MyStruct, MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<MyStruct, MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpMyStructMyEnumDSResult>(new MyClass_OpMyStructMyEnumDSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpByteByteSDResult>
-    opByteByteSDAsync(Dictionary<byte, byte[]> p1, Dictionary<byte, byte[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<byte, byte[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpByteByteSDResult>(new MyClass_OpByteByteSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpBoolBoolSDResult>
-    opBoolBoolSDAsync(Dictionary<bool, bool[]> p1, Dictionary<bool, bool[]> p2, Ice.Current current)
-    {
-        var  p3 = p2;
-        var r = new Dictionary<bool, bool[]>();
-        foreach(KeyValuePair<bool, bool[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<bool, bool[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpBoolBoolSDResult>(new MyClass_OpBoolBoolSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpShortShortSDResult>
-    opShortShortSDAsync(Dictionary<short, short[]> p1, Dictionary<short, short[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<short, short[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpShortShortSDResult>(new MyClass_OpShortShortSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpIntIntSDResult>
-    opIntIntSDAsync(Dictionary<int, int[]> p1, Dictionary<int, int[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<int, int[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpIntIntSDResult>(new MyClass_OpIntIntSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpLongLongSDResult>
-    opLongLongSDAsync(Dictionary<long, long[]> p1, Dictionary<long, long[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<long, long[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpLongLongSDResult>(new MyClass_OpLongLongSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringFloatSDResult>
-    opStringFloatSDAsync(Dictionary<string, float[]> p1, Dictionary<string, float[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<string, float[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringFloatSDResult>(new MyClass_OpStringFloatSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringDoubleSDResult>
-    opStringDoubleSDAsync(Dictionary<string, double[]> p1, Dictionary<string, double[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<string, double[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringDoubleSDResult>(new MyClass_OpStringDoubleSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringStringSDResult>
-    opStringStringSDAsync(Dictionary<string, string[]> p1, Dictionary<string, string[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<string, string[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringStringSDResult>(new MyClass_OpStringStringSDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpMyEnumMyEnumSDResult>
-    opMyEnumMyEnumSDAsync(Dictionary<MyEnum, MyEnum[]> p1, Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpMyEnumMyEnumSDResult>(new MyClass_OpMyEnumMyEnumSDResult(r, p3));
-    }
-
-    public override Task<int[]>
-    opIntSAsync(int[] s, Ice.Current current)
-    {
-        var r = new int[s.Length];
-        for(int i = 0; i < s.Length; ++i)
-        {
-            r[i] = -s[i];
-        }
-        return Task.FromResult<int[]>(r);
-    }
-
-    public override Task<Dictionary<string, string>>
-    opContextAsync(Ice.Current current)
-    {
-        return Task.FromResult<Dictionary<string, string>>(current.ctx);
-    }
-
-    public override Task
-    opByteSOnewayAsync(byte[] s, Ice.Current current)
-    {
-        lock(this)
-        {
-            ++_opByteSOnewayCallCount;
-        }
-        return null;
-    }
-
-    public override Task<int>
-    opByteSOnewayCallCountAsync(Ice.Current current)
-    {
-        lock(this)
-        {
-            var count = _opByteSOnewayCallCount;
-            _opByteSOnewayCallCount = 0;
-            return Task.FromResult<int>(count);
-        }
-    }
-
-    public override Task
-    opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current)
-    {
-        var d = 1278312346.0 / 13.0;
-        test(p1 == d);
-        for(int i = 0; i < p2.Length; ++i)
-        {
-            test(p2[i] == d);
-        }
-        return null;
-    }
-
-    public override Task<MyClass_OpStringSResult>
-    opStringSAsync(string[] p1, string[] p2, Ice.Current current)
-    {
-        var p3 = new string[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        var r = new string[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringSResult>(new MyClass_OpStringSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringSSResult>
-    opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current)
-    {
-        var p3 = new string[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-        var r = new string[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringSSResult>(new MyClass_OpStringSSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringSSSResult>
-    opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current)
-    {
-        var p3 = new string[p1.Length + p2.Length][][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        var r = new string[p2.Length][][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringSSSResult>(new MyClass_OpStringSSSResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStringStringDResult>
-    opStringStringDAsync(Dictionary<string, string> p1, Dictionary<string, string> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<string, string>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringStringDResult>(new MyClass_OpStringStringDResult(r, p3));
-    }
-
-    public override Task<MyClass_OpStructResult>
-    opStructAsync(Structure p1, Structure p2, Ice.Current current)
-    {
-        var p3 = p1;
-        p3.s.s = "a new string";
-        return Task.FromResult<MyClass_OpStructResult>(new MyClass_OpStructResult(p2, p3));
-    }
-
-    public override Task
-    opIdempotentAsync(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Idempotent);
-        return null;
-    }
-
-    public override Task
-    opNonmutatingAsync(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return null;
-    }
-
-    public override Task
-    opDerivedAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task<byte>
-    opByte1Async(byte value, Ice.Current current)
-    {
-        return Task.FromResult<byte>(value);
-    }
-
-    public override Task<short>
-    opShort1Async(short value, Ice.Current current)
-    {
-        return Task.FromResult<short>(value);
-    }
-
-    public override Task<int>
-    opInt1Async(int value, Ice.Current current)
-    {
-        return Task.FromResult<int>(value);
-    }
-
-    public override Task<long>
-    opLong1Async(long value, Ice.Current current)
-    {
-        return Task.FromResult<long>(value);
-    }
-
-    public override Task<float>
-    opFloat1Async(float value, Ice.Current current)
-    {
-        return Task.FromResult<float>(value);
-    }
-
-    public override Task<double>
-    opDouble1Async(double value, Ice.Current current)
-    {
-        return Task.FromResult<double>(value);
-    }
-
-    public override Task<string>
-    opString1Async(string value, Ice.Current current)
-    {
-        return Task.FromResult<string>(value);
-    }
-
-    public override Task<string[]>
-    opStringS1Async(string[] value, Ice.Current current)
-    {
-        return Task.FromResult<string[]>(value);
-    }
-
-    public override Task<Dictionary<byte, bool>>
-    opByteBoolD1Async(Dictionary<byte, bool> value, Ice.Current current)
-    {
-        return Task.FromResult<Dictionary<byte, bool>>(value);
-    }
-
-    public override Task<string[]>
-    opStringS2Async(string[] value, Ice.Current current)
-    {
-        return Task.FromResult<string[]>(value);
-    }
-
-    public override Task<Dictionary<byte, bool>>
-    opByteBoolD2Async(Dictionary<byte, bool> value, Ice.Current current)
-    {
-        return Task.FromResult<Dictionary<byte, bool>>(value);
-    }
-
-    public override Task<MyClass1>
-    opMyClass1Async(MyClass1 value, Ice.Current current)
-    {
-        return Task.FromResult<MyClass1>(value);
-    }
-
-    public override Task<MyStruct1>
-    opMyStruct1Async(MyStruct1 value, Ice.Current current)
-    {
-        return Task.FromResult<MyStruct1>(value);
-    }
-
-    public override Task<string[]>
-    opStringLiteralsAsync(Ice.Current current)
-    {
-        return Task.FromResult<string[]>(new string[]
-            {
-                s0.value,
-                s1.value,
-                s2.value,
-                s3.value,
-                s4.value,
-                s5.value,
-                s6.value,
-                s7.value,
-                s8.value,
-                s9.value,
-                s10.value,
-
-                sw0.value,
-                sw1.value,
-                sw2.value,
-                sw3.value,
-                sw4.value,
-                sw5.value,
-                sw6.value,
-                sw7.value,
-                sw8.value,
-                sw9.value,
-                sw10.value,
-
-                ss0.value,
-                ss1.value,
-                ss2.value,
-                ss3.value,
-                ss4.value,
-                ss5.value,
-
-                su0.value,
-                su1.value,
-                su2.value
-            });
-    }
-
-    public override Task<string[]>
-    opWStringLiteralsAsync(Ice.Current current)
-    {
-        return Task.FromResult<string[]>(new string[]
-            {
-                s0.value,
-                s1.value,
-                s2.value,
-                s3.value,
-                s4.value,
-                s5.value,
-                s6.value,
-                s7.value,
-                s8.value,
-                s9.value,
-                s10.value,
-
-                sw0.value,
-                sw1.value,
-                sw2.value,
-                sw3.value,
-                sw4.value,
-                sw5.value,
-                sw6.value,
-                sw7.value,
-                sw8.value,
-                sw9.value,
-                sw10.value,
-
-                ss0.value,
-                ss1.value,
-                ss2.value,
-                ss3.value,
-                ss4.value,
-                ss5.value,
-
-                su0.value,
-                su1.value,
-                su2.value
-            });
-    }
-
-    public override async Task<Test.MyClass_OpMStruct1MarshaledResult>
-    opMStruct1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
-    }
-
-    public override async Task<Test.MyClass_OpMStruct2MarshaledResult>
-    opMStruct2Async(Test.Structure p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
-    }
-
-    public override async Task<Test.MyClass_OpMSeq1MarshaledResult>
-    opMSeq1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
-    }
-
-    public override async Task<Test.MyClass_OpMSeq2MarshaledResult>
-    opMSeq2Async(string[] p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
-    }
-
-    public override async Task<Test.MyClass_OpMDict1MarshaledResult>
-    opMDict1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
-    }
-
-    public override async Task<Test.MyClass_OpMDict2MarshaledResult>
-    opMDict2Async(Dictionary<string, string> p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
-    }
-
-    private Thread_opVoid _opVoidThread;
-    private int _opByteSOnewayCallCount = 0;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,974 +1,982 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Test;
 
-public sealed class MyDerivedClassI : MyDerivedClassTie_
+namespace Ice
 {
-    public MyDerivedClassI() : base(new MyDerivedClassTieI())
-    {
-    }
-}
-
-public sealed class MyDerivedClassTieI : MyDerivedClassOperations_
-{
-    private static void test(bool b)
-    {
-        if (!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    internal class Thread_opVoid : TaskCompletionSource<object>
-    {
-        public Thread_opVoid()
-        {
-        }
-
-        public void Start()
-        {
-            lock(this)
-            {
-                _thread = new Thread(new ThreadStart(Run));
-                _thread.Start();
-            }
-        }
-
-        public void Run()
-        {
-            SetResult(null);
-        }
-
-        public void Join()
-        {
-            lock(this)
-            {
-                _thread.Join();
-            }
-        }
-
-        private Thread _thread;
-    }
-
-    public Task shutdownAsync(Ice.Current current)
-    {
-        while(_opVoidThread != null)
-        {
-            _opVoidThread.Join();
-            _opVoidThread = null;
-        }
-
-        current.adapter.getCommunicator().shutdown();
-        return null;
-    }
-
-    public Task<bool> supportsCompressAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(true);
-    }
-
-    public Task opVoidAsync(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Normal);
-
-        while(_opVoidThread != null)
-        {
-            _opVoidThread.Join();
-            _opVoidThread = null;
-        }
-
-        _opVoidThread = new Thread_opVoid();
-        _opVoidThread.Start();
-        return _opVoidThread.Task;
-    }
-
-    public Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpBoolResult>(new MyClass_OpBoolResult(p2, p1));
-    }
-
-    public Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current)
-    {
-        bool[] p3 = new bool[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        bool[] r = new bool[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-
-        return Task.FromResult<MyClass_OpBoolSResult>(new MyClass_OpBoolSResult(r, p3));
-    }
-
-    public Task<MyClass_OpBoolSSResult>
-    opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current)
-    {
-        bool[][] p3 = new bool[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        bool[][] r = new bool[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-
-        return Task.FromResult<MyClass_OpBoolSSResult>(new MyClass_OpBoolSSResult(r, p3));
-    }
-
-    public Task<MyClass_OpByteResult>
-    opByteAsync(byte p1, byte p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpByteResult>(new MyClass_OpByteResult(p1, (byte)(p1 ^ p2)));
-    }
-
-    public Task<MyClass_OpByteBoolDResult>
-    opByteBoolDAsync(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2, Ice.Current current)
-    {
-        Dictionary<byte, bool> p3 = p1;
-        Dictionary<byte, bool> r = new Dictionary<byte, bool>();
-        foreach(KeyValuePair<byte, bool> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<byte, bool> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-
-        return Task.FromResult<MyClass_OpByteBoolDResult>(new MyClass_OpByteBoolDResult(r, p3));
-    }
-
-    public Task<MyClass_OpByteSResult>
-    opByteSAsync(byte[] p1, byte[] p2, Ice.Current current)
-    {
-        byte[] p3 = new byte[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
-
-        byte[] r = new byte[p1.Length + p2.Length];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-
-        return Task.FromResult<MyClass_OpByteSResult>(new MyClass_OpByteSResult(r, p3));
-    }
-
-    public Task<MyClass_OpByteSSResult>
-    opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current)
-    {
-        byte[][] p3 = new byte[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
-
-        byte[][] r = new byte[p1.Length + p2.Length][];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-
-        return Task.FromResult<MyClass_OpByteSSResult>(new MyClass_OpByteSSResult(r, p3));
-    }
-
-    public Task<MyClass_OpFloatDoubleResult>
-    opFloatDoubleAsync(float p1, double p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpFloatDoubleResult>(new MyClass_OpFloatDoubleResult(p2, p1, p2));
-    }
-
-    public Task<MyClass_OpFloatDoubleSResult>
-    opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current)
-    {
-        float[] p3 = p1;
-
-        double[] p4 = new double[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
-
-        double[] r = new double[p2.Length + p1.Length];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[p2.Length + i] = p1[i];
-        }
-
-        return Task.FromResult<MyClass_OpFloatDoubleSResult>(new MyClass_OpFloatDoubleSResult(r, p3, p4));
-    }
-
-    public Task<MyClass_OpFloatDoubleSSResult>
-    opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current)
+    namespace operations
     {
-        var p3 = p1;
-
-        var p4 = new double[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
+        namespace AMD
         {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
-
-        var r = new double[p2.Length + p2.Length][];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[p2.Length + i] = new double[p2[i].Length];
-            for(int j = 0; j < p2[i].Length; j++)
+            namespace tie
             {
-                r[p2.Length + i][j] = p2[i][j];
+                public sealed class MyDerivedClassI : Test.MyDerivedClassTie_
+                {
+                    public MyDerivedClassI() : base(new MyDerivedClassTieI())
+                    {
+                    }
+                }
+
+                public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_
+                {
+                    private static void test(bool b)
+                    {
+                        if (!b)
+                        {
+                            throw new System.Exception();
+                        }
+                    }
+
+                    internal class Thread_opVoid : TaskCompletionSource<object>
+                    {
+                        public Thread_opVoid()
+                        {
+                        }
+
+                        public void Start()
+                        {
+                            lock (this)
+                            {
+                                _thread = new Thread(new ThreadStart(Run));
+                                _thread.Start();
+                            }
+                        }
+
+                        public void Run()
+                        {
+                            SetResult(null);
+                        }
+
+                        public void Join()
+                        {
+                            lock (this)
+                            {
+                                _thread.Join();
+                            }
+                        }
+
+                        private Thread _thread;
+                    }
+
+                    public Task shutdownAsync(Ice.Current current)
+                    {
+                        while (_opVoidThread != null)
+                        {
+                            _opVoidThread.Join();
+                            _opVoidThread = null;
+                        }
+
+                        current.adapter.getCommunicator().shutdown();
+                        return null;
+                    }
+
+                    public Task<bool> supportsCompressAsync(Ice.Current current)
+                    {
+                        return Task.FromResult(true);
+                    }
+
+                    public Task opVoidAsync(Ice.Current current)
+                    {
+                        test(current.mode == Ice.OperationMode.Normal);
+
+                        while (_opVoidThread != null)
+                        {
+                            _opVoidThread.Join();
+                            _opVoidThread = null;
+                        }
+
+                        _opVoidThread = new Thread_opVoid();
+                        _opVoidThread.Start();
+                        return _opVoidThread.Task;
+                    }
+
+                    public Task<Test.MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current)
+                    {
+                        return Task.FromResult(new Test.MyClass_OpBoolResult(p2, p1));
+                    }
+
+                    public Task<Test.MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current)
+                    {
+                        bool[] p3 = new bool[p1.Length + p2.Length];
+                        Array.Copy(p1, p3, p1.Length);
+                        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                        bool[] r = new bool[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+
+                        return Task.FromResult(new Test.MyClass_OpBoolSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpBoolSSResult>
+                    opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current)
+                    {
+                        bool[][] p3 = new bool[p1.Length + p2.Length][];
+                        Array.Copy(p1, p3, p1.Length);
+                        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                        bool[][] r = new bool[p1.Length][];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+
+                        return Task.FromResult(new Test.MyClass_OpBoolSSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpByteResult>
+                    opByteAsync(byte p1, byte p2, Ice.Current current)
+                    {
+                        return Task.FromResult(new Test.MyClass_OpByteResult(p1, (byte)(p1 ^ p2)));
+                    }
+
+                    public Task<Test.MyClass_OpByteBoolDResult>
+                    opByteBoolDAsync(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2, Ice.Current current)
+                    {
+                        Dictionary<byte, bool> p3 = p1;
+                        Dictionary<byte, bool> r = new Dictionary<byte, bool>();
+                        foreach (KeyValuePair<byte, bool> e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (KeyValuePair<byte, bool> e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+
+                        return Task.FromResult(new Test.MyClass_OpByteBoolDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpByteSResult>
+                    opByteSAsync(byte[] p1, byte[] p2, Ice.Current current)
+                    {
+                        byte[] p3 = new byte[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            p3[i] = p1[p1.Length - (i + 1)];
+                        }
+
+                        byte[] r = new byte[p1.Length + p2.Length];
+                        Array.Copy(p1, r, p1.Length);
+                        Array.Copy(p2, 0, r, p1.Length, p2.Length);
+
+                        return Task.FromResult(new Test.MyClass_OpByteSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpByteSSResult>
+                    opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current)
+                    {
+                        byte[][] p3 = new byte[p1.Length][];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            p3[i] = p1[p1.Length - (i + 1)];
+                        }
+
+                        byte[][] r = new byte[p1.Length + p2.Length][];
+                        Array.Copy(p1, r, p1.Length);
+                        Array.Copy(p2, 0, r, p1.Length, p2.Length);
+
+                        return Task.FromResult(new Test.MyClass_OpByteSSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpFloatDoubleResult>
+                    opFloatDoubleAsync(float p1, double p2, Ice.Current current)
+                    {
+                        return Task.FromResult(new Test.MyClass_OpFloatDoubleResult(p2, p1, p2));
+                    }
+
+                    public Task<Test.MyClass_OpFloatDoubleSResult>
+                    opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current)
+                    {
+                        float[] p3 = p1;
+
+                        double[] p4 = new double[p2.Length];
+                        for (int i = 0; i < p2.Length; i++)
+                        {
+                            p4[i] = p2[p2.Length - (i + 1)];
+                        }
+
+                        double[] r = new double[p2.Length + p1.Length];
+                        Array.Copy(p2, r, p2.Length);
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[p2.Length + i] = p1[i];
+                        }
+
+                        return Task.FromResult(new Test.MyClass_OpFloatDoubleSResult(r, p3, p4));
+                    }
+
+                    public Task<Test.MyClass_OpFloatDoubleSSResult>
+                    opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+
+                        var p4 = new double[p2.Length][];
+                        for (int i = 0; i < p2.Length; i++)
+                        {
+                            p4[i] = p2[p2.Length - (i + 1)];
+                        }
+
+                        var r = new double[p2.Length + p2.Length][];
+                        Array.Copy(p2, r, p2.Length);
+                        for (int i = 0; i < p2.Length; i++)
+                        {
+                            r[p2.Length + i] = new double[p2[i].Length];
+                            for (int j = 0; j < p2[i].Length; j++)
+                            {
+                                r[p2.Length + i][j] = p2[i][j];
+                            }
+                        }
+
+                        return Task.FromResult(new Test.MyClass_OpFloatDoubleSSResult(r, p3, p4));
+                    }
+
+                    public Task<Test.MyClass_OpLongFloatDResult>
+                    opLongFloatDAsync(Dictionary<long, float> p1, Dictionary<long, float> p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+                        var r = new Dictionary<long, float>();
+                        foreach (KeyValuePair<long, float> e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (KeyValuePair<long, float> e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+
+                        return Task.FromResult(new Test.MyClass_OpLongFloatDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpMyClassResult>
+                    opMyClassAsync(Test.MyClassPrx p1, Ice.Current current)
+                    {
+                        var p2 = p1;
+                        var p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
+                                                                Ice.Util.stringToIdentity("noSuchIdentity")));
+                        return Task.FromResult(new Test.MyClass_OpMyClassResult(
+                            Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3));
+                    }
+
+                    public Task<Test.MyClass_OpMyEnumResult>
+                    opMyEnumAsync(Test.MyEnum p1, Ice.Current current)
+                    {
+                        return Task.FromResult<Test.MyClass_OpMyEnumResult>(new Test.MyClass_OpMyEnumResult(Test.MyEnum.enum3, p1));
+                    }
+
+                    public Task<Test.MyClass_OpShortIntDResult>
+                    opShortIntDAsync(Dictionary<short, int> p1, Dictionary<short, int> p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+                        var r = new Dictionary<short, int>();
+                        foreach (KeyValuePair<short, int> e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (KeyValuePair<short, int> e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpShortIntDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpShortIntLongResult>
+                    opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current)
+                    {
+                        return Task.FromResult(new Test.MyClass_OpShortIntLongResult(p3, p1, p2, p3));
+                    }
+
+                    public Task<Test.MyClass_OpShortIntLongSResult>
+                    opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current)
+                    {
+                        var p4 = p1;
+                        var p5 = new int[p2.Length];
+                        for (int i = 0; i < p2.Length; i++)
+                        {
+                            p5[i] = p2[p2.Length - (i + 1)];
+                        }
+                        var p6 = new long[p3.Length + p3.Length];
+                        Array.Copy(p3, p6, p3.Length);
+                        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
+                        return Task.FromResult(new Test.MyClass_OpShortIntLongSResult(p3, p4, p5, p6));
+                    }
+
+                    public Task<Test.MyClass_OpShortIntLongSSResult>
+                    opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current)
+                    {
+                        var p4 = p1;
+
+                        var p5 = new int[p2.Length][];
+                        for (int i = 0; i < p2.Length; i++)
+                        {
+                            p5[i] = p2[p2.Length - (i + 1)];
+                        }
+
+                        var p6 = new long[p3.Length + p3.Length][];
+                        Array.Copy(p3, p6, p3.Length);
+                        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
+                        return Task.FromResult(new Test.MyClass_OpShortIntLongSSResult(p3, p4, p5, p6));
+                    }
+
+                    public Task<Test.MyClass_OpStringResult>
+                    opStringAsync(string p1, string p2, Ice.Current current)
+                    {
+                        return Task.FromResult(new Test.MyClass_OpStringResult(p1 + " " + p2, p2 + " " + p1));
+                    }
+
+                    public Task<Test.MyClass_OpStringMyEnumDResult>
+                    opStringMyEnumDAsync(Dictionary<string, Test.MyEnum> p1, Dictionary<string, Test.MyEnum> p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+                        var r = new Dictionary<string, Test.MyEnum>();
+                        foreach (KeyValuePair<string, Test.MyEnum> e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (KeyValuePair<string, Test.MyEnum> e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringMyEnumDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpMyEnumStringDResult>
+                    opMyEnumStringDAsync(Dictionary<Test.MyEnum, string> p1, Dictionary<Test.MyEnum, string> p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+                        var r = new Dictionary<Test.MyEnum, string>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (KeyValuePair<Test.MyEnum, string> e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpMyEnumStringDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpMyStructMyEnumDResult>
+                    opMyStructMyEnumDAsync(Dictionary<Test.MyStruct, Test.MyEnum> p1,
+                                           Dictionary<Test.MyStruct, Test.MyEnum> p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+                        var r = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpMyStructMyEnumDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpByteBoolDSResult>
+                    opByteBoolDSAsync(Dictionary<byte, bool>[] p1, Dictionary<byte, bool>[] p2, Ice.Current current)
+                    {
+                        var p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
+                        Array.Copy(p2, p3, p2.Length);
+                        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                        var r = new Dictionary<byte, bool>[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpByteBoolDSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpShortIntDSResult>
+                    opShortIntDSAsync(Dictionary<short, int>[] p1, Dictionary<short, int>[] p2, Ice.Current current)
+                    {
+                        var p3 = new Dictionary<short, int>[p1.Length + p2.Length];
+                        Array.Copy(p2, p3, p2.Length);
+                        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                        var r = new Dictionary<short, int>[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpShortIntDSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpLongFloatDSResult>
+                    opLongFloatDSAsync(Dictionary<long, float>[] p1, Dictionary<long, float>[] p2, Ice.Current current)
+                    {
+                        var p3 = new Dictionary<long, float>[p1.Length + p2.Length];
+                        Array.Copy(p2, p3, p2.Length);
+                        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                        var r = new Dictionary<long, float>[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpLongFloatDSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringStringDSResult>
+                    opStringStringDSAsync(Dictionary<string, string>[] p1, Dictionary<string, string>[] p2, Ice.Current current)
+                    {
+                        var p3 = new Dictionary<string, string>[p1.Length + p2.Length];
+                        Array.Copy(p2, p3, p2.Length);
+                        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                        var r = new Dictionary<string, string>[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringStringDSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringMyEnumDSResult>
+                    opStringMyEnumDSAsync(Dictionary<string, Test.MyEnum>[] p1, Dictionary<string, Test.MyEnum>[] p2, Ice.Current current)
+                    {
+                        var p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length];
+                        Array.Copy(p2, p3, p2.Length);
+                        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                        var r = new Dictionary<string, Test.MyEnum>[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringMyEnumDSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpMyEnumStringDSResult>
+                    opMyEnumStringDSAsync(Dictionary<Test.MyEnum, string>[] p1, Dictionary<Test.MyEnum, string>[] p2, Ice.Current current)
+                    {
+                        var p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length];
+                        Array.Copy(p2, p3, p2.Length);
+                        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                        var r = new Dictionary<Test.MyEnum, string>[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpMyEnumStringDSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpMyStructMyEnumDSResult>
+                    opMyStructMyEnumDSAsync(Dictionary<Test.MyStruct, Test.MyEnum>[] p1, Dictionary<Test.MyStruct, Test.MyEnum>[] p2,
+                        Ice.Current current)
+                    {
+                        var p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length];
+                        Array.Copy(p2, p3, p2.Length);
+                        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                        var r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpMyStructMyEnumDSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpByteByteSDResult>
+                    opByteByteSDAsync(Dictionary<byte, byte[]> p1, Dictionary<byte, byte[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<byte, byte[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpByteByteSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpBoolBoolSDResult>
+                    opBoolBoolSDAsync(Dictionary<bool, bool[]> p1, Dictionary<bool, bool[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<bool, bool[]>();
+                        foreach (KeyValuePair<bool, bool[]> e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (KeyValuePair<bool, bool[]> e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpBoolBoolSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpShortShortSDResult>
+                    opShortShortSDAsync(Dictionary<short, short[]> p1, Dictionary<short, short[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<short, short[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpShortShortSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpIntIntSDResult>
+                    opIntIntSDAsync(Dictionary<int, int[]> p1, Dictionary<int, int[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<int, int[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpIntIntSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpLongLongSDResult>
+                    opLongLongSDAsync(Dictionary<long, long[]> p1, Dictionary<long, long[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<long, long[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpLongLongSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringFloatSDResult>
+                    opStringFloatSDAsync(Dictionary<string, float[]> p1, Dictionary<string, float[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<string, float[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringFloatSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringDoubleSDResult>
+                    opStringDoubleSDAsync(Dictionary<string, double[]> p1, Dictionary<string, double[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<string, double[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringDoubleSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringStringSDResult>
+                    opStringStringSDAsync(Dictionary<string, string[]> p1, Dictionary<string, string[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<string, string[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringStringSDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpMyEnumMyEnumSDResult>
+                    opMyEnumMyEnumSDAsync(Dictionary<Test.MyEnum, Test.MyEnum[]> p1,
+                                          Dictionary<Test.MyEnum, Test.MyEnum[]> p2, Ice.Current current)
+                    {
+                        var p3 = p2;
+                        var r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpMyEnumMyEnumSDResult(r, p3));
+                    }
+
+                    public Task<int[]>
+                    opIntSAsync(int[] s, Ice.Current current)
+                    {
+                        var r = new int[s.Length];
+                        for (int i = 0; i < s.Length; ++i)
+                        {
+                            r[i] = -s[i];
+                        }
+                        return Task.FromResult(r);
+                    }
+
+                    public Task<Dictionary<string, string>>
+                    opContextAsync(Ice.Current current)
+                    {
+                        return Task.FromResult(current.ctx);
+                    }
+
+                    public Task
+                    opByteSOnewayAsync(byte[] s, Ice.Current current)
+                    {
+                        lock (this)
+                        {
+                            ++_opByteSOnewayCallCount;
+                        }
+                        return null;
+                    }
+
+                    public Task<int>
+                    opByteSOnewayCallCountAsync(Ice.Current current)
+                    {
+                        lock (this)
+                        {
+                            var count = _opByteSOnewayCallCount;
+                            _opByteSOnewayCallCount = 0;
+                            return Task.FromResult<int>(count);
+                        }
+                    }
+
+                    public Task
+                    opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current)
+                    {
+                        var d = 1278312346.0 / 13.0;
+                        test(p1 == d);
+                        for (int i = 0; i < p2.Length; ++i)
+                        {
+                            test(p2[i] == d);
+                        }
+                        return null;
+                    }
+
+                    public Task<Test.MyClass_OpStringSResult>
+                    opStringSAsync(string[] p1, string[] p2, Ice.Current current)
+                    {
+                        var p3 = new string[p1.Length + p2.Length];
+                        Array.Copy(p1, p3, p1.Length);
+                        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                        var r = new string[p1.Length];
+                        for (int i = 0; i < p1.Length; i++)
+                        {
+                            r[i] = p1[p1.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringSSResult>
+                    opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current)
+                    {
+                        var p3 = new string[p1.Length + p2.Length][];
+                        Array.Copy(p1, p3, p1.Length);
+                        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+                        var r = new string[p2.Length][];
+                        for (int i = 0; i < p2.Length; i++)
+                        {
+                            r[i] = p2[p2.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringSSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringSSSResult>
+                    opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current)
+                    {
+                        var p3 = new string[p1.Length + p2.Length][][];
+                        Array.Copy(p1, p3, p1.Length);
+                        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                        var r = new string[p2.Length][][];
+                        for (int i = 0; i < p2.Length; i++)
+                        {
+                            r[i] = p2[p2.Length - (i + 1)];
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringSSSResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStringStringDResult>
+                    opStringStringDAsync(Dictionary<string, string> p1, Dictionary<string, string> p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+                        var r = new Dictionary<string, string>();
+                        foreach (var e in p1)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        foreach (var e in p2)
+                        {
+                            r[e.Key] = e.Value;
+                        }
+                        return Task.FromResult(new Test.MyClass_OpStringStringDResult(r, p3));
+                    }
+
+                    public Task<Test.MyClass_OpStructResult>
+                    opStructAsync(Test.Structure p1, Test.Structure p2, Ice.Current current)
+                    {
+                        var p3 = p1;
+                        p3.s.s = "a new string";
+                        return Task.FromResult(new Test.MyClass_OpStructResult(p2, p3));
+                    }
+
+                    public Task
+                    opIdempotentAsync(Ice.Current current)
+                    {
+                        test(current.mode == Ice.OperationMode.Idempotent);
+                        return null;
+                    }
+
+                    public Task
+                    opNonmutatingAsync(Ice.Current current)
+                    {
+                        test(current.mode == Ice.OperationMode.Nonmutating);
+                        return null;
+                    }
+
+                    public Task
+                    opDerivedAsync(Ice.Current current)
+                    {
+                        return null;
+                    }
+
+                    public Task<byte>
+                    opByte1Async(byte value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<short>
+                    opShort1Async(short value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<int>
+                    opInt1Async(int value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<long>
+                    opLong1Async(long value, Ice.Current current)
+                    {
+                        return Task.FromResult<long>(value);
+                    }
+
+                    public Task<float>
+                    opFloat1Async(float value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<double>
+                    opDouble1Async(double value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<string>
+                    opString1Async(string value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<string[]>
+                    opStringS1Async(string[] value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<Dictionary<byte, bool>>
+                    opByteBoolD1Async(Dictionary<byte, bool> value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<string[]>
+                    opStringS2Async(string[] value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<Dictionary<byte, bool>>
+                    opByteBoolD2Async(Dictionary<byte, bool> value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<Test.MyClass1>
+                    opMyClass1Async(Test.MyClass1 value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<Test.MyStruct1>
+                    opMyStruct1Async(Test.MyStruct1 value, Ice.Current current)
+                    {
+                        return Task.FromResult(value);
+                    }
+
+                    public Task<string[]>
+                    opStringLiteralsAsync(Ice.Current current)
+                    {
+                        return Task.FromResult<string[]>(new string[]
+                            {
+                                Test.s0.value,
+                                Test.s1.value,
+                                Test.s2.value,
+                                Test.s3.value,
+                                Test.s4.value,
+                                Test.s5.value,
+                                Test.s6.value,
+                                Test.s7.value,
+                                Test.s8.value,
+                                Test.s9.value,
+                                Test.s10.value,
+
+                                Test.sw0.value,
+                                Test.sw1.value,
+                                Test.sw2.value,
+                                Test.sw3.value,
+                                Test.sw4.value,
+                                Test.sw5.value,
+                                Test.sw6.value,
+                                Test.sw7.value,
+                                Test.sw8.value,
+                                Test.sw9.value,
+                                Test.sw10.value,
+
+                                Test.ss0.value,
+                                Test.ss1.value,
+                                Test.ss2.value,
+                                Test.ss3.value,
+                                Test.ss4.value,
+                                Test.ss5.value,
+
+                                Test.su0.value,
+                                Test.su1.value,
+                                Test.su2.value
+                            });
+                    }
+
+                    public Task<string[]>
+                    opWStringLiteralsAsync(Ice.Current current)
+                    {
+                        return Task.FromResult<string[]>(new string[]
+                            {
+                                Test.s0.value,
+                                Test.s1.value,
+                                Test.s2.value,
+                                Test.s3.value,
+                                Test.s4.value,
+                                Test.s5.value,
+                                Test.s6.value,
+                                Test.s7.value,
+                                Test.s8.value,
+                                Test.s9.value,
+                                Test.s10.value,
+
+                                Test.sw0.value,
+                                Test.sw1.value,
+                                Test.sw2.value,
+                                Test.sw3.value,
+                                Test.sw4.value,
+                                Test.sw5.value,
+                                Test.sw6.value,
+                                Test.sw7.value,
+                                Test.sw8.value,
+                                Test.sw9.value,
+                                Test.sw10.value,
+
+                                Test.ss0.value,
+                                Test.ss1.value,
+                                Test.ss2.value,
+                                Test.ss3.value,
+                                Test.ss4.value,
+                                Test.ss5.value,
+
+                                Test.su0.value,
+                                Test.su1.value,
+                                Test.su2.value
+                            });
+                    }
+
+                    public async Task<Test.MyClass_OpMStruct1MarshaledResult>
+                    opMStruct1Async(Ice.Current current)
+                    {
+                        await Task.Delay(0);
+                        return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
+                    }
+
+                    public async Task<Test.MyClass_OpMStruct2MarshaledResult>
+                    opMStruct2Async(Test.Structure p1, Ice.Current current)
+                    {
+                        await Task.Delay(0);
+                        return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
+                    }
+
+                    public async Task<Test.MyClass_OpMSeq1MarshaledResult>
+                    opMSeq1Async(Ice.Current current)
+                    {
+                        await Task.Delay(0);
+                        return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
+                    }
+
+                    public async Task<Test.MyClass_OpMSeq2MarshaledResult>
+                    opMSeq2Async(string[] p1, Ice.Current current)
+                    {
+                        await Task.Delay(0);
+                        return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
+                    }
+
+                    public async Task<Test.MyClass_OpMDict1MarshaledResult>
+                    opMDict1Async(Ice.Current current)
+                    {
+                        await Task.Delay(0);
+                        return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
+                    }
+
+                    public async Task<Test.MyClass_OpMDict2MarshaledResult>
+                    opMDict2Async(Dictionary<string, string> p1, Ice.Current current)
+                    {
+                        await Task.Delay(0);
+                        return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
+                    }
+
+                    private Thread_opVoid _opVoidThread;
+                    private int _opByteSOnewayCallCount = 0;
+                }
             }
         }
-
-        return Task.FromResult<MyClass_OpFloatDoubleSSResult>(new MyClass_OpFloatDoubleSSResult(r, p3, p4));
-    }
-
-    public Task<MyClass_OpLongFloatDResult>
-    opLongFloatDAsync(Dictionary<long, float> p1, Dictionary<long, float> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<long, float>();
-        foreach(KeyValuePair<long, float> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<long, float> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-
-        return Task.FromResult<MyClass_OpLongFloatDResult>(new MyClass_OpLongFloatDResult(r, p3));
-    }
-
-    public Task<MyClass_OpMyClassResult>
-    opMyClassAsync(MyClassPrx p1, Ice.Current current)
-    {
-        var p2 = p1;
-        var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
-                                                Ice.Util.stringToIdentity("noSuchIdentity")));
-        return Task.FromResult<MyClass_OpMyClassResult>(new MyClass_OpMyClassResult(
-            MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3));
-    }
-
-    public Task<MyClass_OpMyEnumResult>
-    opMyEnumAsync(MyEnum p1, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpMyEnumResult>(new MyClass_OpMyEnumResult(MyEnum.enum3, p1));
-    }
-
-    public Task<MyClass_OpShortIntDResult>
-    opShortIntDAsync(Dictionary<short, int> p1, Dictionary<short, int> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<short, int>();
-        foreach(KeyValuePair<short, int> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<short, int> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpShortIntDResult>(new MyClass_OpShortIntDResult(r, p3));
-    }
-
-    public Task<MyClass_OpShortIntLongResult>
-    opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpShortIntLongResult>(new MyClass_OpShortIntLongResult(p3, p1, p2, p3));
-    }
-
-    public Task<MyClass_OpShortIntLongSResult>
-    opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current)
-    {
-        var p4 = p1;
-        var p5 = new int[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
-        var p6 = new long[p3.Length + p3.Length];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
-        return Task.FromResult<MyClass_OpShortIntLongSResult>(new MyClass_OpShortIntLongSResult(p3, p4, p5, p6));
-    }
-
-    public Task<MyClass_OpShortIntLongSSResult>
-    opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current)
-    {
-        var p4 = p1;
-
-        var p5 = new int[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
-
-        var p6 = new long[p3.Length + p3.Length][];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
-        return Task.FromResult<MyClass_OpShortIntLongSSResult>(new MyClass_OpShortIntLongSSResult(p3, p4, p5, p6));
-    }
-
-    public Task<MyClass_OpStringResult>
-    opStringAsync(string p1, string p2, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpStringResult>(new MyClass_OpStringResult(p1 + " " + p2, p2 + " " + p1));
-    }
-
-    public Task<MyClass_OpStringMyEnumDResult>
-    opStringMyEnumDAsync(Dictionary<string, MyEnum> p1, Dictionary<string, MyEnum> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<string, Test.MyEnum>();
-        foreach(KeyValuePair<string, Test.MyEnum> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, Test.MyEnum> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringMyEnumDResult>(new MyClass_OpStringMyEnumDResult(r, p3));
-    }
-
-    public Task<MyClass_OpMyEnumStringDResult>
-    opMyEnumStringDAsync(Dictionary<MyEnum, string> p1, Dictionary<MyEnum, string> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<MyEnum, string>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<MyEnum, string> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpMyEnumStringDResult>(new MyClass_OpMyEnumStringDResult(r, p3));
-    }
-
-    public Task<MyClass_OpMyStructMyEnumDResult>
-    opMyStructMyEnumDAsync(Dictionary<MyStruct, MyEnum> p1,
-                           Dictionary<MyStruct, MyEnum> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<MyStruct, MyEnum>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpMyStructMyEnumDResult>(new MyClass_OpMyStructMyEnumDResult(r, p3));
-    }
-
-    public Task<MyClass_OpByteBoolDSResult>
-    opByteBoolDSAsync(Dictionary<byte, bool>[] p1, Dictionary<byte, bool>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<byte, bool>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpByteBoolDSResult>(new MyClass_OpByteBoolDSResult(r, p3));
-    }
-
-    public Task<MyClass_OpShortIntDSResult>
-    opShortIntDSAsync(Dictionary<short, int>[] p1, Dictionary<short, int>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<short, int>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<short, int>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpShortIntDSResult>(new MyClass_OpShortIntDSResult(r, p3));
-    }
-
-    public Task<MyClass_OpLongFloatDSResult>
-    opLongFloatDSAsync(Dictionary<long, float>[] p1, Dictionary<long, float>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<long, float>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<long, float>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpLongFloatDSResult>(new MyClass_OpLongFloatDSResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringStringDSResult>
-    opStringStringDSAsync(Dictionary<string, string>[] p1, Dictionary<string, string>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<string, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<string, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringStringDSResult>(new MyClass_OpStringStringDSResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringMyEnumDSResult>
-    opStringMyEnumDSAsync(Dictionary<string, MyEnum>[] p1, Dictionary<string, MyEnum>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<string, MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<string, MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringMyEnumDSResult>(new MyClass_OpStringMyEnumDSResult(r, p3));
-    }
-
-    public Task<MyClass_OpMyEnumStringDSResult>
-    opMyEnumStringDSAsync(Dictionary<MyEnum, string>[] p1, Dictionary<MyEnum, string>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<MyEnum, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<MyEnum, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpMyEnumStringDSResult>(new MyClass_OpMyEnumStringDSResult(r, p3));
-    }
-
-    public Task<MyClass_OpMyStructMyEnumDSResult>
-    opMyStructMyEnumDSAsync(Dictionary<MyStruct, MyEnum>[] p1, Dictionary<MyStruct, MyEnum>[] p2, Ice.Current current)
-    {
-        var p3 = new Dictionary<MyStruct, MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        var r = new Dictionary<MyStruct, MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpMyStructMyEnumDSResult>(new MyClass_OpMyStructMyEnumDSResult(r, p3));
-    }
-
-    public Task<MyClass_OpByteByteSDResult>
-    opByteByteSDAsync(Dictionary<byte, byte[]> p1, Dictionary<byte, byte[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<byte, byte[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpByteByteSDResult>(new MyClass_OpByteByteSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpBoolBoolSDResult>
-    opBoolBoolSDAsync(Dictionary<bool, bool[]> p1, Dictionary<bool, bool[]> p2, Ice.Current current)
-    {
-        var  p3 = p2;
-        var r = new Dictionary<bool, bool[]>();
-        foreach(KeyValuePair<bool, bool[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<bool, bool[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpBoolBoolSDResult>(new MyClass_OpBoolBoolSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpShortShortSDResult>
-    opShortShortSDAsync(Dictionary<short, short[]> p1, Dictionary<short, short[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<short, short[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpShortShortSDResult>(new MyClass_OpShortShortSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpIntIntSDResult>
-    opIntIntSDAsync(Dictionary<int, int[]> p1, Dictionary<int, int[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<int, int[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpIntIntSDResult>(new MyClass_OpIntIntSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpLongLongSDResult>
-    opLongLongSDAsync(Dictionary<long, long[]> p1, Dictionary<long, long[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<long, long[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpLongLongSDResult>(new MyClass_OpLongLongSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringFloatSDResult>
-    opStringFloatSDAsync(Dictionary<string, float[]> p1, Dictionary<string, float[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<string, float[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringFloatSDResult>(new MyClass_OpStringFloatSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringDoubleSDResult>
-    opStringDoubleSDAsync(Dictionary<string, double[]> p1, Dictionary<string, double[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<string, double[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringDoubleSDResult>(new MyClass_OpStringDoubleSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringStringSDResult>
-    opStringStringSDAsync(Dictionary<string, string[]> p1, Dictionary<string, string[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<string, string[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringStringSDResult>(new MyClass_OpStringStringSDResult(r, p3));
-    }
-
-    public Task<MyClass_OpMyEnumMyEnumSDResult>
-    opMyEnumMyEnumSDAsync(Dictionary<MyEnum, MyEnum[]> p1, Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current)
-    {
-        var p3 = p2;
-        var r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpMyEnumMyEnumSDResult>(new MyClass_OpMyEnumMyEnumSDResult(r, p3));
-    }
-
-    public Task<int[]>
-    opIntSAsync(int[] s, Ice.Current current)
-    {
-        var r = new int[s.Length];
-        for(int i = 0; i < s.Length; ++i)
-        {
-            r[i] = -s[i];
-        }
-        return Task.FromResult<int[]>(r);
-    }
-
-    public Task<Dictionary<string, string>>
-    opContextAsync(Ice.Current current)
-    {
-        return Task.FromResult<Dictionary<string, string>>(current.ctx);
-    }
-
-    public Task
-    opByteSOnewayAsync(byte[] s, Ice.Current current)
-    {
-        lock(this)
-        {
-            ++_opByteSOnewayCallCount;
-        }
-        return null;
-    }
-
-    public Task<int>
-    opByteSOnewayCallCountAsync(Ice.Current current)
-    {
-        lock(this)
-        {
-            var count = _opByteSOnewayCallCount;
-            _opByteSOnewayCallCount = 0;
-            return Task.FromResult<int>(count);
-        }
-    }
-
-    public Task
-    opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current)
-    {
-        var d = 1278312346.0 / 13.0;
-        test(p1 == d);
-        for(int i = 0; i < p2.Length; ++i)
-        {
-            test(p2[i] == d);
-        }
-        return null;
-    }
-
-    public Task<MyClass_OpStringSResult>
-    opStringSAsync(string[] p1, string[] p2, Ice.Current current)
-    {
-        var p3 = new string[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        var r = new string[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringSResult>(new MyClass_OpStringSResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringSSResult>
-    opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current)
-    {
-        var p3 = new string[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-        var r = new string[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringSSResult>(new MyClass_OpStringSSResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringSSSResult>
-    opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current)
-    {
-        var p3 = new string[p1.Length + p2.Length][][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        var r = new string[p2.Length][][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return Task.FromResult<MyClass_OpStringSSSResult>(new MyClass_OpStringSSSResult(r, p3));
-    }
-
-    public Task<MyClass_OpStringStringDResult>
-    opStringStringDAsync(Dictionary<string, string> p1, Dictionary<string, string> p2, Ice.Current current)
-    {
-        var p3 = p1;
-        var r = new Dictionary<string, string>();
-        foreach(var e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(var e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return Task.FromResult<MyClass_OpStringStringDResult>(new MyClass_OpStringStringDResult(r, p3));
-    }
-
-    public Task<MyClass_OpStructResult>
-    opStructAsync(Structure p1, Structure p2, Ice.Current current)
-    {
-        var p3 = p1;
-        p3.s.s = "a new string";
-        return Task.FromResult<MyClass_OpStructResult>(new MyClass_OpStructResult(p2, p3));
-    }
-
-    public Task
-    opIdempotentAsync(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Idempotent);
-        return null;
     }
-
-    public Task
-    opNonmutatingAsync(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return null;
-    }
-
-    public Task
-    opDerivedAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public Task<byte>
-    opByte1Async(byte value, Ice.Current current)
-    {
-        return Task.FromResult<byte>(value);
-    }
-
-    public Task<short>
-    opShort1Async(short value, Ice.Current current)
-    {
-        return Task.FromResult<short>(value);
-    }
-
-    public Task<int>
-    opInt1Async(int value, Ice.Current current)
-    {
-        return Task.FromResult<int>(value);
-    }
-
-    public Task<long>
-    opLong1Async(long value, Ice.Current current)
-    {
-        return Task.FromResult<long>(value);
-    }
-
-    public Task<float>
-    opFloat1Async(float value, Ice.Current current)
-    {
-        return Task.FromResult<float>(value);
-    }
-
-    public Task<double>
-    opDouble1Async(double value, Ice.Current current)
-    {
-        return Task.FromResult<double>(value);
-    }
-
-    public Task<string>
-    opString1Async(string value, Ice.Current current)
-    {
-        return Task.FromResult<string>(value);
-    }
-
-    public Task<string[]>
-    opStringS1Async(string[] value, Ice.Current current)
-    {
-        return Task.FromResult<string[]>(value);
-    }
-
-    public Task<Dictionary<byte, bool>>
-    opByteBoolD1Async(Dictionary<byte, bool> value, Ice.Current current)
-    {
-        return Task.FromResult<Dictionary<byte, bool>>(value);
-    }
-
-    public Task<string[]>
-    opStringS2Async(string[] value, Ice.Current current)
-    {
-        return Task.FromResult<string[]>(value);
-    }
-
-    public Task<Dictionary<byte, bool>>
-    opByteBoolD2Async(Dictionary<byte, bool> value, Ice.Current current)
-    {
-        return Task.FromResult<Dictionary<byte, bool>>(value);
-    }
-
-    public Task<MyClass1>
-    opMyClass1Async(MyClass1 value, Ice.Current current)
-    {
-        return Task.FromResult<MyClass1>(value);
-    }
-
-    public Task<MyStruct1>
-    opMyStruct1Async(MyStruct1 value, Ice.Current current)
-    {
-        return Task.FromResult<MyStruct1>(value);
-    }
-
-    public Task<string[]>
-    opStringLiteralsAsync(Ice.Current current)
-    {
-        return Task.FromResult<string[]>(new string[]
-            {
-                s0.value,
-                s1.value,
-                s2.value,
-                s3.value,
-                s4.value,
-                s5.value,
-                s6.value,
-                s7.value,
-                s8.value,
-                s9.value,
-                s10.value,
-
-                sw0.value,
-                sw1.value,
-                sw2.value,
-                sw3.value,
-                sw4.value,
-                sw5.value,
-                sw6.value,
-                sw7.value,
-                sw8.value,
-                sw9.value,
-                sw10.value,
-
-                ss0.value,
-                ss1.value,
-                ss2.value,
-                ss3.value,
-                ss4.value,
-                ss5.value,
-
-                su0.value,
-                su1.value,
-                su2.value
-            });
-    }
-
-    public Task<string[]>
-    opWStringLiteralsAsync(Ice.Current current)
-    {
-        return Task.FromResult<string[]>(new string[]
-            {
-                s0.value,
-                s1.value,
-                s2.value,
-                s3.value,
-                s4.value,
-                s5.value,
-                s6.value,
-                s7.value,
-                s8.value,
-                s9.value,
-                s10.value,
-
-                sw0.value,
-                sw1.value,
-                sw2.value,
-                sw3.value,
-                sw4.value,
-                sw5.value,
-                sw6.value,
-                sw7.value,
-                sw8.value,
-                sw9.value,
-                sw10.value,
-
-                ss0.value,
-                ss1.value,
-                ss2.value,
-                ss3.value,
-                ss4.value,
-                ss5.value,
-
-                su0.value,
-                su1.value,
-                su2.value
-            });
-    }
-
-    public async Task<Test.MyClass_OpMStruct1MarshaledResult>
-    opMStruct1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
-    }
-
-    public async Task<Test.MyClass_OpMStruct2MarshaledResult>
-    opMStruct2Async(Test.Structure p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
-    }
-
-    public async Task<Test.MyClass_OpMSeq1MarshaledResult>
-    opMSeq1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
-    }
-
-    public async Task<Test.MyClass_OpMSeq2MarshaledResult>
-    opMSeq2Async(string[] p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
-    }
-
-    public async Task<Test.MyClass_OpMDict1MarshaledResult>
-    opMDict1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
-    }
-
-    public async Task<Test.MyClass_OpMDict2MarshaledResult>
-    opMDict2Async(Dictionary<string, string> p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
-    }
-
-    private Thread_opVoid _opVoidThread;
-    private int _opByteSOnewayCallCount = 0;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassI.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,910 +1,910 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
+namespace Ice
 {
-    private static void test(bool b)
+    namespace operations
     {
-        if (!b)
+        public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
         {
-            throw new Exception();
-        }
-    }
-
-    //
-    // Override the Object "pseudo" operations to verify the operation mode.
-    //
-
-    public override bool ice_isA(string id, Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return base.ice_isA(id, current);
-    }
-
-    public override void ice_ping(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        base.ice_ping(current);
-    }
+            private static void test(bool b)
+            {
+                if (!b)
+                {
+                    throw new System.Exception();
+                }
+            }
 
-    public override string[] ice_ids(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return base.ice_ids(current);
-    }
+            //
+            // Override the Object "pseudo" operations to verify the operation mode.
+            //
 
-    public override string ice_id(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-        return base.ice_id(current);
-    }
-
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
+            public override bool ice_isA(string id, Ice.Current current)
+            {
+                test(current.mode == Ice.OperationMode.Nonmutating);
+                return base.ice_isA(id, current);
+            }
 
-    public override bool supportsCompress(Ice.Current current)
-    {
-        return IceInternal.BZip2.supported();
-    }
+            public override void ice_ping(Ice.Current current)
+            {
+                test(current.mode == Ice.OperationMode.Nonmutating);
+                base.ice_ping(current);
+            }
 
-    public override void opVoid(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Normal);
-    }
+            public override string[] ice_ids(Ice.Current current)
+            {
+                test(current.mode == Ice.OperationMode.Nonmutating);
+                return base.ice_ids(current);
+            }
 
-    public override bool opBool(bool p1, bool p2, out bool p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p2;
-    }
+            public override string ice_id(Ice.Current current)
+            {
+                test(current.mode == Ice.OperationMode.Nonmutating);
+                return base.ice_id(current);
+            }
 
-    public override bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current)
-    {
-        p3 = new bool[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
 
-        bool[] r = new bool[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            public override bool supportsCompress(Ice.Current current)
+            {
+                return IceInternal.BZip2.supported();
+            }
 
-    public override bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current)
-    {
-        p3 = new bool[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+            public override void opVoid(Ice.Current current)
+            {
+                test(current.mode == Ice.OperationMode.Normal);
+            }
 
-        bool[][] r = new bool[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            public override bool opBool(bool p1, bool p2, out bool p3, Ice.Current current)
+            {
+                p3 = p1;
+                return p2;
+            }
 
-    public override byte opByte(byte p1, byte p2, out byte p3, Ice.Current current)
-    {
-        p3 = (byte)(p1 ^ p2);
-        return p1;
-    }
+            public override bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current)
+            {
+                p3 = new bool[p1.Length + p2.Length];
+                Array.Copy(p1, p3, p1.Length);
+                Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                bool[] r = new bool[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override Dictionary<byte, bool> opByteBoolD(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2,
-                                                       out Dictionary<byte, bool> p3,
-                                                       Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<byte, bool> r = new Dictionary<byte, bool>();
-        foreach(KeyValuePair<byte, bool> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<byte, bool> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current)
+            {
+                p3 = new bool[p1.Length + p2.Length][];
+                Array.Copy(p1, p3, p1.Length);
+                Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                bool[][] r = new bool[p1.Length][];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current)
-    {
-        p3 = new byte[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
+            public override byte opByte(byte p1, byte p2, out byte p3, Ice.Current current)
+            {
+                p3 = (byte)(p1 ^ p2);
+                return p1;
+            }
 
-        byte[] r = new byte[p1.Length + p2.Length];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-        return r;
-    }
+            public override Dictionary<byte, bool> opByteBoolD(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2,
+                                                               out Dictionary<byte, bool> p3,
+                                                               Ice.Current current)
+            {
+                p3 = p1;
+                Dictionary<byte, bool> r = new Dictionary<byte, bool>();
+                foreach (KeyValuePair<byte, bool> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<byte, bool> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current)
-    {
-        p3 = new byte[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
+            public override byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current)
+            {
+                p3 = new byte[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    p3[i] = p1[p1.Length - (i + 1)];
+                }
+
+                byte[] r = new byte[p1.Length + p2.Length];
+                Array.Copy(p1, r, p1.Length);
+                Array.Copy(p2, 0, r, p1.Length, p2.Length);
+                return r;
+            }
 
-        byte[][] r = new byte[p1.Length + p2.Length][];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-        return r;
-    }
+            public override byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current)
+            {
+                p3 = new byte[p1.Length][];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    p3[i] = p1[p1.Length - (i + 1)];
+                }
+
+                byte[][] r = new byte[p1.Length + p2.Length][];
+                Array.Copy(p1, r, p1.Length);
+                Array.Copy(p2, 0, r, p1.Length, p2.Length);
+                return r;
+            }
 
-    public override double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current)
-    {
-        p3 = p1;
-        p4 = p2;
-        return p2;
-    }
+            public override double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current)
+            {
+                p3 = p1;
+                p4 = p2;
+                return p2;
+            }
 
-    public override double[] opFloatDoubleS(float[] p1, double[] p2,
-                                            out float[] p3, out double[] p4,
-                                            Ice.Current current)
-    {
-        p3 = p1;
+            public override double[] opFloatDoubleS(float[] p1, double[] p2,
+                                                    out float[] p3, out double[] p4,
+                                                    Ice.Current current)
+            {
+                p3 = p1;
 
-        p4 = new double[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
+                p4 = new double[p2.Length];
+                for (int i = 0; i < p2.Length; i++)
+                {
+                    p4[i] = p2[p2.Length - (i + 1)];
+                }
+
+                double[] r = new double[p2.Length + p1.Length];
+                Array.Copy(p2, r, p2.Length);
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[p2.Length + i] = (double)p1[i];
+                }
+                return r;
+            }
 
-        double[] r = new double[p2.Length + p1.Length];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[p2.Length + i] = (double)p1[i];
-        }
-        return r;
-    }
+            public override double[][] opFloatDoubleSS(float[][] p1, double[][] p2,
+                                                       out float[][] p3, out double[][] p4,
+                                                       Ice.Current current)
+            {
+                p3 = p1;
 
-    public override double[][] opFloatDoubleSS(float[][] p1, double[][] p2,
-                                               out float[][] p3, out double[][] p4,
-                                               Ice.Current current)
-    {
-        p3 = p1;
+                p4 = new double[p2.Length][];
+                for (int i = 0; i < p2.Length; i++)
+                {
+                    p4[i] = p2[p2.Length - (i + 1)];
+                }
+
+                double[][] r = new double[p2.Length + p2.Length][];
+                Array.Copy(p2, r, p2.Length);
+                for (int i = 0; i < p2.Length; i++)
+                {
+                    r[p2.Length + i] = new double[p2[i].Length];
+                    for (int j = 0; j < p2[i].Length; j++)
+                    {
+                        r[p2.Length + i][j] = (double)p2[i][j];
+                    }
+                }
+                return r;
+            }
 
-        p4 = new double[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
+            public override Dictionary<long, float> opLongFloatD(Dictionary<long, float> p1, Dictionary<long, float> p2,
+                                                                 out Dictionary<long, float> p3,
+                                                                 Ice.Current current)
+            {
+                p3 = p1;
+                Dictionary<long, float> r = new Dictionary<long, float>();
+                foreach (KeyValuePair<long, float> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<long, float> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-        double[][] r = new double[p2.Length + p2.Length][];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[p2.Length + i] = new double[p2[i].Length];
-            for(int j = 0; j < p2[i].Length; j++)
+            public override Test.MyClassPrx opMyClass(Test.MyClassPrx p1, out Test.MyClassPrx p2, out Test.MyClassPrx p3,
+                                                      Ice.Current current)
             {
-                r[p2.Length + i][j] = (double)p2[i][j];
+                p2 = p1;
+                p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
+                                                        Ice.Util.stringToIdentity("noSuchIdentity")));
+                return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
             }
-        }
-        return r;
-    }
 
-    public override Dictionary<long, float> opLongFloatD(Dictionary<long, float> p1, Dictionary<long, float> p2,
-                                                         out Dictionary<long, float> p3,
-                                                         Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<long, float> r = new Dictionary<long, float>();
-        foreach(KeyValuePair<long, float> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<long, float> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override Test.MyEnum opMyEnum(Test.MyEnum p1, out Test.MyEnum p2, Ice.Current current)
+            {
+                p2 = p1;
+                return Test.MyEnum.enum3;
+            }
 
-    public override Test.MyClassPrx opMyClass(Test.MyClassPrx p1, out Test.MyClassPrx p2, out Test.MyClassPrx p3,
-                                              Ice.Current current)
-    {
-        p2 = p1;
-        p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
-                                                Ice.Util.stringToIdentity("noSuchIdentity")));
-        return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
-    }
+            public override Dictionary<short, int> opShortIntD(Dictionary<short, int> p1, Dictionary<short, int> p2,
+                                                               out Dictionary<short, int> p3, Ice.Current current)
+            {
+                p3 = p1;
+                Dictionary<short, int> r = new Dictionary<short, int>();
+                foreach (KeyValuePair<short, int> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<short, int> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Test.MyEnum opMyEnum(Test.MyEnum p1, out Test.MyEnum p2, Ice.Current current)
-    {
-        p2 = p1;
-        return Test.MyEnum.enum3;
-    }
+            public override long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6,
+                                                Ice.Current current)
+            {
+                p4 = p1;
+                p5 = p2;
+                p6 = p3;
+                return p3;
+            }
 
-    public override Dictionary<short, int> opShortIntD(Dictionary<short, int> p1, Dictionary<short, int> p2,
-                                                       out Dictionary<short, int> p3, Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<short, int> r = new Dictionary<short, int>();
-        foreach(KeyValuePair<short, int> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<short, int> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override long[] opShortIntLongS(short[] p1, int[] p2, long[] p3,
+                                                   out short[] p4, out int[] p5, out long[] p6,
+                                                   Ice.Current current)
+            {
+                p4 = p1;
 
-    public override long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6,
-                                        Ice.Current current)
-    {
-        p4 = p1;
-        p5 = p2;
-        p6 = p3;
-        return p3;
-    }
+                p5 = new int[p2.Length];
+                for (int i = 0; i < p2.Length; i++)
+                {
+                    p5[i] = p2[p2.Length - (i + 1)];
+                }
+
+                p6 = new long[p3.Length + p3.Length];
+                Array.Copy(p3, p6, p3.Length);
+                Array.Copy(p3, 0, p6, p3.Length, p3.Length);
 
-    public override long[] opShortIntLongS(short[] p1, int[] p2, long[] p3,
-                                           out short[] p4, out int[] p5, out long[] p6,
-                                           Ice.Current current)
-    {
-        p4 = p1;
+                return p3;
+            }
 
-        p5 = new int[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
+            public override long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3,
+                                                      out short[][] p4, out int[][] p5, out long[][] p6,
+                                                      Ice.Current current)
+            {
+                p4 = p1;
 
-        p6 = new long[p3.Length + p3.Length];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
+                p5 = new int[p2.Length][];
+                for (int i = 0; i < p2.Length; i++)
+                {
+                    p5[i] = p2[p2.Length - (i + 1)];
+                }
+
+                p6 = new long[p3.Length + p3.Length][];
+                Array.Copy(p3, p6, p3.Length);
+                Array.Copy(p3, 0, p6, p3.Length, p3.Length);
 
-        return p3;
-    }
+                return p3;
+            }
 
-    public override long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3,
-                                              out short[][] p4, out int[][] p5, out long[][] p6,
-                                              Ice.Current current)
-    {
-        p4 = p1;
+            public override string opString(string p1, string p2, out string p3, Ice.Current current)
+            {
+                p3 = p2 + " " + p1;
+                return p1 + " " + p2;
+            }
 
-        p5 = new int[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
+            public override Dictionary<string, Test.MyEnum> opStringMyEnumD(Dictionary<string, Test.MyEnum> p1,
+                                                                            Dictionary<string, Test.MyEnum> p2,
+                                                                            out Dictionary<string, Test.MyEnum> p3,
+                                                                            Ice.Current current)
+            {
+                p3 = p1;
+                var r = new Dictionary<string, Test.MyEnum>();
+                foreach (KeyValuePair<string, Test.MyEnum> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<string, Test.MyEnum> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-        p6 = new long[p3.Length + p3.Length][];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
+            public override Dictionary<Test.MyEnum, string> opMyEnumStringD(Dictionary<Test.MyEnum, string> p1,
+                                                                            Dictionary<Test.MyEnum, string> p2,
+                                                                            out Dictionary<Test.MyEnum, string> p3,
+                                                                            Ice.Current current)
+            {
+                p3 = p1;
+                var r = new Dictionary<Test.MyEnum, string>();
+                foreach (var e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (var e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-        return p3;
-    }
+            public override Dictionary<Test.MyStruct, Test.MyEnum> opMyStructMyEnumD(
+                                                        Dictionary<Test.MyStruct, Test.MyEnum> p1,
+                                                        Dictionary<Test.MyStruct, Test.MyEnum> p2,
+                                                        out Dictionary<Test.MyStruct, Test.MyEnum> p3,
+                                                        Ice.Current current)
+            {
+                p3 = p1;
+                var r = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                foreach (var e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (var e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override string opString(string p1, string p2, out string p3, Ice.Current current)
-    {
-        p3 = p2 + " " + p1;
-        return p1 + " " + p2;
-    }
+            public override Dictionary<byte, bool>[] opByteBoolDS(Dictionary<byte, bool>[] p1,
+                                                                 Dictionary<byte, bool>[] p2,
+                                                                 out Dictionary<byte, bool>[] p3,
+                                                                 Ice.Current current)
+            {
+                p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
+                Array.Copy(p2, p3, p2.Length);
+                Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                Dictionary<byte, bool>[] r = new Dictionary<byte, bool>[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override Dictionary<string, Test.MyEnum> opStringMyEnumD(Dictionary<string, Test.MyEnum> p1,
-                                                                    Dictionary<string, Test.MyEnum> p2,
-                                                                    out Dictionary<string, Test.MyEnum> p3,
-                                                                    Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<string, Test.MyEnum> r = new Dictionary<string, Test.MyEnum>();
-        foreach(KeyValuePair<string, Test.MyEnum> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, Test.MyEnum> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override Dictionary<short, int>[] opShortIntDS(Dictionary<short, int>[] p1,
+                                                                  Dictionary<short, int>[] p2,
+                                                                  out Dictionary<short, int>[] p3,
+                                                                  Ice.Current current)
+            {
+                p3 = new Dictionary<short, int>[p1.Length + p2.Length];
+                Array.Copy(p2, p3, p2.Length);
+                Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                Dictionary<short, int>[] r = new Dictionary<short, int>[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override Dictionary<Test.MyEnum, string> opMyEnumStringD(Dictionary<Test.MyEnum, string> p1,
-                                                                    Dictionary<Test.MyEnum, string> p2,
-                                                                    out Dictionary<Test.MyEnum, string> p3,
+            public override Dictionary<long, float>[] opLongFloatDS(Dictionary<long, float>[] p1,
+                                                                    Dictionary<long, float>[] p2,
+                                                                    out Dictionary<long, float>[] p3,
                                                                     Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<Test.MyEnum, string> r = new Dictionary<Test.MyEnum, string>();
-        foreach(KeyValuePair<Test.MyEnum, string> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<Test.MyEnum, string> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public override Dictionary<Test.MyStruct, Test.MyEnum> opMyStructMyEnumD(
-                                                Dictionary<Test.MyStruct, Test.MyEnum> p1,
-                                                Dictionary<Test.MyStruct, Test.MyEnum> p2,
-                                                out Dictionary<Test.MyStruct, Test.MyEnum> p3,
-                                                Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<Test.MyStruct, Test.MyEnum> r = new Dictionary<Test.MyStruct, Test.MyEnum>();
-        foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public override Dictionary<byte, bool>[] opByteBoolDS(Dictionary<byte, bool>[] p1,
-                                                         Dictionary<byte, bool>[] p2,
-                                                         out Dictionary<byte, bool>[] p3,
-                                                         Ice.Current current)
-    {
-        p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<byte, bool>[] r = new Dictionary<byte, bool>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            {
+                p3 = new Dictionary<long, float>[p1.Length + p2.Length];
+                Array.Copy(p2, p3, p2.Length);
+                Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                Dictionary<long, float>[] r = new Dictionary<long, float>[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override Dictionary<short, int>[] opShortIntDS(Dictionary<short, int>[] p1,
-                                                          Dictionary<short, int>[] p2,
-                                                          out Dictionary<short, int>[] p3,
-                                                          Ice.Current current)
-    {
-        p3 = new Dictionary<short, int>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+            public override Dictionary<string, string>[] opStringStringDS(Dictionary<string, string>[] p1,
+                                                                          Dictionary<string, string>[] p2,
+                                                                          out Dictionary<string, string>[] p3,
+                                                                          Ice.Current current)
+            {
+                p3 = new Dictionary<string, string>[p1.Length + p2.Length];
+                Array.Copy(p2, p3, p2.Length);
+                Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                Dictionary<string, string>[] r = new Dictionary<string, string>[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-        Dictionary<short, int>[] r = new Dictionary<short, int>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            public override Dictionary<string, Test.MyEnum>[] opStringMyEnumDS(Dictionary<string, Test.MyEnum>[] p1,
+                                                                               Dictionary<string, Test.MyEnum>[] p2,
+                                                                               out Dictionary<string, Test.MyEnum>[] p3,
+                                                                               Ice.Current current)
+            {
+                p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length];
+                Array.Copy(p2, p3, p2.Length);
+                Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                var r = new Dictionary<string, Test.MyEnum>[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override Dictionary<long, float>[] opLongFloatDS(Dictionary<long, float>[] p1,
-                                                            Dictionary<long, float>[] p2,
-                                                            out Dictionary<long, float>[] p3,
-                                                            Ice.Current current)
-    {
-        p3 = new Dictionary<long, float>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+            public override Dictionary<Test.MyEnum, string>[] opMyEnumStringDS(Dictionary<Test.MyEnum, string>[] p1,
+                                                                               Dictionary<Test.MyEnum, string>[] p2,
+                                                                               out Dictionary<Test.MyEnum, string>[] p3,
+                                                                               Ice.Current current)
+            {
+                p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length];
+                Array.Copy(p2, p3, p2.Length);
+                Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                var r = new Dictionary<Test.MyEnum, string>[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-        Dictionary<long, float>[] r = new Dictionary<long, float>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            public override Dictionary<Test.MyStruct, Test.MyEnum>[] opMyStructMyEnumDS(
+                Dictionary<Test.MyStruct, Test.MyEnum>[] p1,
+                Dictionary<Test.MyStruct, Test.MyEnum>[] p2,
+                out Dictionary<Test.MyStruct, Test.MyEnum>[] p3,
+                Ice.Current current)
+            {
+                p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length];
+                Array.Copy(p2, p3, p2.Length);
+                Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                var r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override Dictionary<string, string>[] opStringStringDS(Dictionary<string, string>[] p1,
-                                                                  Dictionary<string, string>[] p2,
-                                                                  out Dictionary<string, string>[] p3,
+            public override Dictionary<byte, byte[]> opByteByteSD(Dictionary<byte, byte[]> p1,
+                                                                  Dictionary<byte, byte[]> p2,
+                                                                  out Dictionary<byte, byte[]> p3,
                                                                   Ice.Current current)
-    {
-        p3 = new Dictionary<string, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<string, string>[] r = new Dictionary<string, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public override Dictionary<string, Test.MyEnum>[] opStringMyEnumDS(Dictionary<string, Test.MyEnum>[] p1,
-                                                                       Dictionary<string, Test.MyEnum>[] p2,
-                                                                       out Dictionary<string, Test.MyEnum>[] p3,
-                                                                       Ice.Current current)
-    {
-        p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<string, Test.MyEnum>[] r = new Dictionary<string, Test.MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public override Dictionary<Test.MyEnum, string>[] opMyEnumStringDS(Dictionary<Test.MyEnum, string>[] p1,
-                                                                       Dictionary<Test.MyEnum, string>[] p2,
-                                                                       out Dictionary<Test.MyEnum, string>[] p3,
-                                                                       Ice.Current current)
-    {
-        p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<Test.MyEnum, string>[] r = new Dictionary<Test.MyEnum, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public override Dictionary<Test.MyStruct, Test.MyEnum>[] opMyStructMyEnumDS(
-        Dictionary<Test.MyStruct, Test.MyEnum>[] p1,
-        Dictionary<Test.MyStruct, Test.MyEnum>[] p2,
-        out Dictionary<Test.MyStruct, Test.MyEnum>[] p3,
-        Ice.Current current)
-    {
-        p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<Test.MyStruct, Test.MyEnum>[] r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            {
+                p3 = p2;
+                Dictionary<byte, byte[]> r = new Dictionary<byte, byte[]>();
+                foreach (var e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (var e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Dictionary<byte, byte[]> opByteByteSD(Dictionary<byte, byte[]> p1,
-                                                          Dictionary<byte, byte[]> p2,
-                                                          out Dictionary<byte, byte[]> p3,
-                                                          Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<byte, byte[]> r = new Dictionary<byte, byte[]>();
-        foreach(KeyValuePair<byte, byte[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<byte, byte[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override Dictionary<bool, bool[]> opBoolBoolSD(Dictionary<bool, bool[]> p1,
+                                                                  Dictionary<bool, bool[]> p2,
+                                                                  out Dictionary<bool, bool[]> p3,
+                                                                  Ice.Current current)
+            {
+                p3 = p2;
+                Dictionary<bool, bool[]> r = new Dictionary<bool, bool[]>();
+                foreach (KeyValuePair<bool, bool[]> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<bool, bool[]> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Dictionary<bool, bool[]> opBoolBoolSD(Dictionary<bool, bool[]> p1,
-                                                          Dictionary<bool, bool[]> p2,
-                                                          out Dictionary<bool, bool[]> p3,
-                                                          Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<bool, bool[]> r = new Dictionary<bool, bool[]>();
-        foreach(KeyValuePair<bool, bool[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<bool, bool[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override Dictionary<short, short[]> opShortShortSD(Dictionary<short, short[]> p1,
+                                                                      Dictionary<short, short[]> p2,
+                                                                      out Dictionary<short, short[]> p3,
+                                                                      Ice.Current current)
+            {
+                p3 = p2;
+                Dictionary<short, short[]> r = new Dictionary<short, short[]>();
+                foreach (KeyValuePair<short, short[]> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<short, short[]> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Dictionary<short, short[]> opShortShortSD(Dictionary<short, short[]> p1,
-                                                              Dictionary<short, short[]> p2,
-                                                              out Dictionary<short, short[]> p3,
+            public override Dictionary<int, int[]> opIntIntSD(Dictionary<int, int[]> p1,
+                                                              Dictionary<int, int[]> p2,
+                                                              out Dictionary<int, int[]> p3,
                                                               Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<short, short[]> r = new Dictionary<short, short[]>();
-        foreach(KeyValuePair<short, short[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<short, short[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public override Dictionary<int, int[]> opIntIntSD(Dictionary<int, int[]> p1,
-                                                      Dictionary<int, int[]> p2,
-                                                      out Dictionary<int, int[]> p3,
-                                                      Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<int, int[]> r = new Dictionary<int, int[]>();
-        foreach(KeyValuePair<int, int[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<int, int[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public override Dictionary<long, long[]> opLongLongSD(Dictionary<long, long[]> p1,
-                                                          Dictionary<long, long[]> p2,
-                                                          out Dictionary<long, long[]> p3,
-                                                          Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<long, long[]> r = new Dictionary<long, long[]>();
-        foreach(KeyValuePair<long, long[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<long, long[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public override Dictionary<string, float[]> opStringFloatSD(Dictionary<string, float[]> p1,
-                                                                Dictionary<string, float[]> p2,
-                                                                out Dictionary<string, float[]> p3,
-                                                                Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<string, float[]> r = new Dictionary<string, float[]>();
-        foreach(KeyValuePair<string, float[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, float[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            {
+                p3 = p2;
+                Dictionary<int, int[]> r = new Dictionary<int, int[]>();
+                foreach (KeyValuePair<int, int[]> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<int, int[]> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Dictionary<string, double[]> opStringDoubleSD(Dictionary<string, double[]> p1,
-                                                                  Dictionary<string, double[]> p2,
-                                                                  out Dictionary<string, double[]> p3,
+            public override Dictionary<long, long[]> opLongLongSD(Dictionary<long, long[]> p1,
+                                                                  Dictionary<long, long[]> p2,
+                                                                  out Dictionary<long, long[]> p3,
                                                                   Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<string, double[]> r = new Dictionary<string, double[]>();
-        foreach(KeyValuePair<string, double[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, double[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            {
+                p3 = p2;
+                Dictionary<long, long[]> r = new Dictionary<long, long[]>();
+                foreach (KeyValuePair<long, long[]> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<long, long[]> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Dictionary<string, string[]> opStringStringSD(Dictionary<string, string[]> p1,
-                                                                  Dictionary<string, string[]> p2,
-                                                                  out Dictionary<string, string[]> p3,
-                                                                  Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<string, string[]> r = new Dictionary<string, string[]>();
-        foreach(KeyValuePair<string, string[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, string[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override Dictionary<string, float[]> opStringFloatSD(Dictionary<string, float[]> p1,
+                                                                        Dictionary<string, float[]> p2,
+                                                                        out Dictionary<string, float[]> p3,
+                                                                        Ice.Current current)
+            {
+                p3 = p2;
+                Dictionary<string, float[]> r = new Dictionary<string, float[]>();
+                foreach (KeyValuePair<string, float[]> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<string, float[]> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Dictionary<Test.MyEnum, Test.MyEnum[]> opMyEnumMyEnumSD(
-        Dictionary<Test.MyEnum, Test.MyEnum[]> p1,
-        Dictionary<Test.MyEnum, Test.MyEnum[]> p2,
-        out Dictionary<Test.MyEnum, Test.MyEnum[]> p3,
-        Ice.Current ice)
-    {
-        p3 = p2;
-        Dictionary<Test.MyEnum, Test.MyEnum[]> r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
-        foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override Dictionary<string, double[]> opStringDoubleSD(Dictionary<string, double[]> p1,
+                                                                          Dictionary<string, double[]> p2,
+                                                                          out Dictionary<string, double[]> p3,
+                                                                          Ice.Current current)
+            {
+                p3 = p2;
+                Dictionary<string, double[]> r = new Dictionary<string, double[]>();
+                foreach (KeyValuePair<string, double[]> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<string, double[]> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override int[] opIntS(int[] s, Ice.Current current)
-    {
-        int[] r = new int[s.Length];
-        for(int i = 0; i < s.Length; ++i)
-        {
-            r[i] = -s[i];
-        }
-        return r;
-    }
+            public override Dictionary<string, string[]> opStringStringSD(Dictionary<string, string[]> p1,
+                                                                          Dictionary<string, string[]> p2,
+                                                                          out Dictionary<string, string[]> p3,
+                                                                          Ice.Current current)
+            {
+                p3 = p2;
+                Dictionary<string, string[]> r = new Dictionary<string, string[]>();
+                foreach (KeyValuePair<string, string[]> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<string, string[]> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override void opByteSOneway(byte[] s, Ice.Current current)
-    {
-        lock(this)
-        {
-            ++_opByteSOnewayCallCount;
-        }
-    }
+            public override Dictionary<Test.MyEnum, Test.MyEnum[]> opMyEnumMyEnumSD(
+                Dictionary<Test.MyEnum, Test.MyEnum[]> p1,
+                Dictionary<Test.MyEnum, Test.MyEnum[]> p2,
+                out Dictionary<Test.MyEnum, Test.MyEnum[]> p3,
+                Ice.Current ice)
+            {
+                p3 = p2;
+                var r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                foreach (var e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (var e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override int opByteSOnewayCallCount(Ice.Current current)
-    {
-        lock(this)
-        {
-            int count = _opByteSOnewayCallCount;
-            _opByteSOnewayCallCount = 0;
-            return count;
-        }
-    }
+            public override int[] opIntS(int[] s, Ice.Current current)
+            {
+                int[] r = new int[s.Length];
+                for (int i = 0; i < s.Length; ++i)
+                {
+                    r[i] = -s[i];
+                }
+                return r;
+            }
 
-    public override Dictionary<string, string> opContext(Ice.Current current)
-    {
-        return current.ctx == null ? new Dictionary<string, string>() : new Dictionary<string, string>(current.ctx);
-    }
+            public override void opByteSOneway(byte[] s, Ice.Current current)
+            {
+                lock (this)
+                {
+                    ++_opByteSOnewayCallCount;
+                }
+            }
 
-    public override void opDoubleMarshaling(double p1, double[] p2, Ice.Current current)
-    {
-        double d = 1278312346.0 / 13.0;
-        test(p1 == d);
-        for(int i = 0; i < p2.Length; ++i)
-        {
-            test(p2[i] == d);
-        }
-    }
+            public override int opByteSOnewayCallCount(Ice.Current current)
+            {
+                lock (this)
+                {
+                    int count = _opByteSOnewayCallCount;
+                    _opByteSOnewayCallCount = 0;
+                    return count;
+                }
+            }
 
-    public override string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current)
-    {
-        p3 = new string[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+            public override Dictionary<string, string> opContext(Ice.Current current)
+            {
+                return current.ctx == null ? new Dictionary<string, string>() : new Dictionary<string, string>(current.ctx);
+            }
 
-        string[] r = new string[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            public override void opDoubleMarshaling(double p1, double[] p2, Ice.Current current)
+            {
+                double d = 1278312346.0 / 13.0;
+                test(p1 == d);
+                for (int i = 0; i < p2.Length; ++i)
+                {
+                    test(p2[i] == d);
+                }
+            }
 
-    public override string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current)
-    {
-        p3 = new string[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+            public override string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current)
+            {
+                p3 = new string[p1.Length + p2.Length];
+                Array.Copy(p1, p3, p1.Length);
+                Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                string[] r = new string[p1.Length];
+                for (int i = 0; i < p1.Length; i++)
+                {
+                    r[i] = p1[p1.Length - (i + 1)];
+                }
+                return r;
+            }
 
-        string[][] r = new string[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return r;
-    }
+            public override string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current)
+            {
+                p3 = new string[p1.Length + p2.Length][];
+                Array.Copy(p1, p3, p1.Length);
+                Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                string[][] r = new string[p2.Length][];
+                for (int i = 0; i < p2.Length; i++)
+                {
+                    r[i] = p2[p2.Length - (i + 1)];
+                }
+                return r;
+            }
 
-    public override string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current)
-    {
-        p3 = new string[p1.Length + p2.Length][][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+            public override string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current)
+            {
+                p3 = new string[p1.Length + p2.Length][][];
+                Array.Copy(p1, p3, p1.Length);
+                Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                string[][][] r = new string[p2.Length][][];
+                for (int i = 0; i < p2.Length; i++)
+                {
+                    r[i] = p2[p2.Length - (i + 1)];
+                }
+                return r;
+            }
 
-        string[][][] r = new string[p2.Length][][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return r;
-    }
+            public override Dictionary<string, string> opStringStringD(Dictionary<string, string> p1,
+                                                                       Dictionary<string, string> p2,
+                                                                       out Dictionary<string, string> p3,
+                                                                       Ice.Current current)
+            {
+                p3 = p1;
+                Dictionary<string, string> r = new Dictionary<string, string>();
+                foreach (KeyValuePair<string, string> e in p1)
+                {
+                    r[e.Key] = e.Value;
+                }
+                foreach (KeyValuePair<string, string> e in p2)
+                {
+                    r[e.Key] = e.Value;
+                }
+                return r;
+            }
 
-    public override Dictionary<string, string> opStringStringD(Dictionary<string, string> p1,
-                                                               Dictionary<string, string> p2,
-                                                               out Dictionary<string, string> p3,
-                                                               Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<string, string> r = new Dictionary<string, string>();
-        foreach(KeyValuePair<string, string> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, string> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+            public override Test.Structure opStruct(Test.Structure p1, Test.Structure p2, out Test.Structure p3, Ice.Current current)
+            {
+                p3 = p1;
+                p3.s.s = "a new string";
+                return p2;
+            }
 
-    public override Test.Structure opStruct(Test.Structure p1, Test.Structure p2,
-                                            out Test.Structure p3, Ice.Current current)
-    {
-        p3 = p1;
-        p3.s.s = "a new string";
-        return p2;
-    }
+            public override void opIdempotent(Ice.Current current)
+            {
+                test(current.mode == Ice.OperationMode.Idempotent);
+            }
 
-    public override void opIdempotent(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Idempotent);
-    }
+            public override void opNonmutating(Ice.Current current)
+            {
+                test(current.mode == Ice.OperationMode.Nonmutating);
+            }
 
-    public override void opNonmutating(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-    }
+            public override void opDerived(Ice.Current current)
+            {
+            }
 
-    public override void opDerived(Ice.Current current)
-    {
-    }
+            public override byte opByte1(byte opByte1, Ice.Current current)
+            {
+                return opByte1;
+            }
 
-    public override byte opByte1(byte opByte1, Ice.Current current)
-    {
-        return opByte1;
-    }
+            public override short opShort1(short opShort1, Ice.Current current)
+            {
+                return opShort1;
+            }
 
-    public override short opShort1(short opShort1, Ice.Current current)
-    {
-        return opShort1;
-    }
+            public override int opInt1(int opInt1, Ice.Current current)
+            {
+                return opInt1;
+            }
 
-    public override int opInt1(int opInt1, Ice.Current current)
-    {
-        return opInt1;
-    }
+            public override long opLong1(long opLong1, Ice.Current current)
+            {
+                return opLong1;
+            }
 
-    public override long opLong1(long opLong1, Ice.Current current)
-    {
-        return opLong1;
-    }
+            public override float opFloat1(float opFloat1, Ice.Current current)
+            {
+                return opFloat1;
+            }
 
-    public override float opFloat1(float opFloat1, Ice.Current current)
-    {
-        return opFloat1;
-    }
+            public override double opDouble1(double opDouble1, Ice.Current current)
+            {
+                return opDouble1;
+            }
 
-    public override double opDouble1(double opDouble1, Ice.Current current)
-    {
-        return opDouble1;
-    }
+            public override string opString1(string opString1, Ice.Current current)
+            {
+                return opString1;
+            }
 
-    public override string opString1(string opString1, Ice.Current current)
-    {
-        return opString1;
-    }
+            public override string[] opStringS1(string[] opStringS1, Ice.Current current)
+            {
+                return opStringS1;
+            }
 
-    public override string[] opStringS1(string[] opStringS1, Ice.Current current)
-    {
-        return opStringS1;
-    }
+            public override Dictionary<byte, bool> opByteBoolD1(Dictionary<byte, bool> opByteBoolD1, Ice.Current current)
+            {
+                return opByteBoolD1;
+            }
 
-    public override Dictionary<byte, bool> opByteBoolD1(Dictionary<byte, bool> opByteBoolD1, Ice.Current current)
-    {
-        return opByteBoolD1;
-    }
+            public override string[] opStringS2(string[] opStringS2, Ice.Current current)
+            {
+                return opStringS2;
+            }
 
-    public override string[] opStringS2(string[] opStringS2, Ice.Current current)
-    {
-        return opStringS2;
-    }
+            public override Dictionary<byte, bool> opByteBoolD2(Dictionary<byte, bool> opByteBoolD2, Ice.Current current)
+            {
+                return opByteBoolD2;
+            }
 
-    public override Dictionary<byte, bool> opByteBoolD2(Dictionary<byte, bool> opByteBoolD2, Ice.Current current)
-    {
-        return opByteBoolD2;
-    }
+            public override Test.MyClass1 opMyClass1(Test.MyClass1 c, Ice.Current current)
+            {
+                return c;
+            }
 
-    public override Test.MyClass1 opMyClass1(Test.MyClass1 c, Ice.Current current)
-    {
-        return c;
-    }
+            public override Test.MyStruct1 opMyStruct1(Test.MyStruct1 s, Ice.Current current)
+            {
+                return s;
+            }
 
-    public override Test.MyStruct1 opMyStruct1(Test.MyStruct1 s, Ice.Current current)
-    {
-        return s;
-    }
+            public override string[] opStringLiterals(Ice.Current current)
+            {
+                return new string[]
+                    {
+                            Test.s0.value,
+                            Test.s1.value,
+                            Test.s2.value,
+                            Test.s3.value,
+                            Test.s4.value,
+                            Test.s5.value,
+                            Test.s6.value,
+                            Test.s7.value,
+                            Test.s8.value,
+                            Test.s9.value,
+                            Test.s10.value,
+
+                            Test.sw0.value,
+                            Test.sw1.value,
+                            Test.sw2.value,
+                            Test.sw3.value,
+                            Test.sw4.value,
+                            Test.sw5.value,
+                            Test.sw6.value,
+                            Test.sw7.value,
+                            Test.sw8.value,
+                            Test.sw9.value,
+                            Test.sw10.value,
+
+                            Test.ss0.value,
+                            Test.ss1.value,
+                            Test.ss2.value,
+                            Test.ss3.value,
+                            Test.ss4.value,
+                            Test.ss5.value,
+
+                            Test.su0.value,
+                            Test.su1.value,
+                            Test.su2.value
+                    };
+            }
 
-    public override string[] opStringLiterals(Ice.Current current)
-    {
-        return new string[]
+            public override string[] opWStringLiterals(Ice.Current current)
             {
-                Test.s0.value,
-                Test.s1.value,
-                Test.s2.value,
-                Test.s3.value,
-                Test.s4.value,
-                Test.s5.value,
-                Test.s6.value,
-                Test.s7.value,
-                Test.s8.value,
-                Test.s9.value,
-                Test.s10.value,
-
-                Test.sw0.value,
-                Test.sw1.value,
-                Test.sw2.value,
-                Test.sw3.value,
-                Test.sw4.value,
-                Test.sw5.value,
-                Test.sw6.value,
-                Test.sw7.value,
-                Test.sw8.value,
-                Test.sw9.value,
-                Test.sw10.value,
-
-                Test.ss0.value,
-                Test.ss1.value,
-                Test.ss2.value,
-                Test.ss3.value,
-                Test.ss4.value,
-                Test.ss5.value,
-
-                Test.su0.value,
-                Test.su1.value,
-                Test.su2.value
-            };
-    }
+                return opStringLiterals(current);
+            }
 
-    public override string[] opWStringLiterals(Ice.Current current)
-    {
-        return opStringLiterals(current);
-    }
+            public override Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current)
+            {
+                return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
+            }
 
-    public override Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current)
-    {
-        return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
-    }
+            public override Test.MyClass_OpMStruct2MarshaledResult opMStruct2(Test.Structure p1, Ice.Current current)
+            {
+                return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
+            }
 
-    public override Test.MyClass_OpMStruct2MarshaledResult opMStruct2(Test.Structure p1, Ice.Current current)
-    {
-        return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
-    }
+            public override Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current)
+            {
+                return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
+            }
 
-    public override Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current)
-    {
-        return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
-    }
+            public override Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current)
+            {
+                return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
+            }
 
-    public override Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current)
-    {
-        return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
-    }
+            public override Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current)
+            {
+                return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
+            }
 
-    public override Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current)
-    {
-        return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
-    }
+            public override Test.MyClass_OpMDict2MarshaledResult opMDict2(Dictionary<string, string> p1, Ice.Current current)
+            {
+                return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
+            }
 
-    public override Test.MyClass_OpMDict2MarshaledResult opMDict2(Dictionary<string, string> p1, Ice.Current current)
-    {
-        return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
+            private int _opByteSOnewayCallCount = 0;
+        }
     }
-
-    private int _opByteSOnewayCallCount = 0;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassTieI.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassTieI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/MyDerivedClassTieI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/MyDerivedClassTieI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,814 +1,815 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public sealed class MyDerivedClassI : Test.MyDerivedClassTie_
-{
-    public MyDerivedClassI() : base(new MyDerivedClassTieI())
-    {
-    }
-}
-
-public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if (!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    public void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    public bool supportsCompress(Ice.Current current)
-    {
-        return IceInternal.BZip2.supported();
-    }
-
-    public void opVoid(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Normal);
-    }
-
-    public bool opBool(bool p1, bool p2, out bool p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p2;
-    }
-
-    public bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current)
-    {
-        p3 = new bool[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        bool[] r = new bool[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current)
-    {
-        p3 = new bool[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        bool[][] r = new bool[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public byte opByte(byte p1, byte p2, out byte p3, Ice.Current current)
-    {
-        p3 = (byte)(p1 ^ p2);
-        return p1;
-    }
-
-    public Dictionary<byte, bool> opByteBoolD(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2,
-                                              out Dictionary<byte, bool> p3,
-                                              Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<byte, bool> r = new Dictionary<byte, bool>();
-        foreach(KeyValuePair<byte, bool> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<byte, bool> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current)
+    namespace operations
     {
-        p3 = new byte[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
+        namespace tie
         {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
-
-        byte[] r = new byte[p1.Length + p2.Length];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-        return r;
-    }
-
-    public byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current)
-    {
-        p3 = new byte[p1.Length][];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            p3[i] = p1[p1.Length - (i + 1)];
-        }
-
-        byte[][] r = new byte[p1.Length + p2.Length][];
-        Array.Copy(p1, r, p1.Length);
-        Array.Copy(p2, 0, r, p1.Length, p2.Length);
-        return r;
-    }
-
-    public double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current)
-    {
-        p3 = p1;
-        p4 = p2;
-        return p2;
-    }
-
-    public double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current)
-    {
-        p3 = p1;
-
-        p4 = new double[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
-
-        double[] r = new double[p2.Length + p1.Length];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[p2.Length + i] = (double)p1[i];
-        }
-        return r;
-    }
-
-    public double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4,
-                                      Ice.Current current)
-    {
-        p3 = p1;
-
-        p4 = new double[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p4[i] = p2[p2.Length - (i + 1)];
-        }
-
-        double[][] r = new double[p2.Length + p2.Length][];
-        Array.Copy(p2, r, p2.Length);
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[p2.Length + i] = new double[p2[i].Length];
-            for(int j = 0; j < p2[i].Length; j++)
+            public sealed class MyDerivedClassI : Test.MyDerivedClassTie_
             {
-                r[p2.Length + i][j] = (double)p2[i][j];
+                public MyDerivedClassI() : base(new MyDerivedClassTieI())
+                {
+                }
             }
-        }
-        return r;
-    }
-
-    public Dictionary<long, float> opLongFloatD(Dictionary<long, float> p1, Dictionary<long, float> p2,
-                                                out Dictionary<long, float> p3,
-                                                Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<long, float> r = new Dictionary<long, float>();
-        foreach(KeyValuePair<long, float> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<long, float> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Test.MyClassPrx opMyClass(Test.MyClassPrx p1, out Test.MyClassPrx p2, out Test.MyClassPrx p3,
-                                     Ice.Current current)
-    {
-        p2 = p1;
-        p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
-                                                Ice.Util.stringToIdentity("noSuchIdentity")));
-        return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
-    }
-
-    public Test.MyEnum opMyEnum(Test.MyEnum p1, out Test.MyEnum p2, Ice.Current current)
-    {
-        p2 = p1;
-        return Test.MyEnum.enum3;
-    }
-
-    public Dictionary<short, int> opShortIntD(Dictionary<short, int> p1, Dictionary<short, int> p2,
-                                              out Dictionary<short, int> p3, Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<short, int> r = new Dictionary<short, int>();
-        foreach(KeyValuePair<short, int> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<short, int> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current)
-    {
-        p4 = p1;
-        p5 = p2;
-        p6 = p3;
-        return p3;
-    }
-
-    public long[] opShortIntLongS(short[] p1, int[] p2, long[] p3,
-                                  out short[] p4, out int[] p5, out long[] p6,
-                                  Ice.Current current)
-    {
-        p4 = p1;
-
-        p5 = new int[p2.Length];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
-
-        p6 = new long[p3.Length + p3.Length];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
-
-        return p3;
-    }
-
-    public long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3,
-                                     out short[][] p4, out int[][] p5, out long[][] p6,
-                                     Ice.Current current)
-    {
-        p4 = p1;
-
-        p5 = new int[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            p5[i] = p2[p2.Length - (i + 1)];
-        }
-
-        p6 = new long[p3.Length + p3.Length][];
-        Array.Copy(p3, p6, p3.Length);
-        Array.Copy(p3, 0, p6, p3.Length, p3.Length);
-
-        return p3;
-    }
-
-    public string opString(string p1, string p2, out string p3, Ice.Current current)
-    {
-        p3 = p2 + " " + p1;
-        return p1 + " " + p2;
-    }
-
-    public Dictionary<string, Test.MyEnum> opStringMyEnumD(Dictionary<string, Test.MyEnum> p1,
-                                                           Dictionary<string, Test.MyEnum> p2,
-                                                           out Dictionary<string, Test.MyEnum> p3,
-                                                           Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<string, Test.MyEnum> r = new Dictionary<string, Test.MyEnum>();
-        foreach(KeyValuePair<string, Test.MyEnum> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, Test.MyEnum> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Dictionary<Test.MyEnum, string> opMyEnumStringD(Dictionary<Test.MyEnum, string> p1,
-                                                           Dictionary<Test.MyEnum, string> p2,
-                                                           out Dictionary<Test.MyEnum, string> p3,
-                                                           Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<Test.MyEnum, string> r = new Dictionary<Test.MyEnum, string>();
-        foreach(KeyValuePair<Test.MyEnum, string> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<Test.MyEnum, string> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Dictionary<Test.MyStruct, Test.MyEnum> opMyStructMyEnumD(
-        Dictionary<Test.MyStruct, Test.MyEnum> p1,
-        Dictionary<Test.MyStruct, Test.MyEnum> p2,
-        out Dictionary<Test.MyStruct, Test.MyEnum> p3,
-        Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<Test.MyStruct, Test.MyEnum> r = new Dictionary<Test.MyStruct, Test.MyEnum>();
-        foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Dictionary<byte,bool>[] opByteBoolDS(Dictionary<byte,bool>[] p1,
-                                                Dictionary<byte,bool>[] p2,
-                                                out Dictionary<byte,bool>[] p3,
-                                                Ice.Current current)
-    {
-        p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<byte, bool>[] r = new Dictionary<byte, bool>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public Dictionary<short, int>[] opShortIntDS(Dictionary<short, int>[] p1,
-                                                 Dictionary<short, int>[] p2,
-                                                 out Dictionary<short, int>[] p3,
-                                                 Ice.Current current)
-    {
-        p3 = new Dictionary<short, int>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
 
-        Dictionary<short, int>[] r = new Dictionary<short, int>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
+            public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_
+            {
+                private static void test(bool b)
+                {
+                    if (!b)
+                    {
+                        throw new System.Exception();
+                    }
+                }
+
+                public void shutdown(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                }
+
+                public bool supportsCompress(Ice.Current current)
+                {
+                    return IceInternal.BZip2.supported();
+                }
+
+                public void opVoid(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Normal);
+                }
+
+                public bool opBool(bool p1, bool p2, out bool p3, Ice.Current current)
+                {
+                    p3 = p1;
+                    return p2;
+                }
+
+                public bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current)
+                {
+                    p3 = new bool[p1.Length + p2.Length];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    bool[] r = new bool[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current)
+                {
+                    p3 = new bool[p1.Length + p2.Length][];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    bool[][] r = new bool[p1.Length][];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public byte opByte(byte p1, byte p2, out byte p3, Ice.Current current)
+                {
+                    p3 = (byte)(p1 ^ p2);
+                    return p1;
+                }
+
+                public Dictionary<byte, bool> opByteBoolD(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2,
+                                                          out Dictionary<byte, bool> p3,
+                                                          Ice.Current current)
+                {
+                    p3 = p1;
+                    Dictionary<byte, bool> r = new Dictionary<byte, bool>();
+                    foreach (KeyValuePair<byte, bool> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<byte, bool> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current)
+                {
+                    p3 = new byte[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        p3[i] = p1[p1.Length - (i + 1)];
+                    }
+
+                    byte[] r = new byte[p1.Length + p2.Length];
+                    Array.Copy(p1, r, p1.Length);
+                    Array.Copy(p2, 0, r, p1.Length, p2.Length);
+                    return r;
+                }
+
+                public byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current)
+                {
+                    p3 = new byte[p1.Length][];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        p3[i] = p1[p1.Length - (i + 1)];
+                    }
+
+                    byte[][] r = new byte[p1.Length + p2.Length][];
+                    Array.Copy(p1, r, p1.Length);
+                    Array.Copy(p2, 0, r, p1.Length, p2.Length);
+                    return r;
+                }
+
+                public double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current)
+                {
+                    p3 = p1;
+                    p4 = p2;
+                    return p2;
+                }
+
+                public double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current)
+                {
+                    p3 = p1;
+
+                    p4 = new double[p2.Length];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p4[i] = p2[p2.Length - (i + 1)];
+                    }
+
+                    double[] r = new double[p2.Length + p1.Length];
+                    Array.Copy(p2, r, p2.Length);
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[p2.Length + i] = (double)p1[i];
+                    }
+                    return r;
+                }
 
-    public Dictionary<long,float>[] opLongFloatDS(Dictionary<long,float>[] p1,
-                                                  Dictionary<long,float>[] p2,
-                                                  out Dictionary<long,float>[] p3,
+                public double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4,
                                                   Ice.Current current)
-    {
-        p3 = new Dictionary<long, float>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<long, float>[] r = new Dictionary<long, float>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public Dictionary<string, string>[] opStringStringDS(Dictionary<string, string>[] p1,
-                                                         Dictionary<string, string>[] p2,
-                                                         out Dictionary<string, string>[] p3,
-                                                         Ice.Current current)
-    {
-        p3 = new Dictionary<string, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<string, string>[] r = new Dictionary<string, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public Dictionary<string, Test.MyEnum>[] opStringMyEnumDS(Dictionary<string, Test.MyEnum>[] p1,
-                                                              Dictionary<string, Test.MyEnum>[] p2,
-                                                              out Dictionary<string, Test.MyEnum>[] p3,
-                                                              Ice.Current current)
-    {
-        p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+                {
+                    p3 = p1;
 
-        Dictionary<string, Test.MyEnum>[] r = new Dictionary<string, Test.MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public Dictionary<Test.MyEnum, string>[] opMyEnumStringDS(Dictionary<Test.MyEnum, string>[] p1,
-                                                              Dictionary<Test.MyEnum, string>[] p2,
-                                                              out Dictionary<Test.MyEnum, string>[] p3,
-                                                              Ice.Current current)
-    {
-        p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+                    p4 = new double[p2.Length][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p4[i] = p2[p2.Length - (i + 1)];
+                    }
+
+                    double[][] r = new double[p2.Length + p2.Length][];
+                    Array.Copy(p2, r, p2.Length);
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        r[p2.Length + i] = new double[p2[i].Length];
+                        for (int j = 0; j < p2[i].Length; j++)
+                        {
+                            r[p2.Length + i][j] = (double)p2[i][j];
+                        }
+                    }
+                    return r;
+                }
+
+                public Dictionary<long, float> opLongFloatD(Dictionary<long, float> p1, Dictionary<long, float> p2,
+                                                            out Dictionary<long, float> p3,
+                                                            Ice.Current current)
+                {
+                    p3 = p1;
+                    Dictionary<long, float> r = new Dictionary<long, float>();
+                    foreach (KeyValuePair<long, float> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<long, float> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
 
-        Dictionary<Test.MyEnum, string>[] r = new Dictionary<Test.MyEnum, string>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public Dictionary<Test.MyStruct, Test.MyEnum>[] opMyStructMyEnumDS(
-        Dictionary<Test.MyStruct, Test.MyEnum>[] p1,
-        Dictionary<Test.MyStruct, Test.MyEnum>[] p2,
-        out Dictionary<Test.MyStruct, Test.MyEnum>[] p3,
-        Ice.Current current)
-    {
-        p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length];
-        Array.Copy(p2, p3, p2.Length);
-        Array.Copy(p1, 0, p3, p2.Length, p1.Length);
-
-        Dictionary<Test.MyStruct, Test.MyEnum>[] r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public Dictionary<byte, byte[]> opByteByteSD(Dictionary<byte, byte[]> p1,
-                                                 Dictionary<byte, byte[]> p2,
-                                                 out Dictionary<byte, byte[]> p3,
+                public Test.MyClassPrx opMyClass(Test.MyClassPrx p1, out Test.MyClassPrx p2, out Test.MyClassPrx p3,
                                                  Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<byte, byte[]> r = new Dictionary<byte, byte[]>();
-        foreach(KeyValuePair<byte, byte[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<byte, byte[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+                {
+                    p2 = p1;
+                    p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(
+                                                             Ice.Util.stringToIdentity("noSuchIdentity")));
+                    return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
+                }
+
+                public Test.MyEnum opMyEnum(Test.MyEnum p1, out Test.MyEnum p2, Ice.Current current)
+                {
+                    p2 = p1;
+                    return Test.MyEnum.enum3;
+                }
+
+                public Dictionary<short, int> opShortIntD(Dictionary<short, int> p1, Dictionary<short, int> p2,
+                                                          out Dictionary<short, int> p3, Ice.Current current)
+                {
+                    p3 = p1;
+                    Dictionary<short, int> r = new Dictionary<short, int>();
+                    foreach (KeyValuePair<short, int> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<short, int> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current)
+                {
+                    p4 = p1;
+                    p5 = p2;
+                    p6 = p3;
+                    return p3;
+                }
 
-    public Dictionary<bool, bool[]> opBoolBoolSD(Dictionary<bool, bool[]> p1,
-                                                 Dictionary<bool, bool[]> p2,
-                                                 out Dictionary<bool, bool[]> p3,
-                                                 Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<bool, bool[]> r = new Dictionary<bool, bool[]>();
-        foreach(KeyValuePair<bool, bool[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<bool, bool[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+                public long[] opShortIntLongS(short[] p1, int[] p2, long[] p3,
+                                              out short[] p4, out int[] p5, out long[] p6,
+                                              Ice.Current current)
+                {
+                    p4 = p1;
 
-    public Dictionary<short, short[]> opShortShortSD(Dictionary<short, short[]> p1,
-                                                     Dictionary<short, short[]> p2,
-                                                     out Dictionary<short, short[]> p3,
-                                                     Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<short, short[]> r = new Dictionary<short, short[]>();
-        foreach(KeyValuePair<short, short[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<short, short[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+                    p5 = new int[p2.Length];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p5[i] = p2[p2.Length - (i + 1)];
+                    }
+
+                    p6 = new long[p3.Length + p3.Length];
+                    Array.Copy(p3, p6, p3.Length);
+                    Array.Copy(p3, 0, p6, p3.Length, p3.Length);
 
-    public Dictionary<int, int[]> opIntIntSD(Dictionary<int, int[]> p1,
-                                             Dictionary<int, int[]> p2,
-                                             out Dictionary<int, int[]> p3,
-                                             Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<int, int[]> r = new Dictionary<int, int[]>();
-        foreach(KeyValuePair<int, int[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<int, int[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+                    return p3;
+                }
 
-    public Dictionary<long, long[]> opLongLongSD(Dictionary<long, long[]> p1,
-                                                 Dictionary<long, long[]> p2,
-                                                 out Dictionary<long, long[]> p3,
+                public long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3,
+                                                 out short[][] p4, out int[][] p5, out long[][] p6,
                                                  Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<long, long[]> r = new Dictionary<long, long[]>();
-        foreach(KeyValuePair<long, long[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<long, long[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Dictionary<string, float[]> opStringFloatSD(Dictionary<string, float[]> p1,
-                                                       Dictionary<string, float[]> p2,
-                                                       out Dictionary<string, float[]> p3,
-                                                       Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<string, float[]> r = new Dictionary<string, float[]>();
-        foreach(KeyValuePair<string, float[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, float[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Dictionary<string, double[]> opStringDoubleSD(Dictionary<string, double[]> p1,
-                                                         Dictionary<string, double[]> p2,
-                                                         out Dictionary<string, double[]> p3,
-                                                         Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<string, double[]> r = new Dictionary<string, double[]>();
-        foreach(KeyValuePair<string, double[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, double[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
+                {
+                    p4 = p1;
 
-    public Dictionary<string, string[]> opStringStringSD(Dictionary<string, string[]> p1,
-                                                         Dictionary<string, string[]> p2,
-                                                         out Dictionary<string, string[]> p3,
+                    p5 = new int[p2.Length][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        p5[i] = p2[p2.Length - (i + 1)];
+                    }
+
+                    p6 = new long[p3.Length + p3.Length][];
+                    Array.Copy(p3, p6, p3.Length);
+                    Array.Copy(p3, 0, p6, p3.Length, p3.Length);
+
+                    return p3;
+                }
+
+                public string opString(string p1, string p2, out string p3, Ice.Current current)
+                {
+                    p3 = p2 + " " + p1;
+                    return p1 + " " + p2;
+                }
+
+                public Dictionary<string, Test.MyEnum> opStringMyEnumD(Dictionary<string, Test.MyEnum> p1,
+                                                                       Dictionary<string, Test.MyEnum> p2,
+                                                                       out Dictionary<string, Test.MyEnum> p3,
+                                                                       Ice.Current current)
+                {
+                    p3 = p1;
+                    Dictionary<string, Test.MyEnum> r = new Dictionary<string, Test.MyEnum>();
+                    foreach (KeyValuePair<string, Test.MyEnum> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<string, Test.MyEnum> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<Test.MyEnum, string> opMyEnumStringD(Dictionary<Test.MyEnum, string> p1,
+                                                                       Dictionary<Test.MyEnum, string> p2,
+                                                                       out Dictionary<Test.MyEnum, string> p3,
+                                                                       Ice.Current current)
+                {
+                    p3 = p1;
+                    Dictionary<Test.MyEnum, string> r = new Dictionary<Test.MyEnum, string>();
+                    foreach (KeyValuePair<Test.MyEnum, string> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<Test.MyEnum, string> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<Test.MyStruct, Test.MyEnum> opMyStructMyEnumD(
+                    Dictionary<Test.MyStruct, Test.MyEnum> p1,
+                    Dictionary<Test.MyStruct, Test.MyEnum> p2,
+                    out Dictionary<Test.MyStruct, Test.MyEnum> p3,
+                    Ice.Current current)
+                {
+                    p3 = p1;
+                    Dictionary<Test.MyStruct, Test.MyEnum> r = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    foreach (KeyValuePair<Test.MyStruct, Test.MyEnum> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<Test.MyStruct, Test.MyEnum> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<byte, bool>[] opByteBoolDS(Dictionary<byte, bool>[] p1,
+                                                            Dictionary<byte, bool>[] p2,
+                                                            out Dictionary<byte, bool>[] p3,
+                                                            Ice.Current current)
+                {
+                    p3 = new Dictionary<byte, bool>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    Dictionary<byte, bool>[] r = new Dictionary<byte, bool>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<short, int>[] opShortIntDS(Dictionary<short, int>[] p1,
+                                                             Dictionary<short, int>[] p2,
+                                                             out Dictionary<short, int>[] p3,
+                                                             Ice.Current current)
+                {
+                    p3 = new Dictionary<short, int>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    Dictionary<short, int>[] r = new Dictionary<short, int>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<long, float>[] opLongFloatDS(Dictionary<long, float>[] p1,
+                                                              Dictionary<long, float>[] p2,
+                                                              out Dictionary<long, float>[] p3,
+                                                              Ice.Current current)
+                {
+                    p3 = new Dictionary<long, float>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    Dictionary<long, float>[] r = new Dictionary<long, float>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<string, string>[] opStringStringDS(Dictionary<string, string>[] p1,
+                                                                     Dictionary<string, string>[] p2,
+                                                                     out Dictionary<string, string>[] p3,
+                                                                     Ice.Current current)
+                {
+                    p3 = new Dictionary<string, string>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    Dictionary<string, string>[] r = new Dictionary<string, string>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<string, Test.MyEnum>[] opStringMyEnumDS(Dictionary<string, Test.MyEnum>[] p1,
+                                                                          Dictionary<string, Test.MyEnum>[] p2,
+                                                                          out Dictionary<string, Test.MyEnum>[] p3,
+                                                                          Ice.Current current)
+                {
+                    p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    Dictionary<string, Test.MyEnum>[] r = new Dictionary<string, Test.MyEnum>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<Test.MyEnum, string>[] opMyEnumStringDS(Dictionary<Test.MyEnum, string>[] p1,
+                                                                          Dictionary<Test.MyEnum, string>[] p2,
+                                                                          out Dictionary<Test.MyEnum, string>[] p3,
+                                                                          Ice.Current current)
+                {
+                    p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    Dictionary<Test.MyEnum, string>[] r = new Dictionary<Test.MyEnum, string>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<Test.MyStruct, Test.MyEnum>[] opMyStructMyEnumDS(
+                    Dictionary<Test.MyStruct, Test.MyEnum>[] p1,
+                    Dictionary<Test.MyStruct, Test.MyEnum>[] p2,
+                    out Dictionary<Test.MyStruct, Test.MyEnum>[] p3,
+                    Ice.Current current)
+                {
+                    p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length];
+                    Array.Copy(p2, p3, p2.Length);
+                    Array.Copy(p1, 0, p3, p2.Length, p1.Length);
+
+                    Dictionary<Test.MyStruct, Test.MyEnum>[] r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<byte, byte[]> opByteByteSD(Dictionary<byte, byte[]> p1,
+                                                             Dictionary<byte, byte[]> p2,
+                                                             out Dictionary<byte, byte[]> p3,
+                                                             Ice.Current current)
+                {
+                    p3 = p2;
+                    Dictionary<byte, byte[]> r = new Dictionary<byte, byte[]>();
+                    foreach (KeyValuePair<byte, byte[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<byte, byte[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<bool, bool[]> opBoolBoolSD(Dictionary<bool, bool[]> p1,
+                                                             Dictionary<bool, bool[]> p2,
+                                                             out Dictionary<bool, bool[]> p3,
+                                                             Ice.Current current)
+                {
+                    p3 = p2;
+                    Dictionary<bool, bool[]> r = new Dictionary<bool, bool[]>();
+                    foreach (KeyValuePair<bool, bool[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<bool, bool[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<short, short[]> opShortShortSD(Dictionary<short, short[]> p1,
+                                                                 Dictionary<short, short[]> p2,
+                                                                 out Dictionary<short, short[]> p3,
+                                                                 Ice.Current current)
+                {
+                    p3 = p2;
+                    Dictionary<short, short[]> r = new Dictionary<short, short[]>();
+                    foreach (KeyValuePair<short, short[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<short, short[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<int, int[]> opIntIntSD(Dictionary<int, int[]> p1,
+                                                         Dictionary<int, int[]> p2,
+                                                         out Dictionary<int, int[]> p3,
                                                          Ice.Current current)
-    {
-        p3 = p2;
-        Dictionary<string, string[]> r = new Dictionary<string, string[]>();
-        foreach(KeyValuePair<string, string[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, string[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Dictionary<Test.MyEnum, Test.MyEnum[]> opMyEnumMyEnumSD(
-        Dictionary<Test.MyEnum, Test.MyEnum[]> p1,
-        Dictionary<Test.MyEnum, Test.MyEnum[]> p2,
-        out Dictionary<Test.MyEnum, Test.MyEnum[]> p3,
-        Ice.Current ice)
-    {
-        p3 = p2;
-        Dictionary<Test.MyEnum, Test.MyEnum[]> r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
-        foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public int[] opIntS(int[] s, Ice.Current current)
-    {
-        int[] r = new int[s.Length];
-        for(int i = 0; i < s.Length; ++i)
-        {
-            r[i] = -s[i];
-        }
-        return r;
-    }
-
-    public void opByteSOneway(byte[] s, Ice.Current current)
-    {
-        lock(this)
-        {
-            ++_opByteSOnewayCallCount;
-        }
-    }
-
-    public int opByteSOnewayCallCount(Ice.Current current)
-    {
-        lock(this)
-        {
-            int count = _opByteSOnewayCallCount;
-            _opByteSOnewayCallCount = 0;
-            return count;
-        }
-    }
-
-    public Dictionary<string, string> opContext(Ice.Current current)
-    {
-        return current.ctx == null ? new Dictionary<string, string>() : new Dictionary<string, string>(current.ctx);
-    }
-
-    public void opDoubleMarshaling(double p1, double[] p2, Ice.Current current)
-    {
-        double d = 1278312346.0 / 13.0;
-        test(p1 == d);
-        for(int i = 0; i < p2.Length; ++i)
-        {
-            test(p2[i] == d);
-        }
-    }
-
-    public string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current)
-    {
-        p3 = new string[p1.Length + p2.Length];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        string[] r = new string[p1.Length];
-        for(int i = 0; i < p1.Length; i++)
-        {
-            r[i] = p1[p1.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current)
-    {
-        p3 = new string[p1.Length + p2.Length][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        string[][] r = new string[p2.Length][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current)
-    {
-        p3 = new string[p1.Length + p2.Length][][];
-        Array.Copy(p1, p3, p1.Length);
-        Array.Copy(p2, 0, p3, p1.Length, p2.Length);
-
-        string[][][] r = new string[p2.Length][][];
-        for(int i = 0; i < p2.Length; i++)
-        {
-            r[i] = p2[p2.Length - (i + 1)];
-        }
-        return r;
-    }
-
-    public Dictionary<string, string> opStringStringD(Dictionary<string, string> p1,
-                                                      Dictionary<string, string> p2,
-                                                      out Dictionary<string, string> p3,
-                                                      Ice.Current current)
-    {
-        p3 = p1;
-        Dictionary<string, string> r = new Dictionary<string, string>();
-        foreach(KeyValuePair<string, string> e in p1)
-        {
-            r[e.Key] = e.Value;
-        }
-        foreach(KeyValuePair<string, string> e in p2)
-        {
-            r[e.Key] = e.Value;
-        }
-        return r;
-    }
-
-    public Test.Structure opStruct(Test.Structure p1, Test.Structure p2,
-                                   out Test.Structure p3, Ice.Current current)
-    {
-        p3 = p1;
-        p3.s.s = "a new string";
-        return p2;
-    }
-
-    public void opIdempotent(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Idempotent);
-    }
-
-    public void opNonmutating(Ice.Current current)
-    {
-        test(current.mode == Ice.OperationMode.Nonmutating);
-    }
-
-    public void opDerived(Ice.Current current)
-    {
-    }
-
-    public byte opByte1(byte opByte1, Ice.Current current)
-    {
-        return opByte1;
-    }
-
-    public short opShort1(short opShort1, Ice.Current current)
-    {
-        return opShort1;
-    }
-
-    public int opInt1(int opInt1, Ice.Current current)
-    {
-        return opInt1;
-    }
-
-    public long opLong1(long opLong1, Ice.Current current)
-    {
-        return opLong1;
-    }
-
-    public float opFloat1(float opFloat1, Ice.Current current)
-    {
-        return opFloat1;
-    }
-
-    public double opDouble1(double opDouble1, Ice.Current current)
-    {
-        return opDouble1;
-    }
-
-    public string opString1(string opString1, Ice.Current current)
-    {
-        return opString1;
-    }
-
-    public string[] opStringS1(string[] opStringS1, Ice.Current current)
-    {
-        return opStringS1;
-    }
-
-    public Dictionary<byte, bool> opByteBoolD1(Dictionary<byte, bool> opByteBoolD1, Ice.Current current)
-    {
-        return opByteBoolD1;
-    }
-
-    public string[] opStringS2(string[] opStringS2, Ice.Current current)
-    {
-        return opStringS2;
-    }
-
-    public Dictionary<byte, bool> opByteBoolD2(Dictionary<byte, bool> opByteBoolD2, Ice.Current current)
-    {
-        return opByteBoolD2;
-    }
-
-    public Test.MyClass1 opMyClass1(Test.MyClass1 c, Ice.Current current)
-    {
-        return c;
-    }
-
-    public Test.MyStruct1 opMyStruct1(Test.MyStruct1 s, Ice.Current current)
-    {
-        return s;
-    }
-
-    public string[] opStringLiterals(Ice.Current current)
-    {
-        return new string[]
-            {
+                {
+                    p3 = p2;
+                    Dictionary<int, int[]> r = new Dictionary<int, int[]>();
+                    foreach (KeyValuePair<int, int[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<int, int[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<long, long[]> opLongLongSD(Dictionary<long, long[]> p1,
+                                                             Dictionary<long, long[]> p2,
+                                                             out Dictionary<long, long[]> p3,
+                                                             Ice.Current current)
+                {
+                    p3 = p2;
+                    Dictionary<long, long[]> r = new Dictionary<long, long[]>();
+                    foreach (KeyValuePair<long, long[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<long, long[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<string, float[]> opStringFloatSD(Dictionary<string, float[]> p1,
+                                                                   Dictionary<string, float[]> p2,
+                                                                   out Dictionary<string, float[]> p3,
+                                                                   Ice.Current current)
+                {
+                    p3 = p2;
+                    Dictionary<string, float[]> r = new Dictionary<string, float[]>();
+                    foreach (KeyValuePair<string, float[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<string, float[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<string, double[]> opStringDoubleSD(Dictionary<string, double[]> p1,
+                                                                     Dictionary<string, double[]> p2,
+                                                                     out Dictionary<string, double[]> p3,
+                                                                     Ice.Current current)
+                {
+                    p3 = p2;
+                    Dictionary<string, double[]> r = new Dictionary<string, double[]>();
+                    foreach (KeyValuePair<string, double[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<string, double[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<string, string[]> opStringStringSD(Dictionary<string, string[]> p1,
+                                                                     Dictionary<string, string[]> p2,
+                                                                     out Dictionary<string, string[]> p3,
+                                                                     Ice.Current current)
+                {
+                    p3 = p2;
+                    Dictionary<string, string[]> r = new Dictionary<string, string[]>();
+                    foreach (KeyValuePair<string, string[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<string, string[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Dictionary<Test.MyEnum, Test.MyEnum[]> opMyEnumMyEnumSD(
+                    Dictionary<Test.MyEnum, Test.MyEnum[]> p1,
+                    Dictionary<Test.MyEnum, Test.MyEnum[]> p2,
+                    out Dictionary<Test.MyEnum, Test.MyEnum[]> p3,
+                    Ice.Current ice)
+                {
+                    p3 = p2;
+                    Dictionary<Test.MyEnum, Test.MyEnum[]> r = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    foreach (KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public int[] opIntS(int[] s, Ice.Current current)
+                {
+                    int[] r = new int[s.Length];
+                    for (int i = 0; i < s.Length; ++i)
+                    {
+                        r[i] = -s[i];
+                    }
+                    return r;
+                }
+
+                public void opByteSOneway(byte[] s, Ice.Current current)
+                {
+                    lock (this)
+                    {
+                        ++_opByteSOnewayCallCount;
+                    }
+                }
+
+                public int opByteSOnewayCallCount(Ice.Current current)
+                {
+                    lock (this)
+                    {
+                        int count = _opByteSOnewayCallCount;
+                        _opByteSOnewayCallCount = 0;
+                        return count;
+                    }
+                }
+
+                public Dictionary<string, string> opContext(Ice.Current current)
+                {
+                    return current.ctx == null ? new Dictionary<string, string>() : new Dictionary<string, string>(current.ctx);
+                }
+
+                public void opDoubleMarshaling(double p1, double[] p2, Ice.Current current)
+                {
+                    double d = 1278312346.0 / 13.0;
+                    test(p1 == d);
+                    for (int i = 0; i < p2.Length; ++i)
+                    {
+                        test(p2[i] == d);
+                    }
+                }
+
+                public string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current)
+                {
+                    p3 = new string[p1.Length + p2.Length];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    string[] r = new string[p1.Length];
+                    for (int i = 0; i < p1.Length; i++)
+                    {
+                        r[i] = p1[p1.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current)
+                {
+                    p3 = new string[p1.Length + p2.Length][];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    string[][] r = new string[p2.Length][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        r[i] = p2[p2.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current)
+                {
+                    p3 = new string[p1.Length + p2.Length][][];
+                    Array.Copy(p1, p3, p1.Length);
+                    Array.Copy(p2, 0, p3, p1.Length, p2.Length);
+
+                    string[][][] r = new string[p2.Length][][];
+                    for (int i = 0; i < p2.Length; i++)
+                    {
+                        r[i] = p2[p2.Length - (i + 1)];
+                    }
+                    return r;
+                }
+
+                public Dictionary<string, string> opStringStringD(Dictionary<string, string> p1,
+                                                                  Dictionary<string, string> p2,
+                                                                  out Dictionary<string, string> p3,
+                                                                  Ice.Current current)
+                {
+                    p3 = p1;
+                    Dictionary<string, string> r = new Dictionary<string, string>();
+                    foreach (KeyValuePair<string, string> e in p1)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    foreach (KeyValuePair<string, string> e in p2)
+                    {
+                        r[e.Key] = e.Value;
+                    }
+                    return r;
+                }
+
+                public Test.Structure opStruct(Test.Structure p1, Test.Structure p2,
+                                               out Test.Structure p3, Ice.Current current)
+                {
+                    p3 = p1;
+                    p3.s.s = "a new string";
+                    return p2;
+                }
+
+                public void opIdempotent(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Idempotent);
+                }
+
+                public void opNonmutating(Ice.Current current)
+                {
+                    test(current.mode == Ice.OperationMode.Nonmutating);
+                }
+
+                public void opDerived(Ice.Current current)
+                {
+                }
+
+                public byte opByte1(byte opByte1, Ice.Current current)
+                {
+                    return opByte1;
+                }
+
+                public short opShort1(short opShort1, Ice.Current current)
+                {
+                    return opShort1;
+                }
+
+                public int opInt1(int opInt1, Ice.Current current)
+                {
+                    return opInt1;
+                }
+
+                public long opLong1(long opLong1, Ice.Current current)
+                {
+                    return opLong1;
+                }
+
+                public float opFloat1(float opFloat1, Ice.Current current)
+                {
+                    return opFloat1;
+                }
+
+                public double opDouble1(double opDouble1, Ice.Current current)
+                {
+                    return opDouble1;
+                }
+
+                public string opString1(string opString1, Ice.Current current)
+                {
+                    return opString1;
+                }
+
+                public string[] opStringS1(string[] opStringS1, Ice.Current current)
+                {
+                    return opStringS1;
+                }
+
+                public Dictionary<byte, bool> opByteBoolD1(Dictionary<byte, bool> opByteBoolD1, Ice.Current current)
+                {
+                    return opByteBoolD1;
+                }
+
+                public string[] opStringS2(string[] opStringS2, Ice.Current current)
+                {
+                    return opStringS2;
+                }
+
+                public Dictionary<byte, bool> opByteBoolD2(Dictionary<byte, bool> opByteBoolD2, Ice.Current current)
+                {
+                    return opByteBoolD2;
+                }
+
+                public Test.MyClass1 opMyClass1(Test.MyClass1 c, Ice.Current current)
+                {
+                    return c;
+                }
+
+                public Test.MyStruct1 opMyStruct1(Test.MyStruct1 s, Ice.Current current)
+                {
+                    return s;
+                }
+
+                public string[] opStringLiterals(Ice.Current current)
+                {
+                    return new string[]
+                        {
                 Test.s0.value,
                 Test.s1.value,
                 Test.s2.value,
@@ -843,43 +844,46 @@
                 Test.su0.value,
                 Test.su1.value,
                 Test.su2.value
-            };
-    }
-
-    public string[] opWStringLiterals(Ice.Current current)
-    {
-        return opStringLiterals(current);
-    }
-
-    public Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current)
-    {
-        return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
-    }
+                        };
+                }
 
-    public Test.MyClass_OpMStruct2MarshaledResult opMStruct2(Test.Structure p1, Ice.Current current)
-    {
-        return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
-    }
+                public string[] opWStringLiterals(Ice.Current current)
+                {
+                    return opStringLiterals(current);
+                }
+
+                public Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current)
+                {
+                    return new Test.MyClass_OpMStruct1MarshaledResult(new Test.Structure(), current);
+                }
+
+                public Test.MyClass_OpMStruct2MarshaledResult opMStruct2(Test.Structure p1, Ice.Current current)
+                {
+                    return new Test.MyClass_OpMStruct2MarshaledResult(p1, p1, current);
+                }
+
+                public Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current)
+                {
+                    return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
+                }
+
+                public Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current)
+                {
+                    return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
+                }
+
+                public Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current)
+                {
+                    return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
+                }
+
+                public Test.MyClass_OpMDict2MarshaledResult opMDict2(Dictionary<string, string> p1, Ice.Current current)
+                {
+                    return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
+                }
 
-    public Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current)
-    {
-        return new Test.MyClass_OpMSeq1MarshaledResult(new string[0], current);
-    }
-
-    public Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current)
-    {
-        return new Test.MyClass_OpMSeq2MarshaledResult(p1, p1, current);
-    }
-
-    public Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current)
-    {
-        return new Test.MyClass_OpMDict1MarshaledResult(new Dictionary<string, string>(), current);
-    }
-
-    public Test.MyClass_OpMDict2MarshaledResult opMDict2(Dictionary<string, string> p1, Ice.Current current)
-    {
-        return new Test.MyClass_OpMDict2MarshaledResult(p1, p1, current);
+                private int _opByteSOnewayCallCount = 0;
+            }
+        }
     }
-
-    private int _opByteSOnewayCallCount = 0;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/OnewaysAMI.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/OnewaysAMI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/OnewaysAMI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/OnewaysAMI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,290 +1,291 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
 using System.Threading;
 
-public class OnewaysAMI
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new SystemException();
-        }
-    }
-
-    private class CallbackBase
+    namespace operations
     {
-        internal CallbackBase()
+        public class OnewaysAMI
         {
-            _called = false;
-        }
-
-        public virtual void check()
-        {
-            lock(this)
+            private static void test(bool b)
             {
-                while(!_called)
+                if (!b)
                 {
-                    Monitor.Wait(this);
+                    throw new System.Exception();
                 }
-                _called = false;
             }
-        }
 
-        public virtual void called()
-        {
-            lock(this)
+            private class CallbackBase
             {
-                Debug.Assert(!_called);
-                _called = true;
-                Monitor.Pulse(this);
-            }
-        }
+                internal CallbackBase()
+                {
+                    _called = false;
+                }
 
-        private bool _called;
-    }
+                public virtual void check()
+                {
+                    lock (this)
+                    {
+                        while (!_called)
+                        {
+                            Monitor.Wait(this);
+                        }
+                        _called = false;
+                    }
+                }
 
-    private class Callback : CallbackBase
-    {
-        public Callback()
-        {
-        }
+                public virtual void called()
+                {
+                    lock (this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        Monitor.Pulse(this);
+                    }
+                }
 
-        public void
-        sent(bool sentSynchronously)
-        {
-            called();
-        }
+                private bool _called;
+            }
 
-        public void noException(Ice.Exception ex)
-        {
-            test(false);
-        }
-    }
+            private class Callback : CallbackBase
+            {
+                public Callback()
+                {
+                }
 
-    internal static void onewaysAMI(TestCommon.Application app, Test.MyClassPrx proxy)
-    {
-        Ice.Communicator communicator = app.communicator();
-        Test.MyClassPrx p = Test.MyClassPrxHelper.uncheckedCast(proxy.ice_oneway());
+                public void
+                sent(bool sentSynchronously)
+                {
+                    called();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.ice_pingAsync(progress:new Progress<bool>(
-                sentSynchronously =>
-                {
-                    cb.sent(sentSynchronously);
-                }));
-            cb.check();
-        }
+                public void noException(Ice.Exception ex)
+                {
+                    test(false);
+                }
+            }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_ping().whenCompleted(cb.noException).whenSent(cb.sent);
-            cb.check();
-        }
+            internal static void onewaysAMI(global::Test.TestHelper helper, Test.MyClassPrx proxy)
+            {
+                Ice.Communicator communicator = helper.communicator();
+                Test.MyClassPrx p = Test.MyClassPrxHelper.uncheckedCast(proxy.ice_oneway());
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_ping().whenCompleted(
-                (Ice.Exception ex) =>
-                {
-                    cb.noException(ex);
-                }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.ice_pingAsync(progress: new Progress<bool>(
+                        sentSynchronously =>
+                        {
+                            cb.sent(sentSynchronously);
+                        }));
+                    cb.check();
+                }
 
-        {
-            try
-            {
-                p.ice_isAAsync("::Test::MyClass");
-                test(false);
-            }
-            catch(Ice.TwowayOnlyException)
-            {
-            }
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_ping().whenCompleted(cb.noException).whenSent(cb.sent);
+                    cb.check();
+                }
 
-        {
-            try
-            {
-                p.begin_ice_isA("::Test::MyClass");
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
-            }
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_ping().whenCompleted(
+                        (Ice.Exception ex) =>
+                        {
+                            cb.noException(ex);
+                        }
+                    ).whenSent(
+                        (bool sentSynchronously) =>
+                        {
+                            cb.sent(sentSynchronously);
+                        });
+                    cb.check();
+                }
 
-        {
-            try
-            {
-                p.ice_idAsync();
-                test(false);
-            }
-            catch(Ice.TwowayOnlyException)
-            {
-            }
-        }
+                {
+                    try
+                    {
+                        p.ice_isAAsync("::Test::MyClass");
+                        test(false);
+                    }
+                    catch (Ice.TwowayOnlyException)
+                    {
+                    }
+                }
 
-        {
-            try
-            {
-                p.begin_ice_id();
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
-            }
-        }
+                {
+                    try
+                    {
+                        p.begin_ice_isA("::Test::MyClass");
+                        test(false);
+                    }
+                    catch (System.ArgumentException)
+                    {
+                    }
+                }
 
-        {
-            try
-            {
-                p.ice_idsAsync();
-                test(false);
-            }
-            catch(Ice.TwowayOnlyException)
-            {
-            }
-        }
+                {
+                    try
+                    {
+                        p.ice_idAsync();
+                        test(false);
+                    }
+                    catch (Ice.TwowayOnlyException)
+                    {
+                    }
+                }
 
-        {
-            try
-            {
-                p.begin_ice_ids();
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
-            }
-        }
+                {
+                    try
+                    {
+                        p.begin_ice_id();
+                        test(false);
+                    }
+                    catch (ArgumentException)
+                    {
+                    }
+                }
 
-        {
-            Callback cb = new Callback();
-            p.opVoidAsync(progress:new Progress<bool>(
-                sentSynchronously =>
-                {
-                    cb.sent(sentSynchronously);
-                }));
-            cb.check();
-        }
+                {
+                    try
+                    {
+                        p.ice_idsAsync();
+                        test(false);
+                    }
+                    catch (Ice.TwowayOnlyException)
+                    {
+                    }
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opVoid().whenCompleted(cb.noException).whenSent(cb.sent);
-            cb.check();
-        }
+                {
+                    try
+                    {
+                        p.begin_ice_ids();
+                        test(false);
+                    }
+                    catch (ArgumentException)
+                    {
+                    }
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opVoid().whenCompleted(
-                (Ice.Exception ex) =>
-                {
-                    cb.noException(ex);
-                }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.opVoidAsync(progress: new Progress<bool>(
+                        sentSynchronously =>
+                        {
+                            cb.sent(sentSynchronously);
+                        }));
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.opIdempotentAsync(progress:new Progress<bool>(
-                sentSynchronously =>
-                {
-                    cb.sent(sentSynchronously);
-                }));
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opVoid().whenCompleted(cb.noException).whenSent(cb.sent);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opIdempotent().whenCompleted(cb.noException).whenSent(cb.sent);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opVoid().whenCompleted(
+                        (Ice.Exception ex) =>
+                        {
+                            cb.noException(ex);
+                        }
+                    ).whenSent(
+                        (bool sentSynchronously) =>
+                        {
+                            cb.sent(sentSynchronously);
+                        });
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opIdempotent().whenCompleted(
-                (Ice.Exception ex) =>
-                {
-                    cb.noException(ex);
-                }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.opIdempotentAsync(progress: new Progress<bool>(
+                        sentSynchronously =>
+                        {
+                            cb.sent(sentSynchronously);
+                        }));
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.opNonmutatingAsync(progress:new Progress<bool>(
-                sentSynchronously =>
-                {
-                    cb.sent(sentSynchronously);
-                }));
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opIdempotent().whenCompleted(cb.noException).whenSent(cb.sent);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opNonmutating().whenCompleted(cb.noException).whenSent(cb.sent);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opIdempotent().whenCompleted(
+                        (Ice.Exception ex) =>
+                        {
+                            cb.noException(ex);
+                        }
+                    ).whenSent(
+                        (bool sentSynchronously) =>
+                        {
+                            cb.sent(sentSynchronously);
+                        });
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opNonmutating().whenCompleted(
-                (Ice.Exception ex) =>
-                {
-                    cb.noException(ex);
-                }
-            ).whenSent(
-                (bool sentSynchronously) =>
-                {
-                    cb.sent(sentSynchronously);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.opNonmutatingAsync(progress: new Progress<bool>(
+                        sentSynchronously =>
+                        {
+                            cb.sent(sentSynchronously);
+                        }));
+                    cb.check();
+                }
 
-        {
-            try
-            {
-                p.opByteAsync(0xff, 0x0f);
-                test(false);
-            }
-            catch(Ice.TwowayOnlyException)
-            {
-            }
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opNonmutating().whenCompleted(cb.noException).whenSent(cb.sent);
+                    cb.check();
+                }
 
-        {
-            try
-            {
-                p.begin_opByte(0xff, 0x0f);
-                test(false);
-            }
-            catch(System.ArgumentException)
-            {
+                {
+                    Callback cb = new Callback();
+                    p.begin_opNonmutating().whenCompleted(
+                        (Ice.Exception ex) =>
+                        {
+                            cb.noException(ex);
+                        }
+                    ).whenSent(
+                        (bool sentSynchronously) =>
+                        {
+                            cb.sent(sentSynchronously);
+                        });
+                    cb.check();
+                }
+
+                {
+                    try
+                    {
+                        p.opByteAsync(0xff, 0x0f);
+                        test(false);
+                    }
+                    catch (Ice.TwowayOnlyException)
+                    {
+                    }
+                }
+
+                {
+                    try
+                    {
+                        p.begin_opByte(0xff, 0x0f);
+                        test(false);
+                    }
+                    catch (ArgumentException)
+                    {
+                    }
+                }
             }
         }
     }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/Oneways.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/Oneways.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/Oneways.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/Oneways.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,53 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-class Oneways
+namespace Ice
 {
-    private static void test(bool b)
+    namespace operations
     {
-        if(!b)
+        class Oneways
         {
-            throw new System.SystemException();
-        }
-    }
-
-    internal static void oneways(TestCommon.Application app, Test.MyClassPrx p)
-    {
-        Ice.Communicator communicator = app.communicator();
-        p = Test.MyClassPrxHelper.uncheckedCast(p.ice_oneway());
-
-        {
-            p.ice_ping();
-        }
-
-        {
-            p.opVoid();
-        }
-
-        {
-            p.opIdempotent();
-        }
-
-        {
-            p.opNonmutating();
-        }
-
-        {
-            byte b;
-            try
+            private static void test(bool b)
             {
-                p.opByte((byte)0xff, (byte)0x0f, out b);
-                test(false);
+                if (!b)
+                {
+                    throw new System.SystemException();
+                }
             }
-            catch(Ice.TwowayOnlyException)
+
+            internal static void oneways(global::Test.TestHelper helper, Test.MyClassPrx p)
             {
+                Ice.Communicator communicator = helper.communicator();
+                p = Test.MyClassPrxHelper.uncheckedCast(p.ice_oneway());
+
+                {
+                    p.ice_ping();
+                }
+
+                {
+                    p.opVoid();
+                }
+
+                {
+                    p.opIdempotent();
+                }
+
+                {
+                    p.opNonmutating();
+                }
+
+                {
+                    byte b;
+                    try
+                    {
+                        p.opByte((byte)0xff, (byte)0x0f, out b);
+                        test(false);
+                    }
+                    catch (Ice.TwowayOnlyException)
+                    {
+                    }
+                }
             }
         }
     }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/ServerAMD.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,49 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace operations
+    {
+        namespace AMD
+        {
+            public class Server : TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    var initData = new InitializationData();
+                    initData.typeIdNamespaces = new string[]{"Ice.operations.AMD.TypeId"};
+                    initData.properties = createTestProperties(ref args);
+
+                    //
+                    // Its possible to have batch oneway requests dispatched
+                    // after the adapter is deactivated due to thread
+                    // scheduling so we supress this warning.
+                    //
+                    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+                    //
+                    // We don't want connection warnings because of the timeout test.
+                    //
+                    initData.properties.setProperty("Ice.Warn.Connections", "0");
+                    using(var communicator = initialize(initData))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                        adapter.activate();
+                        serverReady();
+                        communicator.waitForShutdown();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return TestDriver.runTest<Server>(args);
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/ServerAMDTie.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/ServerAMDTie.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/ServerAMDTie.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/ServerAMDTie.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,52 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace operations
+    {
+        namespace AMD
+        {
+            namespace tie
+            {
+                public class Server : TestHelper
+                {
+                    public override void run(string[] args)
+                    {
+                        var initData = new InitializationData();
+                        initData.typeIdNamespaces = new string[]{"Ice.operations.AMD.TypeId"};
+
+                        initData.properties = createTestProperties(ref args);
+                        //
+                        // Its possible to have batch oneway requests dispatched
+                        // after the adapter is deactivated due to thread
+                        // scheduling so we supress this warning.
+                        //
+                        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+                        //
+                        // We don't want connection warnings because of the timeout test.
+                        //
+                        initData.properties.setProperty("Ice.Warn.Connections", "0");
+                        using(var communicator = initialize(initData))
+                        {
+                            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                            adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                            adapter.activate();
+                            serverReady();
+                            communicator.waitForShutdown();
+                        }
+                    }
+
+                    public static int Main(string[] args)
+                    {
+                        return TestDriver.runTest<Server>(args);
+                    }
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,54 +1,45 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        //
-        // We don't want connection warnings because of the timeout test.
-        //
-        communicator().getProperties().setProperty("Ice.Warn.Connections", "0");
-
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        //
-        // Its possible to have batch oneway requests dispatched
-        // after the adapter is deactivated due to thread
-        // scheduling so we supress this warning.
-        //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace operations
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                //
+                // Its possible to have batch oneway requests dispatched
+                // after the adapter is deactivated due to thread
+                // scheduling so we supress this warning.
+                //
+                initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+                //
+                // We don't want connection warnings because of the timeout test.
+                //
+                initData.properties.setProperty("Ice.Warn.Connections", "0");
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/ServerTie.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/ServerTie.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/ServerTie.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/ServerTie.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,48 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace operations
+    {
+        namespace tie
+        {
+            public class Server : TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    var initData = new InitializationData();
+                    initData.typeIdNamespaces = new string[]{"Ice.operations.TypeId"};
+                    initData.properties = createTestProperties(ref args);
+                    //
+                    // Its possible to have batch oneway requests dispatched
+                    // after the adapter is deactivated due to thread
+                    // scheduling so we supress this warning.
+                    //
+                    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+                    //
+                    // We don't want connection warnings because of the timeout test.
+                    //
+                    initData.properties.setProperty("Ice.Warn.Connections", "0");
+                    using(var communicator = initialize(initData))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                        adapter.activate();
+                        serverReady();
+                        communicator.waitForShutdown();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return TestDriver.runTest<Server>(args);
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/operations/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/Current.ice>
 
+[["cs:typeid-namespace:Ice.operations.AMD.TypeId"]]
+
+["cs:namespace:Ice.operations.AMD"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/Current.ice>
 
+[["cs:typeid-namespace:Ice.operations.TypeId"]]
+
+["cs:namespace:Ice.operations"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/TwowaysAMI.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/TwowaysAMI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/TwowaysAMI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/TwowaysAMI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -13,3686 +8,3694 @@
 using System.Threading.Tasks;
 using System.Collections.Generic;
 
-public class TwowaysAMI
+namespace Ice
 {
-    private static void test(bool b)
+    namespace operations
     {
-        if(!b)
-        {
-            throw new SystemException();
-        }
-    }
-
-    private class CallbackBase
-    {
-        internal CallbackBase()
-        {
-            _called = false;
-        }
-
-        public virtual void check()
+        public class TwowaysAMI
         {
-            lock(this)
+            private static void test(bool b)
             {
-                while(!_called)
+                if (!b)
                 {
-                    Monitor.Wait(this);
+                    throw new System.Exception();
                 }
-                _called = false;
             }
-        }
 
-        public virtual void called()
-        {
-            lock(this)
+            private class CallbackBase
             {
-                Debug.Assert(!_called);
-                _called = true;
-                Monitor.Pulse(this);
-            }
-        }
-
-        public bool _called;
-    }
-
-    private class GenericCallback<T> : CallbackBase
-    {
-        public GenericCallback(T value)
-        {
-            this._value = value;
-        }
-
-        public void response(T value)
-        {
-            _value = value;
-            _succeeded = true;
-            called();
-        }
-
-        public void exception(Ice.Exception ex)
-        {
-            _succeeded = false;
-            called();
-        }
-
-        public bool succeeded()
-        {
-            check();
-            return _succeeded;
-        }
-
-        public T value()
-        {
-            return _value;
-        }
-
-        private T _value;
-        private bool _succeeded = false;
-    }
-
-    private class Callback : CallbackBase
-    {
-        public Callback()
-        {
-        }
-
-        public Callback(Ice.Communicator c)
-        {
-            _communicator = c;
-        }
-
-        public Callback(int l)
-        {
-            _l = l;
-        }
-
-        public Callback(Dictionary<string, string> d)
-        {
-            _d = d;
-        }
-
-        public void ice_ping()
-        {
-            called();
-        }
-
-        public void ice_isA(bool r)
-        {
-            test(r);
-            called();
-        }
-
-        public void ice_ids(string[] ids)
-        {
-            test(ids.Length == 3);
-            called();
-        }
+                internal CallbackBase()
+                {
+                    _called = false;
+                }
 
-        public void ice_id(string id)
-        {
-            test(id.Equals(Test.MyDerivedClassDisp_.ice_staticId()));
-            called();
-        }
+                public virtual void check()
+                {
+                    lock (this)
+                    {
+                        while (!_called)
+                        {
+                            Monitor.Wait(this);
+                        }
+                        _called = false;
+                    }
+                }
 
-        public void opVoid()
-        {
-            called();
-        }
+                public virtual void called()
+                {
+                    lock (this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        Monitor.Pulse(this);
+                    }
+                }
 
-        public void opContext()
-        {
-            called();
-        }
+                public bool _called;
+            }
 
-        public void opByte(byte r, byte b)
-        {
-            test(b == 0xf0);
-            test(r == 0xff);
-            called();
-        }
+            private class GenericCallback<T> : CallbackBase
+            {
+                public GenericCallback(T value)
+                {
+                    this._value = value;
+                }
 
-        public void opBool(bool r, bool b)
-        {
-            test(b);
-            test(!r);
-            called();
-        }
+                public void response(T value)
+                {
+                    _value = value;
+                    _succeeded = true;
+                    called();
+                }
 
-        public void opShortIntLong(long r, short s, int i, long l)
-        {
-            test(s == 10);
-            test(i == 11);
-            test(l == 12);
-            test(r == 12);
-            called();
-        }
+                public void exception(Ice.Exception ex)
+                {
+                    _succeeded = false;
+                    called();
+                }
 
-        public void opFloatDouble(double r, float f, double d)
-        {
-            test(f == 3.14f);
-            test(d == 1.1e10);
-            test(r == 1.1e10);
-            called();
-        }
+                public bool succeeded()
+                {
+                    check();
+                    return _succeeded;
+                }
 
-        public void opString(string r, string s)
-        {
-            test(s.Equals("world hello"));
-            test(r.Equals("hello world"));
-            called();
-        }
+                public T value()
+                {
+                    return _value;
+                }
 
-        public void opMyEnum(Test.MyEnum r, Test.MyEnum e)
-        {
-            test(e == Test.MyEnum.enum2);
-            test(r == Test.MyEnum.enum3);
-            called();
-        }
+                private T _value;
+                private bool _succeeded = false;
+            }
 
-        public void opMyClass(Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2)
-        {
-            test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
-            test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity")));
-            test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
-
-            //
-            // We can't do the callbacks below in connection serialization mode.
-            //
-            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
+            private class Callback : CallbackBase
             {
-                r.opVoid();
-                c1.opVoid();
-                try
+                public Callback()
                 {
-                    c2.opVoid();
-                    test(false);
                 }
-                catch(Ice.ObjectNotExistException)
+
+                public Callback(Ice.Communicator c)
                 {
+                    _communicator = c;
                 }
-            }
-            called();
-        }
 
-        public void opStruct(Test.Structure rso, Test.Structure so)
-        {
-            test(rso.p == null);
-            test(rso.e == Test.MyEnum.enum2);
-            test(rso.s.s.Equals("def"));
-            test(so.e == Test.MyEnum.enum3);
-            test(so.s.s.Equals("a new string"));
-
-            //
-            // We can't do the callbacks below in connection serialization mode.
-            //
-            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
-            {
-                so.p.opVoid();
-            }
-            called();
-        }
+                public Callback(int l)
+                {
+                    _l = l;
+                }
 
-        public void opByteS(byte[] rso, byte[] bso)
-        {
-            test(bso.Length == 4);
-            test(bso[0] == 0x22);
-            test(bso[1] == 0x12);
-            test(bso[2] == 0x11);
-            test(bso[3] == 0x01);
-            test(rso.Length == 8);
-            test(rso[0] == 0x01);
-            test(rso[1] == 0x11);
-            test(rso[2] == 0x12);
-            test(rso[3] == 0x22);
-            test(rso[4] == 0xf1);
-            test(rso[5] == 0xf2);
-            test(rso[6] == 0xf3);
-            test(rso[7] == 0xf4);
-            called();
-        }
+                public Callback(Dictionary<string, string> d)
+                {
+                    _d = d;
+                }
 
-        public void opBoolS(bool[] rso, bool[] bso)
-        {
-            test(bso.Length == 4);
-            test(bso[0]);
-            test(bso[1]);
-            test(!bso[2]);
-            test(!bso[3]);
-            test(rso.Length == 3);
-            test(!rso[0]);
-            test(rso[1]);
-            test(rso[2]);
-            called();
-        }
+                public void ice_ping()
+                {
+                    called();
+                }
 
-        public void opShortIntLongS(long[] rso, short[] sso, int[] iso, long[] lso)
-        {
-            test(sso.Length == 3);
-            test(sso[0] == 1);
-            test(sso[1] == 2);
-            test(sso[2] == 3);
-            test(iso.Length == 4);
-            test(iso[0] == 8);
-            test(iso[1] == 7);
-            test(iso[2] == 6);
-            test(iso[3] == 5);
-            test(lso.Length == 6);
-            test(lso[0] == 10);
-            test(lso[1] == 30);
-            test(lso[2] == 20);
-            test(lso[3] == 10);
-            test(lso[4] == 30);
-            test(lso[5] == 20);
-            test(rso.Length == 3);
-            test(rso[0] == 10);
-            test(rso[1] == 30);
-            test(rso[2] == 20);
-            called();
-        }
+                public void ice_isA(bool r)
+                {
+                    test(r);
+                    called();
+                }
 
-        public void opFloatDoubleS(double[] rso, float[] fso, double[] dso)
-        {
-            test(fso.Length == 2);
-            test(fso[0] == 3.14f);
-            test(fso[1] == 1.11f);
-            test(dso.Length == 3);
-            test(dso[0] == 1.3e10);
-            test(dso[1] == 1.2e10);
-            test(dso[2] == 1.1e10);
-            test(rso.Length == 5);
-            test(rso[0] == 1.1e10);
-            test(rso[1] == 1.2e10);
-            test(rso[2] == 1.3e10);
-            test((float) rso[3] == 3.14f);
-            test((float) rso[4] == 1.11f);
-            called();
-        }
+                public void ice_ids(string[] ids)
+                {
+                    test(ids.Length == 3);
+                    called();
+                }
 
-        public void opStringS(string[] rso, string[] sso)
-        {
-            test(sso.Length == 4);
-            test(sso[0].Equals("abc"));
-            test(sso[1].Equals("de"));
-            test(sso[2].Equals("fghi"));
-            test(sso[3].Equals("xyz"));
-            test(rso.Length == 3);
-            test(rso[0].Equals("fghi"));
-            test(rso[1].Equals("de"));
-            test(rso[2].Equals("abc"));
-            called();
-        }
+                public void ice_id(string id)
+                {
+                    test(id.Equals(Test.MyDerivedClassDisp_.ice_staticId()));
+                    called();
+                }
 
-        public void opByteSS(byte[][] rso, byte[][] bso)
-        {
-            test(bso.Length == 2);
-            test(bso[0].Length == 1);
-            test(bso[0][0] == 0xff);
-            test(bso[1].Length == 3);
-            test(bso[1][0] == 0x01);
-            test(bso[1][1] == 0x11);
-            test(bso[1][2] == 0x12);
-            test(rso.Length == 4);
-            test(rso[0].Length == 3);
-            test(rso[0][0] == 0x01);
-            test(rso[0][1] == 0x11);
-            test(rso[0][2] == 0x12);
-            test(rso[1].Length == 1);
-            test(rso[1][0] == 0xff);
-            test(rso[2].Length == 1);
-            test(rso[2][0] == 0x0e);
-            test(rso[3].Length == 2);
-            test(rso[3][0] == 0xf2);
-            test(rso[3][1] == 0xf1);
-            called();
-        }
+                public void opVoid()
+                {
+                    called();
+                }
 
-        public void opBoolSS(bool[][] rso, bool[][] bso)
-        {
-            test(bso.Length == 4);
-            test(bso[0].Length == 1);
-            test(bso[0][0]);
-            test(bso[1].Length == 1);
-            test(!bso[1][0]);
-            test(bso[2].Length == 2);
-            test(bso[2][0]);
-            test(bso[2][1]);
-            test(bso[3].Length == 3);
-            test(!bso[3][0]);
-            test(!bso[3][1]);
-            test(bso[3][2]);
-            test(rso.Length == 3);
-            test(rso[0].Length == 2);
-            test(rso[0][0]);
-            test(rso[0][1]);
-            test(rso[1].Length == 1);
-            test(!rso[1][0]);
-            test(rso[2].Length == 1);
-            test(rso[2][0]);
-            called();
-        }
+                public void opContext()
+                {
+                    called();
+                }
 
-        public void opShortIntLongSS(long[][] rso, short[][] sso, int[][] iso, long[][] lso)
-        {
-            test(rso.Length == 1);
-            test(rso[0].Length == 2);
-            test(rso[0][0] == 496);
-            test(rso[0][1] == 1729);
-            test(sso.Length == 3);
-            test(sso[0].Length == 3);
-            test(sso[0][0] == 1);
-            test(sso[0][1] == 2);
-            test(sso[0][2] == 5);
-            test(sso[1].Length == 1);
-            test(sso[1][0] == 13);
-            test(sso[2].Length == 0);
-            test(iso.Length == 2);
-            test(iso[0].Length == 1);
-            test(iso[0][0] == 42);
-            test(iso[1].Length == 2);
-            test(iso[1][0] == 24);
-            test(iso[1][1] == 98);
-            test(lso.Length == 2);
-            test(lso[0].Length == 2);
-            test(lso[0][0] == 496);
-            test(lso[0][1] == 1729);
-            test(lso[1].Length == 2);
-            test(lso[1][0] == 496);
-            test(lso[1][1] == 1729);
-            called();
-        }
+                public void opByte(byte r, byte b)
+                {
+                    test(b == 0xf0);
+                    test(r == 0xff);
+                    called();
+                }
 
-        public void opFloatDoubleSS(double[][] rso, float[][] fso, double[][] dso)
-        {
-            test(fso.Length == 3);
-            test(fso[0].Length == 1);
-            test(fso[0][0] == 3.14f);
-            test(fso[1].Length == 1);
-            test(fso[1][0] == 1.11f);
-            test(fso[2].Length == 0);
-            test(dso.Length == 1);
-            test(dso[0].Length == 3);
-            test(dso[0][0] == 1.1e10);
-            test(dso[0][1] == 1.2e10);
-            test(dso[0][2] == 1.3e10);
-            test(rso.Length == 2);
-            test(rso[0].Length == 3);
-            test(rso[0][0] == 1.1e10);
-            test(rso[0][1] == 1.2e10);
-            test(rso[0][2] == 1.3e10);
-            test(rso[1].Length == 3);
-            test(rso[1][0] == 1.1e10);
-            test(rso[1][1] == 1.2e10);
-            test(rso[1][2] == 1.3e10);
-            called();
-        }
+                public void opBool(bool r, bool b)
+                {
+                    test(b);
+                    test(!r);
+                    called();
+                }
 
-        public void opStringSS(string[][] rso, string[][] sso)
-        {
-            test(sso.Length == 5);
-            test(sso[0].Length == 1);
-            test(sso[0][0].Equals("abc"));
-            test(sso[1].Length == 2);
-            test(sso[1][0].Equals("de"));
-            test(sso[1][1].Equals("fghi"));
-            test(sso[2].Length == 0);
-            test(sso[3].Length == 0);
-            test(sso[4].Length == 1);
-            test(sso[4][0].Equals("xyz"));
-            test(rso.Length == 3);
-            test(rso[0].Length == 1);
-            test(rso[0][0].Equals("xyz"));
-            test(rso[1].Length == 0);
-            test(rso[2].Length == 0);
-            called();
-        }
+                public void opShortIntLong(long r, short s, int i, long l)
+                {
+                    test(s == 10);
+                    test(i == 11);
+                    test(l == 12);
+                    test(r == 12);
+                    called();
+                }
 
-        public void opStringSSS(string[][][] rsso, string[][][] ssso)
-        {
-            test(ssso.Length == 5);
-            test(ssso[0].Length == 2);
-            test(ssso[0][0].Length == 2);
-            test(ssso[0][1].Length == 1);
-            test(ssso[1].Length == 1);
-            test(ssso[1][0].Length == 1);
-            test(ssso[2].Length == 2);
-            test(ssso[2][0].Length == 2);
-            test(ssso[2][1].Length == 1);
-            test(ssso[3].Length == 1);
-            test(ssso[3][0].Length == 1);
-            test(ssso[4].Length == 0);
-            test(ssso[0][0][0].Equals("abc"));
-            test(ssso[0][0][1].Equals("de"));
-            test(ssso[0][1][0].Equals("xyz"));
-            test(ssso[1][0][0].Equals("hello"));
-            test(ssso[2][0][0].Equals(""));
-            test(ssso[2][0][1].Equals(""));
-            test(ssso[2][1][0].Equals("abcd"));
-            test(ssso[3][0][0].Equals(""));
-
-            test(rsso.Length == 3);
-            test(rsso[0].Length == 0);
-            test(rsso[1].Length == 1);
-            test(rsso[1][0].Length == 1);
-            test(rsso[2].Length == 2);
-            test(rsso[2][0].Length == 2);
-            test(rsso[2][1].Length == 1);
-            test(rsso[1][0][0].Equals(""));
-            test(rsso[2][0][0].Equals(""));
-            test(rsso[2][0][1].Equals(""));
-            test(rsso[2][1][0].Equals("abcd"));
-            called();
-        }
+                public void opFloatDouble(double r, float f, double d)
+                {
+                    test(f == 3.14f);
+                    test(d == 1.1e10);
+                    test(r == 1.1e10);
+                    called();
+                }
 
-        public void opByteBoolD(Dictionary<byte, bool> ro, Dictionary<byte, bool> _do)
-        {
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            // test(ro[10] == true); // Disabled since new dictionary mapping.
-            test(ro[11] == false);
-            test(ro[100] == false);
-            test(ro[101] == true);
-            called();
-        }
+                public void opString(string r, string s)
+                {
+                    test(s.Equals("world hello"));
+                    test(r.Equals("hello world"));
+                    called();
+                }
 
-        public void opShortIntD(Dictionary<short, int> ro, Dictionary<short, int> _do)
-        {
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            // test(ro[110] == -1); // Disabled since new dictionary mapping.
-            test(ro[111] == -100);
-            test(ro[1100] == 123123);
-            test(ro[1101] == 0);
-            called();
-        }
+                public void opMyEnum(Test.MyEnum r, Test.MyEnum e)
+                {
+                    test(e == Test.MyEnum.enum2);
+                    test(r == Test.MyEnum.enum3);
+                    called();
+                }
 
-        public void opLongFloatD(Dictionary<long, float> ro, Dictionary<long, float> _do)
-        {
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro[999999110L] == -1.1f);
-            test(ro[999999120L] == -100.4f);
-            test(ro[999999111L] == 123123.2f);
-            test(ro[999999130L] == 0.5f);
-            called();
-        }
+                public void opMyClass(Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2)
+                {
+                    test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
+                    test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity")));
+                    test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
+
+                    //
+                    // We can't do the callbacks below in connection serialization mode.
+                    //
+                    if (_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
+                    {
+                        r.opVoid();
+                        c1.opVoid();
+                        try
+                        {
+                            c2.opVoid();
+                            test(false);
+                        }
+                        catch (Ice.ObjectNotExistException)
+                        {
+                        }
+                    }
+                    called();
+                }
 
-        public void opStringStringD(Dictionary<string, string> ro, Dictionary<string, string> _do)
-        {
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro["foo"].Equals("abc -1.1"));
-            test(ro["FOO"].Equals("abc -100.4"));
-            test(ro["bar"].Equals("abc 123123.2"));
-            test(ro["BAR"].Equals("abc 0.5"));
-            called();
-        }
+                public void opStruct(Test.Structure rso, Test.Structure so)
+                {
+                    test(rso.p == null);
+                    test(rso.e == Test.MyEnum.enum2);
+                    test(rso.s.s.Equals("def"));
+                    test(so.e == Test.MyEnum.enum3);
+                    test(so.s.s.Equals("a new string"));
+
+                    //
+                    // We can't do the callbacks below in connection serialization mode.
+                    //
+                    if (_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
+                    {
+                        so.p.opVoid();
+                    }
+                    called();
+                }
 
-        public void opStringMyEnumD(Dictionary<string, Test.MyEnum> ro, Dictionary<string, Test.MyEnum> _do)
-        {
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro["abc"] == Test.MyEnum.enum1);
-            test(ro["qwerty"] == Test.MyEnum.enum3);
-            test(ro[""] == Test.MyEnum.enum2);
-            test(ro["Hello!!"] == Test.MyEnum.enum2);
-            called();
-        }
+                public void opByteS(byte[] rso, byte[] bso)
+                {
+                    test(bso.Length == 4);
+                    test(bso[0] == 0x22);
+                    test(bso[1] == 0x12);
+                    test(bso[2] == 0x11);
+                    test(bso[3] == 0x01);
+                    test(rso.Length == 8);
+                    test(rso[0] == 0x01);
+                    test(rso[1] == 0x11);
+                    test(rso[2] == 0x12);
+                    test(rso[3] == 0x22);
+                    test(rso[4] == 0xf1);
+                    test(rso[5] == 0xf2);
+                    test(rso[6] == 0xf3);
+                    test(rso[7] == 0xf4);
+                    called();
+                }
 
-        public void opMyEnumStringD(Dictionary<Test.MyEnum, string> ro, Dictionary<Test.MyEnum, string> _do)
-        {
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 3);
-            test(ro[Test.MyEnum.enum1].Equals("abc"));
-            test(ro[Test.MyEnum.enum2].Equals("Hello!!"));
-            test(ro[Test.MyEnum.enum3].Equals("qwerty"));
-            called();
-        }
+                public void opBoolS(bool[] rso, bool[] bso)
+                {
+                    test(bso.Length == 4);
+                    test(bso[0]);
+                    test(bso[1]);
+                    test(!bso[2]);
+                    test(!bso[3]);
+                    test(rso.Length == 3);
+                    test(!rso[0]);
+                    test(rso[1]);
+                    test(rso[2]);
+                    called();
+                }
 
-        public void opMyStructMyEnumD(Dictionary<Test.MyStruct, Test.MyEnum> ro,
-                                      Dictionary<Test.MyStruct, Test.MyEnum> _do)
-        {
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            test(ro.Count == 4);
-            test(ro[s11] == Test.MyEnum.enum1);
-            test(ro[s12] == Test.MyEnum.enum2);
-            test(ro[s22] == Test.MyEnum.enum3);
-            test(ro[s23] == Test.MyEnum.enum2);
-            called();
-        }
+                public void opShortIntLongS(long[] rso, short[] sso, int[] iso, long[] lso)
+                {
+                    test(sso.Length == 3);
+                    test(sso[0] == 1);
+                    test(sso[1] == 2);
+                    test(sso[2] == 3);
+                    test(iso.Length == 4);
+                    test(iso[0] == 8);
+                    test(iso[1] == 7);
+                    test(iso[2] == 6);
+                    test(iso[3] == 5);
+                    test(lso.Length == 6);
+                    test(lso[0] == 10);
+                    test(lso[1] == 30);
+                    test(lso[2] == 20);
+                    test(lso[3] == 10);
+                    test(lso[4] == 30);
+                    test(lso[5] == 20);
+                    test(rso.Length == 3);
+                    test(rso[0] == 10);
+                    test(rso[1] == 30);
+                    test(rso[2] == 20);
+                    called();
+                }
 
-        public void opByteBoolDS(Dictionary<byte,bool>[] ro,
-                                 Dictionary<byte,bool>[] _do)
-        {
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][10]);
-            test(!ro[0][11]);
-            test(ro[0][101]);
-            test(ro[1].Count == 2);
-            test(ro[1][10]);
-            test(!ro[1][100]);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 2);
-            test(!_do[0][100]);
-            test(!_do[0][101]);
-            test(_do[1].Count == 2);
-            test(_do[1][10]);
-            test(!_do[1][100]);
-            test(_do[2].Count == 3);
-            test(_do[2][10]);
-            test(!_do[2][11]);
-            test(_do[2][101]);
-            called();
-        }
+                public void opFloatDoubleS(double[] rso, float[] fso, double[] dso)
+                {
+                    test(fso.Length == 2);
+                    test(fso[0] == 3.14f);
+                    test(fso[1] == 1.11f);
+                    test(dso.Length == 3);
+                    test(dso[0] == 1.3e10);
+                    test(dso[1] == 1.2e10);
+                    test(dso[2] == 1.1e10);
+                    test(rso.Length == 5);
+                    test(rso[0] == 1.1e10);
+                    test(rso[1] == 1.2e10);
+                    test(rso[2] == 1.3e10);
+                    test((float)rso[3] == 3.14f);
+                    test((float)rso[4] == 1.11f);
+                    called();
+                }
 
-        public void opShortIntDS(Dictionary<short, int>[] ro,
-                                 Dictionary<short, int>[] _do)
-        {
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][110] == -1);
-            test(ro[0][111] == -100);
-            test(ro[0][1101] == 0);
-            test(ro[1].Count == 2);
-            test(ro[1][110] == -1);
-            test(ro[1][1100] == 123123);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][100] == -1001);
-            test(_do[1].Count == 2);
-            test(_do[1][110] == -1);
-            test(_do[1][1100] == 123123);
-            test(_do[2].Count == 3);
-            test(_do[2][110] == -1);
-            test(_do[2][111] == -100);
-            test(_do[2][1101] == 0);
-            called();
-        }
+                public void opStringS(string[] rso, string[] sso)
+                {
+                    test(sso.Length == 4);
+                    test(sso[0].Equals("abc"));
+                    test(sso[1].Equals("de"));
+                    test(sso[2].Equals("fghi"));
+                    test(sso[3].Equals("xyz"));
+                    test(rso.Length == 3);
+                    test(rso[0].Equals("fghi"));
+                    test(rso[1].Equals("de"));
+                    test(rso[2].Equals("abc"));
+                    called();
+                }
 
-        public void opLongFloatDS(Dictionary<long,float>[] ro,
-                                  Dictionary<long,float>[] _do)
-        {
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][999999110L] == -1.1f);
-            test(ro[0][999999120L] == -100.4f);
-            test(ro[0][999999130L] == 0.5f);
-            test(ro[1].Count == 2);
-            test(ro[1][999999110L] == -1.1f);
-            test(ro[1][999999111L] == 123123.2f);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][999999140L] == 3.14f);
-            test(_do[1].Count == 2);
-            test(_do[1][999999110L] == -1.1f);
-            test(_do[1][999999111L] == 123123.2f);
-            test(_do[2].Count == 3);
-            test(_do[2][999999110L] == -1.1f);
-            test(_do[2][999999120L] == -100.4f);
-            test(_do[2][999999130L] == 0.5f);
-            called();
-        }
+                public void opByteSS(byte[][] rso, byte[][] bso)
+                {
+                    test(bso.Length == 2);
+                    test(bso[0].Length == 1);
+                    test(bso[0][0] == 0xff);
+                    test(bso[1].Length == 3);
+                    test(bso[1][0] == 0x01);
+                    test(bso[1][1] == 0x11);
+                    test(bso[1][2] == 0x12);
+                    test(rso.Length == 4);
+                    test(rso[0].Length == 3);
+                    test(rso[0][0] == 0x01);
+                    test(rso[0][1] == 0x11);
+                    test(rso[0][2] == 0x12);
+                    test(rso[1].Length == 1);
+                    test(rso[1][0] == 0xff);
+                    test(rso[2].Length == 1);
+                    test(rso[2][0] == 0x0e);
+                    test(rso[3].Length == 2);
+                    test(rso[3][0] == 0xf2);
+                    test(rso[3][1] == 0xf1);
+                    called();
+                }
 
-        public void opStringStringDS(Dictionary<string, string>[] ro,
-                                     Dictionary<string, string>[] _do)
-        {
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0]["foo"].Equals("abc -1.1"));
-            test(ro[0]["FOO"].Equals("abc -100.4"));
-            test(ro[0]["BAR"].Equals("abc 0.5"));
-            test(ro[1].Count == 2);
-            test(ro[1]["foo"] == "abc -1.1");
-            test(ro[1]["bar"] == "abc 123123.2");
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0]["f00"].Equals("ABC -3.14"));
-            test(_do[1].Count == 2);
-            test(_do[1]["foo"].Equals("abc -1.1"));
-            test(_do[1]["bar"].Equals("abc 123123.2"));
-            test(_do[2].Count == 3);
-            test(_do[2]["foo"].Equals("abc -1.1"));
-            test(_do[2]["FOO"].Equals("abc -100.4"));
-            test(_do[2]["BAR"].Equals("abc 0.5"));
-            called();
-        }
+                public void opBoolSS(bool[][] rso, bool[][] bso)
+                {
+                    test(bso.Length == 4);
+                    test(bso[0].Length == 1);
+                    test(bso[0][0]);
+                    test(bso[1].Length == 1);
+                    test(!bso[1][0]);
+                    test(bso[2].Length == 2);
+                    test(bso[2][0]);
+                    test(bso[2][1]);
+                    test(bso[3].Length == 3);
+                    test(!bso[3][0]);
+                    test(!bso[3][1]);
+                    test(bso[3][2]);
+                    test(rso.Length == 3);
+                    test(rso[0].Length == 2);
+                    test(rso[0][0]);
+                    test(rso[0][1]);
+                    test(rso[1].Length == 1);
+                    test(!rso[1][0]);
+                    test(rso[2].Length == 1);
+                    test(rso[2][0]);
+                    called();
+                }
 
-        public void opStringMyEnumDS(Dictionary<string, Test.MyEnum>[] ro,
-                                     Dictionary<string, Test.MyEnum>[] _do)
-        {
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0]["abc"] == Test.MyEnum.enum1);
-            test(ro[0]["qwerty"] == Test.MyEnum.enum3);
-            test(ro[0]["Hello!!"] == Test.MyEnum.enum2);
-            test(ro[1].Count == 2);
-            test(ro[1]["abc"] == Test.MyEnum.enum1);
-            test(ro[1][""] == Test.MyEnum.enum2);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0]["Goodbye"] == Test.MyEnum.enum1);
-            test(_do[1].Count == 2);
-            test(_do[1]["abc"] == Test.MyEnum.enum1);
-            test(_do[1][""] == Test.MyEnum.enum2);
-            test(_do[2].Count == 3);
-            test(_do[2]["abc"] == Test.MyEnum.enum1);
-            test(_do[2]["qwerty"] == Test.MyEnum.enum3);
-            test(_do[2]["Hello!!"] == Test.MyEnum.enum2);
-            called();
-        }
+                public void opShortIntLongSS(long[][] rso, short[][] sso, int[][] iso, long[][] lso)
+                {
+                    test(rso.Length == 1);
+                    test(rso[0].Length == 2);
+                    test(rso[0][0] == 496);
+                    test(rso[0][1] == 1729);
+                    test(sso.Length == 3);
+                    test(sso[0].Length == 3);
+                    test(sso[0][0] == 1);
+                    test(sso[0][1] == 2);
+                    test(sso[0][2] == 5);
+                    test(sso[1].Length == 1);
+                    test(sso[1][0] == 13);
+                    test(sso[2].Length == 0);
+                    test(iso.Length == 2);
+                    test(iso[0].Length == 1);
+                    test(iso[0][0] == 42);
+                    test(iso[1].Length == 2);
+                    test(iso[1][0] == 24);
+                    test(iso[1][1] == 98);
+                    test(lso.Length == 2);
+                    test(lso[0].Length == 2);
+                    test(lso[0][0] == 496);
+                    test(lso[0][1] == 1729);
+                    test(lso[1].Length == 2);
+                    test(lso[1][0] == 496);
+                    test(lso[1][1] == 1729);
+                    called();
+                }
 
-        public void opMyEnumStringDS(Dictionary<Test.MyEnum, string>[] ro,
-                                     Dictionary<Test.MyEnum, string>[] _do)
-        {
-            test(ro.Length == 2);
-            test(ro[0].Count == 2);
-            test(ro[0][Test.MyEnum.enum2].Equals("Hello!!"));
-            test(ro[0][Test.MyEnum.enum3].Equals("qwerty"));
-            test(ro[1].Count == 1);
-            test(ro[1][Test.MyEnum.enum1].Equals("abc"));
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][Test.MyEnum.enum1].Equals("Goodbye"));
-            test(_do[1].Count == 1);
-            test(_do[1][Test.MyEnum.enum1].Equals("abc"));
-            test(_do[2].Count == 2);
-            test(_do[2][Test.MyEnum.enum2].Equals("Hello!!"));
-            test(_do[2][Test.MyEnum.enum3].Equals("qwerty"));
-            called();
-        }
+                public void opFloatDoubleSS(double[][] rso, float[][] fso, double[][] dso)
+                {
+                    test(fso.Length == 3);
+                    test(fso[0].Length == 1);
+                    test(fso[0][0] == 3.14f);
+                    test(fso[1].Length == 1);
+                    test(fso[1][0] == 1.11f);
+                    test(fso[2].Length == 0);
+                    test(dso.Length == 1);
+                    test(dso[0].Length == 3);
+                    test(dso[0][0] == 1.1e10);
+                    test(dso[0][1] == 1.2e10);
+                    test(dso[0][2] == 1.3e10);
+                    test(rso.Length == 2);
+                    test(rso[0].Length == 3);
+                    test(rso[0][0] == 1.1e10);
+                    test(rso[0][1] == 1.2e10);
+                    test(rso[0][2] == 1.3e10);
+                    test(rso[1].Length == 3);
+                    test(rso[1][0] == 1.1e10);
+                    test(rso[1][1] == 1.2e10);
+                    test(rso[1][2] == 1.3e10);
+                    called();
+                }
 
-        public void opMyStructMyEnumDS(Dictionary<Test.MyStruct, Test.MyEnum>[] ro,
-                                       Dictionary<Test.MyStruct, Test.MyEnum>[] _do)
-        {
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][s11] == Test.MyEnum.enum1);
-            test(ro[0][s22] == Test.MyEnum.enum3);
-            test(ro[0][s23] == Test.MyEnum.enum2);
-            test(ro[1].Count == 2);
-            test(ro[1][s11] == Test.MyEnum.enum1);
-            test(ro[1][s12] == Test.MyEnum.enum2);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][s23] == Test.MyEnum.enum3);
-            test(_do[1].Count == 2);
-            test(_do[1][s11] == Test.MyEnum.enum1);
-            test(_do[1][s12] == Test.MyEnum.enum2);
-            test(_do[2].Count == 3);
-            test(_do[2][s11] == Test.MyEnum.enum1);
-            test(_do[2][s22] == Test.MyEnum.enum3);
-            test(_do[2][s23] == Test.MyEnum.enum2);
-            called();
-        }
+                public void opStringSS(string[][] rso, string[][] sso)
+                {
+                    test(sso.Length == 5);
+                    test(sso[0].Length == 1);
+                    test(sso[0][0].Equals("abc"));
+                    test(sso[1].Length == 2);
+                    test(sso[1][0].Equals("de"));
+                    test(sso[1][1].Equals("fghi"));
+                    test(sso[2].Length == 0);
+                    test(sso[3].Length == 0);
+                    test(sso[4].Length == 1);
+                    test(sso[4][0].Equals("xyz"));
+                    test(rso.Length == 3);
+                    test(rso[0].Length == 1);
+                    test(rso[0][0].Equals("xyz"));
+                    test(rso[1].Length == 0);
+                    test(rso[2].Length == 0);
+                    called();
+                }
 
-        public void opByteByteSD(Dictionary<byte, byte[]> ro,
-                                 Dictionary<byte, byte[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do[0xf1].Length == 2);
-            test(_do[0xf1][0] == 0xf2);
-            test(_do[0xf1][1] == 0xf3);
-
-            test(ro.Count == 3);
-            test(ro[0x01].Length == 2);
-            test(ro[0x01][0] == 0x01);
-            test(ro[0x01][1] == 0x11);
-            test(ro[0x22].Length == 1);
-            test(ro[0x22][0] == 0x12);
-            test(ro[0xf1].Length == 2);
-            test(ro[0xf1][0] == 0xf2);
-            test(ro[0xf1][1] == 0xf3);
-            called();
-        }
+                public void opStringSSS(string[][][] rsso, string[][][] ssso)
+                {
+                    test(ssso.Length == 5);
+                    test(ssso[0].Length == 2);
+                    test(ssso[0][0].Length == 2);
+                    test(ssso[0][1].Length == 1);
+                    test(ssso[1].Length == 1);
+                    test(ssso[1][0].Length == 1);
+                    test(ssso[2].Length == 2);
+                    test(ssso[2][0].Length == 2);
+                    test(ssso[2][1].Length == 1);
+                    test(ssso[3].Length == 1);
+                    test(ssso[3][0].Length == 1);
+                    test(ssso[4].Length == 0);
+                    test(ssso[0][0][0].Equals("abc"));
+                    test(ssso[0][0][1].Equals("de"));
+                    test(ssso[0][1][0].Equals("xyz"));
+                    test(ssso[1][0][0].Equals("hello"));
+                    test(ssso[2][0][0].Equals(""));
+                    test(ssso[2][0][1].Equals(""));
+                    test(ssso[2][1][0].Equals("abcd"));
+                    test(ssso[3][0][0].Equals(""));
+
+                    test(rsso.Length == 3);
+                    test(rsso[0].Length == 0);
+                    test(rsso[1].Length == 1);
+                    test(rsso[1][0].Length == 1);
+                    test(rsso[2].Length == 2);
+                    test(rsso[2][0].Length == 2);
+                    test(rsso[2][1].Length == 1);
+                    test(rsso[1][0][0].Equals(""));
+                    test(rsso[2][0][0].Equals(""));
+                    test(rsso[2][0][1].Equals(""));
+                    test(rsso[2][1][0].Equals("abcd"));
+                    called();
+                }
 
-        public void opBoolBoolSD(Dictionary<bool, bool[]> ro,
-                                 Dictionary<bool, bool[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do[false].Length == 2);
-            test(_do[false][0]);
-            test(!_do[false][1]);
-            test(ro.Count == 2);
-            test(ro[false].Length == 2);
-            test(ro[false][0]);
-            test(!ro[false][1]);
-            test(ro[true].Length == 3);
-            test(!ro[true][0]);
-            test(ro[true][1]);
-            test(ro[true][2]);
-            called();
-        }
+                public void opByteBoolD(Dictionary<byte, bool> ro, Dictionary<byte, bool> _do)
+                {
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    // test(ro[10] == true); // Disabled since new dictionary mapping.
+                    test(ro[11] == false);
+                    test(ro[100] == false);
+                    test(ro[101] == true);
+                    called();
+                }
 
-        public void opShortShortSD(Dictionary<short, short[]> ro,
-                                   Dictionary<short, short[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do[4].Length == 2);
-            test(_do[4][0] == 6);
-            test(_do[4][1] == 7);
-
-            test(ro.Count == 3);
-            test(ro[1].Length == 3);
-            test(ro[1][0] == 1);
-            test(ro[1][1] == 2);
-            test(ro[1][2] == 3);
-            test(ro[2].Length == 2);
-            test(ro[2][0] == 4);
-            test(ro[2][1] == 5);
-            test(ro[4].Length == 2);
-            test(ro[4][0] == 6);
-            test(ro[4][1] == 7);
-            called();
-        }
+                public void opShortIntD(Dictionary<short, int> ro, Dictionary<short, int> _do)
+                {
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    // test(ro[110] == -1); // Disabled since new dictionary mapping.
+                    test(ro[111] == -100);
+                    test(ro[1100] == 123123);
+                    test(ro[1101] == 0);
+                    called();
+                }
 
-        public void opIntIntSD(Dictionary<int, int[]> ro,
-                               Dictionary<int, int[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do[400].Length == 2);
-            test(_do[400][0] == 600);
-            test(_do[400][1] == 700);
-
-            test(ro.Count == 3);
-            test(ro[100].Length == 3);
-            test(ro[100][0] == 100);
-            test(ro[100][1] == 200);
-            test(ro[100][2] == 300);
-            test(ro[200].Length == 2);
-            test(ro[200][0] == 400);
-            test(ro[200][1] == 500);
-            test(ro[400].Length == 2);
-            test(ro[400][0] == 600);
-            test(ro[400][1] == 700);
-            called();
-        }
+                public void opLongFloatD(Dictionary<long, float> ro, Dictionary<long, float> _do)
+                {
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro[999999110L] == -1.1f);
+                    test(ro[999999120L] == -100.4f);
+                    test(ro[999999111L] == 123123.2f);
+                    test(ro[999999130L] == 0.5f);
+                    called();
+                }
 
-        public void opLongLongSD(Dictionary<long, long[]> ro,
-                                 Dictionary<long, long[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do[999999992L].Length == 2);
-            test(_do[999999992L][0] == 999999110L);
-            test(_do[999999992L][1] == 999999120L);
-            test(ro.Count == 3);
-            test(ro[999999990L].Length == 3);
-            test(ro[999999990L][0] == 999999110L);
-            test(ro[999999990L][1] == 999999111L);
-            test(ro[999999990L][2] == 999999110L);
-            test(ro[999999991L].Length == 2);
-            test(ro[999999991L][0] == 999999120L);
-            test(ro[999999991L][1] == 999999130L);
-            test(ro[999999992L].Length == 2);
-            test(ro[999999992L][0] == 999999110L);
-            test(ro[999999992L][1] == 999999120L);
-            called();
-        }
+                public void opStringStringD(Dictionary<string, string> ro, Dictionary<string, string> _do)
+                {
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro["foo"].Equals("abc -1.1"));
+                    test(ro["FOO"].Equals("abc -100.4"));
+                    test(ro["bar"].Equals("abc 123123.2"));
+                    test(ro["BAR"].Equals("abc 0.5"));
+                    called();
+                }
 
-        public void opStringFloatSD(Dictionary<string, float[]> ro,
-                                    Dictionary<string, float[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do["aBc"].Length == 2);
-            test(_do["aBc"][0] == -3.14f);
-            test(_do["aBc"][1] == 3.14f);
-
-            test(ro.Count == 3);
-            test(ro["abc"].Length == 3);
-            test(ro["abc"][0] == -1.1f);
-            test(ro["abc"][1] == 123123.2f);
-            test(ro["abc"][2] == 100.0f);
-            test(ro["ABC"].Length == 2);
-            test(ro["ABC"][0] == 42.24f);
-            test(ro["ABC"][1] == -1.61f);
-            test(ro["aBc"].Length == 2);
-            test(ro["aBc"][0] == -3.14f);
-            test(ro["aBc"][1] == 3.14f);
-            called();
-        }
+                public void opStringMyEnumD(Dictionary<string, Test.MyEnum> ro, Dictionary<string, Test.MyEnum> _do)
+                {
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro["abc"] == Test.MyEnum.enum1);
+                    test(ro["qwerty"] == Test.MyEnum.enum3);
+                    test(ro[""] == Test.MyEnum.enum2);
+                    test(ro["Hello!!"] == Test.MyEnum.enum2);
+                    called();
+                }
 
-        public void opStringDoubleSD(Dictionary<string, double[]> ro,
-                                     Dictionary<string, double[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do[""].Length == 2);
-            test(_do[""][0] == 1.6E10);
-            test(_do[""][1] == 1.7E10);
-            test(ro.Count == 3);
-            test(ro["Hello!!"].Length == 3);
-            test(ro["Hello!!"][0] == 1.1E10);
-            test(ro["Hello!!"][1] == 1.2E10);
-            test(ro["Hello!!"][2] == 1.3E10);
-            test(ro["Goodbye"].Length == 2);
-            test(ro["Goodbye"][0] == 1.4E10);
-            test(ro["Goodbye"][1] == 1.5E10);
-            test(ro[""].Length == 2);
-            test(ro[""][0] == 1.6E10);
-            test(ro[""][1] == 1.7E10);
-            called();
-        }
+                public void opMyEnumStringD(Dictionary<Test.MyEnum, string> ro, Dictionary<Test.MyEnum, string> _do)
+                {
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 3);
+                    test(ro[Test.MyEnum.enum1].Equals("abc"));
+                    test(ro[Test.MyEnum.enum2].Equals("Hello!!"));
+                    test(ro[Test.MyEnum.enum3].Equals("qwerty"));
+                    called();
+                }
 
-        public void opStringStringSD(Dictionary<string, string[]> ro,
-                                     Dictionary<string, string[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do["ghi"].Length == 2);
-            test(_do["ghi"][0].Equals("and"));
-            test(_do["ghi"][1].Equals("xor"));
-
-            test(ro.Count == 3);
-            test(ro["abc"].Length == 3);
-            test(ro["abc"][0].Equals("abc"));
-            test(ro["abc"][1].Equals("de"));
-            test(ro["abc"][2].Equals("fghi"));
-            test(ro["def"].Length == 2);
-            test(ro["def"][0].Equals("xyz"));
-            test(ro["def"][1].Equals("or"));
-            test(ro["ghi"].Length == 2);
-            test(ro["ghi"][0].Equals("and"));
-            test(ro["ghi"][1].Equals("xor"));
-            called();
-        }
+                public void opMyStructMyEnumD(Dictionary<Test.MyStruct, Test.MyEnum> ro,
+                                              Dictionary<Test.MyStruct, Test.MyEnum> _do)
+                {
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    test(ro.Count == 4);
+                    test(ro[s11] == Test.MyEnum.enum1);
+                    test(ro[s12] == Test.MyEnum.enum2);
+                    test(ro[s22] == Test.MyEnum.enum3);
+                    test(ro[s23] == Test.MyEnum.enum2);
+                    called();
+                }
 
-        public void opMyEnumMyEnumSD(Dictionary<Test.MyEnum, Test.MyEnum[]> ro,
-                                     Dictionary<Test.MyEnum, Test.MyEnum[]> _do)
-        {
-            test(_do.Count == 1);
-            test(_do[Test.MyEnum.enum1].Length == 2);
-            test(_do[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
-            test(_do[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
-            test(ro.Count == 3);
-            test(ro[Test.MyEnum.enum3].Length == 3);
-            test(ro[Test.MyEnum.enum3][0] == Test.MyEnum.enum1);
-            test(ro[Test.MyEnum.enum3][1] == Test.MyEnum.enum1);
-            test(ro[Test.MyEnum.enum3][2] == Test.MyEnum.enum2);
-            test(ro[Test.MyEnum.enum2].Length == 2);
-            test(ro[Test.MyEnum.enum2][0] == Test.MyEnum.enum1);
-            test(ro[Test.MyEnum.enum2][1] == Test.MyEnum.enum2);
-            test(ro[Test.MyEnum.enum1].Length == 2);
-            test(ro[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
-            test(ro[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
-            called();
-        }
+                public void opByteBoolDS(Dictionary<byte, bool>[] ro,
+                                         Dictionary<byte, bool>[] _do)
+                {
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][10]);
+                    test(!ro[0][11]);
+                    test(ro[0][101]);
+                    test(ro[1].Count == 2);
+                    test(ro[1][10]);
+                    test(!ro[1][100]);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 2);
+                    test(!_do[0][100]);
+                    test(!_do[0][101]);
+                    test(_do[1].Count == 2);
+                    test(_do[1][10]);
+                    test(!_do[1][100]);
+                    test(_do[2].Count == 3);
+                    test(_do[2][10]);
+                    test(!_do[2][11]);
+                    test(_do[2][101]);
+                    called();
+                }
 
-        public void opIntS(int[] r)
-        {
-            test(r.Length == _l);
-            for(int j = 0; j < r.Length; ++j)
-            {
-                test(r[j] == -j);
-            }
-            called();
-        }
+                public void opShortIntDS(Dictionary<short, int>[] ro,
+                                         Dictionary<short, int>[] _do)
+                {
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][110] == -1);
+                    test(ro[0][111] == -100);
+                    test(ro[0][1101] == 0);
+                    test(ro[1].Count == 2);
+                    test(ro[1][110] == -1);
+                    test(ro[1][1100] == 123123);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][100] == -1001);
+                    test(_do[1].Count == 2);
+                    test(_do[1][110] == -1);
+                    test(_do[1][1100] == 123123);
+                    test(_do[2].Count == 3);
+                    test(_do[2][110] == -1);
+                    test(_do[2][111] == -100);
+                    test(_do[2][1101] == 0);
+                    called();
+                }
 
-        public void opContextNotEqual(Dictionary<string, string> r)
-        {
-            test(!Ice.CollectionComparer.Equals(r, _d));
-            called();
-        }
+                public void opLongFloatDS(Dictionary<long, float>[] ro,
+                                          Dictionary<long, float>[] _do)
+                {
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][999999110L] == -1.1f);
+                    test(ro[0][999999120L] == -100.4f);
+                    test(ro[0][999999130L] == 0.5f);
+                    test(ro[1].Count == 2);
+                    test(ro[1][999999110L] == -1.1f);
+                    test(ro[1][999999111L] == 123123.2f);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][999999140L] == 3.14f);
+                    test(_do[1].Count == 2);
+                    test(_do[1][999999110L] == -1.1f);
+                    test(_do[1][999999111L] == 123123.2f);
+                    test(_do[2].Count == 3);
+                    test(_do[2][999999110L] == -1.1f);
+                    test(_do[2][999999120L] == -100.4f);
+                    test(_do[2][999999130L] == 0.5f);
+                    called();
+                }
 
-        public void opContextEqual(Dictionary<string, string> r)
-        {
-            test(Ice.CollectionComparer.Equals(r, _d));
-            called();
-        }
+                public void opStringStringDS(Dictionary<string, string>[] ro,
+                                             Dictionary<string, string>[] _do)
+                {
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0]["foo"].Equals("abc -1.1"));
+                    test(ro[0]["FOO"].Equals("abc -100.4"));
+                    test(ro[0]["BAR"].Equals("abc 0.5"));
+                    test(ro[1].Count == 2);
+                    test(ro[1]["foo"] == "abc -1.1");
+                    test(ro[1]["bar"] == "abc 123123.2");
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0]["f00"].Equals("ABC -3.14"));
+                    test(_do[1].Count == 2);
+                    test(_do[1]["foo"].Equals("abc -1.1"));
+                    test(_do[1]["bar"].Equals("abc 123123.2"));
+                    test(_do[2].Count == 3);
+                    test(_do[2]["foo"].Equals("abc -1.1"));
+                    test(_do[2]["FOO"].Equals("abc -100.4"));
+                    test(_do[2]["BAR"].Equals("abc 0.5"));
+                    called();
+                }
 
-        public void opIdempotent()
-        {
-            called();
-        }
+                public void opStringMyEnumDS(Dictionary<string, Test.MyEnum>[] ro,
+                                             Dictionary<string, Test.MyEnum>[] _do)
+                {
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0]["abc"] == Test.MyEnum.enum1);
+                    test(ro[0]["qwerty"] == Test.MyEnum.enum3);
+                    test(ro[0]["Hello!!"] == Test.MyEnum.enum2);
+                    test(ro[1].Count == 2);
+                    test(ro[1]["abc"] == Test.MyEnum.enum1);
+                    test(ro[1][""] == Test.MyEnum.enum2);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0]["Goodbye"] == Test.MyEnum.enum1);
+                    test(_do[1].Count == 2);
+                    test(_do[1]["abc"] == Test.MyEnum.enum1);
+                    test(_do[1][""] == Test.MyEnum.enum2);
+                    test(_do[2].Count == 3);
+                    test(_do[2]["abc"] == Test.MyEnum.enum1);
+                    test(_do[2]["qwerty"] == Test.MyEnum.enum3);
+                    test(_do[2]["Hello!!"] == Test.MyEnum.enum2);
+                    called();
+                }
 
-        public void opNonmutating()
-        {
-            called();
-        }
+                public void opMyEnumStringDS(Dictionary<Test.MyEnum, string>[] ro,
+                                             Dictionary<Test.MyEnum, string>[] _do)
+                {
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 2);
+                    test(ro[0][Test.MyEnum.enum2].Equals("Hello!!"));
+                    test(ro[0][Test.MyEnum.enum3].Equals("qwerty"));
+                    test(ro[1].Count == 1);
+                    test(ro[1][Test.MyEnum.enum1].Equals("abc"));
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][Test.MyEnum.enum1].Equals("Goodbye"));
+                    test(_do[1].Count == 1);
+                    test(_do[1][Test.MyEnum.enum1].Equals("abc"));
+                    test(_do[2].Count == 2);
+                    test(_do[2][Test.MyEnum.enum2].Equals("Hello!!"));
+                    test(_do[2][Test.MyEnum.enum3].Equals("qwerty"));
+                    called();
+                }
 
-        public void opDerived()
-        {
-            called();
-        }
+                public void opMyStructMyEnumDS(Dictionary<Test.MyStruct, Test.MyEnum>[] ro,
+                                               Dictionary<Test.MyStruct, Test.MyEnum>[] _do)
+                {
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][s11] == Test.MyEnum.enum1);
+                    test(ro[0][s22] == Test.MyEnum.enum3);
+                    test(ro[0][s23] == Test.MyEnum.enum2);
+                    test(ro[1].Count == 2);
+                    test(ro[1][s11] == Test.MyEnum.enum1);
+                    test(ro[1][s12] == Test.MyEnum.enum2);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][s23] == Test.MyEnum.enum3);
+                    test(_do[1].Count == 2);
+                    test(_do[1][s11] == Test.MyEnum.enum1);
+                    test(_do[1][s12] == Test.MyEnum.enum2);
+                    test(_do[2].Count == 3);
+                    test(_do[2][s11] == Test.MyEnum.enum1);
+                    test(_do[2][s22] == Test.MyEnum.enum3);
+                    test(_do[2][s23] == Test.MyEnum.enum2);
+                    called();
+                }
 
-        public void exCB(Ice.Exception ex)
-        {
-            test(false);
-        }
+                public void opByteByteSD(Dictionary<byte, byte[]> ro,
+                                         Dictionary<byte, byte[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do[0xf1].Length == 2);
+                    test(_do[0xf1][0] == 0xf2);
+                    test(_do[0xf1][1] == 0xf3);
+
+                    test(ro.Count == 3);
+                    test(ro[0x01].Length == 2);
+                    test(ro[0x01][0] == 0x01);
+                    test(ro[0x01][1] == 0x11);
+                    test(ro[0x22].Length == 1);
+                    test(ro[0x22][0] == 0x12);
+                    test(ro[0xf1].Length == 2);
+                    test(ro[0xf1][0] == 0xf2);
+                    test(ro[0xf1][1] == 0xf3);
+                    called();
+                }
 
-        private Ice.Communicator _communicator;
-        private int _l;
-        private Dictionary<string, string> _d;
-    }
+                public void opBoolBoolSD(Dictionary<bool, bool[]> ro,
+                                         Dictionary<bool, bool[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do[false].Length == 2);
+                    test(_do[false][0]);
+                    test(!_do[false][1]);
+                    test(ro.Count == 2);
+                    test(ro[false].Length == 2);
+                    test(ro[false][0]);
+                    test(!ro[false][1]);
+                    test(ro[true].Length == 3);
+                    test(!ro[true][0]);
+                    test(ro[true][1]);
+                    test(ro[true][2]);
+                    called();
+                }
 
-    internal static void twowaysAMI(TestCommon.Application app, Test.MyClassPrx p)
-    {
-        Ice.Communicator communicator = app.communicator();
+                public void opShortShortSD(Dictionary<short, short[]> ro,
+                                           Dictionary<short, short[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do[4].Length == 2);
+                    test(_do[4][0] == 6);
+                    test(_do[4][1] == 7);
+
+                    test(ro.Count == 3);
+                    test(ro[1].Length == 3);
+                    test(ro[1][0] == 1);
+                    test(ro[1][1] == 2);
+                    test(ro[1][2] == 3);
+                    test(ro[2].Length == 2);
+                    test(ro[2][0] == 4);
+                    test(ro[2][1] == 5);
+                    test(ro[4].Length == 2);
+                    test(ro[4][0] == 6);
+                    test(ro[4][1] == 7);
+                    called();
+                }
 
-        {
-            p.ice_pingAsync().Wait();
-        }
+                public void opIntIntSD(Dictionary<int, int[]> ro,
+                                       Dictionary<int, int[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do[400].Length == 2);
+                    test(_do[400][0] == 600);
+                    test(_do[400][1] == 700);
+
+                    test(ro.Count == 3);
+                    test(ro[100].Length == 3);
+                    test(ro[100][0] == 100);
+                    test(ro[100][1] == 200);
+                    test(ro[100][2] == 300);
+                    test(ro[200].Length == 2);
+                    test(ro[200][0] == 400);
+                    test(ro[200][1] == 500);
+                    test(ro[400].Length == 2);
+                    test(ro[400][0] == 600);
+                    test(ro[400][1] == 700);
+                    called();
+                }
 
-        {
-            Ice.AsyncResult r = p.begin_ice_ping();
-            p.end_ice_ping(r);
-        }
+                public void opLongLongSD(Dictionary<long, long[]> ro,
+                                         Dictionary<long, long[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do[999999992L].Length == 2);
+                    test(_do[999999992L][0] == 999999110L);
+                    test(_do[999999992L][1] == 999999120L);
+                    test(ro.Count == 3);
+                    test(ro[999999990L].Length == 3);
+                    test(ro[999999990L][0] == 999999110L);
+                    test(ro[999999990L][1] == 999999111L);
+                    test(ro[999999990L][2] == 999999110L);
+                    test(ro[999999991L].Length == 2);
+                    test(ro[999999991L][0] == 999999120L);
+                    test(ro[999999991L][1] == 999999130L);
+                    test(ro[999999992L].Length == 2);
+                    test(ro[999999992L][0] == 999999110L);
+                    test(ro[999999992L][1] == 999999120L);
+                    called();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_ping().whenCompleted(cb.ice_ping, cb.exCB);
-            cb.check();
-        }
+                public void opStringFloatSD(Dictionary<string, float[]> ro,
+                                            Dictionary<string, float[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do["aBc"].Length == 2);
+                    test(_do["aBc"][0] == -3.14f);
+                    test(_do["aBc"][1] == 3.14f);
+
+                    test(ro.Count == 3);
+                    test(ro["abc"].Length == 3);
+                    test(ro["abc"][0] == -1.1f);
+                    test(ro["abc"][1] == 123123.2f);
+                    test(ro["abc"][2] == 100.0f);
+                    test(ro["ABC"].Length == 2);
+                    test(ro["ABC"][0] == 42.24f);
+                    test(ro["ABC"][1] == -1.61f);
+                    test(ro["aBc"].Length == 2);
+                    test(ro["aBc"][0] == -3.14f);
+                    test(ro["aBc"][1] == 3.14f);
+                    called();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_ping().whenCompleted(
-                () =>
-                {
-                    cb.ice_ping();
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                public void opStringDoubleSD(Dictionary<string, double[]> ro,
+                                             Dictionary<string, double[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do[""].Length == 2);
+                    test(_do[""][0] == 1.6E10);
+                    test(_do[""][1] == 1.7E10);
+                    test(ro.Count == 3);
+                    test(ro["Hello!!"].Length == 3);
+                    test(ro["Hello!!"][0] == 1.1E10);
+                    test(ro["Hello!!"][1] == 1.2E10);
+                    test(ro["Hello!!"][2] == 1.3E10);
+                    test(ro["Goodbye"].Length == 2);
+                    test(ro["Goodbye"][0] == 1.4E10);
+                    test(ro["Goodbye"][1] == 1.5E10);
+                    test(ro[""].Length == 2);
+                    test(ro[""][0] == 1.6E10);
+                    test(ro[""][1] == 1.7E10);
+                    called();
+                }
 
-        {
-            test(p.ice_isAAsync(Test.MyClassDisp_.ice_staticId()).Result);
-        }
+                public void opStringStringSD(Dictionary<string, string[]> ro,
+                                             Dictionary<string, string[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do["ghi"].Length == 2);
+                    test(_do["ghi"][0].Equals("and"));
+                    test(_do["ghi"][1].Equals("xor"));
+
+                    test(ro.Count == 3);
+                    test(ro["abc"].Length == 3);
+                    test(ro["abc"][0].Equals("abc"));
+                    test(ro["abc"][1].Equals("de"));
+                    test(ro["abc"][2].Equals("fghi"));
+                    test(ro["def"].Length == 2);
+                    test(ro["def"][0].Equals("xyz"));
+                    test(ro["def"][1].Equals("or"));
+                    test(ro["ghi"].Length == 2);
+                    test(ro["ghi"][0].Equals("and"));
+                    test(ro["ghi"][1].Equals("xor"));
+                    called();
+                }
 
-        {
-            Ice.AsyncResult r = p.begin_ice_isA(Test.MyClassDisp_.ice_staticId());
-            test(p.end_ice_isA(r));
-        }
+                public void opMyEnumMyEnumSD(Dictionary<Test.MyEnum, Test.MyEnum[]> ro,
+                                             Dictionary<Test.MyEnum, Test.MyEnum[]> _do)
+                {
+                    test(_do.Count == 1);
+                    test(_do[Test.MyEnum.enum1].Length == 2);
+                    test(_do[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
+                    test(_do[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
+                    test(ro.Count == 3);
+                    test(ro[Test.MyEnum.enum3].Length == 3);
+                    test(ro[Test.MyEnum.enum3][0] == Test.MyEnum.enum1);
+                    test(ro[Test.MyEnum.enum3][1] == Test.MyEnum.enum1);
+                    test(ro[Test.MyEnum.enum3][2] == Test.MyEnum.enum2);
+                    test(ro[Test.MyEnum.enum2].Length == 2);
+                    test(ro[Test.MyEnum.enum2][0] == Test.MyEnum.enum1);
+                    test(ro[Test.MyEnum.enum2][1] == Test.MyEnum.enum2);
+                    test(ro[Test.MyEnum.enum1].Length == 2);
+                    test(ro[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
+                    test(ro[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
+                    called();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_isA(Test.MyClassDisp_.ice_staticId()).whenCompleted(cb.ice_isA, cb.exCB);
-            cb.check();
-        }
+                public void opIntS(int[] r)
+                {
+                    test(r.Length == _l);
+                    for (int j = 0; j < r.Length; ++j)
+                    {
+                        test(r[j] == -j);
+                    }
+                    called();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_isA(Test.MyClassDisp_.ice_staticId()).whenCompleted(
-                (bool v) =>
-                {
-                    cb.ice_isA(v);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                public void opContextNotEqual(Dictionary<string, string> r)
+                {
+                    test(!Ice.CollectionComparer.Equals(r, _d));
+                    called();
+                }
 
-        {
-            test(p.ice_idsAsync().Result.Length == 3);
-        }
+                public void opContextEqual(Dictionary<string, string> r)
+                {
+                    test(Ice.CollectionComparer.Equals(r, _d));
+                    called();
+                }
 
-        {
-            Ice.AsyncResult r = p.begin_ice_ids();
-            test(p.end_ice_ids(r).Length == 3);
-        }
+                public void opIdempotent()
+                {
+                    called();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_ids().whenCompleted(cb.ice_ids, cb.exCB);
-            cb.check();
-        }
+                public void opNonmutating()
+                {
+                    called();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_ids().whenCompleted(
-                (string[] ids) =>
-                {
-                    cb.ice_ids(ids);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                public void opDerived()
+                {
+                    called();
+                }
 
-        {
-            test(p.ice_idAsync().Result.Equals(Test.MyDerivedClassDisp_.ice_staticId()));
-        }
+                public void exCB(Ice.Exception ex)
+                {
+                    test(false);
+                }
 
-        {
-            Ice.AsyncResult r = p.begin_ice_id();
-            test(p.end_ice_id(r).Equals(Test.MyDerivedClassDisp_.ice_staticId()));
-        }
+                private Ice.Communicator _communicator;
+                private int _l;
+                private Dictionary<string, string> _d;
+            }
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_id().whenCompleted(cb.ice_id, cb.exCB);
-            cb.check();
-        }
+            internal static void twowaysAMI(global::Test.TestHelper helper, Test.MyClassPrx p)
+            {
+                Ice.Communicator communicator = helper.communicator();
 
-        {
-            Callback cb = new Callback();
-            p.begin_ice_id().whenCompleted(
-                (string id) =>
-                {
-                    cb.ice_id(id);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    p.ice_pingAsync().Wait();
+                }
 
-        {
-            p.opVoidAsync().Wait();
-        }
+                {
+                    Ice.AsyncResult r = p.begin_ice_ping();
+                    p.end_ice_ping(r);
+                }
 
-        {
-            Ice.AsyncResult r = p.begin_opVoid();
-            p.end_opVoid(r);
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_ping().whenCompleted(cb.ice_ping, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opVoid().whenCompleted(cb.opVoid, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_ping().whenCompleted(
+                        () =>
+                        {
+                            cb.ice_ping();
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opVoid().whenCompleted(
-                () =>
-                {
-                    cb.opVoid();
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    test(p.ice_isAAsync(Test.MyClassDisp_.ice_staticId()).Result);
+                }
 
-        {
-            var ret = p.opByteAsync(0xff, 0x0f).Result;
-            test(ret.p3 == 0xf0);
-            test(ret.returnValue == 0xff);
-        }
+                {
+                    Ice.AsyncResult r = p.begin_ice_isA(Test.MyClassDisp_.ice_staticId());
+                    test(p.end_ice_isA(r));
+                }
 
-        {
-            Ice.AsyncResult r = p.begin_opByte(0xff, 0x0f);
-            byte p3;
-            byte ret = p.end_opByte(out p3, r);
-            test(p3 == 0xf0);
-            test(ret == 0xff);
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_isA(Test.MyClassDisp_.ice_staticId()).whenCompleted(cb.ice_isA, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opByte(0xff, 0x0f).whenCompleted(cb.opByte, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_isA(Test.MyClassDisp_.ice_staticId()).whenCompleted(
+                        (bool v) =>
+                        {
+                            cb.ice_isA(v);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opByte(0xff, 0x0f).whenCompleted(
-                (byte r, byte b) =>
-                {
-                    cb.opByte(r, b);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    test(p.ice_idsAsync().Result.Length == 3);
+                }
 
-        {
-            var cb = new Callback();
-            var ret = p.opBoolAsync(true, false).Result;
-            cb.opBool(ret.returnValue, ret.p3);
-        }
+                {
+                    Ice.AsyncResult r = p.begin_ice_ids();
+                    test(p.end_ice_ids(r).Length == 3);
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opBool(true, false).whenCompleted(cb.opBool, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_ids().whenCompleted(cb.ice_ids, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opBool(true, false).whenCompleted(
-                (bool r, bool b) =>
-                {
-                    cb.opBool(r, b);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_ids().whenCompleted(
+                        (string[] ids) =>
+                        {
+                            cb.ice_ids(ids);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            var cb = new Callback();
-            var ret = p.opShortIntLongAsync(10, 11, 12).Result;
-            cb.opShortIntLong(ret.returnValue, ret.p4, ret.p5, ret.p6);
-        }
+                {
+                    test(p.ice_idAsync().Result.Equals(Test.MyDerivedClassDisp_.ice_staticId()));
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opShortIntLong(10, 11, 12).whenCompleted(cb.opShortIntLong, cb.exCB);
-            cb.check();
-        }
+                {
+                    Ice.AsyncResult r = p.begin_ice_id();
+                    test(p.end_ice_id(r).Equals(Test.MyDerivedClassDisp_.ice_staticId()));
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opShortIntLong(10, 11, 12).whenCompleted(
-                (long r, short s, int i, long l) =>
-                {
-                    cb.opShortIntLong(r, s, i, l);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_id().whenCompleted(cb.ice_id, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            var cb = new Callback();
-            var ret = p.opFloatDoubleAsync(3.14f, 1.1E10).Result;
-            cb.opFloatDouble(ret.returnValue, ret.p3, ret.p4);
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_ice_id().whenCompleted(
+                        (string id) =>
+                        {
+                            cb.ice_id(id);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opFloatDouble(3.14f, 1.1E10).whenCompleted(cb.opFloatDouble, cb.exCB);
-            cb.check();
-        }
+                {
+                    p.opVoidAsync().Wait();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opFloatDouble(3.14f, 1.1E10).whenCompleted(
-                (double r, float f, double d) =>
-                {
-                    cb.opFloatDouble(r, f, d);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Ice.AsyncResult r = p.begin_opVoid();
+                    p.end_opVoid(r);
+                }
 
-        {
-            var cb = new Callback();
-            var ret = p.opStringAsync("hello", "world").Result;
-            cb.opString(ret.returnValue, ret.p3);
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opVoid().whenCompleted(cb.opVoid, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opString("hello", "world").whenCompleted(cb.opString, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opVoid().whenCompleted(
+                        () =>
+                        {
+                            cb.opVoid();
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opString("hello", "world").whenCompleted(
-                (string r, string s) =>
-                {
-                    cb.opString(r, s);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var ret = p.opByteAsync(0xff, 0x0f).Result;
+                    test(ret.p3 == 0xf0);
+                    test(ret.returnValue == 0xff);
+                }
 
-        {
-            var cb = new Callback();
-            var ret = p.opMyEnumAsync(Test.MyEnum.enum2).Result;
-            cb.opMyEnum(ret.returnValue, ret.p2);
-        }
+                {
+                    Ice.AsyncResult r = p.begin_opByte(0xff, 0x0f);
+                    byte p3;
+                    byte ret = p.end_opByte(out p3, r);
+                    test(p3 == 0xf0);
+                    test(ret == 0xff);
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opMyEnum(Test.MyEnum.enum2).whenCompleted(cb.opMyEnum, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opByte(0xff, 0x0f).whenCompleted(cb.opByte, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opMyEnum(Test.MyEnum.enum2).whenCompleted(
-                (Test.MyEnum r, Test.MyEnum e) =>
-                {
-                    cb.opMyEnum(r, e);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opByte(0xff, 0x0f).whenCompleted(
+                        (byte r, byte b) =>
+                        {
+                            cb.opByte(r, b);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            var cb = new Callback(communicator);
-            var ret = p.opMyClassAsync(p).Result;
-            cb.opMyClass(ret.returnValue, ret.p2, ret.p3);
-        }
+                {
+                    var cb = new Callback();
+                    var ret = p.opBoolAsync(true, false).Result;
+                    cb.opBool(ret.returnValue, ret.p3);
+                }
 
-        {
-            Callback cb = new Callback(communicator);
-            p.begin_opMyClass(p).whenCompleted(cb.opMyClass, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opBool(true, false).whenCompleted(cb.opBool, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback(communicator);
-            p.begin_opMyClass(p).whenCompleted(
-                (Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2) =>
-                {
-                    cb.opMyClass(r, c1, c2);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opBool(true, false).whenCompleted(
+                        (bool r, bool b) =>
+                        {
+                            cb.opBool(r, b);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Test.Structure si1 = new Test.Structure();
-            si1.p = p;
-            si1.e = Test.MyEnum.enum3;
-            si1.s = new Test.AnotherStruct();
-            si1.s.s = "abc";
-            Test.Structure si2 = new Test.Structure();
-            si2.p = null;
-            si2.e = Test.MyEnum.enum2;
-            si2.s = new Test.AnotherStruct();
-            si2.s.s = "def";
-
-            var cb = new Callback(communicator);
-            var ret = p.opStructAsync(si1, si2).Result;
-            cb.opStruct(ret.returnValue, ret.p3);
-        }
+                {
+                    var cb = new Callback();
+                    var ret = p.opShortIntLongAsync(10, 11, 12).Result;
+                    cb.opShortIntLong(ret.returnValue, ret.p4, ret.p5, ret.p6);
+                }
 
-        {
-            Test.Structure si1 = new Test.Structure();
-            si1.p = p;
-            si1.e = Test.MyEnum.enum3;
-            si1.s = new Test.AnotherStruct();
-            si1.s.s = "abc";
-            Test.Structure si2 = new Test.Structure();
-            si2.p = null;
-            si2.e = Test.MyEnum.enum2;
-            si2.s = new Test.AnotherStruct();
-            si2.s.s = "def";
-
-            Callback cb = new Callback(communicator);
-            p.begin_opStruct(si1, si2).whenCompleted(cb.opStruct, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opShortIntLong(10, 11, 12).whenCompleted(cb.opShortIntLong, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Test.Structure si1 = new Test.Structure();
-            si1.p = p;
-            si1.e = Test.MyEnum.enum3;
-            si1.s = new Test.AnotherStruct();
-            si1.s.s = "abc";
-            Test.Structure si2 = new Test.Structure();
-            si2.p = null;
-            si2.e = Test.MyEnum.enum2;
-            si2.s = new Test.AnotherStruct();
-            si2.s.s = "def";
-
-            Callback cb = new Callback(communicator);
-            p.begin_opStruct(si1, si2).whenCompleted(
-                (Test.Structure rso, Test.Structure so) =>
-                {
-                    cb.opStruct(rso, so);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opShortIntLong(10, 11, 12).whenCompleted(
+                        (long r, short s, int i, long l) =>
+                        {
+                            cb.opShortIntLong(r, s, i, l);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
-            byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
+                {
+                    var cb = new Callback();
+                    var ret = p.opFloatDoubleAsync(3.14f, 1.1E10).Result;
+                    cb.opFloatDouble(ret.returnValue, ret.p3, ret.p4);
+                }
 
-            var cb = new Callback();
-            var ret = p.opByteSAsync(bsi1, bsi2).Result;
-            cb.opByteS(ret.returnValue, ret.p3);
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opFloatDouble(3.14f, 1.1E10).whenCompleted(cb.opFloatDouble, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
-            byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
+                {
+                    Callback cb = new Callback();
+                    p.begin_opFloatDouble(3.14f, 1.1E10).whenCompleted(
+                        (double r, float f, double d) =>
+                        {
+                            cb.opFloatDouble(r, f, d);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Callback cb = new Callback();
-            p.begin_opByteS(bsi1, bsi2).whenCompleted(cb.opByteS, cb.exCB);
-            cb.check();
-        }
+                {
+                    var cb = new Callback();
+                    var ret = p.opStringAsync("hello", "world").Result;
+                    cb.opString(ret.returnValue, ret.p3);
+                }
 
-        {
-            byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
-            byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
+                {
+                    Callback cb = new Callback();
+                    p.begin_opString("hello", "world").whenCompleted(cb.opString, cb.exCB);
+                    cb.check();
+                }
 
-            Callback cb = new Callback();
-            p.begin_opByteS(bsi1, bsi2).whenCompleted(
-                (byte[] rso, byte[] bso) =>
-                {
-                    cb.opByteS(rso, bso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opString("hello", "world").whenCompleted(
+                        (string r, string s) =>
+                        {
+                            cb.opString(r, s);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            bool[] bsi1 = new bool[] { true, true, false };
-            bool[] bsi2 = new bool[] { false };
+                {
+                    var cb = new Callback();
+                    var ret = p.opMyEnumAsync(Test.MyEnum.enum2).Result;
+                    cb.opMyEnum(ret.returnValue, ret.p2);
+                }
 
-            var cb = new Callback();
-            var ret = p.opBoolSAsync(bsi1, bsi2).Result;
-            cb.opBoolS(ret.returnValue, ret.p3);
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opMyEnum(Test.MyEnum.enum2).whenCompleted(cb.opMyEnum, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            bool[] bsi1 = new bool[] { true, true, false };
-            bool[] bsi2 = new bool[] { false };
+                {
+                    Callback cb = new Callback();
+                    p.begin_opMyEnum(Test.MyEnum.enum2).whenCompleted(
+                        (Test.MyEnum r, Test.MyEnum e) =>
+                        {
+                            cb.opMyEnum(r, e);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Callback cb = new Callback();
-            p.begin_opBoolS(bsi1, bsi2).whenCompleted(cb.opBoolS, cb.exCB);
-            cb.check();
-        }
+                {
+                    var cb = new Callback(communicator);
+                    var ret = p.opMyClassAsync(p).Result;
+                    cb.opMyClass(ret.returnValue, ret.p2, ret.p3);
+                }
 
-        {
-            bool[] bsi1 = new bool[] { true, true, false };
-            bool[] bsi2 = new bool[] { false };
+                {
+                    Callback cb = new Callback(communicator);
+                    p.begin_opMyClass(p).whenCompleted(cb.opMyClass, cb.exCB);
+                    cb.check();
+                }
 
-            Callback cb = new Callback();
-            p.begin_opBoolS(bsi1, bsi2).whenCompleted(
-                (bool[] rso, bool[] bso) =>
-                {
-                    cb.opBoolS(rso, bso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback(communicator);
+                    p.begin_opMyClass(p).whenCompleted(
+                        (Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2) =>
+                        {
+                            cb.opMyClass(r, c1, c2);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            short[] ssi = new short[] { 1, 2, 3 };
-            int[] isi = new int[] { 5, 6, 7, 8 };
-            long[] lsi = new long[] { 10, 30, 20 };
-
-            var cb = new Callback();
-            var ret = p.opShortIntLongSAsync(ssi, isi, lsi).Result;
-            cb.opShortIntLongS(ret.returnValue, ret.p4, ret.p5, ret.p6);
-        }
+                {
+                    var si1 = new Test.Structure();
+                    si1.p = p;
+                    si1.e = Test.MyEnum.enum3;
+                    si1.s = new Test.AnotherStruct();
+                    si1.s.s = "abc";
+                    var si2 = new Test.Structure();
+                    si2.p = null;
+                    si2.e = Test.MyEnum.enum2;
+                    si2.s = new Test.AnotherStruct();
+                    si2.s.s = "def";
+
+                    var cb = new Callback(communicator);
+                    var ret = p.opStructAsync(si1, si2).Result;
+                    cb.opStruct(ret.returnValue, ret.p3);
+                }
 
-        {
-            short[] ssi = new short[] { 1, 2, 3 };
-            int[] isi = new int[] { 5, 6, 7, 8 };
-            long[] lsi = new long[] { 10, 30, 20 };
-
-            Callback cb = new Callback();
-            p.begin_opShortIntLongS(ssi, isi, lsi).whenCompleted(cb.opShortIntLongS, cb.exCB);
-            cb.check();
-        }
+                {
+                    var si1 = new Test.Structure();
+                    si1.p = p;
+                    si1.e = Test.MyEnum.enum3;
+                    si1.s = new Test.AnotherStruct();
+                    si1.s.s = "abc";
+                    var si2 = new Test.Structure();
+                    si2.p = null;
+                    si2.e = Test.MyEnum.enum2;
+                    si2.s = new Test.AnotherStruct();
+                    si2.s.s = "def";
+
+                    Callback cb = new Callback(communicator);
+                    p.begin_opStruct(si1, si2).whenCompleted(cb.opStruct, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            short[] ssi = new short[] { 1, 2, 3 };
-            int[] isi = new int[] { 5, 6, 7, 8 };
-            long[] lsi = new long[] { 10, 30, 20 };
-
-            Callback cb = new Callback();
-            p.begin_opShortIntLongS(ssi, isi, lsi).whenCompleted(
-                (long[] rso, short[] sso, int[] iso, long[] lso) =>
-                {
-                    cb.opShortIntLongS(rso, sso, iso, lso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var si1 = new Test.Structure();
+                    si1.p = p;
+                    si1.e = Test.MyEnum.enum3;
+                    si1.s = new Test.AnotherStruct();
+                    si1.s.s = "abc";
+                    var si2 = new Test.Structure();
+                    si2.p = null;
+                    si2.e = Test.MyEnum.enum2;
+                    si2.s = new Test.AnotherStruct();
+                    si2.s.s = "def";
+
+                    Callback cb = new Callback(communicator);
+                    p.begin_opStruct(si1, si2).whenCompleted(
+                        (Test.Structure rso, Test.Structure so) =>
+                        {
+                            cb.opStruct(rso, so);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            float[] fsi = new float[] { 3.14f, 1.11f };
-            double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                {
+                    byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
+                    byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
 
-            var cb = new Callback();
-            var ret = p.opFloatDoubleSAsync(fsi, dsi).Result;
-            cb.opFloatDoubleS(ret.returnValue, ret.p3, ret.p4);
-        }
+                    var cb = new Callback();
+                    var ret = p.opByteSAsync(bsi1, bsi2).Result;
+                    cb.opByteS(ret.returnValue, ret.p3);
+                }
 
-        {
-            float[] fsi = new float[] { 3.14f, 1.11f };
-            double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                {
+                    byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
+                    byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
 
-            Callback cb = new Callback();
-            p.begin_opFloatDoubleS(fsi, dsi).whenCompleted(cb.opFloatDoubleS, cb.exCB);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opByteS(bsi1, bsi2).whenCompleted(cb.opByteS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            float[] fsi = new float[] { 3.14f, 1.11f };
-            double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                {
+                    byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
+                    byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
 
-            Callback cb = new Callback();
-            p.begin_opFloatDoubleS(fsi, dsi).whenCompleted(
-                (double[] rso, float[] fso, double[] dso) =>
-                {
-                    cb.opFloatDoubleS(rso, fso, dso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opByteS(bsi1, bsi2).whenCompleted(
+                        (byte[] rso, byte[] bso) =>
+                        {
+                            cb.opByteS(rso, bso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            string[] ssi1 = new string[] { "abc", "de", "fghi" };
-            string[] ssi2 = new string[] { "xyz" };
+                {
+                    bool[] bsi1 = new bool[] { true, true, false };
+                    bool[] bsi2 = new bool[] { false };
 
-            var cb = new Callback();
-            var ret = p.opStringSAsync(ssi1, ssi2).Result;
-            cb.opStringS(ret.returnValue, ret.p3);
-        }
+                    var cb = new Callback();
+                    var ret = p.opBoolSAsync(bsi1, bsi2).Result;
+                    cb.opBoolS(ret.returnValue, ret.p3);
+                }
 
-        {
-            string[] ssi1 = new string[] { "abc", "de", "fghi" };
-            string[] ssi2 = new string[] { "xyz" };
+                {
+                    bool[] bsi1 = new bool[] { true, true, false };
+                    bool[] bsi2 = new bool[] { false };
 
-            Callback cb = new Callback();
-            p.begin_opStringS(ssi1, ssi2).whenCompleted(cb.opStringS, cb.exCB);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opBoolS(bsi1, bsi2).whenCompleted(cb.opBoolS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            string[] ssi1 = new string[] { "abc", "de", "fghi" };
-            string[] ssi2 = new string[] { "xyz" };
+                {
+                    bool[] bsi1 = new bool[] { true, true, false };
+                    bool[] bsi2 = new bool[] { false };
 
-            Callback cb = new Callback();
-            p.begin_opStringS(ssi1, ssi2).whenCompleted(
-                (string[] rso, string[] sso) =>
-                {
-                    cb.opStringS(rso, sso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opBoolS(bsi1, bsi2).whenCompleted(
+                        (bool[] rso, bool[] bso) =>
+                        {
+                            cb.opBoolS(rso, bso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
-            byte[] s12 = new byte[] { 0xff };
-            byte[][] bsi1 = new byte[][] { s11, s12 };
-
-            byte[] s21 = new byte[] { 0x0e };
-            byte[] s22 = new byte[] { 0xf2, 0xf1 };
-            byte[][] bsi2 = new byte[][] { s21, s22 };
-
-            var cb = new Callback();
-            var ret = p.opByteSSAsync(bsi1, bsi2).Result;
-            cb.opByteSS(ret.returnValue, ret.p3);
-        }
+                {
+                    short[] ssi = new short[] { 1, 2, 3 };
+                    int[] isi = new int[] { 5, 6, 7, 8 };
+                    long[] lsi = new long[] { 10, 30, 20 };
+
+                    var cb = new Callback();
+                    var ret = p.opShortIntLongSAsync(ssi, isi, lsi).Result;
+                    cb.opShortIntLongS(ret.returnValue, ret.p4, ret.p5, ret.p6);
+                }
 
-        {
-            byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
-            byte[] s12 = new byte[] { 0xff };
-            byte[][] bsi1 = new byte[][] { s11, s12 };
-
-            byte[] s21 = new byte[] { 0x0e };
-            byte[] s22 = new byte[] { 0xf2, 0xf1 };
-            byte[][] bsi2 = new byte[][] { s21, s22 };
-
-            Callback cb = new Callback();
-            p.begin_opByteSS(bsi1, bsi2).whenCompleted(cb.opByteSS, cb.exCB);
-            cb.check();
-        }
+                {
+                    short[] ssi = new short[] { 1, 2, 3 };
+                    int[] isi = new int[] { 5, 6, 7, 8 };
+                    long[] lsi = new long[] { 10, 30, 20 };
+
+                    Callback cb = new Callback();
+                    p.begin_opShortIntLongS(ssi, isi, lsi).whenCompleted(cb.opShortIntLongS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
-            byte[] s12 = new byte[] { 0xff };
-            byte[][] bsi1 = new byte[][] { s11, s12 };
-
-            byte[] s21 = new byte[] { 0x0e };
-            byte[] s22 = new byte[] { 0xf2, 0xf1 };
-            byte[][] bsi2 = new byte[][] { s21, s22 };
-
-            Callback cb = new Callback();
-            p.begin_opByteSS(bsi1, bsi2).whenCompleted(
-                (byte[][] rso, byte[][] bso) =>
-                {
-                    cb.opByteSS(rso, bso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    short[] ssi = new short[] { 1, 2, 3 };
+                    int[] isi = new int[] { 5, 6, 7, 8 };
+                    long[] lsi = new long[] { 10, 30, 20 };
+
+                    Callback cb = new Callback();
+                    p.begin_opShortIntLongS(ssi, isi, lsi).whenCompleted(
+                        (long[] rso, short[] sso, int[] iso, long[] lso) =>
+                        {
+                            cb.opShortIntLongS(rso, sso, iso, lso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            bool[] s11 = new bool[] { true };
-            bool[] s12 = new bool[] { false };
-            bool[] s13 = new bool[] { true, true };
-            bool[][] bsi1 = new bool[][] { s11, s12, s13 };
-
-            bool[] s21 = new bool[] { false, false, true };
-            bool[][] bsi2 = new bool[][] { s21 };
-
-            var cb = new Callback();
-            var ret = p.opBoolSSAsync(bsi1, bsi2).Result;
-            cb.opBoolSS(ret.returnValue, ret.p3);
-        }
+                {
+                    float[] fsi = new float[] { 3.14f, 1.11f };
+                    double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
 
-        {
-            bool[] s11 = new bool[] {true};
-            bool[] s12 = new bool[] {false};
-            bool[] s13 = new bool[] {true, true};
-            bool[][] bsi1 = new bool[][] {s11, s12, s13};
-
-            bool[] s21 = new bool[] {false, false, true};
-            bool[][] bsi2 = new bool[][] {s21};
-
-            Callback cb = new Callback();
-            p.begin_opBoolSS(bsi1, bsi2).whenCompleted(cb.opBoolSS, cb.exCB);
-            cb.check();
-        }
+                    var cb = new Callback();
+                    var ret = p.opFloatDoubleSAsync(fsi, dsi).Result;
+                    cb.opFloatDoubleS(ret.returnValue, ret.p3, ret.p4);
+                }
 
-        {
-            bool[] s11 = new bool[] {true};
-            bool[] s12 = new bool[] {false};
-            bool[] s13 = new bool[] {true, true};
-            bool[][] bsi1 = new bool[][] {s11, s12, s13};
-
-            bool[] s21 = new bool[] {false, false, true};
-            bool[][] bsi2 = new bool[][] {s21};
-
-            Callback cb = new Callback();
-            p.begin_opBoolSS(bsi1, bsi2).whenCompleted(
-                (bool[][] rso, bool[][] bso) =>
-                {
-                    cb.opBoolSS(rso, bso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    float[] fsi = new float[] { 3.14f, 1.11f };
+                    double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
 
-        {
-            short[] s11 = new short[] { 1, 2, 5 };
-            short[] s12 = new short[] { 13 };
-            short[] s13 = new short[] { };
-            short[][] ssi = new short[][] { s11, s12, s13 };
-
-            int[] i11 = new int[] { 24, 98 };
-            int[] i12 = new int[] { 42 };
-            int[][] isi = new int[][] { i11, i12 };
-
-            long[] l11 = new long[] { 496, 1729 };
-            long[][] lsi = new long[][] { l11 };
-
-            var cb = new Callback();
-            var ret = p.opShortIntLongSSAsync(ssi, isi, lsi).Result;
-            cb.opShortIntLongSS(ret.returnValue, ret.p4, ret.p5, ret.p6);
-        }
+                    Callback cb = new Callback();
+                    p.begin_opFloatDoubleS(fsi, dsi).whenCompleted(cb.opFloatDoubleS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            short[] s11 = new short[] {1, 2, 5};
-            short[] s12 = new short[] {13};
-            short[] s13 = new short[] {};
-            short[][] ssi = new short[][] {s11, s12, s13};
-
-            int[] i11 = new int[] {24, 98};
-            int[] i12 = new int[] {42};
-            int[][] isi = new int[][] {i11, i12};
-
-            long[] l11 = new long[] {496, 1729};
-            long[][] lsi = new long[][] {l11};
-
-            Callback cb = new Callback();
-            p.begin_opShortIntLongSS(ssi, isi, lsi).whenCompleted(cb.opShortIntLongSS, cb.exCB);
-            cb.check();
-        }
+                {
+                    float[] fsi = new float[] { 3.14f, 1.11f };
+                    double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
 
-        {
-            short[] s11 = new short[] {1, 2, 5};
-            short[] s12 = new short[] {13};
-            short[] s13 = new short[] {};
-            short[][] ssi = new short[][] {s11, s12, s13};
-
-            int[] i11 = new int[] {24, 98};
-            int[] i12 = new int[] {42};
-            int[][] isi = new int[][] {i11, i12};
-
-            long[] l11 = new long[] {496, 1729};
-            long[][] lsi = new long[][] {l11};
-
-            Callback cb = new Callback();
-            p.begin_opShortIntLongSS(ssi, isi, lsi).whenCompleted(
-                (long[][] rso, short[][] sso, int[][] iso, long[][] lso) =>
-                {
-                    cb.opShortIntLongSS(rso, sso, iso, lso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opFloatDoubleS(fsi, dsi).whenCompleted(
+                        (double[] rso, float[] fso, double[] dso) =>
+                        {
+                            cb.opFloatDoubleS(rso, fso, dso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            float[] f11 = new float[] { 3.14f };
-            float[] f12 = new float[] { 1.11f };
-            float[] f13 = new float[] { };
-            float[][] fsi = new float[][] { f11, f12, f13 };
-
-            double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
-            double[][] dsi = new double[][] { d11 };
-
-            var cb = new Callback();
-            var ret = p.opFloatDoubleSSAsync(fsi, dsi).Result;
-            cb.opFloatDoubleSS(ret.returnValue, ret.p3, ret.p4);
-        }
+                {
+                    string[] ssi1 = new string[] { "abc", "de", "fghi" };
+                    string[] ssi2 = new string[] { "xyz" };
 
-        {
-            float[] f11 = new float[] { 3.14f };
-            float[] f12 = new float[] { 1.11f };
-            float[] f13 = new float[] { };
-            float[][] fsi = new float[][] { f11, f12, f13 };
-
-            double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
-            double[][] dsi = new double[][] { d11 };
-
-            Callback cb = new Callback();
-            p.begin_opFloatDoubleSS(fsi, dsi).whenCompleted(cb.opFloatDoubleSS, cb.exCB);
-            cb.check();
-        }
+                    var cb = new Callback();
+                    var ret = p.opStringSAsync(ssi1, ssi2).Result;
+                    cb.opStringS(ret.returnValue, ret.p3);
+                }
 
-        {
-            float[] f11 = new float[] { 3.14f };
-            float[] f12 = new float[] { 1.11f };
-            float[] f13 = new float[] { };
-            float[][] fsi = new float[][] { f11, f12, f13 };
-
-            double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
-            double[][] dsi = new double[][] { d11 };
-
-            Callback cb = new Callback();
-            p.begin_opFloatDoubleSS(fsi, dsi).whenCompleted(
-                (double[][] rso, float[][] fso, double[][] dso) =>
-                {
-                    cb.opFloatDoubleSS(rso, fso, dso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    string[] ssi1 = new string[] { "abc", "de", "fghi" };
+                    string[] ssi2 = new string[] { "xyz" };
 
-        {
-            string[] s11 = new string[] { "abc" };
-            string[] s12 = new string[] { "de", "fghi" };
-            string[][] ssi1 = new string[][] { s11, s12 };
-
-            string[] s21 = new string[] { };
-            string[] s22 = new string[] { };
-            string[] s23 = new string[] { "xyz" };
-            string[][] ssi2 = new string[][] { s21, s22, s23 };
-
-            var cb = new Callback();
-            var ret = p.opStringSSAsync(ssi1, ssi2).Result;
-            cb.opStringSS(ret.returnValue, ret.p3);
-        }
+                    Callback cb = new Callback();
+                    p.begin_opStringS(ssi1, ssi2).whenCompleted(cb.opStringS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            string[] s11 = new string[] { "abc" };
-            string[] s12 = new string[] { "de", "fghi" };
-            string[][] ssi1 = new string[][] { s11, s12 };
-
-            string[] s21 = new string[] {};
-            string[] s22 = new string[] {};
-            string[] s23 = new string[] { "xyz" };
-            string[][] ssi2 = new string[][] { s21, s22, s23 };
-
-            Callback cb = new Callback();
-            p.begin_opStringSS(ssi1, ssi2).whenCompleted(cb.opStringSS, cb.exCB);
-            cb.check();
-        }
+                {
+                    string[] ssi1 = new string[] { "abc", "de", "fghi" };
+                    string[] ssi2 = new string[] { "xyz" };
 
-        {
-            string[] s11 = new string[] { "abc" };
-            string[] s12 = new string[] { "de", "fghi" };
-            string[][] ssi1 = new string[][] { s11, s12 };
-
-            string[] s21 = new string[] {};
-            string[] s22 = new string[] {};
-            string[] s23 = new string[] { "xyz" };
-            string[][] ssi2 = new string[][] { s21, s22, s23 };
-
-            Callback cb = new Callback();
-            p.begin_opStringSS(ssi1, ssi2).whenCompleted(
-                (string[][] rso, string[][] sso) =>
-                {
-                    cb.opStringSS(rso, sso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opStringS(ssi1, ssi2).whenCompleted(
+                        (string[] rso, string[] sso) =>
+                        {
+                            cb.opStringS(rso, sso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            string[] s111 = new string[] { "abc", "de" };
-            string[] s112 = new string[] { "xyz" };
-            string[][] ss11 = new string[][] { s111, s112 };
-            string[] s121 = new string[] { "hello" };
-            string[][] ss12 = new string[][] { s121 };
-            string[][][] sssi1 = new string[][][] { ss11, ss12 };
-
-            string[] s211 = new string[] { "", "" };
-            string[] s212 = new string[] { "abcd" };
-            string[][] ss21 = new string[][] { s211, s212 };
-            string[] s221 = new string[] { "" };
-            string[][] ss22 = new string[][] { s221 };
-            string[][] ss23 = new string[][] { };
-            string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
-
-            var cb = new Callback();
-            var ret = p.opStringSSSAsync(sssi1, sssi2).Result;
-            cb.opStringSSS(ret.returnValue, ret.p3);
-        }
+                {
+                    byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
+                    byte[] s12 = new byte[] { 0xff };
+                    byte[][] bsi1 = new byte[][] { s11, s12 };
+
+                    byte[] s21 = new byte[] { 0x0e };
+                    byte[] s22 = new byte[] { 0xf2, 0xf1 };
+                    byte[][] bsi2 = new byte[][] { s21, s22 };
+
+                    var cb = new Callback();
+                    var ret = p.opByteSSAsync(bsi1, bsi2).Result;
+                    cb.opByteSS(ret.returnValue, ret.p3);
+                }
 
-        {
-            string[] s111 = new string[] { "abc", "de"};
-            string[] s112 = new string[] { "xyz" };
-            string[][] ss11 = new string[][] { s111, s112 };
-            string[] s121 = new string[] { "hello"};
-            string[][] ss12 = new string[][] { s121 };
-            string[][][] sssi1 = new string[][][] { ss11, ss12 };
-
-            string[] s211 = new string[] { "", ""};
-            string[] s212 = new string[] { "abcd" };
-            string[][] ss21 = new string[][] { s211, s212 };
-            string[] s221 = new string[] { ""};
-            string[][] ss22 = new string[][] { s221 };
-            string[][] ss23 = new string[][] {};
-            string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
-
-            Callback cb = new Callback();
-            p.begin_opStringSSS(sssi1, sssi2).whenCompleted(cb.opStringSSS, cb.exCB);
-            cb.check();
-        }
+                {
+                    byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
+                    byte[] s12 = new byte[] { 0xff };
+                    byte[][] bsi1 = new byte[][] { s11, s12 };
+
+                    byte[] s21 = new byte[] { 0x0e };
+                    byte[] s22 = new byte[] { 0xf2, 0xf1 };
+                    byte[][] bsi2 = new byte[][] { s21, s22 };
+
+                    Callback cb = new Callback();
+                    p.begin_opByteSS(bsi1, bsi2).whenCompleted(cb.opByteSS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            string[] s111 = new string[] { "abc", "de"};
-            string[] s112 = new string[] { "xyz" };
-            string[][] ss11 = new string[][] { s111, s112 };
-            string[] s121 = new string[] { "hello"};
-            string[][] ss12 = new string[][] { s121 };
-            string[][][] sssi1 = new string[][][] { ss11, ss12 };
-
-            string[] s211 = new string[] { "", ""};
-            string[] s212 = new string[] { "abcd" };
-            string[][] ss21 = new string[][] { s211, s212 };
-            string[] s221 = new string[] { ""};
-            string[][] ss22 = new string[][] { s221 };
-            string[][] ss23 = new string[][] {};
-            string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
-
-            Callback cb = new Callback();
-            p.begin_opStringSSS(sssi1, sssi2).whenCompleted(
-                (string[][][] rsso, string[][][] ssso) =>
-                {
-                    cb.opStringSSS(rsso, ssso);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
+                    byte[] s12 = new byte[] { 0xff };
+                    byte[][] bsi1 = new byte[][] { s11, s12 };
+
+                    byte[] s21 = new byte[] { 0x0e };
+                    byte[] s22 = new byte[] { 0xf2, 0xf1 };
+                    byte[][] bsi2 = new byte[][] { s21, s22 };
+
+                    Callback cb = new Callback();
+                    p.begin_opByteSS(bsi1, bsi2).whenCompleted(
+                        (byte[][] rso, byte[][] bso) =>
+                        {
+                            cb.opByteSS(rso, bso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
-            di2[10] = true;
-            di2[11] = false;
-            di2[101] = true;
-
-            var cb = new Callback();
-            var ret = p.opByteBoolDAsync(di1, di2).Result;
-            cb.opByteBoolD(ret.returnValue, ret.p3);
-        }
+                {
+                    bool[] s11 = new bool[] { true };
+                    bool[] s12 = new bool[] { false };
+                    bool[] s13 = new bool[] { true, true };
+                    bool[][] bsi1 = new bool[][] { s11, s12, s13 };
+
+                    bool[] s21 = new bool[] { false, false, true };
+                    bool[][] bsi2 = new bool[][] { s21 };
+
+                    var cb = new Callback();
+                    var ret = p.opBoolSSAsync(bsi1, bsi2).Result;
+                    cb.opBoolSS(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
-            di2[10] = true;
-            di2[11] = false;
-            di2[101] = true;
-
-            Callback cb = new Callback();
-            p.begin_opByteBoolD(di1, di2).whenCompleted(cb.opByteBoolD, cb.exCB);
-            cb.check();
-        }
+                {
+                    bool[] s11 = new bool[] { true };
+                    bool[] s12 = new bool[] { false };
+                    bool[] s13 = new bool[] { true, true };
+                    bool[][] bsi1 = new bool[][] { s11, s12, s13 };
+
+                    bool[] s21 = new bool[] { false, false, true };
+                    bool[][] bsi2 = new bool[][] { s21 };
+
+                    Callback cb = new Callback();
+                    p.begin_opBoolSS(bsi1, bsi2).whenCompleted(cb.opBoolSS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
-            di2[10] = true;
-            di2[11] = false;
-            di2[101] = true;
-
-            Callback cb = new Callback();
-            p.begin_opByteBoolD(di1, di2).whenCompleted(
-                (Dictionary<byte, bool> ro, Dictionary<byte, bool> _do) =>
-                {
-                    cb.opByteBoolD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    bool[] s11 = new bool[] { true };
+                    bool[] s12 = new bool[] { false };
+                    bool[] s13 = new bool[] { true, true };
+                    bool[][] bsi1 = new bool[][] { s11, s12, s13 };
+
+                    bool[] s21 = new bool[] { false, false, true };
+                    bool[][] bsi2 = new bool[][] { s21 };
+
+                    Callback cb = new Callback();
+                    p.begin_opBoolSS(bsi1, bsi2).whenCompleted(
+                        (bool[][] rso, bool[][] bso) =>
+                        {
+                            cb.opBoolSS(rso, bso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            Dictionary<short, int> di2 = new Dictionary<short, int>();
-            di2[110] = -1;
-            di2[111] = -100;
-            di2[1101] = 0;
-
-            var cb = new Callback();
-            var ret = p.opShortIntDAsync(di1, di2).Result;
-            cb.opShortIntD(ret.returnValue, ret.p3);
-        }
+                {
+                    short[] s11 = new short[] { 1, 2, 5 };
+                    short[] s12 = new short[] { 13 };
+                    short[] s13 = new short[] { };
+                    short[][] ssi = new short[][] { s11, s12, s13 };
+
+                    int[] i11 = new int[] { 24, 98 };
+                    int[] i12 = new int[] { 42 };
+                    int[][] isi = new int[][] { i11, i12 };
+
+                    long[] l11 = new long[] { 496, 1729 };
+                    long[][] lsi = new long[][] { l11 };
+
+                    var cb = new Callback();
+                    var ret = p.opShortIntLongSSAsync(ssi, isi, lsi).Result;
+                    cb.opShortIntLongSS(ret.returnValue, ret.p4, ret.p5, ret.p6);
+                }
 
-        {
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            Dictionary<short, int> di2 = new Dictionary<short, int>();
-            di2[110] = -1;
-            di2[111] = -100;
-            di2[1101] = 0;
-
-            Callback cb = new Callback();
-            p.begin_opShortIntD(di1, di2).whenCompleted(cb.opShortIntD, cb.exCB);
-            cb.check();
-        }
+                {
+                    short[] s11 = new short[] { 1, 2, 5 };
+                    short[] s12 = new short[] { 13 };
+                    short[] s13 = new short[] { };
+                    short[][] ssi = new short[][] { s11, s12, s13 };
+
+                    int[] i11 = new int[] { 24, 98 };
+                    int[] i12 = new int[] { 42 };
+                    int[][] isi = new int[][] { i11, i12 };
+
+                    long[] l11 = new long[] { 496, 1729 };
+                    long[][] lsi = new long[][] { l11 };
+
+                    Callback cb = new Callback();
+                    p.begin_opShortIntLongSS(ssi, isi, lsi).whenCompleted(cb.opShortIntLongSS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            Dictionary<short, int> di2 = new Dictionary<short, int>();
-            di2[110] = -1;
-            di2[111] = -100;
-            di2[1101] = 0;
-
-            Callback cb = new Callback();
-            p.begin_opShortIntD(di1, di2).whenCompleted(
-                (Dictionary<short, int> ro, Dictionary<short, int> _do) =>
-                {
-                    cb.opShortIntD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    short[] s11 = new short[] { 1, 2, 5 };
+                    short[] s12 = new short[] { 13 };
+                    short[] s13 = new short[] { };
+                    short[][] ssi = new short[][] { s11, s12, s13 };
+
+                    int[] i11 = new int[] { 24, 98 };
+                    int[] i12 = new int[] { 42 };
+                    int[][] isi = new int[][] { i11, i12 };
+
+                    long[] l11 = new long[] { 496, 1729 };
+                    long[][] lsi = new long[][] { l11 };
+
+                    Callback cb = new Callback();
+                    p.begin_opShortIntLongSS(ssi, isi, lsi).whenCompleted(
+                        (long[][] rso, short[][] sso, int[][] iso, long[][] lso) =>
+                        {
+                            cb.opShortIntLongSS(rso, sso, iso, lso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            Dictionary<long, float> di2 = new Dictionary<long, float>();
-            di2[999999110L] = -1.1f;
-            di2[999999120L] = -100.4f;
-            di2[999999130L] = 0.5f;
-
-            var cb = new Callback();
-            var ret = p.opLongFloatDAsync(di1, di2).Result;
-            cb.opLongFloatD(ret.returnValue, ret.p3);
-        }
+                {
+                    float[] f11 = new float[] { 3.14f };
+                    float[] f12 = new float[] { 1.11f };
+                    float[] f13 = new float[] { };
+                    float[][] fsi = new float[][] { f11, f12, f13 };
+
+                    double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                    double[][] dsi = new double[][] { d11 };
+
+                    var cb = new Callback();
+                    var ret = p.opFloatDoubleSSAsync(fsi, dsi).Result;
+                    cb.opFloatDoubleSS(ret.returnValue, ret.p3, ret.p4);
+                }
 
-        {
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            Dictionary<long, float> di2 = new Dictionary<long, float>();
-            di2[999999110L] = -1.1f;
-            di2[999999120L] = -100.4f;
-            di2[999999130L] = 0.5f;
-
-            Callback cb = new Callback();
-            p.begin_opLongFloatD(di1, di2).whenCompleted(cb.opLongFloatD, cb.exCB);
-            cb.check();
-        }
+                {
+                    float[] f11 = new float[] { 3.14f };
+                    float[] f12 = new float[] { 1.11f };
+                    float[] f13 = new float[] { };
+                    float[][] fsi = new float[][] { f11, f12, f13 };
+
+                    double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                    double[][] dsi = new double[][] { d11 };
+
+                    Callback cb = new Callback();
+                    p.begin_opFloatDoubleSS(fsi, dsi).whenCompleted(cb.opFloatDoubleSS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            Dictionary<long, float> di2 = new Dictionary<long, float>();
-            di2[999999110L] = -1.1f;
-            di2[999999120L] = -100.4f;
-            di2[999999130L] = 0.5f;
-
-            Callback cb = new Callback();
-            p.begin_opLongFloatD(di1, di2).whenCompleted(
-                (Dictionary<long, float> ro, Dictionary<long, float> _do) =>
-                {
-                    cb.opLongFloatD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    float[] f11 = new float[] { 3.14f };
+                    float[] f12 = new float[] { 1.11f };
+                    float[] f13 = new float[] { };
+                    float[][] fsi = new float[][] { f11, f12, f13 };
+
+                    double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                    double[][] dsi = new double[][] { d11 };
+
+                    Callback cb = new Callback();
+                    p.begin_opFloatDoubleSS(fsi, dsi).whenCompleted(
+                        (double[][] rso, float[][] fso, double[][] dso) =>
+                        {
+                            cb.opFloatDoubleSS(rso, fso, dso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            Dictionary<string, string> di2 = new Dictionary<string, string>();
-            di2["foo"] = "abc -1.1";
-            di2["FOO"] = "abc -100.4";
-            di2["BAR"] = "abc 0.5";
-
-            var cb = new Callback();
-            var ret = p.opStringStringDAsync(di1, di2).Result;
-            cb.opStringStringD(ret.returnValue, ret.p3);
-        }
+                {
+                    string[] s11 = new string[] { "abc" };
+                    string[] s12 = new string[] { "de", "fghi" };
+                    string[][] ssi1 = new string[][] { s11, s12 };
+
+                    string[] s21 = new string[] { };
+                    string[] s22 = new string[] { };
+                    string[] s23 = new string[] { "xyz" };
+                    string[][] ssi2 = new string[][] { s21, s22, s23 };
+
+                    var cb = new Callback();
+                    var ret = p.opStringSSAsync(ssi1, ssi2).Result;
+                    cb.opStringSS(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            Dictionary<string, string> di2 = new Dictionary<string, string>();
-            di2["foo"] = "abc -1.1";
-            di2["FOO"] = "abc -100.4";
-            di2["BAR"] = "abc 0.5";
-
-            Callback cb = new Callback();
-            p.begin_opStringStringD(di1, di2).whenCompleted(cb.opStringStringD, cb.exCB);
-            cb.check();
-        }
+                {
+                    string[] s11 = new string[] { "abc" };
+                    string[] s12 = new string[] { "de", "fghi" };
+                    string[][] ssi1 = new string[][] { s11, s12 };
+
+                    string[] s21 = new string[] { };
+                    string[] s22 = new string[] { };
+                    string[] s23 = new string[] { "xyz" };
+                    string[][] ssi2 = new string[][] { s21, s22, s23 };
+
+                    Callback cb = new Callback();
+                    p.begin_opStringSS(ssi1, ssi2).whenCompleted(cb.opStringSS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            Dictionary<string, string> di2 = new Dictionary<string, string>();
-            di2["foo"] = "abc -1.1";
-            di2["FOO"] = "abc -100.4";
-            di2["BAR"] = "abc 0.5";
-
-            Callback cb = new Callback();
-            p.begin_opStringStringD(di1, di2).whenCompleted(
-                (Dictionary<string, string> ro, Dictionary<string, string> _do) =>
-                {
-                    cb.opStringStringD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    string[] s11 = new string[] { "abc" };
+                    string[] s12 = new string[] { "de", "fghi" };
+                    string[][] ssi1 = new string[][] { s11, s12 };
+
+                    string[] s21 = new string[] { };
+                    string[] s22 = new string[] { };
+                    string[] s23 = new string[] { "xyz" };
+                    string[][] ssi2 = new string[][] { s21, s22, s23 };
+
+                    Callback cb = new Callback();
+                    p.begin_opStringSS(ssi1, ssi2).whenCompleted(
+                        (string[][] rso, string[][] sso) =>
+                        {
+                            cb.opStringSS(rso, sso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di2 = new Dictionary<string, Test.MyEnum>();
-            di2["abc"] = Test.MyEnum.enum1;
-            di2["qwerty"] = Test.MyEnum.enum3;
-            di2["Hello!!"] = Test.MyEnum.enum2;
-
-            var cb = new Callback();
-            var ret = p.opStringMyEnumDAsync(di1, di2).Result;
-            cb.opStringMyEnumD(ret.returnValue, ret.p3);
-        }
+                {
+                    string[] s111 = new string[] { "abc", "de" };
+                    string[] s112 = new string[] { "xyz" };
+                    string[][] ss11 = new string[][] { s111, s112 };
+                    string[] s121 = new string[] { "hello" };
+                    string[][] ss12 = new string[][] { s121 };
+                    string[][][] sssi1 = new string[][][] { ss11, ss12 };
+
+                    string[] s211 = new string[] { "", "" };
+                    string[] s212 = new string[] { "abcd" };
+                    string[][] ss21 = new string[][] { s211, s212 };
+                    string[] s221 = new string[] { "" };
+                    string[][] ss22 = new string[][] { s221 };
+                    string[][] ss23 = new string[][] { };
+                    string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
+
+                    var cb = new Callback();
+                    var ret = p.opStringSSSAsync(sssi1, sssi2).Result;
+                    cb.opStringSSS(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di2 = new Dictionary<string, Test.MyEnum>();
-            di2["abc"] = Test.MyEnum.enum1;
-            di2["qwerty"] = Test.MyEnum.enum3;
-            di2["Hello!!"] = Test.MyEnum.enum2;
-
-            Callback cb = new Callback();
-            p.begin_opStringMyEnumD(di1, di2).whenCompleted(cb.opStringMyEnumD, cb.exCB);
-            cb.check();
-        }
+                {
+                    string[] s111 = new string[] { "abc", "de" };
+                    string[] s112 = new string[] { "xyz" };
+                    string[][] ss11 = new string[][] { s111, s112 };
+                    string[] s121 = new string[] { "hello" };
+                    string[][] ss12 = new string[][] { s121 };
+                    string[][][] sssi1 = new string[][][] { ss11, ss12 };
+
+                    string[] s211 = new string[] { "", "" };
+                    string[] s212 = new string[] { "abcd" };
+                    string[][] ss21 = new string[][] { s211, s212 };
+                    string[] s221 = new string[] { "" };
+                    string[][] ss22 = new string[][] { s221 };
+                    string[][] ss23 = new string[][] { };
+                    string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
+
+                    Callback cb = new Callback();
+                    p.begin_opStringSSS(sssi1, sssi2).whenCompleted(cb.opStringSSS, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di2 = new Dictionary<string, Test.MyEnum>();
-            di2["abc"] = Test.MyEnum.enum1;
-            di2["qwerty"] = Test.MyEnum.enum3;
-            di2["Hello!!"] = Test.MyEnum.enum2;
-
-            Callback cb = new Callback();
-            p.begin_opStringMyEnumD(di1, di2).whenCompleted(
-                (Dictionary<string, Test.MyEnum> ro, Dictionary<string, Test.MyEnum> _do) =>
-                {
-                    cb.opStringMyEnumD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    string[] s111 = new string[] { "abc", "de" };
+                    string[] s112 = new string[] { "xyz" };
+                    string[][] ss11 = new string[][] { s111, s112 };
+                    string[] s121 = new string[] { "hello" };
+                    string[][] ss12 = new string[][] { s121 };
+                    string[][][] sssi1 = new string[][][] { ss11, ss12 };
+
+                    string[] s211 = new string[] { "", "" };
+                    string[] s212 = new string[] { "abcd" };
+                    string[][] ss21 = new string[][] { s211, s212 };
+                    string[] s221 = new string[] { "" };
+                    string[][] ss22 = new string[][] { s221 };
+                    string[][] ss23 = new string[][] { };
+                    string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
+
+                    Callback cb = new Callback();
+                    p.begin_opStringSSS(sssi1, sssi2).whenCompleted(
+                        (string[][][] rsso, string[][][] ssso) =>
+                        {
+                            cb.opStringSSS(rsso, ssso);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            Dictionary<Test.MyEnum, string> di2 = new Dictionary<Test.MyEnum, string>();
-            di2[Test.MyEnum.enum2] = "Hello!!";
-            di2[Test.MyEnum.enum3] = "qwerty";
-
-            var cb = new Callback();
-            var ret = p.opMyEnumStringDAsync(di1, di2).Result;
-            cb.opMyEnumStringD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
+                    di2[10] = true;
+                    di2[11] = false;
+                    di2[101] = true;
+
+                    var cb = new Callback();
+                    var ret = p.opByteBoolDAsync(di1, di2).Result;
+                    cb.opByteBoolD(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            Dictionary<Test.MyEnum, string> di2 = new Dictionary<Test.MyEnum, string>();
-            di2[Test.MyEnum.enum2] = "Hello!!";
-            di2[Test.MyEnum.enum3] = "qwerty";
-
-            Callback cb = new Callback();
-            p.begin_opMyEnumStringD(di1, di2).whenCompleted(cb.opMyEnumStringD, cb.exCB);
-            cb.check();
-        }
+                {
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
+                    di2[10] = true;
+                    di2[11] = false;
+                    di2[101] = true;
+
+                    Callback cb = new Callback();
+                    p.begin_opByteBoolD(di1, di2).whenCompleted(cb.opByteBoolD, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            Dictionary<Test.MyEnum, string> di2 = new Dictionary<Test.MyEnum, string>();
-            di2[Test.MyEnum.enum2] = "Hello!!";
-            di2[Test.MyEnum.enum3] = "qwerty";
-
-            Callback cb = new Callback();
-            p.begin_opMyEnumStringD(di1, di2).whenCompleted(
-                (Dictionary<Test.MyEnum, string> ro, Dictionary<Test.MyEnum, string> _do) =>
-                {
-                    cb.opMyEnumStringD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
+                    di2[10] = true;
+                    di2[11] = false;
+                    di2[101] = true;
+
+                    Callback cb = new Callback();
+                    p.begin_opByteBoolD(di1, di2).whenCompleted(
+                        (Dictionary<byte, bool> ro, Dictionary<byte, bool> _do) =>
+                        {
+                            cb.opByteBoolD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            Dictionary<Test.MyStruct, Test.MyEnum> di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di2[s11] = Test.MyEnum.enum1;
-            di2[s22] = Test.MyEnum.enum3;
-            di2[s23] = Test.MyEnum.enum2;
-
-            var cb = new Callback();
-            var ret = p.opMyStructMyEnumDAsync(di1, di2).Result;
-            cb.opMyStructMyEnumD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    Dictionary<short, int> di2 = new Dictionary<short, int>();
+                    di2[110] = -1;
+                    di2[111] = -100;
+                    di2[1101] = 0;
+
+                    var cb = new Callback();
+                    var ret = p.opShortIntDAsync(di1, di2).Result;
+                    cb.opShortIntD(ret.returnValue, ret.p3);
+                }
 
-        {
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            Dictionary<Test.MyStruct, Test.MyEnum> di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di2[s11] = Test.MyEnum.enum1;
-            di2[s22] = Test.MyEnum.enum3;
-            di2[s23] = Test.MyEnum.enum2;
-
-            Callback cb = new Callback();
-            p.begin_opMyStructMyEnumD(di1, di2).whenCompleted(cb.opMyStructMyEnumD, cb.exCB);
-            cb.check();
-        }
+                {
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    Dictionary<short, int> di2 = new Dictionary<short, int>();
+                    di2[110] = -1;
+                    di2[111] = -100;
+                    di2[1101] = 0;
+
+                    Callback cb = new Callback();
+                    p.begin_opShortIntD(di1, di2).whenCompleted(cb.opShortIntD, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            Dictionary<Test.MyStruct, Test.MyEnum> di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di2[s11] = Test.MyEnum.enum1;
-            di2[s22] = Test.MyEnum.enum3;
-            di2[s23] = Test.MyEnum.enum2;
-
-            Callback cb = new Callback();
-            p.begin_opMyStructMyEnumD(di1, di2).whenCompleted(
-                (Dictionary<Test.MyStruct, Test.MyEnum> ro,
-                 Dictionary<Test.MyStruct, Test.MyEnum> _do) =>
-                {
-                    cb.opMyStructMyEnumD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    Dictionary<short, int> di2 = new Dictionary<short, int>();
+                    di2[110] = -1;
+                    di2[111] = -100;
+                    di2[1101] = 0;
+
+                    Callback cb = new Callback();
+                    p.begin_opShortIntD(di1, di2).whenCompleted(
+                        (Dictionary<short, int> ro, Dictionary<short, int> _do) =>
+                        {
+                            cb.opShortIntD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<byte, bool>[] dsi1 = new Dictionary<byte, bool>[2];
-            Dictionary<byte, bool>[] dsi2 = new Dictionary<byte, bool>[1];
+                {
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    Dictionary<long, float> di2 = new Dictionary<long, float>();
+                    di2[999999110L] = -1.1f;
+                    di2[999999120L] = -100.4f;
+                    di2[999999130L] = 0.5f;
+
+                    var cb = new Callback();
+                    var ret = p.opLongFloatDAsync(di1, di2).Result;
+                    cb.opLongFloatD(ret.returnValue, ret.p3);
+                }
 
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
-            di2[10] = true;
-            di2[11] = false;
-            di2[101] = true;
-            Dictionary<byte, bool> di3 = new Dictionary<byte, bool>();
-            di3[100] = false;
-            di3[101] = false;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            var cb = new Callback();
-            var ret = p.opByteBoolDSAsync(dsi1, dsi2).Result;
-            cb.opByteBoolDS(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    Dictionary<long, float> di2 = new Dictionary<long, float>();
+                    di2[999999110L] = -1.1f;
+                    di2[999999120L] = -100.4f;
+                    di2[999999130L] = 0.5f;
+
+                    Callback cb = new Callback();
+                    p.begin_opLongFloatD(di1, di2).whenCompleted(cb.opLongFloatD, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<byte, bool>[] dsi1 = new Dictionary<byte, bool>[2];
-            Dictionary<byte, bool>[] dsi2 = new Dictionary<byte, bool>[1];
+                {
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    Dictionary<long, float> di2 = new Dictionary<long, float>();
+                    di2[999999110L] = -1.1f;
+                    di2[999999120L] = -100.4f;
+                    di2[999999130L] = 0.5f;
+
+                    Callback cb = new Callback();
+                    p.begin_opLongFloatD(di1, di2).whenCompleted(
+                        (Dictionary<long, float> ro, Dictionary<long, float> _do) =>
+                        {
+                            cb.opLongFloatD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
-            di2[10] = true;
-            di2[11] = false;
-            di2[101] = true;
-            Dictionary<byte, bool> di3 = new Dictionary<byte, bool>();
-            di3[100] = false;
-            di3[101] = false;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Callback cb = new Callback();
-            p.begin_opByteBoolDS(dsi1, dsi2).whenCompleted(
-                (Dictionary<byte, bool>[] ro,
-                 Dictionary<byte, bool>[] _do) =>
-                {
-                    cb.opByteBoolDS(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    Dictionary<string, string> di2 = new Dictionary<string, string>();
+                    di2["foo"] = "abc -1.1";
+                    di2["FOO"] = "abc -100.4";
+                    di2["BAR"] = "abc 0.5";
+
+                    var cb = new Callback();
+                    var ret = p.opStringStringDAsync(di1, di2).Result;
+                    cb.opStringStringD(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<short, int>[] dsi1 = new Dictionary<short, int>[2];
-            Dictionary<short, int>[] dsi2 = new Dictionary<short, int>[1];
+                {
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    Dictionary<string, string> di2 = new Dictionary<string, string>();
+                    di2["foo"] = "abc -1.1";
+                    di2["FOO"] = "abc -100.4";
+                    di2["BAR"] = "abc 0.5";
+
+                    Callback cb = new Callback();
+                    p.begin_opStringStringD(di1, di2).whenCompleted(cb.opStringStringD, cb.exCB);
+                    cb.check();
+                }
 
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            Dictionary<short, int> di2 = new Dictionary<short, int>();
-            di2[110] = -1;
-            di2[111] = -100;
-            di2[1101] = 0;
-            Dictionary<short, int> di3 = new Dictionary<short, int>();
-            di3[100] = -1001;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            var cb = new Callback();
-            var ret = p.opShortIntDSAsync(dsi1, dsi2).Result;
-            cb.opShortIntDS(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    Dictionary<string, string> di2 = new Dictionary<string, string>();
+                    di2["foo"] = "abc -1.1";
+                    di2["FOO"] = "abc -100.4";
+                    di2["BAR"] = "abc 0.5";
+
+                    Callback cb = new Callback();
+                    p.begin_opStringStringD(di1, di2).whenCompleted(
+                        (Dictionary<string, string> ro, Dictionary<string, string> _do) =>
+                        {
+                            cb.opStringStringD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<short, int>[] dsi1 = new Dictionary<short, int>[2];
-            Dictionary<short, int>[] dsi2 = new Dictionary<short, int>[1];
+                {
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    var di2 = new Dictionary<string, Test.MyEnum>();
+                    di2["abc"] = Test.MyEnum.enum1;
+                    di2["qwerty"] = Test.MyEnum.enum3;
+                    di2["Hello!!"] = Test.MyEnum.enum2;
+
+                    var cb = new Callback();
+                    var ret = p.opStringMyEnumDAsync(di1, di2).Result;
+                    cb.opStringMyEnumD(ret.returnValue, ret.p3);
+                }
 
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            Dictionary<short, int> di2 = new Dictionary<short, int>();
-            di2[110] = -1;
-            di2[111] = -100;
-            di2[1101] = 0;
-            Dictionary<short, int> di3 = new Dictionary<short, int>();
-            di3[100] = -1001;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Callback cb = new Callback();
-            p.begin_opShortIntDS(dsi1, dsi2).whenCompleted(
-                (Dictionary<short, int>[] ro,
-                 Dictionary<short, int>[] _do) =>
-                {
-                    cb.opShortIntDS(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    var di2 = new Dictionary<string, Test.MyEnum>();
+                    di2["abc"] = Test.MyEnum.enum1;
+                    di2["qwerty"] = Test.MyEnum.enum3;
+                    di2["Hello!!"] = Test.MyEnum.enum2;
+
+                    Callback cb = new Callback();
+                    p.begin_opStringMyEnumD(di1, di2).whenCompleted(cb.opStringMyEnumD, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<long, float>[] dsi1 = new Dictionary<long, float>[2];
-            Dictionary<long, float>[] dsi2 = new Dictionary<long, float>[1];
+                {
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    var di2 = new Dictionary<string, Test.MyEnum>();
+                    di2["abc"] = Test.MyEnum.enum1;
+                    di2["qwerty"] = Test.MyEnum.enum3;
+                    di2["Hello!!"] = Test.MyEnum.enum2;
+
+                    Callback cb = new Callback();
+                    p.begin_opStringMyEnumD(di1, di2).whenCompleted(
+                        (Dictionary<string, Test.MyEnum> ro, Dictionary<string, Test.MyEnum> _do) =>
+                        {
+                            cb.opStringMyEnumD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            Dictionary<long, float> di2 = new Dictionary<long, float>();
-            di2[999999110L] = -1.1f;
-            di2[999999120L] = -100.4f;
-            di2[999999130L] = 0.5f;
-            Dictionary<long, float> di3 = new Dictionary<long, float>();
-            di3[999999140L] = 3.14f;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            var cb = new Callback();
-            var ret = p.opLongFloatDSAsync(dsi1, dsi2).Result;
-            cb.opLongFloatDS(ret.returnValue, ret.p3);
-        }
+                {
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    var di2 = new Dictionary<Test.MyEnum, string>();
+                    di2[Test.MyEnum.enum2] = "Hello!!";
+                    di2[Test.MyEnum.enum3] = "qwerty";
+
+                    var cb = new Callback();
+                    var ret = p.opMyEnumStringDAsync(di1, di2).Result;
+                    cb.opMyEnumStringD(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<long, float>[] dsi1 = new Dictionary<long, float>[2];
-            Dictionary<long, float>[] dsi2 = new Dictionary<long, float>[1];
+                {
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    var di2 = new Dictionary<Test.MyEnum, string>();
+                    di2[Test.MyEnum.enum2] = "Hello!!";
+                    di2[Test.MyEnum.enum3] = "qwerty";
+
+                    Callback cb = new Callback();
+                    p.begin_opMyEnumStringD(di1, di2).whenCompleted(cb.opMyEnumStringD, cb.exCB);
+                    cb.check();
+                }
 
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            Dictionary<long, float> di2 = new Dictionary<long, float>();
-            di2[999999110L] = -1.1f;
-            di2[999999120L] = -100.4f;
-            di2[999999130L] = 0.5f;
-            Dictionary<long, float> di3 = new Dictionary<long, float>();
-            di3[999999140L] = 3.14f;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Callback cb = new Callback();
-            p.begin_opLongFloatDS(dsi1, dsi2).whenCompleted(
-                (Dictionary<long, float>[] ro,
-                 Dictionary<long, float>[] _do) =>
-                {
-                    cb.opLongFloatDS(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    var di2 = new Dictionary<Test.MyEnum, string>();
+                    di2[Test.MyEnum.enum2] = "Hello!!";
+                    di2[Test.MyEnum.enum3] = "qwerty";
+
+                    Callback cb = new Callback();
+                    p.begin_opMyEnumStringD(di1, di2).whenCompleted(
+                        (Dictionary<Test.MyEnum, string> ro, Dictionary<Test.MyEnum, string> _do) =>
+                        {
+                            cb.opMyEnumStringD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<string, string>[] dsi1 = new Dictionary<string, string>[2];
-            Dictionary<string, string>[] dsi2 = new Dictionary<string, string>[1];
+                {
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    var di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di2[s11] = Test.MyEnum.enum1;
+                    di2[s22] = Test.MyEnum.enum3;
+                    di2[s23] = Test.MyEnum.enum2;
+
+                    var cb = new Callback();
+                    var ret = p.opMyStructMyEnumDAsync(di1, di2).Result;
+                    cb.opMyStructMyEnumD(ret.returnValue, ret.p3);
+                }
 
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            Dictionary<string, string> di2 = new Dictionary<string, string>();
-            di2["foo"] = "abc -1.1";
-            di2["FOO"] = "abc -100.4";
-            di2["BAR"] = "abc 0.5";
-            Dictionary<string, string> di3 = new Dictionary<string, string>();
-            di3["f00"] = "ABC -3.14";
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            var cb = new Callback();
-            var ret = p.opStringStringDSAsync(dsi1, dsi2).Result;
-            cb.opStringStringDS(ret.returnValue, ret.p3);
-        }
+                {
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    var di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di2[s11] = Test.MyEnum.enum1;
+                    di2[s22] = Test.MyEnum.enum3;
+                    di2[s23] = Test.MyEnum.enum2;
+
+                    Callback cb = new Callback();
+                    p.begin_opMyStructMyEnumD(di1, di2).whenCompleted(cb.opMyStructMyEnumD, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Dictionary<string, string>[] dsi1 = new Dictionary<string, string>[2];
-            Dictionary<string, string>[] dsi2 = new Dictionary<string, string>[1];
+                {
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    var di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di2[s11] = Test.MyEnum.enum1;
+                    di2[s22] = Test.MyEnum.enum3;
+                    di2[s23] = Test.MyEnum.enum2;
+
+                    Callback cb = new Callback();
+                    p.begin_opMyStructMyEnumD(di1, di2).whenCompleted(
+                        (Dictionary<Test.MyStruct, Test.MyEnum> ro,
+                         Dictionary<Test.MyStruct, Test.MyEnum> _do) =>
+                        {
+                            cb.opMyStructMyEnumD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            Dictionary<string, string> di2 = new Dictionary<string, string>();
-            di2["foo"] = "abc -1.1";
-            di2["FOO"] = "abc -100.4";
-            di2["BAR"] = "abc 0.5";
-            Dictionary<string, string> di3 = new Dictionary<string, string>();
-            di3["f00"] = "ABC -3.14";
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Callback cb = new Callback();
-            p.begin_opStringStringDS(dsi1, dsi2).whenCompleted(
-                (Dictionary<string, string>[] ro,
-                 Dictionary<string, string>[] _do) =>
-                {
-                    cb.opStringStringDS(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<byte, bool>[] dsi1 = new Dictionary<byte, bool>[2];
+                    Dictionary<byte, bool>[] dsi2 = new Dictionary<byte, bool>[1];
 
-        {
-            Dictionary<string, Test.MyEnum>[] dsi1 = new Dictionary<string, Test.MyEnum>[2];
-            Dictionary<string, Test.MyEnum>[] dsi2 = new Dictionary<string, Test.MyEnum>[1];
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
+                    di2[10] = true;
+                    di2[11] = false;
+                    di2[101] = true;
+                    Dictionary<byte, bool> di3 = new Dictionary<byte, bool>();
+                    di3[100] = false;
+                    di3[101] = false;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    var cb = new Callback();
+                    var ret = p.opByteBoolDSAsync(dsi1, dsi2).Result;
+                    cb.opByteBoolDS(ret.returnValue, ret.p3);
+                }
 
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di2 = new Dictionary<string, Test.MyEnum>();
-            di2["abc"] = Test.MyEnum.enum1;
-            di2["qwerty"] = Test.MyEnum.enum3;
-            di2["Hello!!"] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di3 = new Dictionary<string, Test.MyEnum>();
-            di3["Goodbye"] = Test.MyEnum.enum1;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            var cb = new Callback();
-            var ret = p.opStringMyEnumDSAsync(dsi1, dsi2).Result;
-            cb.opStringMyEnumDS(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<byte, bool>[] dsi1 = new Dictionary<byte, bool>[2];
+                    Dictionary<byte, bool>[] dsi2 = new Dictionary<byte, bool>[1];
 
-        {
-            Dictionary<string, Test.MyEnum>[] dsi1 = new Dictionary<string, Test.MyEnum>[2];
-            Dictionary<string, Test.MyEnum>[] dsi2 = new Dictionary<string, Test.MyEnum>[1];
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
+                    di2[10] = true;
+                    di2[11] = false;
+                    di2[101] = true;
+                    Dictionary<byte, bool> di3 = new Dictionary<byte, bool>();
+                    di3[100] = false;
+                    di3[101] = false;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Callback cb = new Callback();
+                    p.begin_opByteBoolDS(dsi1, dsi2).whenCompleted(
+                        (Dictionary<byte, bool>[] ro,
+                         Dictionary<byte, bool>[] _do) =>
+                        {
+                            cb.opByteBoolDS(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di2 = new Dictionary<string, Test.MyEnum>();
-            di2["abc"] = Test.MyEnum.enum1;
-            di2["qwerty"] = Test.MyEnum.enum3;
-            di2["Hello!!"] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di3 = new Dictionary<string, Test.MyEnum>();
-            di3["Goodbye"] = Test.MyEnum.enum1;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Callback cb = new Callback();
-            p.begin_opStringMyEnumDS(dsi1, dsi2).whenCompleted(
-                (Dictionary<string, Test.MyEnum>[] ro,
-                 Dictionary<string, Test.MyEnum>[] _do) =>
-                {
-                    cb.opStringMyEnumDS(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<short, int>[] dsi1 = new Dictionary<short, int>[2];
+                    Dictionary<short, int>[] dsi2 = new Dictionary<short, int>[1];
 
-        {
-            Dictionary<Test.MyEnum, string>[] dsi1 = new Dictionary<Test.MyEnum, string>[2];
-            Dictionary<Test.MyEnum, string>[] dsi2 = new Dictionary<Test.MyEnum, string>[1];
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    Dictionary<short, int> di2 = new Dictionary<short, int>();
+                    di2[110] = -1;
+                    di2[111] = -100;
+                    di2[1101] = 0;
+                    Dictionary<short, int> di3 = new Dictionary<short, int>();
+                    di3[100] = -1001;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    var cb = new Callback();
+                    var ret = p.opShortIntDSAsync(dsi1, dsi2).Result;
+                    cb.opShortIntDS(ret.returnValue, ret.p3);
+                }
 
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            Dictionary<Test.MyEnum, string> di2 = new Dictionary<Test.MyEnum, string>();
-            di2[Test.MyEnum.enum2] = "Hello!!";
-            di2[Test.MyEnum.enum3] = "qwerty";
-            Dictionary<Test.MyEnum, string> di3 = new Dictionary<Test.MyEnum, string>();
-            di3[Test.MyEnum.enum1] = "Goodbye";
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            var cb = new Callback();
-            var ret = p.opMyEnumStringDSAsync(dsi1, dsi2).Result;
-            cb.opMyEnumStringDS(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<short, int>[] dsi1 = new Dictionary<short, int>[2];
+                    Dictionary<short, int>[] dsi2 = new Dictionary<short, int>[1];
 
-        {
-            Dictionary<Test.MyEnum, string>[] dsi1 = new Dictionary<Test.MyEnum, string>[2];
-            Dictionary<Test.MyEnum, string>[] dsi2 = new Dictionary<Test.MyEnum, string>[1];
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    Dictionary<short, int> di2 = new Dictionary<short, int>();
+                    di2[110] = -1;
+                    di2[111] = -100;
+                    di2[1101] = 0;
+                    Dictionary<short, int> di3 = new Dictionary<short, int>();
+                    di3[100] = -1001;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Callback cb = new Callback();
+                    p.begin_opShortIntDS(dsi1, dsi2).whenCompleted(
+                        (Dictionary<short, int>[] ro,
+                         Dictionary<short, int>[] _do) =>
+                        {
+                            cb.opShortIntDS(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            Dictionary<Test.MyEnum, string> di2 = new Dictionary<Test.MyEnum, string>();
-            di2[Test.MyEnum.enum2] = "Hello!!";
-            di2[Test.MyEnum.enum3] = "qwerty";
-            Dictionary<Test.MyEnum, string> di3 = new Dictionary<Test.MyEnum, string>();
-            di3[Test.MyEnum.enum1] = "Goodbye";
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Callback cb = new Callback();
-            p.begin_opMyEnumStringDS(dsi1, dsi2).whenCompleted(
-                (Dictionary<Test.MyEnum, string>[] ro,
-                 Dictionary<Test.MyEnum, string>[] _do) =>
-                {
-                    cb.opMyEnumStringDS(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<long, float>[] dsi1 = new Dictionary<long, float>[2];
+                    Dictionary<long, float>[] dsi2 = new Dictionary<long, float>[1];
 
-        {
-            Dictionary<Test.MyStruct, Test.MyEnum>[] dsi1 = new Dictionary<Test.MyStruct, Test.MyEnum>[2];
-            Dictionary<Test.MyStruct, Test.MyEnum>[] dsi2 = new Dictionary<Test.MyStruct, Test.MyEnum>[1];
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    Dictionary<long, float> di2 = new Dictionary<long, float>();
+                    di2[999999110L] = -1.1f;
+                    di2[999999120L] = -100.4f;
+                    di2[999999130L] = 0.5f;
+                    Dictionary<long, float> di3 = new Dictionary<long, float>();
+                    di3[999999140L] = 3.14f;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    var cb = new Callback();
+                    var ret = p.opLongFloatDSAsync(dsi1, dsi2).Result;
+                    cb.opLongFloatDS(ret.returnValue, ret.p3);
+                }
 
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            Dictionary<Test.MyStruct, Test.MyEnum> di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di2[s11] = Test.MyEnum.enum1;
-            di2[s22] = Test.MyEnum.enum3;
-            di2[s23] = Test.MyEnum.enum2;
-
-            Dictionary<Test.MyStruct, Test.MyEnum> di3 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di3[s23] = Test.MyEnum.enum3;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            var cb = new Callback();
-            var ret = p.opMyStructMyEnumDSAsync(dsi1, dsi2).Result;
-            cb.opMyStructMyEnumDS(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<long, float>[] dsi1 = new Dictionary<long, float>[2];
+                    Dictionary<long, float>[] dsi2 = new Dictionary<long, float>[1];
 
-        {
-            Dictionary<Test.MyStruct, Test.MyEnum>[] dsi1 = new Dictionary<Test.MyStruct, Test.MyEnum>[2];
-            Dictionary<Test.MyStruct, Test.MyEnum>[] dsi2 = new Dictionary<Test.MyStruct, Test.MyEnum>[1];
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    Dictionary<long, float> di2 = new Dictionary<long, float>();
+                    di2[999999110L] = -1.1f;
+                    di2[999999120L] = -100.4f;
+                    di2[999999130L] = 0.5f;
+                    Dictionary<long, float> di3 = new Dictionary<long, float>();
+                    di3[999999140L] = 3.14f;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Callback cb = new Callback();
+                    p.begin_opLongFloatDS(dsi1, dsi2).whenCompleted(
+                        (Dictionary<long, float>[] ro,
+                         Dictionary<long, float>[] _do) =>
+                        {
+                            cb.opLongFloatDS(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            Dictionary<Test.MyStruct, Test.MyEnum> di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di2[s11] = Test.MyEnum.enum1;
-            di2[s22] = Test.MyEnum.enum3;
-            di2[s23] = Test.MyEnum.enum2;
-
-            Dictionary<Test.MyStruct, Test.MyEnum> di3 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di3[s23] = Test.MyEnum.enum3;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Callback cb = new Callback();
-            p.begin_opMyStructMyEnumDS(dsi1, dsi2).whenCompleted(
-                (Dictionary<Test.MyStruct, Test.MyEnum>[] ro,
-                 Dictionary<Test.MyStruct, Test.MyEnum>[] _do) =>
-                {
-                    cb.opMyStructMyEnumDS(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<string, string>[] dsi1 = new Dictionary<string, string>[2];
+                    Dictionary<string, string>[] dsi2 = new Dictionary<string, string>[1];
 
-        {
-            Dictionary<byte, byte[]> sdi1 = new Dictionary<byte, byte[]>();
-            Dictionary<byte, byte[]> sdi2 = new Dictionary<byte, byte[]>();
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    Dictionary<string, string> di2 = new Dictionary<string, string>();
+                    di2["foo"] = "abc -1.1";
+                    di2["FOO"] = "abc -100.4";
+                    di2["BAR"] = "abc 0.5";
+                    Dictionary<string, string> di3 = new Dictionary<string, string>();
+                    di3["f00"] = "ABC -3.14";
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    var cb = new Callback();
+                    var ret = p.opStringStringDSAsync(dsi1, dsi2).Result;
+                    cb.opStringStringDS(ret.returnValue, ret.p3);
+                }
 
-            byte[] si1 = new byte[] { 0x01, 0x11 };
-            byte[] si2 = new byte[] { 0x12 };
-            byte[] si3 = new byte[] { 0xf2, 0xf3 };
-
-            sdi1[0x01] = si1;
-            sdi1[0x22] = si2;
-            sdi2[0xf1] = si3;
-
-            var cb = new Callback();
-            var ret = p.opByteByteSDAsync(sdi1, sdi2).Result;
-            cb.opByteByteSD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<string, string>[] dsi1 = new Dictionary<string, string>[2];
+                    Dictionary<string, string>[] dsi2 = new Dictionary<string, string>[1];
 
-        {
-            Dictionary<byte, byte[]> sdi1 = new Dictionary<byte, byte[]>();
-            Dictionary<byte, byte[]> sdi2 = new Dictionary<byte, byte[]>();
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    Dictionary<string, string> di2 = new Dictionary<string, string>();
+                    di2["foo"] = "abc -1.1";
+                    di2["FOO"] = "abc -100.4";
+                    di2["BAR"] = "abc 0.5";
+                    Dictionary<string, string> di3 = new Dictionary<string, string>();
+                    di3["f00"] = "ABC -3.14";
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Callback cb = new Callback();
+                    p.begin_opStringStringDS(dsi1, dsi2).whenCompleted(
+                        (Dictionary<string, string>[] ro,
+                         Dictionary<string, string>[] _do) =>
+                        {
+                            cb.opStringStringDS(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            byte[] si1 = new byte[] { 0x01, 0x11 };
-            byte[] si2 = new byte[] { 0x12 };
-            byte[] si3 = new byte[] { 0xf2, 0xf3 };
-
-            sdi1[0x01] = si1;
-            sdi1[0x22] = si2;
-            sdi2[0xf1] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opByteByteSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<byte, byte[]> ro,
-                 Dictionary<byte, byte[]> _do) =>
-                {
-                    cb.opByteByteSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var dsi1 = new Dictionary<string, Test.MyEnum>[2];
+                    var dsi2 = new Dictionary<string, Test.MyEnum>[1];
 
-        {
-            Dictionary<bool, bool[]> sdi1 = new Dictionary<bool, bool[]>();
-            Dictionary<bool, bool[]> sdi2 = new Dictionary<bool, bool[]>();
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    var di2 = new Dictionary<string, Test.MyEnum>();
+                    di2["abc"] = Test.MyEnum.enum1;
+                    di2["qwerty"] = Test.MyEnum.enum3;
+                    di2["Hello!!"] = Test.MyEnum.enum2;
+                    var di3 = new Dictionary<string, Test.MyEnum>();
+                    di3["Goodbye"] = Test.MyEnum.enum1;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    var cb = new Callback();
+                    var ret = p.opStringMyEnumDSAsync(dsi1, dsi2).Result;
+                    cb.opStringMyEnumDS(ret.returnValue, ret.p3);
+                }
 
-            bool[] si1 = new bool[] { true, false };
-            bool[] si2 = new bool[] { false, true, true };
+                {
+                    var dsi1 = new Dictionary<string, Test.MyEnum>[2];
+                    var dsi2 = new Dictionary<string, Test.MyEnum>[1];
 
-            sdi1[false] = si1;
-            sdi1[true] = si2;
-            sdi2[false] = si1;
-
-            var cb = new Callback();
-            var ret = p.opBoolBoolSDAsync(sdi1, sdi2).Result;
-            cb.opBoolBoolSD(ret.returnValue, ret.p3);
-        }
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    var di2 = new Dictionary<string, Test.MyEnum>();
+                    di2["abc"] = Test.MyEnum.enum1;
+                    di2["qwerty"] = Test.MyEnum.enum3;
+                    di2["Hello!!"] = Test.MyEnum.enum2;
+                    var di3 = new Dictionary<string, Test.MyEnum>();
+                    di3["Goodbye"] = Test.MyEnum.enum1;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Callback cb = new Callback();
+                    p.begin_opStringMyEnumDS(dsi1, dsi2).whenCompleted(
+                        (Dictionary<string, Test.MyEnum>[] ro,
+                         Dictionary<string, Test.MyEnum>[] _do) =>
+                        {
+                            cb.opStringMyEnumDS(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<bool, bool[]> sdi1 = new Dictionary<bool, bool[]>();
-            Dictionary<bool, bool[]> sdi2 = new Dictionary<bool, bool[]>();
+                {
+                    var dsi1 = new Dictionary<Test.MyEnum, string>[2];
+                    var dsi2 = new Dictionary<Test.MyEnum, string>[1];
 
-            bool[] si1 = new bool[] { true, false };
-            bool[] si2 = new bool[] { false, true, true };
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    var di2 = new Dictionary<Test.MyEnum, string>();
+                    di2[Test.MyEnum.enum2] = "Hello!!";
+                    di2[Test.MyEnum.enum3] = "qwerty";
+                    var di3 = new Dictionary<Test.MyEnum, string>();
+                    di3[Test.MyEnum.enum1] = "Goodbye";
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    var cb = new Callback();
+                    var ret = p.opMyEnumStringDSAsync(dsi1, dsi2).Result;
+                    cb.opMyEnumStringDS(ret.returnValue, ret.p3);
+                }
 
-            sdi1[false] = si1;
-            sdi1[true] = si2;
-            sdi2[false] = si1;
-
-            Callback cb = new Callback();
-            p.begin_opBoolBoolSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<bool, bool[]> ro,
-                 Dictionary<bool, bool[]> _do) =>
-                {
-                    cb.opBoolBoolSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var dsi1 = new Dictionary<Test.MyEnum, string>[2];
+                    var dsi2 = new Dictionary<Test.MyEnum, string>[1];
 
-        {
-            Dictionary<short, short[]> sdi1 = new Dictionary<short, short[]>();
-            Dictionary<short, short[]> sdi2 = new Dictionary<short, short[]>();
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    var di2 = new Dictionary<Test.MyEnum, string>();
+                    di2[Test.MyEnum.enum2] = "Hello!!";
+                    di2[Test.MyEnum.enum3] = "qwerty";
+                    var di3 = new Dictionary<Test.MyEnum, string>();
+                    di3[Test.MyEnum.enum1] = "Goodbye";
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Callback cb = new Callback();
+                    p.begin_opMyEnumStringDS(dsi1, dsi2).whenCompleted(
+                        (Dictionary<Test.MyEnum, string>[] ro,
+                         Dictionary<Test.MyEnum, string>[] _do) =>
+                        {
+                            cb.opMyEnumStringDS(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            short[] si1 = new short[] { 1, 2, 3 };
-            short[] si2 = new short[] { 4, 5 };
-            short[] si3 = new short[] { 6, 7 };
-
-            sdi1[1] = si1;
-            sdi1[2] = si2;
-            sdi2[4] = si3;
-
-            var cb = new Callback();
-            var ret = p.opShortShortSDAsync(sdi1, sdi2).Result;
-            cb.opShortShortSD(ret.returnValue, ret.p3);
-        }
+                {
+                    var dsi1 = new Dictionary<Test.MyStruct, Test.MyEnum>[2];
+                    var dsi2 = new Dictionary<Test.MyStruct, Test.MyEnum>[1];
 
-        {
-            Dictionary<short, short[]> sdi1 = new Dictionary<short, short[]>();
-            Dictionary<short, short[]> sdi2 = new Dictionary<short, short[]>();
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    var di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di2[s11] = Test.MyEnum.enum1;
+                    di2[s22] = Test.MyEnum.enum3;
+                    di2[s23] = Test.MyEnum.enum2;
+
+                    var di3 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di3[s23] = Test.MyEnum.enum3;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    var cb = new Callback();
+                    var ret = p.opMyStructMyEnumDSAsync(dsi1, dsi2).Result;
+                    cb.opMyStructMyEnumDS(ret.returnValue, ret.p3);
+                }
 
-            short[] si1 = new short[] { 1, 2, 3 };
-            short[] si2 = new short[] { 4, 5 };
-            short[] si3 = new short[] { 6, 7 };
-
-            sdi1[1] = si1;
-            sdi1[2] = si2;
-            sdi2[4] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opShortShortSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<short, short[]> ro,
-                 Dictionary<short, short[]> _do) =>
-                {
-                    cb.opShortShortSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var dsi1 = new Dictionary<Test.MyStruct, Test.MyEnum>[2];
+                    var dsi2 = new Dictionary<Test.MyStruct, Test.MyEnum>[1];
 
-        {
-            Dictionary<int, int[]> sdi1 = new Dictionary<int, int[]>();
-            Dictionary<int, int[]> sdi2 = new Dictionary<int, int[]>();
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    var di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di2[s11] = Test.MyEnum.enum1;
+                    di2[s22] = Test.MyEnum.enum3;
+                    di2[s23] = Test.MyEnum.enum2;
+
+                    var di3 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di3[s23] = Test.MyEnum.enum3;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Callback cb = new Callback();
+                    p.begin_opMyStructMyEnumDS(dsi1, dsi2).whenCompleted(
+                        (Dictionary<Test.MyStruct, Test.MyEnum>[] ro,
+                         Dictionary<Test.MyStruct, Test.MyEnum>[] _do) =>
+                        {
+                            cb.opMyStructMyEnumDS(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            int[] si1 = new int[] { 100, 200, 300 };
-            int[] si2 = new int[] { 400, 500 };
-            int[] si3 = new int[] { 600, 700 };
-
-            sdi1[100] = si1;
-            sdi1[200] = si2;
-            sdi2[400] = si3;
-
-            var cb = new Callback();
-            var ret = p.opIntIntSDAsync(sdi1, sdi2).Result;
-            cb.opIntIntSD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<byte, byte[]> sdi1 = new Dictionary<byte, byte[]>();
+                    Dictionary<byte, byte[]> sdi2 = new Dictionary<byte, byte[]>();
 
-        {
-            Dictionary<int, int[]> sdi1 = new Dictionary<int, int[]>();
-            Dictionary<int, int[]> sdi2 = new Dictionary<int, int[]>();
+                    byte[] si1 = new byte[] { 0x01, 0x11 };
+                    byte[] si2 = new byte[] { 0x12 };
+                    byte[] si3 = new byte[] { 0xf2, 0xf3 };
+
+                    sdi1[0x01] = si1;
+                    sdi1[0x22] = si2;
+                    sdi2[0xf1] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opByteByteSDAsync(sdi1, sdi2).Result;
+                    cb.opByteByteSD(ret.returnValue, ret.p3);
+                }
 
-            int[] si1 = new int[] { 100, 200, 300 };
-            int[] si2 = new int[] { 400, 500 };
-            int[] si3 = new int[] { 600, 700 };
-
-            sdi1[100] = si1;
-            sdi1[200] = si2;
-            sdi2[400] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opIntIntSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<int, int[]> ro,
-                 Dictionary<int, int[]> _do) =>
-                {
-                    cb.opIntIntSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<byte, byte[]> sdi1 = new Dictionary<byte, byte[]>();
+                    Dictionary<byte, byte[]> sdi2 = new Dictionary<byte, byte[]>();
 
-        {
-            Dictionary<long, long[]> sdi1 = new Dictionary<long, long[]>();
-            Dictionary<long, long[]> sdi2 = new Dictionary<long, long[]>();
+                    byte[] si1 = new byte[] { 0x01, 0x11 };
+                    byte[] si2 = new byte[] { 0x12 };
+                    byte[] si3 = new byte[] { 0xf2, 0xf3 };
+
+                    sdi1[0x01] = si1;
+                    sdi1[0x22] = si2;
+                    sdi2[0xf1] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opByteByteSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<byte, byte[]> ro,
+                         Dictionary<byte, byte[]> _do) =>
+                        {
+                            cb.opByteByteSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            long[] si1 = new long[] { 999999110L, 999999111L, 999999110L };
-            long[] si2 = new long[] { 999999120L, 999999130L };
-            long[] si3 = new long[] { 999999110L, 999999120L };
-
-            sdi1[999999990L] = si1;
-            sdi1[999999991L] = si2;
-            sdi2[999999992L] = si3;
-
-            var cb = new Callback();
-            var ret = p.opLongLongSDAsync(sdi1, sdi2).Result;
-            cb.opLongLongSD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<bool, bool[]> sdi1 = new Dictionary<bool, bool[]>();
+                    Dictionary<bool, bool[]> sdi2 = new Dictionary<bool, bool[]>();
 
-        {
-            Dictionary<long, long[]> sdi1 = new Dictionary<long, long[]>();
-            Dictionary<long, long[]> sdi2 = new Dictionary<long, long[]>();
+                    bool[] si1 = new bool[] { true, false };
+                    bool[] si2 = new bool[] { false, true, true };
 
-            long[] si1 = new long[] { 999999110L, 999999111L, 999999110L };
-            long[] si2 = new long[] { 999999120L, 999999130L };
-            long[] si3 = new long[] { 999999110L, 999999120L };
-
-            sdi1[999999990L] = si1;
-            sdi1[999999991L] = si2;
-            sdi2[999999992L] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opLongLongSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<long, long[]> ro,
-                 Dictionary<long, long[]> _do) =>
-                {
-                    cb.opLongLongSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                    sdi1[false] = si1;
+                    sdi1[true] = si2;
+                    sdi2[false] = si1;
+
+                    var cb = new Callback();
+                    var ret = p.opBoolBoolSDAsync(sdi1, sdi2).Result;
+                    cb.opBoolBoolSD(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<string, float[]> sdi1 = new Dictionary<string, float[]>();
-            Dictionary<string, float[]> sdi2 = new Dictionary<string, float[]>();
+                {
+                    Dictionary<bool, bool[]> sdi1 = new Dictionary<bool, bool[]>();
+                    Dictionary<bool, bool[]> sdi2 = new Dictionary<bool, bool[]>();
 
-            float[] si1 = new float[] { -1.1f, 123123.2f, 100.0f };
-            float[] si2 = new float[] { 42.24f, -1.61f };
-            float[] si3 = new float[] { -3.14f, 3.14f };
-
-            sdi1["abc"] = si1;
-            sdi1["ABC"] = si2;
-            sdi2["aBc"] = si3;
-
-            var cb = new Callback();
-            var ret = p.opStringFloatSDAsync(sdi1, sdi2).Result;
-            cb.opStringFloatSD(ret.returnValue, ret.p3);
-        }
+                    bool[] si1 = new bool[] { true, false };
+                    bool[] si2 = new bool[] { false, true, true };
 
-        {
-            Dictionary<string, float[]> sdi1 = new Dictionary<string, float[]>();
-            Dictionary<string, float[]> sdi2 = new Dictionary<string, float[]>();
+                    sdi1[false] = si1;
+                    sdi1[true] = si2;
+                    sdi2[false] = si1;
+
+                    Callback cb = new Callback();
+                    p.begin_opBoolBoolSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<bool, bool[]> ro,
+                         Dictionary<bool, bool[]> _do) =>
+                        {
+                            cb.opBoolBoolSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            float[] si1 = new float[] { -1.1f, 123123.2f, 100.0f };
-            float[] si2 = new float[] { 42.24f, -1.61f };
-            float[] si3 = new float[] { -3.14f, 3.14f };
-
-            sdi1["abc"] = si1;
-            sdi1["ABC"] = si2;
-            sdi2["aBc"] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opStringFloatSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<string, float[]> ro,
-                 Dictionary<string, float[]> _do) =>
-                {
-                    cb.opStringFloatSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<short, short[]> sdi1 = new Dictionary<short, short[]>();
+                    Dictionary<short, short[]> sdi2 = new Dictionary<short, short[]>();
 
-        {
-            Dictionary<string, double[]> sdi1 = new Dictionary<string, double[]>();
-            Dictionary<string, double[]> sdi2 = new Dictionary<string, double[]>();
+                    short[] si1 = new short[] { 1, 2, 3 };
+                    short[] si2 = new short[] { 4, 5 };
+                    short[] si3 = new short[] { 6, 7 };
+
+                    sdi1[1] = si1;
+                    sdi1[2] = si2;
+                    sdi2[4] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opShortShortSDAsync(sdi1, sdi2).Result;
+                    cb.opShortShortSD(ret.returnValue, ret.p3);
+                }
 
-            double[] si1 = new double[] { 1.1E10, 1.2E10, 1.3E10 };
-            double[] si2 = new double[] { 1.4E10, 1.5E10 };
-            double[] si3 = new double[] { 1.6E10, 1.7E10 };
-
-            sdi1["Hello!!"] = si1;
-            sdi1["Goodbye"] = si2;
-            sdi2[""] = si3;
-
-            var cb = new Callback();
-            var ret = p.opStringDoubleSDAsync(sdi1, sdi2).Result;
-            cb.opStringDoubleSD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<short, short[]> sdi1 = new Dictionary<short, short[]>();
+                    Dictionary<short, short[]> sdi2 = new Dictionary<short, short[]>();
 
-        {
-            Dictionary<string, double[]> sdi1 = new Dictionary<string, double[]>();
-            Dictionary<string, double[]> sdi2 = new Dictionary<string, double[]>();
+                    short[] si1 = new short[] { 1, 2, 3 };
+                    short[] si2 = new short[] { 4, 5 };
+                    short[] si3 = new short[] { 6, 7 };
+
+                    sdi1[1] = si1;
+                    sdi1[2] = si2;
+                    sdi2[4] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opShortShortSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<short, short[]> ro,
+                         Dictionary<short, short[]> _do) =>
+                        {
+                            cb.opShortShortSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            double[] si1 = new double[] { 1.1E10, 1.2E10, 1.3E10 };
-            double[] si2 = new double[] { 1.4E10, 1.5E10 };
-            double[] si3 = new double[] { 1.6E10, 1.7E10 };
-
-            sdi1["Hello!!"] = si1;
-            sdi1["Goodbye"] = si2;
-            sdi2[""] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opStringDoubleSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<string, double[]> ro,
-                 Dictionary<string, double[]> _do) =>
-                {
-                    cb.opStringDoubleSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<int, int[]> sdi1 = new Dictionary<int, int[]>();
+                    Dictionary<int, int[]> sdi2 = new Dictionary<int, int[]>();
 
-        {
-            Dictionary<string, string[]> sdi1 = new Dictionary<string, string[]>();
-            Dictionary<string, string[]> sdi2 = new Dictionary<string, string[]>();
+                    int[] si1 = new int[] { 100, 200, 300 };
+                    int[] si2 = new int[] { 400, 500 };
+                    int[] si3 = new int[] { 600, 700 };
+
+                    sdi1[100] = si1;
+                    sdi1[200] = si2;
+                    sdi2[400] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opIntIntSDAsync(sdi1, sdi2).Result;
+                    cb.opIntIntSD(ret.returnValue, ret.p3);
+                }
 
-            string[] si1 = new string[] { "abc", "de", "fghi" };
-            string[] si2 = new string[] { "xyz", "or" };
-            string[] si3 = new string[] { "and", "xor" };
-
-            sdi1["abc"] = si1;
-            sdi1["def"] = si2;
-            sdi2["ghi"] = si3;
-
-            var cb = new Callback();
-            var ret = p.opStringStringSDAsync(sdi1, sdi2).Result;
-            cb.opStringStringSD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<int, int[]> sdi1 = new Dictionary<int, int[]>();
+                    Dictionary<int, int[]> sdi2 = new Dictionary<int, int[]>();
 
-        {
-            Dictionary<string, string[]> sdi1 = new Dictionary<string, string[]>();
-            Dictionary<string, string[]> sdi2 = new Dictionary<string, string[]>();
+                    int[] si1 = new int[] { 100, 200, 300 };
+                    int[] si2 = new int[] { 400, 500 };
+                    int[] si3 = new int[] { 600, 700 };
+
+                    sdi1[100] = si1;
+                    sdi1[200] = si2;
+                    sdi2[400] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opIntIntSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<int, int[]> ro,
+                         Dictionary<int, int[]> _do) =>
+                        {
+                            cb.opIntIntSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            string[] si1 = new string[] { "abc", "de", "fghi" };
-            string[] si2 = new string[] { "xyz", "or" };
-            string[] si3 = new string[] { "and", "xor" };
-
-            sdi1["abc"] = si1;
-            sdi1["def"] = si2;
-            sdi2["ghi"] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opStringStringSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<string, string[]> ro,
-                 Dictionary<string, string[]> _do) =>
-                {
-                    cb.opStringStringSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<long, long[]> sdi1 = new Dictionary<long, long[]>();
+                    Dictionary<long, long[]> sdi2 = new Dictionary<long, long[]>();
 
-        {
-            Dictionary<Test.MyEnum, Test.MyEnum[]> sdi1 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
-            Dictionary<Test.MyEnum, Test.MyEnum[]> sdi2 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    long[] si1 = new long[] { 999999110L, 999999111L, 999999110L };
+                    long[] si2 = new long[] { 999999120L, 999999130L };
+                    long[] si3 = new long[] { 999999110L, 999999120L };
+
+                    sdi1[999999990L] = si1;
+                    sdi1[999999991L] = si2;
+                    sdi2[999999992L] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opLongLongSDAsync(sdi1, sdi2).Result;
+                    cb.opLongLongSD(ret.returnValue, ret.p3);
+                }
 
-            Test.MyEnum[] si1 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2 };
-            Test.MyEnum[] si2 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum2 };
-            Test.MyEnum[] si3 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum3 };
-
-            sdi1[Test.MyEnum.enum3] = si1;
-            sdi1[Test.MyEnum.enum2] = si2;
-            sdi2[Test.MyEnum.enum1] = si3;
-
-            var cb = new Callback();
-            var ret = p.opMyEnumMyEnumSDAsync(sdi1, sdi2).Result;
-            cb.opMyEnumMyEnumSD(ret.returnValue, ret.p3);
-        }
+                {
+                    Dictionary<long, long[]> sdi1 = new Dictionary<long, long[]>();
+                    Dictionary<long, long[]> sdi2 = new Dictionary<long, long[]>();
 
-        {
-            Dictionary<Test.MyEnum, Test.MyEnum[]> sdi1 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
-            Dictionary<Test.MyEnum, Test.MyEnum[]> sdi2 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    long[] si1 = new long[] { 999999110L, 999999111L, 999999110L };
+                    long[] si2 = new long[] { 999999120L, 999999130L };
+                    long[] si3 = new long[] { 999999110L, 999999120L };
+
+                    sdi1[999999990L] = si1;
+                    sdi1[999999991L] = si2;
+                    sdi2[999999992L] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opLongLongSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<long, long[]> ro,
+                         Dictionary<long, long[]> _do) =>
+                        {
+                            cb.opLongLongSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-            Test.MyEnum[] si1 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2 };
-            Test.MyEnum[] si2 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum2 };
-            Test.MyEnum[] si3 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum3 };
-
-            sdi1[Test.MyEnum.enum3] = si1;
-            sdi1[Test.MyEnum.enum2] = si2;
-            sdi2[Test.MyEnum.enum1] = si3;
-
-            Callback cb = new Callback();
-            p.begin_opMyEnumMyEnumSD(sdi1, sdi2).whenCompleted(
-                (Dictionary<Test.MyEnum, Test.MyEnum[]> ro,
-                 Dictionary<Test.MyEnum, Test.MyEnum[]> _do) =>
-                {
-                    cb.opMyEnumMyEnumSD(ro, _do);
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Dictionary<string, float[]> sdi1 = new Dictionary<string, float[]>();
+                    Dictionary<string, float[]> sdi2 = new Dictionary<string, float[]>();
 
-        {
-            int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
+                    float[] si1 = new float[] { -1.1f, 123123.2f, 100.0f };
+                    float[] si2 = new float[] { 42.24f, -1.61f };
+                    float[] si3 = new float[] { -3.14f, 3.14f };
+
+                    sdi1["abc"] = si1;
+                    sdi1["ABC"] = si2;
+                    sdi2["aBc"] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opStringFloatSDAsync(sdi1, sdi2).Result;
+                    cb.opStringFloatSD(ret.returnValue, ret.p3);
+                }
 
-            for(int l = 0; l < lengths.Length; ++l)
-            {
-                int[] s = new int[lengths[l]];
-                for(int i = 0; i < lengths[l]; ++i)
                 {
-                    s[i] = i;
+                    Dictionary<string, float[]> sdi1 = new Dictionary<string, float[]>();
+                    Dictionary<string, float[]> sdi2 = new Dictionary<string, float[]>();
+
+                    float[] si1 = new float[] { -1.1f, 123123.2f, 100.0f };
+                    float[] si2 = new float[] { 42.24f, -1.61f };
+                    float[] si3 = new float[] { -3.14f, 3.14f };
+
+                    sdi1["abc"] = si1;
+                    sdi1["ABC"] = si2;
+                    sdi2["aBc"] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opStringFloatSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<string, float[]> ro,
+                         Dictionary<string, float[]> _do) =>
+                        {
+                            cb.opStringFloatSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
                 }
 
-                var cb = new Callback(lengths[l]);
-                cb.opIntS(p.opIntSAsync(s).Result);
-            }
-        }
+                {
+                    Dictionary<string, double[]> sdi1 = new Dictionary<string, double[]>();
+                    Dictionary<string, double[]> sdi2 = new Dictionary<string, double[]>();
 
-        {
-            int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
+                    double[] si1 = new double[] { 1.1E10, 1.2E10, 1.3E10 };
+                    double[] si2 = new double[] { 1.4E10, 1.5E10 };
+                    double[] si3 = new double[] { 1.6E10, 1.7E10 };
+
+                    sdi1["Hello!!"] = si1;
+                    sdi1["Goodbye"] = si2;
+                    sdi2[""] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opStringDoubleSDAsync(sdi1, sdi2).Result;
+                    cb.opStringDoubleSD(ret.returnValue, ret.p3);
+                }
 
-            for(int l = 0; l < lengths.Length; ++l)
-            {
-                int[] s = new int[lengths[l]];
-                for(int i = 0; i < lengths[l]; ++i)
                 {
-                    s[i] = i;
+                    Dictionary<string, double[]> sdi1 = new Dictionary<string, double[]>();
+                    Dictionary<string, double[]> sdi2 = new Dictionary<string, double[]>();
+
+                    double[] si1 = new double[] { 1.1E10, 1.2E10, 1.3E10 };
+                    double[] si2 = new double[] { 1.4E10, 1.5E10 };
+                    double[] si3 = new double[] { 1.6E10, 1.7E10 };
+
+                    sdi1["Hello!!"] = si1;
+                    sdi1["Goodbye"] = si2;
+                    sdi2[""] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opStringDoubleSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<string, double[]> ro,
+                         Dictionary<string, double[]> _do) =>
+                        {
+                            cb.opStringDoubleSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
                 }
 
-                Callback cb = new Callback(lengths[l]);
-                p.begin_opIntS(s).whenCompleted(cb.opIntS, cb.exCB);
-                cb.check();
-            }
-        }
+                {
+                    Dictionary<string, string[]> sdi1 = new Dictionary<string, string[]>();
+                    Dictionary<string, string[]> sdi2 = new Dictionary<string, string[]>();
 
-        {
-            int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
+                    string[] si1 = new string[] { "abc", "de", "fghi" };
+                    string[] si2 = new string[] { "xyz", "or" };
+                    string[] si3 = new string[] { "and", "xor" };
+
+                    sdi1["abc"] = si1;
+                    sdi1["def"] = si2;
+                    sdi2["ghi"] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opStringStringSDAsync(sdi1, sdi2).Result;
+                    cb.opStringStringSD(ret.returnValue, ret.p3);
+                }
 
-            for(int l = 0; l < lengths.Length; ++l)
-            {
-                int[] s = new int[lengths[l]];
-                for(int i = 0; i < lengths[l]; ++i)
                 {
-                    s[i] = i;
-                }
+                    Dictionary<string, string[]> sdi1 = new Dictionary<string, string[]>();
+                    Dictionary<string, string[]> sdi2 = new Dictionary<string, string[]>();
 
-                Callback cb = new Callback(lengths[l]);
-                p.begin_opIntS(s).whenCompleted(
-                    (int[] r) =>
-                    {
-                        cb.opIntS(r);
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                         cb.exCB(ex);
-                    });
-                cb.check();
-            }
-        }
+                    string[] si1 = new string[] { "abc", "de", "fghi" };
+                    string[] si2 = new string[] { "xyz", "or" };
+                    string[] si3 = new string[] { "and", "xor" };
+
+                    sdi1["abc"] = si1;
+                    sdi1["def"] = si2;
+                    sdi2["ghi"] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opStringStringSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<string, string[]> ro,
+                         Dictionary<string, string[]> _do) =>
+                        {
+                            cb.opStringStringSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-            ctx["one"] = "ONE";
-            ctx["two"] = "TWO";
-            ctx["three"] = "THREE";
-            {
-                test(p.ice_getContext().Count == 0);
-                var cb = new Callback(ctx);
-                cb.opContextNotEqual(p.opContextAsync().Result);
-            }
-            {
-                test(p.ice_getContext().Count == 0);
-                var cb = new Callback(ctx);
-                cb.opContextEqual(p.opContextAsync(ctx).Result);
-            }
-            {
-                var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
-                var cb = new Callback(ctx);
-                cb.opContextEqual(p2.opContextAsync().Result);
-            }
-            {
-                var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                Callback cb = new Callback(ctx);
-                cb.opContextEqual(p2.opContextAsync(ctx).Result);
-            }
-        }
+                {
+                    var sdi1 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    var sdi2 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
 
-        {
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-            ctx["one"] = "ONE";
-            ctx["two"] = "TWO";
-            ctx["three"] = "THREE";
-            {
-                test(p.ice_getContext().Count == 0);
-                Callback cb = new Callback(ctx);
-                p.begin_opContext().whenCompleted(cb.opContextNotEqual, cb.exCB);
-                cb.check();
-            }
-            {
-                test(p.ice_getContext().Count == 0);
-                Callback cb = new Callback(ctx);
-                p.begin_opContext(ctx).whenCompleted(cb.opContextEqual, cb.exCB);
-                cb.check();
-            }
-            {
-                Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
-                Callback cb = new Callback(ctx);
-                p2.begin_opContext().whenCompleted(cb.opContextEqual, cb.exCB);
-                cb.check();
-            }
-            {
-                Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                Callback cb = new Callback(ctx);
-                p2.begin_opContext(ctx).whenCompleted(cb.opContextEqual, cb.exCB);
-                cb.check();
-            }
-        }
+                    var si1 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    var si2 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    var si3 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum3 };
+
+                    sdi1[Test.MyEnum.enum3] = si1;
+                    sdi1[Test.MyEnum.enum2] = si2;
+                    sdi2[Test.MyEnum.enum1] = si3;
+
+                    var cb = new Callback();
+                    var ret = p.opMyEnumMyEnumSDAsync(sdi1, sdi2).Result;
+                    cb.opMyEnumMyEnumSD(ret.returnValue, ret.p3);
+                }
 
-        {
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-            ctx["one"] = "ONE";
-            ctx["two"] = "TWO";
-            ctx["three"] = "THREE";
-            {
-                test(p.ice_getContext().Count == 0);
-                Callback cb = new Callback(ctx);
-                p.begin_opContext().whenCompleted(
-                    (Dictionary<string, string> r) =>
-                    {
-                        cb.opContextNotEqual(r);
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                         cb.exCB(ex);
-                    });
-                cb.check();
-            }
-            {
-                test(p.ice_getContext().Count == 0);
-                Callback cb = new Callback(ctx);
-                p.begin_opContext(ctx).whenCompleted(
-                    (Dictionary<string, string> r) =>
-                    {
-                        cb.opContextEqual(r);
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                         cb.exCB(ex);
-                    });
-                cb.check();
-            }
-            {
-                Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
-                Callback cb = new Callback(ctx);
-                p2.begin_opContext().whenCompleted(
-                    (Dictionary<string, string> r) =>
-                    {
-                        cb.opContextEqual(r);
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                         cb.exCB(ex);
-                    });
-                cb.check();
-            }
-            {
-                Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                Callback cb = new Callback(ctx);
-                p2.begin_opContext(ctx).whenCompleted(
-                    (Dictionary<string, string> r) =>
-                    {
-                        cb.opContextEqual(r);
-                    },
-                    (Ice.Exception ex) =>
-                    {
-                         cb.exCB(ex);
-                    });
-                cb.check();
-            }
-        }
+                {
+                    var sdi1 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    var sdi2 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
 
-        //
-        // Test implicit context propagation with async task
-        //
-        if(p.ice_getConnection() != null)
-        {
-            string[] impls = { "Shared", "PerThread" };
-            for(int i = 0; i < 2; i++)
-            {
-                Ice.InitializationData initData = new Ice.InitializationData();
-                initData.properties = communicator.getProperties().ice_clone_();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
+                    var si1 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    var si2 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    var si3 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum3 };
+
+                    sdi1[Test.MyEnum.enum3] = si1;
+                    sdi1[Test.MyEnum.enum2] = si2;
+                    sdi2[Test.MyEnum.enum1] = si3;
+
+                    Callback cb = new Callback();
+                    p.begin_opMyEnumMyEnumSD(sdi1, sdi2).whenCompleted(
+                        (Dictionary<Test.MyEnum, Test.MyEnum[]> ro,
+                         Dictionary<Test.MyEnum, Test.MyEnum[]> _do) =>
+                        {
+                            cb.opMyEnumMyEnumSD(ro, _do);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-                Ice.Communicator ic = Ice.Util.initialize(initData);
+                {
+                    int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
 
-                Dictionary<string, string> ctx = new Dictionary<string, string>();
-                ctx["one"] = "ONE";
-                ctx["two"] = "TWO";
-                ctx["three"] = "THREE";
+                    for (int l = 0; l < lengths.Length; ++l)
+                    {
+                        int[] s = new int[lengths[l]];
+                        for (int i = 0; i < lengths[l]; ++i)
+                        {
+                            s[i] = i;
+                        }
 
-                Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(
-                                        ic.stringToProxy("test:" + app.getTestEndpoint(0)));
+                        var cb = new Callback(lengths[l]);
+                        cb.opIntS(p.opIntSAsync(s).Result);
+                    }
+                }
 
-                ic.getImplicitContext().setContext(ctx);
-                test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx));
                 {
-                    test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, ctx));
-                }
+                    int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
 
-                ic.getImplicitContext().put("zero", "ZERO");
+                    for (int l = 0; l < lengths.Length; ++l)
+                    {
+                        int[] s = new int[lengths[l]];
+                        for (int i = 0; i < lengths[l]; ++i)
+                        {
+                            s[i] = i;
+                        }
+
+                        Callback cb = new Callback(lengths[l]);
+                        p.begin_opIntS(s).whenCompleted(cb.opIntS, cb.exCB);
+                        cb.check();
+                    }
+                }
 
-                ctx = ic.getImplicitContext().getContext();
                 {
-                    test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, ctx));
-                }
+                    int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
 
-                Dictionary<string, string> prxContext = new Dictionary<string, string>();
-                prxContext["one"] = "UN";
-                prxContext["four"] = "QUATRE";
+                    for (int l = 0; l < lengths.Length; ++l)
+                    {
+                        int[] s = new int[lengths[l]];
+                        for (int i = 0; i < lengths[l]; ++i)
+                        {
+                            s[i] = i;
+                        }
+
+                        Callback cb = new Callback(lengths[l]);
+                        p.begin_opIntS(s).whenCompleted(
+                            (int[] r) =>
+                            {
+                                cb.opIntS(r);
+                            },
+                            (Ice.Exception ex) =>
+                            {
+                                cb.exCB(ex);
+                            });
+                        cb.check();
+                    }
+                }
 
-                Dictionary<string, string> combined = prxContext;
-                foreach(KeyValuePair<string, string> e in ctx)
                 {
-                    try
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+                    ctx["one"] = "ONE";
+                    ctx["two"] = "TWO";
+                    ctx["three"] = "THREE";
+                    {
+                        test(p.ice_getContext().Count == 0);
+                        var cb = new Callback(ctx);
+                        cb.opContextNotEqual(p.opContextAsync().Result);
+                    }
+                    {
+                        test(p.ice_getContext().Count == 0);
+                        var cb = new Callback(ctx);
+                        cb.opContextEqual(p.opContextAsync(ctx).Result);
+                    }
                     {
-                        combined.Add(e.Key, e.Value);
+                        var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+                        test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
+                        var cb = new Callback(ctx);
+                        cb.opContextEqual(p2.opContextAsync().Result);
                     }
-                    catch(System.ArgumentException)
                     {
-                        // Ignore.
+                        var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+                        Callback cb = new Callback(ctx);
+                        cb.opContextEqual(p2.opContextAsync(ctx).Result);
                     }
                 }
-                test(combined["one"].Equals("UN"));
 
-                p3 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(prxContext));
-
-                ic.getImplicitContext().setContext(null);
                 {
-                    test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, prxContext));
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+                    ctx["one"] = "ONE";
+                    ctx["two"] = "TWO";
+                    ctx["three"] = "THREE";
+                    {
+                        test(p.ice_getContext().Count == 0);
+                        Callback cb = new Callback(ctx);
+                        p.begin_opContext().whenCompleted(cb.opContextNotEqual, cb.exCB);
+                        cb.check();
+                    }
+                    {
+                        test(p.ice_getContext().Count == 0);
+                        Callback cb = new Callback(ctx);
+                        p.begin_opContext(ctx).whenCompleted(cb.opContextEqual, cb.exCB);
+                        cb.check();
+                    }
+                    {
+                        var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+                        test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
+                        Callback cb = new Callback(ctx);
+                        p2.begin_opContext().whenCompleted(cb.opContextEqual, cb.exCB);
+                        cb.check();
+                    }
+                    {
+                        var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+                        Callback cb = new Callback(ctx);
+                        p2.begin_opContext(ctx).whenCompleted(cb.opContextEqual, cb.exCB);
+                        cb.check();
+                    }
                 }
 
-                ic.getImplicitContext().setContext(ctx);
                 {
-                    test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, combined));
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+                    ctx["one"] = "ONE";
+                    ctx["two"] = "TWO";
+                    ctx["three"] = "THREE";
+                    {
+                        test(p.ice_getContext().Count == 0);
+                        Callback cb = new Callback(ctx);
+                        p.begin_opContext().whenCompleted(
+                            (Dictionary<string, string> r) =>
+                            {
+                                cb.opContextNotEqual(r);
+                            },
+                            (Ice.Exception ex) =>
+                            {
+                                cb.exCB(ex);
+                            });
+                        cb.check();
+                    }
+                    {
+                        test(p.ice_getContext().Count == 0);
+                        Callback cb = new Callback(ctx);
+                        p.begin_opContext(ctx).whenCompleted(
+                            (Dictionary<string, string> r) =>
+                            {
+                                cb.opContextEqual(r);
+                            },
+                            (Ice.Exception ex) =>
+                            {
+                                cb.exCB(ex);
+                            });
+                        cb.check();
+                    }
+                    {
+                        var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+                        test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
+                        Callback cb = new Callback(ctx);
+                        p2.begin_opContext().whenCompleted(
+                            (Dictionary<string, string> r) =>
+                            {
+                                cb.opContextEqual(r);
+                            },
+                            (Ice.Exception ex) =>
+                            {
+                                cb.exCB(ex);
+                            });
+                        cb.check();
+                    }
+                    {
+                        var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+                        Callback cb = new Callback(ctx);
+                        p2.begin_opContext(ctx).whenCompleted(
+                            (Dictionary<string, string> r) =>
+                            {
+                                cb.opContextEqual(r);
+                            },
+                            (Ice.Exception ex) =>
+                            {
+                                cb.exCB(ex);
+                            });
+                        cb.check();
+                    }
                 }
 
-                //ic.getImplicitContext().setContext(null);
-                ic.destroy();
-            }
-        }
-
-        //
-        // Test implicit context propagation with async result
-        //
-        if(p.ice_getConnection() != null)
-        {
-            string[] impls = {"Shared", "PerThread"};
-            for(int i = 0; i < 2; i++)
-            {
-                Ice.InitializationData initData = new Ice.InitializationData();
-                initData.properties = communicator.getProperties().ice_clone_();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
+                //
+                // Test implicit context propagation with async task
+                //
+                if (p.ice_getConnection() != null)
+                {
+                    string[] impls = { "Shared", "PerThread" };
+                    for (int i = 0; i < 2; i++)
+                    {
+                        Ice.InitializationData initData = new Ice.InitializationData();
+                        initData.properties = communicator.getProperties().ice_clone_();
+                        initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
+
+                        Ice.Communicator ic = helper.initialize(initData);
+
+                        Dictionary<string, string> ctx = new Dictionary<string, string>();
+                        ctx["one"] = "ONE";
+                        ctx["two"] = "TWO";
+                        ctx["three"] = "THREE";
+
+                        var p3 =
+                            Test.MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint(0)));
+
+                        ic.getImplicitContext().setContext(ctx);
+                        test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx));
+                        {
+                            test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, ctx));
+                        }
+
+                        ic.getImplicitContext().put("zero", "ZERO");
+
+                        ctx = ic.getImplicitContext().getContext();
+                        {
+                            test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, ctx));
+                        }
+
+                        Dictionary<string, string> prxContext = new Dictionary<string, string>();
+                        prxContext["one"] = "UN";
+                        prxContext["four"] = "QUATRE";
+
+                        Dictionary<string, string> combined = prxContext;
+                        foreach (KeyValuePair<string, string> e in ctx)
+                        {
+                            try
+                            {
+                                combined.Add(e.Key, e.Value);
+                            }
+                            catch (System.ArgumentException)
+                            {
+                                // Ignore.
+                            }
+                        }
+                        test(combined["one"].Equals("UN"));
+
+                        p3 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(prxContext));
+
+                        ic.getImplicitContext().setContext(null);
+                        {
+                            test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, prxContext));
+                        }
+
+                        ic.getImplicitContext().setContext(ctx);
+                        {
+                            test(Ice.CollectionComparer.Equals(p3.opContextAsync().Result, combined));
+                        }
 
-                Ice.Communicator ic = Ice.Util.initialize(initData);
+                        //ic.getImplicitContext().setContext(null);
+                        ic.destroy();
+                    }
+                }
 
-                Dictionary<string, string> ctx = new Dictionary<string, string>();
-                ctx["one"] = "ONE";
-                ctx["two"] = "TWO";
-                ctx["three"] = "THREE";
+                //
+                // Test implicit context propagation with async result
+                //
+                if (p.ice_getConnection() != null)
+                {
+                    string[] impls = { "Shared", "PerThread" };
+                    for (int i = 0; i < 2; i++)
+                    {
+                        Ice.InitializationData initData = new Ice.InitializationData();
+                        initData.properties = communicator.getProperties().ice_clone_();
+                        initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
+
+                        Ice.Communicator ic = helper.initialize(initData);
+
+                        Dictionary<string, string> ctx = new Dictionary<string, string>();
+                        ctx["one"] = "ONE";
+                        ctx["two"] = "TWO";
+                        ctx["three"] = "THREE";
+
+                        var p3 =
+                            Test.MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint(0)));
+
+                        ic.getImplicitContext().setContext(ctx);
+                        test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx));
+                        {
+                            Ice.AsyncResult r = p3.begin_opContext();
+                            Dictionary<string, string> c = p3.end_opContext(r);
+                            test(Ice.CollectionComparer.Equals(c, ctx));
+                        }
+
+                        ic.getImplicitContext().put("zero", "ZERO");
+
+                        ctx = ic.getImplicitContext().getContext();
+                        {
+                            Ice.AsyncResult r = p3.begin_opContext();
+                            Dictionary<string, string> c = p3.end_opContext(r);
+                            test(Ice.CollectionComparer.Equals(c, ctx));
+                        }
+
+                        Dictionary<string, string> prxContext = new Dictionary<string, string>();
+                        prxContext["one"] = "UN";
+                        prxContext["four"] = "QUATRE";
+
+                        Dictionary<string, string> combined = prxContext;
+                        foreach (KeyValuePair<string, string> e in ctx)
+                        {
+                            try
+                            {
+                                combined.Add(e.Key, e.Value);
+                            }
+                            catch (ArgumentException)
+                            {
+                                // Ignore.
+                            }
+                        }
+                        test(combined["one"].Equals("UN"));
+
+                        p3 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(prxContext));
+
+                        ic.getImplicitContext().setContext(null);
+                        {
+                            Ice.AsyncResult r = p3.begin_opContext();
+                            Dictionary<string, string> c = p3.end_opContext(r);
+                            test(Ice.CollectionComparer.Equals(c, prxContext));
+                        }
+
+                        ic.getImplicitContext().setContext(ctx);
+                        {
+                            Ice.AsyncResult r = p3.begin_opContext();
+                            Dictionary<string, string> c = p3.end_opContext(r);
+                            test(Ice.CollectionComparer.Equals(c, combined));
+                        }
 
-                Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(
-                                        ic.stringToProxy("test:" + app.getTestEndpoint(0)));
+                        //ic.getImplicitContext().setContext(null);
+                        ic.destroy();
+                    }
+                }
 
-                ic.getImplicitContext().setContext(ctx);
-                test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx));
                 {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    Dictionary<string, string> c = p3.end_opContext(r);
-                    test(Ice.CollectionComparer.Equals(c, ctx));
+                    p.opIdempotentAsync().Wait();
                 }
 
-                ic.getImplicitContext().put("zero", "ZERO");
-
-                ctx = ic.getImplicitContext().getContext();
                 {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    Dictionary<string, string> c = p3.end_opContext(r);
-                    test(Ice.CollectionComparer.Equals(c, ctx));
+                    Ice.AsyncResult r = p.begin_opIdempotent();
+                    p.end_opIdempotent(r);
                 }
 
-                Dictionary<string, string> prxContext = new Dictionary<string, string>();
-                prxContext["one"] = "UN";
-                prxContext["four"] = "QUATRE";
-
-                Dictionary<string, string> combined = prxContext;
-                foreach(KeyValuePair<string, string> e in ctx)
                 {
-                    try
-                    {
-                        combined.Add(e.Key, e.Value);
-                    }
-                    catch(System.ArgumentException)
-                    {
-                        // Ignore.
-                    }
+                    Callback cb = new Callback();
+                    p.begin_opIdempotent().whenCompleted(cb.opIdempotent, cb.exCB);
+                    cb.check();
                 }
-                test(combined["one"].Equals("UN"));
-
-                p3 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(prxContext));
 
-                ic.getImplicitContext().setContext(null);
                 {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    Dictionary<string, string> c = p3.end_opContext(r);
-                    test(Ice.CollectionComparer.Equals(c, prxContext));
+                    Callback cb = new Callback();
+                    p.begin_opIdempotent().whenCompleted(
+                        () =>
+                        {
+                            cb.opIdempotent();
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
                 }
 
-                ic.getImplicitContext().setContext(ctx);
                 {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    Dictionary<string, string> c = p3.end_opContext(r);
-                    test(Ice.CollectionComparer.Equals(c, combined));
+                    p.opNonmutatingAsync().Wait();
                 }
 
-                //ic.getImplicitContext().setContext(null);
-                ic.destroy();
-            }
-        }
-
-        {
-            p.opIdempotentAsync().Wait();
-        }
-
-        {
-            Ice.AsyncResult r = p.begin_opIdempotent();
-            p.end_opIdempotent(r);
-        }
-
-        {
-            Callback cb = new Callback();
-            p.begin_opIdempotent().whenCompleted(cb.opIdempotent, cb.exCB);
-            cb.check();
-        }
-
-        {
-            Callback cb = new Callback();
-            p.begin_opIdempotent().whenCompleted(
-                () =>
-                {
-                    cb.opIdempotent();
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
-
-        {
-            p.opNonmutatingAsync().Wait();
-        }
-
-        {
-            Ice.AsyncResult r = p.begin_opNonmutating();
-            p.end_opNonmutating(r);
-        }
+                {
+                    Ice.AsyncResult r = p.begin_opNonmutating();
+                    p.end_opNonmutating(r);
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opNonmutating().whenCompleted(cb.opNonmutating, cb.exCB);
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opNonmutating().whenCompleted(cb.opNonmutating, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Callback cb = new Callback();
-            p.begin_opNonmutating().whenCompleted(
-                () =>
-                {
-                    cb.opNonmutating();
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    Callback cb = new Callback();
+                    p.begin_opNonmutating().whenCompleted(
+                        () =>
+                        {
+                            cb.opNonmutating();
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            var derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
-            test(derived != null);
-            var cb = new Callback();
-            derived.opDerivedAsync().Wait();
-        }
+                {
+                    var derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
+                    test(derived != null);
+                    var cb = new Callback();
+                    derived.opDerivedAsync().Wait();
+                }
 
-        {
-            Test.MyDerivedClassPrx derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
-            test(derived != null);
-            Callback cb = new Callback();
-            derived.begin_opDerived().whenCompleted(cb.opDerived, cb.exCB);
-            cb.check();
-        }
+                {
+                    var derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
+                    test(derived != null);
+                    Callback cb = new Callback();
+                    derived.begin_opDerived().whenCompleted(cb.opDerived, cb.exCB);
+                    cb.check();
+                }
 
-        {
-            Test.MyDerivedClassPrx derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
-            test(derived != null);
-            Callback cb = new Callback();
-            derived.begin_opDerived().whenCompleted(
-                () =>
-                {
-                    cb.opDerived();
-                },
-                (Ice.Exception ex) =>
-                {
-                     cb.exCB(ex);
-                });
-            cb.check();
-        }
+                {
+                    var derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
+                    test(derived != null);
+                    Callback cb = new Callback();
+                    derived.begin_opDerived().whenCompleted(
+                        () =>
+                        {
+                            cb.opDerived();
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exCB(ex);
+                        });
+                    cb.check();
+                }
 
-        {
-            test(p.opByte1Async(0xFF).Result == 0xFF);
-        }
+                {
+                    test(p.opByte1Async(0xFF).Result == 0xFF);
+                }
 
-        {
-            GenericCallback<byte> cb = new GenericCallback<byte>(0);
-            p.begin_opByte1(0xFF).whenCompleted(
-                (byte value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value() == 0xFF);
-        }
+                {
+                    GenericCallback<byte> cb = new GenericCallback<byte>(0);
+                    p.begin_opByte1(0xFF).whenCompleted(
+                        (byte value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value() == 0xFF);
+                }
 
-        {
-            test(p.opShort1Async(0x7FFF).Result == 0x7FFF);
-        }
+                {
+                    test(p.opShort1Async(0x7FFF).Result == 0x7FFF);
+                }
 
-        {
-            GenericCallback<short> cb = new GenericCallback<short>(0);
-            p.begin_opShort1(0x7FFF).whenCompleted(
-                (short value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value() == 0x7FFF);
-        }
+                {
+                    GenericCallback<short> cb = new GenericCallback<short>(0);
+                    p.begin_opShort1(0x7FFF).whenCompleted(
+                        (short value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value() == 0x7FFF);
+                }
 
-        {
-            test(p.opInt1Async(0x7FFFFFFF).Result == 0x7FFFFFFF);
-        }
+                {
+                    test(p.opInt1Async(0x7FFFFFFF).Result == 0x7FFFFFFF);
+                }
 
-        {
-            GenericCallback<int> cb = new GenericCallback<int>(0);
-            p.begin_opInt1(0x7FFFFFFF).whenCompleted(
-                (int value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value() == 0x7FFFFFFF);
-        }
+                {
+                    GenericCallback<int> cb = new GenericCallback<int>(0);
+                    p.begin_opInt1(0x7FFFFFFF).whenCompleted(
+                        (int value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value() == 0x7FFFFFFF);
+                }
 
-        {
-            test(p.opLong1Async(0x7FFFFFFFFFFFFFFF).Result == 0x7FFFFFFFFFFFFFFF);
-        }
+                {
+                    test(p.opLong1Async(0x7FFFFFFFFFFFFFFF).Result == 0x7FFFFFFFFFFFFFFF);
+                }
 
-        {
-            GenericCallback<long> cb = new GenericCallback<long>(0);
-            p.begin_opLong1(0x7FFFFFFFFFFFFFFF).whenCompleted(
-                (long value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value() == 0x7FFFFFFFFFFFFFFF);
-        }
+                {
+                    GenericCallback<long> cb = new GenericCallback<long>(0);
+                    p.begin_opLong1(0x7FFFFFFFFFFFFFFF).whenCompleted(
+                        (long value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value() == 0x7FFFFFFFFFFFFFFF);
+                }
 
-        {
-            test(p.opFloat1Async(1.0f).Result == 1.0f);
-        }
+                {
+                    test(p.opFloat1Async(1.0f).Result == 1.0f);
+                }
 
-        {
-            GenericCallback<float> cb = new GenericCallback<float>(0);
-            p.begin_opFloat1(1.0f).whenCompleted(
-                (float value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value() == 1.0f);
-        }
+                {
+                    GenericCallback<float> cb = new GenericCallback<float>(0);
+                    p.begin_opFloat1(1.0f).whenCompleted(
+                        (float value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value() == 1.0f);
+                }
 
-        {
-            test(p.opDouble1Async(1.0d).Result == 1.0d);
-        }
+                {
+                    test(p.opDouble1Async(1.0d).Result == 1.0d);
+                }
 
-        {
-            GenericCallback<double> cb = new GenericCallback<double>(0);
-            p.begin_opDouble1(1.0d).whenCompleted(
-                (double value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value() == 1.0d);
-        }
+                {
+                    GenericCallback<double> cb = new GenericCallback<double>(0);
+                    p.begin_opDouble1(1.0d).whenCompleted(
+                        (double value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value() == 1.0d);
+                }
 
-        {
-            test(p.opString1Async("opString1").Result.Equals("opString1"));
-        }
+                {
+                    test(p.opString1Async("opString1").Result.Equals("opString1"));
+                }
 
-        {
-            GenericCallback<string> cb = new GenericCallback<string>("");
-            p.begin_opString1("opString1").whenCompleted(
-                (string value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value().Equals("opString1"));
-        }
+                {
+                    GenericCallback<string> cb = new GenericCallback<string>("");
+                    p.begin_opString1("opString1").whenCompleted(
+                        (string value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value().Equals("opString1"));
+                }
 
-        {
-            test(p.opStringS1Async(null).Result.Length == 0);
-        }
+                {
+                    test(p.opStringS1Async(null).Result.Length == 0);
+                }
 
-        {
-            GenericCallback<string[]> cb = new GenericCallback<string[]>(null);
-            p.begin_opStringS1(null).whenCompleted(
-                (string[] seq) =>
-                {
-                    cb.response(seq);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-           test(cb.succeeded() && cb.value().Length == 0);
-        }
+                {
+                    GenericCallback<string[]> cb = new GenericCallback<string[]>(null);
+                    p.begin_opStringS1(null).whenCompleted(
+                        (string[] seq) =>
+                        {
+                            cb.response(seq);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value().Length == 0);
+                }
 
-        {
-            test(p.opByteBoolD1Async(null).Result.Count == 0);
-        }
+                {
+                    test(p.opByteBoolD1Async(null).Result.Count == 0);
+                }
 
-        {
-            GenericCallback<Dictionary<byte, bool>> cb = new GenericCallback<Dictionary<byte, bool>>(null);
-            p.begin_opByteBoolD1(null).whenCompleted(
-                (Dictionary<byte, bool> value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value().Count == 0);
-        }
+                {
+                    GenericCallback<Dictionary<byte, bool>> cb = new GenericCallback<Dictionary<byte, bool>>(null);
+                    p.begin_opByteBoolD1(null).whenCompleted(
+                        (Dictionary<byte, bool> value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value().Count == 0);
+                }
 
-        {
-            test(p.opStringS2Async(null).Result.Length == 0);
-        }
+                {
+                    test(p.opStringS2Async(null).Result.Length == 0);
+                }
 
-        {
-            GenericCallback<string[]> cb = new GenericCallback<string[]>(null);
-            p.begin_opStringS2(null).whenCompleted(
-                (string[] seq) =>
-                {
-                    cb.response(seq);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-           test(cb.succeeded() && cb.value().Length == 0);
-        }
+                {
+                    GenericCallback<string[]> cb = new GenericCallback<string[]>(null);
+                    p.begin_opStringS2(null).whenCompleted(
+                        (string[] seq) =>
+                        {
+                            cb.response(seq);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value().Length == 0);
+                }
 
-        {
-            test(p.opByteBoolD2Async(null).Result.Count == 0);
-        }
+                {
+                    test(p.opByteBoolD2Async(null).Result.Count == 0);
+                }
 
-        {
-            GenericCallback<Dictionary<byte, bool>> cb = new GenericCallback<Dictionary<byte, bool>>(null);
-            p.begin_opByteBoolD2(null).whenCompleted(
-                (Dictionary<byte, bool> value) =>
-                {
-                    cb.response(value);
-                },
-                (Ice.Exception ex) =>
-                {
-                    cb.exception(ex);
-                });
-            test(cb.succeeded() && cb.value().Count == 0);
-        }
+                {
+                    GenericCallback<Dictionary<byte, bool>> cb = new GenericCallback<Dictionary<byte, bool>>(null);
+                    p.begin_opByteBoolD2(null).whenCompleted(
+                        (Dictionary<byte, bool> value) =>
+                        {
+                            cb.response(value);
+                        },
+                        (Ice.Exception ex) =>
+                        {
+                            cb.exception(ex);
+                        });
+                    test(cb.succeeded() && cb.value().Count == 0);
+                }
 
-        Func<Task> task = async () =>
-        {
-            {
-                var p1 = await p.opMStruct1Async();
+                Func<Task> task = async () =>
+                {
+                    {
+                        var p1 = await p.opMStruct1Async();
 
-                p1.e = Test.MyEnum.enum3;
-                var r = await p.opMStruct2Async(p1);
-                test(r.p2.Equals(p1) && r.returnValue.Equals(p1));
-            }
+                        p1.e = Test.MyEnum.enum3;
+                        var r = await p.opMStruct2Async(p1);
+                        test(r.p2.Equals(p1) && r.returnValue.Equals(p1));
+                    }
 
-            {
-                await p.opMSeq1Async();
+                    {
+                        await p.opMSeq1Async();
 
-                var p1 = new string[1];
-                p1[0] = "test";
-                var r = await p.opMSeq2Async(p1);
-                test(Ice.CollectionComparer.Equals(r.p2, p1) && Ice.CollectionComparer.Equals(r.returnValue, p1));
-            }
+                        var p1 = new string[1];
+                        p1[0] = "test";
+                        var r = await p.opMSeq2Async(p1);
+                        test(Ice.CollectionComparer.Equals(r.p2, p1) &&
+                             Ice.CollectionComparer.Equals(r.returnValue, p1));
+                    }
 
-            {
-                await p.opMDict1Async();
+                    {
+                        await p.opMDict1Async();
 
-                var p1 = new Dictionary<string, string>();
-                p1["test"] = "test";
-                var r = await p.opMDict2Async(p1);
-                test(Ice.CollectionComparer.Equals(r.p2, p1) && Ice.CollectionComparer.Equals(r.returnValue, p1));
+                        var p1 = new Dictionary<string, string>();
+                        p1["test"] = "test";
+                        var r = await p.opMDict2Async(p1);
+                        test(Ice.CollectionComparer.Equals(r.p2, p1) &&
+                             Ice.CollectionComparer.Equals(r.returnValue, p1));
+                    }
+                };
             }
-        };
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/operations/Twoways.cs zeroc-ice-3.7.2/csharp/test/Ice/operations/Twoways.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/operations/Twoways.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/operations/Twoways.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,1574 +1,1577 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Threading;
 
-class Twoways
+namespace Ice
 {
-    private static void test(bool b)
+    namespace operations
     {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    class PerThreadContextInvokeThread
-    {
-        public PerThreadContextInvokeThread(Test.MyClassPrx proxy)
-        {
-            _proxy = proxy;
-        }
-
-        public void Join()
+        class Twoways
         {
-            _thread.Join();
-        }
-
-        public void Start()
-        {
-            _thread = new Thread(new ThreadStart(Run));
-            _thread.Start();
-        }
-
-        public void Run()
-        {
-            Dictionary<string, string> ctx = _proxy.ice_getCommunicator().getImplicitContext().getContext();
-            test(ctx.Count == 0);
-            ctx["one"] =  "ONE";
-            _proxy.ice_getCommunicator().getImplicitContext().setContext(ctx);
-            test(Ice.CollectionComparer.Equals(_proxy.opContext(), ctx));
-        }
-
-        private Test.MyClassPrx _proxy;
-        private Thread _thread;
-    }
+            private static void test(bool b)
+            {
+                if (!b)
+                {
+                    throw new System.Exception();
+                }
+            }
 
-    internal static void twoways(TestCommon.Application app, Test.MyClassPrx p)
-    {
-        Ice.Communicator communicator = app.communicator();
-        string[] literals = p.opStringLiterals();
+            class PerThreadContextInvokeThread
+            {
+                public PerThreadContextInvokeThread(Test.MyClassPrx proxy)
+                {
+                    _proxy = proxy;
+                }
 
-        test(Test.s0.value.Equals("\\") &&
-             Test.s0.value.Equals(Test.sw0.value) &&
-             Test.s0.value.Equals(literals[0]) &&
-             Test.s0.value.Equals(literals[11]));
-
-        test(Test.s1.value.Equals("A") &&
-             Test.s1.value.Equals(Test.sw1.value) &&
-             Test.s1.value.Equals(literals[1]) &&
-             Test.s1.value.Equals(literals[12]));
-
-        test(Test.s2.value.Equals("Ice") &&
-             Test.s2.value.Equals(Test.sw2.value) &&
-             Test.s2.value.Equals(literals[2]) &&
-             Test.s2.value.Equals(literals[13]));
-
-        test(Test.s3.value.Equals("A21") &&
-             Test.s3.value.Equals(Test.sw3.value) &&
-             Test.s3.value.Equals(literals[3]) &&
-             Test.s3.value.Equals(literals[14]));
-
-        test(Test.s4.value.Equals("\\u0041 \\U00000041") &&
-             Test.s4.value.Equals(Test.sw4.value) &&
-             Test.s4.value.Equals(literals[4]) &&
-             Test.s4.value.Equals(literals[15]));
-
-        test(Test.s5.value.Equals("\u00FF") &&
-             Test.s5.value.Equals(Test.sw5.value) &&
-             Test.s5.value.Equals(literals[5]) &&
-             Test.s5.value.Equals(literals[16]));
-
-        test(Test.s6.value.Equals("\u03FF") &&
-             Test.s6.value.Equals(Test.sw6.value) &&
-             Test.s6.value.Equals(literals[6]) &&
-             Test.s6.value.Equals(literals[17]));
-
-        test(Test.s7.value.Equals("\u05F0") &&
-             Test.s7.value.Equals(Test.sw7.value) &&
-             Test.s7.value.Equals(literals[7]) &&
-             Test.s7.value.Equals(literals[18]));
-
-        test(Test.s8.value.Equals("\U00010000") &&
-             Test.s8.value.Equals(Test.sw8.value) &&
-             Test.s8.value.Equals(literals[8]) &&
-             Test.s8.value.Equals(literals[19]));
-
-        test(Test.s9.value.Equals("\U0001F34C") &&
-             Test.s9.value.Equals(Test.sw9.value) &&
-             Test.s9.value.Equals(literals[9]) &&
-             Test.s9.value.Equals(literals[20]));
-
-        test(Test.s10.value.Equals("\u0DA7") &&
-             Test.s10.value.Equals(Test.sw10.value) &&
-             Test.s10.value.Equals(literals[10]) &&
-             Test.s10.value.Equals(literals[21]));
-
-        test(Test.ss0.value.Equals("\'\"\u003f\\\a\b\f\n\r\t\v\u0006") &&
-             Test.ss0.value.Equals(Test.ss1.value) &&
-             Test.ss0.value.Equals(Test.ss2.value) &&
-             Test.ss0.value.Equals(literals[22]) &&
-             Test.ss0.value.Equals(literals[23]) &&
-             Test.ss0.value.Equals(literals[24]));
-
-        test(Test.ss3.value.Equals("\\\\U\\u\\") &&
-             Test.ss3.value.Equals(literals[25]));
-
-        test(Test.ss4.value.Equals("\\A\\") &&
-             Test.ss4.value.Equals(literals[26]));
-
-        test(Test.ss5.value.Equals("\\u0041\\") &&
-             Test.ss5.value.Equals(literals[27]));
-
-        test(Test.su0.value.Equals(Test.su1.value) &&
-             Test.su0.value.Equals(Test.su2.value) &&
-             Test.su0.value.Equals(literals[28]) &&
-             Test.su0.value.Equals(literals[29]) &&
-             Test.su0.value.Equals(literals[30]));
+                public void Join()
+                {
+                    _thread.Join();
+                }
 
-        p.ice_ping();
+                public void Start()
+                {
+                    _thread = new Thread(new ThreadStart(Run));
+                    _thread.Start();
+                }
 
-        test(Test.MyClassPrxHelper.ice_staticId().Equals(Test.MyClassDisp_.ice_staticId()));
-        test(Ice.ObjectPrxHelper.ice_staticId().Equals(Ice.ObjectImpl.ice_staticId()));
+                public void Run()
+                {
+                    Dictionary<string, string> ctx = _proxy.ice_getCommunicator().getImplicitContext().getContext();
+                    test(ctx.Count == 0);
+                    ctx["one"] = "ONE";
+                    _proxy.ice_getCommunicator().getImplicitContext().setContext(ctx);
+                    test(Ice.CollectionComparer.Equals(_proxy.opContext(), ctx));
+                }
 
-        test(p.ice_isA(Test.MyClassDisp_.ice_staticId()));
-        test(p.ice_id().Equals(Test.MyDerivedClassDisp_.ice_staticId()));
+                private Test.MyClassPrx _proxy;
+                private Thread _thread;
+            }
 
-        {
-            string[] ids = p.ice_ids();
-            test(ids.Length == 3);
-            test(ids[0].Equals("::Ice::Object"));
-            test(ids[1].Equals("::Test::MyClass"));
-            test(ids[2].Equals("::Test::MyDerivedClass"));
-        }
+            internal static void twoways(global::Test.TestHelper helper, Test.MyClassPrx p)
+            {
+                Ice.Communicator communicator = helper.communicator();
+                string[] literals = p.opStringLiterals();
 
-        {
-            p.opVoid();
-        }
+                test(Test.s0.value.Equals("\\") &&
+                     Test.s0.value.Equals(Test.sw0.value) &&
+                     Test.s0.value.Equals(literals[0]) &&
+                     Test.s0.value.Equals(literals[11]));
+
+                test(Test.s1.value.Equals("A") &&
+                     Test.s1.value.Equals(Test.sw1.value) &&
+                     Test.s1.value.Equals(literals[1]) &&
+                     Test.s1.value.Equals(literals[12]));
+
+                test(Test.s2.value.Equals("Ice") &&
+                     Test.s2.value.Equals(Test.sw2.value) &&
+                     Test.s2.value.Equals(literals[2]) &&
+                     Test.s2.value.Equals(literals[13]));
+
+                test(Test.s3.value.Equals("A21") &&
+                     Test.s3.value.Equals(Test.sw3.value) &&
+                     Test.s3.value.Equals(literals[3]) &&
+                     Test.s3.value.Equals(literals[14]));
+
+                test(Test.s4.value.Equals("\\u0041 \\U00000041") &&
+                     Test.s4.value.Equals(Test.sw4.value) &&
+                     Test.s4.value.Equals(literals[4]) &&
+                     Test.s4.value.Equals(literals[15]));
+
+                test(Test.s5.value.Equals("\u00FF") &&
+                     Test.s5.value.Equals(Test.sw5.value) &&
+                     Test.s5.value.Equals(literals[5]) &&
+                     Test.s5.value.Equals(literals[16]));
+
+                test(Test.s6.value.Equals("\u03FF") &&
+                     Test.s6.value.Equals(Test.sw6.value) &&
+                     Test.s6.value.Equals(literals[6]) &&
+                     Test.s6.value.Equals(literals[17]));
+
+                test(Test.s7.value.Equals("\u05F0") &&
+                     Test.s7.value.Equals(Test.sw7.value) &&
+                     Test.s7.value.Equals(literals[7]) &&
+                     Test.s7.value.Equals(literals[18]));
+
+                test(Test.s8.value.Equals("\U00010000") &&
+                     Test.s8.value.Equals(Test.sw8.value) &&
+                     Test.s8.value.Equals(literals[8]) &&
+                     Test.s8.value.Equals(literals[19]));
+
+                test(Test.s9.value.Equals("\U0001F34C") &&
+                     Test.s9.value.Equals(Test.sw9.value) &&
+                     Test.s9.value.Equals(literals[9]) &&
+                     Test.s9.value.Equals(literals[20]));
+
+                test(Test.s10.value.Equals("\u0DA7") &&
+                     Test.s10.value.Equals(Test.sw10.value) &&
+                     Test.s10.value.Equals(literals[10]) &&
+                     Test.s10.value.Equals(literals[21]));
+
+                test(Test.ss0.value.Equals("\'\"\u003f\\\a\b\f\n\r\t\v\u0006") &&
+                     Test.ss0.value.Equals(Test.ss1.value) &&
+                     Test.ss0.value.Equals(Test.ss2.value) &&
+                     Test.ss0.value.Equals(literals[22]) &&
+                     Test.ss0.value.Equals(literals[23]) &&
+                     Test.ss0.value.Equals(literals[24]));
+
+                test(Test.ss3.value.Equals("\\\\U\\u\\") &&
+                     Test.ss3.value.Equals(literals[25]));
+
+                test(Test.ss4.value.Equals("\\A\\") &&
+                    Test.ss4.value.Equals(literals[26]));
+
+                test(Test.ss5.value.Equals("\\u0041\\") &&
+                     Test.ss5.value.Equals(literals[27]));
+
+                test(Test.su0.value.Equals(Test.su1.value) &&
+                     Test.su0.value.Equals(Test.su2.value) &&
+                     Test.su0.value.Equals(literals[28]) &&
+                     Test.su0.value.Equals(literals[29]) &&
+                     Test.su0.value.Equals(literals[30]));
 
-        {
-            byte b;
-            byte r;
+                p.ice_ping();
 
-            r = p.opByte(0xff, 0x0f, out b);
-            test(b == 0xf0);
-            test(r == 0xff);
-        }
+                test(Test.MyClassPrxHelper.ice_staticId().Equals(Test.MyClassDisp_.ice_staticId()));
+                test(Ice.ObjectPrxHelper.ice_staticId().Equals(Ice.ObjectImpl.ice_staticId()));
 
-        {
-            bool b;
-            bool r;
+                test(p.ice_isA(Test.MyClassDisp_.ice_staticId()));
+                test(p.ice_id().Equals(Test.MyDerivedClassDisp_.ice_staticId()));
 
-            r = p.opBool(true, false, out b);
-            test(b);
-            test(!r);
-        }
+                {
+                    string[] ids = p.ice_ids();
+                    test(ids.Length == 3);
+                    test(ids[0].Equals("::Ice::Object"));
+                    test(ids[1].Equals("::Test::MyClass"));
+                    test(ids[2].Equals("::Test::MyDerivedClass"));
+                }
 
-        {
-            short s;
-            int i;
-            long l;
-            long r;
-
-            r = p.opShortIntLong(10, 11, 12L, out s, out i, out l);
-            test(s == 10);
-            test(i == 11);
-            test(l == 12);
-            test(r == 12L);
-
-            r = p.opShortIntLong(Int16.MinValue, Int32.MinValue, Int64.MinValue, out s, out i, out l);
-            test(s == Int16.MinValue);
-            test(i == Int32.MinValue);
-            test(l == Int64.MinValue);
-            test(r == Int64.MinValue);
-
-            r = p.opShortIntLong(Int16.MaxValue, Int32.MaxValue, Int64.MaxValue, out s, out i, out l);
-            test(s == Int16.MaxValue);
-            test(i == Int32.MaxValue);
-            test(l == Int64.MaxValue);
-            test(r == Int64.MaxValue);
-        }
+                {
+                    p.opVoid();
+                }
 
-        {
-            float f;
-            double d;
-            double r;
-
-            r = p.opFloatDouble(3.14f, 1.1e10, out f, out d);
-            test(f == 3.14f);
-            test(d == 1.1e10);
-            test(r == 1.1e10);
-
-            r = p.opFloatDouble(Single.Epsilon, Double.MinValue, out f, out d);
-            test(f == Single.Epsilon);
-            test(d == Double.MinValue);
-            test(r == Double.MinValue);
-
-            r = p.opFloatDouble(Single.MaxValue, Double.MaxValue, out f, out d);
-            test(f == Single.MaxValue);
-            test(d == Double.MaxValue);
-            test(r == Double.MaxValue);
-        }
+                {
+                    byte b;
+                    byte r;
 
-        {
-            string s;
-            string r;
+                    r = p.opByte(0xff, 0x0f, out b);
+                    test(b == 0xf0);
+                    test(r == 0xff);
+                }
 
-            r = p.opString("hello", "world", out s);
-            test(s.Equals("world hello"));
-            test(r.Equals("hello world"));
-        }
+                {
+                    bool b;
+                    bool r;
 
-        {
-            Test.MyEnum e;
-            Test.MyEnum r;
+                    r = p.opBool(true, false, out b);
+                    test(b);
+                    test(!r);
+                }
 
-            r = p.opMyEnum(Test.MyEnum.enum2, out e);
-            test(e == Test.MyEnum.enum2);
-            test(r == Test.MyEnum.enum3);
-        }
+                {
+                    short s;
+                    int i;
+                    long l;
+                    long r;
+
+                    r = p.opShortIntLong(10, 11, 12L, out s, out i, out l);
+                    test(s == 10);
+                    test(i == 11);
+                    test(l == 12);
+                    test(r == 12L);
+
+                    r = p.opShortIntLong(Int16.MinValue, Int32.MinValue, Int64.MinValue, out s, out i, out l);
+                    test(s == Int16.MinValue);
+                    test(i == Int32.MinValue);
+                    test(l == Int64.MinValue);
+                    test(r == Int64.MinValue);
+
+                    r = p.opShortIntLong(Int16.MaxValue, Int32.MaxValue, Int64.MaxValue, out s, out i, out l);
+                    test(s == Int16.MaxValue);
+                    test(i == Int32.MaxValue);
+                    test(l == Int64.MaxValue);
+                    test(r == Int64.MaxValue);
+                }
 
-        {
-            Test.MyClassPrx c1;
-            Test.MyClassPrx c2;
-            Test.MyClassPrx r;
-
-            r = p.opMyClass(p, out c1, out c2);
-            test(Ice.Util.proxyIdentityAndFacetCompare(c1, p) == 0);
-            test(Ice.Util.proxyIdentityAndFacetCompare(c2, p) != 0);
-            test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0);
-            test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
-            test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity")));
-            test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
-            r.opVoid();
-            c1.opVoid();
-            try
-            {
-                c2.opVoid();
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException)
-            {
-            }
+                {
+                    float f;
+                    double d;
+                    double r;
+
+                    r = p.opFloatDouble(3.14f, 1.1e10, out f, out d);
+                    test(f == 3.14f);
+                    test(d == 1.1e10);
+                    test(r == 1.1e10);
+
+                    r = p.opFloatDouble(Single.Epsilon, Double.MinValue, out f, out d);
+                    test(f == Single.Epsilon);
+                    test(d == Double.MinValue);
+                    test(r == Double.MinValue);
+
+                    r = p.opFloatDouble(Single.MaxValue, Double.MaxValue, out f, out d);
+                    test(f == Single.MaxValue);
+                    test(d == Double.MaxValue);
+                    test(r == Double.MaxValue);
+                }
 
-            r = p.opMyClass(null, out c1, out c2);
-            test(c1 == null);
-            test(c2 != null);
-            test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0);
-            r.opVoid();
-        }
+                {
+                    string s;
+                    string r;
 
-        {
-            Test.Structure si1 = new Test.Structure();
-            si1.p = p;
-            si1.e = Test.MyEnum.enum3;
-            si1.s = new Test.AnotherStruct();
-            si1.s.s = "abc";
-            Test.Structure si2 = new Test.Structure();
-            si2.p = null;
-            si2.e = Test.MyEnum.enum2;
-            si2.s = new Test.AnotherStruct();
-            si2.s.s = "def";
-
-            Test.Structure so;
-            Test.Structure rso = p.opStruct(si1, si2, out so);
-            test(rso.p == null);
-            test(rso.e == Test.MyEnum.enum2);
-            test(rso.s.s.Equals("def"));
-            test(so.p.Equals(p));
-            test(so.e == Test.MyEnum.enum3);
-            test(so.s.s.Equals("a new string"));
-            so.p.opVoid();
-
-            //
-            // Test marshalling of null structs and structs with null members.
-            //
-            si1 = new Test.Structure();
-            si2 = null;
-
-            rso = p.opStruct(si1, si2, out so);
-            test(rso.p == null);
-            test(rso.e == Test.MyEnum.enum1);
-            test(rso.s.s.Equals(""));
-            test(so.p == null);
-            test(so.e == Test.MyEnum.enum1);
-            test(so.s.s.Equals("a new string"));
-        }
+                    r = p.opString("hello", "world", out s);
+                    test(s.Equals("world hello"));
+                    test(r.Equals("hello world"));
+                }
 
-        {
-            byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
-            byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
+                {
+                    Test.MyEnum e;
+                    Test.MyEnum r;
 
-            byte[] bso;
-            byte[] rso;
+                    r = p.opMyEnum(Test.MyEnum.enum2, out e);
+                    test(e == Test.MyEnum.enum2);
+                    test(r == Test.MyEnum.enum3);
+                }
 
-            rso = p.opByteS(bsi1, bsi2, out bso);
-            test(bso.Length == 4);
-            test(bso[0] == 0x22);
-            test(bso[1] == 0x12);
-            test(bso[2] == 0x11);
-            test(bso[3] == 0x01);
-            test(rso.Length == 8);
-            test(rso[0] == 0x01);
-            test(rso[1] == 0x11);
-            test(rso[2] == 0x12);
-            test(rso[3] == 0x22);
-            test(rso[4] == 0xf1);
-            test(rso[5] == 0xf2);
-            test(rso[6] == 0xf3);
-            test(rso[7] == 0xf4);
-        }
+                {
+                    Test.MyClassPrx c1;
+                    Test.MyClassPrx c2;
+                    Test.MyClassPrx r;
+
+                    r = p.opMyClass(p, out c1, out c2);
+                    test(Ice.Util.proxyIdentityAndFacetCompare(c1, p) == 0);
+                    test(Ice.Util.proxyIdentityAndFacetCompare(c2, p) != 0);
+                    test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0);
+                    test(c1.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
+                    test(c2.ice_getIdentity().Equals(Ice.Util.stringToIdentity("noSuchIdentity")));
+                    test(r.ice_getIdentity().Equals(Ice.Util.stringToIdentity("test")));
+                    r.opVoid();
+                    c1.opVoid();
+                    try
+                    {
+                        c2.opVoid();
+                        test(false);
+                    }
+                    catch (Ice.ObjectNotExistException)
+                    {
+                    }
 
-        {
-            bool[] bsi1 = new bool[] { true, true, false };
-            bool[] bsi2 = new bool[] { false };
+                    r = p.opMyClass(null, out c1, out c2);
+                    test(c1 == null);
+                    test(c2 != null);
+                    test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0);
+                    r.opVoid();
+                }
 
-            bool[] bso;
-            bool[] rso;
+                {
+                    Test.Structure si1 = new Test.Structure();
+                    si1.p = p;
+                    si1.e = Test.MyEnum.enum3;
+                    si1.s = new Test.AnotherStruct();
+                    si1.s.s = "abc";
+                    Test.Structure si2 = new Test.Structure();
+                    si2.p = null;
+                    si2.e = Test.MyEnum.enum2;
+                    si2.s = new Test.AnotherStruct();
+                    si2.s.s = "def";
+
+                    Test.Structure so;
+                    Test.Structure rso = p.opStruct(si1, si2, out so);
+                    test(rso.p == null);
+                    test(rso.e == Test.MyEnum.enum2);
+                    test(rso.s.s.Equals("def"));
+                    test(so.p.Equals(p));
+                    test(so.e == Test.MyEnum.enum3);
+                    test(so.s.s.Equals("a new string"));
+                    so.p.opVoid();
+
+                    //
+                    // Test marshalling of null structs and structs with null members.
+                    //
+                    si1 = new Test.Structure();
+                    si2 = null;
+
+                    rso = p.opStruct(si1, si2, out so);
+                    test(rso.p == null);
+                    test(rso.e == Test.MyEnum.enum1);
+                    test(rso.s.s.Equals(""));
+                    test(so.p == null);
+                    test(so.e == Test.MyEnum.enum1);
+                    test(so.s.s.Equals("a new string"));
+                }
 
-            rso = p.opBoolS(bsi1, bsi2, out bso);
-            test(bso.Length == 4);
-            test(bso[0]);
-            test(bso[1]);
-            test(!bso[2]);
-            test(!bso[3]);
-            test(rso.Length == 3);
-            test(!rso[0]);
-            test(rso[1]);
-            test(rso[2]);
-        }
+                {
+                    byte[] bsi1 = new byte[] { 0x01, 0x11, 0x12, 0x22 };
+                    byte[] bsi2 = new byte[] { 0xf1, 0xf2, 0xf3, 0xf4 };
 
-        {
-            short[] ssi = new short[] { 1, 2, 3 };
-            int[] isi = new int[] { 5, 6, 7, 8 };
-            long[] lsi = new long[] { 10, 30, 20 };
-
-            short[] sso;
-            int[] iso;
-            long[] lso;
-            long[] rso;
-
-            rso = p.opShortIntLongS(ssi, isi, lsi, out sso, out iso, out lso);
-            test(sso.Length == 3);
-            test(sso[0] == 1);
-            test(sso[1] == 2);
-            test(sso[2] == 3);
-            test(iso.Length == 4);
-            test(iso[0] == 8);
-            test(iso[1] == 7);
-            test(iso[2] == 6);
-            test(iso[3] == 5);
-            test(lso.Length == 6);
-            test(lso[0] == 10);
-            test(lso[1] == 30);
-            test(lso[2] == 20);
-            test(lso[3] == 10);
-            test(lso[4] == 30);
-            test(lso[5] == 20);
-            test(rso.Length == 3);
-            test(rso[0] == 10);
-            test(rso[1] == 30);
-            test(rso[2] == 20);
-        }
+                    byte[] bso;
+                    byte[] rso;
 
-        {
-            float[] fsi = new float[] { 3.14f, 1.11f };
-            double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                    rso = p.opByteS(bsi1, bsi2, out bso);
+                    test(bso.Length == 4);
+                    test(bso[0] == 0x22);
+                    test(bso[1] == 0x12);
+                    test(bso[2] == 0x11);
+                    test(bso[3] == 0x01);
+                    test(rso.Length == 8);
+                    test(rso[0] == 0x01);
+                    test(rso[1] == 0x11);
+                    test(rso[2] == 0x12);
+                    test(rso[3] == 0x22);
+                    test(rso[4] == 0xf1);
+                    test(rso[5] == 0xf2);
+                    test(rso[6] == 0xf3);
+                    test(rso[7] == 0xf4);
+                }
 
-            float[] fso;
-            double[] dso;
-            double[] rso;
-
-            rso = p.opFloatDoubleS(fsi, dsi, out fso, out dso);
-            test(fso.Length == 2);
-            test(fso[0] == 3.14f);
-            test(fso[1] == 1.11f);
-            test(dso.Length == 3);
-            test(dso[0] == 1.3e10);
-            test(dso[1] == 1.2e10);
-            test(dso[2] == 1.1e10);
-            test(rso.Length == 5);
-            test(rso[0] == 1.1e10);
-            test(rso[1] == 1.2e10);
-            test(rso[2] == 1.3e10);
-            test((float)rso[3] == 3.14f);
-            test((float)rso[4] == 1.11f);
-        }
+                {
+                    bool[] bsi1 = new bool[] { true, true, false };
+                    bool[] bsi2 = new bool[] { false };
 
-        {
-            string[] ssi1 = new string[] { "abc", "de", "fghi" };
-            string[] ssi2 = new string[] { "xyz" };
+                    bool[] bso;
+                    bool[] rso;
 
-            string[] sso;
-            string[] rso;
+                    rso = p.opBoolS(bsi1, bsi2, out bso);
+                    test(bso.Length == 4);
+                    test(bso[0]);
+                    test(bso[1]);
+                    test(!bso[2]);
+                    test(!bso[3]);
+                    test(rso.Length == 3);
+                    test(!rso[0]);
+                    test(rso[1]);
+                    test(rso[2]);
+                }
 
-            rso = p.opStringS(ssi1, ssi2, out sso);
-            test(sso.Length == 4);
-            test(sso[0].Equals("abc"));
-            test(sso[1].Equals("de"));
-            test(sso[2].Equals("fghi"));
-            test(sso[3].Equals("xyz"));
-            test(rso.Length == 3);
-            test(rso[0].Equals("fghi"));
-            test(rso[1].Equals("de"));
-            test(rso[2].Equals("abc"));
-        }
+                {
+                    short[] ssi = new short[] { 1, 2, 3 };
+                    int[] isi = new int[] { 5, 6, 7, 8 };
+                    long[] lsi = new long[] { 10, 30, 20 };
+
+                    short[] sso;
+                    int[] iso;
+                    long[] lso;
+                    long[] rso;
+
+                    rso = p.opShortIntLongS(ssi, isi, lsi, out sso, out iso, out lso);
+                    test(sso.Length == 3);
+                    test(sso[0] == 1);
+                    test(sso[1] == 2);
+                    test(sso[2] == 3);
+                    test(iso.Length == 4);
+                    test(iso[0] == 8);
+                    test(iso[1] == 7);
+                    test(iso[2] == 6);
+                    test(iso[3] == 5);
+                    test(lso.Length == 6);
+                    test(lso[0] == 10);
+                    test(lso[1] == 30);
+                    test(lso[2] == 20);
+                    test(lso[3] == 10);
+                    test(lso[4] == 30);
+                    test(lso[5] == 20);
+                    test(rso.Length == 3);
+                    test(rso[0] == 10);
+                    test(rso[1] == 30);
+                    test(rso[2] == 20);
+                }
 
-        {
-            byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
-            byte[] s12 = new byte[] { 0xff };
-            byte[][] bsi1 = new byte[][] { s11, s12 };
-
-            byte[] s21 = new byte[] { 0x0e };
-            byte[] s22 = new byte[] { 0xf2, 0xf1 };
-            byte[][] bsi2 = new byte[][] { s21, s22 };
-
-            byte[][] bso;
-            byte[][] rso;
-
-            rso = p.opByteSS(bsi1, bsi2, out bso);
-            test(bso.Length == 2);
-            test(bso[0].Length == 1);
-            test(bso[0][0] == 0xff);
-            test(bso[1].Length == 3);
-            test(bso[1][0] == 0x01);
-            test(bso[1][1] == 0x11);
-            test(bso[1][2] == 0x12);
-            test(rso.Length == 4);
-            test(rso[0].Length == 3);
-            test(rso[0][0] == 0x01);
-            test(rso[0][1] == 0x11);
-            test(rso[0][2] == 0x12);
-            test(rso[1].Length == 1);
-            test(rso[1][0] == 0xff);
-            test(rso[2].Length == 1);
-            test(rso[2][0] == 0x0e);
-            test(rso[3].Length == 2);
-            test(rso[3][0] == 0xf2);
-            test(rso[3][1] == 0xf1);
-        }
+                {
+                    float[] fsi = new float[] { 3.14f, 1.11f };
+                    double[] dsi = new double[] { 1.1e10, 1.2e10, 1.3e10 };
 
-        {
-            bool[] s11 = new bool[] {true};
-            bool[] s12 = new bool[] {false};
-            bool[] s13 = new bool[] {true, true};
-            bool[][] bsi1 = new bool[][] {s11, s12, s13};
-
-            bool[] s21 = new bool[] {false, false, true};
-            bool[][] bsi2 = new bool[][] {s21};
-
-            bool[][] rso;
-            bool[][] bso;
-
-            rso = p.opBoolSS(bsi1, bsi2, out bso);
-            test(bso.Length == 4);
-            test(bso[0].Length == 1);
-            test(bso[0][0]);
-            test(bso[1].Length == 1);
-            test(!bso[1][0]);
-            test(bso[2].Length == 2);
-            test(bso[2][0]);
-            test(bso[2][1]);
-            test(bso[3].Length == 3);
-            test(!bso[3][0]);
-            test(!bso[3][1]);
-            test(bso[3][2]);
-            test(rso.Length == 3);
-            test(rso[0].Length == 2);
-            test(rso[0][0]);
-            test(rso[0][1]);
-            test(rso[1].Length == 1);
-            test(!rso[1][0]);
-            test(rso[2].Length == 1);
-            test(rso[2][0]);
-        }
+                    float[] fso;
+                    double[] dso;
+                    double[] rso;
+
+                    rso = p.opFloatDoubleS(fsi, dsi, out fso, out dso);
+                    test(fso.Length == 2);
+                    test(fso[0] == 3.14f);
+                    test(fso[1] == 1.11f);
+                    test(dso.Length == 3);
+                    test(dso[0] == 1.3e10);
+                    test(dso[1] == 1.2e10);
+                    test(dso[2] == 1.1e10);
+                    test(rso.Length == 5);
+                    test(rso[0] == 1.1e10);
+                    test(rso[1] == 1.2e10);
+                    test(rso[2] == 1.3e10);
+                    test((float)rso[3] == 3.14f);
+                    test((float)rso[4] == 1.11f);
+                }
 
-        {
-            short[] s11 = new short[] {1, 2, 5};
-            short[] s12 = new short[] {13};
-            short[] s13 = new short[] {};
-            short[][] ssi = new short[][] {s11, s12, s13};
-
-            int[] i11 = new int[] {24, 98};
-            int[] i12 = new int[] {42};
-            int[][] isi = new int[][] {i11, i12};
-
-            long[] l11 = new long[] {496, 1729};
-            long[][] lsi = new long[][] {l11};
-
-            short[][] sso;
-            int[][] iso;
-            long[][] lso;
-            long[][] rso;
-
-            rso = p.opShortIntLongSS(ssi, isi, lsi, out sso, out iso, out lso);
-            test(rso.Length == 1);
-            test(rso[0].Length == 2);
-            test(rso[0][0] == 496);
-            test(rso[0][1] == 1729);
-            test(sso.Length == 3);
-            test(sso[0].Length == 3);
-            test(sso[0][0] == 1);
-            test(sso[0][1] == 2);
-            test(sso[0][2] == 5);
-            test(sso[1].Length == 1);
-            test(sso[1][0] == 13);
-            test(sso[2].Length == 0);
-            test(iso.Length == 2);
-            test(iso[0].Length == 1);
-            test(iso[0][0] == 42);
-            test(iso[1].Length == 2);
-            test(iso[1][0] == 24);
-            test(iso[1][1] == 98);
-            test(lso.Length == 2);
-            test(lso[0].Length == 2);
-            test(lso[0][0] == 496);
-            test(lso[0][1] == 1729);
-            test(lso[1].Length == 2);
-            test(lso[1][0] == 496);
-            test(lso[1][1] == 1729);
-        }
+                {
+                    string[] ssi1 = new string[] { "abc", "de", "fghi" };
+                    string[] ssi2 = new string[] { "xyz" };
 
-        {
-            float[] f11 = new float[] { 3.14f };
-            float[] f12 = new float[] { 1.11f };
-            float[] f13 = new float[] { };
-            float[][] fsi = new float[][] { f11, f12, f13 };
-
-            double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
-            double[][] dsi = new double[][] { d11 };
-
-            float[][] fso;
-            double[][] dso;
-            double[][] rso;
-
-            rso = p.opFloatDoubleSS(fsi, dsi, out fso, out dso);
-            test(fso.Length == 3);
-            test(fso[0].Length == 1);
-            test(fso[0][0] == 3.14f);
-            test(fso[1].Length == 1);
-            test(fso[1][0] == 1.11f);
-            test(fso[2].Length == 0);
-            test(dso.Length == 1);
-            test(dso[0].Length == 3);
-            test(dso[0][0] == 1.1e10);
-            test(dso[0][1] == 1.2e10);
-            test(dso[0][2] == 1.3e10);
-            test(rso.Length == 2);
-            test(rso[0].Length == 3);
-            test(rso[0][0] == 1.1e10);
-            test(rso[0][1] == 1.2e10);
-            test(rso[0][2] == 1.3e10);
-            test(rso[1].Length == 3);
-            test(rso[1][0] == 1.1e10);
-            test(rso[1][1] == 1.2e10);
-            test(rso[1][2] == 1.3e10);
-        }
+                    string[] sso;
+                    string[] rso;
 
-        {
-            string[] s11 = new string[] { "abc" };
-            string[] s12 = new string[] { "de", "fghi" };
-            string[][] ssi1 = new string[][] { s11, s12 };
-
-            string[] s21 = new string[] {};
-            string[] s22 = new string[] {};
-            string[] s23 = new string[] { "xyz" };
-            string[][] ssi2 = new string[][] { s21, s22, s23 };
-
-            string[][] sso;
-            string[][] rso;
-
-            rso = p.opStringSS(ssi1, ssi2, out sso);
-            test(sso.Length == 5);
-            test(sso[0].Length == 1);
-            test(sso[0][0].Equals("abc"));
-            test(sso[1].Length == 2);
-            test(sso[1][0].Equals("de"));
-            test(sso[1][1].Equals("fghi"));
-            test(sso[2].Length == 0);
-            test(sso[3].Length == 0);
-            test(sso[4].Length == 1);
-            test(sso[4][0].Equals("xyz"));
-            test(rso.Length == 3);
-            test(rso[0].Length == 1);
-            test(rso[0][0].Equals("xyz"));
-            test(rso[1].Length == 0);
-            test(rso[2].Length == 0);
-        }
+                    rso = p.opStringS(ssi1, ssi2, out sso);
+                    test(sso.Length == 4);
+                    test(sso[0].Equals("abc"));
+                    test(sso[1].Equals("de"));
+                    test(sso[2].Equals("fghi"));
+                    test(sso[3].Equals("xyz"));
+                    test(rso.Length == 3);
+                    test(rso[0].Equals("fghi"));
+                    test(rso[1].Equals("de"));
+                    test(rso[2].Equals("abc"));
+                }
 
-        {
-            string[] s111 = new string[] { "abc", "de"};
-            string[] s112 = new string[] { "xyz" };
-            string[][] ss11 = new string[][] { s111, s112 };
-            string[] s121 = new string[] { "hello"};
-            string[][] ss12 = new string[][] { s121 };
-            string[][][] sssi1 = new string[][][] { ss11, ss12 };
-
-            string[] s211 = new string[] { "", ""};
-            string[] s212 = new string[] { "abcd" };
-            string[][] ss21 = new string[][] { s211, s212 };
-            string[] s221 = new string[] { ""};
-            string[][] ss22 = new string[][] { s221 };
-            string[][] ss23 = new string[][] {};
-            string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
-
-            string[][][] ssso;
-            string[][][] rsso;
-
-            rsso = p.opStringSSS(sssi1, sssi2, out ssso);
-            test(ssso.Length == 5);
-            test(ssso[0].Length == 2);
-            test(ssso[0][0].Length == 2);
-            test(ssso[0][1].Length == 1);
-            test(ssso[1].Length == 1);
-            test(ssso[1][0].Length == 1);
-            test(ssso[2].Length == 2);
-            test(ssso[2][0].Length == 2);
-            test(ssso[2][1].Length == 1);
-            test(ssso[3].Length == 1);
-            test(ssso[3][0].Length == 1);
-            test(ssso[4].Length == 0);
-            test(ssso[0][0][0].Equals("abc"));
-            test(ssso[0][0][1].Equals("de"));
-            test(ssso[0][1][0].Equals("xyz"));
-            test(ssso[1][0][0].Equals("hello"));
-            test(ssso[2][0][0].Equals(""));
-            test(ssso[2][0][1].Equals(""));
-            test(ssso[2][1][0].Equals("abcd"));
-            test(ssso[3][0][0].Equals(""));
-
-            test(rsso.Length == 3);
-            test(rsso[0].Length == 0);
-            test(rsso[1].Length == 1);
-            test(rsso[1][0].Length == 1);
-            test(rsso[2].Length == 2);
-            test(rsso[2][0].Length == 2);
-            test(rsso[2][1].Length == 1);
-            test(rsso[1][0][0].Equals(""));
-            test(rsso[2][0][0].Equals(""));
-            test(rsso[2][0][1].Equals(""));
-            test(rsso[2][1][0].Equals("abcd"));
-        }
+                {
+                    byte[] s11 = new byte[] { 0x01, 0x11, 0x12 };
+                    byte[] s12 = new byte[] { 0xff };
+                    byte[][] bsi1 = new byte[][] { s11, s12 };
+
+                    byte[] s21 = new byte[] { 0x0e };
+                    byte[] s22 = new byte[] { 0xf2, 0xf1 };
+                    byte[][] bsi2 = new byte[][] { s21, s22 };
+
+                    byte[][] bso;
+                    byte[][] rso;
+
+                    rso = p.opByteSS(bsi1, bsi2, out bso);
+                    test(bso.Length == 2);
+                    test(bso[0].Length == 1);
+                    test(bso[0][0] == 0xff);
+                    test(bso[1].Length == 3);
+                    test(bso[1][0] == 0x01);
+                    test(bso[1][1] == 0x11);
+                    test(bso[1][2] == 0x12);
+                    test(rso.Length == 4);
+                    test(rso[0].Length == 3);
+                    test(rso[0][0] == 0x01);
+                    test(rso[0][1] == 0x11);
+                    test(rso[0][2] == 0x12);
+                    test(rso[1].Length == 1);
+                    test(rso[1][0] == 0xff);
+                    test(rso[2].Length == 1);
+                    test(rso[2][0] == 0x0e);
+                    test(rso[3].Length == 2);
+                    test(rso[3][0] == 0xf2);
+                    test(rso[3][1] == 0xf1);
+                }
 
-        {
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
-            di2[10] = true;
-            di2[11] = false;
-            di2[101] = true;
-
-            Dictionary<byte, bool> _do;
-            Dictionary<byte, bool> ro = p.opByteBoolD(di1, di2, out _do);
-
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro[10] == true);
-            test(ro[11] == false);
-            test(ro[100] == false);
-            test(ro[101] == true);
-        }
+                {
+                    bool[] s11 = new bool[] { true };
+                    bool[] s12 = new bool[] { false };
+                    bool[] s13 = new bool[] { true, true };
+                    bool[][] bsi1 = new bool[][] { s11, s12, s13 };
+
+                    bool[] s21 = new bool[] { false, false, true };
+                    bool[][] bsi2 = new bool[][] { s21 };
+
+                    bool[][] rso;
+                    bool[][] bso;
+
+                    rso = p.opBoolSS(bsi1, bsi2, out bso);
+                    test(bso.Length == 4);
+                    test(bso[0].Length == 1);
+                    test(bso[0][0]);
+                    test(bso[1].Length == 1);
+                    test(!bso[1][0]);
+                    test(bso[2].Length == 2);
+                    test(bso[2][0]);
+                    test(bso[2][1]);
+                    test(bso[3].Length == 3);
+                    test(!bso[3][0]);
+                    test(!bso[3][1]);
+                    test(bso[3][2]);
+                    test(rso.Length == 3);
+                    test(rso[0].Length == 2);
+                    test(rso[0][0]);
+                    test(rso[0][1]);
+                    test(rso[1].Length == 1);
+                    test(!rso[1][0]);
+                    test(rso[2].Length == 1);
+                    test(rso[2][0]);
+                }
 
-        {
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            Dictionary<short, int> di2 = new Dictionary<short, int>();
-            di2[110] = -1;
-            di2[111] = -100;
-            di2[1101] = 0;
-
-            Dictionary<short, int> _do;
-            Dictionary<short, int> ro = p.opShortIntD(di1, di2, out _do);
-
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro[110] == -1);
-            test(ro[111] == -100);
-            test(ro[1100] == 123123);
-            test(ro[1101] == 0);
-        }
+                {
+                    short[] s11 = new short[] { 1, 2, 5 };
+                    short[] s12 = new short[] { 13 };
+                    short[] s13 = new short[] { };
+                    short[][] ssi = new short[][] { s11, s12, s13 };
+
+                    int[] i11 = new int[] { 24, 98 };
+                    int[] i12 = new int[] { 42 };
+                    int[][] isi = new int[][] { i11, i12 };
+
+                    long[] l11 = new long[] { 496, 1729 };
+                    long[][] lsi = new long[][] { l11 };
+
+                    short[][] sso;
+                    int[][] iso;
+                    long[][] lso;
+                    long[][] rso;
+
+                    rso = p.opShortIntLongSS(ssi, isi, lsi, out sso, out iso, out lso);
+                    test(rso.Length == 1);
+                    test(rso[0].Length == 2);
+                    test(rso[0][0] == 496);
+                    test(rso[0][1] == 1729);
+                    test(sso.Length == 3);
+                    test(sso[0].Length == 3);
+                    test(sso[0][0] == 1);
+                    test(sso[0][1] == 2);
+                    test(sso[0][2] == 5);
+                    test(sso[1].Length == 1);
+                    test(sso[1][0] == 13);
+                    test(sso[2].Length == 0);
+                    test(iso.Length == 2);
+                    test(iso[0].Length == 1);
+                    test(iso[0][0] == 42);
+                    test(iso[1].Length == 2);
+                    test(iso[1][0] == 24);
+                    test(iso[1][1] == 98);
+                    test(lso.Length == 2);
+                    test(lso[0].Length == 2);
+                    test(lso[0][0] == 496);
+                    test(lso[0][1] == 1729);
+                    test(lso[1].Length == 2);
+                    test(lso[1][0] == 496);
+                    test(lso[1][1] == 1729);
+                }
 
-        {
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            Dictionary<long, float> di2 = new Dictionary<long, float>();
-            di2[999999110L] = -1.1f;
-            di2[999999120L] = -100.4f;
-            di2[999999130L] = 0.5f;
-
-            Dictionary<long, float> _do;
-            Dictionary<long, float> ro = p.opLongFloatD(di1, di2, out _do);
-
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro[999999110L] == -1.1f);
-            test(ro[999999120L] == -100.4f);
-            test(ro[999999111L] == 123123.2f);
-            test(ro[999999130L] == 0.5f);
-        }
+                {
+                    float[] f11 = new float[] { 3.14f };
+                    float[] f12 = new float[] { 1.11f };
+                    float[] f13 = new float[] { };
+                    float[][] fsi = new float[][] { f11, f12, f13 };
+
+                    double[] d11 = new double[] { 1.1e10, 1.2e10, 1.3e10 };
+                    double[][] dsi = new double[][] { d11 };
+
+                    float[][] fso;
+                    double[][] dso;
+                    double[][] rso;
+
+                    rso = p.opFloatDoubleSS(fsi, dsi, out fso, out dso);
+                    test(fso.Length == 3);
+                    test(fso[0].Length == 1);
+                    test(fso[0][0] == 3.14f);
+                    test(fso[1].Length == 1);
+                    test(fso[1][0] == 1.11f);
+                    test(fso[2].Length == 0);
+                    test(dso.Length == 1);
+                    test(dso[0].Length == 3);
+                    test(dso[0][0] == 1.1e10);
+                    test(dso[0][1] == 1.2e10);
+                    test(dso[0][2] == 1.3e10);
+                    test(rso.Length == 2);
+                    test(rso[0].Length == 3);
+                    test(rso[0][0] == 1.1e10);
+                    test(rso[0][1] == 1.2e10);
+                    test(rso[0][2] == 1.3e10);
+                    test(rso[1].Length == 3);
+                    test(rso[1][0] == 1.1e10);
+                    test(rso[1][1] == 1.2e10);
+                    test(rso[1][2] == 1.3e10);
+                }
 
-        {
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            Dictionary<string, string> di2 = new Dictionary<string, string>();
-            di2["foo"] = "abc -1.1";
-            di2["FOO"] = "abc -100.4";
-            di2["BAR"] = "abc 0.5";
-
-            Dictionary<string, string> _do;
-            Dictionary<string, string> ro = p.opStringStringD(di1, di2, out _do);
-
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro["foo"].Equals("abc -1.1"));
-            test(ro["FOO"].Equals("abc -100.4"));
-            test(ro["bar"].Equals("abc 123123.2"));
-            test(ro["BAR"].Equals("abc 0.5"));
-        }
+                {
+                    string[] s11 = new string[] { "abc" };
+                    string[] s12 = new string[] { "de", "fghi" };
+                    string[][] ssi1 = new string[][] { s11, s12 };
+
+                    string[] s21 = new string[] { };
+                    string[] s22 = new string[] { };
+                    string[] s23 = new string[] { "xyz" };
+                    string[][] ssi2 = new string[][] { s21, s22, s23 };
+
+                    string[][] sso;
+                    string[][] rso;
+
+                    rso = p.opStringSS(ssi1, ssi2, out sso);
+                    test(sso.Length == 5);
+                    test(sso[0].Length == 1);
+                    test(sso[0][0].Equals("abc"));
+                    test(sso[1].Length == 2);
+                    test(sso[1][0].Equals("de"));
+                    test(sso[1][1].Equals("fghi"));
+                    test(sso[2].Length == 0);
+                    test(sso[3].Length == 0);
+                    test(sso[4].Length == 1);
+                    test(sso[4][0].Equals("xyz"));
+                    test(rso.Length == 3);
+                    test(rso[0].Length == 1);
+                    test(rso[0][0].Equals("xyz"));
+                    test(rso[1].Length == 0);
+                    test(rso[2].Length == 0);
+                }
 
-        {
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di2 = new Dictionary<string, Test.MyEnum>();
-            di2["abc"] = Test.MyEnum.enum1;
-            di2["qwerty"] = Test.MyEnum.enum3;
-            di2["Hello!!"] = Test.MyEnum.enum2;
-
-            Dictionary<string, Test.MyEnum> _do;
-            Dictionary<string, Test.MyEnum> ro = p.opStringMyEnumD(di1, di2, out _do);
-
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro["abc"] == Test.MyEnum.enum1);
-            test(ro["qwerty"] == Test.MyEnum.enum3);
-            test(ro[""] == Test.MyEnum.enum2);
-            test(ro["Hello!!"] == Test.MyEnum.enum2);
-        }
+                {
+                    string[] s111 = new string[] { "abc", "de" };
+                    string[] s112 = new string[] { "xyz" };
+                    string[][] ss11 = new string[][] { s111, s112 };
+                    string[] s121 = new string[] { "hello" };
+                    string[][] ss12 = new string[][] { s121 };
+                    string[][][] sssi1 = new string[][][] { ss11, ss12 };
+
+                    string[] s211 = new string[] { "", "" };
+                    string[] s212 = new string[] { "abcd" };
+                    string[][] ss21 = new string[][] { s211, s212 };
+                    string[] s221 = new string[] { "" };
+                    string[][] ss22 = new string[][] { s221 };
+                    string[][] ss23 = new string[][] { };
+                    string[][][] sssi2 = new string[][][] { ss21, ss22, ss23 };
+
+                    string[][][] ssso;
+                    string[][][] rsso;
+
+                    rsso = p.opStringSSS(sssi1, sssi2, out ssso);
+                    test(ssso.Length == 5);
+                    test(ssso[0].Length == 2);
+                    test(ssso[0][0].Length == 2);
+                    test(ssso[0][1].Length == 1);
+                    test(ssso[1].Length == 1);
+                    test(ssso[1][0].Length == 1);
+                    test(ssso[2].Length == 2);
+                    test(ssso[2][0].Length == 2);
+                    test(ssso[2][1].Length == 1);
+                    test(ssso[3].Length == 1);
+                    test(ssso[3][0].Length == 1);
+                    test(ssso[4].Length == 0);
+                    test(ssso[0][0][0].Equals("abc"));
+                    test(ssso[0][0][1].Equals("de"));
+                    test(ssso[0][1][0].Equals("xyz"));
+                    test(ssso[1][0][0].Equals("hello"));
+                    test(ssso[2][0][0].Equals(""));
+                    test(ssso[2][0][1].Equals(""));
+                    test(ssso[2][1][0].Equals("abcd"));
+                    test(ssso[3][0][0].Equals(""));
+
+                    test(rsso.Length == 3);
+                    test(rsso[0].Length == 0);
+                    test(rsso[1].Length == 1);
+                    test(rsso[1][0].Length == 1);
+                    test(rsso[2].Length == 2);
+                    test(rsso[2][0].Length == 2);
+                    test(rsso[2][1].Length == 1);
+                    test(rsso[1][0][0].Equals(""));
+                    test(rsso[2][0][0].Equals(""));
+                    test(rsso[2][0][1].Equals(""));
+                    test(rsso[2][1][0].Equals("abcd"));
+                }
 
-        {
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            Dictionary<Test.MyEnum, string> di2 = new Dictionary<Test.MyEnum, string>();
-            di2[Test.MyEnum.enum2] = "Hello!!";
-            di2[Test.MyEnum.enum3] = "qwerty";
-
-            Dictionary<Test.MyEnum, string> _do;
-            Dictionary<Test.MyEnum, string> ro = p.opMyEnumStringD(di1, di2, out _do);
-
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 3);
-            test(ro[Test.MyEnum.enum1].Equals("abc"));
-            test(ro[Test.MyEnum.enum2].Equals("Hello!!"));
-            test(ro[Test.MyEnum.enum3].Equals("qwerty"));
-        }
+                {
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
+                    di2[10] = true;
+                    di2[11] = false;
+                    di2[101] = true;
+
+                    Dictionary<byte, bool> _do;
+                    Dictionary<byte, bool> ro = p.opByteBoolD(di1, di2, out _do);
+
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro[10] == true);
+                    test(ro[11] == false);
+                    test(ro[100] == false);
+                    test(ro[101] == true);
+                }
 
-        {
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            Dictionary<Test.MyStruct, Test.MyEnum> di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di2[s11] = Test.MyEnum.enum1;
-            di2[s22] = Test.MyEnum.enum3;
-            di2[s23] = Test.MyEnum.enum2;
-
-            Dictionary<Test.MyStruct, Test.MyEnum> _do;
-            Dictionary<Test.MyStruct, Test.MyEnum> ro = p.opMyStructMyEnumD(di1, di2, out _do);
-
-            test(Ice.CollectionComparer.Equals(_do, di1));
-            test(ro.Count == 4);
-            test(ro[s11] == Test.MyEnum.enum1);
-            test(ro[s12] == Test.MyEnum.enum2);
-            test(ro[s22] == Test.MyEnum.enum3);
-            test(ro[s23] == Test.MyEnum.enum2);
-        }
+                {
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    Dictionary<short, int> di2 = new Dictionary<short, int>();
+                    di2[110] = -1;
+                    di2[111] = -100;
+                    di2[1101] = 0;
+
+                    Dictionary<short, int> _do;
+                    Dictionary<short, int> ro = p.opShortIntD(di1, di2, out _do);
+
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro[110] == -1);
+                    test(ro[111] == -100);
+                    test(ro[1100] == 123123);
+                    test(ro[1101] == 0);
+                }
 
-        {
-            Dictionary<byte, bool>[] dsi1 = new Dictionary<byte, bool>[2];
-            Dictionary<byte, bool>[] dsi2 = new Dictionary<byte, bool>[1];
+                {
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    Dictionary<long, float> di2 = new Dictionary<long, float>();
+                    di2[999999110L] = -1.1f;
+                    di2[999999120L] = -100.4f;
+                    di2[999999130L] = 0.5f;
+
+                    Dictionary<long, float> _do;
+                    Dictionary<long, float> ro = p.opLongFloatD(di1, di2, out _do);
+
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro[999999110L] == -1.1f);
+                    test(ro[999999120L] == -100.4f);
+                    test(ro[999999111L] == 123123.2f);
+                    test(ro[999999130L] == 0.5f);
+                }
 
-            Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
-            di1[10] = true;
-            di1[100] = false;
-            Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
-            di2[10] = true;
-            di2[11] = false;
-            di2[101] = true;
-            Dictionary<byte, bool> di3 = new Dictionary<byte, bool>();
-            di3[100] = false;
-            di3[101] = false;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Dictionary<byte, bool>[] _do;
-            Dictionary<byte, bool>[] ro = p.opByteBoolDS(dsi1, dsi2, out _do);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][10]);
-            test(!ro[0][11]);
-            test(ro[0][101]);
-            test(ro[1].Count == 2);
-            test(ro[1][10]);
-            test(!ro[1][100]);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 2);
-            test(!_do[0][100]);
-            test(!_do[0][101]);
-            test(_do[1].Count == 2);
-            test(_do[1][10]);
-            test(!_do[1][100]);
-            test(_do[2].Count == 3);
-            test(_do[2][10]);
-            test(!_do[2][11]);
-            test(_do[2][101]);
-        }
+                {
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    Dictionary<string, string> di2 = new Dictionary<string, string>();
+                    di2["foo"] = "abc -1.1";
+                    di2["FOO"] = "abc -100.4";
+                    di2["BAR"] = "abc 0.5";
+
+                    Dictionary<string, string> _do;
+                    Dictionary<string, string> ro = p.opStringStringD(di1, di2, out _do);
+
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro["foo"].Equals("abc -1.1"));
+                    test(ro["FOO"].Equals("abc -100.4"));
+                    test(ro["bar"].Equals("abc 123123.2"));
+                    test(ro["BAR"].Equals("abc 0.5"));
+                }
 
-        {
-            Dictionary<short, int>[] dsi1 = new Dictionary<short, int>[2];
-            Dictionary<short, int>[] dsi2 = new Dictionary<short, int>[1];
+                {
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    var di2 = new Dictionary<string, Test.MyEnum>();
+                    di2["abc"] = Test.MyEnum.enum1;
+                    di2["qwerty"] = Test.MyEnum.enum3;
+                    di2["Hello!!"] = Test.MyEnum.enum2;
+
+                    Dictionary<string, Test.MyEnum> _do;
+                    Dictionary<string, Test.MyEnum> ro = p.opStringMyEnumD(di1, di2, out _do);
+
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro["abc"] == Test.MyEnum.enum1);
+                    test(ro["qwerty"] == Test.MyEnum.enum3);
+                    test(ro[""] == Test.MyEnum.enum2);
+                    test(ro["Hello!!"] == Test.MyEnum.enum2);
+                }
 
-            Dictionary<short, int> di1 = new Dictionary<short, int>();
-            di1[110] = -1;
-            di1[1100] = 123123;
-            Dictionary<short, int> di2 = new Dictionary<short, int>();
-            di2[110] = -1;
-            di2[111] = -100;
-            di2[1101] = 0;
-            Dictionary<short, int> di3 = new Dictionary<short, int>();
-            di3[100] = -1001;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Dictionary<short, int>[] _do;
-            Dictionary<short, int>[] ro = p.opShortIntDS(dsi1, dsi2, out _do);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][110] == -1);
-            test(ro[0][111] == -100);
-            test(ro[0][1101] == 0);
-            test(ro[1].Count == 2);
-            test(ro[1][110] == -1);
-            test(ro[1][1100] == 123123);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][100] == -1001);
-            test(_do[1].Count == 2);
-            test(_do[1][110] == -1);
-            test(_do[1][1100] == 123123);
-            test(_do[2].Count == 3);
-            test(_do[2][110] == -1);
-            test(_do[2][111] == -100);
-            test(_do[2][1101] == 0);
-        }
+                {
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    var di2 = new Dictionary<Test.MyEnum, string>();
+                    di2[Test.MyEnum.enum2] = "Hello!!";
+                    di2[Test.MyEnum.enum3] = "qwerty";
+
+                    Dictionary<Test.MyEnum, string> _do;
+                    var ro = p.opMyEnumStringD(di1, di2, out _do);
+
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 3);
+                    test(ro[Test.MyEnum.enum1].Equals("abc"));
+                    test(ro[Test.MyEnum.enum2].Equals("Hello!!"));
+                    test(ro[Test.MyEnum.enum3].Equals("qwerty"));
+                }
 
-        {
-            Dictionary<long, float>[] dsi1 = new Dictionary<long, float>[2];
-            Dictionary<long, float>[] dsi2 = new Dictionary<long, float>[1];
+                {
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    var di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di2[s11] = Test.MyEnum.enum1;
+                    di2[s22] = Test.MyEnum.enum3;
+                    di2[s23] = Test.MyEnum.enum2;
+
+                    Dictionary<Test.MyStruct, Test.MyEnum> _do;
+                    Dictionary<Test.MyStruct, Test.MyEnum> ro = p.opMyStructMyEnumD(di1, di2, out _do);
+
+                    test(Ice.CollectionComparer.Equals(_do, di1));
+                    test(ro.Count == 4);
+                    test(ro[s11] == Test.MyEnum.enum1);
+                    test(ro[s12] == Test.MyEnum.enum2);
+                    test(ro[s22] == Test.MyEnum.enum3);
+                    test(ro[s23] == Test.MyEnum.enum2);
+                }
 
-            Dictionary<long, float> di1 = new Dictionary<long, float>();
-            di1[999999110L] = -1.1f;
-            di1[999999111L] = 123123.2f;
-            Dictionary<long, float> di2 = new Dictionary<long, float>();
-            di2[999999110L] = -1.1f;
-            di2[999999120L] = -100.4f;
-            di2[999999130L] = 0.5f;
-            Dictionary<long, float> di3 = new Dictionary<long, float>();
-            di3[999999140L] = 3.14f;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Dictionary<long, float>[] _do;
-            Dictionary<long, float>[] ro = p.opLongFloatDS(dsi1, dsi2, out _do);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][999999110L] == -1.1f);
-            test(ro[0][999999120L] == -100.4f);
-            test(ro[0][999999130L] == 0.5f);
-            test(ro[1].Count == 2);
-            test(ro[1][999999110L] == -1.1f);
-            test(ro[1][999999111L] == 123123.2f);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][999999140L] == 3.14f);
-            test(_do[1].Count == 2);
-            test(_do[1][999999110L] == -1.1f);
-            test(_do[1][999999111L] == 123123.2f);
-            test(_do[2].Count == 3);
-            test(_do[2][999999110L] == -1.1f);
-            test(_do[2][999999120L] == -100.4f);
-            test(_do[2][999999130L] == 0.5f);
+                {
+                    Dictionary<byte, bool>[] dsi1 = new Dictionary<byte, bool>[2];
+                    Dictionary<byte, bool>[] dsi2 = new Dictionary<byte, bool>[1];
 
-        }
+                    Dictionary<byte, bool> di1 = new Dictionary<byte, bool>();
+                    di1[10] = true;
+                    di1[100] = false;
+                    Dictionary<byte, bool> di2 = new Dictionary<byte, bool>();
+                    di2[10] = true;
+                    di2[11] = false;
+                    di2[101] = true;
+                    Dictionary<byte, bool> di3 = new Dictionary<byte, bool>();
+                    di3[100] = false;
+                    di3[101] = false;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Dictionary<byte, bool>[] _do;
+                    Dictionary<byte, bool>[] ro = p.opByteBoolDS(dsi1, dsi2, out _do);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][10]);
+                    test(!ro[0][11]);
+                    test(ro[0][101]);
+                    test(ro[1].Count == 2);
+                    test(ro[1][10]);
+                    test(!ro[1][100]);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 2);
+                    test(!_do[0][100]);
+                    test(!_do[0][101]);
+                    test(_do[1].Count == 2);
+                    test(_do[1][10]);
+                    test(!_do[1][100]);
+                    test(_do[2].Count == 3);
+                    test(_do[2][10]);
+                    test(!_do[2][11]);
+                    test(_do[2][101]);
+                }
 
-        {
-            Dictionary<string, string>[] dsi1 = new Dictionary<string, string>[2];
-            Dictionary<string, string>[] dsi2 = new Dictionary<string, string>[1];
+                {
+                    Dictionary<short, int>[] dsi1 = new Dictionary<short, int>[2];
+                    Dictionary<short, int>[] dsi2 = new Dictionary<short, int>[1];
 
-            Dictionary<string, string> di1 = new Dictionary<string, string>();
-            di1["foo"] = "abc -1.1";
-            di1["bar"] = "abc 123123.2";
-            Dictionary<string, string> di2 = new Dictionary<string, string>();
-            di2["foo"] = "abc -1.1";
-            di2["FOO"] = "abc -100.4";
-            di2["BAR"] = "abc 0.5";
-            Dictionary<string, string> di3 = new Dictionary<string, string>();
-            di3["f00"] = "ABC -3.14";
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Dictionary<string, string>[] _do;
-            Dictionary<string, string>[] ro = p.opStringStringDS(dsi1, dsi2, out _do);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0]["foo"].Equals("abc -1.1"));
-            test(ro[0]["FOO"].Equals("abc -100.4"));
-            test(ro[0]["BAR"].Equals("abc 0.5"));
-            test(ro[1].Count == 2);
-            test(ro[1]["foo"] == "abc -1.1");
-            test(ro[1]["bar"] == "abc 123123.2");
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0]["f00"].Equals("ABC -3.14"));
-            test(_do[1].Count == 2);
-            test(_do[1]["foo"].Equals("abc -1.1"));
-            test(_do[1]["bar"].Equals("abc 123123.2"));
-            test(_do[2].Count == 3);
-            test(_do[2]["foo"].Equals("abc -1.1"));
-            test(_do[2]["FOO"].Equals("abc -100.4"));
-            test(_do[2]["BAR"].Equals("abc 0.5"));
-        }
+                    Dictionary<short, int> di1 = new Dictionary<short, int>();
+                    di1[110] = -1;
+                    di1[1100] = 123123;
+                    Dictionary<short, int> di2 = new Dictionary<short, int>();
+                    di2[110] = -1;
+                    di2[111] = -100;
+                    di2[1101] = 0;
+                    Dictionary<short, int> di3 = new Dictionary<short, int>();
+                    di3[100] = -1001;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Dictionary<short, int>[] _do;
+                    Dictionary<short, int>[] ro = p.opShortIntDS(dsi1, dsi2, out _do);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][110] == -1);
+                    test(ro[0][111] == -100);
+                    test(ro[0][1101] == 0);
+                    test(ro[1].Count == 2);
+                    test(ro[1][110] == -1);
+                    test(ro[1][1100] == 123123);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][100] == -1001);
+                    test(_do[1].Count == 2);
+                    test(_do[1][110] == -1);
+                    test(_do[1][1100] == 123123);
+                    test(_do[2].Count == 3);
+                    test(_do[2][110] == -1);
+                    test(_do[2][111] == -100);
+                    test(_do[2][1101] == 0);
+                }
 
-        {
-            Dictionary<string, Test.MyEnum>[] dsi1 = new Dictionary<string, Test.MyEnum>[2];
-            Dictionary<string, Test.MyEnum>[] dsi2 = new Dictionary<string, Test.MyEnum>[1];
+                {
+                    Dictionary<long, float>[] dsi1 = new Dictionary<long, float>[2];
+                    Dictionary<long, float>[] dsi2 = new Dictionary<long, float>[1];
 
-            Dictionary<string, Test.MyEnum> di1 = new Dictionary<string, Test.MyEnum>();
-            di1["abc"] = Test.MyEnum.enum1;
-            di1[""] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di2 = new Dictionary<string, Test.MyEnum>();
-            di2["abc"] = Test.MyEnum.enum1;
-            di2["qwerty"] = Test.MyEnum.enum3;
-            di2["Hello!!"] = Test.MyEnum.enum2;
-            Dictionary<string, Test.MyEnum> di3 = new Dictionary<string, Test.MyEnum>();
-            di3["Goodbye"] = Test.MyEnum.enum1;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Dictionary<string, Test.MyEnum>[] _do;
-            Dictionary<string, Test.MyEnum>[] ro = p.opStringMyEnumDS(dsi1, dsi2, out _do);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0]["abc"] == Test.MyEnum.enum1);
-            test(ro[0]["qwerty"] == Test.MyEnum.enum3);
-            test(ro[0]["Hello!!"] == Test.MyEnum.enum2);
-            test(ro[1].Count == 2);
-            test(ro[1]["abc"] == Test.MyEnum.enum1);
-            test(ro[1][""] == Test.MyEnum.enum2);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0]["Goodbye"] == Test.MyEnum.enum1);
-            test(_do[1].Count == 2);
-            test(_do[1]["abc"] == Test.MyEnum.enum1);
-            test(_do[1][""] == Test.MyEnum.enum2);
-            test(_do[2].Count == 3);
-            test(_do[2]["abc"] == Test.MyEnum.enum1);
-            test(_do[2]["qwerty"] == Test.MyEnum.enum3);
-            test(_do[2]["Hello!!"] == Test.MyEnum.enum2);
-        }
+                    Dictionary<long, float> di1 = new Dictionary<long, float>();
+                    di1[999999110L] = -1.1f;
+                    di1[999999111L] = 123123.2f;
+                    Dictionary<long, float> di2 = new Dictionary<long, float>();
+                    di2[999999110L] = -1.1f;
+                    di2[999999120L] = -100.4f;
+                    di2[999999130L] = 0.5f;
+                    Dictionary<long, float> di3 = new Dictionary<long, float>();
+                    di3[999999140L] = 3.14f;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Dictionary<long, float>[] _do;
+                    Dictionary<long, float>[] ro = p.opLongFloatDS(dsi1, dsi2, out _do);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][999999110L] == -1.1f);
+                    test(ro[0][999999120L] == -100.4f);
+                    test(ro[0][999999130L] == 0.5f);
+                    test(ro[1].Count == 2);
+                    test(ro[1][999999110L] == -1.1f);
+                    test(ro[1][999999111L] == 123123.2f);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][999999140L] == 3.14f);
+                    test(_do[1].Count == 2);
+                    test(_do[1][999999110L] == -1.1f);
+                    test(_do[1][999999111L] == 123123.2f);
+                    test(_do[2].Count == 3);
+                    test(_do[2][999999110L] == -1.1f);
+                    test(_do[2][999999120L] == -100.4f);
+                    test(_do[2][999999130L] == 0.5f);
 
-        {
-            Dictionary<Test.MyEnum, string>[] dsi1 = new Dictionary<Test.MyEnum, string>[2];
-            Dictionary<Test.MyEnum, string>[] dsi2 = new Dictionary<Test.MyEnum, string>[1];
+                }
 
-            Dictionary<Test.MyEnum, string> di1 = new Dictionary<Test.MyEnum, string>();
-            di1[Test.MyEnum.enum1] = "abc";
-            Dictionary<Test.MyEnum, string> di2 = new Dictionary<Test.MyEnum, string>();
-            di2[Test.MyEnum.enum2] = "Hello!!";
-            di2[Test.MyEnum.enum3] = "qwerty";
-            Dictionary<Test.MyEnum, string> di3 = new Dictionary<Test.MyEnum, string>();
-            di3[Test.MyEnum.enum1] = "Goodbye";
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Dictionary<Test.MyEnum, string>[] _do;
-            Dictionary<Test.MyEnum, string>[] ro = p.opMyEnumStringDS(dsi1, dsi2, out _do);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 2);
-            test(ro[0][Test.MyEnum.enum2].Equals("Hello!!"));
-            test(ro[0][Test.MyEnum.enum3].Equals("qwerty"));
-            test(ro[1].Count == 1);
-            test(ro[1][Test.MyEnum.enum1].Equals("abc"));
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][Test.MyEnum.enum1].Equals("Goodbye"));
-            test(_do[1].Count == 1);
-            test(_do[1][Test.MyEnum.enum1].Equals("abc"));
-            test(_do[2].Count == 2);
-            test(_do[2][Test.MyEnum.enum2].Equals("Hello!!"));
-            test(_do[2][Test.MyEnum.enum3].Equals("qwerty"));
-        }
+                {
+                    Dictionary<string, string>[] dsi1 = new Dictionary<string, string>[2];
+                    Dictionary<string, string>[] dsi2 = new Dictionary<string, string>[1];
 
-        {
-            Dictionary<Test.MyStruct, Test.MyEnum>[] dsi1 = new Dictionary<Test.MyStruct, Test.MyEnum>[2];
-            Dictionary<Test.MyStruct, Test.MyEnum>[] dsi2 = new Dictionary<Test.MyStruct, Test.MyEnum>[1];
+                    Dictionary<string, string> di1 = new Dictionary<string, string>();
+                    di1["foo"] = "abc -1.1";
+                    di1["bar"] = "abc 123123.2";
+                    Dictionary<string, string> di2 = new Dictionary<string, string>();
+                    di2["foo"] = "abc -1.1";
+                    di2["FOO"] = "abc -100.4";
+                    di2["BAR"] = "abc 0.5";
+                    Dictionary<string, string> di3 = new Dictionary<string, string>();
+                    di3["f00"] = "ABC -3.14";
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Dictionary<string, string>[] _do;
+                    Dictionary<string, string>[] ro = p.opStringStringDS(dsi1, dsi2, out _do);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0]["foo"].Equals("abc -1.1"));
+                    test(ro[0]["FOO"].Equals("abc -100.4"));
+                    test(ro[0]["BAR"].Equals("abc 0.5"));
+                    test(ro[1].Count == 2);
+                    test(ro[1]["foo"] == "abc -1.1");
+                    test(ro[1]["bar"] == "abc 123123.2");
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0]["f00"].Equals("ABC -3.14"));
+                    test(_do[1].Count == 2);
+                    test(_do[1]["foo"].Equals("abc -1.1"));
+                    test(_do[1]["bar"].Equals("abc 123123.2"));
+                    test(_do[2].Count == 3);
+                    test(_do[2]["foo"].Equals("abc -1.1"));
+                    test(_do[2]["FOO"].Equals("abc -100.4"));
+                    test(_do[2]["BAR"].Equals("abc 0.5"));
+                }
 
-            Test.MyStruct s11 = new Test.MyStruct(1, 1);
-            Test.MyStruct s12 = new Test.MyStruct(1, 2);
-            Dictionary<Test.MyStruct, Test.MyEnum> di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di1[s11] = Test.MyEnum.enum1;
-            di1[s12] = Test.MyEnum.enum2;
-
-            Test.MyStruct s22 = new Test.MyStruct(2, 2);
-            Test.MyStruct s23 = new Test.MyStruct(2, 3);
-            Dictionary<Test.MyStruct, Test.MyEnum> di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di2[s11] = Test.MyEnum.enum1;
-            di2[s22] = Test.MyEnum.enum3;
-            di2[s23] = Test.MyEnum.enum2;
-
-            Dictionary<Test.MyStruct, Test.MyEnum> di3 = new Dictionary<Test.MyStruct, Test.MyEnum>();
-            di3[s23] = Test.MyEnum.enum3;
-
-            dsi1[0] = di1;
-            dsi1[1] = di2;
-            dsi2[0] = di3;
-
-            Dictionary<Test.MyStruct, Test.MyEnum>[] _do;
-            Dictionary<Test.MyStruct, Test.MyEnum>[] ro = p.opMyStructMyEnumDS(dsi1, dsi2, out _do);
-
-            test(ro.Length == 2);
-            test(ro[0].Count == 3);
-            test(ro[0][s11] == Test.MyEnum.enum1);
-            test(ro[0][s22] == Test.MyEnum.enum3);
-            test(ro[0][s23] == Test.MyEnum.enum2);
-            test(ro[1].Count == 2);
-            test(ro[1][s11] == Test.MyEnum.enum1);
-            test(ro[1][s12] == Test.MyEnum.enum2);
-
-            test(_do.Length == 3);
-            test(_do[0].Count == 1);
-            test(_do[0][s23] == Test.MyEnum.enum3);
-            test(_do[1].Count == 2);
-            test(_do[1][s11] == Test.MyEnum.enum1);
-            test(_do[1][s12] == Test.MyEnum.enum2);
-            test(_do[2].Count == 3);
-            test(_do[2][s11] == Test.MyEnum.enum1);
-            test(_do[2][s22] == Test.MyEnum.enum3);
-            test(_do[2][s23] == Test.MyEnum.enum2);
-        }
+                {
+                    var dsi1 = new Dictionary<string, Test.MyEnum>[2];
+                    var dsi2 = new Dictionary<string, Test.MyEnum>[1];
 
-        {
-            Dictionary<byte, byte[]> sdi1 = new Dictionary<byte, byte[]>();
-            Dictionary<byte, byte[]> sdi2 = new Dictionary<byte, byte[]>();
+                    var di1 = new Dictionary<string, Test.MyEnum>();
+                    di1["abc"] = Test.MyEnum.enum1;
+                    di1[""] = Test.MyEnum.enum2;
+                    var di2 = new Dictionary<string, Test.MyEnum>();
+                    di2["abc"] = Test.MyEnum.enum1;
+                    di2["qwerty"] = Test.MyEnum.enum3;
+                    di2["Hello!!"] = Test.MyEnum.enum2;
+                    var di3 = new Dictionary<string, Test.MyEnum>();
+                    di3["Goodbye"] = Test.MyEnum.enum1;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Dictionary<string, Test.MyEnum>[] _do;
+                    Dictionary<string, Test.MyEnum>[] ro = p.opStringMyEnumDS(dsi1, dsi2, out _do);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0]["abc"] == Test.MyEnum.enum1);
+                    test(ro[0]["qwerty"] == Test.MyEnum.enum3);
+                    test(ro[0]["Hello!!"] == Test.MyEnum.enum2);
+                    test(ro[1].Count == 2);
+                    test(ro[1]["abc"] == Test.MyEnum.enum1);
+                    test(ro[1][""] == Test.MyEnum.enum2);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0]["Goodbye"] == Test.MyEnum.enum1);
+                    test(_do[1].Count == 2);
+                    test(_do[1]["abc"] == Test.MyEnum.enum1);
+                    test(_do[1][""] == Test.MyEnum.enum2);
+                    test(_do[2].Count == 3);
+                    test(_do[2]["abc"] == Test.MyEnum.enum1);
+                    test(_do[2]["qwerty"] == Test.MyEnum.enum3);
+                    test(_do[2]["Hello!!"] == Test.MyEnum.enum2);
+                }
 
-            byte[] si1 = new byte[] { 0x01, 0x11 };
-            byte[] si2 = new byte[] { 0x12 };
-            byte[] si3 = new byte[] { 0xf2, 0xf3 };
-
-            sdi1[0x01] = si1;
-            sdi1[0x22] = si2;
-            sdi2[0xf1] = si3;
-
-            Dictionary<byte, byte[]> _do;
-            Dictionary<byte, byte[]> ro = p.opByteByteSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do[0xf1].Length == 2);
-            test(_do[0xf1][0] == 0xf2);
-            test(_do[0xf1][1] == 0xf3);
-
-            test(ro.Count == 3);
-            test(ro[0x01].Length == 2);
-            test(ro[0x01][0] == 0x01);
-            test(ro[0x01][1] == 0x11);
-            test(ro[0x22].Length == 1);
-            test(ro[0x22][0] == 0x12);
-            test(ro[0xf1].Length == 2);
-            test(ro[0xf1][0] == 0xf2);
-            test(ro[0xf1][1] == 0xf3);
-        }
+                {
+                    var dsi1 = new Dictionary<Test.MyEnum, string>[2];
+                    var dsi2 = new Dictionary<Test.MyEnum, string>[1];
 
-        {
-            Dictionary<bool, bool[]> sdi1 = new Dictionary<bool, bool[]>();
-            Dictionary<bool, bool[]> sdi2 = new Dictionary<bool, bool[]>();
+                    var di1 = new Dictionary<Test.MyEnum, string>();
+                    di1[Test.MyEnum.enum1] = "abc";
+                    var di2 = new Dictionary<Test.MyEnum, string>();
+                    di2[Test.MyEnum.enum2] = "Hello!!";
+                    di2[Test.MyEnum.enum3] = "qwerty";
+                    var di3 = new Dictionary<Test.MyEnum, string>();
+                    di3[Test.MyEnum.enum1] = "Goodbye";
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Dictionary<Test.MyEnum, string>[] _do;
+                    var ro = p.opMyEnumStringDS(dsi1, dsi2, out _do);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 2);
+                    test(ro[0][Test.MyEnum.enum2].Equals("Hello!!"));
+                    test(ro[0][Test.MyEnum.enum3].Equals("qwerty"));
+                    test(ro[1].Count == 1);
+                    test(ro[1][Test.MyEnum.enum1].Equals("abc"));
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][Test.MyEnum.enum1].Equals("Goodbye"));
+                    test(_do[1].Count == 1);
+                    test(_do[1][Test.MyEnum.enum1].Equals("abc"));
+                    test(_do[2].Count == 2);
+                    test(_do[2][Test.MyEnum.enum2].Equals("Hello!!"));
+                    test(_do[2][Test.MyEnum.enum3].Equals("qwerty"));
+                }
 
-            bool[] si1 = new bool[] { true, false };
-            bool[] si2 = new bool[] { false, true, true };
+                {
+                    var dsi1 = new Dictionary<Test.MyStruct, Test.MyEnum>[2];
+                    var dsi2 = new Dictionary<Test.MyStruct, Test.MyEnum>[1];
 
-            sdi1[false] = si1;
-            sdi1[true] = si2;
-            sdi2[false] = si1;
-
-            Dictionary<bool, bool[]> _do;
-            Dictionary<bool, bool[]> ro = p.opBoolBoolSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do[false].Length == 2);
-            test(_do[false][0]);
-            test(!_do[false][1]);
-            test(ro.Count == 2);
-            test(ro[false].Length == 2);
-            test(ro[false][0]);
-            test(!ro[false][1]);
-            test(ro[true].Length == 3);
-            test(!ro[true][0]);
-            test(ro[true][1]);
-            test(ro[true][2]);
-        }
+                    var s11 = new Test.MyStruct(1, 1);
+                    var s12 = new Test.MyStruct(1, 2);
+                    var di1 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di1[s11] = Test.MyEnum.enum1;
+                    di1[s12] = Test.MyEnum.enum2;
+
+                    var s22 = new Test.MyStruct(2, 2);
+                    var s23 = new Test.MyStruct(2, 3);
+                    var di2 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di2[s11] = Test.MyEnum.enum1;
+                    di2[s22] = Test.MyEnum.enum3;
+                    di2[s23] = Test.MyEnum.enum2;
+
+                    var di3 = new Dictionary<Test.MyStruct, Test.MyEnum>();
+                    di3[s23] = Test.MyEnum.enum3;
+
+                    dsi1[0] = di1;
+                    dsi1[1] = di2;
+                    dsi2[0] = di3;
+
+                    Dictionary<Test.MyStruct, Test.MyEnum>[] _do;
+                    var ro = p.opMyStructMyEnumDS(dsi1, dsi2, out _do);
+
+                    test(ro.Length == 2);
+                    test(ro[0].Count == 3);
+                    test(ro[0][s11] == Test.MyEnum.enum1);
+                    test(ro[0][s22] == Test.MyEnum.enum3);
+                    test(ro[0][s23] == Test.MyEnum.enum2);
+                    test(ro[1].Count == 2);
+                    test(ro[1][s11] == Test.MyEnum.enum1);
+                    test(ro[1][s12] == Test.MyEnum.enum2);
+
+                    test(_do.Length == 3);
+                    test(_do[0].Count == 1);
+                    test(_do[0][s23] == Test.MyEnum.enum3);
+                    test(_do[1].Count == 2);
+                    test(_do[1][s11] == Test.MyEnum.enum1);
+                    test(_do[1][s12] == Test.MyEnum.enum2);
+                    test(_do[2].Count == 3);
+                    test(_do[2][s11] == Test.MyEnum.enum1);
+                    test(_do[2][s22] == Test.MyEnum.enum3);
+                    test(_do[2][s23] == Test.MyEnum.enum2);
+                }
 
-        {
-            Dictionary<short, short[]> sdi1 = new Dictionary<short, short[]>();
-            Dictionary<short, short[]> sdi2 = new Dictionary<short, short[]>();
+                {
+                    var sdi1 = new Dictionary<byte, byte[]>();
+                    var sdi2 = new Dictionary<byte, byte[]>();
 
-            short[] si1 = new short[] { 1, 2, 3 };
-            short[] si2 = new short[] { 4, 5 };
-            short[] si3 = new short[] { 6, 7 };
-
-            sdi1[1] = si1;
-            sdi1[2] = si2;
-            sdi2[4] = si3;
-
-            Dictionary<short, short[]> _do;
-            Dictionary<short, short[]> ro = p.opShortShortSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do[4].Length == 2);
-            test(_do[4][0] == 6);
-            test(_do[4][1] == 7);
-
-            test(ro.Count == 3);
-            test(ro[1].Length == 3);
-            test(ro[1][0] == 1);
-            test(ro[1][1] == 2);
-            test(ro[1][2] == 3);
-            test(ro[2].Length == 2);
-            test(ro[2][0] == 4);
-            test(ro[2][1] == 5);
-            test(ro[4].Length == 2);
-            test(ro[4][0] == 6);
-            test(ro[4][1] == 7);
-        }
+                    byte[] si1 = new byte[] { 0x01, 0x11 };
+                    byte[] si2 = new byte[] { 0x12 };
+                    byte[] si3 = new byte[] { 0xf2, 0xf3 };
+
+                    sdi1[0x01] = si1;
+                    sdi1[0x22] = si2;
+                    sdi2[0xf1] = si3;
+
+                    Dictionary<byte, byte[]> _do;
+                    var ro = p.opByteByteSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do[0xf1].Length == 2);
+                    test(_do[0xf1][0] == 0xf2);
+                    test(_do[0xf1][1] == 0xf3);
+
+                    test(ro.Count == 3);
+                    test(ro[0x01].Length == 2);
+                    test(ro[0x01][0] == 0x01);
+                    test(ro[0x01][1] == 0x11);
+                    test(ro[0x22].Length == 1);
+                    test(ro[0x22][0] == 0x12);
+                    test(ro[0xf1].Length == 2);
+                    test(ro[0xf1][0] == 0xf2);
+                    test(ro[0xf1][1] == 0xf3);
+                }
 
-        {
-            Dictionary<int, int[]> sdi1 = new Dictionary<int, int[]>();
-            Dictionary<int, int[]> sdi2 = new Dictionary<int, int[]>();
+                {
+                    var sdi1 = new Dictionary<bool, bool[]>();
+                    var sdi2 = new Dictionary<bool, bool[]>();
 
-            int[] si1 = new int[] { 100, 200, 300 };
-            int[] si2 = new int[] { 400, 500 };
-            int[] si3 = new int[] { 600, 700 };
-
-            sdi1[100] = si1;
-            sdi1[200] = si2;
-            sdi2[400] = si3;
-
-            Dictionary<int, int[]> _do;
-            Dictionary<int, int[]> ro = p.opIntIntSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do[400].Length == 2);
-            test(_do[400][0] == 600);
-            test(_do[400][1] == 700);
-
-            test(ro.Count == 3);
-            test(ro[100].Length == 3);
-            test(ro[100][0] == 100);
-            test(ro[100][1] == 200);
-            test(ro[100][2] == 300);
-            test(ro[200].Length == 2);
-            test(ro[200][0] == 400);
-            test(ro[200][1] == 500);
-            test(ro[400].Length == 2);
-            test(ro[400][0] == 600);
-            test(ro[400][1] == 700);
-        }
+                    bool[] si1 = new bool[] { true, false };
+                    bool[] si2 = new bool[] { false, true, true };
 
-        {
-            Dictionary<long, long[]> sdi1 = new Dictionary<long, long[]>();
-            Dictionary<long, long[]> sdi2 = new Dictionary<long, long[]>();
+                    sdi1[false] = si1;
+                    sdi1[true] = si2;
+                    sdi2[false] = si1;
+
+                    Dictionary<bool, bool[]> _do;
+                    var ro = p.opBoolBoolSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do[false].Length == 2);
+                    test(_do[false][0]);
+                    test(!_do[false][1]);
+                    test(ro.Count == 2);
+                    test(ro[false].Length == 2);
+                    test(ro[false][0]);
+                    test(!ro[false][1]);
+                    test(ro[true].Length == 3);
+                    test(!ro[true][0]);
+                    test(ro[true][1]);
+                    test(ro[true][2]);
+                }
 
-            long[] si1 = new long[] { 999999110L, 999999111L, 999999110L };
-            long[] si2 = new long[] { 999999120L, 999999130L };
-            long[] si3 = new long[] { 999999110L, 999999120L };
-
-            sdi1[999999990L] = si1;
-            sdi1[999999991L] = si2;
-            sdi2[999999992L] = si3;
-
-            Dictionary<long, long[]> _do;
-            Dictionary<long, long[]> ro = p.opLongLongSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do[999999992L].Length == 2);
-            test(_do[999999992L][0] == 999999110L);
-            test(_do[999999992L][1] == 999999120L);
-            test(ro.Count == 3);
-            test(ro[999999990L].Length == 3);
-            test(ro[999999990L][0] == 999999110L);
-            test(ro[999999990L][1] == 999999111L);
-            test(ro[999999990L][2] == 999999110L);
-            test(ro[999999991L].Length == 2);
-            test(ro[999999991L][0] == 999999120L);
-            test(ro[999999991L][1] == 999999130L);
-            test(ro[999999992L].Length == 2);
-            test(ro[999999992L][0] == 999999110L);
-            test(ro[999999992L][1] == 999999120L);
-        }
+                {
+                    var sdi1 = new Dictionary<short, short[]>();
+                    var sdi2 = new Dictionary<short, short[]>();
 
-        {
-            Dictionary<string, float[]> sdi1 = new Dictionary<string, float[]>();
-            Dictionary<string, float[]> sdi2 = new Dictionary<string, float[]>();
+                    short[] si1 = new short[] { 1, 2, 3 };
+                    short[] si2 = new short[] { 4, 5 };
+                    short[] si3 = new short[] { 6, 7 };
+
+                    sdi1[1] = si1;
+                    sdi1[2] = si2;
+                    sdi2[4] = si3;
+
+                    Dictionary<short, short[]> _do;
+                    var ro = p.opShortShortSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do[4].Length == 2);
+                    test(_do[4][0] == 6);
+                    test(_do[4][1] == 7);
+
+                    test(ro.Count == 3);
+                    test(ro[1].Length == 3);
+                    test(ro[1][0] == 1);
+                    test(ro[1][1] == 2);
+                    test(ro[1][2] == 3);
+                    test(ro[2].Length == 2);
+                    test(ro[2][0] == 4);
+                    test(ro[2][1] == 5);
+                    test(ro[4].Length == 2);
+                    test(ro[4][0] == 6);
+                    test(ro[4][1] == 7);
+                }
 
-            float[] si1 = new float[] { -1.1f, 123123.2f, 100.0f };
-            float[] si2 = new float[] { 42.24f, -1.61f };
-            float[] si3 = new float[] { -3.14f, 3.14f };
-
-            sdi1["abc"] = si1;
-            sdi1["ABC"] = si2;
-            sdi2["aBc"] = si3;
-
-            Dictionary<string, float[]> _do;
-            Dictionary<string, float[]> ro = p.opStringFloatSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do["aBc"].Length == 2);
-            test(_do["aBc"][0] == -3.14f);
-            test(_do["aBc"][1] == 3.14f);
-
-            test(ro.Count == 3);
-            test(ro["abc"].Length == 3);
-            test(ro["abc"][0] == -1.1f);
-            test(ro["abc"][1] == 123123.2f);
-            test(ro["abc"][2] == 100.0f);
-            test(ro["ABC"].Length == 2);
-            test(ro["ABC"][0] == 42.24f);
-            test(ro["ABC"][1] == -1.61f);
-            test(ro["aBc"].Length == 2);
-            test(ro["aBc"][0] == -3.14f);
-            test(ro["aBc"][1] == 3.14f);
-        }
+                {
+                    var sdi1 = new Dictionary<int, int[]>();
+                    var sdi2 = new Dictionary<int, int[]>();
 
-        {
-            Dictionary<string, double[]> sdi1 = new Dictionary<string, double[]>();
-            Dictionary<string, double[]> sdi2 = new Dictionary<string, double[]>();
+                    int[] si1 = new int[] { 100, 200, 300 };
+                    int[] si2 = new int[] { 400, 500 };
+                    int[] si3 = new int[] { 600, 700 };
+
+                    sdi1[100] = si1;
+                    sdi1[200] = si2;
+                    sdi2[400] = si3;
+
+                    Dictionary<int, int[]> _do;
+                    var ro = p.opIntIntSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do[400].Length == 2);
+                    test(_do[400][0] == 600);
+                    test(_do[400][1] == 700);
+
+                    test(ro.Count == 3);
+                    test(ro[100].Length == 3);
+                    test(ro[100][0] == 100);
+                    test(ro[100][1] == 200);
+                    test(ro[100][2] == 300);
+                    test(ro[200].Length == 2);
+                    test(ro[200][0] == 400);
+                    test(ro[200][1] == 500);
+                    test(ro[400].Length == 2);
+                    test(ro[400][0] == 600);
+                    test(ro[400][1] == 700);
+                }
 
-            double[] si1 = new double[] { 1.1E10, 1.2E10, 1.3E10 };
-            double[] si2 = new double[] { 1.4E10, 1.5E10 };
-            double[] si3 = new double[] { 1.6E10, 1.7E10 };
-
-            sdi1["Hello!!"] = si1;
-            sdi1["Goodbye"] = si2;
-            sdi2[""] = si3;
-
-            Dictionary<string, double[]> _do;
-            Dictionary<string, double[]> ro = p.opStringDoubleSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do[""].Length == 2);
-            test(_do[""][0] == 1.6E10);
-            test(_do[""][1] == 1.7E10);
-            test(ro.Count == 3);
-            test(ro["Hello!!"].Length == 3);
-            test(ro["Hello!!"][0] == 1.1E10);
-            test(ro["Hello!!"][1] == 1.2E10);
-            test(ro["Hello!!"][2] == 1.3E10);
-            test(ro["Goodbye"].Length == 2);
-            test(ro["Goodbye"][0] == 1.4E10);
-            test(ro["Goodbye"][1] == 1.5E10);
-            test(ro[""].Length == 2);
-            test(ro[""][0] == 1.6E10);
-            test(ro[""][1] == 1.7E10);
-        }
+                {
+                    var sdi1 = new Dictionary<long, long[]>();
+                    var sdi2 = new Dictionary<long, long[]>();
 
-        {
-            Dictionary<string, string[]> sdi1 = new Dictionary<string, string[]>();
-            Dictionary<string, string[]> sdi2 = new Dictionary<string, string[]>();
+                    var si1 = new long[] { 999999110L, 999999111L, 999999110L };
+                    var si2 = new long[] { 999999120L, 999999130L };
+                    long[] si3 = new long[] { 999999110L, 999999120L };
+
+                    sdi1[999999990L] = si1;
+                    sdi1[999999991L] = si2;
+                    sdi2[999999992L] = si3;
+
+                    Dictionary<long, long[]> _do;
+                    var ro = p.opLongLongSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do[999999992L].Length == 2);
+                    test(_do[999999992L][0] == 999999110L);
+                    test(_do[999999992L][1] == 999999120L);
+                    test(ro.Count == 3);
+                    test(ro[999999990L].Length == 3);
+                    test(ro[999999990L][0] == 999999110L);
+                    test(ro[999999990L][1] == 999999111L);
+                    test(ro[999999990L][2] == 999999110L);
+                    test(ro[999999991L].Length == 2);
+                    test(ro[999999991L][0] == 999999120L);
+                    test(ro[999999991L][1] == 999999130L);
+                    test(ro[999999992L].Length == 2);
+                    test(ro[999999992L][0] == 999999110L);
+                    test(ro[999999992L][1] == 999999120L);
+                }
 
-            string[] si1 = new string[] { "abc", "de", "fghi" };
-            string[] si2 = new string[] { "xyz", "or" };
-            string[] si3 = new string[] { "and", "xor" };
-
-            sdi1["abc"] = si1;
-            sdi1["def"] = si2;
-            sdi2["ghi"] = si3;
-
-            Dictionary<string, string[]> _do;
-            Dictionary<string, string[]> ro = p.opStringStringSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do["ghi"].Length == 2);
-            test(_do["ghi"][0].Equals("and"));
-            test(_do["ghi"][1].Equals("xor"));
-
-            test(ro.Count == 3);
-            test(ro["abc"].Length == 3);
-            test(ro["abc"][0].Equals("abc"));
-            test(ro["abc"][1].Equals("de"));
-            test(ro["abc"][2].Equals("fghi"));
-            test(ro["def"].Length == 2);
-            test(ro["def"][0].Equals("xyz"));
-            test(ro["def"][1].Equals("or"));
-            test(ro["ghi"].Length == 2);
-            test(ro["ghi"][0].Equals("and"));
-            test(ro["ghi"][1].Equals("xor"));
-        }
+                {
+                    var sdi1 = new Dictionary<string, float[]>();
+                    var sdi2 = new Dictionary<string, float[]>();
 
-        {
-            Dictionary<Test.MyEnum, Test.MyEnum[]> sdi1 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
-            Dictionary<Test.MyEnum, Test.MyEnum[]> sdi2 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    var si1 = new float[] { -1.1f, 123123.2f, 100.0f };
+                    var si2 = new float[] { 42.24f, -1.61f };
+                    var si3 = new float[] { -3.14f, 3.14f };
+
+                    sdi1["abc"] = si1;
+                    sdi1["ABC"] = si2;
+                    sdi2["aBc"] = si3;
+
+                    Dictionary<string, float[]> _do;
+                    var ro = p.opStringFloatSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do["aBc"].Length == 2);
+                    test(_do["aBc"][0] == -3.14f);
+                    test(_do["aBc"][1] == 3.14f);
+
+                    test(ro.Count == 3);
+                    test(ro["abc"].Length == 3);
+                    test(ro["abc"][0] == -1.1f);
+                    test(ro["abc"][1] == 123123.2f);
+                    test(ro["abc"][2] == 100.0f);
+                    test(ro["ABC"].Length == 2);
+                    test(ro["ABC"][0] == 42.24f);
+                    test(ro["ABC"][1] == -1.61f);
+                    test(ro["aBc"].Length == 2);
+                    test(ro["aBc"][0] == -3.14f);
+                    test(ro["aBc"][1] == 3.14f);
+                }
 
-            Test.MyEnum[] si1 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2 };
-            Test.MyEnum[] si2 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum2 };
-            Test.MyEnum[] si3 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum3 };
-
-            sdi1[Test.MyEnum.enum3] = si1;
-            sdi1[Test.MyEnum.enum2] = si2;
-            sdi2[Test.MyEnum.enum1] = si3;
-
-            Dictionary<Test.MyEnum, Test.MyEnum[]> _do;
-            Dictionary<Test.MyEnum, Test.MyEnum[]> ro = p.opMyEnumMyEnumSD(sdi1, sdi2, out _do);
-
-            test(_do.Count == 1);
-            test(_do[Test.MyEnum.enum1].Length == 2);
-            test(_do[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
-            test(_do[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
-            test(ro.Count == 3);
-            test(ro[Test.MyEnum.enum3].Length == 3);
-            test(ro[Test.MyEnum.enum3][0] == Test.MyEnum.enum1);
-            test(ro[Test.MyEnum.enum3][1] == Test.MyEnum.enum1);
-            test(ro[Test.MyEnum.enum3][2] == Test.MyEnum.enum2);
-            test(ro[Test.MyEnum.enum2].Length == 2);
-            test(ro[Test.MyEnum.enum2][0] == Test.MyEnum.enum1);
-            test(ro[Test.MyEnum.enum2][1] == Test.MyEnum.enum2);
-            test(ro[Test.MyEnum.enum1].Length == 2);
-            test(ro[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
-            test(ro[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
-        }
+                {
+                    var sdi1 = new Dictionary<string, double[]>();
+                    var sdi2 = new Dictionary<string, double[]>();
 
-        {
-            int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
+                    var si1 = new double[] { 1.1E10, 1.2E10, 1.3E10 };
+                    var si2 = new double[] { 1.4E10, 1.5E10 };
+                    var si3 = new double[] { 1.6E10, 1.7E10 };
+
+                    sdi1["Hello!!"] = si1;
+                    sdi1["Goodbye"] = si2;
+                    sdi2[""] = si3;
+
+                    Dictionary<string, double[]> _do;
+                    var ro = p.opStringDoubleSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do[""].Length == 2);
+                    test(_do[""][0] == 1.6E10);
+                    test(_do[""][1] == 1.7E10);
+                    test(ro.Count == 3);
+                    test(ro["Hello!!"].Length == 3);
+                    test(ro["Hello!!"][0] == 1.1E10);
+                    test(ro["Hello!!"][1] == 1.2E10);
+                    test(ro["Hello!!"][2] == 1.3E10);
+                    test(ro["Goodbye"].Length == 2);
+                    test(ro["Goodbye"][0] == 1.4E10);
+                    test(ro["Goodbye"][1] == 1.5E10);
+                    test(ro[""].Length == 2);
+                    test(ro[""][0] == 1.6E10);
+                    test(ro[""][1] == 1.7E10);
+                }
 
-            for(int l = 0; l < lengths.Length; ++l)
-            {
-                int[] s = new int[lengths[l]];
-                for(int i = 0; i < lengths[l]; ++i)
                 {
-                    s[i] = i;
+                    var sdi1 = new Dictionary<string, string[]>();
+                    var sdi2 = new Dictionary<string, string[]>();
+
+                    var si1 = new string[] { "abc", "de", "fghi" };
+                    var si2 = new string[] { "xyz", "or" };
+                    var si3 = new string[] { "and", "xor" };
+
+                    sdi1["abc"] = si1;
+                    sdi1["def"] = si2;
+                    sdi2["ghi"] = si3;
+
+                    Dictionary<string, string[]> _do;
+                    var ro = p.opStringStringSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do["ghi"].Length == 2);
+                    test(_do["ghi"][0].Equals("and"));
+                    test(_do["ghi"][1].Equals("xor"));
+
+                    test(ro.Count == 3);
+                    test(ro["abc"].Length == 3);
+                    test(ro["abc"][0].Equals("abc"));
+                    test(ro["abc"][1].Equals("de"));
+                    test(ro["abc"][2].Equals("fghi"));
+                    test(ro["def"].Length == 2);
+                    test(ro["def"][0].Equals("xyz"));
+                    test(ro["def"][1].Equals("or"));
+                    test(ro["ghi"].Length == 2);
+                    test(ro["ghi"][0].Equals("and"));
+                    test(ro["ghi"][1].Equals("xor"));
                 }
 
-                int[] r = p.opIntS(s);
-                test(r.Length == lengths[l]);
-                for(int j = 0; j < r.Length; ++j)
                 {
-                    test(r[j] == -j);
-                }
-            }
-        }
+                    var sdi1 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
+                    var sdi2 = new Dictionary<Test.MyEnum, Test.MyEnum[]>();
 
-        {
-            Dictionary<string, string> ctx = new Dictionary<string, string>();
-            ctx["one"] = "ONE";
-            ctx["two"] = "TWO";
-            ctx["three"] = "THREE";
-            {
-                test(p.ice_getContext().Count == 0);
-                Dictionary<string, string> r = p.opContext();
-                test(!r.Equals(ctx));
-            }
-            {
-                Dictionary<string, string> r = p.opContext(ctx);
-                test(p.ice_getContext().Count == 0);
-                test(Ice.CollectionComparer.Equals(r, ctx));
-            }
-            {
-                Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
-                Dictionary<string, string> r = p2.opContext();
-                test(Ice.CollectionComparer.Equals(r, ctx));
-                r = p2.opContext(ctx);
-                test(Ice.CollectionComparer.Equals(r, ctx));
-            }
-        }
+                    var si1 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    var si2 = new Test.MyEnum[] { Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    var si3 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum3 };
+
+                    sdi1[Test.MyEnum.enum3] = si1;
+                    sdi1[Test.MyEnum.enum2] = si2;
+                    sdi2[Test.MyEnum.enum1] = si3;
+
+                    Dictionary<Test.MyEnum, Test.MyEnum[]> _do;
+                    Dictionary<Test.MyEnum, Test.MyEnum[]> ro = p.opMyEnumMyEnumSD(sdi1, sdi2, out _do);
+
+                    test(_do.Count == 1);
+                    test(_do[Test.MyEnum.enum1].Length == 2);
+                    test(_do[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
+                    test(_do[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
+                    test(ro.Count == 3);
+                    test(ro[Test.MyEnum.enum3].Length == 3);
+                    test(ro[Test.MyEnum.enum3][0] == Test.MyEnum.enum1);
+                    test(ro[Test.MyEnum.enum3][1] == Test.MyEnum.enum1);
+                    test(ro[Test.MyEnum.enum3][2] == Test.MyEnum.enum2);
+                    test(ro[Test.MyEnum.enum2].Length == 2);
+                    test(ro[Test.MyEnum.enum2][0] == Test.MyEnum.enum1);
+                    test(ro[Test.MyEnum.enum2][1] == Test.MyEnum.enum2);
+                    test(ro[Test.MyEnum.enum1].Length == 2);
+                    test(ro[Test.MyEnum.enum1][0] == Test.MyEnum.enum3);
+                    test(ro[Test.MyEnum.enum1][1] == Test.MyEnum.enum3);
+                }
 
-        if(p.ice_getConnection() != null)
-        {
-            //
-            // Test implicit context propagation
-            //
+                {
+                    int[] lengths = new int[] { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
 
-            String[] impls = {"Shared", "PerThread"};
-            for(int i = 0; i < 2; i++)
-            {
-                Ice.InitializationData initData = new Ice.InitializationData();
-                initData.properties = communicator.getProperties().ice_clone_();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
-
-                Ice.Communicator ic = Ice.Util.initialize(initData);
-
-                Dictionary<string, string> ctx = new Dictionary<string, string>();
-                ctx["one"] = "ONE";
-                ctx["two"] = "TWO";
-                ctx["three"] = "THREE";
-
-                Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(
-                    ic.stringToProxy("test:" + app.getTestEndpoint(0)));
-
-                ic.getImplicitContext().setContext(ctx);
-                test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx));
-                test(Ice.CollectionComparer.Equals(p3.opContext(), ctx));
-
-                test(ic.getImplicitContext().containsKey("zero") == false);
-                String r = ic.getImplicitContext().put("zero", "ZERO");
-                test(r.Equals(""));
-                test(ic.getImplicitContext().get("zero").Equals("ZERO"));
-
-                ctx = ic.getImplicitContext().getContext();
-                test(Ice.CollectionComparer.Equals(p3.opContext(), ctx));
-
-                Dictionary<string, string> prxContext = new Dictionary<string, string>();
-                prxContext["one"] = "UN";
-                prxContext["four"] = "QUATRE";
+                    for (int l = 0; l < lengths.Length; ++l)
+                    {
+                        int[] s = new int[lengths[l]];
+                        for (int i = 0; i < lengths[l]; ++i)
+                        {
+                            s[i] = i;
+                        }
+
+                        int[] r = p.opIntS(s);
+                        test(r.Length == lengths[l]);
+                        for (int j = 0; j < r.Length; ++j)
+                        {
+                            test(r[j] == -j);
+                        }
+                    }
+                }
 
-                Dictionary<string, string> combined = new Dictionary<string, string>(prxContext);
-                foreach(KeyValuePair<string, string> e in ctx)
                 {
-                    try
+                    Dictionary<string, string> ctx = new Dictionary<string, string>();
+                    ctx["one"] = "ONE";
+                    ctx["two"] = "TWO";
+                    ctx["three"] = "THREE";
                     {
-                        combined.Add(e.Key, e.Value);
+                        test(p.ice_getContext().Count == 0);
+                        Dictionary<string, string> r = p.opContext();
+                        test(!r.Equals(ctx));
                     }
-                    catch(ArgumentException)
                     {
-                        // Ignore.
+                        Dictionary<string, string> r = p.opContext(ctx);
+                        test(p.ice_getContext().Count == 0);
+                        test(Ice.CollectionComparer.Equals(r, ctx));
+                    }
+                    {
+                        var p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+                        test(Ice.CollectionComparer.Equals(p2.ice_getContext(), ctx));
+                        Dictionary<string, string> r = p2.opContext();
+                        test(Ice.CollectionComparer.Equals(r, ctx));
+                        r = p2.opContext(ctx);
+                        test(Ice.CollectionComparer.Equals(r, ctx));
                     }
                 }
-                test(combined["one"].Equals("UN"));
-
-                p3 = Test.MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
 
-                ic.getImplicitContext().setContext(null);
-                test(Ice.CollectionComparer.Equals(p3.opContext(), prxContext));
-
-                ic.getImplicitContext().setContext(ctx);
-                test(Ice.CollectionComparer.Equals(p3.opContext(), combined));
+                if (p.ice_getConnection() != null)
+                {
+                    //
+                    // Test implicit context propagation
+                    //
 
-                test(ic.getImplicitContext().remove("one").Equals("ONE"));
+                    String[] impls = { "Shared", "PerThread" };
+                    for (int i = 0; i < 2; i++)
+                    {
+                        Ice.InitializationData initData = new Ice.InitializationData();
+                        initData.properties = communicator.getProperties().ice_clone_();
+                        initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
+
+                        Ice.Communicator ic = helper.initialize(initData);
+
+                        Dictionary<string, string> ctx = new Dictionary<string, string>();
+                        ctx["one"] = "ONE";
+                        ctx["two"] = "TWO";
+                        ctx["three"] = "THREE";
+
+                        var p3 = Test.MyClassPrxHelper.uncheckedCast(
+                            ic.stringToProxy("test:" + helper.getTestEndpoint(0)));
+
+                        ic.getImplicitContext().setContext(ctx);
+                        test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx));
+                        test(Ice.CollectionComparer.Equals(p3.opContext(), ctx));
+
+                        test(ic.getImplicitContext().containsKey("zero") == false);
+                        String r = ic.getImplicitContext().put("zero", "ZERO");
+                        test(r.Equals(""));
+                        test(ic.getImplicitContext().get("zero").Equals("ZERO"));
+
+                        ctx = ic.getImplicitContext().getContext();
+                        test(Ice.CollectionComparer.Equals(p3.opContext(), ctx));
+
+                        Dictionary<string, string> prxContext = new Dictionary<string, string>();
+                        prxContext["one"] = "UN";
+                        prxContext["four"] = "QUATRE";
+
+                        Dictionary<string, string> combined = new Dictionary<string, string>(prxContext);
+                        foreach (KeyValuePair<string, string> e in ctx)
+                        {
+                            try
+                            {
+                                combined.Add(e.Key, e.Value);
+                            }
+                            catch (ArgumentException)
+                            {
+                                // Ignore.
+                            }
+                        }
+                        test(combined["one"].Equals("UN"));
+
+                        p3 = Test.MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
+
+                        ic.getImplicitContext().setContext(null);
+                        test(Ice.CollectionComparer.Equals(p3.opContext(), prxContext));
+
+                        ic.getImplicitContext().setContext(ctx);
+                        test(Ice.CollectionComparer.Equals(p3.opContext(), combined));
+
+                        test(ic.getImplicitContext().remove("one").Equals("ONE"));
+
+                        if (impls[i].Equals("PerThread"))
+                        {
+                            var thread = new PerThreadContextInvokeThread(
+                                Test.MyClassPrxHelper.uncheckedCast(p3.ice_context(null)));
+                            thread.Start();
+                            thread.Join();
+                        }
+                        ic.destroy();
+                    }
+                }
 
-                if(impls[i].Equals("PerThread"))
                 {
-                    PerThreadContextInvokeThread thread = new PerThreadContextInvokeThread(
-                        Test.MyClassPrxHelper.uncheckedCast(p3.ice_context(null)));
-                    thread.Start();
-                    thread.Join();
+                    p.opIdempotent();
                 }
-                ic.destroy();
-            }
-        }
-
-        {
-            p.opIdempotent();
-        }
 
-        {
-            p.opNonmutating();
-        }
+                {
+                    p.opNonmutating();
+                }
 
-        {
-            test(p.opByte1(0xFF) == 0xFF);
-            test(p.opShort1(0x7FFF) == 0x7FFF);
-            test(p.opInt1(0x7FFFFFFF) == 0x7FFFFFFF);
-            test(p.opLong1(0x7FFFFFFFFFFFFFFF) == 0x7FFFFFFFFFFFFFFF);
-            test(p.opFloat1(1.0f) == 1.0f);
-            test(p.opDouble1(1.0d) == 1.0d);
-            test(p.opString1("opString1").Equals("opString1"));
-            test(p.opStringS1(null).Length == 0);
-            test(p.opByteBoolD1(null).Count == 0);
-            test(p.opStringS2(null).Length == 0);
-            test(p.opByteBoolD2(null).Count == 0);
-
-            Test.MyDerivedClassPrx d = Test.MyDerivedClassPrxHelper.uncheckedCast(p);
-            Test.MyStruct1 s = new Test.MyStruct1();
-            s.tesT = "Test.MyStruct1.s";
-            s.myClass = null;
-            s.myStruct1 = "Test.MyStruct1.myStruct1";
-            s = d.opMyStruct1(s);
-            test(s.tesT.Equals("Test.MyStruct1.s"));
-            test(s.myClass == null);
-            test(s.myStruct1.Equals("Test.MyStruct1.myStruct1"));
-            Test.MyClass1 c = new Test.MyClass1();
-            c.tesT = "Test.MyClass1.testT";
-            c.myClass = null;
-            c.myClass1 = "Test.MyClass1.myClass1";
-            c = d.opMyClass1(c);
-            test(c.tesT.Equals("Test.MyClass1.testT"));
-            test(c.myClass == null);
-            test(c.myClass1.Equals("Test.MyClass1.myClass1"));
-        }
+                {
+                    test(p.opByte1(0xFF) == 0xFF);
+                    test(p.opShort1(0x7FFF) == 0x7FFF);
+                    test(p.opInt1(0x7FFFFFFF) == 0x7FFFFFFF);
+                    test(p.opLong1(0x7FFFFFFFFFFFFFFF) == 0x7FFFFFFFFFFFFFFF);
+                    test(p.opFloat1(1.0f) == 1.0f);
+                    test(p.opDouble1(1.0d) == 1.0d);
+                    test(p.opString1("opString1").Equals("opString1"));
+                    test(p.opStringS1(null).Length == 0);
+                    test(p.opByteBoolD1(null).Count == 0);
+                    test(p.opStringS2(null).Length == 0);
+                    test(p.opByteBoolD2(null).Count == 0);
+
+                    var d = Test.MyDerivedClassPrxHelper.uncheckedCast(p);
+                    var s = new Test.MyStruct1();
+                    s.tesT = "MyStruct1.s";
+                    s.myClass = null;
+                    s.myStruct1 = "MyStruct1.myStruct1";
+                    s = d.opMyStruct1(s);
+                    test(s.tesT.Equals("MyStruct1.s"));
+                    test(s.myClass == null);
+                    test(s.myStruct1.Equals("MyStruct1.myStruct1"));
+                    var c = new Test.MyClass1();
+                    c.tesT = "MyClass1.testT";
+                    c.myClass = null;
+                    c.myClass1 = "MyClass1.myClass1";
+                    c = d.opMyClass1(c);
+                    test(c.tesT.Equals("MyClass1.testT"));
+                    test(c.myClass == null);
+                    test(c.myClass1.Equals("MyClass1.myClass1"));
+                }
 
-        {
-            Test.Structure p1 = p.opMStruct1();
-            p1.e = Test.MyEnum.enum3;
-            Test.Structure p2, p3;
-            p3 = p.opMStruct2(p1, out p2);
-            test(p2.Equals(p1) && p3.Equals(p1));
-        }
+                {
+                    var p1 = p.opMStruct1();
+                    p1.e = Test.MyEnum.enum3;
+                    Test.Structure p2, p3;
+                    p3 = p.opMStruct2(p1, out p2);
+                    test(p2.Equals(p1) && p3.Equals(p1));
+                }
 
-        {
-            p.opMSeq1();
+                {
+                    p.opMSeq1();
 
-            string[] p1 = new string[1];
-            p1[0] = "test";
-            string[] p2, p3;
-            p3 = p.opMSeq2(p1, out p2);
-            test(Ice.CollectionComparer.Equals(p2, p1) && Ice.CollectionComparer.Equals(p3, p1));
-        }
+                    string[] p1 = new string[1];
+                    p1[0] = "test";
+                    string[] p2, p3;
+                    p3 = p.opMSeq2(p1, out p2);
+                    test(Ice.CollectionComparer.Equals(p2, p1) &&
+                         Ice.CollectionComparer.Equals(p3, p1));
+                }
 
-        {
-            p.opMDict1();
+                {
+                    p.opMDict1();
 
-            Dictionary<string, string> p1 = new Dictionary<string, string>();
-            p1["test"] = "test";
-            Dictionary<string, string> p2, p3;
-            p3 = p.opMDict2(p1, out p2);
-            test(Ice.CollectionComparer.Equals(p2, p1) && Ice.CollectionComparer.Equals(p3, p1));
+                    Dictionary<string, string> p1 = new Dictionary<string, string>();
+                    p1["test"] = "test";
+                    Dictionary<string, string> p2, p3;
+                    p3 = p.opMDict2(p1, out p2);
+                    test(Ice.CollectionComparer.Equals(p2, p1) &&
+                         Ice.CollectionComparer.Equals(p3, p1));
+                }
+            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/optional/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,572 +1,369 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static Test.InitialPrx allTests(TestCommon.Application app)
+    namespace optional
     {
-        Ice.Communicator communicator = app.communicator();
-        FactoryI factory = new FactoryI();
-        communicator.getValueFactoryManager().add(factory.create, "");
-
-        Write("testing stringToProxy... ");
-        Flush();
-        string @ref = "initial:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
-        test(@base != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        Test.InitialPrx initial = Test.InitialPrxHelper.checkedCast(@base);
-        test(initial != null);
-        test(initial.Equals(@base));
-        WriteLine("ok");
-
-        Write("testing optional data members... ");
-        Flush();
-
-        Test.OneOptional oo1 = new Test.OneOptional();
-        test(!oo1.a.HasValue);
-        oo1.a = 15;
-        test(oo1.a.HasValue && oo1.a.Value == 15);
-
-        Test.OneOptional oo2 = new Test.OneOptional(16);
-        test(oo2.a.HasValue && oo2.a.Value == 16);
-
-        Test.MultiOptional mo1 = new Test.MultiOptional();
-        mo1.a = 15;
-        mo1.b = true;
-        mo1.c = 19;
-        mo1.d = 78;
-        mo1.e = 99;
-        mo1.f = (float)5.5;
-        mo1.g = 1.0;
-        mo1.h = "test";
-        mo1.i = Test.MyEnum.MyEnumMember;
-        mo1.j = new Ice.Optional<Ice.ObjectPrx>(communicator.stringToProxy("test"));
-        mo1.k = mo1;
-        mo1.bs = new byte[] { 5 };
-        mo1.ss = new string[] { "test", "test2" };
-        mo1.iid = new Dictionary<int, int>();
-        mo1.iid.Value.Add(4, 3);
-        mo1.sid = new Dictionary<string, int>();
-        mo1.sid.Value.Add("test", 10);
-        Test.FixedStruct fs = new Test.FixedStruct();
-        fs.m = 78;
-        mo1.fs = fs;
-        Test.VarStruct vs = new Test.VarStruct();
-        vs.m = "hello";
-        mo1.vs = vs;
-
-        mo1.shs = new short[] { 1 };
-        mo1.es = new Test.MyEnum[] { Test.MyEnum.MyEnumMember, Test.MyEnum.MyEnumMember };
-        mo1.fss = new Test.FixedStruct[] { fs };
-        mo1.vss = new Test.VarStruct[] { vs };
-        mo1.oos = new Test.OneOptional[] { oo1 };
-        mo1.oops = new Ice.ObjectPrx[] { communicator.stringToProxy("test") };
-
-        mo1.ied = new Dictionary<int, Test.MyEnum>();
-        mo1.ied.Value.Add(4, Test.MyEnum.MyEnumMember);
-        mo1.ifsd = new Dictionary<int, Test.FixedStruct>();
-        mo1.ifsd.Value.Add(4, fs);
-        mo1.ivsd = new Dictionary<int, Test.VarStruct>();
-        mo1.ivsd.Value.Add(5, vs);
-        mo1.iood = new Dictionary<int, Test.OneOptional>();
-        mo1.iood.Value.Add(5, new Test.OneOptional(15));
-        mo1.ioopd = new Dictionary<int, Ice.ObjectPrx>();
-        mo1.ioopd.Value.Add(5, communicator.stringToProxy("test"));
-
-        mo1.bos = new bool[] { false, true, false };
-        mo1.ser = new Test.SerializableClass(56);
-
-        test(mo1.a.Value == (byte)15);
-        test(mo1.b.Value);
-        test(mo1.c.Value == 19);
-        test(mo1.d.Value == 78);
-        test(mo1.e.Value == 99);
-        test(mo1.f.Value == (float)5.5);
-        test(mo1.g.Value == 1.0);
-        test(mo1.h.Value.Equals("test"));
-        test(mo1.i.Value == Test.MyEnum.MyEnumMember);
-        test(mo1.j.Value.Equals(communicator.stringToProxy("test")));
-        test(mo1.k.Value == mo1);
-        test(ArraysEqual(mo1.bs.Value, new byte[] { (byte)5 }));
-        test(ArraysEqual(mo1.ss.Value, new String[] { "test", "test2" }));
-        test(mo1.iid.Value[4] == 3);
-        test(mo1.sid.Value["test"] == 10);
-        test(mo1.fs.Value.Equals(new Test.FixedStruct(78)));
-        test(mo1.vs.Value.Equals(new Test.VarStruct("hello")));
-
-        test(mo1.shs.Value[0] == (short)1);
-        test(mo1.es.Value[0] == Test.MyEnum.MyEnumMember && mo1.es.Value[1] == Test.MyEnum.MyEnumMember);
-        test(mo1.fss.Value[0].Equals(new Test.FixedStruct(78)));
-        test(mo1.vss.Value[0].Equals(new Test.VarStruct("hello")));
-        test(mo1.oos.Value[0] == oo1);
-        test(mo1.oops.Value[0].Equals(communicator.stringToProxy("test")));
-
-        test(mo1.ied.Value[4] == Test.MyEnum.MyEnumMember);
-        test(mo1.ifsd.Value[4].Equals(new Test.FixedStruct(78)));
-        test(mo1.ivsd.Value[5].Equals(new Test.VarStruct("hello")));
-        test(mo1.iood.Value[5].a.Value == 15);
-        test(mo1.ioopd.Value[5].Equals(communicator.stringToProxy("test")));
-
-        test(ArraysEqual(mo1.bos.Value, new bool[] { false, true, false }));
-        test(mo1.ser.Value.Equals(new Test.SerializableClass(56)));
-
-        WriteLine("ok");
-
-        Write("testing marshaling... ");
-        Flush();
-
-        Test.OneOptional oo4 = (Test.OneOptional)initial.pingPong(new Test.OneOptional());
-        test(!oo4.a.HasValue);
-
-        Test.OneOptional oo5 = (Test.OneOptional)initial.pingPong(oo1);
-        test(oo1.a.Value == oo5.a.Value);
-
-        Test.MultiOptional mo4 = (Test.MultiOptional)initial.pingPong(new Test.MultiOptional());
-        test(!mo4.a.HasValue);
-        test(!mo4.b.HasValue);
-        test(!mo4.c.HasValue);
-        test(!mo4.d.HasValue);
-        test(!mo4.e.HasValue);
-        test(!mo4.f.HasValue);
-        test(!mo4.g.HasValue);
-        test(!mo4.h.HasValue);
-        test(!mo4.i.HasValue);
-        test(!mo4.j.HasValue);
-        test(!mo4.k.HasValue);
-        test(!mo4.bs.HasValue);
-        test(!mo4.ss.HasValue);
-        test(!mo4.iid.HasValue);
-        test(!mo4.sid.HasValue);
-        test(!mo4.fs.HasValue);
-        test(!mo4.vs.HasValue);
-
-        test(!mo4.shs.HasValue);
-        test(!mo4.es.HasValue);
-        test(!mo4.fss.HasValue);
-        test(!mo4.vss.HasValue);
-        test(!mo4.oos.HasValue);
-        test(!mo4.oops.HasValue);
-
-        test(!mo4.ied.HasValue);
-        test(!mo4.ifsd.HasValue);
-        test(!mo4.ivsd.HasValue);
-        test(!mo4.iood.HasValue);
-        test(!mo4.ioopd.HasValue);
-
-        test(!mo4.bos.HasValue);
-
-        test(!mo4.ser.HasValue);
-
-        bool supportsCsharpSerializable = initial.supportsCsharpSerializable();
-        if(!supportsCsharpSerializable)
-        {
-            mo1.ser = Ice.Util.None;
-        }
-
-        Test.MultiOptional mo5 = (Test.MultiOptional)initial.pingPong(mo1);
-        test(mo5.a.Value == mo1.a.Value);
-        test(mo5.b.Value == mo1.b.Value);
-        test(mo5.c.Value == mo1.c.Value);
-        test(mo5.d.Value == mo1.d.Value);
-        test(mo5.e.Value == mo1.e.Value);
-        test(mo5.f.Value == mo1.f.Value);
-        test(mo5.g.Value == mo1.g.Value);
-        test(mo5.h.Value.Equals(mo1.h.Value));
-        test(mo5.i.Value == mo1.i.Value);
-        test(mo5.j.Value.Equals(mo1.j.Value));
-        test(mo5.k.Value == mo5);
-        test(ArraysEqual(mo5.bs.Value, mo1.bs.Value));
-        test(ArraysEqual(mo5.ss.Value, mo1.ss.Value));
-        test(mo5.iid.Value[4] == 3);
-        test(mo5.sid.Value["test"] == 10);
-        test(mo5.fs.Value.Equals(mo1.fs.Value));
-        test(mo5.vs.Value.Equals(mo1.vs.Value));
-        test(ArraysEqual(mo5.shs.Value, mo1.shs.Value));
-        test(mo5.es.Value[0] == Test.MyEnum.MyEnumMember && mo1.es.Value[1] == Test.MyEnum.MyEnumMember);
-        test(mo5.fss.Value[0].Equals(new Test.FixedStruct(78)));
-        test(mo5.vss.Value[0].Equals(new Test.VarStruct("hello")));
-        test(mo5.oos.Value[0].a.Value == 15);
-        test(mo5.oops.Value[0].Equals(communicator.stringToProxy("test")));
-
-        test(mo5.ied.Value[4] == Test.MyEnum.MyEnumMember);
-        test(mo5.ifsd.Value[4].Equals(new Test.FixedStruct(78)));
-        test(mo5.ivsd.Value[5].Equals(new Test.VarStruct("hello")));
-        test(mo5.iood.Value[5].a.Value == 15);
-        test(mo5.ioopd.Value[5].Equals(communicator.stringToProxy("test")));
-
-        test(ArraysEqual(mo5.bos.Value, new bool[] { false, true, false }));
-        if(supportsCsharpSerializable)
-        {
-            test(mo5.ser.Value.Equals(new Test.SerializableClass(56)));
-        }
-
-        // Clear the first half of the optional members
-        Test.MultiOptional mo6 = new Test.MultiOptional();
-        mo6.b = mo5.b;
-        mo6.d = mo5.d;
-        mo6.f = mo5.f;
-        mo6.h = mo5.h;
-        mo6.j = mo5.j;
-        mo6.bs = mo5.bs;
-        mo6.iid = mo5.iid;
-        mo6.fs = mo5.fs;
-        mo6.shs = mo5.shs;
-        mo6.fss = mo5.fss;
-        mo6.oos = mo5.oos;
-        mo6.ifsd = mo5.ifsd;
-        mo6.iood = mo5.iood;
-        mo6.bos = mo5.bos;
-
-        Test.MultiOptional mo7 = (Test.MultiOptional)initial.pingPong(mo6);
-        test(!mo7.a.HasValue);
-        test(mo7.b.Equals(mo1.b));
-        test(!mo7.c.HasValue);
-        test(mo7.d.Equals(mo1.d));
-        test(!mo7.e.HasValue);
-        test(mo7.f.Equals(mo1.f));
-        test(!mo7.g.HasValue);
-        test(mo7.h.Equals(mo1.h));
-        test(!mo7.i.HasValue);
-        test(mo7.j.Equals(mo1.j));
-        test(!mo7.k.HasValue);
-        test(ArraysEqual(mo7.bs.Value, mo1.bs.Value));
-        test(!mo7.ss.HasValue);
-        test(mo7.iid.Value[4] == 3);
-        test(!mo7.sid.HasValue);
-        test(mo7.fs.Equals(mo1.fs));
-        test(!mo7.vs.HasValue);
-
-        test(ArraysEqual(mo7.shs.Value, mo1.shs.Value));
-        test(!mo7.es.HasValue);
-        test(mo7.fss.Value[0].Equals(new Test.FixedStruct(78)));
-        test(!mo7.vss.HasValue);
-        test(mo7.oos.Value[0].a.Value == 15);
-        test(!mo7.oops.HasValue);
-
-        test(!mo7.ied.HasValue);
-        test(mo7.ifsd.Value[4].Equals(new Test.FixedStruct(78)));
-        test(!mo7.ivsd.HasValue);
-        test(mo7.iood.Value[5].a.Value == 15);
-        test(!mo7.ioopd.HasValue);
-
-        test(ArraysEqual(mo7.bos.Value, new bool[] { false, true, false }));
-        test(!mo7.ser.HasValue);
-
-        // Clear the second half of the optional members
-        Test.MultiOptional mo8 = new Test.MultiOptional();
-        mo8.a = mo5.a;
-        mo8.c = mo5.c;
-        mo8.e = mo5.e;
-        mo8.g = mo5.g;
-        mo8.i = mo5.i;
-        mo8.k = mo8;
-        mo8.ss = mo5.ss;
-        mo8.sid = mo5.sid;
-        mo8.vs = mo5.vs;
-
-        mo8.es = mo5.es;
-        mo8.vss = mo5.vss;
-        mo8.oops = mo5.oops;
-
-        mo8.ied = mo5.ied;
-        mo8.ivsd = mo5.ivsd;
-        mo8.ioopd = mo5.ioopd;
-        if(supportsCsharpSerializable)
-        {
-            mo8.ser = new Test.SerializableClass(56);
-        }
-
-        Test.MultiOptional mo9 = (Test.MultiOptional)initial.pingPong(mo8);
-        test(mo9.a.Equals(mo1.a));
-        test(!mo9.b.HasValue);
-        test(mo9.c.Equals(mo1.c));
-        test(!mo9.d.HasValue);
-        test(mo9.e.Equals(mo1.e));
-        test(!mo9.f.HasValue);
-        test(mo9.g.Equals(mo1.g));
-        test(!mo9.h.HasValue);
-        test(mo9.i.Equals(mo1.i));
-        test(!mo9.j.HasValue);
-        test(mo9.k.Value == mo9);
-        test(!mo9.bs.HasValue);
-        test(ArraysEqual(mo9.ss.Value, mo1.ss.Value));
-        test(!mo9.iid.HasValue);
-        test(mo9.sid.Value["test"] == 10);
-        test(!mo9.fs.HasValue);
-        test(mo9.vs.Equals(mo1.vs));
-
-        test(!mo9.shs.HasValue);
-        test(mo9.es.Value[0] == Test.MyEnum.MyEnumMember && mo1.es.Value[1] == Test.MyEnum.MyEnumMember);
-        test(!mo9.fss.HasValue);
-        test(mo9.vss.Value[0].Equals(new Test.VarStruct("hello")));
-        test(!mo9.oos.HasValue);
-        test(mo9.oops.Value[0].Equals(communicator.stringToProxy("test")));
-
-        test(mo9.ied.Value[4] == Test.MyEnum.MyEnumMember);
-        test(!mo9.ifsd.HasValue);
-        test(mo9.ivsd.Value[5].Equals(new Test.VarStruct("hello")));
-        test(!mo9.iood.HasValue);
-        test(mo9.ioopd.Value[5].Equals(communicator.stringToProxy("test")));
-
-        test(!mo9.bos.HasValue);
-        if(supportsCsharpSerializable)
-        {
-            test(mo9.ser.Value.Equals(new Test.SerializableClass(56)));
-        }
-
-        {
-            Test.OptionalWithCustom owc1 = new Test.OptionalWithCustom();
-            owc1.l = new List<Test.SmallStruct>();
-            owc1.l.Value.Add(new Test.SmallStruct(5));
-            owc1.l.Value.Add(new Test.SmallStruct(6));
-            owc1.l.Value.Add(new Test.SmallStruct(7));
-            owc1.s = new Test.ClassVarStruct(5);
-            Test.OptionalWithCustom owc2 = (Test.OptionalWithCustom)initial.pingPong(owc1);
-            test(owc2.l.HasValue);
-            test(ListsEqual(owc1.l.Value, owc2.l.Value));
-            test(owc2.s.HasValue);
-            test(owc2.s.Value.a == 5);
-        }
-
-        //
-        // Send a request using blobjects. Upon receival, we don't read
-        // any of the optional members. This ensures the optional members
-        // are skipped even if the receiver knows nothing about them.
-        //
-        factory.setEnabled(true);
-        Ice.OutputStream os = new Ice.OutputStream(communicator);
-        os.startEncapsulation();
-        os.writeValue(oo1);
-        os.endEncapsulation();
-        byte[] inEncaps = os.finished();
-        byte[] outEncaps;
-        test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
-        Ice.InputStream @in = new Ice.InputStream(communicator, outEncaps);
-        @in.startEncapsulation();
-        ReadValueCallbackI cb = new ReadValueCallbackI();
-        @in.readValue(cb.invoke);
-        @in.endEncapsulation();
-        test(cb.obj != null && cb.obj is TestValueReader);
-
-        os = new Ice.OutputStream(communicator);
-        os.startEncapsulation();
-        os.writeValue(mo1);
-        os.endEncapsulation();
-        inEncaps = os.finished();
-        test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
-        @in = new Ice.InputStream(communicator, outEncaps);
-        @in.startEncapsulation();
-        @in.readValue(cb.invoke);
-        @in.endEncapsulation();
-        test(cb.obj != null && cb.obj is TestValueReader);
-        factory.setEnabled(false);
-
-        //
-        // Use the 1.0 encoding with operations whose only class parameters are optional.
-        //
-        Ice.Optional<Test.OneOptional> oo = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
-        initial.sendOptionalClass(true, oo);
-        Test.InitialPrx initial2 = (Test.InitialPrx)initial.ice_encodingVersion(Ice.Util.Encoding_1_0);
-        initial2.sendOptionalClass(true, oo);
-
-        initial.returnOptionalClass(true, out oo);
-        test(oo.HasValue);
-        initial2.returnOptionalClass(true, out oo);
-        test(!oo.HasValue);
-
-        Test.Recursive[] recursive1 = new Test.Recursive[1];
-        recursive1[0] = new Test.Recursive();
-        Test.Recursive[] recursive2 = new Test.Recursive[1];
-        recursive2[0] = new Test.Recursive();
-        recursive1[0].value = recursive2;
-        Test.Recursive outer = new Test.Recursive();
-        outer.value = recursive1;
-        initial.pingPong(outer);
-
-        Test.G g = new Test.G();
-        g.gg1Opt = new Ice.Optional<Test.G1>(new Test.G1("gg1Opt"));
-        g.gg2 = new Test.G2(10);
-        g.gg2Opt = new Ice.Optional<Test.G2>(new Test.G2(20));
-        g.gg1 = new Test.G1("gg1");
-        g = initial.opG(g);
-        test("gg1Opt".Equals(g.gg1Opt.Value.a));
-        test(10 == g.gg2.a);
-        test(20 == g.gg2Opt.Value.a);
-        test("gg1".Equals(g.gg1.a));
-
-        initial.opVoid();
-
-        os = new Ice.OutputStream(communicator);
-        os.startEncapsulation();
-        os.writeOptional(1, Ice.OptionalFormat.F4);
-        os.writeInt(15);
-        os.writeOptional(1, Ice.OptionalFormat.VSize);
-        os.writeString("test");
-        os.endEncapsulation();
-        inEncaps = os.finished();
-        test(initial.ice_invoke("opVoid", Ice.OperationMode.Normal, inEncaps, out outEncaps));
-
-        WriteLine("ok");
-
-        Write("testing marshaling of large containers with fixed size elements... ");
-        Flush();
-        Test.MultiOptional mc = new Test.MultiOptional();
-
-        mc.bs = new byte[1000];
-        mc.shs = new short[300];
-
-        mc.fss = new Test.FixedStruct[300];
-        for(int i = 0; i < 300; ++i)
+        public class AllTests : global::Test.AllTests
         {
-            mc.fss.Value[i] = new Test.FixedStruct();
-        }
-
-        mc.ifsd = new Dictionary<int, Test.FixedStruct>();
-        for(int i = 0; i < 300; ++i)
-        {
-            mc.ifsd.Value.Add(i, new Test.FixedStruct());
-        }
-
-        mc = (Test.MultiOptional)initial.pingPong(mc);
-        test(mc.bs.Value.Length == 1000);
-        test(mc.shs.Value.Length == 300);
-        test(mc.fss.Value.Length == 300);
-        test(mc.ifsd.Value.Count == 300);
-
-        factory.setEnabled(true);
-        os = new Ice.OutputStream(communicator);
-        os.startEncapsulation();
-        os.writeValue(mc);
-        os.endEncapsulation();
-        inEncaps = os.finished();
-        test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
-        @in = new Ice.InputStream(communicator, outEncaps);
-        @in.startEncapsulation();
-        @in.readValue(cb.invoke);
-        @in.endEncapsulation();
-        test(cb.obj != null && cb.obj is TestValueReader);
-        factory.setEnabled(false);
-
-        WriteLine("ok");
-
-        Write("testing tag marshaling... ");
-        Flush();
-        {
-            Test.B b = new Test.B();
-            Test.B b2 = (Test.B)initial.pingPong(b);
-            test(!b2.ma.HasValue);
-            test(!b2.mb.HasValue);
-            test(!b2.mc.HasValue);
-
-            b.ma = 10;
-            b.mb = 11;
-            b.mc = 12;
-            b.md = 13;
-
-            b2 = (Test.B)initial.pingPong(b);
-            test(b2.ma.Value == 10);
-            test(b2.mb.Value == 11);
-            test(b2.mc.Value == 12);
-            test(b2.md.Value == 13);
-
-            factory.setEnabled(true);
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeValue(b);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.readValue(cb.invoke);
-            @in.endEncapsulation();
-            test(cb.obj != null);
-            factory.setEnabled(false);
-        }
-        WriteLine("ok");
-
-        Write("testing marshalling of objects with optional objects...");
-        Flush();
-        {
-            Test.F f = new Test.F();
-
-            f.af = new Test.A();
-            f.ae = (Test.A)f.af;
-
-            Test.F rf = (Test.F)initial.pingPong(f);
-            test(rf.ae == rf.af.Value);
-
-            factory.setEnabled(true);
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeValue(f);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            @in = new Ice.InputStream(communicator, inEncaps);
-            @in.startEncapsulation();
-            ReadValueCallbackI rocb = new ReadValueCallbackI();
-            @in.readValue(rocb.invoke);
-            @in.endEncapsulation();
-            factory.setEnabled(false);
-            rf = ((FValueReader)rocb.obj).getF();
-            test(rf.ae != null && !rf.af.HasValue);
-        }
-        WriteLine("ok");
-
-        Write("testing optional with default values... ");
-        Flush();
-        {
-            Test.WD wd = (Test.WD)initial.pingPong(new Test.WD());
-            test(wd.a.Value == 5);
-            test(wd.s.Value.Equals("test"));
-            wd.a = Ice.Util.None;
-            wd.s = Ice.Util.None;
-            wd = (Test.WD)initial.pingPong(wd);
-            test(!wd.a.HasValue);
-            test(!wd.s.HasValue);
-        }
-        WriteLine("ok");
-
-        if(communicator.getProperties().getPropertyAsInt("Ice.Default.SlicedFormat") > 0)
-        {
-            Write("testing marshaling with unknown class slices... ");
-            Flush();
+            public static Test.InitialPrx allTests(global::Test.TestHelper helper)
             {
-                Test.C c = new Test.C();
-                c.ss = "test";
-                c.ms = "testms";
-                os = new Ice.OutputStream(communicator);
+                var communicator = helper.communicator();
+                FactoryI factory = new FactoryI();
+                communicator.getValueFactoryManager().add(factory.create, "");
+
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                string @ref = "initial:" + helper.getTestEndpoint(0);
+                var @base = communicator.stringToProxy(@ref);
+                test(@base != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                Test.InitialPrx initial = Test.InitialPrxHelper.checkedCast(@base);
+                test(initial != null);
+                test(initial.Equals(@base));
+                output.WriteLine("ok");
+
+                output.Write("testing optional data members... ");
+                output.Flush();
+
+                Test.OneOptional oo1 = new Test.OneOptional();
+                test(!oo1.a.HasValue);
+                oo1.a = 15;
+                test(oo1.a.HasValue && oo1.a.Value == 15);
+
+                Test.OneOptional oo2 = new Test.OneOptional(16);
+                test(oo2.a.HasValue && oo2.a.Value == 16);
+
+                Test.MultiOptional mo1 = new Test.MultiOptional();
+                mo1.a = 15;
+                mo1.b = true;
+                mo1.c = 19;
+                mo1.d = 78;
+                mo1.e = 99;
+                mo1.f =(float)5.5;
+                mo1.g = 1.0;
+                mo1.h = "test";
+                mo1.i = Test.MyEnum.MyEnumMember;
+                mo1.j = new Ice.Optional<Ice.ObjectPrx>(communicator.stringToProxy("test"));
+                mo1.k = mo1;
+                mo1.bs = new byte[] { 5 };
+                mo1.ss = new string[] { "test", "test2" };
+                mo1.iid = new Dictionary<int, int>();
+                mo1.iid.Value.Add(4, 3);
+                mo1.sid = new Dictionary<string, int>();
+                mo1.sid.Value.Add("test", 10);
+                Test.FixedStruct fs = new Test.FixedStruct();
+                fs.m = 78;
+                mo1.fs = fs;
+                Test.VarStruct vs = new Test.VarStruct();
+                vs.m = "hello";
+                mo1.vs = vs;
+
+                mo1.shs = new short[] { 1 };
+                mo1.es = new Test.MyEnum[] { Test.MyEnum.MyEnumMember, Test.MyEnum.MyEnumMember };
+                mo1.fss = new Test.FixedStruct[] { fs };
+                mo1.vss = new Test.VarStruct[] { vs };
+                mo1.oos = new Test.OneOptional[] { oo1 };
+                mo1.oops = new Ice.ObjectPrx[] { communicator.stringToProxy("test") };
+
+                mo1.ied = new Dictionary<int, Test.MyEnum>();
+                mo1.ied.Value.Add(4, Test.MyEnum.MyEnumMember);
+                mo1.ifsd = new Dictionary<int, Test.FixedStruct>();
+                mo1.ifsd.Value.Add(4, fs);
+                mo1.ivsd = new Dictionary<int, Test.VarStruct>();
+                mo1.ivsd.Value.Add(5, vs);
+                mo1.iood = new Dictionary<int, Test.OneOptional>();
+                mo1.iood.Value.Add(5, new Test.OneOptional(15));
+                mo1.ioopd = new Dictionary<int, Ice.ObjectPrx>();
+                mo1.ioopd.Value.Add(5, communicator.stringToProxy("test"));
+
+                mo1.bos = new bool[] { false, true, false };
+                mo1.ser = new Test.SerializableClass(56);
+
+                test(mo1.a.Value ==(byte)15);
+                test(mo1.b.Value);
+                test(mo1.c.Value == 19);
+                test(mo1.d.Value == 78);
+                test(mo1.e.Value == 99);
+                test(mo1.f.Value ==(float)5.5);
+                test(mo1.g.Value == 1.0);
+                test(mo1.h.Value.Equals("test"));
+                test(mo1.i.Value == Test.MyEnum.MyEnumMember);
+                test(mo1.j.Value.Equals(communicator.stringToProxy("test")));
+                test(mo1.k.Value == mo1);
+                test(ArraysEqual(mo1.bs.Value, new byte[] {(byte)5 }));
+                test(ArraysEqual(mo1.ss.Value, new String[] { "test", "test2" }));
+                test(mo1.iid.Value[4] == 3);
+                test(mo1.sid.Value["test"] == 10);
+                test(mo1.fs.Value.Equals(new Test.FixedStruct(78)));
+                test(mo1.vs.Value.Equals(new Test.VarStruct("hello")));
+
+                test(mo1.shs.Value[0] ==(short)1);
+                test(mo1.es.Value[0] == Test.MyEnum.MyEnumMember && mo1.es.Value[1] == Test.MyEnum.MyEnumMember);
+                test(mo1.fss.Value[0].Equals(new Test.FixedStruct(78)));
+                test(mo1.vss.Value[0].Equals(new Test.VarStruct("hello")));
+                test(mo1.oos.Value[0] == oo1);
+                test(mo1.oops.Value[0].Equals(communicator.stringToProxy("test")));
+
+                test(mo1.ied.Value[4] == Test.MyEnum.MyEnumMember);
+                test(mo1.ifsd.Value[4].Equals(new Test.FixedStruct(78)));
+                test(mo1.ivsd.Value[5].Equals(new Test.VarStruct("hello")));
+                test(mo1.iood.Value[5].a.Value == 15);
+                test(mo1.ioopd.Value[5].Equals(communicator.stringToProxy("test")));
+
+                test(ArraysEqual(mo1.bos.Value, new bool[] { false, true, false }));
+                test(mo1.ser.Value.Equals(new Test.SerializableClass(56)));
+
+                output.WriteLine("ok");
+
+                output.Write("testing marshaling... ");
+                output.Flush();
+
+                Test.OneOptional oo4 =(Test.OneOptional)initial.pingPong(new Test.OneOptional());
+                test(!oo4.a.HasValue);
+
+                Test.OneOptional oo5 =(Test.OneOptional)initial.pingPong(oo1);
+                test(oo1.a.Value == oo5.a.Value);
+
+                Test.MultiOptional mo4 =(Test.MultiOptional)initial.pingPong(new Test.MultiOptional());
+                test(!mo4.a.HasValue);
+                test(!mo4.b.HasValue);
+                test(!mo4.c.HasValue);
+                test(!mo4.d.HasValue);
+                test(!mo4.e.HasValue);
+                test(!mo4.f.HasValue);
+                test(!mo4.g.HasValue);
+                test(!mo4.h.HasValue);
+                test(!mo4.i.HasValue);
+                test(!mo4.j.HasValue);
+                test(!mo4.k.HasValue);
+                test(!mo4.bs.HasValue);
+                test(!mo4.ss.HasValue);
+                test(!mo4.iid.HasValue);
+                test(!mo4.sid.HasValue);
+                test(!mo4.fs.HasValue);
+                test(!mo4.vs.HasValue);
+
+                test(!mo4.shs.HasValue);
+                test(!mo4.es.HasValue);
+                test(!mo4.fss.HasValue);
+                test(!mo4.vss.HasValue);
+                test(!mo4.oos.HasValue);
+                test(!mo4.oops.HasValue);
+
+                test(!mo4.ied.HasValue);
+                test(!mo4.ifsd.HasValue);
+                test(!mo4.ivsd.HasValue);
+                test(!mo4.iood.HasValue);
+                test(!mo4.ioopd.HasValue);
+
+                test(!mo4.bos.HasValue);
+
+                test(!mo4.ser.HasValue);
+
+                bool supportsCsharpSerializable = initial.supportsCsharpSerializable();
+                if(!supportsCsharpSerializable)
+                {
+                    mo1.ser = Ice.Util.None;
+                }
+
+                Test.MultiOptional mo5 =(Test.MultiOptional)initial.pingPong(mo1);
+                test(mo5.a.Value == mo1.a.Value);
+                test(mo5.b.Value == mo1.b.Value);
+                test(mo5.c.Value == mo1.c.Value);
+                test(mo5.d.Value == mo1.d.Value);
+                test(mo5.e.Value == mo1.e.Value);
+                test(mo5.f.Value == mo1.f.Value);
+                test(mo5.g.Value == mo1.g.Value);
+                test(mo5.h.Value.Equals(mo1.h.Value));
+                test(mo5.i.Value == mo1.i.Value);
+                test(mo5.j.Value.Equals(mo1.j.Value));
+                test(mo5.k.Value == mo5);
+                test(ArraysEqual(mo5.bs.Value, mo1.bs.Value));
+                test(ArraysEqual(mo5.ss.Value, mo1.ss.Value));
+                test(mo5.iid.Value[4] == 3);
+                test(mo5.sid.Value["test"] == 10);
+                test(mo5.fs.Value.Equals(mo1.fs.Value));
+                test(mo5.vs.Value.Equals(mo1.vs.Value));
+                test(ArraysEqual(mo5.shs.Value, mo1.shs.Value));
+                test(mo5.es.Value[0] == Test.MyEnum.MyEnumMember && mo1.es.Value[1] == Test.MyEnum.MyEnumMember);
+                test(mo5.fss.Value[0].Equals(new Test.FixedStruct(78)));
+                test(mo5.vss.Value[0].Equals(new Test.VarStruct("hello")));
+                test(mo5.oos.Value[0].a.Value == 15);
+                test(mo5.oops.Value[0].Equals(communicator.stringToProxy("test")));
+
+                test(mo5.ied.Value[4] == Test.MyEnum.MyEnumMember);
+                test(mo5.ifsd.Value[4].Equals(new Test.FixedStruct(78)));
+                test(mo5.ivsd.Value[5].Equals(new Test.VarStruct("hello")));
+                test(mo5.iood.Value[5].a.Value == 15);
+                test(mo5.ioopd.Value[5].Equals(communicator.stringToProxy("test")));
+
+                test(ArraysEqual(mo5.bos.Value, new bool[] { false, true, false }));
+                if(supportsCsharpSerializable)
+                {
+                    test(mo5.ser.Value.Equals(new Test.SerializableClass(56)));
+                }
+
+                // Clear the first half of the optional members
+                Test.MultiOptional mo6 = new Test.MultiOptional();
+                mo6.b = mo5.b;
+                mo6.d = mo5.d;
+                mo6.f = mo5.f;
+                mo6.h = mo5.h;
+                mo6.j = mo5.j;
+                mo6.bs = mo5.bs;
+                mo6.iid = mo5.iid;
+                mo6.fs = mo5.fs;
+                mo6.shs = mo5.shs;
+                mo6.fss = mo5.fss;
+                mo6.oos = mo5.oos;
+                mo6.ifsd = mo5.ifsd;
+                mo6.iood = mo5.iood;
+                mo6.bos = mo5.bos;
+
+                Test.MultiOptional mo7 =(Test.MultiOptional)initial.pingPong(mo6);
+                test(!mo7.a.HasValue);
+                test(mo7.b.Equals(mo1.b));
+                test(!mo7.c.HasValue);
+                test(mo7.d.Equals(mo1.d));
+                test(!mo7.e.HasValue);
+                test(mo7.f.Equals(mo1.f));
+                test(!mo7.g.HasValue);
+                test(mo7.h.Equals(mo1.h));
+                test(!mo7.i.HasValue);
+                test(mo7.j.Equals(mo1.j));
+                test(!mo7.k.HasValue);
+                test(ArraysEqual(mo7.bs.Value, mo1.bs.Value));
+                test(!mo7.ss.HasValue);
+                test(mo7.iid.Value[4] == 3);
+                test(!mo7.sid.HasValue);
+                test(mo7.fs.Equals(mo1.fs));
+                test(!mo7.vs.HasValue);
+
+                test(ArraysEqual(mo7.shs.Value, mo1.shs.Value));
+                test(!mo7.es.HasValue);
+                test(mo7.fss.Value[0].Equals(new Test.FixedStruct(78)));
+                test(!mo7.vss.HasValue);
+                test(mo7.oos.Value[0].a.Value == 15);
+                test(!mo7.oops.HasValue);
+
+                test(!mo7.ied.HasValue);
+                test(mo7.ifsd.Value[4].Equals(new Test.FixedStruct(78)));
+                test(!mo7.ivsd.HasValue);
+                test(mo7.iood.Value[5].a.Value == 15);
+                test(!mo7.ioopd.HasValue);
+
+                test(ArraysEqual(mo7.bos.Value, new bool[] { false, true, false }));
+                test(!mo7.ser.HasValue);
+
+                // Clear the second half of the optional members
+                Test.MultiOptional mo8 = new Test.MultiOptional();
+                mo8.a = mo5.a;
+                mo8.c = mo5.c;
+                mo8.e = mo5.e;
+                mo8.g = mo5.g;
+                mo8.i = mo5.i;
+                mo8.k = mo8;
+                mo8.ss = mo5.ss;
+                mo8.sid = mo5.sid;
+                mo8.vs = mo5.vs;
+
+                mo8.es = mo5.es;
+                mo8.vss = mo5.vss;
+                mo8.oops = mo5.oops;
+
+                mo8.ied = mo5.ied;
+                mo8.ivsd = mo5.ivsd;
+                mo8.ioopd = mo5.ioopd;
+                if(supportsCsharpSerializable)
+                {
+                    mo8.ser = new Test.SerializableClass(56);
+                }
+
+                Test.MultiOptional mo9 =(Test.MultiOptional)initial.pingPong(mo8);
+                test(mo9.a.Equals(mo1.a));
+                test(!mo9.b.HasValue);
+                test(mo9.c.Equals(mo1.c));
+                test(!mo9.d.HasValue);
+                test(mo9.e.Equals(mo1.e));
+                test(!mo9.f.HasValue);
+                test(mo9.g.Equals(mo1.g));
+                test(!mo9.h.HasValue);
+                test(mo9.i.Equals(mo1.i));
+                test(!mo9.j.HasValue);
+                test(mo9.k.Value == mo9);
+                test(!mo9.bs.HasValue);
+                test(ArraysEqual(mo9.ss.Value, mo1.ss.Value));
+                test(!mo9.iid.HasValue);
+                test(mo9.sid.Value["test"] == 10);
+                test(!mo9.fs.HasValue);
+                test(mo9.vs.Equals(mo1.vs));
+
+                test(!mo9.shs.HasValue);
+                test(mo9.es.Value[0] == Test.MyEnum.MyEnumMember && mo1.es.Value[1] == Test.MyEnum.MyEnumMember);
+                test(!mo9.fss.HasValue);
+                test(mo9.vss.Value[0].Equals(new Test.VarStruct("hello")));
+                test(!mo9.oos.HasValue);
+                test(mo9.oops.Value[0].Equals(communicator.stringToProxy("test")));
+
+                test(mo9.ied.Value[4] == Test.MyEnum.MyEnumMember);
+                test(!mo9.ifsd.HasValue);
+                test(mo9.ivsd.Value[5].Equals(new Test.VarStruct("hello")));
+                test(!mo9.iood.HasValue);
+                test(mo9.ioopd.Value[5].Equals(communicator.stringToProxy("test")));
+
+                test(!mo9.bos.HasValue);
+                if(supportsCsharpSerializable)
+                {
+                    test(mo9.ser.Value.Equals(new Test.SerializableClass(56)));
+                }
+
+                {
+                    Test.OptionalWithCustom owc1 = new Test.OptionalWithCustom();
+                    owc1.l = new List<Test.SmallStruct>();
+                    owc1.l.Value.Add(new Test.SmallStruct(5));
+                    owc1.l.Value.Add(new Test.SmallStruct(6));
+                    owc1.l.Value.Add(new Test.SmallStruct(7));
+                    owc1.s = new Test.ClassVarStruct(5);
+                    Test.OptionalWithCustom owc2 =(Test.OptionalWithCustom)initial.pingPong(owc1);
+                    test(owc2.l.HasValue);
+                    test(ListsEqual(owc1.l.Value, owc2.l.Value));
+                    test(owc2.s.HasValue);
+                    test(owc2.s.Value.a == 5);
+                }
+
+                //
+                // Send a request using blobjects. Upon receival, we don't read
+                // any of the optional members. This ensures the optional members
+                // are skipped even if the receiver knows nothing about them.
+                //
+                factory.setEnabled(true);
+                Ice.OutputStream os = new Ice.OutputStream(communicator);
                 os.startEncapsulation();
-                os.writeValue(c);
+                os.writeValue(oo1);
                 os.endEncapsulation();
-                inEncaps = os.finished();
-                factory.setEnabled(true);
+                byte[] inEncaps = os.finished();
+                byte[] outEncaps;
                 test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
-                @in = new Ice.InputStream(communicator, outEncaps);
+                Ice.InputStream @in = new Ice.InputStream(communicator, outEncaps);
                 @in.startEncapsulation();
+                ReadValueCallbackI cb = new ReadValueCallbackI();
                 @in.readValue(cb.invoke);
                 @in.endEncapsulation();
-                test(cb.obj is CValueReader);
-                factory.setEnabled(false);
+                test(cb.obj != null && cb.obj is TestValueReader);
 
-                factory.setEnabled(true);
                 os = new Ice.OutputStream(communicator);
                 os.startEncapsulation();
-                Ice.Value d = new DValueWriter();
-                os.writeValue(d);
+                os.writeValue(mo1);
                 os.endEncapsulation();
                 inEncaps = os.finished();
                 test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
@@ -574,2035 +371,2240 @@
                 @in.startEncapsulation();
                 @in.readValue(cb.invoke);
                 @in.endEncapsulation();
-                test(cb.obj != null && cb.obj is DValueReader);
-                ((DValueReader)cb.obj).check();
+                test(cb.obj != null && cb.obj is TestValueReader);
                 factory.setEnabled(false);
-            }
-            WriteLine("ok");
 
-            Write("testing optionals with unknown classes...");
-            Flush();
-            {
-                Test.A a = new Test.A();
+                //
+                // Use the 1.0 encoding with operations whose only class parameters are optional.
+                //
+                var oo = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
+                initial.sendOptionalClass(true, oo);
+                Test.InitialPrx initial2 =(Test.InitialPrx)initial.ice_encodingVersion(Ice.Util.Encoding_1_0);
+                initial2.sendOptionalClass(true, oo);
+
+                initial.returnOptionalClass(true, out oo);
+                test(oo.HasValue);
+                initial2.returnOptionalClass(true, out oo);
+                test(!oo.HasValue);
+
+                Test.Recursive[] recursive1 = new Test.Recursive[1];
+                recursive1[0] = new Test.Recursive();
+                Test.Recursive[] recursive2 = new Test.Recursive[1];
+                recursive2[0] = new Test.Recursive();
+                recursive1[0].value = recursive2;
+                Test.Recursive outer = new Test.Recursive();
+                outer.value = recursive1;
+                initial.pingPong(outer);
+
+                Test.G g = new Test.G();
+                g.gg1Opt = new Ice.Optional<Test.G1>(new Test.G1("gg1Opt"));
+                g.gg2 = new Test.G2(10);
+                g.gg2Opt = new Ice.Optional<Test.G2>(new Test.G2(20));
+                g.gg1 = new Test.G1("gg1");
+                g = initial.opG(g);
+                test("gg1Opt".Equals(g.gg1Opt.Value.a));
+                test(10 == g.gg2.a);
+                test(20 == g.gg2Opt.Value.a);
+                test("gg1".Equals(g.gg1.a));
+
+                initial.opVoid();
 
                 os = new Ice.OutputStream(communicator);
                 os.startEncapsulation();
-                os.writeValue(a);
-                os.writeOptional(1, Ice.OptionalFormat.Class);
-                os.writeValue(new DValueWriter());
+                os.writeOptional(1, Ice.OptionalFormat.F4);
+                os.writeInt(15);
+                os.writeOptional(1, Ice.OptionalFormat.VSize);
+                os.writeString("test");
                 os.endEncapsulation();
                 inEncaps = os.finished();
-                test(initial.ice_invoke("opClassAndUnknownOptional", Ice.OperationMode.Normal, inEncaps,
-                                        out outEncaps));
+                test(initial.ice_invoke("opVoid", Ice.OperationMode.Normal, inEncaps, out outEncaps));
+
+                output.WriteLine("ok");
+
+                output.Write("testing marshaling of large containers with fixed size elements... ");
+                output.Flush();
+                Test.MultiOptional mc = new Test.MultiOptional();
+
+                mc.bs = new byte[1000];
+                mc.shs = new short[300];
+
+                mc.fss = new Test.FixedStruct[300];
+                for(int i = 0; i < 300; ++i)
+                {
+                    mc.fss.Value[i] = new Test.FixedStruct();
+                }
+
+                mc.ifsd = new Dictionary<int, Test.FixedStruct>();
+                for(int i = 0; i < 300; ++i)
+                {
+                    mc.ifsd.Value.Add(i, new Test.FixedStruct());
+                }
+
+                mc =(Test.MultiOptional)initial.pingPong(mc);
+                test(mc.bs.Value.Length == 1000);
+                test(mc.shs.Value.Length == 300);
+                test(mc.fss.Value.Length == 300);
+                test(mc.ifsd.Value.Count == 300);
 
+                factory.setEnabled(true);
+                os = new Ice.OutputStream(communicator);
+                os.startEncapsulation();
+                os.writeValue(mc);
+                os.endEncapsulation();
+                inEncaps = os.finished();
+                test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
                 @in = new Ice.InputStream(communicator, outEncaps);
                 @in.startEncapsulation();
+                @in.readValue(cb.invoke);
                 @in.endEncapsulation();
-            }
-            WriteLine("ok");
-        }
-
-        Write("testing optional parameters... ");
-        Flush();
-        {
-            Ice.Optional<byte> p1 = new Ice.Optional<byte>();
-            Ice.Optional<byte> p3;
-            Ice.Optional<byte> p2 = initial.opByte(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opByte(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = 56;
-            p2 = initial.opByte(p1, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            Ice.AsyncResult r = initial.begin_opByte(p1);
-            p2 = initial.end_opByte(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-            p2 = initial.opByte(p1.Value, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            r = initial.begin_opByte(p1.Value);
-            p2 = initial.end_opByte(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-
-            p2 = initial.opByte(new Ice.Optional<byte>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.F1);
-            os.writeByte(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opByte", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.F1));
-            test(@in.readByte() == 56);
-            test(@in.readOptional(3, Ice.OptionalFormat.F1));
-            test(@in.readByte() == 56);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<bool> p1 = new Ice.Optional<bool>();
-            Ice.Optional<bool> p3;
-            Ice.Optional<bool> p2 = initial.opBool(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opBool(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = true;
-            p2 = initial.opBool(p1, out p3);
-            test(p2.Value == true && p3.Value == true);
-            Ice.AsyncResult r = initial.begin_opBool(p1);
-            p2 = initial.end_opBool(out p3, r);
-            test(p2.Value == true && p3.Value == true);
-            p2 = initial.opBool(true, out p3);
-            test(p2.Value == true && p3.Value == true);
-            r = initial.begin_opBool(true);
-            p2 = initial.end_opBool(out p3, r);
-            test(p2.Value == true && p3.Value == true);
-
-            p2 = initial.opBool(new Ice.Optional<bool>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.F1);
-            os.writeBool(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opBool", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.F1));
-            test(@in.readBool() == true);
-            test(@in.readOptional(3, Ice.OptionalFormat.F1));
-            test(@in.readBool() == true);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<short> p1 = new Ice.Optional<short>();
-            Ice.Optional<short> p3;
-            Ice.Optional<short> p2 = initial.opShort(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opShort(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = 56;
-            p2 = initial.opShort(p1, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            Ice.AsyncResult r = initial.begin_opShort(p1);
-            p2 = initial.end_opShort(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-            p2 = initial.opShort(p1.Value, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            r = initial.begin_opShort(p1.Value);
-            p2 = initial.end_opShort(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-
-            p2 = initial.opShort(new Ice.Optional<short>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.F2);
-            os.writeShort(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opShort", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.F2));
-            test(@in.readShort() == 56);
-            test(@in.readOptional(3, Ice.OptionalFormat.F2));
-            test(@in.readShort() == 56);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<int> p1 = new Ice.Optional<int>();
-            Ice.Optional<int> p3;
-            Ice.Optional<int> p2 = initial.opInt(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opInt(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = 56;
-            p2 = initial.opInt(p1, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            Ice.AsyncResult r = initial.begin_opInt(p1);
-            p2 = initial.end_opInt(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-            p2 = initial.opInt(p1.Value, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            r = initial.begin_opInt(p1.Value);
-            p2 = initial.end_opInt(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-
-            p2 = initial.opInt(new Ice.Optional<int>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.F4);
-            os.writeInt(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opInt", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.F4));
-            test(@in.readInt() == 56);
-            test(@in.readOptional(3, Ice.OptionalFormat.F4));
-            test(@in.readInt() == 56);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<long> p1 = new Ice.Optional<long>();
-            Ice.Optional<long> p3;
-            Ice.Optional<long> p2 = initial.opLong(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opLong(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = 56;
-            p2 = initial.opLong(p1, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            Ice.AsyncResult r = initial.begin_opLong(p1);
-            p2 = initial.end_opLong(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-            p2 = initial.opLong(p1.Value, out p3);
-            test(p2.Value == 56 && p3.Value == 56);
-            r = initial.begin_opLong(p1.Value);
-            p2 = initial.end_opLong(out p3, r);
-            test(p2.Value == 56 && p3.Value == 56);
-
-            p2 = initial.opLong(new Ice.Optional<long>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(1, Ice.OptionalFormat.F8);
-            os.writeLong(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opLong", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(2, Ice.OptionalFormat.F8));
-            test(@in.readLong() == 56);
-            test(@in.readOptional(3, Ice.OptionalFormat.F8));
-            test(@in.readLong() == 56);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<float> p1 = new Ice.Optional<float>();
-            Ice.Optional<float> p3;
-            Ice.Optional<float> p2 = initial.opFloat(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFloat(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = (float)1.0;
-            p2 = initial.opFloat(p1, out p3);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-            Ice.AsyncResult r = initial.begin_opFloat(p1);
-            p2 = initial.end_opFloat(out p3, r);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-            p2 = initial.opFloat(p1.Value, out p3);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-            r = initial.begin_opFloat(p1.Value);
-            p2 = initial.end_opFloat(out p3, r);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-
-            p2 = initial.opFloat(new Ice.Optional<float>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.F4);
-            os.writeFloat(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opFloat", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.F4));
-            test(@in.readFloat() == 1.0);
-            test(@in.readOptional(3, Ice.OptionalFormat.F4));
-            test(@in.readFloat() == 1.0);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<double> p1 = new Ice.Optional<double>();
-            Ice.Optional<double> p3;
-            Ice.Optional<double> p2 = initial.opDouble(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opDouble(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = 1.0;
-            p2 = initial.opDouble(p1, out p3);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-            Ice.AsyncResult r = initial.begin_opDouble(p1);
-            p2 = initial.end_opDouble(out p3, r);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-            p2 = initial.opDouble(p1.Value, out p3);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-            r = initial.begin_opDouble(p1.Value);
-            p2 = initial.end_opDouble(out p3, r);
-            test(p2.Value == 1.0 && p3.Value == 1.0);
-
-            p2 = initial.opDouble(new Ice.Optional<double>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.F8);
-            os.writeDouble(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opDouble", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.F8));
-            test(@in.readDouble() == 1.0);
-            test(@in.readOptional(3, Ice.OptionalFormat.F8));
-            test(@in.readDouble() == 1.0);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<string> p1 = new Ice.Optional<string>();
-            Ice.Optional<string> p3;
-            Ice.Optional<string> p2 = initial.opString(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opString(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opString(null, out p3); // Implicitly converts to Ice.Optional<string>(null)
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = "test";
-            p2 = initial.opString(p1, out p3);
-            test(p2.Value.Equals("test") && p3.Value.Equals("test"));
-            Ice.AsyncResult r = initial.begin_opString(p1);
-            p2 = initial.end_opString(out p3, r);
-            test(p2.Value.Equals("test") && p3.Value.Equals("test"));
-            p2 = initial.opString(p1.Value, out p3);
-            test(p2.Value.Equals("test") && p3.Value.Equals("test"));
-            r = initial.begin_opString(p1.Value);
-            p2 = initial.end_opString(out p3, r);
-            test(p2.Value.Equals("test") && p3.Value.Equals("test"));
-
-            p2 = initial.opString(new Ice.Optional<string>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeString(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            test(@in.readString().Equals("test"));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            test(@in.readString().Equals("test"));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.MyEnum> p1 = new Ice.Optional<Test.MyEnum>();
-            Ice.Optional<Test.MyEnum> p3;
-            Ice.Optional<Test.MyEnum> p2 = initial.opMyEnum(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opMyEnum(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = Test.MyEnum.MyEnumMember;
-            p2 = initial.opMyEnum(p1, out p3);
-            test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
-            Ice.AsyncResult r = initial.begin_opMyEnum(p1);
-            p2 = initial.end_opMyEnum(out p3, r);
-            test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
-            p2 = initial.opMyEnum(p1.Value, out p3);
-            test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
-            r = initial.begin_opMyEnum(p1.Value);
-            p2 = initial.end_opMyEnum(out p3, r);
-            test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
-
-            p2 = initial.opMyEnum(new Ice.Optional<Test.MyEnum>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.Size);
-            os.writeEnum((int)p1.Value, 1);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opMyEnum", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.Size));
-            test((Test.MyEnum)@in.readEnum(1) == Test.MyEnum.MyEnumMember);
-            test(@in.readOptional(3, Ice.OptionalFormat.Size));
-            test((Test.MyEnum)@in.readEnum(1) == Test.MyEnum.MyEnumMember);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.SmallStruct> p1 = new Ice.Optional<Test.SmallStruct>();
-            Ice.Optional<Test.SmallStruct> p3;
-            Ice.Optional<Test.SmallStruct> p2 = initial.opSmallStruct(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opSmallStruct(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = new Test.SmallStruct(56);
-            p2 = initial.opSmallStruct(p1, out p3);
-            test(p2.Value.m == (byte)56 && p3.Value.m == (byte)56);
-            Ice.AsyncResult r = initial.begin_opSmallStruct(p1);
-            p2 = initial.end_opSmallStruct(out p3, r);
-            test(p2.Value.m == (byte)56 && p3.Value.m == (byte)56);
-            p2 = initial.opSmallStruct(p1.Value, out p3);
-            test(p2.Value.m == (byte)56 && p3.Value.m == (byte)56);
-            r = initial.begin_opSmallStruct(p1.Value);
-            p2 = initial.end_opSmallStruct(out p3, r);
-            test(p2.Value.m == (byte)56 && p3.Value.m == (byte)56);
-
-            p2 = initial.opSmallStruct(new Ice.Optional<Test.SmallStruct>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(1);
-            p1.Value.ice_writeMembers(os);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opSmallStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            Test.SmallStruct f = new Test.SmallStruct();
-            f.ice_readMembers(@in);
-            test(f.m == (byte)56);
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            f.ice_readMembers(@in);
-            test(f.m == (byte)56);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.FixedStruct> p1 = new Ice.Optional<Test.FixedStruct>();
-            Ice.Optional<Test.FixedStruct> p3;
-            Ice.Optional<Test.FixedStruct> p2 = initial.opFixedStruct(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFixedStruct(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = new Test.FixedStruct(56);
-            p2 = initial.opFixedStruct(p1, out p3);
-            test(p2.Value.m == 56 && p3.Value.m == 56);
-            Ice.AsyncResult r = initial.begin_opFixedStruct(p1);
-            p2 = initial.end_opFixedStruct(out p3, r);
-            test(p2.Value.m == 56 && p3.Value.m == 56);
-            p2 = initial.opFixedStruct(p1.Value, out p3);
-            test(p2.Value.m == 56 && p3.Value.m == 56);
-            r = initial.begin_opFixedStruct(p1.Value);
-            p2 = initial.end_opFixedStruct(out p3, r);
-            test(p2.Value.m == 56 && p3.Value.m == 56);
-
-            p2 = initial.opFixedStruct(new Ice.Optional<Test.FixedStruct>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(4);
-            p1.Value.ice_writeMembers(os);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opFixedStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            Test.FixedStruct f = new Test.FixedStruct();
-            f.ice_readMembers(@in);
-            test(f.m == 56);
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            f.ice_readMembers(@in);
-            test(f.m == 56);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.VarStruct> p1 = new Ice.Optional<Test.VarStruct>();
-            Ice.Optional<Test.VarStruct> p3;
-            Ice.Optional<Test.VarStruct> p2 = initial.opVarStruct(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opVarStruct(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = new Test.VarStruct("test");
-            p2 = initial.opVarStruct(p1, out p3);
-            test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
-
-            // Test null struct
-            p2 = initial.opVarStruct((Test.VarStruct)null, out p3);
-            test(p2.Value.m.Equals("") && p3.Value.m.Equals(""));
-
-            Ice.AsyncResult r = initial.begin_opVarStruct(p1);
-            p2 = initial.end_opVarStruct(out p3, r);
-            test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
-            p2 = initial.opVarStruct(p1.Value, out p3);
-            test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
-            r = initial.begin_opVarStruct(p1.Value);
-            p2 = initial.end_opVarStruct(out p3, r);
-            test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
-
-            p2 = initial.opVarStruct(new Ice.Optional<Test.VarStruct>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.FSize);
-            int pos = os.startSize();
-            p1.Value.ice_writeMembers(os);
-            os.endSize(pos);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opVarStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            Test.VarStruct v = new Test.VarStruct();
-            v.ice_readMembers(@in);
-            test(v.m.Equals("test"));
-            test(@in.readOptional(3, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            v.ice_readMembers(@in);
-            test(v.m.Equals("test"));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.OneOptional> p1 = new Ice.Optional<Test.OneOptional>();
-            Ice.Optional<Test.OneOptional> p3;
-            Ice.Optional<Test.OneOptional> p2 = initial.opOneOptional(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opOneOptional(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            if(initial.supportsNullOptional())
-            {
-                p2 = initial.opOneOptional(null, out p3); // Implicitly converts to Ice.Optional<OneOptional>(null)
-                test(p2.HasValue && p2.Value == null && p3.HasValue && p3.Value == null);
-
-                p2 = initial.opOneOptional(new Ice.Optional<Test.OneOptional>((Test.OneOptional)null), out p3);
-                test(p2.HasValue && p3.HasValue && p2.Value == null && p3.Value == null);
-            }
-
-            p1 = new Test.OneOptional(58);
-            p2 = initial.opOneOptional(p1, out p3);
-            test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
-            Ice.AsyncResult r = initial.begin_opOneOptional(p1);
-            p2 = initial.end_opOneOptional(out p3, r);
-            test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
-            p2 = initial.opOneOptional(p1.Value, out p3);
-            test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
-            r = initial.begin_opOneOptional(p1.Value);
-            p2 = initial.end_opOneOptional(out p3, r);
-            test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
-
-            p2 = initial.opOneOptional(new Ice.Optional<Test.OneOptional>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.Class);
-            os.writeValue(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opOneOptional", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.Class));
-            ReadValueCallbackI p2cb = new ReadValueCallbackI();
-            @in.readValue(p2cb.invoke);
-            test(@in.readOptional(3, Ice.OptionalFormat.Class));
-            ReadValueCallbackI p3cb = new ReadValueCallbackI();
-            @in.readValue(p3cb.invoke);
-            @in.endEncapsulation();
-            test(((Test.OneOptional)p2cb.obj).a.Value == 58 && ((Test.OneOptional)p3cb.obj).a.Value == 58);
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Ice.ObjectPrx> p1 = new Ice.Optional<Ice.ObjectPrx>();
-            Ice.Optional<Ice.ObjectPrx> p3;
-            Ice.Optional<Ice.ObjectPrx> p2 = initial.opOneOptionalProxy(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opOneOptionalProxy(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opOneOptionalProxy(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            if(initial.supportsNullOptional())
-            {
-                p2 = initial.opOneOptionalProxy(null, out p3);
-                test(p2.HasValue && p3.HasValue && p2.Value == null && p3.Value == null);
-            }
-
-            //
-            // Not allowed by C# language spec because OptionalOnePrx is an interface.
-            //
-            //p1 = Test.OneOptionalPrxHelper.uncheckedCast(communicator.stringToProxy("test"));
-            p1 = new Ice.Optional<Ice.ObjectPrx>(communicator.stringToProxy("test"));
-            p2 = initial.opOneOptionalProxy(p1, out p3);
-            test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-
-            Ice.AsyncResult r = initial.begin_opOneOptionalProxy(p1);
-            p2 = initial.end_opOneOptionalProxy(out p3, r);
-            test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-            //p2 = initial.opOneOptionalProxy(p1.Value, out p3);
-            //test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-            //r = initial.begin_opOneOptionalProxy(p1.Value);
-            //p2 = initial.end_opOneOptionalProxy(out p3, r);
-            //test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-
-            p2 = initial.opOneOptionalProxy(new Ice.Optional<Ice.ObjectPrx>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.FSize);
-            int pos = os.startSize();
-            os.writeProxy(p1.Value);
-            os.endSize(pos);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opOneOptionalProxy", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            test(@in.readProxy().Equals(p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            test(@in.readProxy().Equals(p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<byte[]> p1 = new Ice.Optional<byte[]>();
-            Ice.Optional<byte[]> p3;
-            Ice.Optional<byte[]> p2 = initial.opByteSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opByteSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opByteSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new byte[100];
-            Populate(p1.Value, (byte)56);
-            p2 = initial.opByteSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opByteSeq(p1);
-            p2 = initial.end_opByteSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opByteSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opByteSeq(p1.Value);
-            p2 = initial.end_opByteSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opByteSeq(new Ice.Optional<byte[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeByteSeq(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opByteSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            test(ArraysEqual(@in.readByteSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            test(ArraysEqual(@in.readByteSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<bool[]> p1 = new Ice.Optional<bool[]>();
-            Ice.Optional<bool[]> p3;
-            Ice.Optional<bool[]> p2 = initial.opBoolSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opBoolSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opBoolSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new bool[100];
-            Populate(p1.Value, true);
-            p2 = initial.opBoolSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opBoolSeq(p1);
-            p2 = initial.end_opBoolSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opBoolSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opBoolSeq(p1.Value);
-            p2 = initial.end_opBoolSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opBoolSeq(new Ice.Optional<bool[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeBoolSeq(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opBoolSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            test(ArraysEqual(@in.readBoolSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            test(ArraysEqual(@in.readBoolSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<short[]> p1 = new Ice.Optional<short[]>();
-            Ice.Optional<short[]> p3;
-            Ice.Optional<short[]> p2 = initial.opShortSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opShortSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opShortSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new short[100];
-            Populate(p1.Value, (short)56);
-            p2 = initial.opShortSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opShortSeq(p1);
-            p2 = initial.end_opShortSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opShortSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opShortSeq(p1.Value);
-            p2 = initial.end_opShortSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opShortSeq(new Ice.Optional<short[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Length * 2 + (p1.Value.Length > 254 ? 5 : 1));
-            os.writeShortSeq(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opShortSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readShortSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readShortSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<int[]> p1 = new Ice.Optional<int[]>();
-            Ice.Optional<int[]> p3;
-            Ice.Optional<int[]> p2 = initial.opIntSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opIntSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opIntSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new int[100];
-            Populate(p1.Value, 56);
-            p2 = initial.opIntSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opIntSeq(p1);
-            p2 = initial.end_opIntSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opIntSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opIntSeq(p1.Value);
-            p2 = initial.end_opIntSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opIntSeq(new Ice.Optional<int[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Length * 4 + (p1.Value.Length > 254 ? 5 : 1));
-            os.writeIntSeq(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opIntSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readIntSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readIntSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<long[]> p1 = new Ice.Optional<long[]>();
-            Ice.Optional<long[]> p3;
-            Ice.Optional<long[]> p2 = initial.opLongSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opLongSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opLongSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new long[100];
-            Populate(p1.Value, 56);
-            p2 = initial.opLongSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opLongSeq(p1);
-            p2 = initial.end_opLongSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opLongSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opLongSeq(p1.Value);
-            p2 = initial.end_opLongSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opLongSeq(new Ice.Optional<long[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Length * 8 + (p1.Value.Length > 254 ? 5 : 1));
-            os.writeLongSeq(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opLongSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readLongSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readLongSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<float[]> p1 = new Ice.Optional<float[]>();
-            Ice.Optional<float[]> p3;
-            Ice.Optional<float[]> p2 = initial.opFloatSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFloatSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFloatSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new float[100];
-            Populate(p1.Value, (float)1.0);
-            p2 = initial.opFloatSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opFloatSeq(p1);
-            p2 = initial.end_opFloatSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opFloatSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opFloatSeq(p1.Value);
-            p2 = initial.end_opFloatSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opFloatSeq(new Ice.Optional<float[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Length * 4 + (p1.Value.Length > 254 ? 5 : 1));
-            os.writeFloatSeq(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opFloatSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readFloatSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readFloatSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<double[]> p1 = new Ice.Optional<double[]>();
-            Ice.Optional<double[]> p3;
-            Ice.Optional<double[]> p2 = initial.opDoubleSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opDoubleSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opDoubleSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new double[100];
-            Populate(p1.Value, 1.0);
-            p2 = initial.opDoubleSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opDoubleSeq(p1);
-            p2 = initial.end_opDoubleSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opDoubleSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opDoubleSeq(p1.Value);
-            p2 = initial.end_opDoubleSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opDoubleSeq(new Ice.Optional<double[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Length * 8 + (p1.Value.Length > 254 ? 5 : 1));
-            os.writeDoubleSeq(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opDoubleSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readDoubleSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            test(ArraysEqual(@in.readDoubleSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<String[]> p1 = new Ice.Optional<String[]>();
-            Ice.Optional<String[]> p3;
-            Ice.Optional<String[]> p2 = initial.opStringSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opStringSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opStringSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new String[10];
-            Populate(p1.Value, "test1");
-            p2 = initial.opStringSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opStringSeq(p1);
-            p2 = initial.end_opStringSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opStringSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opStringSeq(p1.Value);
-            p2 = initial.end_opStringSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opStringSeq(new Ice.Optional<String[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.FSize);
-            int pos = os.startSize();
-            os.writeStringSeq(p1.Value);
-            os.endSize(pos);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opStringSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            test(ArraysEqual(@in.readStringSeq(), p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            test(ArraysEqual(@in.readStringSeq(), p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.SmallStruct[]> p1 = new Ice.Optional<Test.SmallStruct[]>();
-            Ice.Optional<Test.SmallStruct[]> p3;
-            Ice.Optional<Test.SmallStruct[]> p2 = initial.opSmallStructSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opSmallStructSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opSmallStructSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new Test.SmallStruct[10];
-            for(int i = 0; i < p1.Value.Length; ++i)
-            {
-                p1.Value[i] = new Test.SmallStruct();
-            }
-            p2 = initial.opSmallStructSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opSmallStructSeq(p1);
-            p2 = initial.end_opSmallStructSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opSmallStructSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opSmallStructSeq(p1.Value);
-            p2 = initial.end_opSmallStructSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opSmallStructSeq(new Ice.Optional<Test.SmallStruct[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Length + (p1.Value.Length > 254 ? 5 : 1));
-            Test.SmallStructSeqHelper.write(os, p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opSmallStructSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            Test.SmallStruct[] arr = Test.SmallStructSeqHelper.read(@in);
-            test(ArraysEqual(arr, p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            arr = Test.SmallStructSeqHelper.read(@in);
-            test(ArraysEqual(arr, p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<List<Test.SmallStruct>> p1 = new Ice.Optional<List<Test.SmallStruct>>();
-            Ice.Optional<List<Test.SmallStruct>> p3;
-            Ice.Optional<List<Test.SmallStruct>> p2 = initial.opSmallStructList(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opSmallStructList(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opSmallStructList(null, out p3);
-            test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
-
-            p1 = new List<Test.SmallStruct>();
-            for(int i = 0; i < 10; ++i)
-            {
-                p1.Value.Add(new Test.SmallStruct());
-            }
-            p2 = initial.opSmallStructList(p1, out p3);
-            test(ListsEqual(p2.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opSmallStructList(p1);
-            p2 = initial.end_opSmallStructList(out p3, r);
-            test(ListsEqual(p2.Value, p1.Value));
-            p2 = initial.opSmallStructList(p1.Value, out p3);
-            test(ListsEqual(p2.Value, p1.Value));
-            r = initial.begin_opSmallStructList(p1.Value);
-            p2 = initial.end_opSmallStructList(out p3, r);
-            test(ListsEqual(p2.Value, p1.Value));
-
-            p2 = initial.opSmallStructList(new Ice.Optional<List<Test.SmallStruct>>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Count + (p1.Value.Count > 254 ? 5 : 1));
-            Test.SmallStructListHelper.write(os, p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opSmallStructList", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            List<Test.SmallStruct> arr = Test.SmallStructListHelper.read(@in);
-            test(ListsEqual(arr, p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            arr = Test.SmallStructListHelper.read(@in);
-            test(ListsEqual(arr, p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.FixedStruct[]> p1 = new Ice.Optional<Test.FixedStruct[]>();
-            Ice.Optional<Test.FixedStruct[]> p3;
-            Ice.Optional<Test.FixedStruct[]> p2 = initial.opFixedStructSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFixedStructSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFixedStructSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new Test.FixedStruct[10];
-            for(int i = 0; i < p1.Value.Length; ++i)
-            {
-                p1.Value[i] = new Test.FixedStruct();
-            }
-            p2 = initial.opFixedStructSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opFixedStructSeq(p1);
-            p2 = initial.end_opFixedStructSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opFixedStructSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opFixedStructSeq(p1.Value);
-            p2 = initial.end_opFixedStructSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opFixedStructSeq(new Ice.Optional<Test.FixedStruct[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Length * 4 + (p1.Value.Length > 254 ? 5 : 1));
-            Test.FixedStructSeqHelper.write(os, p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opFixedStructSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            Test.FixedStruct[] arr = Test.FixedStructSeqHelper.read(@in);
-            test(ArraysEqual(arr, p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            arr = Test.FixedStructSeqHelper.read(@in);
-            test(ArraysEqual(arr, p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<LinkedList<Test.FixedStruct>> p1 = new Ice.Optional<LinkedList<Test.FixedStruct>>();
-            Ice.Optional<LinkedList<Test.FixedStruct>> p3;
-            Ice.Optional<LinkedList<Test.FixedStruct>> p2 = initial.opFixedStructList(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFixedStructList(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opFixedStructList(null, out p3);
-            test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
-
-            p1 = new LinkedList<Test.FixedStruct>();
-            for(int i = 0; i < 10; ++i)
-            {
-                p1.Value.AddLast(new Test.FixedStruct());
-            }
-            p2 = initial.opFixedStructList(p1, out p3);
-            test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opFixedStructList(p1);
-            p2 = initial.end_opFixedStructList(out p3, r);
-            test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
-            p2 = initial.opFixedStructList(p1.Value, out p3);
-            test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
-            r = initial.begin_opFixedStructList(p1.Value);
-            p2 = initial.end_opFixedStructList(out p3, r);
-            test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
-
-            p2 = initial.opFixedStructList(new Ice.Optional<LinkedList<Test.FixedStruct>>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Count * 4 + (p1.Value.Count > 254 ? 5 : 1));
-            Test.FixedStructListHelper.write(os, p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opFixedStructList", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            LinkedList<Test.FixedStruct> arr = Test.FixedStructListHelper.read(@in);
-            test(ListsEqual(arr, p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            arr = Test.FixedStructListHelper.read(@in);
-            test(ListsEqual(arr, p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Test.VarStruct[]> p1 = new Ice.Optional<Test.VarStruct[]>();
-            Ice.Optional<Test.VarStruct[]> p3;
-            Ice.Optional<Test.VarStruct[]> p2 = initial.opVarStructSeq(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opVarStructSeq(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opVarStructSeq(null, out p3);
-            test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
-
-            p1 = new Test.VarStruct[10];
-            for(int i = 0; i < p1.Value.Length; ++i)
-            {
-                p1.Value[i] = new Test.VarStruct("");
-            }
-            p2 = initial.opVarStructSeq(p1, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opVarStructSeq(p1);
-            p2 = initial.end_opVarStructSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            p2 = initial.opVarStructSeq(p1.Value, out p3);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-            r = initial.begin_opVarStructSeq(p1.Value);
-            p2 = initial.end_opVarStructSeq(out p3, r);
-            test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
-
-            p2 = initial.opVarStructSeq(new Ice.Optional<Test.VarStruct[]>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.FSize);
-            int pos = os.startSize();
-            Test.VarStructSeqHelper.write(os, p1.Value);
-            os.endSize(pos);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opVarStructSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            Test.VarStruct[] arr = Test.VarStructSeqHelper.read(@in);
-            test(ArraysEqual(arr, p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            arr = Test.VarStructSeqHelper.read(@in);
-            test(ArraysEqual(arr, p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        if(supportsCsharpSerializable)
-        {
-            Ice.Optional<Test.SerializableClass> p1 = new Ice.Optional<Test.SerializableClass>();
-            Ice.Optional<Test.SerializableClass> p3;
-            Ice.Optional<Test.SerializableClass> p2 = initial.opSerializable(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opSerializable(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-
-            p1 = new Test.SerializableClass(58);
-            p2 = initial.opSerializable(p1, out p3);
-            test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-            Ice.AsyncResult r = initial.begin_opSerializable(p1);
-            p2 = initial.end_opSerializable(out p3, r);
-            test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-            p2 = initial.opSerializable(p1.Value, out p3);
-            test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-            r = initial.begin_opSerializable(p1.Value);
-            p2 = initial.end_opSerializable(out p3, r);
-            test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-
-            p2 = initial.opSerializable(new Ice.Optional<Test.SerializableClass>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSerializable(p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opSerializable", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            Test.SerializableClass sc = Test.SerializableHelper.read(@in);
-            test(sc.Equals(p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            sc = Test.SerializableHelper.read(@in);
-            test(sc.Equals(p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Dictionary<int, int>> p1 = new Ice.Optional<Dictionary<int, int>>();
-            Ice.Optional<Dictionary<int, int>> p3;
-            Ice.Optional<Dictionary<int, int>> p2 = initial.opIntIntDict(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opIntIntDict(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opIntIntDict(null, out p3);
-            test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
-
-            p1 = new Dictionary<int, int>();
-            p1.Value.Add(1, 2);
-            p1.Value.Add(2, 3);
-            p2 = initial.opIntIntDict(p1, out p3);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opIntIntDict(p1);
-            p2 = initial.end_opIntIntDict(out p3, r);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-            p2 = initial.opIntIntDict(p1.Value, out p3);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-            r = initial.begin_opIntIntDict(p1.Value);
-            p2 = initial.end_opIntIntDict(out p3, r);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-
-            p2 = initial.opIntIntDict(new Ice.Optional<Dictionary<int, int>>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.VSize);
-            os.writeSize(p1.Value.Count * 8 + (p1.Value.Count > 254 ? 5 : 1));
-            Test.IntIntDictHelper.write(os, p1.Value);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opIntIntDict", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            Dictionary<int, int> m = Test.IntIntDictHelper.read(@in);
-            test(MapsEqual(m, p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.VSize));
-            @in.skipSize();
-            m = Test.IntIntDictHelper.read(@in);
-            test(MapsEqual(m, p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-
-        {
-            Ice.Optional<Dictionary<string, int>> p1 = new Ice.Optional<Dictionary<string, int>>();
-            Ice.Optional<Dictionary<string, int>> p3;
-            Ice.Optional<Dictionary<string, int>> p2 = initial.opStringIntDict(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opStringIntDict(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opStringIntDict(null, out p3);
-            test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
-
-            p1 = new Dictionary<string, int>();
-            p1.Value.Add("1", 1);
-            p1.Value.Add("2", 2);
-            p2 = initial.opStringIntDict(p1, out p3);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-            Ice.AsyncResult r = initial.begin_opStringIntDict(p1);
-            p2 = initial.end_opStringIntDict(out p3, r);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-            p2 = initial.opStringIntDict(p1.Value, out p3);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-            r = initial.begin_opStringIntDict(p1.Value);
-            p2 = initial.end_opStringIntDict(out p3, r);
-            test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
-
-            p2 = initial.opStringIntDict(new Ice.Optional<Dictionary<string, int>>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.FSize);
-            int pos = os.startSize();
-            Test.StringIntDictHelper.write(os, p1.Value);
-            os.endSize(pos);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opStringIntDict", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            Dictionary<string, int> m = Test.StringIntDictHelper.read(@in);
-            test(MapsEqual(m, p1.Value));
-            test(@in.readOptional(3, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            m = Test.StringIntDictHelper.read(@in);
-            test(MapsEqual(m, p1.Value));
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-
-            Test.F f = new Test.F();
-            f.af = new Test.A();
-            f.af.Value.requiredA = 56;
-            f.ae = f.af.Value;
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(1, Ice.OptionalFormat.Class);
-            os.writeValue(f);
-            os.writeOptional(2, Ice.OptionalFormat.Class);
-            os.writeValue(f.ae);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-
-            @in = new Ice.InputStream(communicator, inEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(2, Ice.OptionalFormat.Class));
-            ReadValueCallbackI rocb = new ReadValueCallbackI();
-            @in.readValue(rocb.invoke);
-            @in.endEncapsulation();
-            Test.A a = (Test.A)rocb.obj;
-            test(a != null && a.requiredA == 56);
-        }
-
-        {
-            Ice.Optional<Dictionary<int, Test.OneOptional>> p1 = new Ice.Optional<Dictionary<int, Test.OneOptional>>();
-            Ice.Optional<Dictionary<int, Test.OneOptional>> p3;
-            Ice.Optional<Dictionary<int, Test.OneOptional>> p2 = initial.opIntOneOptionalDict(p1, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opIntOneOptionalDict(Ice.Util.None, out p3);
-            test(!p2.HasValue && !p3.HasValue);
-            p2 = initial.opIntOneOptionalDict(null, out p3);
-            test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
-
-            p1 = new Dictionary<int, Test.OneOptional>();
-            p1.Value.Add(1, new Test.OneOptional(58));
-            p1.Value.Add(2, new Test.OneOptional(59));
-            p2 = initial.opIntOneOptionalDict(p1, out p3);
-            test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
-            Ice.AsyncResult r = initial.begin_opIntOneOptionalDict(p1);
-            p2 = initial.end_opIntOneOptionalDict(out p3, r);
-            test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
-            p2 = initial.opIntOneOptionalDict(p1.Value, out p3);
-            test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
-            r = initial.begin_opIntOneOptionalDict(p1.Value);
-            p2 = initial.end_opIntOneOptionalDict(out p3, r);
-            test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
-
-            p2 = initial.opIntOneOptionalDict(new Ice.Optional<Dictionary<int, Test.OneOptional>>(), out p3);
-            test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
-
-            os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.writeOptional(2, Ice.OptionalFormat.FSize);
-            int pos = os.startSize();
-            Test.IntOneOptionalDictHelper.write(os, p1.Value);
-            os.endSize(pos);
-            os.endEncapsulation();
-            inEncaps = os.finished();
-            initial.ice_invoke("opIntOneOptionalDict", Ice.OperationMode.Normal, inEncaps, out outEncaps);
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            test(@in.readOptional(1, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            Dictionary<int, Test.OneOptional> m = Test.IntOneOptionalDictHelper.read(@in);
-            test(m[1].a.Value == 58);
-            test(@in.readOptional(3, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            m = Test.IntOneOptionalDictHelper.read(@in);
-            test(m[1].a.Value == 58);
-            @in.endEncapsulation();
-
-            @in = new Ice.InputStream(communicator, outEncaps);
-            @in.startEncapsulation();
-            @in.endEncapsulation();
-        }
-        WriteLine("ok");
-
-        Write("testing exception optionals... ");
-        Flush();
-        {
-            try
-            {
-                Ice.Optional<int> a = new Ice.Optional<int>();
-                Ice.Optional<string> b = new Ice.Optional<string>();
-                Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>();
-                initial.opOptionalException(a, b, o);
-            }
-            catch(Test.OptionalException ex)
-            {
-                test(!ex.a.HasValue);
-                test(!ex.b.HasValue);
-                test(!ex.o.HasValue);
-            }
-
-            try
-            {
-                Ice.Optional<int> a = new Ice.Optional<int>(30);
-                Ice.Optional<string> b = new Ice.Optional<string>("test");
-                Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
-                initial.opOptionalException(a, b, o);
-            }
-            catch(Test.OptionalException ex)
-            {
-                test(ex.a.Value == 30);
-                test(ex.b.Value.Equals("test"));
-                test(ex.o.Value.a.Value == 53);
-            }
-
-            try
-            {
-                //
-                // Use the 1.0 encoding with an exception whose only class members are optional.
-                //
-                Ice.Optional<int> a = new Ice.Optional<int>(30);
-                Ice.Optional<string> b = new Ice.Optional<string>("test");
-                Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
-                initial2.opOptionalException(a, b, o);
-            }
-            catch(Test.OptionalException ex)
-            {
-                test(!ex.a.HasValue);
-                test(!ex.b.HasValue);
-                test(!ex.o.HasValue);
-            }
-
-            try
-            {
-                Ice.Optional<int> a = new Ice.Optional<int>();
-                Ice.Optional<string> b = new Ice.Optional<string>();
-                Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>();
-                initial.opDerivedException(a, b, o);
-            }
-            catch(Test.DerivedException ex)
-            {
-                test(!ex.a.HasValue);
-                test(!ex.b.HasValue);
-                test(!ex.o.HasValue);
-                test(!ex.ss.HasValue);
-                test(!ex.o2.HasValue);
-            }
-
-            try
-            {
-                Ice.Optional<int> a = new Ice.Optional<int>(30);
-                Ice.Optional<string> b = new Ice.Optional<string>("test2");
-                Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
-                initial.opDerivedException(a, b, o);
-            }
-            catch(Test.DerivedException ex)
-            {
-                test(ex.a.Value == 30);
-                test(ex.b.Value.Equals("test2"));
-                test(ex.o.Value.a.Value == 53);
-                test(ex.ss.Value.Equals("test2"));
-                test(ex.o2.Value.a.Value == 53);
-            }
-
-            try
-            {
-                Ice.Optional<int> a = new Ice.Optional<int>();
-                Ice.Optional<string> b = new Ice.Optional<string>();
-                Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>();
-                initial.opRequiredException(a, b, o);
-            }
-            catch(Test.RequiredException ex)
-            {
-                test(!ex.a.HasValue);
-                test(!ex.b.HasValue);
-                test(!ex.o.HasValue);
-                test(ex.ss.Equals("test"));
-                test(ex.o2 == null);
-            }
-
-            try
-            {
-                Ice.Optional<int> a = new Ice.Optional<int>(30);
-                Ice.Optional<string> b = new Ice.Optional<string>("test2");
-                Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
-                initial.opRequiredException(a, b, o);
-            }
-            catch(Test.RequiredException ex)
-            {
-                test(ex.a.Value == 30);
-                test(ex.b.Value.Equals("test2"));
-                test(ex.o.Value.a.Value == 53);
-                test(ex.ss.Equals("test2"));
-                test(ex.o2.a.Value == 53);
-            }
-        }
-        WriteLine("ok");
-
-        Write("testing optionals with marshaled results... ");
-        Flush();
-        {
-            test(initial.opMStruct1().HasValue);
-            test(initial.opMDict1().HasValue);
-            test(initial.opMSeq1().HasValue);
-            test(initial.opMG1().HasValue);
-
-            {
-                Ice.Optional<Test.SmallStruct> p1, p2, p3;
-                p3 = initial.opMStruct2(Ice.Util.None, out p2);
-                test(!p2.HasValue && !p3.HasValue);
-
-                p1 = new Test.SmallStruct();
-                p3 = initial.opMStruct2(p1, out p2);
-                test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
-            }
-            {
-                Ice.Optional<string[]> p1, p2, p3;
-                p3 = initial.opMSeq2(Ice.Util.None, out p2);
-                test(!p2.HasValue && !p3.HasValue);
-
-                p1 = new string[1] { "hello" };
-                p3 = initial.opMSeq2(p1, out p2);
-                test(Ice.CollectionComparer.Equals(p2.Value, p1.Value) &&
-                     Ice.CollectionComparer.Equals(p3.Value, p1.Value));
-            }
-            {
-                Ice.Optional<Dictionary<string, int>> p1, p2, p3;
-                p3 = initial.opMDict2(Ice.Util.None, out p2);
-                test(!p2.HasValue && !p3.HasValue);
-
-                p1 = new Dictionary<string, int>();
-                p1.Value["test"] = 54;
-                p3 = initial.opMDict2(p1, out p2);
-                test(Ice.CollectionComparer.Equals(p2.Value, p1.Value) &&
-                     Ice.CollectionComparer.Equals(p3.Value, p1.Value));
-            }
-            {
-                Ice.Optional<Test.G> p1, p2, p3;
-                p3 = initial.opMG2(Ice.Util.None, out p2);
-                test(!p2.HasValue && !p3.HasValue);
-
-                p1 = new Test.G();
-                p3 = initial.opMG2(p1, out p2);
-                test(p2.HasValue && p3.HasValue && p3.Value == p2.Value);
-            }
-        }
-        WriteLine("ok");
-
-        return initial;
-    }
-
-    internal static bool ArraysEqual<T>(T[] a1, T[] a2)
-    {
-        if(ReferenceEquals(a1, a2))
-        {
-            return true;
-        }
-
-        if(a1 == null || a2 == null)
-        {
-            return false;
-        }
-
-        if(a1.Length != a2.Length)
-        {
-            return false;
-        }
-
-        EqualityComparer<T> comparer = EqualityComparer<T>.Default;
-        for(int i = 0; i < a1.Length; ++i)
-        {
-            if(!comparer.Equals(a1[i], a2[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    internal static bool ListsEqual<T>(ICollection<T> a1, ICollection<T> a2)
-    {
-        if(ReferenceEquals(a1, a2))
-        {
-            return true;
-        }
-
-        if(a1 == null || a2 == null)
-        {
-            return false;
-        }
-
-        if(a1.Count != a2.Count)
-        {
-            return false;
-        }
-
-        EqualityComparer<T> comparer = EqualityComparer<T>.Default;
-        IEnumerator<T> a1i = a1.GetEnumerator();
-        IEnumerator<T> a2i = a2.GetEnumerator();
-        while(a1i.MoveNext() && a2i.MoveNext())
-        {
-            if(!comparer.Equals(a1i.Current, a2i.Current))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    internal static bool MapsEqual<K, V>(Dictionary<K, V> d1, Dictionary<K, V> d2)
-    {
-        if(ReferenceEquals(d1, d2))
-        {
-            return true;
-        }
-
-        if(d1 == null || d2 == null)
-        {
-            return false;
-        }
-
-        if(d1.Count != d2.Count)
-        {
-            return false;
-        }
-
-        EqualityComparer<V> valueComparer = EqualityComparer<V>.Default;
-        foreach(K key in d1.Keys)
-        {
-            if(!d2.ContainsKey(key) || !valueComparer.Equals(d1[key], d2[key]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    internal static void Populate<T>(T[] arr, T value)
-    {
-        for(int i = 0; i < arr.Length; ++i)
-        {
-            arr[i] = value;
-        }
-    }
-
-    private class TestValueReader : Ice.ValueReader
-    {
-        public override void read(Ice.InputStream @in)
-        {
-            @in.startValue();
-            @in.startSlice();
-            @in.endSlice();
-            @in.endValue(false);
-        }
-    }
-
-    private class BValueReader : Ice.ValueReader
-    {
-        public override void read(Ice.InputStream @in)
-        {
-            @in.startValue();
-            // ::Test::B
-            @in.startSlice();
-            @in.readInt();
-            @in.endSlice();
-            // ::Test::A
-            @in.startSlice();
-            @in.readInt();
-            @in.endSlice();
-            @in.endValue(false);
-        }
-    }
-
-    private class CValueReader : Ice.ValueReader
-    {
-        public override void read(Ice.InputStream @in)
-        {
-            @in.startValue();
-            // ::Test::C
-            @in.startSlice();
-            @in.skipSlice();
-            // ::Test::B
-            @in.startSlice();
-            @in.readInt();
-            @in.endSlice();
-            // ::Test::A
-            @in.startSlice();
-            @in.readInt();
-            @in.endSlice();
-            @in.endValue(false);
-        }
-    }
-
-    private class DValueWriter : Ice.ValueWriter
-    {
-        public override void write(Ice.OutputStream @out)
-        {
-            @out.startValue(null);
-            // ::Test::D
-            @out.startSlice("::Test::D", -1, false);
-            string s = "test";
-            @out.writeString(s);
-            @out.writeOptional(1, Ice.OptionalFormat.FSize);
-            string[] o = { "test1", "test2", "test3", "test4" };
-            int pos = @out.startSize();
-            @out.writeStringSeq(o);
-            @out.endSize(pos);
-            Test.A a = new Test.A();
-            a.mc = 18;
-            @out.writeOptional(1000, Ice.OptionalFormat.Class);
-            @out.writeValue(a);
-            @out.endSlice();
-            // ::Test::B
-            @out.startSlice(Test.B.ice_staticId(), -1, false);
-            int v = 14;
-            @out.writeInt(v);
-            @out.endSlice();
-            // ::Test::A
-            @out.startSlice(Test.A.ice_staticId(), -1, true);
-            @out.writeInt(v);
-            @out.endSlice();
-            @out.endValue();
-        }
-    }
-
-    private class DValueReader : Ice.ValueReader
-    {
-        public override void read(Ice.InputStream @in)
-        {
-            @in.startValue();
-            // ::Test::D
-            @in.startSlice();
-            string s = @in.readString();
-            test(s.Equals("test"));
-            test(@in.readOptional(1, Ice.OptionalFormat.FSize));
-            @in.skip(4);
-            string[] o = @in.readStringSeq();
-            test(o.Length == 4 &&
-                 o[0].Equals("test1") && o[1].Equals("test2") && o[2].Equals("test3") && o[3].Equals("test4"));
-            test(@in.readOptional(1000, Ice.OptionalFormat.Class));
-            @in.readValue(a.invoke);
-            @in.endSlice();
-            // ::Test::B
-            @in.startSlice();
-            @in.readInt();
-            @in.endSlice();
-            // ::Test::A
-            @in.startSlice();
-            @in.readInt();
-            @in.endSlice();
-            @in.endValue(false);
-        }
-
-        internal void check()
-        {
-            test(((Test.A)a.obj).mc.Value == 18);
-        }
-
-        private ReadValueCallbackI a = new ReadValueCallbackI();
-    }
-
-    private class FValueReader : Ice.ValueReader
-    {
-        public override void read(Ice.InputStream @in)
-        {
-            _f = new Test.F();
-            @in.startValue();
-            @in.startSlice();
-            // Don't read af on purpose
-            //in.read(1, _f.af);
-            @in.endSlice();
-            @in.startSlice();
-            ReadValueCallbackI rocb = new ReadValueCallbackI();
-            @in.readValue(rocb.invoke);
-            @in.endSlice();
-            @in.endValue(false);
-            _f.ae = (Test.A)rocb.obj;
-        }
+                test(cb.obj != null && cb.obj is TestValueReader);
+                factory.setEnabled(false);
 
-        public Test.F getF()
-        {
-            return _f;
-        }
+                output.WriteLine("ok");
 
-        private Test.F _f;
-    }
-
-    private class FactoryI
-    {
-        public Ice.Value create(string typeId)
-        {
-            if(!_enabled)
-            {
-                return null;
-            }
+                output.Write("testing tag marshaling... ");
+                output.Flush();
+                {
+                    Test.B b = new Test.B();
+                    Test.B b2 =(Test.B)initial.pingPong(b);
+                    test(!b2.ma.HasValue);
+                    test(!b2.mb.HasValue);
+                    test(!b2.mc.HasValue);
+
+                    b.ma = 10;
+                    b.mb = 11;
+                    b.mc = 12;
+                    b.md = 13;
+
+                    b2 =(Test.B)initial.pingPong(b);
+                    test(b2.ma.Value == 10);
+                    test(b2.mb.Value == 11);
+                    test(b2.mc.Value == 12);
+                    test(b2.md.Value == 13);
+
+                    factory.setEnabled(true);
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeValue(b);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.readValue(cb.invoke);
+                    @in.endEncapsulation();
+                    test(cb.obj != null);
+                    factory.setEnabled(false);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing marshalling of objects with optional objects...");
+                output.Flush();
+                {
+                    Test.F f = new Test.F();
+
+                    f.af = new Test.A();
+                    f.ae =(Test.A)f.af;
+
+                    Test.F rf =(Test.F)initial.pingPong(f);
+                    test(rf.ae == rf.af.Value);
+
+                    factory.setEnabled(true);
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeValue(f);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    @in = new Ice.InputStream(communicator, inEncaps);
+                    @in.startEncapsulation();
+                    ReadValueCallbackI rocb = new ReadValueCallbackI();
+                    @in.readValue(rocb.invoke);
+                    @in.endEncapsulation();
+                    factory.setEnabled(false);
+                    rf =((FValueReader)rocb.obj).getF();
+                    test(rf.ae != null && !rf.af.HasValue);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing optional with default values... ");
+                output.Flush();
+                {
+                    Test.WD wd =(Test.WD)initial.pingPong(new Test.WD());
+                    test(wd.a.Value == 5);
+                    test(wd.s.Value.Equals("test"));
+                    wd.a = Ice.Util.None;
+                    wd.s = Ice.Util.None;
+                    wd =(Test.WD)initial.pingPong(wd);
+                    test(!wd.a.HasValue);
+                    test(!wd.s.HasValue);
+                }
+                output.WriteLine("ok");
+
+                if(communicator.getProperties().getPropertyAsInt("Ice.Default.SlicedFormat") > 0)
+                {
+                    output.Write("testing marshaling with unknown class slices... ");
+                    output.Flush();
+                    {
+                        Test.C c = new Test.C();
+                        c.ss = "test";
+                        c.ms = "testms";
+                        os = new Ice.OutputStream(communicator);
+                        os.startEncapsulation();
+                        os.writeValue(c);
+                        os.endEncapsulation();
+                        inEncaps = os.finished();
+                        factory.setEnabled(true);
+                        test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
+                        @in = new Ice.InputStream(communicator, outEncaps);
+                        @in.startEncapsulation();
+                        @in.readValue(cb.invoke);
+                        @in.endEncapsulation();
+                        test(cb.obj is CValueReader);
+                        factory.setEnabled(false);
+
+                        factory.setEnabled(true);
+                        os = new Ice.OutputStream(communicator);
+                        os.startEncapsulation();
+                        Ice.Value d = new DValueWriter();
+                        os.writeValue(d);
+                        os.endEncapsulation();
+                        inEncaps = os.finished();
+                        test(initial.ice_invoke("pingPong", Ice.OperationMode.Normal, inEncaps, out outEncaps));
+                        @in = new Ice.InputStream(communicator, outEncaps);
+                        @in.startEncapsulation();
+                        @in.readValue(cb.invoke);
+                        @in.endEncapsulation();
+                        test(cb.obj != null && cb.obj is DValueReader);
+                       ((DValueReader)cb.obj).check();
+                        factory.setEnabled(false);
+                    }
+                    output.WriteLine("ok");
+
+                    output.Write("testing optionals with unknown classes...");
+                    output.Flush();
+                    {
+                        Test.A a = new Test.A();
+
+                        os = new Ice.OutputStream(communicator);
+                        os.startEncapsulation();
+                        os.writeValue(a);
+                        os.writeOptional(1, Ice.OptionalFormat.Class);
+                        os.writeValue(new DValueWriter());
+                        os.endEncapsulation();
+                        inEncaps = os.finished();
+                        test(initial.ice_invoke("opClassAndUnknownOptional", Ice.OperationMode.Normal, inEncaps,
+                                                out outEncaps));
+
+                        @in = new Ice.InputStream(communicator, outEncaps);
+                        @in.startEncapsulation();
+                        @in.endEncapsulation();
+                    }
+                    output.WriteLine("ok");
+                }
+
+                output.Write("testing optional parameters... ");
+                output.Flush();
+                {
+                    Ice.Optional<byte> p1 = new Ice.Optional<byte>();
+                    Ice.Optional<byte> p3;
+                    Ice.Optional<byte> p2 = initial.opByte(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opByte(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = 56;
+                    p2 = initial.opByte(p1, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    Ice.AsyncResult r = initial.begin_opByte(p1);
+                    p2 = initial.end_opByte(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    p2 = initial.opByte(p1.Value, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    r = initial.begin_opByte(p1.Value);
+                    p2 = initial.end_opByte(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+
+                    p2 = initial.opByte(new Ice.Optional<byte>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.F1);
+                    os.writeByte(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opByte", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.F1));
+                    test(@in.readByte() == 56);
+                    test(@in.readOptional(3, Ice.OptionalFormat.F1));
+                    test(@in.readByte() == 56);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<bool> p1 = new Ice.Optional<bool>();
+                    Ice.Optional<bool> p3;
+                    Ice.Optional<bool> p2 = initial.opBool(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opBool(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = true;
+                    p2 = initial.opBool(p1, out p3);
+                    test(p2.Value == true && p3.Value == true);
+                    Ice.AsyncResult r = initial.begin_opBool(p1);
+                    p2 = initial.end_opBool(out p3, r);
+                    test(p2.Value == true && p3.Value == true);
+                    p2 = initial.opBool(true, out p3);
+                    test(p2.Value == true && p3.Value == true);
+                    r = initial.begin_opBool(true);
+                    p2 = initial.end_opBool(out p3, r);
+                    test(p2.Value == true && p3.Value == true);
+
+                    p2 = initial.opBool(new Ice.Optional<bool>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.F1);
+                    os.writeBool(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opBool", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.F1));
+                    test(@in.readBool() == true);
+                    test(@in.readOptional(3, Ice.OptionalFormat.F1));
+                    test(@in.readBool() == true);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<short> p1 = new Ice.Optional<short>();
+                    Ice.Optional<short> p3;
+                    Ice.Optional<short> p2 = initial.opShort(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opShort(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = 56;
+                    p2 = initial.opShort(p1, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    Ice.AsyncResult r = initial.begin_opShort(p1);
+                    p2 = initial.end_opShort(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    p2 = initial.opShort(p1.Value, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    r = initial.begin_opShort(p1.Value);
+                    p2 = initial.end_opShort(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+
+                    p2 = initial.opShort(new Ice.Optional<short>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.F2);
+                    os.writeShort(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opShort", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.F2));
+                    test(@in.readShort() == 56);
+                    test(@in.readOptional(3, Ice.OptionalFormat.F2));
+                    test(@in.readShort() == 56);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<int> p1 = new Ice.Optional<int>();
+                    Ice.Optional<int> p3;
+                    Ice.Optional<int> p2 = initial.opInt(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opInt(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = 56;
+                    p2 = initial.opInt(p1, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    Ice.AsyncResult r = initial.begin_opInt(p1);
+                    p2 = initial.end_opInt(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    p2 = initial.opInt(p1.Value, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    r = initial.begin_opInt(p1.Value);
+                    p2 = initial.end_opInt(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+
+                    p2 = initial.opInt(new Ice.Optional<int>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.F4);
+                    os.writeInt(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opInt", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.F4));
+                    test(@in.readInt() == 56);
+                    test(@in.readOptional(3, Ice.OptionalFormat.F4));
+                    test(@in.readInt() == 56);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<long> p1 = new Ice.Optional<long>();
+                    Ice.Optional<long> p3;
+                    Ice.Optional<long> p2 = initial.opLong(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opLong(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = 56;
+                    p2 = initial.opLong(p1, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    Ice.AsyncResult r = initial.begin_opLong(p1);
+                    p2 = initial.end_opLong(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    p2 = initial.opLong(p1.Value, out p3);
+                    test(p2.Value == 56 && p3.Value == 56);
+                    r = initial.begin_opLong(p1.Value);
+                    p2 = initial.end_opLong(out p3, r);
+                    test(p2.Value == 56 && p3.Value == 56);
+
+                    p2 = initial.opLong(new Ice.Optional<long>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(1, Ice.OptionalFormat.F8);
+                    os.writeLong(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opLong", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(2, Ice.OptionalFormat.F8));
+                    test(@in.readLong() == 56);
+                    test(@in.readOptional(3, Ice.OptionalFormat.F8));
+                    test(@in.readLong() == 56);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<float> p1 = new Ice.Optional<float>();
+                    Ice.Optional<float> p3;
+                    Ice.Optional<float> p2 = initial.opFloat(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFloat(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 =(float)1.0;
+                    p2 = initial.opFloat(p1, out p3);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+                    Ice.AsyncResult r = initial.begin_opFloat(p1);
+                    p2 = initial.end_opFloat(out p3, r);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+                    p2 = initial.opFloat(p1.Value, out p3);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+                    r = initial.begin_opFloat(p1.Value);
+                    p2 = initial.end_opFloat(out p3, r);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+
+                    p2 = initial.opFloat(new Ice.Optional<float>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.F4);
+                    os.writeFloat(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opFloat", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.F4));
+                    test(@in.readFloat() == 1.0);
+                    test(@in.readOptional(3, Ice.OptionalFormat.F4));
+                    test(@in.readFloat() == 1.0);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<double> p1 = new Ice.Optional<double>();
+                    Ice.Optional<double> p3;
+                    Ice.Optional<double> p2 = initial.opDouble(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opDouble(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = 1.0;
+                    p2 = initial.opDouble(p1, out p3);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+                    Ice.AsyncResult r = initial.begin_opDouble(p1);
+                    p2 = initial.end_opDouble(out p3, r);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+                    p2 = initial.opDouble(p1.Value, out p3);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+                    r = initial.begin_opDouble(p1.Value);
+                    p2 = initial.end_opDouble(out p3, r);
+                    test(p2.Value == 1.0 && p3.Value == 1.0);
+
+                    p2 = initial.opDouble(new Ice.Optional<double>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.F8);
+                    os.writeDouble(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opDouble", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.F8));
+                    test(@in.readDouble() == 1.0);
+                    test(@in.readOptional(3, Ice.OptionalFormat.F8));
+                    test(@in.readDouble() == 1.0);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<string> p1 = new Ice.Optional<string>();
+                    Ice.Optional<string> p3;
+                    Ice.Optional<string> p2 = initial.opString(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opString(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opString(null, out p3); // Implicitly converts to Ice.Optional<string>(null)
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = "test";
+                    p2 = initial.opString(p1, out p3);
+                    test(p2.Value.Equals("test") && p3.Value.Equals("test"));
+                    Ice.AsyncResult r = initial.begin_opString(p1);
+                    p2 = initial.end_opString(out p3, r);
+                    test(p2.Value.Equals("test") && p3.Value.Equals("test"));
+                    p2 = initial.opString(p1.Value, out p3);
+                    test(p2.Value.Equals("test") && p3.Value.Equals("test"));
+                    r = initial.begin_opString(p1.Value);
+                    p2 = initial.end_opString(out p3, r);
+                    test(p2.Value.Equals("test") && p3.Value.Equals("test"));
+
+                    p2 = initial.opString(new Ice.Optional<string>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeString(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opString", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    test(@in.readString().Equals("test"));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    test(@in.readString().Equals("test"));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.MyEnum> p1 = new Ice.Optional<Test.MyEnum>();
+                    Ice.Optional<Test.MyEnum> p3;
+                    Ice.Optional<Test.MyEnum> p2 = initial.opMyEnum(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opMyEnum(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = Test.MyEnum.MyEnumMember;
+                    p2 = initial.opMyEnum(p1, out p3);
+                    test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
+                    Ice.AsyncResult r = initial.begin_opMyEnum(p1);
+                    p2 = initial.end_opMyEnum(out p3, r);
+                    test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
+                    p2 = initial.opMyEnum(p1.Value, out p3);
+                    test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
+                    r = initial.begin_opMyEnum(p1.Value);
+                    p2 = initial.end_opMyEnum(out p3, r);
+                    test(p2.Value == Test.MyEnum.MyEnumMember && p3.Value == Test.MyEnum.MyEnumMember);
+
+                    p2 = initial.opMyEnum(new Ice.Optional<Test.MyEnum>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.Size);
+                    os.writeEnum((int)p1.Value, 1);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opMyEnum", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.Size));
+                    test((Test.MyEnum)@in.readEnum(1) == Test.MyEnum.MyEnumMember);
+                    test(@in.readOptional(3, Ice.OptionalFormat.Size));
+                    test((Test.MyEnum)@in.readEnum(1) == Test.MyEnum.MyEnumMember);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.SmallStruct> p1 = new Ice.Optional<Test.SmallStruct>();
+                    Ice.Optional<Test.SmallStruct> p3;
+                    Ice.Optional<Test.SmallStruct> p2 = initial.opSmallStruct(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opSmallStruct(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = new Test.SmallStruct(56);
+                    p2 = initial.opSmallStruct(p1, out p3);
+                    test(p2.Value.m ==(byte)56 && p3.Value.m ==(byte)56);
+                    Ice.AsyncResult r = initial.begin_opSmallStruct(p1);
+                    p2 = initial.end_opSmallStruct(out p3, r);
+                    test(p2.Value.m ==(byte)56 && p3.Value.m ==(byte)56);
+                    p2 = initial.opSmallStruct(p1.Value, out p3);
+                    test(p2.Value.m ==(byte)56 && p3.Value.m ==(byte)56);
+                    r = initial.begin_opSmallStruct(p1.Value);
+                    p2 = initial.end_opSmallStruct(out p3, r);
+                    test(p2.Value.m ==(byte)56 && p3.Value.m ==(byte)56);
+
+                    p2 = initial.opSmallStruct(new Ice.Optional<Test.SmallStruct>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(1);
+                    p1.Value.ice_writeMembers(os);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opSmallStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    Test.SmallStruct f = new Test.SmallStruct();
+                    f.ice_readMembers(@in);
+                    test(f.m ==(byte)56);
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    f.ice_readMembers(@in);
+                    test(f.m ==(byte)56);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.FixedStruct> p1 = new Ice.Optional<Test.FixedStruct>();
+                    Ice.Optional<Test.FixedStruct> p3;
+                    Ice.Optional<Test.FixedStruct> p2 = initial.opFixedStruct(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFixedStruct(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = new Test.FixedStruct(56);
+                    p2 = initial.opFixedStruct(p1, out p3);
+                    test(p2.Value.m == 56 && p3.Value.m == 56);
+                    Ice.AsyncResult r = initial.begin_opFixedStruct(p1);
+                    p2 = initial.end_opFixedStruct(out p3, r);
+                    test(p2.Value.m == 56 && p3.Value.m == 56);
+                    p2 = initial.opFixedStruct(p1.Value, out p3);
+                    test(p2.Value.m == 56 && p3.Value.m == 56);
+                    r = initial.begin_opFixedStruct(p1.Value);
+                    p2 = initial.end_opFixedStruct(out p3, r);
+                    test(p2.Value.m == 56 && p3.Value.m == 56);
+
+                    p2 = initial.opFixedStruct(new Ice.Optional<Test.FixedStruct>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(4);
+                    p1.Value.ice_writeMembers(os);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opFixedStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    Test.FixedStruct f = new Test.FixedStruct();
+                    f.ice_readMembers(@in);
+                    test(f.m == 56);
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    f.ice_readMembers(@in);
+                    test(f.m == 56);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.VarStruct> p1 = new Ice.Optional<Test.VarStruct>();
+                    Ice.Optional<Test.VarStruct> p3;
+                    Ice.Optional<Test.VarStruct> p2 = initial.opVarStruct(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opVarStruct(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = new Test.VarStruct("test");
+                    p2 = initial.opVarStruct(p1, out p3);
+                    test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
+
+                    // Test null struct
+                    p2 = initial.opVarStruct((Test.VarStruct)null, out p3);
+                    test(p2.Value.m.Equals("") && p3.Value.m.Equals(""));
+
+                    Ice.AsyncResult r = initial.begin_opVarStruct(p1);
+                    p2 = initial.end_opVarStruct(out p3, r);
+                    test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
+                    p2 = initial.opVarStruct(p1.Value, out p3);
+                    test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
+                    r = initial.begin_opVarStruct(p1.Value);
+                    p2 = initial.end_opVarStruct(out p3, r);
+                    test(p2.Value.m.Equals("test") && p3.Value.m.Equals("test"));
+
+                    p2 = initial.opVarStruct(new Ice.Optional<Test.VarStruct>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.FSize);
+                    int pos = os.startSize();
+                    p1.Value.ice_writeMembers(os);
+                    os.endSize(pos);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opVarStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    Test.VarStruct v = new Test.VarStruct();
+                    v.ice_readMembers(@in);
+                    test(v.m.Equals("test"));
+                    test(@in.readOptional(3, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    v.ice_readMembers(@in);
+                    test(v.m.Equals("test"));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.OneOptional> p1 = new Ice.Optional<Test.OneOptional>();
+                    Ice.Optional<Test.OneOptional> p3;
+                    Ice.Optional<Test.OneOptional> p2 = initial.opOneOptional(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opOneOptional(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    if(initial.supportsNullOptional())
+                    {
+                        p2 = initial.opOneOptional(null, out p3); // Implicitly converts to Ice.Optional<OneOptional>(null)
+                        test(p2.HasValue && p2.Value == null && p3.HasValue && p3.Value == null);
+
+                        p2 = initial.opOneOptional(new Ice.Optional<Test.OneOptional>((Test.OneOptional)null), out p3);
+                        test(p2.HasValue && p3.HasValue && p2.Value == null && p3.Value == null);
+                    }
+
+                    p1 = new Test.OneOptional(58);
+                    p2 = initial.opOneOptional(p1, out p3);
+                    test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
+                    Ice.AsyncResult r = initial.begin_opOneOptional(p1);
+                    p2 = initial.end_opOneOptional(out p3, r);
+                    test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
+                    p2 = initial.opOneOptional(p1.Value, out p3);
+                    test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
+                    r = initial.begin_opOneOptional(p1.Value);
+                    p2 = initial.end_opOneOptional(out p3, r);
+                    test(p2.Value.a.Value == 58 && p3.Value.a.Value == 58);
+
+                    p2 = initial.opOneOptional(new Ice.Optional<Test.OneOptional>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.Class);
+                    os.writeValue(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opOneOptional", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.Class));
+                    ReadValueCallbackI p2cb = new ReadValueCallbackI();
+                    @in.readValue(p2cb.invoke);
+                    test(@in.readOptional(3, Ice.OptionalFormat.Class));
+                    ReadValueCallbackI p3cb = new ReadValueCallbackI();
+                    @in.readValue(p3cb.invoke);
+                    @in.endEncapsulation();
+                    test(((Test.OneOptional)p2cb.obj).a.Value == 58 &&((Test.OneOptional)p3cb.obj).a.Value == 58);
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Ice.ObjectPrx> p1 = new Ice.Optional<Ice.ObjectPrx>();
+                    Ice.Optional<Ice.ObjectPrx> p3;
+                    Ice.Optional<Ice.ObjectPrx> p2 = initial.opOneOptionalProxy(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opOneOptionalProxy(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opOneOptionalProxy(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    if(initial.supportsNullOptional())
+                    {
+                        p2 = initial.opOneOptionalProxy(null, out p3);
+                        test(p2.HasValue && p3.HasValue && p2.Value == null && p3.Value == null);
+                    }
+
+                    //
+                    // Not allowed by C# language spec because OptionalOnePrx is an interface.
+                    //
+                    //p1 = Test.OneOptionalPrxHelper.uncheckedCast(communicator.stringToProxy("test"));
+                    p1 = new Ice.Optional<Ice.ObjectPrx>(communicator.stringToProxy("test"));
+                    p2 = initial.opOneOptionalProxy(p1, out p3);
+                    test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+
+                    Ice.AsyncResult r = initial.begin_opOneOptionalProxy(p1);
+                    p2 = initial.end_opOneOptionalProxy(out p3, r);
+                    test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+                    //p2 = initial.opOneOptionalProxy(p1.Value, out p3);
+                    //test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+                    //r = initial.begin_opOneOptionalProxy(p1.Value);
+                    //p2 = initial.end_opOneOptionalProxy(out p3, r);
+                    //test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+
+                    p2 = initial.opOneOptionalProxy(new Ice.Optional<Ice.ObjectPrx>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.FSize);
+                    int pos = os.startSize();
+                    os.writeProxy(p1.Value);
+                    os.endSize(pos);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opOneOptionalProxy", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    test(@in.readProxy().Equals(p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    test(@in.readProxy().Equals(p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<byte[]> p1 = new Ice.Optional<byte[]>();
+                    Ice.Optional<byte[]> p3;
+                    Ice.Optional<byte[]> p2 = initial.opByteSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opByteSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opByteSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new byte[100];
+                    Populate(p1.Value,(byte)56);
+                    p2 = initial.opByteSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opByteSeq(p1);
+                    p2 = initial.end_opByteSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opByteSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opByteSeq(p1.Value);
+                    p2 = initial.end_opByteSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opByteSeq(new Ice.Optional<byte[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeByteSeq(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opByteSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    test(ArraysEqual(@in.readByteSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    test(ArraysEqual(@in.readByteSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<bool[]> p1 = new Ice.Optional<bool[]>();
+                    Ice.Optional<bool[]> p3;
+                    Ice.Optional<bool[]> p2 = initial.opBoolSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opBoolSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opBoolSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new bool[100];
+                    Populate(p1.Value, true);
+                    p2 = initial.opBoolSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opBoolSeq(p1);
+                    p2 = initial.end_opBoolSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opBoolSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opBoolSeq(p1.Value);
+                    p2 = initial.end_opBoolSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opBoolSeq(new Ice.Optional<bool[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeBoolSeq(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opBoolSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    test(ArraysEqual(@in.readBoolSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    test(ArraysEqual(@in.readBoolSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<short[]> p1 = new Ice.Optional<short[]>();
+                    Ice.Optional<short[]> p3;
+                    Ice.Optional<short[]> p2 = initial.opShortSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opShortSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opShortSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new short[100];
+                    Populate(p1.Value,(short)56);
+                    p2 = initial.opShortSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opShortSeq(p1);
+                    p2 = initial.end_opShortSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opShortSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opShortSeq(p1.Value);
+                    p2 = initial.end_opShortSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opShortSeq(new Ice.Optional<short[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Length * 2 +(p1.Value.Length > 254 ? 5 : 1));
+                    os.writeShortSeq(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opShortSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readShortSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readShortSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<int[]> p1 = new Ice.Optional<int[]>();
+                    Ice.Optional<int[]> p3;
+                    Ice.Optional<int[]> p2 = initial.opIntSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opIntSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opIntSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new int[100];
+                    Populate(p1.Value, 56);
+                    p2 = initial.opIntSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opIntSeq(p1);
+                    p2 = initial.end_opIntSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opIntSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opIntSeq(p1.Value);
+                    p2 = initial.end_opIntSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opIntSeq(new Ice.Optional<int[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Length * 4 +(p1.Value.Length > 254 ? 5 : 1));
+                    os.writeIntSeq(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opIntSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readIntSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readIntSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<long[]> p1 = new Ice.Optional<long[]>();
+                    Ice.Optional<long[]> p3;
+                    Ice.Optional<long[]> p2 = initial.opLongSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opLongSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opLongSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new long[100];
+                    Populate(p1.Value, 56);
+                    p2 = initial.opLongSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opLongSeq(p1);
+                    p2 = initial.end_opLongSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opLongSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opLongSeq(p1.Value);
+                    p2 = initial.end_opLongSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opLongSeq(new Ice.Optional<long[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Length * 8 +(p1.Value.Length > 254 ? 5 : 1));
+                    os.writeLongSeq(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opLongSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readLongSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readLongSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<float[]> p1 = new Ice.Optional<float[]>();
+                    Ice.Optional<float[]> p3;
+                    Ice.Optional<float[]> p2 = initial.opFloatSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFloatSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFloatSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new float[100];
+                    Populate(p1.Value,(float)1.0);
+                    p2 = initial.opFloatSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opFloatSeq(p1);
+                    p2 = initial.end_opFloatSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opFloatSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opFloatSeq(p1.Value);
+                    p2 = initial.end_opFloatSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opFloatSeq(new Ice.Optional<float[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Length * 4 +(p1.Value.Length > 254 ? 5 : 1));
+                    os.writeFloatSeq(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opFloatSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readFloatSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readFloatSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<double[]> p1 = new Ice.Optional<double[]>();
+                    Ice.Optional<double[]> p3;
+                    Ice.Optional<double[]> p2 = initial.opDoubleSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opDoubleSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opDoubleSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new double[100];
+                    Populate(p1.Value, 1.0);
+                    p2 = initial.opDoubleSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opDoubleSeq(p1);
+                    p2 = initial.end_opDoubleSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opDoubleSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opDoubleSeq(p1.Value);
+                    p2 = initial.end_opDoubleSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opDoubleSeq(new Ice.Optional<double[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Length * 8 +(p1.Value.Length > 254 ? 5 : 1));
+                    os.writeDoubleSeq(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opDoubleSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readDoubleSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    test(ArraysEqual(@in.readDoubleSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<String[]> p1 = new Ice.Optional<String[]>();
+                    Ice.Optional<String[]> p3;
+                    Ice.Optional<String[]> p2 = initial.opStringSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opStringSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opStringSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new String[10];
+                    Populate(p1.Value, "test1");
+                    p2 = initial.opStringSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opStringSeq(p1);
+                    p2 = initial.end_opStringSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opStringSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opStringSeq(p1.Value);
+                    p2 = initial.end_opStringSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opStringSeq(new Ice.Optional<String[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.FSize);
+                    int pos = os.startSize();
+                    os.writeStringSeq(p1.Value);
+                    os.endSize(pos);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opStringSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    test(ArraysEqual(@in.readStringSeq(), p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    test(ArraysEqual(@in.readStringSeq(), p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.SmallStruct[]> p1 = new Ice.Optional<Test.SmallStruct[]>();
+                    Ice.Optional<Test.SmallStruct[]> p3;
+                    Ice.Optional<Test.SmallStruct[]> p2 = initial.opSmallStructSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opSmallStructSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opSmallStructSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new Test.SmallStruct[10];
+                    for(int i = 0; i < p1.Value.Length; ++i)
+                    {
+                        p1.Value[i] = new Test.SmallStruct();
+                    }
+                    p2 = initial.opSmallStructSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opSmallStructSeq(p1);
+                    p2 = initial.end_opSmallStructSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opSmallStructSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opSmallStructSeq(p1.Value);
+                    p2 = initial.end_opSmallStructSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opSmallStructSeq(new Ice.Optional<Test.SmallStruct[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Length +(p1.Value.Length > 254 ? 5 : 1));
+                    Test.SmallStructSeqHelper.write(os, p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opSmallStructSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    Test.SmallStruct[] arr = Test.SmallStructSeqHelper.read(@in);
+                    test(ArraysEqual(arr, p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    arr = Test.SmallStructSeqHelper.read(@in);
+                    test(ArraysEqual(arr, p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<List<Test.SmallStruct>> p1 = new Ice.Optional<List<Test.SmallStruct>>();
+                    Ice.Optional<List<Test.SmallStruct>> p3;
+                    Ice.Optional<List<Test.SmallStruct>> p2 = initial.opSmallStructList(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opSmallStructList(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opSmallStructList(null, out p3);
+                    test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
+
+                    p1 = new List<Test.SmallStruct>();
+                    for(int i = 0; i < 10; ++i)
+                    {
+                        p1.Value.Add(new Test.SmallStruct());
+                    }
+                    p2 = initial.opSmallStructList(p1, out p3);
+                    test(ListsEqual(p2.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opSmallStructList(p1);
+                    p2 = initial.end_opSmallStructList(out p3, r);
+                    test(ListsEqual(p2.Value, p1.Value));
+                    p2 = initial.opSmallStructList(p1.Value, out p3);
+                    test(ListsEqual(p2.Value, p1.Value));
+                    r = initial.begin_opSmallStructList(p1.Value);
+                    p2 = initial.end_opSmallStructList(out p3, r);
+                    test(ListsEqual(p2.Value, p1.Value));
+
+                    p2 = initial.opSmallStructList(new Ice.Optional<List<Test.SmallStruct>>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Count +(p1.Value.Count > 254 ? 5 : 1));
+                    Test.SmallStructListHelper.write(os, p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opSmallStructList", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    List<Test.SmallStruct> arr = Test.SmallStructListHelper.read(@in);
+                    test(ListsEqual(arr, p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    arr = Test.SmallStructListHelper.read(@in);
+                    test(ListsEqual(arr, p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.FixedStruct[]> p1 = new Ice.Optional<Test.FixedStruct[]>();
+                    Ice.Optional<Test.FixedStruct[]> p3;
+                    Ice.Optional<Test.FixedStruct[]> p2 = initial.opFixedStructSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFixedStructSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFixedStructSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new Test.FixedStruct[10];
+                    for(int i = 0; i < p1.Value.Length; ++i)
+                    {
+                        p1.Value[i] = new Test.FixedStruct();
+                    }
+                    p2 = initial.opFixedStructSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opFixedStructSeq(p1);
+                    p2 = initial.end_opFixedStructSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opFixedStructSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opFixedStructSeq(p1.Value);
+                    p2 = initial.end_opFixedStructSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opFixedStructSeq(new Ice.Optional<Test.FixedStruct[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Length * 4 +(p1.Value.Length > 254 ? 5 : 1));
+                    Test.FixedStructSeqHelper.write(os, p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opFixedStructSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    Test.FixedStruct[] arr = Test.FixedStructSeqHelper.read(@in);
+                    test(ArraysEqual(arr, p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    arr = Test.FixedStructSeqHelper.read(@in);
+                    test(ArraysEqual(arr, p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<LinkedList<Test.FixedStruct>> p1 = new Ice.Optional<LinkedList<Test.FixedStruct>>();
+                    Ice.Optional<LinkedList<Test.FixedStruct>> p3;
+                    Ice.Optional<LinkedList<Test.FixedStruct>> p2 = initial.opFixedStructList(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFixedStructList(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opFixedStructList(null, out p3);
+                    test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
+
+                    p1 = new LinkedList<Test.FixedStruct>();
+                    for(int i = 0; i < 10; ++i)
+                    {
+                        p1.Value.AddLast(new Test.FixedStruct());
+                    }
+                    p2 = initial.opFixedStructList(p1, out p3);
+                    test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opFixedStructList(p1);
+                    p2 = initial.end_opFixedStructList(out p3, r);
+                    test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
+                    p2 = initial.opFixedStructList(p1.Value, out p3);
+                    test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
+                    r = initial.begin_opFixedStructList(p1.Value);
+                    p2 = initial.end_opFixedStructList(out p3, r);
+                    test(ListsEqual(p2.Value, p1.Value) && ListsEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opFixedStructList(new Ice.Optional<LinkedList<Test.FixedStruct>>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Count * 4 +(p1.Value.Count > 254 ? 5 : 1));
+                    Test.FixedStructListHelper.write(os, p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opFixedStructList", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    LinkedList<Test.FixedStruct> arr = Test.FixedStructListHelper.read(@in);
+                    test(ListsEqual(arr, p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    arr = Test.FixedStructListHelper.read(@in);
+                    test(ListsEqual(arr, p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Test.VarStruct[]> p1 = new Ice.Optional<Test.VarStruct[]>();
+                    Ice.Optional<Test.VarStruct[]> p3;
+                    Ice.Optional<Test.VarStruct[]> p2 = initial.opVarStructSeq(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opVarStructSeq(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opVarStructSeq(null, out p3);
+                    test(p2.HasValue && p2.Value.Length == 0 && p3.HasValue && p3.Value.Length == 0);
+
+                    p1 = new Test.VarStruct[10];
+                    for(int i = 0; i < p1.Value.Length; ++i)
+                    {
+                        p1.Value[i] = new Test.VarStruct("");
+                    }
+                    p2 = initial.opVarStructSeq(p1, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opVarStructSeq(p1);
+                    p2 = initial.end_opVarStructSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    p2 = initial.opVarStructSeq(p1.Value, out p3);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+                    r = initial.begin_opVarStructSeq(p1.Value);
+                    p2 = initial.end_opVarStructSeq(out p3, r);
+                    test(ArraysEqual(p2.Value, p1.Value) && ArraysEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opVarStructSeq(new Ice.Optional<Test.VarStruct[]>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.FSize);
+                    int pos = os.startSize();
+                    Test.VarStructSeqHelper.write(os, p1.Value);
+                    os.endSize(pos);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opVarStructSeq", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    Test.VarStruct[] arr = Test.VarStructSeqHelper.read(@in);
+                    test(ArraysEqual(arr, p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    arr = Test.VarStructSeqHelper.read(@in);
+                    test(ArraysEqual(arr, p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                if(supportsCsharpSerializable)
+                {
+                    Ice.Optional<Test.SerializableClass> p1 = new Ice.Optional<Test.SerializableClass>();
+                    Ice.Optional<Test.SerializableClass> p3;
+                    Ice.Optional<Test.SerializableClass> p2 = initial.opSerializable(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opSerializable(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+
+                    p1 = new Test.SerializableClass(58);
+                    p2 = initial.opSerializable(p1, out p3);
+                    test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+                    Ice.AsyncResult r = initial.begin_opSerializable(p1);
+                    p2 = initial.end_opSerializable(out p3, r);
+                    test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+                    p2 = initial.opSerializable(p1.Value, out p3);
+                    test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+                    r = initial.begin_opSerializable(p1.Value);
+                    p2 = initial.end_opSerializable(out p3, r);
+                    test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+
+                    p2 = initial.opSerializable(new Ice.Optional<Test.SerializableClass>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSerializable(p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opSerializable", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    Test.SerializableClass sc = Test.SerializableHelper.read(@in);
+                    test(sc.Equals(p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    sc = Test.SerializableHelper.read(@in);
+                    test(sc.Equals(p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Dictionary<int, int>> p1 = new Ice.Optional<Dictionary<int, int>>();
+                    Ice.Optional<Dictionary<int, int>> p3;
+                    Ice.Optional<Dictionary<int, int>> p2 = initial.opIntIntDict(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opIntIntDict(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opIntIntDict(null, out p3);
+                    test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
+
+                    p1 = new Dictionary<int, int>();
+                    p1.Value.Add(1, 2);
+                    p1.Value.Add(2, 3);
+                    p2 = initial.opIntIntDict(p1, out p3);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opIntIntDict(p1);
+                    p2 = initial.end_opIntIntDict(out p3, r);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+                    p2 = initial.opIntIntDict(p1.Value, out p3);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+                    r = initial.begin_opIntIntDict(p1.Value);
+                    p2 = initial.end_opIntIntDict(out p3, r);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opIntIntDict(new Ice.Optional<Dictionary<int, int>>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.VSize);
+                    os.writeSize(p1.Value.Count * 8 +(p1.Value.Count > 254 ? 5 : 1));
+                    Test.IntIntDictHelper.write(os, p1.Value);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opIntIntDict", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    Dictionary<int, int> m = Test.IntIntDictHelper.read(@in);
+                    test(MapsEqual(m, p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.VSize));
+                    @in.skipSize();
+                    m = Test.IntIntDictHelper.read(@in);
+                    test(MapsEqual(m, p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+
+                {
+                    Ice.Optional<Dictionary<string, int>> p1 = new Ice.Optional<Dictionary<string, int>>();
+                    Ice.Optional<Dictionary<string, int>> p3;
+                    Ice.Optional<Dictionary<string, int>> p2 = initial.opStringIntDict(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opStringIntDict(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opStringIntDict(null, out p3);
+                    test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
+
+                    p1 = new Dictionary<string, int>();
+                    p1.Value.Add("1", 1);
+                    p1.Value.Add("2", 2);
+                    p2 = initial.opStringIntDict(p1, out p3);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+                    Ice.AsyncResult r = initial.begin_opStringIntDict(p1);
+                    p2 = initial.end_opStringIntDict(out p3, r);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+                    p2 = initial.opStringIntDict(p1.Value, out p3);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+                    r = initial.begin_opStringIntDict(p1.Value);
+                    p2 = initial.end_opStringIntDict(out p3, r);
+                    test(MapsEqual(p2.Value, p1.Value) && MapsEqual(p3.Value, p1.Value));
+
+                    p2 = initial.opStringIntDict(new Ice.Optional<Dictionary<string, int>>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.FSize);
+                    int pos = os.startSize();
+                    Test.StringIntDictHelper.write(os, p1.Value);
+                    os.endSize(pos);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opStringIntDict", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    Dictionary<string, int> m = Test.StringIntDictHelper.read(@in);
+                    test(MapsEqual(m, p1.Value));
+                    test(@in.readOptional(3, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    m = Test.StringIntDictHelper.read(@in);
+                    test(MapsEqual(m, p1.Value));
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+
+                    Test.F f = new Test.F();
+                    f.af = new Test.A();
+                    f.af.Value.requiredA = 56;
+                    f.ae = f.af.Value;
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(1, Ice.OptionalFormat.Class);
+                    os.writeValue(f);
+                    os.writeOptional(2, Ice.OptionalFormat.Class);
+                    os.writeValue(f.ae);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+
+                    @in = new Ice.InputStream(communicator, inEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(2, Ice.OptionalFormat.Class));
+                    ReadValueCallbackI rocb = new ReadValueCallbackI();
+                    @in.readValue(rocb.invoke);
+                    @in.endEncapsulation();
+                    Test.A a =(Test.A)rocb.obj;
+                    test(a != null && a.requiredA == 56);
+                }
+
+                {
+                    Ice.Optional<Dictionary<int, Test.OneOptional>> p1 = new Ice.Optional<Dictionary<int, Test.OneOptional>>();
+                    Ice.Optional<Dictionary<int, Test.OneOptional>> p3;
+                    Ice.Optional<Dictionary<int, Test.OneOptional>> p2 = initial.opIntOneOptionalDict(p1, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opIntOneOptionalDict(Ice.Util.None, out p3);
+                    test(!p2.HasValue && !p3.HasValue);
+                    p2 = initial.opIntOneOptionalDict(null, out p3);
+                    test(p2.HasValue && p2.Value.Count == 0 && p3.HasValue && p3.Value.Count == 0);
+
+                    p1 = new Dictionary<int, Test.OneOptional>();
+                    p1.Value.Add(1, new Test.OneOptional(58));
+                    p1.Value.Add(2, new Test.OneOptional(59));
+                    p2 = initial.opIntOneOptionalDict(p1, out p3);
+                    test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
+                    Ice.AsyncResult r = initial.begin_opIntOneOptionalDict(p1);
+                    p2 = initial.end_opIntOneOptionalDict(out p3, r);
+                    test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
+                    p2 = initial.opIntOneOptionalDict(p1.Value, out p3);
+                    test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
+                    r = initial.begin_opIntOneOptionalDict(p1.Value);
+                    p2 = initial.end_opIntOneOptionalDict(out p3, r);
+                    test(p2.Value[1].a.Value == 58 && p3.Value[1].a.Value == 58);
+
+                    p2 = initial.opIntOneOptionalDict(new Ice.Optional<Dictionary<int, Test.OneOptional>>(), out p3);
+                    test(!p2.HasValue && !p3.HasValue); // Ensure out parameter is cleared.
+
+                    os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.writeOptional(2, Ice.OptionalFormat.FSize);
+                    int pos = os.startSize();
+                    Test.IntOneOptionalDictHelper.write(os, p1.Value);
+                    os.endSize(pos);
+                    os.endEncapsulation();
+                    inEncaps = os.finished();
+                    initial.ice_invoke("opIntOneOptionalDict", Ice.OperationMode.Normal, inEncaps, out outEncaps);
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    test(@in.readOptional(1, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    Dictionary<int, Test.OneOptional> m = Test.IntOneOptionalDictHelper.read(@in);
+                    test(m[1].a.Value == 58);
+                    test(@in.readOptional(3, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    m = Test.IntOneOptionalDictHelper.read(@in);
+                    test(m[1].a.Value == 58);
+                    @in.endEncapsulation();
+
+                    @in = new Ice.InputStream(communicator, outEncaps);
+                    @in.startEncapsulation();
+                    @in.endEncapsulation();
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing exception optionals... ");
+                output.Flush();
+                {
+                    try
+                    {
+                        Ice.Optional<int> a = new Ice.Optional<int>();
+                        Ice.Optional<string> b = new Ice.Optional<string>();
+                        Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>();
+                        initial.opOptionalException(a, b, o);
+                    }
+                    catch(Test.OptionalException ex)
+                    {
+                        test(!ex.a.HasValue);
+                        test(!ex.b.HasValue);
+                        test(!ex.o.HasValue);
+                    }
+
+                    try
+                    {
+                        Ice.Optional<int> a = new Ice.Optional<int>(30);
+                        Ice.Optional<string> b = new Ice.Optional<string>("test");
+                        Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
+                        initial.opOptionalException(a, b, o);
+                    }
+                    catch(Test.OptionalException ex)
+                    {
+                        test(ex.a.Value == 30);
+                        test(ex.b.Value.Equals("test"));
+                        test(ex.o.Value.a.Value == 53);
+                    }
+
+                    try
+                    {
+                        //
+                        // Use the 1.0 encoding with an exception whose only class members are optional.
+                        //
+                        Ice.Optional<int> a = new Ice.Optional<int>(30);
+                        Ice.Optional<string> b = new Ice.Optional<string>("test");
+                        Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
+                        initial2.opOptionalException(a, b, o);
+                    }
+                    catch(Test.OptionalException ex)
+                    {
+                        test(!ex.a.HasValue);
+                        test(!ex.b.HasValue);
+                        test(!ex.o.HasValue);
+                    }
+
+                    try
+                    {
+                        Ice.Optional<int> a = new Ice.Optional<int>();
+                        Ice.Optional<string> b = new Ice.Optional<string>();
+                        Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>();
+                        initial.opDerivedException(a, b, o);
+                    }
+                    catch(Test.DerivedException ex)
+                    {
+                        test(!ex.a.HasValue);
+                        test(!ex.b.HasValue);
+                        test(!ex.o.HasValue);
+                        test(!ex.ss.HasValue);
+                        test(!ex.o2.HasValue);
+                    }
+
+                    try
+                    {
+                        Ice.Optional<int> a = new Ice.Optional<int>(30);
+                        Ice.Optional<string> b = new Ice.Optional<string>("test2");
+                        Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
+                        initial.opDerivedException(a, b, o);
+                    }
+                    catch(Test.DerivedException ex)
+                    {
+                        test(ex.a.Value == 30);
+                        test(ex.b.Value.Equals("test2"));
+                        test(ex.o.Value.a.Value == 53);
+                        test(ex.ss.Value.Equals("test2"));
+                        test(ex.o2.Value.a.Value == 53);
+                    }
+
+                    try
+                    {
+                        Ice.Optional<int> a = new Ice.Optional<int>();
+                        Ice.Optional<string> b = new Ice.Optional<string>();
+                        Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>();
+                        initial.opRequiredException(a, b, o);
+                    }
+                    catch(Test.RequiredException ex)
+                    {
+                        test(!ex.a.HasValue);
+                        test(!ex.b.HasValue);
+                        test(!ex.o.HasValue);
+                        test(ex.ss.Equals("test"));
+                        test(ex.o2 == null);
+                    }
+
+                    try
+                    {
+                        Ice.Optional<int> a = new Ice.Optional<int>(30);
+                        Ice.Optional<string> b = new Ice.Optional<string>("test2");
+                        Ice.Optional<Test.OneOptional> o = new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53));
+                        initial.opRequiredException(a, b, o);
+                    }
+                    catch(Test.RequiredException ex)
+                    {
+                        test(ex.a.Value == 30);
+                        test(ex.b.Value.Equals("test2"));
+                        test(ex.o.Value.a.Value == 53);
+                        test(ex.ss.Equals("test2"));
+                        test(ex.o2.a.Value == 53);
+                    }
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing optionals with marshaled results... ");
+                output.Flush();
+                {
+                    test(initial.opMStruct1().HasValue);
+                    test(initial.opMDict1().HasValue);
+                    test(initial.opMSeq1().HasValue);
+                    test(initial.opMG1().HasValue);
+
+                    {
+                        Ice.Optional<Test.SmallStruct> p1, p2, p3;
+                        p3 = initial.opMStruct2(Ice.Util.None, out p2);
+                        test(!p2.HasValue && !p3.HasValue);
+
+                        p1 = new Test.SmallStruct();
+                        p3 = initial.opMStruct2(p1, out p2);
+                        test(p2.Value.Equals(p1.Value) && p3.Value.Equals(p1.Value));
+                    }
+                    {
+                        Ice.Optional<string[]> p1, p2, p3;
+                        p3 = initial.opMSeq2(Ice.Util.None, out p2);
+                        test(!p2.HasValue && !p3.HasValue);
+
+                        p1 = new string[1] { "hello" };
+                        p3 = initial.opMSeq2(p1, out p2);
+                        test(Ice.CollectionComparer.Equals(p2.Value, p1.Value) &&
+                             Ice.CollectionComparer.Equals(p3.Value, p1.Value));
+                    }
+                    {
+                        Ice.Optional<Dictionary<string, int>> p1, p2, p3;
+                        p3 = initial.opMDict2(Ice.Util.None, out p2);
+                        test(!p2.HasValue && !p3.HasValue);
+
+                        p1 = new Dictionary<string, int>();
+                        p1.Value["test"] = 54;
+                        p3 = initial.opMDict2(p1, out p2);
+                        test(Ice.CollectionComparer.Equals(p2.Value, p1.Value) &&
+                             Ice.CollectionComparer.Equals(p3.Value, p1.Value));
+                    }
+                    {
+                        Ice.Optional<Test.G> p1, p2, p3;
+                        p3 = initial.opMG2(Ice.Util.None, out p2);
+                        test(!p2.HasValue && !p3.HasValue);
+
+                        p1 = new Test.G();
+                        p3 = initial.opMG2(p1, out p2);
+                        test(p2.HasValue && p3.HasValue && p3.Value == p2.Value);
+                    }
+                }
+                output.WriteLine("ok");
+
+                return initial;
+            }
+
+            internal static bool ArraysEqual<T>(T[] a1, T[] a2)
+            {
+                if(ReferenceEquals(a1, a2))
+                {
+                    return true;
+                }
+
+                if(a1 == null || a2 == null)
+                {
+                    return false;
+                }
+
+                if(a1.Length != a2.Length)
+                {
+                    return false;
+                }
+
+                EqualityComparer<T> comparer = EqualityComparer<T>.Default;
+                for(int i = 0; i < a1.Length; ++i)
+                {
+                    if(!comparer.Equals(a1[i], a2[i]))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            internal static bool ListsEqual<T>(ICollection<T> a1, ICollection<T> a2)
+            {
+                if(ReferenceEquals(a1, a2))
+                {
+                    return true;
+                }
+
+                if(a1 == null || a2 == null)
+                {
+                    return false;
+                }
+
+                if(a1.Count != a2.Count)
+                {
+                    return false;
+                }
+
+                EqualityComparer<T> comparer = EqualityComparer<T>.Default;
+                IEnumerator<T> a1i = a1.GetEnumerator();
+                IEnumerator<T> a2i = a2.GetEnumerator();
+                while(a1i.MoveNext() && a2i.MoveNext())
+                {
+                    if(!comparer.Equals(a1i.Current, a2i.Current))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            internal static bool MapsEqual<K, V>(Dictionary<K, V> d1, Dictionary<K, V> d2)
+            {
+                if(ReferenceEquals(d1, d2))
+                {
+                    return true;
+                }
+
+                if(d1 == null || d2 == null)
+                {
+                    return false;
+                }
+
+                if(d1.Count != d2.Count)
+                {
+                    return false;
+                }
+
+                EqualityComparer<V> valueComparer = EqualityComparer<V>.Default;
+                foreach(K key in d1.Keys)
+                {
+                    if(!d2.ContainsKey(key) || !valueComparer.Equals(d1[key], d2[key]))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            internal static void Populate<T>(T[] arr, T value)
+            {
+                for(int i = 0; i < arr.Length; ++i)
+                {
+                    arr[i] = value;
+                }
+            }
+
+            private class TestValueReader : Ice.ValueReader
+            {
+                public override void read(Ice.InputStream @in)
+                {
+                    @in.startValue();
+                    @in.startSlice();
+                    @in.endSlice();
+                    @in.endValue(false);
+                }
+            }
+
+            private class BValueReader : Ice.ValueReader
+            {
+                public override void read(Ice.InputStream @in)
+                {
+                    @in.startValue();
+                    // ::Test::B
+                    @in.startSlice();
+                    @in.readInt();
+                    @in.endSlice();
+                    // ::Test::A
+                    @in.startSlice();
+                    @in.readInt();
+                    @in.endSlice();
+                    @in.endValue(false);
+                }
+            }
+
+            private class CValueReader : Ice.ValueReader
+            {
+                public override void read(Ice.InputStream @in)
+                {
+                    @in.startValue();
+                    // ::Test::C
+                    @in.startSlice();
+                    @in.skipSlice();
+                    // ::Test::B
+                    @in.startSlice();
+                    @in.readInt();
+                    @in.endSlice();
+                    // ::Test::A
+                    @in.startSlice();
+                    @in.readInt();
+                    @in.endSlice();
+                    @in.endValue(false);
+                }
+            }
+
+            private class DValueWriter : Ice.ValueWriter
+            {
+                public override void write(Ice.OutputStream @out)
+                {
+                    @out.startValue(null);
+                    // ::Test::D
+                    @out.startSlice("::Test::D", -1, false);
+                    string s = "test";
+                    @out.writeString(s);
+                    @out.writeOptional(1, Ice.OptionalFormat.FSize);
+                    string[] o = { "test1", "test2", "test3", "test4" };
+                    int pos = @out.startSize();
+                    @out.writeStringSeq(o);
+                    @out.endSize(pos);
+                    Test.A a = new Test.A();
+                    a.mc = 18;
+                    @out.writeOptional(1000, Ice.OptionalFormat.Class);
+                    @out.writeValue(a);
+                    @out.endSlice();
+                    // ::Test::B
+                    @out.startSlice(Test.B.ice_staticId(), -1, false);
+                    int v = 14;
+                    @out.writeInt(v);
+                    @out.endSlice();
+                    // ::Test::A
+                    @out.startSlice(Test.A.ice_staticId(), -1, true);
+                    @out.writeInt(v);
+                    @out.endSlice();
+                    @out.endValue();
+                }
+            }
+
+            private class DValueReader : Ice.ValueReader
+            {
+                public override void read(Ice.InputStream @in)
+                {
+                    @in.startValue();
+                    // ::Test::D
+                    @in.startSlice();
+                    string s = @in.readString();
+                    test(s.Equals("test"));
+                    test(@in.readOptional(1, Ice.OptionalFormat.FSize));
+                    @in.skip(4);
+                    string[] o = @in.readStringSeq();
+                    test(o.Length == 4 &&
+                         o[0].Equals("test1") && o[1].Equals("test2") && o[2].Equals("test3") && o[3].Equals("test4"));
+                    test(@in.readOptional(1000, Ice.OptionalFormat.Class));
+                    @in.readValue(a.invoke);
+                    @in.endSlice();
+                    // ::Test::B
+                    @in.startSlice();
+                    @in.readInt();
+                    @in.endSlice();
+                    // ::Test::A
+                    @in.startSlice();
+                    @in.readInt();
+                    @in.endSlice();
+                    @in.endValue(false);
+                }
+
+                internal void check()
+                {
+                    test(((Test.A)a.obj).mc.Value == 18);
+                }
+
+                private ReadValueCallbackI a = new ReadValueCallbackI();
+            }
+
+            private class FValueReader : Ice.ValueReader
+            {
+                public override void read(Ice.InputStream @in)
+                {
+                    _f = new Test.F();
+                    @in.startValue();
+                    @in.startSlice();
+                    // Don't read af on purpose
+                    //in.read(1, _f.af);
+                    @in.endSlice();
+                    @in.startSlice();
+                    ReadValueCallbackI rocb = new ReadValueCallbackI();
+                    @in.readValue(rocb.invoke);
+                    @in.endSlice();
+                    @in.endValue(false);
+                    _f.ae =(Test.A)rocb.obj;
+                }
+
+                public Test.F getF()
+                {
+                    return _f;
+                }
+
+                private Test.F _f;
+            }
+
+            private class FactoryI
+            {
+                public Ice.Value create(string typeId)
+                {
+                    if(!_enabled)
+                    {
+                        return null;
+                    }
+
+                    if(typeId.Equals(Test.OneOptional.ice_staticId()))
+                    {
+                        return new TestValueReader();
+                    }
+                    else if(typeId.Equals(Test.MultiOptional.ice_staticId()))
+                    {
+                        return new TestValueReader();
+                    }
+                    else if(typeId.Equals(Test.B.ice_staticId()))
+                    {
+                        return new BValueReader();
+                    }
+                    else if(typeId.Equals(Test.C.ice_staticId()))
+                    {
+                        return new CValueReader();
+                    }
+                    else if(typeId.Equals("::Test::D"))
+                    {
+                        return new DValueReader();
+                    }
+                    else if(typeId.Equals("::Test::F"))
+                    {
+                        return new FValueReader();
+                    }
+
+                    return null;
+                }
+
+                internal void setEnabled(bool enabled)
+                {
+                    _enabled = enabled;
+                }
+
+                private bool _enabled;
+            }
+
+            private class ReadValueCallbackI
+            {
+                public void invoke(Ice.Value obj)
+                {
+                    this.obj = obj;
+                }
 
-            if(typeId.Equals(Test.OneOptional.ice_staticId()))
-            {
-                return new TestValueReader();
-            }
-            else if(typeId.Equals(Test.MultiOptional.ice_staticId()))
-            {
-                return new TestValueReader();
-            }
-            else if(typeId.Equals(Test.B.ice_staticId()))
-            {
-                return new BValueReader();
-            }
-            else if(typeId.Equals(Test.C.ice_staticId()))
-            {
-                return new CValueReader();
-            }
-            else if(typeId.Equals("::Test::D"))
-            {
-                return new DValueReader();
-            }
-            else if(typeId.Equals("::Test::F"))
-            {
-                return new FValueReader();
+                internal Ice.Value obj;
             }
-
-            return null;
-        }
-
-        internal void setEnabled(bool enabled)
-        {
-            _enabled = enabled;
         }
-
-        private bool _enabled;
-    }
-
-    private class ReadValueCallbackI
-    {
-        public void invoke(Ice.Value obj)
-        {
-            this.obj = obj;
-        }
-
-        internal Ice.Value obj;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/AppManifest.xaml zeroc-ice-3.7.2/csharp/test/Ice/optional/AppManifest.xaml
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/AppManifest.xaml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/AppManifest.xaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" EntryPointAssembly="optional" EntryPointType="optional.App" RuntimeVersion="5.0.61118.0">
-  <Deployment.OutOfBrowserSettings>
-    <OutOfBrowserSettings ShortName="Optional Test" EnableGPUAcceleration="False" ShowInstallMenuItem="True">
-      <OutOfBrowserSettings.Blurb>Optional Test</OutOfBrowserSettings.Blurb>
-      <OutOfBrowserSettings.WindowSettings>
-        <WindowSettings Title="Optional Test" Height="1" Width="1" Top="0" Left="0" WindowStartupLocation="Manual" />
-      </OutOfBrowserSettings.WindowSettings>
-      <OutOfBrowserSettings.SecuritySettings>
-        <SecuritySettings ElevatedPermissions="Required" />
-      </OutOfBrowserSettings.SecuritySettings>
-      <OutOfBrowserSettings.Icons />
-    </OutOfBrowserSettings>
-  </Deployment.OutOfBrowserSettings>
-  <Deployment.Parts>
-    <AssemblyPart x:Name="optional" Source="optional.dll" />
-    <AssemblyPart x:Name="Ice" Source="Ice.dll" />
-    <AssemblyPart x:Name="TestCommon" Source="TestCommon.dll" />
-  </Deployment.Parts>
-</Deployment>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/optional/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        Test.InitialPrx initial = AllTests.allTests(this);
-
-        initial.shutdown();
-
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace optional
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.optional.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    var initial = AllTests.allTests(this);
+                    initial.shutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,14 +43,14 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\serializable\net45\serializable.csproj">
@@ -58,15 +58,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serializable/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serializable/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serializable/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serializable/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serializable/net45/serializable.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serializable/net45/serializable.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serializable/net45/serializable.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serializable/net45/serializable.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,17 +21,17 @@
     </NuGetPackageImportStamp>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\SerializableClass.cs">
@@ -39,17 +39,17 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serializable/netstandard2.0/serializable.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
   <Import Project="../../../../../../msbuild/ice.common.props"/>
   <PropertyGroup>
     <AssemblyName>serializable</AssemblyName>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -17,7 +17,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,11 +43,11 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
@@ -58,15 +58,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
     <IceBuilderCsharpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.props</IceBuilderCsharpProps>
     <IceBuilderCsharpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.CSharp.targets</IceBuilderCsharpTargets>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -19,26 +20,25 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\ServerAMD.cs">
       <Link>ServerAMD.cs</Link>
@@ -46,14 +46,14 @@
     <Compile Include="..\..\..\TestAMDI.cs">
       <Link>TestAMDI.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\serializable\net45\serializable.csproj">
@@ -61,15 +61,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestAMDI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.optional</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../SerializableClass.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../TestAMDI.cs" />
+
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/optionalTestPage.html zeroc-ice-3.7.2/csharp/test/Ice/optional/optionalTestPage.html
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/optionalTestPage.html	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/optionalTestPage.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<!-- saved from url=(0014)about:internet -->
-<head>
-    <title>optional</title>
-    <style type="text/css">
-    html, body {
-        height: 100%;
-        overflow: auto;
-    }
-    body {
-        padding: 0;
-        margin: 0;
-    }
-    #silverlightControlHost {
-        height: 100%;
-        text-align:center;
-    }
-    </style>
-
-    <script type="text/javascript">
-        function onSilverlightError(sender, args) {
-            var appSource = "";
-            if (sender != null && sender != 0) {
-              appSource = sender.getHost().Source;
-            }
-
-            var errorType = args.ErrorType;
-            var iErrorCode = args.ErrorCode;
-
-            if (errorType == "ImageError" || errorType == "MediaError") {
-              return;
-            }
-
-            var errMsg = "Unhandled Error in Silverlight Application " +  appSource + "\n" ;
-
-            errMsg += "Code: "+ iErrorCode + "    \n";
-            errMsg += "Category: " + errorType + "       \n";
-            errMsg += "Message: " + args.ErrorMessage + "     \n";
-
-            if (errorType == "ParserError") {
-                errMsg += "File: " + args.xamlFile + "     \n";
-                errMsg += "Line: " + args.lineNumber + "     \n";
-                errMsg += "Position: " + args.charPosition + "     \n";
-            }
-            else if (errorType == "RuntimeError") {
-                if (args.lineNumber != 0) {
-                    errMsg += "Line: " + args.lineNumber + "     \n";
-                    errMsg += "Position: " +  args.charPosition + "     \n";
-                }
-                errMsg += "MethodName: " + args.methodName + "     \n";
-            }
-
-            throw new Error(errMsg);
-        }
-    </script>
-</head>
-<body>
-    <form id="form1" runat="server" style="height:100%">
-    <div id="silverlightControlHost">
-        <object data="data:application/x-silverlight-2," type="application/x-silverlight-2" width="100%" height="100%">
-            <param name="source" value="optional.xap"/>
-            <param name="onError" value="onSilverlightError" />
-            <param name="background" value="white" />
-            <param name="minRuntimeVersion" value="5.0.61118.0" />
-            <param name="autoUpgrade" value="true" />
-            <a href="http://go.microsoft.com/fwlink/?LinkID=149156&v=5.0.61118.0" style="text-decoration:none">
-                <img src="http://go.microsoft.com/fwlink/?LinkId=161376" alt="Get Microsoft Silverlight" style="border-style:none"/>
-            </a>
-        </object><iframe id="_sl_historyFrame" style="visibility:hidden;height:0px;width:0px;border:0px"></iframe></div>
-    </form>
-</body>
-</html>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/SerializableClass.cs zeroc-ice-3.7.2/csharp/test/Ice/optional/SerializableClass.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/SerializableClass.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/SerializableClass.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,41 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-[assembly: CLSCompliant(true)]
-
-namespace Test
-{
-
-[Serializable]
-public class SerializableClass
+namespace Ice
 {
-    public SerializableClass(int v)
-    {
-        _v = v;
-    }
-
-    public override bool Equals(object obj)
+    namespace optional
     {
-        if(obj is SerializableClass)
+        namespace Test
         {
-            return _v == (obj as SerializableClass)._v;
-        }
+            [Serializable]
+            public class SerializableClass
+            {
+                public SerializableClass(int v)
+                {
+                    _v = v;
+                }
+
+                public override bool Equals(object obj)
+                {
+                    if(obj is SerializableClass)
+                    {
+                        return _v == (obj as SerializableClass)._v;
+                    }
+
+                    return false;
+                }
+
+                public override int GetHashCode()
+                {
+                    return base.GetHashCode();
+                }
 
-        return false;
-    }
+                private int _v;
+            }
 
-    public override int GetHashCode()
-    {
-        return base.GetHashCode();
+        }
     }
-
-    private int _v;
-}
-
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/optional/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/ServerAMD.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace optional
     {
-        Server app = new Server();
-        return app.runmain(args);
+        namespace AMD
+        {
+            public class Server : TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    var initData = new InitializationData();
+                    initData.typeIdNamespaces = new string[]{"Ice.optional.AMD.TypeId"};
+                    initData.properties = createTestProperties(ref args);
+                    using(var communicator = initialize(initData))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        var adapter = communicator.createObjectAdapter("TestAdapter");
+                        adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
+                        adapter.activate();
+                        serverReady();
+                        communicator.waitForShutdown();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return TestDriver.runTest<Server>(args);
+                }
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/optional/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace optional
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : global::Test.TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.optional.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/optional/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["suppress-warning:deprecated"]]
-
+[["cs:typeid-namespace:Ice.optional.AMD.TypeId", "suppress-warning:deprecated"]]
+["cs:namespace:Ice.optional.AMD"]
 module Test
 {
 
@@ -62,7 +57,7 @@
 sequence<OneOptional> OneOptionalSeq;
 sequence<OneOptional*> OneOptionalPrxSeq;
 
-["clr:serializable:Test.SerializableClass"]
+["clr:serializable:Ice.optional.Test.SerializableClass"]
 sequence<byte> Serializable;
 
 dictionary<int, int> IntIntDict;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/TestAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/optional/TestAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/TestAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/TestAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,359 +1,371 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Test;
 
-public class InitialI : Test.InitialDisp_
+namespace Ice
 {
-    public override Task shutdownAsync(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-        return null;
-    }
-
-    public override Task<Ice.Value>
-    pingPongAsync(Ice.Value obj, Ice.Current current)
+    namespace optional
     {
-        return Task.FromResult<Ice.Value>(obj);
-    }
-
-    public override Task
-    opOptionalExceptionAsync(Ice.Optional<int> a, Ice.Optional<string> b, Ice.Optional<OneOptional> o, Ice.Current c)
-    {
-        throw new OptionalException(false, a, b, o);
-    }
-
-    public override Task
-    opDerivedExceptionAsync(Ice.Optional<int> a, Ice.Optional<string> b, Ice.Optional<OneOptional> o, Ice.Current c)
-    {
-        throw new DerivedException(false, a, b, o, b, o);
-    }
-
-    public override Task
-    opRequiredExceptionAsync(Ice.Optional<int> a, Ice.Optional<string> b, Ice.Optional<OneOptional> o, Ice.Current c)
-    {
-        var e = new RequiredException();
-        e.a = a;
-        e.b = b;
-        e.o = o;
-        if(b.HasValue)
+        namespace AMD
         {
-            e.ss = b.Value;
+            public class InitialI : Test.InitialDisp_
+            {
+                public override Task shutdownAsync(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                    return null;
+                }
+
+                public override Task<Ice.Value>
+                pingPongAsync(Ice.Value obj, Ice.Current current)
+                {
+                    return Task.FromResult<Ice.Value>(obj);
+                }
+
+                public override Task
+                opOptionalExceptionAsync(Ice.Optional<int> a,
+                                         Ice.Optional<string> b,
+                                         Ice.Optional<Test.OneOptional> o,
+                                         Ice.Current c)
+                {
+                    throw new Test.OptionalException(false, a, b, o);
+                }
+
+                public override Task
+                opDerivedExceptionAsync(Ice.Optional<int> a,
+                                        Ice.Optional<string> b,
+                                        Ice.Optional<Test.OneOptional> o,
+                                        Ice.Current c)
+                {
+                    throw new Test.DerivedException(false, a, b, o, b, o);
+                }
+
+                public override Task
+                opRequiredExceptionAsync(Ice.Optional<int> a,
+                                         Ice.Optional<string> b,
+                                         Ice.Optional<Test.OneOptional> o,
+                                         Ice.Current c)
+                {
+                    var e = new Test.RequiredException();
+                    e.a = a;
+                    e.b = b;
+                    e.o = o;
+                    if(b.HasValue)
+                    {
+                        e.ss = b.Value;
+                    }
+                    if(o.HasValue)
+                    {
+                        e.o2 = o.Value;
+                    }
+                    throw e;
+                }
+
+                public override Task<Test.Initial_OpByteResult>
+                opByteAsync(Ice.Optional<byte> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpByteResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpBoolResult>
+                opBoolAsync(Ice.Optional<bool> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpBoolResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpShortResult>
+                opShortAsync(Ice.Optional<short> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpShortResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpIntResult>
+                opIntAsync(Ice.Optional<int> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpIntResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpLongResult>
+                opLongAsync(Ice.Optional<long> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpLongResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpFloatResult>
+                opFloatAsync(Ice.Optional<float> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpFloatResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpDoubleResult>
+                opDoubleAsync(Ice.Optional<double> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpDoubleResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpStringResult>
+                opStringAsync(Ice.Optional<string> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpStringResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpMyEnumResult>
+                opMyEnumAsync(Ice.Optional<Test.MyEnum> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpMyEnumResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpSmallStructResult>
+                opSmallStructAsync(Ice.Optional<Test.SmallStruct> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpSmallStructResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpFixedStructResult>
+                opFixedStructAsync(Ice.Optional<Test.FixedStruct> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpFixedStructResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpVarStructResult>
+                opVarStructAsync(Ice.Optional<Test.VarStruct> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpVarStructResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpOneOptionalResult>
+                opOneOptionalAsync(Ice.Optional<Test.OneOptional> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpOneOptionalResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpOneOptionalProxyResult>
+                opOneOptionalProxyAsync(Ice.Optional<Ice.ObjectPrx> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpOneOptionalProxyResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpByteSeqResult>
+                opByteSeqAsync(Ice.Optional<byte[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpByteSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpBoolSeqResult>
+                opBoolSeqAsync(Ice.Optional<bool[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpBoolSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpShortSeqResult>
+                opShortSeqAsync(Ice.Optional<short[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpShortSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpIntSeqResult>
+                opIntSeqAsync(Ice.Optional<int[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpIntSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpLongSeqResult>
+                opLongSeqAsync(Ice.Optional<long[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpLongSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpFloatSeqResult>
+                opFloatSeqAsync(Ice.Optional<float[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpFloatSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpDoubleSeqResult>
+                opDoubleSeqAsync(Ice.Optional<double[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpDoubleSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpStringSeqResult>
+                opStringSeqAsync(Ice.Optional<string[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpStringSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpSmallStructSeqResult>
+                opSmallStructSeqAsync(Ice.Optional<Test.SmallStruct[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpSmallStructSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpSmallStructListResult>
+                opSmallStructListAsync(Ice.Optional<List<Test.SmallStruct>> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpSmallStructListResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpFixedStructSeqResult>
+                opFixedStructSeqAsync(Ice.Optional<Test.FixedStruct[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpFixedStructSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpFixedStructListResult>
+                opFixedStructListAsync(Ice.Optional<LinkedList<Test.FixedStruct>> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpFixedStructListResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpVarStructSeqResult>
+                opVarStructSeqAsync(Ice.Optional<Test.VarStruct[]> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpVarStructSeqResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpSerializableResult>
+                opSerializableAsync(Ice.Optional<Ice.optional.Test.SerializableClass> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpSerializableResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpIntIntDictResult>
+                opIntIntDictAsync(Ice.Optional<Dictionary<int, int>> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpIntIntDictResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpStringIntDictResult>
+                opStringIntDictAsync(Ice.Optional<Dictionary<string, int>> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpStringIntDictResult(p1, p1));
+                }
+
+                public override Task<Test.Initial_OpIntOneOptionalDictResult>
+                opIntOneOptionalDictAsync(Ice.Optional<Dictionary<int, Test.OneOptional>> p1, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.Initial_OpIntOneOptionalDictResult(p1, p1));
+                }
+
+                public override Task
+                opClassAndUnknownOptionalAsync(Test.A p, Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task
+                sendOptionalClassAsync(bool req, Ice.Optional<Test.OneOptional> o, Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task<Ice.Optional<Test.OneOptional>>
+                returnOptionalClassAsync(bool req, Ice.Current current)
+                {
+                    return Task.FromResult(new Ice.Optional<Test.OneOptional>(new Test.OneOptional(53)));
+                }
+
+                public override Task<Test.G>
+                opGAsync(Test.G g, Ice.Current current)
+                {
+                    return Task.FromResult(g);
+                }
+
+                public override Task
+                opVoidAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public async override Task<Test.Initial_OpMStruct1MarshaledResult>
+                opMStruct1Async(Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMStruct1MarshaledResult(new Test.SmallStruct(), current);
+                }
+
+                public async override Task<Test.Initial_OpMStruct2MarshaledResult>
+                opMStruct2Async(Ice.Optional<Test.SmallStruct> p1, Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMStruct2MarshaledResult(p1, p1, current);
+                }
+
+                public async override Task<Test.Initial_OpMSeq1MarshaledResult>
+                opMSeq1Async(Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMSeq1MarshaledResult(new string[0], current);
+                }
+
+                public async override Task<Test.Initial_OpMSeq2MarshaledResult>
+                opMSeq2Async(Ice.Optional<string[]> p1, Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMSeq2MarshaledResult(p1, p1, current);
+                }
+
+                public async override Task<Test.Initial_OpMDict1MarshaledResult>
+                opMDict1Async(Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMDict1MarshaledResult(new Dictionary<string, int>(), current);
+                }
+
+                public async override Task<Test.Initial_OpMDict2MarshaledResult>
+                opMDict2Async(Ice.Optional<Dictionary<string, int>> p1, Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMDict2MarshaledResult(p1, p1, current);
+                }
+
+                public async override Task<Test.Initial_OpMG1MarshaledResult>
+                opMG1Async(Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMG1MarshaledResult(new Test.G(), current);
+                }
+
+                public async override Task<Test.Initial_OpMG2MarshaledResult>
+                opMG2Async(Ice.Optional<Test.G> p1, Ice.Current current)
+                {
+                    await Task.Delay(0);
+                    return new Test.Initial_OpMG2MarshaledResult(p1, p1, current);
+                }
+
+                public override Task<bool>
+                supportsRequiredParamsAsync(Ice.Current current)
+                {
+                    return Task.FromResult<bool>(false);
+                }
+
+                public override Task<bool>
+                supportsJavaSerializableAsync(Ice.Current current)
+                {
+                    return Task.FromResult<bool>(false);
+                }
+
+                public override Task<bool>
+                supportsCsharpSerializableAsync(Ice.Current current)
+                {
+                    return Task.FromResult<bool>(true);
+                }
+
+                public override Task<bool>
+                supportsCppStringViewAsync(Ice.Current current)
+                {
+                    return Task.FromResult<bool>(false);
+                }
+
+                public override Task<bool>
+                supportsNullOptionalAsync(Ice.Current current)
+                {
+                    return Task.FromResult<bool>(true);
+                }
+            }
         }
-        if(o.HasValue)
-        {
-            e.o2 = o.Value;
-        }
-        throw e;
-    }
-
-    public override Task<Initial_OpByteResult>
-    opByteAsync(Ice.Optional<byte> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpByteResult>(new Initial_OpByteResult(p1, p1));
-    }
-
-    public override Task<Initial_OpBoolResult>
-    opBoolAsync(Ice.Optional<bool> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpBoolResult>(new Initial_OpBoolResult(p1, p1));
-    }
-
-    public override Task<Initial_OpShortResult>
-    opShortAsync(Ice.Optional<short> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpShortResult>(new Initial_OpShortResult(p1, p1));
-    }
-
-    public override Task<Initial_OpIntResult>
-    opIntAsync(Ice.Optional<int> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpIntResult>(new Initial_OpIntResult(p1, p1));
-    }
-
-    public override Task<Initial_OpLongResult>
-    opLongAsync(Ice.Optional<long> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpLongResult>(new Initial_OpLongResult(p1, p1));
-    }
-
-    public override Task<Initial_OpFloatResult>
-    opFloatAsync(Ice.Optional<float> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpFloatResult>(new Initial_OpFloatResult(p1, p1));
-    }
-
-    public override Task<Initial_OpDoubleResult>
-    opDoubleAsync(Ice.Optional<double> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpDoubleResult>(new Initial_OpDoubleResult(p1, p1));
-    }
-
-    public override Task<Initial_OpStringResult>
-    opStringAsync(Ice.Optional<string> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpStringResult>(new Initial_OpStringResult(p1, p1));
-    }
-
-    public override Task<Initial_OpMyEnumResult>
-    opMyEnumAsync(Ice.Optional<MyEnum> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpMyEnumResult>(new Initial_OpMyEnumResult(p1, p1));
-    }
-
-    public override Task<Initial_OpSmallStructResult>
-    opSmallStructAsync(Ice.Optional<SmallStruct> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpSmallStructResult>(new Initial_OpSmallStructResult(p1, p1));
-    }
-
-    public override Task<Initial_OpFixedStructResult>
-    opFixedStructAsync(Ice.Optional<FixedStruct> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpFixedStructResult>(new Initial_OpFixedStructResult(p1, p1));
-    }
-
-    public override Task<Initial_OpVarStructResult>
-    opVarStructAsync(Ice.Optional<VarStruct> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpVarStructResult>(new Initial_OpVarStructResult(p1, p1));
-    }
-
-    public override Task<Initial_OpOneOptionalResult>
-    opOneOptionalAsync(Ice.Optional<OneOptional> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpOneOptionalResult>(new Initial_OpOneOptionalResult(p1, p1));
-    }
-
-    public override Task<Initial_OpOneOptionalProxyResult>
-    opOneOptionalProxyAsync(Ice.Optional<Ice.ObjectPrx> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpOneOptionalProxyResult>(new Initial_OpOneOptionalProxyResult(p1, p1));
-    }
-
-    public override Task<Initial_OpByteSeqResult>
-    opByteSeqAsync(Ice.Optional<byte[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpByteSeqResult>(new Initial_OpByteSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpBoolSeqResult>
-    opBoolSeqAsync(Ice.Optional<bool[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpBoolSeqResult>(new Initial_OpBoolSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpShortSeqResult>
-    opShortSeqAsync(Ice.Optional<short[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpShortSeqResult>(new Initial_OpShortSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpIntSeqResult>
-    opIntSeqAsync(Ice.Optional<int[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpIntSeqResult>(new Initial_OpIntSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpLongSeqResult>
-    opLongSeqAsync(Ice.Optional<long[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpLongSeqResult>(new Initial_OpLongSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpFloatSeqResult>
-    opFloatSeqAsync(Ice.Optional<float[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpFloatSeqResult>(new Initial_OpFloatSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpDoubleSeqResult>
-    opDoubleSeqAsync(Ice.Optional<double[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpDoubleSeqResult>(new Initial_OpDoubleSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpStringSeqResult>
-    opStringSeqAsync(Ice.Optional<string[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpStringSeqResult>(new Initial_OpStringSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpSmallStructSeqResult>
-    opSmallStructSeqAsync(Ice.Optional<SmallStruct[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpSmallStructSeqResult>(new Initial_OpSmallStructSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpSmallStructListResult>
-    opSmallStructListAsync(Ice.Optional<List<SmallStruct>> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpSmallStructListResult>(new Initial_OpSmallStructListResult(p1, p1));
-    }
-
-    public override Task<Initial_OpFixedStructSeqResult>
-    opFixedStructSeqAsync(Ice.Optional<FixedStruct[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpFixedStructSeqResult>(new Initial_OpFixedStructSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpFixedStructListResult>
-    opFixedStructListAsync(Ice.Optional<LinkedList<FixedStruct>> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpFixedStructListResult>(new Initial_OpFixedStructListResult(p1, p1));
-    }
-
-    public override Task<Initial_OpVarStructSeqResult>
-    opVarStructSeqAsync(Ice.Optional<VarStruct[]> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpVarStructSeqResult>(new Initial_OpVarStructSeqResult(p1, p1));
-    }
-
-    public override Task<Initial_OpSerializableResult>
-    opSerializableAsync(Ice.Optional<SerializableClass> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpSerializableResult>(new Initial_OpSerializableResult(p1, p1));
-    }
-
-    public override Task<Initial_OpIntIntDictResult>
-    opIntIntDictAsync(Ice.Optional<Dictionary<int, int>> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpIntIntDictResult>(new Initial_OpIntIntDictResult(p1, p1));
-    }
-
-    public override Task<Initial_OpStringIntDictResult>
-    opStringIntDictAsync(Ice.Optional<Dictionary<string, int>> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpStringIntDictResult>(new Initial_OpStringIntDictResult(p1, p1));
-    }
-
-    public override Task<Initial_OpIntOneOptionalDictResult>
-    opIntOneOptionalDictAsync(Ice.Optional<Dictionary<int, OneOptional>> p1, Ice.Current current)
-    {
-        return Task.FromResult<Initial_OpIntOneOptionalDictResult>(new Initial_OpIntOneOptionalDictResult(p1, p1));
-    }
-
-    public override Task
-    opClassAndUnknownOptionalAsync(A p, Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task
-    sendOptionalClassAsync(bool req, Ice.Optional<OneOptional> o, Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task<Ice.Optional<OneOptional>>
-    returnOptionalClassAsync(bool req, Ice.Current current)
-    {
-        return Task.FromResult<Ice.Optional<OneOptional>>(new Ice.Optional<OneOptional>(new OneOptional(53)));
-    }
-
-    public override Task<G>
-    opGAsync(G g, Ice.Current current)
-    {
-        return Task.FromResult<G>(g);
-    }
-
-    public override Task
-    opVoidAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public async override Task<Test.Initial_OpMStruct1MarshaledResult>
-    opMStruct1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMStruct1MarshaledResult(new Test.SmallStruct(), current);
-    }
-
-    public async override Task<Test.Initial_OpMStruct2MarshaledResult>
-    opMStruct2Async(Ice.Optional<Test.SmallStruct> p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMStruct2MarshaledResult(p1, p1, current);
-    }
-
-    public async override Task<Test.Initial_OpMSeq1MarshaledResult>
-    opMSeq1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMSeq1MarshaledResult(new string[0], current);
-    }
-
-    public async override Task<Test.Initial_OpMSeq2MarshaledResult>
-    opMSeq2Async(Ice.Optional<string[]> p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMSeq2MarshaledResult(p1, p1, current);
-    }
-
-    public async override Task<Test.Initial_OpMDict1MarshaledResult>
-    opMDict1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMDict1MarshaledResult(new Dictionary<string, int>(), current);
-    }
-
-    public async override Task<Test.Initial_OpMDict2MarshaledResult>
-    opMDict2Async(Ice.Optional<Dictionary<string, int>> p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMDict2MarshaledResult(p1, p1, current);
-    }
-
-    public async override Task<Test.Initial_OpMG1MarshaledResult>
-    opMG1Async(Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMG1MarshaledResult(new Test.G(), current);
-    }
-
-    public async override Task<Test.Initial_OpMG2MarshaledResult>
-    opMG2Async(Ice.Optional<Test.G> p1, Ice.Current current)
-    {
-        await Task.Delay(0);
-        return new Test.Initial_OpMG2MarshaledResult(p1, p1, current);
-    }
-
-    public override Task<bool>
-    supportsRequiredParamsAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(false);
-    }
-
-    public override Task<bool>
-    supportsJavaSerializableAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(false);
-    }
-
-    public override Task<bool>
-    supportsCsharpSerializableAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(true);
-    }
-
-    public override Task<bool>
-    supportsCppStringViewAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(false);
-    }
-
-    public override Task<bool>
-    supportsNullOptionalAsync(Ice.Current current)
-    {
-        return Task.FromResult<bool>(true);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["suppress-warning:deprecated"]]
-
+[["cs:typeid-namespace:Ice.optional.TypeId", "suppress-warning:deprecated"]]
+["cs:namespace:Ice.optional"]
 module Test
 {
 
@@ -62,7 +57,7 @@
 sequence<OneOptional> OneOptionalSeq;
 sequence<OneOptional*> OneOptionalPrxSeq;
 
-["clr:serializable:Test.SerializableClass"]
+["clr:serializable:Ice.optional.Test.SerializableClass"]
 sequence<byte> Serializable;
 
 dictionary<int, int> IntIntDict;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/optional/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/optional/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/optional/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/optional/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,375 +1,418 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public class InitialI : Test.InitialDisp_
+namespace Ice
 {
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    public override Ice.Value pingPong(Ice.Value obj, Ice.Current current)
-    {
-        return obj;
-    }
-
-    public override void opOptionalException(Ice.Optional<int> a, Ice.Optional<string> b,
-                                             Ice.Optional<Test.OneOptional> o, Ice.Current current)
-    {
-        throw new Test.OptionalException(false, a, b, o);
-    }
-
-    public override void opDerivedException(Ice.Optional<int> a, Ice.Optional<string> b,
-                                            Ice.Optional<Test.OneOptional> o, Ice.Current current)
-    {
-        throw new Test.DerivedException(false, a, b, o, b, o);
-    }
-
-    public override void opRequiredException(Ice.Optional<int> a, Ice.Optional<string> b,
-                                             Ice.Optional<Test.OneOptional> o, Ice.Current current)
+    namespace optional
     {
-        Test.RequiredException e = new Test.RequiredException();
-        e.a = a;
-        e.b = b;
-        e.o = o;
-        if(b.HasValue)
-        {
-            e.ss = b.Value;
-        }
-        if(o.HasValue)
+        public class InitialI : Test.InitialDisp_
         {
-            e.o2 = o.Value;
-        }
-        throw e;
-    }
-
-    public override Ice.Optional<byte> opByte(Ice.Optional<byte> p1, out Ice.Optional<byte> p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<bool> opBool(Ice.Optional<bool> p1, out Ice.Optional<bool> p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<short> opShort(Ice.Optional<short> p1, out Ice.Optional<short> p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<int> opInt(Ice.Optional<int> p1, out Ice.Optional<int> p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<long> opLong(Ice.Optional<long> p1, out Ice.Optional<long> p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<float> opFloat(Ice.Optional<float> p1, out Ice.Optional<float> p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<double> opDouble(Ice.Optional<double> p1, out Ice.Optional<double> p3,
-                                                  Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<string> opString(Ice.Optional<string> p1, out Ice.Optional<string> p3,
-                                                  Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.MyEnum> opMyEnum(Ice.Optional<Test.MyEnum> p1, out Ice.Optional<Test.MyEnum> p3,
-                                                       Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.SmallStruct> opSmallStruct(Ice.Optional<Test.SmallStruct> p1,
-                                                                 out Ice.Optional<Test.SmallStruct> p3,
-                                                                 Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.FixedStruct> opFixedStruct(Ice.Optional<Test.FixedStruct> p1,
-                                                                 out Ice.Optional<Test.FixedStruct> p3,
-                                                                 Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.VarStruct> opVarStruct(Ice.Optional<Test.VarStruct> p1,
-                                                             out Ice.Optional<Test.VarStruct> p3,
-                                                             Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.OneOptional> opOneOptional(Ice.Optional<Test.OneOptional> p1,
-                                                                 out Ice.Optional<Test.OneOptional> p3,
-                                                                 Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Ice.ObjectPrx>
-    opOneOptionalProxy(Ice.Optional<Ice.ObjectPrx> p1, out Ice.Optional<Ice.ObjectPrx> p3, Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<byte[]> opByteSeq(Ice.Optional<byte[]> p1, out Ice.Optional<byte[]> p3,
-                                                   Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<bool[]> opBoolSeq(Ice.Optional<bool[]> p1, out Ice.Optional<bool[]> p3,
-                                                   Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<short[]> opShortSeq(Ice.Optional<short[]> p1, out Ice.Optional<short[]> p3,
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            public override Ice.Value pingPong(Ice.Value obj, Ice.Current current)
+            {
+                return obj;
+            }
+
+            public override void opOptionalException(Ice.Optional<int> a,
+                                                     Ice.Optional<string> b,
+                                                     Ice.Optional<Test.OneOptional> o,
                                                      Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<int[]> opIntSeq(Ice.Optional<int[]> p1, out Ice.Optional<int[]> p3,
-                                                 Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<long[]> opLongSeq(Ice.Optional<long[]> p1, out Ice.Optional<long[]> p3,
-                                                   Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<float[]> opFloatSeq(Ice.Optional<float[]> p1, out Ice.Optional<float[]> p3,
+            {
+                throw new Test.OptionalException(false, a, b, o);
+            }
+
+            public override void opDerivedException(Ice.Optional<int> a,
+                                                    Ice.Optional<string> b,
+                                                    Ice.Optional<Test.OneOptional> o,
+                                                    Ice.Current current)
+            {
+                throw new Test.DerivedException(false, a, b, o, b, o);
+            }
+
+            public override void opRequiredException(Ice.Optional<int> a,
+                                                     Ice.Optional<string> b,
+                                                     Ice.Optional<Test.OneOptional> o,
                                                      Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
+            {
+                Test.RequiredException e = new Test.RequiredException();
+                e.a = a;
+                e.b = b;
+                e.o = o;
+                if(b.HasValue)
+                {
+                    e.ss = b.Value;
+                }
+                if(o.HasValue)
+                {
+                    e.o2 = o.Value;
+                }
+                throw e;
+            }
+
+            public override Ice.Optional<byte> opByte(Ice.Optional<byte> p1,
+                                                              out Ice.Optional<byte> p3,
+                                                              Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<bool> opBool(Ice.Optional<bool> p1,
+                                                              out Ice.Optional<bool> p3,
+                                                              Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<short> opShort(Ice.Optional<short> p1,
+                                                                out Ice.Optional<short> p3,
+                                                                Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<int> opInt(Ice.Optional<int> p1,
+                                                            out Ice.Optional<int> p3,
+                                                            Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<long> opLong(Ice.Optional<long> p1,
+                                                              out Ice.Optional<long> p3,
+                                                              Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<float> opFloat(Ice.Optional<float> p1,
+                                                                out Ice.Optional<float> p3,
+                                                                Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
 
-    public override Ice.Optional<double[]> opDoubleSeq(Ice.Optional<double[]> p1, out Ice.Optional<double[]> p3,
-                                                       Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<String[]> opStringSeq(Ice.Optional<String[]> p1, out Ice.Optional<String[]> p3,
-                                                       Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.SmallStruct[]> opSmallStructSeq(Ice.Optional<Test.SmallStruct[]> p1,
-                                                                      out Ice.Optional<Test.SmallStruct[]> p3,
-                                                                      Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<List<Test.SmallStruct>> opSmallStructList(Ice.Optional<List<Test.SmallStruct>> p1,
-                                                                           out Ice.Optional<List<Test.SmallStruct>> p3,
-                                                                           Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.FixedStruct[]> opFixedStructSeq(Ice.Optional<Test.FixedStruct[]> p1,
-                                                                      out Ice.Optional<Test.FixedStruct[]> p3,
-                                                                      Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<LinkedList<Test.FixedStruct>> opFixedStructList(
-        Ice.Optional<LinkedList<Test.FixedStruct>> p1,
-        out Ice.Optional<LinkedList<Test.FixedStruct>> p3,
-        Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.VarStruct[]> opVarStructSeq(Ice.Optional<Test.VarStruct[]> p1,
-                                                                  out Ice.Optional<Test.VarStruct[]> p3,
+            public override Ice.Optional<double> opDouble(Ice.Optional<double> p1,
+                                                                  out Ice.Optional<double> p3,
                                                                   Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Test.SerializableClass> opSerializable(Ice.Optional<Test.SerializableClass> p1,
-                                                                        out Ice.Optional<Test.SerializableClass> p3,
-                                                                        Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Dictionary<int, int>> opIntIntDict(Ice.Optional<Dictionary<int, int>> p1,
-                                                                    out Ice.Optional<Dictionary<int, int>> p3,
-                                                                    Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Dictionary<string, int>> opStringIntDict(Ice.Optional<Dictionary<string, int>> p1,
-                                                                          out Ice.Optional<Dictionary<string, int>> p3,
-                                                                          Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override Ice.Optional<Dictionary<int, Test.OneOptional>> opIntOneOptionalDict(
-        Ice.Optional<Dictionary<int, Test.OneOptional>> p1,
-        out Ice.Optional<Dictionary<int, Test.OneOptional>> p3,
-        Ice.Current current)
-    {
-        p3 = p1;
-        return p1;
-    }
-
-    public override void opClassAndUnknownOptional(Test.A p, Ice.Current current)
-    {
-    }
-
-    public override void sendOptionalClass(bool req, Ice.Optional<Test.OneOptional> o, Ice.Current current)
-    {
-    }
-
-    public override void returnOptionalClass(bool req, out Ice.Optional<Test.OneOptional> o, Ice.Current current)
-    {
-        o = new Test.OneOptional(53);
-    }
-
-    public override Test.G opG(Test.G g, Ice.Current current)
-    {
-        return g;
-    }
+            {
+                p3 = p1;
+                return p1;
+            }
 
-    public override void opVoid(Ice.Current current)
-    {
-    }
-
-    public override Test.Initial_OpMStruct1MarshaledResult
-    opMStruct1(Ice.Current current)
-    {
-        return new Test.Initial_OpMStruct1MarshaledResult(new Test.SmallStruct(), current);
-    }
-
-    public override Test.Initial_OpMStruct2MarshaledResult
-    opMStruct2(Ice.Optional<Test.SmallStruct> p1, Ice.Current current)
-    {
-        return new Test.Initial_OpMStruct2MarshaledResult(p1, p1, current);
-    }
-
-    public override Test.Initial_OpMSeq1MarshaledResult
-    opMSeq1(Ice.Current current)
-    {
-        return new Test.Initial_OpMSeq1MarshaledResult(new string[0], current);
-    }
-
-    public override Test.Initial_OpMSeq2MarshaledResult
-    opMSeq2(Ice.Optional<string[]> p1, Ice.Current current)
-    {
-        return new Test.Initial_OpMSeq2MarshaledResult(p1, p1, current);
-    }
-
-    public override Test.Initial_OpMDict1MarshaledResult
-    opMDict1(Ice.Current current)
-    {
-        return new Test.Initial_OpMDict1MarshaledResult(new Dictionary<string, int>(), current);
-    }
-
-    public override Test.Initial_OpMDict2MarshaledResult
-    opMDict2(Ice.Optional<Dictionary<string, int>> p1, Ice.Current current)
-    {
-        return new Test.Initial_OpMDict2MarshaledResult(p1, p1, current);
-    }
-
-    public override Test.Initial_OpMG1MarshaledResult
-    opMG1(Ice.Current current)
-    {
-        return new Test.Initial_OpMG1MarshaledResult(new Test.G(), current);
-    }
-
-    public override Test.Initial_OpMG2MarshaledResult
-    opMG2(Ice.Optional<Test.G> p1, Ice.Current current)
-    {
-        return new Test.Initial_OpMG2MarshaledResult(p1, p1, current);
-    }
-
-    public override bool supportsRequiredParams(Ice.Current current)
-    {
-        return false;
-    }
-
-    public override bool supportsJavaSerializable(Ice.Current current)
-    {
-        return false;
-    }
+            public override Ice.Optional<string> opString(Ice.Optional<string> p1,
+                                                                  out Ice.Optional<string> p3,
+                                                                  Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.MyEnum> opMyEnum(Ice.Optional<Test.MyEnum> p1,
+                                                                       out Ice.Optional<Test.MyEnum> p3,
+                                                                       Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.SmallStruct> opSmallStruct(Ice.Optional<Test.SmallStruct> p1,
+                                                                                 out Ice.Optional<Test.SmallStruct> p3,
+                                                                                 Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.FixedStruct> opFixedStruct(Ice.Optional<Test.FixedStruct> p1,
+                                                                                 out Ice.Optional<Test.FixedStruct> p3,
+                                                                                 Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.VarStruct> opVarStruct(Ice.Optional<Test.VarStruct> p1,
+                                                                             out Ice.Optional<Test.VarStruct> p3,
+                                                                             Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.OneOptional> opOneOptional(Ice.Optional<Test.OneOptional> p1,
+                                                                                 out Ice.Optional<Test.OneOptional> p3,
+                                                                                 Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Ice.ObjectPrx>
+            opOneOptionalProxy(Ice.Optional<Ice.ObjectPrx> p1,
+                               out Ice.Optional<Ice.ObjectPrx> p3,
+                               Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<byte[]> opByteSeq(Ice.Optional<byte[]> p1,
+                                                                   out Ice.Optional<byte[]> p3,
+                                                                   Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<bool[]> opBoolSeq(Ice.Optional<bool[]> p1,
+                                                                   out Ice.Optional<bool[]> p3,
+                                                                   Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<short[]> opShortSeq(Ice.Optional<short[]> p1,
+                                                                     out Ice.Optional<short[]> p3,
+                                                                     Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
 
-    public override bool supportsCsharpSerializable(Ice.Current current)
-    {
-        return true;
-    }
+            public override Ice.Optional<int[]> opIntSeq(Ice.Optional<int[]> p1,
+                                                                 out Ice.Optional<int[]> p3,
+                                                                 Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<long[]> opLongSeq(Ice.Optional<long[]> p1,
+                                                                   out Ice.Optional<long[]> p3,
+                                                                   Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<float[]> opFloatSeq(Ice.Optional<float[]> p1,
+                                                                     out Ice.Optional<float[]> p3,
+                                                                     Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<double[]> opDoubleSeq(Ice.Optional<double[]> p1,
+                                                                       out Ice.Optional<double[]> p3,
+                                                                       Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<String[]> opStringSeq(Ice.Optional<String[]> p1,
+                                                                       out Ice.Optional<String[]> p3,
+                                                                       Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.SmallStruct[]>
+            opSmallStructSeq(Ice.Optional<Test.SmallStruct[]> p1,
+                             out Ice.Optional<Test.SmallStruct[]> p3,
+                             Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<List<Test.SmallStruct>>
+            opSmallStructList(Ice.Optional<List<Test.SmallStruct>> p1,
+                              out Ice.Optional<List<Test.SmallStruct>> p3,
+                              Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.FixedStruct[]>
+            opFixedStructSeq(Ice.Optional<Test.FixedStruct[]> p1,
+                             out Ice.Optional<Test.FixedStruct[]> p3,
+                             Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<LinkedList<Test.FixedStruct>>
+            opFixedStructList(Ice.Optional<LinkedList<Test.FixedStruct>> p1,
+                              out Ice.Optional<LinkedList<Test.FixedStruct>> p3,
+                              Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.VarStruct[]>
+            opVarStructSeq(Ice.Optional<Test.VarStruct[]> p1,
+                           out Ice.Optional<Test.VarStruct[]> p3,
+                           Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Test.SerializableClass>
+            opSerializable(Ice.Optional<Test.SerializableClass> p1,
+                           out Ice.Optional<Test.SerializableClass> p3,
+                           Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Dictionary<int, int>>
+            opIntIntDict(Ice.Optional<Dictionary<int, int>> p1,
+                         out Ice.Optional<Dictionary<int, int>> p3,
+                         Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Dictionary<string, int>>
+            opStringIntDict(Ice.Optional<Dictionary<string, int>> p1,
+                            out Ice.Optional<Dictionary<string, int>> p3,
+                            Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override Ice.Optional<Dictionary<int, Test.OneOptional>>
+            opIntOneOptionalDict(Ice.Optional<Dictionary<int, Test.OneOptional>> p1,
+                                 out Ice.Optional<Dictionary<int, Test.OneOptional>> p3,
+                                 Ice.Current current)
+            {
+                p3 = p1;
+                return p1;
+            }
+
+            public override void opClassAndUnknownOptional(Test.A p, Ice.Current current)
+            {
+            }
 
-    public override bool supportsCppStringView(Ice.Current current)
-    {
-        return false;
-    }
+            public override void sendOptionalClass(bool req,
+                                                   Ice.Optional<Test.OneOptional> o,
+                                                   Ice.Current current)
+            {
+            }
 
-    public override bool supportsNullOptional(Ice.Current current)
-    {
-        return true;
+            public override void returnOptionalClass(bool req,
+                                                     out Ice.Optional<Test.OneOptional> o,
+                                                     Ice.Current current)
+            {
+                o = new Test.OneOptional(53);
+            }
+
+            public override Test.G opG(Test.G g, Ice.Current current)
+            {
+                return g;
+            }
+
+            public override void opVoid(Ice.Current current)
+            {
+            }
+
+            public override Test.Initial_OpMStruct1MarshaledResult
+            opMStruct1(Ice.Current current)
+            {
+                return new Test.Initial_OpMStruct1MarshaledResult(new Test.SmallStruct(), current);
+            }
+
+            public override Test.Initial_OpMStruct2MarshaledResult
+            opMStruct2(Ice.Optional<Test.SmallStruct> p1, Ice.Current current)
+            {
+                return new Test.Initial_OpMStruct2MarshaledResult(p1, p1, current);
+            }
+
+            public override Test.Initial_OpMSeq1MarshaledResult
+            opMSeq1(Ice.Current current)
+            {
+                return new Test.Initial_OpMSeq1MarshaledResult(new string[0], current);
+            }
+
+            public override Test.Initial_OpMSeq2MarshaledResult
+            opMSeq2(Ice.Optional<string[]> p1, Ice.Current current)
+            {
+                return new Test.Initial_OpMSeq2MarshaledResult(p1, p1, current);
+            }
+
+            public override Test.Initial_OpMDict1MarshaledResult
+            opMDict1(Ice.Current current)
+            {
+                return new Test.Initial_OpMDict1MarshaledResult(new Dictionary<string, int>(), current);
+            }
+
+            public override Test.Initial_OpMDict2MarshaledResult
+            opMDict2(Ice.Optional<Dictionary<string, int>> p1, Ice.Current current)
+            {
+                return new Test.Initial_OpMDict2MarshaledResult(p1, p1, current);
+            }
+
+            public override Test.Initial_OpMG1MarshaledResult
+            opMG1(Ice.Current current)
+            {
+                return new Test.Initial_OpMG1MarshaledResult(new Test.G(), current);
+            }
+
+            public override Test.Initial_OpMG2MarshaledResult
+            opMG2(Ice.Optional<Test.G> p1, Ice.Current current)
+            {
+                return new Test.Initial_OpMG2MarshaledResult(p1, p1, current);
+            }
+
+            public override bool supportsRequiredParams(Ice.Current current)
+            {
+                return false;
+            }
+
+            public override bool supportsJavaSerializable(Ice.Current current)
+            {
+                return false;
+            }
+
+            public override bool supportsCsharpSerializable(Ice.Current current)
+            {
+                return true;
+            }
+
+            public override bool supportsCppStringView(Ice.Current current)
+            {
+                return false;
+            }
+
+            public override bool supportsNullOptional(Ice.Current current)
+            {
+                return true;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/BasePlugin.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/BasePlugin.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/BasePlugin.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/BasePlugin.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public abstract class BasePlugin : Ice.Plugin
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/BasePluginFail.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/BasePluginFail.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/BasePluginFail.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/BasePluginFail.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public abstract class BasePluginFail : Ice.Plugin
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.IO;
@@ -17,17 +12,14 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : Test.TestHelper
 {
-    private static void test(bool b)
+    public static int Main(string[] args)
     {
-        if(!b)
-        {
-            throw new Exception();
-        }
+        return Test.TestDriver.runTest<Client>(args);
     }
 
-    public static int Main(string[] args)
+    public override void run(string[] args)
     {
 #if NET45
         string pluginPath = "msbuild/plugin/net45/Plugin.dll";
@@ -36,125 +28,99 @@
             String.Format("msbuild/plugin/netstandard2.0/{0}/Plugin.dll",
                           Path.GetFileName(Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase)));
 #endif
-        Ice.Communicator communicator = null;
-        Console.Write("testing a simple plug-in... ");
-        Console.Out.Flush();
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.Test",
-                                            pluginPath + ":PluginFactory 'C:\\Program Files\\' --DatabasePath " +
-                                            "'C:\\Program Files\\Application\\db'");
-            communicator = Ice.Util.initialize(ref args, initData);
-            communicator.destroy();
-        }
-        catch(Ice.LocalException ex)
         {
-            Console.WriteLine(ex.ToString());;
-            test(false);
-        }
-        Console.WriteLine("ok");
+            Console.Write("testing a simple plug-in... ");
+            Console.Out.Flush();
+            Ice.Properties properties = Ice.Util.createProperties();
+            properties.setProperty("Ice.Plugin.Test",
+                pluginPath + ":PluginFactory 'C:\\Program Files\\' --DatabasePath " +
+                "'C:\\Program Files\\Application\\db'");
+            using(var communicator = initialize(properties))
+            {
+            }
+            Console.WriteLine("ok");
+        }
+
+        {
+            Console.Write("testing a simple plug-in that fails to initialize... ");
+            Console.Out.Flush();
+            try
+            {
+                Ice.Properties properties = Ice.Util.createProperties();
+                properties.setProperty("Ice.Plugin.Test", pluginPath + ":PluginInitializeFailFactory");
+                initialize(properties);
+                test(false);
+            }
+            catch(Ice.PluginInitializationException ex)
+            {
+                test(ex.InnerException.Message.Equals("PluginInitializeFailException"));
+            }
+            Console.WriteLine("ok");
+        }
+
+        {
+            Console.Write("testing plug-in load order... ");
+            Console.Out.Flush();
+            Ice.Properties properties = Ice.Util.createProperties();
+            properties.setProperty("Ice.Plugin.PluginOne", pluginPath + ":PluginOneFactory");
+            properties.setProperty("Ice.Plugin.PluginTwo", pluginPath + ":PluginTwoFactory");
+            properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
+            properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
+            using(var communicator = initialize(properties))
+            {
+            }
+            Console.WriteLine("ok");
+        }
+
+        {
+            Console.Write("testing plug-in manager... ");
+            Console.Out.Flush();
+
+            Ice.Properties properties = Ice.Util.createProperties();
+            properties.setProperty("Ice.Plugin.PluginOne", pluginPath + ":PluginOneFactory");
+            properties.setProperty("Ice.Plugin.PluginTwo", pluginPath + ":PluginTwoFactory");
+            properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
+            properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
+            properties.setProperty("Ice.InitPlugins", "0");
+
+            MyPlugin p4 = null;
+            using(var communicator = initialize(properties))
+            {
+                Ice.PluginManager pm = communicator.getPluginManager();
+                test(pm.getPlugin("PluginOne") != null);
+                test(pm.getPlugin("PluginTwo") != null);
+                test(pm.getPlugin("PluginThree") != null);
+
+                p4 = new MyPlugin();
+                pm.addPlugin("PluginFour", p4);
+                test(pm.getPlugin("PluginFour") != null);
 
-        Console.Write("testing a simple plug-in that fails to initialize... ");
-        Console.Out.Flush();
-        communicator = null;
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.Test", pluginPath + ":PluginInitializeFailFactory");
-            communicator = Ice.Util.initialize(ref args, initData);
-            test(false);
-        }
-        catch(Ice.PluginInitializationException ex)
-        {
-            test(ex.InnerException.Message.Equals("PluginInitializeFailException"));
-        }
-        test(communicator == null);
-        Console.WriteLine("ok");
-
-        Console.Write("testing plug-in load order... ");
-        Console.Out.Flush();
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.PluginOne", pluginPath + ":PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo", pluginPath + ":PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
-            communicator = Ice.Util.initialize(ref args, initData);
-            communicator.destroy();
-        }
-        catch(Ice.LocalException ex)
-        {
-            Console.WriteLine(ex.ToString());;
-            test(false);
-        }
-        Console.WriteLine("ok");
-
-        Console.Write("testing plug-in manager... ");
-        Console.Out.Flush();
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.PluginOne", pluginPath + ":PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo", pluginPath + ":PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
-            initData.properties.setProperty("Ice.InitPlugins", "0");
-            communicator = Ice.Util.initialize(ref args, initData);
-
-            Ice.PluginManager pm = communicator.getPluginManager();
-            test(pm.getPlugin("PluginOne") != null);
-            test(pm.getPlugin("PluginTwo") != null);
-            test(pm.getPlugin("PluginThree") != null);
-
-            MyPlugin p4 = new MyPlugin();
-            pm.addPlugin("PluginFour", p4);
-            test(pm.getPlugin("PluginFour") != null);
-
-            pm.initializePlugins();
-
-            test(p4.isInitialized());
-
-            communicator.destroy();
+                pm.initializePlugins();
 
+                test(p4.isInitialized());
+            }
             test(p4.isDestroyed());
+            Console.WriteLine("ok");
         }
-        catch(Ice.LocalException ex)
-        {
-            Console.WriteLine(ex.ToString());;
-            test(false);
-        }
-        Console.WriteLine("ok");
 
-        Console.Write("testing destroy when a plug-in fails to initialize... ");
-        Console.Out.Flush();
-        communicator = null;
-        try
         {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.PluginOneFail",
-                                            pluginPath + ":PluginOneFailFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwoFail",
-                                            pluginPath + ":PluginTwoFailFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThreeFail",
-                                            pluginPath + ":PluginThreeFailFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
-            communicator = Ice.Util.initialize(ref args, initData);
+            Console.Write("testing destroy when a plug-in fails to initialize... ");
+            Console.Out.Flush();
+            try
+            {
+                Ice.Properties properties = Ice.Util.createProperties();
+                properties.setProperty("Ice.Plugin.PluginOneFail", pluginPath + ":PluginOneFailFactory");
+                properties.setProperty("Ice.Plugin.PluginTwoFail", pluginPath + ":PluginTwoFailFactory");
+                properties.setProperty("Ice.Plugin.PluginThreeFail", pluginPath + ":PluginThreeFailFactory");
+                properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
+                initialize(properties);
+            }
+            catch(Ice.PluginInitializationException ex)
+            {
+                test(ex.InnerException.Message.Equals("PluginInitializeFailException"));
+            }
+            Console.WriteLine("ok");
         }
-        catch(Ice.PluginInitializationException ex)
-        {
-            test(ex.InnerException.Message.Equals("PluginInitializeFailException"));
-        }
-        test(communicator == null);
-        Console.WriteLine("ok");
-
-        return 0;
     }
 
     internal class MyPlugin : Ice.Plugin
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,35 +17,34 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="generated\"/>
-    <Folder Include="Properties\"/>
+    <Folder Include="generated\" />
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\optional\msbuild\serializable\net45\serializable.csproj">
@@ -52,16 +52,16 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets"/>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" />
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -4,13 +4,13 @@
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs"/>
     <Compile Include="../../../Client.cs"/>
   </ItemGroup>
   <ItemGroup>
@@ -19,7 +19,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/plugin/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/plugin/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/plugin/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/plugin/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/plugin/net45/plugin.csproj zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/plugin/net45/plugin.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/plugin/net45/plugin.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/plugin/net45/plugin.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,22 +17,21 @@
     <AssemblyName>Plugin</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\BasePlugin.cs">
@@ -69,17 +69,17 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/msbuild/plugin/netstandard2.0/plugin.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../../../../../msbuild/ice.common.props"/>
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AssemblyName>Plugin</AssemblyName>
@@ -28,7 +28,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginInitializeFailException.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginInitializeFailException.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginInitializeFailException.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginInitializeFailException.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public class PluginInitializeFailException : System.Exception
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginInitializeFailFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginInitializeFailFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginInitializeFailFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginInitializeFailFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public class PluginInitializeFailFactory : Ice.PluginFactory
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginOneFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginOneFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginOneFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginOneFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public class PluginOneFactory : Ice.PluginFactory
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginOneFailFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginOneFailFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginOneFailFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginOneFailFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginThreeFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginThreeFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginThreeFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginThreeFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public class PluginThreeFactory : Ice.PluginFactory
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginThreeFailFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginThreeFailFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginThreeFailFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginThreeFailFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginTwoFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginTwoFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginTwoFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginTwoFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public class PluginTwoFactory : Ice.PluginFactory
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginTwoFailFactory.cs zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginTwoFailFactory.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/plugin/PluginTwoFailFactory.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/plugin/PluginTwoFailFactory.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/properties/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/properties/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/properties/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/properties/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,16 +11,8 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : Test.TestHelper
 {
-    public static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
     class PropertiesClient : Ice.Application
     {
         public override int
@@ -41,10 +28,8 @@
         }
     }
 
-    public static int Main(string[] args)
+    public override void run(string[] args)
     {
-        int status = 0;
-        try
         {
             Console.Out.Write("testing load properties from UTF-8 path... ");
             Console.Out.Flush();
@@ -61,16 +46,10 @@
             c.main(args, "./config/中国_client.config");
             Console.Out.WriteLine("ok");
         }
-        catch(Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
 
         //
         // Try to load multiple config files.
         //
-        try
         {
             Console.Out.Write("testing using Ice.Config with multiple config files... ");
             Console.Out.Flush();
@@ -81,13 +60,7 @@
             test(properties.getProperty("Config3").Equals("Config3"));
             Console.Out.WriteLine("ok");
         }
-        catch(Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
 
-        try
         {
             Console.Out.Write("testing configuration file escapes... ");
             Console.Out.Flush();
@@ -123,12 +96,10 @@
             }
             Console.Out.WriteLine("ok");
         }
-        catch(Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/properties/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/properties/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/properties/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/properties/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,41 +17,43 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/properties/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/properties/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/properties/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/properties/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/properties/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -4,12 +4,13 @@
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs"/>
     <Compile Include="../../../Client.cs"/>
   </ItemGroup>
   <ItemGroup>
@@ -18,7 +19,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/proxy/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,1139 +1,1141 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static Test.MyClassPrx allTests(TestCommon.Application app)
+    namespace proxy
     {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        string rf = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
-        test(baseProxy != null);
-
-        Ice.ObjectPrx b1 = communicator.stringToProxy("test");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getAdapterId().Length == 0 && b1.ice_getFacet().Length == 0);
-        b1 = communicator.stringToProxy("test ");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Length == 0);
-        b1 = communicator.stringToProxy(" test ");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Length == 0);
-        b1 = communicator.stringToProxy(" test");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Length == 0);
-        b1 = communicator.stringToProxy("'test -f facet'");
-        test(b1.ice_getIdentity().name.Equals("test -f facet") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Length == 0);
-        try
-        {
-            b1 = communicator.stringToProxy("\"test -f facet'");
-            test(false);
-        }
-        catch(Ice.ProxyParseException)
-        {
-        }
-        b1 = communicator.stringToProxy("\"test -f facet\"");
-        test(b1.ice_getIdentity().name.Equals("test -f facet") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Length == 0);
-        b1 = communicator.stringToProxy("\"test -f facet@test\"");
-        test(b1.ice_getIdentity().name.Equals("test -f facet@test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Length == 0);
-        b1 = communicator.stringToProxy("\"test -f facet@test @test\"");
-        test(b1.ice_getIdentity().name.Equals("test -f facet@test @test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Length == 0);
-        try
-        {
-            b1 = communicator.stringToProxy("test test");
-            test(false);
-        }
-        catch(Ice.ProxyParseException)
+        public class AllTests : global::Test.AllTests
         {
-        }
-        b1 = communicator.stringToProxy("test\\040test");
-        test(b1.ice_getIdentity().name.Equals("test test") && b1.ice_getIdentity().category.Length == 0);
-        try
-        {
-            b1 = communicator.stringToProxy("test\\777");
-            test(false);
-        }
-        catch(Ice.IdentityParseException)
-        {
-        }
-        b1 = communicator.stringToProxy("test\\40test");
-        test(b1.ice_getIdentity().name.Equals("test test"));
+            public static Test.MyClassPrx allTests(global::Test.TestHelper helper)
+            {
+                var communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                string rf = "test:" + helper.getTestEndpoint(0);
+                var baseProxy = communicator.stringToProxy(rf);
+                test(baseProxy != null);
+
+                var b1 = communicator.stringToProxy("test");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getAdapterId().Length == 0 && b1.ice_getFacet().Length == 0);
+                b1 = communicator.stringToProxy("test ");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Length == 0);
+                b1 = communicator.stringToProxy(" test ");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Length == 0);
+                b1 = communicator.stringToProxy(" test");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Length == 0);
+                b1 = communicator.stringToProxy("'test -f facet'");
+                test(b1.ice_getIdentity().name.Equals("test -f facet") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Length == 0);
+                try
+                {
+                    b1 = communicator.stringToProxy("\"test -f facet'");
+                    test(false);
+                }
+                catch(Ice.ProxyParseException)
+                {
+                }
+                b1 = communicator.stringToProxy("\"test -f facet\"");
+                test(b1.ice_getIdentity().name.Equals("test -f facet") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Length == 0);
+                b1 = communicator.stringToProxy("\"test -f facet@test\"");
+                test(b1.ice_getIdentity().name.Equals("test -f facet@test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Length == 0);
+                b1 = communicator.stringToProxy("\"test -f facet@test @test\"");
+                test(b1.ice_getIdentity().name.Equals("test -f facet@test @test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Length == 0);
+                try
+                {
+                    b1 = communicator.stringToProxy("test test");
+                    test(false);
+                }
+                catch(Ice.ProxyParseException)
+                {
+                }
+                b1 = communicator.stringToProxy("test\\040test");
+                test(b1.ice_getIdentity().name.Equals("test test") && b1.ice_getIdentity().category.Length == 0);
+                try
+                {
+                    b1 = communicator.stringToProxy("test\\777");
+                    test(false);
+                }
+                catch(Ice.IdentityParseException)
+                {
+                }
+                b1 = communicator.stringToProxy("test\\40test");
+                test(b1.ice_getIdentity().name.Equals("test test"));
 
-        // Test some octal and hex corner cases.
-        b1 = communicator.stringToProxy("test\\4test");
-        test(b1.ice_getIdentity().name.Equals("test\u0004test"));
-        b1 = communicator.stringToProxy("test\\04test");
-        test(b1.ice_getIdentity().name.Equals("test\u0004test"));
-        b1 = communicator.stringToProxy("test\\004test");
-        test(b1.ice_getIdentity().name.Equals("test\u0004test"));
-        b1 = communicator.stringToProxy("test\\1114test");
-        test(b1.ice_getIdentity().name.Equals("test\u00494test"));
-
-        b1 = communicator.stringToProxy("test\\b\\f\\n\\r\\t\\'\\\"\\\\test");
-        test(b1.ice_getIdentity().name.Equals("test\b\f\n\r\t\'\"\\test") && b1.ice_getIdentity().category.Length == 0);
-
-        b1 = communicator.stringToProxy("category/test");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
-             b1.ice_getAdapterId().Length == 0);
-
-        b1 = communicator.stringToProxy("");
-        test(b1 == null);
-        b1 = communicator.stringToProxy("\"\"");
-        test(b1 == null);
-        try
-        {
-            b1 = communicator.stringToProxy("\"\" test"); // Invalid trailing characters.
-            test(false);
-        }
-        catch(Ice.ProxyParseException)
-        {
-        }
-        try
-        {
-            b1 = communicator.stringToProxy("test:"); // Missing endpoint.
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                // Test some octal and hex corner cases.
+                b1 = communicator.stringToProxy("test\\4test");
+                test(b1.ice_getIdentity().name.Equals("test\u0004test"));
+                b1 = communicator.stringToProxy("test\\04test");
+                test(b1.ice_getIdentity().name.Equals("test\u0004test"));
+                b1 = communicator.stringToProxy("test\\004test");
+                test(b1.ice_getIdentity().name.Equals("test\u0004test"));
+                b1 = communicator.stringToProxy("test\\1114test");
+                test(b1.ice_getIdentity().name.Equals("test\u00494test"));
+
+                b1 = communicator.stringToProxy("test\\b\\f\\n\\r\\t\\'\\\"\\\\test");
+                test(b1.ice_getIdentity().name.Equals("test\b\f\n\r\t\'\"\\test") && b1.ice_getIdentity().category.Length == 0);
+
+                b1 = communicator.stringToProxy("category/test");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
+                     b1.ice_getAdapterId().Length == 0);
+
+                b1 = communicator.stringToProxy("");
+                test(b1 == null);
+                b1 = communicator.stringToProxy("\"\"");
+                test(b1 == null);
+                try
+                {
+                    b1 = communicator.stringToProxy("\"\" test"); // Invalid trailing characters.
+                    test(false);
+                }
+                catch(Ice.ProxyParseException)
+                {
+                }
+                try
+                {
+                    b1 = communicator.stringToProxy("test:"); // Missing endpoint.
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        b1 = communicator.stringToProxy("test@adapter");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getAdapterId().Equals("adapter"));
-        try
-        {
-            b1 = communicator.stringToProxy("id@adapter test");
-            test(false);
-        }
-        catch(Ice.ProxyParseException)
-        {
-        }
-        b1 = communicator.stringToProxy("category/test@adapter");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
-             b1.ice_getAdapterId().Equals("adapter"));
-        b1 = communicator.stringToProxy("category/test@adapter:tcp");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
-             b1.ice_getAdapterId().Equals("adapter:tcp"));
-        b1 = communicator.stringToProxy("'category 1/test'@adapter");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category 1") &&
-             b1.ice_getAdapterId().Equals("adapter"));
-        b1 = communicator.stringToProxy("'category/test 1'@adapter");
-        test(b1.ice_getIdentity().name.Equals("test 1") && b1.ice_getIdentity().category.Equals("category") &&
-             b1.ice_getAdapterId().Equals("adapter"));
-        b1 = communicator.stringToProxy("'category/test'@'adapter 1'");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
-             b1.ice_getAdapterId().Equals("adapter 1"));
-        b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@adapter");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category /test@foo") &&
-             b1.ice_getAdapterId().Equals("adapter"));
-        b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@\"adapter:tcp\"");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category /test@foo") &&
-             b1.ice_getAdapterId().Equals("adapter:tcp"));
-
-        b1 = communicator.stringToProxy("id -f facet");
-        test(b1.ice_getIdentity().name.Equals("id") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet"));
-        b1 = communicator.stringToProxy("id -f 'facet x'");
-        test(b1.ice_getIdentity().name.Equals("id") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet x"));
-        b1 = communicator.stringToProxy("id -f \"facet x\"");
-        test(b1.ice_getIdentity().name.Equals("id") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet x"));
-        try
-        {
-            b1 = communicator.stringToProxy("id -f \"facet x");
-            test(false);
-        }
-        catch(Ice.ProxyParseException)
-        {
-        }
-        try
-        {
-            b1 = communicator.stringToProxy("id -f \'facet x");
-            test(false);
-        }
-        catch(Ice.ProxyParseException)
-        {
-        }
-        b1 = communicator.stringToProxy("test -f facet:tcp");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet") && b1.ice_getAdapterId().Length == 0);
-        b1 = communicator.stringToProxy("test -f \"facet:tcp\"");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet:tcp") && b1.ice_getAdapterId().Length == 0);
-        b1 = communicator.stringToProxy("test -f facet@test");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet") && b1.ice_getAdapterId().Equals("test"));
-        b1 = communicator.stringToProxy("test -f 'facet@test'");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet@test") && b1.ice_getAdapterId().Length == 0);
-        b1 = communicator.stringToProxy("test -f 'facet@test'@test");
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getFacet().Equals("facet@test") && b1.ice_getAdapterId().Equals("test"));
-        try
-        {
-            b1 = communicator.stringToProxy("test -f facet@test @test");
-            test(false);
-        }
-        catch(Ice.ProxyParseException)
-        {
-        }
-        b1 = communicator.stringToProxy("test");
-        test(b1.ice_isTwoway());
-        b1 = communicator.stringToProxy("test -t");
-        test(b1.ice_isTwoway());
-        b1 = communicator.stringToProxy("test -o");
-        test(b1.ice_isOneway());
-        b1 = communicator.stringToProxy("test -O");
-        test(b1.ice_isBatchOneway());
-        b1 = communicator.stringToProxy("test -d");
-        test(b1.ice_isDatagram());
-        b1 = communicator.stringToProxy("test -D");
-        test(b1.ice_isBatchDatagram());
-        b1 = communicator.stringToProxy("test");
-        test(!b1.ice_isSecure());
-        b1 = communicator.stringToProxy("test -s");
-        test(b1.ice_isSecure());
-
-        test(b1.ice_getEncodingVersion().Equals(Ice.Util.currentEncoding));
-
-        b1 = communicator.stringToProxy("test -e 1.0");
-        test(b1.ice_getEncodingVersion().major == 1 && b1.ice_getEncodingVersion().minor == 0);
-
-        b1 = communicator.stringToProxy("test -e 6.5");
-        test(b1.ice_getEncodingVersion().major == 6 && b1.ice_getEncodingVersion().minor == 5);
+                b1 = communicator.stringToProxy("test@adapter");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getAdapterId().Equals("adapter"));
+                try
+                {
+                    b1 = communicator.stringToProxy("id@adapter test");
+                    test(false);
+                }
+                catch(Ice.ProxyParseException)
+                {
+                }
+                b1 = communicator.stringToProxy("category/test@adapter");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
+                     b1.ice_getAdapterId().Equals("adapter"));
+                b1 = communicator.stringToProxy("category/test@adapter:tcp");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
+                     b1.ice_getAdapterId().Equals("adapter:tcp"));
+                b1 = communicator.stringToProxy("'category 1/test'@adapter");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category 1") &&
+                     b1.ice_getAdapterId().Equals("adapter"));
+                b1 = communicator.stringToProxy("'category/test 1'@adapter");
+                test(b1.ice_getIdentity().name.Equals("test 1") && b1.ice_getIdentity().category.Equals("category") &&
+                     b1.ice_getAdapterId().Equals("adapter"));
+                b1 = communicator.stringToProxy("'category/test'@'adapter 1'");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category") &&
+                     b1.ice_getAdapterId().Equals("adapter 1"));
+                b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@adapter");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category /test@foo") &&
+                     b1.ice_getAdapterId().Equals("adapter"));
+                b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@\"adapter:tcp\"");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Equals("category /test@foo") &&
+                     b1.ice_getAdapterId().Equals("adapter:tcp"));
+
+                b1 = communicator.stringToProxy("id -f facet");
+                test(b1.ice_getIdentity().name.Equals("id") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet"));
+                b1 = communicator.stringToProxy("id -f 'facet x'");
+                test(b1.ice_getIdentity().name.Equals("id") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet x"));
+                b1 = communicator.stringToProxy("id -f \"facet x\"");
+                test(b1.ice_getIdentity().name.Equals("id") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet x"));
+                try
+                {
+                    b1 = communicator.stringToProxy("id -f \"facet x");
+                    test(false);
+                }
+                catch(Ice.ProxyParseException)
+                {
+                }
+                try
+                {
+                    b1 = communicator.stringToProxy("id -f \'facet x");
+                    test(false);
+                }
+                catch(Ice.ProxyParseException)
+                {
+                }
+                b1 = communicator.stringToProxy("test -f facet:tcp");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet") && b1.ice_getAdapterId().Length == 0);
+                b1 = communicator.stringToProxy("test -f \"facet:tcp\"");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet:tcp") && b1.ice_getAdapterId().Length == 0);
+                b1 = communicator.stringToProxy("test -f facet@test");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet") && b1.ice_getAdapterId().Equals("test"));
+                b1 = communicator.stringToProxy("test -f 'facet@test'");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet@test") && b1.ice_getAdapterId().Length == 0);
+                b1 = communicator.stringToProxy("test -f 'facet@test'@test");
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getFacet().Equals("facet@test") && b1.ice_getAdapterId().Equals("test"));
+                try
+                {
+                    b1 = communicator.stringToProxy("test -f facet@test @test");
+                    test(false);
+                }
+                catch(Ice.ProxyParseException)
+                {
+                }
+                b1 = communicator.stringToProxy("test");
+                test(b1.ice_isTwoway());
+                b1 = communicator.stringToProxy("test -t");
+                test(b1.ice_isTwoway());
+                b1 = communicator.stringToProxy("test -o");
+                test(b1.ice_isOneway());
+                b1 = communicator.stringToProxy("test -O");
+                test(b1.ice_isBatchOneway());
+                b1 = communicator.stringToProxy("test -d");
+                test(b1.ice_isDatagram());
+                b1 = communicator.stringToProxy("test -D");
+                test(b1.ice_isBatchDatagram());
+                b1 = communicator.stringToProxy("test");
+                test(!b1.ice_isSecure());
+                b1 = communicator.stringToProxy("test -s");
+                test(b1.ice_isSecure());
+
+                test(b1.ice_getEncodingVersion().Equals(Ice.Util.currentEncoding));
+
+                b1 = communicator.stringToProxy("test -e 1.0");
+                test(b1.ice_getEncodingVersion().major == 1 && b1.ice_getEncodingVersion().minor == 0);
 
-        b1 = communicator.stringToProxy("test -p 1.0 -e 1.0");
-        test(b1.ToString().Equals("test -t -e 1.0"));
+                b1 = communicator.stringToProxy("test -e 6.5");
+                test(b1.ice_getEncodingVersion().major == 6 && b1.ice_getEncodingVersion().minor == 5);
 
-        b1 = communicator.stringToProxy("test -p 6.5 -e 1.0");
-        test(b1.ToString().Equals("test -t -p 6.5 -e 1.0"));
+                b1 = communicator.stringToProxy("test -p 1.0 -e 1.0");
+                test(b1.ToString().Equals("test -t -e 1.0"));
 
-        try
-        {
-            communicator.stringToProxy("test:tcp@adapterId");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
-        // This is an unknown endpoint warning, not a parse exception.
-        //
-        //try
-        //{
-        //   b1 = communicator.stringToProxy("test -f the:facet:tcp");
-        //   test(false);
-        //}
-        //catch(Ice.EndpointParseException)
-        //{
-        //}
-        try
-        {
-            communicator.stringToProxy("test: :tcp");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                b1 = communicator.stringToProxy("test -p 6.5 -e 1.0");
+                test(b1.ToString().Equals("test -t -p 6.5 -e 1.0"));
 
-        //
-        // Test invalid endpoint syntax
-        //
-        try
-        {
-            communicator.createObjectAdapterWithEndpoints("BadAdapter", " : ");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    communicator.stringToProxy("test:tcp@adapterId");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
+                // This is an unknown endpoint warning, not a parse exception.
+                //
+                //try
+                //{
+                //   b1 = communicator.stringToProxy("test -f the:facet:tcp");
+                //   test(false);
+                //}
+                //catch(Ice.EndpointParseException)
+                //{
+                //}
+                try
+                {
+                    communicator.stringToProxy("test: :tcp");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            communicator.createObjectAdapterWithEndpoints("BadAdapter", "tcp: ");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                //
+                // Test invalid endpoint syntax
+                //
+                try
+                {
+                    communicator.createObjectAdapterWithEndpoints("BadAdapter", " : ");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            communicator.createObjectAdapterWithEndpoints("BadAdapter", ":tcp");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    communicator.createObjectAdapterWithEndpoints("BadAdapter", "tcp: ");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        //
-        // Test for bug ICE-5543: escaped escapes in stringToIdentity
-        //
-        Ice.Identity id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\");
-        Ice.Identity id2 = Ice.Util.stringToIdentity(communicator.identityToString(id));
-        test(id.Equals(id2));
-
-        id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\");
-        id2 = Ice.Util.stringToIdentity(communicator.identityToString(id));
-        test(id.Equals(id2));
-
-        id = new Ice.Identity("/test", "cat/");
-        string idStr = communicator.identityToString(id);
-        test(idStr == "cat\\//\\/test");
-        id2 = Ice.Util.stringToIdentity(idStr);
-        test(id.Equals(id2));
-
-        // Input string with various pitfalls
-        id = Ice.Util.stringToIdentity("\\342\\x82\\254\\60\\x9\\60\\");
-        test(id.name == "€0\t0\\" && id.category == "");
+                try
+                {
+                    communicator.createObjectAdapterWithEndpoints("BadAdapter", ":tcp");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Illegal character < 32
-            id = Ice.Util.stringToIdentity("xx\01FooBar");
-            test(false);
-        }
-        catch(Ice.IdentityParseException)
-        {
-        }
+                //
+                // Test for bug ICE-5543: escaped escapes in stringToIdentity
+                //
+                var id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\");
+                var id2 = Ice.Util.stringToIdentity(communicator.identityToString(id));
+                test(id.Equals(id2));
+
+                id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\");
+                id2 = Ice.Util.stringToIdentity(communicator.identityToString(id));
+                test(id.Equals(id2));
+
+                id = new Ice.Identity("/test", "cat/");
+                string idStr = communicator.identityToString(id);
+                test(idStr == "cat\\//\\/test");
+                id2 = Ice.Util.stringToIdentity(idStr);
+                test(id.Equals(id2));
+
+                // Input string with various pitfalls
+                id = Ice.Util.stringToIdentity("\\342\\x82\\254\\60\\x9\\60\\");
+                test(id.name == "€0\t0\\" && id.category == "");
 
-        try
-        {
-            // Illegal surrogate
-            id = Ice.Util.stringToIdentity("xx\\ud911");
-            test(false);
-        }
-        catch(Ice.IdentityParseException)
-        {
-        }
+                try
+                {
+                    // Illegal character < 32
+                    id = Ice.Util.stringToIdentity("xx\01FooBar");
+                    test(false);
+                }
+                catch(Ice.IdentityParseException)
+                {
+                }
 
-        // Testing bytes 127 (\x7F, \177) and €
-        id = new Ice.Identity("test", "\x7f€");
+                try
+                {
+                    // Illegal surrogate
+                    id = Ice.Util.stringToIdentity("xx\\ud911");
+                    test(false);
+                }
+                catch(Ice.IdentityParseException)
+                {
+                }
 
-        idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Unicode);
-        test(idStr == "\\u007f€/test");
-        id2 = Ice.Util.stringToIdentity(idStr);
-        test(id.Equals(id2));
-        test(Ice.Util.identityToString(id) == idStr);
-
-        idStr = Ice.Util.identityToString(id, Ice.ToStringMode.ASCII);
-        test(idStr == "\\u007f\\u20ac/test");
-        id2 = Ice.Util.stringToIdentity(idStr);
-        test(id.Equals(id2));
-
-        idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Compat);
-        test(idStr == "\\177\\342\\202\\254/test");
-        id2 = Ice.Util.stringToIdentity(idStr);
-        test(id.Equals(id2));
-
-        id2 = Ice.Util.stringToIdentity(communicator.identityToString(id));
-        test(id.Equals(id2));
-
-        // More unicode character
-        id = new Ice.Identity("banana \x0E-\ud83c\udf4c\u20ac\u00a2\u0024", "greek \ud800\udd6a");
-
-        idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Unicode);
-        test(idStr == "greek \ud800\udd6a/banana \\u000e-\ud83c\udf4c\u20ac\u00a2$");
-        id2 = Ice.Util.stringToIdentity(idStr);
-        test(id.Equals(id2));
-
-        idStr = Ice.Util.identityToString(id, Ice.ToStringMode.ASCII);
-        test(idStr == "greek \\U0001016a/banana \\u000e-\\U0001f34c\\u20ac\\u00a2$");
-        id2 = Ice.Util.stringToIdentity(idStr);
-        test(id.Equals(id2));
-
-        idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Compat);
-        id2 = Ice.Util.stringToIdentity(idStr);
-        test(idStr == "greek \\360\\220\\205\\252/banana \\016-\\360\\237\\215\\214\\342\\202\\254\\302\\242$");
-        test(id.Equals(id2));
-
-        WriteLine("ok");
-
-        Write("testing proxyToString... ");
-        Flush();
-        b1 = communicator.stringToProxy(rf);
-        Ice.ObjectPrx b2 = communicator.stringToProxy(communicator.proxyToString(b1));
-        test(b1.Equals(b2));
+                // Testing bytes 127(\x7F, \177) and €
+                id = new Ice.Identity("test", "\x7f€");
 
-        if(b1.ice_getConnection() != null) // not colloc-optimized target
-        {
-            b2 = b1.ice_getConnection().createProxy(Ice.Util.stringToIdentity("fixed"));
-            String str = communicator.proxyToString(b2);
-            test(b2.ToString() == str);
-            String str2 = b1.ice_identity(b2.ice_getIdentity()).ice_secure(b2.ice_isSecure()).ToString();
-
-            // Verify that the stringified fixed proxy is the same as a regular stringified proxy
-            // but without endpoints
-            test(str2.StartsWith(str));
-            test(str2[str.Length] == ':');
-        }
-        WriteLine("ok");
+                idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Unicode);
+                test(idStr == "\\u007f€/test");
+                id2 = Ice.Util.stringToIdentity(idStr);
+                test(id.Equals(id2));
+                test(Ice.Util.identityToString(id) == idStr);
+
+                idStr = Ice.Util.identityToString(id, Ice.ToStringMode.ASCII);
+                test(idStr == "\\u007f\\u20ac/test");
+                id2 = Ice.Util.stringToIdentity(idStr);
+                test(id.Equals(id2));
+
+                idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Compat);
+                test(idStr == "\\177\\342\\202\\254/test");
+                id2 = Ice.Util.stringToIdentity(idStr);
+                test(id.Equals(id2));
+
+                id2 = Ice.Util.stringToIdentity(communicator.identityToString(id));
+                test(id.Equals(id2));
+
+                // More unicode character
+                id = new Ice.Identity("banana \x0E-\ud83c\udf4c\u20ac\u00a2\u0024", "greek \ud800\udd6a");
+
+                idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Unicode);
+                test(idStr == "greek \ud800\udd6a/banana \\u000e-\ud83c\udf4c\u20ac\u00a2$");
+                id2 = Ice.Util.stringToIdentity(idStr);
+                test(id.Equals(id2));
+
+                idStr = Ice.Util.identityToString(id, Ice.ToStringMode.ASCII);
+                test(idStr == "greek \\U0001016a/banana \\u000e-\\U0001f34c\\u20ac\\u00a2$");
+                id2 = Ice.Util.stringToIdentity(idStr);
+                test(id.Equals(id2));
+
+                idStr = Ice.Util.identityToString(id, Ice.ToStringMode.Compat);
+                id2 = Ice.Util.stringToIdentity(idStr);
+                test(idStr == "greek \\360\\220\\205\\252/banana \\016-\\360\\237\\215\\214\\342\\202\\254\\302\\242$");
+                test(id.Equals(id2));
+
+                output.WriteLine("ok");
+
+                output.Write("testing proxyToString... ");
+                output.Flush();
+                b1 = communicator.stringToProxy(rf);
+                var b2 = communicator.stringToProxy(communicator.proxyToString(b1));
+                test(b1.Equals(b2));
 
-        Write("testing propertyToProxy... ");
-        Flush();
-        Ice.Properties prop = communicator.getProperties();
-        String propertyPrefix = "Foo.Proxy";
-        prop.setProperty(propertyPrefix, "test:" + app.getTestEndpoint(0));
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
-             b1.ice_getAdapterId().Length == 0 && b1.ice_getFacet().Length == 0);
-
-        string property;
-
-        property = propertyPrefix + ".Locator";
-        test(b1.ice_getLocator() == null);
-        prop.setProperty(property, "locator:default -p 10000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocator() != null && b1.ice_getLocator().ice_getIdentity().name.Equals("locator"));
-        try
-        {
-            prop.setProperty(property, "");
-        }
-        catch(Exception ex)
-        {
-            Console.WriteLine(ex.ToString());
-        }
-        property = propertyPrefix + ".LocatorCacheTimeout";
-        test(b1.ice_getLocatorCacheTimeout() == -1);
-        prop.setProperty(property, "1");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocatorCacheTimeout() == 1);
-        prop.setProperty(property, "");
-
-        // Now retest with an indirect proxy.
-        prop.setProperty(propertyPrefix, "test");
-        property = propertyPrefix + ".Locator";
-        prop.setProperty(property, "locator:default -p 10000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocator() != null && b1.ice_getLocator().ice_getIdentity().name.Equals("locator"));
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".LocatorCacheTimeout";
-        test(b1.ice_getLocatorCacheTimeout() == -1);
-        prop.setProperty(property, "1");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocatorCacheTimeout() == 1);
-        prop.setProperty(property, "");
-
-        // This cannot be tested so easily because the property is cached
-        // on communicator initialization.
-        //
-        //prop.setProperty("Ice.Default.LocatorCacheTimeout", "60");
-        //b1 = communicator.propertyToProxy(propertyPrefix);
-        //test(b1.ice_getLocatorCacheTimeout() == 60);
-        //prop.setProperty("Ice.Default.LocatorCacheTimeout", "");
-
-        prop.setProperty(propertyPrefix, "test:" + app.getTestEndpoint(0));
-
-        property = propertyPrefix + ".Router";
-        test(b1.ice_getRouter() == null);
-        prop.setProperty(property, "router:default -p 10000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getRouter() != null && b1.ice_getRouter().ice_getIdentity().name.Equals("router"));
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".PreferSecure";
-        test(!b1.ice_isPreferSecure());
-        prop.setProperty(property, "1");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_isPreferSecure());
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".ConnectionCached";
-        test(b1.ice_isConnectionCached());
-        prop.setProperty(property, "0");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(!b1.ice_isConnectionCached());
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".InvocationTimeout";
-        test(b1.ice_getInvocationTimeout() == -1);
-        prop.setProperty(property, "1000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getInvocationTimeout() == 1000);
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".EndpointSelection";
-        test(b1.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
-        prop.setProperty(property, "Random");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
-        prop.setProperty(property, "Ordered");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".CollocationOptimized";
-        test(b1.ice_isCollocationOptimized());
-        prop.setProperty(property, "0");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(!b1.ice_isCollocationOptimized());
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".Context.c1";
-        test(!b1.ice_getContext().ContainsKey("c1"));
-        prop.setProperty(property, "TEST");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getContext()["c1"].Equals("TEST"));
-
-        property = propertyPrefix + ".Context.c2";
-        test(!b1.ice_getContext().ContainsKey("c2"));
-        prop.setProperty(property, "TEST");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getContext()["c2"].Equals("TEST"));
-
-        prop.setProperty(propertyPrefix + ".Context.c1", "");
-        prop.setProperty(propertyPrefix + ".Context.c2", "");
-
-        WriteLine("ok");
-
-        Write("testing proxyToProperty... ");
-        Flush();
-
-        b1 = communicator.stringToProxy("test");
-        b1 = b1.ice_collocationOptimized(true);
-        b1 = b1.ice_connectionCached(true);
-        b1 = b1.ice_preferSecure(false);
-        b1 = b1.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
-        b1 = b1.ice_locatorCacheTimeout(100);
-        b1 = b1.ice_invocationTimeout(1234);
-        b1 = b1.ice_encodingVersion(new Ice.EncodingVersion(1, 0));
-
-        Ice.ObjectPrx router = communicator.stringToProxy("router");
-        router = router.ice_collocationOptimized(false);
-        router = router.ice_connectionCached(true);
-        router = router.ice_preferSecure(true);
-        router = router.ice_endpointSelection(Ice.EndpointSelectionType.Random);
-        router = router.ice_locatorCacheTimeout(200);
-        router = router.ice_invocationTimeout(1500);
-
-        Ice.ObjectPrx locator = communicator.stringToProxy("locator");
-        locator = locator.ice_collocationOptimized(true);
-        locator = locator.ice_connectionCached(false);
-        locator = locator.ice_preferSecure(true);
-        locator = locator.ice_endpointSelection(Ice.EndpointSelectionType.Random);
-        locator = locator.ice_locatorCacheTimeout(300);
-        locator = locator.ice_invocationTimeout(1500);
-
-        locator = locator.ice_router(Ice.RouterPrxHelper.uncheckedCast(router));
-        b1 = b1.ice_locator(Ice.LocatorPrxHelper.uncheckedCast(locator));
-
-        Dictionary<string, string> proxyProps = communicator.proxyToProperty(b1, "Test");
-        test(proxyProps.Count == 21);
-
-        test(proxyProps["Test"].Equals("test -t -e 1.0"));
-        test(proxyProps["Test.CollocationOptimized"].Equals("1"));
-        test(proxyProps["Test.ConnectionCached"].Equals("1"));
-        test(proxyProps["Test.PreferSecure"].Equals("0"));
-        test(proxyProps["Test.EndpointSelection"].Equals("Ordered"));
-        test(proxyProps["Test.LocatorCacheTimeout"].Equals("100"));
-        test(proxyProps["Test.InvocationTimeout"].Equals("1234"));
-
-        test(proxyProps["Test.Locator"].Equals(
-                 "locator -t -e " + Ice.Util.encodingVersionToString(Ice.Util.currentEncoding)));
-        // Locator collocation optimization is always disabled.
-        //test(proxyProps["Test.Locator.CollocationOptimized"].Equals("1"));
-        test(proxyProps["Test.Locator.ConnectionCached"].Equals("0"));
-        test(proxyProps["Test.Locator.PreferSecure"].Equals("1"));
-        test(proxyProps["Test.Locator.EndpointSelection"].Equals("Random"));
-        test(proxyProps["Test.Locator.LocatorCacheTimeout"].Equals("300"));
-        test(proxyProps["Test.Locator.InvocationTimeout"].Equals("1500"));
-
-        test(proxyProps["Test.Locator.Router"].Equals(
-                 "router -t -e " + Ice.Util.encodingVersionToString(Ice.Util.currentEncoding)));
-        test(proxyProps["Test.Locator.Router.CollocationOptimized"].Equals("0"));
-        test(proxyProps["Test.Locator.Router.ConnectionCached"].Equals("1"));
-        test(proxyProps["Test.Locator.Router.PreferSecure"].Equals("1"));
-        test(proxyProps["Test.Locator.Router.EndpointSelection"].Equals("Random"));
-        test(proxyProps["Test.Locator.Router.LocatorCacheTimeout"].Equals("200"));
-        test(proxyProps["Test.Locator.Router.InvocationTimeout"].Equals("1500"));
-
-        WriteLine("ok");
-
-        Write("testing ice_getCommunicator... ");
-        Flush();
-        test(baseProxy.ice_getCommunicator() == communicator);
-        WriteLine("ok");
+                if(b1.ice_getConnection() != null) // not colloc-optimized target
+                {
+                    b2 = b1.ice_getConnection().createProxy(Ice.Util.stringToIdentity("fixed"));
+                    String str = communicator.proxyToString(b2);
+                    test(b2.ToString() == str);
+                    String str2 = b1.ice_identity(b2.ice_getIdentity()).ice_secure(b2.ice_isSecure()).ToString();
+
+                    // Verify that the stringified fixed proxy is the same as a regular stringified proxy
+                    // but without endpoints
+                    test(str2.StartsWith(str));
+                    test(str2[str.Length] == ':');
+                }
+                output.WriteLine("ok");
 
-        Write("testing proxy methods... ");
+                output.Write("testing propertyToProxy... ");
+                output.Flush();
+                var prop = communicator.getProperties();
+                String propertyPrefix = "Foo.Proxy";
+                prop.setProperty(propertyPrefix, "test:" + helper.getTestEndpoint(0));
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 &&
+                     b1.ice_getAdapterId().Length == 0 && b1.ice_getFacet().Length == 0);
+
+                string property;
+
+                property = propertyPrefix + ".Locator";
+                test(b1.ice_getLocator() == null);
+                prop.setProperty(property, "locator:default -p 10000");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getLocator() != null && b1.ice_getLocator().ice_getIdentity().name.Equals("locator"));
+                try
+                {
+                    prop.setProperty(property, "");
+                }
+                catch(Exception ex)
+                {
+                    Console.WriteLine(ex.ToString());
+                }
+                property = propertyPrefix + ".LocatorCacheTimeout";
+                test(b1.ice_getLocatorCacheTimeout() == -1);
+                prop.setProperty(property, "1");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getLocatorCacheTimeout() == 1);
+                prop.setProperty(property, "");
+
+                // Now retest with an indirect proxy.
+                prop.setProperty(propertyPrefix, "test");
+                property = propertyPrefix + ".Locator";
+                prop.setProperty(property, "locator:default -p 10000");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getLocator() != null && b1.ice_getLocator().ice_getIdentity().name.Equals("locator"));
+                prop.setProperty(property, "");
+
+                property = propertyPrefix + ".LocatorCacheTimeout";
+                test(b1.ice_getLocatorCacheTimeout() == -1);
+                prop.setProperty(property, "1");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getLocatorCacheTimeout() == 1);
+                prop.setProperty(property, "");
+
+                // This cannot be tested so easily because the property is cached
+                // on communicator initialization.
+                //
+                //prop.setProperty("Ice.Default.LocatorCacheTimeout", "60");
+                //b1 = communicator.propertyToProxy(propertyPrefix);
+                //test(b1.ice_getLocatorCacheTimeout() == 60);
+                //prop.setProperty("Ice.Default.LocatorCacheTimeout", "");
+
+                prop.setProperty(propertyPrefix, "test:" + helper.getTestEndpoint(0));
+
+                property = propertyPrefix + ".Router";
+                test(b1.ice_getRouter() == null);
+                prop.setProperty(property, "router:default -p 10000");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getRouter() != null && b1.ice_getRouter().ice_getIdentity().name.Equals("router"));
+                prop.setProperty(property, "");
+
+                property = propertyPrefix + ".PreferSecure";
+                test(!b1.ice_isPreferSecure());
+                prop.setProperty(property, "1");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_isPreferSecure());
+                prop.setProperty(property, "");
+
+                property = propertyPrefix + ".ConnectionCached";
+                test(b1.ice_isConnectionCached());
+                prop.setProperty(property, "0");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(!b1.ice_isConnectionCached());
+                prop.setProperty(property, "");
+
+                property = propertyPrefix + ".InvocationTimeout";
+                test(b1.ice_getInvocationTimeout() == -1);
+                prop.setProperty(property, "1000");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getInvocationTimeout() == 1000);
+                prop.setProperty(property, "");
+
+                property = propertyPrefix + ".EndpointSelection";
+                test(b1.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
+                prop.setProperty(property, "Random");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
+                prop.setProperty(property, "Ordered");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
+                prop.setProperty(property, "");
+
+                property = propertyPrefix + ".CollocationOptimized";
+                test(b1.ice_isCollocationOptimized());
+                prop.setProperty(property, "0");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(!b1.ice_isCollocationOptimized());
+                prop.setProperty(property, "");
+
+                property = propertyPrefix + ".Context.c1";
+                test(!b1.ice_getContext().ContainsKey("c1"));
+                prop.setProperty(property, "TEST");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getContext()["c1"].Equals("TEST"));
+
+                property = propertyPrefix + ".Context.c2";
+                test(!b1.ice_getContext().ContainsKey("c2"));
+                prop.setProperty(property, "TEST");
+                b1 = communicator.propertyToProxy(propertyPrefix);
+                test(b1.ice_getContext()["c2"].Equals("TEST"));
+
+                prop.setProperty(propertyPrefix + ".Context.c1", "");
+                prop.setProperty(propertyPrefix + ".Context.c2", "");
+
+                output.WriteLine("ok");
+
+                output.Write("testing proxyToProperty... ");
+                output.Flush();
+
+                b1 = communicator.stringToProxy("test");
+                b1 = b1.ice_collocationOptimized(true);
+                b1 = b1.ice_connectionCached(true);
+                b1 = b1.ice_preferSecure(false);
+                b1 = b1.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
+                b1 = b1.ice_locatorCacheTimeout(100);
+                b1 = b1.ice_invocationTimeout(1234);
+                b1 = b1.ice_encodingVersion(new Ice.EncodingVersion(1, 0));
+
+                Ice.ObjectPrx router = communicator.stringToProxy("router");
+                router = router.ice_collocationOptimized(false);
+                router = router.ice_connectionCached(true);
+                router = router.ice_preferSecure(true);
+                router = router.ice_endpointSelection(Ice.EndpointSelectionType.Random);
+                router = router.ice_locatorCacheTimeout(200);
+                router = router.ice_invocationTimeout(1500);
+
+                Ice.ObjectPrx locator = communicator.stringToProxy("locator");
+                locator = locator.ice_collocationOptimized(true);
+                locator = locator.ice_connectionCached(false);
+                locator = locator.ice_preferSecure(true);
+                locator = locator.ice_endpointSelection(Ice.EndpointSelectionType.Random);
+                locator = locator.ice_locatorCacheTimeout(300);
+                locator = locator.ice_invocationTimeout(1500);
+
+                locator = locator.ice_router(Ice.RouterPrxHelper.uncheckedCast(router));
+                b1 = b1.ice_locator(Ice.LocatorPrxHelper.uncheckedCast(locator));
+
+                Dictionary<string, string> proxyProps = communicator.proxyToProperty(b1, "Test");
+                test(proxyProps.Count == 21);
+
+                test(proxyProps["Test"].Equals("test -t -e 1.0"));
+                test(proxyProps["Test.CollocationOptimized"].Equals("1"));
+                test(proxyProps["Test.ConnectionCached"].Equals("1"));
+                test(proxyProps["Test.PreferSecure"].Equals("0"));
+                test(proxyProps["Test.EndpointSelection"].Equals("Ordered"));
+                test(proxyProps["Test.LocatorCacheTimeout"].Equals("100"));
+                test(proxyProps["Test.InvocationTimeout"].Equals("1234"));
+
+                test(proxyProps["Test.Locator"].Equals(
+                         "locator -t -e " + Ice.Util.encodingVersionToString(Ice.Util.currentEncoding)));
+                // Locator collocation optimization is always disabled.
+                //test(proxyProps["Test.Locator.CollocationOptimized"].Equals("1"));
+                test(proxyProps["Test.Locator.ConnectionCached"].Equals("0"));
+                test(proxyProps["Test.Locator.PreferSecure"].Equals("1"));
+                test(proxyProps["Test.Locator.EndpointSelection"].Equals("Random"));
+                test(proxyProps["Test.Locator.LocatorCacheTimeout"].Equals("300"));
+                test(proxyProps["Test.Locator.InvocationTimeout"].Equals("1500"));
+
+                test(proxyProps["Test.Locator.Router"].Equals(
+                         "router -t -e " + Ice.Util.encodingVersionToString(Ice.Util.currentEncoding)));
+                test(proxyProps["Test.Locator.Router.CollocationOptimized"].Equals("0"));
+                test(proxyProps["Test.Locator.Router.ConnectionCached"].Equals("1"));
+                test(proxyProps["Test.Locator.Router.PreferSecure"].Equals("1"));
+                test(proxyProps["Test.Locator.Router.EndpointSelection"].Equals("Random"));
+                test(proxyProps["Test.Locator.Router.LocatorCacheTimeout"].Equals("200"));
+                test(proxyProps["Test.Locator.Router.InvocationTimeout"].Equals("1500"));
+
+                output.WriteLine("ok");
+
+                output.Write("testing ice_getCommunicator... ");
+                output.Flush();
+                test(baseProxy.ice_getCommunicator() == communicator);
+                output.WriteLine("ok");
+
+                output.Write("testing proxy methods... ");
 
-// Disable Obsolete warning/error
+                // Disable Obsolete warning/error
 #pragma warning disable 612, 618
-        test(communicator.identityToString(
-                 baseProxy.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).Equals("other"));
+                test(communicator.identityToString(
+                         baseProxy.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).Equals("other"));
 #pragma warning restore 612, 618
-        test(baseProxy.ice_facet("facet").ice_getFacet().Equals("facet"));
-        test(baseProxy.ice_adapterId("id").ice_getAdapterId().Equals("id"));
-        test(baseProxy.ice_twoway().ice_isTwoway());
-        test(baseProxy.ice_oneway().ice_isOneway());
-        test(baseProxy.ice_batchOneway().ice_isBatchOneway());
-        test(baseProxy.ice_datagram().ice_isDatagram());
-        test(baseProxy.ice_batchDatagram().ice_isBatchDatagram());
-        test(baseProxy.ice_secure(true).ice_isSecure());
-        test(!baseProxy.ice_secure(false).ice_isSecure());
-        test(baseProxy.ice_collocationOptimized(true).ice_isCollocationOptimized());
-        test(!baseProxy.ice_collocationOptimized(false).ice_isCollocationOptimized());
-        test(baseProxy.ice_preferSecure(true).ice_isPreferSecure());
-        test(!baseProxy.ice_preferSecure(false).ice_isPreferSecure());
+                test(baseProxy.ice_facet("facet").ice_getFacet().Equals("facet"));
+                test(baseProxy.ice_adapterId("id").ice_getAdapterId().Equals("id"));
+                test(baseProxy.ice_twoway().ice_isTwoway());
+                test(baseProxy.ice_oneway().ice_isOneway());
+                test(baseProxy.ice_batchOneway().ice_isBatchOneway());
+                test(baseProxy.ice_datagram().ice_isDatagram());
+                test(baseProxy.ice_batchDatagram().ice_isBatchDatagram());
+                test(baseProxy.ice_secure(true).ice_isSecure());
+                test(!baseProxy.ice_secure(false).ice_isSecure());
+                test(baseProxy.ice_collocationOptimized(true).ice_isCollocationOptimized());
+                test(!baseProxy.ice_collocationOptimized(false).ice_isCollocationOptimized());
+                test(baseProxy.ice_preferSecure(true).ice_isPreferSecure());
+                test(!baseProxy.ice_preferSecure(false).ice_isPreferSecure());
 
-        try
-        {
-            baseProxy.ice_timeout(0);
-            test(false);
-        }
-        catch(ArgumentException)
-        {
-        }
+                try
+                {
+                    baseProxy.ice_timeout(0);
+                    test(false);
+                }
+                catch(ArgumentException)
+                {
+                }
 
-        try
-        {
-            baseProxy.ice_timeout(-1);
-        }
-        catch(ArgumentException)
-        {
-            test(false);
-        }
+                try
+                {
+                    baseProxy.ice_timeout(-1);
+                }
+                catch(ArgumentException)
+                {
+                    test(false);
+                }
 
-        try
-        {
-            baseProxy.ice_timeout(-2);
-            test(false);
-        }
-        catch(ArgumentException)
-        {
-        }
+                try
+                {
+                    baseProxy.ice_timeout(-2);
+                    test(false);
+                }
+                catch(ArgumentException)
+                {
+                }
 
-        try
-        {
-            baseProxy.ice_invocationTimeout(0);
-            test(false);
-        }
-        catch(ArgumentException)
-        {
-        }
+                try
+                {
+                    baseProxy.ice_invocationTimeout(0);
+                    test(false);
+                }
+                catch(ArgumentException)
+                {
+                }
 
-        try
-        {
-            baseProxy.ice_invocationTimeout(-1);
-            baseProxy.ice_invocationTimeout(-2);
-        }
-        catch(ArgumentException)
-        {
-            test(false);
-        }
+                try
+                {
+                    baseProxy.ice_invocationTimeout(-1);
+                    baseProxy.ice_invocationTimeout(-2);
+                }
+                catch(ArgumentException)
+                {
+                    test(false);
+                }
 
-        try
-        {
-            baseProxy.ice_invocationTimeout(-3);
-            test(false);
-        }
-        catch(ArgumentException)
-        {
-        }
+                try
+                {
+                    baseProxy.ice_invocationTimeout(-3);
+                    test(false);
+                }
+                catch(ArgumentException)
+                {
+                }
 
-        try
-        {
-            baseProxy.ice_locatorCacheTimeout(0);
-        }
-        catch(ArgumentException)
-        {
-            test(false);
-        }
+                try
+                {
+                    baseProxy.ice_locatorCacheTimeout(0);
+                }
+                catch(ArgumentException)
+                {
+                    test(false);
+                }
 
-        try
-        {
-            baseProxy.ice_locatorCacheTimeout(-1);
-        }
-        catch(ArgumentException)
-        {
-            test(false);
-        }
+                try
+                {
+                    baseProxy.ice_locatorCacheTimeout(-1);
+                }
+                catch(ArgumentException)
+                {
+                    test(false);
+                }
 
-        try
-        {
-            baseProxy.ice_locatorCacheTimeout(-2);
-            test(false);
-        }
-        catch(ArgumentException)
-        {
-        }
+                try
+                {
+                    baseProxy.ice_locatorCacheTimeout(-2);
+                    test(false);
+                }
+                catch(ArgumentException)
+                {
+                }
 
-        WriteLine("ok");
+                output.WriteLine("ok");
 
-        Write("testing proxy comparison... ");
-        Flush();
+                output.Write("testing proxy comparison... ");
+                output.Flush();
 
-        test(communicator.stringToProxy("foo").Equals(communicator.stringToProxy("foo")));
-        test(!communicator.stringToProxy("foo").Equals(communicator.stringToProxy("foo2")));
+                test(communicator.stringToProxy("foo").Equals(communicator.stringToProxy("foo")));
+                test(!communicator.stringToProxy("foo").Equals(communicator.stringToProxy("foo2")));
 
-        Ice.ObjectPrx compObj = communicator.stringToProxy("foo");
-
-        test(compObj.ice_facet("facet").Equals(compObj.ice_facet("facet")));
-        test(!compObj.ice_facet("facet").Equals(compObj.ice_facet("facet1")));
-
-        test(compObj.ice_oneway().Equals(compObj.ice_oneway()));
-        test(!compObj.ice_oneway().Equals(compObj.ice_twoway()));
-
-        test(compObj.ice_secure(true).Equals(compObj.ice_secure(true)));
-        test(!compObj.ice_secure(false).Equals(compObj.ice_secure(true)));
-
-        test(compObj.ice_collocationOptimized(true).Equals(compObj.ice_collocationOptimized(true)));
-        test(!compObj.ice_collocationOptimized(false).Equals(compObj.ice_collocationOptimized(true)));
-
-        test(compObj.ice_connectionCached(true).Equals(compObj.ice_connectionCached(true)));
-        test(!compObj.ice_connectionCached(false).Equals(compObj.ice_connectionCached(true)));
-
-        test(compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).Equals(
-                 compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random)));
-        test(!compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).Equals(
-                 compObj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered)));
-
-        test(compObj.ice_connectionId("id2").Equals(compObj.ice_connectionId("id2")));
-        test(!compObj.ice_connectionId("id1").Equals(compObj.ice_connectionId("id2")));
-        test(compObj.ice_connectionId("id1").ice_getConnectionId().Equals("id1"));
-        test(compObj.ice_connectionId("id2").ice_getConnectionId().Equals("id2"));
-
-        test(compObj.ice_compress(true).Equals(compObj.ice_compress(true)));
-        test(!compObj.ice_compress(false).Equals(compObj.ice_compress(true)));
-
-        test(!compObj.ice_getCompress().HasValue);
-        test(compObj.ice_compress(true).ice_getCompress().Value == true);
-        test(compObj.ice_compress(false).ice_getCompress().Value == false);
-
-        test(compObj.ice_timeout(20).Equals(compObj.ice_timeout(20)));
-        test(!compObj.ice_timeout(10).Equals(compObj.ice_timeout(20)));
-
-        test(!compObj.ice_getTimeout().HasValue);
-        test(compObj.ice_timeout(10).ice_getTimeout().Value == 10);
-        test(compObj.ice_timeout(20).ice_getTimeout().Value == 20);
-
-        Ice.LocatorPrx loc1 = Ice.LocatorPrxHelper.uncheckedCast(communicator.stringToProxy("loc1:default -p 10000"));
-        Ice.LocatorPrx loc2 = Ice.LocatorPrxHelper.uncheckedCast(communicator.stringToProxy("loc2:default -p 10000"));
-        test(compObj.ice_locator(null).Equals(compObj.ice_locator(null)));
-        test(compObj.ice_locator(loc1).Equals(compObj.ice_locator(loc1)));
-        test(!compObj.ice_locator(loc1).Equals(compObj.ice_locator(null)));
-        test(!compObj.ice_locator(null).Equals(compObj.ice_locator(loc2)));
-        test(!compObj.ice_locator(loc1).Equals(compObj.ice_locator(loc2)));
-
-        Ice.RouterPrx rtr1 = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("rtr1:default -p 10000"));
-        Ice.RouterPrx rtr2 = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("rtr2:default -p 10000"));
-        test(compObj.ice_router(null).Equals(compObj.ice_router(null)));
-        test(compObj.ice_router(rtr1).Equals(compObj.ice_router(rtr1)));
-        test(!compObj.ice_router(rtr1).Equals(compObj.ice_router(null)));
-        test(!compObj.ice_router(null).Equals(compObj.ice_router(rtr2)));
-        test(!compObj.ice_router(rtr1).Equals(compObj.ice_router(rtr2)));
-
-        Dictionary<string, string> ctx1 = new Dictionary<string, string>();
-        ctx1["ctx1"] = "v1";
-        Dictionary<string, string> ctx2 = new Dictionary<string, string>();
-        ctx2["ctx2"] = "v2";
-        test(compObj.ice_context(null).Equals(compObj.ice_context(null)));
-        test(compObj.ice_context(ctx1).Equals(compObj.ice_context(ctx1)));
-        test(!compObj.ice_context(ctx1).Equals(compObj.ice_context(null)));
-        test(!compObj.ice_context(null).Equals(compObj.ice_context(ctx2)));
-        test(!compObj.ice_context(ctx1).Equals(compObj.ice_context(ctx2)));
-
-        test(compObj.ice_preferSecure(true).Equals(compObj.ice_preferSecure(true)));
-        test(!compObj.ice_preferSecure(true).Equals(compObj.ice_preferSecure(false)));
-
-        Ice.ObjectPrx compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
-        Ice.ObjectPrx compObj2 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
-        test(!compObj1.Equals(compObj2));
-
-        compObj1 = communicator.stringToProxy("foo@MyAdapter1");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter2");
-        test(!compObj1.Equals(compObj2));
-
-        test(compObj1.ice_locatorCacheTimeout(20).Equals(compObj1.ice_locatorCacheTimeout(20)));
-        test(!compObj1.ice_locatorCacheTimeout(10).Equals(compObj1.ice_locatorCacheTimeout(20)));
-
-        test(compObj1.ice_invocationTimeout(20).Equals(compObj1.ice_invocationTimeout(20)));
-        test(!compObj1.ice_invocationTimeout(10).Equals(compObj1.ice_invocationTimeout(20)));
-
-        compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 1000");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter1");
-        test(!compObj1.Equals(compObj2));
-
-        Ice.Endpoint[] endpts1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000").ice_getEndpoints();
-        Ice.Endpoint[] endpts2 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10001").ice_getEndpoints();
-        test(!endpts1[0].Equals(endpts2[0]));
-        test(endpts1[0].Equals(communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000").ice_getEndpoints()[0]));
+                Ice.ObjectPrx compObj = communicator.stringToProxy("foo");
+
+                test(compObj.ice_facet("facet").Equals(compObj.ice_facet("facet")));
+                test(!compObj.ice_facet("facet").Equals(compObj.ice_facet("facet1")));
+
+                test(compObj.ice_oneway().Equals(compObj.ice_oneway()));
+                test(!compObj.ice_oneway().Equals(compObj.ice_twoway()));
+
+                test(compObj.ice_secure(true).Equals(compObj.ice_secure(true)));
+                test(!compObj.ice_secure(false).Equals(compObj.ice_secure(true)));
+
+                test(compObj.ice_collocationOptimized(true).Equals(compObj.ice_collocationOptimized(true)));
+                test(!compObj.ice_collocationOptimized(false).Equals(compObj.ice_collocationOptimized(true)));
+
+                test(compObj.ice_connectionCached(true).Equals(compObj.ice_connectionCached(true)));
+                test(!compObj.ice_connectionCached(false).Equals(compObj.ice_connectionCached(true)));
+
+                test(compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).Equals(
+                         compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random)));
+                test(!compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).Equals(
+                         compObj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered)));
+
+                test(compObj.ice_connectionId("id2").Equals(compObj.ice_connectionId("id2")));
+                test(!compObj.ice_connectionId("id1").Equals(compObj.ice_connectionId("id2")));
+                test(compObj.ice_connectionId("id1").ice_getConnectionId().Equals("id1"));
+                test(compObj.ice_connectionId("id2").ice_getConnectionId().Equals("id2"));
+
+                test(compObj.ice_compress(true).Equals(compObj.ice_compress(true)));
+                test(!compObj.ice_compress(false).Equals(compObj.ice_compress(true)));
+
+                test(!compObj.ice_getCompress().HasValue);
+                test(compObj.ice_compress(true).ice_getCompress().Value == true);
+                test(compObj.ice_compress(false).ice_getCompress().Value == false);
+
+                test(compObj.ice_timeout(20).Equals(compObj.ice_timeout(20)));
+                test(!compObj.ice_timeout(10).Equals(compObj.ice_timeout(20)));
+
+                test(!compObj.ice_getTimeout().HasValue);
+                test(compObj.ice_timeout(10).ice_getTimeout().Value == 10);
+                test(compObj.ice_timeout(20).ice_getTimeout().Value == 20);
+
+                Ice.LocatorPrx loc1 = Ice.LocatorPrxHelper.uncheckedCast(communicator.stringToProxy("loc1:default -p 10000"));
+                Ice.LocatorPrx loc2 = Ice.LocatorPrxHelper.uncheckedCast(communicator.stringToProxy("loc2:default -p 10000"));
+                test(compObj.ice_locator(null).Equals(compObj.ice_locator(null)));
+                test(compObj.ice_locator(loc1).Equals(compObj.ice_locator(loc1)));
+                test(!compObj.ice_locator(loc1).Equals(compObj.ice_locator(null)));
+                test(!compObj.ice_locator(null).Equals(compObj.ice_locator(loc2)));
+                test(!compObj.ice_locator(loc1).Equals(compObj.ice_locator(loc2)));
+
+                Ice.RouterPrx rtr1 = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("rtr1:default -p 10000"));
+                Ice.RouterPrx rtr2 = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("rtr2:default -p 10000"));
+                test(compObj.ice_router(null).Equals(compObj.ice_router(null)));
+                test(compObj.ice_router(rtr1).Equals(compObj.ice_router(rtr1)));
+                test(!compObj.ice_router(rtr1).Equals(compObj.ice_router(null)));
+                test(!compObj.ice_router(null).Equals(compObj.ice_router(rtr2)));
+                test(!compObj.ice_router(rtr1).Equals(compObj.ice_router(rtr2)));
+
+                Dictionary<string, string> ctx1 = new Dictionary<string, string>();
+                ctx1["ctx1"] = "v1";
+                Dictionary<string, string> ctx2 = new Dictionary<string, string>();
+                ctx2["ctx2"] = "v2";
+                test(compObj.ice_context(null).Equals(compObj.ice_context(null)));
+                test(compObj.ice_context(ctx1).Equals(compObj.ice_context(ctx1)));
+                test(!compObj.ice_context(ctx1).Equals(compObj.ice_context(null)));
+                test(!compObj.ice_context(null).Equals(compObj.ice_context(ctx2)));
+                test(!compObj.ice_context(ctx1).Equals(compObj.ice_context(ctx2)));
+
+                test(compObj.ice_preferSecure(true).Equals(compObj.ice_preferSecure(true)));
+                test(!compObj.ice_preferSecure(true).Equals(compObj.ice_preferSecure(false)));
+
+                Ice.ObjectPrx compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
+                Ice.ObjectPrx compObj2 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
+                test(!compObj1.Equals(compObj2));
+
+                compObj1 = communicator.stringToProxy("foo@MyAdapter1");
+                compObj2 = communicator.stringToProxy("foo@MyAdapter2");
+                test(!compObj1.Equals(compObj2));
+
+                test(compObj1.ice_locatorCacheTimeout(20).Equals(compObj1.ice_locatorCacheTimeout(20)));
+                test(!compObj1.ice_locatorCacheTimeout(10).Equals(compObj1.ice_locatorCacheTimeout(20)));
+
+                test(compObj1.ice_invocationTimeout(20).Equals(compObj1.ice_invocationTimeout(20)));
+                test(!compObj1.ice_invocationTimeout(10).Equals(compObj1.ice_invocationTimeout(20)));
+
+                compObj1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 1000");
+                compObj2 = communicator.stringToProxy("foo@MyAdapter1");
+                test(!compObj1.Equals(compObj2));
+
+                Ice.Endpoint[] endpts1 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000").ice_getEndpoints();
+                Ice.Endpoint[] endpts2 = communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10001").ice_getEndpoints();
+                test(!endpts1[0].Equals(endpts2[0]));
+                test(endpts1[0].Equals(communicator.stringToProxy("foo:tcp -h 127.0.0.1 -p 10000").ice_getEndpoints()[0]));
 
-        Ice.Connection baseConnection = baseProxy.ice_getConnection();
-        if(baseConnection != null)
-        {
-            Ice.Connection baseConnection2 = baseProxy.ice_connectionId("base2").ice_getConnection();
-            compObj1 = compObj1.ice_fixed(baseConnection);
-            compObj2 = compObj2.ice_fixed(baseConnection2);
-            test(!compObj1.Equals(compObj2));
-        }
-        WriteLine("ok");
+                Ice.Connection baseConnection = baseProxy.ice_getConnection();
+                if(baseConnection != null)
+                {
+                    Ice.Connection baseConnection2 = baseProxy.ice_connectionId("base2").ice_getConnection();
+                    compObj1 = compObj1.ice_fixed(baseConnection);
+                    compObj2 = compObj2.ice_fixed(baseConnection2);
+                    test(!compObj1.Equals(compObj2));
+                }
+                output.WriteLine("ok");
 
-        Write("testing checked cast... ");
-        Flush();
-        Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
-        test(cl != null);
-        Test.MyDerivedClassPrx derived = Test.MyDerivedClassPrxHelper.checkedCast(cl);
-        test(derived != null);
-        test(cl.Equals(baseProxy));
-        test(derived.Equals(baseProxy));
-        test(cl.Equals(derived));
-        WriteLine("ok");
-
-        Write("testing checked cast with context... ");
-        Flush();
-
-        Dictionary<string, string> c = cl.getContext();
-        test(c == null || c.Count == 0);
-
-        c = new Dictionary<string, string>();
-        c["one"] = "hello";
-        c["two"] = "world";
-        cl = Test.MyClassPrxHelper.checkedCast(baseProxy, c);
-        Dictionary<string, string> c2 = cl.getContext();
-        test(Ice.CollectionComparer.Equals(c, c2));
-        WriteLine("ok");
+                output.Write("testing checked cast... ");
+                output.Flush();
+                Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
+                test(cl != null);
+                Test.MyDerivedClassPrx derived = Test.MyDerivedClassPrxHelper.checkedCast(cl);
+                test(derived != null);
+                test(cl.Equals(baseProxy));
+                test(derived.Equals(baseProxy));
+                test(cl.Equals(derived));
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast with context... ");
+                output.Flush();
+
+                Dictionary<string, string> c = cl.getContext();
+                test(c == null || c.Count == 0);
+
+                c = new Dictionary<string, string>();
+                c["one"] = "hello";
+                c["two"] = "world";
+                cl = Test.MyClassPrxHelper.checkedCast(baseProxy, c);
+                Dictionary<string, string> c2 = cl.getContext();
+                test(Ice.CollectionComparer.Equals(c, c2));
+                output.WriteLine("ok");
 
-        Write("testing ice_fixed... ");
-        Flush();
-        {
-            Ice.Connection connection = cl.ice_getConnection();
-            if(connection != null)
-            {
-                Test.MyClassPrx prx = (Test.MyClassPrx)cl.ice_fixed(connection);
-                prx.ice_ping();
-                test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
-                test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet().Equals("facet"));
-                test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
-                Dictionary<string, string> ctx = new Dictionary<string, string>();
-                ctx["one"] = "hello";
-                ctx["two"] = "world";
-                test(cl.ice_fixed(connection).ice_getContext().Count == 0);
-                test(cl.ice_context(ctx).ice_fixed(connection).ice_getContext().Count == 2);
-                test(cl.ice_fixed(connection).ice_getInvocationTimeout() == -1);
-                test(cl.ice_invocationTimeout(10).ice_fixed(connection).ice_getInvocationTimeout() == 10);
-                test(cl.ice_fixed(connection).ice_getConnection() == connection);
-                test(cl.ice_fixed(connection).ice_fixed(connection).ice_getConnection() == connection);
-                test(!cl.ice_fixed(connection).ice_getTimeout().HasValue);
-                test(cl.ice_compress(true).ice_fixed(connection).ice_getCompress().Value);
-                Ice.Connection fixedConnection = cl.ice_connectionId("ice_fixed").ice_getConnection();
-                test(cl.ice_fixed(connection).ice_fixed(fixedConnection).ice_getConnection() == fixedConnection);
+                output.Write("testing ice_fixed... ");
+                output.Flush();
+                {
+                    Ice.Connection connection = cl.ice_getConnection();
+                    if(connection != null)
+                    {
+                        Test.MyClassPrx prx =(Test.MyClassPrx)cl.ice_fixed(connection);
+                        prx.ice_ping();
+                        test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
+                        test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet().Equals("facet"));
+                        test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
+                        Dictionary<string, string> ctx = new Dictionary<string, string>();
+                        ctx["one"] = "hello";
+                        ctx["two"] = "world";
+                        test(cl.ice_fixed(connection).ice_getContext().Count == 0);
+                        test(cl.ice_context(ctx).ice_fixed(connection).ice_getContext().Count == 2);
+                        test(cl.ice_fixed(connection).ice_getInvocationTimeout() == -1);
+                        test(cl.ice_invocationTimeout(10).ice_fixed(connection).ice_getInvocationTimeout() == 10);
+                        test(cl.ice_fixed(connection).ice_getConnection() == connection);
+                        test(cl.ice_fixed(connection).ice_fixed(connection).ice_getConnection() == connection);
+                        test(!cl.ice_fixed(connection).ice_getTimeout().HasValue);
+                        test(cl.ice_compress(true).ice_fixed(connection).ice_getCompress().Value);
+                        Ice.Connection fixedConnection = cl.ice_connectionId("ice_fixed").ice_getConnection();
+                        test(cl.ice_fixed(connection).ice_fixed(fixedConnection).ice_getConnection() == fixedConnection);
+                        try
+                        {
+                            cl.ice_secure(!connection.getEndpoint().getInfo().secure()).ice_fixed(connection).ice_ping();
+                        }
+                        catch(Ice.NoEndpointException)
+                        {
+                        }
+                        try
+                        {
+                            cl.ice_datagram().ice_fixed(connection).ice_ping();
+                        }
+                        catch(Ice.NoEndpointException)
+                        {
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            cl.ice_fixed(connection);
+                            test(false);
+                        }
+                        catch(ArgumentException)
+                        {
+                            // Expected with null connection.
+                        }
+                    }
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing encoding versioning... ");
+                output.Flush();
+                string ref20 = "test -e 2.0:" + helper.getTestEndpoint(0);
+                Test.MyClassPrx cl20 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref20));
                 try
                 {
-                    cl.ice_secure(!connection.getEndpoint().getInfo().secure()).ice_fixed(connection).ice_ping();
+                    cl20.ice_ping();
+                    test(false);
                 }
-                catch(Ice.NoEndpointException)
+                catch(Ice.UnsupportedEncodingException)
                 {
+                    // Server 2.0 endpoint doesn't support 1.1 version.
                 }
+
+                string ref10 = "test -e 1.0:" + helper.getTestEndpoint(0);
+                Test.MyClassPrx cl10 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref10));
+                cl10.ice_ping();
+                cl10.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
+                cl.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
+
+                // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
+                // call will use the 1.1 encoding
+                string ref13 = "test -e 1.3:" + helper.getTestEndpoint(0);
+                Test.MyClassPrx cl13 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref13));
+                cl13.ice_ping();
+                cl13.end_ice_ping(cl13.begin_ice_ping());
+
                 try
                 {
-                    cl.ice_datagram().ice_fixed(connection).ice_ping();
+                    // Send request with bogus 1.2 encoding.
+                    Ice.EncodingVersion version = new Ice.EncodingVersion(1, 2);
+                    Ice.OutputStream os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.endEncapsulation();
+                    byte[] inEncaps = os.finished();
+                    inEncaps[4] = version.major;
+                    inEncaps[5] = version.minor;
+                    byte[] outEncaps;
+                    cl.ice_invoke("ice_ping", Ice.OperationMode.Normal, inEncaps,
+                                                                  out outEncaps);
+                    test(false);
                 }
-                catch(Ice.NoEndpointException)
+                catch(Ice.UnknownLocalException ex)
                 {
+                    // The server thrown an UnsupportedEncodingException
+                    test(ex.unknown.IndexOf("UnsupportedEncodingException") > 0);
                 }
-            }
-            else
-            {
+
                 try
                 {
-                    cl.ice_fixed(connection);
+                    // Send request with bogus 2.0 encoding.
+                    Ice.EncodingVersion version = new Ice.EncodingVersion(2, 0);
+                    Ice.OutputStream os = new Ice.OutputStream(communicator);
+                    os.startEncapsulation();
+                    os.endEncapsulation();
+                    byte[] inEncaps = os.finished();
+                    inEncaps[4] = version.major;
+                    inEncaps[5] = version.minor;
+                    byte[] outEncaps;
+                    cl.ice_invoke("ice_ping", Ice.OperationMode.Normal, inEncaps,
+                                                                  out outEncaps);
                     test(false);
                 }
-                catch(ArgumentException)
+                catch(Ice.UnknownLocalException ex)
                 {
-                    // Expected with null connection.
+                    // The server thrown an UnsupportedEncodingException
+                    test(ex.unknown.IndexOf("UnsupportedEncodingException") > 0);
                 }
-            }
-        }
-        WriteLine("ok");
-
-        Write("testing encoding versioning... ");
-        Flush();
-        string ref20 = "test -e 2.0:" + app.getTestEndpoint(0);
-        Test.MyClassPrx cl20 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref20));
-        try
-        {
-            cl20.ice_ping();
-            test(false);
-        }
-        catch(Ice.UnsupportedEncodingException)
-        {
-            // Server 2.0 endpoint doesn't support 1.1 version.
-        }
 
-        string ref10 = "test -e 1.0:" + app.getTestEndpoint(0);
-        Test.MyClassPrx cl10 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref10));
-        cl10.ice_ping();
-        cl10.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
-        cl.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
-
-        // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-        // call will use the 1.1 encoding
-        string ref13 = "test -e 1.3:" + app.getTestEndpoint(0);
-        Test.MyClassPrx cl13 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref13));
-        cl13.ice_ping();
-        cl13.end_ice_ping(cl13.begin_ice_ping());
+                output.WriteLine("ok");
 
-        try
-        {
-            // Send request with bogus 1.2 encoding.
-            Ice.EncodingVersion version = new Ice.EncodingVersion(1, 2);
-            Ice.OutputStream os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.endEncapsulation();
-            byte[] inEncaps = os.finished();
-            inEncaps[4] = version.major;
-            inEncaps[5] = version.minor;
-            byte[] outEncaps;
-            cl.ice_invoke("ice_ping", Ice.OperationMode.Normal, inEncaps,
-                                                          out outEncaps);
-            test(false);
-        }
-        catch(Ice.UnknownLocalException ex)
-        {
-            // The server thrown an UnsupportedEncodingException
-            test(ex.unknown.IndexOf("UnsupportedEncodingException") > 0);
-        }
+                output.Write("testing protocol versioning... ");
+                output.Flush();
+                ref20 = "test -p 2.0:" + helper.getTestEndpoint(0);
+                cl20 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref20));
+                try
+                {
+                    cl20.ice_ping();
+                    test(false);
+                }
+                catch(Ice.UnsupportedProtocolException)
+                {
+                    // Server 2.0 proxy doesn't support 1.0 version.
+                }
 
-        try
-        {
-            // Send request with bogus 2.0 encoding.
-            Ice.EncodingVersion version = new Ice.EncodingVersion(2, 0);
-            Ice.OutputStream os = new Ice.OutputStream(communicator);
-            os.startEncapsulation();
-            os.endEncapsulation();
-            byte[] inEncaps = os.finished();
-            inEncaps[4] = version.major;
-            inEncaps[5] = version.minor;
-            byte[] outEncaps;
-            cl.ice_invoke("ice_ping", Ice.OperationMode.Normal, inEncaps,
-                                                          out outEncaps);
-            test(false);
-        }
-        catch(Ice.UnknownLocalException ex)
-        {
-            // The server thrown an UnsupportedEncodingException
-            test(ex.unknown.IndexOf("UnsupportedEncodingException") > 0);
-        }
+                ref10 = "test -p 1.0:" + helper.getTestEndpoint(0);
+                cl10 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref10));
+                cl10.ice_ping();
+
+                // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
+                // call will use the 1.1 protocol
+                ref13 = "test -p 1.3:" + helper.getTestEndpoint(0);
+                cl13 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref13));
+                cl13.ice_ping();
+                cl13.end_ice_ping(cl13.begin_ice_ping());
+                output.WriteLine("ok");
 
-        WriteLine("ok");
+                output.Write("testing opaque endpoints... ");
+                output.Flush();
 
-        Write("testing protocol versioning... ");
-        Flush();
-        ref20 = "test -p 2.0:" + app.getTestEndpoint(0);
-        cl20 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref20));
-        try
-        {
-            cl20.ice_ping();
-            test(false);
-        }
-        catch(Ice.UnsupportedProtocolException)
-        {
-            // Server 2.0 proxy doesn't support 1.0 version.
-        }
+                try
+                {
+                    // Invalid -x option
+                    communicator.stringToProxy("id:opaque -t 99 -v abcd -x abc");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        ref10 = "test -p 1.0:" + app.getTestEndpoint(0);
-        cl10 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref10));
-        cl10.ice_ping();
-
-        // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-        // call will use the 1.1 protocol
-        ref13 = "test -p 1.3:" + app.getTestEndpoint(0);
-        cl13 = Test.MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref13));
-        cl13.ice_ping();
-        cl13.end_ice_ping(cl13.begin_ice_ping());
-        WriteLine("ok");
+                try
+                {
+                    // Missing -t and -v
+                    communicator.stringToProxy("id:opaque");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        Write("testing opaque endpoints... ");
-        Flush();
+                try
+                {
+                    // Repeated -t
+                    communicator.stringToProxy("id:opaque -t 1 -t 1 -v abcd");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Invalid -x option
-            communicator.stringToProxy("id:opaque -t 99 -v abcd -x abc");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Repeated -v
+                    communicator.stringToProxy("id:opaque -t 1 -v abcd -v abcd");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Missing -t and -v
-            communicator.stringToProxy("id:opaque");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Missing -t
+                    communicator.stringToProxy("id:opaque -v abcd");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Repeated -t
-            communicator.stringToProxy("id:opaque -t 1 -t 1 -v abcd");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Missing -v
+                    communicator.stringToProxy("id:opaque -t 1");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Repeated -v
-            communicator.stringToProxy("id:opaque -t 1 -v abcd -v abcd");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Missing arg for -t
+                    communicator.stringToProxy("id:opaque -t -v abcd");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Missing -t
-            communicator.stringToProxy("id:opaque -v abcd");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Missing arg for -v
+                    communicator.stringToProxy("id:opaque -t 1 -v");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Missing -v
-            communicator.stringToProxy("id:opaque -t 1");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Not a number for -t
+                    communicator.stringToProxy("id:opaque -t x -v abcd");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Missing arg for -t
-            communicator.stringToProxy("id:opaque -t -v abcd");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // < 0 for -t
+                    communicator.stringToProxy("id:opaque -t -1 -v abcd");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Missing arg for -v
-            communicator.stringToProxy("id:opaque -t 1 -v");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Invalid char for -v
+                    communicator.stringToProxy("id:opaque -t 99 -v x?c");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // Not a number for -t
-            communicator.stringToProxy("id:opaque -t x -v abcd");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                try
+                {
+                    // Invalid lenght for base64 input
+                    communicator.stringToProxy("id:opaque -t 99 -v xc");
+                    test(false);
+                }
+                catch(Ice.EndpointParseException)
+                {
+                }
 
-        try
-        {
-            // < 0 for -t
-            communicator.stringToProxy("id:opaque -t -1 -v abcd");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                // Legal TCP endpoint expressed as opaque endpoint
+                Ice.ObjectPrx p1 = communicator.stringToProxy("test -e 1.1:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+                string pstr = communicator.proxyToString(p1);
+                test(pstr.Equals("test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"));
+
+                // Opaque endpoint encoded with 1.1 encoding.
+                Ice.ObjectPrx p2 = communicator.stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+                test(communicator.proxyToString(p2).Equals("test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"));
 
-        try
-        {
-            // Invalid char for -v
-            communicator.stringToProxy("id:opaque -t 99 -v x?c");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                if(communicator.getProperties().getPropertyAsInt("Ice.IPv6") == 0)
+                {
+                    // Working?
+                    bool ssl = communicator.getProperties().getProperty("Ice.Default.Protocol").Equals("ssl");
+                    bool tcp = communicator.getProperties().getProperty("Ice.Default.Protocol").Equals("tcp");
+
+                    // Two legal TCP endpoints expressed as opaque endpoints
+                    p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMusuAAAQJwAAAA==");
+                    pstr = communicator.proxyToString(p1);
+                    test(pstr.Equals("test -t -e 1.0:tcp -h 127.0.0.1 -p 12010 -t 10000:tcp -h 127.0.0.2 -p 12011 -t 10000"));
+
+                    // Test that an SSL endpoint and a nonsense endpoint get written back out as an opaque endpoint.
+                    p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 2 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -e 1.0 -t 99 -v abch");
+                    pstr = communicator.proxyToString(p1);
+                    if(ssl)
+                    {
+                        test(pstr.Equals("test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch"));
+                    }
+                    else if(tcp)
+                    {
+                        test(pstr.Equals(
+                            "test -t -e 1.0:opaque -t 2 -e 1.0 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch"));
+                    }
+                }
 
-        try
-        {
-            // Invalid lenght for base64 input
-            communicator.stringToProxy("id:opaque -t 99 -v xc");
-            test(false);
-        }
-        catch(Ice.EndpointParseException)
-        {
-        }
+                output.WriteLine("ok");
 
-        // Legal TCP endpoint expressed as opaque endpoint
-        Ice.ObjectPrx p1 = communicator.stringToProxy("test -e 1.1:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
-        string pstr = communicator.proxyToString(p1);
-        test(pstr.Equals("test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"));
-
-        // Opaque endpoint encoded with 1.1 encoding.
-        Ice.ObjectPrx p2 = communicator.stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
-        test(communicator.proxyToString(p2).Equals("test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"));
+                output.Write("testing communicator shutdown/destroy... ");
+                output.Flush();
+                {
+                    Ice.Communicator com = Ice.Util.initialize();
+                    com.shutdown();
+                    test(com.isShutdown());
+                    com.waitForShutdown();
+                    com.destroy();
+                    com.shutdown();
+                    test(com.isShutdown());
+                    com.waitForShutdown();
+                    com.destroy();
+                }
+                output.WriteLine("ok");
 
-        if(communicator.getProperties().getPropertyAsInt("Ice.IPv6") == 0)
-        {
-            // Working?
-            bool ssl = communicator.getProperties().getProperty("Ice.Default.Protocol").Equals("ssl");
-            bool tcp = communicator.getProperties().getProperty("Ice.Default.Protocol").Equals("tcp");
-
-            // Two legal TCP endpoints expressed as opaque endpoints
-            p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMusuAAAQJwAAAA==");
-            pstr = communicator.proxyToString(p1);
-            test(pstr.Equals("test -t -e 1.0:tcp -h 127.0.0.1 -p 12010 -t 10000:tcp -h 127.0.0.2 -p 12011 -t 10000"));
-
-            // Test that an SSL endpoint and a nonsense endpoint get written back out as an opaque endpoint.
-            p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 2 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -e 1.0 -t 99 -v abch");
-            pstr = communicator.proxyToString(p1);
-            if(ssl)
-            {
-                test(pstr.Equals("test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch"));
-            }
-            else if(tcp)
-            {
-                test(pstr.Equals(
-                    "test -t -e 1.0:opaque -t 2 -e 1.0 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch"));
+                return cl;
             }
         }
-
-        WriteLine("ok");
-
-        Write("testing communicator shutdown/destroy... ");
-        Flush();
-        {
-            Ice.Communicator com = Ice.Util.initialize();
-            com.shutdown();
-            test(com.isShutdown());
-            com.waitForShutdown();
-            com.destroy();
-            com.shutdown();
-            test(com.isShutdown());
-            com.waitForShutdown();
-            com.destroy();
-        }
-        WriteLine("ok");
-
-        return cl;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/proxy/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace proxy
     {
-        Test.MyClassPrx myClass = AllTests.allTests(this);
-        myClass.shutdown();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var myClass = AllTests.allTests(this);
+                    myClass.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/proxy/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2"); // For nested AMI.
-        initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static int Main(String[] args)
+    namespace proxy
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.ThreadPool.Client.Size", "2"); // For nested AMI.
+                properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                    //adapter.activate(); // Don't activate OA to ensure collocation is used.
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(String[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -46,14 +46,14 @@
     <Compile Include="..\..\..\MyDerivedClassI.cs">
       <Link>MyDerivedClassI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -67,15 +67,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../MyDerivedClassI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../MyDerivedClassI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyDerivedClassI.cs">
       <Link>MyDerivedClassI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyDerivedClassI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,51 +17,50 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\MyDerivedClassAMDI.cs">
       <Link>MyDerivedClassAMDI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Server.cs">
-      <Link>Server.cs</Link>
+    <Compile Include="..\..\..\ServerAMD.cs">
+      <Link>ServerAMD.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../MyDerivedClassAMDI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../MyDerivedClassAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.proxy</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+      <Compile Include="../../../AllTests.cs" />
+      <Compile Include="../../../Client.cs" />
+      <Compile Include="../../../Collocated.cs" />
+      <Compile Include="../../../MyDerivedClassAMDI.cs" />
+      <Compile Include="../../../MyDerivedClassI.cs" />
+      <Compile Include="../../../Server.cs" />
+      <Compile Include="../../../ServerAMD.cs" />
+      <Compile Include="generated\Test.cs">
+          <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+      </Compile>
+      <Compile Include="generated\TestAMD.cs">
+          <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+      </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+      <SliceCompile Include="../../../Test.ice" />
+      <SliceCompile Include="../../../TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 
-public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
+namespace Ice
 {
-    public MyDerivedClassI()
-    {
-    }
-
-    public override Task<Ice.ObjectPrx> echoAsync(Ice.ObjectPrx obj, Ice.Current c)
-    {
-        return Task.FromResult<Ice.ObjectPrx>(obj);
-    }
-
-    public override Task shutdownAsync(Ice.Current current)
+    namespace proxy
     {
-        current.adapter.getCommunicator().shutdown();
-        return null;
+        namespace AMD
+        {
+            public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
+            {
+                public MyDerivedClassI()
+                {
+                }
+
+                public override Task<Ice.ObjectPrx> echoAsync(Ice.ObjectPrx obj, Ice.Current c)
+                {
+                    return Task.FromResult(obj);
+                }
+
+                public override Task shutdownAsync(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                    return null;
+                }
+
+                public override Task<Dictionary<string, string>> getContextAsync(Ice.Current current)
+                {
+                    return Task.FromResult(_ctx);
+                }
+
+                public override bool ice_isA(string s, Ice.Current current)
+                {
+                    _ctx = current.ctx;
+                    return base.ice_isA(s, current);
+                }
+
+                private Dictionary<string, string> _ctx;
+            }
+        }
     }
-
-    public override Task<Dictionary<string, string>> getContextAsync(Ice.Current current)
-    {
-        return Task.FromResult<Dictionary<string, string>>(_ctx);
-    }
-
-    public override bool ice_isA(string s, Ice.Current current)
-    {
-        _ctx = current.ctx;
-        return base.ice_isA(s, current);
-    }
-
-    private Dictionary<string, string> _ctx;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/MyDerivedClassI.cs zeroc-ice-3.7.2/csharp/test/Ice/proxy/MyDerivedClassI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/MyDerivedClassI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/MyDerivedClassI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,41 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 
-public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
+namespace Ice
 {
-    public MyDerivedClassI()
+    namespace proxy
     {
-    }
+        public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_
+        {
+            public MyDerivedClassI()
+            {
+            }
+
+            public override Ice.ObjectPrx echo(Ice.ObjectPrx obj, Ice.Current c)
+            {
+                return obj;
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            public override Dictionary<string, string> getContext(Ice.Current current)
+            {
+                return _ctx;
+            }
+
+            public override bool ice_isA(string s, Ice.Current current)
+            {
+                _ctx = current.ctx;
+                return base.ice_isA(s, current);
+            }
 
-    public override Ice.ObjectPrx echo(Ice.ObjectPrx obj, Ice.Current c)
-    {
-        return obj;
+            private Dictionary<string, string> _ctx;
+        }
     }
-
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    public override Dictionary<string, string> getContext(Ice.Current current)
-    {
-        return _ctx;
-    }
-
-    public override bool ice_isA(string s, Ice.Current current)
-    {
-        _ctx = current.ctx;
-        return base.ice_isA(s, current);
-    }
-
-    private Dictionary<string, string> _ctx;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/proxy/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/ServerAMD.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,39 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+namespace Ice
+{
+    namespace proxy
+    {
+        namespace AMD
+        {
+            public class Server : global::Test.TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    var properties = createTestProperties(ref args);
+                    //
+                    // We don't want connection warnings because of the timeout test.
+                    //
+                    properties.setProperty("Ice.Warn.Connections", "0");
+                    properties.setProperty("Ice.Warn.Dispatch", "0");
+                    using(var communicator = initialize(properties))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        var adapter = communicator.createObjectAdapter("TestAdapter");
+                        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                        adapter.activate();
+                        serverReady();
+                        communicator.waitForShutdown();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return global::Test.TestDriver.runTest<Server>(args);
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/proxy/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        //
-        // We don't want connection warnings because of the timeout test.
-        //
-        communicator().getProperties().setProperty("Ice.Warn.Connections", "0");
-        communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0");
-
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace proxy
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                //
+                // We don't want connection warnings because of the timeout test.
+                //
+                properties.setProperty("Ice.Warn.Connections", "0");
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/proxy/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/Current.ice>
 
+["cs:namespace:Ice.proxy.AMD"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/Current.ice>
 
+["cs:namespace:Ice.proxy"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/retry/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,254 +1,259 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Diagnostics;
 using System.Threading;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    private class Callback
+    namespace retry
     {
-        internal Callback()
+        public class AllTests : global::Test.AllTests
         {
-            _called = false;
-        }
-
-        public void check()
-        {
-            lock(this)
+            private class Callback
             {
-                while(!_called)
+                internal Callback()
                 {
-                    Monitor.Wait(this);
+                    _called = false;
                 }
 
-                _called = false;
-            }
-        }
+                public void check()
+                {
+                    lock(this)
+                    {
+                        while(!_called)
+                        {
+                            Monitor.Wait(this);
+                        }
 
-        public void called()
-        {
-            lock(this)
-            {
-                Debug.Assert(!_called);
-                _called = true;
-                Monitor.Pulse(this);
-            }
-        }
+                        _called = false;
+                    }
+                }
 
-        private bool _called;
-    }
+                public void called()
+                {
+                    lock(this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        Monitor.Pulse(this);
+                    }
+                }
 
-    static public Test.RetryPrx
-    allTests(TestCommon.Application app, Ice.Communicator communicator2, string rf)
-    {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        Ice.ObjectPrx base1 = communicator.stringToProxy(rf);
-        test(base1 != null);
-        Ice.ObjectPrx base2 = communicator.stringToProxy(rf);
-        test(base2 != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        Test.RetryPrx retry1 = Test.RetryPrxHelper.checkedCast(base1);
-        test(retry1 != null);
-        test(retry1.Equals(base1));
-        Test.RetryPrx retry2 = Test.RetryPrxHelper.checkedCast(base2);
-        test(retry2 != null);
-        test(retry2.Equals(base2));
-        WriteLine("ok");
-
-        Write("calling regular operation with first proxy... ");
-        Flush();
-        retry1.op(false);
-        WriteLine("ok");
-
-        Instrumentation.testInvocationCount(3);
-
-        Write("calling operation to kill connection with second proxy... ");
-        Flush();
-        try
-        {
-            retry2.op(true);
-            test(false);
-        }
-        catch(Ice.UnknownLocalException)
-        {
-            // Expected with collocation
-        }
-        catch(Ice.ConnectionLostException)
-        {
-        }
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(1);
-        Instrumentation.testRetryCount(0);
-        WriteLine("ok");
-
-        Write("calling regular operation with first proxy again... ");
-        Flush();
-        retry1.op(false);
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(0);
-        Instrumentation.testRetryCount(0);
-        WriteLine("ok");
-
-        Callback cb = new Callback();
-
-        Write("calling regular AMI operation with first proxy... ");
-        retry1.begin_op(false).whenCompleted(
-            () =>
-            {
-                cb.called();
-            },
-            (Ice.Exception ex) =>
-            {
-                test(false);
-            });
-        cb.check();
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(0);
-        Instrumentation.testRetryCount(0);
-        WriteLine("ok");
-
-        Write("calling AMI operation to kill connection with second proxy... ");
-        retry2.begin_op(true).whenCompleted(
-            () =>
-            {
-                test(false);
-            },
-            (Ice.Exception ex) =>
-            {
-                test(ex is Ice.ConnectionLostException || ex is Ice.UnknownLocalException);
-                cb.called();
-            });
-        cb.check();
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(1);
-        Instrumentation.testRetryCount(0);
-        WriteLine("ok");
-
-        Write("calling regular AMI operation with first proxy again... ");
-        retry1.begin_op(false).whenCompleted(
-            () =>
-            {
-                cb.called();
-            },
-            (Ice.Exception ex) =>
-            {
-                test(false);
-            });
-        cb.check();
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(0);
-        Instrumentation.testRetryCount(0);
-        WriteLine("ok");
-
-        Write("testing idempotent operation... ");
-        test(retry1.opIdempotent(4) == 4);
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(0);
-        Instrumentation.testRetryCount(4);
-        test(retry1.end_opIdempotent(retry1.begin_opIdempotent(4)) == 4);
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(0);
-        Instrumentation.testRetryCount(4);
-        WriteLine("ok");
+                private bool _called;
+            }
 
-        Write("testing non-idempotent operation... ");
-        try
-        {
-            retry1.opNotIdempotent();
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(1);
-        Instrumentation.testRetryCount(0);
-        try
-        {
-            retry1.end_opNotIdempotent(retry1.begin_opNotIdempotent());
-            test(false);
-        }
-        catch(Ice.LocalException)
-        {
-        }
-        Instrumentation.testInvocationCount(1);
-        Instrumentation.testFailureCount(1);
-        Instrumentation.testRetryCount(0);
-        WriteLine("ok");
+            static public Test.RetryPrx
+            allTests(global::Test.TestHelper helper,
+                     Ice.Communicator communicator,
+                     Ice.Communicator communicator2,
+                     string rf)
+            {
+                Instrumentation.testInvocationReset();
+
+                var output = helper.getWriter();
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                var base1 = communicator.stringToProxy(rf);
+                test(base1 != null);
+                var base2 = communicator.stringToProxy(rf);
+                test(base2 != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                Test.RetryPrx retry1 = Test.RetryPrxHelper.checkedCast(base1);
+                test(retry1 != null);
+                test(retry1.Equals(base1));
+                Test.RetryPrx retry2 = Test.RetryPrxHelper.checkedCast(base2);
+                test(retry2 != null);
+                test(retry2.Equals(base2));
+                output.WriteLine("ok");
+
+                output.Write("calling regular operation with first proxy... ");
+                output.Flush();
+                retry1.op(false);
+                output.WriteLine("ok");
+
+                Instrumentation.testInvocationCount(3);
+
+                output.Write("calling operation to kill connection with second proxy... ");
+                output.Flush();
+                try
+                {
+                    retry2.op(true);
+                    test(false);
+                }
+                catch(Ice.UnknownLocalException)
+                {
+                    // Expected with collocation
+                }
+                catch(Ice.ConnectionLostException)
+                {
+                }
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(1);
+                Instrumentation.testRetryCount(0);
+                output.WriteLine("ok");
+
+                output.Write("calling regular operation with first proxy again... ");
+                output.Flush();
+                retry1.op(false);
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(0);
+                Instrumentation.testRetryCount(0);
+                output.WriteLine("ok");
+
+                Callback cb = new Callback();
+
+                output.Write("calling regular AMI operation with first proxy... ");
+                retry1.begin_op(false).whenCompleted(
+                   () =>
+                    {
+                        cb.called();
+                    },
+                   (Ice.Exception ex) =>
+                    {
+                        test(false);
+                    });
+                cb.check();
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(0);
+                Instrumentation.testRetryCount(0);
+                output.WriteLine("ok");
+
+                output.Write("calling AMI operation to kill connection with second proxy... ");
+                retry2.begin_op(true).whenCompleted(
+                   () =>
+                    {
+                        test(false);
+                    },
+                   (Ice.Exception ex) =>
+                    {
+                        test(ex is Ice.ConnectionLostException || ex is Ice.UnknownLocalException);
+                        cb.called();
+                    });
+                cb.check();
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(1);
+                Instrumentation.testRetryCount(0);
+                output.WriteLine("ok");
+
+                output.Write("calling regular AMI operation with first proxy again... ");
+                retry1.begin_op(false).whenCompleted(
+                   () =>
+                    {
+                        cb.called();
+                    },
+                   (Ice.Exception ex) =>
+                    {
+                        test(false);
+                    });
+                cb.check();
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(0);
+                Instrumentation.testRetryCount(0);
+                output.WriteLine("ok");
+
+                output.Write("testing idempotent operation... ");
+                test(retry1.opIdempotent(4) == 4);
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(0);
+                Instrumentation.testRetryCount(4);
+                test(retry1.end_opIdempotent(retry1.begin_opIdempotent(4)) == 4);
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(0);
+                Instrumentation.testRetryCount(4);
+                output.WriteLine("ok");
 
-        if(retry1.ice_getConnection() == null)
-        {
-            Instrumentation.testInvocationCount(1);
+                output.Write("testing non-idempotent operation... ");
+                try
+                {
+                    retry1.opNotIdempotent();
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(1);
+                Instrumentation.testRetryCount(0);
+                try
+                {
+                    retry1.end_opNotIdempotent(retry1.begin_opNotIdempotent());
+                    test(false);
+                }
+                catch(Ice.LocalException)
+                {
+                }
+                Instrumentation.testInvocationCount(1);
+                Instrumentation.testFailureCount(1);
+                Instrumentation.testRetryCount(0);
+                output.WriteLine("ok");
 
-            Write("testing system exception... ");
-            try
-            {
-                retry1.opSystemException();
-                test(false);
-            }
-            catch(SystemFailure)
-            {
-            }
-            Instrumentation.testInvocationCount(1);
-            Instrumentation.testFailureCount(1);
-            Instrumentation.testRetryCount(0);
-            try
-            {
-                retry1.end_opSystemException(retry1.begin_opSystemException());
-                test(false);
-            }
-            catch(SystemFailure)
-            {
-            }
-            Instrumentation.testInvocationCount(1);
-            Instrumentation.testFailureCount(1);
-            Instrumentation.testRetryCount(0);
-            WriteLine("ok");
-        }
+                if(retry1.ice_getConnection() == null)
+                {
+                    Instrumentation.testInvocationCount(1);
 
-        Write("testing invocation timeout and retries... ");
-        Flush();
+                    output.Write("testing system exception... ");
+                    try
+                    {
+                        retry1.opSystemException();
+                        test(false);
+                    }
+                    catch(SystemFailure)
+                    {
+                    }
+                    Instrumentation.testInvocationCount(1);
+                    Instrumentation.testFailureCount(1);
+                    Instrumentation.testRetryCount(0);
+                    try
+                    {
+                        retry1.end_opSystemException(retry1.begin_opSystemException());
+                        test(false);
+                    }
+                    catch(SystemFailure)
+                    {
+                    }
+                    Instrumentation.testInvocationCount(1);
+                    Instrumentation.testFailureCount(1);
+                    Instrumentation.testRetryCount(0);
+                    output.WriteLine("ok");
+                }
 
-        retry2 = Test.RetryPrxHelper.checkedCast(communicator2.stringToProxy(retry1.ToString()));
-        try
-        {
-            // No more than 2 retries before timeout kicks-in
-            ((Test.RetryPrx)retry2.ice_invocationTimeout(500)).opIdempotent(4);
-            test(false);
-        }
-        catch(Ice.InvocationTimeoutException)
-        {
-            Instrumentation.testRetryCount(2);
-            retry2.opIdempotent(-1); // Reset the counter
-            Instrumentation.testRetryCount(-1);
-        }
-        try
-        {
-            // No more than 2 retries before timeout kicks-in
-            Test.RetryPrx prx = (Test.RetryPrx)retry2.ice_invocationTimeout(500);
-            prx.end_opIdempotent(prx.begin_opIdempotent(4));
-            test(false);
-        }
-        catch(Ice.InvocationTimeoutException)
-        {
-            Instrumentation.testRetryCount(2);
-            retry2.opIdempotent(-1); // Reset the counter
-            Instrumentation.testRetryCount(-1);
+                output.Write("testing invocation timeout and retries... ");
+                output.Flush();
+
+                retry2 = Test.RetryPrxHelper.checkedCast(communicator2.stringToProxy(retry1.ToString()));
+                try
+                {
+                    // No more than 2 retries before timeout kicks-in
+                   ((Test.RetryPrx)retry2.ice_invocationTimeout(500)).opIdempotent(4);
+                    test(false);
+                }
+                catch(Ice.InvocationTimeoutException)
+                {
+                    Instrumentation.testRetryCount(2);
+                    retry2.opIdempotent(-1); // Reset the counter
+                    Instrumentation.testRetryCount(-1);
+                }
+                try
+                {
+                    // No more than 2 retries before timeout kicks-in
+                    Test.RetryPrx prx =(Test.RetryPrx)retry2.ice_invocationTimeout(500);
+                    prx.end_opIdempotent(prx.begin_opIdempotent(4));
+                    test(false);
+                }
+                catch(Ice.InvocationTimeoutException)
+                {
+                    Instrumentation.testRetryCount(2);
+                    retry2.opIdempotent(-1); // Reset the counter
+                    Instrumentation.testRetryCount(-1);
+                }
+                output.WriteLine("ok");
+                return retry1;
+            }
         }
-        WriteLine("ok");
-        return retry1;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/retry/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,48 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace retry
     {
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        Ice.InitializationData initData2 = new Ice.InitializationData();
-        initData2.properties = communicator().getProperties().ice_clone_();
-        initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = Instrumentation.getObserver();
-        Ice.Communicator communicator2 = Ice.Util.initialize(initData2);
-
-        try
+        public class Client : TestHelper
         {
-            Test.RetryPrx retry = AllTests.allTests(this, communicator2, "retry:" + getTestEndpoint(0));
-            retry.shutdown();
-            return 0;
-        }
-        finally
-        {
-            communicator2.destroy();
+            public override void run(string[] args)
+            {
+                var initData = new Ice.InitializationData();
+                initData.observer = Instrumentation.getObserver();
+
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
+
+                //
+                // This test kills connections, so we don't want warnings.
+                //
+                initData.properties.setProperty("Ice.Warn.Connections", "0");
+                using(var communicator = initialize(initData))
+                {
+                    //
+                    // Configure a second communicator for the invocation timeout
+                    // + retry test, we need to configure a large retry interval
+                    // to avoid time-sensitive failures.
+                    //
+                    initData.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+                    initData.observer = Instrumentation.getObserver();
+                    using(var communicator2 = initialize(initData))
+                    {
+                        var retry = AllTests.allTests(this, communicator, communicator2, "retry:" + getTestEndpoint(0));
+                        retry.shutdown();
+                    }
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
         }
     }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.observer = Instrumentation.getObserver();
-
-        initData.properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
-    }
-
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/retry/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,62 +1,51 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        Ice.InitializationData initData2 = new Ice.InitializationData();
-        initData2.properties = communicator().getProperties().ice_clone_();
-        initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = Instrumentation.getObserver();
-        Ice.Communicator communicator2 = Ice.Util.initialize(initData2);
-
-        communicator().createObjectAdapter("").add(new RetryI(), Ice.Util.stringToIdentity("retry"));
-        communicator2.createObjectAdapter("").add(new RetryI(), Ice.Util.stringToIdentity("retry"));
-
-        Test.RetryPrx retry = AllTests.allTests(this, communicator2, "retry");
-        retry.shutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
+    namespace retry
     {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.observer = Instrumentation.getObserver();
-
-        initData.properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new Ice.InitializationData();
+                initData.observer = Instrumentation.getObserver();
+
+                initData.properties = createTestProperties(ref args);
+                initData.properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
+                initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+
+                //
+                // This test kills connections, so we don't want warnings.
+                //
+                initData.properties.setProperty("Ice.Warn.Connections", "0");
+                using(var communicator = initialize(initData))
+                {
+                    //
+                    // Configure a second communicator for the invocation timeout
+                    // + retry test, we need to configure a large retry interval
+                    // to avoid time-sensitive failures.
+                    //
+                    initData.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+                    using(var communicator2 = initialize(initData))
+                    {
+                        communicator.createObjectAdapter("").add(new RetryI(), Ice.Util.stringToIdentity("retry"));
+                        communicator2.createObjectAdapter("").add(new RetryI(), Ice.Util.stringToIdentity("retry"));
+
+                        Test.RetryPrx retry = AllTests.allTests(this, communicator, communicator2, "retry");
+                        retry.shutdown();
+                    }
+                }
+            }
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
 
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/Instrumentation.cs zeroc-ice-3.7.2/csharp/test/Ice/retry/Instrumentation.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/Instrumentation.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/Instrumentation.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,180 +1,189 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public class Instrumentation
+namespace Ice
 {
-    static Object mutex = new Object();
-
-    class InvocationObserverI : Ice.Instrumentation.InvocationObserver
+    namespace retry
     {
-        public void
-        attach()
+        public class Instrumentation
         {
-        }
+            static object mutex = new object();
 
-        public void
-        detach()
-        {
-            lock(mutex)
+            class InvocationObserverI : Ice.Instrumentation.InvocationObserver
             {
-                ++nInvocation;
-            }
-        }
+                public void
+                attach()
+                {
+                }
 
-        public void
-        failed(string msg)
-        {
-            lock(mutex)
-            {
-                ++nFailure;
-            }
-        }
+                public void
+                detach()
+                {
+                    lock(mutex)
+                    {
+                        ++nInvocation;
+                    }
+                }
 
-        public void
-        retried()
-        {
-            lock(mutex)
-            {
-                ++nRetry;
-            }
-        }
+                public void
+                failed(string msg)
+                {
+                    lock(mutex)
+                    {
+                        ++nFailure;
+                    }
+                }
 
-        public void
-        userException()
-        {
-        }
+                public void
+                retried()
+                {
+                    lock(mutex)
+                    {
+                        ++nRetry;
+                    }
+                }
 
-        public Ice.Instrumentation.RemoteObserver
-        getRemoteObserver(Ice.ConnectionInfo ci, Ice.Endpoint ei, int i, int j)
-        {
-            return null;
-        }
+                public void
+                userException()
+                {
+                }
 
-        public Ice.Instrumentation.CollocatedObserver
-        getCollocatedObserver(Ice.ObjectAdapter adapter, int i , int j)
-        {
-            return null;
-        }
+                public Ice.Instrumentation.RemoteObserver
+                getRemoteObserver(Ice.ConnectionInfo ci, Ice.Endpoint ei, int i, int j)
+                {
+                    return null;
+                }
 
-    };
-    static private Ice.Instrumentation.InvocationObserver invocationObserver = new InvocationObserverI();
+                public Ice.Instrumentation.CollocatedObserver
+                getCollocatedObserver(Ice.ObjectAdapter adapter, int i, int j)
+                {
+                    return null;
+                }
 
-    class CommunicatorObserverI : Ice.Instrumentation.CommunicatorObserver
-    {
-        public Ice.Instrumentation.Observer
-        getConnectionEstablishmentObserver(Ice.Endpoint e, string s)
-        {
-            return null;
-        }
+            };
+            static private Ice.Instrumentation.InvocationObserver invocationObserver = new InvocationObserverI();
 
-        public Ice.Instrumentation.Observer
-        getEndpointLookupObserver(Ice.Endpoint e)
-        {
-            return null;
-        }
+            class CommunicatorObserverI : Ice.Instrumentation.CommunicatorObserver
+            {
+                public Ice.Instrumentation.Observer
+                getConnectionEstablishmentObserver(Ice.Endpoint e, string s)
+                {
+                    return null;
+                }
 
-        public Ice.Instrumentation.ConnectionObserver
-        getConnectionObserver(Ice.ConnectionInfo ci,
-                              Ice.Endpoint ei,
-                              Ice.Instrumentation.ConnectionState s,
-                              Ice.Instrumentation.ConnectionObserver o)
-        {
-            return null;
-        }
+                public Ice.Instrumentation.Observer
+                getEndpointLookupObserver(Ice.Endpoint e)
+                {
+                    return null;
+                }
 
-        public Ice.Instrumentation.ThreadObserver
-        getThreadObserver(string p,
-                          string n,
-                          Ice.Instrumentation.ThreadState s,
-                          Ice.Instrumentation.ThreadObserver o)
-        {
-            return null;
-        }
+                public Ice.Instrumentation.ConnectionObserver
+                getConnectionObserver(Ice.ConnectionInfo ci,
+                                      Ice.Endpoint ei,
+                                      Ice.Instrumentation.ConnectionState s,
+                                      Ice.Instrumentation.ConnectionObserver o)
+                {
+                    return null;
+                }
 
-        public Ice.Instrumentation.InvocationObserver
-        getInvocationObserver(Ice.ObjectPrx p, string o, Dictionary<string, string> c)
-        {
-            return invocationObserver;
-        }
+                public Ice.Instrumentation.ThreadObserver
+                getThreadObserver(string p,
+                                  string n,
+                                  Ice.Instrumentation.ThreadState s,
+                                  Ice.Instrumentation.ThreadObserver o)
+                {
+                    return null;
+                }
 
-        public Ice.Instrumentation.DispatchObserver
-        getDispatchObserver(Ice.Current c, int i)
-        {
-            return null;
-        }
+                public Ice.Instrumentation.InvocationObserver
+                getInvocationObserver(Ice.ObjectPrx p, string o, Dictionary<string, string> c)
+                {
+                    return invocationObserver;
+                }
 
-        public void
-        setObserverUpdater(Ice.Instrumentation.ObserverUpdater u)
-        {
-        }
-    };
+                public Ice.Instrumentation.DispatchObserver
+                getDispatchObserver(Ice.Current c, int i)
+                {
+                    return null;
+                }
 
-    static private Ice.Instrumentation.CommunicatorObserver communicatorObserver = new CommunicatorObserverI();
+                public void
+                setObserverUpdater(Ice.Instrumentation.ObserverUpdater u)
+                {
+                }
+            };
 
-    static public Ice.Instrumentation.CommunicatorObserver
-    getObserver()
-    {
-        return communicatorObserver;
-    }
+            static private Ice.Instrumentation.CommunicatorObserver communicatorObserver = new CommunicatorObserverI();
 
-    static private void
-    testEqual(ref int value, int expected)
-    {
-        if(expected < 0)
-        {
-            value = 0;
-            return;
-        }
+            static public Ice.Instrumentation.CommunicatorObserver
+            getObserver()
+            {
+                return communicatorObserver;
+            }
 
-        int retry = 0;
-        while(++retry < 100)
-        {
-            lock(mutex)
+            static private void
+            testEqual(ref int value, int expected)
             {
-                if(value == expected)
+                if(expected < 0)
                 {
-                    break;
+                    value = 0;
+                    return;
                 }
+
+                int retry = 0;
+                while(++retry < 100)
+                {
+                    lock(mutex)
+                    {
+                        if(value == expected)
+                        {
+                            break;
+                        }
+                    }
+                    System.Threading.Thread.Sleep(10);
+                }
+                if(value != expected)
+                {
+                    System.Console.Error.WriteLine("value = " + value + ", expected = " + expected);
+                    System.Diagnostics.Debug.Assert(false);
+                    throw new System.Exception();
+                }
+                value = 0;
             }
-            System.Threading.Thread.Sleep(10);
-        }
-        if(value != expected)
-        {
-            System.Console.Error.WriteLine("value = " + value + ", expected = " + expected);
-            System.Diagnostics.Debug.Assert(false);
-            throw new System.Exception();
-        }
-        value = 0;
-    }
 
-    static public void
-    testRetryCount(int expected)
-    {
-        testEqual(ref nRetry, expected);
-    }
+            static public void
+            testRetryCount(int expected)
+            {
+                testEqual(ref nRetry, expected);
+            }
 
-    static public void
-    testFailureCount(int expected)
-    {
-        testEqual(ref nFailure, expected);
-    }
+            static public void
+            testFailureCount(int expected)
+            {
+                testEqual(ref nFailure, expected);
+            }
 
-    static public void
-    testInvocationCount(int expected)
-    {
-        testEqual(ref nInvocation, expected);
-    }
+            static public void
+            testInvocationCount(int expected)
+            {
+                testEqual(ref nInvocation, expected);
+            }
+
+            static public void
+            testInvocationReset()
+            {
+                nRetry = 0;
+                nFailure = 0;
+                nInvocation = 0;
+            }
 
-    static private int nRetry = 0;
-    static private int nFailure = 0;
-    static private int nInvocation = 0;
-};
+            static private int nRetry = 0;
+            static private int nFailure = 0;
+            static private int nInvocation = 0;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -49,24 +49,24 @@
     <Compile Include="..\..\..\SystemFailure.cs">
       <Link>SystemFailure.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../Instrumentation.cs"/>
-    <Compile Include="../../../SystemFailure.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Instrumentation.cs" />
+    <Compile Include="../../../SystemFailure.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -52,14 +52,14 @@
     <Compile Include="..\..\..\SystemFailure.cs">
       <Link>SystemFailure.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -73,15 +73,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon\TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <Compile Include="../../../Instrumentation.cs"/>
-    <Compile Include="../../../RetryI.cs"/>
-    <Compile Include="../../../SystemFailure.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon\TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Instrumentation.cs" />
+    <Compile Include="../../../RetryI.cs" />
+    <Compile Include="../../../SystemFailure.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\RetryI.cs">
       <Link>RetryI.cs</Link>
@@ -46,24 +46,24 @@
     <Compile Include="..\..\..\SystemFailure.cs">
       <Link>SystemFailure.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../RetryI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <Compile Include="../../../SystemFailure.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../RetryI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../SystemFailure.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.retry</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Instrumentation.cs" />
+    <Compile Include="../../../RetryI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../SystemFailure.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/RetryI.cs zeroc-ice-3.7.2/csharp/test/Ice/retry/RetryI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/RetryI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/RetryI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,59 +1,60 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public sealed class RetryI : Test.RetryDisp_
+namespace Ice
 {
-    public RetryI()
-    {
-    }
-
-    public override void op(bool kill, Ice.Current current)
+    namespace retry
     {
-        if(kill)
+        public sealed class RetryI : Test.RetryDisp_
         {
-            if(current.con != null)
+            public RetryI()
             {
-                current.con.close(Ice.ConnectionClose.Forcefully);
             }
-            else
+
+            public override void op(bool kill, Ice.Current current)
             {
-                throw new Ice.ConnectionLostException();
+                if(kill)
+                {
+                    if(current.con != null)
+                    {
+                        current.con.close(Ice.ConnectionClose.Forcefully);
+                    }
+                    else
+                    {
+                        throw new Ice.ConnectionLostException();
+                    }
+                }
             }
-        }
-    }
 
-    public override int opIdempotent(int nRetry, Ice.Current current)
-    {
-        if(nRetry > _counter)
-        {
-            ++_counter;
-            throw new Ice.ConnectionLostException();
-        }
-        int counter = _counter;
-        _counter = 0;
-        return counter;
-    }
+            public override int opIdempotent(int nRetry, Ice.Current current)
+            {
+                if(nRetry > _counter)
+                {
+                    ++_counter;
+                    throw new Ice.ConnectionLostException();
+                }
+                int counter = _counter;
+                _counter = 0;
+                return counter;
+            }
 
-    public override void opNotIdempotent(Ice.Current current)
-    {
-        throw new Ice.ConnectionLostException();
-    }
+            public override void opNotIdempotent(Ice.Current current)
+            {
+                throw new Ice.ConnectionLostException();
+            }
 
-    public override void opSystemException(Ice.Current c)
-    {
-        throw new SystemFailure();
-    }
+            public override void opSystemException(Ice.Current c)
+            {
+                throw new SystemFailure();
+            }
 
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
 
-    private int _counter;
+            private int _counter;
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/retry/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace retry
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/SystemFailure.cs zeroc-ice-3.7.2/csharp/test/Ice/retry/SystemFailure.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/SystemFailure.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/SystemFailure.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-[System.Serializable]
-public class SystemFailure : Ice.SystemException
+namespace Ice
 {
-    public override string
-    ice_id()
+    namespace retry
     {
-        return "::SystemFailure";
+        [System.Serializable]
+        public class SystemFailure : Ice.SystemException
+        {
+            public override string
+            ice_id()
+            {
+                return "::SystemFailure";
+            }
+        }
     }
-};
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/retry/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/retry/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/retry/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/retry/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.retry"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/scope/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/AllTests.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,359 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Test;
+
+namespace Ice
+{
+    namespace scope
+    {
+        public class AllTests : global::Test.AllTests
+        {
+            public static void allTests(TestHelper helper)
+            {
+                var communicator = helper.communicator();
+                {
+                    var obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+                    var i = Test.IPrxHelper.checkedCast(obj);
+
+                    var s1 = new Test.S(0);
+                    Test.S s2;
+                    var s3 = i.opS(s1, out s2);
+                    test(s2.Equals(s1));
+                    test(s3.Equals(s1));
+
+                    var sseq1 = new Test.S[] { s1 };
+                    Test.S[] sseq2;
+                    var sseq3 = i.opSSeq(sseq1, out sseq2);
+                    test(sseq2[0].Equals(s1));
+                    test(sseq3[0].Equals(s1));
+
+                    Dictionary<String, Test.S> smap1 = new Dictionary<string, Test.S>();
+                    smap1["a"] = s1;
+                    Dictionary<String, Test.S> smap2;
+                    Dictionary<String, Test.S> smap3 = i.opSMap(smap1, out smap2);
+                    test(smap2["a"].Equals(s1));
+                    test(smap3["a"].Equals(s1));
+
+                    var c1 = new Test.C(s1);
+                    Test.C c2;
+                    var c3 = i.opC(c1, out c2);
+                    test(c2.s.Equals(c1.s));
+                    test(c3.s.Equals(c1.s));
+
+                    var cseq1 = new Test.C[] { c1 };
+                    Test.C[] cseq2;
+                    var cseq3 = i.opCSeq(cseq1, out cseq2);
+                    test(cseq2[0].s.Equals(s1));
+                    test(cseq3[0].s.Equals(s1));
+
+                    var cmap1 = new Dictionary<String, Test.C>();
+                    cmap1["a"] = c1;
+                    Dictionary<String, Test.C> cmap2;
+                    var cmap3 = i.opCMap(cmap1, out cmap2);
+                    test(cmap2["a"].s.Equals(s1));
+                    test(cmap3["a"].s.Equals(s1));
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+                    var i = Test.IPrxHelper.checkedCast(obj);
+
+                    Task.Run(async() =>
+                        {
+                            var s1 = new Test.S(0);
+                            var opSResult = await i.opSAsync(s1);
+                            test(s1.Equals(opSResult.returnValue));
+                            test(s1.Equals(opSResult.s2));
+
+                            var sseq1 = new Test.S[] { s1 };
+                            var opSSeqResult = await i.opSSeqAsync(sseq1);
+                            test(opSSeqResult.returnValue[0].Equals(s1));
+                            test(opSSeqResult.s2[0].Equals(s1));
+
+                            var smap1 = new Dictionary<String, Test.S>();
+                            smap1["a"] = s1;
+                            var opSMapResult = await i.opSMapAsync(smap1);
+                            test(opSMapResult.returnValue["a"].Equals(s1));
+                            test(opSMapResult.s2["a"].Equals(s1));
+
+                            var c1 = new Test.C(s1);
+                            var opCResult = await i.opCAsync(c1);
+                            test(c1.s.Equals(opCResult.returnValue.s));
+                            test(c1.s.Equals(opCResult.c2.s));
+
+                            var cseq1 = new Test.C[] { c1 };
+                            var opCSeqResult = await i.opCSeqAsync(cseq1);
+                            test(opCSeqResult.returnValue[0].s.Equals(s1));
+                            test(opCSeqResult.c2[0].s.Equals(s1));
+
+                            var cmap1 = new Dictionary<String, Test.C>();
+                            cmap1["a"] = c1;
+                            var opCMapResult = await i.opCMapAsync(cmap1);
+                            test(opCMapResult.returnValue["a"].s.Equals(s1));
+                            test(opCMapResult.c2["a"].s.Equals(s1));
+                        }).Wait();
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i2:" + helper.getTestEndpoint());
+                    Test.Inner.IPrx i = Test.Inner.IPrxHelper.checkedCast(obj);
+
+                    Test.Inner.Inner2.S s1 = new Test.Inner.Inner2.S(0);
+                    Test.Inner.Inner2.S s2;
+                    Test.Inner.Inner2.S s3 = i.opS(s1, out s2);
+                    test(s2.Equals(s1));
+                    test(s3.Equals(s1));
+
+                    Test.Inner.Inner2.S[] sseq1 = new Test.Inner.Inner2.S[] { s1 };
+                    Test.Inner.Inner2.S[] sseq2;
+                    Test.Inner.Inner2.S[] sseq3 = i.opSSeq(sseq1, out sseq2);
+                    test(sseq2[0].Equals(s1));
+                    test(sseq3[0].Equals(s1));
+
+                    Dictionary<String, Test.Inner.Inner2.S> smap1 = new Dictionary<String, Test.Inner.Inner2.S>();
+                    smap1["a"] = s1;
+                    Dictionary<String, Test.Inner.Inner2.S> smap2;
+                    Dictionary<String, Test.Inner.Inner2.S> smap3 = i.opSMap(smap1, out smap2);
+                    test(smap2["a"].Equals(s1));
+                    test(smap3["a"].Equals(s1));
+
+                    Test.Inner.Inner2.C c1 = new Test.Inner.Inner2.C(s1);
+                    Test.Inner.Inner2.C c2;
+                    Test.Inner.Inner2.C c3 = i.opC(c1, out c2);
+                    test(c2.s.Equals(c1.s));
+                    test(c3.s.Equals(c1.s));
+
+                    Test.Inner.Inner2.C[] cseq1 = new Test.Inner.Inner2.C[] { c1 };
+                    Test.Inner.Inner2.C[] cseq2;
+                    Test.Inner.Inner2.C[] cseq3 = i.opCSeq(cseq1, out cseq2);
+                    test(cseq2[0].s.Equals(s1));
+                    test(cseq3[0].s.Equals(s1));
+
+                    Dictionary<String, Test.Inner.Inner2.C> cmap1 = new Dictionary<String, Test.Inner.Inner2.C>();
+                    cmap1["a"] = c1;
+                    Dictionary<String, Test.Inner.Inner2.C> cmap2;
+                    Dictionary<String, Test.Inner.Inner2.C> cmap3 = i.opCMap(cmap1, out cmap2);
+                    test(cmap2["a"].s.Equals(s1));
+                    test(cmap3["a"].s.Equals(s1));
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i2:" + helper.getTestEndpoint());
+                    Test.Inner.IPrx i = Test.Inner.IPrxHelper.checkedCast(obj);
+
+                    Task.Run(async() =>
+                        {
+                            Test.Inner.Inner2.S s1 = new Test.Inner.Inner2.S(0);
+                            Test.Inner.I_OpSResult opSResult = await i.opSAsync(s1);
+                            test(s1.Equals(opSResult.returnValue));
+                            test(s1.Equals(opSResult.s2));
+
+                            Test.Inner.Inner2.S[] sseq1 = new Test.Inner.Inner2.S[] { s1 };
+                            Test.Inner.I_OpSSeqResult opSSeqResult = await i.opSSeqAsync(sseq1);
+                            test(opSSeqResult.returnValue[0].Equals(s1));
+                            test(opSSeqResult.s2[0].Equals(s1));
+
+                            Dictionary<String, Test.Inner.Inner2.S> smap1 = new Dictionary<String, Test.Inner.Inner2.S>();
+                            smap1["a"] = s1;
+                            Test.Inner.I_OpSMapResult opSMapResult = await i.opSMapAsync(smap1);
+                            test(opSMapResult.returnValue["a"].Equals(s1));
+                            test(opSMapResult.s2["a"].Equals(s1));
+
+                            Test.Inner.Inner2.C c1 = new Test.Inner.Inner2.C(s1);
+                            Test.Inner.I_OpCResult opCResult = await i.opCAsync(c1);
+                            test(c1.s.Equals(opCResult.returnValue.s));
+                            test(c1.s.Equals(opCResult.c2.s));
+
+                            Test.Inner.Inner2.C[] cseq1 = new Test.Inner.Inner2.C[] { c1 };
+                            Test.Inner.I_OpCSeqResult opCSeqResult = await i.opCSeqAsync(cseq1);
+                            test(opCSeqResult.returnValue[0].s.Equals(s1));
+                            test(opCSeqResult.c2[0].s.Equals(s1));
+
+                            Dictionary<String, Test.Inner.Inner2.C> cmap1 = new Dictionary<String, Test.Inner.Inner2.C>();
+                            cmap1["a"] = c1;
+                            Test.Inner.I_OpCMapResult opCMapResult = await i.opCMapAsync(cmap1);
+                            test(opCMapResult.returnValue["a"].s.Equals(s1));
+                            test(opCMapResult.c2["a"].s.Equals(s1));
+                        }).Wait();
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+                    Test.Inner.Inner2.IPrx i = Test.Inner.Inner2.IPrxHelper.checkedCast(obj);
+
+                    Test.Inner.Inner2.S s1 = new Test.Inner.Inner2.S(0);
+                    Test.Inner.Inner2.S s2;
+                    Test.Inner.Inner2.S s3 = i.opS(s1, out s2);
+                    test(s2.Equals(s1));
+                    test(s3.Equals(s1));
+
+                    Test.Inner.Inner2.S[] sseq1 = new Test.Inner.Inner2.S[] { s1 };
+                    Test.Inner.Inner2.S[] sseq2;
+                    Test.Inner.Inner2.S[] sseq3 = i.opSSeq(sseq1, out sseq2);
+                    test(sseq2[0].Equals(s1));
+                    test(sseq3[0].Equals(s1));
+
+                    Dictionary<String, Test.Inner.Inner2.S> smap1 = new Dictionary<String, Test.Inner.Inner2.S>();
+                    smap1["a"] = s1;
+                    Dictionary<String, Test.Inner.Inner2.S> smap2;
+                    Dictionary<String, Test.Inner.Inner2.S> smap3 = i.opSMap(smap1, out smap2);
+                    test(smap2["a"].Equals(s1));
+                    test(smap3["a"].Equals(s1));
+
+                    Test.Inner.Inner2.C c1 = new Test.Inner.Inner2.C(s1);
+                    Test.Inner.Inner2.C c2;
+                    Test.Inner.Inner2.C c3 = i.opC(c1, out c2);
+                    test(c2.s.Equals(c1.s));
+                    test(c3.s.Equals(c1.s));
+
+                    Test.Inner.Inner2.C[] cseq1 = new Test.Inner.Inner2.C[] { c1 };
+                    Test.Inner.Inner2.C[] cseq2;
+                    Test.Inner.Inner2.C[] cseq3 = i.opCSeq(cseq1, out cseq2);
+                    test(cseq2[0].s.Equals(s1));
+                    test(cseq3[0].s.Equals(s1));
+
+                    Dictionary<String, Test.Inner.Inner2.C> cmap1 = new Dictionary<String, Test.Inner.Inner2.C>();
+                    cmap1["a"] = c1;
+                    Dictionary<String, Test.Inner.Inner2.C> cmap2;
+                    Dictionary<String, Test.Inner.Inner2.C> cmap3 = i.opCMap(cmap1, out cmap2);
+                    test(cmap2["a"].s.Equals(s1));
+                    test(cmap3["a"].s.Equals(s1));
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+                    Test.Inner.Inner2.IPrx i = Test.Inner.Inner2.IPrxHelper.checkedCast(obj);
+
+                    Task.Run(async() =>
+                        {
+                            Test.Inner.Inner2.S s1 = new Test.Inner.Inner2.S(0);
+                            Test.Inner.Inner2.I_OpSResult opSResult = await i.opSAsync(s1);
+                            test(s1.Equals(opSResult.returnValue));
+                            test(s1.Equals(opSResult.s2));
+
+                            Test.Inner.Inner2.S[] sseq1 = new Test.Inner.Inner2.S[] { s1 };
+                            Test.Inner.Inner2.I_OpSSeqResult opSSeqResult = await i.opSSeqAsync(sseq1);
+                            test(opSSeqResult.returnValue[0].Equals(s1));
+                            test(opSSeqResult.s2[0].Equals(s1));
+
+                            Dictionary<String, Test.Inner.Inner2.S> smap1 = new Dictionary<String, Test.Inner.Inner2.S>();
+                            smap1["a"] = s1;
+                            Test.Inner.Inner2.I_OpSMapResult opSMapResult = await i.opSMapAsync(smap1);
+                            test(opSMapResult.returnValue["a"].Equals(s1));
+                            test(opSMapResult.s2["a"].Equals(s1));
+
+                            Test.Inner.Inner2.C c1 = new Test.Inner.Inner2.C(s1);
+                            Test.Inner.Inner2.I_OpCResult opCResult = await i.opCAsync(c1);
+                            test(c1.s.Equals(opCResult.returnValue.s));
+                            test(c1.s.Equals(opCResult.c2.s));
+
+                            Test.Inner.Inner2.C[] cseq1 = new Test.Inner.Inner2.C[] { c1 };
+                            Test.Inner.Inner2.I_OpCSeqResult opCSeqResult = await i.opCSeqAsync(cseq1);
+                            test(opCSeqResult.returnValue[0].s.Equals(s1));
+                            test(opCSeqResult.c2[0].s.Equals(s1));
+
+                            Dictionary<String, Test.Inner.Inner2.C> cmap1 = new Dictionary<String, Test.Inner.Inner2.C>();
+                            cmap1["a"] = c1;
+                            Test.Inner.Inner2.I_OpCMapResult opCMapResult = await i.opCMapAsync(cmap1);
+                            test(opCMapResult.returnValue["a"].s.Equals(s1));
+                            test(opCMapResult.c2["a"].s.Equals(s1));
+                        }).Wait();
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i4:" + helper.getTestEndpoint());
+                    Inner.Test.Inner2.IPrx i = Inner.Test.Inner2.IPrxHelper.checkedCast(obj);
+
+                    Test.S s1 = new Test.S(0);
+                    Test.S s2;
+                    Test.S s3 = i.opS(s1, out s2);
+                    test(s2.Equals(s1));
+                    test(s3.Equals(s1));
+
+                    Test.S[] sseq1 = new Test.S[] { s1 };
+                    Test.S[] sseq2;
+                    Test.S[] sseq3 = i.opSSeq(sseq1, out sseq2);
+                    test(sseq2[0].Equals(s1));
+                    test(sseq3[0].Equals(s1));
+
+                    Dictionary<String, Test.S> smap1 = new Dictionary<String, Test.S>();
+                    smap1["a"] = s1;
+                    Dictionary<String, Test.S> smap2;
+                    Dictionary<String, Test.S> smap3 = i.opSMap(smap1, out smap2);
+                    test(smap2["a"].Equals(s1));
+                    test(smap3["a"].Equals(s1));
+
+                    Test.C c1 = new Test.C(s1);
+                    Test.C c2;
+                    Test.C c3 = i.opC(c1, out c2);
+                    test(c2.s.Equals(c1.s));
+                    test(c3.s.Equals(c1.s));
+
+                    Test.C[] cseq1 = new Test.C[] { c1 };
+                    Test.C[] cseq2;
+                    Test.C[] cseq3 = i.opCSeq(cseq1, out cseq2);
+                    test(cseq2[0].s.Equals(s1));
+                    test(cseq3[0].s.Equals(s1));
+
+                    Dictionary<String, Test.C> cmap1 = new Dictionary<String, Test.C>();
+                    cmap1["a"] = c1;
+                    Dictionary<String, Test.C> cmap2;
+                    Dictionary<String, Test.C> cmap3 = i.opCMap(cmap1, out cmap2);
+                    test(cmap2["a"].s.Equals(s1));
+                    test(cmap3["a"].s.Equals(s1));
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i4:" + helper.getTestEndpoint());
+                    Inner.Test.Inner2.IPrx i = Inner.Test.Inner2.IPrxHelper.checkedCast(obj);
+
+                    Task.Run(async() =>
+                        {
+                            Test.S s1 = new Test.S(0);
+                            Inner.Test.Inner2.I_OpSResult opSResult = await i.opSAsync(s1);
+                            test(s1.Equals(opSResult.returnValue));
+                            test(s1.Equals(opSResult.s2));
+
+                            Test.S[] sseq1 = new Test.S[] { s1 };
+                            Inner.Test.Inner2.I_OpSSeqResult opSSeqResult = await i.opSSeqAsync(sseq1);
+                            test(opSSeqResult.returnValue[0].Equals(s1));
+                            test(opSSeqResult.s2[0].Equals(s1));
+
+                            Dictionary<String, Test.S> smap1 = new Dictionary<String, Test.S>();
+                            smap1["a"] = s1;
+                            Inner.Test.Inner2.I_OpSMapResult opSMapResult = await i.opSMapAsync(smap1);
+                            test(opSMapResult.returnValue["a"].Equals(s1));
+                            test(opSMapResult.s2["a"].Equals(s1));
+
+                            Test.C c1 = new Test.C(s1);
+                            Inner.Test.Inner2.I_OpCResult opCResult = await i.opCAsync(c1);
+                            test(c1.s.Equals(opCResult.returnValue.s));
+                            test(c1.s.Equals(opCResult.c2.s));
+
+                            Test.C[] cseq1 = new Test.C[] { c1 };
+                            Inner.Test.Inner2.I_OpCSeqResult opCSeqResult = await i.opCSeqAsync(cseq1);
+                            test(opCSeqResult.returnValue[0].s.Equals(s1));
+                            test(opCSeqResult.c2[0].s.Equals(s1));
+
+                            Dictionary<String, Test.C> cmap1 = new Dictionary<String, Test.C>();
+                            cmap1["a"] = c1;
+                            Inner.Test.Inner2.I_OpCMapResult opCMapResult = await i.opCMapAsync(cmap1);
+                            test(opCMapResult.returnValue["a"].s.Equals(s1));
+                            test(opCMapResult.c2["a"].s.Equals(s1));
+                        }).Wait();
+                }
+
+                {
+                    var obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+                    var i = Test.IPrxHelper.checkedCast(obj);
+                    i.shutdown();
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/scope/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/Client.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,34 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace scope
+    {
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.scope.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    var output = getWriter();
+                    output.Write("test same Slice type name in different scopes... ");
+                    output.Flush();
+                    AllTests.allTests(this);
+                    output.WriteLine("ok");
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/net45/client.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
+  <PropertyGroup Label="Globals">
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{EDF26324-B301-4C47-975E-CD9C3FDE3D50}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>client</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+      <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\AllTests.cs">
+      <Link>AllTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Client.cs">
+      <Link>Client.cs</Link>
+    </Compile>
+    <Compile Include="generated\Test.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="client.exe.config" />
+    <SliceCompile Include="..\..\..\Test.ice">
+      <Link>Test.ice</Link>
+    </SliceCompile>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
+  <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/net45/client.exe.config zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/net45/client.exe.config
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/net45/client.exe.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/net45/client.exe.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<configuration>
+    <runtime>
+        <developmentMode developerInstallation="true"/>
+    </runtime>
+</configuration>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/net45/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>client</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice">
+      <Link>Test.ice</Link>
+    </SliceCompile>
+    <None Update="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </None>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
+  <PropertyGroup Label="Globals">
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B653A0EF-AA6C-4E8B-B2A1-BB5E7743C087}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>collocated</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+      <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\AllTests.cs">
+      <Link>AllTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Collocated.cs">
+      <Link>Collocated.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\TestI.cs">
+      <Link>TestI.cs</Link>
+    </Compile>
+    <Compile Include="generated\Test.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="collocated.exe.config" />
+    <SliceCompile Include="..\..\..\Test.ice">
+      <Link>Test.ice</Link>
+    </SliceCompile>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
+  <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.exe.config zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.exe.config
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.exe.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/net45/collocated.exe.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<configuration>
+    <runtime>
+        <developmentMode developerInstallation="true"/>
+    </runtime>
+</configuration>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/net45/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <PropertyGroup>
+    <AssemblyName>collocated</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs"/>
+    <Compile Include="../../../TestI.cs"/>
+    <Compile Include="../../../AllTests.cs"/>
+    <Compile Include="../../../Collocated.cs"/>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
+    <SliceCompile Include="../../../Test.ice"/>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/net45/packages.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/net45/server.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
+  <PropertyGroup Label="Globals">
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{81A5EA86-74C3-45BD-B04E-FB21983302F2}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>server</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+      <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Server.cs">
+      <Link>Server.cs</Link>
+    </Compile>
+    <Compile Include="generated\Test.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
+    <SliceCompile Include="..\..\..\Test.ice">
+      <Link>Test.ice</Link>
+    </SliceCompile>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
+  <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/net45/server.exe.config zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/net45/server.exe.config
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/net45/server.exe.config	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/net45/server.exe.config	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<configuration>
+    <runtime>
+        <developmentMode developerInstallation="true"/>
+    </runtime>
+</configuration>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>server</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <None Update="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </None>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.scope</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+      <Compile Include="../../../AllTests.cs" />
+      <Compile Include="../../../Client.cs" />
+      <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/scope/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/Server.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,249 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using System;
+using System.Collections.Generic;
+using Test;
+
+namespace Ice
+{
+    namespace scope
+    {
+        public class Server : TestHelper
+        {
+            class I1 : Test.IDisp_
+            {
+                public override Test.S
+                opS(Test.S s1, out Test.S s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.S[]
+                opSSeq(Test.S[] s1, out Test.S[] s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Dictionary<String, Test.S>
+                opSMap(Dictionary<String, Test.S> s1, out Dictionary<String, Test.S> s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.C
+                opC(Test.C c1, out Test.C c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Test.C[]
+                opCSeq(Test.C[] c1, out Test.C[] c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Dictionary<String, Test.C>
+                opCMap(Dictionary<String, Test.C> c1, out Dictionary<String, Test.C> c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                override
+                public void shutdown(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                }
+            }
+
+            class I2 : Test.Inner.IDisp_
+            {
+                public override Test.Inner.Inner2.S
+                opS(Test.Inner.Inner2.S s1, out Test.Inner.Inner2.S s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.Inner.Inner2.S[]
+                opSSeq(Test.Inner.Inner2.S[] s1, out Test.Inner.Inner2.S[] s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Dictionary<String, Test.Inner.Inner2.S>
+                opSMap(Dictionary<String, Test.Inner.Inner2.S> s1, out Dictionary<String, Test.Inner.Inner2.S> s2,
+                       Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.Inner.Inner2.C
+                opC(Test.Inner.Inner2.C c1, out Test.Inner.Inner2.C c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Test.Inner.Inner2.C[]
+                opCSeq(Test.Inner.Inner2.C[] c1, out Test.Inner.Inner2.C[] c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Dictionary<String, Test.Inner.Inner2.C>
+                opCMap(Dictionary<String, Test.Inner.Inner2.C> c1, out Dictionary<String, Test.Inner.Inner2.C> c2,
+                       Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                override
+                public void shutdown(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                }
+            }
+
+            class I3 : Test.Inner.Inner2.IDisp_
+            {
+                public override Test.Inner.Inner2.S
+                opS(Test.Inner.Inner2.S s1, out Test.Inner.Inner2.S s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.Inner.Inner2.S[]
+                opSSeq(Test.Inner.Inner2.S[] s1, out Test.Inner.Inner2.S[] s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Dictionary<String, Test.Inner.Inner2.S>
+                opSMap(Dictionary<String, Test.Inner.Inner2.S> s1, out Dictionary<String, Test.Inner.Inner2.S> s2,
+                       Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.Inner.Inner2.C
+                opC(Test.Inner.Inner2.C c1, out Test.Inner.Inner2.C c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Test.Inner.Inner2.C[]
+                opCSeq(Test.Inner.Inner2.C[] c1, out Test.Inner.Inner2.C[] c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Dictionary<String, Test.Inner.Inner2.C>
+                opCMap(Dictionary<String, Test.Inner.Inner2.C> c1, out Dictionary<String, Test.Inner.Inner2.C> c2,
+                       Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                override
+                public void shutdown(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                }
+            }
+
+            class I4 : Inner.Test.Inner2.IDisp_
+            {
+                public override Test.S
+                opS(Test.S s1, out Test.S s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.S[]
+                opSSeq(Test.S[] s1, out Test.S[] s2, Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Dictionary<String, Test.S>
+                opSMap(Dictionary<String, Test.S> s1, out Dictionary<String, Test.S> s2,
+                       Ice.Current current)
+                {
+                    s2 = s1;
+                    return s1;
+                }
+
+                public override Test.C
+                opC(Test.C c1, out Test.C c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Test.C[]
+                opCSeq(Test.C[] c1, out Test.C[] c2, Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override Dictionary<String, Test.C>
+                opCMap(Dictionary<String, Test.C> c1, out Dictionary<String, Test.C> c2,
+                       Ice.Current current)
+                {
+                    c2 = c1;
+                    return c1;
+                }
+
+                public override void shutdown(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                }
+            }
+
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.scope.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new I1(), Ice.Util.stringToIdentity("i1"));
+                    adapter.add(new I2(), Ice.Util.stringToIdentity("i2"));
+                    adapter.add(new I3(), Ice.Util.stringToIdentity("i3"));
+                    adapter.add(new I4(), Ice.Util.stringToIdentity("i4"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/scope/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,138 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["cs:typeid-namespace:Ice.scope.TypeId"]]
+["cs:namespace:Ice.scope"]
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq c1, out CSeq c2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static Test.MyClassPrx allTests(TestCommon.Application app, bool collocated)
+    namespace seqMapping
     {
-        Ice.Communicator communicator = app.communicator();
-        Flush();
-        string rf = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf);
-        Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
+        public class AllTests : global::Test.AllTests
+        {
+            public static Test.MyClassPrx allTests(global::Test.TestHelper helper, bool collocated)
+            {
+                var communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Flush();
+                string rf = "test:" + helper.getTestEndpoint(0);
+                var baseProxy = communicator.stringToProxy(rf);
+                Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy);
 
-        Write("testing twoway operations... ");
-        Flush();
-        Twoways.twoways(communicator, cl);
-        WriteLine("ok");
+                output.Write("testing twoway operations... ");
+                output.Flush();
+                Twoways.twoways(communicator, cl);
+                output.WriteLine("ok");
 
-        if(!collocated)
-        {
-            Write("testing twoway operations with AMI... ");
-            Flush();
-            TwowaysAMI.twowaysAMI(communicator, cl);
-            WriteLine("ok");
+                if(!collocated)
+                {
+                    output.Write("testing twoway operations with AMI... ");
+                    output.Flush();
+                    TwowaysAMI.twowaysAMI(communicator, cl);
+                    output.WriteLine("ok");
+                }
+                return cl;
+            }
         }
-        return cl;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using System.Diagnostics;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        Test.MyClassPrx myClass = AllTests.allTests(this, false);
-
-        Console.Out.Write("shutting down server... ");
-        Console.Out.Flush();
-        myClass.shutdown();
-        Console.Out.WriteLine("ok");
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace seqMapping
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.seqMapping.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    var myClass = AllTests.allTests(this, false);
+                    Console.Out.Write("shutting down server... ");
+                    Console.Out.Flush();
+                    myClass.shutdown();
+                    Console.Out.WriteLine("ok");
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this, true);
-
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace seqMapping
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.seqMapping.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+                    //adapter.activate(); // Don't activate OA to ensure collocation is used.
+                    AllTests.allTests(this, true);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Custom.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Custom.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Custom.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Custom.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,93 +1,94 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
-public class Custom<T> : IEnumerable<T>
+namespace Ice
 {
-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+    namespace seqMapping
     {
-        return _list.GetEnumerator();
-    }
+        public class Custom<T> : IEnumerable<T>
+        {
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+            {
+                return _list.GetEnumerator();
+            }
 
-    public IEnumerator<T> GetEnumerator()
-    {
-        return _list.GetEnumerator();
-    }
+            public IEnumerator<T> GetEnumerator()
+            {
+                return _list.GetEnumerator();
+            }
 
-    public int Count
-    {
-        get
-        {
-            return _list.Count;
-        }
-    }
+            public int Count
+            {
+                get
+                {
+                    return _list.Count;
+                }
+            }
 
-    public T this[int index]
-    {
-        get
-        {
-            return _list[index];
-        }
+            public T this[int index]
+            {
+                get
+                {
+                    return _list[index];
+                }
 
-        set
-        {
-            _list[index] = value;
-        }
+                set
+                {
+                    _list[index] = value;
+                }
 
-    }
+            }
 
-    public void Add(T elmt)
-    {
-        _list.Add(elmt);
-    }
+            public void Add(T elmt)
+            {
+                _list.Add(elmt);
+            }
 
-    public override bool Equals(object o)
-    {
-        try
-        {
-            Custom<T> tmp = (Custom<T>)o;
-            IEnumerator<T> e = tmp.GetEnumerator();
-            foreach(T elmt in _list)
+            public override bool Equals(object o)
             {
-                if(!e.MoveNext())
-                {
-                    return false;
-                }
-                if(elmt == null)
+                try
                 {
-                    if(e.Current != null)
+                    Custom<T> tmp =(Custom<T>)o;
+                    IEnumerator<T> e = tmp.GetEnumerator();
+                    foreach(T elmt in _list)
                     {
-                        return false;
+                        if(!e.MoveNext())
+                        {
+                            return false;
+                        }
+                        if(elmt == null)
+                        {
+                            if(e.Current != null)
+                            {
+                                return false;
+                            }
+                        }
+                        else
+                        {
+                            if(!elmt.Equals(e.Current))
+                            {
+                                return false;
+                            }
+                        }
                     }
+                    return true;
                 }
-                else
+                catch(Exception)
                 {
-                    if(!elmt.Equals(e.Current))
-                    {
-                        return false;
-                    }
+                    return false;
                 }
             }
-            return true;
-        }
-        catch(Exception)
-        {
-            return false;
-        }
-    }
 
-    public override int GetHashCode()
-    {
-        return base.GetHashCode();
-    }
+            public override int GetHashCode()
+            {
+                return base.GetHashCode();
+            }
 
-    private List<T> _list = new List<T>();
+            private List<T> _list = new List<T>();
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -52,14 +52,14 @@
     <Compile Include="..\..\..\TwowaysAMI.cs">
       <Link>TwowaysAMI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\serializable\net45\serializable.csproj">
@@ -67,15 +67,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../Custom.cs"/>
-    <Compile Include="../../../Twoways.cs"/>
-    <Compile Include="../../../TwowaysAMI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Custom.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -55,14 +55,14 @@
     <Compile Include="..\..\..\TwowaysAMI.cs">
       <Link>TwowaysAMI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -82,15 +82,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../MyClassI.cs"/>
-    <Compile Include="../../../Twoways.cs"/>
-    <Compile Include="../../../TwowaysAMI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <Compile Include="../../../Custom.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../MyClassI.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Custom.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serializable/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serializable/net45/serializable.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,17 +21,17 @@
     </NuGetPackageImportStamp>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\Serializable.cs">
@@ -39,17 +39,17 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serializable/netstandard2.0/serializable.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
   <Import Project="../../../../../../msbuild/ice.common.props"/>
   <PropertyGroup>
     <AssemblyName>serializable</AssemblyName>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -17,7 +17,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Custom.cs">
       <Link>Custom.cs</Link>
@@ -46,11 +46,11 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
@@ -61,15 +61,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../Custom.cs"/>
-    <Compile Include="../../../MyClassI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Custom.cs" />
+    <Compile Include="../../../MyClassI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Custom.cs">
       <Link>Custom.cs</Link>
@@ -46,14 +46,14 @@
     <Compile Include="..\..\..\ServerAMD.cs">
       <Link>ServerAMD.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\serializable\net45\serializable.csproj">
@@ -61,15 +61,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../Custom.cs"/>
-    <Compile Include="../../../MyClassAMDI.cs"/>
-    <Compile Include="../../../ServerAMD.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Custom.cs" />
+    <Compile Include="../../../MyClassAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.seqMapping</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../Custom.cs" />
+    <Compile Include="../../../MyClassAMDI.cs" />
+    <Compile Include="../../../MyClassI.cs" />
+    <Compile Include="../../../Serializable.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="../../../Twoways.cs" />
+    <Compile Include="../../../TwowaysAMI.cs" />
+    <Compile Include="generated\Test.cs">
+        <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\TestAMD.cs">
+        <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/MyClassAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/MyClassAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/MyClassAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/MyClassAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,488 +1,490 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using Test;
 
-public sealed class MyClassI : MyClassDisp_
+namespace Ice
 {
-    public override Task shutdownAsync(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-        return null;
-    }
-
-    public override Task<MyClass_OpAByteSResult>
-    opAByteSAsync(byte[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAByteSResult>(new MyClass_OpAByteSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLByteSResult>
-    opLByteSAsync(List<byte> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLByteSResult>(new MyClass_OpLByteSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKByteSResult>
-    opKByteSAsync(LinkedList<byte> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKByteSResult>(new MyClass_OpKByteSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQByteSResult>
-    opQByteSAsync(Queue<byte> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQByteSResult>(new MyClass_OpQByteSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSByteSResult>
-    opSByteSAsync(Stack<byte> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSByteSResult>(new MyClass_OpSByteSResult(i, i));
-    }
-
-    public override Task<MyClass_OpABoolSResult>
-    opABoolSAsync(bool[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpABoolSResult>(new MyClass_OpABoolSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLBoolSResult>
-    opLBoolSAsync(List<bool> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLBoolSResult>(new MyClass_OpLBoolSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKBoolSResult>
-    opKBoolSAsync(LinkedList<bool> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKBoolSResult>(new MyClass_OpKBoolSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQBoolSResult>
-    opQBoolSAsync(Queue<bool> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQBoolSResult>(new MyClass_OpQBoolSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSBoolSResult>
-    opSBoolSAsync(Stack<bool> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSBoolSResult>(new MyClass_OpSBoolSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAShortSResult>
-    opAShortSAsync(short[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAShortSResult>(new MyClass_OpAShortSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLShortSResult>
-    opLShortSAsync(List<short> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLShortSResult>(new MyClass_OpLShortSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKShortSResult>
-    opKShortSAsync(LinkedList<short> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKShortSResult>(new MyClass_OpKShortSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQShortSResult>
-    opQShortSAsync(Queue<short> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQShortSResult>(new MyClass_OpQShortSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSShortSResult>
-    opSShortSAsync(Stack<short> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSShortSResult>(new MyClass_OpSShortSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAIntSResult>
-    opAIntSAsync(int[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAIntSResult>(new MyClass_OpAIntSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLIntSResult>
-    opLIntSAsync(List<int> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLIntSResult>(new MyClass_OpLIntSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKIntSResult>
-    opKIntSAsync(LinkedList<int> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKIntSResult>(new MyClass_OpKIntSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQIntSResult>
-    opQIntSAsync(Queue<int> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQIntSResult>(new MyClass_OpQIntSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSIntSResult>
-    opSIntSAsync(Stack<int> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSIntSResult>(new MyClass_OpSIntSResult(i, i));
-    }
-
-    public override Task<MyClass_OpALongSResult>
-    opALongSAsync(long[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpALongSResult>(new MyClass_OpALongSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLLongSResult>
-    opLLongSAsync(List<long> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLLongSResult>(new MyClass_OpLLongSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKLongSResult>
-    opKLongSAsync(LinkedList<long> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKLongSResult>(new MyClass_OpKLongSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQLongSResult>
-    opQLongSAsync(Queue<long> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQLongSResult>(new MyClass_OpQLongSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSLongSResult>
-    opSLongSAsync(Stack<long> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSLongSResult>(new MyClass_OpSLongSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAFloatSResult>
-    opAFloatSAsync(float[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAFloatSResult>(new MyClass_OpAFloatSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLFloatSResult>
-    opLFloatSAsync(List<float> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLFloatSResult>(new MyClass_OpLFloatSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKFloatSResult>
-    opKFloatSAsync(LinkedList<float> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKFloatSResult>(new MyClass_OpKFloatSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQFloatSResult>
-    opQFloatSAsync(Queue<float> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQFloatSResult>(new MyClass_OpQFloatSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSFloatSResult>
-    opSFloatSAsync(Stack<float> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSFloatSResult>(new MyClass_OpSFloatSResult(i, i));
-    }
-
-    public override Task<MyClass_OpADoubleSResult>
-    opADoubleSAsync(double[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpADoubleSResult>(new MyClass_OpADoubleSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLDoubleSResult>
-    opLDoubleSAsync(List<double> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLDoubleSResult>(new MyClass_OpLDoubleSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKDoubleSResult>
-    opKDoubleSAsync(LinkedList<double> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKDoubleSResult>(new MyClass_OpKDoubleSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQDoubleSResult>
-    opQDoubleSAsync(Queue<double> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQDoubleSResult>(new MyClass_OpQDoubleSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSDoubleSResult>
-    opSDoubleSAsync(Stack<double> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSDoubleSResult>(new MyClass_OpSDoubleSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAStringSResult>
-    opAStringSAsync(string[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAStringSResult>(new MyClass_OpAStringSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLStringSResult>
-    opLStringSAsync(List<string> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLStringSResult>(new MyClass_OpLStringSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKStringSResult>
-    opKStringSAsync(LinkedList<string> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKStringSResult>(new MyClass_OpKStringSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQStringSResult>
-    opQStringSAsync(Queue<string> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQStringSResult>(new MyClass_OpQStringSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSStringSResult>
-    opSStringSAsync(Stack<string> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSStringSResult>(new MyClass_OpSStringSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAObjectSResult> opAObjectSAsync(Ice.Value[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAObjectSResult>(new MyClass_OpAObjectSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLObjectSResult>
-    opLObjectSAsync(List<Ice.Value> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLObjectSResult>(new MyClass_OpLObjectSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAObjectPrxSResult>
-    opAObjectPrxSAsync(Ice.ObjectPrx[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAObjectPrxSResult>(new MyClass_OpAObjectPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLObjectPrxSResult>
-    opLObjectPrxSAsync(List<Ice.ObjectPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLObjectPrxSResult>(new MyClass_OpLObjectPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKObjectPrxSResult>
-    opKObjectPrxSAsync(LinkedList<Ice.ObjectPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKObjectPrxSResult>(new MyClass_OpKObjectPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQObjectPrxSResult>
-    opQObjectPrxSAsync(Queue<Ice.ObjectPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQObjectPrxSResult>(new MyClass_OpQObjectPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSObjectPrxSResult>
-    opSObjectPrxSAsync(Stack<Ice.ObjectPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSObjectPrxSResult>(new MyClass_OpSObjectPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAStructSResult>
-    opAStructSAsync(S[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAStructSResult>(new MyClass_OpAStructSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLStructSResult>
-    opLStructSAsync(List<S> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLStructSResult>(new MyClass_OpLStructSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKStructSResult>
-    opKStructSAsync(LinkedList<S> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKStructSResult>(new MyClass_OpKStructSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQStructSResult>
-    opQStructSAsync(Queue<S> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQStructSResult>(new MyClass_OpQStructSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSStructSResult>
-    opSStructSAsync(Stack<S> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSStructSResult>(new MyClass_OpSStructSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAStructSDResult>
-    opAStructSDAsync(SD[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAStructSDResult>(new MyClass_OpAStructSDResult(i, i));
-    }
-
-    public override Task<MyClass_OpLStructSDResult>
-    opLStructSDAsync(List<SD> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLStructSDResult>(new MyClass_OpLStructSDResult(i, i));
-    }
-
-    public override Task<MyClass_OpKStructSDResult>
-    opKStructSDAsync(LinkedList<SD> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKStructSDResult>(new MyClass_OpKStructSDResult(i, i));
-    }
-
-    public override Task<MyClass_OpQStructSDResult>
-    opQStructSDAsync(Queue<SD> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQStructSDResult>(new MyClass_OpQStructSDResult(i, i));
-    }
-
-    public override Task<MyClass_OpSStructSDResult>
-    opSStructSDAsync(Stack<SD> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSStructSDResult>(new MyClass_OpSStructSDResult(i, i));
-    }
-
-    public override Task<MyClass_OpACVSResult>
-    opACVSAsync(CV[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpACVSResult>(new MyClass_OpACVSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLCVSResult>
-    opLCVSAsync(List<CV> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLCVSResult>(new MyClass_OpLCVSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAIPrxSResult>
-    opAIPrxSAsync(Test.IPrx[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAIPrxSResult>(new MyClass_OpAIPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLIPrxSResult>
-    opLIPrxSAsync(List<Test.IPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLIPrxSResult>(new MyClass_OpLIPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKIPrxSResult>
-    opKIPrxSAsync(LinkedList<Test.IPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKIPrxSResult>(new MyClass_OpKIPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQIPrxSResult>
-    opQIPrxSAsync(Queue<Test.IPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQIPrxSResult>(new MyClass_OpQIPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSIPrxSResult>
-    opSIPrxSAsync(Stack<Test.IPrx> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSIPrxSResult>(new MyClass_OpSIPrxSResult(i, i));
-    }
-
-    public override Task<MyClass_OpACRSResult>
-    opACRSAsync(CR[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpACRSResult>(new MyClass_OpACRSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLCRSResult>
-    opLCRSAsync(List<CR> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLCRSResult>(new MyClass_OpLCRSResult(i, i));
-    }
-
-    public override Task<MyClass_OpAEnSResult> opAEnSAsync(En[] i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpAEnSResult>(new MyClass_OpAEnSResult(i, i));
-    }
-
-    public override Task<MyClass_OpLEnSResult>
-    opLEnSAsync(List<En> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpLEnSResult>(new MyClass_OpLEnSResult(i, i));
-    }
-
-    public override Task<MyClass_OpKEnSResult>
-    opKEnSAsync(LinkedList<En> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpKEnSResult>(new MyClass_OpKEnSResult(i, i));
-    }
-
-    public override Task<MyClass_OpQEnSResult>
-    opQEnSAsync(Queue<En> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpQEnSResult>(new MyClass_OpQEnSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSEnSResult>
-    opSEnSAsync(Stack<En> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSEnSResult>(new MyClass_OpSEnSResult(i, i));
-    }
-
-    public override Task<MyClass_OpCustomIntSResult>
-    opCustomIntSAsync(Custom<int> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpCustomIntSResult>(new MyClass_OpCustomIntSResult(i, i));
-    }
-
-    public override Task<MyClass_OpCustomCVSResult>
-    opCustomCVSAsync(Custom<CV> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpCustomCVSResult>(new MyClass_OpCustomCVSResult(i, i));
-    }
-
-    public override Task<MyClass_OpCustomIntSSResult>
-    opCustomIntSSAsync(Custom<Custom<int>> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpCustomIntSSResult>(new MyClass_OpCustomIntSSResult(i, i));
-    }
-
-    public override Task<MyClass_OpCustomCVSSResult>
-    opCustomCVSSAsync(Custom<Custom<CV>> i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpCustomCVSSResult>(new MyClass_OpCustomCVSSResult(i, i));
-    }
-
-    public override Task<MyClass_OpSerialSmallCSharpResult>
-    opSerialSmallCSharpAsync(Serialize.Small i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSerialSmallCSharpResult>(new MyClass_OpSerialSmallCSharpResult(i, i));
-    }
-
-    public override Task<MyClass_OpSerialLargeCSharpResult>
-    opSerialLargeCSharpAsync(Serialize.Large i, Ice.Current current)
-    {
-        return Task.FromResult<MyClass_OpSerialLargeCSharpResult>(new MyClass_OpSerialLargeCSharpResult(i, i));
-    }
-
-    public override Task<MyClass_OpSerialStructCSharpResult>
-    opSerialStructCSharpAsync(Serialize.Struct i, Ice.Current current)
+    namespace seqMapping
     {
-        return Task.FromResult<MyClass_OpSerialStructCSharpResult>(new MyClass_OpSerialStructCSharpResult(i, i));
+        namespace AMD
+        {
+            public sealed class MyClassI : Test.MyClassDisp_
+            {
+                public override Task shutdownAsync(Ice.Current current)
+                {
+                    current.adapter.getCommunicator().shutdown();
+                    return null;
+                }
+
+                public override Task<Test.MyClass_OpAByteSResult>
+                opAByteSAsync(byte[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAByteSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLByteSResult>
+                opLByteSAsync(List<byte> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLByteSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKByteSResult>
+                opKByteSAsync(LinkedList<byte> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKByteSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQByteSResult>
+                opQByteSAsync(Queue<byte> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQByteSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSByteSResult>
+                opSByteSAsync(Stack<byte> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSByteSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpABoolSResult>
+                opABoolSAsync(bool[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpABoolSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLBoolSResult>
+                opLBoolSAsync(List<bool> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLBoolSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKBoolSResult>
+                opKBoolSAsync(LinkedList<bool> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKBoolSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQBoolSResult>
+                opQBoolSAsync(Queue<bool> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQBoolSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSBoolSResult>
+                opSBoolSAsync(Stack<bool> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSBoolSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAShortSResult>
+                opAShortSAsync(short[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAShortSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLShortSResult>
+                opLShortSAsync(List<short> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLShortSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKShortSResult>
+                opKShortSAsync(LinkedList<short> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKShortSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQShortSResult>
+                opQShortSAsync(Queue<short> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQShortSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSShortSResult>
+                opSShortSAsync(Stack<short> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSShortSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAIntSResult>
+                opAIntSAsync(int[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAIntSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLIntSResult>
+                opLIntSAsync(List<int> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLIntSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKIntSResult>
+                opKIntSAsync(LinkedList<int> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKIntSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQIntSResult>
+                opQIntSAsync(Queue<int> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQIntSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSIntSResult>
+                opSIntSAsync(Stack<int> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSIntSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpALongSResult>
+                opALongSAsync(long[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpALongSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLLongSResult>
+                opLLongSAsync(List<long> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLLongSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKLongSResult>
+                opKLongSAsync(LinkedList<long> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKLongSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQLongSResult>
+                opQLongSAsync(Queue<long> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQLongSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSLongSResult>
+                opSLongSAsync(Stack<long> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSLongSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAFloatSResult>
+                opAFloatSAsync(float[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAFloatSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLFloatSResult>
+                opLFloatSAsync(List<float> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLFloatSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKFloatSResult>
+                opKFloatSAsync(LinkedList<float> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKFloatSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQFloatSResult>
+                opQFloatSAsync(Queue<float> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQFloatSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSFloatSResult>
+                opSFloatSAsync(Stack<float> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSFloatSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpADoubleSResult>
+                opADoubleSAsync(double[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpADoubleSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLDoubleSResult>
+                opLDoubleSAsync(List<double> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLDoubleSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKDoubleSResult>
+                opKDoubleSAsync(LinkedList<double> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKDoubleSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQDoubleSResult>
+                opQDoubleSAsync(Queue<double> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQDoubleSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSDoubleSResult>
+                opSDoubleSAsync(Stack<double> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSDoubleSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAStringSResult>
+                opAStringSAsync(string[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAStringSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLStringSResult>
+                opLStringSAsync(List<string> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLStringSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKStringSResult>
+                opKStringSAsync(LinkedList<string> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKStringSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQStringSResult>
+                opQStringSAsync(Queue<string> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQStringSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSStringSResult>
+                opSStringSAsync(Stack<string> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSStringSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAObjectSResult> opAObjectSAsync(Ice.Value[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAObjectSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLObjectSResult>
+                opLObjectSAsync(List<Ice.Value> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLObjectSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAObjectPrxSResult>
+                opAObjectPrxSAsync(Ice.ObjectPrx[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAObjectPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLObjectPrxSResult>
+                opLObjectPrxSAsync(List<Ice.ObjectPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLObjectPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKObjectPrxSResult>
+                opKObjectPrxSAsync(LinkedList<Ice.ObjectPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKObjectPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQObjectPrxSResult>
+                opQObjectPrxSAsync(Queue<Ice.ObjectPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQObjectPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSObjectPrxSResult>
+                opSObjectPrxSAsync(Stack<Ice.ObjectPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSObjectPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAStructSResult>
+                opAStructSAsync(Test.S[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAStructSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLStructSResult>
+                opLStructSAsync(List<Test.S> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLStructSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKStructSResult>
+                opKStructSAsync(LinkedList<Test.S> i, Ice.Current current)
+                {
+                    return Task.FromResult<Test.MyClass_OpKStructSResult>(new Test.MyClass_OpKStructSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQStructSResult>
+                opQStructSAsync(Queue<Test.S> i, Ice.Current current)
+                {
+                    return Task.FromResult<Test.MyClass_OpQStructSResult>(new Test.MyClass_OpQStructSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSStructSResult>
+                opSStructSAsync(Stack<Test.S> i, Ice.Current current)
+                {
+                    return Task.FromResult<Test.MyClass_OpSStructSResult>(new Test.MyClass_OpSStructSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAStructSDResult>
+                opAStructSDAsync(Test.SD[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAStructSDResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLStructSDResult>
+                opLStructSDAsync(List<Test.SD> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLStructSDResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKStructSDResult>
+                opKStructSDAsync(LinkedList<Test.SD> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKStructSDResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQStructSDResult>
+                opQStructSDAsync(Queue<Test.SD> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQStructSDResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSStructSDResult>
+                opSStructSDAsync(Stack<Test.SD> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSStructSDResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpACVSResult>
+                opACVSAsync(Test.CV[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpACVSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLCVSResult>
+                opLCVSAsync(List<Test.CV> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLCVSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAIPrxSResult>
+                opAIPrxSAsync(Test.IPrx[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAIPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLIPrxSResult>
+                opLIPrxSAsync(List<Test.IPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLIPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKIPrxSResult>
+                opKIPrxSAsync(LinkedList<Test.IPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKIPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQIPrxSResult>
+                opQIPrxSAsync(Queue<Test.IPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQIPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSIPrxSResult>
+                opSIPrxSAsync(Stack<Test.IPrx> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSIPrxSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpACRSResult>
+                opACRSAsync(Test.CR[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpACRSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLCRSResult>
+                opLCRSAsync(List<Test.CR> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLCRSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpAEnSResult> opAEnSAsync(Test.En[] i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpAEnSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpLEnSResult>
+                opLEnSAsync(List<Test.En> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpLEnSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpKEnSResult>
+                opKEnSAsync(LinkedList<Test.En> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpKEnSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpQEnSResult>
+                opQEnSAsync(Queue<Test.En> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpQEnSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSEnSResult>
+                opSEnSAsync(Stack<Test.En> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSEnSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpCustomIntSResult>
+                opCustomIntSAsync(Custom<int> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpCustomIntSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpCustomCVSResult>
+                opCustomCVSAsync(Custom<Test.CV> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpCustomCVSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpCustomIntSSResult>
+                opCustomIntSSAsync(Custom<Custom<int>> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpCustomIntSSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpCustomCVSSResult>
+                opCustomCVSSAsync(Custom<Custom<Test.CV>> i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpCustomCVSSResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSerialSmallCSharpResult>
+                opSerialSmallCSharpAsync(Serialize.Small i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSerialSmallCSharpResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSerialLargeCSharpResult>
+                opSerialLargeCSharpAsync(Serialize.Large i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSerialLargeCSharpResult(i, i));
+                }
+
+                public override Task<Test.MyClass_OpSerialStructCSharpResult>
+                opSerialStructCSharpAsync(Serialize.Struct i, Ice.Current current)
+                {
+                    return Task.FromResult(new Test.MyClass_OpSerialStructCSharpResult(i, i));
+                }
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/MyClassI.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/MyClassI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/MyClassI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/MyClassI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,492 +1,500 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
-using Test;
 
-public sealed class MyClassI : Test.MyClassDisp_
+namespace Ice
 {
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    public override byte[] opAByteS(byte[] i, out byte[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<byte> opLByteS(List<byte> i, out List<byte> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<byte> opKByteS(LinkedList<byte> i, out LinkedList<byte> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<byte> opQByteS(Queue<byte> i, out Queue<byte> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<byte> opSByteS(Stack<byte> i, out Stack<byte> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override bool[] opABoolS(bool[] i, out bool[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<bool> opLBoolS(List<bool> i, out List<bool> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<bool> opKBoolS(LinkedList<bool> i, out LinkedList<bool> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<bool> opQBoolS(Queue<bool> i, out Queue<bool> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<bool> opSBoolS(Stack<bool> i, out Stack<bool> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override short[] opAShortS(short[] i, out short[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<short> opLShortS(List<short> i, out List<short> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<short> opKShortS(LinkedList<short> i, out LinkedList<short> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<short> opQShortS(Queue<short> i, out Queue<short> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<short> opSShortS(Stack<short> i, out Stack<short> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override int[] opAIntS(int[] i, out int[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<int> opLIntS(List<int> i, out List<int> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<int> opKIntS(LinkedList<int> i, out LinkedList<int> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<int> opQIntS(Queue<int> i, out Queue<int> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<int> opSIntS(Stack<int> i, out Stack<int> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override long[] opALongS(long[] i, out long[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<long> opLLongS(List<long> i, out List<long> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<long> opKLongS(LinkedList<long> i, out LinkedList<long> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<long> opQLongS(Queue<long> i, out Queue<long> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<long> opSLongS(Stack<long> i, out Stack<long> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override float[] opAFloatS(float[] i, out float[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<float> opLFloatS(List<float> i, out List<float> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<float> opKFloatS(LinkedList<float> i, out LinkedList<float> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<float> opQFloatS(Queue<float> i, out Queue<float> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<float> opSFloatS(Stack<float> i, out Stack<float> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override double[] opADoubleS(double[] i, out double[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<double> opLDoubleS(List<double> i, out List<double> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<double> opKDoubleS(LinkedList<double> i, out LinkedList<double> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<double> opQDoubleS(Queue<double> i, out Queue<double> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<double> opSDoubleS(Stack<double> i, out Stack<double> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override string[] opAStringS(string[] i, out string[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<string> opLStringS(List<string> i, out List<string> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<string> opKStringS(LinkedList<string> i, out LinkedList<string> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<string> opQStringS(Queue<string> i, out Queue<string> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<string> opSStringS(Stack<string> i, out Stack<string> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Ice.Value[] opAObjectS(Ice.Value[] i, out Ice.Value[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<Ice.Value> opLObjectS(List<Ice.Value> i, out List<Ice.Value> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Ice.ObjectPrx[] opAObjectPrxS(Ice.ObjectPrx[] i, out Ice.ObjectPrx[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<Ice.ObjectPrx> opLObjectPrxS(List<Ice.ObjectPrx> i, out List<Ice.ObjectPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<Ice.ObjectPrx> opKObjectPrxS(LinkedList<Ice.ObjectPrx> i, out LinkedList<Ice.ObjectPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<Ice.ObjectPrx> opQObjectPrxS(Queue<Ice.ObjectPrx> i, out Queue<Ice.ObjectPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<Ice.ObjectPrx> opSObjectPrxS(Stack<Ice.ObjectPrx> i, out Stack<Ice.ObjectPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override S[] opAStructS(S[] i, out S[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<S> opLStructS(List<S> i, out List<S> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<S> opKStructS(LinkedList<S> i, out LinkedList<S> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<S> opQStructS(Queue<S> i, out Queue<S> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<S> opSStructS(Stack<S> i, out Stack<S> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override SD[] opAStructSD(SD[] i, out SD[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<SD> opLStructSD(List<SD> i, out List<SD> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<SD> opKStructSD(LinkedList<SD> i, out LinkedList<SD> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<SD> opQStructSD(Queue<SD> i, out Queue<SD> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<SD> opSStructSD(Stack<SD> i, out Stack<SD> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override CV[] opACVS(CV[] i, out CV[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<CV> opLCVS(List<CV> i, out List<CV> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override CR[] opACRS(CR[] i, out CR[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<CR> opLCRS(List<CR> i, out List<CR> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override En[] opAEnS(En[] i, out En[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<En> opLEnS(List<En> i, out List<En> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<En> opKEnS(LinkedList<En> i, out LinkedList<En> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<En> opQEnS(Queue<En> i, out Queue<En> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<En> opSEnS(Stack<En> i, out Stack<En> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Test.IPrx[] opAIPrxS(Test.IPrx[] i, out Test.IPrx[] o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override List<Test.IPrx> opLIPrxS(List<Test.IPrx> i, out List<Test.IPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override LinkedList<Test.IPrx> opKIPrxS(LinkedList<Test.IPrx> i, out LinkedList<Test.IPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Queue<Test.IPrx> opQIPrxS(Queue<Test.IPrx> i, out Queue<Test.IPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Stack<Test.IPrx> opSIPrxS(Stack<Test.IPrx> i, out Stack<Test.IPrx> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Custom<int> opCustomIntS(Custom<int> i, out Custom<int> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Custom<CV> opCustomCVS(Custom<CV> i, out Custom<CV> o, Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Custom<Custom<int>> opCustomIntSS(Custom<Custom<int>> i, out Custom<Custom<int>> o,
-                                                      Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Custom<Custom<CV>> opCustomCVSS(Custom<Custom<CV>> i, out Custom<Custom<CV>> o,
-                                                    Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Serialize.Small opSerialSmallCSharp(Serialize.Small i, out Serialize.Small o,
-                                                        Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Serialize.Large opSerialLargeCSharp(Serialize.Large i, out Serialize.Large o,
-                                                        Ice.Current current)
-    {
-        o = i;
-        return i;
-    }
-
-    public override Serialize.Struct opSerialStructCSharp(Serialize.Struct i, out Serialize.Struct o,
-                                                          Ice.Current current)
+    namespace seqMapping
     {
-        o = i;
-        return i;
+        public sealed class MyClassI : Test.MyClassDisp_
+        {
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            public override byte[] opAByteS(byte[] i, out byte[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<byte> opLByteS(List<byte> i, out List<byte> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<byte> opKByteS(LinkedList<byte> i, out LinkedList<byte> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<byte> opQByteS(Queue<byte> i, out Queue<byte> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<byte> opSByteS(Stack<byte> i, out Stack<byte> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override bool[] opABoolS(bool[] i, out bool[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<bool> opLBoolS(List<bool> i, out List<bool> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<bool> opKBoolS(LinkedList<bool> i, out LinkedList<bool> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<bool> opQBoolS(Queue<bool> i, out Queue<bool> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<bool> opSBoolS(Stack<bool> i, out Stack<bool> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override short[] opAShortS(short[] i, out short[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<short> opLShortS(List<short> i, out List<short> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<short> opKShortS(LinkedList<short> i, out LinkedList<short> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<short> opQShortS(Queue<short> i, out Queue<short> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<short> opSShortS(Stack<short> i, out Stack<short> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override int[] opAIntS(int[] i, out int[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<int> opLIntS(List<int> i, out List<int> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<int> opKIntS(LinkedList<int> i, out LinkedList<int> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<int> opQIntS(Queue<int> i, out Queue<int> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<int> opSIntS(Stack<int> i, out Stack<int> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override long[] opALongS(long[] i, out long[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<long> opLLongS(List<long> i, out List<long> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<long> opKLongS(LinkedList<long> i, out LinkedList<long> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<long> opQLongS(Queue<long> i, out Queue<long> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<long> opSLongS(Stack<long> i, out Stack<long> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override float[] opAFloatS(float[] i, out float[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<float> opLFloatS(List<float> i, out List<float> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<float> opKFloatS(LinkedList<float> i, out LinkedList<float> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<float> opQFloatS(Queue<float> i, out Queue<float> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<float> opSFloatS(Stack<float> i, out Stack<float> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override double[] opADoubleS(double[] i, out double[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<double> opLDoubleS(List<double> i, out List<double> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<double> opKDoubleS(LinkedList<double> i, out LinkedList<double> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<double> opQDoubleS(Queue<double> i, out Queue<double> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<double> opSDoubleS(Stack<double> i, out Stack<double> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override string[] opAStringS(string[] i, out string[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<string> opLStringS(List<string> i, out List<string> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<string> opKStringS(LinkedList<string> i, out LinkedList<string> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<string> opQStringS(Queue<string> i, out Queue<string> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<string> opSStringS(Stack<string> i, out Stack<string> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Ice.Value[] opAObjectS(Ice.Value[] i, out Ice.Value[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Ice.Value> opLObjectS(List<Ice.Value> i, out List<Ice.Value> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Ice.ObjectPrx[] opAObjectPrxS(Ice.ObjectPrx[] i, out Ice.ObjectPrx[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Ice.ObjectPrx> opLObjectPrxS(List<Ice.ObjectPrx> i,
+                                                                      out List<Ice.ObjectPrx> o,
+                                                                      Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<Ice.ObjectPrx> opKObjectPrxS(LinkedList<Ice.ObjectPrx> i,
+                                                                            out LinkedList<Ice.ObjectPrx> o,
+                                                                            Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<Ice.ObjectPrx> opQObjectPrxS(Queue<Ice.ObjectPrx> i,
+                                                                       out Queue<Ice.ObjectPrx> o,
+                                                                       Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<Ice.ObjectPrx> opSObjectPrxS(Stack<Ice.ObjectPrx> i,
+                                                                       out Stack<Ice.ObjectPrx> o,
+                                                                       Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Test.S[] opAStructS(Test.S[] i, out Test.S[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Test.S> opLStructS(List<Test.S> i, out List<Test.S> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<Test.S> opKStructS(LinkedList<Test.S> i, out LinkedList<Test.S> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<Test.S> opQStructS(Queue<Test.S> i, out Queue<Test.S> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<Test.S> opSStructS(Stack<Test.S> i, out Stack<Test.S> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Test.SD[] opAStructSD(Test.SD[] i, out Test.SD[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Test.SD> opLStructSD(List<Test.SD> i, out List<Test.SD> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<Test.SD> opKStructSD(LinkedList<Test.SD> i, out LinkedList<Test.SD> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<Test.SD> opQStructSD(Queue<Test.SD> i, out Queue<Test.SD> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<Test.SD> opSStructSD(Stack<Test.SD> i, out Stack<Test.SD> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Test.CV[] opACVS(Test.CV[] i, out Test.CV[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Test.CV> opLCVS(List<Test.CV> i, out List<Test.CV> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Test.CR[] opACRS(Test.CR[] i, out Test.CR[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Test.CR> opLCRS(List<Test.CR> i, out List<Test.CR> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Test.En[] opAEnS(Test.En[] i, out Test.En[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Test.En> opLEnS(List<Test.En> i, out List<Test.En> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<Test.En> opKEnS(LinkedList<Test.En> i, out LinkedList<Test.En> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<Test.En> opQEnS(Queue<Test.En> i, out Queue<Test.En> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<Test.En> opSEnS(Stack<Test.En> i, out Stack<Test.En> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Test.IPrx[] opAIPrxS(Test.IPrx[] i, out Test.IPrx[] o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override List<Test.IPrx> opLIPrxS(List<Test.IPrx> i, out List<Test.IPrx> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override LinkedList<Test.IPrx> opKIPrxS(LinkedList<Test.IPrx> i, out LinkedList<Test.IPrx> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Queue<Test.IPrx> opQIPrxS(Queue<Test.IPrx> i, out Queue<Test.IPrx> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Stack<Test.IPrx> opSIPrxS(Stack<Test.IPrx> i, out Stack<Test.IPrx> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Custom<int> opCustomIntS(Custom<int> i, out Custom<int> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Custom<Test.CV> opCustomCVS(Custom<Test.CV> i, out Custom<Test.CV> o, Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Custom<Custom<int>> opCustomIntSS(Custom<Custom<int>> i, out Custom<Custom<int>> o,
+                                                              Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Custom<Custom<Test.CV>> opCustomCVSS(Custom<Custom<Test.CV>> i, out Custom<Custom<Test.CV>> o,
+                                                                 Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Serialize.Small opSerialSmallCSharp(Serialize.Small i, out Serialize.Small o,
+                                                                Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Serialize.Large opSerialLargeCSharp(Serialize.Large i, out Serialize.Large o,
+                                                                Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+
+            public override Serialize.Struct opSerialStructCSharp(Serialize.Struct i, out Serialize.Struct o,
+                                                                  Ice.Current current)
+            {
+                o = i;
+                return i;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Serializable.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Serializable.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Serializable.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Serializable.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-[assembly: CLSCompliant(true)]
-
 namespace Serialize
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/ServerAMD.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace seqMapping
     {
-        Server app = new Server();
-        return app.runmain(args);
+        namespace AMD
+        {
+            public class Server : TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    var initData = new InitializationData();
+                    initData.typeIdNamespaces = new string[]{"Ice.seqMapping.AMD.TypeId"};
+                    initData.properties = createTestProperties(ref args);
+                    using(var communicator = initialize(initData))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        var adapter = communicator.createObjectAdapter("TestAdapter");
+                        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+                        adapter.activate();
+                        serverReady();
+                        communicator.waitForShutdown();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return TestDriver.runTest<Server>(args);
+                }
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace seqMapping
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : global::Test.TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.seqMapping.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+[["cs:typeid-namespace:Ice.seqMapping.AMD.TypeId"]]
+
+["cs:namespace:Ice.seqMapping.AMD"]
 module Test
 {
 
@@ -122,11 +120,11 @@
 ["clr:generic:Queue"] sequence<En> QEnS;
 ["clr:generic:Stack"] sequence<En> SEnS;
 
-["clr:generic:Custom"] sequence<int> CustomIntS;
-["clr:generic:Custom"] sequence<CV> CustomCVS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<int> CustomIntS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<CV> CustomCVS;
 
-["clr:generic:Custom"] sequence<CustomIntS> CustomIntSS;
-["clr:generic:Custom"] sequence<CustomCVS> CustomCVSS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<CustomIntS> CustomIntSS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<CustomCVS> CustomCVSS;
 
 ["clr:serializable:Serialize.Small"] sequence<byte> SerialSmall;
 ["clr:serializable:Serialize.Large"] sequence<byte> SerialLarge;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+[["cs:typeid-namespace:Ice.seqMapping.TypeId"]]
+
+["cs:namespace:Ice.seqMapping"]
 module Test
 {
 
@@ -17,67 +15,67 @@
 ["clr:generic:LinkedList"] sequence<byte> KByteS;
 ["clr:generic:Queue"] sequence<byte> QByteS;
 ["clr:generic:Stack"] sequence<byte> SByteS;
-["clr:generic:Custom"] sequence<byte> CByteS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<byte> CByteS;
 
 sequence<bool> ABoolS;
 ["clr:generic:List"] sequence<bool> LBoolS;
 ["clr:generic:LinkedList"] sequence<bool> KBoolS;
 ["clr:generic:Queue"] sequence<bool> QBoolS;
 ["clr:generic:Stack"] sequence<bool> SBoolS;
-["clr:generic:Custom"] sequence<bool> CBoolS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<bool> CBoolS;
 
 sequence<short> AShortS;
 ["clr:generic:List"] sequence<short> LShortS;
 ["clr:generic:LinkedList"] sequence<short> KShortS;
 ["clr:generic:Queue"] sequence<short> QShortS;
 ["clr:generic:Stack"] sequence<short> SShortS;
-["clr:generic:Custom"] sequence<short> CShortS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<short> CShortS;
 
 sequence<int> AIntS;
 ["clr:generic:List"] sequence<int> LIntS;
 ["clr:generic:LinkedList"] sequence<int> KIntS;
 ["clr:generic:Queue"] sequence<int> QIntS;
 ["clr:generic:Stack"] sequence<int> SIntS;
-["clr:generic:Custom"] sequence<int> CIntS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<int> CIntS;
 
 sequence<long> ALongS;
 ["clr:generic:List"] sequence<long> LLongS;
 ["clr:generic:LinkedList"] sequence<long> KLongS;
 ["clr:generic:Queue"] sequence<long> QLongS;
 ["clr:generic:Stack"] sequence<long> SLongS;
-["clr:generic:Custom"] sequence<long> CLongS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<long> CLongS;
 
 sequence<float> AFloatS;
 ["clr:generic:List"] sequence<float> LFloatS;
 ["clr:generic:LinkedList"] sequence<float> KFloatS;
 ["clr:generic:Queue"] sequence<float> QFloatS;
 ["clr:generic:Stack"] sequence<float> SFloatS;
-["clr:generic:Custom"] sequence<float> CFloatS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<float> CFloatS;
 
 sequence<double> ADoubleS;
 ["clr:generic:List"] sequence<double> LDoubleS;
 ["clr:generic:LinkedList"] sequence<double> KDoubleS;
 ["clr:generic:Queue"] sequence<double> QDoubleS;
 ["clr:generic:Stack"] sequence<double> SDoubleS;
-["clr:generic:Custom"] sequence<double> CDoubleS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<double> CDoubleS;
 
 sequence<string> AStringS;
 ["clr:generic:List"] sequence<string> LStringS;
 ["clr:generic:LinkedList"] sequence<string> KStringS;
 ["clr:generic:Queue"] sequence<string> QStringS;
 ["clr:generic:Stack"] sequence<string> SStringS;
-["clr:generic:Custom"] sequence<string> CStringS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<string> CStringS;
 
 sequence<Object> AObjectS;
 ["clr:generic:List"] sequence<Object> LObjectS;
-["clr:generic:Custom"] sequence<Object> CObjectS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<Object> CObjectS;
 
 sequence<Object*> AObjectPrxS;
 ["clr:generic:List"] sequence<Object*> LObjectPrxS;
 ["clr:generic:LinkedList"] sequence<Object*> KObjectPrxS;
 ["clr:generic:Queue"] sequence<Object*> QObjectPrxS;
 ["clr:generic:Stack"] sequence<Object*> SObjectPrxS;
-["clr:generic:Custom"] sequence<Object*> CObjectPrxS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<Object*> CObjectPrxS;
 
 struct S
 {
@@ -89,7 +87,7 @@
 ["clr:generic:LinkedList"] sequence<S> KStructS;
 ["clr:generic:Queue"] sequence<S> QStructS;
 ["clr:generic:Stack"] sequence<S> SStructS;
-["clr:generic:Custom"] sequence<S> CStructS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<S> CStructS;
 
 struct SD
 {
@@ -101,7 +99,7 @@
 ["clr:generic:LinkedList"] sequence<SD> KStructSD;
 ["clr:generic:Queue"] sequence<SD> QStructSD;
 ["clr:generic:Stack"] sequence<SD> SStructSD;
-["clr:generic:Custom"] sequence<SD> CStructSD;
+["clr:generic:Ice.seqMapping.Custom"] sequence<SD> CStructSD;
 
 class CV
 {
@@ -117,7 +115,7 @@
 ["clr:generic:LinkedList"] sequence<I*> KIPrxS;
 ["clr:generic:Queue"] sequence<I*> QIPrxS;
 ["clr:generic:Stack"] sequence<I*> SIPrxS;
-["clr:generic:Custom"] sequence<I*> CIPrxS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<I*> CIPrxS;
 
 class CR
 {
@@ -126,7 +124,7 @@
 
 sequence<CR> ACRS;
 ["clr:generic:List"] sequence<CR> LCRS;
-["clr:generic:Custom"] sequence<CR> CCRS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<CR> CCRS;
 
 enum En { A, B, C }
 
@@ -135,13 +133,13 @@
 ["clr:generic:LinkedList"] sequence<En> KEnS;
 ["clr:generic:Queue"] sequence<En> QEnS;
 ["clr:generic:Stack"] sequence<En> SEnS;
-["clr:generic:Custom"] sequence<En> CEnS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<En> CEnS;
 
-["clr:generic:Custom"] sequence<int> CustomIntS;
-["clr:generic:Custom"] sequence<CV> CustomCVS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<int> CustomIntS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<CV> CustomCVS;
 
-["clr:generic:Custom"] sequence<CustomIntS> CustomIntSS;
-["clr:generic:Custom"] sequence<CustomCVS> CustomCVSS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<CustomIntS> CustomIntSS;
+["clr:generic:Ice.seqMapping.Custom"] sequence<CustomCVS> CustomCVSS;
 
 ["clr:serializable:Serialize.Small"] sequence<byte> SerialSmall;
 ["clr:serializable:Serialize.Large"] sequence<byte> SerialLarge;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/TwowaysAMI.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/TwowaysAMI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/TwowaysAMI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/TwowaysAMI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,1897 +1,1895 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Diagnostics;
-using System.Threading;
 using System.Collections.Generic;
-using Test;
 
-public class TwowaysAMI
+namespace Ice
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new System.SystemException();
-        }
-    }
-
-    private class CallbackBase
+    namespace seqMapping
     {
-        internal CallbackBase()
-        {
-            _called = false;
-        }
-
-        public virtual void check()
+        public class TwowaysAMI
         {
-            lock(this)
+            private static void test(bool b)
             {
-                while(!_called)
+                if(!b)
                 {
-                    System.Threading.Monitor.Wait(this);
+                    throw new System.SystemException();
                 }
-
-                _called = false;
             }
-        }
 
-        public virtual void called()
-        {
-            lock(this)
+            private class CallbackBase
             {
-                Debug.Assert(!_called);
-                _called = true;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
+                internal CallbackBase()
+                {
+                    _called = false;
+                }
 
-        private bool _called;
-    }
+                public virtual void check()
+                {
+                    lock(this)
+                    {
+                        while(!_called)
+                        {
+                            System.Threading.Monitor.Wait(this);
+                        }
 
-    private class Callback
-    {
-        public void opAByteSI(Ice.AsyncResult result)
-        {
-            byte[] i = (byte[])result.AsyncState;
-            byte[] o;
-            byte[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAByteS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                        _called = false;
+                    }
+                }
 
-        public void opLByteSI(Ice.AsyncResult result)
-        {
-            List<byte> i = (List<byte>)result.AsyncState;
-            List<byte> o;
-            List<byte> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLByteS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public virtual void called()
+                {
+                    lock(this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        System.Threading.Monitor.Pulse(this);
+                    }
+                }
 
-        public void opKByteSI(Ice.AsyncResult result)
-        {
-            LinkedList<byte> i = (LinkedList<byte>)result.AsyncState;
-            LinkedList<byte> o;
-            LinkedList<byte> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKByteS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                private bool _called;
+            }
 
-        public void opQByteSI(Ice.AsyncResult result)
-        {
-            Queue<byte> i = (Queue<byte>)result.AsyncState;
-            Queue<byte> o;
-            Queue<byte> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQByteS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+            private class Callback
+            {
+                public void opAByteSI(Ice.AsyncResult result)
+                {
+                    byte[] i =(byte[])result.AsyncState;
+                    byte[] o;
+                    byte[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAByteS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSByteSI(Ice.AsyncResult result)
-        {
-            Stack<byte> i = (Stack<byte>)result.AsyncState;
-            Stack<byte> o;
-            Stack<byte> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSByteS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLByteSI(Ice.AsyncResult result)
+                {
+                    List<byte> i =(List<byte>)result.AsyncState;
+                    List<byte> o;
+                    List<byte> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLByteS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opABoolSI(Ice.AsyncResult result)
-        {
-            bool[] i = (bool[])result.AsyncState;
-            bool[] o;
-            bool[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opABoolS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKByteSI(Ice.AsyncResult result)
+                {
+                    LinkedList<byte> i =(LinkedList<byte>)result.AsyncState;
+                    LinkedList<byte> o;
+                    LinkedList<byte> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKByteS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLBoolSI(Ice.AsyncResult result)
-        {
-            List<bool> i = (List<bool>)result.AsyncState;
-            List<bool> o;
-            List<bool> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLBoolS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQByteSI(Ice.AsyncResult result)
+                {
+                    Queue<byte> i =(Queue<byte>)result.AsyncState;
+                    Queue<byte> o;
+                    Queue<byte> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQByteS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKBoolSI(Ice.AsyncResult result)
-        {
-            LinkedList<bool> i = (LinkedList<bool>)result.AsyncState;
-            LinkedList<bool> o;
-            LinkedList<bool> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKBoolS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSByteSI(Ice.AsyncResult result)
+                {
+                    Stack<byte> i =(Stack<byte>)result.AsyncState;
+                    Stack<byte> o;
+                    Stack<byte> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSByteS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQBoolSI(Ice.AsyncResult result)
-        {
-            Queue<bool> i = (Queue<bool>)result.AsyncState;
-            Queue<bool> o;
-            Queue<bool> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQBoolS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opABoolSI(Ice.AsyncResult result)
+                {
+                    bool[] i =(bool[])result.AsyncState;
+                    bool[] o;
+                    bool[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opABoolS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSBoolSI(Ice.AsyncResult result)
-        {
-            Stack<bool> i = (Stack<bool>)result.AsyncState;
-            Stack<bool> o;
-            Stack<bool> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSBoolS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLBoolSI(Ice.AsyncResult result)
+                {
+                    List<bool> i =(List<bool>)result.AsyncState;
+                    List<bool> o;
+                    List<bool> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLBoolS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAShortSI(Ice.AsyncResult result)
-        {
-            short[] i = (short[])result.AsyncState;
-            short[] o;
-            short[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAShortS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKBoolSI(Ice.AsyncResult result)
+                {
+                    LinkedList<bool> i =(LinkedList<bool>)result.AsyncState;
+                    LinkedList<bool> o;
+                    LinkedList<bool> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKBoolS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLShortSI(Ice.AsyncResult result)
-        {
-            List<short> i = (List<short>)result.AsyncState;
-            List<short> o;
-            List<short> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLShortS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQBoolSI(Ice.AsyncResult result)
+                {
+                    Queue<bool> i =(Queue<bool>)result.AsyncState;
+                    Queue<bool> o;
+                    Queue<bool> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQBoolS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKShortSI(Ice.AsyncResult result)
-        {
-            LinkedList<short> i = (LinkedList<short>)result.AsyncState;
-            LinkedList<short> o;
-            LinkedList<short> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKShortS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSBoolSI(Ice.AsyncResult result)
+                {
+                    Stack<bool> i =(Stack<bool>)result.AsyncState;
+                    Stack<bool> o;
+                    Stack<bool> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSBoolS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQShortSI(Ice.AsyncResult result)
-        {
-            Queue<short> i = (Queue<short>)result.AsyncState;
-            Queue<short> o;
-            Queue<short> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQShortS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAShortSI(Ice.AsyncResult result)
+                {
+                    short[] i =(short[])result.AsyncState;
+                    short[] o;
+                    short[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAShortS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSShortSI(Ice.AsyncResult result)
-        {
-            Stack<short> i = (Stack<short>)result.AsyncState;
-            Stack<short> o;
-            Stack<short> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSShortS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLShortSI(Ice.AsyncResult result)
+                {
+                    List<short> i =(List<short>)result.AsyncState;
+                    List<short> o;
+                    List<short> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLShortS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAIntSI(Ice.AsyncResult result)
-        {
-            int[] i = (int[])result.AsyncState;
-            int[] o;
-            int[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAIntS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKShortSI(Ice.AsyncResult result)
+                {
+                    LinkedList<short> i =(LinkedList<short>)result.AsyncState;
+                    LinkedList<short> o;
+                    LinkedList<short> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKShortS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLIntSI(Ice.AsyncResult result)
-        {
-            List<int> i = (List<int>)result.AsyncState;
-            List<int> o;
-            List<int> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLIntS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQShortSI(Ice.AsyncResult result)
+                {
+                    Queue<short> i =(Queue<short>)result.AsyncState;
+                    Queue<short> o;
+                    Queue<short> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQShortS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKIntSI(Ice.AsyncResult result)
-        {
-            LinkedList<int> i = (LinkedList<int>)result.AsyncState;
-            LinkedList<int> o;
-            LinkedList<int> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKIntS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSShortSI(Ice.AsyncResult result)
+                {
+                    Stack<short> i =(Stack<short>)result.AsyncState;
+                    Stack<short> o;
+                    Stack<short> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSShortS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQIntSI(Ice.AsyncResult result)
-        {
-            Queue<int> i = (Queue<int>)result.AsyncState;
-            Queue<int> o;
-            Queue<int> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQIntS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAIntSI(Ice.AsyncResult result)
+                {
+                    int[] i =(int[])result.AsyncState;
+                    int[] o;
+                    int[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAIntS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSIntSI(Ice.AsyncResult result)
-        {
-            Stack<int> i = (Stack<int>)result.AsyncState;
-            Stack<int> o;
-            Stack<int> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSIntS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLIntSI(Ice.AsyncResult result)
+                {
+                    List<int> i =(List<int>)result.AsyncState;
+                    List<int> o;
+                    List<int> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLIntS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opALongSI(Ice.AsyncResult result)
-        {
-            long[] i = (long[])result.AsyncState;
-            long[] o;
-            long[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opALongS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKIntSI(Ice.AsyncResult result)
+                {
+                    LinkedList<int> i =(LinkedList<int>)result.AsyncState;
+                    LinkedList<int> o;
+                    LinkedList<int> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKIntS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLLongSI(Ice.AsyncResult result)
-        {
-            List<long> i = (List<long>)result.AsyncState;
-            List<long> o;
-            List<long> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLLongS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQIntSI(Ice.AsyncResult result)
+                {
+                    Queue<int> i =(Queue<int>)result.AsyncState;
+                    Queue<int> o;
+                    Queue<int> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQIntS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKLongSI(Ice.AsyncResult result)
-        {
-            LinkedList<long> i = (LinkedList<long>)result.AsyncState;
-            LinkedList<long> o;
-            LinkedList<long> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKLongS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSIntSI(Ice.AsyncResult result)
+                {
+                    Stack<int> i =(Stack<int>)result.AsyncState;
+                    Stack<int> o;
+                    Stack<int> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSIntS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQLongSI(Ice.AsyncResult result)
-        {
-            Queue<long> i = (Queue<long>)result.AsyncState;
-            Queue<long> o;
-            Queue<long> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQLongS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opALongSI(Ice.AsyncResult result)
+                {
+                    long[] i =(long[])result.AsyncState;
+                    long[] o;
+                    long[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opALongS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSLongSI(Ice.AsyncResult result)
-        {
-            Stack<long> i = (Stack<long>)result.AsyncState;
-            Stack<long> o;
-            Stack<long> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSLongS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLLongSI(Ice.AsyncResult result)
+                {
+                    List<long> i =(List<long>)result.AsyncState;
+                    List<long> o;
+                    List<long> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLLongS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAFloatSI(Ice.AsyncResult result)
-        {
-            float[] i = (float[])result.AsyncState;
-            float[] o;
-            float[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAFloatS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKLongSI(Ice.AsyncResult result)
+                {
+                    LinkedList<long> i =(LinkedList<long>)result.AsyncState;
+                    LinkedList<long> o;
+                    LinkedList<long> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKLongS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLFloatSI(Ice.AsyncResult result)
-        {
-            List<float> i = (List<float>)result.AsyncState;
-            List<float> o;
-            List<float> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLFloatS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQLongSI(Ice.AsyncResult result)
+                {
+                    Queue<long> i =(Queue<long>)result.AsyncState;
+                    Queue<long> o;
+                    Queue<long> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQLongS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKFloatSI(Ice.AsyncResult result)
-        {
-            LinkedList<float> i = (LinkedList<float>)result.AsyncState;
-            LinkedList<float> o;
-            LinkedList<float> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKFloatS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSLongSI(Ice.AsyncResult result)
+                {
+                    Stack<long> i =(Stack<long>)result.AsyncState;
+                    Stack<long> o;
+                    Stack<long> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSLongS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQFloatSI(Ice.AsyncResult result)
-        {
-            Queue<float> i = (Queue<float>)result.AsyncState;
-            Queue<float> o;
-            Queue<float> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQFloatS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAFloatSI(Ice.AsyncResult result)
+                {
+                    float[] i =(float[])result.AsyncState;
+                    float[] o;
+                    float[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAFloatS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSFloatSI(Ice.AsyncResult result)
-        {
-            Stack<float> i = (Stack<float>)result.AsyncState;
-            Stack<float> o;
-            Stack<float> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSFloatS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLFloatSI(Ice.AsyncResult result)
+                {
+                    List<float> i =(List<float>)result.AsyncState;
+                    List<float> o;
+                    List<float> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLFloatS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opADoubleSI(Ice.AsyncResult result)
-        {
-            double[] i = (double[])result.AsyncState;
-            double[] o;
-            double[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opADoubleS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKFloatSI(Ice.AsyncResult result)
+                {
+                    LinkedList<float> i =(LinkedList<float>)result.AsyncState;
+                    LinkedList<float> o;
+                    LinkedList<float> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKFloatS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLDoubleSI(Ice.AsyncResult result)
-        {
-            List<double> i = (List<double>)result.AsyncState;
-            List<double> o;
-            List<double> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLDoubleS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQFloatSI(Ice.AsyncResult result)
+                {
+                    Queue<float> i =(Queue<float>)result.AsyncState;
+                    Queue<float> o;
+                    Queue<float> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQFloatS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKDoubleSI(Ice.AsyncResult result)
-        {
-            LinkedList<double> i = (LinkedList<double>)result.AsyncState;
-            LinkedList<double> o;
-            LinkedList<double> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKDoubleS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSFloatSI(Ice.AsyncResult result)
+                {
+                    Stack<float> i =(Stack<float>)result.AsyncState;
+                    Stack<float> o;
+                    Stack<float> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSFloatS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQDoubleSI(Ice.AsyncResult result)
-        {
-            Queue<double> i = (Queue<double>)result.AsyncState;
-            Queue<double> o;
-            Queue<double> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQDoubleS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opADoubleSI(Ice.AsyncResult result)
+                {
+                    double[] i =(double[])result.AsyncState;
+                    double[] o;
+                    double[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opADoubleS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSDoubleSI(Ice.AsyncResult result)
-        {
-            Stack<double> i = (Stack<double>)result.AsyncState;
-            Stack<double> o;
-            Stack<double> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSDoubleS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLDoubleSI(Ice.AsyncResult result)
+                {
+                    List<double> i =(List<double>)result.AsyncState;
+                    List<double> o;
+                    List<double> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLDoubleS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAStringSI(Ice.AsyncResult result)
-        {
-            string[] i = (string[])result.AsyncState;
-            string[] o;
-            string[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAStringS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKDoubleSI(Ice.AsyncResult result)
+                {
+                    LinkedList<double> i =(LinkedList<double>)result.AsyncState;
+                    LinkedList<double> o;
+                    LinkedList<double> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKDoubleS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLStringSI(Ice.AsyncResult result)
-        {
-            List<string> i = (List<string>)result.AsyncState;
-            List<string> o;
-            List<string> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLStringS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQDoubleSI(Ice.AsyncResult result)
+                {
+                    Queue<double> i =(Queue<double>)result.AsyncState;
+                    Queue<double> o;
+                    Queue<double> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQDoubleS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKStringSI(Ice.AsyncResult result)
-        {
-            LinkedList<string> i = (LinkedList<string>)result.AsyncState;
-            LinkedList<string> o;
-            LinkedList<string> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKStringS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSDoubleSI(Ice.AsyncResult result)
+                {
+                    Stack<double> i =(Stack<double>)result.AsyncState;
+                    Stack<double> o;
+                    Stack<double> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSDoubleS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQStringSI(Ice.AsyncResult result)
-        {
-            Queue<string> i = (Queue<string>)result.AsyncState;
-            Queue<string> o;
-            Queue<string> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQStringS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAStringSI(Ice.AsyncResult result)
+                {
+                    string[] i =(string[])result.AsyncState;
+                    string[] o;
+                    string[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAStringS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSStringSI(Ice.AsyncResult result)
-        {
-            Stack<string> i = (Stack<string>)result.AsyncState;
-            Stack<string> o;
-            Stack<string> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSStringS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLStringSI(Ice.AsyncResult result)
+                {
+                    List<string> i =(List<string>)result.AsyncState;
+                    List<string> o;
+                    List<string> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLStringS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAObjectSI(Ice.AsyncResult result)
-        {
-            Ice.Value[] i = (Ice.Value[])result.AsyncState;
-            Ice.Value[] o;
-            Ice.Value[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAObjectS(out o, result);
-            System.Collections.IEnumerator eo = o.GetEnumerator();
-            System.Collections.IEnumerator er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == ((CV)eo.Current).i);
-                test(obj.i == ((CV)er.Current).i);
-            }
-            callback.called();
-        }
+                public void opKStringSI(Ice.AsyncResult result)
+                {
+                    LinkedList<string> i =(LinkedList<string>)result.AsyncState;
+                    LinkedList<string> o;
+                    LinkedList<string> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKStringS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLObjectSI(Ice.AsyncResult result)
-        {
-            List<Ice.Value> i = (List<Ice.Value>)result.AsyncState;
-            List<Ice.Value> o;
-            List<Ice.Value> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLObjectS(out o, result);
-            IEnumerator<Ice.Value> eo = o.GetEnumerator();
-            IEnumerator<Ice.Value> er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == ((CV)eo.Current).i);
-                test(obj.i == ((CV)er.Current).i);
-            }
-            callback.called();
-        }
+                public void opQStringSI(Ice.AsyncResult result)
+                {
+                    Queue<string> i =(Queue<string>)result.AsyncState;
+                    Queue<string> o;
+                    Queue<string> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQStringS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAObjectPrxSI(Ice.AsyncResult result)
-        {
-            Ice.ObjectPrx[] i = (Ice.ObjectPrx[])result.AsyncState;
-            Ice.ObjectPrx[] o;
-            Ice.ObjectPrx[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAObjectPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSStringSI(Ice.AsyncResult result)
+                {
+                    Stack<string> i =(Stack<string>)result.AsyncState;
+                    Stack<string> o;
+                    Stack<string> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSStringS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLObjectPrxSI(Ice.AsyncResult result)
-        {
-            List<Ice.ObjectPrx> i = (List<Ice.ObjectPrx>)result.AsyncState;
-            List<Ice.ObjectPrx> o;
-            List<Ice.ObjectPrx> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLObjectPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAObjectSI(Ice.AsyncResult result)
+                {
+                    Ice.Value[] i =(Ice.Value[])result.AsyncState;
+                    Ice.Value[] o;
+                    Ice.Value[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAObjectS(out o, result);
+                    System.Collections.IEnumerator eo = o.GetEnumerator();
+                    System.Collections.IEnumerator er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i ==((Test.CV)eo.Current).i);
+                        test(obj.i ==((Test.CV)er.Current).i);
+                    }
+                    callback.called();
+                }
 
-        public void opKObjectPrxSI(Ice.AsyncResult result)
-        {
-            LinkedList<Ice.ObjectPrx> i = (LinkedList<Ice.ObjectPrx>)result.AsyncState;
-            LinkedList<Ice.ObjectPrx> o;
-            LinkedList<Ice.ObjectPrx> r =
-                MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKObjectPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLObjectSI(Ice.AsyncResult result)
+                {
+                    List<Ice.Value> i =(List<Ice.Value>)result.AsyncState;
+                    List<Ice.Value> o;
+                    List<Ice.Value> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLObjectS(out o, result);
+                    IEnumerator<Ice.Value> eo = o.GetEnumerator();
+                    IEnumerator<Ice.Value> er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i ==((Test.CV)eo.Current).i);
+                        test(obj.i ==((Test.CV)er.Current).i);
+                    }
+                    callback.called();
+                }
 
-        public void opQObjectPrxSI(Ice.AsyncResult result)
-        {
-            Queue<Ice.ObjectPrx> i = (Queue<Ice.ObjectPrx>)result.AsyncState;
-            Queue<Ice.ObjectPrx> o;
-            Queue<Ice.ObjectPrx> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQObjectPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAObjectPrxSI(Ice.AsyncResult result)
+                {
+                    Ice.ObjectPrx[] i =(Ice.ObjectPrx[])result.AsyncState;
+                    Ice.ObjectPrx[] o;
+                    Ice.ObjectPrx[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAObjectPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSObjectPrxSI(Ice.AsyncResult result)
-        {
-            Stack<Ice.ObjectPrx> i = (Stack<Ice.ObjectPrx>)result.AsyncState;
-            Stack<Ice.ObjectPrx> o;
-            Stack<Ice.ObjectPrx> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSObjectPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLObjectPrxSI(Ice.AsyncResult result)
+                {
+                    List<Ice.ObjectPrx> i =(List<Ice.ObjectPrx>)result.AsyncState;
+                    List<Ice.ObjectPrx> o;
+                    List<Ice.ObjectPrx> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLObjectPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAStructSI(Ice.AsyncResult result)
-        {
-            S[] i = (S[])result.AsyncState;
-            S[] o;
-            S[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAStructS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKObjectPrxSI(Ice.AsyncResult result)
+                {
+                    LinkedList<Ice.ObjectPrx> i =(LinkedList<Ice.ObjectPrx>)result.AsyncState;
+                    LinkedList<Ice.ObjectPrx> o;
+                    LinkedList<Ice.ObjectPrx> r =
+                        Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKObjectPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLStructSI(Ice.AsyncResult result)
-        {
-            List<S> i = (List<S>)result.AsyncState;
-            List<S> o;
-            List<S> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLStructS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQObjectPrxSI(Ice.AsyncResult result)
+                {
+                    Queue<Ice.ObjectPrx> i =(Queue<Ice.ObjectPrx>)result.AsyncState;
+                    Queue<Ice.ObjectPrx> o;
+                    Queue<Ice.ObjectPrx> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQObjectPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKStructSI(Ice.AsyncResult result)
-        {
-            LinkedList<S> i = (LinkedList<S>)result.AsyncState;
-            LinkedList<S> o;
-            LinkedList<S> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKStructS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSObjectPrxSI(Ice.AsyncResult result)
+                {
+                    Stack<Ice.ObjectPrx> i =(Stack<Ice.ObjectPrx>)result.AsyncState;
+                    Stack<Ice.ObjectPrx> o;
+                    Stack<Ice.ObjectPrx> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSObjectPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQStructSI(Ice.AsyncResult result)
-        {
-            Queue<S> i = (Queue<S>)result.AsyncState;
-            Queue<S> o;
-            Queue<S> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQStructS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAStructSI(Ice.AsyncResult result)
+                {
+                    Test.S[] i =(Test.S[])result.AsyncState;
+                    Test.S[] o;
+                    Test.S[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAStructS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSStructSI(Ice.AsyncResult result)
-        {
-            Stack<S> i = (Stack<S>)result.AsyncState;
-            Stack<S> o;
-            Stack<S> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSStructS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLStructSI(Ice.AsyncResult result)
+                {
+                    List<Test.S> i =(List<Test.S>)result.AsyncState;
+                    List<Test.S> o;
+                    List<Test.S> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLStructS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAStructSDI(Ice.AsyncResult result)
-        {
-            SD[] i = (SD[])result.AsyncState;
-            SD[] o;
-            SD[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAStructSD(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKStructSI(Ice.AsyncResult result)
+                {
+                    LinkedList<Test.S> i =(LinkedList<Test.S>)result.AsyncState;
+                    LinkedList<Test.S> o;
+                    LinkedList<Test.S> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKStructS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLStructSDI(Ice.AsyncResult result)
-        {
-            List<SD> i = (List<SD>)result.AsyncState;
-            List<SD> o;
-            List<SD> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLStructSD(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opQStructSI(Ice.AsyncResult result)
+                {
+                    Queue<Test.S> i =(Queue<Test.S>)result.AsyncState;
+                    Queue<Test.S> o;
+                    Queue<Test.S> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQStructS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opKStructSDI(Ice.AsyncResult result)
-        {
-            LinkedList<SD> i = (LinkedList<SD>)result.AsyncState;
-            LinkedList<SD> o;
-            LinkedList<SD> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKStructSD(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSStructSI(Ice.AsyncResult result)
+                {
+                    Stack<Test.S> i =(Stack<Test.S>)result.AsyncState;
+                    Stack<Test.S> o;
+                    Stack<Test.S> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSStructS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opQStructSDI(Ice.AsyncResult result)
-        {
-            Queue<SD> i = (Queue<SD>)result.AsyncState;
-            Queue<SD> o;
-            Queue<SD> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQStructSD(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAStructSDI(Ice.AsyncResult result)
+                {
+                    Test.SD[] i =(Test.SD[])result.AsyncState;
+                    Test.SD[] o;
+                    Test.SD[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAStructSD(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSStructSDI(Ice.AsyncResult result)
-        {
-            Stack<SD> i = (Stack<SD>)result.AsyncState;
-            Stack<SD> o;
-            Stack<SD> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSStructSD(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLStructSDI(Ice.AsyncResult result)
+                {
+                    List<Test.SD> i =(List<Test.SD>)result.AsyncState;
+                    List<Test.SD> o;
+                    List<Test.SD> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLStructSD(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opACVSI(Ice.AsyncResult result)
-        {
-            CV[] i = (CV[])result.AsyncState;
-            CV[] o;
-            CV[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opACVS(out o, result);
-            System.Collections.IEnumerator eo = o.GetEnumerator();
-            System.Collections.IEnumerator er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == ((CV)eo.Current).i);
-                test(obj.i == ((CV)er.Current).i);
-            }
-            callback.called();
-        }
+                public void opKStructSDI(Ice.AsyncResult result)
+                {
+                    LinkedList<Test.SD> i =(LinkedList<Test.SD>)result.AsyncState;
+                    LinkedList<Test.SD> o;
+                    LinkedList<Test.SD> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKStructSD(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLCVSI(Ice.AsyncResult result)
-        {
-            List<CV> i = (List<CV>)result.AsyncState;
-            List<CV> o;
-            List<CV> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLCVS(out o, result);
-            IEnumerator<CV> eo = o.GetEnumerator();
-            IEnumerator<CV> er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == ((CV)eo.Current).i);
-                test(obj.i == ((CV)er.Current).i);
-            }
-            callback.called();
-        }
+                public void opQStructSDI(Ice.AsyncResult result)
+                {
+                    Queue<Test.SD> i =(Queue<Test.SD>)result.AsyncState;
+                    Queue<Test.SD> o;
+                    Queue<Test.SD> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQStructSD(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opIPrxSI(Ice.AsyncResult result)
-        {
-            Test.IPrx[] i = (Test.IPrx[])result.AsyncState;
-            Test.IPrx[] o;
-            Test.IPrx[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAIPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSStructSDI(Ice.AsyncResult result)
+                {
+                    Stack<Test.SD> i =(Stack<Test.SD>)result.AsyncState;
+                    Stack<Test.SD> o;
+                    Stack<Test.SD> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSStructSD(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLIPrxSI(Ice.AsyncResult result)
-        {
-            List<Test.IPrx> i = (List<Test.IPrx>)result.AsyncState;
-            List<Test.IPrx> o;
-            List<Test.IPrx> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLIPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opACVSI(Ice.AsyncResult result)
+                {
+                    Test.CV[] i =(Test.CV[])result.AsyncState;
+                    Test.CV[] o;
+                    Test.CV[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opACVS(out o, result);
+                    System.Collections.IEnumerator eo = o.GetEnumerator();
+                    System.Collections.IEnumerator er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i ==((Test.CV)eo.Current).i);
+                        test(obj.i ==((Test.CV)er.Current).i);
+                    }
+                    callback.called();
+                }
 
-        public void opKIPrxSI(Ice.AsyncResult result)
-        {
-            LinkedList<Test.IPrx> i = (LinkedList<Test.IPrx>)result.AsyncState;
-            LinkedList<Test.IPrx> o;
-            LinkedList<Test.IPrx> r =
-                MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKIPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLCVSI(Ice.AsyncResult result)
+                {
+                    List<Test.CV> i =(List<Test.CV>)result.AsyncState;
+                    List<Test.CV> o;
+                    List<Test.CV> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLCVS(out o, result);
+                    IEnumerator<Test.CV> eo = o.GetEnumerator();
+                    IEnumerator<Test.CV> er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i == eo.Current.i);
+                        test(obj.i == er.Current.i);
+                    }
+                    callback.called();
+                }
 
-        public void opQIPrxSI(Ice.AsyncResult result)
-        {
-            Queue<Test.IPrx> i = (Queue<Test.IPrx>)result.AsyncState;
-            Queue<Test.IPrx> o;
-            Queue<Test.IPrx> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQIPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opIPrxSI(Ice.AsyncResult result)
+                {
+                    Test.IPrx[] i =(Test.IPrx[])result.AsyncState;
+                    Test.IPrx[] o;
+                    Test.IPrx[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAIPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSIPrxSI(Ice.AsyncResult result)
-        {
-            Stack<Test.IPrx> i = (Stack<Test.IPrx>)result.AsyncState;
-            Stack<Test.IPrx> o;
-            Stack<Test.IPrx> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSIPrxS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLIPrxSI(Ice.AsyncResult result)
+                {
+                    List<Test.IPrx> i =(List<Test.IPrx>)result.AsyncState;
+                    List<Test.IPrx> o;
+                    List<Test.IPrx> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLIPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opACRSI(Ice.AsyncResult result)
-        {
-            CR[] i = (CR[])result.AsyncState;
-            CR[] o;
-            CR[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opACRS(out o, result);
-            System.Collections.IEnumerator eo = o.GetEnumerator();
-            System.Collections.IEnumerator er = r.GetEnumerator();
-            foreach(CR obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.v.i == ((CR)eo.Current).v.i);
-                test(obj.v.i == ((CR)er.Current).v.i);
-            }
-            callback.called();
-        }
+                public void opKIPrxSI(Ice.AsyncResult result)
+                {
+                    LinkedList<Test.IPrx> i =(LinkedList<Test.IPrx>)result.AsyncState;
+                    LinkedList<Test.IPrx> o;
+                    LinkedList<Test.IPrx> r =
+                        Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKIPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLCRSI(Ice.AsyncResult result)
-        {
-            List<CR> i = (List<CR>)result.AsyncState;
-            List<CR> o;
-            List<CR> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLCRS(out o, result);
-            IEnumerator<CR> eo = o.GetEnumerator();
-            IEnumerator<CR> er = r.GetEnumerator();
-            foreach(CR obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.v.i == ((CR)eo.Current).v.i);
-                test(obj.v.i == ((CR)er.Current).v.i);
-            }
-            callback.called();
-        }
+                public void opQIPrxSI(Ice.AsyncResult result)
+                {
+                    Queue<Test.IPrx> i =(Queue<Test.IPrx>)result.AsyncState;
+                    Queue<Test.IPrx> o;
+                    Queue<Test.IPrx> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQIPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opAEnSI(Ice.AsyncResult result)
-        {
-            En[] i = (En[])result.AsyncState;
-            En[] o;
-            En[] r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAEnS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opSIPrxSI(Ice.AsyncResult result)
+                {
+                    Stack<Test.IPrx> i =(Stack<Test.IPrx>)result.AsyncState;
+                    Stack<Test.IPrx> o;
+                    Stack<Test.IPrx> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSIPrxS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opLEnSI(Ice.AsyncResult result)
-        {
-            List<En> i = (List<En>)result.AsyncState;
-            List<En> o;
-            List<En> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLEnS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opACRSI(Ice.AsyncResult result)
+                {
+                    Test.CR[] i =(Test.CR[])result.AsyncState;
+                    Test.CR[] o;
+                    Test.CR[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opACRS(out o, result);
+                    System.Collections.IEnumerator eo = o.GetEnumerator();
+                    System.Collections.IEnumerator er = r.GetEnumerator();
+                    foreach(Test.CR obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.v.i ==((Test.CR)eo.Current).v.i);
+                        test(obj.v.i ==((Test.CR)er.Current).v.i);
+                    }
+                    callback.called();
+                }
 
-        public void opKEnSI(Ice.AsyncResult result)
-        {
-            LinkedList<En> i = (LinkedList<En>)result.AsyncState;
-            LinkedList<En> o;
-            LinkedList<En> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKEnS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLCRSI(Ice.AsyncResult result)
+                {
+                    List<Test.CR> i =(List<Test.CR>)result.AsyncState;
+                    List<Test.CR> o;
+                    List<Test.CR> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLCRS(out o, result);
+                    IEnumerator<Test.CR> eo = o.GetEnumerator();
+                    IEnumerator<Test.CR> er = r.GetEnumerator();
+                    foreach(Test.CR obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.v.i == eo.Current.v.i);
+                        test(obj.v.i == er.Current.v.i);
+                    }
+                    callback.called();
+                }
 
-        public void opQEnSI(Ice.AsyncResult result)
-        {
-            Queue<En> i = (Queue<En>)result.AsyncState;
-            Queue<En> o;
-            Queue<En> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQEnS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opAEnSI(Ice.AsyncResult result)
+                {
+                    Test.En[] i =(Test.En[])result.AsyncState;
+                    Test.En[] o;
+                    Test.En[] r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opAEnS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSEnSI(Ice.AsyncResult result)
-        {
-            Stack<En> i = (Stack<En>)result.AsyncState;
-            Stack<En> o;
-            Stack<En> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSEnS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opLEnSI(Ice.AsyncResult result)
+                {
+                    List<Test.En> i =(List<Test.En>)result.AsyncState;
+                    List<Test.En> o;
+                    List<Test.En> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opLEnS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opCustomIntSI(Ice.AsyncResult result)
-        {
-            Custom<int> i = (Custom<int>)result.AsyncState;
-            Custom<int> o;
-            Custom<int> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomIntS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opKEnSI(Ice.AsyncResult result)
+                {
+                    LinkedList<Test.En> i =(LinkedList<Test.En>)result.AsyncState;
+                    LinkedList<Test.En> o;
+                    LinkedList<Test.En> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opKEnS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opCustomCVSI(Ice.AsyncResult result)
-        {
-            Custom<CV> i = (Custom<CV>)result.AsyncState;
-            Custom<CV> o;
-            Custom<CV> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomCVS(out o, result);
-            IEnumerator<CV> eo = (IEnumerator<CV>)o.GetEnumerator();
-            IEnumerator<CV> er = (IEnumerator<CV>)r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                if(obj == null)
+                public void opQEnSI(Ice.AsyncResult result)
                 {
-                    test(eo.Current == null);
-                    test(er.Current == null);
+                    Queue<Test.En> i =(Queue<Test.En>)result.AsyncState;
+                    Queue<Test.En> o;
+                    Queue<Test.En> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opQEnS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
                 }
-                else
+
+                public void opSEnSI(Ice.AsyncResult result)
                 {
-                    test(obj.i == ((CV)eo.Current).i);
-                    test(obj.i == ((CV)er.Current).i);
+                    Stack<Test.En> i =(Stack<Test.En>)result.AsyncState;
+                    Stack<Test.En> o;
+                    Stack<Test.En> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSEnS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
                 }
-            }
-            callback.called();
-        }
 
-        public void opCustomIntSSI(Ice.AsyncResult result)
-        {
-            Custom<Custom<int>> i = (Custom<Custom<int>>)result.AsyncState;
-            Custom<Custom<int>> o;
-            Custom<Custom<int>> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomIntSS(out o, result);
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-            callback.called();
-        }
+                public void opCustomIntSI(Ice.AsyncResult result)
+                {
+                    Custom<int> i =(Custom<int>)result.AsyncState;
+                    Custom<int> o;
+                    Custom<int> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomIntS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opCustomCVSSI(Ice.AsyncResult result)
-        {
-            Custom<Custom<CV>> i = (Custom<Custom<CV>>)result.AsyncState;
-            Custom<Custom<CV>> o;
-            Custom<Custom<CV>> r = MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomCVSS(out o, result);
-            IEnumerator<Custom<CV>> eo = (IEnumerator<Custom<CV>>)o.GetEnumerator();
-            IEnumerator<Custom<CV>> er = (IEnumerator<Custom<CV>>)r.GetEnumerator();
-            foreach(Custom<CV> s in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                IEnumerator<CV> io = (IEnumerator<CV>)eo.Current.GetEnumerator();
-                IEnumerator<CV> ir = (IEnumerator<CV>)er.Current.GetEnumerator();
-                foreach(CV obj in s)
-                {
-                    io.MoveNext();
-                    ir.MoveNext();
-                    if(obj == null)
-                    {
-                        test(io.Current == null);
-                        test(ir.Current == null);
-                    }
-                    else
+                public void opCustomCVSI(Ice.AsyncResult result)
+                {
+                    Custom<Test.CV> i =(Custom<Test.CV>)result.AsyncState;
+                    Custom<Test.CV> o;
+                    Custom<Test.CV> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomCVS(out o, result);
+                    IEnumerator<Test.CV> eo = o.GetEnumerator();
+                    IEnumerator<Test.CV> er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
                     {
-                        test(obj.i == io.Current.i);
-                        test(obj.i == ir.Current.i);
+                        eo.MoveNext();
+                        er.MoveNext();
+                        if(obj == null)
+                        {
+                            test(eo.Current == null);
+                            test(er.Current == null);
+                        }
+                        else
+                        {
+                            test(obj.i == eo.Current.i);
+                            test(obj.i == er.Current.i);
+                        }
                     }
+                    callback.called();
                 }
-            }
-            callback.called();
-        }
 
-        public void opSerialSmallCSharpNullI(Ice.AsyncResult result)
-        {
-            try
-            {
-                Serialize.Small o;
-                Serialize.Small r =
-                    MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialSmallCSharp(out o, result);
-                test(o == null);
-                test(r == null);
-                callback.called();
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // OK, talking to non-C# server.
-            }
-        }
+                public void opCustomIntSSI(Ice.AsyncResult result)
+                {
+                    Custom<Custom<int>> i =(Custom<Custom<int>>)result.AsyncState;
+                    Custom<Custom<int>> o;
+                    Custom<Custom<int>> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomIntSS(out o, result);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                    callback.called();
+                }
 
-        public void opSerialSmallCSharpI(Ice.AsyncResult result)
-        {
-            try
-            {
-                Serialize.Small o;
-                Serialize.Small r =
-                    MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialSmallCSharp(out o, result);
-                test(o.i == 99);
-                test(r.i == 99);
-                callback.called();
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // OK, talking to non-C# server.
-            }
-        }
+                public void opCustomCVSSI(Ice.AsyncResult result)
+                {
+                    Custom<Custom<Test.CV>> i =(Custom<Custom<Test.CV>>)result.AsyncState;
+                    Custom<Custom<Test.CV>> o;
+                    Custom<Custom<Test.CV>> r = Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opCustomCVSS(out o, result);
+                    IEnumerator<Custom<Test.CV>> eo = o.GetEnumerator();
+                    IEnumerator<Custom<Test.CV>> er = r.GetEnumerator();
+                    foreach(Custom<Test.CV> s in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        IEnumerator<Test.CV> io = eo.Current.GetEnumerator();
+                        IEnumerator<Test.CV> ir = er.Current.GetEnumerator();
+                        foreach(Test.CV obj in s)
+                        {
+                            io.MoveNext();
+                            ir.MoveNext();
+                            if(obj == null)
+                            {
+                                test(io.Current == null);
+                                test(ir.Current == null);
+                            }
+                            else
+                            {
+                                test(obj.i == io.Current.i);
+                                test(obj.i == ir.Current.i);
+                            }
+                        }
+                    }
+                    callback.called();
+                }
 
-        public void opSerialLargeCSharpI(Ice.AsyncResult result)
-        {
-            try
-            {
-                Serialize.Large o;
-                Serialize.Large r =
-                    MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialLargeCSharp(out o, result);
-                test(o.d1 == 1.0);
-                test(o.d2 == 2.0);
-                test(o.d3 == 3.0);
-                test(o.d4 == 4.0);
-                test(o.d5 == 5.0);
-                test(o.d6 == 6.0);
-                test(o.d7 == 7.0);
-                test(o.d8 == 8.0);
-                test(o.d9 == 9.0);
-                test(o.d10 == 10.0);
-                test(r.d1 == 1.0);
-                test(r.d2 == 2.0);
-                test(r.d3 == 3.0);
-                test(r.d4 == 4.0);
-                test(r.d5 == 5.0);
-                test(r.d6 == 6.0);
-                test(r.d7 == 7.0);
-                test(r.d8 == 8.0);
-                test(r.d9 == 9.0);
-                test(r.d10 == 10.0);
-                callback.called();
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // OK, talking to non-C# server.
-            }
-        }
+                public void opSerialSmallCSharpNullI(Ice.AsyncResult result)
+                {
+                    try
+                    {
+                        Serialize.Small o;
+                        Serialize.Small r =
+                            Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialSmallCSharp(out o, result);
+                        test(o == null);
+                        test(r == null);
+                        callback.called();
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // OK, talking to non-C# server.
+                    }
+                }
 
-        public void opSerialStructCSharpI(Ice.AsyncResult result)
-        {
-            try
-            {
-                Serialize.Struct o;
-                Serialize.Struct r =
-                    MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialStructCSharp(out o, result);
-                test(o.o == null);
-                test(o.o2 != null);
-                test(((Serialize.Struct)(o.o2)).o == null);
-                test(((Serialize.Struct)(o.o2)).o2 == o.o2);
-                test(o.s == null);
-                test(o.s2.Equals("Hello"));
-                test(r.o == null);
-                test(r.o2 != null);
-                test(((Serialize.Struct)(r.o2)).o == null);
-                test(((Serialize.Struct)(r.o2)).o2 == r.o2);
-                test(r.s == null);
-                test(r.s2.Equals("Hello"));
-                callback.called();
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // OK, talking to non-C# server.
-            }
-        }
+                public void opSerialSmallCSharpI(Ice.AsyncResult result)
+                {
+                    try
+                    {
+                        Serialize.Small o;
+                        Serialize.Small r =
+                            Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialSmallCSharp(out o, result);
+                        test(o.i == 99);
+                        test(r.i == 99);
+                        callback.called();
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // OK, talking to non-C# server.
+                    }
+                }
 
-        public virtual void check()
-        {
-             callback.check();
-        }
+                public void opSerialLargeCSharpI(Ice.AsyncResult result)
+                {
+                    try
+                    {
+                        Serialize.Large o;
+                        Serialize.Large r =
+                            Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialLargeCSharp(out o, result);
+                        test(o.d1 == 1.0);
+                        test(o.d2 == 2.0);
+                        test(o.d3 == 3.0);
+                        test(o.d4 == 4.0);
+                        test(o.d5 == 5.0);
+                        test(o.d6 == 6.0);
+                        test(o.d7 == 7.0);
+                        test(o.d8 == 8.0);
+                        test(o.d9 == 9.0);
+                        test(o.d10 == 10.0);
+                        test(r.d1 == 1.0);
+                        test(r.d2 == 2.0);
+                        test(r.d3 == 3.0);
+                        test(r.d4 == 4.0);
+                        test(r.d5 == 5.0);
+                        test(r.d6 == 6.0);
+                        test(r.d7 == 7.0);
+                        test(r.d8 == 8.0);
+                        test(r.d9 == 9.0);
+                        test(r.d10 == 10.0);
+                        callback.called();
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // OK, talking to non-C# server.
+                    }
+                }
 
-        private CallbackBase callback = new CallbackBase();
-    }
+                public void opSerialStructCSharpI(Ice.AsyncResult result)
+                {
+                    try
+                    {
+                        Serialize.Struct o;
+                        Serialize.Struct r =
+                            Test.MyClassPrxHelper.uncheckedCast(result.getProxy()).end_opSerialStructCSharp(out o, result);
+                        test(o.o == null);
+                        test(o.o2 != null);
+                        test(((Serialize.Struct)(o.o2)).o == null);
+                        test(((Serialize.Struct)(o.o2)).o2 == o.o2);
+                        test(o.s == null);
+                        test(o.s2.Equals("Hello"));
+                        test(r.o == null);
+                        test(r.o2 != null);
+                        test(((Serialize.Struct)(r.o2)).o == null);
+                        test(((Serialize.Struct)(r.o2)).o2 == r.o2);
+                        test(r.s == null);
+                        test(r.s2.Equals("Hello"));
+                        callback.called();
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // OK, talking to non-C# server.
+                    }
+                }
 
-    static int _length = 100;
+                public virtual void check()
+                {
+                    callback.check();
+                }
 
-    internal static void twowaysAMI(Ice.Communicator communicator, Test.MyClassPrx p)
-    {
-        {
-            byte[] i = new byte[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (byte)c;
+                private CallbackBase callback = new CallbackBase();
             }
 
-            Callback cb = new Callback();
-            p.begin_opAByteS(i, null, cb.opAByteSI, i);
-            cb.check();
-        }
+            static int _length = 100;
 
-        {
-            List<byte> i = new List<byte>();
-            for(int c = 0; c < _length; ++c)
+            internal static void twowaysAMI(Ice.Communicator communicator, Test.MyClassPrx p)
             {
-                i.Add((byte)c);
-            }
+                {
+                    byte[] i = new byte[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(byte)c;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLByteS(i, null, cb.opLByteSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAByteS(i, null, cb.opAByteSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<byte> i = new LinkedList<byte>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((byte)c);
-            }
+                {
+                    List<byte> i = new List<byte>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((byte)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKByteS(i, null, cb.opKByteSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLByteS(i, null, cb.opLByteSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<byte> i = new Queue<byte>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((byte)c);
-            }
+                {
+                    LinkedList<byte> i = new LinkedList<byte>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((byte)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQByteS(i, null, cb.opQByteSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKByteS(i, null, cb.opKByteSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<byte> i = new Stack<byte>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((byte)c);
-            }
+                {
+                    Queue<byte> i = new Queue<byte>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((byte)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSByteS(i, null, cb.opSByteSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQByteS(i, null, cb.opQByteSI, i);
+                    cb.check();
+                }
 
-        {
-            bool[] i = new bool[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = c % 1 == 1;
-            }
+                {
+                    Stack<byte> i = new Stack<byte>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((byte)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opABoolS(i, null, cb.opABoolSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSByteS(i, null, cb.opSByteSI, i);
+                    cb.check();
+                }
 
-        {
-            List<bool> i = new List<bool>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(c % 1 == 1);
-            }
+                {
+                    bool[] i = new bool[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = c % 1 == 1;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLBoolS(i, null, cb.opLBoolSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opABoolS(i, null, cb.opABoolSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<bool> i = new LinkedList<bool>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(c % 1 == 1);
-            }
+                {
+                    List<bool> i = new List<bool>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(c % 1 == 1);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKBoolS(i, null, cb.opKBoolSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLBoolS(i, null, cb.opLBoolSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<bool> i = new Queue<bool>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(c % 1 == 1);
-            }
+                {
+                    LinkedList<bool> i = new LinkedList<bool>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(c % 1 == 1);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQBoolS(i, null, cb.opQBoolSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKBoolS(i, null, cb.opKBoolSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<bool> i = new Stack<bool>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(c % 1 == 1);
-            }
+                {
+                    Queue<bool> i = new Queue<bool>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(c % 1 == 1);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSBoolS(i, null, cb.opSBoolSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQBoolS(i, null, cb.opQBoolSI, i);
+                    cb.check();
+                }
 
-        {
-            short[] i = new short[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (short)c;
-            }
+                {
+                    Stack<bool> i = new Stack<bool>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(c % 1 == 1);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAShortS(i, null, cb.opAShortSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSBoolS(i, null, cb.opSBoolSI, i);
+                    cb.check();
+                }
 
-        {
-            List<short> i = new List<short>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((short)c);
-            }
+                {
+                    short[] i = new short[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(short)c;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLShortS(i, null, cb.opLShortSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAShortS(i, null, cb.opAShortSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<short> i = new LinkedList<short>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((short)c);
-            }
+                {
+                    List<short> i = new List<short>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((short)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKShortS(i, null, cb.opKShortSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLShortS(i, null, cb.opLShortSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<short> i = new Queue<short>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((short)c);
-            }
+                {
+                    LinkedList<short> i = new LinkedList<short>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((short)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQShortS(i, null, cb.opQShortSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKShortS(i, null, cb.opKShortSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<short> i = new Stack<short>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((short)c);
-            }
+                {
+                    Queue<short> i = new Queue<short>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((short)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSShortS(i, null, cb.opSShortSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQShortS(i, null, cb.opQShortSI, i);
+                    cb.check();
+                }
 
-        {
-            int[] i = new int[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (int)c;
-            }
+                {
+                    Stack<short> i = new Stack<short>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((short)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAIntS(i, null, cb.opAIntSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSShortS(i, null, cb.opSShortSI, i);
+                    cb.check();
+                }
 
-        {
-            List<int> i = new List<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((int)c);
-            }
+                {
+                    int[] i = new int[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(int)c;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLIntS(i, null, cb.opLIntSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAIntS(i, null, cb.opAIntSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<int> i = new LinkedList<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((int)c);
-            }
+                {
+                    List<int> i = new List<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((int)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKIntS(i, null, cb.opKIntSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLIntS(i, null, cb.opLIntSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<int> i = new Queue<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((int)c);
-            }
+                {
+                    LinkedList<int> i = new LinkedList<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((int)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQIntS(i, null, cb.opQIntSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKIntS(i, null, cb.opKIntSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<int> i = new Stack<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((int)c);
-            }
+                {
+                    Queue<int> i = new Queue<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((int)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSIntS(i, null, cb.opSIntSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQIntS(i, null, cb.opQIntSI, i);
+                    cb.check();
+                }
 
-        {
-            long[] i = new long[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (long)c;
-            }
+                {
+                    Stack<int> i = new Stack<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((int)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opALongS(i, null, cb.opALongSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSIntS(i, null, cb.opSIntSI, i);
+                    cb.check();
+                }
 
-        {
-            List<long> i = new List<long>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((long)c);
-            }
+                {
+                    long[] i = new long[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(long)c;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLLongS(i, null, cb.opLLongSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opALongS(i, null, cb.opALongSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<long> i = new LinkedList<long>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((long)c);
-            }
+                {
+                    List<long> i = new List<long>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((long)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKLongS(i, null, cb.opKLongSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLLongS(i, null, cb.opLLongSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<long> i = new Queue<long>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((long)c);
-            }
+                {
+                    LinkedList<long> i = new LinkedList<long>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((long)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQLongS(i, null, cb.opQLongSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKLongS(i, null, cb.opKLongSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<long> i = new Stack<long>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((long)c);
-            }
+                {
+                    Queue<long> i = new Queue<long>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((long)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSLongS(i, null, cb.opSLongSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQLongS(i, null, cb.opQLongSI, i);
+                    cb.check();
+                }
 
-        {
-            float[] i = new float[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (float)c;
-            }
+                {
+                    Stack<long> i = new Stack<long>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((long)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAFloatS(i, null, cb.opAFloatSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSLongS(i, null, cb.opSLongSI, i);
+                    cb.check();
+                }
 
-        {
-            List<float> i = new List<float>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((float)c);
-            }
+                {
+                    float[] i = new float[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(float)c;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLFloatS(i, null, cb.opLFloatSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAFloatS(i, null, cb.opAFloatSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<float> i = new LinkedList<float>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((float)c);
-            }
+                {
+                    List<float> i = new List<float>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((float)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKFloatS(i, null, cb.opKFloatSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLFloatS(i, null, cb.opLFloatSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<float> i = new Queue<float>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((float)c);
-            }
+                {
+                    LinkedList<float> i = new LinkedList<float>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((float)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQFloatS(i, null, cb.opQFloatSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKFloatS(i, null, cb.opKFloatSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<float> i = new Stack<float>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((float)c);
-            }
+                {
+                    Queue<float> i = new Queue<float>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((float)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSFloatS(i, null, cb.opSFloatSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQFloatS(i, null, cb.opQFloatSI, i);
+                    cb.check();
+                }
 
-        {
-            double[] i = new double[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (double)c;
-            }
+                {
+                    Stack<float> i = new Stack<float>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((float)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opADoubleS(i, null, cb.opADoubleSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSFloatS(i, null, cb.opSFloatSI, i);
+                    cb.check();
+                }
 
-        {
-            List<double> i = new List<double>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((double)c);
-            }
+                {
+                    double[] i = new double[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(double)c;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLDoubleS(i, null, cb.opLDoubleSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opADoubleS(i, null, cb.opADoubleSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<double> i = new LinkedList<double>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((double)c);
-            }
+                {
+                    List<double> i = new List<double>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((double)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKDoubleS(i, null, cb.opKDoubleSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLDoubleS(i, null, cb.opLDoubleSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<double> i = new Queue<double>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((double)c);
-            }
+                {
+                    LinkedList<double> i = new LinkedList<double>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((double)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQDoubleS(i, null, cb.opQDoubleSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKDoubleS(i, null, cb.opKDoubleSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<double> i = new Stack<double>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((double)c);
-            }
+                {
+                    Queue<double> i = new Queue<double>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((double)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSDoubleS(i, null, cb.opSDoubleSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQDoubleS(i, null, cb.opQDoubleSI, i);
+                    cb.check();
+                }
 
-        {
-            string[] i = new string[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = c.ToString();
-            }
+                {
+                    Stack<double> i = new Stack<double>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((double)c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAStringS(i, null, cb.opAStringSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSDoubleS(i, null, cb.opSDoubleSI, i);
+                    cb.check();
+                }
 
-        {
-            List<string> i = new List<string>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(c.ToString());
-            }
+                {
+                    string[] i = new string[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = c.ToString();
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLStringS(i, null, cb.opLStringSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAStringS(i, null, cb.opAStringSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<string> i = new LinkedList<string>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(c.ToString());
-            }
+                {
+                    List<string> i = new List<string>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(c.ToString());
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKStringS(i, null, cb.opKStringSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLStringS(i, null, cb.opLStringSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<string> i = new Queue<string>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(c.ToString());
-            }
+                {
+                    LinkedList<string> i = new LinkedList<string>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(c.ToString());
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQStringS(i, null, cb.opQStringSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKStringS(i, null, cb.opKStringSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<string> i = new Stack<string>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(c.ToString());
-            }
+                {
+                    Queue<string> i = new Queue<string>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(c.ToString());
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSStringS(i, null, cb.opSStringSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQStringS(i, null, cb.opQStringSI, i);
+                    cb.check();
+                }
 
-        {
-            Ice.Value[] i = new Ice.Value[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = new CV(c);
-            }
+                {
+                    Stack<string> i = new Stack<string>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(c.ToString());
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAObjectS(i, null, cb.opAObjectSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSStringS(i, null, cb.opSStringSI, i);
+                    cb.check();
+                }
 
-        {
-            List<Ice.Value> i = new List<Ice.Value>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CV(c));
-            }
+                {
+                    Ice.Value[] i = new Ice.Value[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = new Test.CV(c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLObjectS(i, null, cb.opLObjectSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAObjectS(i, null, cb.opAObjectSI, i);
+                    cb.check();
+                }
 
-        {
-            Ice.ObjectPrx[] i = new Ice.ObjectPrx[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = communicator.stringToProxy(c.ToString());
-            }
+                {
+                    List<Ice.Value> i = new List<Ice.Value>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CV(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAObjectPrxS(i, null, cb.opAObjectPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLObjectS(i, null, cb.opLObjectSI, i);
+                    cb.check();
+                }
 
-        {
-            List<Ice.ObjectPrx> i = new List<Ice.ObjectPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(communicator.stringToProxy(c.ToString()));
-            }
+                {
+                    Ice.ObjectPrx[] i = new Ice.ObjectPrx[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = communicator.stringToProxy(c.ToString());
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLObjectPrxS(i, null, cb.opLObjectPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAObjectPrxS(i, null, cb.opAObjectPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<Ice.ObjectPrx> i = new LinkedList<Ice.ObjectPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(communicator.stringToProxy(c.ToString()));
-            }
+                {
+                    List<Ice.ObjectPrx> i = new List<Ice.ObjectPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(communicator.stringToProxy(c.ToString()));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKObjectPrxS(i, null, cb.opKObjectPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLObjectPrxS(i, null, cb.opLObjectPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<Ice.ObjectPrx> i = new Queue<Ice.ObjectPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(communicator.stringToProxy(c.ToString()));
-            }
+                {
+                    LinkedList<Ice.ObjectPrx> i = new LinkedList<Ice.ObjectPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(communicator.stringToProxy(c.ToString()));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQObjectPrxS(i, null, cb.opQObjectPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKObjectPrxS(i, null, cb.opKObjectPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<Ice.ObjectPrx> i = new Stack<Ice.ObjectPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(communicator.stringToProxy(c.ToString()));
-            }
+                {
+                    Queue<Ice.ObjectPrx> i = new Queue<Ice.ObjectPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(communicator.stringToProxy(c.ToString()));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSObjectPrxS(i, null, cb.opSObjectPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQObjectPrxS(i, null, cb.opQObjectPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            S[] i = new S[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c].i = c;
-            }
+                {
+                    Stack<Ice.ObjectPrx> i = new Stack<Ice.ObjectPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(communicator.stringToProxy(c.ToString()));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAStructS(i, null, cb.opAStructSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSObjectPrxS(i, null, cb.opSObjectPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            List<S> i = new List<S>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new S(c));
-            }
+                {
+                    var i = new Test.S[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c].i = c;
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLStructS(i, null, cb.opLStructSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAStructS(i, null, cb.opAStructSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<S> i = new LinkedList<S>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(new S(c));
-            }
+                {
+                    var i = new List<Test.S>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.S(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKStructS(i, null, cb.opKStructSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLStructS(i, null, cb.opLStructSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<S> i = new Queue<S>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(new S(c));
-            }
+                {
+                    var i = new LinkedList<Test.S>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(new Test.S(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQStructS(i, null, cb.opQStructSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKStructS(i, null, cb.opKStructSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<S> i = new Stack<S>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(new S(c));
-            }
+                {
+                    var i = new Queue<Test.S>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(new Test.S(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSStructS(i, null, cb.opSStructSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQStructS(i, null, cb.opQStructSI, i);
+                    cb.check();
+                }
 
-        {
-            CV[] i = new CV[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = new CV(c);
-            }
+                {
+                    var i = new Stack<Test.S>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(new Test.S(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opACVS(i, null, cb.opACVSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSStructS(i, null, cb.opSStructSI, i);
+                    cb.check();
+                }
 
-        {
-            List<CV> i = new List<CV>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CV(c));
-            }
+                {
+                    var i = new Test.CV[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = new Test.CV(c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLCVS(i, null, cb.opLCVSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opACVS(i, null, cb.opACVSI, i);
+                    cb.check();
+                }
 
-        {
-            Test.IPrx[] i = new Test.IPrx[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString()));
-            }
+                {
+                    var i = new List<Test.CV>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CV(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAIPrxS(i, null, cb.opIPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLCVS(i, null, cb.opLCVSI, i);
+                    cb.check();
+                }
 
-        {
-            List<Test.IPrx> i = new List<Test.IPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
+                {
+                    Test.IPrx[] i = new Test.IPrx[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString()));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLIPrxS(i, null, cb.opLIPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAIPrxS(i, null, cb.opIPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<Test.IPrx> i = new LinkedList<Test.IPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
+                {
+                    List<Test.IPrx> i = new List<Test.IPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKIPrxS(i, null, cb.opKIPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLIPrxS(i, null, cb.opLIPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<Test.IPrx> i = new Queue<Test.IPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
+                {
+                    LinkedList<Test.IPrx> i = new LinkedList<Test.IPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQIPrxS(i, null, cb.opQIPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKIPrxS(i, null, cb.opKIPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<Test.IPrx> i = new Stack<Test.IPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
+                {
+                    Queue<Test.IPrx> i = new Queue<Test.IPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSIPrxS(i, null, cb.opSIPrxSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQIPrxS(i, null, cb.opQIPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            CR[] i = new CR[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = new CR(new CV(c));
-            }
+                {
+                    Stack<Test.IPrx> i = new Stack<Test.IPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opACRS(i, null, cb.opACRSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSIPrxS(i, null, cb.opSIPrxSI, i);
+                    cb.check();
+                }
 
-        {
-            List<CR> i = new List<CR>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CR(new CV(c)));
-            }
+                {
+                    var i = new Test.CR[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = new Test.CR(new Test.CV(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLCRS(i, null, cb.opLCRSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opACRS(i, null, cb.opACRSI, i);
+                    cb.check();
+                }
 
-        {
-            En[] i = new En[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (En)(c % 3);
-            }
+                {
+                    var i = new List<Test.CR>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CR(new Test.CV(c)));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opAEnS(i, null, cb.opAEnSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLCRS(i, null, cb.opLCRSI, i);
+                    cb.check();
+                }
 
-        {
-            List<En> i = new List<En>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((En)(c % 3));
-            }
+                {
+                    var i = new Test.En[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(Test.En)(c % 3);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opLEnS(i, null, cb.opLEnSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opAEnS(i, null, cb.opAEnSI, i);
+                    cb.check();
+                }
 
-        {
-            LinkedList<En> i = new LinkedList<En>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((En)(c % 3));
-            }
+                {
+                    var i = new List<Test.En>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((Test.En)(c % 3));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opKEnS(i, null, cb.opKEnSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opLEnS(i, null, cb.opLEnSI, i);
+                    cb.check();
+                }
 
-        {
-            Queue<En> i = new Queue<En>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((En)(c % 3));
-            }
+                {
+                    var i = new LinkedList<Test.En>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((Test.En)(c % 3));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opQEnS(i, null, cb.opQEnSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opKEnS(i, null, cb.opKEnSI, i);
+                    cb.check();
+                }
 
-        {
-            Stack<En> i = new Stack<En>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((En)(c % 3));
-            }
+                {
+                    var i = new Queue<Test.En>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((Test.En)(c % 3));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opSEnS(i, null, cb.opSEnSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opQEnS(i, null, cb.opQEnSI, i);
+                    cb.check();
+                }
 
-        {
-            Custom<int> i = new Custom<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(c);
-            }
+                {
+                    var i = new Stack<Test.En>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((Test.En)(c % 3));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opCustomIntS(i, null, cb.opCustomIntSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSEnS(i, null, cb.opSEnSI, i);
+                    cb.check();
+                }
 
-        {
-            Custom<CV> i = new Custom<CV>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CV(c));
-            }
+                {
+                    Custom<int> i = new Custom<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(c);
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opCustomCVS(i, null, cb.opCustomCVSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opCustomIntS(i, null, cb.opCustomIntSI, i);
+                    cb.check();
+                }
 
-        {
-            Custom<Custom<int>> i = new Custom<Custom<int>>();
-            for(int c = 0; c < _length; ++c)
-            {
-                Custom<int> inner = new Custom<int>();
-                for(int j = 0; j < c; ++j)
                 {
-                    inner.Add(j);
-                }
-                i.Add(inner);
-            }
+                    var i = new Custom<Test.CV>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CV(c));
+                    }
 
-            Callback cb = new Callback();
-            p.begin_opCustomIntSS(i, null, cb.opCustomIntSSI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opCustomCVS(i, null, cb.opCustomCVSI, i);
+                    cb.check();
+                }
 
-        {
-            Custom<Custom<CV>> i = new Custom<Custom<CV>>();
-            for(int c = 0; c < _length; ++c)
-            {
-                Custom<CV> inner = new Custom<CV>();
-                for(int j = 0; j < c; ++j)
                 {
-                    inner.Add(new CV(j));
+                    Custom<Custom<int>> i = new Custom<Custom<int>>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        Custom<int> inner = new Custom<int>();
+                        for(int j = 0; j < c; ++j)
+                        {
+                            inner.Add(j);
+                        }
+                        i.Add(inner);
+                    }
+
+                    Callback cb = new Callback();
+                    p.begin_opCustomIntSS(i, null, cb.opCustomIntSSI, i);
+                    cb.check();
                 }
-                i.Add(inner);
-            }
 
-            Callback cb = new Callback();
-            p.begin_opCustomCVSS(i, null, cb.opCustomCVSSI, i);
-            cb.check();
-        }
+                {
+                    var i = new Custom<Custom<Test.CV>>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        var inner = new Custom<Test.CV>();
+                        for(int j = 0; j < c; ++j)
+                        {
+                            inner.Add(new Test.CV(j));
+                        }
+                        i.Add(inner);
+                    }
 
-        {
-            Serialize.Small i = null;
+                    Callback cb = new Callback();
+                    p.begin_opCustomCVSS(i, null, cb.opCustomCVSSI, i);
+                    cb.check();
+                }
 
-            Callback cb = new Callback();
-            p.begin_opSerialSmallCSharp(i, null, cb.opSerialSmallCSharpNullI, i);
-            cb.check();
-        }
+                {
+                    Serialize.Small i = null;
 
-        {
-            Serialize.Small i = new Serialize.Small();
-            i.i = 99;
+                    Callback cb = new Callback();
+                    p.begin_opSerialSmallCSharp(i, null, cb.opSerialSmallCSharpNullI, i);
+                    cb.check();
+                }
 
-            Callback cb = new Callback();
-            p.begin_opSerialSmallCSharp(i, null, cb.opSerialSmallCSharpI, i);
-            cb.check();
-        }
+                {
+                    Serialize.Small i = new Serialize.Small();
+                    i.i = 99;
 
-        {
-            Serialize.Large i = new Serialize.Large();
-            i.d1 = 1.0;
-            i.d2 = 2.0;
-            i.d3 = 3.0;
-            i.d4 = 4.0;
-            i.d5 = 5.0;
-            i.d6 = 6.0;
-            i.d7 = 7.0;
-            i.d8 = 8.0;
-            i.d9 = 9.0;
-            i.d10 = 10.0;
-
-            Callback cb = new Callback();
-            p.begin_opSerialLargeCSharp(i, null, cb.opSerialLargeCSharpI, i);
-            cb.check();
-        }
+                    Callback cb = new Callback();
+                    p.begin_opSerialSmallCSharp(i, null, cb.opSerialSmallCSharpI, i);
+                    cb.check();
+                }
 
-        {
-            Serialize.Struct i = new Serialize.Struct();
-            i.o = null;
-            i.o2 = i;
-            i.s = null;
-            i.s2 = "Hello";
-
-            Callback cb = new Callback();
-            p.begin_opSerialStructCSharp(i, null, cb.opSerialStructCSharpI, i);
-            cb.check();
+                {
+                    Serialize.Large i = new Serialize.Large();
+                    i.d1 = 1.0;
+                    i.d2 = 2.0;
+                    i.d3 = 3.0;
+                    i.d4 = 4.0;
+                    i.d5 = 5.0;
+                    i.d6 = 6.0;
+                    i.d7 = 7.0;
+                    i.d8 = 8.0;
+                    i.d9 = 9.0;
+                    i.d10 = 10.0;
+
+                    Callback cb = new Callback();
+                    p.begin_opSerialLargeCSharp(i, null, cb.opSerialLargeCSharpI, i);
+                    cb.check();
+                }
+
+                {
+                    Serialize.Struct i = new Serialize.Struct();
+                    i.o = null;
+                    i.o2 = i;
+                    i.s = null;
+                    i.s2 = "Hello";
+
+                    Callback cb = new Callback();
+                    p.begin_opSerialStructCSharp(i, null, cb.opSerialStructCSharpI, i);
+                    cb.check();
+                }
+            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Twoways.cs zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Twoways.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/seqMapping/Twoways.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/seqMapping/Twoways.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,1351 +1,1350 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Collections.Generic;
-using Test;
 
-class Twoways
+namespace Ice
 {
-    private static void test(bool b)
+    namespace seqMapping
     {
-        if(!b)
+        class Twoways
         {
-            throw new Exception();
-        }
-    }
-
-    static int _length = 100;
-
-    internal static void twoways(Ice.Communicator communicator, Test.MyClassPrx p)
-    {
-        {
-            byte[] i = new byte[_length];
-            for(int c = 0; c < _length; ++c)
+            private static void test(bool b)
             {
-                i[c] = (byte)c;
+                if(!b)
+                {
+                    throw new System.Exception();
+                }
             }
-            byte[] o;
-            byte[] r;
 
-            r = p.opAByteS(i, out o);
-
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+            static int _length = 100;
 
-        {
-            List<byte> i = new List<byte>(_length);
-            for(int c = 0; c < _length; ++c)
+            internal static void twoways(Ice.Communicator communicator, Test.MyClassPrx p)
             {
-                i.Add((byte)c);
-            }
-            List<byte> o;
-            List<byte> r;
+                {
+                    byte[] i = new byte[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(byte)c;
+                    }
+                    byte[] o;
+                    byte[] r;
 
-            r = p.opLByteS(i, out o);
+                    r = p.opAByteS(i, out o);
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
-
-        {
-            LinkedList<byte> i = new LinkedList<byte>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((byte)c);
-            }
-            LinkedList<byte> o;
-            LinkedList<byte> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKByteS(i, out o);
+                {
+                    List<byte> i = new List<byte>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((byte)c);
+                    }
+                    List<byte> o;
+                    List<byte> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLByteS(i, out o);
 
-        {
-            Queue<byte> i = new Queue<byte>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((byte)c);
-            }
-            Queue<byte> o;
-            Queue<byte> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQByteS(i, out o);
+                {
+                    LinkedList<byte> i = new LinkedList<byte>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((byte)c);
+                    }
+                    LinkedList<byte> o;
+                    LinkedList<byte> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKByteS(i, out o);
 
-        {
-            Stack<byte> i = new Stack<byte>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((byte)c);
-            }
-            Stack<byte> o;
-            Stack<byte> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSByteS(i, out o);
+                {
+                    Queue<byte> i = new Queue<byte>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((byte)c);
+                    }
+                    Queue<byte> o;
+                    Queue<byte> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQByteS(i, out o);
 
-        {
-            bool[] i = new bool[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = c % 1 == 1;
-            }
-            bool[] o;
-            bool[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opABoolS(i, out o);
+                {
+                    Stack<byte> i = new Stack<byte>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((byte)c);
+                    }
+                    Stack<byte> o;
+                    Stack<byte> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSByteS(i, out o);
 
-        {
-            List<bool> i = new List<bool>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(c % 1 == 1);
-            }
-            List<bool> o;
-            List<bool> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLBoolS(i, out o);
+                {
+                    bool[] i = new bool[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = c % 1 == 1;
+                    }
+                    bool[] o;
+                    bool[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opABoolS(i, out o);
 
-        {
-            LinkedList<bool> i = new LinkedList<bool>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(c % 1 == 1);
-            }
-            LinkedList<bool> o;
-            LinkedList<bool> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKBoolS(i, out o);
+                {
+                    List<bool> i = new List<bool>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(c % 1 == 1);
+                    }
+                    List<bool> o;
+                    List<bool> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLBoolS(i, out o);
 
-        {
-            Queue<bool> i = new Queue<bool>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(c % 1 == 1);
-            }
-            Queue<bool> o;
-            Queue<bool> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQBoolS(i, out o);
+                {
+                    LinkedList<bool> i = new LinkedList<bool>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(c % 1 == 1);
+                    }
+                    LinkedList<bool> o;
+                    LinkedList<bool> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKBoolS(i, out o);
 
-        {
-            Stack<bool> i = new Stack<bool>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(c % 1 == 1);
-            }
-            Stack<bool> o;
-            Stack<bool> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSBoolS(i, out o);
+                {
+                    Queue<bool> i = new Queue<bool>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(c % 1 == 1);
+                    }
+                    Queue<bool> o;
+                    Queue<bool> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQBoolS(i, out o);
 
-        {
-            short[] i = new short[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (short)c;
-            }
-            short[] o;
-            short[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            {
-                r = p.opAShortS(i, out o);
-            }
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                {
+                    Stack<bool> i = new Stack<bool>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(c % 1 == 1);
+                    }
+                    Stack<bool> o;
+                    Stack<bool> r;
 
-        {
-            List<short> i = new List<short>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((short)c);
-            }
-            List<short> o;
-            List<short> r;
+                    r = p.opSBoolS(i, out o);
 
-            r = p.opLShortS(i, out o);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                {
+                    short[] i = new short[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(short)c;
+                    }
+                    short[] o;
+                    short[] r;
 
-        {
-            LinkedList<short> i = new LinkedList<short>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((short)c);
-            }
-            LinkedList<short> o;
-            LinkedList<short> r;
+                    {
+                        r = p.opAShortS(i, out o);
+                    }
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKShortS(i, out o);
+                {
+                    List<short> i = new List<short>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((short)c);
+                    }
+                    List<short> o;
+                    List<short> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLShortS(i, out o);
 
-        {
-            Queue<short> i = new Queue<short>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((short)c);
-            }
-            Queue<short> o;
-            Queue<short> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQShortS(i, out o);
+                {
+                    LinkedList<short> i = new LinkedList<short>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((short)c);
+                    }
+                    LinkedList<short> o;
+                    LinkedList<short> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKShortS(i, out o);
 
-        {
-            Stack<short> i = new Stack<short>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((short)c);
-            }
-            Stack<short> o;
-            Stack<short> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSShortS(i, out o);
+                {
+                    Queue<short> i = new Queue<short>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((short)c);
+                    }
+                    Queue<short> o;
+                    Queue<short> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQShortS(i, out o);
 
-        {
-            int[] i = new int[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (int)c;
-            }
-            int[] o;
-            int[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opAIntS(i, out o);
+                {
+                    Stack<short> i = new Stack<short>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((short)c);
+                    }
+                    Stack<short> o;
+                    Stack<short> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSShortS(i, out o);
 
-        {
-            List<int> i = new List<int>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((int)c);
-            }
-            List<int> o;
-            List<int> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLIntS(i, out o);
+                {
+                    int[] i = new int[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(int)c;
+                    }
+                    int[] o;
+                    int[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAIntS(i, out o);
 
-        {
-            LinkedList<int> i = new LinkedList<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((int)c);
-            }
-            LinkedList<int> o;
-            LinkedList<int> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKIntS(i, out o);
+                {
+                    List<int> i = new List<int>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((int)c);
+                    }
+                    List<int> o;
+                    List<int> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLIntS(i, out o);
 
-        {
-            Queue<int> i = new Queue<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((int)c);
-            }
-            Queue<int> o;
-            Queue<int> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQIntS(i, out o);
+                {
+                    LinkedList<int> i = new LinkedList<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((int)c);
+                    }
+                    LinkedList<int> o;
+                    LinkedList<int> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKIntS(i, out o);
 
-        {
-            Stack<int> i = new Stack<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((int)c);
-            }
-            Stack<int> o;
-            Stack<int> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSIntS(i, out o);
+                {
+                    Queue<int> i = new Queue<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((int)c);
+                    }
+                    Queue<int> o;
+                    Queue<int> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQIntS(i, out o);
 
-        {
-            long[] i = new long[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (long)c;
-            }
-            long[] o;
-            long[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opALongS(i, out o);
+                {
+                    Stack<int> i = new Stack<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((int)c);
+                    }
+                    Stack<int> o;
+                    Stack<int> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSIntS(i, out o);
 
-        {
-            List<long> i = new List<long>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((long)c);
-            }
-            List<long> o;
-            List<long> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLLongS(i, out o);
+                {
+                    long[] i = new long[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(long)c;
+                    }
+                    long[] o;
+                    long[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opALongS(i, out o);
 
-        {
-            LinkedList<long> i = new LinkedList<long>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((long)c);
-            }
-            LinkedList<long> o;
-            LinkedList<long> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKLongS(i, out o);
+                {
+                    List<long> i = new List<long>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((long)c);
+                    }
+                    List<long> o;
+                    List<long> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLLongS(i, out o);
 
-        {
-            Queue<long> i = new Queue<long>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((long)c);
-            }
-            Queue<long> o;
-            Queue<long> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQLongS(i, out o);
+                {
+                    LinkedList<long> i = new LinkedList<long>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((long)c);
+                    }
+                    LinkedList<long> o;
+                    LinkedList<long> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKLongS(i, out o);
 
-        {
-            Stack<long> i = new Stack<long>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((long)c);
-            }
-            Stack<long> o;
-            Stack<long> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSLongS(i, out o);
+                {
+                    Queue<long> i = new Queue<long>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((long)c);
+                    }
+                    Queue<long> o;
+                    Queue<long> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQLongS(i, out o);
 
-        {
-            float[] i = new float[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (float)c;
-            }
-            float[] o;
-            float[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opAFloatS(i, out o);
+                {
+                    Stack<long> i = new Stack<long>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((long)c);
+                    }
+                    Stack<long> o;
+                    Stack<long> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSLongS(i, out o);
 
-        {
-            List<float> i = new List<float>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((float)c);
-            }
-            List<float> o;
-            List<float> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLFloatS(i, out o);
+                {
+                    float[] i = new float[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(float)c;
+                    }
+                    float[] o;
+                    float[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAFloatS(i, out o);
 
-        {
-            LinkedList<float> i = new LinkedList<float>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((float)c);
-            }
-            LinkedList<float> o;
-            LinkedList<float> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKFloatS(i, out o);
+                {
+                    List<float> i = new List<float>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((float)c);
+                    }
+                    List<float> o;
+                    List<float> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLFloatS(i, out o);
 
-        {
-            Queue<float> i = new Queue<float>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((float)c);
-            }
-            Queue<float> o;
-            Queue<float> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQFloatS(i, out o);
+                {
+                    LinkedList<float> i = new LinkedList<float>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((float)c);
+                    }
+                    LinkedList<float> o;
+                    LinkedList<float> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKFloatS(i, out o);
 
-        {
-            Stack<float> i = new Stack<float>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((float)c);
-            }
-            Stack<float> o;
-            Stack<float> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSFloatS(i, out o);
+                {
+                    Queue<float> i = new Queue<float>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((float)c);
+                    }
+                    Queue<float> o;
+                    Queue<float> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQFloatS(i, out o);
 
-        {
-            double[] i = new double[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (double)c;
-            }
-            double[] o;
-            double[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opADoubleS(i, out o);
+                {
+                    Stack<float> i = new Stack<float>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((float)c);
+                    }
+                    Stack<float> o;
+                    Stack<float> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSFloatS(i, out o);
 
-        {
-            List<double> i = new List<double>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((double)c);
-            }
-            List<double> o;
-            List<double> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLDoubleS(i, out o);
+                {
+                    double[] i = new double[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(double)c;
+                    }
+                    double[] o;
+                    double[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opADoubleS(i, out o);
 
-        {
-            LinkedList<double> i = new LinkedList<double>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((double)c);
-            }
-            LinkedList<double> o;
-            LinkedList<double> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKDoubleS(i, out o);
+                {
+                    List<double> i = new List<double>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((double)c);
+                    }
+                    List<double> o;
+                    List<double> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLDoubleS(i, out o);
 
-        {
-            Queue<double> i = new Queue<double>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((double)c);
-            }
-            Queue<double> o;
-            Queue<double> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQDoubleS(i, out o);
+                {
+                    LinkedList<double> i = new LinkedList<double>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((double)c);
+                    }
+                    LinkedList<double> o;
+                    LinkedList<double> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKDoubleS(i, out o);
 
-        {
-            Stack<double> i = new Stack<double>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((double)c);
-            }
-            Stack<double> o;
-            Stack<double> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSDoubleS(i, out o);
+                {
+                    Queue<double> i = new Queue<double>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((double)c);
+                    }
+                    Queue<double> o;
+                    Queue<double> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQDoubleS(i, out o);
 
-        {
-            string[] i = new string[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = c.ToString();
-            }
-            string[] o;
-            string[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opAStringS(i, out o);
+                {
+                    Stack<double> i = new Stack<double>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((double)c);
+                    }
+                    Stack<double> o;
+                    Stack<double> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSDoubleS(i, out o);
 
-        {
-            List<string> i = new List<string>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(c.ToString());
-            }
-            List<string> o;
-            List<string> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLStringS(i, out o);
+                {
+                    string[] i = new string[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = c.ToString();
+                    }
+                    string[] o;
+                    string[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAStringS(i, out o);
 
-        {
-            LinkedList<string> i = new LinkedList<string>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(c.ToString());
-            }
-            LinkedList<string> o;
-            LinkedList<string> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKStringS(i, out o);
+                {
+                    List<string> i = new List<string>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(c.ToString());
+                    }
+                    List<string> o;
+                    List<string> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLStringS(i, out o);
 
-        {
-            Queue<string> i = new Queue<string>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(c.ToString());
-            }
-            Queue<string> o;
-            Queue<string> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQStringS(i, out o);
+                {
+                    LinkedList<string> i = new LinkedList<string>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(c.ToString());
+                    }
+                    LinkedList<string> o;
+                    LinkedList<string> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKStringS(i, out o);
 
-        {
-            Stack<string> i = new Stack<string>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(c.ToString());
-            }
-            Stack<string> o;
-            Stack<string> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSStringS(i, out o);
+                {
+                    Queue<string> i = new Queue<string>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(c.ToString());
+                    }
+                    Queue<string> o;
+                    Queue<string> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQStringS(i, out o);
 
-        {
-            Ice.Value[] i = new CV[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = new CV(c);
-            }
-            Ice.Value[] o;
-            Ice.Value[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opAObjectS(i, out o);
+                {
+                    Stack<string> i = new Stack<string>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(c.ToString());
+                    }
+                    Stack<string> o;
+                    Stack<string> r;
 
-            System.Collections.IEnumerator eo = o.GetEnumerator();
-            System.Collections.IEnumerator er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == ((CV)eo.Current).i);
-                test(obj.i == ((CV)er.Current).i);
-            }
-        }
+                    r = p.opSStringS(i, out o);
 
-        {
-            var i = new List<Ice.Value>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CV(c));
-            }
-            List<Ice.Value> o;
-            List<Ice.Value> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLObjectS(i, out o);
+                {
+                    Ice.Value[] i = new Test.CV[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = new Test.CV(c);
+                    }
+                    Ice.Value[] o;
+                    Ice.Value[] r;
 
-            var eo = o.GetEnumerator();
-            var er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == ((CV)eo.Current).i);
-                test(obj.i == ((CV)er.Current).i);
-            }
-        }
+                    r = p.opAObjectS(i, out o);
 
-        {
-            Ice.ObjectPrx[] i = new Ice.ObjectPrx[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = communicator.stringToProxy(c.ToString());
-            }
-            Ice.ObjectPrx[] o;
-            Ice.ObjectPrx[] r;
+                    System.Collections.IEnumerator eo = o.GetEnumerator();
+                    System.Collections.IEnumerator er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i ==((Test.CV)eo.Current).i);
+                        test(obj.i ==((Test.CV)er.Current).i);
+                    }
+                }
 
-            r = p.opAObjectPrxS(i, out o);
+                {
+                    var i = new List<Ice.Value>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CV(c));
+                    }
+                    List<Ice.Value> o;
+                    List<Ice.Value> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLObjectS(i, out o);
 
-        {
-            List<Ice.ObjectPrx> i = new List<Ice.ObjectPrx>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(communicator.stringToProxy(c.ToString()));
-            }
-            List<Ice.ObjectPrx> o;
-            List<Ice.ObjectPrx> r;
+                    var eo = o.GetEnumerator();
+                    var er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i ==((Test.CV)eo.Current).i);
+                        test(obj.i ==((Test.CV)er.Current).i);
+                    }
+                }
 
-            r = p.opLObjectPrxS(i, out o);
+                {
+                    Ice.ObjectPrx[] i = new Ice.ObjectPrx[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = communicator.stringToProxy(c.ToString());
+                    }
+                    Ice.ObjectPrx[] o;
+                    Ice.ObjectPrx[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAObjectPrxS(i, out o);
 
-        {
-            LinkedList<Ice.ObjectPrx> i = new LinkedList<Ice.ObjectPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(communicator.stringToProxy(c.ToString()));
-            }
-            LinkedList<Ice.ObjectPrx> o;
-            LinkedList<Ice.ObjectPrx> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKObjectPrxS(i, out o);
+                {
+                    List<Ice.ObjectPrx> i = new List<Ice.ObjectPrx>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(communicator.stringToProxy(c.ToString()));
+                    }
+                    List<Ice.ObjectPrx> o;
+                    List<Ice.ObjectPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLObjectPrxS(i, out o);
 
-        {
-            Queue<Ice.ObjectPrx> i = new Queue<Ice.ObjectPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(communicator.stringToProxy(c.ToString()));
-            }
-            Queue<Ice.ObjectPrx> o;
-            Queue<Ice.ObjectPrx> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQObjectPrxS(i, out o);
+                {
+                    LinkedList<Ice.ObjectPrx> i = new LinkedList<Ice.ObjectPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(communicator.stringToProxy(c.ToString()));
+                    }
+                    LinkedList<Ice.ObjectPrx> o;
+                    LinkedList<Ice.ObjectPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKObjectPrxS(i, out o);
 
-        {
-            Stack<Ice.ObjectPrx> i = new Stack<Ice.ObjectPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(communicator.stringToProxy(c.ToString()));
-            }
-            Stack<Ice.ObjectPrx> o;
-            Stack<Ice.ObjectPrx> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSObjectPrxS(i, out o);
+                {
+                    Queue<Ice.ObjectPrx> i = new Queue<Ice.ObjectPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(communicator.stringToProxy(c.ToString()));
+                    }
+                    Queue<Ice.ObjectPrx> o;
+                    Queue<Ice.ObjectPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQObjectPrxS(i, out o);
 
-        {
-            S[] i = new S[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c].i = c;
-            }
-            S[] o;
-            S[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opAStructS(i, out o);
+                {
+                    Stack<Ice.ObjectPrx> i = new Stack<Ice.ObjectPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(communicator.stringToProxy(c.ToString()));
+                    }
+                    Stack<Ice.ObjectPrx> o;
+                    Stack<Ice.ObjectPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSObjectPrxS(i, out o);
 
-        {
-            List<S> i = new List<S>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new S(c));
-            }
-            List<S> o;
-            List<S> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLStructS(i, out o);
+                {
+                    var i = new Test.S[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c].i = c;
+                    }
+                    Test.S[] o;
+                    Test.S[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAStructS(i, out o);
 
-        {
-            LinkedList<S> i = new LinkedList<S>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(new S(c));
-            }
-            LinkedList<S> o;
-            LinkedList<S> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKStructS(i, out o);
+                {
+                    var i = new List<Test.S>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.S(c));
+                    }
+                    List<Test.S> o;
+                    List<Test.S> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLStructS(i, out o);
 
-        {
-            Queue<S> i = new Queue<S>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(new S(c));
-            }
-            Queue<S> o;
-            Queue<S> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQStructS(i, out o);
+                {
+                    var i = new LinkedList<Test.S>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(new Test.S(c));
+                    }
+                    LinkedList<Test.S> o;
+                    LinkedList<Test.S> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKStructS(i, out o);
 
-        {
-            Stack<S> i = new Stack<S>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(new S(c));
-            }
-            Stack<S> o;
-            Stack<S> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSStructS(i, out o);
+                {
+                    var i = new Queue<Test.S>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(new Test.S(c));
+                    }
+                    Queue<Test.S> o;
+                    Queue<Test.S> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQStructS(i, out o);
 
-        {
-            SD[] i = new SD[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = new SD(c);
-            }
-            SD[] o;
-            SD[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opAStructSD(i, out o);
+                {
+                    var i = new Stack<Test.S>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(new Test.S(c));
+                    }
+                    Stack<Test.S> o;
+                    Stack<Test.S> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSStructS(i, out o);
 
-        {
-            List<SD> i = new List<SD>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new SD(c));
-            }
-            List<SD> o;
-            List<SD> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLStructSD(i, out o);
+                {
+                    var i = new Test.SD[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = new Test.SD(c);
+                    }
+                    Test.SD[] o;
+                    Test.SD[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAStructSD(i, out o);
 
-        {
-            LinkedList<SD> i = new LinkedList<SD>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(new SD(c));
-            }
-            LinkedList<SD> o;
-            LinkedList<SD> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKStructSD(i, out o);
+                {
+                    var i = new List<Test.SD>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.SD(c));
+                    }
+                    List<Test.SD> o;
+                    List<Test.SD> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLStructSD(i, out o);
 
-        {
-            Queue<SD> i = new Queue<SD>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(new SD(c));
-            }
-            Queue<SD> o;
-            Queue<SD> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQStructSD(i, out o);
+                {
+                    var i = new LinkedList<Test.SD>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(new Test.SD(c));
+                    }
+                    LinkedList<Test.SD> o;
+                    LinkedList<Test.SD> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKStructSD(i, out o);
 
-        {
-            Stack<SD> i = new Stack<SD>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(new SD(c));
-            }
-            Stack<SD> o;
-            Stack<SD> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSStructSD(i, out o);
+                {
+                    var i = new Queue<Test.SD>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(new Test.SD(c));
+                    }
+                    Queue<Test.SD> o;
+                    Queue<Test.SD> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQStructSD(i, out o);
 
-        {
-            CV[] i = new CV[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = new CV(c);
-            }
-            CV[] o;
-            CV[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opACVS(i, out o);
+                {
+                    var i = new Stack<Test.SD>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(new Test.SD(c));
+                    }
+                    Stack<Test.SD> o;
+                    Stack<Test.SD> r;
 
-            System.Collections.IEnumerator eo = o.GetEnumerator();
-            System.Collections.IEnumerator er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == ((CV)eo.Current).i);
-                test(obj.i == ((CV)er.Current).i);
-            }
-        }
+                    r = p.opSStructSD(i, out o);
 
-        {
-            List<CV> i = new List<CV>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CV(c));
-            }
-            List<CV> o;
-            List<CV> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLCVS(i, out o);
+                {
+                    var i = new Test.CV[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = new Test.CV(c);
+                    }
+                    Test.CV[] o;
+                    Test.CV[] r;
 
-            IEnumerator<CV> eo = o.GetEnumerator();
-            IEnumerator<CV> er = r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.i == eo.Current.i);
-                test(obj.i == er.Current.i);
-            }
-        }
+                    r = p.opACVS(i, out o);
 
-        {
-            CR[] i = new CR[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = new CR(new CV(c));
-            }
-            CR[] o;
-            CR[] r;
+                    System.Collections.IEnumerator eo = o.GetEnumerator();
+                    System.Collections.IEnumerator er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i ==((Test.CV)eo.Current).i);
+                        test(obj.i ==((Test.CV)er.Current).i);
+                    }
+                }
 
-            r = p.opACRS(i, out o);
+                {
+                    var i = new List<Test.CV>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CV(c));
+                    }
+                    List<Test.CV> o;
+                    List<Test.CV> r;
 
-            System.Collections.IEnumerator eo = o.GetEnumerator();
-            System.Collections.IEnumerator er = r.GetEnumerator();
-            foreach(CR obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.v.i == ((CR)eo.Current).v.i);
-                test(obj.v.i == ((CR)er.Current).v.i);
-            }
-        }
+                    r = p.opLCVS(i, out o);
 
-        {
-            List<CR> i = new List<CR>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CR(new CV(c)));
-            }
-            List<CR> o;
-            List<CR> r;
+                    IEnumerator<Test.CV> eo = o.GetEnumerator();
+                    IEnumerator<Test.CV> er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.i == eo.Current.i);
+                        test(obj.i == er.Current.i);
+                    }
+                }
 
-            r = p.opLCRS(i, out o);
+                {
+                    var i = new Test.CR[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = new Test.CR(new Test.CV(c));
+                    }
+                    Test.CR[] o;
+                    Test.CR[] r;
 
-            IEnumerator<CR> eo = o.GetEnumerator();
-            IEnumerator<CR> er = r.GetEnumerator();
-            foreach(CR obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                test(obj.v.i == eo.Current.v.i);
-                test(obj.v.i == er.Current.v.i);
-            }
-        }
+                    r = p.opACRS(i, out o);
 
-        {
-            En[] i = new En[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = (En)(c % 3);
-            }
-            En[] o;
-            En[] r;
+                    System.Collections.IEnumerator eo = o.GetEnumerator();
+                    System.Collections.IEnumerator er = r.GetEnumerator();
+                    foreach(Test.CR obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.v.i ==((Test.CR)eo.Current).v.i);
+                        test(obj.v.i ==((Test.CR)er.Current).v.i);
+                    }
+                }
 
-            r = p.opAEnS(i, out o);
+                {
+                    var i = new List<Test.CR>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CR(new Test.CV(c)));
+                    }
+                    List<Test.CR> o;
+                    List<Test.CR> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLCRS(i, out o);
 
-        {
-            List<En> i = new List<En>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add((En)(c % 3));
-            }
-            List<En> o;
-            List<En> r;
+                    IEnumerator<Test.CR> eo = o.GetEnumerator();
+                    IEnumerator<Test.CR> er = r.GetEnumerator();
+                    foreach(Test.CR obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        test(obj.v.i == eo.Current.v.i);
+                        test(obj.v.i == er.Current.v.i);
+                    }
+                }
 
-            r = p.opLEnS(i, out o);
+                {
+                    var i = new Test.En[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] =(Test.En)(c % 3);
+                    }
+                    Test.En[] o;
+                    Test.En[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAEnS(i, out o);
 
-        {
-            LinkedList<En> i = new LinkedList<En>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast((En)(c % 3));
-            }
-            LinkedList<En> o;
-            LinkedList<En> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKEnS(i, out o);
+                {
+                    var i = new List<Test.En>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add((Test.En)(c % 3));
+                    }
+                    List<Test.En> o;
+                    List<Test.En> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLEnS(i, out o);
 
-        {
-            Queue<En> i = new Queue<En>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue((En)(c % 3));
-            }
-            Queue<En> o;
-            Queue<En> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQEnS(i, out o);
+                {
+                    var i = new LinkedList<Test.En>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast((Test.En)(c % 3));
+                    }
+                    LinkedList<Test.En> o;
+                    LinkedList<Test.En> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKEnS(i, out o);
 
-        {
-            Stack<En> i = new Stack<En>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push((En)(c % 3));
-            }
-            Stack<En> o;
-            Stack<En> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSEnS(i, out o);
+                {
+                    var i = new Queue<Test.En>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue((Test.En)(c % 3));
+                    }
+                    Queue<Test.En> o;
+                    Queue<Test.En> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQEnS(i, out o);
 
-        {
-            Test.IPrx[] i = new Test.IPrx[_length];
-            for(int c = 0; c < _length; ++c)
-            {
-                i[c] = Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString()));
-            }
-            Test.IPrx[] o;
-            Test.IPrx[] r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opAIPrxS(i, out o);
+                {
+                    var i = new Stack<Test.En>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push((Test.En)(c % 3));
+                    }
+                    Stack<Test.En> o;
+                    Stack<Test.En> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSEnS(i, out o);
 
-        {
-            List<Test.IPrx> i = new List<Test.IPrx>(_length);
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
-            List<Test.IPrx> o;
-            List<Test.IPrx> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opLIPrxS(i, out o);
+                {
+                    Test.IPrx[] i = new Test.IPrx[_length];
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i[c] = Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString()));
+                    }
+                    Test.IPrx[] o;
+                    Test.IPrx[] r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opAIPrxS(i, out o);
 
-        {
-            LinkedList<Test.IPrx> i = new LinkedList<Test.IPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.AddLast(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
-            LinkedList<Test.IPrx> o;
-            LinkedList<Test.IPrx> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opKIPrxS(i, out o);
+                {
+                    List<Test.IPrx> i = new List<Test.IPrx>(_length);
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
+                    List<Test.IPrx> o;
+                    List<Test.IPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opLIPrxS(i, out o);
 
-        {
-            Queue<Test.IPrx> i = new Queue<Test.IPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Enqueue(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
-            Queue<Test.IPrx> o;
-            Queue<Test.IPrx> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opQIPrxS(i, out o);
+                {
+                    LinkedList<Test.IPrx> i = new LinkedList<Test.IPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.AddLast(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
+                    LinkedList<Test.IPrx> o;
+                    LinkedList<Test.IPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opKIPrxS(i, out o);
 
-        {
-            Stack<Test.IPrx> i = new Stack<Test.IPrx>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Push(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
-            }
-            Stack<Test.IPrx> o;
-            Stack<Test.IPrx> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opSIPrxS(i, out o);
+                {
+                    Queue<Test.IPrx> i = new Queue<Test.IPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Enqueue(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
+                    Queue<Test.IPrx> o;
+                    Queue<Test.IPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opQIPrxS(i, out o);
 
-        {
-            Custom<int> i = new Custom<int>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(c);
-            }
-            Custom<int> o;
-            Custom<int> r;
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
+                }
 
-            r = p.opCustomIntS(i, out o);
+                {
+                    Stack<Test.IPrx> i = new Stack<Test.IPrx>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Push(Test.IPrxHelper.uncheckedCast(communicator.stringToProxy(c.ToString())));
+                    }
+                    Stack<Test.IPrx> o;
+                    Stack<Test.IPrx> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opSIPrxS(i, out o);
 
-        {
-            Custom<CV> i = new Custom<CV>();
-            for(int c = 0; c < _length; ++c)
-            {
-                i.Add(new CV(c));
-            }
-            i.Add(null);
-            Custom<CV> o;
-            Custom<CV> r;
-
-            r = p.opCustomCVS(i, out o);
-
-            IEnumerator<CV> eo = (IEnumerator<CV>)o.GetEnumerator();
-            IEnumerator<CV> er = (IEnumerator<CV>)r.GetEnumerator();
-            foreach(CV obj in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                if(obj == null)
-                {
-                    test(eo.Current == null);
-                    test(er.Current == null);
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
                 }
-                else
+
                 {
-                    test(obj.i == eo.Current.i);
-                    test(obj.i == er.Current.i);
+                    Custom<int> i = new Custom<int>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(c);
+                    }
+                    Custom<int> o;
+                    Custom<int> r;
+
+                    r = p.opCustomIntS(i, out o);
+
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
                 }
-            }
-        }
 
-        {
-            Custom<Custom<int>> i = new Custom<Custom<int>>();
-            for(int c = 0; c < _length; ++c)
-            {
-                Custom<int> inner = new Custom<int>();
-                for(int j = 0; j < c; ++j)
                 {
-                    inner.Add(j);
+                    var i = new Custom<Test.CV>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        i.Add(new Test.CV(c));
+                    }
+                    i.Add(null);
+                    Custom<Test.CV> o;
+                    Custom<Test.CV> r;
+
+                    r = p.opCustomCVS(i, out o);
+
+                    var eo = o.GetEnumerator();
+                    var er = r.GetEnumerator();
+                    foreach(Test.CV obj in i)
+                    {
+                        eo.MoveNext();
+                        er.MoveNext();
+                        if(obj == null)
+                        {
+                            test(eo.Current == null);
+                            test(er.Current == null);
+                        }
+                        else
+                        {
+                            test(obj.i == eo.Current.i);
+                            test(obj.i == er.Current.i);
+                        }
+                    }
                 }
-                i.Add(inner);
-            }
-            Custom<Custom<int>> o;
-            Custom<Custom<int>> r;
 
-            r = p.opCustomIntSS(i, out o);
+                {
+                    Custom<Custom<int>> i = new Custom<Custom<int>>();
+                    for(int c = 0; c < _length; ++c)
+                    {
+                        Custom<int> inner = new Custom<int>();
+                        for(int j = 0; j < c; ++j)
+                        {
+                            inner.Add(j);
+                        }
+                        i.Add(inner);
+                    }
+                    Custom<Custom<int>> o;
+                    Custom<Custom<int>> r;
 
-            test(Ice.CollectionComparer.Equals(i, o));
-            test(Ice.CollectionComparer.Equals(i, r));
-        }
+                    r = p.opCustomIntSS(i, out o);
 
-        {
-            Custom<Custom<CV>> i = new Custom<Custom<CV>>();
-            for(int c = 0; c < _length; ++c)
-            {
-                Custom<CV> inner = new Custom<CV>();
-                for(int j = 0; j < c; ++j)
-                {
-                    inner.Add(new CV(j));
+                    test(Ice.CollectionComparer.Equals(i, o));
+                    test(Ice.CollectionComparer.Equals(i, r));
                 }
-                i.Add(inner);
-            }
-            Custom<Custom<CV>> o;
-            Custom<Custom<CV>> r;
-
-            r = p.opCustomCVSS(i, out o);
 
-            IEnumerator<Custom<CV>> eo = (IEnumerator<Custom<CV>>)o.GetEnumerator();
-            IEnumerator<Custom<CV>> er = (IEnumerator<Custom<CV>>)r.GetEnumerator();
-            foreach(Custom<CV> s in i)
-            {
-                eo.MoveNext();
-                er.MoveNext();
-                IEnumerator<CV> io = (IEnumerator<CV>)eo.Current.GetEnumerator();
-                IEnumerator<CV> ir = (IEnumerator<CV>)er.Current.GetEnumerator();
-                foreach(CV obj in s)
-                {
-                    io.MoveNext();
-                    ir.MoveNext();
-                    if(obj == null)
+                {
+                    var i = new Custom<Custom<Test.CV>>();
+                    for(int c = 0; c < _length; ++c)
                     {
-                        test(io.Current == null);
-                        test(ir.Current == null);
+                        var inner = new Custom<Test.CV>();
+                        for(int j = 0; j < c; ++j)
+                        {
+                            inner.Add(new Test.CV(j));
+                        }
+                        i.Add(inner);
                     }
-                    else
+                    Custom<Custom<Test.CV>> o;
+                    Custom<Custom<Test.CV>> r;
+
+                    r = p.opCustomCVSS(i, out o);
+
+                    var eo = o.GetEnumerator();
+                    var er = r.GetEnumerator();
+                    foreach(Custom<Test.CV> s in i)
                     {
-                        test(obj.i == io.Current.i);
-                        test(obj.i == ir.Current.i);
+                        eo.MoveNext();
+                        er.MoveNext();
+                        IEnumerator<Test.CV> io = eo.Current.GetEnumerator();
+                        IEnumerator<Test.CV> ir = er.Current.GetEnumerator();
+                        foreach(Test.CV obj in s)
+                        {
+                            io.MoveNext();
+                            ir.MoveNext();
+                            if(obj == null)
+                            {
+                                test(io.Current == null);
+                                test(ir.Current == null);
+                            }
+                            else
+                            {
+                                test(obj.i == io.Current.i);
+                                test(obj.i == ir.Current.i);
+                            }
+                        }
                     }
                 }
-            }
-        }
 
-        {
-            Serialize.Small i = null;
-            Serialize.Small o;
-            Serialize.Small r;
+                {
+                    Serialize.Small i = null;
+                    Serialize.Small o;
+                    Serialize.Small r;
 
-            r = p.opSerialSmallCSharp(i, out o);
+                    r = p.opSerialSmallCSharp(i, out o);
 
-            test(o == null);
-            test(r == null);
-        }
+                    test(o == null);
+                    test(r == null);
+                }
 
-        {
-            Serialize.Small i = new Serialize.Small();
-            i.i = 99;
-            Serialize.Small o;
-            Serialize.Small r;
+                {
+                    Serialize.Small i = new Serialize.Small();
+                    i.i = 99;
+                    Serialize.Small o;
+                    Serialize.Small r;
 
-            try
-            {
-                r = p.opSerialSmallCSharp(i, out o);
+                    try
+                    {
+                        r = p.opSerialSmallCSharp(i, out o);
 
-                test(o.i == 99);
-                test(r.i == 99);
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // OK, talking to non-C# server.
-            }
-        }
+                        test(o.i == 99);
+                        test(r.i == 99);
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // OK, talking to non-C# server.
+                    }
+                }
 
-        {
-            Serialize.Large i = new Serialize.Large();
-            i.d1 = 1.0;
-            i.d2 = 2.0;
-            i.d3 = 3.0;
-            i.d4 = 4.0;
-            i.d5 = 5.0;
-            i.d6 = 6.0;
-            i.d7 = 7.0;
-            i.d8 = 8.0;
-            i.d9 = 9.0;
-            i.d10 = 10.0;
-            Serialize.Large o;
-            Serialize.Large r;
+                {
+                    Serialize.Large i = new Serialize.Large();
+                    i.d1 = 1.0;
+                    i.d2 = 2.0;
+                    i.d3 = 3.0;
+                    i.d4 = 4.0;
+                    i.d5 = 5.0;
+                    i.d6 = 6.0;
+                    i.d7 = 7.0;
+                    i.d8 = 8.0;
+                    i.d9 = 9.0;
+                    i.d10 = 10.0;
+                    Serialize.Large o;
+                    Serialize.Large r;
 
-            try
-            {
-                r = p.opSerialLargeCSharp(i, out o);
+                    try
+                    {
+                        r = p.opSerialLargeCSharp(i, out o);
 
-                test(o.d1 == 1.0);
-                test(o.d2 == 2.0);
-                test(o.d3 == 3.0);
-                test(o.d4 == 4.0);
-                test(o.d5 == 5.0);
-                test(o.d6 == 6.0);
-                test(o.d7 == 7.0);
-                test(o.d8 == 8.0);
-                test(o.d9 == 9.0);
-                test(o.d10 == 10.0);
-                test(r.d1 == 1.0);
-                test(r.d2 == 2.0);
-                test(r.d3 == 3.0);
-                test(r.d4 == 4.0);
-                test(r.d5 == 5.0);
-                test(r.d6 == 6.0);
-                test(r.d7 == 7.0);
-                test(r.d8 == 8.0);
-                test(r.d9 == 9.0);
-                test(r.d10 == 10.0);
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // OK, talking to non-C# server.
-            }
-        }
+                        test(o.d1 == 1.0);
+                        test(o.d2 == 2.0);
+                        test(o.d3 == 3.0);
+                        test(o.d4 == 4.0);
+                        test(o.d5 == 5.0);
+                        test(o.d6 == 6.0);
+                        test(o.d7 == 7.0);
+                        test(o.d8 == 8.0);
+                        test(o.d9 == 9.0);
+                        test(o.d10 == 10.0);
+                        test(r.d1 == 1.0);
+                        test(r.d2 == 2.0);
+                        test(r.d3 == 3.0);
+                        test(r.d4 == 4.0);
+                        test(r.d5 == 5.0);
+                        test(r.d6 == 6.0);
+                        test(r.d7 == 7.0);
+                        test(r.d8 == 8.0);
+                        test(r.d9 == 9.0);
+                        test(r.d10 == 10.0);
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // OK, talking to non-C# server.
+                    }
+                }
 
-        {
-            Serialize.Struct i = new Serialize.Struct();
-            i.o = null;
-            i.o2 = i;
-            i.s = null;
-            i.s2 = "Hello";
-            Serialize.Struct o;
-            Serialize.Struct r;
+                {
+                    Serialize.Struct i = new Serialize.Struct();
+                    i.o = null;
+                    i.o2 = i;
+                    i.s = null;
+                    i.s2 = "Hello";
+                    Serialize.Struct o;
+                    Serialize.Struct r;
 
-            try
-            {
-                r = p.opSerialStructCSharp(i, out o);
+                    try
+                    {
+                        r = p.opSerialStructCSharp(i, out o);
 
-                test(o.o == null);
-                test(o.o2 != null);
-                test(((Serialize.Struct)(o.o2)).o == null);
-                test(((Serialize.Struct)(o.o2)).o2 == o.o2);
-                test(o.s == null);
-                test(o.s2.Equals("Hello"));
-                test(r.o == null);
-                test(r.o2 != null);
-                test(((Serialize.Struct)(r.o2)).o == null);
-                test(((Serialize.Struct)(r.o2)).o2 == r.o2);
-                test(r.s == null);
-                test(r.s2.Equals("Hello"));
-            }
-            catch(Ice.OperationNotExistException)
-            {
-                // OK, talking to non-C# server.
+                        test(o.o == null);
+                        test(o.o2 != null);
+                        test(((Serialize.Struct)(o.o2)).o == null);
+                        test(((Serialize.Struct)(o.o2)).o2 == o.o2);
+                        test(o.s == null);
+                        test(o.s2.Equals("Hello"));
+                        test(r.o == null);
+                        test(r.o2 != null);
+                        test(((Serialize.Struct)(r.o2)).o == null);
+                        test(((Serialize.Struct)(r.o2)).o2 == r.o2);
+                        test(r.s == null);
+                        test(r.s2.Equals("Hello"));
+                    }
+                    catch(Ice.OperationNotExistException)
+                    {
+                        // OK, talking to non-C# server.
+                    }
+                }
             }
         }
     }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/serialize/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/serialize/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/serialize/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/serialize/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections;
 using System.Collections.Generic;
@@ -13,169 +8,174 @@
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Runtime.Serialization;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    //
-    // There does not appear to be any way to compare collections
-    // in either C# or with the .NET framework. Something like
-    // C++ STL EqualRange would be nice...
-    //
-    private static bool Compare(ICollection c1, ICollection c2)
+    namespace serialize
     {
-        if (c1 == null)
-        {
-            return c2 == null;
-        }
-        if (c2 == null)
-        {
-            return false;
-        }
-        if (!c1.GetType().Equals(c2.GetType()))
+        public class AllTests : global::Test.AllTests
         {
-            return false;
-        }
-
-        if (c1.Count != c2.Count)
-        {
-            return false;
-        }
-
-        IEnumerator i1 = c1.GetEnumerator();
-        IEnumerator i2 = c2.GetEnumerator();
-        while (i1.MoveNext())
-        {
-            i2.MoveNext();
-            if (i1.Current is ICollection)
+            //
+            // There does not appear to be any way to compare collections
+            // in either C# or with the .NET framework. Something like
+            // C++ STL EqualRange would be nice...
+            //
+            private static bool Compare(ICollection c1, ICollection c2)
             {
-                Debug.Assert(i2.Current is ICollection);
-                if (!Compare((ICollection)i1.Current, (ICollection)i2.Current))
+                if(c1 == null)
+                {
+                    return c2 == null;
+                }
+                if(c2 == null)
+                {
+                    return false;
+                }
+                if(!c1.GetType().Equals(c2.GetType()))
                 {
                     return false;
                 }
-            }
-            else if (!i1.Current.Equals(i2.Current))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    static public int run(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
 
-        Write("testing serialization... ");
-        Flush();
+                if(c1.Count != c2.Count)
+                {
+                    return false;
+                }
 
-        MyInterfacePrx proxy = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test"));
+                IEnumerator i1 = c1.GetEnumerator();
+                IEnumerator i2 = c2.GetEnumerator();
+                while(i1.MoveNext())
+                {
+                    i2.MoveNext();
+                    if(i1.Current is ICollection)
+                    {
+                        Debug.Assert(i2.Current is ICollection);
+                        if(!Compare((ICollection)i1.Current,(ICollection)i2.Current))
+                        {
+                            return false;
+                        }
+                    }
+                    else if(!i1.Current.Equals(i2.Current))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
 
-        MyException ex, ex2;
-        ex = new MyException();
-        ex.name = "";
-        ex.vss = new ValStruct[0];
-        ex.vsl = new List<ValStruct>();
-        ex.vsll = new LinkedList<ValStruct>();
-        ex.vssk = new Stack<ValStruct>();
-        ex.vsq = new Queue<ValStruct>();
-        ex.isd = new Dictionary<int, string>();
-        ex.ivd = new Dictionary<int, ValStruct>();
-        ex.ipd = null;
-        ex.issd = new SortedDictionary<int, string>();
-        ex.optName = new Ice.Optional<string>();
-        ex.optInt = new Ice.Optional<int>();
-        ex.optValStruct = new Ice.Optional<ValStruct>();
-        ex.optRefStruct = new Ice.Optional<RefStruct>();
-        ex.optEnum = new Ice.Optional<MyEnum>();
-        ex.optClass = new Ice.Optional<MyClass>();
-        ex.optProxy = new Ice.Optional<MyInterfacePrx>();
-        ex2 = inOut(ex, communicator);
-        test(ex.Equals(ex2));
-
-        ex.name = "MyException";
-        ex.b = 1;
-        ex.s = 2;
-        ex.i = 3;
-        ex.l = 4;
-        ex.vs = new ValStruct(true, 1, 2, 3, 4, MyEnum.enum2);
-        ex.rs = new RefStruct("RefStruct", "prop", null, proxy, new MyInterfacePrx[] { proxy, null, proxy });
-        ex.vss = new ValStruct[1];
-        ex.vss[0] = ex.vs;
-        ex.vsl = new List<ValStruct>();
-        ex.vsl.Add(ex.vs);
-        ex.vsll = new LinkedList<ValStruct>();
-        ex.vsll.AddLast(ex.vs);
-        ex.vssk = new Stack<ValStruct>();
-        ex.vssk.Push(ex.vs);
-        ex.vsq = new Queue<ValStruct>();
-        ex.vsq.Enqueue(ex.vs);
-        ex.isd = new Dictionary<int, string>();
-        ex.isd[5] = "five";
-        ex.ivd = new Dictionary<int, ValStruct>();
-        ex.ivd[1] = ex.vs;
-        ex.ipd = new Dictionary<int, MyInterfacePrx>() { { 1, proxy }, { 2, null }, { 3, proxy } };
-        ex.issd = new SortedDictionary<int, string>();
-        ex.issd[3] = "three";
-        ex.optName = new Ice.Optional<string>("MyException");
-        ex.optInt = new Ice.Optional<int>(99);
-        ex.optValStruct = new Ice.Optional<ValStruct>(ex.vs);
-        ex.optRefStruct = new Ice.Optional<RefStruct>(ex.rs);
-        ex.optEnum = new Ice.Optional<MyEnum>(MyEnum.enum3);
-        ex.optClass = new Ice.Optional<MyClass>(null);
-        ex.optProxy = new Ice.Optional<MyInterfacePrx>(proxy);
-        ex2 = inOut(ex, communicator);
-        test(ex.Equals(ex2));
-
-        RefStruct rs, rs2;
-        rs = new RefStruct();
-        rs.s = "RefStruct";
-        rs.sp = "prop";
-        rs.c = null;
-        rs.p = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test"));
-        rs.seq = new MyInterfacePrx[] { rs.p };
-        rs2 = inOut(rs, communicator);
-        test(rs.Equals(rs2));
-
-        Base b, b2;
-        b = new Base(true, 1, 2, 3, 4, MyEnum.enum2);
-        b2 = inOut(b, communicator);
-        test(b2.bo == b.bo);
-        test(b2.by == b.by);
-        test(b2.sh == b.sh);
-        test(b2.i == b.i);
-        test(b2.l == b.l);
-        test(b2.e == b.e);
-
-        MyClass c, c2;
-        c = new MyClass(true, 1, 2, 3, 4, MyEnum.enum1, null, null, new ValStruct(true, 1, 2, 3, 4, MyEnum.enum2));
-        c.c = c;
-        c.o = c;
-        c2 = inOut(c, communicator);
-        test(c2.bo == c.bo);
-        test(c2.by == c.by);
-        test(c2.sh == c.sh);
-        test(c2.i == c.i);
-        test(c2.l == c.l);
-        test(c2.e == c.e);
-        test(c2.c == c2);
-        test(c2.o == c2);
-        test(c2.s.Equals(c.s));
+            static public int allTests(global::Test.TestHelper helper)
+            {
+                var communicator = helper.communicator();
+                var output = helper.getWriter();
+                output.Write("testing serialization... ");
+                output.Flush();
+
+                var proxy = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test"));
+
+                Test.MyException ex, ex2;
+                ex = new Test.MyException();
+                ex.name = "";
+                ex.vss = new Test.ValStruct[0];
+                ex.vsl = new List<Test.ValStruct>();
+                ex.vsll = new LinkedList<Test.ValStruct>();
+                ex.vssk = new Stack<Test.ValStruct>();
+                ex.vsq = new Queue<Test.ValStruct>();
+                ex.isd = new Dictionary<int, string>();
+                ex.ivd = new Dictionary<int, Test.ValStruct>();
+                ex.ipd = null;
+                ex.issd = new SortedDictionary<int, string>();
+                ex.optName = new Ice.Optional<string>();
+                ex.optInt = new Ice.Optional<int>();
+                ex.optValStruct = new Ice.Optional<Test.ValStruct>();
+                ex.optRefStruct = new Ice.Optional<Test.RefStruct>();
+                ex.optEnum = new Ice.Optional<Test.MyEnum>();
+                ex.optClass = new Ice.Optional<Test.MyClass>();
+                ex.optProxy = new Ice.Optional<Test.MyInterfacePrx>();
+                ex2 = inOut(ex, communicator);
+                test(ex.Equals(ex2));
+
+                ex.name = "MyException";
+                ex.b = 1;
+                ex.s = 2;
+                ex.i = 3;
+                ex.l = 4;
+                ex.vs = new Test.ValStruct(true, 1, 2, 3, 4, Test.MyEnum.enum2);
+                ex.rs = new Test.RefStruct("RefStruct", "prop", null, proxy, new Test.MyInterfacePrx[] { proxy, null, proxy });
+                ex.vss = new Test.ValStruct[1];
+                ex.vss[0] = ex.vs;
+                ex.vsl = new List<Test.ValStruct>();
+                ex.vsl.Add(ex.vs);
+                ex.vsll = new LinkedList<Test.ValStruct>();
+                ex.vsll.AddLast(ex.vs);
+                ex.vssk = new Stack<Test.ValStruct>();
+                ex.vssk.Push(ex.vs);
+                ex.vsq = new Queue<Test.ValStruct>();
+                ex.vsq.Enqueue(ex.vs);
+                ex.isd = new Dictionary<int, string>();
+                ex.isd[5] = "five";
+                ex.ivd = new Dictionary<int, Test.ValStruct>();
+                ex.ivd[1] = ex.vs;
+                ex.ipd = new Dictionary<int, Test.MyInterfacePrx>() { { 1, proxy }, { 2, null }, { 3, proxy } };
+                ex.issd = new SortedDictionary<int, string>();
+                ex.issd[3] = "three";
+                ex.optName = new Ice.Optional<string>("MyException");
+                ex.optInt = new Ice.Optional<int>(99);
+                ex.optValStruct = new Ice.Optional<Test.ValStruct>(ex.vs);
+                ex.optRefStruct = new Ice.Optional<Test.RefStruct>(ex.rs);
+                ex.optEnum = new Ice.Optional<Test.MyEnum>(Test.MyEnum.enum3);
+                ex.optClass = new Ice.Optional<Test.MyClass>(null);
+                ex.optProxy = new Ice.Optional<Test.MyInterfacePrx>(proxy);
+                ex2 = inOut(ex, communicator);
+                test(ex.Equals(ex2));
+
+                Test.RefStruct rs, rs2;
+                rs = new Test.RefStruct();
+                rs.s = "RefStruct";
+                rs.sp = "prop";
+                rs.c = null;
+                rs.p = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test"));
+                rs.seq = new Test.MyInterfacePrx[] { rs.p };
+                rs2 = inOut(rs, communicator);
+                test(rs.Equals(rs2));
+
+                Test.Base b, b2;
+                b = new Test.Base(true, 1, 2, 3, 4, Test.MyEnum.enum2);
+                b2 = inOut(b, communicator);
+                test(b2.bo == b.bo);
+                test(b2.by == b.by);
+                test(b2.sh == b.sh);
+                test(b2.i == b.i);
+                test(b2.l == b.l);
+                test(b2.e == b.e);
+
+                Test.MyClass c, c2;
+                c = new Test.MyClass(true, 1, 2, 3, 4, Test.MyEnum.enum1, null, null, new Test.ValStruct(true, 1, 2, 3, 4, Test.MyEnum.enum2));
+                c.c = c;
+                c.o = c;
+                c2 = inOut(c, communicator);
+                test(c2.bo == c.bo);
+                test(c2.by == c.by);
+                test(c2.sh == c.sh);
+                test(c2.i == c.i);
+                test(c2.l == c.l);
+                test(c2.e == c.e);
+                test(c2.c == c2);
+                test(c2.o == c2);
+                test(c2.s.Equals(c.s));
 
-        WriteLine("ok");
-        return 0;
-    }
+                output.WriteLine("ok");
+                return 0;
+            }
 
-    private static T inOut<T>(T o, Ice.Communicator communicator)
-    {
-        BinaryFormatter bin = new BinaryFormatter(null,
-            new StreamingContext(StreamingContextStates.All, communicator));
-        using (MemoryStream mem = new MemoryStream())
-        {
-            bin.Serialize(mem, o);
-            mem.Seek(0, 0);
-            return (T)bin.Deserialize(mem);
+            private static T inOut<T>(T o, Ice.Communicator communicator)
+            {
+                BinaryFormatter bin = new BinaryFormatter(null,
+                    new StreamingContext(StreamingContextStates.All, communicator));
+                using(MemoryStream mem = new MemoryStream())
+                {
+                    bin.Serialize(mem, o);
+                    mem.Seek(0, 0);
+                    return(T)bin.Deserialize(mem);
+                }
+            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/serialize/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/serialize/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/serialize/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/serialize/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace serialize
     {
-        return AllTests.run(this);
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.serialize.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/serialize/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.serialize</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/serialize/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/serialize/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/serialize/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/serialize/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/BuiltinSequences.ice>
 
+[["cs:typeid-namespace:Ice.serialize.TypeId"]]
+
+["cs:namespace:Ice.serialize"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,362 +1,363 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using Test;
-using Ice;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    public static void testExceptions(TestIntfPrx obj)
-    {
-        try
-        {
-            obj.requestFailedException();
-            test(false);
-        }
-        catch(ObjectNotExistException ex)
-        {
-            test(ex.id.Equals(obj.ice_getIdentity()));
-            test(ex.facet.Equals(obj.ice_getFacet()));
-            test(ex.operation.Equals("requestFailedException"));
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.unknownUserException();
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            test(ex.unknown.Equals("reason"));
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.unknownLocalException();
-            test(false);
-        }
-        catch(UnknownLocalException ex)
-        {
-            test(ex.unknown.Equals("reason"));
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.unknownException();
-            test(false);
-        }
-        catch(UnknownException ex)
-        {
-            test(ex.unknown.Equals("reason"));
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.userException();
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            //Console.Error.WriteLine(ex.unknown);
-            test(ex.unknown.IndexOf("Test::TestIntfUserException") >= 0);
-        }
-        catch(Ice.OperationNotExistException)
-        {
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.localException();
-            test(false);
-        }
-        catch(UnknownLocalException ex)
-        {
-            test(ex.unknown.IndexOf("Ice::SocketException") >= 0 ||
-                 ex.unknown.IndexOf("Ice.SocketException") >= 0);
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.csException();
-            test(false);
-        }
-        catch(UnknownException ex)
-        {
-            test(ex.unknown.IndexOf("System.Exception") >= 0);
-        }
-        catch(Ice.OperationNotExistException)
-        {
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.unknownExceptionWithServantException();
-            test(false);
-        }
-        catch(UnknownException ex)
-        {
-            test(ex.unknown.Equals("reason"));
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.impossibleException(false);
-            test(false);
-        }
-        catch(UnknownUserException)
-        {
-            // Operation doesn't throw, but locate() and finished() throw TestIntfUserException.
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.impossibleException(true);
-            test(false);
-        }
-        catch(UnknownUserException)
-        {
-            // Operation throws TestImpossibleException, but locate() and finished() throw TestIntfUserException.
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.intfUserException(false);
-            test(false);
-        }
-        catch(TestImpossibleException)
-        {
-            // Operation doesn't throw, but locate() and finished() throw TestImpossibleException.
-        }
-        catch(System.Exception ex)
-        {
-            Console.WriteLine(ex);
-            test(false);
-        }
-
-        try
-        {
-            obj.intfUserException(true);
-            test(false);
-        }
-        catch(TestImpossibleException)
-        {
-            // Operation throws TestIntfUserException, but locate() and finished() throw TestImpossibleException.
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-    }
-
-    public static TestIntfPrx allTests(TestCommon.Application app)
+    namespace servantLocator
     {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        string @ref = "asm:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
-        test(@base != null);
-        WriteLine("ok");
-
-        Write("testing checked cast... ");
-        Flush();
-        TestIntfPrx obj = TestIntfPrxHelper.checkedCast(@base);
-        test(obj != null);
-        test(obj.Equals(@base));
-        WriteLine("ok");
-
-        Write("testing ice_ids... ");
-        Flush();
-        try
-        {
-            Ice.ObjectPrx o = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
-            o.ice_ids();
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            test(ex.unknown.Equals("::Test::TestIntfUserException"));
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-
-        try
-        {
-            Ice.ObjectPrx o = communicator.stringToProxy("category/finished:" + app.getTestEndpoint(0));
-            o.ice_ids();
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            test(ex.unknown.Equals("::Test::TestIntfUserException"));
-        }
-        catch(System.Exception)
-        {
-            test(false);
-        }
-        WriteLine("ok");
-
-        Write("testing servant locator...");
-        Flush();
-        @base = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
-        obj = TestIntfPrxHelper.checkedCast(@base);
-        try
-        {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:" + app.getTestEndpoint(0)));
-        }
-        catch(ObjectNotExistException)
-        {
-        }
-        WriteLine("ok");
-
-        Write("testing default servant locator...");
-        Flush();
-        @base = communicator.stringToProxy("anothercat/locate:" + app.getTestEndpoint(0));
-        obj = TestIntfPrxHelper.checkedCast(@base);
-        @base = communicator.stringToProxy("locate:" + app.getTestEndpoint(0));
-        obj = TestIntfPrxHelper.checkedCast(@base);
-        try
-        {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:" + app.getTestEndpoint(0)));
-        }
-        catch(ObjectNotExistException)
-        {
-        }
-        try
-        {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:" + app.getTestEndpoint(0)));
-        }
-        catch(ObjectNotExistException)
-        {
-        }
-        WriteLine("ok");
-
-        Write("testing locate exceptions... ");
-        Flush();
-        @base = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
-        obj = TestIntfPrxHelper.checkedCast(@base);
-        testExceptions(obj);
-        WriteLine("ok");
-
-        Write("testing finished exceptions... ");
-        Flush();
-        @base = communicator.stringToProxy("category/finished:" + app.getTestEndpoint(0));
-        obj = TestIntfPrxHelper.checkedCast(@base);
-        testExceptions(obj);
-
-        //
-        // Only call these for category/finished.
-        //
-        try
-        {
-            obj.asyncResponse();
-        }
-        catch(TestIntfUserException)
-        {
-            test(false);
-        }
-        catch(TestImpossibleException)
-        {
-            //
-            // Called by finished().
-            //
-        }
-
-        //
-        // Only call these for category/finished.
-        //
-        try
-        {
-            obj.asyncException();
-        }
-        catch(TestIntfUserException)
-        {
-            test(false);
-        }
-        catch(TestImpossibleException)
-        {
-            //
-            // Called by finished().
-            //
-        }
-
-        WriteLine("ok");
-
-        Write("testing servant locator removal... ");
-        Flush();
-        @base = communicator.stringToProxy("test/activation:" + app.getTestEndpoint(0));
-        TestActivationPrx activation = TestActivationPrxHelper.checkedCast(@base);
-        activation.activateServantLocator(false);
-        try
-        {
-            obj.ice_ping();
-            test(false);
-        }
-        catch(ObjectNotExistException)
-        {
-            WriteLine("ok");
-        }
-        Write("testing servant locator addition... ");
-        Flush();
-        activation.activateServantLocator(true);
-        try
-        {
-            obj.ice_ping();
-            WriteLine("ok");
-        }
-        catch(System.Exception)
+        public class AllTests : global::Test.AllTests
         {
-            test(false);
+            public static void testExceptions(Test.TestIntfPrx obj)
+            {
+                try
+                {
+                    obj.requestFailedException();
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException ex)
+                {
+                    test(ex.id.Equals(obj.ice_getIdentity()));
+                    test(ex.facet.Equals(obj.ice_getFacet()));
+                    test(ex.operation.Equals("requestFailedException"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.unknownUserException();
+                    test(false);
+                }
+                catch(Ice.UnknownUserException ex)
+                {
+                    test(ex.unknown.Equals("reason"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.unknownLocalException();
+                    test(false);
+                }
+                catch(Ice.UnknownLocalException ex)
+                {
+                    test(ex.unknown.Equals("reason"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.unknownException();
+                    test(false);
+                }
+                catch(Ice.UnknownException ex)
+                {
+                    test(ex.unknown.Equals("reason"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.userException();
+                    test(false);
+                }
+                catch(Ice.UnknownUserException ex)
+                {
+                    //Console.Error.WriteLine(ex.unknown);
+                    test(ex.unknown.IndexOf("Test::TestIntfUserException") >= 0);
+                }
+                catch(Ice.OperationNotExistException)
+                {
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.localException();
+                    test(false);
+                }
+                catch(Ice.UnknownLocalException ex)
+                {
+                    test(ex.unknown.IndexOf("Ice::SocketException") >= 0 ||
+                         ex.unknown.IndexOf("Ice.SocketException") >= 0);
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.csException();
+                    test(false);
+                }
+                catch(Ice.UnknownException ex)
+                {
+                    test(ex.unknown.IndexOf("System.Exception") >= 0);
+                }
+                catch(Ice.OperationNotExistException)
+                {
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.unknownExceptionWithServantException();
+                    test(false);
+                }
+                catch(Ice.UnknownException ex)
+                {
+                    test(ex.unknown.Equals("reason"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.impossibleException(false);
+                    test(false);
+                }
+                catch(Ice.UnknownUserException)
+                {
+                    // Operation doesn't throw, but locate() and finished() throw TestIntfUserException.
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.impossibleException(true);
+                    test(false);
+                }
+                catch(Ice.UnknownUserException)
+                {
+                    // Operation throws TestImpossibleException, but locate() and finished() throw TestIntfUserException.
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    obj.intfUserException(false);
+                    test(false);
+                }
+                catch(Test.TestImpossibleException)
+                {
+                    // Operation doesn't throw, but locate() and finished() throw TestImpossibleException.
+                }
+                catch(Exception ex)
+                {
+                    Console.WriteLine(ex);
+                    test(false);
+                }
+
+                try
+                {
+                    obj.intfUserException(true);
+                    test(false);
+                }
+                catch(Test.TestImpossibleException)
+                {
+                    // Operation throws TestIntfUserException, but locate() and finished() throw TestImpossibleException.
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+            }
+
+            public static Test.TestIntfPrx allTests(global::Test.TestHelper helper)
+            {
+                var communicator = helper.communicator();
+                var output = helper.getWriter();
+
+                output.Write("testing stringToProxy... ");
+                output.Flush();
+                string @ref = "asm:" + helper.getTestEndpoint(0);
+                var @base = communicator.stringToProxy(@ref);
+                test(@base != null);
+                output.WriteLine("ok");
+
+                output.Write("testing checked cast... ");
+                output.Flush();
+                var obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                test(obj != null);
+                test(obj.Equals(@base));
+                output.WriteLine("ok");
+
+                output.Write("testing ice_ids... ");
+                output.Flush();
+                try
+                {
+                    var o = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
+                    o.ice_ids();
+                    test(false);
+                }
+                catch(Ice.UnknownUserException ex)
+                {
+                    test(ex.unknown.Equals("::Test::TestIntfUserException"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+
+                try
+                {
+                    var o = communicator.stringToProxy("category/finished:" + helper.getTestEndpoint(0));
+                    o.ice_ids();
+                    test(false);
+                }
+                catch(Ice.UnknownUserException ex)
+                {
+                    test(ex.unknown.Equals("::Test::TestIntfUserException"));
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing servant locator...");
+                output.Flush();
+                @base = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
+                obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                try
+                {
+                    Test.TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:" + helper.getTestEndpoint(0)));
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing default servant locator...");
+                output.Flush();
+                @base = communicator.stringToProxy("anothercat/locate:" + helper.getTestEndpoint(0));
+                obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                @base = communicator.stringToProxy("locate:" + helper.getTestEndpoint(0));
+                obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                try
+                {
+                    Test.TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:" + helper.getTestEndpoint(0)));
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                }
+                try
+                {
+                    Test.TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:" + helper.getTestEndpoint(0)));
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                }
+                output.WriteLine("ok");
+
+                output.Write("testing locate exceptions... ");
+                output.Flush();
+                @base = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
+                obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                testExceptions(obj);
+                output.WriteLine("ok");
+
+                output.Write("testing finished exceptions... ");
+                output.Flush();
+                @base = communicator.stringToProxy("category/finished:" + helper.getTestEndpoint(0));
+                obj = Test.TestIntfPrxHelper.checkedCast(@base);
+                testExceptions(obj);
+
+                //
+                // Only call these for category/finished.
+                //
+                try
+                {
+                    obj.asyncResponse();
+                }
+                catch(Test.TestIntfUserException)
+                {
+                    test(false);
+                }
+                catch(Test.TestImpossibleException)
+                {
+                    //
+                    // Called by finished().
+                    //
+                }
+
+                //
+                // Only call these for category/finished.
+                //
+                try
+                {
+                    obj.asyncException();
+                }
+                catch(Test.TestIntfUserException)
+                {
+                    test(false);
+                }
+                catch(Test.TestImpossibleException)
+                {
+                    //
+                    // Called by finished().
+                    //
+                }
+
+                output.WriteLine("ok");
+
+                output.Write("testing servant locator removal... ");
+                output.Flush();
+                @base = communicator.stringToProxy("test/activation:" + helper.getTestEndpoint(0));
+                var activation = Test.TestActivationPrxHelper.checkedCast(@base);
+                activation.activateServantLocator(false);
+                try
+                {
+                    obj.ice_ping();
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException)
+                {
+                    output.WriteLine("ok");
+                }
+                output.Write("testing servant locator addition... ");
+                output.Flush();
+                activation.activateServantLocator(true);
+                try
+                {
+                    obj.ice_ping();
+                    output.WriteLine("ok");
+                }
+                catch(Exception)
+                {
+                    test(false);
+                }
+                return obj;
+            }
         }
-        return obj;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace servantLocator
     {
-        TestIntfPrx obj = AllTests.allTests(this);
-        obj.shutdown();
-        return 0;
-    }
+        public class Client : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.servantLocator.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    var obj = AllTests.allTests(this);
+                    obj.shutdown();
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Collocated.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Collocated.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Collocated.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Collocated.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
+using Test;
 
-public class Collocated : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        adapter.addServantLocator(new ServantLocatorI(""), "");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
-        adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace servantLocator
     {
-        Collocated app = new Collocated();
-        return app.runmain(args);
+        public class Collocated : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.servantLocator.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0");
+
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.addServantLocator(new ServantLocatorI("category"), "category");
+                    adapter.addServantLocator(new ServantLocatorI(""), "");
+                    adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
+                    adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Collocated>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/CookieAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/CookieAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/CookieAMDI.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/CookieAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,20 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+namespace Ice
+{
+    namespace servantLocator
+    {
+        namespace AMD
+        {
+            public sealed class CookieI : Test.Cookie
+            {
+                public override string message()
+                {
+                    return "blahblah";
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/CookieI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/CookieI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/CookieI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/CookieI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class CookieI : Cookie
+namespace Ice
 {
-    public override string message()
+    namespace servantLocator
     {
-        return "blahblah";
+        public sealed class CookieI : Test.Cookie
+        {
+            public override string message()
+            {
+                return "blahblah";
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/collocated/net45/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/collocated/net45/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/collocated/net45/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/collocated/net45/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>collocated</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -55,14 +55,14 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="collocated.exe.config"/>
+    <None Include="collocated.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.1">
@@ -76,15 +76,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/collocated/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/collocated/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/collocated/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/collocated/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/collocated/netstandard2.0/collocated.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>collocated</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../CookieI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <Compile Include="../../../TestActivationI.cs"/>
-    <Compile Include="../../../Collocated.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../CookieI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../TestActivationI.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\CookieI.cs">
       <Link>CookieI.cs</Link>
@@ -52,24 +52,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <Compile Include="../../../CookieI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <Compile Include="../../../TestActivationI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../CookieI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../TestActivationI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,60 +17,59 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\CookieI.cs">
-      <Link>CookieI.cs</Link>
+    <Compile Include="..\..\..\CookieAMDI.cs">
+      <Link>CookieAMDI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\ServantLocatorI.cs">
-      <Link>ServantLocatorI.cs</Link>
+    <Compile Include="..\..\..\ServantLocatorAMDI.cs">
+      <Link>ServantLocatorAMDI.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Server.cs">
-      <Link>Server.cs</Link>
+    <Compile Include="..\..\..\ServerAMD.cs">
+      <Link>ServerAMD.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\TestActivationI.cs">
-      <Link>TestActivationI.cs</Link>
+    <Compile Include="..\..\..\TestActivationAMDI.cs">
+      <Link>TestActivationAMDI.cs</Link>
     </Compile>
     <Compile Include="..\..\..\TestAMDI.cs">
       <Link>TestAMDI.cs</Link>
     </Compile>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestAMDI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <Compile Include="../../../CookieI.cs"/>
-    <Compile Include="../../../ServantLocatorI.cs"/>
-    <Compile Include="../../../TestActivationI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="../../../CookieAMDI.cs" />
+    <Compile Include="../../../ServantLocatorAMDI.cs" />
+    <Compile Include="../../../TestActivationAMDI.cs" />
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.servantLocator</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Collocated.cs" />
+    <Compile Include="../../../CookieAMDI.cs" />
+    <Compile Include="../../../CookieI.cs" />
+    <Compile Include="../../../ServantLocatorAMDI.cs" />
+    <Compile Include="../../../ServantLocatorI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="../../../TestActivationAMDI.cs" />
+    <Compile Include="../../../TestActivationI.cs" />
+    <Compile Include="../../../TestAMDI.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="generated\Test.cs">
+        <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\TestAMD.cs">
+        <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/ServantLocatorAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,175 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using System;
+
+namespace Ice
+{
+    namespace servantLocator
+    {
+        namespace AMD
+        {
+            public sealed class ServantLocatorI : Ice.ServantLocator
+            {
+                public ServantLocatorI(String category)
+                {
+                    _category = category;
+                    _deactivated = false;
+                    _requestId = -1;
+                }
+
+                ~ServantLocatorI()
+                {
+                    lock(this)
+                    {
+                        test(_deactivated);
+                    }
+                }
+
+                private static void test(bool b)
+                {
+                    if(!b)
+                    {
+                        throw new System.Exception();
+                    }
+                }
+
+                public Ice.Object locate(Ice.Current current, out object cookie)
+                {
+                    lock(this)
+                    {
+                        test(!_deactivated);
+                    }
+
+                    test(current.id.category.Equals(_category) || _category.Length == 0);
+
+                    if(current.id.name.Equals("unknown"))
+                    {
+                        cookie = null;
+                        return null;
+                    }
+
+                    test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
+                    if(current.id.name.Equals("locate"))
+                    {
+                        exception(current);
+                    }
+
+                    //
+                    // Ensure locate() is only called once per request.
+                    //
+                    test(_requestId == -1);
+                    _requestId = current.requestId;
+
+                    cookie = new CookieI();
+
+                    return new TestI();
+                }
+
+                public void finished(Ice.Current current, Ice.Object servant, System.Object cookie)
+                {
+                    lock(this)
+                    {
+                        test(!_deactivated);
+                    }
+
+                    //
+                    // Ensure finished() is only called once per request.
+                    //
+                    test(_requestId == current.requestId);
+                    _requestId = -1;
+
+                    test(current.id.category.Equals(_category) || _category.Length == 0);
+                    test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
+
+                    if(current.id.name.Equals("finished"))
+                    {
+                        exception(current);
+                    }
+
+                    var co =(Test.Cookie)cookie;
+                    test(co.message().Equals("blahblah"));
+                }
+
+                public void deactivate(string category)
+                {
+                    lock(this)
+                    {
+                        test(!_deactivated);
+
+                        _deactivated = true;
+                    }
+                }
+
+                private void exception(Ice.Current current)
+                {
+                    if(current.operation.Equals("ice_ids"))
+                    {
+                        throw new Test.TestIntfUserException();
+                    }
+                    else if(current.operation.Equals("requestFailedException"))
+                    {
+                        throw new Ice.ObjectNotExistException();
+                    }
+                    else if(current.operation.Equals("unknownUserException"))
+                    {
+                        var ex = new Ice.UnknownUserException();
+                        ex.unknown = "reason";
+                        throw ex;
+                    }
+                    else if(current.operation.Equals("unknownLocalException"))
+                    {
+                        var ex = new Ice.UnknownLocalException();
+                        ex.unknown = "reason";
+                        throw ex;
+                    }
+                    else if(current.operation.Equals("unknownException"))
+                    {
+                        var ex = new Ice.UnknownException();
+                        ex.unknown = "reason";
+                        throw ex;
+                    }
+                    else if(current.operation.Equals("userException"))
+                    {
+                        throw new Test.TestIntfUserException();
+                    }
+                    else if(current.operation.Equals("localException"))
+                    {
+                        var ex = new Ice.SocketException();
+                        ex.error = 0;
+                        throw ex;
+                    }
+                    else if(current.operation.Equals("csException"))
+                    {
+                        throw new System.Exception("message");
+                    }
+                    else if(current.operation.Equals("unknownExceptionWithServantException"))
+                    {
+                        throw new Ice.UnknownException("reason");
+                    }
+                    else if(current.operation.Equals("impossibleException"))
+                    {
+                        throw new Test.TestIntfUserException(); // Yes, it really is meant to be TestIntfException.
+                    }
+                    else if(current.operation.Equals("intfUserException"))
+                    {
+                        throw new Test.TestImpossibleException(); // Yes, it really is meant to be TestImpossibleException.
+                    }
+                    else if(current.operation.Equals("asyncResponse"))
+                    {
+                        throw new Test.TestImpossibleException();
+                    }
+                    else if(current.operation.Equals("asyncException"))
+                    {
+                        throw new Test.TestImpossibleException();
+                    }
+                }
+
+                private bool _deactivated;
+                private string _category;
+                private int _requestId;
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/ServantLocatorI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/ServantLocatorI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/ServantLocatorI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/ServantLocatorI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,173 +1,172 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using Test;
-using Ice;
 
-public sealed class ServantLocatorI : Ice.ServantLocator
+namespace Ice
 {
-    public ServantLocatorI(String category)
-    {
-        _category = category;
-        _deactivated = false;
-        _requestId = -1;
-    }
-
-    ~ServantLocatorI()
-    {
-        lock(this)
-        {
-            test(_deactivated);
-        }
-    }
-
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new System.Exception();
-        }
-    }
-
-    public Ice.Object locate(Ice.Current current, out object cookie)
-    {
-        lock(this)
-        {
-            test(!_deactivated);
-        }
-
-        test(current.id.category.Equals(_category) || _category.Length == 0);
-
-        if(current.id.name.Equals("unknown"))
-        {
-            cookie = null;
-            return null;
-        }
-
-        test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
-        if(current.id.name.Equals("locate"))
-        {
-            exception(current);
-        }
-
-        //
-        // Ensure locate() is only called once per request.
-        //
-        test(_requestId == -1);
-        _requestId = current.requestId;
-
-        cookie = new CookieI();
-
-        return new TestI();
-    }
-
-    public void finished(Ice.Current current, Ice.Object servant, System.Object cookie)
+    namespace servantLocator
     {
-        lock(this)
+        public sealed class ServantLocatorI : Ice.ServantLocator
         {
-            test(!_deactivated);
+            public ServantLocatorI(String category)
+            {
+                _category = category;
+                _deactivated = false;
+                _requestId = -1;
+            }
+
+            ~ServantLocatorI()
+            {
+                lock(this)
+                {
+                    test(_deactivated);
+                }
+            }
+
+            private static void test(bool b)
+            {
+                if(!b)
+                {
+                    throw new System.Exception();
+                }
+            }
+
+            public Ice.Object locate(Ice.Current current, out object cookie)
+            {
+                lock(this)
+                {
+                    test(!_deactivated);
+                }
+
+                test(current.id.category.Equals(_category) || _category.Length == 0);
+
+                if(current.id.name.Equals("unknown"))
+                {
+                    cookie = null;
+                    return null;
+                }
+
+                test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
+                if(current.id.name.Equals("locate"))
+                {
+                    exception(current);
+                }
+
+                //
+                // Ensure locate() is only called once per request.
+                //
+                test(_requestId == -1);
+                _requestId = current.requestId;
+
+                cookie = new CookieI();
+
+                return new TestI();
+            }
+
+            public void finished(Ice.Current current, Ice.Object servant, System.Object cookie)
+            {
+                lock(this)
+                {
+                    test(!_deactivated);
+                }
+
+                //
+                // Ensure finished() is only called once per request.
+                //
+                test(_requestId == current.requestId);
+                _requestId = -1;
+
+                test(current.id.category.Equals(_category) || _category.Length == 0);
+                test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
+
+                if(current.id.name.Equals("finished"))
+                {
+                    exception(current);
+                }
+
+                var co =(Test.Cookie)cookie;
+                test(co.message().Equals("blahblah"));
+            }
+
+            public void deactivate(string category)
+            {
+                lock(this)
+                {
+                    test(!_deactivated);
+
+                    _deactivated = true;
+                }
+            }
+
+            private void exception(Ice.Current current)
+            {
+                if(current.operation.Equals("ice_ids"))
+                {
+                    throw new Test.TestIntfUserException();
+                }
+                else if(current.operation.Equals("requestFailedException"))
+                {
+                    throw new Ice.ObjectNotExistException();
+                }
+                else if(current.operation.Equals("unknownUserException"))
+                {
+                    var ex = new Ice.UnknownUserException();
+                    ex.unknown = "reason";
+                    throw ex;
+                }
+                else if(current.operation.Equals("unknownLocalException"))
+                {
+                    var ex = new Ice.UnknownLocalException();
+                    ex.unknown = "reason";
+                    throw ex;
+                }
+                else if(current.operation.Equals("unknownException"))
+                {
+                    var ex = new Ice.UnknownException();
+                    ex.unknown = "reason";
+                    throw ex;
+                }
+                else if(current.operation.Equals("userException"))
+                {
+                    throw new Test.TestIntfUserException();
+                }
+                else if(current.operation.Equals("localException"))
+                {
+                    var ex = new Ice.SocketException();
+                    ex.error = 0;
+                    throw ex;
+                }
+                else if(current.operation.Equals("csException"))
+                {
+                    throw new System.Exception("message");
+                }
+                else if(current.operation.Equals("unknownExceptionWithServantException"))
+                {
+                    throw new Ice.UnknownException("reason");
+                }
+                else if(current.operation.Equals("impossibleException"))
+                {
+                    throw new Test.TestIntfUserException(); // Yes, it really is meant to be TestIntfException.
+                }
+                else if(current.operation.Equals("intfUserException"))
+                {
+                    throw new Test.TestImpossibleException(); // Yes, it really is meant to be TestImpossibleException.
+                }
+                else if(current.operation.Equals("asyncResponse"))
+                {
+                    throw new Test.TestImpossibleException();
+                }
+                else if(current.operation.Equals("asyncException"))
+                {
+                    throw new Test.TestImpossibleException();
+                }
+            }
+
+            private bool _deactivated;
+            private string _category;
+            private int _requestId;
         }
-
-        //
-        // Ensure finished() is only called once per request.
-        //
-        test(_requestId == current.requestId);
-        _requestId = -1;
-
-        test(current.id.category.Equals(_category)  || _category.Length == 0);
-        test(current.id.name.Equals("locate") || current.id.name.Equals("finished"));
-
-        if(current.id.name.Equals("finished"))
-        {
-            exception(current);
-        }
-
-        Cookie co = (Cookie) cookie;
-        test(co.message().Equals("blahblah"));
     }
-
-    public void deactivate(string category)
-    {
-        lock(this)
-        {
-            test(!_deactivated);
-
-            _deactivated = true;
-        }
-    }
-
-    private void exception(Ice.Current current)
-    {
-        if(current.operation.Equals("ice_ids"))
-        {
-            throw new Test.TestIntfUserException();
-        }
-        else if(current.operation.Equals("requestFailedException"))
-        {
-            throw new ObjectNotExistException();
-        }
-        else if(current.operation.Equals("unknownUserException"))
-        {
-            UnknownUserException ex = new UnknownUserException();
-            ex.unknown = "reason";
-            throw ex;
-        }
-        else if(current.operation.Equals("unknownLocalException"))
-        {
-            UnknownLocalException ex = new UnknownLocalException();
-            ex.unknown = "reason";
-            throw ex;
-        }
-        else if(current.operation.Equals("unknownException"))
-        {
-            UnknownException ex = new UnknownException();
-            ex.unknown = "reason";
-            throw ex;
-        }
-        else if(current.operation.Equals("userException"))
-        {
-            throw new TestIntfUserException();
-        }
-        else if(current.operation.Equals("localException"))
-        {
-            SocketException ex = new SocketException();
-            ex.error = 0;
-            throw ex;
-        }
-        else if(current.operation.Equals("csException"))
-        {
-            throw new System.Exception("message");
-        }
-        else if(current.operation.Equals("unknownExceptionWithServantException"))
-        {
-            throw new UnknownException("reason");
-        }
-        else if(current.operation.Equals("impossibleException"))
-        {
-            throw new Test.TestIntfUserException(); // Yes, it really is meant to be TestIntfException.
-        }
-        else if(current.operation.Equals("intfUserException"))
-        {
-            throw new Test.TestImpossibleException(); // Yes, it really is meant to be TestImpossibleException.
-        }
-        else if(current.operation.Equals("asyncResponse"))
-        {
-            throw new Test.TestImpossibleException();
-        }
-        else if(current.operation.Equals("asyncException"))
-        {
-            throw new Test.TestImpossibleException();
-        }
-    }
-
-    private bool _deactivated;
-    private string _category;
-    private int _requestId;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/ServerAMD.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,43 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Test;
+
+namespace Ice
+{
+    namespace servantLocator
+    {
+        namespace AMD
+        {
+            public class Server : TestHelper
+            {
+                public override void run(string[] args)
+                {
+                    var initData = new InitializationData();
+                    initData.typeIdNamespaces = new string[]{"Ice.servantLocator.AMD.TypeId"};
+                    initData.properties = createTestProperties(ref args);
+                    using(var communicator = initialize(initData))
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                        communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0");
+
+                        var adapter = communicator.createObjectAdapter("TestAdapter");
+                        adapter.addServantLocator(new ServantLocatorI("category"), "category");
+                        adapter.addServantLocator(new ServantLocatorI(""), "");
+                        adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
+                        adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
+                        adapter.activate();
+                        serverReady();
+                        adapter.waitForDeactivate();
+                    }
+                }
+
+                public static int Main(string[] args)
+                {
+                    return TestDriver.runTest<Server>(args);
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,40 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
 
-[assembly: CLSCompliant(true)]
+using Test;
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        adapter.addServantLocator(new ServantLocatorI(""), "");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
-        adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
-        adapter.activate();
-        adapter.waitForDeactivate();
-        return 0;
-    }
-
-    public static int Main(string[] args)
+    namespace servantLocator
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.servantLocator.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0");
+
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.addServantLocator(new ServantLocatorI("category"), "category");
+                    adapter.addServantLocator(new ServantLocatorI(""), "");
+                    adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
+                    adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
+                    adapter.activate();
+                    serverReady();
+                    adapter.waitForDeactivate();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestActivationAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestActivationAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestActivationAMDI.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestActivationAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,31 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+namespace Ice
+{
+    namespace servantLocator
+    {
+        namespace AMD
+        {
+            public sealed class TestActivationI : Test.TestActivationDisp_
+            {
+                override public void activateServantLocator(bool activate, Ice.Current current)
+                {
+                    if(activate)
+                    {
+                        current.adapter.addServantLocator(new ServantLocatorI(""), "");
+                        current.adapter.addServantLocator(new ServantLocatorI("category"), "category");
+                    }
+                    else
+                    {
+                        var locator = current.adapter.removeServantLocator("");
+                        locator.deactivate("");
+                        locator = current.adapter.removeServantLocator("category");
+                        locator.deactivate("category");
+                    }
+                }
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestActivationI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestActivationI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestActivationI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestActivationI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class TestActivationI : TestActivationDisp_
+namespace Ice
 {
-    override public void activateServantLocator(bool activate, Ice.Current current)
+    namespace servantLocator
     {
-        if(activate)
-        {
-            current.adapter.addServantLocator(new ServantLocatorI(""), "");
-            current.adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        }
-        else
+        public sealed class TestActivationI : Test.TestActivationDisp_
         {
-            Ice.ServantLocator locator = current.adapter.removeServantLocator("");
-            locator.deactivate("");
-            locator = current.adapter.removeServantLocator("category");
-            locator.deactivate("category");
+            override public void activateServantLocator(bool activate, Ice.Current current)
+            {
+                if(activate)
+                {
+                    current.adapter.addServantLocator(new ServantLocatorI(""), "");
+                    current.adapter.addServantLocator(new ServantLocatorI("category"), "category");
+                }
+                else
+                {
+                    var locator = current.adapter.removeServantLocator("");
+                    locator.deactivate("");
+                    locator = current.adapter.removeServantLocator("category");
+                    locator.deactivate("category");
+                }
+            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+[["cs:typeid-namespace:Ice.servantLocator.AMD.TypeId"]]
+
+["cs:namespace:Ice.servantLocator.AMD"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,108 +1,110 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using System;
 using System.Threading.Tasks;
-using Test;
 
-public sealed class TestI : TestIntfDisp_
+namespace Ice
 {
-    public override Task requestFailedExceptionAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task unknownUserExceptionAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task unknownLocalExceptionAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task unknownExceptionAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task localExceptionAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task userExceptionAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task csExceptionAsync(Ice.Current current)
-    {
-        return null;
-    }
-
-    public override Task
-    unknownExceptionWithServantExceptionAsync(Ice.Current current)
+    namespace servantLocator
     {
-        throw new Ice.ObjectNotExistException();
-    }
-
-    public override Task<string>
-    impossibleExceptionAsync(bool @throw, Ice.Current current)
-    {
-        if(@throw)
+        namespace AMD
         {
-            throw new TestImpossibleException();
+            public sealed class TestI : Test.TestIntfDisp_
+            {
+                public override Task requestFailedExceptionAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task unknownUserExceptionAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task unknownLocalExceptionAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task unknownExceptionAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task localExceptionAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task userExceptionAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task csExceptionAsync(Ice.Current current)
+                {
+                    return null;
+                }
+
+                public override Task
+                unknownExceptionWithServantExceptionAsync(Ice.Current current)
+                {
+                    throw new Ice.ObjectNotExistException();
+                }
+
+                public override Task<string>
+                impossibleExceptionAsync(bool @throw, Ice.Current current)
+                {
+                    if(@throw)
+                    {
+                        throw new Test.TestImpossibleException();
+                    }
+                    else
+                    {
+                        //
+                        // Return a value so we can be sure that the stream position
+                        // is reset correctly iuf finished throws.
+                        //
+                        return Task.FromResult<string>("Hello");
+                    }
+                }
+
+                public override Task<string>
+                intfUserExceptionAsync(bool @throw, Ice.Current current)
+                {
+                    if(@throw)
+                    {
+                        throw new Test.TestIntfUserException();
+                    }
+                    else
+                    {
+                        //
+                        // Return a value so we can be sure that the stream position
+                        // is reset correctly iuf finished throws.
+                        //
+                        return Task.FromResult<string>("Hello");
+                    }
+                }
+
+                public override Task asyncResponseAsync(Ice.Current current)
+                {
+                    return null;
+                    throw new Ice.ObjectNotExistException();
+                }
+
+                public override Task asyncExceptionAsync(Ice.Current current)
+                {
+                    throw new Test.TestIntfUserException();
+                    throw new Ice.ObjectNotExistException();
+                }
+
+                public override Task shutdownAsync(Ice.Current current)
+                {
+                    current.adapter.deactivate();
+                    return null;
+                }
+            }
         }
-        else
-        {
-            //
-            // Return a value so we can be sure that the stream position
-            // is reset correctly iuf finished throws.
-            //
-            return Task.FromResult<string>("Hello");
-        }
-    }
-
-    public override Task<string>
-    intfUserExceptionAsync(bool @throw, Ice.Current current)
-    {
-        if(@throw)
-        {
-            throw new TestIntfUserException();
-        }
-        else
-        {
-            //
-            // Return a value so we can be sure that the stream position
-            // is reset correctly iuf finished throws.
-            //
-            return Task.FromResult<string>("Hello");
-        }
-    }
-
-    public override Task asyncResponseAsync(Ice.Current current)
-    {
-       return null;
-       throw new Ice.ObjectNotExistException();
-    }
-
-    public override Task asyncExceptionAsync(Ice.Current current)
-    {
-        throw new TestIntfUserException();
-        throw new Ice.ObjectNotExistException();
-    }
-
-    public override Task shutdownAsync(Ice.Current current)
-    {
-        current.adapter.deactivate();
-        return null;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+[["cs:typeid-namespace:Ice.servantLocator.TypeId"]]
+
+["cs:namespace:Ice.servantLocator"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/servantLocator/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/servantLocator/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,91 +1,90 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using Test;
 
-public sealed class TestI : TestIntfDisp_
+namespace Ice
 {
-    public override void requestFailedException(Ice.Current current)
-    {
-    }
-
-    public override void unknownUserException(Ice.Current current)
-    {
-    }
-
-    public override void unknownLocalException(Ice.Current current)
-    {
-    }
-
-    public override void unknownException(Ice.Current current)
-    {
-    }
-
-    public override void localException(Ice.Current current)
-    {
-    }
-
-    public override void userException(Ice.Current current)
-    {
-    }
-
-    public override void csException(Ice.Current current)
+    namespace servantLocator
     {
-    }
-
-    public override void unknownExceptionWithServantException(Ice.Current current)
-    {
-        throw new Ice.ObjectNotExistException();
-    }
-
-    public override string impossibleException(bool @throw, Ice.Current current)
-    {
-        if(@throw)
-        {
-            throw new Test.TestImpossibleException();
-        }
-        //
-        // Return a value so we can be sure that the stream position
-        // is reset correctly if finished() throws.
-        //
-        return "Hello";
-    }
-
-    public override string intfUserException(bool @throw, Ice.Current current)
-    {
-        if(@throw)
+        public sealed class TestI : Test.TestIntfDisp_
         {
-            throw new Test.TestIntfUserException();
+            public override void requestFailedException(Ice.Current current)
+            {
+            }
+
+            public override void unknownUserException(Ice.Current current)
+            {
+            }
+
+            public override void unknownLocalException(Ice.Current current)
+            {
+            }
+
+            public override void unknownException(Ice.Current current)
+            {
+            }
+
+            public override void localException(Ice.Current current)
+            {
+            }
+
+            public override void userException(Ice.Current current)
+            {
+            }
+
+            public override void csException(Ice.Current current)
+            {
+            }
+
+            public override void unknownExceptionWithServantException(Ice.Current current)
+            {
+                throw new Ice.ObjectNotExistException();
+            }
+
+            public override string impossibleException(bool @throw, Ice.Current current)
+            {
+                if(@throw)
+                {
+                    throw new Test.TestImpossibleException();
+                }
+                //
+                // Return a value so we can be sure that the stream position
+                // is reset correctly if finished() throws.
+                //
+                return "Hello";
+            }
+
+            public override string intfUserException(bool @throw, Ice.Current current)
+            {
+                if(@throw)
+                {
+                    throw new Test.TestIntfUserException();
+                }
+                //
+                // Return a value so we can be sure that the stream position
+                // is reset correctly if finished() throws.
+                //
+                return "Hello";
+            }
+
+            public override void asyncResponse(Ice.Current current)
+            {
+                //
+                // Only relevant for AMD.
+                //
+            }
+
+            public override void asyncException(Ice.Current current)
+            {
+                //
+                // Only relevant for AMD.
+                //
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.deactivate();
+            }
         }
-        //
-        // Return a value so we can be sure that the stream position
-        // is reset correctly if finished() throws.
-        //
-        return "Hello";
-    }
-
-    public override void asyncResponse(Ice.Current current)
-    {
-        //
-        // Only relevant for AMD.
-        //
-    }
-
-    public override void asyncException(Ice.Current current)
-    {
-        //
-        // Only relevant for AMD.
-        //
-    }
-
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.deactivate();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
 using System.Threading;
 using Test;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
     private class Callback
     {
@@ -90,25 +85,26 @@
         }
     }
 
-    public static TestIntfPrx allTests(TestCommon.Application app, bool collocated)
+    public static TestIntfPrx allTests(Test.TestHelper helper, bool collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        String @ref = "Test:" + app.getTestEndpoint(0) + " -t 2000";
+        Ice.Communicator communicator = helper.communicator();
+        var output = helper.getWriter();
+        output.Write("testing stringToProxy... ");
+        output.Flush();
+        String @ref = "Test:" + helper.getTestEndpoint(0) + " -t 2000";
         Ice.ObjectPrx @base = communicator.stringToProxy(@ref);
         test(@base != null);
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing checked cast... ");
-        Flush();
+        output.Write("testing checked cast... ");
+        output.Flush();
         TestIntfPrx testPrx = TestIntfPrxHelper.checkedCast(@base);
         test(testPrx != null);
         test(testPrx.Equals(@base));
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base... ");
-        Flush();
+        output.Write("base... ");
+        output.Flush();
         {
             try
             {
@@ -125,10 +121,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base (AMI)... ");
-        Flush();
+        output.Write("base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_baseAsBase().whenCompleted(
@@ -177,10 +173,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown derived... ");
-        Flush();
+        output.Write("slicing of unknown derived... ");
+        output.Flush();
         {
             try
             {
@@ -197,10 +193,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown derived (AMI)... ");
-        Flush();
+        output.Write("slicing of unknown derived (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_unknownDerivedAsBase().whenCompleted(
@@ -249,10 +245,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known derived as base... ");
-        Flush();
+        output.Write("non-slicing of known derived as base... ");
+        output.Flush();
         {
             try
             {
@@ -270,10 +266,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known derived as base (AMI)... ");
-        Flush();
+        output.Write("non-slicing of known derived as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_knownDerivedAsBase().whenCompleted(
@@ -324,10 +320,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known derived as derived... ");
-        Flush();
+        output.Write("non-slicing of known derived as derived... ");
+        output.Flush();
         {
             try
             {
@@ -345,10 +341,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known derived as derived (AMI)... ");
-        Flush();
+        output.Write("non-slicing of known derived as derived (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_knownDerivedAsKnownDerived().whenCompleted(
@@ -399,10 +395,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown intermediate as base... ");
-        Flush();
+        output.Write("slicing of unknown intermediate as base... ");
+        output.Flush();
         {
             try
             {
@@ -419,10 +415,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown intermediate as base (AMI)... ");
-        Flush();
+        output.Write("slicing of unknown intermediate as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_unknownIntermediateAsBase().whenCompleted(
@@ -471,10 +467,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of known intermediate as base... ");
-        Flush();
+        output.Write("slicing of known intermediate as base... ");
+        output.Flush();
         {
             try
             {
@@ -492,10 +488,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of known intermediate as base (AMI)... ");
-        Flush();
+        output.Write("slicing of known intermediate as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_knownIntermediateAsBase().whenCompleted(
@@ -546,10 +542,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of known most derived as base... ");
-        Flush();
+        output.Write("slicing of known most derived as base... ");
+        output.Flush();
         {
             try
             {
@@ -568,10 +564,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of known most derived as base (AMI)... ");
-        Flush();
+        output.Write("slicing of known most derived as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_knownMostDerivedAsBase().whenCompleted(
@@ -624,10 +620,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known intermediate as intermediate... ");
-        Flush();
+        output.Write("non-slicing of known intermediate as intermediate... ");
+        output.Flush();
         {
             try
             {
@@ -645,10 +641,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known intermediate as intermediate (AMI)... ");
-        Flush();
+        output.Write("non-slicing of known intermediate as intermediate (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_knownIntermediateAsKnownIntermediate().whenCompleted(
@@ -699,10 +695,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known most derived as intermediate... ");
-        Flush();
+        output.Write("non-slicing of known most derived as intermediate... ");
+        output.Flush();
         {
             try
             {
@@ -721,10 +717,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known most derived as intermediate (AMI)... ");
-        Flush();
+        output.Write("non-slicing of known most derived as intermediate (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_knownMostDerivedAsKnownIntermediate().whenCompleted(
@@ -777,10 +773,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known most derived as most derived... ");
-        Flush();
+        output.Write("non-slicing of known most derived as most derived... ");
+        output.Flush();
         {
             try
             {
@@ -799,10 +795,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("non-slicing of known most derived as most derived (AMI)... ");
-        Flush();
+        output.Write("non-slicing of known most derived as most derived (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_knownMostDerivedAsKnownMostDerived().whenCompleted(
@@ -855,10 +851,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown most derived, known intermediate as base... ");
-        Flush();
+        output.Write("slicing of unknown most derived, known intermediate as base... ");
+        output.Flush();
         {
             try
             {
@@ -876,10 +872,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown most derived, known intermediate as base (AMI)... ");
-        Flush();
+        output.Write("slicing of unknown most derived, known intermediate as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_unknownMostDerived1AsBase().whenCompleted(
@@ -930,10 +926,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown most derived, known intermediate as intermediate... ");
-        Flush();
+        output.Write("slicing of unknown most derived, known intermediate as intermediate... ");
+        output.Flush();
         {
             try
             {
@@ -951,10 +947,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown most derived, known intermediate as intermediate (AMI)... ");
-        Flush();
+        output.Write("slicing of unknown most derived, known intermediate as intermediate (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_unknownMostDerived1AsKnownIntermediate().whenCompleted(
@@ -1005,10 +1001,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown most derived, unknown intermediate thrown as base... ");
-        Flush();
+        output.Write("slicing of unknown most derived, unknown intermediate thrown as base... ");
+        output.Flush();
         {
             try
             {
@@ -1025,10 +1021,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("slicing of unknown most derived, unknown intermediate thrown as base (AMI)... ");
-        Flush();
+        output.Write("slicing of unknown most derived, unknown intermediate thrown as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_unknownMostDerived2AsBase().whenCompleted(
@@ -1077,10 +1073,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("unknown most derived in compact format... ");
-        Flush();
+        output.Write("unknown most derived in compact format... ");
+        output.Flush();
         {
             try
             {
@@ -1110,10 +1106,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("preserved exceptions... ");
-        Flush();
+        output.Write("preserved exceptions... ");
+        output.Flush();
         {
             try
             {
@@ -1271,7 +1267,7 @@
 
             adapter.destroy();
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
         return testPrx;
     }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        TestIntfPrx test = AllTests.allTests(this, false);
-        test.shutdown();
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            TestIntfPrx test = AllTests.allTests(this, false);
+            test.shutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,8 +43,8 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\ClientPrivate.cs"/>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\ClientPrivate.cs" />
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\client.exe.config">
@@ -56,11 +56,11 @@
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <IncludeDirectories>$(MSBuildProjectDirectory)\..\..\..</IncludeDirectories>
@@ -70,9 +70,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
-    <SliceCompile Include="../../../ClientPrivate.ice"/>
+    <Compile Include="../../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\ClientPrivate.cs">
+      <SliceCompileSource>../../../ClientPrivate.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../ClientPrivate.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,12 +43,12 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\ServerPrivate.cs"/>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\ServerPrivate.cs" />
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\ServerPrivate.ice">
       <Link>ServerPrivate.ice</Link>
     </SliceCompile>
@@ -56,8 +56,8 @@
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <IncludeDirectories>$(MSBuildProjectDirectory)\..\..\..</IncludeDirectories>
@@ -67,9 +67,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
-    <SliceCompile Include="../../../ServerPrivate.ice"/>
+    <Compile Include="../../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\ServerPrivate.cs">
+      <SliceCompileSource>../../../ServerPrivate.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../ServerPrivate.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\ServerAMD.cs">
       <Link>ServerAMD.cs</Link>
@@ -43,8 +43,8 @@
     <Compile Include="..\..\..\TestAMDI.cs">
       <Link>TestAMDI.cs</Link>
     </Compile>
-    <Compile Include="generated\ServerPrivateAMD.cs"/>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\ServerPrivateAMD.cs" />
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\ServerPrivateAMD.ice">
@@ -53,11 +53,11 @@
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <IncludeDirectories>$(MSBuildProjectDirectory)\..\..\..</IncludeDirectories>
@@ -67,9 +67,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestAMDI.cs"/>
-    <Compile Include="../../../ServerAMD.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
-    <SliceCompile Include="../../../ServerPrivateAMD.ice"/>
+    <Compile Include="../../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\ServerPrivateAMD.cs">
+      <SliceCompileSource>../../../ServerPrivateAMD.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+    <SliceCompile Include="../../../ServerPrivateAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ServerAMD.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.Properties properties = communicator().getProperties();
+        Ice.Properties properties = createTestProperties(ref args);
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object @object = new TestI();
-        adapter.add(@object, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.Properties properties = communicator().getProperties();
+        Ice.Properties properties = createTestProperties(ref args);
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object @object = new TestI();
-        adapter.add(@object, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/TestAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/TestAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/TestAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/TestAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Threading.Tasks;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/exceptions/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/exceptions/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Test;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
     private class Callback
     {
@@ -76,24 +71,25 @@
         return null;
     }
 
-    public static TestIntfPrx allTests(TestCommon.Application app, bool collocated)
+    public static TestIntfPrx allTests(Test.TestHelper helper, bool collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        Write("testing stringToProxy... ");
-        Flush();
-        Ice.ObjectPrx basePrx = communicator.stringToProxy("Test:" + app.getTestEndpoint(0) + " -t 2000");
+        Ice.Communicator communicator = helper.communicator();
+        var output = helper.getWriter();
+        output.Write("testing stringToProxy... ");
+        output.Flush();
+        Ice.ObjectPrx basePrx = communicator.stringToProxy("Test:" + helper.getTestEndpoint(0) + " -t 2000");
         test(basePrx != null);
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing checked cast... ");
-        Flush();
+        output.Write("testing checked cast... ");
+        output.Flush();
         TestIntfPrx testPrx = TestIntfPrxHelper.checkedCast(basePrx);
         test(testPrx != null);
         test(testPrx.Equals(basePrx));
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base as Object... ");
-        Flush();
+        output.Write("base as Object... ");
+        output.Flush();
         {
             Ice.Value o;
             SBase sb = null;
@@ -111,10 +107,10 @@
             test(sb != null);
             test(sb.sb.Equals("SBase.sb"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base as Object (AMI)... ");
-        Flush();
+        output.Write("base as Object (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_SBaseAsObject().whenCompleted(
@@ -141,10 +137,10 @@
             test(sb != null);
             test(sb.sb.Equals("SBase.sb"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base as base... ");
-        Flush();
+        output.Write("base as base... ");
+        output.Flush();
         {
             SBase sb;
             try
@@ -157,10 +153,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base as base (AMI)... ");
-        Flush();
+        output.Write("base as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_SBaseAsSBase().whenCompleted(
@@ -180,10 +176,10 @@
             SBase sb = testPrx.SBaseAsSBaseAsync().Result;
             test(sb.sb.Equals("SBase.sb"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base with known derived as base... ");
-        Flush();
+        output.Write("base with known derived as base... ");
+        output.Flush();
         {
             SBase sb;
             SBSKnownDerived sbskd = null;
@@ -200,10 +196,10 @@
             test(sbskd != null);
             test(sbskd.sbskd.Equals("SBSKnownDerived.sbskd"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base with known derived as base (AMI)... ");
-        Flush();
+        output.Write("base with known derived as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_SBSKnownDerivedAsSBase().whenCompleted(
@@ -228,10 +224,10 @@
             test(sbskd != null);
             test(sbskd.sbskd.Equals("SBSKnownDerived.sbskd"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base with known derived as known derived... ");
-        Flush();
+        output.Write("base with known derived as known derived... ");
+        output.Flush();
         {
             SBSKnownDerived sbskd;
             try
@@ -244,10 +240,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base with known derived as known derived (AMI)... ");
-        Flush();
+        output.Write("base with known derived as known derived (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_SBSKnownDerivedAsSBSKnownDerived().whenCompleted(
@@ -266,10 +262,10 @@
             SBSKnownDerived sbskd = testPrx.SBSKnownDerivedAsSBSKnownDerivedAsync().Result;
             test(sbskd.sbskd.Equals("SBSKnownDerived.sbskd"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base with unknown derived as base... ");
-        Flush();
+        output.Write("base with unknown derived as base... ");
+        output.Flush();
         {
             SBase sb;
             try
@@ -314,10 +310,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base with unknown derived as base (AMI)... ");
-        Flush();
+        output.Write("base with unknown derived as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_SBSUnknownDerivedAsSBase().whenCompleted(
@@ -390,10 +386,10 @@
                 test(ae.InnerException is Ice.NoValueFactoryException);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("unknown with Object as Object... ");
-        Flush();
+        output.Write("unknown with Object as Object... ");
+        output.Flush();
         {
             try
             {
@@ -413,10 +409,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("unknown with Object as Object (AMI)... ");
-        Flush();
+        output.Write("unknown with Object as Object (AMI)... ");
+        output.Flush();
         {
             try
             {
@@ -486,10 +482,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("one-element cycle... ");
-        Flush();
+        output.Write("one-element cycle... ");
+        output.Flush();
         {
             try
             {
@@ -504,10 +500,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("one-element cycle (AMI)... ");
-        Flush();
+        output.Write("one-element cycle (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_oneElementCycle().whenCompleted(
@@ -532,10 +528,10 @@
             test(b.sb.Equals("B1.sb"));
             test(b.pb == b);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("two-element cycle... ");
-        Flush();
+        output.Write("two-element cycle... ");
+        output.Flush();
         {
             try
             {
@@ -555,10 +551,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("two-element cycle (AMI)... ");
-        Flush();
+        output.Write("two-element cycle (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_twoElementCycle().whenCompleted(
@@ -593,10 +589,10 @@
             test(b2.sb.Equals("B2.sb"));
             test(b2.pb == b1);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("known derived pointer slicing as base... ");
-        Flush();
+        output.Write("known derived pointer slicing as base... ");
+        output.Flush();
         {
             try
             {
@@ -625,10 +621,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("known derived pointer slicing as base (AMI)... ");
-        Flush();
+        output.Write("known derived pointer slicing as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_D1AsB().whenCompleted(
@@ -679,10 +675,10 @@
             test(b2.sb.Equals("D2.sb"));
             test(b2.ice_id().Equals("::Test::B"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("known derived pointer slicing as derived... ");
-        Flush();
+        output.Write("known derived pointer slicing as derived... ");
+        output.Flush();
         {
             try
             {
@@ -705,10 +701,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("known derived pointer slicing as derived (AMI)... ");
-        Flush();
+        output.Write("known derived pointer slicing as derived (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_D1AsD1().whenCompleted(
@@ -748,10 +744,10 @@
             test(b2.sb.Equals("D2.sb"));
             test(b2.pb == d1);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("unknown derived pointer slicing as base... ");
-        Flush();
+        output.Write("unknown derived pointer slicing as base... ");
+        output.Flush();
         {
             try
             {
@@ -778,10 +774,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("unknown derived pointer slicing as base (AMI)... ");
-        Flush();
+        output.Write("unknown derived pointer slicing as base (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_D2AsB().whenCompleted(
@@ -829,10 +825,10 @@
             test(d1.sd1.Equals("D1.sd1"));
             test(d1.pd1 == b2);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing with known first... ");
-        Flush();
+        output.Write("param ptr slicing with known first... ");
+        output.Flush();
         {
             try
             {
@@ -859,10 +855,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing with known first (AMI)... ");
-        Flush();
+        output.Write("param ptr slicing with known first (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_paramTest1().whenCompleted(
@@ -908,10 +904,10 @@
             test(b2.sb.Equals("D2.sb"));
             test(b2.pb == b1);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing with unknown first... ");
-        Flush();
+        output.Write("param ptr slicing with unknown first... ");
+        output.Flush();
         {
             try
             {
@@ -938,10 +934,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing with unknown first (AMI)... ");
-        Flush();
+        output.Write("param ptr slicing with unknown first (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_paramTest2().whenCompleted(
@@ -987,10 +983,10 @@
             test(b2.sb.Equals("D2.sb"));
             test(b2.pb == b1);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity with known first... ");
-        Flush();
+        output.Write("return value identity with known first... ");
+        output.Flush();
         {
             try
             {
@@ -1004,10 +1000,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity with known first (AMI)... ");
-        Flush();
+        output.Write("return value identity with known first (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_returnTest1().whenCompleted(
@@ -1026,10 +1022,10 @@
             var result = testPrx.returnTest1Async().Result;
             test(result.returnValue == result.p1);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity with unknown first... ");
-        Flush();
+        output.Write("return value identity with unknown first... ");
+        output.Flush();
         {
             try
             {
@@ -1043,10 +1039,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity with unknown first (AMI)... ");
-        Flush();
+        output.Write("return value identity with unknown first (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_returnTest2().whenCompleted(
@@ -1065,10 +1061,10 @@
             var result = testPrx.returnTest2Async().Result;
             test(result.returnValue == result.p2);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity for input params known first... ");
-        Flush();
+        output.Write("return value identity for input params known first... ");
+        output.Flush();
         {
             try
             {
@@ -1118,10 +1114,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity for input params known first (AMI)... ");
-        Flush();
+        output.Write("return value identity for input params known first (AMI)... ");
+        output.Flush();
         {
             D1 d1 = new D1();
             d1.sb = "D1.sb";
@@ -1220,10 +1216,10 @@
             test(b2 != d1);
             test(b2 != d3);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity for input params unknown first... ");
-        Flush();
+        output.Write("return value identity for input params unknown first... ");
+        output.Flush();
         {
             try
             {
@@ -1274,10 +1270,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("return value identity for input params unknown first (AMI)... ");
-        Flush();
+        output.Write("return value identity for input params unknown first (AMI)... ");
+        output.Flush();
         {
             D1 d1 = new D1();
             d1.sb = "D1.sb";
@@ -1379,10 +1375,10 @@
             test(b2 != d1);
             test(b2 != d3);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("remainder unmarshaling (3 instances)... ");
-        Flush();
+        output.Write("remainder unmarshaling (3 instances)... ");
+        output.Flush();
         {
             try
             {
@@ -1410,10 +1406,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("remainder unmarshaling (3 instances) (AMI)... ");
-        Flush();
+        output.Write("remainder unmarshaling (3 instances) (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_paramTest3().whenCompleted(
@@ -1462,10 +1458,10 @@
             test(ret.pb == null);
             test(ret.ice_id().Equals("::Test::D1"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("remainder unmarshaling (4 instances)... ");
-        Flush();
+        output.Write("remainder unmarshaling (4 instances)... ");
+        output.Flush();
         {
             try
             {
@@ -1487,10 +1483,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("remainder unmarshaling (4 instances) (AMI)... ");
-        Flush();
+        output.Write("remainder unmarshaling (4 instances) (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_paramTest4().whenCompleted(
@@ -1529,10 +1525,10 @@
             test(ret.pb == null);
             test(ret.ice_id().Equals("::Test::B"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing, instance marshaled in unknown derived as base... ");
-        Flush();
+        output.Write("param ptr slicing, instance marshaled in unknown derived as base... ");
+        output.Flush();
         {
             try
             {
@@ -1562,10 +1558,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing, instance marshaled in unknown derived as base (AMI)... ");
-        Flush();
+        output.Write("param ptr slicing, instance marshaled in unknown derived as base (AMI)... ");
+        output.Flush();
         {
             B b1 = new B();
             b1.sb = "B.sb(1)";
@@ -1623,10 +1619,10 @@
             test(rv.sb.Equals("D3.sb"));
             test(rv.pb == rv);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing, instance marshaled in unknown derived as derived... ");
-        Flush();
+        output.Write("param ptr slicing, instance marshaled in unknown derived as derived... ");
+        output.Flush();
         {
             try
             {
@@ -1658,10 +1654,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("param ptr slicing, instance marshaled in unknown derived as derived (AMI)... ");
-        Flush();
+        output.Write("param ptr slicing, instance marshaled in unknown derived as derived (AMI)... ");
+        output.Flush();
         {
             D1 d11 = new D1();
             d11.sb = "D1.sb(1)";
@@ -1725,10 +1721,10 @@
             test(rv.sb.Equals("D3.sb"));
             test(rv.pb == rv);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("sequence slicing... ");
-        Flush();
+        output.Write("sequence slicing... ");
+        output.Flush();
         {
             try
             {
@@ -1815,10 +1811,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("sequence slicing (AMI)... ");
-        Flush();
+        output.Write("sequence slicing (AMI)... ");
+        output.Flush();
         {
             SS3 ss = null;
             {
@@ -1987,10 +1983,10 @@
             test(ss2d5.ice_id().Equals("::Test::D1"));
             test(ss2d6.ice_id().Equals("::Test::B"));
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("dictionary slicing... ");
-        Flush();
+        output.Write("dictionary slicing... ");
+        output.Flush();
         {
             try
             {
@@ -2042,10 +2038,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("dictionary slicing (AMI)... ");
-        Flush();
+        output.Write("dictionary slicing (AMI)... ");
+        output.Flush();
         {
             Dictionary<int, B> bin = new Dictionary<int, B>();
             Dictionary<int, B> bout = null;
@@ -2149,10 +2145,10 @@
                 test(d1.pd1 == d1);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base exception thrown as base exception... ");
-        Flush();
+        output.Write("base exception thrown as base exception... ");
+        output.Flush();
         {
             try
             {
@@ -2172,10 +2168,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("base exception thrown as base exception (AMI)... ");
-        Flush();
+        output.Write("base exception thrown as base exception (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_throwBaseAsBase().whenCompleted(
@@ -2222,10 +2218,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("derived exception thrown as base exception... ");
-        Flush();
+        output.Write("derived exception thrown as base exception... ");
+        output.Flush();
         {
             try
             {
@@ -2251,10 +2247,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("derived exception thrown as base exception (AMI)... ");
-        Flush();
+        output.Write("derived exception thrown as base exception (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_throwDerivedAsBase().whenCompleted(
@@ -2314,10 +2310,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("derived exception thrown as derived exception... ");
-        Flush();
+        output.Write("derived exception thrown as derived exception... ");
+        output.Flush();
         {
             try
             {
@@ -2343,10 +2339,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("derived exception thrown as derived exception (AMI)... ");
-        Flush();
+        output.Write("derived exception thrown as derived exception (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_throwDerivedAsDerived().whenCompleted(
@@ -2406,10 +2402,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("unknown derived exception thrown as base exception... ");
-        Flush();
+        output.Write("unknown derived exception thrown as base exception... ");
+        output.Flush();
         {
             try
             {
@@ -2429,10 +2425,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("unknown derived exception thrown as base exception (AMI)... ");
-        Flush();
+        output.Write("unknown derived exception thrown as base exception (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_throwUnknownDerivedAsBase().whenCompleted(
@@ -2480,10 +2476,10 @@
                 }
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("forward-declared class... ");
-        Flush();
+        output.Write("forward-declared class... ");
+        output.Flush();
         {
             try
             {
@@ -2496,10 +2492,10 @@
                 test(false);
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("forward-declared class (AMI)... ");
-        Flush();
+        output.Write("forward-declared class (AMI)... ");
+        output.Flush();
         {
             Callback cb = new Callback();
             testPrx.begin_useForward().whenCompleted(
@@ -2517,10 +2513,10 @@
         {
             test(testPrx.useForwardAsync().Result != null);
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("preserved classes... ");
-        Flush();
+        output.Write("preserved classes... ");
+        output.Flush();
 
         //
         // Register a factory in order to substitute our own subclass of Preserved. This provides
@@ -2700,10 +2696,10 @@
         {
         }
 
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("preserved classes (AMI)... ");
-        Flush();
+        output.Write("preserved classes (AMI)... ");
+        output.Flush();
         {
             //
             // Server knows the most-derived class PDerived.
@@ -3043,10 +3039,10 @@
         {
         }
 
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("garbage collection for preserved classes... ");
-        Flush();
+        output.Write("garbage collection for preserved classes... ");
+        output.Flush();
         try
         {
             //
@@ -3142,7 +3138,7 @@
         {
         }
 
-        WriteLine("ok");
+        output.WriteLine("ok");
         return testPrx;
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        TestIntfPrx test = AllTests.allTests(this, false);
-        test.shutdown();
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            TestIntfPrx test = AllTests.allTests(this, false);
+            test.shutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,8 +43,8 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\ClientPrivate.cs"/>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\ClientPrivate.cs" />
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\client.exe.config">
@@ -56,10 +56,10 @@
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <IncludeDirectories>$(MSBuildProjectDirectory)\..\..\..</IncludeDirectories>
@@ -69,9 +69,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
-    <SliceCompile Include="../../../ClientPrivate.ice"/>
+    <Compile Include="../../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\ClientPrivate.cs">
+      <SliceCompileSource>../../../ClientPrivate.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../ClientPrivate.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,8 +43,8 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\ServerPrivate.cs"/>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\ServerPrivate.cs" />
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\server.exe.config">
@@ -56,10 +56,10 @@
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <IncludeDirectories>$(MSBuildProjectDirectory)\..\..\..</IncludeDirectories>
@@ -69,9 +69,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
-    <SliceCompile Include="../../../ServerPrivate.ice"/>
+    <Compile Include="../../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\ServerPrivate.cs">
+      <SliceCompileSource>../../../ServerPrivate.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
+    <SliceCompile Include="../../../ServerPrivate.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/serveramd/net45/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>serveramd</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\ServerAMD.cs">
       <Link>ServerAMD.cs</Link>
@@ -43,8 +43,8 @@
     <Compile Include="..\..\..\TestAMDI.cs">
       <Link>TestAMDI.cs</Link>
     </Compile>
-    <Compile Include="generated\ServerPrivateAMD.cs"/>
-    <Compile Include="generated\TestAMD.cs"/>
+    <Compile Include="generated\ServerPrivateAMD.cs" />
+    <Compile Include="generated\TestAMD.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\ServerPrivateAMD.ice">
@@ -53,11 +53,11 @@
     <SliceCompile Include="..\..\..\TestAMD.ice">
       <Link>TestAMD.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
-    <None Include="serveramd.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="serveramd.exe.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\..\msbuild\ice.test.props" />
   <ItemDefinitionGroup Label="IceBuilder">
     <SliceCompile>
       <IncludeDirectories>$(MSBuildProjectDirectory)\..\..\..</IncludeDirectories>
@@ -67,9 +67,9 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/msbuild/serveramd/netstandard2.0/serveramd.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>serveramd</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -15,22 +15,28 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="../../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestAMDI.cs"/>
-    <Compile Include="../../../ServerAMD.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../TestAMD.ice"/>
-    <SliceCompile Include="../../../ServerPrivateAMD.ice"/>
+    <Compile Include="../../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestAMDI.cs" />
+    <Compile Include="../../../ServerAMD.cs" />
+    <Compile Include="generated\ServerPrivateAMD.cs">
+      <SliceCompileSource>../../../ServerPrivateAMD.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\TestAMD.cs">
+      <SliceCompileSource>../../../TestAMD.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../TestAMD.ice" />
+    <SliceCompile Include="../../../ServerPrivateAMD.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ServerAMD.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ServerAMD.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ServerAMD.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ServerAMD.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.Properties properties = communicator().getProperties();
+        Ice.Properties properties = createTestProperties(ref args);
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object obj = new TestI();
-        adapter.add(obj, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.Properties properties = communicator().getProperties();
+        Ice.Properties properties = createTestProperties(ref args);
         properties.setProperty("Ice.Warn.Dispatch", "0");
-        properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object obj = new TestI();
-        adapter.add(obj, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ServerPrivate.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ServerPrivate.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/TestAMD.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/TestAMD.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/TestAMDI.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/TestAMDI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/TestAMDI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/TestAMDI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/slicing/objects/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/slicing/objects/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/stream/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,1055 +1,1061 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright(c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Test;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    //
-    // There does not appear to be any way to compare collections
-    // in either C# or with the .NET framework. Something like
-    // C++ STL EqualRange would be nice...
-    //
-    private static bool Compare(ICollection c1, ICollection c2)
+    namespace stream
     {
-        if (c1 == null)
-        {
-            return c2 == null;
-        }
-        if (c2 == null)
-        {
-            return false;
-        }
-        if (!c1.GetType().Equals(c2.GetType()))
-        {
-            return false;
-        }
-
-        if (c1.Count != c2.Count)
-        {
-            return false;
-        }
-
-        IEnumerator i1 = c1.GetEnumerator();
-        IEnumerator i2 = c2.GetEnumerator();
-        while (i1.MoveNext())
+        public class AllTests : global::Test.AllTests
         {
-            i2.MoveNext();
-            if (i1.Current is ICollection)
+            //
+            // There does not appear to be any way to compare collections
+            // in either C# or with the .NET framework. Something like
+            // C++ STL EqualRange would be nice...
+            //
+            private static bool Compare(ICollection c1, ICollection c2)
             {
-                Debug.Assert(i2.Current is ICollection);
-                if (!Compare((ICollection)i1.Current, (ICollection)i2.Current))
+                if(c1 == null)
+                {
+                    return c2 == null;
+                }
+                if(c2 == null)
+                {
+                    return false;
+                }
+                if(!c1.GetType().Equals(c2.GetType()))
                 {
                     return false;
                 }
-            }
-            else if (!i1.Current.Equals(i2.Current))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private class TestValueWriter : Ice.ValueWriter
-    {
-        public TestValueWriter(MyClass obj)
-        {
-            this.obj = obj;
-        }
-
-        public override void write(Ice.OutputStream outS)
-        {
-            obj.iceWrite(outS);
-            called = true;
-        }
 
-        internal MyClass obj;
-        internal bool called = false;
-    }
+                if(c1.Count != c2.Count)
+                {
+                    return false;
+                }
 
-    private class TestValueReader : Ice.ValueReader
-    {
-        public override void read(Ice.InputStream inS)
-        {
-            obj = new MyClass();
-            obj.iceRead(inS);
-            called = true;
-        }
+                IEnumerator i1 = c1.GetEnumerator();
+                IEnumerator i2 = c2.GetEnumerator();
+                while(i1.MoveNext())
+                {
+                    i2.MoveNext();
+                    if(i1.Current is ICollection)
+                    {
+                        Debug.Assert(i2.Current is ICollection);
+                        if(!Compare((ICollection)i1.Current,(ICollection)i2.Current))
+                        {
+                            return false;
+                        }
+                    }
+                    else if(!i1.Current.Equals(i2.Current))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
 
-        internal MyClass obj;
-        internal bool called = false;
-    }
+            private class TestValueWriter : Ice.ValueWriter
+            {
+                public TestValueWriter(Test.MyClass obj)
+                {
+                    this.obj = obj;
+                }
 
-    private static Ice.Value TestObjectFactory(string type)
-    {
-        Debug.Assert(type.Equals(MyClass.ice_staticId()));
-        return new TestValueReader();
-    }
+                public override void write(Ice.OutputStream outS)
+                {
+                    obj.iceWrite(outS);
+                    called = true;
+                }
 
-    private class TestReadValueCallback
-    {
-        public void invoke(Ice.Value obj)
-        {
-            this.obj = obj;
-        }
+                internal Test.MyClass obj;
+                internal bool called = false;
+            }
 
-        internal Ice.Value obj;
-    }
+            private class TestValueReader : Ice.ValueReader
+            {
+                public override void read(Ice.InputStream inS)
+                {
+                    obj = new Test.MyClass();
+                    obj.iceRead(inS);
+                    called = true;
+                }
 
-    public class MyClassFactoryWrapper
-    {
-        public MyClassFactoryWrapper()
-        {
-            _factory = null;
-        }
+                internal Test.MyClass obj;
+                internal bool called = false;
+            }
 
-        public Ice.Value create(string type)
-        {
-            if (_factory != null)
+            private static Ice.Value TestObjectFactory(string type)
             {
-                return _factory(type);
+                Debug.Assert(type.Equals(Test.MyClass.ice_staticId()));
+                return new TestValueReader();
             }
-            return new MyClass();
-        }
-
-        public void setFactory(Ice.ValueFactory factory)
-        {
-            _factory = factory;
-        }
-
-        private Ice.ValueFactory _factory;
-    }
 
-    static public int allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
-
-        communicator.getValueFactoryManager().add(factoryWrapper.create, MyClass.ice_staticId());
-        communicator.getValueFactoryManager().add((id) =>
+            private class TestReadValueCallback
             {
-                return new Ice.InterfaceByValue("::Test::MyInterface");
-            },
-            "::Test::MyInterface");
+                public void invoke(Ice.Value obj)
+                {
+                    this.obj = obj;
+                }
 
-        Ice.InputStream inS;
-        Ice.OutputStream outS;
+                internal Ice.Value obj;
+            }
 
-        Write("testing primitive types... ");
-        Flush();
+            public class MyClassFactoryWrapper
+            {
+                public MyClassFactoryWrapper()
+                {
+                    _factory = null;
+                }
 
-        {
-            byte[] data = new byte[0];
-            inS = new Ice.InputStream(communicator, data);
-        }
+                public Ice.Value create(string type)
+                {
+                    if(_factory != null)
+                    {
+                        return _factory(type);
+                    }
+                    return new Test.MyClass();
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.startEncapsulation();
-            outS.writeBool(true);
-            outS.endEncapsulation();
-            var data = outS.finished();
-
-            inS = new Ice.InputStream(communicator, data);
-            inS.startEncapsulation();
-            test(inS.readBool());
-            inS.endEncapsulation();
-
-            inS = new Ice.InputStream(communicator, data);
-            inS.startEncapsulation();
-            test(inS.readBool());
-            inS.endEncapsulation();
-        }
+                public void setFactory(Ice.ValueFactory factory)
+                {
+                    _factory = factory;
+                }
 
-        {
-            var data = new byte[0];
-            inS = new Ice.InputStream(communicator, data);
-            try
-            {
-                inS.readBool();
-                test(false);
+                private Ice.ValueFactory _factory;
             }
-            catch (Ice.UnmarshalOutOfBoundsException)
+
+            static public int allTests(global::Test.TestHelper helper)
             {
-            }
-        }
+                var communicator = helper.communicator();
+                MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeBool(true);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readBool());
-        }
+                communicator.getValueFactoryManager().add(factoryWrapper.create, Test.MyClass.ice_staticId());
+                communicator.getValueFactoryManager().add((id) =>
+                    {
+                        return new Ice.InterfaceByValue("::Test::MyInterface");
+                    },
+                    "::Test::MyInterface");
+
+                Ice.InputStream inS;
+                Ice.OutputStream outS;
+
+                var output = helper.getWriter();
+                output.Write("testing primitive types... ");
+                output.Flush();
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeByte(1);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readByte() == 1);
-        }
+                {
+                    byte[] data = new byte[0];
+                    inS = new Ice.InputStream(communicator, data);
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeShort(2);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readShort() == 2);
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.startEncapsulation();
+                    outS.writeBool(true);
+                    outS.endEncapsulation();
+                    var data = outS.finished();
+
+                    inS = new Ice.InputStream(communicator, data);
+                    inS.startEncapsulation();
+                    test(inS.readBool());
+                    inS.endEncapsulation();
+
+                    inS = new Ice.InputStream(communicator, data);
+                    inS.startEncapsulation();
+                    test(inS.readBool());
+                    inS.endEncapsulation();
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeInt(3);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readInt() == 3);
-        }
+                {
+                    var data = new byte[0];
+                    inS = new Ice.InputStream(communicator, data);
+                    try
+                    {
+                        inS.readBool();
+                        test(false);
+                    }
+                    catch(Ice.UnmarshalOutOfBoundsException)
+                    {
+                    }
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeLong(4);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readLong() == 4);
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeBool(true);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readBool());
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeFloat((float)5.0);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readFloat() == (float)5.0);
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeByte(1);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readByte() == 1);
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeDouble(6.0);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readDouble() == 6.0);
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeShort(2);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readShort() == 2);
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            outS.writeString("hello world");
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            test(inS.readString().Equals("hello world"));
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeInt(3);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readInt() == 3);
+                }
 
-        WriteLine("ok");
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeLong(4);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readLong() == 4);
+                }
 
-        Write("testing constructed types... ");
-        Flush();
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeFloat((float)5.0);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readFloat() ==(float)5.0);
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            MyEnumHelper.write(outS, MyEnum.enum3);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var e = MyEnumHelper.read(inS);
-            test(e == MyEnum.enum3);
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeDouble(6.0);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readDouble() == 6.0);
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var s = new SmallStruct();
-            s.bo = true;
-            s.by = 1;
-            s.sh = 2;
-            s.i = 3;
-            s.l = 4;
-            s.f = 5.0f;
-            s.d = 6.0;
-            s.str = "7";
-            s.e = MyEnum.enum2;
-            s.p = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test:default"));
-            SmallStruct.ice_write(outS, s);
-            var data = outS.finished();
-            var s2 = SmallStruct.ice_read(new Ice.InputStream(communicator, data));
-            test(s2.Equals(s));
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeString("hello world");
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    test(inS.readString().Equals("hello world"));
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var o = new OptionalClass();
-            o.bo = true;
-            o.by = 5;
-            o.sh = 4;
-            o.i = 3;
-            outS.writeValue(o);
-            outS.writePendingValues();
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            TestReadValueCallback cb = new TestReadValueCallback();
-            inS.readValue(cb.invoke);
-            inS.readPendingValues();
-            var o2 = (OptionalClass)cb.obj;
-            test(o2.bo == o.bo);
-            test(o2.by == o.by);
-            if(communicator.getProperties().getProperty("Ice.Default.EncodingVersion").Equals("1.0"))
-            {
-                test(!o2.sh.HasValue);
-                test(!o2.i.HasValue);
-            }
-            else
-            {
-                test(o2.sh.Value == o.sh.Value);
-                test(o2.i.Value == o.i.Value);
-            }
-        }
+                output.WriteLine("ok");
 
-        {
-            outS = new Ice.OutputStream(communicator, Ice.Util.Encoding_1_0);
-            var o = new OptionalClass();
-            o.bo = true;
-            o.by = 5;
-            o.sh = 4;
-            o.i = 3;
-            outS.writeValue(o);
-            outS.writePendingValues();
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, Ice.Util.Encoding_1_0, data);
-            var cb = new TestReadValueCallback();
-            inS.readValue(cb.invoke);
-            inS.readPendingValues();
-            var o2 = (OptionalClass)cb.obj;
-            test(o2.bo == o.bo);
-            test(o2.by == o.by);
-            test(!o2.sh.HasValue);
-            test(!o2.i.HasValue);
-        }
+                output.Write("testing constructed types... ");
+                output.Flush();
 
-        {
-            bool[] arr = { true, false, true, false };
-            outS = new Ice.OutputStream(communicator);
-            Ice.BoolSeqHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = Ice.BoolSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            bool[][] arrS = { arr, new bool[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            BoolSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = BoolSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    Test.MyEnumHelper.write(outS, Test.MyEnum.enum3);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var e = Test.MyEnumHelper.read(inS);
+                    test(e == Test.MyEnum.enum3);
+                }
 
-        {
-            byte[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            Ice.ByteSeqHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = Ice.ByteSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            byte[][] arrS = { arr, new byte[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            ByteSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = ByteSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var s = new Test.SmallStruct();
+                    s.bo = true;
+                    s.by = 1;
+                    s.sh = 2;
+                    s.i = 3;
+                    s.l = 4;
+                    s.f = 5.0f;
+                    s.d = 6.0;
+                    s.str = "7";
+                    s.e = Test.MyEnum.enum2;
+                    s.p = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test:default"));
+                    Test.SmallStruct.ice_write(outS, s);
+                    var data = outS.finished();
+                    var s2 = Test.SmallStruct.ice_read(new Ice.InputStream(communicator, data));
+                    test(s2.Equals(s));
+                }
 
-        {
-            Serialize.Small small = new Serialize.Small();
-            small.i = 99;
-            outS = new Ice.OutputStream(communicator);
-            outS.writeSerializable(small);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var small2 = (Serialize.Small)inS.readSerializable();
-            test(small2.i == 99);
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var o = new Test.OptionalClass();
+                    o.bo = true;
+                    o.by = 5;
+                    o.sh = 4;
+                    o.i = 3;
+                    outS.writeValue(o);
+                    outS.writePendingValues();
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    TestReadValueCallback cb = new TestReadValueCallback();
+                    inS.readValue(cb.invoke);
+                    inS.readPendingValues();
+                    var o2 =(Test.OptionalClass)cb.obj;
+                    test(o2.bo == o.bo);
+                    test(o2.by == o.by);
+                    if(communicator.getProperties().getProperty("Ice.Default.EncodingVersion").Equals("1.0"))
+                    {
+                        test(!o2.sh.HasValue);
+                        test(!o2.i.HasValue);
+                    }
+                    else
+                    {
+                        test(o2.sh.Value == o.sh.Value);
+                        test(o2.i.Value == o.i.Value);
+                    }
+                }
 
-        {
-            short[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            Ice.ShortSeqHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = Ice.ShortSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            short[][] arrS = { arr, new short[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            ShortSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = ShortSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    outS = new Ice.OutputStream(communicator, Ice.Util.Encoding_1_0);
+                    var o = new Test.OptionalClass();
+                    o.bo = true;
+                    o.by = 5;
+                    o.sh = 4;
+                    o.i = 3;
+                    outS.writeValue(o);
+                    outS.writePendingValues();
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, Ice.Util.Encoding_1_0, data);
+                    var cb = new TestReadValueCallback();
+                    inS.readValue(cb.invoke);
+                    inS.readPendingValues();
+                    var o2 =(Test.OptionalClass)cb.obj;
+                    test(o2.bo == o.bo);
+                    test(o2.by == o.by);
+                    test(!o2.sh.HasValue);
+                    test(!o2.i.HasValue);
+                }
 
-        {
-            int[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            Ice.IntSeqHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = Ice.IntSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            int[][] arrS = { arr, new int[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            IntSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = IntSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    bool[] arr = { true, false, true, false };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.BoolSeqHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Ice.BoolSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    bool[][] arrS = { arr, new bool[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.BoolSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.BoolSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        {
-            long[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            Ice.LongSeqHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = Ice.LongSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            long[][] arrS = { arr, new long[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            LongSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = LongSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    byte[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.ByteSeqHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Ice.ByteSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    byte[][] arrS = { arr, new byte[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.ByteSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.ByteSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        {
-            float[] arr = {1, 2, 3, 4};
-            outS = new Ice.OutputStream(communicator);
-            Ice.FloatSeqHelper.write(outS, arr);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            float[] arr2 = Ice.FloatSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            float[][] arrS = { arr, new float[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            FloatSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = FloatSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    Serialize.Small small = new Serialize.Small();
+                    small.i = 99;
+                    outS = new Ice.OutputStream(communicator);
+                    outS.writeSerializable(small);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var small2 =(Serialize.Small)inS.readSerializable();
+                    test(small2.i == 99);
+                }
 
-        {
-            double[] arr =
-            {
-                (double)1,
-                (double)2,
-                (double)3,
-                (double)4
-            };
-            outS = new Ice.OutputStream(communicator);
-            Ice.DoubleSeqHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = Ice.DoubleSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            double[][] arrS = { arr, new double[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            DoubleSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = DoubleSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    short[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.ShortSeqHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Ice.ShortSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    short[][] arrS = { arr, new short[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.ShortSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.ShortSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        {
-            string[] arr = { "string1", "string2", "string3", "string4" };
-            outS = new Ice.OutputStream(communicator);
-            Ice.StringSeqHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = Ice.StringSeqHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            string[][] arrS = { arr, new string[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            StringSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = StringSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    int[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.IntSeqHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Ice.IntSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    int[][] arrS = { arr, new int[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.IntSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.IntSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        {
-            MyEnum[] arr = { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1, MyEnum.enum2 };
-            outS = new Ice.OutputStream(communicator);
-            MyEnumSHelper.write(outS, arr);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = MyEnumSHelper.read(inS);
-            test(Compare(arr2, arr));
-
-            MyEnum[][] arrS = { arr, new MyEnum[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            MyEnumSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = MyEnumSSHelper.read(inS);
-            test(Compare(arr2S, arrS));
-        }
+                {
+                    long[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.LongSeqHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Ice.LongSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    long[][] arrS = { arr, new long[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.LongSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.LongSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        var smallStructArray = new SmallStruct[3];
-        for(int i = 0; i < smallStructArray.Length; ++i)
-        {
-            smallStructArray[i] = new SmallStruct();
-            smallStructArray[i].bo = true;
-            smallStructArray[i].by = 1;
-            smallStructArray[i].sh = 2;
-            smallStructArray[i].i = 3;
-            smallStructArray[i].l = 4;
-            smallStructArray[i].f = 5.0f;
-            smallStructArray[i].d = 6.0;
-            smallStructArray[i].str = "7";
-            smallStructArray[i].e = MyEnum.enum2;
-            smallStructArray[i].p = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test:default"));
-        }
+                {
+                    float[] arr = { 1, 2, 3, 4 };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.FloatSeqHelper.write(outS, arr);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    float[] arr2 = Ice.FloatSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    float[][] arrS = { arr, new float[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.FloatSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.FloatSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        var myClassArray = new MyClass[4];
-        for(int i = 0; i < myClassArray.Length; ++i)
-        {
-            myClassArray[i] = new MyClass();
-            myClassArray[i].c = myClassArray[i];
-            myClassArray[i].o = myClassArray[i];
-            myClassArray[i].s = new SmallStruct();
-            myClassArray[i].s.e = MyEnum.enum2;
-            myClassArray[i].seq1 = new bool[] { true, false, true, false };
-            myClassArray[i].seq2 = new byte[] { 1, 2, 3, 4 };
-            myClassArray[i].seq3 = new short[] { 1, 2, 3, 4 };
-            myClassArray[i].seq4 = new int[] { 1, 2, 3, 4 };
-            myClassArray[i].seq5 = new long[] { 1, 2, 3, 4 };
-            myClassArray[i].seq6 = new float[] { 1, 2, 3, 4 };
-            myClassArray[i].seq7 = new double[] { 1, 2, 3, 4 };
-            myClassArray[i].seq8 = new string[] { "string1", "string2", "string3", "string4" };
-            myClassArray[i].seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
-            myClassArray[i].seq10 = new MyClass[4]; // null elements.
-            myClassArray[i].d = new Dictionary<string, Test.MyClass>();
-            myClassArray[i].d["hi"] = myClassArray[i];
-        }
+                {
+                    double[] arr =
+                    {
+                            1,
+                            2,
+                            3,
+                            4
+                        };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.DoubleSeqHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Ice.DoubleSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    double[][] arrS = { arr, new double[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.DoubleSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.DoubleSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        var myInterfaceArray = new Ice.Value[4];
-        for(int i = 0; i < myInterfaceArray.Length; ++i)
-        {
-            myInterfaceArray[i] = new Ice.InterfaceByValue("::Test::MyInterface");
-        }
+                {
+                    string[] arr = { "string1", "string2", "string3", "string4" };
+                    outS = new Ice.OutputStream(communicator);
+                    Ice.StringSeqHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Ice.StringSeqHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    string[][] arrS = { arr, new string[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.StringSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.StringSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            MyClassSHelper.write(outS, myClassArray);
-            outS.writePendingValues();
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = MyClassSHelper.read(inS);
-            inS.readPendingValues();
-            test(arr2.Length == myClassArray.Length);
-            for(int i = 0; i < arr2.Length; ++i)
-            {
-                test(arr2[i] != null);
-                test(arr2[i].c == arr2[i]);
-                test(arr2[i].o == arr2[i]);
-                test(arr2[i].s.e == MyEnum.enum2);
-                test(Compare(arr2[i].seq1, myClassArray[i].seq1));
-                test(Compare(arr2[i].seq2, myClassArray[i].seq2));
-                test(Compare(arr2[i].seq3, myClassArray[i].seq3));
-                test(Compare(arr2[i].seq4, myClassArray[i].seq4));
-                test(Compare(arr2[i].seq5, myClassArray[i].seq5));
-                test(Compare(arr2[i].seq6, myClassArray[i].seq6));
-                test(Compare(arr2[i].seq7, myClassArray[i].seq7));
-                test(Compare(arr2[i].seq8, myClassArray[i].seq8));
-                test(Compare(arr2[i].seq9, myClassArray[i].seq9));
-                test(arr2[i].d["hi"].Equals(arr2[i]));
-            }
+                {
+                    Test.MyEnum[] arr = {
+                            Test.MyEnum.enum3,
+                            Test.MyEnum.enum2,
+                            Test.MyEnum.enum1,
+                            Test.MyEnum.enum2
+                        };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.MyEnumSHelper.write(outS, arr);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Test.MyEnumSHelper.read(inS);
+                    test(Compare(arr2, arr));
+
+                    Test.MyEnum[][] arrS = { arr, new Test.MyEnum[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.MyEnumSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.MyEnumSSHelper.read(inS);
+                    test(Compare(arr2S, arrS));
+                }
 
-            MyClass[][] arrS = { myClassArray, new MyClass[0], myClassArray };
-            outS = new Ice.OutputStream(communicator);
-            MyClassSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = MyClassSSHelper.read(inS);
-            test(arr2S.Length == arrS.Length);
-            test(arr2S[0].Length == arrS[0].Length);
-            test(arr2S[1].Length == arrS[1].Length);
-            test(arr2S[2].Length == arrS[2].Length);
-        }
+                var smallStructArray = new Test.SmallStruct[3];
+                for(int i = 0; i < smallStructArray.Length; ++i)
+                {
+                    smallStructArray[i] = new Test.SmallStruct();
+                    smallStructArray[i].bo = true;
+                    smallStructArray[i].by = 1;
+                    smallStructArray[i].sh = 2;
+                    smallStructArray[i].i = 3;
+                    smallStructArray[i].l = 4;
+                    smallStructArray[i].f = 5.0f;
+                    smallStructArray[i].d = 6.0;
+                    smallStructArray[i].str = "7";
+                    smallStructArray[i].e = Test.MyEnum.enum2;
+                    smallStructArray[i].p = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("test:default"));
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            MyInterfaceSHelper.write(outS, myInterfaceArray);
-            outS.writePendingValues();
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2 = MyInterfaceSHelper.read(inS);
-            inS.readPendingValues();
-            test(arr2.Length == myInterfaceArray.Length);
-            Ice.Value[][] arrS = { myInterfaceArray, new Ice.Value[0], myInterfaceArray };
-            outS = new Ice.OutputStream(communicator);
-            MyInterfaceSSHelper.write(outS, arrS);
-            data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var arr2S = MyInterfaceSSHelper.read(inS);
-            test(arr2S.Length == arrS.Length);
-            test(arr2S[0].Length == arrS[0].Length);
-            test(arr2S[1].Length == arrS[1].Length);
-            test(arr2S[2].Length == arrS[2].Length);
-        }
+                var myClassArray = new Test.MyClass[4];
+                for(int i = 0; i < myClassArray.Length; ++i)
+                {
+                    myClassArray[i] = new Test.MyClass();
+                    myClassArray[i].c = myClassArray[i];
+                    myClassArray[i].o = myClassArray[i];
+                    myClassArray[i].s = new Test.SmallStruct();
+                    myClassArray[i].s.e = Test.MyEnum.enum2;
+                    myClassArray[i].seq1 = new bool[] { true, false, true, false };
+                    myClassArray[i].seq2 = new byte[] { 1, 2, 3, 4 };
+                    myClassArray[i].seq3 = new short[] { 1, 2, 3, 4 };
+                    myClassArray[i].seq4 = new int[] { 1, 2, 3, 4 };
+                    myClassArray[i].seq5 = new long[] { 1, 2, 3, 4 };
+                    myClassArray[i].seq6 = new float[] { 1, 2, 3, 4 };
+                    myClassArray[i].seq7 = new double[] { 1, 2, 3, 4 };
+                    myClassArray[i].seq8 = new string[] { "string1", "string2", "string3", "string4" };
+                    myClassArray[i].seq9 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1 };
+                    myClassArray[i].seq10 = new Test.MyClass[4]; // null elements.
+                    myClassArray[i].d = new Dictionary<string, Test.MyClass>();
+                    myClassArray[i].d["hi"] = myClassArray[i];
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var obj = new MyClass();
-            obj.s = new SmallStruct();
-            obj.s.e = MyEnum.enum2;
-            var writer = new TestValueWriter(obj);
-            outS.writeValue(writer);
-            outS.writePendingValues();
-            var data = outS.finished();
-            test(writer.called);
-            factoryWrapper.setFactory(TestObjectFactory);
-            inS = new Ice.InputStream(communicator, data);
-            var cb = new TestReadValueCallback();
-            inS.readValue(cb.invoke);
-            inS.readPendingValues();
-            test(cb.obj != null);
-            test(cb.obj is TestValueReader);
-            var reader = (TestValueReader)cb.obj;
-            test(reader.called);
-            test(reader.obj != null);
-            test(reader.obj.s.e == MyEnum.enum2);
-            factoryWrapper.setFactory(null);
-        }
+                var myInterfaceArray = new Ice.Value[4];
+                for(int i = 0; i < myInterfaceArray.Length; ++i)
+                {
+                    myInterfaceArray[i] = new Ice.InterfaceByValue("::Test::MyInterface");
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var ex = new MyException();
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    Test.MyClassSHelper.write(outS, myClassArray);
+                    outS.writePendingValues();
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Test.MyClassSHelper.read(inS);
+                    inS.readPendingValues();
+                    test(arr2.Length == myClassArray.Length);
+                    for(int i = 0; i < arr2.Length; ++i)
+                    {
+                        test(arr2[i] != null);
+                        test(arr2[i].c == arr2[i]);
+                        test(arr2[i].o == arr2[i]);
+                        test(arr2[i].s.e == Test.MyEnum.enum2);
+                        test(Compare(arr2[i].seq1, myClassArray[i].seq1));
+                        test(Compare(arr2[i].seq2, myClassArray[i].seq2));
+                        test(Compare(arr2[i].seq3, myClassArray[i].seq3));
+                        test(Compare(arr2[i].seq4, myClassArray[i].seq4));
+                        test(Compare(arr2[i].seq5, myClassArray[i].seq5));
+                        test(Compare(arr2[i].seq6, myClassArray[i].seq6));
+                        test(Compare(arr2[i].seq7, myClassArray[i].seq7));
+                        test(Compare(arr2[i].seq8, myClassArray[i].seq8));
+                        test(Compare(arr2[i].seq9, myClassArray[i].seq9));
+                        test(arr2[i].d["hi"].Equals(arr2[i]));
+                    }
+
+                    Test.MyClass[][] arrS = { myClassArray, new Test.MyClass[0], myClassArray };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.MyClassSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.MyClassSSHelper.read(inS);
+                    test(arr2S.Length == arrS.Length);
+                    test(arr2S[0].Length == arrS[0].Length);
+                    test(arr2S[1].Length == arrS[1].Length);
+                    test(arr2S[2].Length == arrS[2].Length);
+                }
 
-            var c = new MyClass();
-            c.c = c;
-            c.o = c;
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum2;
-            c.seq1 = new bool[] { true, false, true, false };
-            c.seq2 = new byte[] { 1, 2, 3, 4 };
-            c.seq3 = new short[] { 1, 2, 3, 4 };
-            c.seq4 = new int[] { 1, 2, 3, 4 };
-            c.seq5 = new long[] { 1, 2, 3, 4 };
-            c.seq6 = new float[] { 1, 2, 3, 4 };
-            c.seq7 = new double[] { 1, 2, 3, 4 };
-            c.seq8 = new string[] { "string1", "string2", "string3", "string4" };
-            c.seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
-            c.seq10 = new MyClass[4]; // null elements.
-            c.d = new Dictionary<string, MyClass>();
-            c.d.Add("hi", c);
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    Test.MyInterfaceSHelper.write(outS, myInterfaceArray);
+                    outS.writePendingValues();
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2 = Test.MyInterfaceSHelper.read(inS);
+                    inS.readPendingValues();
+                    test(arr2.Length == myInterfaceArray.Length);
+                    Ice.Value[][] arrS = { myInterfaceArray, new Ice.Value[0], myInterfaceArray };
+                    outS = new Ice.OutputStream(communicator);
+                    Test.MyInterfaceSSHelper.write(outS, arrS);
+                    data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var arr2S = Test.MyInterfaceSSHelper.read(inS);
+                    test(arr2S.Length == arrS.Length);
+                    test(arr2S[0].Length == arrS[0].Length);
+                    test(arr2S[1].Length == arrS[1].Length);
+                    test(arr2S[2].Length == arrS[2].Length);
+                }
 
-            ex.c = c;
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var obj = new Test.MyClass();
+                    obj.s = new Test.SmallStruct();
+                    obj.s.e = Test.MyEnum.enum2;
+                    var writer = new TestValueWriter(obj);
+                    outS.writeValue(writer);
+                    outS.writePendingValues();
+                    var data = outS.finished();
+                    test(writer.called);
+                    factoryWrapper.setFactory(TestObjectFactory);
+                    inS = new Ice.InputStream(communicator, data);
+                    var cb = new TestReadValueCallback();
+                    inS.readValue(cb.invoke);
+                    inS.readPendingValues();
+                    test(cb.obj != null);
+                    test(cb.obj is TestValueReader);
+                    var reader =(TestValueReader)cb.obj;
+                    test(reader.called);
+                    test(reader.obj != null);
+                    test(reader.obj.s.e == Test.MyEnum.enum2);
+                    factoryWrapper.setFactory(null);
+                }
 
-            outS.writeException(ex);
-            var data = outS.finished();
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var ex = new Test.MyException();
 
-            inS = new Ice.InputStream(communicator, data);
-            try
-            {
-                inS.throwException();
-                test(false);
-            }
-            catch (MyException ex1)
-            {
-                test(ex1.c.s.e == c.s.e);
-                test(Compare(ex1.c.seq1, c.seq1));
-                test(Compare(ex1.c.seq2, c.seq2));
-                test(Compare(ex1.c.seq3, c.seq3));
-                test(Compare(ex1.c.seq4, c.seq4));
-                test(Compare(ex1.c.seq5, c.seq5));
-                test(Compare(ex1.c.seq6, c.seq6));
-                test(Compare(ex1.c.seq7, c.seq7));
-                test(Compare(ex1.c.seq8, c.seq8));
-                test(Compare(ex1.c.seq9, c.seq9));
-            }
-            catch (Ice.UserException)
-            {
-                test(false);
-            }
-        }
+                    var c = new Test.MyClass();
+                    c.c = c;
+                    c.o = c;
+                    c.s = new Test.SmallStruct();
+                    c.s.e = Test.MyEnum.enum2;
+                    c.seq1 = new bool[] { true, false, true, false };
+                    c.seq2 = new byte[] { 1, 2, 3, 4 };
+                    c.seq3 = new short[] { 1, 2, 3, 4 };
+                    c.seq4 = new int[] { 1, 2, 3, 4 };
+                    c.seq5 = new long[] { 1, 2, 3, 4 };
+                    c.seq6 = new float[] { 1, 2, 3, 4 };
+                    c.seq7 = new double[] { 1, 2, 3, 4 };
+                    c.seq8 = new string[] { "string1", "string2", "string3", "string4" };
+                    c.seq9 = new Test.MyEnum[] { Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1 };
+                    c.seq10 = new Test.MyClass[4]; // null elements.
+                    c.d = new Dictionary<string, Test.MyClass>();
+                    c.d.Add("hi", c);
+
+                    ex.c = c;
+
+                    outS.writeException(ex);
+                    var data = outS.finished();
+
+                    inS = new Ice.InputStream(communicator, data);
+                    try
+                    {
+                        inS.throwException();
+                        test(false);
+                    }
+                    catch(Test.MyException ex1)
+                    {
+                        test(ex1.c.s.e == c.s.e);
+                        test(Compare(ex1.c.seq1, c.seq1));
+                        test(Compare(ex1.c.seq2, c.seq2));
+                        test(Compare(ex1.c.seq3, c.seq3));
+                        test(Compare(ex1.c.seq4, c.seq4));
+                        test(Compare(ex1.c.seq5, c.seq5));
+                        test(Compare(ex1.c.seq6, c.seq6));
+                        test(Compare(ex1.c.seq7, c.seq7));
+                        test(Compare(ex1.c.seq8, c.seq8));
+                        test(Compare(ex1.c.seq9, c.seq9));
+                    }
+                    catch(Ice.UserException)
+                    {
+                        test(false);
+                    }
+                }
 
-        {
-            var dict = new Dictionary<byte, bool>();
-            dict.Add(4, true);
-            dict.Add(1, false);
-            outS = new Ice.OutputStream(communicator);
-            ByteBoolDHelper.write(outS, dict);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var dict2 = ByteBoolDHelper.read(inS);
-            test(Ice.CollectionComparer.Equals(dict2, dict));
-        }
+                {
+                    var dict = new Dictionary<byte, bool>();
+                    dict.Add(4, true);
+                    dict.Add(1, false);
+                    outS = new Ice.OutputStream(communicator);
+                    Test.ByteBoolDHelper.write(outS, dict);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var dict2 = Test.ByteBoolDHelper.read(inS);
+                    test(Ice.CollectionComparer.Equals(dict2, dict));
+                }
 
-        {
-            var dict = new Dictionary<short, int>();
-            dict.Add(1, 9);
-            dict.Add(4, 8);
-            outS = new Ice.OutputStream(communicator);
-            ShortIntDHelper.write(outS, dict);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var dict2 = ShortIntDHelper.read(inS);
-            test(Ice.CollectionComparer.Equals(dict2, dict));
-        }
+                {
+                    var dict = new Dictionary<short, int>();
+                    dict.Add(1, 9);
+                    dict.Add(4, 8);
+                    outS = new Ice.OutputStream(communicator);
+                    Test.ShortIntDHelper.write(outS, dict);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var dict2 = Test.ShortIntDHelper.read(inS);
+                    test(Ice.CollectionComparer.Equals(dict2, dict));
+                }
 
-        {
-            var dict = new Dictionary<long, float>();
-            dict.Add(123809828, 0.51f);
-            dict.Add(123809829, 0.56f);
-            outS = new Ice.OutputStream(communicator);
-            LongFloatDHelper.write(outS, dict);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var dict2 = LongFloatDHelper.read(inS);
-            test(Ice.CollectionComparer.Equals(dict2, dict));
-        }
+                {
+                    var dict = new Dictionary<long, float>();
+                    dict.Add(123809828, 0.51f);
+                    dict.Add(123809829, 0.56f);
+                    outS = new Ice.OutputStream(communicator);
+                    Test.LongFloatDHelper.write(outS, dict);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var dict2 = Test.LongFloatDHelper.read(inS);
+                    test(Ice.CollectionComparer.Equals(dict2, dict));
+                }
 
-        {
-            var dict = new Dictionary<string, string>();
-            dict.Add("key1", "value1");
-            dict.Add("key2", "value2");
-            outS = new Ice.OutputStream(communicator);
-            StringStringDHelper.write(outS, dict);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var dict2 = StringStringDHelper.read(inS);
-            test(Ice.CollectionComparer.Equals(dict2, dict));
-        }
+                {
+                    var dict = new Dictionary<string, string>();
+                    dict.Add("key1", "value1");
+                    dict.Add("key2", "value2");
+                    outS = new Ice.OutputStream(communicator);
+                    Test.StringStringDHelper.write(outS, dict);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var dict2 = Test.StringStringDHelper.read(inS);
+                    test(Ice.CollectionComparer.Equals(dict2, dict));
+                }
 
-        {
-            var dict = new Dictionary<string, MyClass>();
-            var c = new MyClass();
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum2;
-            dict.Add("key1", c);
-            c = new MyClass();
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum3;
-            dict.Add("key2", c);
-            outS = new Ice.OutputStream(communicator);
-            StringMyClassDHelper.write(outS, dict);
-            outS.writePendingValues();
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var dict2 = StringMyClassDHelper.read(inS);
-            inS.readPendingValues();
-            test(dict2.Count == dict.Count);
-            test(dict2["key1"].s.e == MyEnum.enum2);
-            test(dict2["key2"].s.e == MyEnum.enum3);
-        }
+                {
+                    var dict = new Dictionary<string, Test.MyClass>();
+                    var c = new Test.MyClass();
+                    c.s = new Test.SmallStruct();
+                    c.s.e = Test.MyEnum.enum2;
+                    dict.Add("key1", c);
+                    c = new Test.MyClass();
+                    c.s = new Test.SmallStruct();
+                    c.s.e = Test.MyEnum.enum3;
+                    dict.Add("key2", c);
+                    outS = new Ice.OutputStream(communicator);
+                    Test.StringMyClassDHelper.write(outS, dict);
+                    outS.writePendingValues();
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var dict2 = Test.StringMyClassDHelper.read(inS);
+                    inS.readPendingValues();
+                    test(dict2.Count == dict.Count);
+                    test(dict2["key1"].s.e == Test.MyEnum.enum2);
+                    test(dict2["key2"].s.e == Test.MyEnum.enum3);
+                }
 
-        {
-            bool[] arr = { true, false, true, false };
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<bool>(arr);
-            BoolListHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = BoolListHelper.read(inS);
-            test(Compare(l, l2));
-        }
+                {
+                    bool[] arr = { true, false, true, false };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<bool>(arr);
+                    Test.BoolListHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.BoolListHelper.read(inS);
+                    test(Compare(l, l2));
+                }
 
-        {
-            byte[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<byte>(arr);
-            ByteListHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = ByteListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    byte[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<byte>(arr);
+                    Test.ByteListHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.ByteListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            MyEnum[] arr = { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1, MyEnum.enum2 };
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<MyEnum>(arr);
-            MyEnumListHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = MyEnumListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    Test.MyEnum[] arr = { Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<Test.MyEnum>(arr);
+                    Test.MyEnumListHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.MyEnumListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<SmallStruct>(smallStructArray);
-            SmallStructListHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = SmallStructListHelper.read(inS);
-            test(l2.Count == l.Count);
-            for(int i = 0; i < l2.Count; ++i)
-            {
-                test(l2[i].Equals(smallStructArray[i]));
-            }
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<Test.SmallStruct>(smallStructArray);
+                    Test.SmallStructListHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.SmallStructListHelper.read(inS);
+                    test(l2.Count == l.Count);
+                    for(int i = 0; i < l2.Count; ++i)
+                    {
+                        test(l2[i].Equals(smallStructArray[i]));
+                    }
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<MyClass>(myClassArray);
-            MyClassListHelper.write(outS, l);
-            outS.writePendingValues();
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = MyClassListHelper.read(inS);
-            inS.readPendingValues();
-            test(l2.Count == l.Count);
-            for(int i = 0; i < l2.Count; ++i)
-            {
-                test(l2[i] != null);
-                test(l2[i].c == l2[i]);
-                test(l2[i].o == l2[i]);
-                test(l2[i].s.e == MyEnum.enum2);
-                test(Compare(l2[i].seq1, l[i].seq1));
-                test(Compare(l2[i].seq2, l[i].seq2));
-                test(Compare(l2[i].seq3, l[i].seq3));
-                test(Compare(l2[i].seq4, l[i].seq4));
-                test(Compare(l2[i].seq5, l[i].seq5));
-                test(Compare(l2[i].seq6, l[i].seq6));
-                test(Compare(l2[i].seq7, l[i].seq7));
-                test(Compare(l2[i].seq8, l[i].seq8));
-                test(Compare(l2[i].seq9, l[i].seq9));
-                test(l2[i].d["hi"].Equals(l2[i]));
-            }
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<Test.MyClass>(myClassArray);
+                    Test.MyClassListHelper.write(outS, l);
+                    outS.writePendingValues();
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.MyClassListHelper.read(inS);
+                    inS.readPendingValues();
+                    test(l2.Count == l.Count);
+                    for(int i = 0; i < l2.Count; ++i)
+                    {
+                        test(l2[i] != null);
+                        test(l2[i].c == l2[i]);
+                        test(l2[i].o == l2[i]);
+                        test(l2[i].s.e == Test.MyEnum.enum2);
+                        test(Compare(l2[i].seq1, l[i].seq1));
+                        test(Compare(l2[i].seq2, l[i].seq2));
+                        test(Compare(l2[i].seq3, l[i].seq3));
+                        test(Compare(l2[i].seq4, l[i].seq4));
+                        test(Compare(l2[i].seq5, l[i].seq5));
+                        test(Compare(l2[i].seq6, l[i].seq6));
+                        test(Compare(l2[i].seq7, l[i].seq7));
+                        test(Compare(l2[i].seq8, l[i].seq8));
+                        test(Compare(l2[i].seq9, l[i].seq9));
+                        test(l2[i].d["hi"].Equals(l2[i]));
+                    }
+                }
 
-        {
-            var arr = new Ice.ObjectPrx[2];
-            arr[0] = communicator.stringToProxy("zero");
-            arr[1] = communicator.stringToProxy("one");
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<Ice.ObjectPrx>(arr);
-            MyClassProxyListHelper.write(outS, l);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = MyClassProxyListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    var arr = new Ice.ObjectPrx[2];
+                    arr[0] = communicator.stringToProxy("zero");
+                    arr[1] = communicator.stringToProxy("one");
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<Ice.ObjectPrx>(arr);
+                    Test.MyClassProxyListHelper.write(outS, l);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.MyClassProxyListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            var arr = new MyInterfacePrx[2];
-            arr[0] = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("zero"));
-            arr[1] = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("one"));
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<MyInterfacePrx>(arr);
-            MyInterfaceProxyListHelper.write(outS, l);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = MyInterfaceProxyListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    var arr = new Test.MyInterfacePrx[2];
+                    arr[0] = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("zero"));
+                    arr[1] = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("one"));
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<Test.MyInterfacePrx>(arr);
+                    Test.MyInterfaceProxyListHelper.write(outS, l);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.MyInterfaceProxyListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            short[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            var l = new LinkedList<short>(arr);
-            ShortLinkedListHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = ShortLinkedListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    short[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new LinkedList<short>(arr);
+                    Test.ShortLinkedListHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.ShortLinkedListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            int[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            LinkedList<int> l = new LinkedList<int>(arr);
-            Test.IntLinkedListHelper.write(outS, l);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            LinkedList<int> l2 = Test.IntLinkedListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    int[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    LinkedList<int> l = new LinkedList<int>(arr);
+                    Test.IntLinkedListHelper.write(outS, l);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    LinkedList<int> l2 = Test.IntLinkedListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            MyEnum[] arr = { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1, MyEnum.enum2 };
-            outS = new Ice.OutputStream(communicator);
-            LinkedList<Test.MyEnum> l = new LinkedList<Test.MyEnum>(arr);
-            Test.MyEnumLinkedListHelper.write(outS, l);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            LinkedList<Test.MyEnum> l2 = Test.MyEnumLinkedListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    Test.MyEnum[] arr = { Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1, Test.MyEnum.enum2 };
+                    outS = new Ice.OutputStream(communicator);
+                    LinkedList<Test.MyEnum> l = new LinkedList<Test.MyEnum>(arr);
+                    Test.MyEnumLinkedListHelper.write(outS, l);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    LinkedList<Test.MyEnum> l2 = Test.MyEnumLinkedListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var l = new LinkedList<Test.SmallStruct>(smallStructArray);
-            SmallStructLinkedListHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = SmallStructLinkedListHelper.read(inS);
-            test(l2.Count == l.Count);
-            var e = l.GetEnumerator();
-            var e2 = l2.GetEnumerator();
-            while (e.MoveNext() && e2.MoveNext())
-            {
-                test(e.Current.Equals(e2.Current));
-            }
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new LinkedList<Test.SmallStruct>(smallStructArray);
+                    Test.SmallStructLinkedListHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.SmallStructLinkedListHelper.read(inS);
+                    test(l2.Count == l.Count);
+                    var e = l.GetEnumerator();
+                    var e2 = l2.GetEnumerator();
+                    while(e.MoveNext() && e2.MoveNext())
+                    {
+                        test(e.Current.Equals(e2.Current));
+                    }
+                }
 
-        {
-            long[] arr = { 0x01, 0x11, 0x12, 0x22 };
-            outS = new Ice.OutputStream(communicator);
-            var l = new Stack<long>(arr);
-            LongStackHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = LongStackHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    long[] arr = { 0x01, 0x11, 0x12, 0x22 };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Stack<long>(arr);
+                    Test.LongStackHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.LongStackHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            float[] arr = { 1, 2, 3, 4 };
-            outS = new Ice.OutputStream(communicator);
-            var l = new Stack<float>(arr);
-            FloatStackHelper.write(outS, l);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = FloatStackHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    float[] arr = { 1, 2, 3, 4 };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Stack<float>(arr);
+                    Test.FloatStackHelper.write(outS, l);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.FloatStackHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var l = new Stack<SmallStruct>(smallStructArray);
-            SmallStructStackHelper.write(outS, l);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = SmallStructStackHelper.read(inS);
-            test(l2.Count == l.Count);
-            var e = l.GetEnumerator();
-            var e2 = l2.GetEnumerator();
-            while (e.MoveNext() && e2.MoveNext())
-            {
-                test(e.Current.Equals(e2.Current));
-            }
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Stack<Test.SmallStruct>(smallStructArray);
+                    Test.SmallStructStackHelper.write(outS, l);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.SmallStructStackHelper.read(inS);
+                    test(l2.Count == l.Count);
+                    var e = l.GetEnumerator();
+                    var e2 = l2.GetEnumerator();
+                    while(e.MoveNext() && e2.MoveNext())
+                    {
+                        test(e.Current.Equals(e2.Current));
+                    }
+                }
 
-        {
-            var arr = new Ice.ObjectPrx[2];
-            arr[0] = communicator.stringToProxy("zero");
-            arr[1] = communicator.stringToProxy("one");
-            outS = new Ice.OutputStream(communicator);
-            var l = new Stack<Ice.ObjectPrx>(arr);
-            MyClassProxyStackHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = MyClassProxyStackHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    var arr = new Ice.ObjectPrx[2];
+                    arr[0] = communicator.stringToProxy("zero");
+                    arr[1] = communicator.stringToProxy("one");
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Stack<Ice.ObjectPrx>(arr);
+                    Test.MyClassProxyStackHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.MyClassProxyStackHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            var arr = new MyInterfacePrx[2];
-            arr[0] = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("zero"));
-            arr[1] = MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("one"));
-            outS = new Ice.OutputStream(communicator);
-            var l = new Stack<MyInterfacePrx>(arr);
-            MyInterfaceProxyStackHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = MyInterfaceProxyStackHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    var arr = new Test.MyInterfacePrx[2];
+                    arr[0] = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("zero"));
+                    arr[1] = Test.MyInterfacePrxHelper.uncheckedCast(communicator.stringToProxy("one"));
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Stack<Test.MyInterfacePrx>(arr);
+                    Test.MyInterfaceProxyStackHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.MyInterfaceProxyStackHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            double[] arr = { 1, 2, 3, 4 };
-            outS = new Ice.OutputStream(communicator);
-            var l = new Queue<double>(arr);
-            DoubleQueueHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = DoubleQueueHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    double[] arr = { 1, 2, 3, 4 };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Queue<double>(arr);
+                    Test.DoubleQueueHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.DoubleQueueHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            string[] arr = { "string1", "string2", "string3", "string4" };
-            outS = new Ice.OutputStream(communicator);
-            var l = new Queue<string>(arr);
-            StringQueueHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = StringQueueHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    string[] arr = { "string1", "string2", "string3", "string4" };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Queue<string>(arr);
+                    Test.StringQueueHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.StringQueueHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            outS = new Ice.OutputStream(communicator);
-            var l = new Queue<SmallStruct>(smallStructArray);
-            SmallStructQueueHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = SmallStructQueueHelper.read(inS);
-            test(l2.Count == l.Count);
-            var e = l.GetEnumerator();
-            var e2 = l2.GetEnumerator();
-            while (e.MoveNext() && e2.MoveNext())
-            {
-                test(e.Current.Equals(e2.Current));
-            }
-        }
+                {
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Queue<Test.SmallStruct>(smallStructArray);
+                    Test.SmallStructQueueHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.SmallStructQueueHelper.read(inS);
+                    test(l2.Count == l.Count);
+                    var e = l.GetEnumerator();
+                    var e2 = l2.GetEnumerator();
+                    while(e.MoveNext() && e2.MoveNext())
+                    {
+                        test(e.Current.Equals(e2.Current));
+                    }
+                }
 
-        {
-            string[] arr = { "string1", "string2", "string3", "string4" };
-            string[][] arrS = { arr, new string[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            var l = new List<string[]>(arrS);
-            StringSListHelper.write(outS, l);
-            byte[] data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = StringSListHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    string[] arr = { "string1", "string2", "string3", "string4" };
+                    string[][] arrS = { arr, new string[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new List<string[]>(arrS);
+                    Test.StringSListHelper.write(outS, l);
+                    byte[] data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.StringSListHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            string[] arr = { "string1", "string2", "string3", "string4" };
-            string[][] arrS = { arr, new string[0], arr };
-            outS = new Ice.OutputStream(communicator);
-            var l = new Stack<string[]>(arrS);
-            StringSStackHelper.write(outS, l);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var l2 = StringSStackHelper.read(inS);
-            test(Compare(l2, l));
-        }
+                {
+                    string[] arr = { "string1", "string2", "string3", "string4" };
+                    string[][] arrS = { arr, new string[0], arr };
+                    outS = new Ice.OutputStream(communicator);
+                    var l = new Stack<string[]>(arrS);
+                    Test.StringSStackHelper.write(outS, l);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var l2 = Test.StringSStackHelper.read(inS);
+                    test(Compare(l2, l));
+                }
 
-        {
-            var dict = new SortedDictionary<string, string>();
-            dict.Add("key1", "value1");
-            dict.Add("key2", "value2");
-            outS = new Ice.OutputStream(communicator);
-            SortedStringStringDHelper.write(outS, dict);
-            var data = outS.finished();
-            inS = new Ice.InputStream(communicator, data);
-            var dict2 = SortedStringStringDHelper.read(inS);
-            test(Ice.CollectionComparer.Equals(dict2, dict));
-        }
+                {
+                    var dict = new SortedDictionary<string, string>();
+                    dict.Add("key1", "value1");
+                    dict.Add("key2", "value2");
+                    outS = new Ice.OutputStream(communicator);
+                    Test.SortedStringStringDHelper.write(outS, dict);
+                    var data = outS.finished();
+                    inS = new Ice.InputStream(communicator, data);
+                    var dict2 = Test.SortedStringStringDHelper.read(inS);
+                    test(Ice.CollectionComparer.Equals(dict2, dict));
+                }
 
-        WriteLine("ok");
-        return 0;
+                output.WriteLine("ok");
+                return 0;
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/stream/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace stream
     {
-        return AllTests.allTests(this);
-    }
+        public class Client : global::Test.TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var initData = new InitializationData();
+                initData.typeIdNamespaces = new string[]{"Ice.stream.TypeId"};
+                initData.properties = createTestProperties(ref args);
+                using(var communicator = initialize(initData))
+                {
+                    AllTests.allTests(this);
+                }
+            }
 
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
+            public static int Main(string[] args)
+            {
+                return global::Test.TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,14 +43,14 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\serializable\net45\serializable.csproj">
@@ -58,15 +58,15 @@
       <Name>serializable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj"/>
+    <ProjectReference Include="../../serializable/netstandard2.0/serializable.csproj" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/serializable/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/serializable/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/serializable/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/serializable/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/serializable/net45/serializable.csproj zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/serializable/net45/serializable.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/serializable/net45/serializable.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/serializable/net45/serializable.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,17 +21,17 @@
     </NuGetPackageImportStamp>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\Serializable.cs">
@@ -39,17 +39,17 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/serializable/netstandard2.0/serializable.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
   <Import Project="../../../../../../msbuild/ice.common.props"/>
   <PropertyGroup>
     <AssemblyName>serializable</AssemblyName>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
@@ -17,7 +17,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.stream</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Serializable.cs" />
+
+    <Compile Include="generated/Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+
+    <SliceCompile Include="../../../Test.ice" />
+
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/Serializable.cs zeroc-ice-3.7.2/csharp/test/Ice/stream/Serializable.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/Serializable.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/Serializable.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-[assembly: CLSCompliant(true)]
-
-namespace Serialize
+namespace Ice
 {
+    namespace stream
+    {
+        namespace Serialize
+        {
 
-[Serializable]
-public class Small // Fewer than 254 bytes with a BinaryFormatter.
-{
-    public int i;
-}
+            [Serializable]
+            public class Small // Fewer than 254 bytes with a BinaryFormatter.
+            {
+                public int i;
+            }
 
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/stream/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/stream/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/stream/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/stream/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 //
 // Suppress invalid metadata warnings
 //
-[["suppress-warning:invalid-metadata, deprecated"]]
+[["cs:typeid-namespace:Ice.stream.TypeId", "suppress-warning:invalid-metadata, deprecated"]]
 
 #include <Ice/BuiltinSequences.ice>
 
+["cs:namespace:Ice.stream"]
 module Test
 {
 
@@ -147,7 +143,7 @@
 ["clr:generic:SortedDictionary"]
 dictionary<string, string> SortedStringStringD;
 
-["clr:serializable:Serialize.Small"] sequence<byte> SerialSmall;
+["clr:serializable:Ice.stream.Serialize.Small"] sequence<byte> SerialSmall;
 
 class MyClass
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace threadPoolPriority
     {
-        Console.Out.Write("testing server priority... ");
-        Console.Out.Flush();
-        Ice.ObjectPrx obj = communicator().stringToProxy("test:" + getTestEndpoint(0) + " -t 10000");
-        Test.PriorityPrx priority = Test.PriorityPrxHelper.checkedCast(obj);
-
-        try
+        public class Client : global::Test.TestHelper
         {
-            test("AboveNormal".Equals(priority.getPriority()));
+            public override void run(string[] args)
+            {
+                using(var communicator = initialize(ref args))
+                {
+                    var output = getWriter();
+                    output.Write("testing server priority... ");
+                    output.Flush();
+                    var obj = communicator.stringToProxy("test:" + getTestEndpoint(0) + " -t 10000");
+                    Test.PriorityPrx priority = Test.PriorityPrxHelper.checkedCast(obj);
+                    test("AboveNormal".Equals(priority.getPriority()));
+                    output.WriteLine("ok");
+                    priority.shutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return global::Test.TestDriver.runTest<Client>(args);
+            }
         }
-        catch(Exception ex)
-        {
-            Console.Error.WriteLine(ex.ToString());
-            test(false);
-        }
-        Console.Out.WriteLine("ok");
-
-        priority.shutdown();
-        return 0;
-    }
-
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,48 +17,47 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\PriorityI.cs">
       <Link>PriorityI.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../PriorityI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../PriorityI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.threadPoolPriority</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../PriorityI.cs" />
+      <Compile Include="../../../Server.cs" />
+    <Compile Include="generated/Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+
+    <SliceCompile Include="../../../Test.ice" />
+
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/PriorityI.cs zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/PriorityI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/PriorityI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/PriorityI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Threading;
-using System;
 
-public class PriorityI : Test.PriorityDisp_
+namespace Ice
 {
-
-    public override void shutdown(Ice.Current current)
+    namespace threadPoolPriority
     {
-        current.adapter.getCommunicator().shutdown();
-    }
+        public class PriorityI : Test.PriorityDisp_
+        {
 
-    public override string getPriority(Ice.Current current)
-    {
-        return Thread.CurrentThread.Priority.ToString();
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
+
+            public override string getPriority(Ice.Current current)
+            {
+                return Thread.CurrentThread.Priority.ToString();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "AboveNormal");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace threadPoolPriority
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : global::Test.TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "AboveNormal");
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test"));
+                    adapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return global::Test.TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/threadPoolPriority/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/threadPoolPriority/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.threadPoolPriority"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/timeout/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,499 +1,499 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 using System.Threading;
 
-public class AllTests : TestCommon.AllTests
+namespace Ice
 {
-    private class Callback
+    namespace timeout
     {
-        internal Callback()
+        public class AllTests : global::Test.AllTests
         {
-            _called = false;
-        }
-
-        public virtual void check()
-        {
-            lock(this)
+            private class Callback
             {
-                while(!_called)
+                internal Callback()
                 {
-                    Monitor.Wait(this);
+                    _called = false;
                 }
 
-                _called = false;
-            }
-        }
+                public virtual void check()
+                {
+                    lock(this)
+                    {
+                        while(!_called)
+                        {
+                            Monitor.Wait(this);
+                        }
 
-        public virtual void called()
-        {
-            lock(this)
-            {
-                Debug.Assert(!_called);
-                _called = true;
-                Monitor.Pulse(this);
-            }
-        }
+                        _called = false;
+                    }
+                }
 
-        private bool _called;
-    }
+                public virtual void called()
+                {
+                    lock(this)
+                    {
+                        Debug.Assert(!_called);
+                        _called = true;
+                        Monitor.Pulse(this);
+                    }
+                }
 
-    private static Ice.Connection connect(Ice.ObjectPrx prx)
-    {
-        int nRetry = 10;
-        while(--nRetry > 0)
-        {
-            try
-            {
-                prx.ice_getConnection();
-                break;
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-                // Can sporadically occur with slow machines
+                private bool _called;
             }
-        }
-        return prx.ice_getConnection();
-    }
-
-    public static void allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        string sref = "timeout:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx obj = communicator.stringToProxy(sref);
-        test(obj != null);
-
-        Test.TimeoutPrx timeout = Test.TimeoutPrxHelper.checkedCast(obj);
-        test(timeout != null);
-
-        Test.ControllerPrx controller = Test.ControllerPrxHelper.checkedCast(
-            communicator.stringToProxy("controller:" + app.getTestEndpoint(1)));
-        test(controller != null);
 
-        Write("testing connect timeout... ");
-        Flush();
-        {
-            //
-            // Expect ConnectTimeoutException.
-            //
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(100));
-            controller.holdAdapter(-1);
-            try
-            {
-                to.op();
-                test(false);
-            }
-            catch(Ice.ConnectTimeoutException)
+            private static Ice.Connection connect(Ice.ObjectPrx prx)
             {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-        }
-        {
-            //
-            // Expect success.
-            //
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(2000));
-            controller.holdAdapter(100);
-            try
-            {
-                to.op();
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-                test(false);
+                int nRetry = 10;
+                while(--nRetry > 0)
+                {
+                    try
+                    {
+                        prx.ice_getConnection();
+                        break;
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                        // Can sporadically occur with slow machines
+                    }
+                }
+                return prx.ice_getConnection();
             }
-        }
-        WriteLine("ok");
 
-        // The sequence needs to be large enough to fill the write/recv buffers
-        byte[] seq = new byte[2000000];
-
-        Write("testing connection timeout... ");
-        Flush();
-        {
-            //
-            // Expect TimeoutException.
-            //
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(250));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
+            public static void allTests(global::Test.TestHelper helper)
             {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-        }
-        {
-            //
-            // Expect success.
-            //
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(2000));
-            controller.holdAdapter(100);
-            try
-            {
-                to.sendData(new byte[1000000]);
-            }
-            catch(Ice.TimeoutException)
-            {
-                test(false);
-            }
-        }
-        WriteLine("ok");
+                var communicator = helper.communicator();
+                string sref = "timeout:" + helper.getTestEndpoint(0);
+                var obj = communicator.stringToProxy(sref);
+                test(obj != null);
+
+                Test.TimeoutPrx timeout = Test.TimeoutPrxHelper.checkedCast(obj);
+                test(timeout != null);
+
+                Test.ControllerPrx controller =
+                    Test.ControllerPrxHelper.checkedCast(communicator.stringToProxy("controller:" + helper.getTestEndpoint(1)));
+                test(controller != null);
+
+                var output = helper.getWriter();
+                output.Write("testing connect timeout... ");
+                output.Flush();
+                {
+                    //
+                    // Expect ConnectTimeoutException.
+                    //
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(100));
+                    controller.holdAdapter(-1);
+                    try
+                    {
+                        to.op();
+                        test(false);
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                        // Expected.
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
+                }
+                {
+                    //
+                    // Expect success.
+                    //
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(-1));
+                    controller.holdAdapter(100);
+                    try
+                    {
+                        to.op();
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                        test(false);
+                    }
+                }
+                output.WriteLine("ok");
 
-        Write("testing invocation timeout... ");
-        Flush();
-        {
-            Ice.Connection connection = obj.ice_getConnection();
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(100));
-            test(connection == to.ice_getConnection());
-            try
-            {
-                to.sleep(500);
-                test(false);
-            }
-            catch(Ice.InvocationTimeoutException)
-            {
-            }
-            obj.ice_ping();
-            to = Test.TimeoutPrxHelper.checkedCast(obj.ice_invocationTimeout(1000));
-            test(connection == to.ice_getConnection());
-            try
-            {
-                to.sleep(100);
-            }
-            catch(Ice.InvocationTimeoutException)
-            {
-                test(false);
-            }
-            test(connection == to.ice_getConnection());
-        }
-        {
-            //
-            // Expect InvocationTimeoutException.
-            //
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(100));
-            Callback cb = new Callback();
-            to.begin_sleep(500).whenCompleted(
-                () =>
-                {
-                    test(false);
-                },
-                (Ice.Exception ex) =>
-                {
-                    test(ex is Ice.InvocationTimeoutException);
-                    cb.called();
-                });
-            cb.check();
-            obj.ice_ping();
-        }
-        {
-            //
-            // Expect success.
-            //
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(1000));
-            Callback cb = new Callback();
-            to.begin_sleep(100).whenCompleted(
-                () =>
-                {
-                    cb.called();
-
-                },
-                (Ice.Exception ex) =>
-                {
-                    test(false);
-                });
-            cb.check();
-        }
-        {
-            //
-            // Backward compatible connection timeouts
-            //
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(-2).ice_timeout(250));
-            Ice.Connection con = connect(to);
-            try
-            {
-                to.sleep(750);
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-                try
+                // The sequence needs to be large enough to fill the write/recv buffers
+                byte[] seq = new byte[2000000];
+
+                output.Write("testing connection timeout... ");
+                output.Flush();
                 {
-                    con.getInfo();
-                    test(false);
+                    //
+                    // Expect TimeoutException.
+                    //
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(250));
+                    connect(to);
+                    controller.holdAdapter(-1);
+                    try
+                    {
+                        to.sendData(seq);
+                        test(false);
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        // Expected.
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
                 }
-                catch(Ice.TimeoutException)
                 {
-                    // Connection got closed as well.
+                    //
+                    // Expect success.
+                    //
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(2000));
+                    controller.holdAdapter(100);
+                    try
+                    {
+                        to.sendData(new byte[1000000]);
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        test(false);
+                    }
                 }
-            }
-            obj.ice_ping();
+                output.WriteLine("ok");
 
-            try
-            {
-                con = connect(to);
-                to.end_sleep(to.begin_sleep(750));
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-                try
+                output.Write("testing invocation timeout... ");
+                output.Flush();
                 {
-                    con.getInfo();
-                    test(false);
+                    var connection = obj.ice_getConnection();
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(100));
+                    test(connection == to.ice_getConnection());
+                    try
+                    {
+                        to.sleep(500);
+                        test(false);
+                    }
+                    catch(Ice.InvocationTimeoutException)
+                    {
+                    }
+                    obj.ice_ping();
+                    to = Test.TimeoutPrxHelper.checkedCast(obj.ice_invocationTimeout(1000));
+                    test(connection == to.ice_getConnection());
+                    try
+                    {
+                        to.sleep(100);
+                    }
+                    catch(Ice.InvocationTimeoutException)
+                    {
+                        test(false);
+                    }
+                    test(connection == to.ice_getConnection());
                 }
-                catch(Ice.TimeoutException)
                 {
-                    // Connection got closed as well.
+                    //
+                    // Expect InvocationTimeoutException.
+                    //
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(100));
+                    Callback cb = new Callback();
+                    to.begin_sleep(500).whenCompleted(
+                       () =>
+                        {
+                            test(false);
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            test(ex is Ice.InvocationTimeoutException);
+                            cb.called();
+                        });
+                    cb.check();
+                    obj.ice_ping();
                 }
-            }
-            obj.ice_ping();
-        }
-        WriteLine("ok");
-
-        Write("testing close timeout... ");
-        Flush();
-        {
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(250));
-            Ice.Connection connection = connect(to);
-            controller.holdAdapter(-1);
-            connection.close(Ice.ConnectionClose.GracefullyWithWait);
-            try
-            {
-                connection.getInfo(); // getInfo() doesn't throw in the closing state.
-            }
-            catch(Ice.LocalException)
-            {
-                test(false);
-            }
-            while(true)
-            {
-                try
                 {
-                    connection.getInfo();
-                    Thread.Sleep(10);
+                    //
+                    // Expect success.
+                    //
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(1000));
+                    Callback cb = new Callback();
+                    to.begin_sleep(100).whenCompleted(
+                       () =>
+                        {
+                            cb.called();
+
+                        },
+                       (Ice.Exception ex) =>
+                        {
+                            test(false);
+                        });
+                    cb.check();
                 }
-                catch(Ice.ConnectionManuallyClosedException ex)
                 {
-                    // Expected.
-                    test(ex.graceful);
-                    break;
+                    //
+                    // Backward compatible connection timeouts
+                    //
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(-2).ice_timeout(250));
+                    var con = connect(to);
+                    try
+                    {
+                        to.sleep(750);
+                        test(false);
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        try
+                        {
+                            con.getInfo();
+                            test(false);
+                        }
+                        catch(Ice.TimeoutException)
+                        {
+                            // Connection got closed as well.
+                        }
+                    }
+                    obj.ice_ping();
+
+                    try
+                    {
+                        con = connect(to);
+                        to.end_sleep(to.begin_sleep(750));
+                        test(false);
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        try
+                        {
+                            con.getInfo();
+                            test(false);
+                        }
+                        catch(Ice.TimeoutException)
+                        {
+                            // Connection got closed as well.
+                        }
+                    }
+                    obj.ice_ping();
                 }
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-        }
-        WriteLine("ok");
-
-        Write("testing timeout overrides... ");
-        Flush();
-        {
-            //
-            // Test Ice.Override.Timeout. This property overrides all
-            // endpoint timeouts.
-            //
-            string[] args = new string[0];
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().ice_clone_();
-            initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
-            initData.properties.setProperty("Ice.Override.Timeout", "100");
-            Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-
-            //
-            // Calling ice_timeout() should have no effect.
-            //
-            to = Test.TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-            comm.destroy();
-        }
-        {
-            //
-            // Test Ice.Override.ConnectTimeout.
-            //
-            string[] args = new string[0];
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().ice_clone_();
-            initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
-            Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
-            controller.holdAdapter(-1);
-            Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
-            try
-            {
-                to.op();
-                test(false);
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+                output.WriteLine("ok");
 
-            //
-            // Calling ice_timeout() should have no effect on the connect timeout.
-            //
-            controller.holdAdapter(-1);
-            to = Test.TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000));
-            try
-            {
-                to.op();
-                test(false);
-            }
-            catch(Ice.ConnectTimeoutException)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-
-            //
-            // Verify that timeout set via ice_timeout() is still used for requests.
-            //
-            to = Test.TimeoutPrxHelper.uncheckedCast(to.ice_timeout(250));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(Ice.TimeoutException)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-            comm.destroy();
-        }
-        {
-            //
-            // Test Ice.Override.CloseTimeout.
-            //
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().ice_clone_();
-            initData.properties.setProperty("Ice.Override.CloseTimeout", "100");
-            Ice.Communicator comm = Ice.Util.initialize(initData);
-            comm.stringToProxy(sref).ice_getConnection();
-            controller.holdAdapter(-1);
-            long begin = System.DateTime.Now.Ticks;
-            comm.destroy();
-            test(((long)new System.TimeSpan(System.DateTime.Now.Ticks - begin).TotalMilliseconds - begin) < 700);
-            controller.resumeAdapter();
-        }
-        WriteLine("ok");
-
-        Write("testing invocation timeouts with collocated calls... ");
-        Flush();
-        {
-            communicator.getProperties().setProperty("TimeoutCollocated.AdapterId", "timeoutAdapter");
-
-            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TimeoutCollocated");
-            adapter.activate();
-
-            Test.TimeoutPrx proxy = Test.TimeoutPrxHelper.uncheckedCast(adapter.addWithUUID(new TimeoutI()));
-            proxy = (Test.TimeoutPrx)proxy.ice_invocationTimeout(100);
-            try
-            {
-                proxy.sleep(500);
-                test(false);
-            }
-            catch(Ice.InvocationTimeoutException)
-            {
-            }
-
-            try
-            {
-                proxy.end_sleep(proxy.begin_sleep(500));
-                test(false);
-            }
-            catch(Ice.InvocationTimeoutException)
-            {
-            }
+                output.Write("testing close timeout... ");
+                output.Flush();
+                {
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(250));
+                    var connection = connect(to);
+                    controller.holdAdapter(-1);
+                    connection.close(Ice.ConnectionClose.GracefullyWithWait);
+                    try
+                    {
+                        connection.getInfo(); // getInfo() doesn't throw in the closing state.
+                    }
+                    catch(Ice.LocalException)
+                    {
+                        test(false);
+                    }
+                    while(true)
+                    {
+                        try
+                        {
+                            connection.getInfo();
+                            Thread.Sleep(10);
+                        }
+                        catch(Ice.ConnectionManuallyClosedException ex)
+                        {
+                            // Expected.
+                            test(ex.graceful);
+                            break;
+                        }
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
+                }
+                output.WriteLine("ok");
 
-            try
-            {
-                ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-2)).ice_ping();
-                ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-2)).begin_ice_ping().waitForCompleted();
-            }
-            catch(Ice.Exception)
-            {
-                test(false);
-            }
+                output.Write("testing timeout overrides... ");
+                output.Flush();
+                {
+                    //
+                    // Test Ice.Override.Timeout. This property overrides all
+                    // endpoint timeouts.
+                    //
+                    var initData = new Ice.InitializationData();
+                    initData.properties = communicator.getProperties().ice_clone_();
+                    initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+                    initData.properties.setProperty("Ice.Override.Timeout", "100");
+                    var comm = helper.initialize(initData);
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
+                    connect(to);
+                    controller.holdAdapter(-1);
+                    try
+                    {
+                        to.sendData(seq);
+                        test(false);
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        // Expected.
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
+
+                    //
+                    // Calling ice_timeout() should have no effect.
+                    //
+                    to = Test.TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000));
+                    connect(to);
+                    controller.holdAdapter(-1);
+                    try
+                    {
+                        to.sendData(seq);
+                        test(false);
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        // Expected.
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
+                    comm.destroy();
+                }
+                {
+                    //
+                    // Test Ice.Override.ConnectTimeout.
+                    //
+                    var initData = new Ice.InitializationData();
+                    initData.properties = communicator.getProperties().ice_clone_();
+                    initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+                    var comm = helper.initialize(initData);
+                    controller.holdAdapter(-1);
+                    Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
+                    try
+                    {
+                        to.op();
+                        test(false);
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                        // Expected.
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
+
+                    //
+                    // Calling ice_timeout() should have no effect on the connect timeout.
+                    //
+                    controller.holdAdapter(-1);
+                    to = Test.TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000));
+                    try
+                    {
+                        to.op();
+                        test(false);
+                    }
+                    catch(Ice.ConnectTimeoutException)
+                    {
+                        // Expected.
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
+
+                    //
+                    // Verify that timeout set via ice_timeout() is still used for requests.
+                    //
+                    to = Test.TimeoutPrxHelper.uncheckedCast(to.ice_timeout(250));
+                    connect(to);
+                    controller.holdAdapter(-1);
+                    try
+                    {
+                        to.sendData(seq);
+                        test(false);
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        // Expected.
+                    }
+                    controller.resumeAdapter();
+                    timeout.op(); // Ensure adapter is active.
+                    comm.destroy();
+                }
+                {
+                    //
+                    // Test Ice.Override.CloseTimeout.
+                    //
+                    var initData = new Ice.InitializationData();
+                    initData.properties = communicator.getProperties().ice_clone_();
+                    initData.properties.setProperty("Ice.Override.CloseTimeout", "100");
+                    var comm = helper.initialize(initData);
+                    comm.stringToProxy(sref).ice_getConnection();
+                    controller.holdAdapter(-1);
+                    long begin = System.DateTime.Now.Ticks;
+                    comm.destroy();
+                    test(((long)new System.TimeSpan(System.DateTime.Now.Ticks - begin).TotalMilliseconds - begin) < 1000);
+                    controller.resumeAdapter();
+                }
+                output.WriteLine("ok");
 
-            Test.TimeoutPrx batchTimeout = (Test.TimeoutPrx)proxy.ice_batchOneway();
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
+                output.Write("testing invocation timeouts with collocated calls... ");
+                output.Flush();
+                {
+                    communicator.getProperties().setProperty("TimeoutCollocated.AdapterId", "timeoutAdapter");
 
-            ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
-            try
-            {
-                batchTimeout.ice_flushBatchRequests();
-                test(false);
-            }
-            catch(Ice.InvocationTimeoutException)
-            {
-            }
+                    var adapter = communicator.createObjectAdapter("TimeoutCollocated");
+                    adapter.activate();
+
+                    Test.TimeoutPrx proxy = Test.TimeoutPrxHelper.uncheckedCast(adapter.addWithUUID(new TimeoutI()));
+                    proxy =(Test.TimeoutPrx)proxy.ice_invocationTimeout(100);
+                    try
+                    {
+                        proxy.sleep(500);
+                        test(false);
+                    }
+                    catch(Ice.InvocationTimeoutException)
+                    {
+                    }
+
+                    try
+                    {
+                        proxy.end_sleep(proxy.begin_sleep(500));
+                        test(false);
+                    }
+                    catch(Ice.InvocationTimeoutException)
+                    {
+                    }
+
+                    try
+                    {
+                       ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-2)).ice_ping();
+                       ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-2)).begin_ice_ping().waitForCompleted();
+                    }
+                    catch(Ice.Exception)
+                    {
+                        test(false);
+                    }
+
+                    Test.TimeoutPrx batchTimeout =(Test.TimeoutPrx)proxy.ice_batchOneway();
+                    batchTimeout.ice_ping();
+                    batchTimeout.ice_ping();
+                    batchTimeout.ice_ping();
+
+                   ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
+                    try
+                    {
+                        batchTimeout.ice_flushBatchRequests();
+                        test(false);
+                    }
+                    catch(Ice.InvocationTimeoutException)
+                    {
+                    }
+
+                    batchTimeout.ice_ping();
+                    batchTimeout.ice_ping();
+                    batchTimeout.ice_ping();
+
+                   ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
+                    try
+                    {
+                        batchTimeout.end_ice_flushBatchRequests(batchTimeout.begin_ice_flushBatchRequests());
+                        test(false);
+                    }
+                    catch(Ice.InvocationTimeoutException)
+                    {
+                    }
 
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
+                    adapter.destroy();
+                }
+                output.WriteLine("ok");
 
-            ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
-            try
-            {
-                batchTimeout.end_ice_flushBatchRequests(batchTimeout.begin_ice_flushBatchRequests());
-                test(false);
+                controller.shutdown();
             }
-            catch(Ice.InvocationTimeoutException)
-            {
-            }
-
-            adapter.destroy();
         }
-        WriteLine("ok");
-
-        controller.shutdown();
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/timeout/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,54 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-
-        //
-        // For this test, we want to disable retries.
-        //
-        initData.properties.setProperty("Ice.RetryIntervals", "-1");
-
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace timeout
     {
-        Client app = new Client();
-        return app.runmain(args);
+        public class Client : global::Test.TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+
+                //
+                // For this test, we want to disable retries.
+                //
+                properties.setProperty("Ice.RetryIntervals", "-1");
+
+                //
+                // This test kills connections, so we don't want warnings.
+                //
+                properties.setProperty("Ice.Warn.Connections", "0");
+
+                //
+                // Limit the send buffer size, this test relies on the socket
+                // send() blocking after sending a given amount of data.
+                //
+                properties.setProperty("Ice.TCP.SndSize", "50000");
+                using(var communicator = initialize(properties))
+                {
+                    AllTests.allTests(this);
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return global::Test.TestDriver.runTest<Client>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -46,24 +46,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.timeout</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../TestI.cs" />
+
+    <Compile Include="generated/Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+
+    <SliceCompile Include="../../../Test.ice" />
+
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/timeout/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,54 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout"));
-        adapter.activate();
-
-        Ice.ObjectAdapter controllerAdapter = communicator().createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-        //
-        // The client sends large messages to cause the transport
-        // buffers to fill up.
-        //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
-
-        //
-        // Limit the recv buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        return initData;
-    }
-
-    public static int Main(string[] args)
+    namespace timeout
     {
-        Server app = new Server();
-        return app.runmain(args);
+        public class Server : global::Test.TestHelper
+        {
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                //
+                // This test kills connections, so we don't want warnings.
+                //
+                properties.setProperty("Ice.Warn.Connections", "0");
+
+                //
+                // The client sends large messages to cause the transport
+                // buffers to fill up.
+                //
+                properties.setProperty("Ice.MessageSizeMax", "20000");
+
+                //
+                // Limit the recv buffer size, this test relies on the socket
+                // send() blocking after sending a given amount of data.
+                //
+                properties.setProperty("Ice.TCP.RcvSize", "50000");
+                using(var communicator = initialize(properties))
+                {
+                    communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                    communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+                    communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+                    var adapter = communicator.createObjectAdapter("TestAdapter");
+                    adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout"));
+                    adapter.activate();
+
+                    var controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+                    controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+                    controllerAdapter.activate();
+                    serverReady();
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return global::Test.TestDriver.runTest<Server>(args);
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
+["cs:namespace:Ice.timeout"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/timeout/TestI.cs zeroc-ice-3.7.2/csharp/test/Ice/timeout/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/timeout/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/timeout/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,76 +1,77 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Threading;
 
-internal class ActivateAdapterThread
-{
-    internal ActivateAdapterThread(Ice.ObjectAdapter adapter, int timeout)
-    {
-        _adapter = adapter;
-        _timeout = timeout;
-    }
-
-    internal void run()
-    {
-        _adapter.waitForHold();
-        Thread.Sleep(_timeout);
-        _adapter.activate();
-    }
-
-    private Ice.ObjectAdapter _adapter;
-    private int _timeout;
-}
-
-internal class TimeoutI : Test.TimeoutDisp_
+namespace Ice
 {
-    public override void op(Ice.Current current)
-    {
-    }
-
-    public override void sendData(byte[] seq, Ice.Current current)
-    {
-    }
-
-    public override void sleep(int to, Ice.Current current)
+    namespace timeout
     {
-        Thread.Sleep(to);
-    }
-}
+        internal class ActivateAdapterThread
+        {
+            internal ActivateAdapterThread(Ice.ObjectAdapter adapter, int timeout)
+            {
+                _adapter = adapter;
+                _timeout = timeout;
+            }
+
+            internal void run()
+            {
+                _adapter.waitForHold();
+                Thread.Sleep(_timeout);
+                _adapter.activate();
+            }
 
-internal class ControllerI : Test.ControllerDisp_
-{
-    public ControllerI(Ice.ObjectAdapter adapter)
-    {
-        _adapter = adapter;
-    }
+            private Ice.ObjectAdapter _adapter;
+            private int _timeout;
+        }
 
-    public override void holdAdapter(int to, Ice.Current current)
-    {
-        _adapter.hold();
-        if(to >= 0)
+        internal class TimeoutI : Test.TimeoutDisp_
         {
-            ActivateAdapterThread act = new ActivateAdapterThread(_adapter, to);
-            Thread thread = new Thread(new ThreadStart(act.run));
-            thread.Start();
+            public override void op(Ice.Current current)
+            {
+            }
+
+            public override void sendData(byte[] seq, Ice.Current current)
+            {
+            }
+
+            public override void sleep(int to, Ice.Current current)
+            {
+                Thread.Sleep(to);
+            }
         }
-    }
 
-    public override void resumeAdapter(Ice.Current current)
-    {
-        _adapter.activate();
-    }
+        internal class ControllerI : Test.ControllerDisp_
+        {
+            public ControllerI(Ice.ObjectAdapter adapter)
+            {
+                _adapter = adapter;
+            }
+
+            public override void holdAdapter(int to, Ice.Current current)
+            {
+                _adapter.hold();
+                if(to >= 0)
+                {
+                    ActivateAdapterThread act = new ActivateAdapterThread(_adapter, to);
+                    Thread thread = new Thread(new ThreadStart(act.run));
+                    thread.Start();
+                }
+            }
+
+            public override void resumeAdapter(Ice.Current current)
+            {
+                _adapter.activate();
+            }
+
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
 
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
+            private Ice.ObjectAdapter _adapter;
+        }
     }
-
-    private Ice.ObjectAdapter _adapter;
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/AllTests.cs zeroc-ice-3.7.2/csharp/test/Ice/udp/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,246 +1,249 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using Test;
 using System;
 using System.Text;
-using System.Threading;
 
-public class AllTests
+namespace Ice
 {
-    private static void test(bool b)
+    namespace udp
     {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    public class PingReplyI : Test.PingReplyDisp_
-    {
-        public override void reply(Ice.Current current)
-        {
-            lock(this)
-            {
-                ++_replies;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
-
-        public void reset()
-        {
-            lock(this)
-            {
-                 _replies = 0;
-            }
-        }
-
-        public bool waitReply(int expectedReplies, long timeout)
+        public class AllTests : global::Test.AllTests
         {
-            lock(this)
+            public class PingReplyI : Test.PingReplyDisp_
             {
-                long end = IceInternal.Time.currentMonotonicTimeMillis() + timeout;
-                while(_replies < expectedReplies)
+                public override void reply(Ice.Current current)
                 {
-                    int delay = (int)(end - IceInternal.Time.currentMonotonicTimeMillis());
-                    if(delay > 0)
+                    lock(this)
                     {
-                        System.Threading.Monitor.Wait(this, delay);
+                        ++_replies;
+                        System.Threading.Monitor.Pulse(this);
                     }
-                    else
+                }
+
+                public void reset()
+                {
+                    lock(this)
                     {
-                        break;
+                        _replies = 0;
                     }
                 }
-                return _replies == expectedReplies;
-            }
-        }
 
-        private int _replies = 0;
-    }
+                public bool waitReply(int expectedReplies, long timeout)
+                {
+                    lock(this)
+                    {
+                        long end = IceInternal.Time.currentMonotonicTimeMillis() + timeout;
+                        while(_replies < expectedReplies)
+                        {
+                            int delay =(int)(end - IceInternal.Time.currentMonotonicTimeMillis());
+                            if(delay > 0)
+                            {
+                                System.Threading.Monitor.Wait(this, delay);
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        return _replies == expectedReplies;
+                    }
+                }
 
-    public static void allTests(TestCommon.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        communicator.getProperties().setProperty("ReplyAdapter.Endpoints", "udp");
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ReplyAdapter");
-        PingReplyI replyI = new PingReplyI();
-        Test.PingReplyPrx reply =
-            (Test.PingReplyPrx)Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
-        adapter.activate();
-
-        Console.Out.Write("testing udp... ");
-        Console.Out.Flush();
-        Ice.ObjectPrx @base = communicator.stringToProxy("test:" + app.getTestEndpoint(0, "udp")).ice_datagram();
-        Test.TestIntfPrx obj = Test.TestIntfPrxHelper.uncheckedCast(@base);
-
-        int nRetry = 5;
-        bool ret = false;
-        while(nRetry-- > 0)
-        {
-            replyI.reset();
-            obj.ping(reply);
-            obj.ping(reply);
-            obj.ping(reply);
-            ret = replyI.waitReply(3, 2000);
-            if(ret)
-            {
-                break; // Success
+                private int _replies = 0;
             }
 
-            // If the 3 datagrams were not received within the 2 seconds, we try again to
-            // receive 3 new datagrams using a new object. We give up after 5 retries.
-            replyI = new PingReplyI();
-            reply =(Test.PingReplyPrx)Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
-        }
-        test(ret == true);
-
-        if(communicator.getProperties().getPropertyAsInt("Ice.Override.Compress") == 0)
-        {
-            //
-            // Only run this test if compression is disabled, the test expect fixed message size
-            // to be sent over the wire.
-            //
-            byte[] seq = null;
-            try
+            public static void allTests(global::Test.TestHelper helper)
             {
-                seq = new byte[1024];
-                while(true)
+                Ice.Communicator communicator = helper.communicator();
+                communicator.getProperties().setProperty("ReplyAdapter.Endpoints", "udp");
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ReplyAdapter");
+                PingReplyI replyI = new PingReplyI();
+                Test.PingReplyPrx reply =
+                  (Test.PingReplyPrx)Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
+                adapter.activate();
+
+                Console.Out.Write("testing udp... ");
+                Console.Out.Flush();
+                Ice.ObjectPrx @base = communicator.stringToProxy("test:" + helper.getTestEndpoint(0, "udp")).ice_datagram();
+                Test.TestIntfPrx obj = Test.TestIntfPrxHelper.uncheckedCast(@base);
+
+                int nRetry = 5;
+                bool ret = false;
+                while(nRetry-- > 0)
                 {
-                    seq = new byte[seq.Length * 2 + 10];
                     replyI.reset();
-                    obj.sendByteSeq(seq, reply);
-                    replyI.waitReply(1, 10000);
+                    obj.ping(reply);
+                    obj.ping(reply);
+                    obj.ping(reply);
+                    ret = replyI.waitReply(3, 2000);
+                    if(ret)
+                    {
+                        break; // Success
+                    }
+
+                    // If the 3 datagrams were not received within the 2 seconds, we try again to
+                    // receive 3 new datagrams using a new object. We give up after 5 retries.
+                    replyI = new PingReplyI();
+                    reply =(Test.PingReplyPrx)Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
+                }
+                test(ret == true);
+
+                if(communicator.getProperties().getPropertyAsInt("Ice.Override.Compress") == 0)
+                {
+                    //
+                    // Only run this test if compression is disabled, the test expect fixed message size
+                    // to be sent over the wire.
+                    //
+                    byte[] seq = null;
+                    try
+                    {
+                        seq = new byte[1024];
+                        while(true)
+                        {
+                            seq = new byte[seq.Length * 2 + 10];
+                            replyI.reset();
+                            obj.sendByteSeq(seq, reply);
+                            replyI.waitReply(1, 10000);
+                        }
+                    }
+                    catch(Ice.DatagramLimitException)
+                    {
+                        //
+                        // The server's Ice.UDP.RcvSize property is set to 16384, which means that DatagramLimitException
+                        // will be throw when try to send a packet bigger than that.
+                        //
+                        test(seq.Length > 16384);
+                    }
+                    obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    communicator.getProperties().setProperty("Ice.UDP.SndSize", "64000");
+                    seq = new byte[50000];
+                    try
+                    {
+                        replyI.reset();
+                        obj.sendByteSeq(seq, reply);
+
+                        bool b = replyI.waitReply(1, 500);
+                        //
+                        // The server's Ice.UDP.RcvSize property is set to 16384, which means this packet
+                        // should not be delivered.
+                        //
+                        test(!b);
+                    }
+                    catch(Ice.DatagramLimitException)
+                    {
+                    }
+                    catch(Ice.LocalException ex)
+                    {
+                        Console.Out.WriteLine(ex);
+                        test(false);
+                    }
                 }
-            }
-            catch(Ice.DatagramLimitException)
-            {
-                //
-                // The server's Ice.UDP.RcvSize property is set to 16384, which means that DatagramLimitException
-                // will be throw when try to send a packet bigger than that.
-                //
-                test(seq.Length > 16384);
-            }
-            obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            communicator.getProperties().setProperty("Ice.UDP.SndSize", "64000");
-            seq = new byte[50000];
-            try
-            {
-                replyI.reset();
-                obj.sendByteSeq(seq, reply);
 
-                bool b = replyI.waitReply(1, 500);
+                Console.Out.WriteLine("ok");
+
+                Console.Out.Write("testing udp multicast... ");
+                Console.Out.Flush();
+                StringBuilder endpoint = new StringBuilder();
                 //
-                // The server's Ice.UDP.RcvSize property is set to 16384, which means this packet
-                // should not be delivered.
+                // Use loopback to prevent other machines to answer.
                 //
-                test(!b);
-            }
-            catch(Ice.DatagramLimitException)
-            {
-            }
-            catch(Ice.LocalException ex)
-            {
-                Console.Out.WriteLine(ex);
-                test(false);
-            }
-        }
-
-        Console.Out.WriteLine("ok");
+                if(communicator.getProperties().getProperty("Ice.IPv6").Equals("1"))
+                {
+                    endpoint.Append("udp -h \"ff15::1:1\"");
+                    if(IceInternal.AssemblyUtil.isWindows || IceInternal.AssemblyUtil.isMacOS)
+                    {
+                        endpoint.Append(" --interface \"::1\"");
+                    }
+                }
+                else
+                {
+                    endpoint.Append("udp -h 239.255.1.1");
+                    if(IceInternal.AssemblyUtil.isWindows || IceInternal.AssemblyUtil.isMacOS)
+                    {
+                        endpoint.Append(" --interface 127.0.0.1");
+                    }
+                }
+                endpoint.Append(" -p ");
+                endpoint.Append(helper.getTestPort(10));
+                @base = communicator.stringToProxy("test -d:" + endpoint.ToString());
+                var objMcast = Test.TestIntfPrxHelper.uncheckedCast(@base);
 
-        Console.Out.Write("testing udp multicast... ");
-        Console.Out.Flush();
-        StringBuilder endpoint = new StringBuilder();
-        if(communicator.getProperties().getProperty("Ice.IPv6").Equals("1"))
-        {
-            endpoint.Append("udp -h \"ff15::1:1\" --interface \"::1\" -p "); // Use loopback to prevent other machines to answer.
-        }
-        else
-        {
-            endpoint.Append("udp -h 239.255.1.1 --interface 127.0.0.1 -p "); // Use loopback to prevent other machines to answer.
-        }
-        endpoint.Append(app.getTestPort(10));
-        @base = communicator.stringToProxy("test -d:" + endpoint.ToString());
-        TestIntfPrx objMcast = Test.TestIntfPrxHelper.uncheckedCast(@base);
+                nRetry = 5;
+                while(nRetry-- > 0)
+                {
+                    replyI.reset();
+                    objMcast.ping(reply);
+                    ret = replyI.waitReply(5, 5000);
+                    if(ret)
+                    {
+                        break;
+                    }
+                    replyI = new PingReplyI();
+                    reply =(Test.PingReplyPrx)Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
+                }
+                if(!ret)
+                {
+                    Console.Out.WriteLine("failed(is a firewall enabled?)");
+                }
+                else
+                {
+                    Console.Out.WriteLine("ok");
+                }
 
-        nRetry = 5;
-        while(nRetry-- > 0)
-        {
-            replyI.reset();
-            objMcast.ping(reply);
-            ret = replyI.waitReply(5, 5000);
-            if(ret)
-            {
-                break;
-            }
-            replyI = new PingReplyI();
-            reply =(Test.PingReplyPrx)Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
-        }
-        if(!ret)
-        {
-            Console.Out.WriteLine("failed (is a firewall enabled?)");
-        }
-        else
-        {
-            Console.Out.WriteLine("ok");
-        }
+                Console.Out.Write("testing udp bi-dir connection... ");
+                Console.Out.Flush();
+                obj.ice_getConnection().setAdapter(adapter);
+                objMcast.ice_getConnection().setAdapter(adapter);
+                nRetry = 5;
+                while(nRetry-- > 0)
+                {
+                    replyI.reset();
+                    obj.pingBiDir(reply.ice_getIdentity());
+                    obj.pingBiDir(reply.ice_getIdentity());
+                    obj.pingBiDir(reply.ice_getIdentity());
+                    ret = replyI.waitReply(3, 2000);
+                    if(ret)
+                    {
+                        break; // Success
+                    }
+                    replyI = new PingReplyI();
+                    reply =(Test.PingReplyPrx)Test.PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
+                }
+                test(ret);
+                Console.Out.WriteLine("ok");
 
-        Console.Out.Write("testing udp bi-dir connection... ");
-        Console.Out.Flush();
-        obj.ice_getConnection().setAdapter(adapter);
-        objMcast.ice_getConnection().setAdapter(adapter);
-        nRetry = 5;
-        while(nRetry-- > 0)
-        {
-            replyI.reset();
-            obj.pingBiDir(reply.ice_getIdentity());
-            obj.pingBiDir(reply.ice_getIdentity());
-            obj.pingBiDir(reply.ice_getIdentity());
-            ret = replyI.waitReply(3, 2000);
-            if(ret)
-            {
-                break; // Success
+                //
+                // Sending the replies back on the multicast UDP connection doesn't work for most
+                // platform(it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
+                // Windows...). For Windows, see UdpTransceiver constructor for the details. So
+                // we don't run this test.
+                //
+                //         Console.Out.Write("testing udp bi-dir connection... ");
+                //         nRetry = 5;
+                //         while(nRetry-- > 0)
+                //         {
+                //             replyI.reset();
+                //             objMcast.pingBiDir(reply.ice_getIdentity());
+                //             ret = replyI.waitReply(5, 2000);
+                //             if(ret)
+                //             {
+                //                 break; // Success
+                //             }
+                //             replyI = new PingReplyI();
+                //             reply =(PingReplyPrx)PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
+                //         }
+
+                //         if(!ret)
+                //         {
+                //             Console.Out.WriteLine("failed(is a firewall enabled?)");
+                //         }
+                //         else
+                //         {
+                //             Console.Out.WriteLine("ok");
+                //         }
             }
-            replyI = new PingReplyI();
-            reply = (PingReplyPrx)PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
         }
-        test(ret);
-        Console.Out.WriteLine("ok");
-
-        //
-        // Sending the replies back on the multicast UDP connection doesn't work for most
-        // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
-        // Windows...). For Windows, see UdpTransceiver constructor for the details. So
-        // we don't run this test.
-        //
-//         Console.Out.Write("testing udp bi-dir connection... ");
-//         nRetry = 5;
-//         while(nRetry-- > 0)
-//         {
-//             replyI.reset();
-//             objMcast.pingBiDir(reply.ice_getIdentity());
-//             ret = replyI.waitReply(5, 2000);
-//             if(ret)
-//             {
-//                 break; // Success
-//             }
-//             replyI = new PingReplyI();
-//             reply = (PingReplyPrx)PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram();
-//         }
-
-//         if(!ret)
-//         {
-//             Console.Out.WriteLine("failed (is a firewall enabled?)");
-//         }
-//         else
-//         {
-//             Console.Out.WriteLine("ok");
-//         }
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/Client.cs zeroc-ice-3.7.2/csharp/test/Ice/udp/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-using Test;
 using System;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-
-public class Client : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace udp
     {
-        AllTests.allTests(this);
-
-        int num;
-        try
-        {
-            num = args.Length == 1 ? Int32.Parse(args[0]) : 0;
-        }
-        catch(FormatException)
-        {
-            num = 0;
-        }
-        for(int i = 0; i < num; ++i)
+        public class Client : global::Test.TestHelper
         {
-            string endpoint = getTestEndpoint(i, "tcp");
-            TestIntfPrxHelper.uncheckedCast(communicator().stringToProxy("control:" + endpoint)).shutdown();
+            public override void run(string[] args)
+            {
+                var properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.Connections", "0");
+                properties.setProperty("Ice.UDP.SndSize", "16384");
+                using(var communicator = initialize(properties))
+                {
+                    AllTests.allTests(this);
+
+                    int num;
+                    try
+                    {
+                        num = args.Length == 1 ? Int32.Parse(args[0]) : 1;
+                    }
+                    catch(FormatException)
+                    {
+                        num = 1;
+                    }
+
+                    for(int i = 0; i < num; ++i)
+                    {
+                        var prx = communicator.stringToProxy("control:" + getTestEndpoint(i, "tcp"));
+                        Test.TestIntfPrxHelper.uncheckedCast(prx).shutdown();
+                    }
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return global::Test.TestDriver.runTest<Client>(args);
+            }
         }
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.UDP.SndSize", "16384");
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Client app = new Client();
-        return app.runmain(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestIntfI.cs">
       <Link>TestIntfI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestIntfI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestIntfI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/msbuild/test/netstandard2.0/test.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../../../../../msbuild/ice.common.props" />
+  <PropertyGroup>
+    <AssemblyName>Ice.udp</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="../../../TestIntfI.cs" />
+
+    <Compile Include="generated/Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+
+    <SliceCompile Include="../../../Test.ice" />
+
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/Server.cs zeroc-ice-3.7.2/csharp/test/Ice/udp/Server.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,79 +1,86 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Text;
-using System.Reflection;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IceTest")]
-[assembly: AssemblyDescription("Ice test")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+namespace Ice
 {
-    public override int run(string[] args)
+    namespace udp
     {
-        Ice.Properties properties = communicator().getProperties();
-
-        int num = 0;
-        try
-        {
-            num = args.Length == 1 ? Int32.Parse(args[0]) : 0;
-        }
-        catch(FormatException)
+        public class Server : global::Test.TestHelper
         {
+            public override void run(string[] args)
+            {
+                Ice.Properties properties = createTestProperties(ref args);
+                properties.setProperty("Ice.Warn.Connections", "0");
+                properties.setProperty("Ice.UDP.RcvSize", "16384");
+                if(IceInternal.AssemblyUtil.isMacOS && properties.getPropertyAsInt("Ice.IPv6") > 0)
+                {
+                    // Disable dual mode sockets on macOS, see https://github.com/dotnet/corefx/issues/31182
+                    properties.setProperty("Ice.IPv4", "0");
+                }
+
+                using(var communicator = initialize(properties))
+                {
+                    int num = 0;
+                    try
+                    {
+                        num = args.Length == 1 ? Int32.Parse(args[0]) : 0;
+                    }
+                    catch(FormatException)
+                    {
+                    }
+
+                    communicator.getProperties().setProperty("ControlAdapter.Endpoints", getTestEndpoint(num, "tcp"));
+                    Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter");
+                    adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control"));
+                    adapter.activate();
+                    serverReady();
+                    if(num == 0)
+                    {
+                        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(num, "udp"));
+                        Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter");
+                        adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
+                        adapter2.activate();
+                    }
+
+                    StringBuilder endpoint = new StringBuilder();
+                    //
+                    // Use loopback to prevent other machines to answer.
+                    //
+                    if(properties.getProperty("Ice.IPv6").Equals("1"))
+                    {
+                        endpoint.Append("udp -h \"ff15::1:1\"");
+                        if(IceInternal.AssemblyUtil.isWindows || IceInternal.AssemblyUtil.isMacOS)
+                        {
+                            endpoint.Append(" --interface \"::1\"");
+                        }
+                    }
+                    else
+                    {
+                        endpoint.Append("udp -h 239.255.1.1");
+                        if(IceInternal.AssemblyUtil.isWindows || IceInternal.AssemblyUtil.isMacOS)
+                        {
+                            endpoint.Append(" --interface 127.0.0.1");
+                        }
+                    }
+                    endpoint.Append(" -p ");
+                    endpoint.Append(getTestPort(properties, 10));
+                    communicator.getProperties().setProperty("McastTestAdapter.Endpoints", endpoint.ToString());
+                    Ice.ObjectAdapter mcastAdapter = communicator.createObjectAdapter("McastTestAdapter");
+                    mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
+                    mcastAdapter.activate();
+
+                    communicator.waitForShutdown();
+                }
+            }
+
+            public static int Main(string[] args)
+            {
+                return global::Test.TestDriver.runTest<Server>(args);
+            }
         }
-        properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(num, "tcp"));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
-        adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control"));
-        adapter.activate();
-
-        if(num == 0)
-        {
-            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(num, "udp"));
-            Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter");
-            adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
-            adapter2.activate();
-        }
-
-        StringBuilder endpoint = new StringBuilder();
-        if(properties.getProperty("Ice.IPv6").Equals("1"))
-        {
-            endpoint.Append("udp -h \"ff15::1:1\" --interface \"::1\" -p "); // Use loopback to prevent other machines to answer.
-        }
-        else
-        {
-            endpoint.Append("udp -h 239.255.1.1 --interface 127.0.0.1 -p "); // Use loopback to prevent other machines to answer.
-        }
-        endpoint.Append(getTestPort(properties, 10));
-        properties.setProperty("McastTestAdapter.Endpoints", endpoint.ToString());
-        Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter");
-        mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
-        mcastAdapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
-        return initData;
-    }
-
-    public static int Main(string[] args)
-    {
-        Server app = new Server();
-        return app.runmain(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/Test.ice zeroc-ice-3.7.2/csharp/test/Ice/udp/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/Identity.ice>
 
+["cs:namespace:Ice.udp"]
 module Test
 {
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Ice/udp/TestIntfI.cs zeroc-ice-3.7.2/csharp/test/Ice/udp/TestIntfI.cs
--- zeroc-ice-3.7.1/csharp/test/Ice/udp/TestIntfI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Ice/udp/TestIntfI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,68 +1,69 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 
-public sealed class TestIntfI : Test.TestIntfDisp_
+namespace Ice
 {
-    public override void ping(Test.PingReplyPrx reply, Ice.Current current)
-    {
-        try
-        {
-            reply.reply();
-        }
-        catch(Ice.LocalException)
-        {
-            Debug.Assert(false);
-        }
-    }
-
-    public override void sendByteSeq(byte[] seq, Test.PingReplyPrx reply, Ice.Current current)
+    namespace udp
     {
-        try
-        {
-            reply.reply();
-        }
-        catch(Ice.LocalException)
+        public sealed class TestIntfI : Test.TestIntfDisp_
         {
-            Debug.Assert(false);
-        }
-    }
+            public override void ping(Test.PingReplyPrx reply, Ice.Current current)
+            {
+                try
+                {
+                    reply.reply();
+                }
+                catch(Ice.LocalException)
+                {
+                    Debug.Assert(false);
+                }
+            }
 
-    public override void pingBiDir(Ice.Identity id, Ice.Current current)
-    {
-        try
-        {
-            //
-            // Ensure sending too much data doesn't cause the UDP connection
-            // to be closed.
-            //
-            try
+            public override void sendByteSeq(byte[] seq, Test.PingReplyPrx reply, Ice.Current current)
             {
-                byte[] seq = new byte[32 * 1024];
-                Test.TestIntfPrxHelper.uncheckedCast(current.con.createProxy(id)).sendByteSeq(seq, null);
+                try
+                {
+                    reply.reply();
+                }
+                catch(Ice.LocalException)
+                {
+                    Debug.Assert(false);
+                }
             }
-            catch(Ice.DatagramLimitException)
+
+            public override void pingBiDir(Ice.Identity id, Ice.Current current)
             {
-                // Expected.
+                try
+                {
+                    //
+                    // Ensure sending too much data doesn't cause the UDP connection
+                    // to be closed.
+                    //
+                    try
+                    {
+                        byte[] seq = new byte[32 * 1024];
+                        Test.TestIntfPrxHelper.uncheckedCast(current.con.createProxy(id)).sendByteSeq(seq, null);
+                    }
+                    catch(Ice.DatagramLimitException)
+                    {
+                        // Expected.
+                    }
+
+                    Test.PingReplyPrxHelper.uncheckedCast(current.con.createProxy(id)).reply();
+                }
+                catch(Ice.LocalException)
+                {
+                    Debug.Assert(false);
+                }
             }
 
-            Test.PingReplyPrxHelper.uncheckedCast(current.con.createProxy(id)).reply();
-        }
-        catch(Ice.LocalException)
-        {
-            Debug.Assert(false);
+            public override void shutdown(Ice.Current current)
+            {
+                current.adapter.getCommunicator().shutdown();
+            }
         }
     }
-
-    public override void shutdown(Ice.Current current)
-    {
-        current.adapter.getCommunicator().shutdown();
-    }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/AllTests.cs zeroc-ice-3.7.2/csharp/test/IceBox/admin/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 
 using Test;
 
-public class AllTests
+public class AllTests : Test.AllTests
 {
-    private static void
-    test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
-    public static void allTests(TestCommon.Application app)
+    public static void allTests(Test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        string @ref = "DemoIceBox/admin:default -p 9996 -t 10000";
-        Ice.ObjectPrx admin = communicator.stringToProxy(@ref);
+        Ice.Communicator communicator = helper.communicator();
+        Ice.ObjectPrx admin = communicator.stringToProxy("DemoIceBox/admin:default -p 9996 -t 10000");
 
         TestFacetPrx facet = null;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/Client.cs zeroc-ice-3.7.2/csharp/test/IceBox/admin/Client.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
@@ -17,31 +12,26 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this);
-
-        //
-        // Shutdown the IceBox server.
-        //
-        Ice.ProcessPrxHelper.uncheckedCast(
-            communicator().stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
+    public override void run(string[] args)
     {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+        using(var communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+            //
+            // Shutdown the IceBox server.
+            //
+            Ice.ObjectPrx prx = communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996");
+            Ice.ProcessPrxHelper.uncheckedCast(prx).shutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/testservice/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/testservice/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/testservice/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/testservice/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/testservice/net45/testservice.csproj zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/testservice/net45/testservice.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/testservice/net45/testservice.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/testservice/net45/testservice.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,27 +17,26 @@
     <AssemblyName>testservice</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceBox, Version=3.7.1.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="IceBox, Version=3.7.2.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceBox.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\TestI.cs">
@@ -45,23 +45,23 @@
     <Compile Include="..\..\..\TestServiceI.cs">
       <Link>TestServiceI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/msbuild/testservice/netstandard2.0/testservice.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>testservice</AssemblyName>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../TestServiceI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../TestServiceI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceBox.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceBox.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/Test.ice zeroc-ice-3.7.2/csharp/test/IceBox/admin/Test.ice
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/TestI.cs zeroc-ice-3.7.2/csharp/test/IceBox/admin/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Collections.Generic;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/admin/TestServiceI.cs zeroc-ice-3.7.2/csharp/test/IceBox/admin/TestServiceI.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/admin/TestServiceI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/admin/TestServiceI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using IceBox;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/AllTests.cs zeroc-ice-3.7.2/csharp/test/IceBox/configuration/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using Test;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
-    public static void allTests(TestCommon.Application app)
+    public static void allTests(Test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
+        Ice.Communicator communicator = helper.communicator();
         TestIntfPrx service1 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" +
-                                                                                          app.getTestEndpoint(0)));
+                                                                                          helper.getTestEndpoint(0)));
         TestIntfPrx service2 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" +
-                                                                                          app.getTestEndpoint(1)));
+                                                                                          helper.getTestEndpoint(1)));
         TestIntfPrx service3 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" +
-                                                                                          app.getTestEndpoint(2)));
+                                                                                          helper.getTestEndpoint(2)));
         TestIntfPrx service4 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" +
-                                                                                          app.getTestEndpoint(3)));
+                                                                                          helper.getTestEndpoint(3)));
 
         if(service1.getProperty("IceBox.InheritProperties").Equals(""))
         {
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/Client.cs zeroc-ice-3.7.2/csharp/test/IceBox/configuration/Client.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,30 +11,25 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
-    {
-        AllTests.allTests(this);
-
-        //
-        // Shutdown the IceBox server.
-        //
-        Ice.ProcessPrxHelper.uncheckedCast(
-            communicator().stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
-        return 0;
-    }
-
-    protected override Ice.InitializationData getInitData(ref string[] args)
+    public override void run(string[] args)
     {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+        using(var communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+            //
+            // Shutdown the IceBox server.
+            //
+            Ice.ObjectPrx prx = communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996");
+            Ice.ProcessPrxHelper.uncheckedCast(prx).shutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/testservice/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/testservice/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/testservice/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/testservice/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/testservice/net45/testservice.csproj zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/testservice/net45/testservice.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/testservice/net45/testservice.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/testservice/net45/testservice.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,27 +17,26 @@
     <AssemblyName>testservice</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
-    <Reference Include="IceBox, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="IceBox, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceBox.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\TestI.cs">
@@ -45,23 +45,23 @@
     <Compile Include="..\..\..\TestServiceI.cs">
       <Link>TestServiceI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/msbuild/testservice/netstandard2.0/testservice.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>testservice</AssemblyName>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../TestServiceI.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../TestServiceI.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceBox.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceBox.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/Test.ice zeroc-ice-3.7.2/csharp/test/IceBox/configuration/Test.ice
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/TestI.cs zeroc-ice-3.7.2/csharp/test/IceBox/configuration/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceBox/configuration/TestServiceI.cs zeroc-ice-3.7.2/csharp/test/IceBox/configuration/TestServiceI.cs
--- zeroc-ice-3.7.1/csharp/test/IceBox/configuration/TestServiceI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceBox/configuration/TestServiceI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using IceBox;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/AllTests.cs zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
 using System.Collections.Generic;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
     public static void
-    allTests(TestCommon.Application app, int num)
+    allTests(Test.TestHelper helper, int num)
     {
-        Ice.Communicator communicator = app.communicator();
+        var output = helper.getWriter();
+        Ice.Communicator communicator = helper.communicator();
         List<ControllerPrx> proxies = new List<ControllerPrx>();
         List<ControllerPrx> indirectProxies = new List<ControllerPrx>();
         for(int i = 0; i < num; ++i)
@@ -26,28 +22,28 @@
             indirectProxies.Add(ControllerPrxHelper.uncheckedCast(communicator.stringToProxy(id + "@control" + i)));
         }
 
-        Write("testing indirect proxies... ");
-        Flush();
+        output.Write("testing indirect proxies... ");
+        output.Flush();
         {
             foreach(ControllerPrx prx in indirectProxies)
             {
                 prx.ice_ping();
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing well-known proxies... ");
-        Flush();
+        output.Write("testing well-known proxies... ");
+        output.Flush();
         {
             foreach(ControllerPrx prx in proxies)
             {
                 prx.ice_ping();
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing object adapter registration... ");
-        Flush();
+        output.Write("testing object adapter registration... ");
+        output.Flush();
         {
             try
             {
@@ -80,10 +76,10 @@
             {
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing object adapter migration...");
-        Flush();
+        output.Write("testing object adapter migration...");
+        output.Flush();
         {
             proxies[0].activateObjectAdapter("oa", "oa1", "");
             proxies[0].addObject("oa", "object");
@@ -97,10 +93,10 @@
             proxies[1].removeObject("oa", "object");
             proxies[1].deactivateObjectAdapter("oa");
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing object migration...");
-        Flush();
+        output.Write("testing object migration...");
+        output.Flush();
         {
             proxies[0].activateObjectAdapter("oa", "oa1", "");
             proxies[1].activateObjectAdapter("oa", "oa2", "");
@@ -133,10 +129,10 @@
             proxies[0].deactivateObjectAdapter("oa");
             proxies[1].deactivateObjectAdapter("oa");
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing replica groups...");
-        Flush();
+        output.Write("testing replica groups...");
+        output.Flush();
         {
             proxies[0].activateObjectAdapter("oa", "oa1", "rg");
             proxies[1].activateObjectAdapter("oa", "oa2", "rg");
@@ -196,10 +192,10 @@
                      communicator.stringToProxy("object @ rg")).getAdapterId().Equals("oa1"));
             proxies[0].deactivateObjectAdapter("oa");
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("testing invalid lookup endpoints... ");
-        Flush();
+        output.Write("testing invalid lookup endpoints... ");
+        output.Flush();
         {
             String multicast;
             if(communicator.getProperties().getProperty("Ice.IPv6").Equals("1"))
@@ -245,14 +241,14 @@
                 comm.destroy();
             }
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
 
-        Write("shutting down... ");
-        Flush();
+        output.Write("shutting down... ");
+        output.Flush();
         foreach(ControllerPrx prx in proxies)
         {
             prx.shutdown();
         }
-        WriteLine("ok");
+        output.WriteLine("ok");
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/Client.cs zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/Client.cs
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,26 +11,27 @@
 [assembly: AssemblyDescription("IceDiscovery test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        int num;
-        try
-        {
-            num = args.Length == 1 ? Int32.Parse(args[0]) : 0;
-        }
-        catch(FormatException)
+        using(var communicator = initialize(ref args))
         {
-            num = 0;
+            int num;
+            try
+            {
+                num = args.Length == 1 ? Int32.Parse(args[0]) : 0;
+            }
+            catch(FormatException)
+            {
+                num = 0;
+            }
+            AllTests.allTests(this, num);
         }
-        AllTests.allTests(this, num);
-        return 0;
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/Server.cs zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/Server.cs
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,36 +11,35 @@
 [assembly: AssemblyDescription("IceDiscovery test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.Properties properties = communicator().getProperties();
-
-        int num = 0;
-        try
-        {
-            num =  Int32.Parse(args[0]);
-        }
-        catch(FormatException)
+        using(var communicator = initialize(ref args))
         {
-        }
-
-        properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(num));
-        properties.setProperty("ControlAdapter.AdapterId", "control" + num);
-        properties.setProperty("ControlAdapter.ThreadPool.Size", "1");
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
-        adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num));
-        adapter.activate();
+            int num = 0;
+            try
+            {
+                num =  Int32.Parse(args[0]);
+            }
+            catch(FormatException)
+            {
+            }
+
+            communicator.getProperties().setProperty("ControlAdapter.Endpoints", getTestEndpoint(num));
+            communicator.getProperties().setProperty("ControlAdapter.AdapterId", "control" + num);
+            communicator.getProperties().setProperty("ControlAdapter.ThreadPool.Size", "1");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter");
+            adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num));
+            adapter.activate();
 
-        communicator().waitForShutdown();
-        return 0;
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/Test.ice zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/Test.ice
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/TestI.cs zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/IceDiscovery/simple/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceDiscovery/simple/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Diagnostics;
 using System.Collections.Generic;
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/AllTests.cs zeroc-ice-3.7.2/csharp/test/IceGrid/simple/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using Test;
 
-public class AllTests : TestCommon.AllTests
+public class AllTests : Test.AllTests
 {
-    public static void allTests(TestCommon.Application app)
+    public static void allTests(Test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
+        Ice.Communicator communicator = helper.communicator();
         Console.Out.Write("testing stringToProxy... ");
         Console.Out.Flush();
         String rf = "test @ TestAdapter";
@@ -75,7 +70,7 @@
             initData.properties.setProperty("Ice.Default.Locator", "");
             initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
                                             "IceLocatorDiscovery:IceLocatorDiscovery.PluginFactory");
-            initData.properties.setProperty("IceLocatorDiscovery.Port", app.getTestPort(99).ToString());
+            initData.properties.setProperty("IceLocatorDiscovery.Port", helper.getTestPort(99).ToString());
             initData.properties.setProperty("AdapterForDiscoveryTest.AdapterId", "discoveryAdapter");
             initData.properties.setProperty("AdapterForDiscoveryTest.Endpoints", "default");
 
@@ -173,7 +168,7 @@
                 {
                     intf = " --interface \"" + intf + "\"";
                 }
-                string port = app.getTestPort(99).ToString();
+                string port = helper.getTestPort(99).ToString();
                 initData.properties.setProperty("IceLocatorDiscovery.Lookup",
                                                  "udp -h " + multicast + " --interface unknown:" +
                                                  "udp -h " + multicast + " -p " + port + intf);
@@ -199,9 +194,9 @@
     }
 
     public static void
-    allTestsWithDeploy(TestCommon.Application app)
+    allTestsWithDeploy(Test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
+        Ice.Communicator communicator = helper.communicator();
         Console.Out.Write("testing stringToProxy... ");
         Console.Out.Flush();
         Ice.ObjectPrx @base = communicator.stringToProxy("test @ TestAdapter");
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/application.netcoreapp2.0.xml zeroc-ice-3.7.2/csharp/test/IceGrid/simple/application.netcoreapp2.0.xml
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/application.netcoreapp2.0.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/application.netcoreapp2.0.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<icegrid>
-  <application name="Test">
-    <node name="localnode">
-      <server id="server" exe="${dotnet.exe}" pwd="." activation="on-demand">
-        <option>${test.dir}/${server.dir}/server.dll</option>
-        <adapter name="TestAdapter" id="TestAdapter" endpoints="default">
-          <object identity="test" type="Test"/>
-        </adapter>
-      </server>
-
-      <server id="server10" exe="${dotnet.exe}" pwd="." activation="on-demand">
-        <option>${test.dir}/${server.dir}/server.dll</option>
-        <adapter name="TestAdapter" endpoints="default" id="TestAdapter10">
-          <object identity="test10" type="Test" property="Identity"/>
-        </adapter>
-        <property name="Ice.Default.EncodingVersion" value="1.0"/>
-      </server>
-    </node>
-  </application>
-</icegrid>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/application.netcoreapp.xml zeroc-ice-3.7.2/csharp/test/IceGrid/simple/application.netcoreapp.xml
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/application.netcoreapp.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/application.netcoreapp.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,20 @@
+<icegrid>
+  <application name="Test">
+    <node name="localnode">
+      <server id="server" exe="${dotnet.exe}" pwd="." activation="on-demand">
+        <option>${test.dir}/${server.dir}/server.dll</option>
+        <adapter name="TestAdapter" id="TestAdapter" endpoints="default">
+          <object identity="test" type="Test"/>
+        </adapter>
+      </server>
+
+      <server id="server10" exe="${dotnet.exe}" pwd="." activation="on-demand">
+        <option>${test.dir}/${server.dir}/server.dll</option>
+        <adapter name="TestAdapter" endpoints="default" id="TestAdapter10">
+          <object identity="test10" type="Test" property="Identity"/>
+        </adapter>
+        <property name="Ice.Default.EncodingVersion" value="1.0"/>
+      </server>
+    </node>
+  </application>
+</icegrid>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/Client.cs zeroc-ice-3.7.2/csharp/test/IceGrid/simple/Client.cs
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
+using System.Linq;
 
 [assembly: CLSCompliant(true)]
 
@@ -16,35 +12,25 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        bool withDeploy = false;
-        for(int i = 0; i < args.Length; i++)
+        using(var communicator = initialize(ref args))
         {
-            if(args[i].Equals("--with-deploy"))
+            if(args.Any(v => v.Equals("--with-deploy")))
             {
-                withDeploy = true;
-                break;
+                AllTests.allTestsWithDeploy(this);
+            }
+            else
+            {
+                AllTests.allTests(this);
             }
         }
-
-        if(!withDeploy)
-        {
-            AllTests.allTests(this);
-        }
-        else
-        {
-            AllTests.allTestsWithDeploy(this);
-        }
-
-        return 0;
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,36 +17,35 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Glacier2, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glacier2, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Glacier2.dll</HintPath>
     </Reference>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceGrid, Version=3.7.1.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="IceGrid, Version=3.7.2.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceGrid.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -53,24 +53,24 @@
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceGrid.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceLocatorDiscovery.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceDiscovery.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/Glacier2.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceGrid.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceLocatorDiscovery.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceDiscovery.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,26 +17,25 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -43,24 +43,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/Server.cs zeroc-ice-3.7.2/csharp/test/IceGrid/simple/Server.cs
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,17 +11,16 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server
+public class Server : Test.TestHelper
 {
-    public class App : Ice.Application
+    public override void run(string[] args)
     {
-        public override int run(string[] args)
+        using(var communicator = initialize(ref args))
         {
-            args = communicator().getProperties().parseCommandLineOptions("TestAdapter", args);
-            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-            string id = communicator().getProperties().getPropertyWithDefault("Identity", "test");
+            communicator.getProperties().parseCommandLineOptions("TestAdapter", args);
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            string id = communicator.getProperties().getPropertyWithDefault("Identity", "test");
             adapter.add(new TestI(), Ice.Util.stringToIdentity(id));
-            shutdownOnInterrupt();
             try
             {
                 adapter.activate();
@@ -34,14 +28,12 @@
             catch(Ice.ObjectAdapterDeactivatedException)
             {
             }
-            communicator().waitForShutdown();
-            return 0;
+            communicator.waitForShutdown();
         }
     }
 
     public static int Main(string[] args)
     {
-        App server = new App();
-        return server.main(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/Test.ice zeroc-ice-3.7.2/csharp/test/IceGrid/simple/Test.ice
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceGrid/simple/TestI.cs zeroc-ice-3.7.2/csharp/test/IceGrid/simple/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/IceGrid/simple/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceGrid/simple/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 public sealed class TestI : Test.TestIntfDisp_
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/certs/makecerts.py zeroc-ice-3.7.2/csharp/test/IceSSL/certs/makecerts.py
--- zeroc-ice-3.7.1/csharp/test/IceSSL/certs/makecerts.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/certs/makecerts.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2015-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 import os, sys, socket, getopt
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/AllTests.cs zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/AllTests.cs
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/AllTests.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/AllTests.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // NOTE: This test is not interoperable with other language mappings.
@@ -29,6 +24,11 @@
         }
     }
 
+    private static X509Certificate2 createCertificate(string certPEM)
+    {
+        return new X509Certificate2(System.Text.Encoding.ASCII.GetBytes(certPEM));
+    }
+
     private static Ice.InitializationData
     createClientProps(Ice.Properties defaultProperties)
     {
@@ -94,10 +94,10 @@
         return initData;
     }
 
-    public static Test.ServerFactoryPrx allTests(TestCommon.Application app, string testDir)
+    public static Test.ServerFactoryPrx allTests(Test.TestHelper helper, string testDir)
     {
-        Ice.Communicator communicator = app.communicator();
-        string factoryRef = "factory:" + app.getTestEndpoint(0, "tcp");
+        Ice.Communicator communicator = helper.communicator();
+        string factoryRef = "factory:" + helper.getTestEndpoint(0, "tcp");
 
         Ice.ObjectPrx b = communicator.stringToProxy(factoryRef);
         test(b != null);
@@ -124,8 +124,8 @@
         X509Certificate2 caCert1 = new X509Certificate2(caCert1File);
         X509Certificate2 caCert2 = new X509Certificate2(caCert2File);
 
-        test(Enumerable.SequenceEqual(IceSSL.Util.createCertificate(File.ReadAllText(caCert1File)).RawData, caCert1.RawData));
-        test(Enumerable.SequenceEqual(IceSSL.Util.createCertificate(File.ReadAllText(caCert2File)).RawData, caCert2.RawData));
+        test(Enumerable.SequenceEqual(createCertificate(File.ReadAllText(caCert1File)).RawData, caCert1.RawData));
+        test(Enumerable.SequenceEqual(createCertificate(File.ReadAllText(caCert2File)).RawData, caCert2.RawData));
 
         X509Store store = new X509Store(StoreName.AuthRoot, StoreLocation.LocalMachine);
         bool isAdministrator = false;
@@ -880,7 +880,7 @@
                     // the cert size should be 2.
                     //
                     d = createServerProps(defaultProperties, "s_rsa_wroot_ca1", "");
-                    d["IceSSL.VerifyPeer"] = "0";;
+                    d["IceSSL.VerifyPeer"] = "0";
                     server = fact.createServer(d);
                     try
                     {
@@ -907,7 +907,7 @@
 
                     {
                         d = createServerProps(defaultProperties, "s_rsa_ca1", "");
-                        d["IceSSL.VerifyPeer"] = "0";;
+                        d["IceSSL.VerifyPeer"] = "0";
                         server = fact.createServer(d);
                         try
                         {
@@ -936,7 +936,7 @@
 
                     {
                         d = createServerProps(defaultProperties, "s_rsa_cai1", "");
-                        d["IceSSL.VerifyPeer"] = "0";;
+                        d["IceSSL.VerifyPeer"] = "0";
                         server = fact.createServer(d);
                         try
                         {
@@ -994,7 +994,7 @@
 
                         {
                             d = createServerProps(defaultProperties, "s_rsa_cai2", "");
-                            d["IceSSL.VerifyPeer"] = "0";;
+                            d["IceSSL.VerifyPeer"] = "0";
                             server = fact.createServer(d);
                             try
                             {
@@ -1022,7 +1022,7 @@
 
                         {
                             d = createServerProps(defaultProperties, "s_rsa_cai2", "");
-                            d["IceSSL.VerifyPeer"] = "0";;
+                            d["IceSSL.VerifyPeer"] = "0";
                             server = fact.createServer(d);
                             try
                             {
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/CertificateVerifierI.cs zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/CertificateVerifierI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/CertificateVerifierI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/Client.cs zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/Client.cs
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,26 +11,25 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        if(args.Length < 1)
+        using(var communicator = initialize(ref args))
         {
-            Console.Error.WriteLine("Usage: client testdir");
-            return 1;
+            if(args.Length < 1)
+            {
+                throw new ArgumentException("Usage: client testdir");
+            }
+
+            Test.ServerFactoryPrx factory;
+            factory = AllTests.allTests(this, args[0]);
+            factory.shutdown();
         }
-
-        Test.ServerFactoryPrx factory;
-        factory = AllTests.allTests(this, args[0]);
-        factory.shutdown();
-
-        return 0;
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\AllTests.cs">
       <Link>AllTests.cs</Link>
@@ -54,24 +54,24 @@
     <Compile Include="..\..\..\PasswordCallbackI.cs">
       <Link>PasswordCallbackI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../AllTests.cs"/>
-    <Compile Include="../../../CertificateVerifierI.cs"/>
-    <Compile Include="../../../PasswordCallbackI.cs"/>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../AllTests.cs" />
+    <Compile Include="../../../CertificateVerifierI.cs" />
+    <Compile Include="../../../PasswordCallbackI.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceSSL.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceSSL.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/server/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/server/net45/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,31 +17,30 @@
     <AssemblyName>server</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="IceSSL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="IceSSL, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\IceSSL.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Server.cs">
       <Link>Server.cs</Link>
@@ -48,24 +48,24 @@
     <Compile Include="..\..\..\TestI.cs">
       <Link>TestI.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config"/>
-    <None Include="server.exe.config"/>
+    <None Include="packages.config" />
+    <None Include="server.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/msbuild/server/netstandard2.0/server.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>server</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
-    <Compile Include="../../../TestI.cs"/>
-    <Compile Include="../../../Server.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../TestI.cs" />
+    <Compile Include="../../../Server.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
-        <Reference Include="../../../../../../lib/netstandard2.0/IceSSL.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
+        <Reference Include="../../../../../../lib/netstandard2.0/IceSSL.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/PasswordCallbackI.cs zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/PasswordCallbackI.cs
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/PasswordCallbackI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/PasswordCallbackI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Diagnostics;
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/Server.cs zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/Server.cs
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/Server.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/Server.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Reflection;
@@ -16,29 +11,29 @@
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        if(args.Length < 1)
+        using(var communicator = initialize(ref args))
         {
-            Console.Error.WriteLine("Usage: server testdir");
-            return 1;
-        }
+            if(args.Length < 1)
+            {
+                throw new ArgumentException("Usage: server testdir");
+            }
+
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp"));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Identity id = Ice.Util.stringToIdentity("factory");
+            adapter.add(new ServerFactoryI(args[0] + "/../certs"), id);
+            adapter.activate();
 
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp"));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Identity id = Ice.Util.stringToIdentity("factory");
-        adapter.add(new ServerFactoryI(args[0] + "/../certs"), id);
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/Test.ice zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/Test.ice
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/TestI.cs zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/TestI.cs
--- zeroc-ice-3.7.1/csharp/test/IceSSL/configuration/TestI.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceSSL/configuration/TestI.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using Test;
 using System;
diff -Nru zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/Client.cs zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/Client.cs
--- zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 
-public class Client : TestCommon.Application
+public class Client : Test.TestHelper
 {
-    public override int run(string[] argvs)
+    public override void run(string[] argvs)
     {
         Console.Out.Write("testing string to command line arguments... ");
         Console.Out.Flush();
@@ -155,12 +150,10 @@
             test(IceUtilInternal.StringUtil.splitString("a\"b", ":") == null);
         }
         Console.Out.WriteLine("ok");
-        return 0;
     }
 
     public static int Main(string[] args)
     {
-        Client app = new Client();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,44 +17,43 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\TestCommon\TestApp.cs">
-      <Link>TestApp.cs</Link>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
     </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
-    <None Include="packages.config"/>
+    <None Include="client.exe.config" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/IceUtil/inputUtil/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -4,13 +4,13 @@
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../../../TestCommon/TestApp.cs"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs"/>
     <Compile Include="../../../Client.cs"/>
   </ItemGroup>
   <ItemGroup>
@@ -19,7 +19,7 @@
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
       </ItemGroup>
     </When>
     <Otherwise>
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/csharp/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/csharp/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/escape/Client.cs zeroc-ice-3.7.2/csharp/test/Slice/escape/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Slice/escape/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/escape/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-public class Client
+public class Client : Test.TestHelper
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new System.Exception();
-        }
-    }
-
     public sealed class caseI : @abstract.caseDisp_
     {
         public override Task<int>
@@ -127,65 +114,45 @@
         test(k == 0);
     }
 
-    private static int run(string[] args, Ice.Communicator communicator)
+    public override void run(string[] args)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default");
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new decimalI(), Ice.Util.stringToIdentity("test"));
-        adapter.add(new Test1I(), Ice.Util.stringToIdentity("test1"));
-        adapter.add(new Test2I(), Ice.Util.stringToIdentity("test2"));
-        adapter.activate();
-
-        Console.Out.Write("testing operation name... ");
-        Console.Out.Flush();
-        @abstract.@decimalPrx p = @abstract.@decimalPrxHelper.uncheckedCast(
-            adapter.createProxy(Ice.Util.stringToIdentity("test")));
-        p.@default();
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing System as module name... ");
-        Console.Out.Flush();
-        @abstract.System.TestPrx t1 = @abstract.System.TestPrxHelper.uncheckedCast(
-                adapter.createProxy(Ice.Util.stringToIdentity("test1")));
-        t1.op();
-
-        System.TestPrx t2 = System.TestPrxHelper.uncheckedCast(
-                adapter.createProxy(Ice.Util.stringToIdentity("test2")));
-
-        t2.op();
-        Console.Out.WriteLine("ok");
-
-        Console.Out.Write("testing types... ");
-        Console.Out.Flush();
-        testtypes();
-        Console.Out.WriteLine("ok");
-
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", "default");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new decimalI(), Ice.Util.stringToIdentity("test"));
+            adapter.add(new Test1I(), Ice.Util.stringToIdentity("test1"));
+            adapter.add(new Test2I(), Ice.Util.stringToIdentity("test2"));
+            adapter.activate();
+
+            Console.Out.Write("testing operation name... ");
+            Console.Out.Flush();
+            @abstract.@decimalPrx p =
+                @abstract.@decimalPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("test")));
+            p.@default();
+            Console.Out.WriteLine("ok");
+
+            Console.Out.Write("testing System as module name... ");
+            Console.Out.Flush();
+            @abstract.System.TestPrx t1 =
+                @abstract.System.TestPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("test1")));
+            t1.op();
+
+            System.TestPrx t2 =
+                System.TestPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("test2")));
+
+            t2.op();
+            Console.Out.WriteLine("ok");
+
+            Console.Out.Write("testing types... ");
+            Console.Out.Flush();
+            testtypes();
+            Console.Out.WriteLine("ok");
+        }
     }
 
     public static int Main(string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            communicator = Ice.Util.initialize(ref args, initData);
-            status = run(args, communicator);
-        }
-        catch(System.Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            communicator.destroy();
-        }
-
-        return status;
+        return Test.TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/escape/Key.ice zeroc-ice-3.7.2/csharp/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/csharp/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/escape/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Slice/escape/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Slice/escape/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/escape/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,49 +17,51 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Clash.cs"/>
-    <Compile Include="generated\Key.cs"/>
+    <Compile Include="generated\Clash.cs" />
+    <Compile Include="generated\Key.cs" />
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\Clash.ice">
       <Link>Clash.ice</Link>
     </SliceCompile>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Key.ice">
       <Link>Key.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/escape/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Slice/escape/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Slice/escape/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/escape/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/escape/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Clash.ice"/>
-    <SliceCompile Include="../../../Key.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Clash.cs">
+      <SliceCompileSource>../../../Clash.ice</SliceCompileSource>
+    </Compile>
+    <Compile Include="generated\Key.cs">
+      <SliceCompileSource>../../../Key.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Clash.ice" />
+    <SliceCompile Include="../../../Key.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/macros/Client.cs zeroc-ice-3.7.2/csharp/test/Slice/macros/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Slice/macros/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/macros/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
-using System.Diagnostics;
-using System.Collections.Generic;
-
 using Test;
 
-public class Client
+public class Client : TestHelper
 {
-    private static void test(bool b)
+    public override void run(string[] args)
     {
-        if(!b)
-        {
-            throw new System.Exception();
-        }
+        Console.Out.Write("testing Slice predefined macros... ");
+        Console.Out.Flush();
+        Default d = new Default();
+        test(d.x == 10);
+        test(d.y == 10);
+
+        NoDefault nd = new NoDefault();
+        test(nd.x != 10);
+        test(nd.y != 10);
+
+        CsOnly c = new CsOnly();
+        test(c.lang.Equals("cs"));
+        test(c.version == Ice.Util.intVersion());
+        Console.Out.WriteLine("ok");
     }
 
     public static int Main(string[] args)
     {
-        int status = 0;
-        try
-        {
-            Console.Out.Write("testing Slice predefined macros... ");
-            Console.Out.Flush();
-            Default d = new Default();
-            test(d.x == 10);
-            test(d.y == 10);
-
-            NoDefault nd = new NoDefault();
-            test(nd.x != 10);
-            test(nd.y != 10);
-
-            CsOnly c = new CsOnly();
-            test(c.lang.Equals("cs"));
-            test(c.version == Ice.Util.intVersion());
-            Console.Out.WriteLine("ok");
-        }
-        catch(System.Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
-        return status;
+        return TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/macros/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Slice/macros/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Slice/macros/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/macros/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,45 +17,47 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/macros/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Slice/macros/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Slice/macros/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/macros/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/macros/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/macros/Test.ice zeroc-ice-3.7.2/csharp/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This macro sets the default value only when compiling with slice2cs.
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/structure/Client.cs zeroc-ice-3.7.2/csharp/test/Slice/structure/Client.cs
--- zeroc-ice-3.7.1/csharp/test/Slice/structure/Client.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/structure/Client.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,26 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System;
 using System.Collections.Generic;
 using Test;
 
-public class Client
+public class Client : TestHelper
 {
-    private static void test(bool b)
-    {
-        if(!b)
-        {
-            throw new Exception();
-        }
-    }
-
     private static void allTests(Ice.Communicator communicator)
     {
         Console.Out.Write("testing equals() for Slice structures... ");
@@ -267,36 +254,16 @@
         Console.Out.WriteLine("ok");
     }
 
-    private static int run(string[] args, Ice.Communicator communicator)
+    public override void run(string[] args)
     {
-        allTests(communicator);
-
-        return 0;
+        using(var communicator = initialize(ref args))
+        {
+            allTests(communicator);
+        }
     }
 
     public static int Main(string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            communicator = Ice.Util.initialize(ref args, initData);
-            status = run(args, communicator);
-        }
-        catch(System.Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            communicator.destroy();
-        }
-
-        return status;
+        return TestDriver.runTest<Client>(args);
     }
 }
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/structure/msbuild/client/net45/client.csproj zeroc-ice-3.7.2/csharp/test/Slice/structure/msbuild/client/net45/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Slice/structure/msbuild/client/net45/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/structure/msbuild/client/net45/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')"/>
-  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props"/>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" />
+  <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props" />
   <PropertyGroup Label="Globals">
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
+  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,45 +17,47 @@
     <AssemblyName>client</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ice, Version=3.7.1.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
+    <Reference Include="Ice, Version=3.7.2.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
       <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath>
     </Reference>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\"/>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs">
+      <Link>TestHelper.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
-    <Compile Include="generated\Test.cs"/>
+    <Compile Include="generated\Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="client.exe.config"/>
+    <None Include="client.exe.config" />
     <SliceCompile Include="..\..\..\Test.ice">
       <Link>Test.ice</Link>
     </SliceCompile>
-    <None Include="packages.config"/>
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" />
   <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.1\build\zeroc.ice.net.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))"/>
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.2\build\zeroc.ice.net.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
+  <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/structure/msbuild/client/net45/packages.config zeroc-ice-3.7.2/csharp/test/Slice/structure/msbuild/client/net45/packages.config
--- zeroc-ice-3.7.1/csharp/test/Slice/structure/msbuild/client/net45/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/structure/msbuild/client/net45/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="zeroc.ice.net" version="3.7.1" targetFramework="net452" />
+  <package id="zeroc.ice.net" version="3.7.2" targetFramework="net452" />
   <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj zeroc-ice-3.7.2/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj
--- zeroc-ice-3.7.1/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/structure/msbuild/client/netstandard2.0/client.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../../../../../msbuild/ice.common.props"/>
+  <Import Project="../../../../../../msbuild/ice.common.props" />
   <PropertyGroup>
     <AssemblyName>client</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <OutputPath>.</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../../../Client.cs"/>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
-    <SliceCompile Include="../../../Test.ice"/>
+    <Compile Include="../../../../../TestCommon/TestHelper.cs" />
+    <Compile Include="../../../Client.cs" />
+    <Compile Include="generated\Test.cs">
+      <SliceCompileSource>../../../Test.ice</SliceCompileSource>
+    </Compile>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <SliceCompile Include="../../../Test.ice" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(ICE_BIN_DIST)' == 'all'">
       <ItemGroup>
-        <PackageReference Include="zeroc.ice.net" Version="3.7.1"/>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll"/>
+        <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" />
       </ItemGroup>
     </Otherwise>
   </Choose>
diff -Nru zeroc-ice-3.7.1/csharp/test/Slice/structure/Test.ice zeroc-ice-3.7.2/csharp/test/Slice/structure/Test.ice
--- zeroc-ice-3.7.1/csharp/test/Slice/structure/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/Slice/structure/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj zeroc-ice-3.7.2/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj
--- zeroc-ice-3.7.1/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/TestCommon/msbuild/testcommon/netstandard2.0/testcommon.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\..\..\msbuild\ice.common.props"/>
+  <PropertyGroup>
+    <AssemblyName>TestCommon</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <OutputPath>.</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="../../../TestHelper.cs"/>
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4"/>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2"/>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="..\..\..\..\..\lib\netstandard2.0\Ice.dll"/>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/TestCommon/Properties/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/test/TestCommon/Properties/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/test/TestCommon/Properties/AssemblyInfo.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/TestCommon/Properties/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -19,7 +14,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© 2003-2018 ZeroC, Inc.")]
+[assembly: AssemblyCopyright("© ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
@@ -39,7 +34,7 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.7.1")]
-[assembly: AssemblyFileVersion("3.7.1")]
+[assembly: AssemblyVersion("3.7.2")]
+[assembly: AssemblyFileVersion("3.7.2")]
 
 [assembly: System.CLSCompliant(true)]
diff -Nru zeroc-ice-3.7.1/csharp/test/TestCommon/TestApp.cs zeroc-ice-3.7.2/csharp/test/TestCommon/TestApp.cs
--- zeroc-ice-3.7.1/csharp/test/TestCommon/TestApp.cs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/TestCommon/TestApp.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Diagnostics;
-
-namespace TestCommon
-{
-    public abstract class Application
-    {
-        public
-        Application()
-        {
-        }
-
-        //
-        // This runmain() must be called by the global main(). runmain()
-        // initializes the Communicator, calls run(), and destroys
-        // the Communicator upon return from run(). It thereby handles
-        // all exceptions properly, i.e., error messages are printed
-        // if exceptions propagate to main(), and the Communicator is
-        // always destroyed, regardless of exceptions.
-        //
-        public int runmain(string[] args)
-        {
-            Ice.InitializationData initData = getInitData(ref args);
-            return runmain(args, initData);
-        }
-
-        public int runmain(string[] args, Ice.InitializationData initializationData)
-        {
-            _testName = AppDomain.CurrentDomain.FriendlyName;
-
-            if(_communicator != null)
-            {
-                Console.Out.WriteLine(_testName + ": only one instance of the Application class can be used");
-                return 1;
-            }
-
-            //
-            // We parse the properties here to extract Ice.ProgramName.
-            //
-            if(initializationData == null)
-            {
-                initializationData = getInitData(ref args);
-            }
-
-            Ice.InitializationData initData;
-            if(initializationData != null)
-            {
-                initData = (Ice.InitializationData)initializationData.Clone();
-            }
-            else
-            {
-                initData = new Ice.InitializationData();
-            }
-            initData.properties = Ice.Util.createProperties(ref args, initData.properties);
-
-            //
-            // If the process logger is the default logger, we replace it with a
-            // a logger that uses the program name as the prefix.
-            //
-            if(Ice.Util.getProcessLogger() is Ice.LoggerI)
-            {
-                Ice.Util.setProcessLogger(new Ice.ConsoleLoggerI(initData.properties.getProperty("Ice.ProgramName")));
-            }
-
-            int status = 0;
-            try
-            {
-                _communicator = Ice.Util.initialize(ref args, initData);
-                status = run(args);
-            }
-            catch(Exception ex)
-            {
-                Console.Out.WriteLine(_testName + ": " + ex);
-                status = 1;
-            }
-
-            if(_communicator != null)
-            {
-                _communicator.destroy();
-                _communicator = null;
-            }
-            return status;
-        }
-
-        public void stop()
-        {
-            if(_communicator != null)
-            {
-                _communicator.shutdown();
-            }
-        }
-
-        public abstract int run(string[] args);
-
-        //
-        // Hook to override the initialization data. This hook is
-        // necessary because some properties must be set prior to
-        // communicator initialization.
-        //
-        protected virtual Ice.InitializationData getInitData(ref string[] args)
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            args = initData.properties.parseCommandLineOptions("Test", args);
-            return initData;
-        }
-
-        //
-        // Return the application name, i.e., argv[0].
-        //
-        public string appName()
-        {
-            return _testName;
-        }
-
-        public Ice.Communicator communicator()
-        {
-            return _communicator;
-        }
-
-        public string getTestEndpoint(int num)
-        {
-            return getTestEndpoint(num, "");
-        }
-
-        public string getTestEndpoint(int num, string prot)
-        {
-            return getTestEndpoint(_communicator.getProperties(), num, prot);
-        }
-
-        static public string getTestEndpoint(Ice.Properties properties, int num)
-        {
-            return getTestEndpoint(properties, num, "");
-        }
-
-        static public string getTestEndpoint(Ice.Properties properties, int num, string prot)
-        {
-            string protocol = prot;
-            if(protocol == "")
-            {
-                protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default");
-            }
-            int basePort = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010);
-            return protocol + " -p " + (basePort + num);
-        }
-
-        public string getTestHost()
-        {
-            return getTestHost(_communicator.getProperties());
-        }
-
-        static public string getTestHost(Ice.Properties properties)
-        {
-            return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
-        }
-
-        public string getTestProtocol()
-        {
-            return getTestProtocol(_communicator.getProperties());
-        }
-
-        static public string getTestProtocol(Ice.Properties properties)
-        {
-            return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        }
-
-        public int getTestPort(int num)
-        {
-            return getTestPort(_communicator.getProperties(), num);
-        }
-
-        static public int getTestPort(Ice.Properties properties, int num)
-        {
-            return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
-        }
-
-        protected static void test(bool b)
-        {
-            if(!b)
-            {
-                Debug.Assert(false);
-                throw new Exception();
-            }
-        }
-
-        private string _testName;
-        private Ice.Communicator _communicator;
-    }
-
-    public abstract class AllTests
-    {
-        protected static void test(bool b)
-        {
-            if(!b)
-            {
-                Debug.Assert(false);
-                throw new Exception();
-            }
-        }
-
-        public static void Write(string msg)
-        {
-            Console.Out.Write(msg);
-        }
-
-        public static void WriteLine(string msg)
-        {
-            Console.Out.WriteLine(msg);
-        }
-
-        public static void Flush()
-        {
-            Console.Out.Flush();
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/csharp/test/TestCommon/TestHelper.cs zeroc-ice-3.7.2/csharp/test/TestCommon/TestHelper.cs
--- zeroc-ice-3.7.1/csharp/test/TestCommon/TestHelper.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/TestCommon/TestHelper.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,191 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.IO;
+
+namespace Test
+{
+    public interface ControllerHelper
+    {
+        void serverReady();
+        void communicatorInitialized(Ice.Communicator communicator);
+    }
+
+    public interface PlatformAdapter
+    {
+        bool isEmulator();
+
+        string processControllerRegistryHost();
+
+        string processControllerIdentity();
+    }
+
+    public abstract class TestHelper
+    {
+        public abstract void run(string[] args);
+
+        public string getTestEndpoint(int num = 0, string protocol = "")
+        {
+            return getTestEndpoint(_communicator.getProperties(), num, protocol);
+        }
+
+        static public string getTestEndpoint(Ice.Properties properties, int num = 0, string protocol = "")
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(protocol == "" ? properties.getPropertyWithDefault("Ice.Default.Protocol", "default") :
+                                       protocol);
+            sb.Append(" -p ");
+            sb.Append(properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num);
+            return sb.ToString();
+        }
+
+        public string getTestHost()
+        {
+            return getTestHost(_communicator.getProperties());
+        }
+
+        static public string getTestHost(Ice.Properties properties)
+        {
+            return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+        }
+
+        public String getTestProtocol()
+        {
+            return getTestProtocol(_communicator.getProperties());
+        }
+
+        static public String getTestProtocol(Ice.Properties properties)
+        {
+            return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+        }
+
+        public int getTestPort(int num)
+        {
+            return getTestPort(_communicator.getProperties(), num);
+        }
+
+        static public int getTestPort(Ice.Properties properties, int num)
+        {
+            return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
+        }
+
+        public TextWriter getWriter()
+        {
+            if(_writer == null)
+            {
+                return Console.Out;
+            }
+            else
+            {
+                return _writer;
+            }
+        }
+
+        public void setWriter(TextWriter writer)
+        {
+            _writer = writer;
+        }
+
+        public Ice.Properties createTestProperties(ref string[] args)
+        {
+            Ice.Properties properties = Ice.Util.createProperties(ref args);
+            args = properties.parseCommandLineOptions("Test", args);
+            return properties;
+        }
+
+        public Ice.Communicator initialize(ref string[] args)
+        {
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = createTestProperties(ref args);
+            return initialize(initData);
+        }
+
+        public Ice.Communicator initialize(Ice.Properties properties)
+        {
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = properties;
+            return initialize(initData);
+        }
+
+        public Ice.Communicator initialize(Ice.InitializationData initData)
+        {
+            Ice.Communicator communicator = Ice.Util.initialize(initData);
+            if(_communicator == null)
+            {
+                _communicator = communicator;
+            }
+            if(_controllerHelper != null)
+            {
+                _controllerHelper.communicatorInitialized(communicator);
+            }
+            return  communicator;
+        }
+
+        public Ice.Communicator communicator()
+        {
+            return _communicator;
+        }
+
+        protected static void test(bool b)
+        {
+            if (!b)
+            {
+                Debug.Assert(false);
+                throw new Exception();
+            }
+        }
+
+        public void setControllerHelper(ControllerHelper controllerHelper)
+        {
+            _controllerHelper = controllerHelper;
+        }
+
+        public void serverReady()
+        {
+            if (_controllerHelper != null)
+            {
+                _controllerHelper.serverReady();
+            }
+        }
+
+        private Ice.Communicator _communicator;
+        private ControllerHelper _controllerHelper;
+        private TextWriter _writer;
+    }
+
+    public abstract class AllTests
+    {
+        protected static void test(bool b)
+        {
+            if (!b)
+            {
+                Debug.Assert(false);
+                throw new Exception();
+            }
+        }
+    }
+
+    public static class TestDriver
+    {
+        public static int runTest<T>(string[] args)
+            where T : TestHelper, new()
+        {
+            int status = 0;
+            try
+            {
+                T h = new T();
+                h.run(args);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+                status = 1;
+            }
+            return status;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller/App.xaml zeroc-ice-3.7.2/csharp/test/xamarin/controller/App.xaml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller/App.xaml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller/App.xaml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Application xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="controller.App">
+    <Application.Resources>
+    </Application.Resources>
+</Application>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller/App.xaml.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller/App.xaml.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller/App.xaml.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller/App.xaml.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,32 @@
+using System.Reflection;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+[assembly: XamlCompilation (XamlCompilationOptions.Compile)]
+namespace controller
+{
+    public partial class App : Application
+    {
+        public App (Test.PlatformAdapter platformAdapter)
+        {
+            InitializeComponent();
+
+            MainPage = new MainPage(platformAdapter);
+        }
+
+        protected override void OnStart ()
+        {
+            // Handle when your app starts
+        }
+
+        protected override void OnSleep ()
+        {
+            // Handle when your app sleeps
+        }
+
+        protected override void OnResume ()
+        {
+            // Handle when your app resumes
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller/controller.csproj zeroc-ice-3.7.2/csharp/test/xamarin/controller/controller.csproj
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller/controller.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller/controller.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,92 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <Import Project="..\..\..\msbuild\ice.common.props" />
+  <PropertyGroup>
+      <EnableDefaultCompileItems>true</EnableDefaultCompileItems>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="test\**" />
+    <EmbeddedResource Remove="test\**" />
+    <None Remove="test\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
+    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <Compile Update="generated\Controller.cs">
+      <SliceCompileSource>..\..\..\..\scripts\Controller.ice</SliceCompileSource>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="generated\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <SliceCompile Include="..\..\..\..\scripts\Controller.ice" Link="Controller.ice" />
+  </ItemGroup>
+
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="..\..\..\lib\netstandard2.0\Ice.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceSSL.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceDiscovery.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
+  <ItemGroup>
+    <SliceCompile Remove="test\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\..\..\certs\cacert.der" Link="cacert.der" />
+    <EmbeddedResource Include="..\..\..\..\certs\client.p12" Link="client.p12" />
+    <EmbeddedResource Include="..\..\..\..\certs\server.p12" Link="server.p12" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Ice\acm\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\adapterDeactivation\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\admin\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\ami\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\binding\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\checksum\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\defaultServant\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\defaultValue\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\dictMapping\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\enums\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\exceptions\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\facets\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\hold\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\info\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\inheritance\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\interceptor\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\invoke\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\location\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\objects\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\operations\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\optional\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\namespacemd\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\proxy\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\retry\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\scope\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\seqMapping\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\serialize\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\servantLocator\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\stream\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\threadPoolPriority\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\timeout\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\Ice\udp\msbuild\test\netstandard2.0\test.csproj" />
+    <ProjectReference Include="..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" />
+  </ItemGroup>
+</Project>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller/MainPage.xaml zeroc-ice-3.7.2/csharp/test/xamarin/controller/MainPage.xaml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller/MainPage.xaml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller/MainPage.xaml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:controller"
+             x:Class="controller.MainPage">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Label Grid.Row="0" Text="ProcessControllerRegistry" FontSize="20"/>
+        <Entry Grid.Row="1" Text="" x:Name="ProcessControllerRegistryHost"/>
+        <Label Grid.Row="2" Text="IPv4" FontSize="20"/>
+        <Picker Grid.Row="3"  x:Name="IPv4Address"/>
+        <Label Grid.Row="4" Text="IPv6" FontSize="20"/>
+        <Picker Grid.Row="5"  x:Name="IPv6Address"/>
+        <Button Grid.Row="6" x:Name="RegisterProcessController" Text="Register Process Controller" IsEnabled="False"/>
+        <ListView Grid.Row="7" x:Name="Output"></ListView>
+    </Grid>
+</ContentPage>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller/MainPage.xaml.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller/MainPage.xaml.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller/MainPage.xaml.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller/MainPage.xaml.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,815 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using System;
+using System.Text;
+using System.IO;
+using Xamarin.Forms;
+using System.Net;
+using System.Net.Sockets;
+using System.Net.NetworkInformation;
+using System.Threading;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Test;
+using Ice;
+using Test.Common;
+using System.Security.Cryptography.X509Certificates;
+
+namespace controller
+{
+    public class TestFactory
+    {
+        public static TestHelper create(string type)
+        {
+            if(type.Equals("Ice.acm.Server"))
+            {
+                return new Ice.acm.Server();
+            }
+            else if(type.Equals("Ice.acm.Client"))
+            {
+                return new Ice.acm.Client();
+            }
+
+            else if(type.Equals("Ice.adapterDeactivation.Server"))
+            {
+                return new Ice.adapterDeactivation.Server();
+            }
+            else if(type.Equals("Ice.adapterDeactivation.Client"))
+            {
+                return new Ice.adapterDeactivation.Client();
+            }
+            else if(type.Equals("Ice.adapterDeactivation.Collocated"))
+            {
+                return new Ice.adapterDeactivation.Collocated();
+            }
+
+            else if(type.Equals("Ice.admin.Server"))
+            {
+                return new Ice.admin.Server();
+            }
+            else if(type.Equals("Ice.admin.Client"))
+            {
+                return new Ice.admin.Client();
+            }
+
+            else if(type.Equals("Ice.ami.Server"))
+            {
+                return new Ice.ami.Server();
+            }
+            else if(type.Equals("Ice.ami.Client"))
+            {
+                return new Ice.ami.Client();
+            }
+            else if(type.Equals("Ice.ami.Collocated"))
+            {
+                return new Ice.ami.Collocated();
+            }
+
+            else if(type.Equals("Ice.binding.Server"))
+            {
+                return new Ice.binding.Server();
+            }
+            else if(type.Equals("Ice.binding.Client"))
+            {
+                return new Ice.binding.Client();
+            }
+
+            else if(type.Equals("Ice.checksum.Server"))
+            {
+                return new Ice.checksum.Server();
+            }
+            else if(type.Equals("Ice.checksum.Client"))
+            {
+                return new Ice.checksum.Client();
+            }
+
+            else if(type.Equals("Ice.defaultServant.Client"))
+            {
+                return new Ice.defaultServant.Client();
+            }
+
+            else if(type.Equals("Ice.defaultValue.Client"))
+            {
+                return new Ice.defaultValue.Client();
+            }
+
+            else if(type.Equals("Ice.dictMapping.Client"))
+            {
+                return new Ice.dictMapping.Client();
+            }
+            else if(type.Equals("Ice.dictMapping.Collocated"))
+            {
+                return new Ice.dictMapping.Collocated();
+            }
+            else if(type.Equals("Ice.dictMapping.Server"))
+            {
+                return new Ice.dictMapping.Server();
+            }
+            else if(type.Equals("Ice.dictMapping.Serveramd"))
+            {
+                return new Ice.dictMapping.AMD.Server();
+            }
+
+            else if(type.Equals("Ice.enums.Client"))
+            {
+                return new Ice.enums.Client();
+            }
+            else if(type.Equals("Ice.enums.Server"))
+            {
+                return new Ice.enums.Server();
+            }
+
+            else if(type.Equals("Ice.exceptions.Client"))
+            {
+                return new Ice.exceptions.Client();
+            }
+            else if(type.Equals("Ice.exceptions.Collocated"))
+            {
+                return new Ice.exceptions.Collocated();
+            }
+            else if(type.Equals("Ice.exceptions.Server"))
+            {
+                return new Ice.exceptions.Server();
+            }
+            else if(type.Equals("Ice.exceptions.Serveramd"))
+            {
+                return new Ice.exceptions.AMD.Server();
+            }
+
+            else if(type.Equals("Ice.facets.Client"))
+            {
+                return new Ice.facets.Client();
+            }
+            else if(type.Equals("Ice.facets.Collocated"))
+            {
+                return new Ice.facets.Collocated();
+            }
+            else if(type.Equals("Ice.facets.Server"))
+            {
+                return new Ice.facets.Server();
+            }
+
+            else if(type.Equals("Ice.hold.Client"))
+            {
+                return new Ice.hold.Client();
+            }
+            else if(type.Equals("Ice.hold.Server"))
+            {
+                return new Ice.hold.Server();
+            }
+
+            else if(type.Equals("Ice.info.Client"))
+            {
+                return new Ice.info.Client();
+            }
+            else if(type.Equals("Ice.info.Server"))
+            {
+                return new Ice.info.Server();
+            }
+
+            else if(type.Equals("Ice.inheritance.Client"))
+            {
+                return new Ice.inheritance.Client();
+            }
+            else if(type.Equals("Ice.inheritance.Collocated"))
+            {
+                return new Ice.inheritance.Collocated();
+            }
+            else if(type.Equals("Ice.inheritance.Server"))
+            {
+                return new Ice.inheritance.Server();
+            }
+
+            else if(type.Equals("Ice.interceptor.Client"))
+            {
+                return new Ice.interceptor.Client();
+            }
+
+            else if(type.Equals("Ice.invoke.Client"))
+            {
+                return new Ice.invoke.Client();
+            }
+            else if(type.Equals("Ice.invoke.Server"))
+            {
+                return new Ice.invoke.Server();
+            }
+
+            else if(type.Equals("Ice.location.Client"))
+            {
+                return new Ice.location.Client();
+            }
+            else if(type.Equals("Ice.location.Server"))
+            {
+                return new Ice.location.Server();
+            }
+
+            else if(type.Equals("Ice.objects.Client"))
+            {
+                return new Ice.objects.Client();
+            }
+            else if(type.Equals("Ice.objects.Collocated"))
+            {
+                return new Ice.objects.Collocated();
+            }
+            else if(type.Equals("Ice.objects.Server"))
+            {
+                return new Ice.objects.Server();
+            }
+
+            else if(type.Equals("Ice.operations.Client"))
+            {
+                return new Ice.operations.Client();
+            }
+            else if(type.Equals("Ice.operations.Collocated"))
+            {
+                return new Ice.operations.Collocated();
+            }
+            else if(type.Equals("Ice.operations.Server"))
+            {
+                return new Ice.operations.Server();
+            }
+            else if(type.Equals("Ice.operations.Serveramd"))
+            {
+                return new Ice.operations.AMD.Server();
+            }
+            else if(type.Equals("Ice.operations.Serveramdtie"))
+            {
+                return new Ice.operations.AMD.tie.Server();
+            }
+            else if(type.Equals("Ice.operations.Servertie"))
+            {
+                return new Ice.operations.tie.Server();
+            }
+
+            else if(type.Equals("Ice.optional.Client"))
+            {
+                return new Ice.optional.Client();
+            }
+            else if(type.Equals("Ice.optional.Server"))
+            {
+                return new Ice.optional.Server();
+            }
+            else if(type.Equals("Ice.optional.Serveramd"))
+            {
+                return new Ice.optional.AMD.Server();
+            }
+
+            else if(type.Equals("Ice.namespacemd.Client"))
+            {
+                return new Ice.namespacemd.Client();
+            }
+            else if(type.Equals("Ice.namespacemd.Server"))
+            {
+                return new Ice.namespacemd.Server();
+            }
+
+            else if(type.Equals("Ice.proxy.Client"))
+            {
+                return new Ice.proxy.Client();
+            }
+            else if(type.Equals("Ice.proxy.Collocated"))
+            {
+                return new Ice.proxy.Collocated();
+            }
+            else if(type.Equals("Ice.proxy.Server"))
+            {
+                return new Ice.proxy.Server();
+            }
+            else if(type.Equals("Ice.proxy.Serveramd"))
+            {
+                return new Ice.proxy.AMD.Server();
+            }
+
+            else if(type.Equals("Ice.retry.Client"))
+            {
+                return new Ice.retry.Client();
+            }
+            else if(type.Equals("Ice.retry.Collocated"))
+            {
+                return new Ice.retry.Collocated();
+            }
+            else if(type.Equals("Ice.retry.Server"))
+            {
+                return new Ice.retry.Server();
+            }
+
+            else if(type.Equals("Ice.scope.Client"))
+            {
+                return new Ice.scope.Client();
+            }
+            else if(type.Equals("Ice.scope.Server"))
+            {
+                return new Ice.scope.Server();
+            }
+
+            else if(type.Equals("Ice.seqMapping.Client"))
+            {
+                return new Ice.seqMapping.Client();
+            }
+            else if(type.Equals("Ice.seqMapping.Collocated"))
+            {
+                return new Ice.seqMapping.Collocated();
+            }
+            else if(type.Equals("Ice.seqMapping.Server"))
+            {
+                return new Ice.seqMapping.Server();
+            }
+            else if(type.Equals("Ice.seqMapping.Serveramd"))
+            {
+                return new Ice.seqMapping.AMD.Server();
+            }
+
+            else if(type.Equals("Ice.serialize.Client"))
+            {
+                return new Ice.serialize.Client();
+            }
+
+            else if(type.Equals("Ice.servantLocator.Client"))
+            {
+                return new Ice.servantLocator.Client();
+            }
+            else if(type.Equals("Ice.servantLocator.Collocated"))
+            {
+                return new Ice.servantLocator.Collocated();
+            }
+            else if(type.Equals("Ice.servantLocator.Server"))
+            {
+                return new Ice.servantLocator.Server();
+            }
+            else if(type.Equals("Ice.servantLocator.Serveramd"))
+            {
+                return new Ice.servantLocator.AMD.Server();
+            }
+
+            else if(type.Equals("Ice.stream.Client"))
+            {
+                return new Ice.stream.Client();
+            }
+
+            else if(type.Equals("Ice.threadPoolPriority.Client"))
+            {
+                return new Ice.threadPoolPriority.Client();
+            }
+            else if(type.Equals("Ice.threadPoolPriority.Server"))
+            {
+                return new Ice.threadPoolPriority.Server();
+            }
+
+            else if(type.Equals("Ice.timeout.Client"))
+            {
+                return new Ice.timeout.Client();
+            }
+            else if(type.Equals("Ice.timeout.Server"))
+            {
+                return new Ice.timeout.Server();
+            }
+
+            else if(type.Equals("Ice.udp.Client"))
+            {
+                return new Ice.udp.Client();
+            }
+            else if(type.Equals("Ice.udp.Server"))
+            {
+                return new Ice.udp.Server();
+            }
+
+            else
+            {
+                return null;
+            }
+        }
+    }
+
+    public class ControllerHelperI : ControllerHelper
+    {
+        public ControllerHelperI(string name, string[] args, MainPage page, PlatformAdapter platformAdapter)
+        {
+            _name = name;
+            _args = args;
+            _page = page;
+            _platformAdapter = platformAdapter;
+            _typename = name;
+        }
+
+        public void communicatorInitialized(Communicator communicator)
+        {
+            var properties = communicator.getProperties();
+            if(properties.getProperty("Ice.Plugin.IceSSL").Equals("IceSSL.dll:IceSSL.PluginFactory"))
+            {
+                var plugin =(IceSSL.Plugin)communicator.getPluginManager().getPlugin("IceSSL");
+                plugin.setCertificates(loadCertificate(properties.getProperty("IceSSL.CertFile"),
+                                                       properties.getProperty("IceSSL.Password")));
+                plugin.setCACertificates(loadCertificate(properties.getProperty("IceSSL.CAs")));
+                communicator.getPluginManager().initializePlugins();
+
+                if(communicator.getProperties().getPropertyWithDefault("Ice.Admin.DelayCreation", "0").Equals("1"))
+                {
+                    communicator.getAdmin();
+                }
+            }
+        }
+
+        public X509Certificate2Collection loadCertificate(string name, string password = "")
+        {
+            var assembly = IntrospectionExtensions.GetTypeInfo(typeof(MainPage)).Assembly;
+            var stream = assembly.GetManifestResourceStream(string.Format("controller.{0}", name));
+            var memoryStream = new MemoryStream();
+            stream.CopyTo(memoryStream);
+            var cert = new X509Certificate2Collection();
+            if(string.IsNullOrEmpty(password))
+            {
+                cert.Import(memoryStream.ToArray());
+            }
+            else
+            {
+                cert.Import(memoryStream.ToArray(), password, X509KeyStorageFlags.UserKeySet);
+            }
+            return cert;
+        }
+
+        public string getOutput()
+        {
+            return _helper.getWriter().ToString();
+        }
+
+        public void join()
+        {
+            if(_thread != null)
+            {
+                _thread.Join();
+            }
+        }
+
+        public void completed(int status)
+        {
+            lock(this)
+            {
+                _completed = true;
+                _status = status;
+                Monitor.PulseAll(this);
+            }
+        }
+
+        public void run()
+        {
+            _thread = new Thread(() =>
+            {
+                try
+                {
+                    _helper = TestFactory.create(_typename);
+                    _helper.setControllerHelper(this);
+                    _helper.setWriter(new StringWriter());
+                    _helper.run(_args);
+                    completed(0);
+                }
+                catch(System.Exception ex)
+                {
+                    _helper.getWriter().WriteLine("unexpected unknown exception while running `{0}':\n", ex);
+                    completed(1);
+                }
+            });
+            _thread.Start();
+        }
+
+        public string loggerPrefix()
+        {
+            return _name;
+        }
+
+        public void serverReady()
+        {
+            lock(this)
+            {
+                _ready = true;
+                Monitor.PulseAll(this);
+            }
+        }
+
+        public void shutdown()
+        {
+            lock(this)
+            {
+                if(_completed)
+                {
+                    return;
+                }
+
+                if(_helper != null)
+                {
+                    var communicator = _helper.communicator();
+                    if(communicator != null)
+                    {
+                        communicator.shutdown();
+                    }
+                }
+            }
+        }
+
+        public void waitReady(int msec)
+        {
+            lock(this)
+            {
+                while(!_ready && !_completed)
+                {
+                    if(!Monitor.Wait(this, msec * 1000))
+                    {
+                        throw new ProcessFailedException("timed out waiting for the process to be ready");
+                    }
+                }
+            }
+        }
+
+        public int waitSuccess(int msec)
+        {
+            lock(this)
+            {
+                while(!_completed)
+                {
+                    if(!Monitor.Wait(this, msec * 1000))
+                    {
+                        throw new ProcessFailedException("timed out waiting for the process to be ready");
+                    }
+                }
+                return _status;
+            }
+        }
+
+        private MainPage _page;
+        private PlatformAdapter _platformAdapter;
+        private string _name;
+        private string[] _args;
+        private TestHelper _helper;
+        private bool _ready;
+        private bool _completed;
+        private int _status;
+        private Thread _thread;
+        private string _typename;
+    }
+
+    public class ProccessI : Test.Common.ProcessDisp_
+    {
+        public ProccessI(ControllerHelperI controllerHelper)
+        {
+            _controllerHelper = controllerHelper;
+        }
+
+        public override void waitReady(int timeout, Current current)
+        {
+            _controllerHelper.waitReady(timeout);
+        }
+
+        public override int waitSuccess(int timeout, Current current)
+        {
+            return _controllerHelper.waitSuccess(timeout);
+        }
+
+        public override string terminate(Current current)
+        {
+            _controllerHelper.shutdown();
+            current.adapter.remove(current.id);
+            _controllerHelper.join();
+            return _controllerHelper.getOutput();
+        }
+
+        private ControllerHelperI _controllerHelper;
+    }
+
+    public class ProcessControllerI : Test.Common.ProcessControllerDisp_
+    {
+        public ProcessControllerI(MainPage mainPage)
+        {
+            _mainPage = mainPage;
+        }
+
+        public override Test.Common.ProcessPrx start(string testsuite, string exe, string[] args, Current current)
+        {
+            var test = testsuite.Replace("/", ".") + "." + char.ToUpper(exe[0]) + exe.Substring(1);
+            _mainPage.print("starting test." + test + "... ");
+            string[] newArgs = new string[args.Length + 1];
+            newArgs[0] = test;
+            Array.Copy(args, 0, newArgs, 1, args.Length);
+            var helper = new ControllerHelperI(test, newArgs, _mainPage, _mainPage.platformAdapter);
+            helper.run();
+            return Test.Common.ProcessPrxHelper.uncheckedCast(current.adapter.addWithUUID(new ProccessI(helper)));
+        }
+
+        public override string getHost(string protocol, bool ipv6, Current current)
+        {
+            if(_mainPage.platformAdapter.isEmulator())
+            {
+                return "127.0.0.1";
+            }
+            else
+            {
+                return _mainPage.getHost(ipv6);
+            }
+        }
+
+        private MainPage _mainPage;
+    }
+
+    public class ControllerI
+    {
+        public ControllerI(MainPage mainPage)
+        {
+            IceSSL.Util.registerIceSSL(false);
+            IceDiscovery.Util.registerIceDiscovery(false);
+            _mainPage = mainPage;
+            var initData = new InitializationData();
+            initData.properties = Util.createProperties();
+            initData.properties.setProperty("Ice.ThreadPool.Client.SizeMax", "10");
+            initData.properties.setProperty("Ice.ThreadPool.Server.SizeMax", "10");
+            initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp");
+            initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
+            //initData.properties.setProperty("Ice.Trace.Network", "3");
+            //initData.properties.setProperty("Ice.Trace.Protocol", "1");
+            initData.properties.setProperty("ControllerAdapter.AdapterId", new Guid().ToString());
+
+            if(!mainPage.platformAdapter.isEmulator())
+            {
+                initData.properties.setProperty("Ice.Plugin.IceDiscovery", "IceDiscovery:IceDiscovery.PluginFactory");
+                initData.properties.setProperty("IceDiscovery.DomainId", "TestController");
+            }
+
+            _communicator = Util.initialize(initData);
+
+            _adapter = _communicator.createObjectAdapter("ControllerAdapter");
+            _processController = ProcessControllerPrxHelper.uncheckedCast(
+                _adapter.add(new ProcessControllerI(mainPage),
+                             Util.stringToIdentity(mainPage.platformAdapter.processControllerIdentity())));
+            _adapter.activate();
+
+            registerProcessController();
+            _mainPage.print(mainPage.platformAdapter.processControllerIdentity());
+        }
+
+        public void
+        registerProcessController()
+        {
+            Task.Run(async() =>
+                {
+                    try
+                    {
+                        if(_mainPage.RegisterProcessControllerEnabled())
+                        {
+                            ProcessControllerRegistryPrx registry;
+                            if(_mainPage.processControllerRegistryHost().Length == 0)
+                            {
+                                registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
+                                    _communicator.stringToProxy("Util/ProcessControllerRegistry"));
+                            }
+                            else
+                            {
+                                registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
+                                    _communicator.stringToProxy(string.Format(
+                                        "Util/ProcessControllerRegistry:tcp -h {0} -p 15001",
+                                        _mainPage.processControllerRegistryHost())));
+                            }
+                            await registry.ice_pingAsync();
+                            var connection = registry.ice_getConnection();
+                            connection.setAdapter(_adapter);
+                            connection.setACM(5, ACMClose.CloseOff, ACMHeartbeat.HeartbeatAlways);
+                            connection.setCloseCallback(conn =>
+                                {
+                                    _mainPage.print("connection with process controller registry closed");
+                                    Thread.Sleep(500);
+                                    registerProcessController();
+                                });
+                            await registry.setProcessControllerAsync(_processController);
+                        }
+                    }
+                    catch(ConnectFailedException)
+                    {
+                        Thread.Sleep(500);
+                        registerProcessController();
+                    }
+                    catch(Ice.TimeoutException)
+                    {
+                        Thread.Sleep(500);
+                        registerProcessController();
+                    }
+                    catch(DNSException)
+                    {
+                        Thread.Sleep(500);
+                        registerProcessController();
+                    }
+                    catch(System.Exception ex)
+                    {
+                        _mainPage.print(ex.ToString());
+                    }
+                });
+        }
+
+        private Communicator _communicator;
+        private MainPage _mainPage;
+        private ObjectAdapter _adapter;
+        private ProcessControllerPrx _processController;
+    }
+
+    public partial class MainPage : ContentPage
+    {
+        public MainPage(PlatformAdapter platformAdapter)
+        {
+            InitializeComponent();
+            this.platformAdapter = platformAdapter;
+
+            IPv4Address.Items.Add(IPAddress.Loopback.ToString());
+            IPv4Address.SelectedIndex = 0;
+
+            IPv6Address.Items.Add(IPAddress.IPv6Loopback.ToString());
+            IPv6Address.SelectedIndex = 0;
+
+            ProcessControllerRegistryHost.Text = platformAdapter.processControllerRegistryHost();
+
+            ProcessControllerRegistryHost.TextChanged += ProcessControllerRegistryHost_TextChanged;
+            RegisterProcessController.Clicked += RegisterProcessController_Clicked;
+
+            NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
+            foreach(NetworkInterface ni in nics)
+            {
+                IPInterfaceProperties ipProps = ni.GetIPProperties();
+                UnicastIPAddressInformationCollection uniColl = ipProps.UnicastAddresses;
+                foreach(UnicastIPAddressInformation uni in uniColl)
+                {
+                    if(uni.Address.AddressFamily == AddressFamily.InterNetwork)
+                    {
+                        if(!uni.Address.Equals(IPAddress.Loopback))
+                        {
+                            IPv4Address.Items.Add(uni.Address.ToString());
+                        }
+                    }
+                    else if(uni.Address.AddressFamily == AddressFamily.InterNetworkV6)
+                    {
+                        if(!uni.Address.Equals(IPAddress.IPv6Loopback))
+                        {
+                            IPv6Address.Items.Add(uni.Address.ToString());
+                        }
+                    }
+                }
+            }
+            Output.ItemsSource = _outputSource;
+            try
+            {
+                _controllerI = new ControllerI(this);
+            }
+            catch(PluginInitializationException ex)
+            {
+                print(ex.ToString());
+                print(ex.reason);
+                print(ex.StackTrace);
+            }
+            catch(System.Exception ex)
+            {
+                print(ex.ToString());
+            }
+        }
+
+        public bool RegisterProcessControllerEnabled()
+        {
+            return !RegisterProcessController.IsEnabled;
+        }
+
+        private void RegisterProcessController_Clicked(object sender, EventArgs e)
+        {
+            RegisterProcessController.IsEnabled = false;
+            _controllerI.registerProcessController();
+        }
+
+        private void ProcessControllerRegistryHost_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            RegisterProcessController.IsEnabled = true;
+        }
+
+        public void print(string message)
+        {
+            Device.BeginInvokeOnMainThread(() =>
+                {
+                    _outputSource.Add(message);
+                    Output.ScrollTo(Output.ItemsSource.Cast<object>().LastOrDefault(), ScrollToPosition.End, true);
+                });
+        }
+
+        public string processControllerRegistryHost()
+        {
+            return ProcessControllerRegistryHost.Text;
+        }
+
+        public PlatformAdapter platformAdapter
+        {
+            get;
+            private set;
+        }
+
+        public string getHost(bool ipv6)
+        {
+            return ipv6 ? IPv6Address.SelectedItem.ToString() : IPv4Address.SelectedItem.ToString();
+        }
+
+        private ObservableCollection<string> _outputSource = new ObservableCollection<string>();
+        private ControllerI _controllerI;
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/controller.Android.csproj zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/controller.Android.csproj
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/controller.Android.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/controller.Android.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{62B1BE59-435A-480B-8807-03A42623BA1A}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>controller.Droid</RootNamespace>
+    <AssemblyName>controller.Android</AssemblyName>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <AndroidKeyStore>false</AndroidKeyStore>
+    <UseShortFileNames>True</UseShortFileNames>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <BundleAssemblies>false</BundleAssemblies>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
+    <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <Debugger>Xamarin</Debugger>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <BundleAssemblies>false</BundleAssemblies>
+    <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
+    <AndroidSupportedAbis>armeabi;armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="..\..\..\lib\netstandard2.0\Ice.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceSSL.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceDiscovery.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
+    <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
+    <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />
+    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="27.0.2.1" />
+    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="27.0.2.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainActivity.cs" />
+    <Compile Include="Resources\Resource.Designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\Tabbar.axml" />
+    <AndroidResource Include="Resources\layout\Toolbar.axml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <AndroidResource Include="Resources\values\colors.xml" />
+    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />
+    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" />
+    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\drawable-hdpi\" />
+    <Folder Include="Resources\drawable-xhdpi\" />
+    <Folder Include="Resources\drawable-xxhdpi\" />
+    <Folder Include="Resources\drawable-xxxhdpi\" />
+    <Folder Include="Resources\drawable\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj">
+      <Project>{a62bf5e3-ad66-4edb-9bba-3e9bd6148425}</Project>
+      <Name>testcommon</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\controller\controller.csproj">
+      <Project>{D86C4CA0-7EF8-4A9B-B42F-CB2FBBC7B68F}</Project>
+      <Name>controller</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/MainActivity.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/MainActivity.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/MainActivity.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/MainActivity.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,98 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using System;
+using Android.App;
+using Android.Content.PM;
+using Android.OS;
+using Android.Util;
+
+namespace controller.Droid
+{
+    public class AndroidLogger : Ice.Logger
+    {
+        private const string TAG = "ControllerApp";
+        private string _prefix;
+
+        public AndroidLogger(string prefix)
+        {
+            _prefix = prefix;
+        }
+
+        public void print(string message)
+        {
+            Log.Debug(TAG, message);
+        }
+
+        public void trace(String category, String message)
+        {
+            Log.Verbose(category, message);
+        }
+
+        public void warning(String message)
+        {
+            Log.Warn(TAG, message);
+        }
+
+        public void error(String message)
+        {
+            Log.Error(TAG, message);
+        }
+
+        public String getPrefix()
+        {
+            return _prefix;
+        }
+
+        public Ice.Logger cloneWithPrefix(string s)
+        {
+            return new AndroidLogger(s);
+        }
+    }
+
+    [Activity(Label = "controller",
+              Name = "controller.MainActivity",
+              Icon = "@mipmap/icon",
+              Theme = "@style/MainTheme",
+              MainLauncher = true,
+              ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+    public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
+                                Test.PlatformAdapter
+    {
+        protected override void OnCreate(Bundle bundle)
+        {
+            Ice.Util.setProcessLogger(new AndroidLogger(""));
+            TabLayoutResource = Resource.Layout.Tabbar;
+            ToolbarResource = Resource.Layout.Toolbar;
+
+            base.OnCreate(bundle);
+
+            global::Xamarin.Forms.Forms.Init(this, bundle);
+            LoadApplication(new App(this));
+        }
+
+        public bool isEmulator()
+        {
+            return Build.Fingerprint.Contains("vbox") ||
+                   Build.Fingerprint.Contains("generic") ||
+                   Build.Fingerprint.Contains("unknown") ||
+                   Build.Model.Contains("google_sdk") ||
+                   Build.Model.Contains("Emulator") ||
+                   Build.Model.Contains("Android SDK built for x86") ||
+                   Build.Manufacturer.Contains("Genymotion") ||
+                   (Build.Brand.StartsWith("generic") && Build.Device.StartsWith("generic")) ||
+                   Build.Product.Equals("google_sdk");
+        }
+
+        public string processControllerIdentity()
+        {
+            return "AndroidXamarin/ProcessController";
+        }
+
+        public string processControllerRegistryHost()
+        {
+            return isEmulator() ? "10.0.2.2" : ""; // With an empty host, the controller will use IceDiscovery.
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Properties/AndroidManifest.xml zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Properties/AndroidManifest.xml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Properties/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Properties/AndroidManifest.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.zeroc.testcontroller" android:versionCode="1" android:versionName="1.0" android:installLocation="preferExternal">
+	<uses-sdk android:minSdkVersion="27" android:targetSdkVersion="28" />
+	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+	<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+	<uses-permission android:name="android.permission.BLUETOOTH" />
+	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+	<application android:label="Test Controller"></application>
+</manifest>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Properties/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Properties/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Properties/AssemblyInfo.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Properties/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("controller.Android")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("controller.Android")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+// Add some common permissions, these can be removed if not needed
+[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
+[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/AboutResources.txt zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/AboutResources.txt
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/AboutResources.txt	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/AboutResources.txt	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,50 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included
+in your application as resource files.  Various Android APIs are designed to
+operate on the resource IDs instead of dealing with images, strings or binary blobs
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.xml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png)
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+    drawable-hdpi/
+        icon.png
+
+    drawable-ldpi/
+        icon.png
+
+    drawable-mdpi/
+        icon.png
+
+    layout/
+        main.xml
+
+    values/
+        strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource".  The native Android APIs do not operate directly with filenames, but
+instead operate on resource IDs.  When you compile an Android application that uses resources,
+the build system will package the resources for distribution and generate a class called
+"Resource" that contains the tokens for each one of the resources included. For example,
+for the above Resources layout, this is what the Resource class would expose:
+
+public class Resource {
+    public class drawable {
+        public const int icon = 0x123;
+    }
+
+    public class layout {
+        public const int main = 0x456;
+    }
+
+    public class strings {
+        public const int first_string = 0xabc;
+        public const int second_string = 0xbcd;
+    }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main
+to reference the layout/main.xml file, or Resource.strings.first_string to reference the first
+string in the dictionary file values/strings.xml.
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/layout/Tabbar.axml zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/layout/Tabbar.axml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/layout/Tabbar.axml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/layout/Tabbar.axml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/sliding_tabs"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:tabIndicatorColor="@android:color/white"
+    app:tabGravity="fill"
+    app:tabMode="fixed" />
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/layout/Toolbar.axml zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/layout/Toolbar.axml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/layout/Toolbar.axml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/layout/Toolbar.axml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+<android.support.v7.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon_round.xml zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon_round.xml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon_round.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon_round.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/launcher_background" />
+    <foreground android:drawable="@mipmap/launcher_foreground" />
+</adaptive-icon>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon.xml zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon.xml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-anydpi-v26/icon.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/launcher_background" />
+    <foreground android:drawable="@mipmap/launcher_foreground" />
+</adaptive-icon>
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-hdpi/Icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-hdpi/Icon.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-hdpi/launcher_foreground.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-hdpi/launcher_foreground.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-mdpi/icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-mdpi/icon.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-mdpi/launcher_foreground.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-mdpi/launcher_foreground.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-xhdpi/Icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-xhdpi/Icon.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-xhdpi/launcher_foreground.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-xhdpi/launcher_foreground.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-xxhdpi/Icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-xxhdpi/Icon.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-xxhdpi/launcher_foreground.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-xxhdpi/launcher_foreground.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-xxxhdpi/Icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-xxxhdpi/Icon.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/mipmap-xxxhdpi/launcher_foreground.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/mipmap-xxxhdpi/launcher_foreground.png differ
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/Resource.designer.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/Resource.designer.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/Resource.designer.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/Resource.designer.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7504 @@
+#pragma warning disable 1591
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("controller.Droid.Resource", IsApplication=true)]
+
+namespace controller.Droid
+{
+	
+	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+	public partial class Resource
+	{
+		
+		static Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+		}
+		
+		public static void UpdateIdValues()
+		{
+			global::Xamarin.Forms.Platform.Android.Resource.Attribute.actionBarSize = global::controller.Droid.Resource.Attribute.actionBarSize;
+		}
+		
+		public partial class Animation
+		{
+			
+			// aapt resource value: 0x7f050000
+			public const int abc_fade_in = 2131034112;
+			
+			// aapt resource value: 0x7f050001
+			public const int abc_fade_out = 2131034113;
+			
+			// aapt resource value: 0x7f050002
+			public const int abc_grow_fade_in_from_bottom = 2131034114;
+			
+			// aapt resource value: 0x7f050003
+			public const int abc_popup_enter = 2131034115;
+			
+			// aapt resource value: 0x7f050004
+			public const int abc_popup_exit = 2131034116;
+			
+			// aapt resource value: 0x7f050005
+			public const int abc_shrink_fade_out_from_bottom = 2131034117;
+			
+			// aapt resource value: 0x7f050006
+			public const int abc_slide_in_bottom = 2131034118;
+			
+			// aapt resource value: 0x7f050007
+			public const int abc_slide_in_top = 2131034119;
+			
+			// aapt resource value: 0x7f050008
+			public const int abc_slide_out_bottom = 2131034120;
+			
+			// aapt resource value: 0x7f050009
+			public const int abc_slide_out_top = 2131034121;
+			
+			// aapt resource value: 0x7f05000a
+			public const int design_bottom_sheet_slide_in = 2131034122;
+			
+			// aapt resource value: 0x7f05000b
+			public const int design_bottom_sheet_slide_out = 2131034123;
+			
+			// aapt resource value: 0x7f05000c
+			public const int design_snackbar_in = 2131034124;
+			
+			// aapt resource value: 0x7f05000d
+			public const int design_snackbar_out = 2131034125;
+			
+			// aapt resource value: 0x7f05000e
+			public const int tooltip_enter = 2131034126;
+			
+			// aapt resource value: 0x7f05000f
+			public const int tooltip_exit = 2131034127;
+			
+			static Animation()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Animation()
+			{
+			}
+		}
+		
+		public partial class Animator
+		{
+			
+			// aapt resource value: 0x7f060000
+			public const int design_appbar_state_list_animator = 2131099648;
+			
+			static Animator()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Animator()
+			{
+			}
+		}
+		
+		public partial class Attribute
+		{
+			
+			// aapt resource value: 0x7f01006b
+			public const int actionBarDivider = 2130772075;
+			
+			// aapt resource value: 0x7f01006c
+			public const int actionBarItemBackground = 2130772076;
+			
+			// aapt resource value: 0x7f010065
+			public const int actionBarPopupTheme = 2130772069;
+			
+			// aapt resource value: 0x7f01006a
+			public const int actionBarSize = 2130772074;
+			
+			// aapt resource value: 0x7f010067
+			public const int actionBarSplitStyle = 2130772071;
+			
+			// aapt resource value: 0x7f010066
+			public const int actionBarStyle = 2130772070;
+			
+			// aapt resource value: 0x7f010061
+			public const int actionBarTabBarStyle = 2130772065;
+			
+			// aapt resource value: 0x7f010060
+			public const int actionBarTabStyle = 2130772064;
+			
+			// aapt resource value: 0x7f010062
+			public const int actionBarTabTextStyle = 2130772066;
+			
+			// aapt resource value: 0x7f010068
+			public const int actionBarTheme = 2130772072;
+			
+			// aapt resource value: 0x7f010069
+			public const int actionBarWidgetTheme = 2130772073;
+			
+			// aapt resource value: 0x7f010086
+			public const int actionButtonStyle = 2130772102;
+			
+			// aapt resource value: 0x7f010082
+			public const int actionDropDownStyle = 2130772098;
+			
+			// aapt resource value: 0x7f0100dd
+			public const int actionLayout = 2130772189;
+			
+			// aapt resource value: 0x7f01006d
+			public const int actionMenuTextAppearance = 2130772077;
+			
+			// aapt resource value: 0x7f01006e
+			public const int actionMenuTextColor = 2130772078;
+			
+			// aapt resource value: 0x7f010071
+			public const int actionModeBackground = 2130772081;
+			
+			// aapt resource value: 0x7f010070
+			public const int actionModeCloseButtonStyle = 2130772080;
+			
+			// aapt resource value: 0x7f010073
+			public const int actionModeCloseDrawable = 2130772083;
+			
+			// aapt resource value: 0x7f010075
+			public const int actionModeCopyDrawable = 2130772085;
+			
+			// aapt resource value: 0x7f010074
+			public const int actionModeCutDrawable = 2130772084;
+			
+			// aapt resource value: 0x7f010079
+			public const int actionModeFindDrawable = 2130772089;
+			
+			// aapt resource value: 0x7f010076
+			public const int actionModePasteDrawable = 2130772086;
+			
+			// aapt resource value: 0x7f01007b
+			public const int actionModePopupWindowStyle = 2130772091;
+			
+			// aapt resource value: 0x7f010077
+			public const int actionModeSelectAllDrawable = 2130772087;
+			
+			// aapt resource value: 0x7f010078
+			public const int actionModeShareDrawable = 2130772088;
+			
+			// aapt resource value: 0x7f010072
+			public const int actionModeSplitBackground = 2130772082;
+			
+			// aapt resource value: 0x7f01006f
+			public const int actionModeStyle = 2130772079;
+			
+			// aapt resource value: 0x7f01007a
+			public const int actionModeWebSearchDrawable = 2130772090;
+			
+			// aapt resource value: 0x7f010063
+			public const int actionOverflowButtonStyle = 2130772067;
+			
+			// aapt resource value: 0x7f010064
+			public const int actionOverflowMenuStyle = 2130772068;
+			
+			// aapt resource value: 0x7f0100df
+			public const int actionProviderClass = 2130772191;
+			
+			// aapt resource value: 0x7f0100de
+			public const int actionViewClass = 2130772190;
+			
+			// aapt resource value: 0x7f01008e
+			public const int activityChooserViewStyle = 2130772110;
+			
+			// aapt resource value: 0x7f0100b3
+			public const int alertDialogButtonGroupStyle = 2130772147;
+			
+			// aapt resource value: 0x7f0100b4
+			public const int alertDialogCenterButtons = 2130772148;
+			
+			// aapt resource value: 0x7f0100b2
+			public const int alertDialogStyle = 2130772146;
+			
+			// aapt resource value: 0x7f0100b5
+			public const int alertDialogTheme = 2130772149;
+			
+			// aapt resource value: 0x7f0100cb
+			public const int allowStacking = 2130772171;
+			
+			// aapt resource value: 0x7f0100cc
+			public const int alpha = 2130772172;
+			
+			// aapt resource value: 0x7f0100da
+			public const int alphabeticModifiers = 2130772186;
+			
+			// aapt resource value: 0x7f0100d3
+			public const int arrowHeadLength = 2130772179;
+			
+			// aapt resource value: 0x7f0100d4
+			public const int arrowShaftLength = 2130772180;
+			
+			// aapt resource value: 0x7f0100ba
+			public const int autoCompleteTextViewStyle = 2130772154;
+			
+			// aapt resource value: 0x7f010054
+			public const int autoSizeMaxTextSize = 2130772052;
+			
+			// aapt resource value: 0x7f010053
+			public const int autoSizeMinTextSize = 2130772051;
+			
+			// aapt resource value: 0x7f010052
+			public const int autoSizePresetSizes = 2130772050;
+			
+			// aapt resource value: 0x7f010051
+			public const int autoSizeStepGranularity = 2130772049;
+			
+			// aapt resource value: 0x7f010050
+			public const int autoSizeTextType = 2130772048;
+			
+			// aapt resource value: 0x7f01002e
+			public const int background = 2130772014;
+			
+			// aapt resource value: 0x7f010030
+			public const int backgroundSplit = 2130772016;
+			
+			// aapt resource value: 0x7f01002f
+			public const int backgroundStacked = 2130772015;
+			
+			// aapt resource value: 0x7f010116
+			public const int backgroundTint = 2130772246;
+			
+			// aapt resource value: 0x7f010117
+			public const int backgroundTintMode = 2130772247;
+			
+			// aapt resource value: 0x7f0100d5
+			public const int barLength = 2130772181;
+			
+			// aapt resource value: 0x7f010141
+			public const int behavior_autoHide = 2130772289;
+			
+			// aapt resource value: 0x7f01011e
+			public const int behavior_hideable = 2130772254;
+			
+			// aapt resource value: 0x7f01014a
+			public const int behavior_overlapTop = 2130772298;
+			
+			// aapt resource value: 0x7f01011d
+			public const int behavior_peekHeight = 2130772253;
+			
+			// aapt resource value: 0x7f01011f
+			public const int behavior_skipCollapsed = 2130772255;
+			
+			// aapt resource value: 0x7f01013f
+			public const int borderWidth = 2130772287;
+			
+			// aapt resource value: 0x7f01008b
+			public const int borderlessButtonStyle = 2130772107;
+			
+			// aapt resource value: 0x7f010139
+			public const int bottomSheetDialogTheme = 2130772281;
+			
+			// aapt resource value: 0x7f01013a
+			public const int bottomSheetStyle = 2130772282;
+			
+			// aapt resource value: 0x7f010088
+			public const int buttonBarButtonStyle = 2130772104;
+			
+			// aapt resource value: 0x7f0100b8
+			public const int buttonBarNegativeButtonStyle = 2130772152;
+			
+			// aapt resource value: 0x7f0100b9
+			public const int buttonBarNeutralButtonStyle = 2130772153;
+			
+			// aapt resource value: 0x7f0100b7
+			public const int buttonBarPositiveButtonStyle = 2130772151;
+			
+			// aapt resource value: 0x7f010087
+			public const int buttonBarStyle = 2130772103;
+			
+			// aapt resource value: 0x7f01010b
+			public const int buttonGravity = 2130772235;
+			
+			// aapt resource value: 0x7f010043
+			public const int buttonPanelSideLayout = 2130772035;
+			
+			// aapt resource value: 0x7f0100bb
+			public const int buttonStyle = 2130772155;
+			
+			// aapt resource value: 0x7f0100bc
+			public const int buttonStyleSmall = 2130772156;
+			
+			// aapt resource value: 0x7f0100cd
+			public const int buttonTint = 2130772173;
+			
+			// aapt resource value: 0x7f0100ce
+			public const int buttonTintMode = 2130772174;
+			
+			// aapt resource value: 0x7f010017
+			public const int cardBackgroundColor = 2130771991;
+			
+			// aapt resource value: 0x7f010018
+			public const int cardCornerRadius = 2130771992;
+			
+			// aapt resource value: 0x7f010019
+			public const int cardElevation = 2130771993;
+			
+			// aapt resource value: 0x7f01001a
+			public const int cardMaxElevation = 2130771994;
+			
+			// aapt resource value: 0x7f01001c
+			public const int cardPreventCornerOverlap = 2130771996;
+			
+			// aapt resource value: 0x7f01001b
+			public const int cardUseCompatPadding = 2130771995;
+			
+			// aapt resource value: 0x7f0100bd
+			public const int checkboxStyle = 2130772157;
+			
+			// aapt resource value: 0x7f0100be
+			public const int checkedTextViewStyle = 2130772158;
+			
+			// aapt resource value: 0x7f0100ee
+			public const int closeIcon = 2130772206;
+			
+			// aapt resource value: 0x7f010040
+			public const int closeItemLayout = 2130772032;
+			
+			// aapt resource value: 0x7f01010d
+			public const int collapseContentDescription = 2130772237;
+			
+			// aapt resource value: 0x7f01010c
+			public const int collapseIcon = 2130772236;
+			
+			// aapt resource value: 0x7f01012c
+			public const int collapsedTitleGravity = 2130772268;
+			
+			// aapt resource value: 0x7f010126
+			public const int collapsedTitleTextAppearance = 2130772262;
+			
+			// aapt resource value: 0x7f0100cf
+			public const int color = 2130772175;
+			
+			// aapt resource value: 0x7f0100aa
+			public const int colorAccent = 2130772138;
+			
+			// aapt resource value: 0x7f0100b1
+			public const int colorBackgroundFloating = 2130772145;
+			
+			// aapt resource value: 0x7f0100ae
+			public const int colorButtonNormal = 2130772142;
+			
+			// aapt resource value: 0x7f0100ac
+			public const int colorControlActivated = 2130772140;
+			
+			// aapt resource value: 0x7f0100ad
+			public const int colorControlHighlight = 2130772141;
+			
+			// aapt resource value: 0x7f0100ab
+			public const int colorControlNormal = 2130772139;
+			
+			// aapt resource value: 0x7f0100ca
+			public const int colorError = 2130772170;
+			
+			// aapt resource value: 0x7f0100a8
+			public const int colorPrimary = 2130772136;
+			
+			// aapt resource value: 0x7f0100a9
+			public const int colorPrimaryDark = 2130772137;
+			
+			// aapt resource value: 0x7f0100af
+			public const int colorSwitchThumbNormal = 2130772143;
+			
+			// aapt resource value: 0x7f0100f3
+			public const int commitIcon = 2130772211;
+			
+			// aapt resource value: 0x7f0100e0
+			public const int contentDescription = 2130772192;
+			
+			// aapt resource value: 0x7f010039
+			public const int contentInsetEnd = 2130772025;
+			
+			// aapt resource value: 0x7f01003d
+			public const int contentInsetEndWithActions = 2130772029;
+			
+			// aapt resource value: 0x7f01003a
+			public const int contentInsetLeft = 2130772026;
+			
+			// aapt resource value: 0x7f01003b
+			public const int contentInsetRight = 2130772027;
+			
+			// aapt resource value: 0x7f010038
+			public const int contentInsetStart = 2130772024;
+			
+			// aapt resource value: 0x7f01003c
+			public const int contentInsetStartWithNavigation = 2130772028;
+			
+			// aapt resource value: 0x7f01001d
+			public const int contentPadding = 2130771997;
+			
+			// aapt resource value: 0x7f010021
+			public const int contentPaddingBottom = 2130772001;
+			
+			// aapt resource value: 0x7f01001e
+			public const int contentPaddingLeft = 2130771998;
+			
+			// aapt resource value: 0x7f01001f
+			public const int contentPaddingRight = 2130771999;
+			
+			// aapt resource value: 0x7f010020
+			public const int contentPaddingTop = 2130772000;
+			
+			// aapt resource value: 0x7f010127
+			public const int contentScrim = 2130772263;
+			
+			// aapt resource value: 0x7f0100b0
+			public const int controlBackground = 2130772144;
+			
+			// aapt resource value: 0x7f010160
+			public const int counterEnabled = 2130772320;
+			
+			// aapt resource value: 0x7f010161
+			public const int counterMaxLength = 2130772321;
+			
+			// aapt resource value: 0x7f010163
+			public const int counterOverflowTextAppearance = 2130772323;
+			
+			// aapt resource value: 0x7f010162
+			public const int counterTextAppearance = 2130772322;
+			
+			// aapt resource value: 0x7f010031
+			public const int customNavigationLayout = 2130772017;
+			
+			// aapt resource value: 0x7f0100ed
+			public const int defaultQueryHint = 2130772205;
+			
+			// aapt resource value: 0x7f010080
+			public const int dialogPreferredPadding = 2130772096;
+			
+			// aapt resource value: 0x7f01007f
+			public const int dialogTheme = 2130772095;
+			
+			// aapt resource value: 0x7f010027
+			public const int displayOptions = 2130772007;
+			
+			// aapt resource value: 0x7f01002d
+			public const int divider = 2130772013;
+			
+			// aapt resource value: 0x7f01008d
+			public const int dividerHorizontal = 2130772109;
+			
+			// aapt resource value: 0x7f0100d9
+			public const int dividerPadding = 2130772185;
+			
+			// aapt resource value: 0x7f01008c
+			public const int dividerVertical = 2130772108;
+			
+			// aapt resource value: 0x7f0100d1
+			public const int drawableSize = 2130772177;
+			
+			// aapt resource value: 0x7f010022
+			public const int drawerArrowStyle = 2130772002;
+			
+			// aapt resource value: 0x7f01009f
+			public const int dropDownListViewStyle = 2130772127;
+			
+			// aapt resource value: 0x7f010083
+			public const int dropdownListPreferredItemHeight = 2130772099;
+			
+			// aapt resource value: 0x7f010094
+			public const int editTextBackground = 2130772116;
+			
+			// aapt resource value: 0x7f010093
+			public const int editTextColor = 2130772115;
+			
+			// aapt resource value: 0x7f0100bf
+			public const int editTextStyle = 2130772159;
+			
+			// aapt resource value: 0x7f01003e
+			public const int elevation = 2130772030;
+			
+			// aapt resource value: 0x7f01015e
+			public const int errorEnabled = 2130772318;
+			
+			// aapt resource value: 0x7f01015f
+			public const int errorTextAppearance = 2130772319;
+			
+			// aapt resource value: 0x7f010042
+			public const int expandActivityOverflowButtonDrawable = 2130772034;
+			
+			// aapt resource value: 0x7f010118
+			public const int expanded = 2130772248;
+			
+			// aapt resource value: 0x7f01012d
+			public const int expandedTitleGravity = 2130772269;
+			
+			// aapt resource value: 0x7f010120
+			public const int expandedTitleMargin = 2130772256;
+			
+			// aapt resource value: 0x7f010124
+			public const int expandedTitleMarginBottom = 2130772260;
+			
+			// aapt resource value: 0x7f010123
+			public const int expandedTitleMarginEnd = 2130772259;
+			
+			// aapt resource value: 0x7f010121
+			public const int expandedTitleMarginStart = 2130772257;
+			
+			// aapt resource value: 0x7f010122
+			public const int expandedTitleMarginTop = 2130772258;
+			
+			// aapt resource value: 0x7f010125
+			public const int expandedTitleTextAppearance = 2130772261;
+			
+			// aapt resource value: 0x7f010015
+			public const int externalRouteEnabledDrawable = 2130771989;
+			
+			// aapt resource value: 0x7f01013d
+			public const int fabSize = 2130772285;
+			
+			// aapt resource value: 0x7f010004
+			public const int fastScrollEnabled = 2130771972;
+			
+			// aapt resource value: 0x7f010007
+			public const int fastScrollHorizontalThumbDrawable = 2130771975;
+			
+			// aapt resource value: 0x7f010008
+			public const int fastScrollHorizontalTrackDrawable = 2130771976;
+			
+			// aapt resource value: 0x7f010005
+			public const int fastScrollVerticalThumbDrawable = 2130771973;
+			
+			// aapt resource value: 0x7f010006
+			public const int fastScrollVerticalTrackDrawable = 2130771974;
+			
+			// aapt resource value: 0x7f010171
+			public const int font = 2130772337;
+			
+			// aapt resource value: 0x7f010055
+			public const int fontFamily = 2130772053;
+			
+			// aapt resource value: 0x7f01016a
+			public const int fontProviderAuthority = 2130772330;
+			
+			// aapt resource value: 0x7f01016d
+			public const int fontProviderCerts = 2130772333;
+			
+			// aapt resource value: 0x7f01016e
+			public const int fontProviderFetchStrategy = 2130772334;
+			
+			// aapt resource value: 0x7f01016f
+			public const int fontProviderFetchTimeout = 2130772335;
+			
+			// aapt resource value: 0x7f01016b
+			public const int fontProviderPackage = 2130772331;
+			
+			// aapt resource value: 0x7f01016c
+			public const int fontProviderQuery = 2130772332;
+			
+			// aapt resource value: 0x7f010170
+			public const int fontStyle = 2130772336;
+			
+			// aapt resource value: 0x7f010172
+			public const int fontWeight = 2130772338;
+			
+			// aapt resource value: 0x7f010142
+			public const int foregroundInsidePadding = 2130772290;
+			
+			// aapt resource value: 0x7f0100d2
+			public const int gapBetweenBars = 2130772178;
+			
+			// aapt resource value: 0x7f0100ef
+			public const int goIcon = 2130772207;
+			
+			// aapt resource value: 0x7f010148
+			public const int headerLayout = 2130772296;
+			
+			// aapt resource value: 0x7f010023
+			public const int height = 2130772003;
+			
+			// aapt resource value: 0x7f010037
+			public const int hideOnContentScroll = 2130772023;
+			
+			// aapt resource value: 0x7f010164
+			public const int hintAnimationEnabled = 2130772324;
+			
+			// aapt resource value: 0x7f01015d
+			public const int hintEnabled = 2130772317;
+			
+			// aapt resource value: 0x7f01015c
+			public const int hintTextAppearance = 2130772316;
+			
+			// aapt resource value: 0x7f010085
+			public const int homeAsUpIndicator = 2130772101;
+			
+			// aapt resource value: 0x7f010032
+			public const int homeLayout = 2130772018;
+			
+			// aapt resource value: 0x7f01002b
+			public const int icon = 2130772011;
+			
+			// aapt resource value: 0x7f0100e2
+			public const int iconTint = 2130772194;
+			
+			// aapt resource value: 0x7f0100e3
+			public const int iconTintMode = 2130772195;
+			
+			// aapt resource value: 0x7f0100eb
+			public const int iconifiedByDefault = 2130772203;
+			
+			// aapt resource value: 0x7f010095
+			public const int imageButtonStyle = 2130772117;
+			
+			// aapt resource value: 0x7f010034
+			public const int indeterminateProgressStyle = 2130772020;
+			
+			// aapt resource value: 0x7f010041
+			public const int initialActivityCount = 2130772033;
+			
+			// aapt resource value: 0x7f010149
+			public const int insetForeground = 2130772297;
+			
+			// aapt resource value: 0x7f010024
+			public const int isLightTheme = 2130772004;
+			
+			// aapt resource value: 0x7f010146
+			public const int itemBackground = 2130772294;
+			
+			// aapt resource value: 0x7f010144
+			public const int itemIconTint = 2130772292;
+			
+			// aapt resource value: 0x7f010036
+			public const int itemPadding = 2130772022;
+			
+			// aapt resource value: 0x7f010147
+			public const int itemTextAppearance = 2130772295;
+			
+			// aapt resource value: 0x7f010145
+			public const int itemTextColor = 2130772293;
+			
+			// aapt resource value: 0x7f010131
+			public const int keylines = 2130772273;
+			
+			// aapt resource value: 0x7f0100ea
+			public const int layout = 2130772202;
+			
+			// aapt resource value: 0x7f010000
+			public const int layoutManager = 2130771968;
+			
+			// aapt resource value: 0x7f010134
+			public const int layout_anchor = 2130772276;
+			
+			// aapt resource value: 0x7f010136
+			public const int layout_anchorGravity = 2130772278;
+			
+			// aapt resource value: 0x7f010133
+			public const int layout_behavior = 2130772275;
+			
+			// aapt resource value: 0x7f01012f
+			public const int layout_collapseMode = 2130772271;
+			
+			// aapt resource value: 0x7f010130
+			public const int layout_collapseParallaxMultiplier = 2130772272;
+			
+			// aapt resource value: 0x7f010138
+			public const int layout_dodgeInsetEdges = 2130772280;
+			
+			// aapt resource value: 0x7f010137
+			public const int layout_insetEdge = 2130772279;
+			
+			// aapt resource value: 0x7f010135
+			public const int layout_keyline = 2130772277;
+			
+			// aapt resource value: 0x7f01011b
+			public const int layout_scrollFlags = 2130772251;
+			
+			// aapt resource value: 0x7f01011c
+			public const int layout_scrollInterpolator = 2130772252;
+			
+			// aapt resource value: 0x7f0100a7
+			public const int listChoiceBackgroundIndicator = 2130772135;
+			
+			// aapt resource value: 0x7f010081
+			public const int listDividerAlertDialog = 2130772097;
+			
+			// aapt resource value: 0x7f010047
+			public const int listItemLayout = 2130772039;
+			
+			// aapt resource value: 0x7f010044
+			public const int listLayout = 2130772036;
+			
+			// aapt resource value: 0x7f0100c7
+			public const int listMenuViewStyle = 2130772167;
+			
+			// aapt resource value: 0x7f0100a0
+			public const int listPopupWindowStyle = 2130772128;
+			
+			// aapt resource value: 0x7f01009a
+			public const int listPreferredItemHeight = 2130772122;
+			
+			// aapt resource value: 0x7f01009c
+			public const int listPreferredItemHeightLarge = 2130772124;
+			
+			// aapt resource value: 0x7f01009b
+			public const int listPreferredItemHeightSmall = 2130772123;
+			
+			// aapt resource value: 0x7f01009d
+			public const int listPreferredItemPaddingLeft = 2130772125;
+			
+			// aapt resource value: 0x7f01009e
+			public const int listPreferredItemPaddingRight = 2130772126;
+			
+			// aapt resource value: 0x7f01002c
+			public const int logo = 2130772012;
+			
+			// aapt resource value: 0x7f010110
+			public const int logoDescription = 2130772240;
+			
+			// aapt resource value: 0x7f01014b
+			public const int maxActionInlineWidth = 2130772299;
+			
+			// aapt resource value: 0x7f01010a
+			public const int maxButtonHeight = 2130772234;
+			
+			// aapt resource value: 0x7f0100d7
+			public const int measureWithLargestChild = 2130772183;
+			
+			// aapt resource value: 0x7f010009
+			public const int mediaRouteAudioTrackDrawable = 2130771977;
+			
+			// aapt resource value: 0x7f01000a
+			public const int mediaRouteButtonStyle = 2130771978;
+			
+			// aapt resource value: 0x7f010016
+			public const int mediaRouteButtonTint = 2130771990;
+			
+			// aapt resource value: 0x7f01000b
+			public const int mediaRouteCloseDrawable = 2130771979;
+			
+			// aapt resource value: 0x7f01000c
+			public const int mediaRouteControlPanelThemeOverlay = 2130771980;
+			
+			// aapt resource value: 0x7f01000d
+			public const int mediaRouteDefaultIconDrawable = 2130771981;
+			
+			// aapt resource value: 0x7f01000e
+			public const int mediaRoutePauseDrawable = 2130771982;
+			
+			// aapt resource value: 0x7f01000f
+			public const int mediaRoutePlayDrawable = 2130771983;
+			
+			// aapt resource value: 0x7f010010
+			public const int mediaRouteSpeakerGroupIconDrawable = 2130771984;
+			
+			// aapt resource value: 0x7f010011
+			public const int mediaRouteSpeakerIconDrawable = 2130771985;
+			
+			// aapt resource value: 0x7f010012
+			public const int mediaRouteStopDrawable = 2130771986;
+			
+			// aapt resource value: 0x7f010013
+			public const int mediaRouteTheme = 2130771987;
+			
+			// aapt resource value: 0x7f010014
+			public const int mediaRouteTvIconDrawable = 2130771988;
+			
+			// aapt resource value: 0x7f010143
+			public const int menu = 2130772291;
+			
+			// aapt resource value: 0x7f010045
+			public const int multiChoiceItemLayout = 2130772037;
+			
+			// aapt resource value: 0x7f01010f
+			public const int navigationContentDescription = 2130772239;
+			
+			// aapt resource value: 0x7f01010e
+			public const int navigationIcon = 2130772238;
+			
+			// aapt resource value: 0x7f010026
+			public const int navigationMode = 2130772006;
+			
+			// aapt resource value: 0x7f0100db
+			public const int numericModifiers = 2130772187;
+			
+			// aapt resource value: 0x7f0100e6
+			public const int overlapAnchor = 2130772198;
+			
+			// aapt resource value: 0x7f0100e8
+			public const int paddingBottomNoButtons = 2130772200;
+			
+			// aapt resource value: 0x7f010114
+			public const int paddingEnd = 2130772244;
+			
+			// aapt resource value: 0x7f010113
+			public const int paddingStart = 2130772243;
+			
+			// aapt resource value: 0x7f0100e9
+			public const int paddingTopNoTitle = 2130772201;
+			
+			// aapt resource value: 0x7f0100a4
+			public const int panelBackground = 2130772132;
+			
+			// aapt resource value: 0x7f0100a6
+			public const int panelMenuListTheme = 2130772134;
+			
+			// aapt resource value: 0x7f0100a5
+			public const int panelMenuListWidth = 2130772133;
+			
+			// aapt resource value: 0x7f010167
+			public const int passwordToggleContentDescription = 2130772327;
+			
+			// aapt resource value: 0x7f010166
+			public const int passwordToggleDrawable = 2130772326;
+			
+			// aapt resource value: 0x7f010165
+			public const int passwordToggleEnabled = 2130772325;
+			
+			// aapt resource value: 0x7f010168
+			public const int passwordToggleTint = 2130772328;
+			
+			// aapt resource value: 0x7f010169
+			public const int passwordToggleTintMode = 2130772329;
+			
+			// aapt resource value: 0x7f010091
+			public const int popupMenuStyle = 2130772113;
+			
+			// aapt resource value: 0x7f01003f
+			public const int popupTheme = 2130772031;
+			
+			// aapt resource value: 0x7f010092
+			public const int popupWindowStyle = 2130772114;
+			
+			// aapt resource value: 0x7f0100e4
+			public const int preserveIconSpacing = 2130772196;
+			
+			// aapt resource value: 0x7f01013e
+			public const int pressedTranslationZ = 2130772286;
+			
+			// aapt resource value: 0x7f010035
+			public const int progressBarPadding = 2130772021;
+			
+			// aapt resource value: 0x7f010033
+			public const int progressBarStyle = 2130772019;
+			
+			// aapt resource value: 0x7f0100f5
+			public const int queryBackground = 2130772213;
+			
+			// aapt resource value: 0x7f0100ec
+			public const int queryHint = 2130772204;
+			
+			// aapt resource value: 0x7f0100c0
+			public const int radioButtonStyle = 2130772160;
+			
+			// aapt resource value: 0x7f0100c1
+			public const int ratingBarStyle = 2130772161;
+			
+			// aapt resource value: 0x7f0100c2
+			public const int ratingBarStyleIndicator = 2130772162;
+			
+			// aapt resource value: 0x7f0100c3
+			public const int ratingBarStyleSmall = 2130772163;
+			
+			// aapt resource value: 0x7f010002
+			public const int reverseLayout = 2130771970;
+			
+			// aapt resource value: 0x7f01013c
+			public const int rippleColor = 2130772284;
+			
+			// aapt resource value: 0x7f01012b
+			public const int scrimAnimationDuration = 2130772267;
+			
+			// aapt resource value: 0x7f01012a
+			public const int scrimVisibleHeightTrigger = 2130772266;
+			
+			// aapt resource value: 0x7f0100f1
+			public const int searchHintIcon = 2130772209;
+			
+			// aapt resource value: 0x7f0100f0
+			public const int searchIcon = 2130772208;
+			
+			// aapt resource value: 0x7f010099
+			public const int searchViewStyle = 2130772121;
+			
+			// aapt resource value: 0x7f0100c4
+			public const int seekBarStyle = 2130772164;
+			
+			// aapt resource value: 0x7f010089
+			public const int selectableItemBackground = 2130772105;
+			
+			// aapt resource value: 0x7f01008a
+			public const int selectableItemBackgroundBorderless = 2130772106;
+			
+			// aapt resource value: 0x7f0100dc
+			public const int showAsAction = 2130772188;
+			
+			// aapt resource value: 0x7f0100d8
+			public const int showDividers = 2130772184;
+			
+			// aapt resource value: 0x7f010101
+			public const int showText = 2130772225;
+			
+			// aapt resource value: 0x7f010048
+			public const int showTitle = 2130772040;
+			
+			// aapt resource value: 0x7f010046
+			public const int singleChoiceItemLayout = 2130772038;
+			
+			// aapt resource value: 0x7f010001
+			public const int spanCount = 2130771969;
+			
+			// aapt resource value: 0x7f0100d0
+			public const int spinBars = 2130772176;
+			
+			// aapt resource value: 0x7f010084
+			public const int spinnerDropDownItemStyle = 2130772100;
+			
+			// aapt resource value: 0x7f0100c5
+			public const int spinnerStyle = 2130772165;
+			
+			// aapt resource value: 0x7f010100
+			public const int splitTrack = 2130772224;
+			
+			// aapt resource value: 0x7f010049
+			public const int srcCompat = 2130772041;
+			
+			// aapt resource value: 0x7f010003
+			public const int stackFromEnd = 2130771971;
+			
+			// aapt resource value: 0x7f0100e7
+			public const int state_above_anchor = 2130772199;
+			
+			// aapt resource value: 0x7f010119
+			public const int state_collapsed = 2130772249;
+			
+			// aapt resource value: 0x7f01011a
+			public const int state_collapsible = 2130772250;
+			
+			// aapt resource value: 0x7f010132
+			public const int statusBarBackground = 2130772274;
+			
+			// aapt resource value: 0x7f010128
+			public const int statusBarScrim = 2130772264;
+			
+			// aapt resource value: 0x7f0100e5
+			public const int subMenuArrow = 2130772197;
+			
+			// aapt resource value: 0x7f0100f6
+			public const int submitBackground = 2130772214;
+			
+			// aapt resource value: 0x7f010028
+			public const int subtitle = 2130772008;
+			
+			// aapt resource value: 0x7f010103
+			public const int subtitleTextAppearance = 2130772227;
+			
+			// aapt resource value: 0x7f010112
+			public const int subtitleTextColor = 2130772242;
+			
+			// aapt resource value: 0x7f01002a
+			public const int subtitleTextStyle = 2130772010;
+			
+			// aapt resource value: 0x7f0100f4
+			public const int suggestionRowLayout = 2130772212;
+			
+			// aapt resource value: 0x7f0100fe
+			public const int switchMinWidth = 2130772222;
+			
+			// aapt resource value: 0x7f0100ff
+			public const int switchPadding = 2130772223;
+			
+			// aapt resource value: 0x7f0100c6
+			public const int switchStyle = 2130772166;
+			
+			// aapt resource value: 0x7f0100fd
+			public const int switchTextAppearance = 2130772221;
+			
+			// aapt resource value: 0x7f01014f
+			public const int tabBackground = 2130772303;
+			
+			// aapt resource value: 0x7f01014e
+			public const int tabContentStart = 2130772302;
+			
+			// aapt resource value: 0x7f010151
+			public const int tabGravity = 2130772305;
+			
+			// aapt resource value: 0x7f01014c
+			public const int tabIndicatorColor = 2130772300;
+			
+			// aapt resource value: 0x7f01014d
+			public const int tabIndicatorHeight = 2130772301;
+			
+			// aapt resource value: 0x7f010153
+			public const int tabMaxWidth = 2130772307;
+			
+			// aapt resource value: 0x7f010152
+			public const int tabMinWidth = 2130772306;
+			
+			// aapt resource value: 0x7f010150
+			public const int tabMode = 2130772304;
+			
+			// aapt resource value: 0x7f01015b
+			public const int tabPadding = 2130772315;
+			
+			// aapt resource value: 0x7f01015a
+			public const int tabPaddingBottom = 2130772314;
+			
+			// aapt resource value: 0x7f010159
+			public const int tabPaddingEnd = 2130772313;
+			
+			// aapt resource value: 0x7f010157
+			public const int tabPaddingStart = 2130772311;
+			
+			// aapt resource value: 0x7f010158
+			public const int tabPaddingTop = 2130772312;
+			
+			// aapt resource value: 0x7f010156
+			public const int tabSelectedTextColor = 2130772310;
+			
+			// aapt resource value: 0x7f010154
+			public const int tabTextAppearance = 2130772308;
+			
+			// aapt resource value: 0x7f010155
+			public const int tabTextColor = 2130772309;
+			
+			// aapt resource value: 0x7f01004f
+			public const int textAllCaps = 2130772047;
+			
+			// aapt resource value: 0x7f01007c
+			public const int textAppearanceLargePopupMenu = 2130772092;
+			
+			// aapt resource value: 0x7f0100a1
+			public const int textAppearanceListItem = 2130772129;
+			
+			// aapt resource value: 0x7f0100a2
+			public const int textAppearanceListItemSecondary = 2130772130;
+			
+			// aapt resource value: 0x7f0100a3
+			public const int textAppearanceListItemSmall = 2130772131;
+			
+			// aapt resource value: 0x7f01007e
+			public const int textAppearancePopupMenuHeader = 2130772094;
+			
+			// aapt resource value: 0x7f010097
+			public const int textAppearanceSearchResultSubtitle = 2130772119;
+			
+			// aapt resource value: 0x7f010096
+			public const int textAppearanceSearchResultTitle = 2130772118;
+			
+			// aapt resource value: 0x7f01007d
+			public const int textAppearanceSmallPopupMenu = 2130772093;
+			
+			// aapt resource value: 0x7f0100b6
+			public const int textColorAlertDialogListItem = 2130772150;
+			
+			// aapt resource value: 0x7f01013b
+			public const int textColorError = 2130772283;
+			
+			// aapt resource value: 0x7f010098
+			public const int textColorSearchUrl = 2130772120;
+			
+			// aapt resource value: 0x7f010115
+			public const int theme = 2130772245;
+			
+			// aapt resource value: 0x7f0100d6
+			public const int thickness = 2130772182;
+			
+			// aapt resource value: 0x7f0100fc
+			public const int thumbTextPadding = 2130772220;
+			
+			// aapt resource value: 0x7f0100f7
+			public const int thumbTint = 2130772215;
+			
+			// aapt resource value: 0x7f0100f8
+			public const int thumbTintMode = 2130772216;
+			
+			// aapt resource value: 0x7f01004c
+			public const int tickMark = 2130772044;
+			
+			// aapt resource value: 0x7f01004d
+			public const int tickMarkTint = 2130772045;
+			
+			// aapt resource value: 0x7f01004e
+			public const int tickMarkTintMode = 2130772046;
+			
+			// aapt resource value: 0x7f01004a
+			public const int tint = 2130772042;
+			
+			// aapt resource value: 0x7f01004b
+			public const int tintMode = 2130772043;
+			
+			// aapt resource value: 0x7f010025
+			public const int title = 2130772005;
+			
+			// aapt resource value: 0x7f01012e
+			public const int titleEnabled = 2130772270;
+			
+			// aapt resource value: 0x7f010104
+			public const int titleMargin = 2130772228;
+			
+			// aapt resource value: 0x7f010108
+			public const int titleMarginBottom = 2130772232;
+			
+			// aapt resource value: 0x7f010106
+			public const int titleMarginEnd = 2130772230;
+			
+			// aapt resource value: 0x7f010105
+			public const int titleMarginStart = 2130772229;
+			
+			// aapt resource value: 0x7f010107
+			public const int titleMarginTop = 2130772231;
+			
+			// aapt resource value: 0x7f010109
+			public const int titleMargins = 2130772233;
+			
+			// aapt resource value: 0x7f010102
+			public const int titleTextAppearance = 2130772226;
+			
+			// aapt resource value: 0x7f010111
+			public const int titleTextColor = 2130772241;
+			
+			// aapt resource value: 0x7f010029
+			public const int titleTextStyle = 2130772009;
+			
+			// aapt resource value: 0x7f010129
+			public const int toolbarId = 2130772265;
+			
+			// aapt resource value: 0x7f010090
+			public const int toolbarNavigationButtonStyle = 2130772112;
+			
+			// aapt resource value: 0x7f01008f
+			public const int toolbarStyle = 2130772111;
+			
+			// aapt resource value: 0x7f0100c9
+			public const int tooltipForegroundColor = 2130772169;
+			
+			// aapt resource value: 0x7f0100c8
+			public const int tooltipFrameBackground = 2130772168;
+			
+			// aapt resource value: 0x7f0100e1
+			public const int tooltipText = 2130772193;
+			
+			// aapt resource value: 0x7f0100f9
+			public const int track = 2130772217;
+			
+			// aapt resource value: 0x7f0100fa
+			public const int trackTint = 2130772218;
+			
+			// aapt resource value: 0x7f0100fb
+			public const int trackTintMode = 2130772219;
+			
+			// aapt resource value: 0x7f010140
+			public const int useCompatPadding = 2130772288;
+			
+			// aapt resource value: 0x7f0100f2
+			public const int voiceIcon = 2130772210;
+			
+			// aapt resource value: 0x7f010056
+			public const int windowActionBar = 2130772054;
+			
+			// aapt resource value: 0x7f010058
+			public const int windowActionBarOverlay = 2130772056;
+			
+			// aapt resource value: 0x7f010059
+			public const int windowActionModeOverlay = 2130772057;
+			
+			// aapt resource value: 0x7f01005d
+			public const int windowFixedHeightMajor = 2130772061;
+			
+			// aapt resource value: 0x7f01005b
+			public const int windowFixedHeightMinor = 2130772059;
+			
+			// aapt resource value: 0x7f01005a
+			public const int windowFixedWidthMajor = 2130772058;
+			
+			// aapt resource value: 0x7f01005c
+			public const int windowFixedWidthMinor = 2130772060;
+			
+			// aapt resource value: 0x7f01005e
+			public const int windowMinWidthMajor = 2130772062;
+			
+			// aapt resource value: 0x7f01005f
+			public const int windowMinWidthMinor = 2130772063;
+			
+			// aapt resource value: 0x7f010057
+			public const int windowNoTitle = 2130772055;
+			
+			static Attribute()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Attribute()
+			{
+			}
+		}
+		
+		public partial class Boolean
+		{
+			
+			// aapt resource value: 0x7f0e0000
+			public const int abc_action_bar_embed_tabs = 2131623936;
+			
+			// aapt resource value: 0x7f0e0001
+			public const int abc_allow_stacked_button_bar = 2131623937;
+			
+			// aapt resource value: 0x7f0e0002
+			public const int abc_config_actionMenuItemAllCaps = 2131623938;
+			
+			// aapt resource value: 0x7f0e0003
+			public const int abc_config_closeDialogWhenTouchOutside = 2131623939;
+			
+			// aapt resource value: 0x7f0e0004
+			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131623940;
+			
+			static Boolean()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Boolean()
+			{
+			}
+		}
+		
+		public partial class Color
+		{
+			
+			// aapt resource value: 0x7f0d004f
+			public const int abc_background_cache_hint_selector_material_dark = 2131558479;
+			
+			// aapt resource value: 0x7f0d0050
+			public const int abc_background_cache_hint_selector_material_light = 2131558480;
+			
+			// aapt resource value: 0x7f0d0051
+			public const int abc_btn_colored_borderless_text_material = 2131558481;
+			
+			// aapt resource value: 0x7f0d0052
+			public const int abc_btn_colored_text_material = 2131558482;
+			
+			// aapt resource value: 0x7f0d0053
+			public const int abc_color_highlight_material = 2131558483;
+			
+			// aapt resource value: 0x7f0d0054
+			public const int abc_hint_foreground_material_dark = 2131558484;
+			
+			// aapt resource value: 0x7f0d0055
+			public const int abc_hint_foreground_material_light = 2131558485;
+			
+			// aapt resource value: 0x7f0d0004
+			public const int abc_input_method_navigation_guard = 2131558404;
+			
+			// aapt resource value: 0x7f0d0056
+			public const int abc_primary_text_disable_only_material_dark = 2131558486;
+			
+			// aapt resource value: 0x7f0d0057
+			public const int abc_primary_text_disable_only_material_light = 2131558487;
+			
+			// aapt resource value: 0x7f0d0058
+			public const int abc_primary_text_material_dark = 2131558488;
+			
+			// aapt resource value: 0x7f0d0059
+			public const int abc_primary_text_material_light = 2131558489;
+			
+			// aapt resource value: 0x7f0d005a
+			public const int abc_search_url_text = 2131558490;
+			
+			// aapt resource value: 0x7f0d0005
+			public const int abc_search_url_text_normal = 2131558405;
+			
+			// aapt resource value: 0x7f0d0006
+			public const int abc_search_url_text_pressed = 2131558406;
+			
+			// aapt resource value: 0x7f0d0007
+			public const int abc_search_url_text_selected = 2131558407;
+			
+			// aapt resource value: 0x7f0d005b
+			public const int abc_secondary_text_material_dark = 2131558491;
+			
+			// aapt resource value: 0x7f0d005c
+			public const int abc_secondary_text_material_light = 2131558492;
+			
+			// aapt resource value: 0x7f0d005d
+			public const int abc_tint_btn_checkable = 2131558493;
+			
+			// aapt resource value: 0x7f0d005e
+			public const int abc_tint_default = 2131558494;
+			
+			// aapt resource value: 0x7f0d005f
+			public const int abc_tint_edittext = 2131558495;
+			
+			// aapt resource value: 0x7f0d0060
+			public const int abc_tint_seek_thumb = 2131558496;
+			
+			// aapt resource value: 0x7f0d0061
+			public const int abc_tint_spinner = 2131558497;
+			
+			// aapt resource value: 0x7f0d0062
+			public const int abc_tint_switch_track = 2131558498;
+			
+			// aapt resource value: 0x7f0d0008
+			public const int accent_material_dark = 2131558408;
+			
+			// aapt resource value: 0x7f0d0009
+			public const int accent_material_light = 2131558409;
+			
+			// aapt resource value: 0x7f0d000a
+			public const int background_floating_material_dark = 2131558410;
+			
+			// aapt resource value: 0x7f0d000b
+			public const int background_floating_material_light = 2131558411;
+			
+			// aapt resource value: 0x7f0d000c
+			public const int background_material_dark = 2131558412;
+			
+			// aapt resource value: 0x7f0d000d
+			public const int background_material_light = 2131558413;
+			
+			// aapt resource value: 0x7f0d000e
+			public const int bright_foreground_disabled_material_dark = 2131558414;
+			
+			// aapt resource value: 0x7f0d000f
+			public const int bright_foreground_disabled_material_light = 2131558415;
+			
+			// aapt resource value: 0x7f0d0010
+			public const int bright_foreground_inverse_material_dark = 2131558416;
+			
+			// aapt resource value: 0x7f0d0011
+			public const int bright_foreground_inverse_material_light = 2131558417;
+			
+			// aapt resource value: 0x7f0d0012
+			public const int bright_foreground_material_dark = 2131558418;
+			
+			// aapt resource value: 0x7f0d0013
+			public const int bright_foreground_material_light = 2131558419;
+			
+			// aapt resource value: 0x7f0d0014
+			public const int button_material_dark = 2131558420;
+			
+			// aapt resource value: 0x7f0d0015
+			public const int button_material_light = 2131558421;
+			
+			// aapt resource value: 0x7f0d0000
+			public const int cardview_dark_background = 2131558400;
+			
+			// aapt resource value: 0x7f0d0001
+			public const int cardview_light_background = 2131558401;
+			
+			// aapt resource value: 0x7f0d0002
+			public const int cardview_shadow_end_color = 2131558402;
+			
+			// aapt resource value: 0x7f0d0003
+			public const int cardview_shadow_start_color = 2131558403;
+			
+			// aapt resource value: 0x7f0d004e
+			public const int colorAccent = 2131558478;
+			
+			// aapt resource value: 0x7f0d004c
+			public const int colorPrimary = 2131558476;
+			
+			// aapt resource value: 0x7f0d004d
+			public const int colorPrimaryDark = 2131558477;
+			
+			// aapt resource value: 0x7f0d0040
+			public const int design_bottom_navigation_shadow_color = 2131558464;
+			
+			// aapt resource value: 0x7f0d0063
+			public const int design_error = 2131558499;
+			
+			// aapt resource value: 0x7f0d0041
+			public const int design_fab_shadow_end_color = 2131558465;
+			
+			// aapt resource value: 0x7f0d0042
+			public const int design_fab_shadow_mid_color = 2131558466;
+			
+			// aapt resource value: 0x7f0d0043
+			public const int design_fab_shadow_start_color = 2131558467;
+			
+			// aapt resource value: 0x7f0d0044
+			public const int design_fab_stroke_end_inner_color = 2131558468;
+			
+			// aapt resource value: 0x7f0d0045
+			public const int design_fab_stroke_end_outer_color = 2131558469;
+			
+			// aapt resource value: 0x7f0d0046
+			public const int design_fab_stroke_top_inner_color = 2131558470;
+			
+			// aapt resource value: 0x7f0d0047
+			public const int design_fab_stroke_top_outer_color = 2131558471;
+			
+			// aapt resource value: 0x7f0d0048
+			public const int design_snackbar_background_color = 2131558472;
+			
+			// aapt resource value: 0x7f0d0064
+			public const int design_tint_password_toggle = 2131558500;
+			
+			// aapt resource value: 0x7f0d0016
+			public const int dim_foreground_disabled_material_dark = 2131558422;
+			
+			// aapt resource value: 0x7f0d0017
+			public const int dim_foreground_disabled_material_light = 2131558423;
+			
+			// aapt resource value: 0x7f0d0018
+			public const int dim_foreground_material_dark = 2131558424;
+			
+			// aapt resource value: 0x7f0d0019
+			public const int dim_foreground_material_light = 2131558425;
+			
+			// aapt resource value: 0x7f0d001a
+			public const int error_color_material = 2131558426;
+			
+			// aapt resource value: 0x7f0d001b
+			public const int foreground_material_dark = 2131558427;
+			
+			// aapt resource value: 0x7f0d001c
+			public const int foreground_material_light = 2131558428;
+			
+			// aapt resource value: 0x7f0d001d
+			public const int highlighted_text_material_dark = 2131558429;
+			
+			// aapt resource value: 0x7f0d001e
+			public const int highlighted_text_material_light = 2131558430;
+			
+			// aapt resource value: 0x7f0d004b
+			public const int launcher_background = 2131558475;
+			
+			// aapt resource value: 0x7f0d001f
+			public const int material_blue_grey_800 = 2131558431;
+			
+			// aapt resource value: 0x7f0d0020
+			public const int material_blue_grey_900 = 2131558432;
+			
+			// aapt resource value: 0x7f0d0021
+			public const int material_blue_grey_950 = 2131558433;
+			
+			// aapt resource value: 0x7f0d0022
+			public const int material_deep_teal_200 = 2131558434;
+			
+			// aapt resource value: 0x7f0d0023
+			public const int material_deep_teal_500 = 2131558435;
+			
+			// aapt resource value: 0x7f0d0024
+			public const int material_grey_100 = 2131558436;
+			
+			// aapt resource value: 0x7f0d0025
+			public const int material_grey_300 = 2131558437;
+			
+			// aapt resource value: 0x7f0d0026
+			public const int material_grey_50 = 2131558438;
+			
+			// aapt resource value: 0x7f0d0027
+			public const int material_grey_600 = 2131558439;
+			
+			// aapt resource value: 0x7f0d0028
+			public const int material_grey_800 = 2131558440;
+			
+			// aapt resource value: 0x7f0d0029
+			public const int material_grey_850 = 2131558441;
+			
+			// aapt resource value: 0x7f0d002a
+			public const int material_grey_900 = 2131558442;
+			
+			// aapt resource value: 0x7f0d0049
+			public const int notification_action_color_filter = 2131558473;
+			
+			// aapt resource value: 0x7f0d004a
+			public const int notification_icon_bg_color = 2131558474;
+			
+			// aapt resource value: 0x7f0d003f
+			public const int notification_material_background_media_default_color = 2131558463;
+			
+			// aapt resource value: 0x7f0d002b
+			public const int primary_dark_material_dark = 2131558443;
+			
+			// aapt resource value: 0x7f0d002c
+			public const int primary_dark_material_light = 2131558444;
+			
+			// aapt resource value: 0x7f0d002d
+			public const int primary_material_dark = 2131558445;
+			
+			// aapt resource value: 0x7f0d002e
+			public const int primary_material_light = 2131558446;
+			
+			// aapt resource value: 0x7f0d002f
+			public const int primary_text_default_material_dark = 2131558447;
+			
+			// aapt resource value: 0x7f0d0030
+			public const int primary_text_default_material_light = 2131558448;
+			
+			// aapt resource value: 0x7f0d0031
+			public const int primary_text_disabled_material_dark = 2131558449;
+			
+			// aapt resource value: 0x7f0d0032
+			public const int primary_text_disabled_material_light = 2131558450;
+			
+			// aapt resource value: 0x7f0d0033
+			public const int ripple_material_dark = 2131558451;
+			
+			// aapt resource value: 0x7f0d0034
+			public const int ripple_material_light = 2131558452;
+			
+			// aapt resource value: 0x7f0d0035
+			public const int secondary_text_default_material_dark = 2131558453;
+			
+			// aapt resource value: 0x7f0d0036
+			public const int secondary_text_default_material_light = 2131558454;
+			
+			// aapt resource value: 0x7f0d0037
+			public const int secondary_text_disabled_material_dark = 2131558455;
+			
+			// aapt resource value: 0x7f0d0038
+			public const int secondary_text_disabled_material_light = 2131558456;
+			
+			// aapt resource value: 0x7f0d0039
+			public const int switch_thumb_disabled_material_dark = 2131558457;
+			
+			// aapt resource value: 0x7f0d003a
+			public const int switch_thumb_disabled_material_light = 2131558458;
+			
+			// aapt resource value: 0x7f0d0065
+			public const int switch_thumb_material_dark = 2131558501;
+			
+			// aapt resource value: 0x7f0d0066
+			public const int switch_thumb_material_light = 2131558502;
+			
+			// aapt resource value: 0x7f0d003b
+			public const int switch_thumb_normal_material_dark = 2131558459;
+			
+			// aapt resource value: 0x7f0d003c
+			public const int switch_thumb_normal_material_light = 2131558460;
+			
+			// aapt resource value: 0x7f0d003d
+			public const int tooltip_background_dark = 2131558461;
+			
+			// aapt resource value: 0x7f0d003e
+			public const int tooltip_background_light = 2131558462;
+			
+			static Color()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Color()
+			{
+			}
+		}
+		
+		public partial class Dimension
+		{
+			
+			// aapt resource value: 0x7f08001b
+			public const int abc_action_bar_content_inset_material = 2131230747;
+			
+			// aapt resource value: 0x7f08001c
+			public const int abc_action_bar_content_inset_with_nav = 2131230748;
+			
+			// aapt resource value: 0x7f080010
+			public const int abc_action_bar_default_height_material = 2131230736;
+			
+			// aapt resource value: 0x7f08001d
+			public const int abc_action_bar_default_padding_end_material = 2131230749;
+			
+			// aapt resource value: 0x7f08001e
+			public const int abc_action_bar_default_padding_start_material = 2131230750;
+			
+			// aapt resource value: 0x7f080020
+			public const int abc_action_bar_elevation_material = 2131230752;
+			
+			// aapt resource value: 0x7f080021
+			public const int abc_action_bar_icon_vertical_padding_material = 2131230753;
+			
+			// aapt resource value: 0x7f080022
+			public const int abc_action_bar_overflow_padding_end_material = 2131230754;
+			
+			// aapt resource value: 0x7f080023
+			public const int abc_action_bar_overflow_padding_start_material = 2131230755;
+			
+			// aapt resource value: 0x7f080011
+			public const int abc_action_bar_progress_bar_size = 2131230737;
+			
+			// aapt resource value: 0x7f080024
+			public const int abc_action_bar_stacked_max_height = 2131230756;
+			
+			// aapt resource value: 0x7f080025
+			public const int abc_action_bar_stacked_tab_max_width = 2131230757;
+			
+			// aapt resource value: 0x7f080026
+			public const int abc_action_bar_subtitle_bottom_margin_material = 2131230758;
+			
+			// aapt resource value: 0x7f080027
+			public const int abc_action_bar_subtitle_top_margin_material = 2131230759;
+			
+			// aapt resource value: 0x7f080028
+			public const int abc_action_button_min_height_material = 2131230760;
+			
+			// aapt resource value: 0x7f080029
+			public const int abc_action_button_min_width_material = 2131230761;
+			
+			// aapt resource value: 0x7f08002a
+			public const int abc_action_button_min_width_overflow_material = 2131230762;
+			
+			// aapt resource value: 0x7f08000f
+			public const int abc_alert_dialog_button_bar_height = 2131230735;
+			
+			// aapt resource value: 0x7f08002b
+			public const int abc_button_inset_horizontal_material = 2131230763;
+			
+			// aapt resource value: 0x7f08002c
+			public const int abc_button_inset_vertical_material = 2131230764;
+			
+			// aapt resource value: 0x7f08002d
+			public const int abc_button_padding_horizontal_material = 2131230765;
+			
+			// aapt resource value: 0x7f08002e
+			public const int abc_button_padding_vertical_material = 2131230766;
+			
+			// aapt resource value: 0x7f08002f
+			public const int abc_cascading_menus_min_smallest_width = 2131230767;
+			
+			// aapt resource value: 0x7f080014
+			public const int abc_config_prefDialogWidth = 2131230740;
+			
+			// aapt resource value: 0x7f080030
+			public const int abc_control_corner_material = 2131230768;
+			
+			// aapt resource value: 0x7f080031
+			public const int abc_control_inset_material = 2131230769;
+			
+			// aapt resource value: 0x7f080032
+			public const int abc_control_padding_material = 2131230770;
+			
+			// aapt resource value: 0x7f080015
+			public const int abc_dialog_fixed_height_major = 2131230741;
+			
+			// aapt resource value: 0x7f080016
+			public const int abc_dialog_fixed_height_minor = 2131230742;
+			
+			// aapt resource value: 0x7f080017
+			public const int abc_dialog_fixed_width_major = 2131230743;
+			
+			// aapt resource value: 0x7f080018
+			public const int abc_dialog_fixed_width_minor = 2131230744;
+			
+			// aapt resource value: 0x7f080033
+			public const int abc_dialog_list_padding_bottom_no_buttons = 2131230771;
+			
+			// aapt resource value: 0x7f080034
+			public const int abc_dialog_list_padding_top_no_title = 2131230772;
+			
+			// aapt resource value: 0x7f080019
+			public const int abc_dialog_min_width_major = 2131230745;
+			
+			// aapt resource value: 0x7f08001a
+			public const int abc_dialog_min_width_minor = 2131230746;
+			
+			// aapt resource value: 0x7f080035
+			public const int abc_dialog_padding_material = 2131230773;
+			
+			// aapt resource value: 0x7f080036
+			public const int abc_dialog_padding_top_material = 2131230774;
+			
+			// aapt resource value: 0x7f080037
+			public const int abc_dialog_title_divider_material = 2131230775;
+			
+			// aapt resource value: 0x7f080038
+			public const int abc_disabled_alpha_material_dark = 2131230776;
+			
+			// aapt resource value: 0x7f080039
+			public const int abc_disabled_alpha_material_light = 2131230777;
+			
+			// aapt resource value: 0x7f08003a
+			public const int abc_dropdownitem_icon_width = 2131230778;
+			
+			// aapt resource value: 0x7f08003b
+			public const int abc_dropdownitem_text_padding_left = 2131230779;
+			
+			// aapt resource value: 0x7f08003c
+			public const int abc_dropdownitem_text_padding_right = 2131230780;
+			
+			// aapt resource value: 0x7f08003d
+			public const int abc_edit_text_inset_bottom_material = 2131230781;
+			
+			// aapt resource value: 0x7f08003e
+			public const int abc_edit_text_inset_horizontal_material = 2131230782;
+			
+			// aapt resource value: 0x7f08003f
+			public const int abc_edit_text_inset_top_material = 2131230783;
+			
+			// aapt resource value: 0x7f080040
+			public const int abc_floating_window_z = 2131230784;
+			
+			// aapt resource value: 0x7f080041
+			public const int abc_list_item_padding_horizontal_material = 2131230785;
+			
+			// aapt resource value: 0x7f080042
+			public const int abc_panel_menu_list_width = 2131230786;
+			
+			// aapt resource value: 0x7f080043
+			public const int abc_progress_bar_height_material = 2131230787;
+			
+			// aapt resource value: 0x7f080044
+			public const int abc_search_view_preferred_height = 2131230788;
+			
+			// aapt resource value: 0x7f080045
+			public const int abc_search_view_preferred_width = 2131230789;
+			
+			// aapt resource value: 0x7f080046
+			public const int abc_seekbar_track_background_height_material = 2131230790;
+			
+			// aapt resource value: 0x7f080047
+			public const int abc_seekbar_track_progress_height_material = 2131230791;
+			
+			// aapt resource value: 0x7f080048
+			public const int abc_select_dialog_padding_start_material = 2131230792;
+			
+			// aapt resource value: 0x7f08001f
+			public const int abc_switch_padding = 2131230751;
+			
+			// aapt resource value: 0x7f080049
+			public const int abc_text_size_body_1_material = 2131230793;
+			
+			// aapt resource value: 0x7f08004a
+			public const int abc_text_size_body_2_material = 2131230794;
+			
+			// aapt resource value: 0x7f08004b
+			public const int abc_text_size_button_material = 2131230795;
+			
+			// aapt resource value: 0x7f08004c
+			public const int abc_text_size_caption_material = 2131230796;
+			
+			// aapt resource value: 0x7f08004d
+			public const int abc_text_size_display_1_material = 2131230797;
+			
+			// aapt resource value: 0x7f08004e
+			public const int abc_text_size_display_2_material = 2131230798;
+			
+			// aapt resource value: 0x7f08004f
+			public const int abc_text_size_display_3_material = 2131230799;
+			
+			// aapt resource value: 0x7f080050
+			public const int abc_text_size_display_4_material = 2131230800;
+			
+			// aapt resource value: 0x7f080051
+			public const int abc_text_size_headline_material = 2131230801;
+			
+			// aapt resource value: 0x7f080052
+			public const int abc_text_size_large_material = 2131230802;
+			
+			// aapt resource value: 0x7f080053
+			public const int abc_text_size_medium_material = 2131230803;
+			
+			// aapt resource value: 0x7f080054
+			public const int abc_text_size_menu_header_material = 2131230804;
+			
+			// aapt resource value: 0x7f080055
+			public const int abc_text_size_menu_material = 2131230805;
+			
+			// aapt resource value: 0x7f080056
+			public const int abc_text_size_small_material = 2131230806;
+			
+			// aapt resource value: 0x7f080057
+			public const int abc_text_size_subhead_material = 2131230807;
+			
+			// aapt resource value: 0x7f080012
+			public const int abc_text_size_subtitle_material_toolbar = 2131230738;
+			
+			// aapt resource value: 0x7f080058
+			public const int abc_text_size_title_material = 2131230808;
+			
+			// aapt resource value: 0x7f080013
+			public const int abc_text_size_title_material_toolbar = 2131230739;
+			
+			// aapt resource value: 0x7f08000c
+			public const int cardview_compat_inset_shadow = 2131230732;
+			
+			// aapt resource value: 0x7f08000d
+			public const int cardview_default_elevation = 2131230733;
+			
+			// aapt resource value: 0x7f08000e
+			public const int cardview_default_radius = 2131230734;
+			
+			// aapt resource value: 0x7f080094
+			public const int compat_button_inset_horizontal_material = 2131230868;
+			
+			// aapt resource value: 0x7f080095
+			public const int compat_button_inset_vertical_material = 2131230869;
+			
+			// aapt resource value: 0x7f080096
+			public const int compat_button_padding_horizontal_material = 2131230870;
+			
+			// aapt resource value: 0x7f080097
+			public const int compat_button_padding_vertical_material = 2131230871;
+			
+			// aapt resource value: 0x7f080098
+			public const int compat_control_corner_material = 2131230872;
+			
+			// aapt resource value: 0x7f080072
+			public const int design_appbar_elevation = 2131230834;
+			
+			// aapt resource value: 0x7f080073
+			public const int design_bottom_navigation_active_item_max_width = 2131230835;
+			
+			// aapt resource value: 0x7f080074
+			public const int design_bottom_navigation_active_text_size = 2131230836;
+			
+			// aapt resource value: 0x7f080075
+			public const int design_bottom_navigation_elevation = 2131230837;
+			
+			// aapt resource value: 0x7f080076
+			public const int design_bottom_navigation_height = 2131230838;
+			
+			// aapt resource value: 0x7f080077
+			public const int design_bottom_navigation_item_max_width = 2131230839;
+			
+			// aapt resource value: 0x7f080078
+			public const int design_bottom_navigation_item_min_width = 2131230840;
+			
+			// aapt resource value: 0x7f080079
+			public const int design_bottom_navigation_margin = 2131230841;
+			
+			// aapt resource value: 0x7f08007a
+			public const int design_bottom_navigation_shadow_height = 2131230842;
+			
+			// aapt resource value: 0x7f08007b
+			public const int design_bottom_navigation_text_size = 2131230843;
+			
+			// aapt resource value: 0x7f08007c
+			public const int design_bottom_sheet_modal_elevation = 2131230844;
+			
+			// aapt resource value: 0x7f08007d
+			public const int design_bottom_sheet_peek_height_min = 2131230845;
+			
+			// aapt resource value: 0x7f08007e
+			public const int design_fab_border_width = 2131230846;
+			
+			// aapt resource value: 0x7f08007f
+			public const int design_fab_elevation = 2131230847;
+			
+			// aapt resource value: 0x7f080080
+			public const int design_fab_image_size = 2131230848;
+			
+			// aapt resource value: 0x7f080081
+			public const int design_fab_size_mini = 2131230849;
+			
+			// aapt resource value: 0x7f080082
+			public const int design_fab_size_normal = 2131230850;
+			
+			// aapt resource value: 0x7f080083
+			public const int design_fab_translation_z_pressed = 2131230851;
+			
+			// aapt resource value: 0x7f080084
+			public const int design_navigation_elevation = 2131230852;
+			
+			// aapt resource value: 0x7f080085
+			public const int design_navigation_icon_padding = 2131230853;
+			
+			// aapt resource value: 0x7f080086
+			public const int design_navigation_icon_size = 2131230854;
+			
+			// aapt resource value: 0x7f08006a
+			public const int design_navigation_max_width = 2131230826;
+			
+			// aapt resource value: 0x7f080087
+			public const int design_navigation_padding_bottom = 2131230855;
+			
+			// aapt resource value: 0x7f080088
+			public const int design_navigation_separator_vertical_padding = 2131230856;
+			
+			// aapt resource value: 0x7f08006b
+			public const int design_snackbar_action_inline_max_width = 2131230827;
+			
+			// aapt resource value: 0x7f08006c
+			public const int design_snackbar_background_corner_radius = 2131230828;
+			
+			// aapt resource value: 0x7f080089
+			public const int design_snackbar_elevation = 2131230857;
+			
+			// aapt resource value: 0x7f08006d
+			public const int design_snackbar_extra_spacing_horizontal = 2131230829;
+			
+			// aapt resource value: 0x7f08006e
+			public const int design_snackbar_max_width = 2131230830;
+			
+			// aapt resource value: 0x7f08006f
+			public const int design_snackbar_min_width = 2131230831;
+			
+			// aapt resource value: 0x7f08008a
+			public const int design_snackbar_padding_horizontal = 2131230858;
+			
+			// aapt resource value: 0x7f08008b
+			public const int design_snackbar_padding_vertical = 2131230859;
+			
+			// aapt resource value: 0x7f080070
+			public const int design_snackbar_padding_vertical_2lines = 2131230832;
+			
+			// aapt resource value: 0x7f08008c
+			public const int design_snackbar_text_size = 2131230860;
+			
+			// aapt resource value: 0x7f08008d
+			public const int design_tab_max_width = 2131230861;
+			
+			// aapt resource value: 0x7f080071
+			public const int design_tab_scrollable_min_width = 2131230833;
+			
+			// aapt resource value: 0x7f08008e
+			public const int design_tab_text_size = 2131230862;
+			
+			// aapt resource value: 0x7f08008f
+			public const int design_tab_text_size_2line = 2131230863;
+			
+			// aapt resource value: 0x7f080059
+			public const int disabled_alpha_material_dark = 2131230809;
+			
+			// aapt resource value: 0x7f08005a
+			public const int disabled_alpha_material_light = 2131230810;
+			
+			// aapt resource value: 0x7f080000
+			public const int fastscroll_default_thickness = 2131230720;
+			
+			// aapt resource value: 0x7f080001
+			public const int fastscroll_margin = 2131230721;
+			
+			// aapt resource value: 0x7f080002
+			public const int fastscroll_minimum_range = 2131230722;
+			
+			// aapt resource value: 0x7f08005b
+			public const int highlight_alpha_material_colored = 2131230811;
+			
+			// aapt resource value: 0x7f08005c
+			public const int highlight_alpha_material_dark = 2131230812;
+			
+			// aapt resource value: 0x7f08005d
+			public const int highlight_alpha_material_light = 2131230813;
+			
+			// aapt resource value: 0x7f08005e
+			public const int hint_alpha_material_dark = 2131230814;
+			
+			// aapt resource value: 0x7f08005f
+			public const int hint_alpha_material_light = 2131230815;
+			
+			// aapt resource value: 0x7f080060
+			public const int hint_pressed_alpha_material_dark = 2131230816;
+			
+			// aapt resource value: 0x7f080061
+			public const int hint_pressed_alpha_material_light = 2131230817;
+			
+			// aapt resource value: 0x7f080003
+			public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
+			
+			// aapt resource value: 0x7f080004
+			public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
+			
+			// aapt resource value: 0x7f080005
+			public const int item_touch_helper_swipe_escape_velocity = 2131230725;
+			
+			// aapt resource value: 0x7f080006
+			public const int mr_controller_volume_group_list_item_height = 2131230726;
+			
+			// aapt resource value: 0x7f080007
+			public const int mr_controller_volume_group_list_item_icon_size = 2131230727;
+			
+			// aapt resource value: 0x7f080008
+			public const int mr_controller_volume_group_list_max_height = 2131230728;
+			
+			// aapt resource value: 0x7f08000b
+			public const int mr_controller_volume_group_list_padding_top = 2131230731;
+			
+			// aapt resource value: 0x7f080009
+			public const int mr_dialog_fixed_width_major = 2131230729;
+			
+			// aapt resource value: 0x7f08000a
+			public const int mr_dialog_fixed_width_minor = 2131230730;
+			
+			// aapt resource value: 0x7f080099
+			public const int notification_action_icon_size = 2131230873;
+			
+			// aapt resource value: 0x7f08009a
+			public const int notification_action_text_size = 2131230874;
+			
+			// aapt resource value: 0x7f08009b
+			public const int notification_big_circle_margin = 2131230875;
+			
+			// aapt resource value: 0x7f080091
+			public const int notification_content_margin_start = 2131230865;
+			
+			// aapt resource value: 0x7f08009c
+			public const int notification_large_icon_height = 2131230876;
+			
+			// aapt resource value: 0x7f08009d
+			public const int notification_large_icon_width = 2131230877;
+			
+			// aapt resource value: 0x7f080092
+			public const int notification_main_column_padding_top = 2131230866;
+			
+			// aapt resource value: 0x7f080093
+			public const int notification_media_narrow_margin = 2131230867;
+			
+			// aapt resource value: 0x7f08009e
+			public const int notification_right_icon_size = 2131230878;
+			
+			// aapt resource value: 0x7f080090
+			public const int notification_right_side_padding_top = 2131230864;
+			
+			// aapt resource value: 0x7f08009f
+			public const int notification_small_icon_background_padding = 2131230879;
+			
+			// aapt resource value: 0x7f0800a0
+			public const int notification_small_icon_size_as_large = 2131230880;
+			
+			// aapt resource value: 0x7f0800a1
+			public const int notification_subtext_size = 2131230881;
+			
+			// aapt resource value: 0x7f0800a2
+			public const int notification_top_pad = 2131230882;
+			
+			// aapt resource value: 0x7f0800a3
+			public const int notification_top_pad_large_text = 2131230883;
+			
+			// aapt resource value: 0x7f080062
+			public const int tooltip_corner_radius = 2131230818;
+			
+			// aapt resource value: 0x7f080063
+			public const int tooltip_horizontal_padding = 2131230819;
+			
+			// aapt resource value: 0x7f080064
+			public const int tooltip_margin = 2131230820;
+			
+			// aapt resource value: 0x7f080065
+			public const int tooltip_precise_anchor_extra_offset = 2131230821;
+			
+			// aapt resource value: 0x7f080066
+			public const int tooltip_precise_anchor_threshold = 2131230822;
+			
+			// aapt resource value: 0x7f080067
+			public const int tooltip_vertical_padding = 2131230823;
+			
+			// aapt resource value: 0x7f080068
+			public const int tooltip_y_offset_non_touch = 2131230824;
+			
+			// aapt resource value: 0x7f080069
+			public const int tooltip_y_offset_touch = 2131230825;
+			
+			static Dimension()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Dimension()
+			{
+			}
+		}
+		
+		public partial class Drawable
+		{
+			
+			// aapt resource value: 0x7f020000
+			public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+			
+			// aapt resource value: 0x7f020001
+			public const int abc_action_bar_item_background_material = 2130837505;
+			
+			// aapt resource value: 0x7f020002
+			public const int abc_btn_borderless_material = 2130837506;
+			
+			// aapt resource value: 0x7f020003
+			public const int abc_btn_check_material = 2130837507;
+			
+			// aapt resource value: 0x7f020004
+			public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+			
+			// aapt resource value: 0x7f020005
+			public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+			
+			// aapt resource value: 0x7f020006
+			public const int abc_btn_colored_material = 2130837510;
+			
+			// aapt resource value: 0x7f020007
+			public const int abc_btn_default_mtrl_shape = 2130837511;
+			
+			// aapt resource value: 0x7f020008
+			public const int abc_btn_radio_material = 2130837512;
+			
+			// aapt resource value: 0x7f020009
+			public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+			
+			// aapt resource value: 0x7f02000a
+			public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+			
+			// aapt resource value: 0x7f02000b
+			public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+			
+			// aapt resource value: 0x7f02000c
+			public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+			
+			// aapt resource value: 0x7f02000d
+			public const int abc_cab_background_internal_bg = 2130837517;
+			
+			// aapt resource value: 0x7f02000e
+			public const int abc_cab_background_top_material = 2130837518;
+			
+			// aapt resource value: 0x7f02000f
+			public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+			
+			// aapt resource value: 0x7f020010
+			public const int abc_control_background_material = 2130837520;
+			
+			// aapt resource value: 0x7f020011
+			public const int abc_dialog_material_background = 2130837521;
+			
+			// aapt resource value: 0x7f020012
+			public const int abc_edit_text_material = 2130837522;
+			
+			// aapt resource value: 0x7f020013
+			public const int abc_ic_ab_back_material = 2130837523;
+			
+			// aapt resource value: 0x7f020014
+			public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+			
+			// aapt resource value: 0x7f020015
+			public const int abc_ic_clear_material = 2130837525;
+			
+			// aapt resource value: 0x7f020016
+			public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+			
+			// aapt resource value: 0x7f020017
+			public const int abc_ic_go_search_api_material = 2130837527;
+			
+			// aapt resource value: 0x7f020018
+			public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+			
+			// aapt resource value: 0x7f020019
+			public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+			
+			// aapt resource value: 0x7f02001a
+			public const int abc_ic_menu_overflow_material = 2130837530;
+			
+			// aapt resource value: 0x7f02001b
+			public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+			
+			// aapt resource value: 0x7f02001c
+			public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+			
+			// aapt resource value: 0x7f02001d
+			public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+			
+			// aapt resource value: 0x7f02001e
+			public const int abc_ic_search_api_material = 2130837534;
+			
+			// aapt resource value: 0x7f02001f
+			public const int abc_ic_star_black_16dp = 2130837535;
+			
+			// aapt resource value: 0x7f020020
+			public const int abc_ic_star_black_36dp = 2130837536;
+			
+			// aapt resource value: 0x7f020021
+			public const int abc_ic_star_black_48dp = 2130837537;
+			
+			// aapt resource value: 0x7f020022
+			public const int abc_ic_star_half_black_16dp = 2130837538;
+			
+			// aapt resource value: 0x7f020023
+			public const int abc_ic_star_half_black_36dp = 2130837539;
+			
+			// aapt resource value: 0x7f020024
+			public const int abc_ic_star_half_black_48dp = 2130837540;
+			
+			// aapt resource value: 0x7f020025
+			public const int abc_ic_voice_search_api_material = 2130837541;
+			
+			// aapt resource value: 0x7f020026
+			public const int abc_item_background_holo_dark = 2130837542;
+			
+			// aapt resource value: 0x7f020027
+			public const int abc_item_background_holo_light = 2130837543;
+			
+			// aapt resource value: 0x7f020028
+			public const int abc_list_divider_mtrl_alpha = 2130837544;
+			
+			// aapt resource value: 0x7f020029
+			public const int abc_list_focused_holo = 2130837545;
+			
+			// aapt resource value: 0x7f02002a
+			public const int abc_list_longpressed_holo = 2130837546;
+			
+			// aapt resource value: 0x7f02002b
+			public const int abc_list_pressed_holo_dark = 2130837547;
+			
+			// aapt resource value: 0x7f02002c
+			public const int abc_list_pressed_holo_light = 2130837548;
+			
+			// aapt resource value: 0x7f02002d
+			public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+			
+			// aapt resource value: 0x7f02002e
+			public const int abc_list_selector_background_transition_holo_light = 2130837550;
+			
+			// aapt resource value: 0x7f02002f
+			public const int abc_list_selector_disabled_holo_dark = 2130837551;
+			
+			// aapt resource value: 0x7f020030
+			public const int abc_list_selector_disabled_holo_light = 2130837552;
+			
+			// aapt resource value: 0x7f020031
+			public const int abc_list_selector_holo_dark = 2130837553;
+			
+			// aapt resource value: 0x7f020032
+			public const int abc_list_selector_holo_light = 2130837554;
+			
+			// aapt resource value: 0x7f020033
+			public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+			
+			// aapt resource value: 0x7f020034
+			public const int abc_popup_background_mtrl_mult = 2130837556;
+			
+			// aapt resource value: 0x7f020035
+			public const int abc_ratingbar_indicator_material = 2130837557;
+			
+			// aapt resource value: 0x7f020036
+			public const int abc_ratingbar_material = 2130837558;
+			
+			// aapt resource value: 0x7f020037
+			public const int abc_ratingbar_small_material = 2130837559;
+			
+			// aapt resource value: 0x7f020038
+			public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+			
+			// aapt resource value: 0x7f020039
+			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+			
+			// aapt resource value: 0x7f02003a
+			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+			
+			// aapt resource value: 0x7f02003b
+			public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+			
+			// aapt resource value: 0x7f02003c
+			public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+			
+			// aapt resource value: 0x7f02003d
+			public const int abc_seekbar_thumb_material = 2130837565;
+			
+			// aapt resource value: 0x7f02003e
+			public const int abc_seekbar_tick_mark_material = 2130837566;
+			
+			// aapt resource value: 0x7f02003f
+			public const int abc_seekbar_track_material = 2130837567;
+			
+			// aapt resource value: 0x7f020040
+			public const int abc_spinner_mtrl_am_alpha = 2130837568;
+			
+			// aapt resource value: 0x7f020041
+			public const int abc_spinner_textfield_background_material = 2130837569;
+			
+			// aapt resource value: 0x7f020042
+			public const int abc_switch_thumb_material = 2130837570;
+			
+			// aapt resource value: 0x7f020043
+			public const int abc_switch_track_mtrl_alpha = 2130837571;
+			
+			// aapt resource value: 0x7f020044
+			public const int abc_tab_indicator_material = 2130837572;
+			
+			// aapt resource value: 0x7f020045
+			public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+			
+			// aapt resource value: 0x7f020046
+			public const int abc_text_cursor_material = 2130837574;
+			
+			// aapt resource value: 0x7f020047
+			public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+			
+			// aapt resource value: 0x7f020048
+			public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+			
+			// aapt resource value: 0x7f020049
+			public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+			
+			// aapt resource value: 0x7f02004a
+			public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+			
+			// aapt resource value: 0x7f02004b
+			public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
+			
+			// aapt resource value: 0x7f02004c
+			public const int abc_text_select_handle_right_mtrl_light = 2130837580;
+			
+			// aapt resource value: 0x7f02004d
+			public const int abc_textfield_activated_mtrl_alpha = 2130837581;
+			
+			// aapt resource value: 0x7f02004e
+			public const int abc_textfield_default_mtrl_alpha = 2130837582;
+			
+			// aapt resource value: 0x7f02004f
+			public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
+			
+			// aapt resource value: 0x7f020050
+			public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
+			
+			// aapt resource value: 0x7f020051
+			public const int abc_textfield_search_material = 2130837585;
+			
+			// aapt resource value: 0x7f020052
+			public const int abc_vector_test = 2130837586;
+			
+			// aapt resource value: 0x7f020053
+			public const int avd_hide_password = 2130837587;
+			
+			// aapt resource value: 0x7f02012f
+			public const int avd_hide_password_1 = 2130837807;
+			
+			// aapt resource value: 0x7f020130
+			public const int avd_hide_password_2 = 2130837808;
+			
+			// aapt resource value: 0x7f020131
+			public const int avd_hide_password_3 = 2130837809;
+			
+			// aapt resource value: 0x7f020054
+			public const int avd_show_password = 2130837588;
+			
+			// aapt resource value: 0x7f020132
+			public const int avd_show_password_1 = 2130837810;
+			
+			// aapt resource value: 0x7f020133
+			public const int avd_show_password_2 = 2130837811;
+			
+			// aapt resource value: 0x7f020134
+			public const int avd_show_password_3 = 2130837812;
+			
+			// aapt resource value: 0x7f020055
+			public const int design_bottom_navigation_item_background = 2130837589;
+			
+			// aapt resource value: 0x7f020056
+			public const int design_fab_background = 2130837590;
+			
+			// aapt resource value: 0x7f020057
+			public const int design_ic_visibility = 2130837591;
+			
+			// aapt resource value: 0x7f020058
+			public const int design_ic_visibility_off = 2130837592;
+			
+			// aapt resource value: 0x7f020059
+			public const int design_password_eye = 2130837593;
+			
+			// aapt resource value: 0x7f02005a
+			public const int design_snackbar_background = 2130837594;
+			
+			// aapt resource value: 0x7f02005b
+			public const int ic_audiotrack_dark = 2130837595;
+			
+			// aapt resource value: 0x7f02005c
+			public const int ic_audiotrack_light = 2130837596;
+			
+			// aapt resource value: 0x7f02005d
+			public const int ic_dialog_close_dark = 2130837597;
+			
+			// aapt resource value: 0x7f02005e
+			public const int ic_dialog_close_light = 2130837598;
+			
+			// aapt resource value: 0x7f02005f
+			public const int ic_group_collapse_00 = 2130837599;
+			
+			// aapt resource value: 0x7f020060
+			public const int ic_group_collapse_01 = 2130837600;
+			
+			// aapt resource value: 0x7f020061
+			public const int ic_group_collapse_02 = 2130837601;
+			
+			// aapt resource value: 0x7f020062
+			public const int ic_group_collapse_03 = 2130837602;
+			
+			// aapt resource value: 0x7f020063
+			public const int ic_group_collapse_04 = 2130837603;
+			
+			// aapt resource value: 0x7f020064
+			public const int ic_group_collapse_05 = 2130837604;
+			
+			// aapt resource value: 0x7f020065
+			public const int ic_group_collapse_06 = 2130837605;
+			
+			// aapt resource value: 0x7f020066
+			public const int ic_group_collapse_07 = 2130837606;
+			
+			// aapt resource value: 0x7f020067
+			public const int ic_group_collapse_08 = 2130837607;
+			
+			// aapt resource value: 0x7f020068
+			public const int ic_group_collapse_09 = 2130837608;
+			
+			// aapt resource value: 0x7f020069
+			public const int ic_group_collapse_10 = 2130837609;
+			
+			// aapt resource value: 0x7f02006a
+			public const int ic_group_collapse_11 = 2130837610;
+			
+			// aapt resource value: 0x7f02006b
+			public const int ic_group_collapse_12 = 2130837611;
+			
+			// aapt resource value: 0x7f02006c
+			public const int ic_group_collapse_13 = 2130837612;
+			
+			// aapt resource value: 0x7f02006d
+			public const int ic_group_collapse_14 = 2130837613;
+			
+			// aapt resource value: 0x7f02006e
+			public const int ic_group_collapse_15 = 2130837614;
+			
+			// aapt resource value: 0x7f02006f
+			public const int ic_group_expand_00 = 2130837615;
+			
+			// aapt resource value: 0x7f020070
+			public const int ic_group_expand_01 = 2130837616;
+			
+			// aapt resource value: 0x7f020071
+			public const int ic_group_expand_02 = 2130837617;
+			
+			// aapt resource value: 0x7f020072
+			public const int ic_group_expand_03 = 2130837618;
+			
+			// aapt resource value: 0x7f020073
+			public const int ic_group_expand_04 = 2130837619;
+			
+			// aapt resource value: 0x7f020074
+			public const int ic_group_expand_05 = 2130837620;
+			
+			// aapt resource value: 0x7f020075
+			public const int ic_group_expand_06 = 2130837621;
+			
+			// aapt resource value: 0x7f020076
+			public const int ic_group_expand_07 = 2130837622;
+			
+			// aapt resource value: 0x7f020077
+			public const int ic_group_expand_08 = 2130837623;
+			
+			// aapt resource value: 0x7f020078
+			public const int ic_group_expand_09 = 2130837624;
+			
+			// aapt resource value: 0x7f020079
+			public const int ic_group_expand_10 = 2130837625;
+			
+			// aapt resource value: 0x7f02007a
+			public const int ic_group_expand_11 = 2130837626;
+			
+			// aapt resource value: 0x7f02007b
+			public const int ic_group_expand_12 = 2130837627;
+			
+			// aapt resource value: 0x7f02007c
+			public const int ic_group_expand_13 = 2130837628;
+			
+			// aapt resource value: 0x7f02007d
+			public const int ic_group_expand_14 = 2130837629;
+			
+			// aapt resource value: 0x7f02007e
+			public const int ic_group_expand_15 = 2130837630;
+			
+			// aapt resource value: 0x7f02007f
+			public const int ic_media_pause_dark = 2130837631;
+			
+			// aapt resource value: 0x7f020080
+			public const int ic_media_pause_light = 2130837632;
+			
+			// aapt resource value: 0x7f020081
+			public const int ic_media_play_dark = 2130837633;
+			
+			// aapt resource value: 0x7f020082
+			public const int ic_media_play_light = 2130837634;
+			
+			// aapt resource value: 0x7f020083
+			public const int ic_media_stop_dark = 2130837635;
+			
+			// aapt resource value: 0x7f020084
+			public const int ic_media_stop_light = 2130837636;
+			
+			// aapt resource value: 0x7f020085
+			public const int ic_mr_button_connected_00_dark = 2130837637;
+			
+			// aapt resource value: 0x7f020086
+			public const int ic_mr_button_connected_00_light = 2130837638;
+			
+			// aapt resource value: 0x7f020087
+			public const int ic_mr_button_connected_01_dark = 2130837639;
+			
+			// aapt resource value: 0x7f020088
+			public const int ic_mr_button_connected_01_light = 2130837640;
+			
+			// aapt resource value: 0x7f020089
+			public const int ic_mr_button_connected_02_dark = 2130837641;
+			
+			// aapt resource value: 0x7f02008a
+			public const int ic_mr_button_connected_02_light = 2130837642;
+			
+			// aapt resource value: 0x7f02008b
+			public const int ic_mr_button_connected_03_dark = 2130837643;
+			
+			// aapt resource value: 0x7f02008c
+			public const int ic_mr_button_connected_03_light = 2130837644;
+			
+			// aapt resource value: 0x7f02008d
+			public const int ic_mr_button_connected_04_dark = 2130837645;
+			
+			// aapt resource value: 0x7f02008e
+			public const int ic_mr_button_connected_04_light = 2130837646;
+			
+			// aapt resource value: 0x7f02008f
+			public const int ic_mr_button_connected_05_dark = 2130837647;
+			
+			// aapt resource value: 0x7f020090
+			public const int ic_mr_button_connected_05_light = 2130837648;
+			
+			// aapt resource value: 0x7f020091
+			public const int ic_mr_button_connected_06_dark = 2130837649;
+			
+			// aapt resource value: 0x7f020092
+			public const int ic_mr_button_connected_06_light = 2130837650;
+			
+			// aapt resource value: 0x7f020093
+			public const int ic_mr_button_connected_07_dark = 2130837651;
+			
+			// aapt resource value: 0x7f020094
+			public const int ic_mr_button_connected_07_light = 2130837652;
+			
+			// aapt resource value: 0x7f020095
+			public const int ic_mr_button_connected_08_dark = 2130837653;
+			
+			// aapt resource value: 0x7f020096
+			public const int ic_mr_button_connected_08_light = 2130837654;
+			
+			// aapt resource value: 0x7f020097
+			public const int ic_mr_button_connected_09_dark = 2130837655;
+			
+			// aapt resource value: 0x7f020098
+			public const int ic_mr_button_connected_09_light = 2130837656;
+			
+			// aapt resource value: 0x7f020099
+			public const int ic_mr_button_connected_10_dark = 2130837657;
+			
+			// aapt resource value: 0x7f02009a
+			public const int ic_mr_button_connected_10_light = 2130837658;
+			
+			// aapt resource value: 0x7f02009b
+			public const int ic_mr_button_connected_11_dark = 2130837659;
+			
+			// aapt resource value: 0x7f02009c
+			public const int ic_mr_button_connected_11_light = 2130837660;
+			
+			// aapt resource value: 0x7f02009d
+			public const int ic_mr_button_connected_12_dark = 2130837661;
+			
+			// aapt resource value: 0x7f02009e
+			public const int ic_mr_button_connected_12_light = 2130837662;
+			
+			// aapt resource value: 0x7f02009f
+			public const int ic_mr_button_connected_13_dark = 2130837663;
+			
+			// aapt resource value: 0x7f0200a0
+			public const int ic_mr_button_connected_13_light = 2130837664;
+			
+			// aapt resource value: 0x7f0200a1
+			public const int ic_mr_button_connected_14_dark = 2130837665;
+			
+			// aapt resource value: 0x7f0200a2
+			public const int ic_mr_button_connected_14_light = 2130837666;
+			
+			// aapt resource value: 0x7f0200a3
+			public const int ic_mr_button_connected_15_dark = 2130837667;
+			
+			// aapt resource value: 0x7f0200a4
+			public const int ic_mr_button_connected_15_light = 2130837668;
+			
+			// aapt resource value: 0x7f0200a5
+			public const int ic_mr_button_connected_16_dark = 2130837669;
+			
+			// aapt resource value: 0x7f0200a6
+			public const int ic_mr_button_connected_16_light = 2130837670;
+			
+			// aapt resource value: 0x7f0200a7
+			public const int ic_mr_button_connected_17_dark = 2130837671;
+			
+			// aapt resource value: 0x7f0200a8
+			public const int ic_mr_button_connected_17_light = 2130837672;
+			
+			// aapt resource value: 0x7f0200a9
+			public const int ic_mr_button_connected_18_dark = 2130837673;
+			
+			// aapt resource value: 0x7f0200aa
+			public const int ic_mr_button_connected_18_light = 2130837674;
+			
+			// aapt resource value: 0x7f0200ab
+			public const int ic_mr_button_connected_19_dark = 2130837675;
+			
+			// aapt resource value: 0x7f0200ac
+			public const int ic_mr_button_connected_19_light = 2130837676;
+			
+			// aapt resource value: 0x7f0200ad
+			public const int ic_mr_button_connected_20_dark = 2130837677;
+			
+			// aapt resource value: 0x7f0200ae
+			public const int ic_mr_button_connected_20_light = 2130837678;
+			
+			// aapt resource value: 0x7f0200af
+			public const int ic_mr_button_connected_21_dark = 2130837679;
+			
+			// aapt resource value: 0x7f0200b0
+			public const int ic_mr_button_connected_21_light = 2130837680;
+			
+			// aapt resource value: 0x7f0200b1
+			public const int ic_mr_button_connected_22_dark = 2130837681;
+			
+			// aapt resource value: 0x7f0200b2
+			public const int ic_mr_button_connected_22_light = 2130837682;
+			
+			// aapt resource value: 0x7f0200b3
+			public const int ic_mr_button_connected_23_dark = 2130837683;
+			
+			// aapt resource value: 0x7f0200b4
+			public const int ic_mr_button_connected_23_light = 2130837684;
+			
+			// aapt resource value: 0x7f0200b5
+			public const int ic_mr_button_connected_24_dark = 2130837685;
+			
+			// aapt resource value: 0x7f0200b6
+			public const int ic_mr_button_connected_24_light = 2130837686;
+			
+			// aapt resource value: 0x7f0200b7
+			public const int ic_mr_button_connected_25_dark = 2130837687;
+			
+			// aapt resource value: 0x7f0200b8
+			public const int ic_mr_button_connected_25_light = 2130837688;
+			
+			// aapt resource value: 0x7f0200b9
+			public const int ic_mr_button_connected_26_dark = 2130837689;
+			
+			// aapt resource value: 0x7f0200ba
+			public const int ic_mr_button_connected_26_light = 2130837690;
+			
+			// aapt resource value: 0x7f0200bb
+			public const int ic_mr_button_connected_27_dark = 2130837691;
+			
+			// aapt resource value: 0x7f0200bc
+			public const int ic_mr_button_connected_27_light = 2130837692;
+			
+			// aapt resource value: 0x7f0200bd
+			public const int ic_mr_button_connected_28_dark = 2130837693;
+			
+			// aapt resource value: 0x7f0200be
+			public const int ic_mr_button_connected_28_light = 2130837694;
+			
+			// aapt resource value: 0x7f0200bf
+			public const int ic_mr_button_connected_29_dark = 2130837695;
+			
+			// aapt resource value: 0x7f0200c0
+			public const int ic_mr_button_connected_29_light = 2130837696;
+			
+			// aapt resource value: 0x7f0200c1
+			public const int ic_mr_button_connected_30_dark = 2130837697;
+			
+			// aapt resource value: 0x7f0200c2
+			public const int ic_mr_button_connected_30_light = 2130837698;
+			
+			// aapt resource value: 0x7f0200c3
+			public const int ic_mr_button_connecting_00_dark = 2130837699;
+			
+			// aapt resource value: 0x7f0200c4
+			public const int ic_mr_button_connecting_00_light = 2130837700;
+			
+			// aapt resource value: 0x7f0200c5
+			public const int ic_mr_button_connecting_01_dark = 2130837701;
+			
+			// aapt resource value: 0x7f0200c6
+			public const int ic_mr_button_connecting_01_light = 2130837702;
+			
+			// aapt resource value: 0x7f0200c7
+			public const int ic_mr_button_connecting_02_dark = 2130837703;
+			
+			// aapt resource value: 0x7f0200c8
+			public const int ic_mr_button_connecting_02_light = 2130837704;
+			
+			// aapt resource value: 0x7f0200c9
+			public const int ic_mr_button_connecting_03_dark = 2130837705;
+			
+			// aapt resource value: 0x7f0200ca
+			public const int ic_mr_button_connecting_03_light = 2130837706;
+			
+			// aapt resource value: 0x7f0200cb
+			public const int ic_mr_button_connecting_04_dark = 2130837707;
+			
+			// aapt resource value: 0x7f0200cc
+			public const int ic_mr_button_connecting_04_light = 2130837708;
+			
+			// aapt resource value: 0x7f0200cd
+			public const int ic_mr_button_connecting_05_dark = 2130837709;
+			
+			// aapt resource value: 0x7f0200ce
+			public const int ic_mr_button_connecting_05_light = 2130837710;
+			
+			// aapt resource value: 0x7f0200cf
+			public const int ic_mr_button_connecting_06_dark = 2130837711;
+			
+			// aapt resource value: 0x7f0200d0
+			public const int ic_mr_button_connecting_06_light = 2130837712;
+			
+			// aapt resource value: 0x7f0200d1
+			public const int ic_mr_button_connecting_07_dark = 2130837713;
+			
+			// aapt resource value: 0x7f0200d2
+			public const int ic_mr_button_connecting_07_light = 2130837714;
+			
+			// aapt resource value: 0x7f0200d3
+			public const int ic_mr_button_connecting_08_dark = 2130837715;
+			
+			// aapt resource value: 0x7f0200d4
+			public const int ic_mr_button_connecting_08_light = 2130837716;
+			
+			// aapt resource value: 0x7f0200d5
+			public const int ic_mr_button_connecting_09_dark = 2130837717;
+			
+			// aapt resource value: 0x7f0200d6
+			public const int ic_mr_button_connecting_09_light = 2130837718;
+			
+			// aapt resource value: 0x7f0200d7
+			public const int ic_mr_button_connecting_10_dark = 2130837719;
+			
+			// aapt resource value: 0x7f0200d8
+			public const int ic_mr_button_connecting_10_light = 2130837720;
+			
+			// aapt resource value: 0x7f0200d9
+			public const int ic_mr_button_connecting_11_dark = 2130837721;
+			
+			// aapt resource value: 0x7f0200da
+			public const int ic_mr_button_connecting_11_light = 2130837722;
+			
+			// aapt resource value: 0x7f0200db
+			public const int ic_mr_button_connecting_12_dark = 2130837723;
+			
+			// aapt resource value: 0x7f0200dc
+			public const int ic_mr_button_connecting_12_light = 2130837724;
+			
+			// aapt resource value: 0x7f0200dd
+			public const int ic_mr_button_connecting_13_dark = 2130837725;
+			
+			// aapt resource value: 0x7f0200de
+			public const int ic_mr_button_connecting_13_light = 2130837726;
+			
+			// aapt resource value: 0x7f0200df
+			public const int ic_mr_button_connecting_14_dark = 2130837727;
+			
+			// aapt resource value: 0x7f0200e0
+			public const int ic_mr_button_connecting_14_light = 2130837728;
+			
+			// aapt resource value: 0x7f0200e1
+			public const int ic_mr_button_connecting_15_dark = 2130837729;
+			
+			// aapt resource value: 0x7f0200e2
+			public const int ic_mr_button_connecting_15_light = 2130837730;
+			
+			// aapt resource value: 0x7f0200e3
+			public const int ic_mr_button_connecting_16_dark = 2130837731;
+			
+			// aapt resource value: 0x7f0200e4
+			public const int ic_mr_button_connecting_16_light = 2130837732;
+			
+			// aapt resource value: 0x7f0200e5
+			public const int ic_mr_button_connecting_17_dark = 2130837733;
+			
+			// aapt resource value: 0x7f0200e6
+			public const int ic_mr_button_connecting_17_light = 2130837734;
+			
+			// aapt resource value: 0x7f0200e7
+			public const int ic_mr_button_connecting_18_dark = 2130837735;
+			
+			// aapt resource value: 0x7f0200e8
+			public const int ic_mr_button_connecting_18_light = 2130837736;
+			
+			// aapt resource value: 0x7f0200e9
+			public const int ic_mr_button_connecting_19_dark = 2130837737;
+			
+			// aapt resource value: 0x7f0200ea
+			public const int ic_mr_button_connecting_19_light = 2130837738;
+			
+			// aapt resource value: 0x7f0200eb
+			public const int ic_mr_button_connecting_20_dark = 2130837739;
+			
+			// aapt resource value: 0x7f0200ec
+			public const int ic_mr_button_connecting_20_light = 2130837740;
+			
+			// aapt resource value: 0x7f0200ed
+			public const int ic_mr_button_connecting_21_dark = 2130837741;
+			
+			// aapt resource value: 0x7f0200ee
+			public const int ic_mr_button_connecting_21_light = 2130837742;
+			
+			// aapt resource value: 0x7f0200ef
+			public const int ic_mr_button_connecting_22_dark = 2130837743;
+			
+			// aapt resource value: 0x7f0200f0
+			public const int ic_mr_button_connecting_22_light = 2130837744;
+			
+			// aapt resource value: 0x7f0200f1
+			public const int ic_mr_button_connecting_23_dark = 2130837745;
+			
+			// aapt resource value: 0x7f0200f2
+			public const int ic_mr_button_connecting_23_light = 2130837746;
+			
+			// aapt resource value: 0x7f0200f3
+			public const int ic_mr_button_connecting_24_dark = 2130837747;
+			
+			// aapt resource value: 0x7f0200f4
+			public const int ic_mr_button_connecting_24_light = 2130837748;
+			
+			// aapt resource value: 0x7f0200f5
+			public const int ic_mr_button_connecting_25_dark = 2130837749;
+			
+			// aapt resource value: 0x7f0200f6
+			public const int ic_mr_button_connecting_25_light = 2130837750;
+			
+			// aapt resource value: 0x7f0200f7
+			public const int ic_mr_button_connecting_26_dark = 2130837751;
+			
+			// aapt resource value: 0x7f0200f8
+			public const int ic_mr_button_connecting_26_light = 2130837752;
+			
+			// aapt resource value: 0x7f0200f9
+			public const int ic_mr_button_connecting_27_dark = 2130837753;
+			
+			// aapt resource value: 0x7f0200fa
+			public const int ic_mr_button_connecting_27_light = 2130837754;
+			
+			// aapt resource value: 0x7f0200fb
+			public const int ic_mr_button_connecting_28_dark = 2130837755;
+			
+			// aapt resource value: 0x7f0200fc
+			public const int ic_mr_button_connecting_28_light = 2130837756;
+			
+			// aapt resource value: 0x7f0200fd
+			public const int ic_mr_button_connecting_29_dark = 2130837757;
+			
+			// aapt resource value: 0x7f0200fe
+			public const int ic_mr_button_connecting_29_light = 2130837758;
+			
+			// aapt resource value: 0x7f0200ff
+			public const int ic_mr_button_connecting_30_dark = 2130837759;
+			
+			// aapt resource value: 0x7f020100
+			public const int ic_mr_button_connecting_30_light = 2130837760;
+			
+			// aapt resource value: 0x7f020101
+			public const int ic_mr_button_disabled_dark = 2130837761;
+			
+			// aapt resource value: 0x7f020102
+			public const int ic_mr_button_disabled_light = 2130837762;
+			
+			// aapt resource value: 0x7f020103
+			public const int ic_mr_button_disconnected_dark = 2130837763;
+			
+			// aapt resource value: 0x7f020104
+			public const int ic_mr_button_disconnected_light = 2130837764;
+			
+			// aapt resource value: 0x7f020105
+			public const int ic_mr_button_grey = 2130837765;
+			
+			// aapt resource value: 0x7f020106
+			public const int ic_vol_type_speaker_dark = 2130837766;
+			
+			// aapt resource value: 0x7f020107
+			public const int ic_vol_type_speaker_group_dark = 2130837767;
+			
+			// aapt resource value: 0x7f020108
+			public const int ic_vol_type_speaker_group_light = 2130837768;
+			
+			// aapt resource value: 0x7f020109
+			public const int ic_vol_type_speaker_light = 2130837769;
+			
+			// aapt resource value: 0x7f02010a
+			public const int ic_vol_type_tv_dark = 2130837770;
+			
+			// aapt resource value: 0x7f02010b
+			public const int ic_vol_type_tv_light = 2130837771;
+			
+			// aapt resource value: 0x7f02010c
+			public const int mr_button_connected_dark = 2130837772;
+			
+			// aapt resource value: 0x7f02010d
+			public const int mr_button_connected_light = 2130837773;
+			
+			// aapt resource value: 0x7f02010e
+			public const int mr_button_connecting_dark = 2130837774;
+			
+			// aapt resource value: 0x7f02010f
+			public const int mr_button_connecting_light = 2130837775;
+			
+			// aapt resource value: 0x7f020110
+			public const int mr_button_dark = 2130837776;
+			
+			// aapt resource value: 0x7f020111
+			public const int mr_button_light = 2130837777;
+			
+			// aapt resource value: 0x7f020112
+			public const int mr_dialog_close_dark = 2130837778;
+			
+			// aapt resource value: 0x7f020113
+			public const int mr_dialog_close_light = 2130837779;
+			
+			// aapt resource value: 0x7f020114
+			public const int mr_dialog_material_background_dark = 2130837780;
+			
+			// aapt resource value: 0x7f020115
+			public const int mr_dialog_material_background_light = 2130837781;
+			
+			// aapt resource value: 0x7f020116
+			public const int mr_group_collapse = 2130837782;
+			
+			// aapt resource value: 0x7f020117
+			public const int mr_group_expand = 2130837783;
+			
+			// aapt resource value: 0x7f020118
+			public const int mr_media_pause_dark = 2130837784;
+			
+			// aapt resource value: 0x7f020119
+			public const int mr_media_pause_light = 2130837785;
+			
+			// aapt resource value: 0x7f02011a
+			public const int mr_media_play_dark = 2130837786;
+			
+			// aapt resource value: 0x7f02011b
+			public const int mr_media_play_light = 2130837787;
+			
+			// aapt resource value: 0x7f02011c
+			public const int mr_media_stop_dark = 2130837788;
+			
+			// aapt resource value: 0x7f02011d
+			public const int mr_media_stop_light = 2130837789;
+			
+			// aapt resource value: 0x7f02011e
+			public const int mr_vol_type_audiotrack_dark = 2130837790;
+			
+			// aapt resource value: 0x7f02011f
+			public const int mr_vol_type_audiotrack_light = 2130837791;
+			
+			// aapt resource value: 0x7f020120
+			public const int navigation_empty_icon = 2130837792;
+			
+			// aapt resource value: 0x7f020121
+			public const int notification_action_background = 2130837793;
+			
+			// aapt resource value: 0x7f020122
+			public const int notification_bg = 2130837794;
+			
+			// aapt resource value: 0x7f020123
+			public const int notification_bg_low = 2130837795;
+			
+			// aapt resource value: 0x7f020124
+			public const int notification_bg_low_normal = 2130837796;
+			
+			// aapt resource value: 0x7f020125
+			public const int notification_bg_low_pressed = 2130837797;
+			
+			// aapt resource value: 0x7f020126
+			public const int notification_bg_normal = 2130837798;
+			
+			// aapt resource value: 0x7f020127
+			public const int notification_bg_normal_pressed = 2130837799;
+			
+			// aapt resource value: 0x7f020128
+			public const int notification_icon_background = 2130837800;
+			
+			// aapt resource value: 0x7f02012d
+			public const int notification_template_icon_bg = 2130837805;
+			
+			// aapt resource value: 0x7f02012e
+			public const int notification_template_icon_low_bg = 2130837806;
+			
+			// aapt resource value: 0x7f020129
+			public const int notification_tile_bg = 2130837801;
+			
+			// aapt resource value: 0x7f02012a
+			public const int notify_panel_notification_icon_bg = 2130837802;
+			
+			// aapt resource value: 0x7f02012b
+			public const int tooltip_frame_dark = 2130837803;
+			
+			// aapt resource value: 0x7f02012c
+			public const int tooltip_frame_light = 2130837804;
+			
+			static Drawable()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Drawable()
+			{
+			}
+		}
+		
+		public partial class Id
+		{
+			
+			// aapt resource value: 0x7f090032
+			public const int ALT = 2131296306;
+			
+			// aapt resource value: 0x7f090033
+			public const int CTRL = 2131296307;
+			
+			// aapt resource value: 0x7f090034
+			public const int FUNCTION = 2131296308;
+			
+			// aapt resource value: 0x7f090035
+			public const int META = 2131296309;
+			
+			// aapt resource value: 0x7f090036
+			public const int SHIFT = 2131296310;
+			
+			// aapt resource value: 0x7f090037
+			public const int SYM = 2131296311;
+			
+			// aapt resource value: 0x7f0900b6
+			public const int action0 = 2131296438;
+			
+			// aapt resource value: 0x7f09007c
+			public const int action_bar = 2131296380;
+			
+			// aapt resource value: 0x7f090001
+			public const int action_bar_activity_content = 2131296257;
+			
+			// aapt resource value: 0x7f09007b
+			public const int action_bar_container = 2131296379;
+			
+			// aapt resource value: 0x7f090077
+			public const int action_bar_root = 2131296375;
+			
+			// aapt resource value: 0x7f090002
+			public const int action_bar_spinner = 2131296258;
+			
+			// aapt resource value: 0x7f09005b
+			public const int action_bar_subtitle = 2131296347;
+			
+			// aapt resource value: 0x7f09005a
+			public const int action_bar_title = 2131296346;
+			
+			// aapt resource value: 0x7f0900b3
+			public const int action_container = 2131296435;
+			
+			// aapt resource value: 0x7f09007d
+			public const int action_context_bar = 2131296381;
+			
+			// aapt resource value: 0x7f0900ba
+			public const int action_divider = 2131296442;
+			
+			// aapt resource value: 0x7f0900b4
+			public const int action_image = 2131296436;
+			
+			// aapt resource value: 0x7f090003
+			public const int action_menu_divider = 2131296259;
+			
+			// aapt resource value: 0x7f090004
+			public const int action_menu_presenter = 2131296260;
+			
+			// aapt resource value: 0x7f090079
+			public const int action_mode_bar = 2131296377;
+			
+			// aapt resource value: 0x7f090078
+			public const int action_mode_bar_stub = 2131296376;
+			
+			// aapt resource value: 0x7f09005c
+			public const int action_mode_close_button = 2131296348;
+			
+			// aapt resource value: 0x7f0900b5
+			public const int action_text = 2131296437;
+			
+			// aapt resource value: 0x7f0900c3
+			public const int actions = 2131296451;
+			
+			// aapt resource value: 0x7f09005d
+			public const int activity_chooser_view_content = 2131296349;
+			
+			// aapt resource value: 0x7f090027
+			public const int add = 2131296295;
+			
+			// aapt resource value: 0x7f090070
+			public const int alertTitle = 2131296368;
+			
+			// aapt resource value: 0x7f090052
+			public const int all = 2131296338;
+			
+			// aapt resource value: 0x7f090038
+			public const int always = 2131296312;
+			
+			// aapt resource value: 0x7f090056
+			public const int async = 2131296342;
+			
+			// aapt resource value: 0x7f090044
+			public const int auto = 2131296324;
+			
+			// aapt resource value: 0x7f09002f
+			public const int beginning = 2131296303;
+			
+			// aapt resource value: 0x7f090057
+			public const int blocking = 2131296343;
+			
+			// aapt resource value: 0x7f09003d
+			public const int bottom = 2131296317;
+			
+			// aapt resource value: 0x7f090063
+			public const int buttonPanel = 2131296355;
+			
+			// aapt resource value: 0x7f0900b7
+			public const int cancel_action = 2131296439;
+			
+			// aapt resource value: 0x7f090045
+			public const int center = 2131296325;
+			
+			// aapt resource value: 0x7f090046
+			public const int center_horizontal = 2131296326;
+			
+			// aapt resource value: 0x7f090047
+			public const int center_vertical = 2131296327;
+			
+			// aapt resource value: 0x7f090073
+			public const int checkbox = 2131296371;
+			
+			// aapt resource value: 0x7f0900bf
+			public const int chronometer = 2131296447;
+			
+			// aapt resource value: 0x7f09004e
+			public const int clip_horizontal = 2131296334;
+			
+			// aapt resource value: 0x7f09004f
+			public const int clip_vertical = 2131296335;
+			
+			// aapt resource value: 0x7f090039
+			public const int collapseActionView = 2131296313;
+			
+			// aapt resource value: 0x7f09008d
+			public const int container = 2131296397;
+			
+			// aapt resource value: 0x7f090066
+			public const int contentPanel = 2131296358;
+			
+			// aapt resource value: 0x7f09008e
+			public const int coordinator = 2131296398;
+			
+			// aapt resource value: 0x7f09006d
+			public const int custom = 2131296365;
+			
+			// aapt resource value: 0x7f09006c
+			public const int customPanel = 2131296364;
+			
+			// aapt resource value: 0x7f09007a
+			public const int decor_content_parent = 2131296378;
+			
+			// aapt resource value: 0x7f090060
+			public const int default_activity_button = 2131296352;
+			
+			// aapt resource value: 0x7f090090
+			public const int design_bottom_sheet = 2131296400;
+			
+			// aapt resource value: 0x7f090097
+			public const int design_menu_item_action_area = 2131296407;
+			
+			// aapt resource value: 0x7f090096
+			public const int design_menu_item_action_area_stub = 2131296406;
+			
+			// aapt resource value: 0x7f090095
+			public const int design_menu_item_text = 2131296405;
+			
+			// aapt resource value: 0x7f090094
+			public const int design_navigation_view = 2131296404;
+			
+			// aapt resource value: 0x7f090020
+			public const int disableHome = 2131296288;
+			
+			// aapt resource value: 0x7f09007e
+			public const int edit_query = 2131296382;
+			
+			// aapt resource value: 0x7f090030
+			public const int end = 2131296304;
+			
+			// aapt resource value: 0x7f0900c5
+			public const int end_padder = 2131296453;
+			
+			// aapt resource value: 0x7f09003f
+			public const int enterAlways = 2131296319;
+			
+			// aapt resource value: 0x7f090040
+			public const int enterAlwaysCollapsed = 2131296320;
+			
+			// aapt resource value: 0x7f090041
+			public const int exitUntilCollapsed = 2131296321;
+			
+			// aapt resource value: 0x7f09005e
+			public const int expand_activities_button = 2131296350;
+			
+			// aapt resource value: 0x7f090072
+			public const int expanded_menu = 2131296370;
+			
+			// aapt resource value: 0x7f090050
+			public const int fill = 2131296336;
+			
+			// aapt resource value: 0x7f090051
+			public const int fill_horizontal = 2131296337;
+			
+			// aapt resource value: 0x7f090048
+			public const int fill_vertical = 2131296328;
+			
+			// aapt resource value: 0x7f090054
+			public const int @fixed = 2131296340;
+			
+			// aapt resource value: 0x7f090058
+			public const int forever = 2131296344;
+			
+			// aapt resource value: 0x7f09000a
+			public const int ghost_view = 2131296266;
+			
+			// aapt resource value: 0x7f090005
+			public const int home = 2131296261;
+			
+			// aapt resource value: 0x7f090021
+			public const int homeAsUp = 2131296289;
+			
+			// aapt resource value: 0x7f090062
+			public const int icon = 2131296354;
+			
+			// aapt resource value: 0x7f0900c4
+			public const int icon_group = 2131296452;
+			
+			// aapt resource value: 0x7f09003a
+			public const int ifRoom = 2131296314;
+			
+			// aapt resource value: 0x7f09005f
+			public const int image = 2131296351;
+			
+			// aapt resource value: 0x7f0900c0
+			public const int info = 2131296448;
+			
+			// aapt resource value: 0x7f090059
+			public const int italic = 2131296345;
+			
+			// aapt resource value: 0x7f090000
+			public const int item_touch_helper_previous_elevation = 2131296256;
+			
+			// aapt resource value: 0x7f09008c
+			public const int largeLabel = 2131296396;
+			
+			// aapt resource value: 0x7f090049
+			public const int left = 2131296329;
+			
+			// aapt resource value: 0x7f090017
+			public const int line1 = 2131296279;
+			
+			// aapt resource value: 0x7f090018
+			public const int line3 = 2131296280;
+			
+			// aapt resource value: 0x7f09001d
+			public const int listMode = 2131296285;
+			
+			// aapt resource value: 0x7f090061
+			public const int list_item = 2131296353;
+			
+			// aapt resource value: 0x7f0900ca
+			public const int masked = 2131296458;
+			
+			// aapt resource value: 0x7f0900b9
+			public const int media_actions = 2131296441;
+			
+			// aapt resource value: 0x7f0900c8
+			public const int message = 2131296456;
+			
+			// aapt resource value: 0x7f090031
+			public const int middle = 2131296305;
+			
+			// aapt resource value: 0x7f090053
+			public const int mini = 2131296339;
+			
+			// aapt resource value: 0x7f0900a5
+			public const int mr_art = 2131296421;
+			
+			// aapt resource value: 0x7f09009a
+			public const int mr_chooser_list = 2131296410;
+			
+			// aapt resource value: 0x7f09009d
+			public const int mr_chooser_route_desc = 2131296413;
+			
+			// aapt resource value: 0x7f09009b
+			public const int mr_chooser_route_icon = 2131296411;
+			
+			// aapt resource value: 0x7f09009c
+			public const int mr_chooser_route_name = 2131296412;
+			
+			// aapt resource value: 0x7f090099
+			public const int mr_chooser_title = 2131296409;
+			
+			// aapt resource value: 0x7f0900a2
+			public const int mr_close = 2131296418;
+			
+			// aapt resource value: 0x7f0900a8
+			public const int mr_control_divider = 2131296424;
+			
+			// aapt resource value: 0x7f0900ae
+			public const int mr_control_playback_ctrl = 2131296430;
+			
+			// aapt resource value: 0x7f0900b1
+			public const int mr_control_subtitle = 2131296433;
+			
+			// aapt resource value: 0x7f0900b0
+			public const int mr_control_title = 2131296432;
+			
+			// aapt resource value: 0x7f0900af
+			public const int mr_control_title_container = 2131296431;
+			
+			// aapt resource value: 0x7f0900a3
+			public const int mr_custom_control = 2131296419;
+			
+			// aapt resource value: 0x7f0900a4
+			public const int mr_default_control = 2131296420;
+			
+			// aapt resource value: 0x7f09009f
+			public const int mr_dialog_area = 2131296415;
+			
+			// aapt resource value: 0x7f09009e
+			public const int mr_expandable_area = 2131296414;
+			
+			// aapt resource value: 0x7f0900b2
+			public const int mr_group_expand_collapse = 2131296434;
+			
+			// aapt resource value: 0x7f0900a6
+			public const int mr_media_main_control = 2131296422;
+			
+			// aapt resource value: 0x7f0900a1
+			public const int mr_name = 2131296417;
+			
+			// aapt resource value: 0x7f0900a7
+			public const int mr_playback_control = 2131296423;
+			
+			// aapt resource value: 0x7f0900a0
+			public const int mr_title_bar = 2131296416;
+			
+			// aapt resource value: 0x7f0900a9
+			public const int mr_volume_control = 2131296425;
+			
+			// aapt resource value: 0x7f0900aa
+			public const int mr_volume_group_list = 2131296426;
+			
+			// aapt resource value: 0x7f0900ac
+			public const int mr_volume_item_icon = 2131296428;
+			
+			// aapt resource value: 0x7f0900ad
+			public const int mr_volume_slider = 2131296429;
+			
+			// aapt resource value: 0x7f090028
+			public const int multiply = 2131296296;
+			
+			// aapt resource value: 0x7f090093
+			public const int navigation_header_container = 2131296403;
+			
+			// aapt resource value: 0x7f09003b
+			public const int never = 2131296315;
+			
+			// aapt resource value: 0x7f090022
+			public const int none = 2131296290;
+			
+			// aapt resource value: 0x7f09001e
+			public const int normal = 2131296286;
+			
+			// aapt resource value: 0x7f0900c2
+			public const int notification_background = 2131296450;
+			
+			// aapt resource value: 0x7f0900bc
+			public const int notification_main_column = 2131296444;
+			
+			// aapt resource value: 0x7f0900bb
+			public const int notification_main_column_container = 2131296443;
+			
+			// aapt resource value: 0x7f09004c
+			public const int parallax = 2131296332;
+			
+			// aapt resource value: 0x7f090065
+			public const int parentPanel = 2131296357;
+			
+			// aapt resource value: 0x7f09000b
+			public const int parent_matrix = 2131296267;
+			
+			// aapt resource value: 0x7f09004d
+			public const int pin = 2131296333;
+			
+			// aapt resource value: 0x7f090006
+			public const int progress_circular = 2131296262;
+			
+			// aapt resource value: 0x7f090007
+			public const int progress_horizontal = 2131296263;
+			
+			// aapt resource value: 0x7f090075
+			public const int radio = 2131296373;
+			
+			// aapt resource value: 0x7f09004a
+			public const int right = 2131296330;
+			
+			// aapt resource value: 0x7f0900c1
+			public const int right_icon = 2131296449;
+			
+			// aapt resource value: 0x7f0900bd
+			public const int right_side = 2131296445;
+			
+			// aapt resource value: 0x7f09000c
+			public const int save_image_matrix = 2131296268;
+			
+			// aapt resource value: 0x7f09000d
+			public const int save_non_transition_alpha = 2131296269;
+			
+			// aapt resource value: 0x7f09000e
+			public const int save_scale_type = 2131296270;
+			
+			// aapt resource value: 0x7f090029
+			public const int screen = 2131296297;
+			
+			// aapt resource value: 0x7f090042
+			public const int scroll = 2131296322;
+			
+			// aapt resource value: 0x7f09006b
+			public const int scrollIndicatorDown = 2131296363;
+			
+			// aapt resource value: 0x7f090067
+			public const int scrollIndicatorUp = 2131296359;
+			
+			// aapt resource value: 0x7f090068
+			public const int scrollView = 2131296360;
+			
+			// aapt resource value: 0x7f090055
+			public const int scrollable = 2131296341;
+			
+			// aapt resource value: 0x7f090080
+			public const int search_badge = 2131296384;
+			
+			// aapt resource value: 0x7f09007f
+			public const int search_bar = 2131296383;
+			
+			// aapt resource value: 0x7f090081
+			public const int search_button = 2131296385;
+			
+			// aapt resource value: 0x7f090086
+			public const int search_close_btn = 2131296390;
+			
+			// aapt resource value: 0x7f090082
+			public const int search_edit_frame = 2131296386;
+			
+			// aapt resource value: 0x7f090088
+			public const int search_go_btn = 2131296392;
+			
+			// aapt resource value: 0x7f090083
+			public const int search_mag_icon = 2131296387;
+			
+			// aapt resource value: 0x7f090084
+			public const int search_plate = 2131296388;
+			
+			// aapt resource value: 0x7f090085
+			public const int search_src_text = 2131296389;
+			
+			// aapt resource value: 0x7f090089
+			public const int search_voice_btn = 2131296393;
+			
+			// aapt resource value: 0x7f09008a
+			public const int select_dialog_listview = 2131296394;
+			
+			// aapt resource value: 0x7f090074
+			public const int shortcut = 2131296372;
+			
+			// aapt resource value: 0x7f090023
+			public const int showCustom = 2131296291;
+			
+			// aapt resource value: 0x7f090024
+			public const int showHome = 2131296292;
+			
+			// aapt resource value: 0x7f090025
+			public const int showTitle = 2131296293;
+			
+			// aapt resource value: 0x7f0900c6
+			public const int sliding_tabs = 2131296454;
+			
+			// aapt resource value: 0x7f09008b
+			public const int smallLabel = 2131296395;
+			
+			// aapt resource value: 0x7f090092
+			public const int snackbar_action = 2131296402;
+			
+			// aapt resource value: 0x7f090091
+			public const int snackbar_text = 2131296401;
+			
+			// aapt resource value: 0x7f090043
+			public const int snap = 2131296323;
+			
+			// aapt resource value: 0x7f090064
+			public const int spacer = 2131296356;
+			
+			// aapt resource value: 0x7f090008
+			public const int split_action_bar = 2131296264;
+			
+			// aapt resource value: 0x7f09002a
+			public const int src_atop = 2131296298;
+			
+			// aapt resource value: 0x7f09002b
+			public const int src_in = 2131296299;
+			
+			// aapt resource value: 0x7f09002c
+			public const int src_over = 2131296300;
+			
+			// aapt resource value: 0x7f09004b
+			public const int start = 2131296331;
+			
+			// aapt resource value: 0x7f0900b8
+			public const int status_bar_latest_event_content = 2131296440;
+			
+			// aapt resource value: 0x7f090076
+			public const int submenuarrow = 2131296374;
+			
+			// aapt resource value: 0x7f090087
+			public const int submit_area = 2131296391;
+			
+			// aapt resource value: 0x7f09001f
+			public const int tabMode = 2131296287;
+			
+			// aapt resource value: 0x7f090019
+			public const int tag_transition_group = 2131296281;
+			
+			// aapt resource value: 0x7f09001a
+			public const int text = 2131296282;
+			
+			// aapt resource value: 0x7f09001b
+			public const int text2 = 2131296283;
+			
+			// aapt resource value: 0x7f09006a
+			public const int textSpacerNoButtons = 2131296362;
+			
+			// aapt resource value: 0x7f090069
+			public const int textSpacerNoTitle = 2131296361;
+			
+			// aapt resource value: 0x7f090098
+			public const int text_input_password_toggle = 2131296408;
+			
+			// aapt resource value: 0x7f090014
+			public const int textinput_counter = 2131296276;
+			
+			// aapt resource value: 0x7f090015
+			public const int textinput_error = 2131296277;
+			
+			// aapt resource value: 0x7f0900be
+			public const int time = 2131296446;
+			
+			// aapt resource value: 0x7f09001c
+			public const int title = 2131296284;
+			
+			// aapt resource value: 0x7f090071
+			public const int titleDividerNoCustom = 2131296369;
+			
+			// aapt resource value: 0x7f09006f
+			public const int title_template = 2131296367;
+			
+			// aapt resource value: 0x7f0900c7
+			public const int toolbar = 2131296455;
+			
+			// aapt resource value: 0x7f09003e
+			public const int top = 2131296318;
+			
+			// aapt resource value: 0x7f09006e
+			public const int topPanel = 2131296366;
+			
+			// aapt resource value: 0x7f09008f
+			public const int touch_outside = 2131296399;
+			
+			// aapt resource value: 0x7f09000f
+			public const int transition_current_scene = 2131296271;
+			
+			// aapt resource value: 0x7f090010
+			public const int transition_layout_save = 2131296272;
+			
+			// aapt resource value: 0x7f090011
+			public const int transition_position = 2131296273;
+			
+			// aapt resource value: 0x7f090012
+			public const int transition_scene_layoutid_cache = 2131296274;
+			
+			// aapt resource value: 0x7f090013
+			public const int transition_transform = 2131296275;
+			
+			// aapt resource value: 0x7f09002d
+			public const int uniform = 2131296301;
+			
+			// aapt resource value: 0x7f090009
+			public const int up = 2131296265;
+			
+			// aapt resource value: 0x7f090026
+			public const int useLogo = 2131296294;
+			
+			// aapt resource value: 0x7f090016
+			public const int view_offset_helper = 2131296278;
+			
+			// aapt resource value: 0x7f0900c9
+			public const int visible = 2131296457;
+			
+			// aapt resource value: 0x7f0900ab
+			public const int volume_item_container = 2131296427;
+			
+			// aapt resource value: 0x7f09003c
+			public const int withText = 2131296316;
+			
+			// aapt resource value: 0x7f09002e
+			public const int wrap_content = 2131296302;
+			
+			static Id()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Id()
+			{
+			}
+		}
+		
+		public partial class Integer
+		{
+			
+			// aapt resource value: 0x7f0b0003
+			public const int abc_config_activityDefaultDur = 2131427331;
+			
+			// aapt resource value: 0x7f0b0004
+			public const int abc_config_activityShortDur = 2131427332;
+			
+			// aapt resource value: 0x7f0b0008
+			public const int app_bar_elevation_anim_duration = 2131427336;
+			
+			// aapt resource value: 0x7f0b0009
+			public const int bottom_sheet_slide_duration = 2131427337;
+			
+			// aapt resource value: 0x7f0b0005
+			public const int cancel_button_image_alpha = 2131427333;
+			
+			// aapt resource value: 0x7f0b0006
+			public const int config_tooltipAnimTime = 2131427334;
+			
+			// aapt resource value: 0x7f0b0007
+			public const int design_snackbar_text_max_lines = 2131427335;
+			
+			// aapt resource value: 0x7f0b000a
+			public const int hide_password_duration = 2131427338;
+			
+			// aapt resource value: 0x7f0b0000
+			public const int mr_controller_volume_group_list_animation_duration_ms = 2131427328;
+			
+			// aapt resource value: 0x7f0b0001
+			public const int mr_controller_volume_group_list_fade_in_duration_ms = 2131427329;
+			
+			// aapt resource value: 0x7f0b0002
+			public const int mr_controller_volume_group_list_fade_out_duration_ms = 2131427330;
+			
+			// aapt resource value: 0x7f0b000b
+			public const int show_password_duration = 2131427339;
+			
+			// aapt resource value: 0x7f0b000c
+			public const int status_bar_notification_info_maxnum = 2131427340;
+			
+			static Integer()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Integer()
+			{
+			}
+		}
+		
+		public partial class Interpolator
+		{
+			
+			// aapt resource value: 0x7f070000
+			public const int mr_fast_out_slow_in = 2131165184;
+			
+			// aapt resource value: 0x7f070001
+			public const int mr_linear_out_slow_in = 2131165185;
+			
+			static Interpolator()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Interpolator()
+			{
+			}
+		}
+		
+		public partial class Layout
+		{
+			
+			// aapt resource value: 0x7f040000
+			public const int abc_action_bar_title_item = 2130968576;
+			
+			// aapt resource value: 0x7f040001
+			public const int abc_action_bar_up_container = 2130968577;
+			
+			// aapt resource value: 0x7f040002
+			public const int abc_action_menu_item_layout = 2130968578;
+			
+			// aapt resource value: 0x7f040003
+			public const int abc_action_menu_layout = 2130968579;
+			
+			// aapt resource value: 0x7f040004
+			public const int abc_action_mode_bar = 2130968580;
+			
+			// aapt resource value: 0x7f040005
+			public const int abc_action_mode_close_item_material = 2130968581;
+			
+			// aapt resource value: 0x7f040006
+			public const int abc_activity_chooser_view = 2130968582;
+			
+			// aapt resource value: 0x7f040007
+			public const int abc_activity_chooser_view_list_item = 2130968583;
+			
+			// aapt resource value: 0x7f040008
+			public const int abc_alert_dialog_button_bar_material = 2130968584;
+			
+			// aapt resource value: 0x7f040009
+			public const int abc_alert_dialog_material = 2130968585;
+			
+			// aapt resource value: 0x7f04000a
+			public const int abc_alert_dialog_title_material = 2130968586;
+			
+			// aapt resource value: 0x7f04000b
+			public const int abc_dialog_title_material = 2130968587;
+			
+			// aapt resource value: 0x7f04000c
+			public const int abc_expanded_menu_layout = 2130968588;
+			
+			// aapt resource value: 0x7f04000d
+			public const int abc_list_menu_item_checkbox = 2130968589;
+			
+			// aapt resource value: 0x7f04000e
+			public const int abc_list_menu_item_icon = 2130968590;
+			
+			// aapt resource value: 0x7f04000f
+			public const int abc_list_menu_item_layout = 2130968591;
+			
+			// aapt resource value: 0x7f040010
+			public const int abc_list_menu_item_radio = 2130968592;
+			
+			// aapt resource value: 0x7f040011
+			public const int abc_popup_menu_header_item_layout = 2130968593;
+			
+			// aapt resource value: 0x7f040012
+			public const int abc_popup_menu_item_layout = 2130968594;
+			
+			// aapt resource value: 0x7f040013
+			public const int abc_screen_content_include = 2130968595;
+			
+			// aapt resource value: 0x7f040014
+			public const int abc_screen_simple = 2130968596;
+			
+			// aapt resource value: 0x7f040015
+			public const int abc_screen_simple_overlay_action_mode = 2130968597;
+			
+			// aapt resource value: 0x7f040016
+			public const int abc_screen_toolbar = 2130968598;
+			
+			// aapt resource value: 0x7f040017
+			public const int abc_search_dropdown_item_icons_2line = 2130968599;
+			
+			// aapt resource value: 0x7f040018
+			public const int abc_search_view = 2130968600;
+			
+			// aapt resource value: 0x7f040019
+			public const int abc_select_dialog_material = 2130968601;
+			
+			// aapt resource value: 0x7f04001a
+			public const int design_bottom_navigation_item = 2130968602;
+			
+			// aapt resource value: 0x7f04001b
+			public const int design_bottom_sheet_dialog = 2130968603;
+			
+			// aapt resource value: 0x7f04001c
+			public const int design_layout_snackbar = 2130968604;
+			
+			// aapt resource value: 0x7f04001d
+			public const int design_layout_snackbar_include = 2130968605;
+			
+			// aapt resource value: 0x7f04001e
+			public const int design_layout_tab_icon = 2130968606;
+			
+			// aapt resource value: 0x7f04001f
+			public const int design_layout_tab_text = 2130968607;
+			
+			// aapt resource value: 0x7f040020
+			public const int design_menu_item_action_area = 2130968608;
+			
+			// aapt resource value: 0x7f040021
+			public const int design_navigation_item = 2130968609;
+			
+			// aapt resource value: 0x7f040022
+			public const int design_navigation_item_header = 2130968610;
+			
+			// aapt resource value: 0x7f040023
+			public const int design_navigation_item_separator = 2130968611;
+			
+			// aapt resource value: 0x7f040024
+			public const int design_navigation_item_subheader = 2130968612;
+			
+			// aapt resource value: 0x7f040025
+			public const int design_navigation_menu = 2130968613;
+			
+			// aapt resource value: 0x7f040026
+			public const int design_navigation_menu_item = 2130968614;
+			
+			// aapt resource value: 0x7f040027
+			public const int design_text_input_password_icon = 2130968615;
+			
+			// aapt resource value: 0x7f040028
+			public const int mr_chooser_dialog = 2130968616;
+			
+			// aapt resource value: 0x7f040029
+			public const int mr_chooser_list_item = 2130968617;
+			
+			// aapt resource value: 0x7f04002a
+			public const int mr_controller_material_dialog_b = 2130968618;
+			
+			// aapt resource value: 0x7f04002b
+			public const int mr_controller_volume_item = 2130968619;
+			
+			// aapt resource value: 0x7f04002c
+			public const int mr_playback_control = 2130968620;
+			
+			// aapt resource value: 0x7f04002d
+			public const int mr_volume_control = 2130968621;
+			
+			// aapt resource value: 0x7f04002e
+			public const int notification_action = 2130968622;
+			
+			// aapt resource value: 0x7f04002f
+			public const int notification_action_tombstone = 2130968623;
+			
+			// aapt resource value: 0x7f040030
+			public const int notification_media_action = 2130968624;
+			
+			// aapt resource value: 0x7f040031
+			public const int notification_media_cancel_action = 2130968625;
+			
+			// aapt resource value: 0x7f040032
+			public const int notification_template_big_media = 2130968626;
+			
+			// aapt resource value: 0x7f040033
+			public const int notification_template_big_media_custom = 2130968627;
+			
+			// aapt resource value: 0x7f040034
+			public const int notification_template_big_media_narrow = 2130968628;
+			
+			// aapt resource value: 0x7f040035
+			public const int notification_template_big_media_narrow_custom = 2130968629;
+			
+			// aapt resource value: 0x7f040036
+			public const int notification_template_custom_big = 2130968630;
+			
+			// aapt resource value: 0x7f040037
+			public const int notification_template_icon_group = 2130968631;
+			
+			// aapt resource value: 0x7f040038
+			public const int notification_template_lines_media = 2130968632;
+			
+			// aapt resource value: 0x7f040039
+			public const int notification_template_media = 2130968633;
+			
+			// aapt resource value: 0x7f04003a
+			public const int notification_template_media_custom = 2130968634;
+			
+			// aapt resource value: 0x7f04003b
+			public const int notification_template_part_chronometer = 2130968635;
+			
+			// aapt resource value: 0x7f04003c
+			public const int notification_template_part_time = 2130968636;
+			
+			// aapt resource value: 0x7f04003d
+			public const int select_dialog_item_material = 2130968637;
+			
+			// aapt resource value: 0x7f04003e
+			public const int select_dialog_multichoice_material = 2130968638;
+			
+			// aapt resource value: 0x7f04003f
+			public const int select_dialog_singlechoice_material = 2130968639;
+			
+			// aapt resource value: 0x7f040040
+			public const int support_simple_spinner_dropdown_item = 2130968640;
+			
+			// aapt resource value: 0x7f040041
+			public const int Tabbar = 2130968641;
+			
+			// aapt resource value: 0x7f040042
+			public const int Toolbar = 2130968642;
+			
+			// aapt resource value: 0x7f040043
+			public const int tooltip = 2130968643;
+			
+			static Layout()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Layout()
+			{
+			}
+		}
+		
+		public partial class Mipmap
+		{
+			
+			// aapt resource value: 0x7f030000
+			public const int icon = 2130903040;
+			
+			// aapt resource value: 0x7f030001
+			public const int icon_round = 2130903041;
+			
+			// aapt resource value: 0x7f030002
+			public const int launcher_foreground = 2130903042;
+			
+			static Mipmap()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Mipmap()
+			{
+			}
+		}
+		
+		public partial class String
+		{
+			
+			// aapt resource value: 0x7f0a0015
+			public const int abc_action_bar_home_description = 2131361813;
+			
+			// aapt resource value: 0x7f0a0016
+			public const int abc_action_bar_up_description = 2131361814;
+			
+			// aapt resource value: 0x7f0a0017
+			public const int abc_action_menu_overflow_description = 2131361815;
+			
+			// aapt resource value: 0x7f0a0018
+			public const int abc_action_mode_done = 2131361816;
+			
+			// aapt resource value: 0x7f0a0019
+			public const int abc_activity_chooser_view_see_all = 2131361817;
+			
+			// aapt resource value: 0x7f0a001a
+			public const int abc_activitychooserview_choose_application = 2131361818;
+			
+			// aapt resource value: 0x7f0a001b
+			public const int abc_capital_off = 2131361819;
+			
+			// aapt resource value: 0x7f0a001c
+			public const int abc_capital_on = 2131361820;
+			
+			// aapt resource value: 0x7f0a0027
+			public const int abc_font_family_body_1_material = 2131361831;
+			
+			// aapt resource value: 0x7f0a0028
+			public const int abc_font_family_body_2_material = 2131361832;
+			
+			// aapt resource value: 0x7f0a0029
+			public const int abc_font_family_button_material = 2131361833;
+			
+			// aapt resource value: 0x7f0a002a
+			public const int abc_font_family_caption_material = 2131361834;
+			
+			// aapt resource value: 0x7f0a002b
+			public const int abc_font_family_display_1_material = 2131361835;
+			
+			// aapt resource value: 0x7f0a002c
+			public const int abc_font_family_display_2_material = 2131361836;
+			
+			// aapt resource value: 0x7f0a002d
+			public const int abc_font_family_display_3_material = 2131361837;
+			
+			// aapt resource value: 0x7f0a002e
+			public const int abc_font_family_display_4_material = 2131361838;
+			
+			// aapt resource value: 0x7f0a002f
+			public const int abc_font_family_headline_material = 2131361839;
+			
+			// aapt resource value: 0x7f0a0030
+			public const int abc_font_family_menu_material = 2131361840;
+			
+			// aapt resource value: 0x7f0a0031
+			public const int abc_font_family_subhead_material = 2131361841;
+			
+			// aapt resource value: 0x7f0a0032
+			public const int abc_font_family_title_material = 2131361842;
+			
+			// aapt resource value: 0x7f0a001d
+			public const int abc_search_hint = 2131361821;
+			
+			// aapt resource value: 0x7f0a001e
+			public const int abc_searchview_description_clear = 2131361822;
+			
+			// aapt resource value: 0x7f0a001f
+			public const int abc_searchview_description_query = 2131361823;
+			
+			// aapt resource value: 0x7f0a0020
+			public const int abc_searchview_description_search = 2131361824;
+			
+			// aapt resource value: 0x7f0a0021
+			public const int abc_searchview_description_submit = 2131361825;
+			
+			// aapt resource value: 0x7f0a0022
+			public const int abc_searchview_description_voice = 2131361826;
+			
+			// aapt resource value: 0x7f0a0023
+			public const int abc_shareactionprovider_share_with = 2131361827;
+			
+			// aapt resource value: 0x7f0a0024
+			public const int abc_shareactionprovider_share_with_application = 2131361828;
+			
+			// aapt resource value: 0x7f0a0025
+			public const int abc_toolbar_collapse_description = 2131361829;
+			
+			// aapt resource value: 0x7f0a0033
+			public const int appbar_scrolling_view_behavior = 2131361843;
+			
+			// aapt resource value: 0x7f0a0034
+			public const int bottom_sheet_behavior = 2131361844;
+			
+			// aapt resource value: 0x7f0a0035
+			public const int character_counter_pattern = 2131361845;
+			
+			// aapt resource value: 0x7f0a0000
+			public const int mr_button_content_description = 2131361792;
+			
+			// aapt resource value: 0x7f0a0001
+			public const int mr_cast_button_connected = 2131361793;
+			
+			// aapt resource value: 0x7f0a0002
+			public const int mr_cast_button_connecting = 2131361794;
+			
+			// aapt resource value: 0x7f0a0003
+			public const int mr_cast_button_disconnected = 2131361795;
+			
+			// aapt resource value: 0x7f0a0004
+			public const int mr_chooser_searching = 2131361796;
+			
+			// aapt resource value: 0x7f0a0005
+			public const int mr_chooser_title = 2131361797;
+			
+			// aapt resource value: 0x7f0a0006
+			public const int mr_controller_album_art = 2131361798;
+			
+			// aapt resource value: 0x7f0a0007
+			public const int mr_controller_casting_screen = 2131361799;
+			
+			// aapt resource value: 0x7f0a0008
+			public const int mr_controller_close_description = 2131361800;
+			
+			// aapt resource value: 0x7f0a0009
+			public const int mr_controller_collapse_group = 2131361801;
+			
+			// aapt resource value: 0x7f0a000a
+			public const int mr_controller_disconnect = 2131361802;
+			
+			// aapt resource value: 0x7f0a000b
+			public const int mr_controller_expand_group = 2131361803;
+			
+			// aapt resource value: 0x7f0a000c
+			public const int mr_controller_no_info_available = 2131361804;
+			
+			// aapt resource value: 0x7f0a000d
+			public const int mr_controller_no_media_selected = 2131361805;
+			
+			// aapt resource value: 0x7f0a000e
+			public const int mr_controller_pause = 2131361806;
+			
+			// aapt resource value: 0x7f0a000f
+			public const int mr_controller_play = 2131361807;
+			
+			// aapt resource value: 0x7f0a0010
+			public const int mr_controller_stop = 2131361808;
+			
+			// aapt resource value: 0x7f0a0011
+			public const int mr_controller_stop_casting = 2131361809;
+			
+			// aapt resource value: 0x7f0a0012
+			public const int mr_controller_volume_slider = 2131361810;
+			
+			// aapt resource value: 0x7f0a0013
+			public const int mr_system_route_name = 2131361811;
+			
+			// aapt resource value: 0x7f0a0014
+			public const int mr_user_route_category_name = 2131361812;
+			
+			// aapt resource value: 0x7f0a0036
+			public const int password_toggle_content_description = 2131361846;
+			
+			// aapt resource value: 0x7f0a0037
+			public const int path_password_eye = 2131361847;
+			
+			// aapt resource value: 0x7f0a0038
+			public const int path_password_eye_mask_strike_through = 2131361848;
+			
+			// aapt resource value: 0x7f0a0039
+			public const int path_password_eye_mask_visible = 2131361849;
+			
+			// aapt resource value: 0x7f0a003a
+			public const int path_password_strike_through = 2131361850;
+			
+			// aapt resource value: 0x7f0a0026
+			public const int search_menu_title = 2131361830;
+			
+			// aapt resource value: 0x7f0a003b
+			public const int status_bar_notification_info_overflow = 2131361851;
+			
+			static String()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private String()
+			{
+			}
+		}
+		
+		public partial class Style
+		{
+			
+			// aapt resource value: 0x7f0c00a4
+			public const int AlertDialog_AppCompat = 2131493028;
+			
+			// aapt resource value: 0x7f0c00a5
+			public const int AlertDialog_AppCompat_Light = 2131493029;
+			
+			// aapt resource value: 0x7f0c00a6
+			public const int Animation_AppCompat_Dialog = 2131493030;
+			
+			// aapt resource value: 0x7f0c00a7
+			public const int Animation_AppCompat_DropDownUp = 2131493031;
+			
+			// aapt resource value: 0x7f0c00a8
+			public const int Animation_AppCompat_Tooltip = 2131493032;
+			
+			// aapt resource value: 0x7f0c016e
+			public const int Animation_Design_BottomSheetDialog = 2131493230;
+			
+			// aapt resource value: 0x7f0c0191
+			public const int AppCompatDialogStyle = 2131493265;
+			
+			// aapt resource value: 0x7f0c00a9
+			public const int Base_AlertDialog_AppCompat = 2131493033;
+			
+			// aapt resource value: 0x7f0c00aa
+			public const int Base_AlertDialog_AppCompat_Light = 2131493034;
+			
+			// aapt resource value: 0x7f0c00ab
+			public const int Base_Animation_AppCompat_Dialog = 2131493035;
+			
+			// aapt resource value: 0x7f0c00ac
+			public const int Base_Animation_AppCompat_DropDownUp = 2131493036;
+			
+			// aapt resource value: 0x7f0c00ad
+			public const int Base_Animation_AppCompat_Tooltip = 2131493037;
+			
+			// aapt resource value: 0x7f0c000c
+			public const int Base_CardView = 2131492876;
+			
+			// aapt resource value: 0x7f0c00ae
+			public const int Base_DialogWindowTitle_AppCompat = 2131493038;
+			
+			// aapt resource value: 0x7f0c00af
+			public const int Base_DialogWindowTitleBackground_AppCompat = 2131493039;
+			
+			// aapt resource value: 0x7f0c0048
+			public const int Base_TextAppearance_AppCompat = 2131492936;
+			
+			// aapt resource value: 0x7f0c0049
+			public const int Base_TextAppearance_AppCompat_Body1 = 2131492937;
+			
+			// aapt resource value: 0x7f0c004a
+			public const int Base_TextAppearance_AppCompat_Body2 = 2131492938;
+			
+			// aapt resource value: 0x7f0c0036
+			public const int Base_TextAppearance_AppCompat_Button = 2131492918;
+			
+			// aapt resource value: 0x7f0c004b
+			public const int Base_TextAppearance_AppCompat_Caption = 2131492939;
+			
+			// aapt resource value: 0x7f0c004c
+			public const int Base_TextAppearance_AppCompat_Display1 = 2131492940;
+			
+			// aapt resource value: 0x7f0c004d
+			public const int Base_TextAppearance_AppCompat_Display2 = 2131492941;
+			
+			// aapt resource value: 0x7f0c004e
+			public const int Base_TextAppearance_AppCompat_Display3 = 2131492942;
+			
+			// aapt resource value: 0x7f0c004f
+			public const int Base_TextAppearance_AppCompat_Display4 = 2131492943;
+			
+			// aapt resource value: 0x7f0c0050
+			public const int Base_TextAppearance_AppCompat_Headline = 2131492944;
+			
+			// aapt resource value: 0x7f0c001a
+			public const int Base_TextAppearance_AppCompat_Inverse = 2131492890;
+			
+			// aapt resource value: 0x7f0c0051
+			public const int Base_TextAppearance_AppCompat_Large = 2131492945;
+			
+			// aapt resource value: 0x7f0c001b
+			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131492891;
+			
+			// aapt resource value: 0x7f0c0052
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131492946;
+			
+			// aapt resource value: 0x7f0c0053
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131492947;
+			
+			// aapt resource value: 0x7f0c0054
+			public const int Base_TextAppearance_AppCompat_Medium = 2131492948;
+			
+			// aapt resource value: 0x7f0c001c
+			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131492892;
+			
+			// aapt resource value: 0x7f0c0055
+			public const int Base_TextAppearance_AppCompat_Menu = 2131492949;
+			
+			// aapt resource value: 0x7f0c00b0
+			public const int Base_TextAppearance_AppCompat_SearchResult = 2131493040;
+			
+			// aapt resource value: 0x7f0c0056
+			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131492950;
+			
+			// aapt resource value: 0x7f0c0057
+			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131492951;
+			
+			// aapt resource value: 0x7f0c0058
+			public const int Base_TextAppearance_AppCompat_Small = 2131492952;
+			
+			// aapt resource value: 0x7f0c001d
+			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131492893;
+			
+			// aapt resource value: 0x7f0c0059
+			public const int Base_TextAppearance_AppCompat_Subhead = 2131492953;
+			
+			// aapt resource value: 0x7f0c001e
+			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131492894;
+			
+			// aapt resource value: 0x7f0c005a
+			public const int Base_TextAppearance_AppCompat_Title = 2131492954;
+			
+			// aapt resource value: 0x7f0c001f
+			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131492895;
+			
+			// aapt resource value: 0x7f0c00b1
+			public const int Base_TextAppearance_AppCompat_Tooltip = 2131493041;
+			
+			// aapt resource value: 0x7f0c0095
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131493013;
+			
+			// aapt resource value: 0x7f0c005b
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131492955;
+			
+			// aapt resource value: 0x7f0c005c
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131492956;
+			
+			// aapt resource value: 0x7f0c005d
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131492957;
+			
+			// aapt resource value: 0x7f0c005e
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131492958;
+			
+			// aapt resource value: 0x7f0c005f
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131492959;
+			
+			// aapt resource value: 0x7f0c0060
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131492960;
+			
+			// aapt resource value: 0x7f0c0061
+			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131492961;
+			
+			// aapt resource value: 0x7f0c009c
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131493020;
+			
+			// aapt resource value: 0x7f0c009d
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131493021;
+			
+			// aapt resource value: 0x7f0c0096
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131493014;
+			
+			// aapt resource value: 0x7f0c00b2
+			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131493042;
+			
+			// aapt resource value: 0x7f0c0062
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131492962;
+			
+			// aapt resource value: 0x7f0c0063
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131492963;
+			
+			// aapt resource value: 0x7f0c0064
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131492964;
+			
+			// aapt resource value: 0x7f0c0065
+			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131492965;
+			
+			// aapt resource value: 0x7f0c0066
+			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131492966;
+			
+			// aapt resource value: 0x7f0c00b3
+			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131493043;
+			
+			// aapt resource value: 0x7f0c0067
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131492967;
+			
+			// aapt resource value: 0x7f0c0068
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131492968;
+			
+			// aapt resource value: 0x7f0c0069
+			public const int Base_Theme_AppCompat = 2131492969;
+			
+			// aapt resource value: 0x7f0c00b4
+			public const int Base_Theme_AppCompat_CompactMenu = 2131493044;
+			
+			// aapt resource value: 0x7f0c0020
+			public const int Base_Theme_AppCompat_Dialog = 2131492896;
+			
+			// aapt resource value: 0x7f0c0021
+			public const int Base_Theme_AppCompat_Dialog_Alert = 2131492897;
+			
+			// aapt resource value: 0x7f0c00b5
+			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131493045;
+			
+			// aapt resource value: 0x7f0c0022
+			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131492898;
+			
+			// aapt resource value: 0x7f0c0010
+			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131492880;
+			
+			// aapt resource value: 0x7f0c006a
+			public const int Base_Theme_AppCompat_Light = 2131492970;
+			
+			// aapt resource value: 0x7f0c00b6
+			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131493046;
+			
+			// aapt resource value: 0x7f0c0023
+			public const int Base_Theme_AppCompat_Light_Dialog = 2131492899;
+			
+			// aapt resource value: 0x7f0c0024
+			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131492900;
+			
+			// aapt resource value: 0x7f0c00b7
+			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131493047;
+			
+			// aapt resource value: 0x7f0c0025
+			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131492901;
+			
+			// aapt resource value: 0x7f0c0011
+			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131492881;
+			
+			// aapt resource value: 0x7f0c00b8
+			public const int Base_ThemeOverlay_AppCompat = 2131493048;
+			
+			// aapt resource value: 0x7f0c00b9
+			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131493049;
+			
+			// aapt resource value: 0x7f0c00ba
+			public const int Base_ThemeOverlay_AppCompat_Dark = 2131493050;
+			
+			// aapt resource value: 0x7f0c00bb
+			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131493051;
+			
+			// aapt resource value: 0x7f0c0026
+			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131492902;
+			
+			// aapt resource value: 0x7f0c0027
+			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131492903;
+			
+			// aapt resource value: 0x7f0c00bc
+			public const int Base_ThemeOverlay_AppCompat_Light = 2131493052;
+			
+			// aapt resource value: 0x7f0c0028
+			public const int Base_V11_Theme_AppCompat_Dialog = 2131492904;
+			
+			// aapt resource value: 0x7f0c0029
+			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131492905;
+			
+			// aapt resource value: 0x7f0c002a
+			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131492906;
+			
+			// aapt resource value: 0x7f0c0032
+			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131492914;
+			
+			// aapt resource value: 0x7f0c0033
+			public const int Base_V12_Widget_AppCompat_EditText = 2131492915;
+			
+			// aapt resource value: 0x7f0c016f
+			public const int Base_V14_Widget_Design_AppBarLayout = 2131493231;
+			
+			// aapt resource value: 0x7f0c006b
+			public const int Base_V21_Theme_AppCompat = 2131492971;
+			
+			// aapt resource value: 0x7f0c006c
+			public const int Base_V21_Theme_AppCompat_Dialog = 2131492972;
+			
+			// aapt resource value: 0x7f0c006d
+			public const int Base_V21_Theme_AppCompat_Light = 2131492973;
+			
+			// aapt resource value: 0x7f0c006e
+			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131492974;
+			
+			// aapt resource value: 0x7f0c006f
+			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131492975;
+			
+			// aapt resource value: 0x7f0c016b
+			public const int Base_V21_Widget_Design_AppBarLayout = 2131493227;
+			
+			// aapt resource value: 0x7f0c0093
+			public const int Base_V22_Theme_AppCompat = 2131493011;
+			
+			// aapt resource value: 0x7f0c0094
+			public const int Base_V22_Theme_AppCompat_Light = 2131493012;
+			
+			// aapt resource value: 0x7f0c0097
+			public const int Base_V23_Theme_AppCompat = 2131493015;
+			
+			// aapt resource value: 0x7f0c0098
+			public const int Base_V23_Theme_AppCompat_Light = 2131493016;
+			
+			// aapt resource value: 0x7f0c00a0
+			public const int Base_V26_Theme_AppCompat = 2131493024;
+			
+			// aapt resource value: 0x7f0c00a1
+			public const int Base_V26_Theme_AppCompat_Light = 2131493025;
+			
+			// aapt resource value: 0x7f0c00a2
+			public const int Base_V26_Widget_AppCompat_Toolbar = 2131493026;
+			
+			// aapt resource value: 0x7f0c016d
+			public const int Base_V26_Widget_Design_AppBarLayout = 2131493229;
+			
+			// aapt resource value: 0x7f0c00bd
+			public const int Base_V7_Theme_AppCompat = 2131493053;
+			
+			// aapt resource value: 0x7f0c00be
+			public const int Base_V7_Theme_AppCompat_Dialog = 2131493054;
+			
+			// aapt resource value: 0x7f0c00bf
+			public const int Base_V7_Theme_AppCompat_Light = 2131493055;
+			
+			// aapt resource value: 0x7f0c00c0
+			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131493056;
+			
+			// aapt resource value: 0x7f0c00c1
+			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131493057;
+			
+			// aapt resource value: 0x7f0c00c2
+			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131493058;
+			
+			// aapt resource value: 0x7f0c00c3
+			public const int Base_V7_Widget_AppCompat_EditText = 2131493059;
+			
+			// aapt resource value: 0x7f0c00c4
+			public const int Base_V7_Widget_AppCompat_Toolbar = 2131493060;
+			
+			// aapt resource value: 0x7f0c00c5
+			public const int Base_Widget_AppCompat_ActionBar = 2131493061;
+			
+			// aapt resource value: 0x7f0c00c6
+			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131493062;
+			
+			// aapt resource value: 0x7f0c00c7
+			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131493063;
+			
+			// aapt resource value: 0x7f0c0070
+			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131492976;
+			
+			// aapt resource value: 0x7f0c0071
+			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131492977;
+			
+			// aapt resource value: 0x7f0c0072
+			public const int Base_Widget_AppCompat_ActionButton = 2131492978;
+			
+			// aapt resource value: 0x7f0c0073
+			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131492979;
+			
+			// aapt resource value: 0x7f0c0074
+			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131492980;
+			
+			// aapt resource value: 0x7f0c00c8
+			public const int Base_Widget_AppCompat_ActionMode = 2131493064;
+			
+			// aapt resource value: 0x7f0c00c9
+			public const int Base_Widget_AppCompat_ActivityChooserView = 2131493065;
+			
+			// aapt resource value: 0x7f0c0034
+			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131492916;
+			
+			// aapt resource value: 0x7f0c0075
+			public const int Base_Widget_AppCompat_Button = 2131492981;
+			
+			// aapt resource value: 0x7f0c0076
+			public const int Base_Widget_AppCompat_Button_Borderless = 2131492982;
+			
+			// aapt resource value: 0x7f0c0077
+			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131492983;
+			
+			// aapt resource value: 0x7f0c00ca
+			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131493066;
+			
+			// aapt resource value: 0x7f0c0099
+			public const int Base_Widget_AppCompat_Button_Colored = 2131493017;
+			
+			// aapt resource value: 0x7f0c0078
+			public const int Base_Widget_AppCompat_Button_Small = 2131492984;
+			
+			// aapt resource value: 0x7f0c0079
+			public const int Base_Widget_AppCompat_ButtonBar = 2131492985;
+			
+			// aapt resource value: 0x7f0c00cb
+			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131493067;
+			
+			// aapt resource value: 0x7f0c007a
+			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131492986;
+			
+			// aapt resource value: 0x7f0c007b
+			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131492987;
+			
+			// aapt resource value: 0x7f0c00cc
+			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131493068;
+			
+			// aapt resource value: 0x7f0c000f
+			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131492879;
+			
+			// aapt resource value: 0x7f0c00cd
+			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131493069;
+			
+			// aapt resource value: 0x7f0c007c
+			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131492988;
+			
+			// aapt resource value: 0x7f0c0035
+			public const int Base_Widget_AppCompat_EditText = 2131492917;
+			
+			// aapt resource value: 0x7f0c007d
+			public const int Base_Widget_AppCompat_ImageButton = 2131492989;
+			
+			// aapt resource value: 0x7f0c00ce
+			public const int Base_Widget_AppCompat_Light_ActionBar = 2131493070;
+			
+			// aapt resource value: 0x7f0c00cf
+			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131493071;
+			
+			// aapt resource value: 0x7f0c00d0
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131493072;
+			
+			// aapt resource value: 0x7f0c007e
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131492990;
+			
+			// aapt resource value: 0x7f0c007f
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131492991;
+			
+			// aapt resource value: 0x7f0c0080
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131492992;
+			
+			// aapt resource value: 0x7f0c0081
+			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131492993;
+			
+			// aapt resource value: 0x7f0c0082
+			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131492994;
+			
+			// aapt resource value: 0x7f0c00d1
+			public const int Base_Widget_AppCompat_ListMenuView = 2131493073;
+			
+			// aapt resource value: 0x7f0c0083
+			public const int Base_Widget_AppCompat_ListPopupWindow = 2131492995;
+			
+			// aapt resource value: 0x7f0c0084
+			public const int Base_Widget_AppCompat_ListView = 2131492996;
+			
+			// aapt resource value: 0x7f0c0085
+			public const int Base_Widget_AppCompat_ListView_DropDown = 2131492997;
+			
+			// aapt resource value: 0x7f0c0086
+			public const int Base_Widget_AppCompat_ListView_Menu = 2131492998;
+			
+			// aapt resource value: 0x7f0c0087
+			public const int Base_Widget_AppCompat_PopupMenu = 2131492999;
+			
+			// aapt resource value: 0x7f0c0088
+			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131493000;
+			
+			// aapt resource value: 0x7f0c00d2
+			public const int Base_Widget_AppCompat_PopupWindow = 2131493074;
+			
+			// aapt resource value: 0x7f0c002b
+			public const int Base_Widget_AppCompat_ProgressBar = 2131492907;
+			
+			// aapt resource value: 0x7f0c002c
+			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131492908;
+			
+			// aapt resource value: 0x7f0c0089
+			public const int Base_Widget_AppCompat_RatingBar = 2131493001;
+			
+			// aapt resource value: 0x7f0c009a
+			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131493018;
+			
+			// aapt resource value: 0x7f0c009b
+			public const int Base_Widget_AppCompat_RatingBar_Small = 2131493019;
+			
+			// aapt resource value: 0x7f0c00d3
+			public const int Base_Widget_AppCompat_SearchView = 2131493075;
+			
+			// aapt resource value: 0x7f0c00d4
+			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131493076;
+			
+			// aapt resource value: 0x7f0c008a
+			public const int Base_Widget_AppCompat_SeekBar = 2131493002;
+			
+			// aapt resource value: 0x7f0c00d5
+			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131493077;
+			
+			// aapt resource value: 0x7f0c008b
+			public const int Base_Widget_AppCompat_Spinner = 2131493003;
+			
+			// aapt resource value: 0x7f0c0012
+			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131492882;
+			
+			// aapt resource value: 0x7f0c008c
+			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131493004;
+			
+			// aapt resource value: 0x7f0c00a3
+			public const int Base_Widget_AppCompat_Toolbar = 2131493027;
+			
+			// aapt resource value: 0x7f0c008d
+			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131493005;
+			
+			// aapt resource value: 0x7f0c016c
+			public const int Base_Widget_Design_AppBarLayout = 2131493228;
+			
+			// aapt resource value: 0x7f0c0170
+			public const int Base_Widget_Design_TabLayout = 2131493232;
+			
+			// aapt resource value: 0x7f0c000b
+			public const int CardView = 2131492875;
+			
+			// aapt resource value: 0x7f0c000d
+			public const int CardView_Dark = 2131492877;
+			
+			// aapt resource value: 0x7f0c000e
+			public const int CardView_Light = 2131492878;
+			
+			// aapt resource value: 0x7f0c018f
+			public const int MainTheme = 2131493263;
+			
+			// aapt resource value: 0x7f0c0190
+			public const int MainTheme_Base = 2131493264;
+			
+			// aapt resource value: 0x7f0c002d
+			public const int Platform_AppCompat = 2131492909;
+			
+			// aapt resource value: 0x7f0c002e
+			public const int Platform_AppCompat_Light = 2131492910;
+			
+			// aapt resource value: 0x7f0c008e
+			public const int Platform_ThemeOverlay_AppCompat = 2131493006;
+			
+			// aapt resource value: 0x7f0c008f
+			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131493007;
+			
+			// aapt resource value: 0x7f0c0090
+			public const int Platform_ThemeOverlay_AppCompat_Light = 2131493008;
+			
+			// aapt resource value: 0x7f0c002f
+			public const int Platform_V11_AppCompat = 2131492911;
+			
+			// aapt resource value: 0x7f0c0030
+			public const int Platform_V11_AppCompat_Light = 2131492912;
+			
+			// aapt resource value: 0x7f0c0037
+			public const int Platform_V14_AppCompat = 2131492919;
+			
+			// aapt resource value: 0x7f0c0038
+			public const int Platform_V14_AppCompat_Light = 2131492920;
+			
+			// aapt resource value: 0x7f0c0091
+			public const int Platform_V21_AppCompat = 2131493009;
+			
+			// aapt resource value: 0x7f0c0092
+			public const int Platform_V21_AppCompat_Light = 2131493010;
+			
+			// aapt resource value: 0x7f0c009e
+			public const int Platform_V25_AppCompat = 2131493022;
+			
+			// aapt resource value: 0x7f0c009f
+			public const int Platform_V25_AppCompat_Light = 2131493023;
+			
+			// aapt resource value: 0x7f0c0031
+			public const int Platform_Widget_AppCompat_Spinner = 2131492913;
+			
+			// aapt resource value: 0x7f0c003a
+			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131492922;
+			
+			// aapt resource value: 0x7f0c003b
+			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131492923;
+			
+			// aapt resource value: 0x7f0c003c
+			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131492924;
+			
+			// aapt resource value: 0x7f0c003d
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131492925;
+			
+			// aapt resource value: 0x7f0c003e
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131492926;
+			
+			// aapt resource value: 0x7f0c003f
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131492927;
+			
+			// aapt resource value: 0x7f0c0040
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131492928;
+			
+			// aapt resource value: 0x7f0c0041
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131492929;
+			
+			// aapt resource value: 0x7f0c0042
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131492930;
+			
+			// aapt resource value: 0x7f0c0043
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131492931;
+			
+			// aapt resource value: 0x7f0c0044
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131492932;
+			
+			// aapt resource value: 0x7f0c0045
+			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131492933;
+			
+			// aapt resource value: 0x7f0c0046
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131492934;
+			
+			// aapt resource value: 0x7f0c0047
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131492935;
+			
+			// aapt resource value: 0x7f0c00d6
+			public const int TextAppearance_AppCompat = 2131493078;
+			
+			// aapt resource value: 0x7f0c00d7
+			public const int TextAppearance_AppCompat_Body1 = 2131493079;
+			
+			// aapt resource value: 0x7f0c00d8
+			public const int TextAppearance_AppCompat_Body2 = 2131493080;
+			
+			// aapt resource value: 0x7f0c00d9
+			public const int TextAppearance_AppCompat_Button = 2131493081;
+			
+			// aapt resource value: 0x7f0c00da
+			public const int TextAppearance_AppCompat_Caption = 2131493082;
+			
+			// aapt resource value: 0x7f0c00db
+			public const int TextAppearance_AppCompat_Display1 = 2131493083;
+			
+			// aapt resource value: 0x7f0c00dc
+			public const int TextAppearance_AppCompat_Display2 = 2131493084;
+			
+			// aapt resource value: 0x7f0c00dd
+			public const int TextAppearance_AppCompat_Display3 = 2131493085;
+			
+			// aapt resource value: 0x7f0c00de
+			public const int TextAppearance_AppCompat_Display4 = 2131493086;
+			
+			// aapt resource value: 0x7f0c00df
+			public const int TextAppearance_AppCompat_Headline = 2131493087;
+			
+			// aapt resource value: 0x7f0c00e0
+			public const int TextAppearance_AppCompat_Inverse = 2131493088;
+			
+			// aapt resource value: 0x7f0c00e1
+			public const int TextAppearance_AppCompat_Large = 2131493089;
+			
+			// aapt resource value: 0x7f0c00e2
+			public const int TextAppearance_AppCompat_Large_Inverse = 2131493090;
+			
+			// aapt resource value: 0x7f0c00e3
+			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131493091;
+			
+			// aapt resource value: 0x7f0c00e4
+			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131493092;
+			
+			// aapt resource value: 0x7f0c00e5
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131493093;
+			
+			// aapt resource value: 0x7f0c00e6
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131493094;
+			
+			// aapt resource value: 0x7f0c00e7
+			public const int TextAppearance_AppCompat_Medium = 2131493095;
+			
+			// aapt resource value: 0x7f0c00e8
+			public const int TextAppearance_AppCompat_Medium_Inverse = 2131493096;
+			
+			// aapt resource value: 0x7f0c00e9
+			public const int TextAppearance_AppCompat_Menu = 2131493097;
+			
+			// aapt resource value: 0x7f0c00ea
+			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131493098;
+			
+			// aapt resource value: 0x7f0c00eb
+			public const int TextAppearance_AppCompat_SearchResult_Title = 2131493099;
+			
+			// aapt resource value: 0x7f0c00ec
+			public const int TextAppearance_AppCompat_Small = 2131493100;
+			
+			// aapt resource value: 0x7f0c00ed
+			public const int TextAppearance_AppCompat_Small_Inverse = 2131493101;
+			
+			// aapt resource value: 0x7f0c00ee
+			public const int TextAppearance_AppCompat_Subhead = 2131493102;
+			
+			// aapt resource value: 0x7f0c00ef
+			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131493103;
+			
+			// aapt resource value: 0x7f0c00f0
+			public const int TextAppearance_AppCompat_Title = 2131493104;
+			
+			// aapt resource value: 0x7f0c00f1
+			public const int TextAppearance_AppCompat_Title_Inverse = 2131493105;
+			
+			// aapt resource value: 0x7f0c0039
+			public const int TextAppearance_AppCompat_Tooltip = 2131492921;
+			
+			// aapt resource value: 0x7f0c00f2
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131493106;
+			
+			// aapt resource value: 0x7f0c00f3
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131493107;
+			
+			// aapt resource value: 0x7f0c00f4
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131493108;
+			
+			// aapt resource value: 0x7f0c00f5
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131493109;
+			
+			// aapt resource value: 0x7f0c00f6
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131493110;
+			
+			// aapt resource value: 0x7f0c00f7
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131493111;
+			
+			// aapt resource value: 0x7f0c00f8
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131493112;
+			
+			// aapt resource value: 0x7f0c00f9
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131493113;
+			
+			// aapt resource value: 0x7f0c00fa
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131493114;
+			
+			// aapt resource value: 0x7f0c00fb
+			public const int TextAppearance_AppCompat_Widget_Button = 2131493115;
+			
+			// aapt resource value: 0x7f0c00fc
+			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131493116;
+			
+			// aapt resource value: 0x7f0c00fd
+			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131493117;
+			
+			// aapt resource value: 0x7f0c00fe
+			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131493118;
+			
+			// aapt resource value: 0x7f0c00ff
+			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131493119;
+			
+			// aapt resource value: 0x7f0c0100
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131493120;
+			
+			// aapt resource value: 0x7f0c0101
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131493121;
+			
+			// aapt resource value: 0x7f0c0102
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131493122;
+			
+			// aapt resource value: 0x7f0c0103
+			public const int TextAppearance_AppCompat_Widget_Switch = 2131493123;
+			
+			// aapt resource value: 0x7f0c0104
+			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131493124;
+			
+			// aapt resource value: 0x7f0c0188
+			public const int TextAppearance_Compat_Notification = 2131493256;
+			
+			// aapt resource value: 0x7f0c0189
+			public const int TextAppearance_Compat_Notification_Info = 2131493257;
+			
+			// aapt resource value: 0x7f0c0165
+			public const int TextAppearance_Compat_Notification_Info_Media = 2131493221;
+			
+			// aapt resource value: 0x7f0c018e
+			public const int TextAppearance_Compat_Notification_Line2 = 2131493262;
+			
+			// aapt resource value: 0x7f0c0169
+			public const int TextAppearance_Compat_Notification_Line2_Media = 2131493225;
+			
+			// aapt resource value: 0x7f0c0166
+			public const int TextAppearance_Compat_Notification_Media = 2131493222;
+			
+			// aapt resource value: 0x7f0c018a
+			public const int TextAppearance_Compat_Notification_Time = 2131493258;
+			
+			// aapt resource value: 0x7f0c0167
+			public const int TextAppearance_Compat_Notification_Time_Media = 2131493223;
+			
+			// aapt resource value: 0x7f0c018b
+			public const int TextAppearance_Compat_Notification_Title = 2131493259;
+			
+			// aapt resource value: 0x7f0c0168
+			public const int TextAppearance_Compat_Notification_Title_Media = 2131493224;
+			
+			// aapt resource value: 0x7f0c0171
+			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131493233;
+			
+			// aapt resource value: 0x7f0c0172
+			public const int TextAppearance_Design_Counter = 2131493234;
+			
+			// aapt resource value: 0x7f0c0173
+			public const int TextAppearance_Design_Counter_Overflow = 2131493235;
+			
+			// aapt resource value: 0x7f0c0174
+			public const int TextAppearance_Design_Error = 2131493236;
+			
+			// aapt resource value: 0x7f0c0175
+			public const int TextAppearance_Design_Hint = 2131493237;
+			
+			// aapt resource value: 0x7f0c0176
+			public const int TextAppearance_Design_Snackbar_Message = 2131493238;
+			
+			// aapt resource value: 0x7f0c0177
+			public const int TextAppearance_Design_Tab = 2131493239;
+			
+			// aapt resource value: 0x7f0c0000
+			public const int TextAppearance_MediaRouter_PrimaryText = 2131492864;
+			
+			// aapt resource value: 0x7f0c0001
+			public const int TextAppearance_MediaRouter_SecondaryText = 2131492865;
+			
+			// aapt resource value: 0x7f0c0002
+			public const int TextAppearance_MediaRouter_Title = 2131492866;
+			
+			// aapt resource value: 0x7f0c0105
+			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131493125;
+			
+			// aapt resource value: 0x7f0c0106
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131493126;
+			
+			// aapt resource value: 0x7f0c0107
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131493127;
+			
+			// aapt resource value: 0x7f0c0108
+			public const int Theme_AppCompat = 2131493128;
+			
+			// aapt resource value: 0x7f0c0109
+			public const int Theme_AppCompat_CompactMenu = 2131493129;
+			
+			// aapt resource value: 0x7f0c0013
+			public const int Theme_AppCompat_DayNight = 2131492883;
+			
+			// aapt resource value: 0x7f0c0014
+			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131492884;
+			
+			// aapt resource value: 0x7f0c0015
+			public const int Theme_AppCompat_DayNight_Dialog = 2131492885;
+			
+			// aapt resource value: 0x7f0c0016
+			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131492886;
+			
+			// aapt resource value: 0x7f0c0017
+			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131492887;
+			
+			// aapt resource value: 0x7f0c0018
+			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131492888;
+			
+			// aapt resource value: 0x7f0c0019
+			public const int Theme_AppCompat_DayNight_NoActionBar = 2131492889;
+			
+			// aapt resource value: 0x7f0c010a
+			public const int Theme_AppCompat_Dialog = 2131493130;
+			
+			// aapt resource value: 0x7f0c010b
+			public const int Theme_AppCompat_Dialog_Alert = 2131493131;
+			
+			// aapt resource value: 0x7f0c010c
+			public const int Theme_AppCompat_Dialog_MinWidth = 2131493132;
+			
+			// aapt resource value: 0x7f0c010d
+			public const int Theme_AppCompat_DialogWhenLarge = 2131493133;
+			
+			// aapt resource value: 0x7f0c010e
+			public const int Theme_AppCompat_Light = 2131493134;
+			
+			// aapt resource value: 0x7f0c010f
+			public const int Theme_AppCompat_Light_DarkActionBar = 2131493135;
+			
+			// aapt resource value: 0x7f0c0110
+			public const int Theme_AppCompat_Light_Dialog = 2131493136;
+			
+			// aapt resource value: 0x7f0c0111
+			public const int Theme_AppCompat_Light_Dialog_Alert = 2131493137;
+			
+			// aapt resource value: 0x7f0c0112
+			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131493138;
+			
+			// aapt resource value: 0x7f0c0113
+			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131493139;
+			
+			// aapt resource value: 0x7f0c0114
+			public const int Theme_AppCompat_Light_NoActionBar = 2131493140;
+			
+			// aapt resource value: 0x7f0c0115
+			public const int Theme_AppCompat_NoActionBar = 2131493141;
+			
+			// aapt resource value: 0x7f0c0178
+			public const int Theme_Design = 2131493240;
+			
+			// aapt resource value: 0x7f0c0179
+			public const int Theme_Design_BottomSheetDialog = 2131493241;
+			
+			// aapt resource value: 0x7f0c017a
+			public const int Theme_Design_Light = 2131493242;
+			
+			// aapt resource value: 0x7f0c017b
+			public const int Theme_Design_Light_BottomSheetDialog = 2131493243;
+			
+			// aapt resource value: 0x7f0c017c
+			public const int Theme_Design_Light_NoActionBar = 2131493244;
+			
+			// aapt resource value: 0x7f0c017d
+			public const int Theme_Design_NoActionBar = 2131493245;
+			
+			// aapt resource value: 0x7f0c0003
+			public const int Theme_MediaRouter = 2131492867;
+			
+			// aapt resource value: 0x7f0c0004
+			public const int Theme_MediaRouter_Light = 2131492868;
+			
+			// aapt resource value: 0x7f0c0005
+			public const int Theme_MediaRouter_Light_DarkControlPanel = 2131492869;
+			
+			// aapt resource value: 0x7f0c0006
+			public const int Theme_MediaRouter_LightControlPanel = 2131492870;
+			
+			// aapt resource value: 0x7f0c0116
+			public const int ThemeOverlay_AppCompat = 2131493142;
+			
+			// aapt resource value: 0x7f0c0117
+			public const int ThemeOverlay_AppCompat_ActionBar = 2131493143;
+			
+			// aapt resource value: 0x7f0c0118
+			public const int ThemeOverlay_AppCompat_Dark = 2131493144;
+			
+			// aapt resource value: 0x7f0c0119
+			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131493145;
+			
+			// aapt resource value: 0x7f0c011a
+			public const int ThemeOverlay_AppCompat_Dialog = 2131493146;
+			
+			// aapt resource value: 0x7f0c011b
+			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131493147;
+			
+			// aapt resource value: 0x7f0c011c
+			public const int ThemeOverlay_AppCompat_Light = 2131493148;
+			
+			// aapt resource value: 0x7f0c0007
+			public const int ThemeOverlay_MediaRouter_Dark = 2131492871;
+			
+			// aapt resource value: 0x7f0c0008
+			public const int ThemeOverlay_MediaRouter_Light = 2131492872;
+			
+			// aapt resource value: 0x7f0c011d
+			public const int Widget_AppCompat_ActionBar = 2131493149;
+			
+			// aapt resource value: 0x7f0c011e
+			public const int Widget_AppCompat_ActionBar_Solid = 2131493150;
+			
+			// aapt resource value: 0x7f0c011f
+			public const int Widget_AppCompat_ActionBar_TabBar = 2131493151;
+			
+			// aapt resource value: 0x7f0c0120
+			public const int Widget_AppCompat_ActionBar_TabText = 2131493152;
+			
+			// aapt resource value: 0x7f0c0121
+			public const int Widget_AppCompat_ActionBar_TabView = 2131493153;
+			
+			// aapt resource value: 0x7f0c0122
+			public const int Widget_AppCompat_ActionButton = 2131493154;
+			
+			// aapt resource value: 0x7f0c0123
+			public const int Widget_AppCompat_ActionButton_CloseMode = 2131493155;
+			
+			// aapt resource value: 0x7f0c0124
+			public const int Widget_AppCompat_ActionButton_Overflow = 2131493156;
+			
+			// aapt resource value: 0x7f0c0125
+			public const int Widget_AppCompat_ActionMode = 2131493157;
+			
+			// aapt resource value: 0x7f0c0126
+			public const int Widget_AppCompat_ActivityChooserView = 2131493158;
+			
+			// aapt resource value: 0x7f0c0127
+			public const int Widget_AppCompat_AutoCompleteTextView = 2131493159;
+			
+			// aapt resource value: 0x7f0c0128
+			public const int Widget_AppCompat_Button = 2131493160;
+			
+			// aapt resource value: 0x7f0c0129
+			public const int Widget_AppCompat_Button_Borderless = 2131493161;
+			
+			// aapt resource value: 0x7f0c012a
+			public const int Widget_AppCompat_Button_Borderless_Colored = 2131493162;
+			
+			// aapt resource value: 0x7f0c012b
+			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131493163;
+			
+			// aapt resource value: 0x7f0c012c
+			public const int Widget_AppCompat_Button_Colored = 2131493164;
+			
+			// aapt resource value: 0x7f0c012d
+			public const int Widget_AppCompat_Button_Small = 2131493165;
+			
+			// aapt resource value: 0x7f0c012e
+			public const int Widget_AppCompat_ButtonBar = 2131493166;
+			
+			// aapt resource value: 0x7f0c012f
+			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131493167;
+			
+			// aapt resource value: 0x7f0c0130
+			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131493168;
+			
+			// aapt resource value: 0x7f0c0131
+			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131493169;
+			
+			// aapt resource value: 0x7f0c0132
+			public const int Widget_AppCompat_CompoundButton_Switch = 2131493170;
+			
+			// aapt resource value: 0x7f0c0133
+			public const int Widget_AppCompat_DrawerArrowToggle = 2131493171;
+			
+			// aapt resource value: 0x7f0c0134
+			public const int Widget_AppCompat_DropDownItem_Spinner = 2131493172;
+			
+			// aapt resource value: 0x7f0c0135
+			public const int Widget_AppCompat_EditText = 2131493173;
+			
+			// aapt resource value: 0x7f0c0136
+			public const int Widget_AppCompat_ImageButton = 2131493174;
+			
+			// aapt resource value: 0x7f0c0137
+			public const int Widget_AppCompat_Light_ActionBar = 2131493175;
+			
+			// aapt resource value: 0x7f0c0138
+			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131493176;
+			
+			// aapt resource value: 0x7f0c0139
+			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131493177;
+			
+			// aapt resource value: 0x7f0c013a
+			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131493178;
+			
+			// aapt resource value: 0x7f0c013b
+			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131493179;
+			
+			// aapt resource value: 0x7f0c013c
+			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131493180;
+			
+			// aapt resource value: 0x7f0c013d
+			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131493181;
+			
+			// aapt resource value: 0x7f0c013e
+			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131493182;
+			
+			// aapt resource value: 0x7f0c013f
+			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131493183;
+			
+			// aapt resource value: 0x7f0c0140
+			public const int Widget_AppCompat_Light_ActionButton = 2131493184;
+			
+			// aapt resource value: 0x7f0c0141
+			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131493185;
+			
+			// aapt resource value: 0x7f0c0142
+			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131493186;
+			
+			// aapt resource value: 0x7f0c0143
+			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131493187;
+			
+			// aapt resource value: 0x7f0c0144
+			public const int Widget_AppCompat_Light_ActivityChooserView = 2131493188;
+			
+			// aapt resource value: 0x7f0c0145
+			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131493189;
+			
+			// aapt resource value: 0x7f0c0146
+			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131493190;
+			
+			// aapt resource value: 0x7f0c0147
+			public const int Widget_AppCompat_Light_ListPopupWindow = 2131493191;
+			
+			// aapt resource value: 0x7f0c0148
+			public const int Widget_AppCompat_Light_ListView_DropDown = 2131493192;
+			
+			// aapt resource value: 0x7f0c0149
+			public const int Widget_AppCompat_Light_PopupMenu = 2131493193;
+			
+			// aapt resource value: 0x7f0c014a
+			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131493194;
+			
+			// aapt resource value: 0x7f0c014b
+			public const int Widget_AppCompat_Light_SearchView = 2131493195;
+			
+			// aapt resource value: 0x7f0c014c
+			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131493196;
+			
+			// aapt resource value: 0x7f0c014d
+			public const int Widget_AppCompat_ListMenuView = 2131493197;
+			
+			// aapt resource value: 0x7f0c014e
+			public const int Widget_AppCompat_ListPopupWindow = 2131493198;
+			
+			// aapt resource value: 0x7f0c014f
+			public const int Widget_AppCompat_ListView = 2131493199;
+			
+			// aapt resource value: 0x7f0c0150
+			public const int Widget_AppCompat_ListView_DropDown = 2131493200;
+			
+			// aapt resource value: 0x7f0c0151
+			public const int Widget_AppCompat_ListView_Menu = 2131493201;
+			
+			// aapt resource value: 0x7f0c0152
+			public const int Widget_AppCompat_PopupMenu = 2131493202;
+			
+			// aapt resource value: 0x7f0c0153
+			public const int Widget_AppCompat_PopupMenu_Overflow = 2131493203;
+			
+			// aapt resource value: 0x7f0c0154
+			public const int Widget_AppCompat_PopupWindow = 2131493204;
+			
+			// aapt resource value: 0x7f0c0155
+			public const int Widget_AppCompat_ProgressBar = 2131493205;
+			
+			// aapt resource value: 0x7f0c0156
+			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131493206;
+			
+			// aapt resource value: 0x7f0c0157
+			public const int Widget_AppCompat_RatingBar = 2131493207;
+			
+			// aapt resource value: 0x7f0c0158
+			public const int Widget_AppCompat_RatingBar_Indicator = 2131493208;
+			
+			// aapt resource value: 0x7f0c0159
+			public const int Widget_AppCompat_RatingBar_Small = 2131493209;
+			
+			// aapt resource value: 0x7f0c015a
+			public const int Widget_AppCompat_SearchView = 2131493210;
+			
+			// aapt resource value: 0x7f0c015b
+			public const int Widget_AppCompat_SearchView_ActionBar = 2131493211;
+			
+			// aapt resource value: 0x7f0c015c
+			public const int Widget_AppCompat_SeekBar = 2131493212;
+			
+			// aapt resource value: 0x7f0c015d
+			public const int Widget_AppCompat_SeekBar_Discrete = 2131493213;
+			
+			// aapt resource value: 0x7f0c015e
+			public const int Widget_AppCompat_Spinner = 2131493214;
+			
+			// aapt resource value: 0x7f0c015f
+			public const int Widget_AppCompat_Spinner_DropDown = 2131493215;
+			
+			// aapt resource value: 0x7f0c0160
+			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131493216;
+			
+			// aapt resource value: 0x7f0c0161
+			public const int Widget_AppCompat_Spinner_Underlined = 2131493217;
+			
+			// aapt resource value: 0x7f0c0162
+			public const int Widget_AppCompat_TextView_SpinnerItem = 2131493218;
+			
+			// aapt resource value: 0x7f0c0163
+			public const int Widget_AppCompat_Toolbar = 2131493219;
+			
+			// aapt resource value: 0x7f0c0164
+			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131493220;
+			
+			// aapt resource value: 0x7f0c018c
+			public const int Widget_Compat_NotificationActionContainer = 2131493260;
+			
+			// aapt resource value: 0x7f0c018d
+			public const int Widget_Compat_NotificationActionText = 2131493261;
+			
+			// aapt resource value: 0x7f0c017e
+			public const int Widget_Design_AppBarLayout = 2131493246;
+			
+			// aapt resource value: 0x7f0c017f
+			public const int Widget_Design_BottomNavigationView = 2131493247;
+			
+			// aapt resource value: 0x7f0c0180
+			public const int Widget_Design_BottomSheet_Modal = 2131493248;
+			
+			// aapt resource value: 0x7f0c0181
+			public const int Widget_Design_CollapsingToolbar = 2131493249;
+			
+			// aapt resource value: 0x7f0c0182
+			public const int Widget_Design_CoordinatorLayout = 2131493250;
+			
+			// aapt resource value: 0x7f0c0183
+			public const int Widget_Design_FloatingActionButton = 2131493251;
+			
+			// aapt resource value: 0x7f0c0184
+			public const int Widget_Design_NavigationView = 2131493252;
+			
+			// aapt resource value: 0x7f0c0185
+			public const int Widget_Design_ScrimInsetsFrameLayout = 2131493253;
+			
+			// aapt resource value: 0x7f0c0186
+			public const int Widget_Design_Snackbar = 2131493254;
+			
+			// aapt resource value: 0x7f0c016a
+			public const int Widget_Design_TabLayout = 2131493226;
+			
+			// aapt resource value: 0x7f0c0187
+			public const int Widget_Design_TextInputLayout = 2131493255;
+			
+			// aapt resource value: 0x7f0c0009
+			public const int Widget_MediaRouter_Light_MediaRouteButton = 2131492873;
+			
+			// aapt resource value: 0x7f0c000a
+			public const int Widget_MediaRouter_MediaRouteButton = 2131492874;
+			
+			static Style()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Style()
+			{
+			}
+		}
+		
+		public partial class Styleable
+		{
+			
+			public static int[] ActionBar = new int[] {
+					2130772003,
+					2130772005,
+					2130772006,
+					2130772007,
+					2130772008,
+					2130772009,
+					2130772010,
+					2130772011,
+					2130772012,
+					2130772013,
+					2130772014,
+					2130772015,
+					2130772016,
+					2130772017,
+					2130772018,
+					2130772019,
+					2130772020,
+					2130772021,
+					2130772022,
+					2130772023,
+					2130772024,
+					2130772025,
+					2130772026,
+					2130772027,
+					2130772028,
+					2130772029,
+					2130772030,
+					2130772031,
+					2130772101};
+			
+			// aapt resource value: 10
+			public const int ActionBar_background = 10;
+			
+			// aapt resource value: 12
+			public const int ActionBar_backgroundSplit = 12;
+			
+			// aapt resource value: 11
+			public const int ActionBar_backgroundStacked = 11;
+			
+			// aapt resource value: 21
+			public const int ActionBar_contentInsetEnd = 21;
+			
+			// aapt resource value: 25
+			public const int ActionBar_contentInsetEndWithActions = 25;
+			
+			// aapt resource value: 22
+			public const int ActionBar_contentInsetLeft = 22;
+			
+			// aapt resource value: 23
+			public const int ActionBar_contentInsetRight = 23;
+			
+			// aapt resource value: 20
+			public const int ActionBar_contentInsetStart = 20;
+			
+			// aapt resource value: 24
+			public const int ActionBar_contentInsetStartWithNavigation = 24;
+			
+			// aapt resource value: 13
+			public const int ActionBar_customNavigationLayout = 13;
+			
+			// aapt resource value: 3
+			public const int ActionBar_displayOptions = 3;
+			
+			// aapt resource value: 9
+			public const int ActionBar_divider = 9;
+			
+			// aapt resource value: 26
+			public const int ActionBar_elevation = 26;
+			
+			// aapt resource value: 0
+			public const int ActionBar_height = 0;
+			
+			// aapt resource value: 19
+			public const int ActionBar_hideOnContentScroll = 19;
+			
+			// aapt resource value: 28
+			public const int ActionBar_homeAsUpIndicator = 28;
+			
+			// aapt resource value: 14
+			public const int ActionBar_homeLayout = 14;
+			
+			// aapt resource value: 7
+			public const int ActionBar_icon = 7;
+			
+			// aapt resource value: 16
+			public const int ActionBar_indeterminateProgressStyle = 16;
+			
+			// aapt resource value: 18
+			public const int ActionBar_itemPadding = 18;
+			
+			// aapt resource value: 8
+			public const int ActionBar_logo = 8;
+			
+			// aapt resource value: 2
+			public const int ActionBar_navigationMode = 2;
+			
+			// aapt resource value: 27
+			public const int ActionBar_popupTheme = 27;
+			
+			// aapt resource value: 17
+			public const int ActionBar_progressBarPadding = 17;
+			
+			// aapt resource value: 15
+			public const int ActionBar_progressBarStyle = 15;
+			
+			// aapt resource value: 4
+			public const int ActionBar_subtitle = 4;
+			
+			// aapt resource value: 6
+			public const int ActionBar_subtitleTextStyle = 6;
+			
+			// aapt resource value: 1
+			public const int ActionBar_title = 1;
+			
+			// aapt resource value: 5
+			public const int ActionBar_titleTextStyle = 5;
+			
+			public static int[] ActionBarLayout = new int[] {
+					16842931};
+			
+			// aapt resource value: 0
+			public const int ActionBarLayout_android_layout_gravity = 0;
+			
+			public static int[] ActionMenuItemView = new int[] {
+					16843071};
+			
+			// aapt resource value: 0
+			public const int ActionMenuItemView_android_minWidth = 0;
+			
+			public static int[] ActionMenuView;
+			
+			public static int[] ActionMode = new int[] {
+					2130772003,
+					2130772009,
+					2130772010,
+					2130772014,
+					2130772016,
+					2130772032};
+			
+			// aapt resource value: 3
+			public const int ActionMode_background = 3;
+			
+			// aapt resource value: 4
+			public const int ActionMode_backgroundSplit = 4;
+			
+			// aapt resource value: 5
+			public const int ActionMode_closeItemLayout = 5;
+			
+			// aapt resource value: 0
+			public const int ActionMode_height = 0;
+			
+			// aapt resource value: 2
+			public const int ActionMode_subtitleTextStyle = 2;
+			
+			// aapt resource value: 1
+			public const int ActionMode_titleTextStyle = 1;
+			
+			public static int[] ActivityChooserView = new int[] {
+					2130772033,
+					2130772034};
+			
+			// aapt resource value: 1
+			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+			
+			// aapt resource value: 0
+			public const int ActivityChooserView_initialActivityCount = 0;
+			
+			public static int[] AlertDialog = new int[] {
+					16842994,
+					2130772035,
+					2130772036,
+					2130772037,
+					2130772038,
+					2130772039,
+					2130772040};
+			
+			// aapt resource value: 0
+			public const int AlertDialog_android_layout = 0;
+			
+			// aapt resource value: 1
+			public const int AlertDialog_buttonPanelSideLayout = 1;
+			
+			// aapt resource value: 5
+			public const int AlertDialog_listItemLayout = 5;
+			
+			// aapt resource value: 2
+			public const int AlertDialog_listLayout = 2;
+			
+			// aapt resource value: 3
+			public const int AlertDialog_multiChoiceItemLayout = 3;
+			
+			// aapt resource value: 6
+			public const int AlertDialog_showTitle = 6;
+			
+			// aapt resource value: 4
+			public const int AlertDialog_singleChoiceItemLayout = 4;
+			
+			public static int[] AppBarLayout = new int[] {
+					16842964,
+					16843919,
+					16844096,
+					2130772030,
+					2130772248};
+			
+			// aapt resource value: 0
+			public const int AppBarLayout_android_background = 0;
+			
+			// aapt resource value: 2
+			public const int AppBarLayout_android_keyboardNavigationCluster = 2;
+			
+			// aapt resource value: 1
+			public const int AppBarLayout_android_touchscreenBlocksFocus = 1;
+			
+			// aapt resource value: 3
+			public const int AppBarLayout_elevation = 3;
+			
+			// aapt resource value: 4
+			public const int AppBarLayout_expanded = 4;
+			
+			public static int[] AppBarLayoutStates = new int[] {
+					2130772249,
+					2130772250};
+			
+			// aapt resource value: 0
+			public const int AppBarLayoutStates_state_collapsed = 0;
+			
+			// aapt resource value: 1
+			public const int AppBarLayoutStates_state_collapsible = 1;
+			
+			public static int[] AppBarLayout_Layout = new int[] {
+					2130772251,
+					2130772252};
+			
+			// aapt resource value: 0
+			public const int AppBarLayout_Layout_layout_scrollFlags = 0;
+			
+			// aapt resource value: 1
+			public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
+			
+			public static int[] AppCompatImageView = new int[] {
+					16843033,
+					2130772041,
+					2130772042,
+					2130772043};
+			
+			// aapt resource value: 0
+			public const int AppCompatImageView_android_src = 0;
+			
+			// aapt resource value: 1
+			public const int AppCompatImageView_srcCompat = 1;
+			
+			// aapt resource value: 2
+			public const int AppCompatImageView_tint = 2;
+			
+			// aapt resource value: 3
+			public const int AppCompatImageView_tintMode = 3;
+			
+			public static int[] AppCompatSeekBar = new int[] {
+					16843074,
+					2130772044,
+					2130772045,
+					2130772046};
+			
+			// aapt resource value: 0
+			public const int AppCompatSeekBar_android_thumb = 0;
+			
+			// aapt resource value: 1
+			public const int AppCompatSeekBar_tickMark = 1;
+			
+			// aapt resource value: 2
+			public const int AppCompatSeekBar_tickMarkTint = 2;
+			
+			// aapt resource value: 3
+			public const int AppCompatSeekBar_tickMarkTintMode = 3;
+			
+			public static int[] AppCompatTextHelper = new int[] {
+					16842804,
+					16843117,
+					16843118,
+					16843119,
+					16843120,
+					16843666,
+					16843667};
+			
+			// aapt resource value: 2
+			public const int AppCompatTextHelper_android_drawableBottom = 2;
+			
+			// aapt resource value: 6
+			public const int AppCompatTextHelper_android_drawableEnd = 6;
+			
+			// aapt resource value: 3
+			public const int AppCompatTextHelper_android_drawableLeft = 3;
+			
+			// aapt resource value: 4
+			public const int AppCompatTextHelper_android_drawableRight = 4;
+			
+			// aapt resource value: 5
+			public const int AppCompatTextHelper_android_drawableStart = 5;
+			
+			// aapt resource value: 1
+			public const int AppCompatTextHelper_android_drawableTop = 1;
+			
+			// aapt resource value: 0
+			public const int AppCompatTextHelper_android_textAppearance = 0;
+			
+			public static int[] AppCompatTextView = new int[] {
+					16842804,
+					2130772047,
+					2130772048,
+					2130772049,
+					2130772050,
+					2130772051,
+					2130772052,
+					2130772053};
+			
+			// aapt resource value: 0
+			public const int AppCompatTextView_android_textAppearance = 0;
+			
+			// aapt resource value: 6
+			public const int AppCompatTextView_autoSizeMaxTextSize = 6;
+			
+			// aapt resource value: 5
+			public const int AppCompatTextView_autoSizeMinTextSize = 5;
+			
+			// aapt resource value: 4
+			public const int AppCompatTextView_autoSizePresetSizes = 4;
+			
+			// aapt resource value: 3
+			public const int AppCompatTextView_autoSizeStepGranularity = 3;
+			
+			// aapt resource value: 2
+			public const int AppCompatTextView_autoSizeTextType = 2;
+			
+			// aapt resource value: 7
+			public const int AppCompatTextView_fontFamily = 7;
+			
+			// aapt resource value: 1
+			public const int AppCompatTextView_textAllCaps = 1;
+			
+			public static int[] AppCompatTheme = new int[] {
+					16842839,
+					16842926,
+					2130772054,
+					2130772055,
+					2130772056,
+					2130772057,
+					2130772058,
+					2130772059,
+					2130772060,
+					2130772061,
+					2130772062,
+					2130772063,
+					2130772064,
+					2130772065,
+					2130772066,
+					2130772067,
+					2130772068,
+					2130772069,
+					2130772070,
+					2130772071,
+					2130772072,
+					2130772073,
+					2130772074,
+					2130772075,
+					2130772076,
+					2130772077,
+					2130772078,
+					2130772079,
+					2130772080,
+					2130772081,
+					2130772082,
+					2130772083,
+					2130772084,
+					2130772085,
+					2130772086,
+					2130772087,
+					2130772088,
+					2130772089,
+					2130772090,
+					2130772091,
+					2130772092,
+					2130772093,
+					2130772094,
+					2130772095,
+					2130772096,
+					2130772097,
+					2130772098,
+					2130772099,
+					2130772100,
+					2130772101,
+					2130772102,
+					2130772103,
+					2130772104,
+					2130772105,
+					2130772106,
+					2130772107,
+					2130772108,
+					2130772109,
+					2130772110,
+					2130772111,
+					2130772112,
+					2130772113,
+					2130772114,
+					2130772115,
+					2130772116,
+					2130772117,
+					2130772118,
+					2130772119,
+					2130772120,
+					2130772121,
+					2130772122,
+					2130772123,
+					2130772124,
+					2130772125,
+					2130772126,
+					2130772127,
+					2130772128,
+					2130772129,
+					2130772130,
+					2130772131,
+					2130772132,
+					2130772133,
+					2130772134,
+					2130772135,
+					2130772136,
+					2130772137,
+					2130772138,
+					2130772139,
+					2130772140,
+					2130772141,
+					2130772142,
+					2130772143,
+					2130772144,
+					2130772145,
+					2130772146,
+					2130772147,
+					2130772148,
+					2130772149,
+					2130772150,
+					2130772151,
+					2130772152,
+					2130772153,
+					2130772154,
+					2130772155,
+					2130772156,
+					2130772157,
+					2130772158,
+					2130772159,
+					2130772160,
+					2130772161,
+					2130772162,
+					2130772163,
+					2130772164,
+					2130772165,
+					2130772166,
+					2130772167,
+					2130772168,
+					2130772169,
+					2130772170};
+			
+			// aapt resource value: 23
+			public const int AppCompatTheme_actionBarDivider = 23;
+			
+			// aapt resource value: 24
+			public const int AppCompatTheme_actionBarItemBackground = 24;
+			
+			// aapt resource value: 17
+			public const int AppCompatTheme_actionBarPopupTheme = 17;
+			
+			// aapt resource value: 22
+			public const int AppCompatTheme_actionBarSize = 22;
+			
+			// aapt resource value: 19
+			public const int AppCompatTheme_actionBarSplitStyle = 19;
+			
+			// aapt resource value: 18
+			public const int AppCompatTheme_actionBarStyle = 18;
+			
+			// aapt resource value: 13
+			public const int AppCompatTheme_actionBarTabBarStyle = 13;
+			
+			// aapt resource value: 12
+			public const int AppCompatTheme_actionBarTabStyle = 12;
+			
+			// aapt resource value: 14
+			public const int AppCompatTheme_actionBarTabTextStyle = 14;
+			
+			// aapt resource value: 20
+			public const int AppCompatTheme_actionBarTheme = 20;
+			
+			// aapt resource value: 21
+			public const int AppCompatTheme_actionBarWidgetTheme = 21;
+			
+			// aapt resource value: 50
+			public const int AppCompatTheme_actionButtonStyle = 50;
+			
+			// aapt resource value: 46
+			public const int AppCompatTheme_actionDropDownStyle = 46;
+			
+			// aapt resource value: 25
+			public const int AppCompatTheme_actionMenuTextAppearance = 25;
+			
+			// aapt resource value: 26
+			public const int AppCompatTheme_actionMenuTextColor = 26;
+			
+			// aapt resource value: 29
+			public const int AppCompatTheme_actionModeBackground = 29;
+			
+			// aapt resource value: 28
+			public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
+			
+			// aapt resource value: 31
+			public const int AppCompatTheme_actionModeCloseDrawable = 31;
+			
+			// aapt resource value: 33
+			public const int AppCompatTheme_actionModeCopyDrawable = 33;
+			
+			// aapt resource value: 32
+			public const int AppCompatTheme_actionModeCutDrawable = 32;
+			
+			// aapt resource value: 37
+			public const int AppCompatTheme_actionModeFindDrawable = 37;
+			
+			// aapt resource value: 34
+			public const int AppCompatTheme_actionModePasteDrawable = 34;
+			
+			// aapt resource value: 39
+			public const int AppCompatTheme_actionModePopupWindowStyle = 39;
+			
+			// aapt resource value: 35
+			public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
+			
+			// aapt resource value: 36
+			public const int AppCompatTheme_actionModeShareDrawable = 36;
+			
+			// aapt resource value: 30
+			public const int AppCompatTheme_actionModeSplitBackground = 30;
+			
+			// aapt resource value: 27
+			public const int AppCompatTheme_actionModeStyle = 27;
+			
+			// aapt resource value: 38
+			public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+			
+			// aapt resource value: 15
+			public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+			
+			// aapt resource value: 16
+			public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+			
+			// aapt resource value: 58
+			public const int AppCompatTheme_activityChooserViewStyle = 58;
+			
+			// aapt resource value: 95
+			public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+			
+			// aapt resource value: 96
+			public const int AppCompatTheme_alertDialogCenterButtons = 96;
+			
+			// aapt resource value: 94
+			public const int AppCompatTheme_alertDialogStyle = 94;
+			
+			// aapt resource value: 97
+			public const int AppCompatTheme_alertDialogTheme = 97;
+			
+			// aapt resource value: 1
+			public const int AppCompatTheme_android_windowAnimationStyle = 1;
+			
+			// aapt resource value: 0
+			public const int AppCompatTheme_android_windowIsFloating = 0;
+			
+			// aapt resource value: 102
+			public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
+			
+			// aapt resource value: 55
+			public const int AppCompatTheme_borderlessButtonStyle = 55;
+			
+			// aapt resource value: 52
+			public const int AppCompatTheme_buttonBarButtonStyle = 52;
+			
+			// aapt resource value: 100
+			public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+			
+			// aapt resource value: 101
+			public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+			
+			// aapt resource value: 99
+			public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
+			
+			// aapt resource value: 51
+			public const int AppCompatTheme_buttonBarStyle = 51;
+			
+			// aapt resource value: 103
+			public const int AppCompatTheme_buttonStyle = 103;
+			
+			// aapt resource value: 104
+			public const int AppCompatTheme_buttonStyleSmall = 104;
+			
+			// aapt resource value: 105
+			public const int AppCompatTheme_checkboxStyle = 105;
+			
+			// aapt resource value: 106
+			public const int AppCompatTheme_checkedTextViewStyle = 106;
+			
+			// aapt resource value: 86
+			public const int AppCompatTheme_colorAccent = 86;
+			
+			// aapt resource value: 93
+			public const int AppCompatTheme_colorBackgroundFloating = 93;
+			
+			// aapt resource value: 90
+			public const int AppCompatTheme_colorButtonNormal = 90;
+			
+			// aapt resource value: 88
+			public const int AppCompatTheme_colorControlActivated = 88;
+			
+			// aapt resource value: 89
+			public const int AppCompatTheme_colorControlHighlight = 89;
+			
+			// aapt resource value: 87
+			public const int AppCompatTheme_colorControlNormal = 87;
+			
+			// aapt resource value: 118
+			public const int AppCompatTheme_colorError = 118;
+			
+			// aapt resource value: 84
+			public const int AppCompatTheme_colorPrimary = 84;
+			
+			// aapt resource value: 85
+			public const int AppCompatTheme_colorPrimaryDark = 85;
+			
+			// aapt resource value: 91
+			public const int AppCompatTheme_colorSwitchThumbNormal = 91;
+			
+			// aapt resource value: 92
+			public const int AppCompatTheme_controlBackground = 92;
+			
+			// aapt resource value: 44
+			public const int AppCompatTheme_dialogPreferredPadding = 44;
+			
+			// aapt resource value: 43
+			public const int AppCompatTheme_dialogTheme = 43;
+			
+			// aapt resource value: 57
+			public const int AppCompatTheme_dividerHorizontal = 57;
+			
+			// aapt resource value: 56
+			public const int AppCompatTheme_dividerVertical = 56;
+			
+			// aapt resource value: 75
+			public const int AppCompatTheme_dropDownListViewStyle = 75;
+			
+			// aapt resource value: 47
+			public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
+			
+			// aapt resource value: 64
+			public const int AppCompatTheme_editTextBackground = 64;
+			
+			// aapt resource value: 63
+			public const int AppCompatTheme_editTextColor = 63;
+			
+			// aapt resource value: 107
+			public const int AppCompatTheme_editTextStyle = 107;
+			
+			// aapt resource value: 49
+			public const int AppCompatTheme_homeAsUpIndicator = 49;
+			
+			// aapt resource value: 65
+			public const int AppCompatTheme_imageButtonStyle = 65;
+			
+			// aapt resource value: 83
+			public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+			
+			// aapt resource value: 45
+			public const int AppCompatTheme_listDividerAlertDialog = 45;
+			
+			// aapt resource value: 115
+			public const int AppCompatTheme_listMenuViewStyle = 115;
+			
+			// aapt resource value: 76
+			public const int AppCompatTheme_listPopupWindowStyle = 76;
+			
+			// aapt resource value: 70
+			public const int AppCompatTheme_listPreferredItemHeight = 70;
+			
+			// aapt resource value: 72
+			public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
+			
+			// aapt resource value: 71
+			public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+			
+			// aapt resource value: 73
+			public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+			
+			// aapt resource value: 74
+			public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
+			
+			// aapt resource value: 80
+			public const int AppCompatTheme_panelBackground = 80;
+			
+			// aapt resource value: 82
+			public const int AppCompatTheme_panelMenuListTheme = 82;
+			
+			// aapt resource value: 81
+			public const int AppCompatTheme_panelMenuListWidth = 81;
+			
+			// aapt resource value: 61
+			public const int AppCompatTheme_popupMenuStyle = 61;
+			
+			// aapt resource value: 62
+			public const int AppCompatTheme_popupWindowStyle = 62;
+			
+			// aapt resource value: 108
+			public const int AppCompatTheme_radioButtonStyle = 108;
+			
+			// aapt resource value: 109
+			public const int AppCompatTheme_ratingBarStyle = 109;
+			
+			// aapt resource value: 110
+			public const int AppCompatTheme_ratingBarStyleIndicator = 110;
+			
+			// aapt resource value: 111
+			public const int AppCompatTheme_ratingBarStyleSmall = 111;
+			
+			// aapt resource value: 69
+			public const int AppCompatTheme_searchViewStyle = 69;
+			
+			// aapt resource value: 112
+			public const int AppCompatTheme_seekBarStyle = 112;
+			
+			// aapt resource value: 53
+			public const int AppCompatTheme_selectableItemBackground = 53;
+			
+			// aapt resource value: 54
+			public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+			
+			// aapt resource value: 48
+			public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
+			
+			// aapt resource value: 113
+			public const int AppCompatTheme_spinnerStyle = 113;
+			
+			// aapt resource value: 114
+			public const int AppCompatTheme_switchStyle = 114;
+			
+			// aapt resource value: 40
+			public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
+			
+			// aapt resource value: 77
+			public const int AppCompatTheme_textAppearanceListItem = 77;
+			
+			// aapt resource value: 78
+			public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
+			
+			// aapt resource value: 79
+			public const int AppCompatTheme_textAppearanceListItemSmall = 79;
+			
+			// aapt resource value: 42
+			public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
+			
+			// aapt resource value: 67
+			public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
+			
+			// aapt resource value: 66
+			public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
+			
+			// aapt resource value: 41
+			public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+			
+			// aapt resource value: 98
+			public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+			
+			// aapt resource value: 68
+			public const int AppCompatTheme_textColorSearchUrl = 68;
+			
+			// aapt resource value: 60
+			public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+			
+			// aapt resource value: 59
+			public const int AppCompatTheme_toolbarStyle = 59;
+			
+			// aapt resource value: 117
+			public const int AppCompatTheme_tooltipForegroundColor = 117;
+			
+			// aapt resource value: 116
+			public const int AppCompatTheme_tooltipFrameBackground = 116;
+			
+			// aapt resource value: 2
+			public const int AppCompatTheme_windowActionBar = 2;
+			
+			// aapt resource value: 4
+			public const int AppCompatTheme_windowActionBarOverlay = 4;
+			
+			// aapt resource value: 5
+			public const int AppCompatTheme_windowActionModeOverlay = 5;
+			
+			// aapt resource value: 9
+			public const int AppCompatTheme_windowFixedHeightMajor = 9;
+			
+			// aapt resource value: 7
+			public const int AppCompatTheme_windowFixedHeightMinor = 7;
+			
+			// aapt resource value: 6
+			public const int AppCompatTheme_windowFixedWidthMajor = 6;
+			
+			// aapt resource value: 8
+			public const int AppCompatTheme_windowFixedWidthMinor = 8;
+			
+			// aapt resource value: 10
+			public const int AppCompatTheme_windowMinWidthMajor = 10;
+			
+			// aapt resource value: 11
+			public const int AppCompatTheme_windowMinWidthMinor = 11;
+			
+			// aapt resource value: 3
+			public const int AppCompatTheme_windowNoTitle = 3;
+			
+			public static int[] BottomNavigationView = new int[] {
+					2130772030,
+					2130772291,
+					2130772292,
+					2130772293,
+					2130772294};
+			
+			// aapt resource value: 0
+			public const int BottomNavigationView_elevation = 0;
+			
+			// aapt resource value: 4
+			public const int BottomNavigationView_itemBackground = 4;
+			
+			// aapt resource value: 2
+			public const int BottomNavigationView_itemIconTint = 2;
+			
+			// aapt resource value: 3
+			public const int BottomNavigationView_itemTextColor = 3;
+			
+			// aapt resource value: 1
+			public const int BottomNavigationView_menu = 1;
+			
+			public static int[] BottomSheetBehavior_Layout = new int[] {
+					2130772253,
+					2130772254,
+					2130772255};
+			
+			// aapt resource value: 1
+			public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+			
+			// aapt resource value: 0
+			public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
+			
+			// aapt resource value: 2
+			public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
+			
+			public static int[] ButtonBarLayout = new int[] {
+					2130772171};
+			
+			// aapt resource value: 0
+			public const int ButtonBarLayout_allowStacking = 0;
+			
+			public static int[] CardView = new int[] {
+					16843071,
+					16843072,
+					2130771991,
+					2130771992,
+					2130771993,
+					2130771994,
+					2130771995,
+					2130771996,
+					2130771997,
+					2130771998,
+					2130771999,
+					2130772000,
+					2130772001};
+			
+			// aapt resource value: 1
+			public const int CardView_android_minHeight = 1;
+			
+			// aapt resource value: 0
+			public const int CardView_android_minWidth = 0;
+			
+			// aapt resource value: 2
+			public const int CardView_cardBackgroundColor = 2;
+			
+			// aapt resource value: 3
+			public const int CardView_cardCornerRadius = 3;
+			
+			// aapt resource value: 4
+			public const int CardView_cardElevation = 4;
+			
+			// aapt resource value: 5
+			public const int CardView_cardMaxElevation = 5;
+			
+			// aapt resource value: 7
+			public const int CardView_cardPreventCornerOverlap = 7;
+			
+			// aapt resource value: 6
+			public const int CardView_cardUseCompatPadding = 6;
+			
+			// aapt resource value: 8
+			public const int CardView_contentPadding = 8;
+			
+			// aapt resource value: 12
+			public const int CardView_contentPaddingBottom = 12;
+			
+			// aapt resource value: 9
+			public const int CardView_contentPaddingLeft = 9;
+			
+			// aapt resource value: 10
+			public const int CardView_contentPaddingRight = 10;
+			
+			// aapt resource value: 11
+			public const int CardView_contentPaddingTop = 11;
+			
+			public static int[] CollapsingToolbarLayout = new int[] {
+					2130772005,
+					2130772256,
+					2130772257,
+					2130772258,
+					2130772259,
+					2130772260,
+					2130772261,
+					2130772262,
+					2130772263,
+					2130772264,
+					2130772265,
+					2130772266,
+					2130772267,
+					2130772268,
+					2130772269,
+					2130772270};
+			
+			// aapt resource value: 13
+			public const int CollapsingToolbarLayout_collapsedTitleGravity = 13;
+			
+			// aapt resource value: 7
+			public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 7;
+			
+			// aapt resource value: 8
+			public const int CollapsingToolbarLayout_contentScrim = 8;
+			
+			// aapt resource value: 14
+			public const int CollapsingToolbarLayout_expandedTitleGravity = 14;
+			
+			// aapt resource value: 1
+			public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
+			
+			// aapt resource value: 5
+			public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
+			
+			// aapt resource value: 4
+			public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
+			
+			// aapt resource value: 2
+			public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
+			
+			// aapt resource value: 3
+			public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
+			
+			// aapt resource value: 6
+			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
+			
+			// aapt resource value: 12
+			public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
+			
+			// aapt resource value: 11
+			public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
+			
+			// aapt resource value: 9
+			public const int CollapsingToolbarLayout_statusBarScrim = 9;
+			
+			// aapt resource value: 0
+			public const int CollapsingToolbarLayout_title = 0;
+			
+			// aapt resource value: 15
+			public const int CollapsingToolbarLayout_titleEnabled = 15;
+			
+			// aapt resource value: 10
+			public const int CollapsingToolbarLayout_toolbarId = 10;
+			
+			public static int[] CollapsingToolbarLayout_Layout = new int[] {
+					2130772271,
+					2130772272};
+			
+			// aapt resource value: 0
+			public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
+			
+			// aapt resource value: 1
+			public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
+			
+			public static int[] ColorStateListItem = new int[] {
+					16843173,
+					16843551,
+					2130772172};
+			
+			// aapt resource value: 2
+			public const int ColorStateListItem_alpha = 2;
+			
+			// aapt resource value: 1
+			public const int ColorStateListItem_android_alpha = 1;
+			
+			// aapt resource value: 0
+			public const int ColorStateListItem_android_color = 0;
+			
+			public static int[] CompoundButton = new int[] {
+					16843015,
+					2130772173,
+					2130772174};
+			
+			// aapt resource value: 0
+			public const int CompoundButton_android_button = 0;
+			
+			// aapt resource value: 1
+			public const int CompoundButton_buttonTint = 1;
+			
+			// aapt resource value: 2
+			public const int CompoundButton_buttonTintMode = 2;
+			
+			public static int[] CoordinatorLayout = new int[] {
+					2130772273,
+					2130772274};
+			
+			// aapt resource value: 0
+			public const int CoordinatorLayout_keylines = 0;
+			
+			// aapt resource value: 1
+			public const int CoordinatorLayout_statusBarBackground = 1;
+			
+			public static int[] CoordinatorLayout_Layout = new int[] {
+					16842931,
+					2130772275,
+					2130772276,
+					2130772277,
+					2130772278,
+					2130772279,
+					2130772280};
+			
+			// aapt resource value: 0
+			public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
+			
+			// aapt resource value: 2
+			public const int CoordinatorLayout_Layout_layout_anchor = 2;
+			
+			// aapt resource value: 4
+			public const int CoordinatorLayout_Layout_layout_anchorGravity = 4;
+			
+			// aapt resource value: 1
+			public const int CoordinatorLayout_Layout_layout_behavior = 1;
+			
+			// aapt resource value: 6
+			public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 6;
+			
+			// aapt resource value: 5
+			public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
+			
+			// aapt resource value: 3
+			public const int CoordinatorLayout_Layout_layout_keyline = 3;
+			
+			public static int[] DesignTheme = new int[] {
+					2130772281,
+					2130772282,
+					2130772283};
+			
+			// aapt resource value: 0
+			public const int DesignTheme_bottomSheetDialogTheme = 0;
+			
+			// aapt resource value: 1
+			public const int DesignTheme_bottomSheetStyle = 1;
+			
+			// aapt resource value: 2
+			public const int DesignTheme_textColorError = 2;
+			
+			public static int[] DrawerArrowToggle = new int[] {
+					2130772175,
+					2130772176,
+					2130772177,
+					2130772178,
+					2130772179,
+					2130772180,
+					2130772181,
+					2130772182};
+			
+			// aapt resource value: 4
+			public const int DrawerArrowToggle_arrowHeadLength = 4;
+			
+			// aapt resource value: 5
+			public const int DrawerArrowToggle_arrowShaftLength = 5;
+			
+			// aapt resource value: 6
+			public const int DrawerArrowToggle_barLength = 6;
+			
+			// aapt resource value: 0
+			public const int DrawerArrowToggle_color = 0;
+			
+			// aapt resource value: 2
+			public const int DrawerArrowToggle_drawableSize = 2;
+			
+			// aapt resource value: 3
+			public const int DrawerArrowToggle_gapBetweenBars = 3;
+			
+			// aapt resource value: 1
+			public const int DrawerArrowToggle_spinBars = 1;
+			
+			// aapt resource value: 7
+			public const int DrawerArrowToggle_thickness = 7;
+			
+			public static int[] FloatingActionButton = new int[] {
+					2130772030,
+					2130772246,
+					2130772247,
+					2130772284,
+					2130772285,
+					2130772286,
+					2130772287,
+					2130772288};
+			
+			// aapt resource value: 1
+			public const int FloatingActionButton_backgroundTint = 1;
+			
+			// aapt resource value: 2
+			public const int FloatingActionButton_backgroundTintMode = 2;
+			
+			// aapt resource value: 6
+			public const int FloatingActionButton_borderWidth = 6;
+			
+			// aapt resource value: 0
+			public const int FloatingActionButton_elevation = 0;
+			
+			// aapt resource value: 4
+			public const int FloatingActionButton_fabSize = 4;
+			
+			// aapt resource value: 5
+			public const int FloatingActionButton_pressedTranslationZ = 5;
+			
+			// aapt resource value: 3
+			public const int FloatingActionButton_rippleColor = 3;
+			
+			// aapt resource value: 7
+			public const int FloatingActionButton_useCompatPadding = 7;
+			
+			public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+					2130772289};
+			
+			// aapt resource value: 0
+			public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+			
+			public static int[] FontFamily = new int[] {
+					2130772330,
+					2130772331,
+					2130772332,
+					2130772333,
+					2130772334,
+					2130772335};
+			
+			// aapt resource value: 0
+			public const int FontFamily_fontProviderAuthority = 0;
+			
+			// aapt resource value: 3
+			public const int FontFamily_fontProviderCerts = 3;
+			
+			// aapt resource value: 4
+			public const int FontFamily_fontProviderFetchStrategy = 4;
+			
+			// aapt resource value: 5
+			public const int FontFamily_fontProviderFetchTimeout = 5;
+			
+			// aapt resource value: 1
+			public const int FontFamily_fontProviderPackage = 1;
+			
+			// aapt resource value: 2
+			public const int FontFamily_fontProviderQuery = 2;
+			
+			public static int[] FontFamilyFont = new int[] {
+					16844082,
+					16844083,
+					16844095,
+					2130772336,
+					2130772337,
+					2130772338};
+			
+			// aapt resource value: 0
+			public const int FontFamilyFont_android_font = 0;
+			
+			// aapt resource value: 2
+			public const int FontFamilyFont_android_fontStyle = 2;
+			
+			// aapt resource value: 1
+			public const int FontFamilyFont_android_fontWeight = 1;
+			
+			// aapt resource value: 4
+			public const int FontFamilyFont_font = 4;
+			
+			// aapt resource value: 3
+			public const int FontFamilyFont_fontStyle = 3;
+			
+			// aapt resource value: 5
+			public const int FontFamilyFont_fontWeight = 5;
+			
+			public static int[] ForegroundLinearLayout = new int[] {
+					16843017,
+					16843264,
+					2130772290};
+			
+			// aapt resource value: 0
+			public const int ForegroundLinearLayout_android_foreground = 0;
+			
+			// aapt resource value: 1
+			public const int ForegroundLinearLayout_android_foregroundGravity = 1;
+			
+			// aapt resource value: 2
+			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
+			
+			public static int[] LinearLayoutCompat = new int[] {
+					16842927,
+					16842948,
+					16843046,
+					16843047,
+					16843048,
+					2130772013,
+					2130772183,
+					2130772184,
+					2130772185};
+			
+			// aapt resource value: 2
+			public const int LinearLayoutCompat_android_baselineAligned = 2;
+			
+			// aapt resource value: 3
+			public const int LinearLayoutCompat_android_baselineAlignedChildIndex = 3;
+			
+			// aapt resource value: 0
+			public const int LinearLayoutCompat_android_gravity = 0;
+			
+			// aapt resource value: 1
+			public const int LinearLayoutCompat_android_orientation = 1;
+			
+			// aapt resource value: 4
+			public const int LinearLayoutCompat_android_weightSum = 4;
+			
+			// aapt resource value: 5
+			public const int LinearLayoutCompat_divider = 5;
+			
+			// aapt resource value: 8
+			public const int LinearLayoutCompat_dividerPadding = 8;
+			
+			// aapt resource value: 6
+			public const int LinearLayoutCompat_measureWithLargestChild = 6;
+			
+			// aapt resource value: 7
+			public const int LinearLayoutCompat_showDividers = 7;
+			
+			public static int[] LinearLayoutCompat_Layout = new int[] {
+					16842931,
+					16842996,
+					16842997,
+					16843137};
+			
+			// aapt resource value: 0
+			public const int LinearLayoutCompat_Layout_android_layout_gravity = 0;
+			
+			// aapt resource value: 2
+			public const int LinearLayoutCompat_Layout_android_layout_height = 2;
+			
+			// aapt resource value: 3
+			public const int LinearLayoutCompat_Layout_android_layout_weight = 3;
+			
+			// aapt resource value: 1
+			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
+			
+			public static int[] ListPopupWindow = new int[] {
+					16843436,
+					16843437};
+			
+			// aapt resource value: 0
+			public const int ListPopupWindow_android_dropDownHorizontalOffset = 0;
+			
+			// aapt resource value: 1
+			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
+			
+			public static int[] MediaRouteButton = new int[] {
+					16843071,
+					16843072,
+					2130771989,
+					2130771990};
+			
+			// aapt resource value: 1
+			public const int MediaRouteButton_android_minHeight = 1;
+			
+			// aapt resource value: 0
+			public const int MediaRouteButton_android_minWidth = 0;
+			
+			// aapt resource value: 2
+			public const int MediaRouteButton_externalRouteEnabledDrawable = 2;
+			
+			// aapt resource value: 3
+			public const int MediaRouteButton_mediaRouteButtonTint = 3;
+			
+			public static int[] MenuGroup = new int[] {
+					16842766,
+					16842960,
+					16843156,
+					16843230,
+					16843231,
+					16843232};
+			
+			// aapt resource value: 5
+			public const int MenuGroup_android_checkableBehavior = 5;
+			
+			// aapt resource value: 0
+			public const int MenuGroup_android_enabled = 0;
+			
+			// aapt resource value: 1
+			public const int MenuGroup_android_id = 1;
+			
+			// aapt resource value: 3
+			public const int MenuGroup_android_menuCategory = 3;
+			
+			// aapt resource value: 4
+			public const int MenuGroup_android_orderInCategory = 4;
+			
+			// aapt resource value: 2
+			public const int MenuGroup_android_visible = 2;
+			
+			public static int[] MenuItem = new int[] {
+					16842754,
+					16842766,
+					16842960,
+					16843014,
+					16843156,
+					16843230,
+					16843231,
+					16843233,
+					16843234,
+					16843235,
+					16843236,
+					16843237,
+					16843375,
+					2130772186,
+					2130772187,
+					2130772188,
+					2130772189,
+					2130772190,
+					2130772191,
+					2130772192,
+					2130772193,
+					2130772194,
+					2130772195};
+			
+			// aapt resource value: 16
+			public const int MenuItem_actionLayout = 16;
+			
+			// aapt resource value: 18
+			public const int MenuItem_actionProviderClass = 18;
+			
+			// aapt resource value: 17
+			public const int MenuItem_actionViewClass = 17;
+			
+			// aapt resource value: 13
+			public const int MenuItem_alphabeticModifiers = 13;
+			
+			// aapt resource value: 9
+			public const int MenuItem_android_alphabeticShortcut = 9;
+			
+			// aapt resource value: 11
+			public const int MenuItem_android_checkable = 11;
+			
+			// aapt resource value: 3
+			public const int MenuItem_android_checked = 3;
+			
+			// aapt resource value: 1
+			public const int MenuItem_android_enabled = 1;
+			
+			// aapt resource value: 0
+			public const int MenuItem_android_icon = 0;
+			
+			// aapt resource value: 2
+			public const int MenuItem_android_id = 2;
+			
+			// aapt resource value: 5
+			public const int MenuItem_android_menuCategory = 5;
+			
+			// aapt resource value: 10
+			public const int MenuItem_android_numericShortcut = 10;
+			
+			// aapt resource value: 12
+			public const int MenuItem_android_onClick = 12;
+			
+			// aapt resource value: 6
+			public const int MenuItem_android_orderInCategory = 6;
+			
+			// aapt resource value: 7
+			public const int MenuItem_android_title = 7;
+			
+			// aapt resource value: 8
+			public const int MenuItem_android_titleCondensed = 8;
+			
+			// aapt resource value: 4
+			public const int MenuItem_android_visible = 4;
+			
+			// aapt resource value: 19
+			public const int MenuItem_contentDescription = 19;
+			
+			// aapt resource value: 21
+			public const int MenuItem_iconTint = 21;
+			
+			// aapt resource value: 22
+			public const int MenuItem_iconTintMode = 22;
+			
+			// aapt resource value: 14
+			public const int MenuItem_numericModifiers = 14;
+			
+			// aapt resource value: 15
+			public const int MenuItem_showAsAction = 15;
+			
+			// aapt resource value: 20
+			public const int MenuItem_tooltipText = 20;
+			
+			public static int[] MenuView = new int[] {
+					16842926,
+					16843052,
+					16843053,
+					16843054,
+					16843055,
+					16843056,
+					16843057,
+					2130772196,
+					2130772197};
+			
+			// aapt resource value: 4
+			public const int MenuView_android_headerBackground = 4;
+			
+			// aapt resource value: 2
+			public const int MenuView_android_horizontalDivider = 2;
+			
+			// aapt resource value: 5
+			public const int MenuView_android_itemBackground = 5;
+			
+			// aapt resource value: 6
+			public const int MenuView_android_itemIconDisabledAlpha = 6;
+			
+			// aapt resource value: 1
+			public const int MenuView_android_itemTextAppearance = 1;
+			
+			// aapt resource value: 3
+			public const int MenuView_android_verticalDivider = 3;
+			
+			// aapt resource value: 0
+			public const int MenuView_android_windowAnimationStyle = 0;
+			
+			// aapt resource value: 7
+			public const int MenuView_preserveIconSpacing = 7;
+			
+			// aapt resource value: 8
+			public const int MenuView_subMenuArrow = 8;
+			
+			public static int[] NavigationView = new int[] {
+					16842964,
+					16842973,
+					16843039,
+					2130772030,
+					2130772291,
+					2130772292,
+					2130772293,
+					2130772294,
+					2130772295,
+					2130772296};
+			
+			// aapt resource value: 0
+			public const int NavigationView_android_background = 0;
+			
+			// aapt resource value: 1
+			public const int NavigationView_android_fitsSystemWindows = 1;
+			
+			// aapt resource value: 2
+			public const int NavigationView_android_maxWidth = 2;
+			
+			// aapt resource value: 3
+			public const int NavigationView_elevation = 3;
+			
+			// aapt resource value: 9
+			public const int NavigationView_headerLayout = 9;
+			
+			// aapt resource value: 7
+			public const int NavigationView_itemBackground = 7;
+			
+			// aapt resource value: 5
+			public const int NavigationView_itemIconTint = 5;
+			
+			// aapt resource value: 8
+			public const int NavigationView_itemTextAppearance = 8;
+			
+			// aapt resource value: 6
+			public const int NavigationView_itemTextColor = 6;
+			
+			// aapt resource value: 4
+			public const int NavigationView_menu = 4;
+			
+			public static int[] PopupWindow = new int[] {
+					16843126,
+					16843465,
+					2130772198};
+			
+			// aapt resource value: 1
+			public const int PopupWindow_android_popupAnimationStyle = 1;
+			
+			// aapt resource value: 0
+			public const int PopupWindow_android_popupBackground = 0;
+			
+			// aapt resource value: 2
+			public const int PopupWindow_overlapAnchor = 2;
+			
+			public static int[] PopupWindowBackgroundState = new int[] {
+					2130772199};
+			
+			// aapt resource value: 0
+			public const int PopupWindowBackgroundState_state_above_anchor = 0;
+			
+			public static int[] RecycleListView = new int[] {
+					2130772200,
+					2130772201};
+			
+			// aapt resource value: 0
+			public const int RecycleListView_paddingBottomNoButtons = 0;
+			
+			// aapt resource value: 1
+			public const int RecycleListView_paddingTopNoTitle = 1;
+			
+			public static int[] RecyclerView = new int[] {
+					16842948,
+					16842993,
+					2130771968,
+					2130771969,
+					2130771970,
+					2130771971,
+					2130771972,
+					2130771973,
+					2130771974,
+					2130771975,
+					2130771976};
+			
+			// aapt resource value: 1
+			public const int RecyclerView_android_descendantFocusability = 1;
+			
+			// aapt resource value: 0
+			public const int RecyclerView_android_orientation = 0;
+			
+			// aapt resource value: 6
+			public const int RecyclerView_fastScrollEnabled = 6;
+			
+			// aapt resource value: 9
+			public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
+			
+			// aapt resource value: 10
+			public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
+			
+			// aapt resource value: 7
+			public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
+			
+			// aapt resource value: 8
+			public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
+			
+			// aapt resource value: 2
+			public const int RecyclerView_layoutManager = 2;
+			
+			// aapt resource value: 4
+			public const int RecyclerView_reverseLayout = 4;
+			
+			// aapt resource value: 3
+			public const int RecyclerView_spanCount = 3;
+			
+			// aapt resource value: 5
+			public const int RecyclerView_stackFromEnd = 5;
+			
+			public static int[] ScrimInsetsFrameLayout = new int[] {
+					2130772297};
+			
+			// aapt resource value: 0
+			public const int ScrimInsetsFrameLayout_insetForeground = 0;
+			
+			public static int[] ScrollingViewBehavior_Layout = new int[] {
+					2130772298};
+			
+			// aapt resource value: 0
+			public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
+			
+			public static int[] SearchView = new int[] {
+					16842970,
+					16843039,
+					16843296,
+					16843364,
+					2130772202,
+					2130772203,
+					2130772204,
+					2130772205,
+					2130772206,
+					2130772207,
+					2130772208,
+					2130772209,
+					2130772210,
+					2130772211,
+					2130772212,
+					2130772213,
+					2130772214};
+			
+			// aapt resource value: 0
+			public const int SearchView_android_focusable = 0;
+			
+			// aapt resource value: 3
+			public const int SearchView_android_imeOptions = 3;
+			
+			// aapt resource value: 2
+			public const int SearchView_android_inputType = 2;
+			
+			// aapt resource value: 1
+			public const int SearchView_android_maxWidth = 1;
+			
+			// aapt resource value: 8
+			public const int SearchView_closeIcon = 8;
+			
+			// aapt resource value: 13
+			public const int SearchView_commitIcon = 13;
+			
+			// aapt resource value: 7
+			public const int SearchView_defaultQueryHint = 7;
+			
+			// aapt resource value: 9
+			public const int SearchView_goIcon = 9;
+			
+			// aapt resource value: 5
+			public const int SearchView_iconifiedByDefault = 5;
+			
+			// aapt resource value: 4
+			public const int SearchView_layout = 4;
+			
+			// aapt resource value: 15
+			public const int SearchView_queryBackground = 15;
+			
+			// aapt resource value: 6
+			public const int SearchView_queryHint = 6;
+			
+			// aapt resource value: 11
+			public const int SearchView_searchHintIcon = 11;
+			
+			// aapt resource value: 10
+			public const int SearchView_searchIcon = 10;
+			
+			// aapt resource value: 16
+			public const int SearchView_submitBackground = 16;
+			
+			// aapt resource value: 14
+			public const int SearchView_suggestionRowLayout = 14;
+			
+			// aapt resource value: 12
+			public const int SearchView_voiceIcon = 12;
+			
+			public static int[] SnackbarLayout = new int[] {
+					16843039,
+					2130772030,
+					2130772299};
+			
+			// aapt resource value: 0
+			public const int SnackbarLayout_android_maxWidth = 0;
+			
+			// aapt resource value: 1
+			public const int SnackbarLayout_elevation = 1;
+			
+			// aapt resource value: 2
+			public const int SnackbarLayout_maxActionInlineWidth = 2;
+			
+			public static int[] Spinner = new int[] {
+					16842930,
+					16843126,
+					16843131,
+					16843362,
+					2130772031};
+			
+			// aapt resource value: 3
+			public const int Spinner_android_dropDownWidth = 3;
+			
+			// aapt resource value: 0
+			public const int Spinner_android_entries = 0;
+			
+			// aapt resource value: 1
+			public const int Spinner_android_popupBackground = 1;
+			
+			// aapt resource value: 2
+			public const int Spinner_android_prompt = 2;
+			
+			// aapt resource value: 4
+			public const int Spinner_popupTheme = 4;
+			
+			public static int[] SwitchCompat = new int[] {
+					16843044,
+					16843045,
+					16843074,
+					2130772215,
+					2130772216,
+					2130772217,
+					2130772218,
+					2130772219,
+					2130772220,
+					2130772221,
+					2130772222,
+					2130772223,
+					2130772224,
+					2130772225};
+			
+			// aapt resource value: 1
+			public const int SwitchCompat_android_textOff = 1;
+			
+			// aapt resource value: 0
+			public const int SwitchCompat_android_textOn = 0;
+			
+			// aapt resource value: 2
+			public const int SwitchCompat_android_thumb = 2;
+			
+			// aapt resource value: 13
+			public const int SwitchCompat_showText = 13;
+			
+			// aapt resource value: 12
+			public const int SwitchCompat_splitTrack = 12;
+			
+			// aapt resource value: 10
+			public const int SwitchCompat_switchMinWidth = 10;
+			
+			// aapt resource value: 11
+			public const int SwitchCompat_switchPadding = 11;
+			
+			// aapt resource value: 9
+			public const int SwitchCompat_switchTextAppearance = 9;
+			
+			// aapt resource value: 8
+			public const int SwitchCompat_thumbTextPadding = 8;
+			
+			// aapt resource value: 3
+			public const int SwitchCompat_thumbTint = 3;
+			
+			// aapt resource value: 4
+			public const int SwitchCompat_thumbTintMode = 4;
+			
+			// aapt resource value: 5
+			public const int SwitchCompat_track = 5;
+			
+			// aapt resource value: 6
+			public const int SwitchCompat_trackTint = 6;
+			
+			// aapt resource value: 7
+			public const int SwitchCompat_trackTintMode = 7;
+			
+			public static int[] TabItem = new int[] {
+					16842754,
+					16842994,
+					16843087};
+			
+			// aapt resource value: 0
+			public const int TabItem_android_icon = 0;
+			
+			// aapt resource value: 1
+			public const int TabItem_android_layout = 1;
+			
+			// aapt resource value: 2
+			public const int TabItem_android_text = 2;
+			
+			public static int[] TabLayout = new int[] {
+					2130772300,
+					2130772301,
+					2130772302,
+					2130772303,
+					2130772304,
+					2130772305,
+					2130772306,
+					2130772307,
+					2130772308,
+					2130772309,
+					2130772310,
+					2130772311,
+					2130772312,
+					2130772313,
+					2130772314,
+					2130772315};
+			
+			// aapt resource value: 3
+			public const int TabLayout_tabBackground = 3;
+			
+			// aapt resource value: 2
+			public const int TabLayout_tabContentStart = 2;
+			
+			// aapt resource value: 5
+			public const int TabLayout_tabGravity = 5;
+			
+			// aapt resource value: 0
+			public const int TabLayout_tabIndicatorColor = 0;
+			
+			// aapt resource value: 1
+			public const int TabLayout_tabIndicatorHeight = 1;
+			
+			// aapt resource value: 7
+			public const int TabLayout_tabMaxWidth = 7;
+			
+			// aapt resource value: 6
+			public const int TabLayout_tabMinWidth = 6;
+			
+			// aapt resource value: 4
+			public const int TabLayout_tabMode = 4;
+			
+			// aapt resource value: 15
+			public const int TabLayout_tabPadding = 15;
+			
+			// aapt resource value: 14
+			public const int TabLayout_tabPaddingBottom = 14;
+			
+			// aapt resource value: 13
+			public const int TabLayout_tabPaddingEnd = 13;
+			
+			// aapt resource value: 11
+			public const int TabLayout_tabPaddingStart = 11;
+			
+			// aapt resource value: 12
+			public const int TabLayout_tabPaddingTop = 12;
+			
+			// aapt resource value: 10
+			public const int TabLayout_tabSelectedTextColor = 10;
+			
+			// aapt resource value: 8
+			public const int TabLayout_tabTextAppearance = 8;
+			
+			// aapt resource value: 9
+			public const int TabLayout_tabTextColor = 9;
+			
+			public static int[] TextAppearance = new int[] {
+					16842901,
+					16842902,
+					16842903,
+					16842904,
+					16842906,
+					16842907,
+					16843105,
+					16843106,
+					16843107,
+					16843108,
+					16843692,
+					2130772047,
+					2130772053};
+			
+			// aapt resource value: 10
+			public const int TextAppearance_android_fontFamily = 10;
+			
+			// aapt resource value: 6
+			public const int TextAppearance_android_shadowColor = 6;
+			
+			// aapt resource value: 7
+			public const int TextAppearance_android_shadowDx = 7;
+			
+			// aapt resource value: 8
+			public const int TextAppearance_android_shadowDy = 8;
+			
+			// aapt resource value: 9
+			public const int TextAppearance_android_shadowRadius = 9;
+			
+			// aapt resource value: 3
+			public const int TextAppearance_android_textColor = 3;
+			
+			// aapt resource value: 4
+			public const int TextAppearance_android_textColorHint = 4;
+			
+			// aapt resource value: 5
+			public const int TextAppearance_android_textColorLink = 5;
+			
+			// aapt resource value: 0
+			public const int TextAppearance_android_textSize = 0;
+			
+			// aapt resource value: 2
+			public const int TextAppearance_android_textStyle = 2;
+			
+			// aapt resource value: 1
+			public const int TextAppearance_android_typeface = 1;
+			
+			// aapt resource value: 12
+			public const int TextAppearance_fontFamily = 12;
+			
+			// aapt resource value: 11
+			public const int TextAppearance_textAllCaps = 11;
+			
+			public static int[] TextInputLayout = new int[] {
+					16842906,
+					16843088,
+					2130772316,
+					2130772317,
+					2130772318,
+					2130772319,
+					2130772320,
+					2130772321,
+					2130772322,
+					2130772323,
+					2130772324,
+					2130772325,
+					2130772326,
+					2130772327,
+					2130772328,
+					2130772329};
+			
+			// aapt resource value: 1
+			public const int TextInputLayout_android_hint = 1;
+			
+			// aapt resource value: 0
+			public const int TextInputLayout_android_textColorHint = 0;
+			
+			// aapt resource value: 6
+			public const int TextInputLayout_counterEnabled = 6;
+			
+			// aapt resource value: 7
+			public const int TextInputLayout_counterMaxLength = 7;
+			
+			// aapt resource value: 9
+			public const int TextInputLayout_counterOverflowTextAppearance = 9;
+			
+			// aapt resource value: 8
+			public const int TextInputLayout_counterTextAppearance = 8;
+			
+			// aapt resource value: 4
+			public const int TextInputLayout_errorEnabled = 4;
+			
+			// aapt resource value: 5
+			public const int TextInputLayout_errorTextAppearance = 5;
+			
+			// aapt resource value: 10
+			public const int TextInputLayout_hintAnimationEnabled = 10;
+			
+			// aapt resource value: 3
+			public const int TextInputLayout_hintEnabled = 3;
+			
+			// aapt resource value: 2
+			public const int TextInputLayout_hintTextAppearance = 2;
+			
+			// aapt resource value: 13
+			public const int TextInputLayout_passwordToggleContentDescription = 13;
+			
+			// aapt resource value: 12
+			public const int TextInputLayout_passwordToggleDrawable = 12;
+			
+			// aapt resource value: 11
+			public const int TextInputLayout_passwordToggleEnabled = 11;
+			
+			// aapt resource value: 14
+			public const int TextInputLayout_passwordToggleTint = 14;
+			
+			// aapt resource value: 15
+			public const int TextInputLayout_passwordToggleTintMode = 15;
+			
+			public static int[] Toolbar = new int[] {
+					16842927,
+					16843072,
+					2130772005,
+					2130772008,
+					2130772012,
+					2130772024,
+					2130772025,
+					2130772026,
+					2130772027,
+					2130772028,
+					2130772029,
+					2130772031,
+					2130772226,
+					2130772227,
+					2130772228,
+					2130772229,
+					2130772230,
+					2130772231,
+					2130772232,
+					2130772233,
+					2130772234,
+					2130772235,
+					2130772236,
+					2130772237,
+					2130772238,
+					2130772239,
+					2130772240,
+					2130772241,
+					2130772242};
+			
+			// aapt resource value: 0
+			public const int Toolbar_android_gravity = 0;
+			
+			// aapt resource value: 1
+			public const int Toolbar_android_minHeight = 1;
+			
+			// aapt resource value: 21
+			public const int Toolbar_buttonGravity = 21;
+			
+			// aapt resource value: 23
+			public const int Toolbar_collapseContentDescription = 23;
+			
+			// aapt resource value: 22
+			public const int Toolbar_collapseIcon = 22;
+			
+			// aapt resource value: 6
+			public const int Toolbar_contentInsetEnd = 6;
+			
+			// aapt resource value: 10
+			public const int Toolbar_contentInsetEndWithActions = 10;
+			
+			// aapt resource value: 7
+			public const int Toolbar_contentInsetLeft = 7;
+			
+			// aapt resource value: 8
+			public const int Toolbar_contentInsetRight = 8;
+			
+			// aapt resource value: 5
+			public const int Toolbar_contentInsetStart = 5;
+			
+			// aapt resource value: 9
+			public const int Toolbar_contentInsetStartWithNavigation = 9;
+			
+			// aapt resource value: 4
+			public const int Toolbar_logo = 4;
+			
+			// aapt resource value: 26
+			public const int Toolbar_logoDescription = 26;
+			
+			// aapt resource value: 20
+			public const int Toolbar_maxButtonHeight = 20;
+			
+			// aapt resource value: 25
+			public const int Toolbar_navigationContentDescription = 25;
+			
+			// aapt resource value: 24
+			public const int Toolbar_navigationIcon = 24;
+			
+			// aapt resource value: 11
+			public const int Toolbar_popupTheme = 11;
+			
+			// aapt resource value: 3
+			public const int Toolbar_subtitle = 3;
+			
+			// aapt resource value: 13
+			public const int Toolbar_subtitleTextAppearance = 13;
+			
+			// aapt resource value: 28
+			public const int Toolbar_subtitleTextColor = 28;
+			
+			// aapt resource value: 2
+			public const int Toolbar_title = 2;
+			
+			// aapt resource value: 14
+			public const int Toolbar_titleMargin = 14;
+			
+			// aapt resource value: 18
+			public const int Toolbar_titleMarginBottom = 18;
+			
+			// aapt resource value: 16
+			public const int Toolbar_titleMarginEnd = 16;
+			
+			// aapt resource value: 15
+			public const int Toolbar_titleMarginStart = 15;
+			
+			// aapt resource value: 17
+			public const int Toolbar_titleMarginTop = 17;
+			
+			// aapt resource value: 19
+			public const int Toolbar_titleMargins = 19;
+			
+			// aapt resource value: 12
+			public const int Toolbar_titleTextAppearance = 12;
+			
+			// aapt resource value: 27
+			public const int Toolbar_titleTextColor = 27;
+			
+			public static int[] View = new int[] {
+					16842752,
+					16842970,
+					2130772243,
+					2130772244,
+					2130772245};
+			
+			// aapt resource value: 1
+			public const int View_android_focusable = 1;
+			
+			// aapt resource value: 0
+			public const int View_android_theme = 0;
+			
+			// aapt resource value: 3
+			public const int View_paddingEnd = 3;
+			
+			// aapt resource value: 2
+			public const int View_paddingStart = 2;
+			
+			// aapt resource value: 4
+			public const int View_theme = 4;
+			
+			public static int[] ViewBackgroundHelper = new int[] {
+					16842964,
+					2130772246,
+					2130772247};
+			
+			// aapt resource value: 0
+			public const int ViewBackgroundHelper_android_background = 0;
+			
+			// aapt resource value: 1
+			public const int ViewBackgroundHelper_backgroundTint = 1;
+			
+			// aapt resource value: 2
+			public const int ViewBackgroundHelper_backgroundTintMode = 2;
+			
+			public static int[] ViewStubCompat = new int[] {
+					16842960,
+					16842994,
+					16842995};
+			
+			// aapt resource value: 0
+			public const int ViewStubCompat_android_id = 0;
+			
+			// aapt resource value: 2
+			public const int ViewStubCompat_android_inflatedId = 2;
+			
+			// aapt resource value: 1
+			public const int ViewStubCompat_android_layout = 1;
+			
+			static Styleable()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Styleable()
+			{
+			}
+		}
+	}
+}
+#pragma warning restore 1591
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/values/colors.xml zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/values/colors.xml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/values/colors.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/values/colors.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="launcher_background">#FFFFFF</color>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/values/styles.xml zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/values/styles.xml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.Android/Resources/values/styles.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.Android/Resources/values/styles.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+
+  <style name="MainTheme" parent="MainTheme.Base">
+  </style>
+  <!-- Base theme applied no matter what API -->
+  <style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+    <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
+    <item name="windowNoTitle">true</item>
+    <!--We will be using the toolbar so no need to show ActionBar-->
+    <item name="windowActionBar">false</item>
+    <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette -->
+    <!-- colorPrimary is used for the default action bar background -->
+    <item name="colorPrimary">#2196F3</item>
+    <!-- colorPrimaryDark is used for the status bar -->
+    <item name="colorPrimaryDark">#1976D2</item>
+    <!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+    <item name="colorAccent">#FF4081</item>
+    <!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+    <item name="windowActionModeOverlay">true</item>
+
+    <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
+  </style>
+
+  <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+    <item name="colorAccent">#FF4081</item>
+  </style>
+</resources>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/AppDelegate.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/AppDelegate.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/AppDelegate.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/AppDelegate.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,54 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using Foundation;
+using UIKit;
+
+namespace controller.iOS
+{
+    // The UIApplicationDelegate for the application. This class is responsible for launching the
+    // User Interface of the application, as well as listening (and optionally responding) to
+    // application events from iOS.
+    [Register("AppDelegate")]
+    public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate,
+                                       Test.PlatformAdapter
+    {
+        public string processControllerIdentity()
+        {
+            if(isEmulator())
+            {
+                return "iPhoneSimulator/com.zeroc.Xamarin-Test-Controller";
+            }
+            else
+            {
+                return "iPhoneOS/com.zeroc.Xamarin-Test-Controller";
+            }
+        }
+
+        //
+        // This method is invoked when the application has loaded and is ready to run. In this
+        // method you should instantiate the window, load the UI into it and then make the window
+        // visible.
+        //
+        // You have 17 seconds to return from this method, or iOS will terminate your application.
+        //
+        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
+        {
+            global::Xamarin.Forms.Forms.Init();
+            LoadApplication(new App(this));
+
+            return base.FinishedLaunching(app, options);
+        }
+
+        public bool isEmulator()
+        {
+            return ObjCRuntime.Runtime.Arch == ObjCRuntime.Arch.SIMULATOR;
+        }
+
+        public string processControllerRegistryHost()
+        {
+            return isEmulator() ? "127.0.0.1" : ""; // With an empty host, the controller will use IceDiscovery.
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,117 @@
+{
+  "images": [
+    {
+      "scale": "2x",
+      "size": "20x20",
+      "idiom": "iphone",
+      "filename": "Icon40.png"
+    },
+    {
+      "scale": "3x",
+      "size": "20x20",
+      "idiom": "iphone",
+      "filename": "Icon60.png"
+    },
+    {
+      "scale": "2x",
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "Icon58.png"
+    },
+    {
+      "scale": "3x",
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "Icon87.png"
+    },
+    {
+      "scale": "2x",
+      "size": "40x40",
+      "idiom": "iphone",
+      "filename": "Icon80.png"
+    },
+    {
+      "scale": "3x",
+      "size": "40x40",
+      "idiom": "iphone",
+      "filename": "Icon120.png"
+    },
+    {
+      "scale": "2x",
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "Icon120.png"
+    },
+    {
+      "scale": "3x",
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "Icon180.png"
+    },
+    {
+      "scale": "1x",
+      "size": "20x20",
+      "idiom": "ipad",
+      "filename": "Icon20.png"
+    },
+    {
+      "scale": "2x",
+      "size": "20x20",
+      "idiom": "ipad",
+      "filename": "Icon40.png"
+    },
+    {
+      "scale": "1x",
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "Icon29.png"
+    },
+    {
+      "scale": "2x",
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "Icon58.png"
+    },
+    {
+      "scale": "1x",
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "Icon40.png"
+    },
+    {
+      "scale": "2x",
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "Icon80.png"
+    },
+    {
+      "scale": "1x",
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "Icon76.png"
+    },
+    {
+      "scale": "2x",
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "Icon152.png"
+    },
+    {
+      "scale": "2x",
+      "size": "83.5x83.5",
+      "idiom": "ipad",
+      "filename": "Icon167.png"
+    },
+    {
+      "scale": "1x",
+      "size": "1024x1024",
+      "idiom": "ios-marketing",
+      "filename": "Icon1024.png"
+    }
+  ],
+  "properties": {},
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png differ
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/controller.iOS.csproj zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/controller.iOS.csproj
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/controller.iOS.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/controller.iOS.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FD70EC29-8D51-4F4F-8AD7-64170F22575D}</ProjectGuid>
+    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TemplateGuid>{6143fdea-f3c2-4a09-aafa-6e230626515e}</TemplateGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>controller.iOS</RootNamespace>
+    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
+    <AssemblyName>controller.iOS</AssemblyName>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <MtouchArch>x86_64</MtouchArch>
+    <MtouchLink>None</MtouchLink>
+    <MtouchDebug>true</MtouchDebug>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignProvision>
+    </CodesignProvision>
+    <CodesignExtraArgs />
+    <CodesignResourceRules />
+    <CodesignEntitlements />
+    <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <MtouchLink>None</MtouchLink>
+    <MtouchArch>x86_64</MtouchArch>
+    <ConsolePause>false</ConsolePause>
+    <MtouchDebug>true</MtouchDebug>
+    <IOSDebugOverWiFi>true</IOSDebugOverWiFi>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignProvision>
+    </CodesignProvision>
+    <CodesignExtraArgs />
+    <CodesignResourceRules />
+    <CodesignEntitlements />
+    <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhone\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <MtouchArch>ARMv7s, ARM64</MtouchArch>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <MtouchDebug>true</MtouchDebug>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodesignProvision />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\iPhone\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <MtouchArch>ARMv7s, ARM64</MtouchArch>
+    <ConsolePause>false</ConsolePause>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <MtouchDebug>true</MtouchDebug>
+    <CodesignExtraArgs />
+    <CodesignResourceRules />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
+    <DebugType>none</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <MtouchArch>ARM64</MtouchArch>
+    <BuildIpa>True</BuildIpa>
+    <CodesignProvision>Automatic:AdHoc</CodesignProvision>
+    <CodesignKey>iPhone Distribution</CodesignKey>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
+    <DebugType>none</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>bin\iPhone\AppStore</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <MtouchArch>ARM64</MtouchArch>
+    <CodesignProvision>Automatic:AppStore</CodesignProvision>
+    <CodesignKey>iPhone Distribution</CodesignKey>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
+    <AppExtensionDebugBundleId />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <None Include="Entitlements.plist" />
+    <None Include="Info.plist" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="..\..\..\lib\netstandard2.0\Ice.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceSSL.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceDiscovery.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon1024.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon180.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon167.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon152.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon120.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon87.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon80.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon76.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon60.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon58.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon40.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon29.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon20.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.iOS" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj">
+      <Project>{a62bf5e3-ad66-4edb-9bba-3e9bd6148425}</Project>
+      <Name>testcommon</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\controller\controller.csproj">
+      <Project>{0578CEE2-EF1E-496E-ABF4-5F9A70E888D4}</Project>
+      <Name>controller</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Entitlements.plist zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Entitlements.plist
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Entitlements.plist	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Entitlements.plist	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Info.plist zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Info.plist
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Info.plist	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Info.plist	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>MinimumOSVersion</key>
+	<string>8.0</string>
+	<key>CFBundleDisplayName</key>
+	<string>TestController</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zeroc.Xamarin-Test-Controller</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>CFBundleName</key>
+	<string>controller</string>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
+</dict>
+</plist>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Main.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Main.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Main.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Main.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,19 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using UIKit;
+
+namespace controller.iOS
+{
+    public class Application
+    {
+        // This is the main entry point of the application.
+        static void Main(string[] args)
+        {
+            // if you want to use a different Application Delegate class from "AppDelegate"
+            // you can specify it here.
+            UIApplication.Main(args, null, "AppDelegate");
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Properties/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Properties/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Properties/AssemblyInfo.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Properties/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("controller.iOS")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("controller.iOS")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Resources/Default@2x.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Resources/Default@2x.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Resources/Default-568h@2x.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Resources/Default-568h@2x.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Resources/Default.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Resources/Default.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Resources/Default-Portrait@2x.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Resources/Default-Portrait@2x.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Resources/Default-Portrait.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Resources/Default-Portrait.png differ
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Resources/LaunchScreen.storyboard zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Resources/LaunchScreen.storyboard
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.iOS/Resources/LaunchScreen.storyboard	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.iOS/Resources/LaunchScreen.storyboard	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="gAE-YM-kbH">
+            <objects>
+                <viewController id="X5k-f2-b5h" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Y8P-hJ-Z43"/>
+                        <viewControllerLayoutGuide type="bottom" id="9ZL-r4-8FZ"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="yd7-JS-zBw">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="Icon-60.png" translatesAutoresizingMaskIntoConstraints="NO" id="23">
+                                <rect key="frame" x="270" y="270" width="60" height="60"/>
+                                <rect key="contentStretch" x="0.0" y="0.0" width="0.0" height="0.0"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.20392156862745098" green="0.59607843137254901" blue="0.85882352941176465" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstItem="23" firstAttribute="centerY" secondItem="yd7-JS-zBw" secondAttribute="centerY" priority="1" id="39"/>
+                            <constraint firstItem="23" firstAttribute="centerX" secondItem="yd7-JS-zBw" secondAttribute="centerX" priority="1" id="41"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="XAI-xm-WK6" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="349" y="339"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="Icon-60.png" width="180" height="180"/>
+    </resources>
+</document>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/App.xaml zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/App.xaml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/App.xaml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/App.xaml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+<Application
+    x:Class="controller.UWP.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:controller.UWP"
+    RequestedTheme="Light">
+
+</Application>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/App.xaml.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/App.xaml.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/App.xaml.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/App.xaml.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,94 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+using System;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace controller.UWP
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    sealed partial class App : Application
+    {
+        /// <summary>
+        /// Initializes the singleton application object.  This is the first line of authored code
+        /// executed, and as such is the logical equivalent of main() or WinMain().
+        /// </summary>
+        public App()
+        {
+            this.InitializeComponent();
+            this.Suspending += OnSuspending;
+        }
+
+        /// <summary>
+        /// Invoked when the application is launched normally by the end user.  Other entry points
+        /// will be used such as when the application is launched to open a specific file.
+        /// </summary>
+        /// <param name="e">Details about the launch request and process.</param>
+        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        {
+
+            Frame rootFrame = Window.Current.Content as Frame;
+
+            // Do not repeat app initialization when the Window already has content,
+            // just ensure that the window is active
+            if (rootFrame == null)
+            {
+                // Create a Frame to act as the navigation context and navigate to the first page
+                rootFrame = new Frame();
+
+                rootFrame.NavigationFailed += OnNavigationFailed;
+
+                Xamarin.Forms.Forms.Init(e);
+
+                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
+                {
+                    //TODO: Load state from previously suspended application
+                }
+
+                // Place the frame in the current Window
+                Window.Current.Content = rootFrame;
+            }
+
+            if (rootFrame.Content == null)
+            {
+                // When the navigation stack isn't restored navigate to the first page,
+                // configuring the new page by passing required information as a navigation
+                // parameter
+                rootFrame.Navigate(typeof(MainPage), e.Arguments);
+            }
+            // Ensure the current window is active
+            Window.Current.Activate();
+        }
+
+        /// <summary>
+        /// Invoked when Navigation to a certain page fails
+        /// </summary>
+        /// <param name="sender">The Frame which failed navigation</param>
+        /// <param name="e">Details about the navigation failure</param>
+        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        }
+
+        /// <summary>
+        /// Invoked when application execution is being suspended.  Application state is saved
+        /// without knowing whether the application will be terminated or resumed with the contents
+        /// of memory still intact.
+        /// </summary>
+        /// <param name="sender">The source of the suspend request.</param>
+        /// <param name="e">Details about the suspend request.</param>
+        private void OnSuspending(object sender, SuspendingEventArgs e)
+        {
+            var deferral = e.SuspendingOperation.GetDeferral();
+            //TODO: Save application state and stop any background activity
+            deferral.Complete();
+        }
+    }
+}
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/LargeTile.scale-100.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/LargeTile.scale-100.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/LargeTile.scale-200.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/LargeTile.scale-200.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/LargeTile.scale-400.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/LargeTile.scale-400.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/SmallTile.scale-100.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/SmallTile.scale-100.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/SmallTile.scale-200.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/SmallTile.scale-200.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/SmallTile.scale-400.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/SmallTile.scale-400.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/SplashScreen.scale-100.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/SplashScreen.scale-100.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/SplashScreen.scale-200.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/SplashScreen.scale-200.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/SplashScreen.scale-400.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/SplashScreen.scale-400.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square150x150Logo.scale-100.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square150x150Logo.scale-100.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square150x150Logo.scale-200.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square150x150Logo.scale-200.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square150x150Logo.scale-400.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square150x150Logo.scale-400.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.scale-100.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.scale-100.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.scale-200.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.scale-200.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.scale-400.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.scale-400.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.targetsize-16.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.targetsize-16.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.targetsize-256.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.targetsize-256.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.targetsize-48.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Square44x44Logo.targetsize-48.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.backup.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.backup.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.scale-100.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.scale-100.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.scale-200.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.scale-200.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.scale-400.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/StoreLogo.scale-400.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Wide310x150Logo.scale-100.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Wide310x150Logo.scale-100.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Wide310x150Logo.scale-200.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Wide310x150Logo.scale-200.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Assets/Wide310x150Logo.scale-400.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Assets/Wide310x150Logo.scale-400.png differ
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/controller.UWP.csproj zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/controller.UWP.csproj
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/controller.UWP.csproj	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/controller.UWP.csproj	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{00218ACB-5695-4935-BAE1-F47B13989E9B}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>controller.UWP</RootNamespace>
+    <AssemblyName>controller.UWP</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PackageCertificateKeyFile>controller.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>28A113377FFC465A2670468B58F20BEBACAF4D9D</PackageCertificateThumbprint>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Never</AppxBundle>
+    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
+    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\LargeTile.scale-100.png" />
+    <Content Include="Assets\LargeTile.scale-200.png" />
+    <Content Include="Assets\LargeTile.scale-400.png" />
+    <Content Include="Assets\SmallTile.scale-100.png" />
+    <Content Include="Assets\SmallTile.scale-200.png" />
+    <Content Include="Assets\SmallTile.scale-400.png" />
+    <Content Include="Assets\SplashScreen.scale-100.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-400.png" />
+    <Content Include="Assets\Square150x150Logo.scale-100.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-400.png" />
+    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="Assets\Square44x44Logo.scale-100.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-400.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-16.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-256.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-48.png" />
+    <Content Include="Assets\StoreLogo.scale-100.png" />
+    <Content Include="Assets\StoreLogo.scale-200.png" />
+    <Content Include="Assets\StoreLogo.scale-400.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-100.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-400.png" />
+    <Content Include="Properties\Default.rd.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.7" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(ICE_BIN_DIST)' == 'all'">
+      <ItemGroup>
+        <PackageReference Include="zeroc.ice.net" Version="3.7.2" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="..\..\..\lib\netstandard2.0\Ice.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceSSL.dll" />
+        <Reference Include="..\..\..\lib\netstandard2.0\IceDiscovery.dll" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj">
+      <Project>{a62bf5e3-ad66-4edb-9bba-3e9bd6148425}</Project>
+      <Name>testcommon</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\controller\controller.csproj">
+      <Project>{D86C4CA0-7EF8-4A9B-B42F-CB2FBBC7B68F}</Project>
+      <Name>controller</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="controller.UWP_TemporaryKey.pfx" />
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+</Project>
\ No newline at end of file
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/controller.UWP_TemporaryKey.pfx and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/controller.UWP_TemporaryKey.pfx differ
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/MainPage.xaml zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/MainPage.xaml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/MainPage.xaml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/MainPage.xaml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,15 @@
+<forms:WindowsPage
+    x:Class="controller.UWP.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:forms="using:Xamarin.Forms.Platform.UWP"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:controller.UWP"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    </Grid>
+</forms:WindowsPage>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/MainPage.xaml.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/MainPage.xaml.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/MainPage.xaml.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/MainPage.xaml.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,30 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+namespace controller.UWP
+{
+    public sealed partial class MainPage : Test.PlatformAdapter
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+            LoadApplication(new controller.App(this));
+        }
+
+        public bool isEmulator()
+        {
+            return false;
+        }
+
+        public string processControllerIdentity()
+        {
+            return "UWPXamarin/ProcessController";
+        }
+
+        public string processControllerRegistryHost()
+        {
+            return "127.0.0.1";
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Package.appxmanifest zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Package.appxmanifest
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Package.appxmanifest	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Package.appxmanifest	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity Name="ice-uwp-controller.xamarin" Publisher="CN=ZeroC" Version="1.0.0.0" />
+  <mp:PhoneIdentity PhoneProductId="ec0cc741-fd3e-485c-81be-68815c480690" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Properties>
+    <DisplayName>controller.UWP</DisplayName>
+    <PublisherDisplayName>1c2277d8-e020-4faa-a81f-a56e57227351</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="controller.UWP.App">
+      <uap:VisualElements DisplayName="controller.UWP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="controller.UWP" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
+          <uap:ShowNameOnTiles>
+            <uap:ShowOn Tile="square150x150Logo" />
+            <uap:ShowOn Tile="wide310x150Logo" />
+            <uap:ShowOn Tile="square310x310Logo" />
+          </uap:ShowNameOnTiles>
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <Capability Name="internetClientServer" />
+  </Capabilities>
+</Package>
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Properties/AssemblyInfo.cs zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Properties/AssemblyInfo.cs
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Properties/AssemblyInfo.cs	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Properties/AssemblyInfo.cs	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("controller.UWP")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("controller.UWP")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
diff -Nru zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Properties/Default.rd.xml zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Properties/Default.rd.xml
--- zeroc-ice-3.7.1/csharp/test/xamarin/controller.UWP/Properties/Default.rd.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/csharp/test/xamarin/controller.UWP/Properties/Default.rd.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,29 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+
+    <!-- Add your application specific runtime directives here. -->
+
+  </Application>
+</Directives>
diff -Nru zeroc-ice-3.7.1/debian/changelog zeroc-ice-3.7.2/debian/changelog
--- zeroc-ice-3.7.1/debian/changelog	2018-06-06 21:28:50.000000000 +0000
+++ zeroc-ice-3.7.2/debian/changelog	2019-02-12 21:24:42.000000000 +0000
@@ -1,3 +1,59 @@
+zeroc-ice (3.7.2-4~ubuntu18.10.1) cosmic; urgency=medium
+
+  * No-change backport to cosmic
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Tue, 12 Feb 2019 21:24:42 +0000
+
+zeroc-ice (3.7.2-4) unstable; urgency=medium
+
+  * Update Linux OS detection patch
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Fri, 08 Feb 2019 08:24:27 +0000
+
+zeroc-ice (3.7.2-3) unstable; urgency=medium
+
+  * Close #921629, better Linux OS detection
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Thu, 07 Feb 2019 19:37:12 +0000
+
+zeroc-ice (3.7.2-2) unstable; urgency=medium
+
+  * Missing openjfx dependency
+  * Fix  version in libzeroc-ice3.7-java.poms
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Wed, 06 Feb 2019 18:20:18 +0000
+
+zeroc-ice (3.7.2-1) unstable; urgency=medium
+
+  * New upstream version 3.7.2
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Wed, 06 Feb 2019 11:27:15 +0000
+
+zeroc-ice (3.7.1-6) unstable; urgency=medium
+
+  * Fix Python 3.7 build failure
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Sat, 01 Dec 2018 11:17:16 +0000
+
+zeroc-ice (3.7.1-5) unstable; urgency=medium
+
+  * Fix JDK 11 build failure
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Mon, 05 Nov 2018 20:39:40 +0000
+
+zeroc-ice (3.7.1-4) unstable; urgency=medium
+
+  * Better detect debian derivatives Close #901899
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Fri, 26 Oct 2018 16:00:11 +0000
+
+zeroc-ice (3.7.1-3) unstable; urgency=medium
+
+  * Add patch for Bug#910665
+  * Use secure copyright file specification URI.
+
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Wed, 17 Oct 2018 20:48:29 +0000
+
 zeroc-ice (3.7.1-2) unstable; urgency=medium
 
   * Do not set DH_BUILD_DDEBS in debian/rules
diff -Nru zeroc-ice-3.7.1/debian/control zeroc-ice-3.7.2/debian/control
--- zeroc-ice-3.7.1/debian/control	2018-04-24 12:12:53.000000000 +0000
+++ zeroc-ice-3.7.2/debian/control	2019-02-06 17:24:35.000000000 +0000
@@ -7,7 +7,8 @@
                      gradle (>= 2),
                      gradle-ice-builder-plugin (>= 1.3.13),
                      libjgoodies-forms-java (>= 1.6.0),
-                     libjgoodies-looks-java (>= 2.5.2)
+                     libjgoodies-looks-java (>= 2.5.2),
+                     openjfx
 Build-Depends: debhelper (>= 9.20160709),
                dh-exec,
                dh-php (>= 0.20),
diff -Nru zeroc-ice-3.7.1/debian/copyright zeroc-ice-3.7.2/debian/copyright
--- zeroc-ice-3.7.1/debian/copyright	2018-04-24 11:29:38.000000000 +0000
+++ zeroc-ice-3.7.2/debian/copyright	2019-02-06 17:23:04.000000000 +0000
@@ -1,15 +1,15 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ZeroC Ice
 Upstream-Contact: ZeroC Info <info@zeroc.com>
 Source: https://github.com/zeroc-ice/
 Files-Excluded: */gradle/GRADLE_LICENSE */gradle/wrapper */gradlew* cpp/src/IceUtil/ConvertUTF.*
 
 Files: *
-Copyright: 2003-2018 ZeroC, Inc.
+Copyright: 2003-2019 ZeroC, Inc.
 License: GPL-2.0+exceptions
 
 Files: debian/*
-Copyright: 2003-2018 ZeroC, Inc.
+Copyright: 2003-2019 ZeroC, Inc.
            2016 Ondřej Surý
 License: GPL-2.0+exceptions
 
diff -Nru zeroc-ice-3.7.1/debian/libzeroc-ice3.7-java.poms zeroc-ice-3.7.2/debian/libzeroc-ice3.7-java.poms
--- zeroc-ice-3.7.1/debian/libzeroc-ice3.7-java.poms	2018-04-24 11:29:50.000000000 +0000
+++ zeroc-ice-3.7.2/debian/libzeroc-ice3.7-java.poms	2019-02-06 18:09:34.000000000 +0000
@@ -1,19 +1,19 @@
-java/lib/glacier2-3.7.1.pom --artifact=java/lib/glacier2-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icebt-3.7.1.pom --artifact=java/lib/icebt-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icebox-3.7.1.pom --artifact=java/lib/icebox-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/ice-3.7.1.pom --artifact=java/lib/ice-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icediscovery-3.7.1.pom --artifact=java/lib/icediscovery-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icegrid-3.7.1.pom --artifact=java/lib/icegrid-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icelocatordiscovery-3.7.1.pom --artifact=java/lib/icelocatordiscovery-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icepatch2-3.7.1.pom --artifact=java/lib/icepatch2-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icestorm-3.7.1.pom --artifact=java/lib/icestorm-3.7.1.jar --java-lib --no-usj-versionless
-java/lib/icessl-3.7.1.pom --artifact=java/lib/icessl-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/glacier2-compat-3.7.1.pom --artifact=java-compat/lib/glacier2-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/icebt-compat-3.7.1.pom --artifact=java-compat/lib/icebt-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/icebox-compat-3.7.1.pom --artifact=java-compat/lib/icebox-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/ice-compat-3.7.1.pom --artifact=java-compat/lib/ice-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/icediscovery-compat-3.7.1.pom --artifact=java-compat/lib/icediscovery-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/icegrid-compat-3.7.1.pom --artifact=java-compat/lib/icegrid-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/icelocatordiscovery-compat-3.7.1.pom --artifact=java-compat/lib/icelocatordiscovery-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/icepatch2-compat-3.7.1.pom --artifact=java-compat/lib/icepatch2-compat-3.7.1.jar --java-lib --no-usj-versionless
-java-compat/lib/icestorm-compat-3.7.1.pom --artifact=java-compat/lib/icestorm-compat-3.7.1.jar --java-lib --no-usj-versionless
+java/lib/glacier2-3.7.2.pom --artifact=java/lib/glacier2-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icebt-3.7.2.pom --artifact=java/lib/icebt-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icebox-3.7.2.pom --artifact=java/lib/icebox-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/ice-3.7.2.pom --artifact=java/lib/ice-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icediscovery-3.7.2.pom --artifact=java/lib/icediscovery-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icegrid-3.7.2.pom --artifact=java/lib/icegrid-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icelocatordiscovery-3.7.2.pom --artifact=java/lib/icelocatordiscovery-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icepatch2-3.7.2.pom --artifact=java/lib/icepatch2-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icestorm-3.7.2.pom --artifact=java/lib/icestorm-3.7.2.jar --java-lib --no-usj-versionless
+java/lib/icessl-3.7.2.pom --artifact=java/lib/icessl-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/glacier2-compat-3.7.2.pom --artifact=java-compat/lib/glacier2-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/icebt-compat-3.7.2.pom --artifact=java-compat/lib/icebt-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/icebox-compat-3.7.2.pom --artifact=java-compat/lib/icebox-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/ice-compat-3.7.2.pom --artifact=java-compat/lib/ice-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/icediscovery-compat-3.7.2.pom --artifact=java-compat/lib/icediscovery-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/icegrid-compat-3.7.2.pom --artifact=java-compat/lib/icegrid-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/icelocatordiscovery-compat-3.7.2.pom --artifact=java-compat/lib/icelocatordiscovery-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/icepatch2-compat-3.7.2.pom --artifact=java-compat/lib/icepatch2-compat-3.7.2.jar --java-lib --no-usj-versionless
+java-compat/lib/icestorm-compat-3.7.2.pom --artifact=java-compat/lib/icestorm-compat-3.7.2.jar --java-lib --no-usj-versionless
diff -Nru zeroc-ice-3.7.1/debian/patches/0001-Fix-macros-for-Linux-OS-detection zeroc-ice-3.7.2/debian/patches/0001-Fix-macros-for-Linux-OS-detection
--- zeroc-ice-3.7.1/debian/patches/0001-Fix-macros-for-Linux-OS-detection	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/debian/patches/0001-Fix-macros-for-Linux-OS-detection	2019-02-08 08:24:27.000000000 +0000
@@ -0,0 +1,142 @@
+--- a/cpp/src/Ice/Instance.cpp
++++ b/cpp/src/Ice/Instance.cpp
+@@ -61,7 +61,7 @@
+ #   include <sys/types.h>
+ #endif
+ 
+-#if defined(__linux) || defined(__sun) || defined(_AIX) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__sun) || defined(_AIX) || defined(__GLIBC__)
+ #   include <grp.h> // for initgroups
+ #endif
+ 
+--- a/cpp/src/Ice/Network.cpp
++++ b/cpp/src/Ice/Network.cpp
+@@ -46,7 +46,7 @@
+ #   include <sys/ioctl.h>
+ #endif
+ 
+-#if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+ #  include <ifaddrs.h>
+ #elif defined(__sun)
+ #  include <sys/sockio.h>
+@@ -346,7 +346,7 @@
+ 
+         free(adapter_addresses);
+     }
+-#elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
++#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+     struct ifaddrs* ifap;
+     if(::getifaddrs(&ifap) == SOCKET_ERROR)
+     {
+@@ -648,7 +648,7 @@
+     //
+     if(isAddr)
+     {
+-#  if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
++#  if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+         struct ifaddrs* ifap;
+         if(::getifaddrs(&ifap) != SOCKET_ERROR)
+         {
+@@ -2653,7 +2653,7 @@
+         }
+     }
+ 
+-#if defined(__linux)
++#if defined(__linux__)
+     //
+     // Prevent self connect (self connect happens on Linux when a client tries to connect to
+     // a server which was just deactivated if the client socket re-uses the same ephemeral
+@@ -2722,7 +2722,7 @@
+         }
+     }
+ 
+-#if defined(__linux)
++#if defined(__linux__)
+     //
+     // Prevent self connect (self connect happens on Linux when a client tries to connect to
+     // a server which was just deactivated if the client socket re-uses the same ephemeral
+--- a/cpp/src/IceGrid/Activator.cpp
++++ b/cpp/src/IceGrid/Activator.cpp
+@@ -32,7 +32,7 @@
+ #endif
+ #endif
+ 
+-#if defined(__linux) || defined(__sun) || defined(_AIX) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__sun) || defined(_AIX) || defined(__GLIBC__)
+ #   include <grp.h> // for setgroups
+ #endif
+ 
+@@ -1413,7 +1413,7 @@
+     try
+     {
+         int status;
+-#if defined(__linux)
++#if defined(__linux__)
+         int nRetry = 0;
+         while(true) // The while loop is necessary for the linux workaround.
+         {
+--- a/cpp/src/IceGrid/PlatformInfo.cpp
++++ b/cpp/src/IceGrid/PlatformInfo.cpp
+@@ -333,7 +333,7 @@
+     {
+ #if defined(_WIN32)
+         _nProcessorSockets = getSocketCount(_traceLevels->logger);
+-#elif defined(__linux)
++#elif defined(__linux__)
+         ifstream is("/proc/cpuinfo");
+         set<string> ids;
+ 
+@@ -484,7 +484,7 @@
+     info.avg1 = static_cast<float>(_last1Total) / _usages1.size() / 100.0f;
+     info.avg5 = static_cast<float>(_last5Total) / _usages5.size() / 100.0f;
+     info.avg15 = static_cast<float>(_last15Total) / _usages15.size() / 100.0f;
+-#elif defined(__sun) || defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#elif defined(__sun) || defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+     //
+     // We use the load average divided by the number of
+     // processors to figure out if the machine is busy or
+--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
++++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
+@@ -84,7 +84,7 @@
+     // On some platforms, pthread_t is a pointer to a per-thread structure.
+     //
+     return reinterpret_cast<unsigned long>(pthread_self());
+-#  elif defined(__linux) || defined(__sun) || defined(__hpux) || defined(_AIX) || defined(__GLIBC__)
++#  elif defined(__linux__) || defined(__sun) || defined(__hpux) || defined(_AIX) || defined(__GLIBC__)
+     //
+     // On Linux, Solaris, HP-UX and AIX, pthread_t is an integer.
+     //
+--- a/cpp/include/IceUtil/Atomic.h
++++ b/cpp/include/IceUtil/Atomic.h
+@@ -23,7 +23,7 @@
+ #elif ((defined(__GNUC__) && (((__GNUC__* 100) + __GNUC_MINOR__) >= 401)) || __clang__)  &&                         \
+         ((defined(__sun) && (defined(__sparc) || defined(__sparcv9))) || \
+          defined(__APPLE__) || \
+-        (defined(__linux) && \
++        (defined(__linux__) && \
+                 (defined(__i486) || defined(__i586) || \
+                  defined(__i686) || defined(__x86_64))))
+ 
+--- a/cpp/include/IceUtil/Config.h
++++ b/cpp/include/IceUtil/Config.h
+@@ -80,7 +80,7 @@
+ #   elif defined(__WORDSIZE) && (__WORDSIZE == 32)
+ #      define ICE_32
+ #   elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64))  || \
+-         defined(__linux) && defined(__x86_64)                        || \
++         defined(__linux__) && defined(__x86_64)                      || \
+          defined(__APPLE__) && defined(__x86_64)                      || \
+          defined(__hppa) && defined(__LP64__)                         || \
+          defined(_ARCH_COM) && defined(__64BIT__)                     || \
+--- a/cpp/src/Ice/Network.h
++++ b/cpp/src/Ice/Network.h
+@@ -38,7 +38,7 @@
+ #   include <netdb.h>
+ #endif
+ 
+-#if defined(__linux) && !defined(ICE_NO_EPOLL)
++#if defined(__linux__) && !defined(ICE_NO_EPOLL)
+ #   define ICE_USE_EPOLL 1
+ #elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE)
+ #   define ICE_USE_KQUEUE 1
diff -Nru zeroc-ice-3.7.1/debian/patches/gcc8-build-fixes.patch zeroc-ice-3.7.2/debian/patches/gcc8-build-fixes.patch
--- zeroc-ice-3.7.1/debian/patches/gcc8-build-fixes.patch	2018-06-06 20:17:41.000000000 +0000
+++ zeroc-ice-3.7.2/debian/patches/gcc8-build-fixes.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Index: ice-debian-packaging/cpp/src/Ice/NetworkProxy.cpp
-===================================================================
---- ice-debian-packaging.orig/cpp/src/Ice/NetworkProxy.cpp
-+++ ice-debian-packaging/cpp/src/Ice/NetworkProxy.cpp
-@@ -81,7 +81,6 @@ private:
- SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port)
- {
-     assert(!host.empty());
--    memset(&_address, 0, sizeof(_address));
- }
- 
- SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr)
-@@ -194,7 +193,6 @@ HTTPNetworkProxy::HTTPNetworkProxy(const
-     _host(host), _port(port), _protocol(EnableBoth)
- {
-     assert(!host.empty());
--    memset(&_address, 0, sizeof(_address));
- }
- 
- HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol) :
-Index: ice-debian-packaging/cpp/src/IceGrid/Database.cpp
-===================================================================
---- ice-debian-packaging.orig/cpp/src/IceGrid/Database.cpp
-+++ ice-debian-packaging/cpp/src/IceGrid/Database.cpp
-@@ -1628,7 +1628,7 @@ Database::updateObject(const Ice::Object
- 
-             if(!_objects.get(txn, id, info))
-             {
--                ObjectNotRegisteredException(id);
-+                throw ObjectNotRegisteredException(id);
-             }
-             info.proxy = proxy;
-             addObject(txn, info, false);
diff -Nru zeroc-ice-3.7.1/debian/patches/series zeroc-ice-3.7.2/debian/patches/series
--- zeroc-ice-3.7.1/debian/patches/series	2018-06-06 20:16:18.000000000 +0000
+++ zeroc-ice-3.7.2/debian/patches/series	2019-02-07 18:11:13.000000000 +0000
@@ -1 +1 @@
-gcc8-build-fixes.patch
+0001-Fix-macros-for-Linux-OS-detection
diff -Nru zeroc-ice-3.7.1/debian/README zeroc-ice-3.7.2/debian/README
--- zeroc-ice-3.7.1/debian/README	2018-04-24 11:29:50.000000000 +0000
+++ zeroc-ice-3.7.2/debian/README	2019-02-06 17:23:04.000000000 +0000
@@ -39,9 +39,9 @@
 ---------------------------------
 
 Please visit the 'Using the Linux Binary Distributions' section in the
-Ice 3.7.0 release notes:
+Ice 3.7.2 release notes:
 
-https://doc.zeroc.com/display/Rel/Ice+3.7.0+Release+Notes
+https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes
 
 Documentation
 -------------
@@ -54,6 +54,6 @@
 Source Code
 ------------
 
-The source code for Ice 3.7.0 is on GitHub:
+The source code for Ice 3.7.2 is on GitHub:
 
 https://github.com/zeroc-ice/ice/releases/tag/v3.7.1
diff -Nru zeroc-ice-3.7.1/debian/rules zeroc-ice-3.7.2/debian/rules
--- zeroc-ice-3.7.1/debian/rules	2018-06-06 20:06:49.000000000 +0000
+++ zeroc-ice-3.7.2/debian/rules	2019-02-06 17:23:04.000000000 +0000
@@ -17,7 +17,14 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java/
 
+#
+# Use the system gradle unless it has been overridden by GRADLE
+# environment variable.
+#
+ifeq ($(GRADLE),)
 export GRADLE		= gradle
+endif
+
 export GRADLEARGS	= --gradle-user-home $(CURDIR)/.gradle \
 			  --info \
 			  --console plain \
diff -Nru zeroc-ice-3.7.1/debian/zeroc-glacier2.glacier2router.conf zeroc-ice-3.7.2/debian/zeroc-glacier2.glacier2router.conf
--- zeroc-ice-3.7.1/debian/zeroc-glacier2.glacier2router.conf	2018-04-24 11:29:38.000000000 +0000
+++ zeroc-ice-3.7.2/debian/zeroc-glacier2.glacier2router.conf	2019-02-06 17:23:04.000000000 +0000
@@ -52,7 +52,7 @@
 #
 # Various settings to trace requests, overrides, etc.
 #
-Ice.UseSyslog=1
+Ice.UseSystemdJournal=1
 Glacier2.Client.Trace.Request=1
 Glacier2.Server.Trace.Request=1
 Glacier2.Client.Trace.Override=1
diff -Nru zeroc-ice-3.7.1/debian/zeroc-glacier2.glacier2router.service zeroc-ice-3.7.2/debian/zeroc-glacier2.glacier2router.service
--- zeroc-ice-3.7.1/debian/zeroc-glacier2.glacier2router.service	2018-04-24 11:29:50.000000000 +0000
+++ zeroc-ice-3.7.2/debian/zeroc-glacier2.glacier2router.service	2019-02-06 17:23:04.000000000 +0000
@@ -9,10 +9,10 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/glacier2router --daemon --pidfile /run/glacier2router/glacier2router.pid --Ice.Config=/etc/glacier2router.conf
-Type=forking
+ExecStart=/usr/bin/glacier2router --Ice.Config=/etc/glacier2router.conf
+Type=notify
+NotifyAccess=main
 RuntimeDirectory=glacier2router
-PIDFile=/run/glacier2router/glacier2router.pid
 KillMode=process
 User=ice
 
diff -Nru zeroc-ice-3.7.1/debian/zeroc-icegridgui.icegridgui zeroc-ice-3.7.2/debian/zeroc-icegridgui.icegridgui
--- zeroc-ice-3.7.1/debian/zeroc-icegridgui.icegridgui	2018-04-24 11:29:38.000000000 +0000
+++ zeroc-ice-3.7.2/debian/zeroc-icegridgui.icegridgui	2019-02-06 17:23:04.000000000 +0000
@@ -1,12 +1,3 @@
 #!/bin/sh
 
-# **********************************************************************
-#
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
 exec java -jar /usr/share/java/icegridgui.jar $@
diff -Nru zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridnode.conf zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridnode.conf
--- zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridnode.conf	2018-04-24 11:29:38.000000000 +0000
+++ zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridnode.conf	2019-02-06 17:23:04.000000000 +0000
@@ -43,7 +43,7 @@
 #
 # Logging to syslog
 #
-Ice.UseSyslog=1
+Ice.UseSystemdJournal=1
 Ice.ProgramName=icegridnode (DemoIceGrid node1)
 IceGrid.Node.Trace.Replica=2
 
diff -Nru zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridnode.service zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridnode.service
--- zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridnode.service	2018-04-24 11:29:50.000000000 +0000
+++ zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridnode.service	2019-02-06 17:23:04.000000000 +0000
@@ -9,10 +9,10 @@
 After=network.target icegridregistry.service
 
 [Service]
-ExecStart=/usr/bin/icegridnode --daemon --pidfile /run/icegridnode/icegridnode.pid --Ice.Config=/etc/icegridnode.conf
-Type=forking
+ExecStart=/usr/bin/icegridnode --Ice.Config=/etc/icegridnode.conf
+Type=notify
+NotifyAccess=main
 RuntimeDirectory=icegridnode
-PIDFile=/run/icegridnode/icegridnode.pid
 KillMode=process
 User=ice
 
diff -Nru zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridregistry.conf zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridregistry.conf
--- zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridregistry.conf	2018-04-24 11:29:38.000000000 +0000
+++ zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridregistry.conf	2019-02-06 17:23:04.000000000 +0000
@@ -62,9 +62,9 @@
 IceGrid.Registry.DefaultTemplates=/usr/share/ice/templates.xml
 
 #
-# Logging to syslog
+# Logging to sytemd Journal
 #
-Ice.UseSyslog=1
+Ice.UseSystemdJournal=1
 Ice.ProgramName=icegridregistry (DemoIceGrid Master)
 IceGrid.Registry.Trace.Node=1
 IceGrid.Registry.Trace.Replica=1
diff -Nru zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridregistry.service zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridregistry.service
--- zeroc-ice-3.7.1/debian/zeroc-icegrid.icegridregistry.service	2018-04-24 11:29:50.000000000 +0000
+++ zeroc-ice-3.7.2/debian/zeroc-icegrid.icegridregistry.service	2019-02-06 17:23:04.000000000 +0000
@@ -10,10 +10,10 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/icegridregistry --daemon --pidfile /run/icegridregistry/icegridregistry.pid --Ice.Config=/etc/icegridregistry.conf
-Type=forking
+ExecStart=/usr/bin/icegridregistry --Ice.Config=/etc/icegridregistry.conf
+Type=notify
+NotifyAccess=main
 RuntimeDirectory=icegridregistry
-PIDFile=/run/icegridregistry/icegridregistry.pid
 KillMode=process
 User=ice
 
diff -Nru zeroc-ice-3.7.1/doxygen/config zeroc-ice-3.7.2/doxygen/config
--- zeroc-ice-3.7.1/doxygen/config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/doxygen/config	2019-02-05 18:03:04.000000000 +0000
@@ -32,7 +32,7 @@
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Ice Slice API Reference"
+PROJECT_NAME           = "Ice 3.7 Slice API Reference"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
diff -Nru zeroc-ice-3.7.1/doxygen/mainpage.md zeroc-ice-3.7.2/doxygen/mainpage.md
--- zeroc-ice-3.7.1/doxygen/mainpage.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/doxygen/mainpage.md	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,4 @@
-Overview
-==
+## Overview
 
 This Slice API reference was generated from the Slice files in the
 [zeroc-ice/ice GitHub repository](https://github.com/zeroc-ice/ice/tree/3.7/slice)
@@ -7,6 +6,6 @@
 Slice support. We provide a [tag file](../slice.tag) if you would like to include
 links to this documentation in your own Doxygen projects.
 
-The [language mapping chapters](https://doc.zeroc.com/display/Ice37/Language+Mappings)
-in the [Ice Manual](https://doc.zeroc.com/display/Ice37/Ice+Manual) describe how Slice
+The [language mapping chapters](https://doc.zeroc.com/ice/3.7/language-mappings)
+in the [Ice Manual](https://doc.zeroc.com/ice/3.7/introduction) describe how Slice
 APIs map to programming language APIs.
diff -Nru zeroc-ice-3.7.1/.gitignore zeroc-ice-3.7.2/.gitignore
--- zeroc-ice-3.7.1/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -100,3 +100,14 @@
 **/msbuild/packages/*
 **/msbuild/zeroc.ice.*
 *.nupkg
+
+**/netstandard2.0/netstandard2.0/*
+
+AppPackages
+BundleArtifacts
+csharp/AppX
+*.deps.json
+*.runtimeconfig.dev.json
+*.runtimeconfig.json
+cpp/AppX
+cpp/test/Slice/errorDetection/tmp
diff -Nru zeroc-ice-3.7.1/ICE_LICENSE zeroc-ice-3.7.2/ICE_LICENSE
--- zeroc-ice-3.7.1/ICE_LICENSE	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ICE_LICENSE	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+Copyright (c) ZeroC, Inc. All rights reserved.
 
 This copy of Ice is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as
diff -Nru zeroc-ice-3.7.1/ice.proj zeroc-ice-3.7.2/ice.proj
--- zeroc-ice-3.7.1/ice.proj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ice.proj	2019-02-05 18:03:04.000000000 +0000
@@ -14,43 +14,51 @@
 
   <ItemGroup>
     <Projects Include="$(MSBuildThisFileDirectory)cpp\msbuild\ice.proj">
-      <Configuration>$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=$(Configuration)</Properties>
     </Projects>
 
     <Projects Include="$(MSBuildThisFileDirectory)csharp\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' != 'v100'">
-      <Configuration>$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=$(Configuration)</Properties>
     </Projects>
 
     <Projects Include="$(MSBuildThisFileDirectory)java\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' != 'v100'">
-      <Configuration>$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=$(Configuration)</Properties>
     </Projects>
 
     <Projects Include="$(MSBuildThisFileDirectory)java-compat\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' != 'v100'">
-      <Configuration>$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=$(Configuration)</Properties>
     </Projects>
 
     <!-- For PHP build both thread safe and non thread safe configurations -->
     <Projects Include="$(MSBuildThisFileDirectory)php\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' == 'v140'">
-      <Configuration>$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=$(Configuration);BuildWithPhpVersion=7.1</Properties>
     </Projects>
 
     <Projects Include="$(MSBuildThisFileDirectory)php\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' == 'v140'">
-      <Configuration>NTS-$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=NTS-$(Configuration);BuildWithPHPVersion=7.1</Properties>
+    </Projects>
+
+    <Projects Include="$(MSBuildThisFileDirectory)php\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' == 'v141'">
+      <Properties>Platform=$(Platform);Configuration=$(Configuration);BuildWithPhpVersion=7.2</Properties>
+    </Projects>
+
+    <Projects Include="$(MSBuildThisFileDirectory)php\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' == 'v141'">
+      <Properties>Platform=$(Platform);Configuration=NTS-$(Configuration);BuildWithPHPVersion=7.2</Properties>
     </Projects>
 
     <Projects Include="$(MSBuildThisFileDirectory)js\msbuild\ice.proj">
-      <Configuration>$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=$(Configuration)</Properties>
     </Projects>
 
     <Projects Include="$(MSBuildThisFileDirectory)python\msbuild\ice.proj" Condition="'$(DefaultPlatformToolset)' == 'v140'">
-      <Configuration>$(Configuration)</Configuration>
+      <Properties>Platform=$(Platform);Configuration=$(Configuration)</Properties>
     </Projects>
   </ItemGroup>
 
   <Target Name="Build">
     <MSBuild Projects="@(Projects)"
              BuildInParallel="false"
-             Properties="Platform=$(Platform);Configuration=%(Configuration)" />
+             Properties="%(Properties)" />
   </Target>
 
   <Target Name="Clean">
diff -Nru zeroc-ice-3.7.1/java/allTests.py zeroc-ice-3.7.2/java/allTests.py
--- zeroc-ice-3.7.1/java/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/java/android/allTests.py zeroc-ice-3.7.2/java/android/allTests.py
--- zeroc-ice-3.7.1/java/android/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/allTests.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts"))
-
-from Util import runTestsWithPath
-
-runTestsWithPath(__file__)
diff -Nru zeroc-ice-3.7.1/java/android/build.gradle zeroc-ice-3.7.2/java/android/build.gradle
--- zeroc-ice-3.7.1/java/android/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
-    }
-}
-
-subprojects {
-    project.ext.topSrcDir = "$rootProject.projectDir/../.."
-
-    project.version = iceVersion
-    project.group = "com.zeroc"
-
-    apply plugin: 'idea'
-}
-
-//
-// Used to build the gradle wrapper to automatically download and install
-// the version of gradle needed to build Ice.
-//
-task wrapper(type: Wrapper) {
-    gradleVersion = "4.7"
-    distributionType = Wrapper.DistributionType.ALL
-}
diff -Nru zeroc-ice-3.7.1/java/android/controller/build.gradle zeroc-ice-3.7.2/java/android/controller/build.gradle
--- zeroc-ice-3.7.1/java/android/controller/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/controller/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'com.android.application'
-apply from: "$rootProject.projectDir/../gradle/ice.gradle"
-apply from: "$rootProject.projectDir/gradle/tests.gradle"
-
-slice {
-    java {
-        files = fileTree(dir: "$rootProject.projectDir/../../scripts/", includes: ['*.ice'])
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
-
-    defaultConfig {
-        applicationId "com.zeroc.testcontroller"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
-        multiDexEnabled true // Necessary otherwise we'd exceed the 64K DEX limit.
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-        }
-    }
-
-    buildTypes {
-        debug {
-            //
-            // Set minifyEnabled to false because the test app loads classes dynamically.
-            //
-            minifyEnabled false
-        }
-
-        release {
-            //
-            // Set minifyEnabled to false because the test app loads classes dynamically.
-            //
-            minifyEnabled false
-        }
-    }
-}
-
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
-task copyBksTask(type: Copy) {
-    from "${rootProject.projectDir}/../../certs/client.bks"
-    from "${rootProject.projectDir}/../../certs/server.bks"
-    into "src/main/res/raw"
-}
-preBuild.dependsOn(copyBksTask)
-
-clean {
-    delete("src/main/res/raw/client.bks")
-    delete("src/main/res/raw/server.bks")
-}
-
-dependencies {
-    implementation localDependency('ice')
-    implementation localDependency('icessl')
-    implementation localDependency('icediscovery')
-    implementation localDependency('icebt')
-    implementation project(':test')
-    tests.each {
-        def name = it.replace('/', '_')
-        implementation project(":test_${name}")
-    }
-    runtimeOnly "org.apache.commons:commons-compress:1.14"
-}
diff -Nru zeroc-ice-3.7.1/java/android/controller/src/main/AndroidManifest.xml zeroc-ice-3.7.2/java/android/controller/src/main/AndroidManifest.xml
--- zeroc-ice-3.7.1/java/android/controller/src/main/AndroidManifest.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/controller/src/main/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.zeroc.testcontroller"
-      android:versionCode="1"
-      android:versionName="1.0.0">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-    <!--
-      http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
-    -->
-    <application android:icon="@raw/icon" android:label="@string/app_name" android:name="ControllerApp"
-                 android:allowBackup="false">
-        <activity android:name="ControllerActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-</application>
-</manifest>
diff -Nru zeroc-ice-3.7.1/java/android/controller/src/main/assets/.gitignore zeroc-ice-3.7.2/java/android/controller/src/main/assets/.gitignore
--- zeroc-ice-3.7.1/java/android/controller/src/main/assets/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/controller/src/main/assets/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-*.dex
diff -Nru zeroc-ice-3.7.1/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java zeroc-ice-3.7.2/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java
--- zeroc-ice-3.7.1/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.testcontroller;
-
-import java.util.LinkedList;
-import android.app.*;
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.widget.*;
-import android.view.View;
-
-public class ControllerActivity extends ListActivity
-{
-    private WifiManager _wifiManager;
-    private WifiManager.MulticastLock _lock;
-    private LinkedList<String> _output = new LinkedList<String>();
-    private ArrayAdapter<String> _outputAdapter;
-    private ArrayAdapter<String> _ipv4Adapter;
-    private ArrayAdapter<String> _ipv6Adapter;
-
-    private static final int REQUEST_ENABLE_BT = 1;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        _wifiManager = (WifiManager)getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-        _lock = _wifiManager.createMulticastLock("com.zeroc.testcontroller");
-        _lock.acquire();
-    }
-
-    @Override
-    public void onStart()
-    {
-        super.onStart();
-
-        //
-        // Enable Bluetooth if necessary.
-        //
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        if(adapter == null)
-        {
-            Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
-            setup(false);
-        }
-        else if(!adapter.isEnabled())
-        {
-            Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-            startActivityForResult(enableIntent, REQUEST_ENABLE_BT);
-        }
-        else
-        {
-            setup(true);
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int req, int res, Intent data)
-    {
-        switch(req)
-        {
-            case REQUEST_ENABLE_BT:
-            {
-                if(_outputAdapter == null)
-                {
-                    if(res == Activity.RESULT_OK)
-                    {
-                        setup(true);
-                    }
-                    else
-                    {
-                        Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
-                        setup(false);
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    private synchronized void setup(boolean bluetooth)
-    {
-        _outputAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _output);
-        setListAdapter(_outputAdapter);
-        final ControllerApp app = (ControllerApp)getApplication();
-        final java.util.List<String> ipv4Addresses = app.getAddresses(false);
-        _ipv4Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv4Addresses);
-        Spinner s = (Spinner)findViewById(R.id.ipv4);
-        s.setAdapter(_ipv4Adapter);
-        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
-            {
-                @Override
-                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
-                {
-                    app.setIpv4Address(ipv4Addresses.get((int)id));
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> arg0)
-                {
-                }
-            });
-        s.setSelection(0);
-
-        final java.util.List<String> ipv6Addresses = app.getAddresses(true);
-        _ipv6Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv6Addresses);
-        s = (Spinner)findViewById(R.id.ipv6);
-        s.setAdapter(_ipv6Adapter);
-        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
-            {
-                @Override
-                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
-                {
-                    app.setIpv6Address(ipv6Addresses.get((int)id));
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> arg0)
-                {
-                }
-            });
-        s.setSelection(0);
-        app.startController(this, bluetooth);
-    }
-
-    public synchronized void println(String data)
-    {
-        _output.add(data);
-        _outputAdapter.notifyDataSetChanged();
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java zeroc-ice-3.7.2/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
--- zeroc-ice-3.7.1/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,545 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.testcontroller;
-
-import java.io.*;
-import java.util.*;
-
-import com.zeroc.Ice.Logger;
-import com.zeroc.Ice.Communicator;
-import com.zeroc.IceInternal.Time;
-
-import android.os.Build;
-import android.util.Log;
-import android.app.Application;
-
-import Test.Common.ProcessControllerRegistryPrx;
-import Test.Common.ProcessControllerPrx;
-import test.Util.Application.CommunicatorListener;
-
-public class ControllerApp extends Application
-{
-    private final String TAG = "ControllerApp";
-    private ControllerHelper _helper;
-    private ControllerActivity _controller;
-    private String _ipv4Address;
-    private String _ipv6Address;
-
-    static private class TestSuiteBundle
-    {
-        @SuppressWarnings("unchecked")
-        TestSuiteBundle(String name, ClassLoader loader) throws ClassNotFoundException
-        {
-            _loader = loader;
-            _class = (Class<? extends test.Util.Application>)_loader.loadClass(name);
-        }
-
-        test.Util.Application newInstance()
-                throws IllegalAccessException, InstantiationException
-        {
-            if(_class == null)
-            {
-                return null;
-            }
-            return _class.newInstance();
-        }
-
-        ClassLoader getClassLoader()
-        {
-            return  _loader;
-        }
-
-        private String _name;
-        private ClassLoader _loader;
-        private Class<? extends test.Util.Application> _class;
-    }
-
-    class AndroidLogger implements Logger
-    {
-        private final String _prefix;
-
-        AndroidLogger(String prefix)
-        {
-            _prefix = prefix;
-        }
-
-        @Override
-        public void print(String message)
-        {
-            Log.d(TAG, message);
-        }
-
-        @Override
-        public void trace(String category, String message)
-        {
-            Log.v(category, message);
-        }
-
-        @Override
-        public void warning(String message)
-        {
-            Log.w(TAG, message);
-        }
-
-        @Override
-        public void error(String message)
-        {
-            Log.e(TAG, message);
-        }
-
-        @Override
-        public String getPrefix()
-        {
-            return _prefix;
-        }
-
-        @Override
-        public Logger cloneWithPrefix(String s)
-        {
-            return new AndroidLogger(s);
-        }
-    }
-
-    @Override
-    public void onCreate()
-    {
-        super.onCreate();
-        com.zeroc.Ice.Util.setProcessLogger(new AndroidLogger(""));
-    }
-
-    synchronized public void setIpv4Address(String address)
-    {
-        _ipv4Address = address;
-    }
-
-    synchronized public void setIpv6Address(String address)
-    {
-        int i = address.indexOf("%");
-        _ipv6Address = i == -1 ? address : address.substring(i);
-    }
-
-    public List<String> getAddresses(boolean ipv6)
-    {
-        List<String> addresses = new java.util.ArrayList<String>();
-        try
-        {
-            java.util.Enumeration<java.net.NetworkInterface> ifaces = java.net.NetworkInterface.getNetworkInterfaces();
-            while(ifaces.hasMoreElements())
-            {
-                java.net.NetworkInterface iface = ifaces.nextElement();
-                java.util.Enumeration<java.net.InetAddress> addrs = iface.getInetAddresses();
-                while (addrs.hasMoreElements())
-                {
-                    java.net.InetAddress addr = addrs.nextElement();
-                    if((ipv6 && addr instanceof java.net.Inet6Address) ||
-                       (!ipv6 && !(addr instanceof java.net.Inet6Address)))
-                    {
-                        addresses.add(addr.getHostAddress());
-                    }
-                }
-            }
-        }
-        catch(java.net.SocketException ex)
-        {
-        }
-        return addresses;
-    }
-
-    public synchronized void startController(ControllerActivity controller, boolean bluetooth)
-    {
-        if(_helper == null)
-        {
-            _controller = controller;
-            _helper = new ControllerHelper(bluetooth);
-        }
-        else
-        {
-            _controller = controller;
-        }
-    }
-
-    public synchronized void println(final String data)
-    {
-        _controller.runOnUiThread(new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                synchronized(ControllerApp.this)
-                {
-                    _controller.println(data);
-                }
-            }
-        });
-    }
-
-    public static boolean isEmulator()
-    {
-        return Build.FINGERPRINT.startsWith("generic") ||
-               Build.FINGERPRINT.startsWith("unknown") ||
-               Build.MODEL.contains("google_sdk") ||
-               Build.MODEL.contains("Emulator") ||
-               Build.MODEL.contains("Android SDK built for x86") ||
-               Build.MANUFACTURER.contains("Genymotion") ||
-               (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) ||
-               Build.PRODUCT.equals("google_sdk");
-    }
-
-    class ControllerHelper
-    {
-        public ControllerHelper(boolean bluetooth)
-        {
-            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
-            initData.properties = com.zeroc.Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.ThreadPool.Server.SizeMax", "10");
-            initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp");
-            //initData.properties.setProperty("Ice.Trace.Network", "3");
-            //initData.properties.setProperty("Ice.Trace.Protocol", "1");
-            initData.properties.setProperty("ControllerAdapter.AdapterId", java.util.UUID.randomUUID().toString());
-            initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
-            if(!isEmulator())
-            {
-                if(bluetooth)
-                {
-                    initData.properties.setProperty("Ice.Plugin.IceBT", "com.zeroc.IceBT.PluginFactory");
-                }
-                initData.properties.setProperty("Ice.Plugin.IceDiscovery", "com.zeroc.IceDiscovery.PluginFactory");
-                initData.properties.setProperty("IceDiscovery.DomainId", "TestController");
-            }
-            _communicator = com.zeroc.Ice.Util.initialize(initData);
-            com.zeroc.Ice.ObjectAdapter adapter = _communicator.createObjectAdapter("ControllerAdapter");
-            ProcessControllerPrx processController = ProcessControllerPrx.uncheckedCast(
-                    adapter.add(new ProcessControllerI(),
-                                com.zeroc.Ice.Util.stringToIdentity("Android/ProcessController")));
-            adapter.activate();
-            if(isEmulator())
-            {
-                ProcessControllerRegistryPrx registry = ProcessControllerRegistryPrx.uncheckedCast(
-                        _communicator.stringToProxy("Util/ProcessControllerRegistry:tcp -h 10.0.2.2 -p 15001"));
-                registerProcessController(adapter, registry, processController);
-            }
-            println("Android/ProcessController");
-        }
-
-        public void
-        registerProcessController(final com.zeroc.Ice.ObjectAdapter adapter,
-                                  final ProcessControllerRegistryPrx registry,
-                                  final ProcessControllerPrx processController)
-        {
-            registry.ice_pingAsync().whenCompleteAsync(
-                (r1, e1) ->
-                {
-                    if(e1 != null)
-                    {
-                        handleException(e1, adapter, registry, processController);
-                    }
-                    else
-                    {
-                        com.zeroc.Ice.Connection connection = registry.ice_getConnection();
-                        connection.setAdapter(adapter);
-                        connection.setACM(OptionalInt.of(5),
-                                Optional.of(com.zeroc.Ice.ACMClose.CloseOff),
-                                Optional.of(com.zeroc.Ice.ACMHeartbeat.HeartbeatAlways));
-                        connection.setCloseCallback(
-                                con ->
-                                {
-                                    println("connection with process controller registry closed");
-                                    while (true) {
-                                        try
-                                        {
-                                            Thread.sleep(500);
-                                            break;
-                                        }
-                                        catch(InterruptedException e)
-                                        {
-                                        }
-                                    }
-                                    registerProcessController(adapter, registry, processController);
-                                });
-
-                        registry.setProcessControllerAsync(processController).whenCompleteAsync(
-                                (r2, e2) ->
-                                {
-                                    if(e2 != null)
-                                    {
-                                        handleException(e2, adapter, registry, processController);
-                                    }
-                                });
-                    }
-                });
-        }
-
-        public void handleException(Throwable ex,
-                                    final com.zeroc.Ice.ObjectAdapter adapter,
-                                    final ProcessControllerRegistryPrx registry,
-                                    final ProcessControllerPrx processController)
-        {
-            if(ex instanceof com.zeroc.Ice.ConnectFailedException || ex instanceof com.zeroc.Ice.TimeoutException)
-            {
-                while(true)
-                {
-                    try
-                    {
-                        Thread.sleep(500);
-                        break;
-                    }
-                    catch(InterruptedException e)
-                    {
-                    }
-                }
-                registerProcessController(adapter, registry, processController);
-            }
-            else
-            {
-                println(ex.toString());
-            }
-        }
-
-        public void destroy()
-        {
-            _communicator.destroy();
-        }
-
-        private ProcessControllerRegistryPrx _registry;
-        private com.zeroc.Ice.Communicator _communicator;
-    }
-
-    class MainHelperI extends Thread implements test.Util.Application.ServerReadyListener
-    {
-        public MainHelperI(TestSuiteBundle bundle, String[] args, String exe)
-        {
-            _bundle = bundle;
-            _args = args;
-        }
-
-        public void run()
-        {
-            try
-            {
-                _app = _bundle.newInstance();
-                _app.setClassLoader(_bundle.getClassLoader());
-                _app.setCommunicatorListener(new CommunicatorListener()
-                {
-                    public void communicatorInitialized(Communicator communicator)
-                    {
-                        if(communicator.getProperties().getProperty("Ice.Plugin.IceSSL").equals("com.zeroc.IceSSL.PluginFactory"))
-                        {
-                            com.zeroc.IceSSL.Plugin plugin = (com.zeroc.IceSSL.Plugin)communicator.getPluginManager().getPlugin("IceSSL");
-                            String keystore = communicator.getProperties().getProperty("IceSSL.Keystore");
-                            communicator.getProperties().setProperty("IceSSL.Keystore", "");
-                            java.io.InputStream certs = getResources().openRawResource(
-                                keystore.equals("client.bks") ? R.raw.client : R.raw.server);
-                            plugin.setKeystoreStream(certs);
-                            plugin.setTruststoreStream(certs);
-                            communicator.getPluginManager().initializePlugins();
-                        }
-                    }
-                });
-                _app.setWriter(new Writer()
-                    {
-                        @Override
-                        public void close() throws IOException
-                        {
-                        }
-
-                        @Override
-                        public void flush() throws IOException
-                        {
-                        }
-
-                        @Override
-                        public void write(char[] buf, int offset, int count)
-                            throws IOException
-                        {
-                            _out.append(buf, offset, count);
-                        }
-                    });
-                _app.setServerReadyListener(this);
-
-                int status = _app.main(_exe, _args);
-                synchronized(this)
-                {
-                    _status = status;
-                    _completed = true;
-                    notifyAll();
-                }
-            }
-            catch(Exception ex)
-            {
-                _out.append(ex.toString());
-                synchronized(this)
-                {
-                    _status = -1;
-                    _completed = true;
-                    notifyAll();
-                }
-            }
-        }
-
-        public void shutdown()
-        {
-            if(_app != null)
-            {
-                _app.stop();
-            }
-        }
-
-        public String getOutput()
-        {
-            return _out.toString();
-        }
-
-        synchronized private void completed(int status)
-        {
-            _completed = true;
-            _status = status;
-            notifyAll();
-        }
-
-        synchronized public void serverReady()
-        {
-            _ready = true;
-            notifyAll();
-        }
-
-        synchronized private void waitReady(int timeout)
-            throws Test.Common.ProcessFailedException
-        {
-            long now = Time.currentMonotonicTimeMillis();
-            while(!_ready && !_completed)
-            {
-                try
-                {
-                    wait(timeout * 1000);
-                    if(Time.currentMonotonicTimeMillis() - now > timeout * 1000)
-                    {
-                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
-                    }
-                }
-                catch(java.lang.InterruptedException ex)
-                {
-                }
-            }
-
-            if(_completed && _status != 0)
-            {
-                throw new Test.Common.ProcessFailedException(_out.toString());
-            }
-        }
-
-        synchronized private int waitSuccess(int timeout)
-            throws Test.Common.ProcessFailedException
-        {
-            long now = Time.currentMonotonicTimeMillis();
-            while(!_completed)
-            {
-                try
-                {
-                    wait(timeout * 1000);
-                    if(Time.currentMonotonicTimeMillis() - now > timeout * 1000)
-                    {
-                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
-                    }
-                }
-                catch(java.lang.InterruptedException ex)
-                {
-                }
-            }
-            return _status;
-        }
-
-        private TestSuiteBundle _bundle;
-        private String[] _args;
-        private String _exe;
-        private test.Util.Application _app;
-        private boolean _ready = false;
-        private boolean _completed = false;
-        private int _status = 0;
-        private final StringBuffer _out = new StringBuffer();
-    }
-
-    class ProcessControllerI implements Test.Common.ProcessController
-    {
-        public Test.Common.ProcessPrx start(final String testsuite, final String exe, String[] args,
-                                            com.zeroc.Ice.Current current)
-            throws Test.Common.ProcessFailedException
-        {
-            println("starting " + testsuite + " " + exe + "... ");
-            String className = "test." + testsuite.replace("/", ".") + "." + exe.substring(0, 1).toUpperCase() + exe.substring(1);
-            try
-            {
-                TestSuiteBundle bundle = new TestSuiteBundle(className, getClassLoader());
-                MainHelperI mainHelper = new MainHelperI(bundle, args, exe);
-                mainHelper.start();
-                return Test.Common.ProcessPrx.uncheckedCast(current.adapter.addWithUUID(new ProcessI(mainHelper)));
-            }
-            catch(ClassNotFoundException ex)
-            {
-                throw new Test.Common.ProcessFailedException(
-                    "testsuite `" + testsuite + "' exe ` " + exe + "' start failed:\n" + ex.toString());
-            }
-        }
-
-        public String getHost(String protocol, boolean ipv6, com.zeroc.Ice.Current current)
-        {
-            if(isEmulator())
-            {
-                return  "127.0.0.1";
-            }
-            else
-            {
-                synchronized(ControllerApp.this)
-                {
-                    return ipv6 ? _ipv6Address : _ipv4Address;
-                }
-            }
-        }
-    }
-
-    class ProcessI implements Test.Common.Process
-    {
-        public ProcessI(MainHelperI helper)
-        {
-            _helper = helper;
-        }
-
-        public void waitReady(int timeout, com.zeroc.Ice.Current current)
-            throws Test.Common.ProcessFailedException
-        {
-            _helper.waitReady(timeout);
-        }
-
-        public int waitSuccess(int timeout, com.zeroc.Ice.Current current)
-            throws Test.Common.ProcessFailedException
-        {
-            return _helper.waitSuccess(timeout);
-        }
-
-        public String terminate(com.zeroc.Ice.Current current)
-        {
-            _helper.shutdown();
-            current.adapter.remove(current.id);
-            while(true)
-            {
-                try
-                {
-                    _helper.join();
-                    break;
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-            return _helper.getOutput();
-        }
-
-        private MainHelperI _helper;
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/android/controller/src/main/res/layout/main.xml zeroc-ice-3.7.2/java/android/controller/src/main/res/layout/main.xml
--- zeroc-ice-3.7.1/java/android/controller/src/main/res/layout/main.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/controller/src/main/res/layout/main.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="5dip">
-        <TextView
-            android:layout_width="5dip"
-            android:layout_weight="25"
-            android:layout_height="wrap_content"
-            android:text="IPv4"
-            android:layout_gravity="center_vertical"/>
-
-        <Spinner
-            android:id="@+id/ipv4"
-            android:layout_width="5dip"
-            android:layout_weight="75"
-            android:layout_height="wrap_content"
-            android:drawSelectorOnTop="false"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="5dip">
-        <TextView
-            android:layout_width="0dip"
-            android:layout_weight="25"
-            android:layout_height="wrap_content"
-            android:text="IPv6"
-            android:layout_gravity="center_vertical"/>
-
-        <Spinner
-            android:id="@+id/ipv6"
-            android:layout_width="0dip"
-            android:layout_weight="75"
-            android:layout_height="wrap_content"
-            android:drawSelectorOnTop="false"/>
-    </LinearLayout>
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:stackFromBottom="true"
-        android:transcriptMode="alwaysScroll"/>
-</LinearLayout>
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java/android/controller/src/main/res/raw/icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java/android/controller/src/main/res/raw/icon.png differ
diff -Nru zeroc-ice-3.7.1/java/android/controller/src/main/res/values/strings.xml zeroc-ice-3.7.2/java/android/controller/src/main/res/values/strings.xml
--- zeroc-ice-3.7.1/java/android/controller/src/main/res/values/strings.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/controller/src/main/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Test Controller</string>
-    <string name="no_bluetooth">Bluetooth disabled</string>
-</resources>
diff -Nru zeroc-ice-3.7.1/java/android/.gitignore zeroc-ice-3.7.2/java/android/.gitignore
--- zeroc-ice-3.7.1/java/android/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-lib
-build
-.gradle
-local.properties
-*.bks
-*.iml
-/.idea
-test/src/
diff -Nru zeroc-ice-3.7.1/java/android/gradle/library.gradle zeroc-ice-3.7.2/java/android/gradle/library.gradle
--- zeroc-ice-3.7.1/java/android/gradle/library.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/gradle/library.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-jar {
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jar.archiveName}")
-}
-
-task copyJars(type: Copy, dependsOn: jar) {
-    from "${libDir}/${jar.archiveName}"
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
-
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
diff -Nru zeroc-ice-3.7.1/java/android/gradle/tests.gradle zeroc-ice-3.7.2/java/android/gradle/tests.gradle
--- zeroc-ice-3.7.1/java/android/gradle/tests.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/gradle/tests.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-ext.tests = [
-    "Ice/acm",
-    "Ice/adapterDeactivation",
-    "Ice/admin",
-    "Ice/ami",
-    "Ice/background",
-    "Ice/binding",
-    "Ice/checksum",
-    "Ice/classLoader",
-    "Ice/custom",
-    "Ice/defaultServant",
-    "Ice/defaultValue",
-    "Ice/dispatcher",
-    //"Ice/echo",
-    "Ice/enums",
-    "Ice/exceptions",
-    "Ice/facets",
-    //"Ice/faultTolerance",
-    //"Ice/hash",
-    "Ice/hold",
-    "Ice/info",
-    "Ice/inheritance",
-    "Ice/interceptor",
-    "Ice/interrupt",
-    "Ice/invoke",
-    "Ice/location",
-    //"Ice/metrics",
-    //"Ice/networkProxy",
-    "Ice/objects",
-    "Ice/operations",
-    "Ice/optional",
-    "Ice/packagemd",
-    //"Ice/plugin",
-    //"Ice/properties",
-    "Ice/proxy",
-    "Ice/retry",
-    "Ice/seqMapping",
-    "Ice/serialize",
-    "Ice/servantLocator",
-    "Ice/slicing/exceptions",
-    "Ice/slicing/objects",
-    "Ice/stream",
-    "Ice/threadPoolPriority",
-    //"Ice/throughput",
-    "Ice/timeout",
-    "Ice/udp" ]
diff -Nru zeroc-ice-3.7.1/java/android/gradle.properties zeroc-ice-3.7.2/java/android/gradle.properties
--- zeroc-ice-3.7.1/java/android/gradle.properties	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/gradle.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-//
-// Version used in JAR files
-//
-iceVersion = 3.7.1
-
-// The Android versions used for the Ice build.
-ice_buildToolsVersion = 27.0.3
-ice_compileSdkVersion = 24
-ice_minSdkVersion = 24
-ice_targetSdkVersion = 24
-
-//
-// Set iceHome to location of Ice installation if Ice was installed in a
-// non-standard location. You must use forward slashes in the path, even on
-// Windows.
-//
-// iceHome =
-
-//
-// Set the version of the Ice Builder to use for building. It must be set to debian
-// when using the gradle-ice-builder-plugin package on Debian.
-//
-iceBuilderVersion = 1.4.5
-
-//
-// Set the builder artifact class path. It must be set to com.zeroc.gradle.ice-builder
-// when using the gradle-ice-builder-plugin package.
-//
-iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder
-
-//
-// Set the location of a local Ice Builder for Gradle source directory
-//
-iceBuilderHome =
-
-//
-// Gradle build properties
-//
-org.gradle.daemon = true
-
-//
-// Package build properties
-//
-DESTDIR =
-appendVersionSuffix = yes
-prefix =
-debug = true
-
-//
-// Windows specific options
-//
-
-//
-// The platform used by the C++ build. Supported values are `x64` and `Win32`.
-// This is required to locate the slice2java compiler in the platform-dependent
-// directory.
-//
-cppPlatform = x64
-
-//
-// The configuration used by the C++ build. Supported values are `Debug` and `Release`.
-// This is required to locate the slice2java compiler in the configuration-dependent
-// directory.
-//
-cppConfiguration = Release
diff -Nru zeroc-ice-3.7.1/java/android/README.md zeroc-ice-3.7.2/java/android/README.md
--- zeroc-ice-3.7.1/java/android/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-# Building the Ice for Android Test Suite
-
-This directory contains an Android Studio project for the Ice test suite. For
-ease of development and testing, this project also builds a subset of the Ice
-JAR files. This is not necessary for your own projects as it considerably
-complicates the project configuration.
-
-Building [Ice for Java](../README.md) is the only way to build all of the Ice
-JAR files from source. The JAR files produced by the Ice for Java build fully
-support Android. If you prefer, our [binary distributions][1] include
-pre-compiled JAR files.
-
-## Build Requirements
-
-### Android Development Tools
-
-Building any Ice application for Android requires Android Studio and the Android
-SDK build tools. We tested with the following components:
-
-- Android Studio 3.0.1
-- Android SDK 24
-- Android Build Tools 27.0.1
-
-Using Ice's Java mapping with Java 8 requires at minimum API level 24:
-
-- Android 7 (API24)
-
-If you want to target a later version of the Android API level for the test
-suite, edit `gradle.properties` and change the following variables:
-
-```
-ice_compileSdkVersion
-ice_minSdkVersion
-ice_targetSdkVersion
-```
-
-*NOTE: Do not use Android Studio to modify the project's settings.*
-
-### Slice to Java Compiler
-
-To build this project you'll need the Slice to Java compiler, which generates
-Java code from Slice definitions. The compiler is written in C++. If you have
-a suitable C++ development environment, you can build [Ice for C++](../../cpp)
-yourself. Otherwise, you can obtain the compiler by installing a
-[binary distribution][1].
-
-The project's Gradle-based build system will automatically search for the
-compiler in this repository and in the default installation directories used
-by the binary distributions for our supported platforms.
-
-### Bzip2 Compression
-
-Ice for Java supports protocol compression using the bzip2 classes included
-with [Apache Commons Compress][2].
-
-The Maven package id for the commons-compress JAR file is as follows:
-
-```
-groupId=org.apache.commons, version=1.14, artifactId=commons-compress
-```
-
-The demos and tests are automatically setup to enable protocol compression by
-adding the commons-compress JAR to the manifest class path. For your own
-applications you must add the commons-compress JAR to the application CLASSPATH
-to enable protocol compression.
-
-> *These classes are a pure Java implementation of the bzip2 algorithm and
-therefore add significant latency to Ice requests.*
-
-## Building the Project
-
-Follow these steps to open the project in Android Studio:
-
-1. Start Android Studio
-2. Select "Open an existing Android Studio project"
-3. Navigate to and select the "android" subdirectory
-4. Click OK and wait for the project to open and build
-
-## Running the Test Suite
-
-The Android Studio project contains a `testController` app for the Ice test
-suite. Prior to running the app, you must disable Android Studio's Instant Run
-feature, located in File / Settings / Build, Execution, Deployment /
-Instant Run.
-
-Tests are started from the dev machine using the `allTests.py` script, similar
-to the other language mappings. The script uses Ice for Python to communicate
-with the Android app, therefore you must build the [Python mapping]
-(../../python) before continuing.
-
-You also need to add the `tools\bin`, `platform-tools` and `emulator`
-directories from the Android SDK to your PATH. On macOS, you can use the
-following commands:
-
-```
-export PATH=~/Library/Android/sdk/tools/bin:$PATH
-export PATH=~/Library/Android/sdk/platform-tools:$PATH
-export PATH=~/Library/Android/sdk/emulator:$PATH
-```
-
-On Windows, you can use the following commands:
-
-```
-set PATH=%LOCALAPPDATA%\Android\sdk\tools;%PATH%
-set PATH=%LOCALAPPDATA%\Android\sdk\platform-tools;%PATH%
-set PATH=%LOCALAPPDATA%\Android\sdk\emulator;%PATH%
-```
-
-Run the tests with the Android emulator by running the following command:
-
-```
-cd android
-python allTests.py --androidemulator --controller-app
-```
-
-To run the tests on a specific Android connected device, you can use the
-`--device` argument as shown below:
-
-```
-python allTests.py --device=ZX1C2234XF --controller-app
-```
-
-You can see the list of connected devices with the `adb` command:
-
-```
-adb devices -l
-```
-
-To run the tests against a `testController` application started from Android
-Studio you should omit the `--controller-app` option from the commands above.
-
-[1]: https://zeroc.com/distributions/ice
-[2]: https://commons.apache.org/proper/commons-compress/
diff -Nru zeroc-ice-3.7.1/java/android/settings.gradle zeroc-ice-3.7.2/java/android/settings.gradle
--- zeroc-ice-3.7.1/java/android/settings.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/settings.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply from: "$rootProject.projectDir/gradle/tests.gradle"
-
-// Main source
-include ':ice'
-project(':ice').projectDir = new File('src/Ice')
-include ':icessl'
-project(':icessl').projectDir = new File('src/IceSSL')
-include ':icediscovery'
-project(':icediscovery').projectDir = new File('src/IceDiscovery')
-include ':icebt'
-project(':icebt').projectDir = new File('src/IceBT')
-include ':test', ':testController'
-project(':test').projectDir = new File('test')
-project(':testController').projectDir = new File('controller')
-tests.each {
-    def name = it.replace("/", "_")
-    include ":test_${name}"
-    project(":test_${name}").projectDir = new File("test/src/test_${name}")
-}
diff -Nru zeroc-ice-3.7.1/java/android/src/Ice/build.gradle zeroc-ice-3.7.2/java/android/src/Ice/build.gradle
--- zeroc-ice-3.7.1/java/android/src/Ice/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/src/Ice/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-apply from: "$project.ext.topSrcDir/java/src/Ice/build.gradle"
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java/src/Ice/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/android/src/IceBT/build.gradle zeroc-ice-3.7.2/java/android/src/IceBT/build.gradle
--- zeroc-ice-3.7.1/java/android/src/IceBT/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/src/IceBT/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-apply from: "$project.ext.topSrcDir/java/src/IceBT/build.gradle"
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java/src/IceBT/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/android/src/IceDiscovery/build.gradle zeroc-ice-3.7.2/java/android/src/IceDiscovery/build.gradle
--- zeroc-ice-3.7.1/java/android/src/IceDiscovery/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/src/IceDiscovery/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-apply from: "$project.ext.topSrcDir/java/src/IceDiscovery/build.gradle"
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java/src/IceDiscovery/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/android/src/IceSSL/build.gradle zeroc-ice-3.7.2/java/android/src/IceSSL/build.gradle
--- zeroc-ice-3.7.1/java/android/src/IceSSL/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/src/IceSSL/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-apply from: "$project.ext.topSrcDir/java/src/IceSSL/build.gradle"
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java/src/IceSSL/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/android/test/build.gradle zeroc-ice-3.7.2/java/android/test/build.gradle
--- zeroc-ice-3.7.1/java/android/test/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/test/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
- //**********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$rootProject.projectDir/../gradle/ice.gradle"
-ext.testDir = "$rootProject.projectDir/../test/src/main/java/test"
-apply from: "slice.gradle"
-apply from: "$rootProject.projectDir/gradle/tests.gradle"
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
-
-sourceSets {
-    main {
-        java {
-            srcDir "$rootProject.projectDir/../test/src/main/java"
-            include 'test/Util/**'
-        }
-    }
-}
-
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
-dependencies {
-    compile localDependency('ice')
-}
-
-jar {
-    archiveName = "test.jar"
-}
-
-tests.each {
-    def dirName = it
-    def name = it.replace('/', '_')
-
-    project(":test_${name}") {
-        apply plugin: 'java'
-        apply from: "$rootProject.projectDir/../gradle/ice.gradle"
-
-        sourceCompatibility = iceSourceCompatibility
-        targetCompatibility = iceTargetCompatibility
-
-        sourceSets {
-            main {
-                java {
-                    srcDir "$rootProject.projectDir/../test/src/main/java"
-                    include "test/${dirName}/**"
-                    srcDir "$rootProject.projectDir/test/build/generated-src/"
-                    include "test/${dirName}/**"
-                }
-            }
-        }
-
-        dependencies {
-            compile project(':test')
-            compile localDependency('ice')
-            compile localDependency('icessl')
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/android/test/slice.gradle zeroc-ice-3.7.2/java/android/test/slice.gradle
--- zeroc-ice-3.7.1/java/android/test/slice.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/android/test/slice.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-task testSliceTask {
-    slice {
-        java {
-            set1 {
-                files = fileTree(dir: testDir, includes:['Ice/acm/*.ice',
-                                                     'Ice/adapterDeactivation/*.ice',
-                                                     'Ice/ami/*.ice',
-                                                     'Ice/admin/*.ice',
-                                                     'Ice/background/*.ice',
-                                                     'Ice/binding/*.ice',
-                                                     'Ice/classLoader/*.ice',
-                                                     'Ice/custom/*.ice',
-                                                     'Ice/defaultServant/*.ice',
-                                                     'Ice/defaultValue/*.ice',
-                                                     'Ice/dispatcher/*.ice',
-                                                     'Ice/enums/*.ice',
-                                                     'Ice/exceptions/*.ice',
-                                                     'Ice/facets/*.ice',
-                                                     'Ice/hash/*.ice',
-                                                     'Ice/hold/*.ice',
-                                                     'Ice/info/*.ice',
-                                                     'Ice/inheritance/*.ice',
-                                                     'Ice/interceptor/*.ice',
-                                                     'Ice/interrupt/*.ice',
-                                                     'Ice/invoke/*.ice',
-                                                     'Ice/location/*.ice',
-                                                     'Ice/networkProxy/*.ice',
-                                                     'Ice/objects/*.ice',
-                                                     'Ice/operations/*.ice',
-                                                     'Ice/optional/*.ice',
-                                                     'Ice/proxy/*.ice',
-                                                     'Ice/retry/*.ice',
-                                                     'Ice/seqMapping/*.ice',
-                                                     'Ice/serialize/*.ice',
-                                                     'Ice/servantLocator/*.ice',
-                                                     'Ice/slicing/exceptions/*.ice',
-                                                     'Ice/slicing/objects/*.ice',
-                                                     'Ice/stream/*.ice',
-                                                     'Ice/threadPoolPriority/*.ice',
-                                                     'Ice/timeout/*.ice',
-                                                     'Ice/udp/*.ice'])
-            }
-            set2 {
-                args = "--checksum test.Ice.checksum.Test.SliceChecksums"
-                files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice',
-                                                     'Ice/checksum/Types.ice'])
-            }
-            set3 {
-                args = "--checksum test.Ice.checksum.server.Test.SliceChecksums"
-                files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice',
-                                                     'Ice/checksum/TypesServer.ice'])
-            }
-            set4 {
-                include = ["${testDir}/Ice/packagemd"]
-                files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice'])
-            }
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/build.gradle zeroc-ice-3.7.2/java/build.gradle
--- zeroc-ice-3.7.1/java/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 subprojects {
     project.ext.topSrcDir = "$rootProject.projectDir/.."
@@ -18,7 +13,7 @@
     apply from: "$rootProject.projectDir/gradle/ice.gradle"
 
     repositories {
-        if (slice.jarDir) {
+        if(slice.jarDir) {
             flatDir {
                 name "local"
                 dirs slice.jarDir
@@ -38,13 +33,6 @@
         }
 
         mavenCentral()
-
-        //
-        // The thirdparty repository is required on macOS for appblunder
-        //
-        maven {
-            url 'https://repo.zeroc.com/nexus/content/repositories/thirdparty'
-        }
     }
 
     jar {
@@ -65,6 +53,43 @@
     }
 }
 
+def exportedProjects = [
+    ":glacier2",
+    ":ice",
+    ":icebox",
+    ":icebt",
+    ":icegrid",
+    ":icepatch2",
+    ":icessl",
+    ":icestorm"
+    ]
+
+task alljavadoc(type: Javadoc) {
+
+    // We rely on Java9+ javadoc features
+    enabled = JavaVersion.current() > JavaVersion.VERSION_1_8
+
+    source exportedProjects.collect { project(it).javadoc.source }
+    classpath = files(exportedProjects.collect { project(it).javadoc.classpath })
+    destinationDir = file("${buildDir}/docs/javadoc")
+
+    if(GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) {
+        // TODO: --no-module-directories is an undocumented option required for the
+        // generated search to work properly. Without this option, search returns
+        // .../undefined/... URLs.
+        options.addBooleanOption('-no-module-directories', true)
+    }
+    options.addBooleanOption('html5', true)
+    options.header = 'Ice for Java'
+    options.docTitle = "Ice ${iceVersion} API Reference"
+}
+
+alljavadoc.dependsOn = exportedProjects.collect { project(it).javadoc.dependsOn }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
 task dist()
 dist.dependsOn(project(":ice").assemble)
 dist.dependsOn(project(":icessl").assemble)
@@ -82,6 +107,6 @@
 // Used to build the gradle wrapper to automatically download and install
 // the version of gradle needed to build Ice.
 //
-task wrapper(type: Wrapper) {
-    gradleVersion = "4.7"
+wrapper {
+    gradleVersion = "4.10.2"
 }
diff -Nru zeroc-ice-3.7.1/java/.gitignore zeroc-ice-3.7.2/java/.gitignore
--- zeroc-ice-3.7.1/java/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -3,3 +3,4 @@
 .gradle
 *.iml
 .idea
+local.properties
diff -Nru zeroc-ice-3.7.1/java/gradle/ice.gradle zeroc-ice-3.7.2/java/gradle/ice.gradle
--- zeroc-ice-3.7.1/java/gradle/ice.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/gradle/ice.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 buildscript {
     //
@@ -46,42 +41,45 @@
 // from gradle-ice-builder-plugin package and this is not possible when using gradle 3.2
 // included in stretch and the Plugin DSL.
 //
-if (!project.plugins.findPlugin(com.zeroc.gradle.icebuilder.slice.SlicePlugin)) {
-    project.apply(plugin: com.zeroc.gradle.icebuilder.slice.SlicePlugin)
-}
+project.apply(plugin: com.zeroc.gradle.icebuilder.slice.SlicePlugin)
 
 slice {
-    cppConfiguration = this.cppConfiguration
-    cppPlatform = this.cppPlatform
+    cppConfiguration = project.cppConfiguration
+    cppPlatform = project.cppPlatform
     if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) {
-        iceHome =  this.hasProperty('iceHome') ? this.iceHome
+        iceHome =  project.hasProperty('iceHome') ? project.iceHome
             : System.getenv("ICE_HOME") != null ? System.env.ICE_HOME : new File(project.ext.topSrcDir).getCanonicalPath()
     }
 }
 
-ext.generatedDir = "$project.buildDir/generated"
-
 // Android does not have a compileJava task
 if(!(project.hasProperty('android') && project.android.sourceSets)) {
     compileJava {
+        // target Java 8 using the --release option introduced in Java 9
+        if(JavaVersion.current() > JavaVersion.VERSION_1_8) {
+            options.compilerArgs.addAll(['--release', "${targetJavaRelease}"])
+        }
         options.debug = debug
     }
 }
 
-def env = System.getenv()
+// The corresponding -source and -target javac options are suppressed by gradle when
+// --release is set through options.compileArgs (see above).
+sourceCompatibility = "1.${targetJavaRelease}"
+targetCompatibility = "1.${targetJavaRelease}"
 
 // Determine the name of the Slice-to-Java translator
 def isWindows = System.properties['os.name'].toLowerCase().contains('windows')
 
 // If the prefix isn't set use these default locations.
-if (!prefix) {
+if(!prefix) {
     def prefixVersion = iceVersion
     if(prefixVersion.indexOf(".0-alpha")){
         prefixVersion = prefixVersion.replace(".0-alpha", "a")
     } else if(prefixVersion.indexOf(".0-beta")){
         prefixVersion = prefixVersion.replace(".0-beta", "b")
     }
-    if (isWindows) {
+    if(isWindows) {
         prefix = "C:\\Ice-${prefixVersion}"
     } else {
         prefix = "/opt/Ice-${prefixVersion}"
@@ -92,7 +90,7 @@
 //
 // Note that we exclude /usr/src/packages because it's the RPM build directory on SLES.
 //
-if ((prefix.startsWith("/usr") || prefix.startsWith("/usr/local")) && !prefix.startsWith("/usr/src/packages")) {
+if((prefix.startsWith("/usr") || prefix.startsWith("/usr/local")) && !prefix.startsWith("/usr/src/packages")) {
     ext.jarDir = prefix + "/share/java"
     ext.binDir = prefix + "/bin"
 } else {
@@ -101,16 +99,12 @@
 }
 
 // Check is DESTDIR is set (non-Windows)
-if (isWindows) {
+if(isWindows) {
     ext.DESTDIR = ""
 }
 
-ext.versionSuffix = "-${project.version}"
 ext.libDir = "$rootProject.projectDir/lib"
 
-ext.iceSourceCompatibility = 1.8
-ext.iceTargetCompatibility = 1.8
-
 ext.searchFile = { List<Closure> places, List<String> searchPaths ->
     def dirs = []
     places.each {
@@ -132,8 +126,10 @@
     }
 }
 
+// Used for the tests
+//
 ext.localDependency = { artifactId ->
-    if (project.slice.srcDist || System.env.ICE_BIN_DIST == "cpp") {
+    if(project.slice.srcDist || System.env.ICE_BIN_DIST == "cpp") {
         return project(":${artifactId}")
     } else {
         return "com.zeroc:${artifactId}:${project.version}"
diff -Nru zeroc-ice-3.7.1/java/gradle/library.gradle zeroc-ice-3.7.2/java/gradle/library.gradle
--- zeroc-ice-3.7.1/java/gradle/library.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/gradle/library.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 apply plugin: 'maven'
 apply plugin: 'signing'
@@ -71,13 +66,22 @@
 
 assemble.dependsOn(jarSources)
 
+javadoc.dependsOn(compileSlice)
+
 javadoc {
-    failOnError = false
+    // We rely on Java9+ javadoc features
+    enabled = JavaVersion.current() > JavaVersion.VERSION_1_8
+
+    failOnError = true
     options.header = project.ext.displayName
-    if(JavaVersion.current() > JavaVersion.VERSION_1_8) {
-        // Add -quiet to workaround Gradle bug https://github.com/gradle/gradle/issues/2354
-        options.addStringOption("html4", "-quiet")
+
+    if(GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) {
+        // TODO: --no-module-directories is an undocumented option required for the
+        // generated search to work properly. Without this option, search returns
+        // .../undefined/... URLs.
+        options.addBooleanOption('-no-module-directories', true)
     }
+    options.addBooleanOption('html5', true)
     classpath = project.sourceSets.main.compileClasspath
 }
 
@@ -129,7 +133,7 @@
 
 jar {
     manifest {
-        attributes("Class-Path": configurations.runtime.resolve().collect{ "${it.name}" }.join(' '))
+        attributes("Class-Path": configurations.runtimeClasspath.resolve().collect{ "${it.name}" }.join(' '))
     }
 }
 
diff -Nru zeroc-ice-3.7.1/java/gradle.properties zeroc-ice-3.7.2/java/gradle.properties
--- zeroc-ice-3.7.1/java/gradle.properties	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/gradle.properties	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Version used in JAR files
 //
-iceVersion = 3.7.1
+iceVersion = 3.7.2
 
 //
 // Select an installation base directory. The directory will be created
@@ -22,6 +17,17 @@
 prefix =
 
 //
+// Used to set --release (with javac >=9) or -source/-target with older javac versions.
+//
+targetJavaRelease = 8
+
+//
+// Define debug as true if you want to build with debug information,
+// false otherwise.
+//
+debug = true
+
+//
 // The Jgoodies third party package versions to use with IceGridGUI builds.
 //
 jgoodiesLooksVersion = 2.7.0
@@ -34,16 +40,10 @@
 icegridguiProguard = true
 
 //
-// Define debug as true if you want to build with debug information,
-// false otherwise.
-//
-debug = true
-
-//
 // Set the version of the Ice Builder to use for building. It must be set to debian
 // when using the gradle-ice-builder-plugin package on Debian.
 //
-iceBuilderVersion = 1.4.5
+iceBuilderVersion = 1.4.7
 
 //
 // Set the builder artifact class path. It must be set to com.zeroc.gradle.ice-builder
diff -Nru zeroc-ice-3.7.1/java/Makefile zeroc-ice-3.7.2/java/Makefile
--- zeroc-ice-3.7.1/java/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 ifeq ($(GRADLE),)
 GRADLE = ./gradlew
diff -Nru zeroc-ice-3.7.1/java/README.md zeroc-ice-3.7.2/java/README.md
--- zeroc-ice-3.7.1/java/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -12,11 +12,10 @@
   * [JGoodies](#jgoodies)
   * [ProGuard](#proguard)
   * [Java Application Bundler](#java-application-bundler)
-* [Compiling Ice for Java](#compiling-ice-for-java)
-  * [Preparing to Build](#preparing-to-build)
-  * [Building Ice for Java](#building-ice-for-java-1)
+* [Building Ice for Java](#building-ice-for-java-1)
 * [Installing Ice for Java](#installing-ice-for-java)
 * [Running the Java Tests](#running-the-java-tests)
+* [Building the Ice for Android Tests](#building-the-ice-for-android-tests)
 * [IceGrid GUI Tool](#icegrid-gui-tool)
 
 ## Build Requirements
@@ -50,12 +49,9 @@
 ### Gradle
 
 Ice for Java uses the [Gradle][3] build system, and includes the Gradle wrapper
-version 2.4 in the distribution. You cannot build the Ice for Java source
-distribution without an Internet connection. Gradle will download all required
-distribution without an Internet connection. Gradle will download all required
-packages automatically from ZeroC's Maven repository located at
-
-    https://repo.zeroc.com/nexus/content/repositories/thirdparty
+in the distribution. You cannot build the Ice for Java source distribution without
+an Internet connection. Gradle will download all required packages automatically
+from Maven Central repository located at http://central.maven.org/maven2/
 
 ### Bzip2 Compression
 
@@ -64,7 +60,9 @@
 
 The Maven package id for the commons-compress JAR file is as follows:
 
-    groupId=org.apache.commons, version=1.14, artifactId=commons-compress
+```
+groupId=org.apache.commons, version=1.14, artifactId=commons-compress
+```
 
 The demos and tests are automatically setup to enable protocol compression by
 adding the commons-compress JAR to the manifest class path. For your own
@@ -79,13 +77,17 @@
 The IceGrid GUI tool uses the JGoodies libraries Forms and Looks. The following
 versions were tested:
 
-    JGoodies Forms 1.9.0
-    JGoodies Looks 2.7.0
+```
+JGoodies Forms 1.9.0
+JGoodies Looks 2.7.0
+```
 
 The Maven package ids for the JGoodies packages are as follows:
 
-    groupId=com.jgoodies, version=1.9.0, artifactId=jgoodies-forms
-    groupId=com.jgoodies, version=2.7.0, artifactId=jgoodies-looks
+```
+groupId=com.jgoodies, version=1.9.0, artifactId=jgoodies-forms
+groupId=com.jgoodies, version=2.7.0, artifactId=jgoodies-looks
+```
 
 ### ProGuard
 
@@ -94,7 +96,9 @@
 
 The Maven package id for the ProGuard package is as follows:
 
-    groupId='net.sf.proguard', artifactId='proguard-gradle', version='6.0'
+```
+groupId='net.sf.proguard', artifactId='proguard-gradle', version='6.0'
+```
 
 ### Java Application Bundler
 
@@ -103,11 +107,11 @@
 
 The Maven package id for the application bundler package is as follows:
 
-    groupId=com.oracle, version=1.0, artifactId=appbundler
-
-## Compiling Ice for Java
+```
+groupId=com.panayotis, version=1.0.2, artifactId=appbundler
+```
 
-### Preparing to Build
+## Building Ice for Java
 
 The build system requires the Slice to Java compiler from Ice for C++. If you
 have not built Ice for C++ in this source distribution, you must set the
@@ -122,7 +126,7 @@
 On Windows with an MSI installation:
 ```
 set ICE_BIN_DIST=cpp
-set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.1
+set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.2
 ```
 
 If you are using Ice for C++ from a source build on Windows, you must set
@@ -136,10 +140,8 @@
 The supported values for `CPP_PLATFORM` are `Win32` and `x64` and the supported
 values for `CPP_CONFIGURATION` are `Debug` and `Release`.
 
-Before building Ice for Java, review the settings in the file
-`gradle.properties` and edit as necessary.
-
-### Building Ice for Java
+Before building Ice for Java, review the settings in the file `gradle.properties`
+and edit as necessary.
 
 To build Ice, all services, and tests, run
 ```
@@ -165,17 +167,19 @@
 
 The following JAR files will be installed to `<prefix>/lib`.
 
-    glacier2-3.7.1.jar
-    ice-3.7.1.jar
-    icebox-3.7.1.jar
-    icebt-3.7.1.jar
-    icediscovery-3.7.1.jar
-    icegrid-3.7.1.jar
-    icegridgui.jar
-    icelocatordiscovery-3.7.1.jar
-    icepatch2-3.7.1.jar
-    icessl-3.7.1.jar
-    icestorm-3.7.1.jar
+```
+glacier2-3.7.2.jar
+ice-3.7.2.jar
+icebox-3.7.2.jar
+icebt-3.7.2.jar
+icediscovery-3.7.2.jar
+icegrid-3.7.2.jar
+icegridgui.jar
+icelocatordiscovery-3.7.2.jar
+icepatch2-3.7.2.jar
+icessl-3.7.2.jar
+icestorm-3.7.2.jar
+```
 
 POM files are also installed for ease of deployment to a Maven-based
 distribution system.
@@ -187,13 +191,13 @@
 then you must set the `ICE_HOME` environment variable with the path name of your
 Ice installation. On Unix:
 ```
-export ICE_HOME=/opt/Ice-3.7.1 (For local build)
+export ICE_HOME=/opt/Ice-3.7.2 (For local build)
 export ICE_HOME=/usr (For RPM installation)
 ```
 
 On Windows:
 ```
-set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.1
+set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.2
 ```
 
 Python is required to run the test suite. To run the tests, open a command
@@ -205,6 +209,99 @@
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
 
+## Building the Ice for Android Tests
+
+The `test/android/controller` directory contains an Android Studio project for
+the Ice test suite controller.
+
+### Android Build Requirements
+
+Building any Ice application for Android requires Android Studio and the Android
+SDK build tools. We tested with the following components:
+
+- Android Studio 3.2.1
+- Android SDK 24
+- Android Build Tools 27.0.1
+
+Using Ice's Java mapping with Java 8 requires at minimum API level 24:
+
+- Android 7 (API24)
+
+If you want to target a later version of the Android API level for the test
+suite, edit `test/android/controller/gradle.properties` and change the
+following variables:
+
+```
+ice_compileSdkVersion
+ice_minSdkVersion
+ice_targetSdkVersion
+```
+
+*NOTE: Do not use Android Studio to modify the project's settings.*
+
+### Building the Android Test Controller
+
+You must first build Ice for Java refer to [Building Ice for Java](#building-ice-for-java-1)
+for instructions, then follow these steps:
+
+1. Start Android Studio
+2. Select "Open an existing Android Studio project"
+3. Navigate to and select the "java/test/android/controller" subdirectory
+4. Click OK and wait for the project to open and build
+
+### Running the Android Test Suite
+
+The Android Studio project contains a `controller` app for the Ice test
+suite. Prior to running the app, you must disable Android Studio's Instant Run
+feature, located in File / Settings / Build, Execution, Deployment /
+Instant Run.
+
+Tests are started from the dev machine using the `allTests.py` script, similar
+to the other language mappings. The script uses Ice for Python to communicate
+with the Android app, therefore you must build the [Python mapping]
+(../python) before continuing.
+
+You also need to add the `tools\bin`, `platform-tools` and `emulator`
+directories from the Android SDK to your PATH. On macOS, you can use the
+following commands:
+
+```
+export PATH=~/Library/Android/sdk/tools/bin:$PATH
+export PATH=~/Library/Android/sdk/platform-tools:$PATH
+export PATH=~/Library/Android/sdk/emulator:$PATH
+```
+
+On Windows, you can use the following commands:
+
+```
+set PATH=%LOCALAPPDATA%\Android\sdk\tools\bin;%PATH%
+set PATH=%LOCALAPPDATA%\Android\sdk\platform-tools;%PATH%
+set PATH=%LOCALAPPDATA%\Android\sdk\emulator;%PATH%
+```
+
+Run the tests with the Android emulator by running the following command:
+
+```
+python allTests.py --android --controller-app
+```
+
+To run the tests on a Android device connected through USB, you can use
+the `--device=usb` option as shown below:
+
+```
+python allTests.py --android --device=usb --controller-app
+```
+
+To connect to an Android device that is running adb you can use the
+`--device=<ip-address>`
+
+```
+python allTests.py --android --device=<ip-address> --controller-app
+```
+
+To run the tests against a `controller` application started from Android
+Studio you should omit the `--controller-app` option from the commands above.
+
 ## IceGrid GUI Tool
 
 Ice for Java includes the IceGrid GUI tool. It can be found in the file
@@ -221,7 +318,7 @@
 Finder.
 
 [1]: https://zeroc.com/distributions/ice
-[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.1
+[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2
 [3]: https://gradle.org
 [4]: http://proguard.sourceforge.net
 [5]: https://commons.apache.org/proper/commons-compress/
diff -Nru zeroc-ice-3.7.1/java/.settings/org.eclipse.jdt.core.prefs zeroc-ice-3.7.2/java/.settings/org.eclipse.jdt.core.prefs
--- zeroc-ice-3.7.1/java/.settings/org.eclipse.jdt.core.prefs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00.000000000 +0000
@@ -1,384 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff -Nru zeroc-ice-3.7.1/java/.settings/org.eclipse.jdt.ui.prefs zeroc-ice-3.7.2/java/.settings/org.eclipse.jdt.ui.prefs
--- zeroc-ice-3.7.1/java/.settings/org.eclipse.jdt.ui.prefs	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/.settings/org.eclipse.jdt.ui.prefs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-formatter_profile=_ZeroC
-formatter_settings_version=12
diff -Nru zeroc-ice-3.7.1/java/settings.gradle zeroc-ice-3.7.2/java/settings.gradle
--- zeroc-ice-3.7.1/java/settings.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/settings.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Main source
 include ':ice'
@@ -33,7 +28,6 @@
 
 // Tests
 include ':test'
+
 include ':testPlugins'
 project(':testPlugins').projectDir = new File('test/plugins')
-include ':testController'
-project(':testController').projectDir = new File('test/controller')
diff -Nru zeroc-ice-3.7.1/java/src/Glacier2/build.gradle zeroc-ice-3.7.2/java/src/Glacier2/build.gradle
--- zeroc-ice-3.7.1/java/src/Glacier2/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Glacier2/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "Glacier2"
 project.ext.description = "Firewall traversal for Ice"
@@ -24,15 +16,13 @@
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.Glacier2.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.Glacier2.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java
--- zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/package-info.java zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/package-info.java
--- zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for clients of the Glacier2 firewall traversal service.
+ **/
+package com.zeroc.Glacier2;
diff -Nru zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionCallback.java zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionCallback.java
--- zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionFactoryHelper.java zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionFactoryHelper.java
--- zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionFactoryHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionFactoryHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java
--- zeroc-ice-3.7.1/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/build.gradle zeroc-ice-3.7.2/java/src/Ice/build.gradle
--- zeroc-ice-3.7.1/java/src/Ice/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "Ice"
 project.ext.description = "Ice is a comprehensive RPC framework that helps you build distributed applications" +
@@ -16,14 +8,23 @@
 
 slice {
     java {
-        stream {
-            files = [file("$project.ext.topSrcDir/slice/Ice/BuiltinSequences.ice")]
-        }
-        nostream {
-            files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['Ice/*.ice'],
-                excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice'])
-        }
+        files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['Ice/*.ice'],
+                excludes:['Ice/*F.ice'])
     }
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
+
+//
+// Unfortunately we can't simply process Ice classes through javadoc as
+// they use various public IceInternal and IceUtilInternal classes. So
+// we first compile everything then use these compiled classes to javadoc
+// the code we want to document. A handful of public Ice classes (other
+// than the *I.java classes) are also marked @hidden.
+//
+javadoc.dependsOn(compileJava)
+
+javadoc {
+    classpath = project.sourceSets.main.output
+    excludes = ["**/IceInternal/*.java", "**/IceUtilInternal/*.java", "**/Ice/*I.java"]
+}
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Application.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Application.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Application.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Application.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -564,6 +559,7 @@
     }
 
     // For use by Glacier2.Application
+    /** @hidden */
     static public class AppHook extends Thread
     {
         public void
@@ -687,12 +683,27 @@
         private Runnable _hook;
     }
 
+    /** @hidden */
     protected static String _appName;
+
+    /** @hidden */
     protected static Communicator _communicator;
+
+    /** @hidden */
     protected static AppHook _appHook;
+
+    /** @hidden */
     protected final static java.lang.Object _mutex = new java.lang.Object();
+
+    /** @hidden */
     protected static boolean _callbackInProgress = false;
+
+    /** @hidden */
     protected static boolean _destroyed = false;
+
+    /** @hidden */
     protected static boolean _interrupted = false;
+
+    /** @hidden */
     protected static SignalPolicy _signalPolicy = SignalPolicy.HandleSignals;
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequestInterceptor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequestInterceptor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequestInterceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequestInterceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequest.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequest.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequest.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/BatchRequest.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
+/**
+ * Represents an invocation on a proxy configured for batch-oneway or batch-datagram.
+ **/
 public interface BatchRequest
 {
     /**
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/BlobjectAsync.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -43,6 +38,7 @@
     CompletionStage<Object.Ice_invokeResult> ice_invokeAsync(byte[] inEncaps, Current current)
         throws UserException;
 
+    /** @hidden */
     @Override
     default CompletionStage<OutputStream> _iceDispatch(com.zeroc.IceInternal.Incoming in, Current current)
         throws UserException
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Blobject.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -37,6 +32,7 @@
     com.zeroc.Ice.Object.Ice_invokeResult ice_invoke(byte[] inEncaps, Current current)
         throws UserException;
 
+    /** @hidden */
     @Override
     default CompletionStage<OutputStream> _iceDispatch(com.zeroc.IceInternal.Incoming in, Current current)
         throws UserException
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/CommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -245,25 +240,13 @@
 
     private com.zeroc.IceInternal.CommunicatorFlushBatch _iceI_flushBatchRequestsAsync(CompressBatch compressBatch)
     {
-        com.zeroc.IceInternal.OutgoingConnectionFactory connectionFactory = _instance.outgoingConnectionFactory();
-        com.zeroc.IceInternal.ObjectAdapterFactory adapterFactory = _instance.objectAdapterFactory();
-
         //
         // This callback object receives the results of all invocations
         // of Connection.begin_flushBatchRequests.
         //
         com.zeroc.IceInternal.CommunicatorFlushBatch f =
             new com.zeroc.IceInternal.CommunicatorFlushBatch(this, _instance);
-
-        connectionFactory.flushAsyncBatchRequests(compressBatch, f);
-        adapterFactory.flushAsyncBatchRequests(compressBatch, f);
-
-        //
-        // Inform the callback that we have finished initiating all of the
-        // flush requests.
-        //
-        f.ready();
-
+        f.invoke(compressBatch);
         return f;
     }
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/DispatchInterceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -36,6 +31,7 @@
     public abstract CompletionStage<OutputStream> dispatch(Request request)
         throws UserException;
 
+    /** @hidden */
     @Override
     public CompletionStage<OutputStream> _iceDispatch(com.zeroc.IceInternal.Incoming in, Current current)
         throws UserException
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Exception.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Exception.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Exception.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Exception.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/FormatType.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/FormatType.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/FormatType.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/FormatType.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ImplicitContextI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ImplicitContextI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ImplicitContextI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ImplicitContextI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InitializationData.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InitializationData.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InitializationData.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InitializationData.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -16,8 +11,8 @@
 import com.zeroc.IceInternal.Protocol;
 
 /**
- * Interface for input streams used to extract Slice types from a sequence
- * of bytes.
+ * Interface to read sequence of bytes encoded using the Ice encoding and
+ * recreate the corresponding Slice types.
  *
  * @see OutputStream
  **/
@@ -3549,6 +3544,7 @@
         }
     }
 
+    /** @hidden */
     @FunctionalInterface
     static public interface Unmarshaler
     {
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Instrumentation/package-info.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Instrumentation/package-info.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Instrumentation/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Instrumentation/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * Ice Instrumentation API, used to observe Ice internal components such as
+ * threads and connections.
+ **/
+package com.zeroc.Ice.Instrumentation;
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InterfaceByValue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -34,6 +29,7 @@
         return _id;
     }
 
+    /** @hidden */
     @Override
     protected void _iceWriteImpl(OutputStream ostr)
     {
@@ -41,6 +37,7 @@
         ostr.endSlice();
     }
 
+    /** @hidden */
     @Override
     protected void _iceReadImpl(InputStream istr)
     {
@@ -48,6 +45,7 @@
         istr.endSlice();
     }
 
+    /** @hidden */
     public static final long serialVersionUID = 0L;
 
     private String _id;
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InvocationFuture.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InvocationFuture.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/InvocationFuture.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/InvocationFuture.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/LocalException.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/LocalException.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/LocalException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/LocalException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerPlugin.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerPlugin.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerPlugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerPlugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/MarshaledResult.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/MarshaledResult.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/MarshaledResult.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/MarshaledResult.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
+/** @hidden */
 public interface MarshaledResult
 {
     OutputStream getOutputStream();
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/NativePropertiesAdmin.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/NativePropertiesAdmin.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/NativePropertiesAdmin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/NativePropertiesAdmin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
+/**
+ * Interface implemented by the Property admin facet. It allows users to add and remove
+ * callbacks that notify the application when Ice properties are updated at run time.
+ **/
 public interface NativePropertiesAdmin
 {
+    /**
+     * Adds a new update callback. The callback receives the updated properties each time
+     * the properties are updated.
+     * @param callback The new callback.
+     **/
     void addUpdateCallback(java.util.function.Consumer<java.util.Map<String, String>> callback);
+
+    /**
+     * Removes a previously registered update callback.
+     * @param callback The callback to remove.
+     **/
     void removeUpdateCallback(java.util.function.Consumer<java.util.Map<String, String>> callback);
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectInputStream.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectInputStream.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectInputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectInputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Object.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -18,6 +13,7 @@
  **/
 public interface Object
 {
+    /** @hidden */
     final static String[] _iceIds =
     {
         "::Ice::Object"
@@ -121,6 +117,7 @@
         return _iceIds[0];
     }
 
+    /** @hidden */
     final static String[] _iceOps =
     {
         "ice_id",
@@ -147,6 +144,13 @@
         return _iceDispatch(in, in.getCurrent());
     }
 
+    /**
+     * @hidden
+     * @param in -
+     * @param current -
+     * @return -
+     * @throws UserException -
+     **/
     default CompletionStage<OutputStream> _iceDispatch(Incoming in, Current current)
         throws UserException
     {
@@ -180,6 +184,10 @@
         throw new OperationNotExistException(current.id, current.facet, current.operation);
     }
 
+    /**
+     * @hidden
+     * @param ostr -
+     **/
     default void _iceWrite(OutputStream ostr)
     {
          ostr.startValue(null);
@@ -187,10 +195,18 @@
          ostr.endValue();
     }
 
+    /**
+     * @hidden
+     * @param ostr -
+     **/
     default void _iceWriteImpl(OutputStream ostr)
     {
     }
 
+    /**
+     * @hidden
+     * @param istr -
+     **/
     default void _iceRead(InputStream istr)
     {
          istr.startValue();
@@ -198,10 +214,21 @@
          istr.endValue(false);
     }
 
+    /**
+     * @hidden
+     * @param istr -
+     **/
     default void _iceReadImpl(InputStream istr)
     {
     }
 
+    /**
+     * @hidden
+     * @param obj -
+     * @param inS -
+     * @param current -
+     * @return -
+     **/
     static CompletionStage<OutputStream> _iceD_ice_isA(Object obj, Incoming inS, Current current)
     {
         InputStream istr = inS.startReadParams();
@@ -214,6 +241,13 @@
         return inS.setResult(ostr);
     }
 
+    /**
+     * @hidden
+     * @param obj -
+     * @param inS -
+     * @param current -
+     * @return -
+     **/
     static CompletionStage<OutputStream> _iceD_ice_ping(Object obj, Incoming inS, Current current)
     {
         inS.readEmptyParams();
@@ -221,6 +255,13 @@
         return inS.setResult(inS.writeEmptyParams());
     }
 
+    /**
+     * @hidden
+     * @param obj -
+     * @param inS -
+     * @param current -
+     * @return -
+     **/
     static CompletionStage<OutputStream> _iceD_ice_ids(Object obj, Incoming inS, Current current)
     {
         inS.readEmptyParams();
@@ -231,6 +272,13 @@
         return inS.setResult(ostr);
     }
 
+    /**
+     * @hidden
+     * @param obj -
+     * @param inS -
+     * @param current -
+     * @return -
+     **/
     static CompletionStage<OutputStream> _iceD_ice_id(Object obj, Incoming inS, Current current)
     {
         inS.readEmptyParams();
@@ -241,6 +289,11 @@
         return inS.setResult(ostr);
     }
 
+    /**
+     * @hidden
+     * @param mode -
+     * @return -
+     **/
     static String _iceOperationModeToString(OperationMode mode)
     {
         if(mode == OperationMode.Normal)
@@ -260,6 +313,11 @@
         return "???";
     }
 
+    /**
+     * @hidden
+     * @param expected -
+     * @param received -
+     **/
     static void _iceCheckMode(OperationMode expected, OperationMode received)
     {
         if(expected == null)
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxFactoryMethods.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxFactoryMethods.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxFactoryMethods.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxFactoryMethods.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
 /**
+ * @hidden
  * Provides overloads of the proxy factory methods with covariant return types
  * so that applications do not need to downcast to the derived proxy type.
  **/
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -711,6 +706,9 @@
     @Override
     boolean equals(java.lang.Object r);
 
+    /**
+     * The type ID of the target's interface: "::Ice::Object".
+     **/
     static final String ice_staticId = "::Ice::Object";
 
     /**
@@ -849,28 +847,80 @@
         return istr.readProxy();
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param id -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _checkedCast(ObjectPrx obj, String id, Class<T> proxy, Class<?> impl)
     {
         return _checkedCast(obj, false, null, noExplicitContext, id, proxy, impl);
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param ctx -
+     * @param id -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _checkedCast(ObjectPrx obj, java.util.Map<String, String> ctx, String id, Class<T> proxy,
                                Class<?> impl)
     {
         return _checkedCast(obj, false, null, ctx, id, proxy, impl);
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param facet -
+     * @param id -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _checkedCast(ObjectPrx obj, String facet, String id, Class<T> proxy, Class<?> impl)
     {
         return _checkedCast(obj, true, facet, noExplicitContext, id, proxy, impl);
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param facet -
+     * @param ctx -
+     * @param id -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _checkedCast(ObjectPrx obj, String facet, java.util.Map<String, String> ctx, String id,
                                Class<T> proxy, Class<?> impl)
     {
         return _checkedCast(obj, true, facet, ctx, id, proxy, impl);
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param explicitFacet -
+     * @param facet -
+     * @param ctx -
+     * @param id -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _checkedCast(ObjectPrx obj, boolean explicitFacet, String facet, java.util.Map<String, String> ctx,
                                String id, Class<T> proxy, Class<?> impl)
     {
@@ -925,16 +975,43 @@
         return r;
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _uncheckedCast(ObjectPrx obj, Class<T> proxy, Class<?> impl)
     {
         return _uncheckedCast(obj, false, null, proxy, impl);
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param facet -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _uncheckedCast(ObjectPrx obj, String facet, Class<T> proxy, Class<?> impl)
     {
         return _uncheckedCast(obj, true, facet, proxy, impl);
     }
 
+    /**
+     * @hidden
+     * @param <T> -
+     * @param obj -
+     * @param explicitFacet -
+     * @param facet -
+     * @param proxy -
+     * @param impl -
+     * @return -
+     **/
     static <T> T _uncheckedCast(ObjectPrx obj, boolean explicitFacet, String facet, Class<T> proxy, Class<?> impl)
     {
         T r = null;
@@ -982,16 +1059,46 @@
         return r;
     }
 
+    /**
+     * @hidden
+     * @param os -
+     **/
     void _write(OutputStream os);
+
+    /**
+     * @hidden
+     * @param p -
+     **/
     void _copyFrom(ObjectPrx p);
+
+    /**
+     * @hidden
+     * @return -
+     **/
     com.zeroc.IceInternal.Reference _getReference();
+
+    /**
+     * @hidden
+     * @param r -
+     * @return -
+     **/
     ObjectPrx _newInstance(com.zeroc.IceInternal.Reference r);
 
+    /**
+     * @hidden
+     * @param newContext -
+     * @return -
+     **/
     default ObjectPrx _ice_context(java.util.Map<String, String> newContext)
     {
         return _newInstance(_getReference().changeContext(newContext));
     }
 
+    /**
+     * @hidden
+     * @param newAdapterId -
+     * @return -
+     **/
     default ObjectPrx _ice_adapterId(String newAdapterId)
     {
         if(newAdapterId == null)
@@ -1009,6 +1116,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param newEndpoints -
+     * @return -
+     **/
     default ObjectPrx _ice_endpoints(Endpoint[] newEndpoints)
     {
         if(java.util.Arrays.equals(newEndpoints, _getReference().getEndpoints()))
@@ -1023,6 +1135,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param connection -
+     * @return -
+     **/
     default ObjectPrx _ice_fixed(com.zeroc.Ice.Connection connection)
     {
         if(connection == null)
@@ -1043,6 +1160,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param newTimeout -
+     * @return -
+     **/
     default ObjectPrx _ice_locatorCacheTimeout(int newTimeout)
     {
         if(newTimeout < -1)
@@ -1059,6 +1181,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param newTimeout -
+     * @return -
+     **/
     default ObjectPrx _ice_invocationTimeout(int newTimeout)
     {
         if(newTimeout < 1 && newTimeout != -1 && newTimeout != -2)
@@ -1075,6 +1202,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param newCache -
+     * @return -
+     **/
     default ObjectPrx _ice_connectionCached(boolean newCache)
     {
         if(newCache == _getReference().getCacheConnection())
@@ -1087,6 +1219,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param newType -
+     * @return -
+     **/
     default ObjectPrx _ice_endpointSelection(EndpointSelectionType newType)
     {
         if(newType == _getReference().getEndpointSelection())
@@ -1099,6 +1236,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param b -
+     * @return -
+     **/
     default ObjectPrx _ice_secure(boolean b)
     {
         if(b == _getReference().getSecure())
@@ -1111,6 +1253,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param e -
+     * @return -
+     **/
     default ObjectPrx _ice_encodingVersion(EncodingVersion e)
     {
         if(e.equals(_getReference().getEncoding()))
@@ -1123,6 +1270,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param b -
+     * @return -
+     **/
     default ObjectPrx _ice_preferSecure(boolean b)
     {
         if(b == _getReference().getPreferSecure())
@@ -1135,6 +1287,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param router -
+     * @return -
+     **/
     default ObjectPrx _ice_router(RouterPrx router)
     {
         com.zeroc.IceInternal.Reference ref = _getReference().changeRouter(router);
@@ -1148,6 +1305,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param locator -
+     * @return -
+     **/
     default ObjectPrx _ice_locator(LocatorPrx locator)
     {
         com.zeroc.IceInternal.Reference ref = _getReference().changeLocator(locator);
@@ -1161,6 +1323,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param b -
+     * @return -
+     **/
     default ObjectPrx _ice_collocationOptimized(boolean b)
     {
         if(b == _getReference().getCollocationOptimized())
@@ -1173,6 +1340,10 @@
         }
     }
 
+    /**
+     * @hidden
+     * @return -
+     **/
     default ObjectPrx _ice_twoway()
     {
         if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeTwoway)
@@ -1185,6 +1356,10 @@
         }
     }
 
+    /**
+     * @hidden
+     * @return -
+     **/
     default ObjectPrx _ice_oneway()
     {
         if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeOneway)
@@ -1197,6 +1372,10 @@
         }
     }
 
+    /**
+     * @hidden
+     * @return -
+     **/
     default ObjectPrx _ice_batchOneway()
     {
         if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeBatchOneway)
@@ -1209,6 +1388,10 @@
         }
     }
 
+    /**
+     * @hidden
+     * @return -
+     **/
     default ObjectPrx _ice_datagram()
     {
         if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeDatagram)
@@ -1221,6 +1404,10 @@
         }
     }
 
+    /**
+     * @hidden
+     * @return -
+     **/
     default ObjectPrx _ice_batchDatagram()
     {
         if(_getReference().getMode() == com.zeroc.IceInternal.Reference.ModeBatchDatagram)
@@ -1233,6 +1420,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param co -
+     * @return -
+     **/
     default ObjectPrx _ice_compress(boolean co)
     {
         com.zeroc.IceInternal.Reference ref = _getReference().changeCompress(co);
@@ -1246,6 +1438,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param t -
+     * @return -
+     **/
     default ObjectPrx _ice_timeout(int t)
     {
         if(t < 1 && t != -1)
@@ -1263,6 +1460,11 @@
         }
     }
 
+    /**
+     * @hidden
+     * @param connectionId -
+     * @return -
+     **/
     default ObjectPrx _ice_connectionId(String connectionId)
     {
         com.zeroc.IceInternal.Reference ref = _getReference().changeConnectionId(connectionId);
@@ -1276,5 +1478,10 @@
         }
     }
 
+    /**
+     * A special empty context that is indistinguishable from the absence of a context parameter.
+     * For example, <code>prx.op(noExplicitContext)</code> is the same as <code>prx.op()</code>
+     * and does not override the current implicit context (if any).
+     **/
     static final java.util.Map<String, String> noExplicitContext = new java.util.HashMap<>();
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/OptionalFormat.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/OptionalFormat.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/OptionalFormat.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/OptionalFormat.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
+/**
+ * Interface to marshal (write) Slice types into sequence of bytes encoded using the
+ * Ice encoding.
+ *
+ * @see InputStream
+ **/
 public class OutputStream
 {
     /**
@@ -450,11 +451,11 @@
      * Marks the start of a new slice for a class instance or user exception.
      *
      * @param typeId The Slice type ID corresponding to this slice.
-
+     *
      * @param compactId The Slice compact type ID corresponding to
      *        this slice or -1 if no compact ID is defined for the
      *        type ID.
-
+     *
      * @param last True if this is the last slice, false otherwise.
      **/
     public void startSlice(String typeId, int compactId, boolean last)
@@ -2458,6 +2459,7 @@
         }
     }
 
+    /** @hidden */
     @FunctionalInterface
     static public interface Marshaler
     {
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/package-info.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/package-info.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * Core APIs of the Ice framework.
+ **/
+package com.zeroc.Ice;
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/PluginFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/PluginFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/PluginManagerI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/PluginManagerI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/PluginManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/PluginManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -317,7 +312,8 @@
     public void
     load(String file)
     {
-        if(System.getProperty("os.name").startsWith("Windows") && file.startsWith("HKLM\\"))
+        if(System.getProperty("os.name").startsWith("Windows") &&
+           (file.startsWith("HKCU\\") || file.startsWith("HKLM\\")))
         {
             String regQuery = "reg query " + file;
             try
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityFacetKey.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityFacetKey.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityFacetKey.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityFacetKey.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityKey.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityKey.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityKey.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ProxyIdentityKey.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Request.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Request.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Request.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Request.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SignalPolicy.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SignalPolicy.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SignalPolicy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SignalPolicy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SlicedData.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SlicedData.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SlicedData.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SlicedData.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SliceInfo.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SliceInfo.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SliceInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SliceInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SystemException.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SystemException.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/SystemException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/SystemException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ThreadHookPlugin.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ThreadHookPlugin.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ThreadHookPlugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ThreadHookPlugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/UnknownSlicedValue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -47,6 +42,7 @@
         return _unknownTypeId;
     }
 
+    /** @hidden */
     @Override
     public void _iceWrite(OutputStream ostr)
     {
@@ -54,6 +50,7 @@
         ostr.endValue();
     }
 
+    /** @hidden */
     @Override
     public void _iceRead(InputStream istr)
     {
@@ -64,5 +61,6 @@
     private final String _unknownTypeId;
     private SlicedData _slicedData;
 
+    /** @hidden */
     public static final long serialVersionUID = 0L;
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/UserExceptionFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/UserExceptionFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/UserExceptionFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/UserExceptionFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/UserException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -94,6 +89,10 @@
         return sw.toString();
     }
 
+    /**
+     * @hidden
+     * @param os -
+     **/
     public void _write(OutputStream os)
     {
         os.startException(null);
@@ -101,6 +100,10 @@
         os.endException();
     }
 
+    /**
+     * @hidden
+     * @param is -
+     **/
     public void _read(InputStream is)
     {
         is.startException();
@@ -108,14 +111,27 @@
         is.endException(false);
     }
 
+    /**
+     * @hidden
+     * @return -
+     **/
     public boolean _usesClasses()
     {
         return false;
     }
 
+    /**
+     * @hidden
+     * @param os -
+     **/
     protected abstract void _writeImpl(OutputStream os);
 
+    /**
+     * @hidden
+     * @param is -
+     **/
     protected abstract void _readImpl(InputStream is);
 
+     /** @hidden */
     public static final long serialVersionUID = 0L;
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -534,7 +529,7 @@
      **/
     public static String stringVersion()
     {
-        return "3.7.1"; // "A.B.C", with A=major, B=minor, C=patch
+        return "3.7.2"; // "A.B.C", with A=major, B=minor, C=patch
     }
 
     /**
@@ -546,7 +541,7 @@
      **/
     public static int intVersion()
     {
-        return 30701; // AABBCC, with AA=major, BB=minor, CC=patch
+        return 30702; // AABBCC, with AA=major, BB=minor, CC=patch
     }
 
     /**
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ValueFactoryManagerI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ValueFactoryManagerI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ValueFactoryManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ValueFactoryManagerI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.Ice;
-
-public class ValueFactoryManagerI implements ValueFactoryManager
-{
-    public synchronized void add(ValueFactory factory, String id)
-    {
-        if(_factoryMap.containsKey(id))
-        {
-            throw new AlreadyRegisteredException("value factory", id);
-        }
-
-        _factoryMap.put(id, factory);
-    }
-
-    public synchronized ValueFactory find(String id)
-    {
-        return _factoryMap.get(id);
-    }
-
-    private java.util.HashMap<String, ValueFactory> _factoryMap = new java.util.HashMap<>();
-}
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/Value.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -78,6 +73,10 @@
         return "::Ice::Object";
     }
 
+    /**
+     * @hidden
+     * @param ostr -
+     **/
     public void _iceWrite(OutputStream ostr)
     {
         ostr.startValue(null);
@@ -85,6 +84,10 @@
         ostr.endValue();
     }
 
+    /**
+     * @hidden
+     * @param istr -
+     **/
     public void _iceRead(InputStream istr)
     {
         istr.startValue();
@@ -92,13 +95,22 @@
         istr.endValue(false);
     }
 
+    /**
+     * @hidden
+     * @param ostr -
+     **/
     protected void _iceWriteImpl(OutputStream ostr)
     {
     }
 
+    /**
+     * @hidden
+     * @param istr -
+     **/
     protected void _iceReadImpl(InputStream istr)
     {
     }
 
+    /** @hidden */
     public static final long serialVersionUID = 0L;
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ValueReader.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -21,17 +16,20 @@
      **/
     public abstract void read(InputStream in);
 
+    /** @hidden */
     @Override
     public void _iceWrite(OutputStream os)
     {
         assert(false);
     }
 
+    /** @hidden */
     @Override
     public void _iceRead(InputStream is)
     {
         read(is);
     }
 
+    /** @hidden */
     public static final long serialVersionUID = 0L;
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/Ice/ValueWriter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.Ice;
 
@@ -21,17 +16,20 @@
      **/
     public abstract void write(OutputStream out);
 
+    /** @hidden */
     @Override
     public void _iceWrite(OutputStream os)
     {
         write(os);
     }
 
+    /** @hidden */
     @Override
     public void _iceRead(InputStream is)
     {
         assert(false);
     }
 
+    /** @hidden */
     public static final long serialVersionUID = 0L;
 }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Acceptor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Acceptor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Acceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Acceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMMonitor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMMonitor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMMonitor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMMonitor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/AsyncStatus.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/AsyncStatus.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/AsyncStatus.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/AsyncStatus.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/BatchRequestQueue.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/BatchRequestQueue.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/BatchRequestQueue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/BatchRequestQueue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Buffer.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Buffer.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Buffer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Buffer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/BufSizeWarnInfo.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/BufSizeWarnInfo.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/BufSizeWarnInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/BufSizeWarnInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CancellationHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CancellationHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CancellationHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CancellationHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedObserverI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedObserverI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -17,8 +12,6 @@
     {
         super(communicator, instance, "flushBatchRequests");
 
-        _observer = ObserverHelper.get(instance, "flushBatchRequests");
-
         //
         // _useCount is initialized to 1 to prevent premature callbacks.
         // The caller must invoke ready() after all flush requests have
@@ -150,8 +143,11 @@
         }
     }
 
-    public void ready()
+    public void invoke(com.zeroc.Ice.CompressBatch compressBatch)
     {
+        _observer = ObserverHelper.get(_instance, "flushBatchRequests");
+        _instance.outgoingConnectionFactory().flushAsyncBatchRequests(compressBatch, this);
+        _instance.objectAdapterFactory().flushAsyncBatchRequests(compressBatch, this);
         doCheck(true);
     }
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorObserverI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorObserverI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionACMMonitor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionACMMonitor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionACMMonitor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionACMMonitor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionFlushBatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -34,6 +29,7 @@
 
     public void invoke(com.zeroc.Ice.CompressBatch compressBatch)
     {
+        _observer = ObserverHelper.get(_instance, "flushBatchRequests");
         try
         {
             final BatchRequestQueue.SwapResult r = _connection.getBatchRequestQueue().swap(_os);
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionObserverI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionObserverI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionRequestHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionRequestHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectionRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Connector.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Connector.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Connector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Connector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ConnectRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/DefaultsAndOverrides.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/DefaultsAndOverrides.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/DefaultsAndOverrides.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/DefaultsAndOverrides.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchObserverI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchObserverI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchWorkItem.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchWorkItem.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchWorkItem.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/DispatchWorkItem.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryManager.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryManager.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryWithUnderlying.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryWithUnderlying.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryWithUnderlying.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointFactoryWithUnderlying.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI_connectors.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI_connectors.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI_connectors.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI_connectors.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointIHolder.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointIHolder.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointIHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointIHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandlerOpPair.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandlerOpPair.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandlerOpPair.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/EventHandlerOpPair.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -36,7 +31,7 @@
             assert(false);
         }
         throw new com.zeroc.Ice.UnexpectedObjectException(
-            "expected element of type `" + expected + "' but received '" + type, type, expected);
+            "expected element of type `" + expected + "' but received `" + type + "'", type, expected);
     }
     public static void throwUOE(String expectedType, com.zeroc.Ice.Value v)
     {
@@ -53,7 +48,7 @@
 
         String type = v.ice_id();
         throw new com.zeroc.Ice.UnexpectedObjectException(
-            "expected element of type `" + expectedType + "' but received '" + type, type, expectedType);
+            "expected element of type `" + expectedType + "' but received `" + type + "'", type, expectedType);
     }
 
     public static void throwMemoryLimitException(int requested, int maximum)
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/FixedReference.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/HashUtil.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/HashUtil.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/HashUtil.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/HashUtil.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Holder.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Holder.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Holder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Holder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/HTTPNetworkProxy.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/HTTPNetworkProxy.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/HTTPNetworkProxy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/HTTPNetworkProxy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/HttpParser.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/HttpParser.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/HttpParser.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/HttpParser.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -308,6 +303,8 @@
                         // Ignore, could be a class loading error.
                     }
 
+                    assert(_acceptorStarted);
+                    _acceptorStarted = false;
                     if(_adapter.getThreadPool().finish(this, true))
                     {
                         closeAcceptor();
@@ -365,17 +362,23 @@
     {
         if(_state < StateClosed)
         {
-            if(_acceptorStarted && close)
+            if(close)
             {
                 closeAcceptor();
             }
+
+            //
+            // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
+            // because of an unexpected error), try to restart the acceptor in 1 second.
+            //
+            _instance.timer().schedule(() -> startAcceptor(), 1, java.util.concurrent.TimeUnit.SECONDS);
             return;
         }
 
-        assert(_state == StateClosed);
+        assert(_state >= StateClosed);
         setState(StateFinished);
 
-        if(_acceptorStarted && close)
+        if(close)
         {
             closeAcceptor();
         }
@@ -623,6 +626,7 @@
                     // if there are no more threads in the thread pool available to dispatch
                     // the finish() call.
                     //
+                    _acceptorStarted = false;
                     if(_adapter.getThreadPool().finish(this, true))
                     {
                         closeAcceptor();
@@ -713,13 +717,8 @@
             _instance.initializationData().logger.trace(_instance.traceLevels().networkCat, s.toString());
         }
 
-        _acceptorStarted = false;
+        assert(!_acceptorStarted);
         _acceptor.close();
-
-        if(_state == StateHolding || _state == StateActive)
-        {
-            _instance.timer().schedule(() -> startAcceptor(), 1, java.util.concurrent.TimeUnit.SECONDS);
-        }
     }
 
     private void
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -252,6 +247,10 @@
                 }
             }
         }
+        catch(ServantError ex)
+        {
+            throw ex;
+        }
         catch(Throwable ex)
         {
             completed(ex, false);
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/InputStreamWrapper.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/InputStreamWrapper.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/InputStreamWrapper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/InputStreamWrapper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Instance.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Instance.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Instance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Instance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -66,11 +61,7 @@
         Timer(com.zeroc.Ice.Properties props, String threadName)
         {
             super(1, Util.createThreadFactory(props, threadName)); // Single thread executor
-            if(!Util.isAndroid())
-            {
-                // This API doesn't exist on Android up to API level 20.
-                setRemoveOnCancelPolicy(true);
-            }
+            setRemoveOnCancelPolicy(true);
             setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
             _observerHelper = new ThreadObserverHelper(threadName);
         }
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationObserverI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationObserverI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/IPEndpointI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/IPEndpointI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/IPEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/IPEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorTable.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorTable.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorTable.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LocatorTable.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -197,7 +192,7 @@
 
         //
         // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to
-        // remote logggers
+        // remote loggers
         //
         if(sendLogCommunicator != null)
         {
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLoggerI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLoggerI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLogger.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLogger.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLogger.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminLogger.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsAdminI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsMap.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsMap.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsMap.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsMap.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsViewI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsViewI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsViewI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/MetricsViewI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/NetworkProxy.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/NetworkProxy.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/NetworkProxy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/NetworkProxy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectInputStream.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectInputStream.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectInputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectInputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObserverHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OpaqueEndpointI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OpaqueEndpointI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OpaqueEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OpaqueEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBaseI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBaseI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBaseI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBaseI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
@@ -39,10 +34,11 @@
     public final void attachRemoteObserver(com.zeroc.Ice.ConnectionInfo info, com.zeroc.Ice.Endpoint endpt,
                                            int requestId)
     {
-        if(_observer != null)
+        com.zeroc.Ice.Instrumentation.InvocationObserver observer = getObserver();
+        if(observer != null)
         {
             final int size = _os.size() - Protocol.headerSize - 4;
-            _childObserver = getObserver().getRemoteObserver(info, endpt, requestId, size);
+            _childObserver = observer.getRemoteObserver(info, endpt, requestId, size);
             if(_childObserver != null)
             {
                 _childObserver.attach();
@@ -53,10 +49,11 @@
     @Override
     public final void attachCollocatedObserver(com.zeroc.Ice.ObjectAdapter adapter, int requestId)
     {
-        if(_observer != null)
+        com.zeroc.Ice.Instrumentation.InvocationObserver observer = getObserver();
+        if(observer != null)
         {
             final int size = _os.size() - Protocol.headerSize - 4;
-            _childObserver = getObserver().getCollocatedObserver(adapter, requestId, size);
+            _childObserver = observer.getCollocatedObserver(adapter, requestId, size);
             if(_childObserver != null)
             {
                 _childObserver.attach();
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBase.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBase.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsyncBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutputStreamWrapper.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutputStreamWrapper.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutputStreamWrapper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutputStreamWrapper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProcessI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProcessI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProcessI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProcessI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertiesAdminI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertiesAdminI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertiesAdminI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertiesAdminI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 14 10:24:07 2018
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -183,6 +178,7 @@
         new Property("Ice\\.TCP\\.SndSize", false, null),
         new Property("Ice\\.UseApplicationClassLoader", false, null),
         new Property("Ice\\.UseSyslog", false, null),
+        new Property("Ice\\.UseSystemdJournal", false, null),
         new Property("Ice\\.Warn\\.AMICallback", false, null),
         new Property("Ice\\.Warn\\.Connections", false, null),
         new Property("Ice\\.Warn\\.Datagrams", false, null),
@@ -192,7 +188,7 @@
         new Property("Ice\\.Warn\\.UnusedProperties", false, null),
         new Property("Ice\\.CacheMessageBuffers", false, null),
         new Property("Ice\\.ThreadInterruptSafe", false, null),
-        new Property("Ice\\.Voip", false, null),
+        new Property("Ice\\.Voip", true, null),
         null
     };
 
@@ -510,6 +506,43 @@
         new Property("IceGridAdmin\\.Host", false, null),
         new Property("IceGridAdmin\\.Port", false, null),
         new Property("IceGridAdmin\\.InstanceName", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM\\.Timeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM\\.Heartbeat", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM\\.Close", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM", false, null),
+        new Property("IceGridAdmin\\.Server\\.AdapterId", false, null),
+        new Property("IceGridAdmin\\.Server\\.Endpoints", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.EndpointSelection", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.ConnectionCached", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.PreferSecure", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.LocatorCacheTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.InvocationTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.Locator", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.Router", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.CollocationOptimized", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.Context\\.[^\\s]+", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator", false, null),
+        new Property("IceGridAdmin\\.Server\\.PublishedEndpoints", false, null),
+        new Property("IceGridAdmin\\.Server\\.ReplicaGroupId", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.EndpointSelection", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.ConnectionCached", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.PreferSecure", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.LocatorCacheTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.InvocationTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.Locator", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.Router", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.CollocationOptimized", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.Context\\.[^\\s]+", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router", false, null),
+        new Property("IceGridAdmin\\.Server\\.ProxyOptions", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Size", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeMax", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeWarn", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.StackSize", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Serialize", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadIdleTime", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadPriority", false, null),
+        new Property("IceGridAdmin\\.Server\\.MessageSizeMax", false, null),
         new Property("IceGridAdmin\\.Discovery\\.Address", false, null),
         new Property("IceGridAdmin\\.Discovery\\.Interface", false, null),
         new Property("IceGridAdmin\\.Discovery\\.Lookup", false, null),
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolInstance.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolInstance.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolInstance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolInstance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Protocol.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Protocol.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Protocol.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Protocol.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacadeI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacadeI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacadeI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacadeI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacade.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacade.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacade.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProtocolPluginFacade.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBase.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBase.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueRequestHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueRequestHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReadyCallback.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReadyCallback.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReadyCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReadyCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RemoteObserverI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RemoteObserverI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RemoteObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RemoteObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReplyStatus.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReplyStatus.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReplyStatus.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReplyStatus.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandlerFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ResponseHandler.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ResponseHandler.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ResponseHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ResponseHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryException.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryException.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryQueue.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryQueue.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryQueue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryQueue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryTask.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryTask.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryTask.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RetryTask.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RoutableReference.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterManager.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterManager.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/RouterManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Selector.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Selector.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Selector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Selector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantError.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantError.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantError.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantError.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantManager.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantManager.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ServantManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/SocketOperation.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/SocketOperation.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/SocketOperation.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/SocketOperation.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/SOCKSNetworkProxy.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/SOCKSNetworkProxy.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/SOCKSNetworkProxy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/SOCKSNetworkProxy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/StreamSocket.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/StreamSocket.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/StreamSocket.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/StreamSocket.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpAcceptor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpAcceptor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpAcceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpAcceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpConnector.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpConnector.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpConnector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpConnector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpTransceiver.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpTransceiver.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TcpTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadObserverI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadObserverI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkItem.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkItem.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkItem.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkItem.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Time.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Time.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Time.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Time.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceLevels.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceLevels.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceLevels.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceLevels.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Transceiver.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Transceiver.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Transceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Transceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpConnector.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpConnector.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpConnector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpConnector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastClientTransceiver.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastClientTransceiver.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastClientTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastClientTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpTransceiver.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpTransceiver.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UnderlyingEndpointFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UnderlyingEndpointFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/UnderlyingEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/UnderlyingEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueFactoryManagerI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueFactoryManagerI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueFactoryManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueFactoryManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/ValueWriter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WebSocketException.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WebSocketException.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WebSocketException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WebSocketException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSAcceptor.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSAcceptor.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSAcceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSAcceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSConnector.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSConnector.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSConnector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSConnector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpointFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpointFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpoint.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpoint.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpoint.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSEndpoint.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSTransceiver.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSTransceiver.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceInternal/WSTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/MetricsHelper.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/MetricsHelper.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/MetricsHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/MetricsHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceMX;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactory.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactory.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceMX;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactoryWithDelegate.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactoryWithDelegate.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactoryWithDelegate.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverFactoryWithDelegate.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceMX;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/Observer.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/Observer.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/Observer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/Observer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceMX;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegateI.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegateI.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegateI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegateI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceMX;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegate.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegate.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegate.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/ObserverWithDelegate.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceMX;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/package-info.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/package-info.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceMX/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceMX/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * Ice Management Extension (IceMX) APIs.
+ **/
+package com.zeroc.IceMX;
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Assert.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Assert.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Assert.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Assert.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Base64.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Base64.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Base64.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Base64.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/OutputBase.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/OutputBase.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/OutputBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/OutputBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StopWatch.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StopWatch.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StopWatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StopWatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StringUtil.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StringUtil.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StringUtil.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/StringUtil.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/XMLOutput.java zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/XMLOutput.java
--- zeroc-ice-3.7.1/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/XMLOutput.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/XMLOutput.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceBox/build.gradle zeroc-ice-3.7.2/java/src/IceBox/build.gradle
--- zeroc-ice-3.7.1/java/src/IceBox/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBox/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IceBox"
 project.ext.description = "IceBox is an easy-to-use framework for Ice application services"
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IceBox.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IceBox.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
+
+javadoc {
+    excludes = ["**/Admin.java", "**/Server.java", "**/ServiceManagerI.java"]
+}
diff -Nru zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/Admin.java zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/Admin.java
--- zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/Admin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/Admin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,183 +1,182 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBox;
 
 public final class Admin
 {
-    private static class Client extends com.zeroc.Ice.Application
+    private static void usage()
+    {
+        System.err.println(
+            "Usage: com.zeroc.IceBox.Admin [options] [command...]\n" +
+            "Options:\n" +
+            "-h, --help          Show this message.\n" +
+            "-v, --version       Display the Ice version.\n" +
+            "\n" +
+            "Commands:\n" +
+            "start SERVICE       Start a service.\n" +
+            "stop SERVICE        Stop a service.\n" +
+            "shutdown            Shutdown the server.");
+    }
+
+    public static void main(String[] args)
     {
-        private void usage()
+        int status = 0;
+        java.util.List<String> commands = new java.util.ArrayList<String>();
+
+        try(com.zeroc.Ice.Communicator communicator = com.zeroc.Ice.Util.initialize(args, commands))
         {
-            System.err.println(
-                "Usage: " + appName() + " [options] [command...]\n" +
-                "Options:\n" +
-                "-h, --help          Show this message.\n" +
-                "\n" +
-                "Commands:\n" +
-                "start SERVICE       Start a service.\n" +
-                "stop SERVICE        Stop a service.\n" +
-                "shutdown            Shutdown the server.");
+            Runtime.getRuntime().addShutdownHook(new Thread(() ->
+            {
+                communicator.destroy();
+            }));
+
+            status = run(communicator, commands);
         }
 
-        @Override
-        public int run(String[] args)
+        System.exit(status);
+    }
+
+    public static int run(com.zeroc.Ice.Communicator communicator, java.util.List<String> commands)
+    {
+        if(commands.isEmpty())
         {
-            java.util.List<String> commands = new java.util.ArrayList<>();
+            usage();
+            return 0;
+        }
 
-            int idx = 0;
-            while(idx < args.length)
+        for(String command : commands)
+        {
+            if(command.equals("-h") || command.equals("--help"))
             {
-                if(args[idx].equals("-h") || args[idx].equals("--help"))
-                {
-                    usage();
-                    return 1;
-                }
-                else if(args[idx].charAt(0) == '-')
-                {
-                    System.err.println(appName() + ": unknown option `" + args[idx] + "'");
-                    usage();
-                    return 1;
-                }
-                else
-                {
-                    commands.add(args[idx]);
-                    ++idx;
-                }
+                usage();
+                return 0;
             }
-
-            if(commands.isEmpty())
+            else if(command.equals("-v") || command.equals("--version"))
             {
-                usage();
+                System.out.println(com.zeroc.Ice.Util.stringVersion());
                 return 0;
             }
-
-            com.zeroc.Ice.ObjectPrx base = communicator().propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
-
-            if(base == null)
+            else if(command.startsWith("-"))
             {
-                //
-                // The old deprecated way to retrieve the service manager proxy
-                //
+                System.err.println("IceBox.Admin: unknown option `" + command + "'");
+                usage();
+                return 1;
+            }
+        }
 
-                com.zeroc.Ice.Properties properties = communicator().getProperties();
+        com.zeroc.Ice.ObjectPrx base = communicator.propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
 
-                com.zeroc.Ice.Identity managerIdentity = new com.zeroc.Ice.Identity();
-                managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
-                managerIdentity.name = "ServiceManager";
+        if(base == null)
+        {
+            //
+            // The old deprecated way to retrieve the service manager proxy
+            //
+
+            com.zeroc.Ice.Properties properties = communicator.getProperties();
+
+            com.zeroc.Ice.Identity managerIdentity = new com.zeroc.Ice.Identity();
+            managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+            managerIdentity.name = "ServiceManager";
 
-                String managerProxy;
-                if(properties.getProperty("Ice.Default.Locator").length() == 0)
+            String managerProxy;
+            if(properties.getProperty("Ice.Default.Locator").length() == 0)
+            {
+                String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
+                if(managerEndpoints.length() == 0)
                 {
-                    String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
-                    if(managerEndpoints.length() == 0)
-                    {
-                        System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set");
-                        return 1;
-                    }
-
-                    managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" +
-                        managerEndpoints;
+                    System.err.println("IceBox.Admin: property `IceBoxAdmin.ServiceManager.Proxy' is not set");
+                    return 1;
                 }
-                else
-                {
-                    String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
-                    if(managerAdapterId.length() == 0)
-                    {
-                        System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set");
-                        return 1;
-                    }
 
-                    managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" +
-                        managerAdapterId;
+                managerProxy = "\"" + communicator.identityToString(managerIdentity) + "\" :" +
+                    managerEndpoints;
+            }
+            else
+            {
+                String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
+                if(managerAdapterId.length() == 0)
+                {
+                    System.err.println("IceBox.Admin: property `IceBoxAdmin.ServiceManager.Proxy' is not set");
+                    return 1;
                 }
 
-                base = communicator().stringToProxy(managerProxy);
+                managerProxy = "\"" + communicator.identityToString(managerIdentity) + "\" @" +
+                    managerAdapterId;
             }
 
-            com.zeroc.IceBox.ServiceManagerPrx manager = com.zeroc.IceBox.ServiceManagerPrx.checkedCast(base);
-            if(manager == null)
+            base = communicator.stringToProxy(managerProxy);
+        }
+
+        com.zeroc.IceBox.ServiceManagerPrx manager = com.zeroc.IceBox.ServiceManagerPrx.checkedCast(base);
+        if(manager == null)
+        {
+            System.err.println("IceBox.Admin: `" + base.toString() + "' is not an IceBox::ServiceManager");
+            return 1;
+        }
+
+        for(int i = 0; i < commands.size(); i++)
+        {
+            String command = commands.get(i);
+            if(command.equals("shutdown"))
             {
-                System.err.println(appName() + ": `" + base.toString() + "' is not an IceBox::ServiceManager");
-                return 1;
+                manager.shutdown();
             }
-
-            for(int i = 0; i < commands.size(); i++)
+            else if(command.equals("start"))
             {
-                String command = commands.get(i);
-                if(command.equals("shutdown"))
+                if(++i >= commands.size())
                 {
-                    manager.shutdown();
+                    System.err.println("IceBox.Admin: no service name specified.");
+                    return 1;
                 }
-                else if(command.equals("start"))
+
+                String service = commands.get(i);
+                try
                 {
-                    if(++i >= commands.size())
-                    {
-                        System.err.println(appName() + ": no service name specified.");
-                        return 1;
-                    }
-
-                    String service = commands.get(i);
-                    try
-                    {
-                        manager.startService(service);
-                    }
-                    catch(com.zeroc.IceBox.NoSuchServiceException ex)
-                    {
-                        System.err.println(appName() + ": unknown service `" + service + "'");
-                        return 1;
-                    }
-                    catch(com.zeroc.IceBox.AlreadyStartedException ex)
-                    {
-                        System.err.println(appName() + "service already started.");
-                    }
-                }
-                else if(command.equals("stop"))
-                {
-                    if(++i >= commands.size())
-                    {
-                        System.err.println(appName() + ": no service name specified.");
-                        return 1;
-                    }
-
-                    String service = commands.get(i);
-                    try
-                    {
-                        manager.stopService(service);
-                    }
-                    catch(com.zeroc.IceBox.NoSuchServiceException ex)
-                    {
-                        System.err.println(appName() + ": unknown service `" + service + "'");
-                        return 1;
-                    }
-                    catch(com.zeroc.IceBox.AlreadyStoppedException ex)
-                    {
-                        System.err.println(appName() + "service already stopped.");
-                    }
+                    manager.startService(service);
                 }
-                else
+                catch(com.zeroc.IceBox.NoSuchServiceException ex)
                 {
-                    System.err.println(appName() + ": unknown command `" + command + "'");
-                    usage();
+                    System.err.println("IceBox.Admin: unknown service `" + service + "'");
                     return 1;
                 }
+                catch(com.zeroc.IceBox.AlreadyStartedException ex)
+                {
+                    System.err.println("IceBox.Admin: service already started.");
+                }
             }
+            else if(command.equals("stop"))
+            {
+                if(++i >= commands.size())
+                {
+                    System.err.println("IceBox.Admin: no service name specified.");
+                    return 1;
+                }
 
-            return 0;
+                String service = commands.get(i);
+                try
+                {
+                    manager.stopService(service);
+                }
+                catch(com.zeroc.IceBox.NoSuchServiceException ex)
+                {
+                    System.err.println("IceBox.Admin: unknown service `" + service + "'");
+                    return 1;
+                }
+                catch(com.zeroc.IceBox.AlreadyStoppedException ex)
+                {
+                    System.err.println("IceBox.Admin: service already stopped.");
+                }
+            }
+            else
+            {
+                System.err.println("IceBox.Admin: unknown command `" + command + "'");
+                usage();
+                return 1;
+            }
         }
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int rc = app.main("IceBox.Admin", args);
 
-        System.exit(rc);
+        return 0;
     }
 }
diff -Nru zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/package-info.java zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/package-info.java
--- zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for creating IceBox services and interacting with the IceBox server.
+ **/
+package com.zeroc.IceBox;
diff -Nru zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/Server.java zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/Server.java
--- zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,76 +1,130 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBox;
 
-public final class Server extends com.zeroc.Ice.Application
+public final class Server
 {
+    static class ShutdownHook extends Thread
+    {
+        private com.zeroc.Ice.Communicator _communicator;
+        private final java.lang.Object _doneMutex = new java.lang.Object();
+        private boolean _done = false;
+
+        ShutdownHook(com.zeroc.Ice.Communicator communicator)
+        {
+            _communicator = communicator;
+        }
+
+        @Override
+        public void run()
+        {
+            _communicator.shutdown();
+
+            synchronized(_doneMutex)
+            {
+                //
+                // Wait on the server to finish shutting down before exiting the ShutdownHook. This ensures
+                // that all IceBox services have had a chance to shutdown cleanly before the JVM terminates.
+                //
+                while(!_done)
+                {
+                    try
+                    {
+                        _doneMutex.wait();
+                    }
+                    catch(InterruptedException ex)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        public void done()
+        {
+            synchronized(_doneMutex)
+            {
+                _done = true;
+                _doneMutex.notify();
+            }
+        }
+    }
+
     private static void usage()
     {
         System.err.println("Usage: com.zeroc.IceBox.Server [options] --Ice.Config=<file>\n");
         System.err.println(
             "Options:\n" +
-            "-h, --help           Show this message.\n"
+            "-h, --help           Show this message.\n" +
+            "-v, --version        Display the Ice version."
         );
     }
 
-    public static void main(String[] args)
-    {
-        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
-        initData.properties = com.zeroc.Ice.Util.createProperties();
-        initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
-
-        Server server = new Server();
-        System.exit(server.main("IceBox.Server", args, initData));
-    }
-
-    @Override
-    public int run(String[] args)
+    private static int run(com.zeroc.Ice.Communicator communicator, java.util.List<String> argSeq)
     {
         final String prefix = "IceBox.Service.";
-        com.zeroc.Ice.Properties properties = communicator().getProperties();
+        com.zeroc.Ice.Properties properties = communicator.getProperties();
         java.util.Map<String, String> services = properties.getPropertiesForPrefix(prefix);
-        java.util.List<String> argSeq = new java.util.ArrayList<>(args.length);
-        for(String s : args)
-        {
-            argSeq.add(s);
-        }
 
-        for(java.util.Map.Entry<String, String> entry : services.entrySet())
+        java.util.List<String> iceBoxArgs = new java.util.ArrayList<String>(argSeq);
+
+        for(String key : services.keySet())
         {
-            String name = entry.getKey().substring(prefix.length());
-            for(int i = 0; i < argSeq.size(); ++i)
-            {
-                if(argSeq.get(i).startsWith("--" + name))
-                {
-                    argSeq.remove(i);
-                    i--;
-                }
-            }
+            String name = key.substring(prefix.length());
+            iceBoxArgs.removeIf(v -> v.startsWith("--" + name));
         }
 
-        for(String arg : argSeq)
+        for(String arg : iceBoxArgs)
         {
             if(arg.equals("-h") || arg.equals("--help"))
             {
                 usage();
                 return 0;
             }
+            else if(arg.equals("-v") || arg.equals("--version"))
+            {
+                System.out.println(com.zeroc.Ice.Util.stringVersion());
+                return 0;
+            }
             else
             {
-                System.err.println("Server: unknown option `" + arg + "'");
+                System.err.println("IceBox.Server: unknown option `" + arg + "'");
                 usage();
                 return 1;
             }
         }
 
-        ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator(), args);
+        ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator, argSeq.toArray(new String[0]));
         return serviceManagerImpl.run();
     }
+
+    public static void main(String[] args)
+    {
+        int status = 0;
+        java.util.List<String> argSeq = new java.util.ArrayList<String>();
+
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        initData.properties = com.zeroc.Ice.Util.createProperties();
+        initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
+        ShutdownHook shutdownHook = null;
+
+        try(com.zeroc.Ice.Communicator communicator = com.zeroc.Ice.Util.initialize(args, initData, argSeq))
+        {
+            shutdownHook = new ShutdownHook(communicator);
+            Runtime.getRuntime().addShutdownHook(shutdownHook);
+
+            status = run(communicator, argSeq);
+        }
+        finally
+        {
+            if(shutdownHook != null)
+            {
+                shutdownHook.done();
+            }
+        }
+
+        System.exit(status);
+    }
 }
diff -Nru zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java
--- zeroc-ice-3.7.1/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBox;
 
@@ -411,14 +406,6 @@
             }
 
             //
-            // Don't move after the adapter activation. This allows
-            // applications to wait for the service manager to be
-            // reachable before sending a signal to shutdown the
-            // IceBox.
-            //
-            com.zeroc.Ice.Application.shutdownOnInterrupt();
-
-            //
             // Register "this" as a facet to the Admin object and
             // create Admin object
             //
@@ -452,7 +439,6 @@
             }
 
             _communicator.waitForShutdown();
-            com.zeroc.Ice.Application.defaultInterrupt();
         }
         catch(FailureException ex)
         {
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/build.gradle zeroc-ice-3.7.2/java/src/IceBT/build.gradle
--- zeroc-ice-3.7.1/java/src/IceBT/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IceBT"
 project.ext.description = "Bluetooth support for Ice"
 
 slice {
     java {
-        set1 {
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBT", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBT", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
@@ -34,3 +24,7 @@
     //
     exclude("android/**")
 }
+
+javadoc {
+    excludes = ["**/android/*", "**/*I.java", "**/Instance.java"]
+}
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/AcceptorI.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/AcceptorI.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/AcceptorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/AcceptorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
@@ -28,9 +23,10 @@
     }
 
     @Override
-    public void setReadyCallback(ReadyCallback callback)
+    public synchronized void setReadyCallback(ReadyCallback callback)
     {
         _readyCallback = callback;
+        notify(); // Notify the acceptor thread
     }
 
     @Override
@@ -174,9 +170,26 @@
 
     private void runAccept()
     {
-        try
+        synchronized(this)
         {
-            while(true)
+            //
+            // Wait for the ready callback to be set by the selector.
+            //
+            while(_readyCallback == null)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+        }
+
+        while(true)
+        {
+            try
             {
                 BluetoothSocket socket = _socket.accept();
                 synchronized(this)
@@ -190,13 +203,14 @@
                     _readyCallback.ready(SocketOperation.Read, true);
                 }
             }
-        }
-        catch(Exception ex)
-        {
-            synchronized(this)
+            catch(Exception ex)
             {
-                if(!_closed)
+                synchronized(this)
                 {
+                    if(_closed)
+                    {
+                        break;
+                    }
                     _exception = ex;
                     _readyCallback.ready(SocketOperation.Read, true);
                 }
@@ -206,14 +220,7 @@
         //
         // Close any remaining incoming sockets that haven't been accepted yet.
         //
-        java.util.Stack<BluetoothSocket> pending;
-        synchronized(this)
-        {
-            pending = _pending;
-            _pending = null;
-        }
-
-        for(BluetoothSocket s : pending)
+        for(BluetoothSocket s : _pending)
         {
             try
             {
@@ -224,6 +231,7 @@
                 // Ignore.
             }
         }
+        _pending.clear();
     }
 
     private EndpointI _endpoint;
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointFactoryI.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointFactoryI.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/package-info.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/package-info.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for the IceBT plug-in, a Bluetooth transport currently available
+ * only for Android.
+ **/
+package com.zeroc.IceBT;
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginFactory.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginFactory.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
 /**
- * Plug-in factories must implement this interface.
+ * Creates IceBT plug-ins.
  **/
 public class PluginFactory implements com.zeroc.Ice.PluginFactory
 {
     /**
-     * Returns a new plug-in.
+     * Returns a new IceBT plug-in.
      *
      * @param communicator The communicator for the plug-in.
      * @param name The name of the plug-in.
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginI.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginI.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/TransceiverI.java zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/TransceiverI.java
--- zeroc-ice-3.7.1/java/src/IceBT/src/main/java/com/zeroc/IceBT/TransceiverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceBT/src/main/java/com/zeroc/IceBT/TransceiverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceBT;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/build.gradle zeroc-ice-3.7.2/java/src/IceDiscovery/build.gradle
--- zeroc-ice-3.7.1/java/src/IceDiscovery/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IceDiscovery"
 project.ext.description = "Allow Ice applications to discover objects and object adapters"
@@ -20,7 +12,7 @@
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorI.java zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorI.java
--- zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorRegistryI.java zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorRegistryI.java
--- zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorRegistryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LocatorRegistryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java
--- zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupReplyI.java zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupReplyI.java
--- zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupReplyI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupReplyI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/package-info.java zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/package-info.java
--- zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for the IceDiscovery plug-in. IceDiscovery lets client applications
+ * discover servers using UDP multicast.
+ **/
+package com.zeroc.IceDiscovery;
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginFactory.java zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginFactory.java
--- zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceDiscovery;
 
+/**
+ * Creates IceDiscovery plug-ins.
+ **/
 public class PluginFactory implements com.zeroc.Ice.PluginFactory
 {
     @Override
diff -Nru zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginI.java zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginI.java
--- zeroc-ice-3.7.1/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceDiscovery;
 
 import com.zeroc.IceInternal.Network;
 
-public class PluginI implements com.zeroc.Ice.Plugin
+class PluginI implements com.zeroc.Ice.Plugin
 {
     public PluginI(com.zeroc.Ice.Communicator communicator)
     {
diff -Nru zeroc-ice-3.7.1/java/src/IceGrid/build.gradle zeroc-ice-3.7.2/java/src/IceGrid/build.gradle
--- zeroc-ice-3.7.1/java/src/IceGrid/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGrid/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IceGrid"
 project.ext.description = "Locate, deploy, and manage Ice servers"
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IceGrid.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IceGrid.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
-    compile project(':glacier2')
+    implementation project(':ice')
+    implementation project(':glacier2')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java/src/IceGrid/src/main/java/com/zeroc/IceGrid/package-info.java zeroc-ice-3.7.2/java/src/IceGrid/src/main/java/com/zeroc/IceGrid/package-info.java
--- zeroc-ice-3.7.1/java/src/IceGrid/src/main/java/com/zeroc/IceGrid/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGrid/src/main/java/com/zeroc/IceGrid/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,8 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for clients of the IceGrid location service.
+ **/
+package com.zeroc.IceGrid;
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/build.gradle zeroc-ice-3.7.2/java/src/IceGridGUI/build.gradle
--- zeroc-ice-3.7.1/java/src/IceGridGUI/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
-project.ext.displayName = "IceGridGUI Compat"
+project.ext.displayName = "IceGridGUI"
 project.ext.description = ""
 
-project.ext.macosx = System.properties['os.name'] == "Mac OS X"
+if(GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) {
+    ext.os = System.properties['os.name']
+    if(os == "Mac OS X") {
+        ext.platform = "mac"
+        ext.hasJavaFx = true
+    } else if(os.toLowerCase().contains("windows")) {
+        ext.platform = "win"
+        ext.hasJavaFx = true
+    } else if(os.toLowerCase().contains("linux")) {
+        ext.platform = "linux"
+        ext.hasJavaFx = true
+    } else {
+        ext.hasJavaFx = false
+    }
+} else {
+    ext.javafxJar = ['jfxrt.jar',
+                     'lib/jfxrt.jar',
+                     'lib/ext/jfxrt.jar',
+                     'jre/lib/jfxrt.jar',
+                     'jre/lib/ext/jfxrt.jar',
+                     'lib/javafx-swt.jar'].find{ new File("${System.properties['java.home']}/${it}").exists() }
 
-project.ext.javafxJar = ['jfxrt.jar',
-                         'lib/jfxrt.jar',
-                         'lib/ext/jfxrt.jar',
-                         'jre/lib/jfxrt.jar',
-                         'jre/lib/ext/jfxrt.jar',
-                         'lib/javafx-swt.jar'].find{ new File("${System.properties['java.home']}/${it}").exists() }
-
-project.ext.hasJavaFx = javafxJar != null
+    ext.hasJavaFx = javafxJar != null
+}
 
-if(!project.ext.hasJavaFx) {
+if(!hasJavaFx) {
     sourceSets {
         main {
             java {
@@ -34,33 +40,35 @@
     }
 }
 
+// Don't generate javadoc
+javadoc.enabled = false
+
 // Disable deprecation warnings caused by JGoodies
 tasks.withType(JavaCompile) {
     options.deprecation = false
 }
 
-configurations {
-    bundleapp
-}
-
 dependencies {
-      compile project(':ice')
-      compile project(':icessl')
-      compile project(':icelocatordiscovery')
-      compile project(':icebox')
-      compile project(':icestorm')
-      compile project(':glacier2')
-      compile project(':icegrid')
-      compile "com.jgoodies:jgoodies-looks:${jgoodiesLooksVersion}"
-      compile "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}"
-      bundleapp 'com.panayotis:appbundler:1.0.2'
+      implementation project(':ice')
+      implementation project(':icessl')
+      implementation project(':icelocatordiscovery')
+      implementation project(':icebox')
+      implementation project(':icestorm')
+      implementation project(':glacier2')
+      implementation project(':icegrid')
+      implementation "com.jgoodies:jgoodies-looks:${jgoodiesLooksVersion}"
+      implementation "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}"
+
+      if(hasJavaFx && GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) {
+           implementation "org.openjfx:javafx-base:11:$platform"
+           implementation "org.openjfx:javafx-swing:11:$platform"
+           implementation "org.openjfx:javafx-controls:11:$platform"
+           implementation "org.openjfx:javafx-graphics:11:$platform"
+      }
 }
 
 project.ext.tmpJarName = "IceGridGUITEMP.jar"
 project.ext.jarName = "icegridgui.jar"
-project.ext.env = System.getenv()
-project.ext.keystore = env['JARSIGNER_KEYSTORE']
-project.ext.keystore_password = env['JARSIGNER_KEYSTORE_PASSWORD']
 
 jar {
     archiveName = tmpJarName
@@ -70,105 +78,21 @@
     }
 }
 
-task signjar() {
-    doLast {
-        if(keystore != null && keystore.length() > 0) {
-            ant.signjar(jar: "${libDir}/${jarName}",
-                        alias: 'zeroc.com',
-                        keystore:"${keystore}",
-                        storepass:"${keystore_password}")
-        }
-    }
-}
-assemble.dependsOn(signjar)
-
 project.ext.libJars = []
 
 project.ext.jarBuilder = "plain-jar.gradle"
 if(icegridguiProguard.toBoolean()) {
-    if(JavaVersion.current() == JavaVersion.VERSION_1_8) {
-        ['rt.jar',
-         'jsse.jar',
-         'i386/default/jclSC170/vm.jar',
-         'amd64/default/jclSC170/vm.jar',
-         'ibmcertpathfw.jar',
-         'math.jar'].each {
-            def jfile = searchFile(["${System.properties['java.home']}"],
-                                   ["${it}", "lib/${it}", "jre/lib/${it}"])
-            if(jfile) {
-                project.ext.libJars << jfile
-            }
-        }
-
-        if(hasJavaFx) {
-            project.ext.libJars << "${System.properties['java.home']}/${javafxJar}"
-        }
+    if(GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) {
+        logger.warn('Proguard does not yet support Java 11. Plain IceGridGUI JAR will be built.')
     }
-    else{
-        ['java.base.jmod',
-         'java.xml.jmod',
-         'java.desktop.jmod',
-         'java.prefs.jmod',
-         'java.naming.jmod',
-         'java.datatransfer.jmod',
-         'javafx.base.jmod',
-         'javafx.controls.jmod',
-         'javafx.graphics.jmod',
-         'javafx.swing.jmod',
-         'java.logging.jmod'].each {
-            project.ext.libJars << "${System.properties['java.home']}/jmods/${it}"
-        }
+    else {
+        project.ext.jarBuilder = "proguard-jar.gradle"
     }
-    project.ext.jarBuilder = "proguard-jar.gradle"
 }
-apply from: jarBuilder
 
-if(macosx)
-{
-    def appName = "IceGrid GUI"
-    task bundleapp(dependsOn: signjar) {
-        doLast {
-            ant.taskdef(name: 'bundleapp',
-                        classname: 'com.oracle.appbundler.AppBundlerTask',
-                        classpath: configurations.bundleapp.asPath)
-
-            ant.bundleapp(outputdirectory: "${libDir}",
-                        name: appName,
-                        displayname: appName,
-                        identifier: "com.zeroc.IceGridGUI",
-                        icon: "${projectDir}/src/main/resources/icons/icegrid.icns",
-                        shortversion: "${project.version}",
-                        applicationCategory: "public.app-category.utilities",
-                        mainclassname: "com.zeroc.IceGridGUI/Main",
-                        copyright: "Copyright © 2005-2018 ZeroC, Inc. All rights reserved.") {
-                classpath(file: "${libDir}/${jarName}") {
-                }
-                option(value: "-Dapple.laf.useScreenMenuBar=true") {
-                }
-                option(value: "-Dcom.apple.macos.use-file-dialog-packages=true") {
-                }
-                option(value: "-Dcom.apple.macos.useScreenMenuBar=true") {
-                }
-                option(value: "-Xdock:name=IceGrid GUI") {
-                }
-                option(value: "-Dcom.apple.mrj.application.apple.menu.about.name=${appName}") {
-                }
-            }
-        }
-    }
-    assemble.dependsOn(bundleapp)
-
-    task copyBundle(type: Copy, dependsOn: bundleapp) {
-        from "${libDir}/${appName}.app"
-        into "${DESTDIR}/${prefix}/${appName}.app"
-    }
-}
+apply from: jarBuilder
 
 clean {
     delete("${libDir}/${jarName}")
     delete("${libDir}/IceGrid GUI.app")
 }
-
-if(macosx) {
-    install.dependsOn(copyBundle)
-}
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/icegridgui.pro zeroc-ice-3.7.2/java/src/IceGridGUI/icegridgui.pro
--- zeroc-ice-3.7.1/java/src/IceGridGUI/icegridgui.pro	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/icegridgui.pro	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Preserve all public applications.
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/plain-jar.gradle zeroc-ice-3.7.2/java/src/IceGridGUI/plain-jar.gradle
--- zeroc-ice-3.7.1/java/src/IceGridGUI/plain-jar.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/plain-jar.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 task copyTmpJars(type: Copy, dependsOn: jar) {
     from new File("${projectDir}/build/libs/${tmpJarName}")
@@ -20,15 +15,13 @@
             delegate.manifest {
                 attribute(name: "Main-Class", value: "com.zeroc.IceGridGUI.Main")
                 attribute(name: "Built-By", value: "ZeroC, Inc.")
-                attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { "file://${it.toURI().getRawPath()}" }.join(' '))
+                attribute(name: "Class-Path", value: configurations.runtimeClasspath.resolve().collect { "file://${it.toURI().getRawPath()}" }.join(' '))
             }
         }
     }
 }
-
 updateManifest.outputs.files("${libDir}/${jarName}")
-
-signjar.dependsOn(updateManifest)
+assemble.dependsOn(updateManifest)
 
 //
 // Copy JARs to the install location
@@ -49,27 +42,11 @@
             delegate.manifest {
                 attribute(name: "Main-Class", value: "com.zeroc.IceGridGUI.Main")
                 attribute(name: "Built-By", value: "ZeroC, Inc.")
-                attribute(name: "Class-Path", value: configurations.runtime.resolve().collect {
+                attribute(name: "Class-Path", value: configurations.runtimeClasspath.resolve().collect {
                     "file://${it.toURI().getRawPath()}" }.join(' ').replaceAll("${libDir.replaceAll('\\\\', '/')}", "${jarDir.replaceAll('\\\\', '/')}"))
             }
         }
     }
 }
 updateInstallManifest.outputs.files("${DESTDIR}${jarDir}/${jarName}")
-
-//
-// We need to sign the install JARs after updating the manifest.
-//
-task signInstallJar(dependsOn: updateInstallManifest) {
-    doLast {
-        if(keystore != null && keystore.length() > 0) {
-            ant.signjar(jar: "${DESTDIR}${jarDir}/${jarName}",
-                        alias: "zeroc.com",
-                        keystore: "${keystore}",
-                        storepass:"${keystore_password}")
-        }
-    }
-}
-signInstallJar.outputs.files("${DESTDIR}${jarDir}/${jarName}")
-
-task install(dependsOn: signInstallJar)
+task install(dependsOn: updateInstallManifest)
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/proguard-jar.gradle zeroc-ice-3.7.2/java/src/IceGridGUI/proguard-jar.gradle
--- zeroc-ice-3.7.1/java/src/IceGridGUI/proguard-jar.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/proguard-jar.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 buildscript {
     repositories {
@@ -17,18 +12,96 @@
     }
 }
 
+configurations {
+    bundleapp
+}
+
+dependencies {
+      bundleapp 'com.panayotis:appbundler:1.1.0'
+}
+
+if(JavaVersion.current() == JavaVersion.VERSION_1_8) {
+    ['rt.jar',
+     'jsse.jar',
+     'i386/default/jclSC170/vm.jar',
+     'amd64/default/jclSC170/vm.jar',
+     'ibmcertpathfw.jar',
+     'math.jar'].each {
+        def jfile = searchFile(["${System.properties['java.home']}"], ["${it}", "lib/${it}", "jre/lib/${it}"])
+        if(jfile) {
+            project.ext.libJars << jfile
+        }
+    }
+
+    if(hasJavaFx) {
+        project.ext.libJars << "${System.properties['java.home']}/${javafxJar}"
+    }
+}
+else {
+    ['java.base.jmod',
+     'java.xml.jmod',
+     'java.desktop.jmod',
+     'java.prefs.jmod',
+     'java.naming.jmod',
+     'java.datatransfer.jmod',
+     'javafx.base.jmod',
+     'javafx.controls.jmod',
+     'javafx.graphics.jmod',
+     'javafx.swing.jmod',
+     'java.logging.jmod'].each {
+        project.ext.libJars << "${System.properties['java.home']}/jmods/${it}"
+    }
+}
+
 task proguardJar(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
-    injars configurations.compile.resolve(), filter: "!META-INF/**"
+    injars configurations.runtimeClasspath.resolve(), filter: "!META-INF/**"
     injars "${projectDir}/build/libs/${tmpJarName}"
     outjars "${libDir}/${jarName}"
     libraryjars project.ext.libJars
     configuration 'icegridgui.pro'
 }
-signjar.dependsOn(proguardJar)
 
-task copyJars(type: Copy, dependsOn: signjar) {
+task copyJars(type: Copy, dependsOn: proguardJar) {
     from new File("${libDir}/${jarName}")
     into "${DESTDIR}${jarDir}"
 }
-
 task install(dependsOn: copyJars)
+
+if(System.properties['os.name'] == "Mac OS X") {
+    def appName = "IceGrid GUI"
+    task bundleapp(dependsOn: proguardJar) {
+        doLast {
+            ant.taskdef(name: 'bundleapp',
+                        classname: 'com.oracle.appbundler.AppBundlerTask',
+                        classpath: configurations.bundleapp.asPath)
+
+            ant.bundleapp(outputdirectory: "${libDir}",
+                          name: appName,
+                          displayname: appName,
+                          identifier: "com.zeroc.IceGridGUI",
+                          icon: "${projectDir}/src/main/resources/icons/icegrid.icns",
+                          shortversion: "${project.version}",
+                          applicationCategory: "public.app-category.utilities",
+                          mainclassname: "com.zeroc.IceGridGUI/Main",
+                          copyright: "Copyright © 2005-present ZeroC, Inc. All rights reserved.") {
+                classpath(file: "${libDir}/${jarName}") {}
+                option(value: "-Dapple.laf.useScreenMenuBar=true") {}
+                option(value: "-Dcom.apple.macos.use-file-dialog-packages=true") {}
+                option(value: "-Dcom.apple.macos.useScreenMenuBar=true") {}
+                option(value: "-Xdock:name=IceGrid GUI") {}
+                option(value: "-Dcom.apple.mrj.application.apple.menu.about.name=${appName}") {}
+            }
+        }
+    }
+    assemble.dependsOn(bundleapp)
+
+    task copyBundle(type: Copy, dependsOn: bundleapp) {
+        from "${libDir}/${appName}.app"
+        into "${DESTDIR}/${prefix}/${appName}.app"
+    }
+
+    install.dependsOn(copyBundle)
+}
+else {
+    assemble.dependsOn(proguardJar)
+}
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdapterObserverI.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdapterObserverI.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdapterObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdapterObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdminRouter.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdminRouter.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdminRouter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/AdminRouter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AbstractServerEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AbstractServerEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AbstractServerEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AbstractServerEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AdapterEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AdapterEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AdapterEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/AdapterEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Adapter.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Adapter.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Adapter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Adapter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ApplicationEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ArrayMapField.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ArrayMapField.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ArrayMapField.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ArrayMapField.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorChildEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorChildEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorChildEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorChildEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Communicator.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Communicator.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Communicator.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Communicator.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorSubEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorSubEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorSubEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/CommunicatorSubEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnvEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnvEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnvEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnvEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnv.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnv.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnv.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DbEnv.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DescriptorHolder.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DescriptorHolder.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DescriptorHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/DescriptorHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editable.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editable.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editable.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editable.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTextField.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTextField.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTextField.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTextField.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTreeNode.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTreeNode.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTreeNode.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ListTreeNode.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/NodeEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/NodeEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/NodeEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/NodeEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Node.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Node.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Node.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Node.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Nodes.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Nodes.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Nodes.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Nodes.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParametersField.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParametersField.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParametersField.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParametersField.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParameterValuesField.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParameterValuesField.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParameterValuesField.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ParameterValuesField.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServerEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServerEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServerEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServerEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServiceEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServiceEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServiceEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainServiceEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainService.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainService.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainService.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PlainService.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertiesField.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertiesField.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertiesField.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertiesField.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetParent.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetParent.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetParent.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySetParent.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySets.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySets.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySets.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySets.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroupEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroupEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroupEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroupEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroup.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroup.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroup.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroup.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroups.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroups.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroups.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ReplicaGroups.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
@@ -124,6 +119,28 @@
     }
 
     @Override
+    public void delete()
+    {
+        if(_file == null && !_live)
+        {
+            int confirm = JOptionPane.showConfirmDialog(_coordinator.getMainFrame(),
+                                                        "You are about to remove application '" + _id + "'. "
+                                                        + "Do you want to proceed?",
+                                                        "Remove Confirmation",
+                                                        JOptionPane.YES_NO_OPTION);
+
+            if(confirm == JOptionPane.YES_OPTION)
+            {
+                super.delete();
+            }
+        }
+        else
+        {
+            super.delete();
+        }
+    }
+
+    @Override
     public Editor getEditor()
     {
         if(_editor == null)
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstanceEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstanceEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstanceEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstanceEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstance.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstance.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstancePropertySetEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstancePropertySetEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstancePropertySetEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerInstancePropertySetEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Server.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Server.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplateEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplateEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplateEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplateEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplate.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplates.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplates.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplates.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerTemplates.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstanceEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstanceEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstanceEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstanceEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstance.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstance.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceInstance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Service.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Service.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Service.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Service.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceSubEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceSubEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceSubEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceSubEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplateEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplateEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplateEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplateEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplate.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplate.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplate.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplate.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplates.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplates.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplates.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServiceTemplates.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/SimpleMapField.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/SimpleMapField.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/SimpleMapField.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/SimpleMapField.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateInstance.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateInstance.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateInstance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TemplateInstance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Templates.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Templates.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Templates.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Templates.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/TreeNode.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/UpdateFailedException.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/UpdateFailedException.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/UpdateFailedException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/UpdateFailedException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.Application;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationObserverI.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationObserverI.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/CellRenderer.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/CellRenderer.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/CellRenderer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/CellRenderer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
@@ -27,6 +22,9 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
+import java.nio.file.Paths;
+import java.nio.file.Files;
+
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.filechooser.FileFilter;
@@ -234,16 +232,6 @@
             //
         }
 
-        private void disableAllEditMenusAndButtons()
-        {
-            _cut.setTarget(null);
-            _copy.setTarget(null);
-            _paste.setTarget(null);
-            _delete.setTarget(null);
-            _moveUp.setTarget(null);
-            _moveDown.setTarget(null);
-        }
-
         private void enableTextEditActions(JTextComponent target)
         {
             boolean editable = target.isEditable() && target.isEnabled();
@@ -710,6 +698,16 @@
         return _discardUpdates;
     }
 
+    public void disableAllEditMenusAndButtons()
+    {
+        _cut.setTarget(null);
+        _copy.setTarget(null);
+        _paste.setTarget(null);
+        _delete.setTarget(null);
+        _moveUp.setTarget(null);
+        _moveDown.setTarget(null);
+    }
+
     //
     // Open live application and select application tab
     //
@@ -1689,14 +1687,14 @@
                 return _session;
             }
 
-            synchronized public void setSessionTimeout(long sessionTimeout)
+            synchronized public void setACMTimeout(int acmTimeout)
             {
-                _sessionTimeout = sessionTimeout;
+                _acmTimeout = acmTimeout;
             }
 
-            synchronized public void setACMTimeout(int acmTimeout)
+            synchronized public void setReplicaName(String replicaName)
             {
-                _acmTimeout = acmTimeout;
+                _replicaName = replicaName;
             }
 
             synchronized public void loginSuccess()
@@ -1711,7 +1709,7 @@
                 _newApplicationWithDefaultTemplates.setEnabled(true);
                 _acquireExclusiveWriteAccess.setEnabled(true);
                 _mainPane.setSelectedComponent(_liveDeploymentPane);
-                _sessionKeeper.loginSuccess(parent, _sessionTimeout, _acmTimeout, _session, info);
+                _sessionKeeper.loginSuccess(parent, _acmTimeout, _session, _replicaName, info);
             }
 
             synchronized public void loginFailed()
@@ -1732,8 +1730,8 @@
             }
 
             private AdminSessionPrx _session;
-            private long _sessionTimeout = 0;
             private int _acmTimeout = 0;
+            private String _replicaName;
             private boolean _failed = false;
         }
 
@@ -1805,14 +1803,8 @@
                                    }
                                }
                                cb.setSession(AdminSessionPrx.uncheckedCast(s));
-                               cb.setSessionTimeout(router.getSessionTimeout());
-                               try
-                               {
-                                   cb.setACMTimeout(router.getACMTimeout());
-                               }
-                               catch(com.zeroc.Ice.OperationNotExistException ex)
-                               {
-                               }
+                               cb.setACMTimeout(router.getACMTimeout());
+                               cb.setReplicaName(cb.getSession().getReplicaName());
                                SwingUtilities.invokeLater(() -> cb.loginSuccess());
                            }
                            catch(final com.zeroc.Glacier2.PermissionDeniedException e)
@@ -2041,14 +2033,7 @@
                                                                                              info.getPassword() != null ? new String(info.getPassword()) : ""));
                                            assert cb.getSession() != null;
                                        }
-                                       cb.setSessionTimeout(cb.getRegistry().getSessionTimeout());
-                                       try
-                                       {
-                                           cb.setACMTimeout(cb.getRegistry().getACMTimeout());
-                                       }
-                                       catch(com.zeroc.Ice.OperationNotExistException ex)
-                                       {
-                                       }
+                                       cb.setACMTimeout(cb.getRegistry().getACMTimeout());
                                    }
                                    catch(final com.zeroc.IceGrid.PermissionDeniedException e)
                                    {
@@ -2133,6 +2118,7 @@
                                    }
                                } while(cb.getSession() == null);
 
+                               cb.setReplicaName(cb.getSession().getReplicaName());
                                SwingUtilities.invokeLater(() -> cb.loginSuccess());
                            }
                        });
@@ -3127,7 +3113,7 @@
         else if(com.zeroc.IceInternal.Util.findClass("javafx.embed.swing.JFXPanel", null) == null)
         {
             JOptionPane.showMessageDialog(_mainFrame,
-                                          "The Metrics Graph view requires JavaFX 2",
+                                          "The Metrics Graph view requires JavaFX",
                                           "IceGrid GUI Info",
                                           JOptionPane.INFORMATION_MESSAGE);
         }
@@ -3268,7 +3254,7 @@
     {
         String text = "IceGrid GUI version "
             + com.zeroc.Ice.Util.stringVersion() + "\n"
-            + "Copyright \u00A9 2005-2018 ZeroC, Inc. All rights reserved.\n";
+            + "Copyright \u00A9 2005-present ZeroC, Inc. All rights reserved.\n";
 
         JOptionPane.showMessageDialog(
             _mainFrame,
@@ -3359,7 +3345,7 @@
         return _sessionKeeper.connectedToMaster();
     }
 
-    SessionKeeper getSessionKeeper()
+    public SessionKeeper getSessionKeeper()
     {
         return _sessionKeeper;
     }
@@ -3489,68 +3475,130 @@
         return _connected;
     }
 
-    public String getDataDirectory() throws java.lang.Exception
+    public void tryMigrateDataDirectory()
     {
-        if(_dataDir == null)
+        String oldDataDir = null;
+        if(System.getProperty("os.name").startsWith("Windows"))
         {
-            if(System.getProperty("os.name").startsWith("Windows"))
+            String regKey = "\"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\"";
+            String regQuery = "reg query " + regKey + " /v Personal";
+            try
             {
-                String regKey = "\"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\"";
-                String regQuery = "reg query " + regKey + " /v Personal";
-                try
+                java.lang.Process process = Runtime.getRuntime().exec(regQuery);
+                process.waitFor();
+                if(process.exitValue() != 0)
                 {
-                    java.lang.Process process = Runtime.getRuntime().exec(regQuery);
-                    process.waitFor();
-                    if(process.exitValue() != 0)
-                    {
-                        throw new Exception("Could not read Windows registry key `" + regKey + "'");
-                    }
+                    JOptionPane.showMessageDialog(getMainFrame(),
+                                                  "Could not read Windows registry key `" + regKey + "'",
+                                                  "Initialization Exception",
+                                                  JOptionPane.ERROR_MESSAGE);
+                    return;
+                }
 
-                    java.io.InputStream is = process.getInputStream();
-                    java.io.StringWriter sw = new java.io.StringWriter();
-                    int c;
-                    while((c = is.read()) != -1)
-                    {
-                        sw.write(c);
-                    }
-                    String[] result = sw.toString().split("\n");
-                    for(String line : result)
-                    {
-                        int i = line.indexOf("REG_SZ");
-                        if(i == -1)
-                        {
-                            continue;
-                        }
-                        _dataDir = line.substring(i + "REG_SZ".length(), line.length()).trim();
-                        break;
-                    }
-                    if(_dataDir == null)
-                    {
-                        throw new Exception("Could not get Documents dir from Windows registry key `" + regKey + "'");
-                    }
-                    _dataDir += File.separator + "ZeroC" + File.separator + "IceGrid Admin" + File.separator +
-                        "KeyStore";
+                java.io.InputStream is = process.getInputStream();
+                java.io.StringWriter sw = new java.io.StringWriter();
+                int c;
+                while((c = is.read()) != -1)
+                {
+                    sw.write(c);
                 }
-                catch(java.io.IOException ex)
+                String[] result = sw.toString().split("\n");
+                for(String line : result)
                 {
-                    throw new Exception("Could not read Windows registry key `" + regKey + "'\n" + ex.toString());
+                    int i = line.indexOf("REG_SZ");
+                    if(i == -1)
+                    {
+                        continue;
+                    }
+                    oldDataDir = line.substring(i + "REG_SZ".length(), line.length()).trim();
+                    break;
                 }
-                catch(java.lang.InterruptedException ex)
+
+                if(oldDataDir == null)
                 {
-                    throw new Exception("Could not read Windows registry key `" + regKey + "'\n" + ex.toString());
+                    JOptionPane.showMessageDialog(getMainFrame(),
+                                              "Could not get Documents dir from Windows registry key `" + regKey + "'",
+                                              "Initialization Exception",
+                                              JOptionPane.ERROR_MESSAGE);
+                    return;
                 }
+                oldDataDir = Paths.get(oldDataDir, "ZeroC",  "IceGrid Admin", "KeyStore").toString();
             }
-            else
+            catch(java.io.IOException ex)
             {
-                _dataDir = System.getProperty("user.home") + File.separator + ".ZeroC" + File.separator +
-                    "IceGrid Admin" + File.separator + "KeyStore";
+                JOptionPane.showMessageDialog(getMainFrame(),
+                                              "Could not read Windows registry key `" + regKey + "'\n" + ex.toString(),
+                                              "Initialization Exception",
+                                              JOptionPane.ERROR_MESSAGE);
+                return;
+            }
+            catch(java.lang.InterruptedException ex)
+            {
+                JOptionPane.showMessageDialog(getMainFrame(),
+                                              "Could not read Windows registry key `" + regKey + "'\n" + ex.toString(),
+                                              "Initialization Exception",
+                                              JOptionPane.ERROR_MESSAGE);
+                return;
             }
         }
-        if(!new File(_dataDir).isDirectory())
+        else if(System.getProperty("os.name").startsWith("Mac OS"))
         {
-            new File(_dataDir).mkdirs();
+            oldDataDir = Paths.get(System.getProperty("user.home"), ".ZeroC", "IceGrid Admin", "KeyStore").toString();
         }
-        return _dataDir;
+
+        if(oldDataDir != null)
+        {
+            String dataDir = getDataDirectory();
+            if(new File(dataDir).isDirectory() && new File(dataDir).list().length == 0 &&
+               new File(oldDataDir).isDirectory() && new File(oldDataDir).list().length > 0)
+            {
+                for(File f : new File(oldDataDir).listFiles())
+                {
+                    try
+                    {
+                        Files.copy(Paths.get(oldDataDir, f.getName()),
+                                   Paths.get(dataDir, f.getName()));
+                        new File(Paths.get(oldDataDir, f.getName()).toString()).delete();
+                    }
+                    catch(java.io.IOException ex)
+                    {
+                        JOptionPane.showMessageDialog(getMainFrame(),
+                                                      "Could not move `" +
+                                                      Paths.get(oldDataDir, f.getName()).toString() + "' to " +
+                                                      "`" + Paths.get(oldDataDir, f.getName()).toString() + "'",
+                                                      "Initialization Exception",
+                                                      JOptionPane.ERROR_MESSAGE);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    public String getDataDirectory()
+    {
+        String dataDir = null;
+        if(System.getProperty("os.name").startsWith("Windows"))
+        {
+            dataDir = Paths.get(System.getenv("APPDATA"), "..", "Local", "ZeroC",
+                                "IceGrid Admin", "KeyStore").toString();
+        }
+        else if(System.getProperty("os.name").startsWith("Mac OS"))
+        {
+            dataDir = Paths.get(System.getProperty("user.home"), "Library", "Application Support", "ZeroC",
+                                "IceGrid Admin", "KeyStore").toString();
+        }
+        else
+        {
+            dataDir = Paths.get(System.getProperty("user.home"), ".ZeroC", "IceGrid Admin", "KeyStore").toString();
+        }
+
+        if(!new File(dataDir).isDirectory())
+        {
+            new File(dataDir).mkdirs();
+        }
+
+        return dataDir;
     }
 
     public IGraphView[] getGraphViews()
@@ -3715,7 +3763,6 @@
             getScaledInstance(16, 16, java.awt.Image.SCALE_SMOOTH ));
     }
 
-    private String _dataDir;
     private final com.zeroc.Ice.InitializationData _initData;
     private com.zeroc.Ice.Communicator _communicator;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/AdapterEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/AdapterEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/AdapterEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/AdapterEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Adapter.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Adapter.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Adapter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Adapter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnvEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnvEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnvEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnvEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnv.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnv.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnv.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/DbEnv.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Editor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Editor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Editor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Editor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsFieldContext.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsFieldContext.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsFieldContext.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsFieldContext.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsViewEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsView.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsView.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsView.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/MetricsView.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/NodeEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/NodeEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/NodeEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/NodeEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Root.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServerEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
@@ -788,25 +783,16 @@
                         {
                             try
                             {
-                                serviceManager.addObserverAsync(_serviceObserver).whenComplete((result, ex) ->
-                                    {
-                                        if(ex != null)
-                                        {
-                                            JOptionPane.showMessageDialog(
-                                                getCoordinator().getMainFrame(),
-                                                "Failed to register service-manager observer: " + ex.toString(),
-                                                "Observer registration error",
-                                                JOptionPane.ERROR_MESSAGE);
-                                        }
-                                    });
+                                //
+                                // Ignore failures to register the service observers. Failures can occur if
+                                // there's an incompatibility between IceGrid nodes & registries (it's the
+                                // case for instance between 3.5 and 3.7).
+                                //
+                                serviceManager.addObserverAsync(_serviceObserver);
                             }
                             catch(com.zeroc.Ice.LocalException ex)
                             {
-                                JOptionPane.showMessageDialog(
-                                    getCoordinator().getMainFrame(),
-                                    "Failed to contact service-manager: " + ex.toString(),
-                                    "Observer communication error",
-                                    JOptionPane.ERROR_MESSAGE);
+                                // Ignore
                             }
                         }
                     }
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServiceEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServiceEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServiceEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ServiceEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowLogFileDialog.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowLogFileDialog.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowLogFileDialog.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowLogFileDialog.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/SlaveEditor.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/SlaveEditor.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/SlaveEditor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/SlaveEditor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Slave.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Slave.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Slave.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Slave.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TableField.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TableField.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TableField.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TableField.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/TreeNode.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
@@ -224,6 +219,10 @@
             com.zeroc.IceGrid.DeploymentException de = (com.zeroc.IceGrid.DeploymentException)e;
             amiFailure(prefix, title, "Deployment exception: " + de.reason);
         }
+        else if(e instanceof com.zeroc.Ice.ObjectNotExistException)
+        {
+            SwingUtilities.invokeLater(() -> { getCoordinator().getSessionKeeper().sessionLost(); });
+        }
         else
         {
             amiFailure(prefix, title, title + ":\n" + e.toString());
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI.LiveDeployment;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
@@ -41,7 +36,7 @@
     public void selected()
     {
         Coordinator c = _root.getCoordinator();
-
+        c.disableAllEditMenusAndButtons();
         if(c.connected())
         {
             c.getShowLiveDeploymentFiltersAction().setEnabled(true);
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Logger.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Logger.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Logger.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Logger.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
@@ -119,7 +114,7 @@
             });
 
         _coordinator = new Coordinator(this, args, Preferences.userRoot().node("IceGridGUI"));
-
+        _coordinator.tryMigrateDataDirectory();
         _coordinator.showMainFrame();
     }
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/MainPane.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/MainPane.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/MainPane.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/MainPane.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/NodeObserverI.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/NodeObserverI.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/NodeObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/NodeObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ObjectObserverI.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ObjectObserverI.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ObjectObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ObjectObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/RegistryObserverI.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/RegistryObserverI.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/RegistryObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/RegistryObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
@@ -80,7 +75,7 @@
     //
     private class Session
     {
-        Session(AdminSessionPrx session, long sessionTimeout, int acmTimeout, boolean routed, final Component parent)
+        Session(AdminSessionPrx session, int acmTimeout, boolean routed, final Component parent)
             throws java.lang.Throwable
         {
             _session = session;
@@ -216,34 +211,18 @@
                     {
                         try
                         {
-                            con.getInfo(); // This throws when the connection is closed.
+                            con.throwException(); // This throws when the connection is closed.
                             assert(false);
                         }
                         catch(final com.zeroc.Ice.LocalException ex)
                         {
                             SwingUtilities.invokeLater(() ->
                                 {
-                                    sessionLost("Failed to contact the IceGrid registry: " + ex.toString());
+                                    sessionLost();
                                 });
                         }
                     });
             }
-            else
-            {
-                _keepAliveFuture = _coordinator.getScheduledExecutor().scheduleAtFixedRate(() ->
-                    {
-                        _session.keepAliveAsync().whenComplete((result, ex) ->
-                            {
-                                if(ex != null)
-                                {
-                                    SwingUtilities.invokeLater(() ->
-                                        {
-                                            sessionLost("Failed to contact the IceGrid registry: " + ex.toString());
-                                        });
-                                }
-                            });
-                    }, sessionTimeout / 2, sessionTimeout / 2, java.util.concurrent.TimeUnit.SECONDS);
-            }
         }
 
         void logout(boolean destroySession)
@@ -5079,8 +5058,8 @@
         }
     }
 
-    public void loginSuccess(final JDialog parent, final long sessionTimeout, final int acmTimeout,
-                             final AdminSessionPrx adminSession, final ConnectionInfo info)
+    public void loginSuccess(final JDialog parent, final int acmTimeout, final AdminSessionPrx adminSession,
+                             final String replicaName, final ConnectionInfo info)
     {
         try
         {
@@ -5105,21 +5084,8 @@
         }
 
         assert adminSession != null;
-        try
-        {
-            _replicaName = adminSession.getReplicaName();
-        }
-        catch(com.zeroc.Ice.LocalException e)
-        {
-            logout(true);
-            JOptionPane.showMessageDialog(
-                parent,
-                "Could not retrieve replica name: " + e.toString(),
-                "Login failed",
-                JOptionPane.ERROR_MESSAGE);
-            return;
-        }
 
+        _replicaName = replicaName;
         _coordinator.setConnected(true);
 
         _connectedToMaster = _replicaName.equals("Master");
@@ -5139,7 +5105,7 @@
             {
                 try
                 {
-                    final Session session = new Session(adminSession, sessionTimeout, acmTimeout, !info.getDirect(), parent);
+                    final Session session = new Session(adminSession, acmTimeout, !info.getDirect(), parent);
                     SwingUtilities.invokeAndWait(() ->
                                                  {
                                                      _session = session;
@@ -5202,6 +5168,12 @@
 
     public void permissionDenied(final JDialog parent, final ConnectionInfo info, final String msg)
     {
+        if(_authDialog != null)
+        {
+            _authDialog.dispose();
+            _authDialog = null;
+        }
+
         class PermissionDeniedAuthDialog extends AuthDialog
         {
             PermissionDeniedAuthDialog()
@@ -5355,8 +5327,9 @@
                             }
                         }
                     };
+                okButton.setAction(okAction);
 
-                AbstractAction editAction = new AbstractAction("Edit Connection")
+                AbstractAction editConnectionAction = new AbstractAction("Edit Connection")
                     {
                         @Override
                         public void actionPerformed(ActionEvent e)
@@ -5370,6 +5343,7 @@
                             dialog.setVisible(true);
                         }
                     };
+                editConnectionButton.setAction(editConnectionAction);
 
                 AbstractAction cancelAction = new AbstractAction("Cancel")
                     {
@@ -5381,6 +5355,7 @@
                             _authDialog = null;
                         }
                     };
+                cancelButton.setAction(cancelAction);
 
                 JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, editConnectionButton,
                     cancelButton).addGlue().build();
@@ -5408,11 +5383,11 @@
         _authDialog.showDialog();
     }
 
-    void sessionLost(String message)
+    public void sessionLost()
     {
         JOptionPane.showMessageDialog(
             _coordinator.getMainFrame(),
-            message,
+            "The connection with the registry has been closed.",
             "Session lost",
             JOptionPane.ERROR_MESSAGE);
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/StatusBar.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/StatusBar.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/StatusBar.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/StatusBar.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Tab.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Tab.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Tab.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Tab.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/TreeNodeBase.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/TreeNodeBase.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/TreeNodeBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/TreeNodeBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Utils.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Utils.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Utils.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Utils.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 import java.awt.Image;
diff -Nru zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/XMLWriter.java zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/XMLWriter.java
--- zeroc-ice-3.7.1/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/XMLWriter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/XMLWriter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceGridGUI;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/build.gradle zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/build.gradle
--- zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IceLocatorDiscovery"
 project.ext.description = "Ice plug-in that enables the discovery of IceGrid and custom locators via UDP multicast"
@@ -20,7 +12,7 @@
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/package-info.java zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/package-info.java
--- zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for the IceLocatorDiscovery plug-in. IceLocatorDiscovery discovers Ice
+ * locators (such as IceGrid registries) using UDP multicast.
+ **/
+package com.zeroc.IceLocatorDiscovery;
diff -Nru zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginFactory.java zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginFactory.java
--- zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceLocatorDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java
--- zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceLocatorDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/Plugin.java zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/Plugin.java
--- zeroc-ice-3.7.1/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/Plugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceLocatorDiscovery/src/main/java/com/zeroc/IceLocatorDiscovery/Plugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceLocatorDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java/src/IcePatch2/build.gradle zeroc-ice-3.7.2/java/src/IcePatch2/build.gradle
--- zeroc-ice-3.7.1/java/src/IcePatch2/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IcePatch2/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IcePatch2"
 project.ext.description = "File distribution and patching for Ice"
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IcePatch2.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IcePatch2.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java/src/IcePatch2/src/main/java/com/zeroc/IcePatch2/package-info.java zeroc-ice-3.7.2/java/src/IcePatch2/src/main/java/com/zeroc/IcePatch2/package-info.java
--- zeroc-ice-3.7.1/java/src/IcePatch2/src/main/java/com/zeroc/IcePatch2/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IcePatch2/src/main/java/com/zeroc/IcePatch2/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for clients of the IcePatch2 file patching service.
+ * @deprecated
+ **/
+package com.zeroc.IcePatch2;
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/build.gradle zeroc-ice-3.7.2/java/src/IceSSL/build.gradle
--- zeroc-ice-3.7.1/java/src/IceSSL/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IceSSL"
 project.ext.description = "The IceSSL plug-in"
 
 slice {
     java {
-
-        nostream {
-            files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['IceSSL/*.ice'])
-        }
+        files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['IceSSL/*.ice'])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/AcceptorI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/AcceptorI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/AcceptorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/AcceptorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/CertificateVerifier.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/CertificateVerifier.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/CertificateVerifier.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/CertificateVerifier.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointFactoryI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointFactoryI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Instance.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Instance.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Instance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Instance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/package-info.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/package-info.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * APIs for the IceSSL transport plug-in. IceSSL provides encryption using
+ * SSL/TLS.
+ **/
+package com.zeroc.IceSSL;
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PasswordCallback.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PasswordCallback.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PasswordCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PasswordCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginFactory.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginFactory.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Plugin.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Plugin.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Plugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Plugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/RFC2253.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/RFC2253.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/RFC2253.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/RFC2253.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
@@ -71,6 +66,10 @@
                 {
                     l.add("TLSv1.2");
                 }
+                else if(s.equals("TLS1_3") || s.equals("TLSV1_3"))
+                {
+                    l.add("TLSv1.3");
+                }
                 else
                 {
                     PluginInitializationException e = new PluginInitializationException();
@@ -787,15 +786,22 @@
     javax.net.ssl.SSLEngine createSSLEngine(boolean incoming, String host, int port)
     {
         javax.net.ssl.SSLEngine engine;
-        if(host != null)
+        try
         {
-            engine = _context.createSSLEngine(host, port);
+            if(host != null)
+            {
+                engine = _context.createSSLEngine(host, port);
+            }
+            else
+            {
+                engine = _context.createSSLEngine();
+            }
+            engine.setUseClientMode(!incoming);
         }
-        else
+        catch(Exception ex)
         {
-            engine = _context.createSSLEngine();
+            throw new com.zeroc.Ice.SecurityException("IceSSL: couldn't create SSL engine", ex);
         }
-        engine.setUseClientMode(!incoming);
 
         String[] cipherSuites = filterCiphers(engine.getSupportedCipherSuites(), engine.getEnabledCipherSuites());
         try
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
@@ -52,10 +47,15 @@
             final String host = _incoming ? (ipInfo != null ? ipInfo.remoteAddress : "") : _host;
             final int port = ipInfo != null ? ipInfo.remotePort : -1;
             _engine = _instance.createSSLEngine(_incoming, host, port);
-            _appInput = ByteBuffer.allocateDirect(_engine.getSession().getApplicationBufferSize() * 2);
+            _appInput = ByteBuffer.allocate(_engine.getSession().getApplicationBufferSize() * 2);
+
+            // Require BIG_ENDIAN byte buffers. This is needed for Android >= 8.0 which can read
+            // the SSL messages directly with these buffers.
             int bufSize = _engine.getSession().getPacketBufferSize() * 2;
-            _netInput = new com.zeroc.IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2));
-            _netOutput = new com.zeroc.IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2));
+            _netInput = new com.zeroc.IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2),
+                                                         java.nio.ByteOrder.BIG_ENDIAN);
+            _netOutput = new com.zeroc.IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2),
+                                                          java.nio.ByteOrder.BIG_ENDIAN);
         }
 
         int status = handshakeNonBlocking();
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TrustManager.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TrustManager.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TrustManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TrustManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Util.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Util.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Util.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/Util.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.IceSSL;
-
-public final class Util
-{
-    //
-    // Create a certificate from a PEM-encoded string.
-    //
-    public static java.security.cert.X509Certificate
-    createCertificate(String certPEM)
-        throws java.security.cert.CertificateException
-    {
-        final String header = "-----BEGIN CERTIFICATE-----";
-        final String footer = "-----END CERTIFICATE-----";
-
-        //
-        // The generateCertificate method requires that its input begin
-        // with the PEM header.
-        //
-        int pos = certPEM.indexOf(header);
-        if(pos == -1)
-        {
-            certPEM = header + "\n" + certPEM;
-        }
-        else if(pos > 0)
-        {
-            certPEM = certPEM.substring(pos);
-        }
-
-        //
-        // Add the footer if necessary.
-        //
-        if(certPEM.indexOf(footer) == -1)
-        {
-            certPEM = certPEM + footer;
-        }
-
-        byte[] bytes = null;
-        try
-        {
-            bytes = certPEM.getBytes("UTF8");
-        }
-        catch(java.io.UnsupportedEncodingException ex)
-        {
-            assert(false);
-            return null;
-        }
-
-        java.io.ByteArrayInputStream in = new java.io.ByteArrayInputStream(bytes);
-        java.security.cert.CertificateFactory cf = java.security.cert.CertificateFactory.getInstance("X.509");
-        return (java.security.cert.X509Certificate)cf.generateCertificate(in);
-    }
-
-    public final static String jdkTarget = "1.5";
-
-    //
-    // Needed by the test scripts to determine the JDK target of the SSL plug-in.
-    //
-    public static void
-    main(String[] args)
-    {
-        System.out.println(jdkTarget);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509KeyManagerI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509KeyManagerI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509KeyManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509KeyManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509TrustManagerI.java zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509TrustManagerI.java
--- zeroc-ice-3.7.1/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509TrustManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/X509TrustManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package com.zeroc.IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java/src/IceStorm/build.gradle zeroc-ice-3.7.2/java/src/IceStorm/build.gradle
--- zeroc-ice-3.7.1/java/src/IceStorm/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceStorm/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
 
 project.ext.displayName = "IceStorm"
 project.ext.description = "Publish-subscribe event distribution service"
@@ -24,15 +16,13 @@
 
 slice {
     java {
-        set1 {
-            args = "--checksum com.zeroc.IceStorm.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--checksum com.zeroc.IceStorm.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice')
+    implementation project(':ice')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java/src/IceStorm/src/main/java/com/zeroc/IceStorm/package-info.java zeroc-ice-3.7.2/java/src/IceStorm/src/main/java/com/zeroc/IceStorm/package-info.java
--- zeroc-ice-3.7.1/java/src/IceStorm/src/main/java/com/zeroc/IceStorm/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/src/IceStorm/src/main/java/com/zeroc/IceStorm/package-info.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/**
+ * IceStorm APIs. IceStorm is a broker-based pub/sub service, where
+ * subscribers connect to publishers using topics.
+ **/
+package com.zeroc.IceStorm;
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/build.gradle zeroc-ice-3.7.2/java/test/android/controller/build.gradle
--- zeroc-ice-3.7.1/java/test/android/controller/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,105 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+buildscript {
+    repositories {
+        jcenter()
+        google()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'gradle.plugin.com.zeroc.gradle.ice-builder:slice:1.4.5'
+    }
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'com.zeroc.gradle.ice-builder.slice'
+
+slice {
+    output = file("${project.buildDir}/generated/source/ice")
+    cppConfiguration = project.cppConfiguration
+    cppPlatform = project.cppPlatform
+    if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) {
+        iceHome = project.hasProperty('iceHome') ? project.iceHome
+                : System.getenv("ICE_HOME") != null ? System.env.ICE_HOME : new File("$rootProject.projectDir/../../../..").getCanonicalPath()
+    }
+    java {
+        files = fileTree(dir: "$rootProject.projectDir/../../../../scripts/", includes: ['*.ice'])
+    }
+}
+
+repositories {
+    if(slice.jarDir != null) {
+        flatDir {
+            name "local"
+            dirs slice.jarDir
+        }
+    }
+
+    if(this.devRepo) {
+        maven {
+            url this.devRepo
+        }
+    }
+
+    google()
+    jcenter()
+}
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        applicationId "com.zeroc.testcontroller"
+        minSdkVersion 24
+        targetSdkVersion 28
+        multiDexEnabled true // Necessary otherwise we'd exceed the 64K DEX limit.
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
+    }
+
+    buildTypes {
+        debug {
+            //
+            // Set minifyEnabled to false because the test app loads classes dynamically.
+            //
+            minifyEnabled false
+        }
+
+        release {
+            //
+            // Set minifyEnabled to false because the test app loads classes dynamically.
+            //
+            minifyEnabled false
+        }
+    }
+}
+
+task copyBksTask(type: Copy) {
+    from "${rootProject.projectDir}/../../../../certs/client.bks"
+    from "${rootProject.projectDir}/../../../../certs/server.bks"
+    into "src/main/res/raw"
+}
+preBuild.dependsOn(copyBksTask)
+
+clean {
+    delete("src/main/res/raw/client.bks")
+    delete("src/main/res/raw/server.bks")
+}
+
+dependencies {
+    implementation "com.zeroc:glacier2:${project.iceVersion}"
+    implementation "com.zeroc:ice:${project.iceVersion}"
+    implementation "com.zeroc:icessl:${project.iceVersion}"
+    runtimeOnly "com.zeroc:icediscovery:${project.iceVersion}"
+    runtimeOnly "com.zeroc:icebt:${project.iceVersion}"
+
+    implementation files("${rootProject.projectDir}/../../../lib/test.jar")
+    runtimeOnly "org.apache.commons:commons-compress:1.14"
+}
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/gradle.properties zeroc-ice-3.7.2/java/test/android/controller/gradle.properties
--- zeroc-ice-3.7.1/java/test/android/controller/gradle.properties	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/gradle.properties	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,51 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+//
+// Version used in JAR files
+//
+iceVersion = 3.7.2
+
+//
+// Set iceHome to location of Ice installation if Ice was installed in a
+// non-standard location. You must use forward slashes in the path, even on
+// Windows.
+//
+// iceHome =
+
+//
+// Gradle build properties
+//
+org.gradle.daemon = true
+org.gradle.configureondemand=false
+
+//
+// If the dev repository is set it will be used as the first repository when
+// resolving dependencies
+//
+devRepo =
+
+//
+// Windows specific options
+//
+
+//
+// The platform used by the C++ build. Supported values are `x64` and `Win32`.
+// This is required to locate the slice2java compiler in the platform-dependent
+// directory.
+//
+cppPlatform = x64
+
+//
+// The configuration used by the C++ build. Supported values are `Debug` and `Release`.
+// This is required to locate the slice2java compiler in the configuration-dependent
+// directory.
+//
+cppConfiguration = Release
+
+//
+// If the dev repository is set it will be used as the first repository when
+// resolving dependencies
+//
+devRepo =
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/src/main/AndroidManifest.xml zeroc-ice-3.7.2/java/test/android/controller/src/main/AndroidManifest.xml
--- zeroc-ice-3.7.1/java/test/android/controller/src/main/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/src/main/AndroidManifest.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.zeroc.testcontroller"
+    android:versionCode="1"
+    android:versionName="1.0.0">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <!--
+      http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
+    -->
+    <application
+        android:icon="@raw/icon"
+        android:label="@string/app_name"
+        android:name="ControllerApp"
+        android:allowBackup="false">
+        <activity
+            android:name="ControllerActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="http"
+                    android:host="zeroc.com" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/src/main/assets/.gitignore zeroc-ice-3.7.2/java/test/android/controller/src/main/assets/.gitignore
--- zeroc-ice-3.7.1/java/test/android/controller/src/main/assets/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/src/main/assets/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1 @@
+*.dex
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java zeroc-ice-3.7.2/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java
--- zeroc-ice-3.7.1/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,138 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package com.zeroc.testcontroller;
+
+import java.util.LinkedList;
+import android.app.*;
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.widget.*;
+import android.view.View;
+
+public class ControllerActivity extends ListActivity
+{
+    private WifiManager _wifiManager;
+    private WifiManager.MulticastLock _lock;
+    private LinkedList<String> _output = new LinkedList<String>();
+    private ArrayAdapter<String> _outputAdapter;
+    private ArrayAdapter<String> _ipv4Adapter;
+    private ArrayAdapter<String> _ipv6Adapter;
+
+    private static final int REQUEST_ENABLE_BT = 1;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        _wifiManager = (WifiManager)getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        _lock = _wifiManager.createMulticastLock("com.zeroc.testcontroller");
+        _lock.acquire();
+    }
+
+    @Override
+    public void onStart()
+    {
+        super.onStart();
+
+        //
+        // Enable Bluetooth if necessary.
+        //
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if(adapter == null)
+        {
+            Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
+            setup(false);
+        }
+        else if(!adapter.isEnabled())
+        {
+            Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+            startActivityForResult(enableIntent, REQUEST_ENABLE_BT);
+        }
+        else
+        {
+            setup(true);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int req, int res, Intent data)
+    {
+        switch(req)
+        {
+            case REQUEST_ENABLE_BT:
+            {
+                if(_outputAdapter == null)
+                {
+                    if(res == Activity.RESULT_OK)
+                    {
+                        setup(true);
+                    }
+                    else
+                    {
+                        Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
+                        setup(false);
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    private synchronized void setup(boolean bluetooth)
+    {
+        _outputAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, _output);
+        setListAdapter(_outputAdapter);
+        final ControllerApp app = (ControllerApp)getApplication();
+        final java.util.List<String> ipv4Addresses = app.getAddresses(false);
+        _ipv4Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv4Addresses);
+        Spinner s = (Spinner)findViewById(R.id.ipv4);
+        s.setAdapter(_ipv4Adapter);
+        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
+            {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+                {
+                    app.setIpv4Address(ipv4Addresses.get((int)id));
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> arg0)
+                {
+                }
+            });
+        s.setSelection(0);
+
+        final java.util.List<String> ipv6Addresses = app.getAddresses(true);
+        _ipv6Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv6Addresses);
+        s = (Spinner)findViewById(R.id.ipv6);
+        s.setAdapter(_ipv6Adapter);
+        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
+            {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+                {
+                    app.setIpv6Address(ipv6Addresses.get((int)id));
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> arg0)
+                {
+                }
+            });
+        s.setSelection(0);
+        app.startController(this, bluetooth);
+    }
+
+    public synchronized void println(String data)
+    {
+        _output.add(data);
+        _outputAdapter.notifyDataSetChanged();
+    }
+}
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java zeroc-ice-3.7.2/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
--- zeroc-ice-3.7.1/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,535 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package com.zeroc.testcontroller;
+
+import java.io.*;
+import java.util.*;
+
+import com.zeroc.Ice.Logger;
+import com.zeroc.Ice.Communicator;
+import com.zeroc.IceInternal.Time;
+
+import android.os.Build;
+import android.util.Log;
+import android.app.Application;
+
+import Test.Common.ProcessControllerRegistryPrx;
+import Test.Common.ProcessControllerPrx;
+
+public class ControllerApp extends Application
+{
+    private final String TAG = "ControllerApp";
+    private ControllerI _controllerI;
+    private ControllerActivity _activity;
+    private String _ipv4Address;
+    private String _ipv6Address;
+
+    static private class TestSuiteBundle
+    {
+        @SuppressWarnings("unchecked")
+        TestSuiteBundle(String name, ClassLoader loader) throws ClassNotFoundException
+        {
+            _loader = loader;
+            _class = (Class<? extends test.TestHelper>)_loader.loadClass(name);
+        }
+
+        test.TestHelper newInstance()
+                throws IllegalAccessException, InstantiationException
+        {
+            if(_class == null)
+            {
+                return null;
+            }
+            return _class.newInstance();
+        }
+
+        ClassLoader getClassLoader()
+        {
+            return  _loader;
+        }
+
+        private String _name;
+        private ClassLoader _loader;
+        private Class<? extends test.TestHelper> _class;
+    }
+
+    class AndroidLogger implements Logger
+    {
+        private final String _prefix;
+
+        AndroidLogger(String prefix)
+        {
+            _prefix = prefix;
+        }
+
+        @Override
+        public void print(String message)
+        {
+            Log.d(TAG, message);
+        }
+
+        @Override
+        public void trace(String category, String message)
+        {
+            Log.v(category, message);
+        }
+
+        @Override
+        public void warning(String message)
+        {
+            Log.w(TAG, message);
+        }
+
+        @Override
+        public void error(String message)
+        {
+            Log.e(TAG, message);
+        }
+
+        @Override
+        public String getPrefix()
+        {
+            return _prefix;
+        }
+
+        @Override
+        public Logger cloneWithPrefix(String s)
+        {
+            return new AndroidLogger(s);
+        }
+    }
+
+    @Override
+    public void onCreate()
+    {
+        super.onCreate();
+        com.zeroc.Ice.Util.setProcessLogger(new AndroidLogger(""));
+    }
+
+    synchronized public void setIpv4Address(String address)
+    {
+        _ipv4Address = address;
+    }
+
+    synchronized public void setIpv6Address(String address)
+    {
+        int i = address.indexOf("%");
+        _ipv6Address = i == -1 ? address : address.substring(i);
+    }
+
+    public List<String> getAddresses(boolean ipv6)
+    {
+        List<String> addresses = new java.util.ArrayList<String>();
+        try
+        {
+            java.util.Enumeration<java.net.NetworkInterface> ifaces = java.net.NetworkInterface.getNetworkInterfaces();
+            while(ifaces.hasMoreElements())
+            {
+                java.net.NetworkInterface iface = ifaces.nextElement();
+                java.util.Enumeration<java.net.InetAddress> addrs = iface.getInetAddresses();
+                while(addrs.hasMoreElements())
+                {
+                    java.net.InetAddress addr = addrs.nextElement();
+                    if((ipv6 && addr instanceof java.net.Inet6Address) ||
+                       (!ipv6 && !(addr instanceof java.net.Inet6Address)))
+                    {
+                        addresses.add(addr.getHostAddress());
+                    }
+                }
+            }
+        }
+        catch(java.net.SocketException ex)
+        {
+        }
+        return addresses;
+    }
+
+    public synchronized void startController(ControllerActivity activity, boolean bluetooth)
+    {
+        _activity = activity;
+        if(_controllerI == null)
+        {
+            _controllerI = new ControllerI(bluetooth);
+        }
+    }
+
+    public synchronized void println(final String data)
+    {
+        _activity.runOnUiThread(new Runnable()
+                                {
+                                    @Override
+                                    public void run()
+                                    {
+                                        synchronized(ControllerApp.this)
+                                        {
+                                            _activity.println(data);
+                                        }
+                                    }
+                                });
+    }
+
+    public static boolean isEmulator()
+    {
+        return Build.FINGERPRINT.startsWith("generic") ||
+               Build.FINGERPRINT.startsWith("unknown") ||
+               Build.MODEL.contains("google_sdk") ||
+               Build.MODEL.contains("Emulator") ||
+               Build.MODEL.contains("Android SDK built for x86") ||
+               Build.MANUFACTURER.contains("Genymotion") ||
+               (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) ||
+               Build.PRODUCT.equals("google_sdk");
+    }
+
+    class ControllerI
+    {
+        public ControllerI(boolean bluetooth)
+        {
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+            initData.properties = com.zeroc.Ice.Util.createProperties();
+            initData.properties.setProperty("Ice.ThreadPool.Server.SizeMax", "10");
+            initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp");
+            //initData.properties.setProperty("Ice.Trace.Network", "3");
+            //initData.properties.setProperty("Ice.Trace.Protocol", "1");
+            initData.properties.setProperty("ControllerAdapter.AdapterId", java.util.UUID.randomUUID().toString());
+            initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
+            if(!isEmulator())
+            {
+                if(bluetooth)
+                {
+                    initData.properties.setProperty("Ice.Plugin.IceBT", "com.zeroc.IceBT.PluginFactory");
+                }
+                initData.properties.setProperty("Ice.Plugin.IceDiscovery", "com.zeroc.IceDiscovery.PluginFactory");
+                initData.properties.setProperty("IceDiscovery.DomainId", "TestController");
+            }
+            _communicator = com.zeroc.Ice.Util.initialize(initData);
+            com.zeroc.Ice.ObjectAdapter adapter = _communicator.createObjectAdapter("ControllerAdapter");
+            ProcessControllerPrx processController = ProcessControllerPrx.uncheckedCast(
+                    adapter.add(new ProcessControllerI(),
+                                com.zeroc.Ice.Util.stringToIdentity("Android/ProcessController")));
+            adapter.activate();
+            ProcessControllerRegistryPrx registry;
+            if(isEmulator())
+            {
+                registry = ProcessControllerRegistryPrx.uncheckedCast(
+                        _communicator.stringToProxy("Util/ProcessControllerRegistry:tcp -h 10.0.2.2 -p 15001"));
+            }
+            else
+            {
+                // Use IceDiscovery to find a process controller registry
+                registry = ProcessControllerRegistryPrx.uncheckedCast(
+                        _communicator.stringToProxy("Util/ProcessControllerRegistry"));
+            }
+            registerProcessController(adapter, registry, processController);
+            println("Android/ProcessController");
+        }
+
+        public void
+        registerProcessController(final com.zeroc.Ice.ObjectAdapter adapter,
+                                  final ProcessControllerRegistryPrx registry,
+                                  final ProcessControllerPrx processController)
+        {
+            registry.ice_pingAsync().whenCompleteAsync(
+                (r1, e1) ->
+                {
+                    if(e1 != null)
+                    {
+                        handleException(e1, adapter, registry, processController);
+                    }
+                    else
+                    {
+                        com.zeroc.Ice.Connection connection = registry.ice_getConnection();
+                        connection.setAdapter(adapter);
+                        connection.setACM(OptionalInt.of(5),
+                                Optional.of(com.zeroc.Ice.ACMClose.CloseOff),
+                                Optional.of(com.zeroc.Ice.ACMHeartbeat.HeartbeatAlways));
+                        connection.setCloseCallback(
+                                con ->
+                                {
+                                    println("connection with process controller registry closed");
+                                    while (true) {
+                                        try
+                                        {
+                                            Thread.sleep(500);
+                                            break;
+                                        }
+                                        catch(InterruptedException e)
+                                        {
+                                        }
+                                    }
+                                    registerProcessController(adapter, registry, processController);
+                                });
+
+                        registry.setProcessControllerAsync(processController).whenCompleteAsync(
+                                (r2, e2) ->
+                                {
+                                    if(e2 != null)
+                                    {
+                                        handleException(e2, adapter, registry, processController);
+                                    }
+                                });
+                    }
+                });
+        }
+
+        public void handleException(Throwable ex,
+                                    final com.zeroc.Ice.ObjectAdapter adapter,
+                                    final ProcessControllerRegistryPrx registry,
+                                    final ProcessControllerPrx processController)
+        {
+            if(ex instanceof com.zeroc.Ice.ConnectFailedException || ex instanceof com.zeroc.Ice.TimeoutException)
+            {
+                while(true)
+                {
+                    try
+                    {
+                        Thread.sleep(500);
+                        break;
+                    }
+                    catch(InterruptedException e)
+                    {
+                    }
+                }
+                registerProcessController(adapter, registry, processController);
+            }
+            else
+            {
+                println(ex.toString());
+            }
+        }
+
+        public void destroy()
+        {
+            _communicator.destroy();
+        }
+
+        private ProcessControllerRegistryPrx _registry;
+        private com.zeroc.Ice.Communicator _communicator;
+    }
+
+    class ControllerHelperI extends Thread implements test.TestHelper.ControllerHelper
+    {
+        public ControllerHelperI(TestSuiteBundle bundle, String[] args, String exe)
+        {
+            _bundle = bundle;
+            _args = args;
+            _exe = exe;
+        }
+
+        public void communicatorInitialized(Communicator communicator)
+        {
+            com.zeroc.Ice.Properties properties = communicator.getProperties();
+            if(properties.getProperty("Ice.Plugin.IceSSL").equals("com.zeroc.IceSSL.PluginFactory"))
+            {
+                com.zeroc.IceSSL.Plugin plugin =
+                        (com.zeroc.IceSSL.Plugin)communicator.getPluginManager().getPlugin("IceSSL");
+                String keystore = communicator.getProperties().getProperty("IceSSL.Keystore");
+                properties.setProperty("IceSSL.Keystore", "");
+                int resource = keystore.equals("client.bks") ? R.raw.client : R.raw.server;
+                java.io.InputStream certs = getResources().openRawResource(resource);
+                plugin.setKeystoreStream(certs);
+                plugin.setTruststoreStream(certs);
+                communicator.getPluginManager().initializePlugins();
+            }
+        }
+
+        public void run()
+        {
+            try
+            {
+                _helper = _bundle.newInstance();
+                _helper.setClassLoader(_bundle.getClassLoader());
+                _helper.setControllerHelper(this);
+
+                _helper.setWriter(new Writer()
+                    {
+                        @Override
+                        public void close() throws IOException
+                        {
+                        }
+
+                        @Override
+                        public void flush() throws IOException
+                        {
+                        }
+
+                        @Override
+                        public void write(char[] buf, int offset, int count)
+                            throws IOException
+                        {
+                            _out.append(buf, offset, count);
+                        }
+                    });
+
+                _helper.run(_args);
+                completed(0);
+            }
+            catch(Exception ex)
+            {
+                ex.printStackTrace(_helper.getWriter());
+                completed(-1);
+            }
+        }
+
+        public void shutdown()
+        {
+            if(_helper != null)
+            {
+                _helper.shutdown();
+            }
+        }
+
+        public String getOutput()
+        {
+            return _out.toString();
+        }
+
+        synchronized public void serverReady()
+        {
+            _ready = true;
+            notifyAll();
+        }
+
+        synchronized private void completed(int status)
+        {
+            _completed = true;
+            _status = status;
+            notifyAll();
+        }
+
+        synchronized private void waitReady(int timeout)
+            throws Test.Common.ProcessFailedException
+        {
+            long now = Time.currentMonotonicTimeMillis();
+            while(!_ready && !_completed)
+            {
+                try
+                {
+                    wait(timeout * 1000);
+                    if(Time.currentMonotonicTimeMillis() - now > timeout * 1000)
+                    {
+                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
+                    }
+                }
+                catch(java.lang.InterruptedException ex)
+                {
+                }
+            }
+
+            if(_completed && _status != 0)
+            {
+                throw new Test.Common.ProcessFailedException(_out.toString());
+            }
+        }
+
+        synchronized private int waitSuccess(int timeout)
+            throws Test.Common.ProcessFailedException
+        {
+            long now = Time.currentMonotonicTimeMillis();
+            while(!_completed)
+            {
+                try
+                {
+                    wait(timeout * 1000);
+                    if(Time.currentMonotonicTimeMillis() - now > timeout * 1000)
+                    {
+                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
+                    }
+                }
+                catch(java.lang.InterruptedException ex)
+                {
+                }
+            }
+            return _status;
+        }
+
+        private TestSuiteBundle _bundle;
+        private String[] _args;
+        private String _exe;
+        private test.TestHelper _helper;
+        private boolean _ready = false;
+        private boolean _completed = false;
+        private int _status = 0;
+        private final StringBuffer _out = new StringBuffer();
+    }
+
+    class ProcessControllerI implements Test.Common.ProcessController
+    {
+        public Test.Common.ProcessPrx start(final String testsuite, final String exe, String[] args,
+                                            com.zeroc.Ice.Current current)
+            throws Test.Common.ProcessFailedException
+        {
+            println("starting " + testsuite + " " + exe + "... ");
+            String className = "test." + testsuite.replace("/", ".") + "." +
+                exe.substring(0, 1).toUpperCase(Locale.ROOT) + exe.substring(1);
+            try
+            {
+                TestSuiteBundle bundle = new TestSuiteBundle(className, getClassLoader());
+                ControllerHelperI mainHelper = new ControllerHelperI(bundle, args, exe);
+                mainHelper.start();
+                return Test.Common.ProcessPrx.uncheckedCast(current.adapter.addWithUUID(new ProcessI(mainHelper)));
+            }
+            catch(ClassNotFoundException ex)
+            {
+                throw new Test.Common.ProcessFailedException(
+                    "testsuite `" + testsuite + "' exe ` " + exe + "' start failed:\n" + ex.toString());
+            }
+        }
+
+        public String getHost(String protocol, boolean ipv6, com.zeroc.Ice.Current current)
+        {
+            if(isEmulator())
+            {
+                return  "127.0.0.1";
+            }
+            else
+            {
+                synchronized(ControllerApp.this)
+                {
+                    return ipv6 ? _ipv6Address : _ipv4Address;
+                }
+            }
+        }
+    }
+
+    class ProcessI implements Test.Common.Process
+    {
+        public ProcessI(ControllerHelperI controllerHelper)
+        {
+            _controllerHelper = controllerHelper;
+        }
+
+        public void waitReady(int timeout, com.zeroc.Ice.Current current)
+            throws Test.Common.ProcessFailedException
+        {
+            _controllerHelper.waitReady(timeout);
+        }
+
+        public int waitSuccess(int timeout, com.zeroc.Ice.Current current)
+            throws Test.Common.ProcessFailedException
+        {
+            return _controllerHelper.waitSuccess(timeout);
+        }
+
+        public String terminate(com.zeroc.Ice.Current current)
+        {
+            _controllerHelper.shutdown();
+            current.adapter.remove(current.id);
+            while(true)
+            {
+                try
+                {
+                    _controllerHelper.join();
+                    break;
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+            return _controllerHelper.getOutput();
+        }
+
+        private ControllerHelperI _controllerHelper;
+    }
+}
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/src/main/res/layout/main.xml zeroc-ice-3.7.2/java/test/android/controller/src/main/res/layout/main.xml
--- zeroc-ice-3.7.1/java/test/android/controller/src/main/res/layout/main.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/src/main/res/layout/main.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="5dip">
+        <TextView
+            android:layout_width="5dip"
+            android:layout_weight="25"
+            android:layout_height="wrap_content"
+            android:text="@string/ipv4"
+            android:layout_gravity="center_vertical"/>
+
+        <Spinner
+            android:id="@+id/ipv4"
+            android:layout_width="5dip"
+            android:layout_weight="75"
+            android:layout_height="wrap_content"
+            android:drawSelectorOnTop="false"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="5dip">
+        <TextView
+            android:layout_width="0dip"
+            android:layout_weight="25"
+            android:layout_height="wrap_content"
+            android:text="@string/ipv6"
+            android:layout_gravity="center_vertical"/>
+
+        <Spinner
+            android:id="@+id/ipv6"
+            android:layout_width="0dip"
+            android:layout_weight="75"
+            android:layout_height="wrap_content"
+            android:drawSelectorOnTop="false"/>
+    </LinearLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:stackFromBottom="true"
+        android:transcriptMode="alwaysScroll"/>
+</LinearLayout>
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java/test/android/controller/src/main/res/raw/client.bks and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java/test/android/controller/src/main/res/raw/client.bks differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java/test/android/controller/src/main/res/raw/icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java/test/android/controller/src/main/res/raw/icon.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java/test/android/controller/src/main/res/raw/server.bks and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java/test/android/controller/src/main/res/raw/server.bks differ
diff -Nru zeroc-ice-3.7.1/java/test/android/controller/src/main/res/values/strings.xml zeroc-ice-3.7.2/java/test/android/controller/src/main/res/values/strings.xml
--- zeroc-ice-3.7.1/java/test/android/controller/src/main/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/android/controller/src/main/res/values/strings.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Test Controller</string>
+    <string name="no_bluetooth">Bluetooth disabled</string>
+    <string name="ipv6">IPv6</string>
+    <string name="ipv4">IPv4</string>
+</resources>
diff -Nru zeroc-ice-3.7.1/java/test/build.gradle zeroc-ice-3.7.2/java/test/build.gradle
--- zeroc-ice-3.7.1/java/test/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 ext.testDir = "${projectDir}/src/main/java/test"
 apply from: "slice.gradle"
 
+// Don't generate javadoc
+javadoc.enabled = false
+
 sourceSets {
     main {
         java {
@@ -19,20 +17,20 @@
 }
 
 dependencies {
-    compile localDependency('ice')
-    compile localDependency('icessl')
-    compile localDependency('icediscovery')
-    compile localDependency('icelocatordiscovery')
-    compile localDependency('icebox')
-    compile localDependency('glacier2')
-    compile localDependency('icestorm')
-    compile localDependency('icegrid')
-    compile project(':testPlugins')
+    implementation localDependency('ice')
+    implementation localDependency('icessl')
+    runtimeOnly localDependency('icediscovery')
+    runtimeOnly localDependency('icelocatordiscovery')
+    implementation localDependency('icebox')
+    implementation localDependency('glacier2')
+    implementation localDependency('icestorm')
+    implementation localDependency('icegrid')
+    implementation project(':testPlugins')
 }
 
 if(!gradle.startParameter.isOffline()) {
     dependencies {
-        runtime "org.apache.commons:commons-compress:1.14"
+        runtimeOnly "org.apache.commons:commons-compress:1.14"
     }
 }
 
@@ -40,7 +38,7 @@
     archiveName = "test.jar"
     destinationDir = new File("$rootProject.projectDir/lib/")
     manifest {
-        attributes("Class-Path": configurations.runtime.resolve().collect { it.toURI() }.join(' '))
+        attributes("Class-Path": configurations.runtimeClasspath.resolve().collect { it.toURI() }.join(' '))
     }
 }
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/DoubleModuleNoPackage.ice zeroc-ice-3.7.2/java/test/Ice/translator/DoubleModuleNoPackage.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/DoubleModuleNoPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/DoubleModuleNoPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // dmnp = double module no package
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/DoubleModuleWithPackage.ice zeroc-ice-3.7.2/java/test/Ice/translator/DoubleModuleWithPackage.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/DoubleModuleWithPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/DoubleModuleWithPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // dmwp = double module with package
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/Metadata.ice zeroc-ice-3.7.2/java/test/Ice/translator/Metadata.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/Metadata.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/Metadata.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module MetadataTest
 {
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/SingleModuleNoPackage.ice zeroc-ice-3.7.2/java/test/Ice/translator/SingleModuleNoPackage.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/SingleModuleNoPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/SingleModuleNoPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // smnp = single module no package
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/SingleModuleWithPackage.ice zeroc-ice-3.7.2/java/test/Ice/translator/SingleModuleWithPackage.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/SingleModuleWithPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/SingleModuleWithPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // smwp = single module with package
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/Test/CustomList.java zeroc-ice-3.7.2/java/test/Ice/translator/Test/CustomList.java
--- zeroc-ice-3.7.1/java/test/Ice/translator/Test/CustomList.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/Test/CustomList.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Test;
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage5.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleNoPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (same) double module with package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage10.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) double module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage11.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) double module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (different) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage5.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) single module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) single module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage8.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestDoubleModuleWithPackage9.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleNoPackage4.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleNoPackage4.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleNoPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleNoPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleNoPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleNoPackage6.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleNoPackage6.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleNoPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleNoPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleNoPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleNoPackage7.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleNoPackage7.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleNoPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleNoPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleNoPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage10.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage10.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage10.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage10.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage11.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage11.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage11.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage11.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) double module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage12.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage12.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage12.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage12.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) double module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage13.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage13.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage13.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage13.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (same) double module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage4.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage4.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage5.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage5.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage5.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage5.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage6.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage6.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) single module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage7.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage7.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) single module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage9.ice zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage9.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/TestSingleModuleWithPackage9.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/TestSingleModuleWithPackage9.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java/test/Ice/translator/Underscore.ice zeroc-ice-3.7.2/java/test/Ice/translator/Underscore.ice
--- zeroc-ice-3.7.1/java/test/Ice/translator/Underscore.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/Ice/translator/Underscore.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Underscore_Test
 {
diff -Nru zeroc-ice-3.7.1/java/test/plugins/build.gradle zeroc-ice-3.7.2/java/test/plugins/build.gradle
--- zeroc-ice-3.7.1/java/test/plugins/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-sourceCompatibility = iceSourceCompatibility
-targetCompatibility = iceTargetCompatibility
+// Don't generate javadoc
+javadoc.enabled = false
 
 sourceSets {
     main {
@@ -19,7 +14,7 @@
 }
 
 dependencies {
-    compile localDependency('ice')
+    implementation localDependency('ice')
 }
 
 jar {
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
--- zeroc-ice-3.7.1/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java/test/slice.gradle zeroc-ice-3.7.2/java/test/slice.gradle
--- zeroc-ice-3.7.1/java/test/slice.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/slice.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 task testSliceTask {
     slice {
@@ -52,6 +47,7 @@
                                                      'Ice/optional/*.ice',
                                                      'Ice/stream/*.ice',
                                                      'Ice/enums/*.ice',
+                                                     'Ice/scope/*.ice',
                                                      'Glacier2/application/*.ice',
                                                      'Glacier2/router/*.ice',
                                                      'Glacier2/sessionHelper/*.ice',
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/Callback.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/Callback.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/CallbackI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/CallbackI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/CallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/CallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.application;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.application;
 
@@ -13,21 +8,15 @@
 import test.Glacier2.application.Test.CallbackPrx;
 import test.Glacier2.application.Test.CallbackReceiverPrx;
 
-public class Client extends test.Util.Application
+import com.zeroc.Ice.InitializationData;
+
+public class Client extends test.TestHelper
 {
-    Client()
+    public Client()
     {
         out = getWriter();
     }
 
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     class CallbackReceiverI implements test.Glacier2.application.Test.CallbackReceiver
     {
         @Override
@@ -134,61 +123,51 @@
         private CallbackReceiverI _receiver;
     }
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        _initData = super.getInitData(args, rArgs);
-        _initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return _initData;
-    }
-
-    public int run(String[] args)
+    public void run(String[] args)
     {
         Application app = new Application();
-        _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                            getTestEndpoint(_initData.properties, 50));
-        int status = app.main("Client", args, _initData);
-
-        out.print("testing stringToProxy for process object... ");
-        out.flush();
-        com.zeroc.Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:" +
-                                                                getTestEndpoint(communicator().getProperties(), 51));
-        out.println("ok");
-
-        out.print("testing checked cast for admin object... ");
-        out.flush();
-        com.zeroc.Ice.ProcessPrx process = com.zeroc.Ice.ProcessPrx.checkedCast(processBase);
-        test(process != null);
-        out.println("ok");
-
-        out.print("testing Glacier2 shutdown... ");
-        out.flush();
-        process.shutdown();
-        try
-        {
-            process.ice_ping();
-            test(false);
-        }
-        catch(com.zeroc.Ice.LocalException ex)
-        {
+        InitializationData initData = new InitializationData();
+        initData.properties = createTestProperties(args);
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        initData.properties.setProperty("Ice.Default.Router",
+                                        "Glacier2/router:" + getTestEndpoint(initData.properties, 50));
+
+        int status = app.main("Client", args, initData);
+
+        initData.properties = createTestProperties(args);
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            out.print("testing stringToProxy for process object... ");
+            out.flush();
+            com.zeroc.Ice.ObjectPrx processBase =
+                communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
             out.println("ok");
+
+            out.print("testing checked cast for admin object... ");
+            out.flush();
+            com.zeroc.Ice.ProcessPrx process = com.zeroc.Ice.ProcessPrx.checkedCast(processBase);
+            test(process != null);
+            out.println("ok");
+
+            out.print("testing Glacier2 shutdown... ");
+            out.flush();
+            process.shutdown();
+            try
+            {
+                process.ice_ping();
+                test(false);
+            }
+            catch(com.zeroc.Ice.LocalException ex)
+            {
+                out.println("ok");
+            }
         }
 
         test(app._restart == 5);
         test(app._destroyed);
-
-        return status;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 
     final public PrintWriter out;
-    private com.zeroc.Ice.InitializationData _initData;
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/application/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/application/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.application;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
-        communicator().createObjectAdapter("DeactivatedAdapter");
-
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("callback"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+            communicator.createObjectAdapter("DeactivatedAdapter");
+
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+            adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/Callback.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/Callback.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/CallbackI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/CallbackI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/CallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/CallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,492 +1,469 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
 import java.io.PrintWriter;
 
+import java.util.stream.Stream;
+
 import test.Glacier2.router.Test.CallbackException;
 import test.Glacier2.router.Test.CallbackPrx;
 import test.Glacier2.router.Test.CallbackReceiverPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
+    public void run(String[] args)
     {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
 
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectPrx routerBase;
-
-        PrintWriter out = getWriter();
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            out.print("testing stringToProxy for router... ");
-            out.flush();
-            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(50));
-            out.println("ok");
-        }
-
-        com.zeroc.Glacier2.RouterPrx router;
+            com.zeroc.Ice.ObjectPrx routerBase;
 
-        {
-            out.print("testing checked cast for router... ");
-            out.flush();
-            router = com.zeroc.Glacier2.RouterPrx.checkedCast(routerBase);
-            test(router != null);
-            out.println("ok");
-        }
-
-        {
-            out.print("testing router finder... ");
-            out.flush();
-            com.zeroc.Ice.RouterFinderPrx finder = com.zeroc.Ice.RouterFinderPrx.uncheckedCast(
-                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
-            test(finder.getRouter().ice_getIdentity().equals(router.ice_getIdentity()));
-            out.println("ok");
-        }
+            PrintWriter out = getWriter();
+            {
+                out.print("testing stringToProxy for router... ");
+                out.flush();
+                routerBase = communicator.stringToProxy("Glacier2/router:" + getTestEndpoint(50));
+                out.println("ok");
+            }
 
-        {
-            out.print("installing router with communicator... ");
-            out.flush();
-            communicator().setDefaultRouter(router);
-            out.println("ok");
-        }
+            com.zeroc.Glacier2.RouterPrx router;
 
-        {
-            out.print("getting the session timeout... ");
-            out.flush();
-            long timeout = router.getSessionTimeout();
-            test(timeout == 30);
-            out.println("ok");
-        }
+            {
+                out.print("testing checked cast for router... ");
+                out.flush();
+                router = com.zeroc.Glacier2.RouterPrx.checkedCast(routerBase);
+                test(router != null);
+                out.println("ok");
+            }
 
-        com.zeroc.Ice.ObjectPrx base;
+            {
+                out.print("testing router finder... ");
+                out.flush();
+                com.zeroc.Ice.RouterFinderPrx finder = com.zeroc.Ice.RouterFinderPrx.uncheckedCast(
+                    communicator.stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
+                test(finder.getRouter().ice_getIdentity().equals(router.ice_getIdentity()));
+                out.println("ok");
+            }
 
-        {
-            out.print("testing stringToProxy for server object... ");
-            out.flush();
-            base = communicator().stringToProxy("c1/callback:" + getTestEndpoint(0));
-            out.println("ok");
-        }
+            {
+                out.print("installing router with communicator... ");
+                out.flush();
+                communicator.setDefaultRouter(router);
+                out.println("ok");
+            }
 
-        {
-            out.print("trying to ping server before session creation... ");
-            out.flush();
-            try
             {
-                base.ice_ping();
-                test(false);
+                out.print("getting the session timeout... ");
+                out.flush();
+                long timeout = router.getSessionTimeout();
+                test(timeout == 30);
+                out.println("ok");
             }
-            catch(com.zeroc.Ice.ConnectionLostException ex)
+
+            com.zeroc.Ice.ObjectPrx base;
+
             {
+                out.print("testing stringToProxy for server object... ");
+                out.flush();
+                base = communicator.stringToProxy("c1/callback:" + getTestEndpoint(0));
                 out.println("ok");
             }
-            catch(com.zeroc.Ice.SocketException ex)
+
             {
-                //
-                // The JSSE implementation in the AIX JDK appears to have a
-                // bug that causes a "bad certificate" exception to be raised
-                // when the connection is forcefully dropped and a retry occurs.
-                //
-                if(System.getProperty("os.name").equals("AIX"))
+                out.print("trying to ping server before session creation... ");
+                out.flush();
+                try
+                {
+                    base.ice_ping();
+                    test(false);
+                }
+                catch(com.zeroc.Ice.ConnectionLostException ex)
                 {
                     out.println("ok");
                 }
-                else
+                catch(com.zeroc.Ice.SocketException ex)
                 {
-                    System.err.println(ex);
-                    test(false);
+                    //
+                    // The JSSE implementation in the AIX JDK appears to have a
+                    // bug that causes a "bad certificate" exception to be raised
+                    // when the connection is forcefully dropped and a retry occurs.
+                    //
+                    if(System.getProperty("os.name").equals("AIX"))
+                    {
+                        out.println("ok");
+                    }
+                    else
+                    {
+                        System.err.println(ex);
+                        test(false);
+                    }
                 }
             }
-        }
 
-        {
-            out.print("trying to create session with wrong password... ");
-            out.flush();
-            try
             {
-                router.createSession("userid", "xxx");
-                test(false);
-            }
-            catch(com.zeroc.Glacier2.PermissionDeniedException ex)
-            {
-                out.println("ok");
-            }
-            catch(com.zeroc.Glacier2.CannotCreateSessionException ex)
-            {
-                test(false);
+                out.print("trying to create session with wrong password... ");
+                out.flush();
+                try
+                {
+                    router.createSession("userid", "xxx");
+                    test(false);
+                }
+                catch(com.zeroc.Glacier2.PermissionDeniedException ex)
+                {
+                    out.println("ok");
+                }
+                catch(com.zeroc.Glacier2.CannotCreateSessionException ex)
+                {
+                    test(false);
+                }
             }
-        }
 
-        {
-            out.print("trying to destroy non-existing session... ");
-            out.flush();
-            try
             {
-                router.destroySession();
-                test(false);
+                out.print("trying to destroy non-existing session... ");
+                out.flush();
+                try
+                {
+                    router.destroySession();
+                    test(false);
+                }
+                catch(com.zeroc.Glacier2.SessionNotExistException ex)
+                {
+                    out.println("ok");
+                }
             }
-            catch(com.zeroc.Glacier2.SessionNotExistException ex)
+
             {
+                out.print("creating session with correct password... ");
+                out.flush();
+                try
+                {
+                    router.createSession("userid", "abc123");
+                }
+                catch(com.zeroc.Glacier2.PermissionDeniedException ex)
+                {
+                    test(false);
+                }
+                catch(com.zeroc.Glacier2.CannotCreateSessionException ex)
+                {
+                    test(false);
+                }
                 out.println("ok");
             }
-        }
 
-        {
-            out.print("creating session with correct password... ");
-            out.flush();
-            try
-            {
-                router.createSession("userid", "abc123");
-            }
-            catch(com.zeroc.Glacier2.PermissionDeniedException ex)
-            {
-                test(false);
-            }
-            catch(com.zeroc.Glacier2.CannotCreateSessionException ex)
             {
-                test(false);
+                out.print("trying to create a second session... ");
+                out.flush();
+                try
+                {
+                    router.createSession("userid", "abc123");
+                    test(false);
+                }
+                catch(com.zeroc.Glacier2.PermissionDeniedException ex)
+                {
+                    test(false);
+                }
+                catch(com.zeroc.Glacier2.CannotCreateSessionException ex)
+                {
+                    out.println("ok");
+                }
             }
-            out.println("ok");
-        }
 
-        {
-            out.print("trying to create a second session... ");
-            out.flush();
-            try
-            {
-                router.createSession("userid", "abc123");
-                test(false);
-            }
-            catch(com.zeroc.Glacier2.PermissionDeniedException ex)
-            {
-                test(false);
-            }
-            catch(com.zeroc.Glacier2.CannotCreateSessionException ex)
             {
+                out.print("pinging server after session creation... ");
+                out.flush();
+                base.ice_ping();
                 out.println("ok");
             }
-        }
-
-        {
-            out.print("pinging server after session creation... ");
-            out.flush();
-            base.ice_ping();
-            out.println("ok");
-        }
 
-        {
-            out.print("pinging object with client endpoint... ");
-            out.flush();
-            com.zeroc.Ice.ObjectPrx baseC = communicator().stringToProxy("collocated:" + getTestEndpoint(50));
-            try
-            {
-                baseC.ice_ping();
-            }
-            catch(com.zeroc.Ice.ObjectNotExistException ex)
             {
+                out.print("pinging object with client endpoint... ");
+                out.flush();
+                com.zeroc.Ice.ObjectPrx baseC = communicator.stringToProxy("collocated:" + getTestEndpoint(50));
+                try
+                {
+                    baseC.ice_ping();
+                }
+                catch(com.zeroc.Ice.ObjectNotExistException ex)
+                {
+                }
+                out.println("ok");
             }
-            out.println("ok");
-        }
-
-        CallbackPrx twoway;
-
-        {
-            out.print("testing checked cast for server object... ");
-            out.flush();
-            twoway = CallbackPrx.checkedCast(base);
-            test(twoway != null);
-            out.println("ok");
-        }
-
-        com.zeroc.Ice.ObjectAdapter adapter;
-
-        {
-            out.print("creating and activating callback receiver adapter... ");
-            out.flush();
-            communicator().getProperties().setProperty("Ice.PrintAdapterReady", "0");
-            adapter = communicator().createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
-            adapter.activate();
-            out.println("ok");
-        }
 
-        String category;
+            CallbackPrx twoway;
 
-        {
-            out.print("getting category from router... ");
-            out.flush();
-            category = router.getCategoryForClient();
-            out.println("ok");
-        }
-
-        CallbackReceiverI callbackReceiverImpl;
-        com.zeroc.Ice.Object callbackReceiver;
-        CallbackReceiverPrx twowayR;
-        CallbackReceiverPrx fakeTwowayR;
-
-        {
-            out.print("creating and adding callback receiver object... ");
-            out.flush();
-            callbackReceiverImpl = new CallbackReceiverI();
-            callbackReceiver = callbackReceiverImpl;
-            com.zeroc.Ice.Identity callbackReceiverIdent = new com.zeroc.Ice.Identity();
-            callbackReceiverIdent.name = "callbackReceiver";
-            callbackReceiverIdent.category = category;
-            twowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
-            com.zeroc.Ice.Identity fakeCallbackReceiverIdent = new com.zeroc.Ice.Identity();
-            fakeCallbackReceiverIdent.name = "callbackReceiver";
-            fakeCallbackReceiverIdent.category = "dummy";
-            fakeTwowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
-            out.println("ok");
-        }
-
-        {
-            out.print("testing oneway callback... ");
-            out.flush();
-            CallbackPrx oneway = twoway.ice_oneway();
-            CallbackReceiverPrx onewayR = twowayR.ice_oneway();
-            java.util.Map<String, String> context = new java.util.HashMap<>();
-            context.put("_fwd", "o");
-            oneway.initiateCallback(onewayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
-
-        {
-            out.print("testing twoway callback... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<>();
-            context.put("_fwd", "t");
-            twoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
-
-        {
-            out.print("ditto, but with user exception... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<>();
-            context.put("_fwd", "t");
-            try
-            {
-                twoway.initiateCallbackEx(twowayR, context);
-                test(false);
-            }
-            catch(CallbackException ex)
             {
-                test(ex.someValue == 3.14);
-                test(ex.someString.equals("3.14"));
+                out.print("testing checked cast for server object... ");
+                out.flush();
+                twoway = CallbackPrx.checkedCast(base);
+                test(twoway != null);
+                out.println("ok");
             }
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
 
-        {
-            out.print("trying twoway callback with fake category... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<>();
-            context.put("_fwd", "t");
-            try
-            {
-                twoway.initiateCallback(fakeTwowayR, context);
-                test(false);
-            }
-            catch(com.zeroc.Ice.ObjectNotExistException ex)
+            com.zeroc.Ice.ObjectAdapter adapter;
+
             {
+                out.print("creating and activating callback receiver adapter... ");
+                out.flush();
+                communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+                adapter = communicator.createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
+                adapter.activate();
                 out.println("ok");
             }
-        }
 
-        {
-            out.print("testing whether other allowed category is accepted... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<>();
-            context.put("_fwd", "t");
-            CallbackPrx otherCategoryTwoway = CallbackPrx.uncheckedCast(
-                twoway.ice_identity(com.zeroc.Ice.Util.stringToIdentity("c2/callback")));
-            otherCategoryTwoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
+            String category;
 
-        {
-            out.print("testing whether disallowed category gets rejected... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<>();
-            context.put("_fwd", "t");
-            try
-            {
-                CallbackPrx otherCategoryTwoway = CallbackPrx.uncheckedCast(
-                    twoway.ice_identity(com.zeroc.Ice.Util.stringToIdentity("c3/callback")));
-                otherCategoryTwoway.initiateCallback(twowayR, context);
-                test(false);
-            }
-            catch(com.zeroc.Ice.ObjectNotExistException ex)
             {
+                out.print("getting category from router... ");
+                out.flush();
+                category = router.getCategoryForClient();
                 out.println("ok");
             }
-        }
-
-        {
-            out.print("testing whether user-id as category is accepted... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<>();
-            context.put("_fwd", "t");
-            CallbackPrx otherCategoryTwoway = CallbackPrx.uncheckedCast(
-                twoway.ice_identity(com.zeroc.Ice.Util.stringToIdentity("_userid/callback")));
-            otherCategoryTwoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
 
-        if(args.length >= 1 && args[0].equals("--shutdown"))
-        {
-            out.print("testing server shutdown... ");
-            out.flush();
-            twoway.shutdown();
-            // No ping, otherwise the router prints a warning message if it's
-            // started with --Ice.Warn.Connections.
-            out.println("ok");
-            /*
-              try
-              {
-                  base.ice_ping();
-                  test(false);
-              }
-              // If we use the glacier router, the exact exception reason gets
-              // lost.
-              catch(com.zeroc.Ice.UnknownLocalException ex)
-              {
-                  System.out.println("ok");
-              }
-            */
-        }
+            CallbackReceiverI callbackReceiverImpl;
+            com.zeroc.Ice.Object callbackReceiver;
+            CallbackReceiverPrx twowayR;
+            CallbackReceiverPrx fakeTwowayR;
 
-        {
-            out.print("destroying session... ");
-            out.flush();
-            try
-            {
-                router.destroySession();
-            }
-            catch(com.zeroc.Glacier2.SessionNotExistException ex)
             {
-                test(false);
+                out.print("creating and adding callback receiver object... ");
+                out.flush();
+                callbackReceiverImpl = new CallbackReceiverI();
+                callbackReceiver = callbackReceiverImpl;
+                com.zeroc.Ice.Identity callbackReceiverIdent = new com.zeroc.Ice.Identity();
+                callbackReceiverIdent.name = "callbackReceiver";
+                callbackReceiverIdent.category = category;
+                twowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
+                com.zeroc.Ice.Identity fakeCallbackReceiverIdent = new com.zeroc.Ice.Identity();
+                fakeCallbackReceiverIdent.name = "callbackReceiver";
+                fakeCallbackReceiverIdent.category = "dummy";
+                fakeTwowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
+                out.println("ok");
             }
-            catch(com.zeroc.Ice.LocalException ex)
+
             {
-                test(false);
+                out.print("testing oneway callback... ");
+                out.flush();
+                CallbackPrx oneway = twoway.ice_oneway();
+                CallbackReceiverPrx onewayR = twowayR.ice_oneway();
+                java.util.Map<String, String> context = new java.util.HashMap<>();
+                context.put("_fwd", "o");
+                oneway.initiateCallback(onewayR, context);
+                callbackReceiverImpl.callbackOK();
+                out.println("ok");
             }
-            out.println("ok");
-        }
 
-        {
-            out.print("trying to ping server after session destruction... ");
-            out.flush();
-            try
             {
-                base.ice_ping();
-                test(false);
+                out.print("testing twoway callback... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<>();
+                context.put("_fwd", "t");
+                twoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
+                out.println("ok");
             }
-            catch(com.zeroc.Ice.ConnectionLostException ex)
+
             {
+                out.print("ditto, but with user exception... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<>();
+                context.put("_fwd", "t");
+                try
+                {
+                    twoway.initiateCallbackEx(twowayR, context);
+                    test(false);
+                }
+                catch(CallbackException ex)
+                {
+                    test(ex.someValue == 3.14);
+                    test(ex.someString.equals("3.14"));
+                }
+                callbackReceiverImpl.callbackOK();
                 out.println("ok");
             }
-            catch(com.zeroc.Ice.SocketException ex)
+
             {
-                //
-                // The JSSE implementation in the AIX JDK appears to have a
-                // bug that causes a "bad certificate" exception to be raised
-                // when the connection is forcefully dropped and a retry occurs.
-                //
-                if(System.getProperty("os.name").equals("AIX"))
+                out.print("trying twoway callback with fake category... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<>();
+                context.put("_fwd", "t");
+                try
                 {
-                    out.println("ok");
+                    twoway.initiateCallback(fakeTwowayR, context);
+                    test(false);
                 }
-                else
+                catch(com.zeroc.Ice.ObjectNotExistException ex)
                 {
-                    test(false);
+                    out.println("ok");
                 }
             }
-        }
 
-        if(args.length >= 1 && args[0].equals("--shutdown"))
-        {
             {
-                out.print("uninstalling router with communicator... ");
+                out.print("testing whether other allowed category is accepted... ");
                 out.flush();
-                communicator().setDefaultRouter(null);
+                java.util.Map<String, String> context = new java.util.HashMap<>();
+                context.put("_fwd", "t");
+                CallbackPrx otherCategoryTwoway = CallbackPrx.uncheckedCast(
+                                                                            twoway.ice_identity(com.zeroc.Ice.Util.stringToIdentity("c2/callback")));
+                otherCategoryTwoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
                 out.println("ok");
             }
 
-            com.zeroc.Ice.ObjectPrx processBase;
-
             {
-                out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
-                out.println("ok");
+                out.print("testing whether disallowed category gets rejected... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<>();
+                context.put("_fwd", "t");
+                try
+                {
+                    CallbackPrx otherCategoryTwoway = CallbackPrx.uncheckedCast(
+                                                                                twoway.ice_identity(com.zeroc.Ice.Util.stringToIdentity("c3/callback")));
+                    otherCategoryTwoway.initiateCallback(twowayR, context);
+                    test(false);
+                }
+                catch(com.zeroc.Ice.ObjectNotExistException ex)
+                {
+                    out.println("ok");
+                }
             }
 
-/*
             {
-                out.print("uninstalling router with process object... ");
-                processBase.ice_router(null);
+                out.print("testing whether user-id as category is accepted... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<>();
+                context.put("_fwd", "t");
+                CallbackPrx otherCategoryTwoway = CallbackPrx.uncheckedCast(
+                                                                            twoway.ice_identity(com.zeroc.Ice.Util.stringToIdentity("_userid/callback")));
+                otherCategoryTwoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
                 out.println("ok");
             }
-*/
 
-            com.zeroc.Ice.ProcessPrx process;
+            boolean shutdown = Stream.of(args).anyMatch(v -> v.equals("--shutdown"));
+            if(shutdown)
+            {
+                out.print("testing server shutdown... ");
+                out.flush();
+                twoway.shutdown();
+                // No ping, otherwise the router prints a warning message if it's
+                // started with --Ice.Warn.Connections.
+                out.println("ok");
+                /*
+                  try
+                  {
+                  base.ice_ping();
+                  test(false);
+                  }
+                  // If we use the glacier router, the exact exception reason gets
+                  // lost.
+                  catch(com.zeroc.Ice.UnknownLocalException ex)
+                  {
+                  System.out.println("ok");
+                  }
+                */
+            }
 
             {
-                out.print("testing checked cast for admin object... ");
-                process = com.zeroc.Ice.ProcessPrx.checkedCast(processBase);
-                test(process != null);
+                out.print("destroying session... ");
+                out.flush();
+                try
+                {
+                    router.destroySession();
+                }
+                catch(com.zeroc.Glacier2.SessionNotExistException ex)
+                {
+                    test(false);
+                }
+                catch(com.zeroc.Ice.LocalException ex)
+                {
+                    test(false);
+                }
                 out.println("ok");
             }
 
-            out.print("testing Glacier2 shutdown... ");
-            process.shutdown();
-            try
             {
-                process.ice_ping();
-                test(false);
+                out.print("trying to ping server after session destruction... ");
+                out.flush();
+                try
+                {
+                    base.ice_ping();
+                    test(false);
+                }
+                catch(com.zeroc.Ice.ConnectionLostException ex)
+                {
+                    out.println("ok");
+                }
+                catch(com.zeroc.Ice.SocketException ex)
+                {
+                    //
+                    // The JSSE implementation in the AIX JDK appears to have a
+                    // bug that causes a "bad certificate" exception to be raised
+                    // when the connection is forcefully dropped and a retry occurs.
+                    //
+                    if(System.getProperty("os.name").equals("AIX"))
+                    {
+                        out.println("ok");
+                    }
+                    else
+                    {
+                        test(false);
+                    }
+                }
             }
-            catch(com.zeroc.Ice.LocalException ex)
+
+            if(shutdown)
             {
-                out.println("ok");
-            }
-        }
+                {
+                    out.print("uninstalling router with communicator... ");
+                    out.flush();
+                    communicator.setDefaultRouter(null);
+                    out.println("ok");
+                }
 
-        return 0;
-    }
+                com.zeroc.Ice.ObjectPrx processBase;
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
-        return initData;
-    }
+                {
+                    out.print("testing stringToProxy for process object... ");
+                    processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
+                    out.println("ok");
+                }
 
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
+                /*
+                  {
+                  out.print("uninstalling router with process object... ");
+                  processBase.ice_router(null);
+                  out.println("ok");
+                  }
+                */
+
+                com.zeroc.Ice.ProcessPrx process;
+
+                {
+                    out.print("testing checked cast for admin object... ");
+                    process = com.zeroc.Ice.ProcessPrx.checkedCast(processBase);
+                    test(process != null);
+                    out.println("ok");
+                }
 
-        System.gc();
-        System.exit(status);
+                out.print("testing Glacier2 shutdown... ");
+                process.shutdown();
+                try
+                {
+                    process.ice_ping();
+                    test(false);
+                }
+                catch(com.zeroc.Ice.LocalException ex)
+                {
+                    out.println("ok");
+                }
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/router/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/router/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
+
 {
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(),
-                    com.zeroc.Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category.
-        adapter.add(new CallbackI(),
-                    com.zeroc.Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category.
-        adapter.add(new CallbackI(),
-                    com.zeroc.Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category.
-        adapter.add(new CallbackI(),
-                    com.zeroc.Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid.
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
-        return initData;
-    }
+            //
+            // The test allows "c1" as category.
+            //
+            adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("c1/callback"));
 
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
+            //
+            // The test allows "c2" as category.
+            //
+            adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("c2/callback"));
+
+            //
+            // The test rejects "c3" as category.
+            //
+            adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("c3/callback"));
 
-        System.gc();
-        System.exit(status);
+            //
+            // The test allows the prefixed userid.
+            //
+            adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("_userid/callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.sessionHelper;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.sessionHelper;
 
@@ -15,132 +10,192 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    Client()
+    public Client()
     {
         out = getWriter();
         me = this;
     }
 
-    private static void test(boolean b)
+    public void run(String[] args)
     {
-        if(!b)
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        initData.properties = createTestProperties(args);
+        initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
+                                        getTestEndpoint(initData.properties, 50));
+        initData.dispatcher = (Runnable runnable, com.zeroc.Ice.Connection c) ->
+            {
+                _workQueue.submit(runnable);
+            };
+
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
         {
-            throw new RuntimeException();
-        }
-    }
+            String protocol = getTestProtocol();
+            String host = getTestHost();
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        _initData = initData;
-        _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                         getTestEndpoint(_initData.properties, 50));
-        _initData.dispatcher =
-            (Runnable runnable, com.zeroc.Ice.Connection c) -> {  _workQueue.submit(runnable); };
+            _factory = new com.zeroc.Glacier2.SessionFactoryHelper(initData, new com.zeroc.Glacier2.SessionCallback()
+                {
+                    @Override
+                    public void connected(com.zeroc.Glacier2.SessionHelper session)
+                    throws com.zeroc.Glacier2.SessionNotExistException
+                    {
+                        test(false);
+                    }
 
-        return initData;
-    }
+                    @Override
+                    public void disconnected(com.zeroc.Glacier2.SessionHelper session)
+                    {
+                        test(false);
+                    }
 
-    @Override
-    public int run(String[] args)
-    {
-        String protocol = getTestProtocol();
-        String host = getTestHost();
+                    @Override
+                    public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable exception)
+                    {
+                        try
+                        {
+                            throw exception;
+                        }
+                        catch(com.zeroc.Glacier2.PermissionDeniedException ex)
+                        {
+                            out.println("ok");
+                            synchronized(test.Glacier2.sessionHelper.Client.this)
+                            {
+                                test.Glacier2.sessionHelper.Client.wakeUp();
+                            }
+                        }
+                        catch(Throwable ex)
+                        {
+                            ex.printStackTrace();
+                            test(false);
+                        }
+                    }
+
+                    @Override
+                    public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
+                    {
+                        test(session.communicator() != null);
+                    }
+                });
 
-        _factory = new com.zeroc.Glacier2.SessionFactoryHelper(_initData, new com.zeroc.Glacier2.SessionCallback()
+            //
+            // Test to create a session with wrong userid/password
+            //
+            synchronized(this)
             {
-                @Override
-                public void connected(com.zeroc.Glacier2.SessionHelper session)
-                    throws com.zeroc.Glacier2.SessionNotExistException
-                {
-                     test(false);
-                }
+                out.print("testing SessionHelper connect with wrong userid/password... ");
+                out.flush();
 
-                @Override
-                public void disconnected(com.zeroc.Glacier2.SessionHelper session)
+                _session = _factory.connect("userid", "xxx");
+                while(true)
                 {
-                    test(false);
+                    try
+                    {
+                        wait(30000);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
+                test(!_session.isConnected());
+            }
 
-                @Override
-                public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable exception)
+            initData.properties.setProperty("Ice.Default.Router", "");
+            _factory = new com.zeroc.Glacier2.SessionFactoryHelper(initData, new com.zeroc.Glacier2.SessionCallback()
                 {
-                    try
+                    @Override
+                    public void connected(com.zeroc.Glacier2.SessionHelper session)
+                    throws com.zeroc.Glacier2.SessionNotExistException
                     {
-                        throw exception;
+                        test(false);
                     }
-                    catch(com.zeroc.Glacier2.PermissionDeniedException ex)
+
+                    @Override
+                    public void disconnected(com.zeroc.Glacier2.SessionHelper session)
                     {
-                        out.println("ok");
-                        synchronized(test.Glacier2.sessionHelper.Client.this)
+                        test(false);
+                    }
+
+                    @Override
+                    public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable exception)
+                    {
+                        try
                         {
-                            test.Glacier2.sessionHelper.Client.wakeUp();
+                            throw exception;
+                        }
+                        catch(com.zeroc.Ice.CommunicatorDestroyedException ex)
+                        {
+                            out.println("ok");
+                            synchronized(test.Glacier2.sessionHelper.Client.this)
+                            {
+                                test.Glacier2.sessionHelper.Client.wakeUp();
+                            }
+                        }
+                        catch(Throwable ex)
+                        {
+                            test(false);
                         }
                     }
-                    catch(Throwable ex)
+
+                    @Override
+                    public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
                     {
-                        ex.printStackTrace();
-                        test(false);
+                        test(session.communicator() != null);
                     }
-                }
-
-                @Override
-                public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
+                });
 
-        //
-        // Test to create a session with wrong userid/password
-        //
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect with wrong userid/password... ");
-            out.flush();
-
-            _session = _factory.connect("userid", "xxx");
-            while(true)
+            synchronized(this)
             {
-                try
-                {
-                    wait(30000);
-                    break;
-                }
-                catch(java.lang.InterruptedException ex)
-                {
-                }
-            }
-            test(!_session.isConnected());
-        }
+                out.print("testing SessionHelper connect interrupt... ");
+                out.flush();
+                _factory.setRouterHost(host);
+                _factory.setPort(getTestPort(1));
+                _factory.setProtocol(protocol);
+                _session = _factory.connect("userid", "abc123");
 
-        _initData.properties.setProperty("Ice.Default.Router", "");
-        _factory = new com.zeroc.Glacier2.SessionFactoryHelper(_initData, new com.zeroc.Glacier2.SessionCallback()
-            {
-                @Override
-                public void connected(com.zeroc.Glacier2.SessionHelper session)
-                    throws com.zeroc.Glacier2.SessionNotExistException
+                while(true)
                 {
-                    test(false);
+                    try
+                    {
+                        Thread.sleep(100);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
+                _session.destroy();
 
-                @Override
-                public void disconnected(com.zeroc.Glacier2.SessionHelper session)
+                while(true)
                 {
-                    test(false);
+                    try
+                    {
+                        wait(30000);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
+                test(!_session.isConnected());
+            };
 
-                @Override
-                public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable exception)
+            _factory = new com.zeroc.Glacier2.SessionFactoryHelper(initData, new com.zeroc.Glacier2.SessionCallback()
                 {
-                    try
+                    @Override
+                    public void connected(com.zeroc.Glacier2.SessionHelper session)
+                    throws com.zeroc.Glacier2.SessionNotExistException
                     {
-                        throw exception;
+                        out.println("ok");
+                        synchronized(test.Glacier2.sessionHelper.Client.this)
+                        {
+                            test.Glacier2.sessionHelper.Client.wakeUp();
+                        }
                     }
-                    catch(com.zeroc.Ice.CommunicatorDestroyedException ex)
+
+                    @Override
+                    public void disconnected(com.zeroc.Glacier2.SessionHelper session)
                     {
                         out.println("ok");
                         synchronized(test.Glacier2.sessionHelper.Client.this)
@@ -148,306 +203,214 @@
                             test.Glacier2.sessionHelper.Client.wakeUp();
                         }
                     }
-                    catch(Throwable ex)
+
+                    @Override
+                    public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable ex)
                     {
                         test(false);
                     }
-                }
-
-                @Override
-                public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
 
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect interrupt... ");
-            out.flush();
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(1));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
+                    @Override
+                    public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
+                    {
+                        test(session.communicator() != null);
+                    }
+                });
 
-            while(true)
+            synchronized(this)
             {
-                try
-                {
-                    Thread.sleep(100);
-                    break;
-                }
-                catch(java.lang.InterruptedException ex)
+                out.print("testing SessionHelper connect... ");
+                out.flush();
+                _factory.setRouterHost(host);
+                _factory.setPort(getTestPort(50));
+                _factory.setProtocol(protocol);
+                _session = _factory.connect("userid", "abc123");
+                while(true)
                 {
+                    try
+                    {
+                        wait(30000);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
-            }
-            _session.destroy();
 
-            while(true)
-            {
+                out.print("testing SessionHelper isConnected after connect... ");
+                out.flush();
+                test(_session.isConnected());
+                out.println("ok");
+
+                out.print("testing SessionHelper categoryForClient after connect... ");
+                out.flush();
                 try
                 {
-                    wait(30000);
-                    break;
+                    test(!_session.categoryForClient().equals(""));
                 }
-                catch(java.lang.InterruptedException ex)
+                catch(com.zeroc.Glacier2.SessionNotExistException ex)
                 {
+                    test(false);
                 }
-            }
-            test(!_session.isConnected());
-        };
+                out.println("ok");
 
-        _factory = new com.zeroc.Glacier2.SessionFactoryHelper(_initData, new com.zeroc.Glacier2.SessionCallback()
-            {
-                @Override
-                public void connected(com.zeroc.Glacier2.SessionHelper session)
-                    throws com.zeroc.Glacier2.SessionNotExistException
+                test(_session.session() == null);
+
+                out.print("testing stringToProxy for server object... ");
+                out.flush();
+                com.zeroc.Ice.ObjectPrx base = _session.communicator().stringToProxy("callback:" + getTestEndpoint(0));
+                out.println("ok");
+
+                out.print("pinging server after session creation... ");
+                out.flush();
+                base.ice_ping();
+                out.println("ok");
+
+                out.print("testing checked cast for server object... ");
+                out.flush();
+                CallbackPrx twoway = CallbackPrx.checkedCast(base);
+                test(twoway != null);
+                out.println("ok");
+
+                out.print("testing server shutdown... ");
+                out.flush();
+                twoway.shutdown();
+                out.println("ok");
+
+                test(_session.communicator() != null);
+                out.print("testing SessionHelper destroy... ");
+                out.flush();
+                _session.destroy();
+                while(true)
                 {
-                    out.println("ok");
-                    synchronized(test.Glacier2.sessionHelper.Client.this)
+                    try
                     {
-                        test.Glacier2.sessionHelper.Client.wakeUp();
+                        wait();
+                        break;
                     }
-                }
-
-                @Override
-                public void disconnected(com.zeroc.Glacier2.SessionHelper session)
-                {
-                    out.println("ok");
-                    synchronized(test.Glacier2.sessionHelper.Client.this)
+                    catch(java.lang.InterruptedException ex)
                     {
-                        test.Glacier2.sessionHelper.Client.wakeUp();
                     }
                 }
 
-                @Override
-                public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable ex)
-                {
-                    test(false);
-                }
-
-                @Override
-                public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
+                out.print("testing SessionHelper isConnected after destroy... ");
+                out.flush();
+                test(_session.isConnected() == false);
+                out.println("ok");
 
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect... ");
-            out.flush();
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(50));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
-            while(true)
-            {
+                out.print("testing SessionHelper categoryForClient after destroy... ");
+                out.flush();
                 try
                 {
-                    wait(30000);
-                    break;
+                    test(!_session.categoryForClient().equals(""));
+                    test(false);
                 }
-                catch(java.lang.InterruptedException ex)
+                catch(com.zeroc.Glacier2.SessionNotExistException ex)
                 {
                 }
-            }
-
-            out.print("testing SessionHelper isConnected after connect... ");
-            out.flush();
-            test(_session.isConnected());
-            out.println("ok");
-
-            out.print("testing SessionHelper categoryForClient after connect... ");
-            out.flush();
-            try
-            {
-                test(!_session.categoryForClient().equals(""));
-            }
-            catch(com.zeroc.Glacier2.SessionNotExistException ex)
-            {
-                test(false);
-            }
-            out.println("ok");
+                out.println("ok");
 
-            test(_session.session() == null);
+                out.print("testing SessionHelper session after destroy... ");
+                test(_session.session() == null);
+                out.println("ok");
 
-            out.print("testing stringToProxy for server object... ");
-            out.flush();
-            com.zeroc.Ice.ObjectPrx base = _session.communicator().stringToProxy("callback:" + getTestEndpoint(0));
-            out.println("ok");
-
-            out.print("pinging server after session creation... ");
-            out.flush();
-            base.ice_ping();
-            out.println("ok");
-
-            out.print("testing checked cast for server object... ");
-            out.flush();
-            CallbackPrx twoway = CallbackPrx.checkedCast(base);
-            test(twoway != null);
-            out.println("ok");
-
-            out.print("testing server shutdown... ");
-            out.flush();
-            twoway.shutdown();
-            out.println("ok");
-
-            test(_session.communicator() != null);
-            out.print("testing SessionHelper destroy... ");
-            out.flush();
-            _session.destroy();
-            while(true)
-            {
+                out.print("testing SessionHelper communicator after destroy... ");
+                out.flush();
                 try
                 {
-                    wait();
-                    break;
+                    test(_session.communicator() != null);
+                    _session.communicator().stringToProxy("dummy");
+                    test(false);
                 }
-                catch(java.lang.InterruptedException ex)
+                catch(com.zeroc.Ice.CommunicatorDestroyedException ex)
                 {
                 }
-            }
-
-            out.print("testing SessionHelper isConnected after destroy... ");
-            out.flush();
-            test(_session.isConnected() == false);
-            out.println("ok");
-
-            out.print("testing SessionHelper categoryForClient after destroy... ");
-            out.flush();
-            try
-            {
-                test(!_session.categoryForClient().equals(""));
-                test(false);
-            }
-            catch(com.zeroc.Glacier2.SessionNotExistException ex)
-            {
-            }
-            out.println("ok");
-
-            out.print("testing SessionHelper session after destroy... ");
-            test(_session.session() == null);
-            out.println("ok");
-
-            out.print("testing SessionHelper communicator after destroy... ");
-            out.flush();
-            try
-            {
-                test(_session.communicator() != null);
-                _session.communicator().stringToProxy("dummy");
-                test(false);
-            }
-            catch(com.zeroc.Ice.CommunicatorDestroyedException ex)
-            {
-            }
-            out.println("ok");
-
-            out.print("uninstalling router with communicator... ");
-            out.flush();
-            communicator().setDefaultRouter(null);
-            out.println("ok");
-
-            com.zeroc.Ice.ObjectPrx processBase;
-            {
-                out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 out.println("ok");
-            }
 
-            com.zeroc.Ice.ProcessPrx process;
-            {
-                out.print("testing checked cast for admin object... ");
-                process = com.zeroc.Ice.ProcessPrx.checkedCast(processBase);
-                test(process != null);
+                out.print("uninstalling router with communicator... ");
+                out.flush();
+                communicator.setDefaultRouter(null);
                 out.println("ok");
-            }
 
-            out.print("testing Glacier2 shutdown... ");
-            process.shutdown();
-            try
-            {
-                process.ice_ping();
-                test(false);
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                out.println("ok");
-            }
-        }
+                com.zeroc.Ice.ObjectPrx processBase;
+                {
+                    out.print("testing stringToProxy for process object... ");
+                    processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
+                    out.println("ok");
+                }
 
-        _factory = new com.zeroc.Glacier2.SessionFactoryHelper(_initData, new com.zeroc.Glacier2.SessionCallback()
-            {
-                @Override
-                public void connected(com.zeroc.Glacier2.SessionHelper session)
-                    throws com.zeroc.Glacier2.SessionNotExistException
+                com.zeroc.Ice.ProcessPrx process;
                 {
-                     test(false);
+                    out.print("testing checked cast for admin object... ");
+                    process = com.zeroc.Ice.ProcessPrx.checkedCast(processBase);
+                    test(process != null);
+                    out.println("ok");
                 }
 
-                @Override
-                public void disconnected(com.zeroc.Glacier2.SessionHelper session)
+                out.print("testing Glacier2 shutdown... ");
+                process.shutdown();
+                try
                 {
+                    process.ice_ping();
                     test(false);
                 }
+                catch(com.zeroc.Ice.LocalException ex)
+                {
+                    out.println("ok");
+                }
+            }
 
-                @Override
-                public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable exception)
+            _factory = new com.zeroc.Glacier2.SessionFactoryHelper(initData, new com.zeroc.Glacier2.SessionCallback()
                 {
-                    try
+                    @Override
+                    public void connected(com.zeroc.Glacier2.SessionHelper session)
+                    throws com.zeroc.Glacier2.SessionNotExistException
                     {
-                        throw exception;
+                        test(false);
                     }
-                    catch(com.zeroc.Ice.ConnectFailedException ex)
+
+                    @Override
+                    public void disconnected(com.zeroc.Glacier2.SessionHelper session)
                     {
-                        out.println("ok");
-                        synchronized(test.Glacier2.sessionHelper.Client.this)
+                        test(false);
+                    }
+
+                    @Override
+                    public void connectFailed(com.zeroc.Glacier2.SessionHelper session, Throwable exception)
+                    {
+                        try
                         {
-                            test.Glacier2.sessionHelper.Client.wakeUp();
+                            throw exception;
+                        }
+                        catch(com.zeroc.Ice.ConnectFailedException ex)
+                        {
+                            out.println("ok");
+                            synchronized(test.Glacier2.sessionHelper.Client.this)
+                            {
+                                test.Glacier2.sessionHelper.Client.wakeUp();
+                            }
+                        }
+                        catch(Throwable ex)
+                        {
+                            test(false);
                         }
                     }
-                    catch(Throwable ex)
+
+                    @Override
+                    public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
                     {
-                        test(false);
+                        test(session.communicator() != null);
                     }
-                }
-
-                @Override
-                public void createdCommunicator(com.zeroc.Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
-
-        //
-        // Wait a bit to ensure glaci2router has been shutdown.
-        //
-        while(true)
-        {
-            try
-            {
-                Thread.sleep(100);
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }
+                });
 
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect after router shutdown... ");
-            out.flush();
-
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(50));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
+            //
+            // Wait a bit to ensure glaci2router has been shutdown.
+            //
             while(true)
             {
                 try
                 {
-                    wait();
+                    Thread.sleep(100);
                     break;
                 }
                 catch(java.lang.InterruptedException ex)
@@ -455,32 +418,52 @@
                 }
             }
 
-            out.print("testing SessionHelper isConnect after connect failure... ");
-            out.flush();
-            test(_session.isConnected() == false);
-            out.println("ok");
-
-            out.print("testing SessionHelper communicator after connect failure... ");
-            out.flush();
-            try
-            {
-                test(_session.communicator() != null);
-                _session.communicator().stringToProxy("dummy");
-                test(false);
-            }
-            catch(com.zeroc.Ice.CommunicatorDestroyedException ex)
+            synchronized(this)
             {
-            }
-            out.println("ok");
+                out.print("testing SessionHelper connect after router shutdown... ");
+                out.flush();
 
-            out.print("testing SessionHelper destroy after connect failure... ");
-            out.flush();
-            _session.destroy();
-            out.println("ok");
-        }
-        _workQueue.shutdown();
+                _factory.setRouterHost(host);
+                _factory.setPort(getTestPort(50));
+                _factory.setProtocol(protocol);
+                _session = _factory.connect("userid", "abc123");
+                while(true)
+                {
+                    try
+                    {
+                        wait();
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
+                }
+
+                out.print("testing SessionHelper isConnect after connect failure... ");
+                out.flush();
+                test(_session.isConnected() == false);
+                out.println("ok");
+
+                out.print("testing SessionHelper communicator after connect failure... ");
+                out.flush();
+                try
+                {
+                    test(_session.communicator() != null);
+                    _session.communicator().stringToProxy("dummy");
+                    test(false);
+                }
+                catch(com.zeroc.Ice.CommunicatorDestroyedException ex)
+                {
+                }
+                out.println("ok");
 
-        return 0;
+                out.print("testing SessionHelper destroy after connect failure... ");
+                out.flush();
+                _session.destroy();
+                out.println("ok");
+            }
+            _workQueue.shutdown();
+        }
     }
 
     public static void wakeUp()
@@ -488,18 +471,8 @@
         me.notify();
     }
 
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
-    }
-
     private com.zeroc.Glacier2.SessionHelper _session;
     private com.zeroc.Glacier2.SessionFactoryHelper _factory;
-    private com.zeroc.Ice.InitializationData _initData;
     private ExecutorService _workQueue = Executors.newSingleThreadExecutor();
     static public Client me;
     final public PrintWriter out;
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.sessionHelper;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
-        communicator().createObjectAdapter("DeactivatedAdapter");
-
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("callback"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+            communicator.createObjectAdapter("DeactivatedAdapter");
+
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+            adapter.add(new CallbackI(), com.zeroc.Ice.Util.stringToIdentity("callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
@@ -15,7 +10,7 @@
 import test.Ice.acm.Test.RemoteCommunicatorPrx;
 import test.Ice.acm.Test.RemoteObjectAdapterPrx;
 import test.Ice.acm.Test.TestIntfPrx;
-import test.Util.Application;
+import test.TestHelper;
 
 import com.zeroc.Ice.ACMClose;
 import com.zeroc.Ice.ACMHeartbeat;
@@ -122,9 +117,9 @@
 
     static abstract class TestCase
     {
-        public TestCase(Application app, String name, RemoteCommunicatorPrx com, PrintWriter out)
+        public TestCase(TestHelper helper, String name, RemoteCommunicatorPrx com, PrintWriter out)
         {
-            _app = app;
+            _helper = helper;
             _name = name;
             _com = com;
             _logger = new LoggerI(out);
@@ -145,8 +140,8 @@
         {
             _adapter = _com.createObjectAdapter(_serverACMTimeout, _serverACMClose, _serverACMHeartbeat);
 
-            com.zeroc.Ice.InitializationData initData = _app.createInitializationData();
-            initData.properties = _app.communicator().getProperties()._clone();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+            initData.properties = _helper.communicator().getProperties()._clone();
             initData.logger = _logger;
             initData.properties.setProperty("Ice.ACM.Timeout", "2");
             if(_clientACMTimeout >= 0)
@@ -161,9 +156,9 @@
             {
                 initData.properties.setProperty("Ice.ACM.Client.Heartbeat", Integer.toString(_clientACMHeartbeat));
             }
-            //initData.properties.setProperty("Ice.Trace.Protocol", "2");
-            //initData.properties.setProperty("Ice.Trace.Network", "2");
-            _communicator = _app.initialize(initData);
+            // initData.properties.setProperty("Ice.Trace.Protocol", "2");
+            // initData.properties.setProperty("Ice.Trace.Network", "2");
+            _communicator = _helper.initialize(initData);
 
             _thread = new Thread(() -> { TestCase.this.run(); });
         }
@@ -270,7 +265,7 @@
             _serverACMHeartbeat = heartbeat;
         }
 
-        private final Application _app;
+        private final TestHelper _helper;
         private String _name;
         private RemoteCommunicatorPrx _com;
         private String _msg;
@@ -293,9 +288,9 @@
 
     static class InvocationHeartbeatTest extends TestCase
     {
-        public InvocationHeartbeatTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationHeartbeatTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation heartbeat", com, out);
+            super(helper, "invocation heartbeat", com, out);
             setServerACM(1, -1, -1); // Faster ACM to make sure we receive enough ACM heartbeats
         }
 
@@ -308,9 +303,9 @@
 
     static class InvocationHeartbeatOnHoldTest extends TestCase
     {
-        public InvocationHeartbeatOnHoldTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationHeartbeatOnHoldTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation with heartbeat on hold", com, out);
+            super(helper, "invocation with heartbeat on hold", com, out);
             // Use default ACM configuration.
         }
 
@@ -335,9 +330,9 @@
 
     static class InvocationNoHeartbeatTest extends TestCase
     {
-        public InvocationNoHeartbeatTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationNoHeartbeatTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation with no heartbeat", com, out);
+            super(helper, "invocation with no heartbeat", com, out);
             setServerACM(2, 2, 0); // Disable heartbeat on invocations
         }
 
@@ -366,9 +361,9 @@
 
     static class InvocationHeartbeatCloseOnIdleTest extends TestCase
     {
-        public InvocationHeartbeatCloseOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationHeartbeatCloseOnIdleTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation with no heartbeat and close on idle", com, out);
+            super(helper, "invocation with no heartbeat and close on idle", com, out);
             setClientACM(1, 1, 0); // Only close on idle.
             setServerACM(1, 2, 0); // Disable heartbeat on invocations
         }
@@ -389,9 +384,9 @@
 
     static class CloseOnIdleTest extends TestCase
     {
-        public CloseOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public CloseOnIdleTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "close on idle", com, out);
+            super(helper, "close on idle", com, out);
             setClientACM(1, 1, 0); // Only close on idle
         }
 
@@ -416,9 +411,9 @@
 
     static class CloseOnInvocationTest extends TestCase
     {
-        public CloseOnInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public CloseOnInvocationTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "close on invocation", com, out);
+            super(helper, "close on invocation", com, out);
             setClientACM(1, 2, 0); // Only close on invocation
         }
 
@@ -442,9 +437,9 @@
 
     static class CloseOnIdleAndInvocationTest extends TestCase
     {
-        public CloseOnIdleAndInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public CloseOnIdleAndInvocationTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "close on idle and invocation", com, out);
+            super(helper, "close on idle and invocation", com, out);
             setClientACM(1, 3, 0); // Only close on idle and invocation
         }
 
@@ -485,9 +480,9 @@
 
     static class ForcefulCloseOnIdleAndInvocationTest extends TestCase
     {
-        public ForcefulCloseOnIdleAndInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public ForcefulCloseOnIdleAndInvocationTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "forceful close on idle and invocation", com, out);
+            super(helper, "forceful close on idle and invocation", com, out);
             setClientACM(1, 4, 0); // Only close on idle and invocation
         }
 
@@ -511,9 +506,9 @@
 
     static class HeartbeatOnIdleTest extends TestCase
     {
-        public HeartbeatOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public HeartbeatOnIdleTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "heartbeat on idle", com, out);
+            super(helper, "heartbeat on idle", com, out);
             setServerACM(1, -1, 2); // Enable server heartbeats.
         }
 
@@ -536,9 +531,9 @@
 
     static class HeartbeatAlwaysTest extends TestCase
     {
-        public HeartbeatAlwaysTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public HeartbeatAlwaysTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "heartbeat always", com, out);
+            super(helper, "heartbeat always", com, out);
             setServerACM(1, -1, 3); // Enable server heartbeats.
         }
 
@@ -565,9 +560,9 @@
 
     static class HeartbeatManualTest extends TestCase
     {
-        public HeartbeatManualTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public HeartbeatManualTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "manual heartbeats", com, out);
+            super(helper, "manual heartbeats", com, out);
             //
             // Disable heartbeats.
             //
@@ -590,9 +585,9 @@
 
     static class SetACMTest extends TestCase
     {
-        public SetACMTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public SetACMTest(TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "setACM/getACM", com, out);
+            super(helper, "setACM/getACM", com, out);
             setClientACM(15, 4, 0);
         }
 
@@ -680,30 +675,30 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "communicator:" + app.getTestEndpoint(0);
+        String ref = "communicator:" + helper.getTestEndpoint();
         RemoteCommunicatorPrx com = RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
         java.util.List<TestCase> tests = new java.util.ArrayList<>();
 
-        tests.add(new InvocationHeartbeatTest(app, com, out));
-        tests.add(new InvocationHeartbeatOnHoldTest(app, com, out));
-        tests.add(new InvocationNoHeartbeatTest(app, com, out));
-        tests.add(new InvocationHeartbeatCloseOnIdleTest(app, com, out));
-
-        tests.add(new CloseOnIdleTest(app, com, out));
-        tests.add(new CloseOnInvocationTest(app, com, out));
-        tests.add(new CloseOnIdleAndInvocationTest(app, com, out));
-        tests.add(new ForcefulCloseOnIdleAndInvocationTest(app, com, out));
-
-        tests.add(new HeartbeatOnIdleTest(app, com, out));
-        tests.add(new HeartbeatAlwaysTest(app, com, out));
-        tests.add(new HeartbeatManualTest(app, com, out));
-        tests.add(new SetACMTest(app, com, out));
+        tests.add(new InvocationHeartbeatTest(helper, com, out));
+        tests.add(new InvocationHeartbeatOnHoldTest(helper, com, out));
+        tests.add(new InvocationNoHeartbeatTest(helper, com, out));
+        tests.add(new InvocationHeartbeatCloseOnIdleTest(helper, com, out));
+
+        tests.add(new CloseOnIdleTest(helper, com, out));
+        tests.add(new CloseOnInvocationTest(helper, com, out));
+        tests.add(new CloseOnIdleAndInvocationTest(helper, com, out));
+        tests.add(new ForcefulCloseOnIdleAndInvocationTest(helper, com, out));
+
+        tests.add(new HeartbeatOnIdleTest(helper, com, out));
+        tests.add(new HeartbeatAlwaysTest(helper, com, out));
+        tests.add(new HeartbeatManualTest(helper, com, out));
+        tests.add(new SetACMTest(helper, com, out));
 
         for(TestCase test : tests)
         {
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.acm");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.acm");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("communicator");
-        adapter.add(new RemoteCommunicatorI(), id);
-        adapter.activate();
-
-        // Disable ready print for further adapters.
-        communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
-
-        return WAIT;
-    }
-
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.acm");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.ACM.Timeout", "1");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.acm");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.ACM.Timeout", "1");
+
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint());
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("communicator");
+            adapter.add(new RemoteCommunicatorI(), id);
+            adapter.activate();
+
+            // Disable ready print for further adapters.
+            communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/acm/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/acm/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
@@ -22,14 +17,14 @@
         }
     }
 
-    public static TestIntfPrx allTests(test.Util.Application app)
+    public static TestIntfPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        java.io.PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        java.io.PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -74,11 +69,10 @@
             out.flush();
             for(int i = 0; i < 10; ++i)
             {
-                com.zeroc.Ice.InitializationData initData = app.createInitializationData();
-                initData.properties = communicator.getProperties()._clone();
-                com.zeroc.Ice.Communicator comm = app.initialize(initData);
-                comm.stringToProxy("test:" + app.getTestEndpoint(0)).ice_pingAsync();
-                comm.destroy();
+                try(com.zeroc.Ice.Communicator comm = helper.initialize(communicator.getProperties()._clone()))
+                {
+                    comm.stringToProxy("test:" + helper.getTestEndpoint(0)).ice_pingAsync();
+                }
             }
             out.println("ok");
         }
@@ -168,8 +162,8 @@
 
             try
             {
-                router =
-                    com.zeroc.Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(1)));
+                router = com.zeroc.Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("test:" +
+                                                                                          helper.getTestEndpoint(1)));
                 communicator.createObjectAdapterWithRouter("", router);
                 test(false);
             }
@@ -183,10 +177,10 @@
         out.flush();
         {
             com.zeroc.Ice.ObjectAdapter adapter1 =
-                communicator.createObjectAdapterWithEndpoints("Adpt1", app.getTestEndpoint(10));
+                communicator.createObjectAdapterWithEndpoints("Adpt1", helper.getTestEndpoint(10));
             try
             {
-                communicator.createObjectAdapterWithEndpoints("Adpt2", app.getTestEndpoint(10));
+                communicator.createObjectAdapterWithEndpoints("Adpt2", helper.getTestEndpoint(10));
                 test(false);
             }
             catch(com.zeroc.Ice.LocalException ex)
@@ -207,11 +201,12 @@
         try
         {
             obj.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
-            throw new RuntimeException();
+            test(false);
         }
         catch(com.zeroc.Ice.LocalException ex)
         {
             out.println("ok");
+            out.flush();
         }
 
         return obj;
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ServantLocator locator = new ServantLocatorI();
-        adapter.addServantLocator(locator, "");
-
-        AllTests.allTests(this);
-
-        adapter.waitForDeactivate();
-        return 0;
-    }
-
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-
-        //
-        // 2 threads are necessary to dispatch the collocated transient() call with AMI
-        //
-        initData.properties.setProperty("TestAdapter.ThreadPool.Size", "2");
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
 
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            //
+            // 2 threads are necessary to dispatch the collocated transient() call with AMI
+            //
+            communicator.getProperties().setProperty("TestAdapter.ThreadPool.Size", "2");
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint());
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI(), "");
+            AllTests.allTests(this);
+            adapter.waitForDeactivate();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ServantLocator locator = new ServantLocatorI();
-
-        adapter.addServantLocator(locator, "");
-        adapter.activate();
-        serverReady();
-        adapter.waitForDeactivate();
-        return 0;
-    }
-
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint());
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI(), "");
+            adapter.activate();
+            serverReady();
+            adapter.waitForDeactivate();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/adapterDeactivation/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
@@ -101,9 +96,9 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing communicator operations... ");
         out.flush();
@@ -111,81 +106,86 @@
             //
             // Test: Exercise addAdminFacet, findAdminFacet, removeAdminFacet with a typical configuration.
             //
-            com.zeroc.Ice.InitializationData init = app.createInitializationData();
+            com.zeroc.Ice.InitializationData init = new com.zeroc.Ice.InitializationData();
             init.properties = com.zeroc.Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
             init.properties.setProperty("Ice.Admin.InstanceName", "Test");
-            com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init);
-            testFacets(comm, true);
-            comm.destroy();
+            try(com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init))
+            {
+                testFacets(comm, true);
+            }
         }
         {
             //
             // Test: Verify that the operations work correctly in the presence of facet filters.
             //
-            com.zeroc.Ice.InitializationData init = app.createInitializationData();
+            com.zeroc.Ice.InitializationData init = new com.zeroc.Ice.InitializationData();
             init.properties = com.zeroc.Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
             init.properties.setProperty("Ice.Admin.InstanceName", "Test");
             init.properties.setProperty("Ice.Admin.Facets", "Properties");
-            com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init);
-            testFacets(comm, false);
-            comm.destroy();
+            try(com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init))
+            {
+                testFacets(comm, false);
+            }
         }
         {
             //
             // Test: Verify that the operations work correctly with the Admin object disabled.
             //
-            com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize();
-            testFacets(comm, false);
-            comm.destroy();
+            try(com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize())
+            {
+                testFacets(comm, false);
+            }
         }
         {
             //
             // Test: Verify that the operations work correctly when Ice.Admin.Enabled is set
             //
-            com.zeroc.Ice.InitializationData init = app.createInitializationData();
+            com.zeroc.Ice.InitializationData init = new com.zeroc.Ice.InitializationData();
             init.properties = com.zeroc.Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Enabled", "1");
-            com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init);
-
-            test(comm.getAdmin() == null);
-            com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("test-admin");
-            try
-            {
-                comm.createAdmin(null, id);
-                test(false);
-            }
-            catch(com.zeroc.Ice.InitializationException ex)
+            try(com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init))
             {
-            }
+                test(comm.getAdmin() == null);
+                com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("test-admin");
+                try
+                {
+                    comm.createAdmin(null, id);
+                    test(false);
+                }
+                catch(com.zeroc.Ice.InitializationException ex)
+                {
+                }
 
-            com.zeroc.Ice.ObjectAdapter adapter = comm.createObjectAdapter("");
-            test(comm.createAdmin(adapter, id) != null);
-            test(comm.getAdmin() != null);
-            testFacets(comm, true);
-            comm.destroy();
+                com.zeroc.Ice.ObjectAdapter adapter = comm.createObjectAdapter("");
+                test(comm.createAdmin(adapter, id) != null);
+                test(comm.getAdmin() != null);
+                testFacets(comm, true);
+            }
         }
         {
             //
             // Test: Verify that the operations work correctly when creation of the Admin object is delayed.
             //
-            com.zeroc.Ice.InitializationData init = app.createInitializationData();
+            com.zeroc.Ice.InitializationData init = new com.zeroc.Ice.InitializationData();
             init.properties = com.zeroc.Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
             init.properties.setProperty("Ice.Admin.InstanceName", "Test");
             init.properties.setProperty("Ice.Admin.DelayCreation", "1");
-            com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init);
-            testFacets(comm, true);
-            comm.getAdmin();
-            testFacets(comm, true);
-            comm.destroy();
+            try(com.zeroc.Ice.Communicator comm = com.zeroc.Ice.Util.initialize(init))
+            {
+                testFacets(comm, true);
+                comm.getAdmin();
+                testFacets(comm, true);
+                comm.destroy();
+            }
         }
         out.println("ok");
 
-        String ref = "factory:" + app.getTestEndpoint(0) + " -t 10000";
+        String ref = "factory:" + helper.getTestEndpoint(0) + " -t 10000";
         RemoteCommunicatorFactoryPrx factory =
-            RemoteCommunicatorFactoryPrx.uncheckedCast(app.communicator().stringToProxy(ref));
+            RemoteCommunicatorFactoryPrx.uncheckedCast(helper.communicator().stringToProxy(ref));
 
         out.print("testing process facet... ");
         out.flush();
@@ -360,7 +360,7 @@
             // Now, test RemoteLogger
             //
             com.zeroc.Ice.ObjectAdapter adapter =
-                app.communicator().createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost");
+                helper.communicator().createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost");
 
             RemoteLoggerI remoteLogger = new RemoteLoggerI();
 
@@ -373,8 +373,6 @@
             // No filtering
             //
             r = logger.getLog(null, null, -1);
-            remoteLogger.checkNextInit(r.prefix, r.returnValue);
-
             try
             {
                 logger.attachRemoteLogger(myProxy, null, null, -1);
@@ -383,13 +381,13 @@
             {
                 test(false);
             }
-
             remoteLogger.wait(1);
 
-            remoteLogger.checkNextLog(LogMessageType.TraceMessage, "rtrace", "testCat");
-            remoteLogger.checkNextLog(LogMessageType.WarningMessage, "rwarning", "");
-            remoteLogger.checkNextLog(LogMessageType.ErrorMessage, "rerror", "");
-            remoteLogger.checkNextLog(LogMessageType.PrintMessage, "rprint", "");
+            for(int i = 0; i < r.returnValue.length; ++i)
+            {
+                com.zeroc.Ice.LogMessage m = r.returnValue[i];
+                remoteLogger.checkNextInit(r.prefix, m.type, m.message, m.traceCategory);
+            }
 
             rcom.trace("testCat", "rtrace");
             rcom.warning("rwarning");
@@ -398,6 +396,11 @@
 
             remoteLogger.wait(4);
 
+            remoteLogger.checkNextLog(LogMessageType.TraceMessage, "rtrace", "testCat");
+            remoteLogger.checkNextLog(LogMessageType.WarningMessage, "rwarning", "");
+            remoteLogger.checkNextLog(LogMessageType.ErrorMessage, "rerror", "");
+            remoteLogger.checkNextLog(LogMessageType.PrintMessage, "rprint", "");
+
             test(logger.detachRemoteLogger(myProxy));
             test(!logger.detachRemoteLogger(myProxy));
 
@@ -406,7 +409,6 @@
             //
             r = logger.getLog(messageTypes, categories, 4);
             test(r.returnValue.length == 4);
-            remoteLogger.checkNextInit(r.prefix, r.returnValue);
 
             try
             {
@@ -416,11 +418,13 @@
             {
                 test(false);
             }
-
             remoteLogger.wait(1);
 
-            remoteLogger.checkNextLog(LogMessageType.TraceMessage, "rtrace2", "testCat");
-            remoteLogger.checkNextLog(LogMessageType.ErrorMessage, "rerror2", "");
+            for(int i = 0; i < r.returnValue.length; ++i)
+            {
+                com.zeroc.Ice.LogMessage m = r.returnValue[i];
+                remoteLogger.checkNextInit(r.prefix, m.type, m.message, m.traceCategory);
+            }
 
             rcom.warning("rwarning2");
             rcom.trace("testCat", "rtrace2");
@@ -430,6 +434,8 @@
 
             remoteLogger.wait(2);
 
+            remoteLogger.checkNextLog(LogMessageType.TraceMessage, "rtrace2", "testCat");
+            remoteLogger.checkNextLog(LogMessageType.ErrorMessage, "rerror2", "");
             //
             // Attempt reconnection with slightly different proxy
             //
@@ -557,6 +563,7 @@
             rcom.destroy();
         }
         out.println("ok");
+        out.flush();
 
         factory.shutdown();
     }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        try(com.zeroc.Ice.Communicator communicator = initialize(args))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/RemoteLoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
@@ -14,8 +9,11 @@
     @Override
     public synchronized void init(String prefix, com.zeroc.Ice.LogMessage[] logMessages, com.zeroc.Ice.Current current)
     {
-        test(prefix.equals(_expectedPrefix));
-        test(java.util.Arrays.equals(logMessages, _expectedInitMessages));
+        _prefix = prefix;
+        for(int i = 0; i < logMessages.length; ++i)
+        {
+            _initMessages.add(logMessages[i]);
+        }
         _receivedCalls++;
         notifyAll();
     }
@@ -23,24 +21,28 @@
     @Override
     public synchronized void log(com.zeroc.Ice.LogMessage logMessage, com.zeroc.Ice.Current current)
     {
-        com.zeroc.Ice.LogMessage front = _expectedLogMessages.pollFirst();
-        test(front.type == logMessage.type && front.message.equals(logMessage.message) &&
-             front.traceCategory.equals(logMessage.traceCategory));
-
+        _logMessages.add(logMessage);
         _receivedCalls++;
         notifyAll();
     }
 
-    synchronized void checkNextInit(String prefix, com.zeroc.Ice.LogMessage[] logMessages)
+    synchronized void checkNextInit(String prefix, com.zeroc.Ice.LogMessageType type, String message, String category)
     {
-        _expectedPrefix = prefix;
-        _expectedInitMessages = logMessages;
-    }
-
-    synchronized void checkNextLog(com.zeroc.Ice.LogMessageType messageType, String message, String category)
-    {
-        com.zeroc.Ice.LogMessage logMessage = new com.zeroc.Ice.LogMessage(messageType, 0, category, message);
-        _expectedLogMessages.addLast(logMessage);
+        test(_prefix.equals(prefix));
+        test(_initMessages.size() > 0);
+        com.zeroc.Ice.LogMessage logMessage = _initMessages.pop();
+        test(logMessage.type == type);
+        test(logMessage.message.equals(message));
+        test(logMessage.traceCategory.equals(category));
+    }
+
+    synchronized void checkNextLog(com.zeroc.Ice.LogMessageType type, String message, String category)
+    {
+        test(_logMessages.size() > 0);
+        com.zeroc.Ice.LogMessage logMessage = _logMessages.pop();
+        test(logMessage.type == type);
+        test(logMessage.message.equals(message));
+        test(logMessage.traceCategory.equals(category));
     }
 
     synchronized void wait(int calls)
@@ -69,8 +71,9 @@
     }
 
     private int _receivedCalls;
-    private String _expectedPrefix;
-    private com.zeroc.Ice.LogMessage[] _expectedInitMessages;
-    private java.util.Deque<com.zeroc.Ice.LogMessage> _expectedLogMessages =
+    private String _prefix;
+    private java.util.Deque<com.zeroc.Ice.LogMessage> _initMessages =
+        new java.util.ArrayDeque<com.zeroc.Ice.LogMessage>();
+    private java.util.Deque<com.zeroc.Ice.LogMessage> _logMessages =
         new java.util.ArrayDeque<com.zeroc.Ice.LogMessage>();
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new RemoteCommunicatorFactoryI(), com.zeroc.Ice.Util.stringToIdentity("factory"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.admin");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.admin");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint());
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new RemoteCommunicatorFactoryI(), com.zeroc.Ice.Util.stringToIdentity("factory"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/TestFacetI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/TestFacetI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/TestFacetI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/TestFacetI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
-import test.Util.Application;
 import java.io.PrintWriter;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CancellationException;
@@ -25,7 +19,6 @@
 import test.Ice.ami.Test.TestIntfControllerPrx;
 import test.Ice.ami.Test.TestIntfException;
 import test.Ice.ami.Test.PingReplyPrx;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -44,42 +37,17 @@
     public static class PingReplyI implements test.Ice.ami.Test.PingReply
     {
         @Override
-        public synchronized void reply(com.zeroc.Ice.Current current)
-        {
-            ++_replies;
-            notify();
-        }
-
-        public synchronized void reset()
+        public void reply(com.zeroc.Ice.Current current)
         {
-             _replies = 0;
+            _received = true;
         }
 
-        public synchronized boolean waitReply(int expectedReplies, long timeout)
+        public boolean checkReceived()
         {
-            long end = System.currentTimeMillis() + timeout;
-            while(_replies < expectedReplies)
-            {
-                long delay = end - System.currentTimeMillis();
-                if(delay > 0)
-                {
-                    try
-                    {
-                        wait(delay);
-                    }
-                    catch(java.lang.InterruptedException ex)
-                    {
-                    }
-                }
-                else
-                {
-                    break;
-                }
-            }
-            return _replies == expectedReplies;
+            return _received;
         }
 
-        private int _replies;
+        private boolean _received = false;
     }
 
     private static class Callback
@@ -164,19 +132,19 @@
         }
     }
 
-    public static void allTests(Application app, boolean collocated)
+    public static void allTests(test.TestHelper helper, boolean collocated)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "test:" + app.getTestEndpoint(0);
+        String sref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         TestIntfPrx p = TestIntfPrx.uncheckedCast(obj);
 
-        sref = "testController:" + app.getTestEndpoint(1);
+        sref = "testController:" + helper.getTestEndpoint(1);
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -247,9 +215,9 @@
             //
             if(p.ice_getConnection() != null)
             {
-                com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+                com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
                 initData.properties = communicator.getProperties()._clone();
-                com.zeroc.Ice.Communicator ic = app.initialize(initData);
+                com.zeroc.Ice.Communicator ic = helper.initialize(initData);
                 com.zeroc.Ice.ObjectPrx o = ic.stringToProxy(p.toString());
                 TestIntfPrx p2 = TestIntfPrx.uncheckedCast(o);
                 ic.destroy();
@@ -1111,8 +1079,8 @@
                 adapter.activate();
 
                 p.ice_getConnection().setAdapter(adapter);
-                p.pingBiDir(reply.ice_getIdentity());
-                replyI.waitReply(1, 100);
+                p.pingBiDir(reply);
+                test(replyI.checkReceived());
                 adapter.destroy();
             }
         }
@@ -1123,7 +1091,7 @@
         {
             test.Ice.ami.Test.Outer.Inner.TestIntfPrx q =
                 test.Ice.ami.Test.Outer.Inner.TestIntfPrx.uncheckedCast(
-                    communicator.stringToProxy("test2:" + app.getTestEndpoint(0)));
+                    communicator.stringToProxy("test2:" + helper.getTestEndpoint(0)));
 
             q.opAsync(1).whenComplete(
                 (result, ex) ->
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this, false);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami");
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.ami");
+        properties.setProperty("Ice.Warn.AMICallback", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         //
         // Limit the send buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        properties.setProperty("Ice.TCP.SndSize", "50000");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this, false);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.add(new TestII(), com.zeroc.Ice.Util.stringToIdentity("test2"));
-        //adapter.activate(); // Collocated test doesn't need to activate the OA
-        adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Collocated test doesn't need to activate the OA
-
-        AllTests.allTests(this, true);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        return initData;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.ami");
+        properties.setProperty("Ice.Warn.AMICallback", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.add(new TestII(), com.zeroc.Ice.Util.stringToIdentity("test2"));
+            //adapter.activate(); // Collocated test doesn't need to activate the OA
+            adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
+            //adapter2.activate(); // Collocated test doesn't need to activate the OA
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+            AllTests.allTests(this, true);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.add(new TestII(), com.zeroc.Ice.Util.stringToIdentity("test2"));
-        adapter.activate();
-        adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.ami");
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        return initData;
-    }
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.add(new TestII(), com.zeroc.Ice.Util.stringToIdentity("test2"));
+            adapter.activate();
+            adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
+            adapter2.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/TestControllerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/TestControllerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/TestControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/TestControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -58,7 +53,7 @@
     float opFloat(float f);
     double opDouble(double d);
 
-    void pingBiDir(Ice::Identity id);
+    void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/TestII.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/TestII.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/TestII.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/TestII.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/ami/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/ami/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
@@ -125,14 +120,17 @@
     }
 
     @Override
-    public void pingBiDir(com.zeroc.Ice.Identity id, com.zeroc.Ice.Current current)
+    public void pingBiDir(PingReplyPrx reply, com.zeroc.Ice.Current current)
     {
-        PingReplyPrx p = PingReplyPrx.uncheckedCast(current.con.createProxy(id));
-        p.replyAsync().whenCompleteAsync(
+        reply = reply.ice_fixed(current.con);
+        final Thread dispatchThread = Thread.currentThread();
+        reply.replyAsync().whenCompleteAsync(
             (result, ex) ->
             {
-                test(Thread.currentThread().getName().indexOf("Ice.ThreadPool.Server") != -1);
-            }, p.ice_executor()).join();
+                Thread callbackThread = Thread.currentThread();
+                test(callbackThread != dispatchThread);
+                test(callbackThread.getName().indexOf("Ice.ThreadPool.Server") != -1);
+            }, reply.ice_executor()).join();
     }
 
     @Override
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Acceptor.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Acceptor.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Acceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Acceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
@@ -161,18 +156,18 @@
         private BackgroundPrx _background = null;
     }
 
-    public static BackgroundPrx allTests(Configuration configuration, test.Util.Application app)
+    public static BackgroundPrx allTests(Configuration configuration, test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "background:" + app.getTestEndpoint(0);
+        String sref = "background:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         BackgroundPrx background = BackgroundPrx.uncheckedCast(obj);
 
-        sref = "backgroundController:" + app.getTestEndpoint(1, "tcp");
+        sref = "backgroundController:" + helper.getTestEndpoint(1, "tcp");
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -210,7 +205,7 @@
         out.flush();
         {
             com.zeroc.Ice.LocatorPrx locator;
-            obj = communicator.stringToProxy("locator:" + app.getTestEndpoint(0)).ice_invocationTimeout(250);
+            obj = communicator.stringToProxy("locator:" + helper.getTestEndpoint(0)).ice_invocationTimeout(250);
             locator = com.zeroc.Ice.LocatorPrx.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_locator(locator).ice_oneway();
 
@@ -225,7 +220,7 @@
             }
             backgroundController.resumeCall("findAdapterById");
 
-            obj = communicator.stringToProxy("locator:" + app.getTestEndpoint(0));
+            obj = communicator.stringToProxy("locator:" + helper.getTestEndpoint(0));
             locator = com.zeroc.Ice.LocatorPrx.uncheckedCast(obj);
             obj = obj.ice_locator(locator);
             obj.ice_ping();
@@ -251,7 +246,7 @@
         {
             com.zeroc.Ice.RouterPrx router;
 
-            obj = communicator.stringToProxy("router:" + app.getTestEndpoint(0)).ice_invocationTimeout(250);
+            obj = communicator.stringToProxy("router:" + helper.getTestEndpoint(0)).ice_invocationTimeout(250);
             router = com.zeroc.Ice.RouterPrx.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_router(router).ice_oneway();
 
@@ -266,7 +261,7 @@
             }
             backgroundController.resumeCall("getClientProxy");
 
-            obj = communicator.stringToProxy("router:" + app.getTestEndpoint(0));
+            obj = communicator.stringToProxy("router:" + helper.getTestEndpoint(0));
             router = com.zeroc.Ice.RouterPrx.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_router(router);
             BackgroundPrx bg = BackgroundPrx.uncheckedCast(obj);
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/BackgroundControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/BackgroundI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/BackgroundI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/BackgroundI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/BackgroundI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,63 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
 import test.Ice.background.PluginFactory.PluginI;
 import test.Ice.background.Test.BackgroundPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        PluginI plugin = (PluginI)communicator().getPluginManager().getPlugin("Test");
-        BackgroundPrx background = AllTests.allTests(plugin.getConfiguration(), this);
-        background.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        //
         // For this test, we want to disable retries.
         //
-        initData.properties.setProperty("Ice.RetryIntervals", "-1");
+        properties.setProperty("Ice.RetryIntervals", "-1");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
+        //
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+        //
+        properties.setProperty("Ice.TCP.SndSize", "50000");
 
         //
         // Setup the test transport plug-in.
         //
-        initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
-        String defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.background");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
+        properties.setProperty("Ice.Default.Protocol",
+                               "test-" + properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp"));
+
+        properties.setProperty("Ice.Package.Test", "test.Ice.background");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            PluginI plugin = (PluginI)communicator().getPluginManager().getPlugin("Test");
+            BackgroundPrx background = AllTests.allTests(plugin.getConfiguration(), this);
+            background.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Configuration.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Configuration.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Configuration.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Configuration.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Connector.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Connector.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Connector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Connector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/EndpointFactory.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/EndpointFactory.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/EndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/EndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/EndpointI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/EndpointI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/PluginFactory.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/PluginFactory.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
@@ -14,7 +9,7 @@
 
 import test.Ice.background.PluginFactory.PluginI;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     static public class LocatorI implements com.zeroc.Ice.Locator
     {
@@ -81,64 +76,51 @@
     }
 
     @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        PluginI plugin = (PluginI)communicator().getPluginManager().getPlugin("Test");
-        Configuration configuration = plugin.getConfiguration();
-
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        BackgroundControllerI backgroundController = new BackgroundControllerI(configuration, adapter);
-
-        adapter.add(new BackgroundI(backgroundController), com.zeroc.Ice.Util.stringToIdentity("background"));
-        adapter.add(new LocatorI(backgroundController), com.zeroc.Ice.Util.stringToIdentity("locator"));
-        adapter.add(new RouterI(backgroundController), com.zeroc.Ice.Util.stringToIdentity("router"));
-        adapter.activate();
-
-        adapter2.add(backgroundController, com.zeroc.Ice.Util.stringToIdentity("backgroundController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
 
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
         //
         // Setup the test transport plug-in.
         //
-        initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
-        String defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.background");
-
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 1, "tcp"));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
+        properties.setProperty("Ice.Default.Protocol",
+                               "test-" + properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp"));
+        properties.setProperty("Ice.Package.Test", "test.Ice.background");
+
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            PluginI plugin = (PluginI)communicator().getPluginManager().getPlugin("Test");
+            Configuration configuration = plugin.getConfiguration();
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
+
+            BackgroundControllerI backgroundController = new BackgroundControllerI(configuration, adapter);
+
+            adapter.add(new BackgroundI(backgroundController), com.zeroc.Ice.Util.stringToIdentity("background"));
+            adapter.add(new LocatorI(backgroundController), com.zeroc.Ice.Util.stringToIdentity("locator"));
+            adapter.add(new RouterI(backgroundController), com.zeroc.Ice.Util.stringToIdentity("router"));
+            adapter.activate();
+
+            adapter2.add(backgroundController, com.zeroc.Ice.Util.stringToIdentity("backgroundController"));
+            adapter2.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Transceiver.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Transceiver.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/background/Transceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/background/Transceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
@@ -14,7 +9,6 @@
 import test.Ice.binding.Test.RemoteCommunicatorPrx;
 import test.Ice.binding.Test.RemoteObjectAdapterPrx;
 import test.Ice.binding.Test.TestIntfPrx;
-import test.Util.Application;
 
 import com.zeroc.Ice.ConnectionClose;
 import com.zeroc.Ice.Endpoint;
@@ -56,12 +50,12 @@
         }
     }
 
-    public static void allTests(Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "communicator:" + app.getTestEndpoint(0);
+        String ref = "communicator:" + helper.getTestEndpoint(0);
         RemoteCommunicatorPrx rcom = RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
         out.print("testing binding with single endpoint... ");
@@ -859,7 +853,7 @@
             clientProps.add(bothPreferIPv4);
             clientProps.add(bothPreferIPv6);
 
-            String endpoint = "tcp -p " + app.getTestPort(2);
+            String endpoint = "tcp -p " + helper.getTestPort(2);
 
             com.zeroc.Ice.Properties anyipv4 = ipv4._clone();
             anyipv4.setProperty("Adapter.Endpoints", endpoint);
@@ -891,70 +885,67 @@
             boolean ipv6NotSupported = false;
             for(com.zeroc.Ice.Properties p : serverProps)
             {
-                com.zeroc.Ice.InitializationData serverInitData = app.createInitializationData();
-                serverInitData.properties = p;
-                com.zeroc.Ice.Communicator serverCommunicator = app.initialize(serverInitData);
-                com.zeroc.Ice.ObjectAdapter oa;
-                try
-                {
-                    oa = serverCommunicator.createObjectAdapter("Adapter");
-                    oa.activate();
-                }
-                catch(com.zeroc.Ice.DNSException ex)
-                {
-                    serverCommunicator.destroy();
-                    continue; // IP version not supported.
-                }
-                catch(com.zeroc.Ice.SocketException ex)
-                {
-                    if(p == ipv6)
-                    {
-                        ipv6NotSupported = true;
-                    }
-                    serverCommunicator.destroy();
-                    continue; // IP version not supported.
-                }
-
-                String strPrx = oa.createProxy(com.zeroc.Ice.Util.stringToIdentity("dummy")).toString();
-                for(com.zeroc.Ice.Properties q : clientProps)
+                try(com.zeroc.Ice.Communicator serverCommunicator = helper.initialize(p))
                 {
-                    com.zeroc.Ice.InitializationData clientInitData = app.createInitializationData();
-                    clientInitData.properties = q;
-                    com.zeroc.Ice.Communicator clientCommunicator = app.initialize(clientInitData);
-                    com.zeroc.Ice.ObjectPrx prx = clientCommunicator.stringToProxy(strPrx);
+                    com.zeroc.Ice.ObjectAdapter oa;
                     try
                     {
-                        prx.ice_ping();
-                        test(false);
-                    }
-                    catch(com.zeroc.Ice.ObjectNotExistException ex)
-                    {
-                        // Expected, no object registered.
+                        oa = serverCommunicator.createObjectAdapter("Adapter");
+                        oa.activate();
                     }
                     catch(com.zeroc.Ice.DNSException ex)
                     {
-                        // Expected if no IPv4 or IPv6 address is
-                        // associated to localhost or if trying to connect
-                        // to an any endpoint with the wrong IP version,
-                        // e.g.: resolving an IPv4 address when only IPv6
-                        // is enabled fails with a DNS exception.
+                        serverCommunicator.destroy();
+                        continue; // IP version not supported.
                     }
                     catch(com.zeroc.Ice.SocketException ex)
                     {
-                        test((p == ipv4 && q == ipv6) || (p == ipv6 && q == ipv4) ||
-                             (p == bothPreferIPv4 && q == ipv6) || (p == bothPreferIPv6 && q == ipv4) ||
-                             (p == bothPreferIPv6 && q == ipv6 && ipv6NotSupported) ||
-                             (p == anyipv4 && q == ipv6) || (p == anyipv6 && q == ipv4) ||
-                             (p == localipv4 && q == ipv6) || (p == localipv6 && q == ipv4) ||
-                             (p == ipv6 && q == bothPreferIPv4) || (p == bothPreferIPv6 && q == ipv6) ||
-                             (p == ipv6 && q == bothPreferIPv4) || (p == ipv6 && q == bothPreferIPv6) ||
-                             (p == bothPreferIPv6 && q == ipv6));
+                        if(p == ipv6)
+                        {
+                            ipv6NotSupported = true;
+                        }
+                        serverCommunicator.destroy();
+                        continue; // IP version not supported.
+                    }
+
+                    String strPrx = oa.createProxy(com.zeroc.Ice.Util.stringToIdentity("dummy")).toString();
+                    for(com.zeroc.Ice.Properties q : clientProps)
+                    {
+                        try(com.zeroc.Ice.Communicator clientCommunicator = helper.initialize(q))
+                        {
+                            com.zeroc.Ice.ObjectPrx prx = clientCommunicator.stringToProxy(strPrx);
+                            try
+                            {
+                                prx.ice_ping();
+                                test(false);
+                            }
+                            catch(com.zeroc.Ice.ObjectNotExistException ex)
+                            {
+                                // Expected, no object registered.
+                            }
+                            catch(com.zeroc.Ice.DNSException ex)
+                            {
+                                // Expected if no IPv4 or IPv6 address is
+                                // associated to localhost or if trying to connect
+                                // to an any endpoint with the wrong IP version,
+                                // e.g.: resolving an IPv4 address when only IPv6
+                                // is enabled fails with a DNS exception.
+                            }
+                            catch(com.zeroc.Ice.SocketException ex)
+                            {
+                                test((p == ipv4 && q == ipv6) || (p == ipv6 && q == ipv4) ||
+                                     (p == bothPreferIPv4 && q == ipv6) || (p == bothPreferIPv6 && q == ipv4) ||
+                                     (p == bothPreferIPv6 && q == ipv6 && ipv6NotSupported) ||
+                                     (p == anyipv4 && q == ipv6) || (p == anyipv6 && q == ipv4) ||
+                                     (p == localipv4 && q == ipv6) || (p == localipv6 && q == ipv4) ||
+                                     (p == ipv6 && q == bothPreferIPv4) || (p == bothPreferIPv6 && q == ipv6) ||
+                                     (p == ipv6 && q == bothPreferIPv4) || (p == ipv6 && q == bothPreferIPv6) ||
+                                     (p == bothPreferIPv6 && q == ipv6));
+                            }
+                        }
                     }
-                    clientCommunicator.destroy();
                 }
-                serverCommunicator.destroy();
             }
-
             out.println("ok");
         }
 
@@ -962,7 +953,7 @@
         // On Windows, the FD limit is very high and there's no way to limit the number of FDs
         // for the server so we don't run this test.
         //
-        if(!System.getProperty("os.name").startsWith("Windows"))
+        if(!System.getProperty("os.name").startsWith("Windows") && !helper.isAndroid())
         {
             out.print("testing FD limit... ");
             out.flush();
@@ -992,7 +983,7 @@
             catch(com.zeroc.Ice.ConnectionRefusedException ex)
             {
                 // Close the connection now to free a FD (it could be done after the sleep but
-                // there could be race condiutation since the connection might not be closed
+                // there could be race condition since the connection might not be closed
                 // immediately due to threading).
                 test.ice_connectionId("0").ice_getConnection().close(ConnectionClose.GracefullyWithWait);
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.binding");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.binding");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
@@ -15,9 +10,9 @@
 public class RemoteCommunicatorI implements RemoteCommunicator
 {
     public
-    RemoteCommunicatorI(test.Util.Application app)
+    RemoteCommunicatorI(test.TestHelper helper)
     {
-        _app = app;
+        _helper = helper;
     }
 
     @Override
@@ -31,9 +26,8 @@
                 String endpoints = endpts;
                 if(endpoints.indexOf("-p") < 0)
                 {
-                    endpoints = _app.getTestEndpoint(_nextPort++, endpoints);
+                    endpoints = _helper.getTestEndpoint(_nextPort++, endpoints);
                 }
-
                 com.zeroc.Ice.Communicator com = current.adapter.getCommunicator();
                 com.getProperties().setProperty(name + ".ThreadPool.Size", "1");
                 com.zeroc.Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, endpoints);
@@ -61,6 +55,6 @@
         current.adapter.getCommunicator().shutdown();
     }
 
-    private final test.Util.Application _app;
+    private final test.TestHelper _helper;
     private int _nextPort = 10;
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("communicator");
-        adapter.add(new RemoteCommunicatorI(this), id);
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.binding");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.logger = new com.zeroc.Ice.Logger() {
             @Override public void print(String message)
             {
@@ -56,14 +38,16 @@
                 return this;
             }
         };
-        return initData;
-    }
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("communicator");
+            adapter.add(new RemoteCommunicatorI(this), id);
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/binding/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/binding/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
@@ -22,12 +17,12 @@
         }
     }
 
-    public static ChecksumPrx allTests(test.Util.Application app, boolean collocated)
+    public static ChecksumPrx allTests(test.TestHelper helper, boolean collocated)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/ChecksumI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/ChecksumI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/ChecksumI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/ChecksumI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
 import test.Ice.checksum.Test.ChecksumPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        ChecksumPrx checksum = AllTests.allTests(this, false);
-        checksum.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.checksum");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.checksum");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            ChecksumPrx checksum = AllTests.allTests(this, false);
+            checksum.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new ChecksumI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new ChecksumI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/TestServer.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/TestServer.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/TestServer.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/TestServer.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Types.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Types.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/Types.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/Types.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/TypesServer.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/TypesServer.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/checksum/TypesServer.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/checksum/TypesServer.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
@@ -14,7 +9,6 @@
 import test.Ice.classLoader.Test.ConcreteClass;
 import test.Ice.classLoader.Test.E;
 import test.Ice.classLoader.Test.InitialPrx;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -54,10 +48,10 @@
         }
     }
 
-    public static void allTests(Application app, boolean collocated)
+    public static void allTests(test.TestHelper helper, boolean collocated)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         //
         // Verify that the class loader is used for Slice packages.
@@ -65,14 +59,15 @@
         {
             out.print("testing package... ");
             out.flush();
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
-            test(classLoader.check("test.Ice.classLoader.Test._Marker"));
-            ic.destroy();
-            out.println("ok");
+            try(com.zeroc.Ice.Communicator ic = helper.initialize(initData))
+            {
+                test(classLoader.check("test.Ice.classLoader.Test._Marker"));
+                out.println("ok");
+            }
         }
 
         //
@@ -81,15 +76,16 @@
         {
             out.print("testing plug-in... ");
             out.flush();
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.classLoader.PluginFactoryI");
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
-            test(classLoader.check("test.Ice.classLoader.PluginFactoryI"));
-            ic.destroy();
-            out.println("ok");
+            try(com.zeroc.Ice.Communicator ic = helper.initialize(initData))
+            {
+                test(classLoader.check("test.Ice.classLoader.PluginFactoryI"));
+                out.println("ok");
+            }
         }
 
         //
@@ -99,69 +95,71 @@
         {
             out.print("testing IceSSL certificate verifier and password callback... ");
             out.flush();
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("IceSSL.CertVerifier", "test.Ice.classLoader.CertificateVerifierI");
             initData.properties.setProperty("IceSSL.PasswordCallback", "test.Ice.classLoader.PasswordCallbackI");
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
-            test(classLoader.check("test.Ice.classLoader.CertificateVerifierI"));
-            test(classLoader.check("test.Ice.classLoader.PasswordCallbackI"));
-            ic.destroy();
-            out.println("ok");
+            try(com.zeroc.Ice.Communicator ic = helper.initialize(initData))
+            {
+                test(classLoader.check("test.Ice.classLoader.CertificateVerifierI"));
+                test(classLoader.check("test.Ice.classLoader.PasswordCallbackI"));
+                out.println("ok");
+            }
         }
 
         //
         // Marshaling tests.
         //
         {
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
-
-            String ref = "initial:" + app.getTestEndpoint(0);
-            com.zeroc.Ice.ObjectPrx base = ic.stringToProxy(ref);
-            test(base != null);
-
-            InitialPrx initial = InitialPrx.checkedCast(base);
-            test(initial != null);
-
-            //
-            // Verify that the class loader is used for concrete classes.
-            //
+            try(com.zeroc.Ice.Communicator ic = helper.initialize(initData))
             {
-                out.print("testing concrete class... ");
+                String ref = "initial:" + helper.getTestEndpoint(0);
+                com.zeroc.Ice.ObjectPrx base = ic.stringToProxy(ref);
+                test(base != null);
+
+                InitialPrx initial = InitialPrx.checkedCast(base);
+                test(initial != null);
+
+                //
+                // Verify that the class loader is used for concrete classes.
+                //
+                {
+                    out.print("testing concrete class... ");
+                    out.flush();
+                    ConcreteClass cc = initial.getConcreteClass();
+                    test(cc != null);
+                    test(classLoader.check("Test.ConcreteClass"));
+                    test(classLoader.check("test.Ice.classLoader.Test.ConcreteClass"));
+                    classLoader.reset();
+                    out.println("ok");
+                }
+
+                //
+                // Verify that the class loader is used for user exceptions.
+                //
+                out.print("testing user exception... ");
                 out.flush();
-                ConcreteClass cc = initial.getConcreteClass();
-                test(cc != null);
-                test(classLoader.check("Test.ConcreteClass"));
-                test(classLoader.check("test.Ice.classLoader.Test.ConcreteClass"));
-                classLoader.reset();
+                try
+                {
+                    initial.throwException();
+                    test(false);
+                }
+                catch(E ex)
+                {
+                }
+                test(classLoader.check("Test.E"));
+                test(classLoader.check("test.Ice.classLoader.Test.E"));
                 out.println("ok");
-            }
 
-            //
-            // Verify that the class loader is used for user exceptions.
-            //
-            out.print("testing user exception... ");
-            out.flush();
-            try
-            {
-                initial.throwException();
-                test(false);
-            }
-            catch(E ex)
-            {
+                initial.shutdown();
+                ic.destroy();
             }
-            test(classLoader.check("Test.E"));
-            test(classLoader.check("test.Ice.classLoader.Test.E"));
-            out.println("ok");
-
-            initial.shutdown();
-            ic.destroy();
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this, false);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        _initData = initData;
-        _initData.properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
-        return initData;
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this, false);
+        }
     }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
-    }
-
-    private com.zeroc.Ice.InitializationData _initData;
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/InitialI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/InitialI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new InitialI(adapter);
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Default.SlicedFormat", "1");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
+        properties.setProperty("Ice.Default.SlicedFormat", "1");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object object = new InitialI(adapter);
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/classLoader/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/classLoader/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
@@ -39,13 +34,13 @@
         }
     }
 
-    public static TestIntfPrx allTests(test.Util.Application app)
+    public static TestIntfPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(ref);
         test(obj != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
 import test.Ice.custom.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        TestIntfPrx test = AllTests.allTests(this);
-        test.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom");
-        initData.properties.setProperty("Ice.CacheMessageBuffers", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.custom");
+        properties.setProperty("Ice.CacheMessageBuffers", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object test = new TestI(communicator);
-        adapter.add(test, com.zeroc.Ice.Util.stringToIdentity("test"));
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.CacheMessageBuffers", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.custom");
+        properties.setProperty("Ice.CacheMessageBuffers", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object test = new TestI(communicator);
+            adapter.add(test, com.zeroc.Ice.Util.stringToIdentity("test"));
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object test = new TestI(communicator);
-        adapter.add(test, com.zeroc.Ice.Util.stringToIdentity("test"));
-
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.CacheMessageBuffers", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.custom");
+        properties.setProperty("Ice.CacheMessageBuffers", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object test = new TestI(communicator);
+            adapter.add(test, com.zeroc.Ice.Util.stringToIdentity("test"));
+
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/custom/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/custom/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultServant;
 
@@ -22,10 +17,10 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         com.zeroc.Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost");
         oa.activate();
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultServant;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        try(com.zeroc.Ice.Communicator communicator = initialize(args))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/MyObjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultServant;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultServant/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultServant/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultValue/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultValue/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultValue/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultValue/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultValue;
 
@@ -22,9 +17,9 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing default values... ");
         out.flush();
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultValue/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultValue/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultValue/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultValue/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultValue;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        try(com.zeroc.Ice.Communicator communicator = initialize(args))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
@@ -24,6 +19,7 @@
         Callback()
         {
             _called = false;
+            _exception = null;
         }
 
         public synchronized void check()
@@ -38,10 +34,28 @@
                 {
                 }
             }
-
+            if(_exception != null)
+            {
+                throw _exception;
+            }
             _called = false;
         }
 
+        public synchronized void exception(Throwable ex)
+        {
+            assert(!_called);
+            _called = true;
+            if(ex instanceof RuntimeException)
+            {
+                _exception = (RuntimeException)ex;
+            }
+            else
+            {
+                _exception = new RuntimeException(ex);
+            }
+            notify();
+        }
+
         public synchronized void called()
         {
             assert(!_called);
@@ -50,6 +64,7 @@
         }
 
         private boolean _called;
+        private RuntimeException _exception;
     }
 
     private static void test(boolean b)
@@ -60,24 +75,25 @@
         }
     }
 
-    public static void allTests(test.Util.Application app, final Dispatcher dispatcher)
+    public static void allTests(test.TestHelper helper, final Dispatcher dispatcher)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "test:" + app.getTestEndpoint(0);
+        String sref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         int mult = 1;
-        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp"))
+        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp") ||
+           helper.isAndroid())
         {
             mult = 4;
         }
 
         TestIntfPrx p = TestIntfPrx.uncheckedCast(obj);
 
-        sref = "testController:" + app.getTestEndpoint(1, "tcp");
+        sref = "testController:" + helper.getTestEndpoint(1, "tcp");
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -94,8 +110,7 @@
                     {
                         if(ex != null)
                         {
-                            ex.printStackTrace();
-                            test(false);
+                            cb.exception(ex);
                         }
                         else
                         {
@@ -112,8 +127,7 @@
                     {
                         if(ex != null)
                         {
-                            ex.printStackTrace();
-                            test(false);
+                            cb.exception(ex);
                         }
                         else
                         {
@@ -137,7 +151,7 @@
                         }
                         else
                         {
-                            test(false);
+                            cb.exception(new RuntimeException());
                         }
                     }, dispatcher);
                 cb.check();
@@ -156,7 +170,7 @@
                         }
                         else
                         {
-                            test(false);
+                            cb.exception(new RuntimeException());
                         }
                     }, p.ice_executor());
                 cb.check();
@@ -166,7 +180,7 @@
                 //
                 // Expect InvocationTimeoutException.
                 //
-                TestIntfPrx to = p.ice_invocationTimeout(250);
+                TestIntfPrx to = p.ice_invocationTimeout(10);
                 final Callback cb = new Callback();
                 CompletableFuture<Void> r = to.sleepAsync(500 * mult);
                 r.whenCompleteAsync((result, ex) ->
@@ -179,7 +193,7 @@
                         }
                         else
                         {
-                            test(false);
+                            cb.exception(new RuntimeException());
                         }
                     }, dispatcher);
                 com.zeroc.Ice.Util.getInvocationFuture(r).whenSentAsync((sentSynchronously, ex) ->
@@ -194,7 +208,7 @@
                 //
                 // Expect InvocationTimeoutException.
                 //
-                TestIntfPrx to = p.ice_invocationTimeout(250);
+                TestIntfPrx to = p.ice_invocationTimeout(10);
                 final Callback cb = new Callback();
                 CompletableFuture<Void> r = to.sleepAsync(500 * mult);
                 r.whenCompleteAsync((result, ex) ->
@@ -207,7 +221,7 @@
                         }
                         else
                         {
-                            test(false);
+                            cb.exception(new RuntimeException());
                         }
                     }, dispatcher);
                 com.zeroc.Ice.Util.getInvocationFuture(r).whenSentAsync((sentSynchronously, ex) ->
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this, _dispatcher);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        assert(_dispatcher == null);
-        _dispatcher = new Dispatcher();
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
 
+        Dispatcher dispatcher = new Dispatcher();
         //
         // Limit the send buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
         initData.properties.setProperty("Ice.TCP.SndSize", "50000");
 
-        initData.dispatcher = _dispatcher;
-        return initData;
+        initData.dispatcher = dispatcher;
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            AllTests.allTests(this, dispatcher);
+        }
+        dispatcher.terminate();
     }
-
-    Dispatcher getDispatcher()
-    {
-        return _dispatcher;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        app.getDispatcher().terminate();
-        System.gc();
-        System.exit(result);
-    }
-
-    //
-    // The Dispatcher class uses a static "_instance" member in other language
-    // mappings. In Java, we avoid the use of static members because we need to
-    // maintain support for Android (in which the client and server run in the
-    // same process).
-    //
-    private Dispatcher _dispatcher;
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        assert(_dispatcher != null);
-        adapter.add(new TestI(_dispatcher), com.zeroc.Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-        adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this, _dispatcher);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        assert(_dispatcher == null);
-        _dispatcher = new Dispatcher();
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        Dispatcher dispatcher = new Dispatcher();
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 1, "tcp"));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-        initData.dispatcher = _dispatcher;
-        return initData;
+        initData.dispatcher = dispatcher;
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+            adapter.add(new TestI(dispatcher), com.zeroc.Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+            adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
+            //adapter2.activate(); // Don't activate OA to ensure collocation is used.
+
+            AllTests.allTests(this, dispatcher);
+        }
+        dispatcher.terminate();
     }
-
-    Dispatcher getDispatcher()
-    {
-        return _dispatcher;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        app.getDispatcher().terminate();
-        System.gc();
-        System.exit(result);
-    }
-
-    //
-    // The Dispatcher class uses a static "_instance" member in other language
-    // mappings. In Java, we avoid the use of static members because we need to
-    // maintain support for Android (in which the client and server run in the
-    // same process).
-    //
-    private Dispatcher _dispatcher;
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Dispatcher.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
@@ -66,6 +61,7 @@
                 catch(Exception ex)
                 {
                     // Exceptions should never propagate here.
+                    ex.printStackTrace();
                     test(false);
                 }
             }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,73 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        assert(_dispatcher != null);
-        adapter.add(new TestI(_dispatcher), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        assert(_dispatcher == null);
-        _dispatcher = new Dispatcher();
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        Dispatcher dispatcher = new Dispatcher();
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 1, "tcp"));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
         initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        initData.dispatcher = _dispatcher;
-        return initData;
-    }
-
-    public void terminate()
-    {
-        if(_dispatcher != null)
+        initData.dispatcher = dispatcher;
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
         {
-            _dispatcher.terminate();
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
+
+            adapter.add(new TestI(dispatcher), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            adapter2.add(new TestControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("testController"));
+            adapter2.activate();
+            serverReady();
+            communicator.waitForShutdown();
         }
+        dispatcher.terminate();
     }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        app.terminate();
-        System.gc();
-        System.exit(result);
-    }
-
-    //
-    // The Dispatcher class uses a static "_instance" member in other language
-    // mappings. In Java, we avoid the use of static members because we need to
-    // maintain support for Android (in which the client and server run in the
-    // same process).
-    //
-    private Dispatcher _dispatcher;
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/TestControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/dispatcher/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/dispatcher/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/echo/BlobjectI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/echo/BlobjectI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/echo/BlobjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/echo/BlobjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.echo;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/echo/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/echo/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/echo/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/echo/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.echo;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     class EchoI implements test.Ice.echo.Test.Echo
     {
@@ -39,32 +34,19 @@
         final private BlobjectI _blob;
     }
 
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        BlobjectI blob = new BlobjectI();
-        adapter.addDefaultServant(blob, "");
-        adapter.add(new EchoI(blob), com.zeroc.Ice.Util.stringToIdentity("__echo"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.echo");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.echo");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            BlobjectI blob = new BlobjectI();
+            adapter.addDefaultServant(blob, "");
+            adapter.add(new EchoI(blob), com.zeroc.Ice.Util.stringToIdentity("__echo"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/echo/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/echo/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/echo/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/echo/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
@@ -22,11 +17,11 @@
         }
     }
 
-    public static TestIntfPrx allTests(test.Util.Application app)
+    public static TestIntfPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
-        String ref = "test:" + app.getTestEndpoint(0);
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        String ref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(ref);
         test(obj != null);
         TestIntfPrx proxy = TestIntfPrx.checkedCast(obj);
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
 import test.Ice.enums.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        TestIntfPrx test = AllTests.allTests(this);
-        test.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.enums");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.enums");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object test = new TestIntfI();
-        adapter.add(test, com.zeroc.Ice.Util.stringToIdentity("test"));
-
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.enums");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.enums");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object test = new TestIntfI();
+            adapter.add(test, com.zeroc.Ice.Util.stringToIdentity("test"));
+
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/TestIntfI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/TestIntfI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/enums/TestIntfI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/enums/TestIntfI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
@@ -29,11 +24,11 @@
         }
     }
 
-    public static ThrowerPrx allTests(test.Util.Application app)
+    public static ThrowerPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
         {
             out.print("testing object adapter registration exceptions... ");
@@ -154,7 +149,7 @@
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "thrower:" + app.getTestEndpoint(0);
+        String ref = "thrower:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -458,7 +453,7 @@
             try
             {
                 ThrowerPrx thrower2 = ThrowerPrx.uncheckedCast(communicator.stringToProxy("thrower:" +
-                                                                                          app.getTestEndpoint(1)));
+                                                                                          helper.getTestEndpoint(1)));
                 try
                 {
                     thrower2.throwMemoryLimitException(new byte[2 * 1024 * 1024]); // 2MB (no limits)
@@ -467,7 +462,7 @@
                 {
                 }
                 ThrowerPrx thrower3 = ThrowerPrx.uncheckedCast(communicator.stringToProxy("thrower:" +
-                                                                                          app.getTestEndpoint(2)));
+                                                                                          helper.getTestEndpoint(2)));
                 try
                 {
                     thrower3.throwMemoryLimitException(new byte[1024]); // 1KB limit
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
-        com.zeroc.Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
-        com.zeroc.Ice.Object object = new AMDThrowerI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
-        adapter2.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
-        adapter3.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
-        adapter.activate();
-        adapter2.activate();
-        adapter3.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
 
         //
         // For this test, we need a dummy logger, otherwise the
@@ -39,24 +16,31 @@
         //
         initData.logger = new DummyLogger();
 
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0");
-        initData.properties.setProperty("TestAdapter3.Endpoints", getTestEndpoint(initData.properties, 2));
-        initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0");
+            communicator.getProperties().setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
+            communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+            com.zeroc.Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
+            com.zeroc.Ice.Object object = new AMDThrowerI();
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
+            adapter2.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
+            adapter3.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
+            adapter.activate();
+            adapter2.activate();
+            adapter3.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
 import test.Ice.exceptions.Test.ThrowerPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        ThrowerPrx thrower = AllTests.allTests(this);
-        thrower.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            ThrowerPrx thrower = AllTests.allTests(this);
+            thrower.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new ThrowerI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
         //
         // For this test, we need a dummy logger, otherwise the
         // assertion test will print an error message.
         //
         initData.logger = new DummyLogger();
 
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
         initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object object = new ThrowerI();
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/EmptyI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/EmptyI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/EmptyI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/EmptyI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,61 +1,44 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
-        com.zeroc.Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
-        com.zeroc.Ice.Object object = new ThrowerI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
-        adapter2.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
-        adapter3.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
-        adapter.activate();
-        adapter2.activate();
-        adapter3.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
         //
         // For this test, we need a dummy logger, otherwise the
         // assertion test will print an error message.
         //
         initData.logger = new DummyLogger();
-
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0");
-        initData.properties.setProperty("TestAdapter3.Endpoints", getTestEndpoint(initData.properties, 2));
-        initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0");
+            communicator.getProperties().setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
+            communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+            com.zeroc.Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
+            com.zeroc.Ice.Object object = new ThrowerI();
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
+            adapter2.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
+            adapter3.add(object, com.zeroc.Ice.Util.stringToIdentity("thrower"));
+            adapter.activate();
+            adapter2.activate();
+            adapter3.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/ThrowerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/AI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/AI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/AI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/AI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
@@ -28,10 +23,10 @@
         }
     }
 
-    public static GPrx allTests(test.Util.Application app)
+    public static GPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing Ice.Admin.Facets property... ");
         test(communicator.getProperties().getPropertyAsList("Ice.Admin.Facets").length == 0);
         communicator.getProperties().setProperty("Ice.Admin.Facets", "foobar");
@@ -112,7 +107,7 @@
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "d:" + app.getTestEndpoint(0);
+        String ref = "d:" + helper.getTestEndpoint(0);
         ObjectPrx db = communicator.stringToProxy(ref);
         test(db != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/BI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/BI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/BI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/BI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/CI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/CI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/CI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/CI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
 import test.Ice.facets.Test.GPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        GPrx g = AllTests.allTests(this);
-        g.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.facets");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            GPrx g = AllTests.allTests(this);
+            g.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object d = new DI();
-        adapter.add(d, com.zeroc.Ice.Util.stringToIdentity("d"));
-        adapter.addFacet(d, com.zeroc.Ice.Util.stringToIdentity("d"), "facetABCD");
-        com.zeroc.Ice.Object f = new FI();
-        adapter.addFacet(f, com.zeroc.Ice.Util.stringToIdentity("d"), "facetEF");
-        com.zeroc.Ice.Object h = new HI(communicator);
-        adapter.addFacet(h, com.zeroc.Ice.Util.stringToIdentity("d"), "facetGH");
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
-        return initData;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.facets");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object d = new DI();
+            adapter.add(d, com.zeroc.Ice.Util.stringToIdentity("d"));
+            adapter.addFacet(d, com.zeroc.Ice.Util.stringToIdentity("d"), "facetABCD");
+            com.zeroc.Ice.Object f = new FI();
+            adapter.addFacet(f, com.zeroc.Ice.Util.stringToIdentity("d"), "facetEF");
+            com.zeroc.Ice.Object h = new HI(communicator);
+            adapter.addFacet(h, com.zeroc.Ice.Util.stringToIdentity("d"), "facetGH");
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/DI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/DI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/DI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/DI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/EI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/EI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/EI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/EI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/EmptyI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/EmptyI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/EmptyI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/EmptyI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/FI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/FI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/FI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/FI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/GI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/GI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/GI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/GI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/HI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/HI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/HI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/HI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object d = new DI();
-        adapter.add(d, com.zeroc.Ice.Util.stringToIdentity("d"));
-        adapter.addFacet(d, com.zeroc.Ice.Util.stringToIdentity("d"), "facetABCD");
-        com.zeroc.Ice.Object f = new FI();
-        adapter.addFacet(f, com.zeroc.Ice.Util.stringToIdentity("d"), "facetEF");
-        com.zeroc.Ice.Object h = new HI(communicator);
-        adapter.addFacet(h, com.zeroc.Ice.Util.stringToIdentity("d"), "facetGH");
-
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.facets");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object d = new DI();
+            adapter.add(d, com.zeroc.Ice.Util.stringToIdentity("d"));
+            adapter.addFacet(d, com.zeroc.Ice.Util.stringToIdentity("d"), "facetABCD");
+            com.zeroc.Ice.Object f = new FI();
+            adapter.addFacet(f, com.zeroc.Ice.Util.stringToIdentity("d"), "facetEF");
+            com.zeroc.Ice.Object h = new HI(communicator);
+            adapter.addFacet(h, com.zeroc.Ice.Util.stringToIdentity("d"), "facetGH");
+
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
@@ -97,17 +92,17 @@
         }
     }
 
-    public static void allTests(test.Util.Application app, int[] ports)
+    public static void allTests(test.TestHelper helper, int[] ports)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
         String ref = "test";
         for(int port : ports)
         {
-            ref += ":" + app.getTestEndpoint(port);
+            ref += ":" + helper.getTestEndpoint(port);
         }
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
 import java.io.PrintWriter;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     private static void
     usage()
@@ -19,83 +14,42 @@
         System.err.println("Usage: Client port...");
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        PrintWriter out = getWriter();
+        java.util.List<String> remainingArgs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, remainingArgs);
+        properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
+        //
+        // This test aborts servers, so we don't want warnings.
+        //
+        properties.setProperty("Ice.Warn.Connections", "0");
 
-        java.util.List<Integer> ports = new java.util.ArrayList<>(args.length);
-        for(String arg : args)
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            if(arg.charAt(0) == '-')
+            PrintWriter out = getWriter();
+            java.util.List<Integer> ports = new java.util.ArrayList<>(args.length);
+            for(String arg : remainingArgs)
             {
-                //
-                // TODO: Arguments recognized by the communicator are not
-                // removed from the argument list.
-                //
-                //System.err.println("Client: unknown option `" + arg + "'");
-                //usage();
-                //return 1;
-                continue;
+                if(arg.charAt(0) == '-')
+                {
+                    usage();
+                    throw new IllegalArgumentException("Client: unknown option `" + arg + "'");
+                }
+                ports.add(Integer.parseInt(arg));
             }
 
-            int port = 0;
-            try
+            if(ports.isEmpty())
             {
-                port = Integer.parseInt(arg);
+                usage();
+                throw new RuntimeException("Client: no ports specified");
             }
-            catch(NumberFormatException ex)
+
+            int[] arr = new int[ports.size()];
+            for(int i = 0; i < arr.length; i++)
             {
-                ex.printStackTrace();
-                return 1;
+                arr[i] = ports.get(i).intValue();
             }
-            ports.add(port);
-        }
-
-        if(ports.isEmpty())
-        {
-            out.println("Client: no ports specified");
-            usage();
-            return 1;
-        }
-
-        int[] arr = new int[ports.size()];
-        for(int i = 0; i < arr.length; i++)
-        {
-            arr[i] = ports.get(i).intValue();
-        }
-
-        try
-        {
             AllTests.allTests(this, arr);
         }
-        catch(com.zeroc.Ice.LocalException ex)
-        {
-            ex.printStackTrace();
-            AllTests.test(false);
-        }
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
-        //
-        // This test aborts servers, so we don't want warnings.
-        //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
 import java.io.PrintWriter;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     private static void
     usage()
@@ -19,71 +14,44 @@
         System.err.println("Usage: Server port");
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        int port = 0;
-        PrintWriter out = getWriter();
-        for(String arg : args)
+        java.util.List<String> remainingArgs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, remainingArgs);
+        properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
+        properties.setProperty("Ice.ServerIdleTime", "120");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            if(arg.charAt(0) == '-')
-            {
-                out.println("Server: unknown option `" + arg + "'");
-                usage();
-                return 1;
-            }
-
-            if(port > 0)
+            int port = 0;
+            PrintWriter out = getWriter();
+            for(String arg : remainingArgs)
             {
-                out.println("Server: only one port can be specified");
-                usage();
-                return 1;
-            }
+                if(arg.charAt(0) == '-')
+                {
+                    throw new RuntimeException("Server: unknown option `" + arg + "'");
+                }
+
+                if(port > 0)
+                {
+                    throw new RuntimeException("Server: only one port can be specified");
+                }
 
-            try
-            {
                 port = Integer.parseInt(arg);
             }
-            catch(NumberFormatException ex)
+
+            if(port <= 0)
             {
-                out.println("Server: invalid port");
-                usage();
-                return 1;
+                throw new RuntimeException("Server: no port specified");
             }
-        }
 
-        if(port <= 0)
-        {
-            out.println("Server: no port specified");
-            usage();
-            return 1;
+            // Don't move this, it needs the port.
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(port));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object object = new TestI(port);
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
         }
-
-        // Don't move this, it needs the port.
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(port));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new TestI(port);
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
-        // Two minutes.
-        initData.properties.setProperty("Ice.ServerIdleTime", "120");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/faultTolerance/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/faultTolerance/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hash/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hash/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hash/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hash/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hash;
 
@@ -18,31 +13,14 @@
 import com.zeroc.Ice.ProxyIdentityKey;
 import com.zeroc.Ice.ProxyIdentityFacetKey;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
-    }
-
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         PrintWriter out = getWriter();
-        int status = 0;
-        try
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Plugin.IceSSL", "com.zeroc.IceSSL.PluginFactory");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
             java.util.Map<Integer, ObjectPrx> seenProxy = new java.util.HashMap<>();
             java.util.Map<Integer, Endpoint> seenEndpoint = new java.util.HashMap<>();
@@ -52,11 +30,6 @@
             int maxCollisions = 10;
             int maxIterations = 10000;
 
-            com.zeroc.Ice.InitializationData initData = createInitializationData();
-            initData.properties = com.zeroc.Ice.Util.createProperties(args);
-            initData.properties.setProperty("Ice.Plugin.IceSSL", "com.zeroc.IceSSL.PluginFactory");
-            com.zeroc.Ice.Communicator communicator = com.zeroc.Ice.Util.initialize(args, initData);
-
             out.print("testing proxy & endpoint hash algorithm collisions... ");
             out.flush();
             {
@@ -435,17 +408,6 @@
                 test(structCollisions < maxCollisions);
             }
             out.println("ok");
-
-            if(communicator != null)
-            {
-                communicator.destroy();
-            }
-        }
-        catch(Exception ex)
-        {
-            System.out.println(ex.toString());
-            status = 1;
         }
-        return status;
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hash/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hash/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hash/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hash/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
@@ -66,16 +61,16 @@
         private int _expected;
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "hold:" + app.getTestEndpoint(0);
+        String ref = "hold:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
-        String refSerialized = "hold:" + app.getTestEndpoint(1);
+        String refSerialized = "hold:" + helper.getTestEndpoint(1);
         com.zeroc.Ice.ObjectPrx baseSerialized = communicator.stringToProxy(refSerialized);
         test(baseSerialized != null);
         out.println("ok");
@@ -194,7 +189,7 @@
             holdSerialized.set(value, 0);
             CompletableFuture<Void> r = null;
             InvocationFuture<Void> f = null;
-            int max = app.isAndroid() ? 5000 : 10000;
+            int max = helper.isAndroid() ? 5000 : 10000;
             for(int i = 0; i < max; ++i)
             {
                 // Create a new proxy for each request
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.hold");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/HoldI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/HoldI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/HoldI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/HoldI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,63 +1,44 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        java.util.Timer timer = new java.util.Timer();
-
-        com.zeroc.Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1");
-        adapter1.add(new HoldI(timer, adapter1), com.zeroc.Ice.Util.stringToIdentity("hold"));
-
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
-        adapter2.add(new HoldI(timer, adapter2), com.zeroc.Ice.Util.stringToIdentity("hold"));
-
-        adapter1.activate();
-        adapter2.activate();
-
-        serverReady();
-        communicator.waitForShutdown();
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.hold");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter1.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Size", "5");
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Serialize", "0");
+
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Size", "5");
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Serialize", "1");
+
+            java.util.Timer timer = new java.util.Timer();
+
+            com.zeroc.Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1");
+            adapter1.add(new HoldI(timer, adapter1), com.zeroc.Ice.Util.stringToIdentity("hold"));
+
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+            adapter2.add(new HoldI(timer, adapter2), com.zeroc.Ice.Util.stringToIdentity("hold"));
 
-        timer.cancel();
+            adapter1.activate();
+            adapter2.activate();
 
-        return 0;
-    }
+            serverReady();
+            communicator.waitForShutdown();
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold");
-        initData.properties.setProperty("TestAdapter1.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("TestAdapter1.ThreadPool.Size", "5");
-        initData.properties.setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
-        initData.properties.setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
-        initData.properties.setProperty("TestAdapter1.ThreadPool.Serialize", "0");
-
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.ThreadPool.Size", "5");
-        initData.properties.setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
-        initData.properties.setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
-        initData.properties.setProperty("TestAdapter2.ThreadPool.Serialize", "1");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+            timer.cancel();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/hold/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/hold/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.impl;
 
 import test.Ice.impl.AMD.Test.MyDerivedClassI;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.impl.AMD");
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.impl.AMD");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
-
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.impl;
+
 import test.Ice.impl.Test.MyDerivedClassI;
-public class Server extends test.Util.Application
-{
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+public class Server extends test.TestHelper
+{
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.impl");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.impl");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/impl/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/impl/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 
@@ -64,10 +59,10 @@
         return null;
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing proxy endpoint information... ");
         out.flush();
         {
@@ -145,7 +140,7 @@
 
             adapter.destroy();
 
-            int port = app.getTestPort(1);
+            int port = helper.getTestPort(1);
             communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -h * -p " + port);
             communicator.getProperties().setProperty("TestAdapter.PublishedEndpoints", "tcp -h dummy -p " + port);
             adapter = communicator.createObjectAdapter("TestAdapter");
@@ -170,11 +165,11 @@
         out.println("ok");
 
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy("test:" +
-                                                                  app.getTestEndpoint(0) + ":" +
-                                                                  app.getTestEndpoint(0, "udp"));
+                                                                  helper.getTestEndpoint(0) + ":" +
+                                                                  helper.getTestEndpoint(0, "udp"));
         TestIntfPrx testIntf = TestIntfPrx.checkedCast(base);
 
-        int endpointPort = app.getTestPort(0);
+        int endpointPort = helper.getTestPort(0);
 
         final String defaultHost = communicator.getProperties().getProperty("Ice.Default.Host");
         out.print("test connection endpoint information... ");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.info");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.info");
+        try(com.zeroc.Ice.Communicator communicator = initialize(args))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        initData.properties.setProperty("TestAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 0) + ":" +
-                                          getTestEndpoint(initData.properties, 0, "udp"));
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints",
+                                   getTestEndpoint(0) + ":" + getTestEndpoint(0, "udp"));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/info/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/info/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
@@ -31,13 +26,13 @@
         }
     }
 
-    public static InitialPrx allTests(test.Util.Application app)
+    public static InitialPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CAI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CAI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CAI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CAI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CBI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CBI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CBI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CBI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CCI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CCI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CCI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CCI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CDI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CDI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/CDI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/CDI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
 import test.Ice.inheritance.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
     @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new InitialI(adapter);
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new InitialI(adapter), com.zeroc.Ice.Util.stringToIdentity("initial"));
+            AllTests.allTests(this);
+        }
     }
-
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/IAI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/IAI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/IAI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/IAI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/IB1I.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/IB1I.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/IB1I.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/IB1I.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/IB2I.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/IB2I.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/IB2I.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/IB2I.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/ICI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/ICI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/ICI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/ICI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/InitialI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/InitialI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new InitialI(adapter);
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object object = new InitialI(adapter);
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
@@ -14,17 +9,9 @@
 import test.Ice.interceptor.Test.InvalidInputException;
 import test.Ice.interceptor.Test.MyObjectPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    private int run(MyObjectPrx prx, InterceptorI interceptor)
+    private void runTest(MyObjectPrx prx, InterceptorI interceptor)
     {
         PrintWriter out = getWriter();
         out.print("testing simple interceptor... ");
@@ -102,11 +89,9 @@
         test(interceptor.getLastOperation().equals("badSystemAdd"));
         test(!interceptor.getLastStatus());
         out.println("ok");
-
-        return 0;
     }
 
-    private int runAmd(MyObjectPrx prx, InterceptorI interceptor, PrintWriter out)
+    private void runAmdTest(MyObjectPrx prx, InterceptorI interceptor, PrintWriter out)
     {
         out.print("testing simple interceptor... ");
         out.flush();
@@ -174,72 +159,42 @@
         test(interceptor.getLastOperation().equals("amdBadSystemAdd"));
         test(interceptor.getLastStatus());
         out.println("ok");
-        return 0;
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        //
-        // Create OA and servants
-        //
-        communicator().getProperties().setProperty("MyOA.AdapterId", "myOA");
-
-        com.zeroc.Ice.ObjectAdapter oa = communicator().createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
-
-        com.zeroc.Ice.Object servant = new MyObjectI();
-        InterceptorI interceptor = new InterceptorI(servant);
-
-        MyObjectPrx prx = MyObjectPrx.uncheckedCast(oa.addWithUUID(interceptor));
-
-        PrintWriter out = getWriter();
-        out.println("Collocation optimization on");
-        int rs = run(prx, interceptor);
-        if(rs != 0)
-        {
-            return rs;
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interceptor");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            //
+            // Create OA and servants
+            //
+            communicator.getProperties().setProperty("MyOA.AdapterId", "myOA");
+
+            com.zeroc.Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
+
+            com.zeroc.Ice.Object servant = new MyObjectI();
+            InterceptorI interceptor = new InterceptorI(servant);
+
+            MyObjectPrx prx = MyObjectPrx.uncheckedCast(oa.addWithUUID(interceptor));
+
+            PrintWriter out = getWriter();
+            out.println("Collocation optimization on");
+            runTest(prx, interceptor);
+            out.println("Now with AMD");
+            interceptor.clear();
+            runAmdTest(prx, interceptor, out);
+            oa.activate(); // Only necessary for non-collocation optimized tests
+
+            out.println("Collocation optimization off");
+            interceptor.clear();
+            prx = MyObjectPrx.uncheckedCast(prx.ice_collocationOptimized(false));
+            runTest(prx, interceptor);
+            out.println("Now with AMD");
+            interceptor.clear();
+            runAmdTest(prx, interceptor, out);
         }
-
-        out.println("Now with AMD");
-        interceptor.clear();
-        rs = runAmd(prx, interceptor, out);
-        if(rs != 0)
-        {
-            return rs;
-        }
-
-        oa.activate(); // Only necessary for non-collocation optimized tests
-
-        out.println("Collocation optimization off");
-        interceptor.clear();
-        prx = MyObjectPrx.uncheckedCast(prx.ice_collocationOptimized(false));
-        rs = run(prx, interceptor);
-        if(rs != 0)
-        {
-            return rs;
-        }
-
-        out.println("Now with AMD");
-        interceptor.clear();
-        rs = runAmd(prx, interceptor, out);
-
-        return rs;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interceptor");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int status = app.main("Interceptor", args);
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/InterceptorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/MyObjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/MySystemException.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/MySystemException.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/MySystemException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/MySystemException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interceptor/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interceptor/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
@@ -82,18 +77,18 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
         throws InterruptedException
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
-        String sref = "test:" + app.getTestEndpoint(0);
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        String sref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         final TestIntfPrx p = TestIntfPrx.uncheckedCast(obj);
 
-        sref = "testController:" + app.getTestEndpoint(1);
+        sref = "testController:" + helper.getTestEndpoint(1);
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -519,9 +514,9 @@
             //
             // Check that CommunicatorDestroyedException is raised directly.
             //
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
+            com.zeroc.Ice.Communicator ic = helper.initialize(initData);
 
             Thread.currentThread().interrupt();
             try
@@ -537,7 +532,7 @@
 
             ExecutorService executor = java.util.concurrent.Executors.newFixedThreadPool(2);
 
-            ic = app.initialize(initData);
+            ic = helper.initialize(initData);
             com.zeroc.Ice.ObjectPrx o = ic.stringToProxy(p.toString());
 
             final Thread[] thread = new Thread[1];
@@ -641,10 +636,10 @@
         {
             final Thread mainThread = Thread.currentThread();
             ExecutorService executor = java.util.concurrent.Executors.newFixedThreadPool(1);
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("ClientTestAdapter.Endpoints", "tcp -h *");
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
+            com.zeroc.Ice.Communicator ic = helper.initialize(initData);
             final com.zeroc.Ice.ObjectAdapter adapter = ic.createObjectAdapter("ClientTestAdapter");
             adapter.activate();
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,64 +1,43 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        try
-        {
-            AllTests.allTests(this);
-        }
-        catch(InterruptedException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException();
-        }
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
         // We need to enable the ThreadInterruptSafe property so that Ice is
         // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
+        properties.setProperty("Ice.ThreadInterruptSafe", "1");
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+        properties.setProperty("Ice.MessageSizeMax", "20000");
         //
-        // Retry up to 2 times, sleep 1s for the last retry. This is
+        // Retry up to 2 times, sleep 2s for the last retry. This is
         // useful to test interrupting the retry sleep
         //
-        initData.properties.setProperty("Ice.RetryIntervals", "0 1000");
+        properties.setProperty("Ice.RetryIntervals", "0 2000");
         //
         // Limit the send buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-        return initData;
-    }
+        properties.setProperty("Ice.TCP.SndSize", "50000");
 
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
+        catch(InterruptedException ex)
+        {
+            throw new RuntimeException(ex);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,74 +1,49 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-        TestControllerI controller = new TestControllerI(adapter);
-        adapter.add(new TestI(controller), com.zeroc.Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-        adapter2.add(controller, com.zeroc.Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Don't activate OA to ensure collocation is used.
-
-        try
-        {
-            AllTests.allTests(this);
-        }
-        catch(InterruptedException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException();
-        }
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
         // We need to enable the ThreadInterruptSafe property so that Ice is
         // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
+        properties.setProperty("Ice.ThreadInterruptSafe", "1");
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+        properties.setProperty("Ice.MessageSizeMax", "20000");
         //
         // opIdempotent raises UnknownException, we disable dispatch
         // warnings to prevent warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
 
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
-
-        System.gc();
-        System.exit(status);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
+            TestControllerI controller = new TestControllerI(adapter);
+            adapter.add(new TestI(controller), com.zeroc.Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+            adapter2.add(controller, com.zeroc.Ice.Util.stringToIdentity("testController"));
+            //adapter2.activate(); // Don't activate OA to ensure collocation is used.
+            AllTests.allTests(this);
+        }
+        catch(InterruptedException ex)
+        {
+            throw new RuntimeException(ex);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,69 +1,51 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        TestControllerI controller = new TestControllerI(adapter);
-        adapter.add(new TestI(controller), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        adapter2.add(controller, com.zeroc.Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
         // We need to enable the ThreadInterruptSafe property so that Ice is
         // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
+        properties.setProperty("Ice.ThreadInterruptSafe", "1");
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+        properties.setProperty("Ice.MessageSizeMax", "20000");
         //
         // opIdempotent raises UnknownException, we disable dispatch
         // warnings to prevent warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+            TestControllerI controller = new TestControllerI(adapter);
+            adapter.add(new TestI(controller), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            adapter2.add(controller, com.zeroc.Ice.Util.stringToIdentity("testController"));
+            adapter2.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/TestControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/interrupt/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/interrupt/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
@@ -31,11 +26,11 @@
         }
     }
 
-    public static MyClassPrx allTests(test.Util.Application app)
+    public static MyClassPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
-        String ref = "test:" + app.getTestEndpoint(0);
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        String ref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrx.checkedCast(base);
         MyClassPrx oneway = cl.ice_oneway();
@@ -43,7 +38,6 @@
 
         out.print("testing ice_invoke... ");
         out.flush();
-
         {
             com.zeroc.Ice.Object.Ice_invokeResult r;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/BlobjectI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/BlobjectI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/BlobjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/BlobjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
 import test.Ice.invoke.Test.MyClassPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        MyClassPrx myClass = AllTests.allTests(this);
-
-        myClass.shutdown();
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            MyClassPrx myClass = AllTests.allTests(this);
+            myClass.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
-public class Server extends test.Util.Application
+import java.util.stream.Stream;
+
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        boolean async = false;
-        for(int i = 0; i < args.length; ++i)
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            if(args[i].equals("--async"))
-            {
-               async = true;
-            }
+            boolean async = Stream.of(args).anyMatch(v -> v.equals("--async"));
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI(async), "");
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
         }
-
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI(async), "");
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/invoke/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/invoke/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
@@ -20,7 +15,6 @@
 import test.Ice.location.Test.TestIntfPrx;
 import test.Ice.location.Test.TestLocatorPrx;
 import test.Ice.location.Test.TestLocatorRegistryPrx;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -33,14 +27,14 @@
     }
 
     public static void
-    allTests(Application app)
+    allTests(test.TestHelper helper)
         throws com.zeroc.Ice.AdapterAlreadyActiveException, com.zeroc.Ice.AdapterNotFoundException, InterruptedException
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         ServerManagerPrx manager = ServerManagerPrx.checkedCast(
-                                        communicator.stringToProxy("ServerManager:" + app.getTestEndpoint(0)));
+            communicator.stringToProxy("ServerManager:" + helper.getTestEndpoint(0)));
         test(manager != null);
 
         TestLocatorPrx locator = TestLocatorPrx.uncheckedCast(communicator.getDefaultLocator());
@@ -266,24 +260,24 @@
 
         out.print("testing locator cache timeout... ");
         out.flush();
-
+        com.zeroc.Ice.ObjectPrx basencc = communicator.stringToProxy("test@TestAdapter").ice_connectionCached(false);
         int count = locator.getRequestCount();
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+        basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
         test(++count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+        basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
         test(++count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+        basencc.ice_locatorCacheTimeout(2).ice_ping(); // 2s timeout.
         test(count == locator.getRequestCount());
-        Thread.sleep(1200);
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+        Thread.sleep(1300);
+        basencc.ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
         test(++count == locator.getRequestCount());
 
         communicator.stringToProxy("test").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
         count += 2;
         test(count == locator.getRequestCount());
-        communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
+        communicator.stringToProxy("test").ice_locatorCacheTimeout(2).ice_ping(); // 2s timeout
         test(count == locator.getRequestCount());
-        Thread.sleep(1200);
+        Thread.sleep(1300);
         communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
         count += 2;
         test(count == locator.getRequestCount());
@@ -395,7 +389,8 @@
         try
         {
             communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            registry.setAdapterDirectProxy("TestAdapter3", communicator.stringToProxy("dummy:tcp"));
+            registry.setAdapterDirectProxy("TestAdapter3",
+                                           communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
             communicator.stringToProxy("test@TestAdapter3").ice_ping();
         }
         catch(com.zeroc.Ice.LocalException ex)
@@ -447,7 +442,8 @@
             test(ex.id.equals("TestUnknown"));
         }
         registry.addObject(communicator.stringToProxy("test3@TestAdapter4")); // Update
-        registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:tcp"));
+        registry.setAdapterDirectProxy("TestAdapter4",
+                                       communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
 
         try
         {
@@ -468,7 +464,8 @@
             test(false);
         }
 
-        registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:tcp"));
+        registry.setAdapterDirectProxy("TestAdapter4",
+                                       communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
         try
         {
             communicator.stringToProxy("test3").ice_ping();
@@ -527,56 +524,56 @@
         out.print("testing locator cache background updates... ");
         out.flush();
         {
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
-
-            registry.setAdapterDirectProxy("TestAdapter5", locator.findAdapterById("TestAdapter"));
-            registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
-
-            count = locator.getRequestCount();
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            count += 3;
-            test(count == locator.getRequestCount());
-            registry.setAdapterDirectProxy("TestAdapter5", null);
-            registry.addObject(communicator.stringToProxy("test3:tcp"));
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            test(count == locator.getRequestCount());
-            Thread.sleep(1200);
-
-            // The following request should trigger the background updates but still use the cached endpoints
-            // and therefore succeed.
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-
-            try
+            com.zeroc.Ice.Properties properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
+            try(com.zeroc.Ice.Communicator ic = helper.initialize(properties))
             {
-                while(true)
+                registry.setAdapterDirectProxy("TestAdapter5", locator.findAdapterById("TestAdapter"));
+                registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+
+                count = locator.getRequestCount();
+                ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                count += 3;
+                test(count == locator.getRequestCount());
+                registry.setAdapterDirectProxy("TestAdapter5", null);
+                registry.addObject(communicator.stringToProxy("test3:" + helper.getTestEndpoint(99)));
+                ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                test(count == locator.getRequestCount());
+                Thread.sleep(1200);
+
+                // The following request should trigger the background updates but still use the cached endpoints
+                // and therefore succeed.
+                ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+
+                try
                 {
-                    ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    Thread.sleep(10);
+                    while(true)
+                    {
+                        ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                        Thread.sleep(10);
+                    }
                 }
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                // Expected to fail once they endpoints have been updated in the background.
-            }
-            try
-            {
-                while(true)
+                catch(com.zeroc.Ice.LocalException ex)
                 {
-                    ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    Thread.sleep(10);
+                    // Expected to fail once they endpoints have been updated in the background.
+                }
+
+                try
+                {
+                    while(true)
+                    {
+                        ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                        Thread.sleep(10);
+                    }
+                }
+                catch(com.zeroc.Ice.LocalException ex)
+                {
+                    // Expected to fail once they endpoints have been updated in the background.
                 }
             }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                // Expected to fail once they endpoints have been updated in the background.
-            }
-            ic.destroy();
         }
         out.println("ok");
 
@@ -627,6 +624,7 @@
         catch(com.zeroc.Ice.LocalException ex)
         {
         }
+
         try
         {
             obj3.ice_ping();
@@ -635,6 +633,7 @@
         catch(com.zeroc.Ice.LocalException ex)
         {
         }
+
         try
         {
             obj5.ice_ping();
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        try
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.location");
+        properties.setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(properties, 0));
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
             AllTests.allTests(this);
         }
-        catch(com.zeroc.Ice.AdapterAlreadyActiveException ex)
-        {
-            ex.printStackTrace();
-            throw new RuntimeException();
-        }
-        catch(com.zeroc.Ice.AdapterNotFoundException ex)
+        catch(Exception ex)
         {
-            ex.printStackTrace();
-            throw new RuntimeException();
+            throw new RuntimeException(ex);
         }
-        catch(InterruptedException ex)
-        {
-            ex.printStackTrace();
-            throw new RuntimeException();
-        }
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.location");
-        initData.properties.setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/HelloI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/HelloI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/HelloI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/HelloI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,70 +1,48 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
-public class Server extends test.Util.Application
-{
-    private com.zeroc.Ice.InitializationData _initData;
-
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-
-        //
-        // Register the server manager. The server manager creates a new
-        // 'server' (a server isn't a different process, it's just a new
-        // communicator and object adapter).
-        //
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter");
-
-        //
-        // We also register a sample server locator which implements the
-        // locator interface, this locator is used by the clients and the
-        // 'servers' created with the server manager interface.
-        //
-        ServerLocatorRegistry registry = new ServerLocatorRegistry();
-        registry.addObject(adapter.createProxy(com.zeroc.Ice.Util.stringToIdentity("ServerManager")), null);
-        com.zeroc.Ice.Object object = new ServerManagerI(registry, _initData, this);
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("ServerManager"));
-
-        com.zeroc.Ice.LocatorRegistryPrx registryPrx =
-            com.zeroc.Ice.LocatorRegistryPrx.uncheckedCast(adapter.add(registry,
-                com.zeroc.Ice.Util.stringToIdentity("registry")));
-
-        ServerLocator locator = new ServerLocator(registry, registryPrx);
-        adapter.add(locator, com.zeroc.Ice.Util.stringToIdentity("locator"));
-
-        adapter.activate();
+import com.zeroc.Ice.LocatorRegistryPrx;
 
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.location");
-        initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2");
-        initData.properties.setProperty("Ice.ThreadPool.Server.SizeWarn", "0");
-        initData.properties.setProperty("ServerManagerAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-
-        _initData = initData;
-        return initData;
-    }
-
-    public static void main(String[] args)
+public class Server extends test.TestHelper
+{
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.location");
+        properties.setProperty("Ice.ThreadPool.Server.Size", "2");
+        properties.setProperty("Ice.ThreadPool.Server.SizeWarn", "0");
+
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("ServerManagerAdapter.Endpoints", getTestEndpoint(0));
+
+            //
+            // Register the server manager. The server manager creates a new
+            // 'server' (a server isn't a different process, it's just a new
+            // communicator and object adapter).
+            //
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter");
+
+            //
+            // We also register a sample server locator which implements the
+            // locator interface, this locator is used by the clients and the
+            // 'servers' created with the server manager interface.
+            //
+            ServerLocatorRegistry registry = new ServerLocatorRegistry();
+            registry.addObject(adapter.createProxy(com.zeroc.Ice.Util.stringToIdentity("ServerManager")), null);
+            com.zeroc.Ice.Object object = new ServerManagerI(registry, this);
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("ServerManager"));
+
+            LocatorRegistryPrx registryPrx =
+                LocatorRegistryPrx.uncheckedCast(adapter.add(registry, com.zeroc.Ice.Util.stringToIdentity("registry")));
+
+            adapter.add(new ServerLocator(registry, registryPrx), com.zeroc.Ice.Util.stringToIdentity("locator"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/ServerLocator.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/ServerLocator.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/ServerLocator.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/ServerLocator.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/ServerManagerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/ServerManagerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/ServerManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/ServerManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
@@ -14,17 +9,16 @@
 
 public class ServerManagerI implements ServerManager
 {
-    ServerManagerI(ServerLocatorRegistry registry, com.zeroc.Ice.InitializationData initData, test.Util.Application app)
+    ServerManagerI(ServerLocatorRegistry registry, test.TestHelper helper)
     {
         _registry = registry;
         _communicators = new java.util.ArrayList<com.zeroc.Ice.Communicator>();
 
-        _app = app;
-        _initData = initData;
-
-        _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
-        _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
-        _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
+        _helper = helper;
+        _properties = _helper.communicator().getProperties()._clone();
+        _properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
+        _properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+        _properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
     }
 
     @Override
@@ -45,7 +39,7 @@
         // its endpoints with the locator and create references containing
         // the adapter id instead of the endpoints.
         //
-        com.zeroc.Ice.Communicator serverCommunicator = _app.initialize(_initData);
+        com.zeroc.Ice.Communicator serverCommunicator = _helper.initialize(_properties);
         _communicators.add(serverCommunicator);
 
         //
@@ -60,15 +54,15 @@
             try
             {
                 serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints",
-                                                               _app.getTestEndpoint(_nextPort++));
+                                                               _helper.getTestEndpoint(_nextPort++));
                 serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints",
-                                                               _app.getTestEndpoint(_nextPort++));
+                                                               _helper.getTestEndpoint(_nextPort++));
 
                 adapter = serverCommunicator.createObjectAdapter("TestAdapter");
                 adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2");
 
                 com.zeroc.Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:"  +
-                                                                                   _app.getTestEndpoint(0));
+                                                                                   _helper.getTestEndpoint(0));
                 adapter.setLocator(com.zeroc.Ice.LocatorPrx.uncheckedCast(locator));
                 adapter2.setLocator(com.zeroc.Ice.LocatorPrx.uncheckedCast(locator));
 
@@ -114,7 +108,7 @@
 
     private ServerLocatorRegistry _registry;
     private java.util.List<com.zeroc.Ice.Communicator> _communicators;
-    private com.zeroc.Ice.InitializationData _initData;
-    private test.Util.Application _app;
+    private com.zeroc.Ice.Properties _properties;
+    private test.TestHelper _helper;
     private int _nextPort = 1;
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/location/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/location/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/logger/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/logger/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/logger/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/logger/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.logger;
 
@@ -17,7 +12,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     public static void test(boolean b)
     {
@@ -28,17 +23,17 @@
     }
 
     @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         System.out.print("testing Ice.LogFile... ");
         if(new File("log.txt").exists())
         {
             new File("log.txt").delete();
         }
-        InitializationData initData = new InitializationData();
-        initData.properties = Util.createProperties();
-        initData.properties.setProperty("Ice.LogFile", "log.txt");
-        try(Communicator communicator = Util.initialize(initData))
+
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.LogFile", "log.txt");
+        try(Communicator communicator = initialize(properties))
         {
             communicator.getLogger().trace("info", "my logger");
         }
@@ -53,14 +48,5 @@
         }
         new File("log.txt").delete();
         System.out.println("ok");
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
@@ -30,7 +25,7 @@
 
     static String getPort(com.zeroc.Ice.PropertiesAdminPrx p)
     {
-        return Integer.toString(test.Util.Application.getTestPort(p.ice_getCommunicator().getProperties(), 0));
+        return Integer.toString(test.TestHelper.getTestPort(p.ice_getCommunicator().getProperties(), 0));
     }
 
     static ConnectionMetrics getServerConnectionMetrics(MetricsAdminPrx metrics, long expected)
@@ -377,16 +372,16 @@
         return m;
     }
 
-    static MetricsPrx allTests(test.Util.Application app, CommunicatorObserverI obsv)
+    static MetricsPrx allTests(test.TestHelper helper, CommunicatorObserverI obsv)
         throws UnknownMetricsView
     {
-        PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
-        String host = app.getTestHost();
-        String port = Integer.toString(app.getTestPort(0));
+        String host = helper.getTestHost();
+        String port = Integer.toString(helper.getTestPort(0));
         String hostAndPort = host + ":" + port;
-        String protocol = app.getTestProtocol();
+        String protocol = helper.getTestProtocol();
         String endpoint = protocol + " -h " + host + " -p " + port;
 
         MetricsPrx metrics = MetricsPrx.checkedCast(communicator.stringToProxy("metrics:" + endpoint));
@@ -576,7 +571,7 @@
             test(map.get("active").current == 1);
 
             ControllerPrx controller = ControllerPrx.checkedCast(
-                communicator.stringToProxy("controller:" + app.getTestEndpoint(1)));
+                communicator.stringToProxy("controller:" + helper.getTestEndpoint(1)));
             controller.hold();
 
             map = toMap(clientMetrics.getMetricsView("View").returnValue.get("Connection"));
@@ -1175,6 +1170,60 @@
         testAttribute(clientMetrics, clientProps, "Invocation", "mode", "batch-oneway",
                       new InvokeOp(metricsBatchOneway), out);
 
+        //
+        // Tests flushBatchRequests
+        //
+        props.put("IceMX.Metrics.View.Map.Invocation.GroupBy", "operation");
+        props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "localPort");
+        updateProps(clientProps, serverProps, props, "Invocation");
+
+        metricsBatchOneway = (MetricsPrx)metrics.ice_batchOneway();
+        metricsBatchOneway.op();
+
+        metricsBatchOneway.ice_flushBatchRequests();
+        metricsBatchOneway.ice_flushBatchRequestsAsync().join();
+
+        map = toMap(clientMetrics.getMetricsView("View").returnValue.get("Invocation"));
+        test(map.size() == 2);
+
+        im1 = (InvocationMetrics)map.get("ice_flushBatchRequests");
+        test(im1.current <= 1 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+        if(!collocated)
+        {
+            test(im1.remotes.length == 1); // The first operation got sent over a connection
+        }
+
+        if(!collocated)
+        {
+            clearView(clientProps, serverProps);
+
+            com.zeroc.Ice.Connection con = metricsBatchOneway.ice_getConnection();
+
+            metricsBatchOneway = (MetricsPrx)metricsBatchOneway.ice_fixed(con);
+            metricsBatchOneway.op();
+
+            con.flushBatchRequests(com.zeroc.Ice.CompressBatch.No);
+            con.flushBatchRequestsAsync(com.zeroc.Ice.CompressBatch.No).join();
+
+            map = toMap(clientMetrics.getMetricsView("View").returnValue.get("Invocation"));
+            test(map.size() == 3);
+
+            im1 = (InvocationMetrics)map.get("flushBatchRequests");
+            test(im1.current == 0 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+            test(im1.remotes.length == 1); // The first operation got sent over a connection
+
+            clearView(clientProps, serverProps);
+            metricsBatchOneway.op();
+
+            communicator.flushBatchRequests(com.zeroc.Ice.CompressBatch.No);
+            communicator.flushBatchRequestsAsync(com.zeroc.Ice.CompressBatch.No).join();
+            map = toMap(clientMetrics.getMetricsView("View").returnValue.get("Invocation"));
+            test(map.size() == 2);
+
+            im1 = (InvocationMetrics)map.get("flushBatchRequests");
+            test(im1.current <= 1 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+            test(im1.remotes.length == 1); // The first operation got sent over a connection
+        }
         out.println("ok");
 
         out.print("testing metrics view enable/disable...");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/AMDMetricsI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMetricsI(), com.zeroc.Ice.Util.stringToIdentity("metrics"));
-        adapter.activate();
-
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties.setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer app = new AMDServer();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.retry");
+        properties.setProperty("Ice.Admin.Endpoints", "tcp");
+        properties.setProperty("Ice.Admin.InstanceName", "server");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
+
+        try(com.zeroc.Ice.Communicator  communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMetricsI(), com.zeroc.Ice.Util.stringToIdentity("metrics"));
+            adapter.activate();
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
+            controllerAdapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
 import test.Ice.metrics.Test.MetricsPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        try
-        {
-            MetricsPrx metrics = AllTests.allTests(this, _observer);
-            metrics.shutdown();
-        }
-        catch(com.zeroc.Ice.UserException ex)
-        {
-            ex.printStackTrace();
-            assert(false);
-            return 1;
-        }
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        CommunicatorObserverI observer = new CommunicatorObserverI();
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.metrics");
         initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
+        initData.observer = observer;
 
-        initData.observer = _observer;
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            MetricsPrx metrics = AllTests.allTests(this, observer);
+            metrics.shutdown();
+        }
+        catch(com.zeroc.IceMX.UnknownMetricsView ex)
+        {
+            throw new RuntimeException(ex);
+        }
     }
-
-    private CommunicatorObserverI _observer = new CommunicatorObserverI();
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
 import test.Ice.metrics.Test.MetricsPrx;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MetricsI(), com.zeroc.Ice.Util.stringToIdentity("metrics"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
-        //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        try
-        {
-            MetricsPrx metrics = AllTests.allTests(this, _observer);
-            metrics.shutdown();
-        }
-        catch(com.zeroc.Ice.UserException ex)
-        {
-            ex.printStackTrace();
-            assert(false);
-            return 1;
-        }
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        CommunicatorObserverI observer = new CommunicatorObserverI();
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
+        initData.properties = createTestProperties(args);
         if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
         {
             // With background IO, collocated invocations are
@@ -56,21 +24,30 @@
         initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        initData.observer = _observer;
-        return initData;
-    }
+        initData.observer = observer;
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
-    }
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MetricsI(), com.zeroc.Ice.Util.stringToIdentity("metrics"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
+            //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used.
 
-    private CommunicatorObserverI _observer = new CommunicatorObserverI();
+            MetricsPrx metrics = AllTests.allTests(this, observer);
+            metrics.shutdown();
+        }
+        catch(com.zeroc.IceMX.UnknownMetricsView ex)
+        {
+            throw new RuntimeException(ex);
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ControllerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ControllerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/DispatchObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/InvocationObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/MetricsI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/MetricsI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/MetricsI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/MetricsI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/RemoveObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MetricsI(), com.zeroc.Ice.Util.stringToIdentity("metrics"));
-        adapter.activate();
-
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties.setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.retry");
+        properties.setProperty("Ice.Admin.Endpoints", "tcp");
+        properties.setProperty("Ice.Admin.InstanceName", "server");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MetricsI(), com.zeroc.Ice.Util.stringToIdentity("metrics"));
+            adapter.activate();
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
+            controllerAdapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/metrics/ThreadObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.networkProxy;
 
@@ -23,12 +18,12 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "test:" + app.getTestEndpoint(0);
+        String sref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.networkProxy;
 
 import test.Ice.networkProxy.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.networkProxy;
 
 import test.Ice.networkProxy.Test.TestIntf;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     static public class TestI implements TestIntf
     {
@@ -21,30 +16,18 @@
         }
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/networkProxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/networkProxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
 import java.io.PrintWriter;
+import java.lang.reflect.Modifier;
 
 import test.Ice.objects.Test.B;
 import test.Ice.objects.Test.C;
@@ -19,6 +15,12 @@
 import test.Ice.objects.Test.G;
 import test.Ice.objects.Test.H;
 import test.Ice.objects.Test.I;
+import test.Ice.objects.Test.K;
+import test.Ice.objects.Test.L;
+import test.Ice.objects.Test.Initial.OpValueResult;
+import test.Ice.objects.Test.Initial.OpValueSeqResult;
+import test.Ice.objects.Test.Initial.OpValueMapResult;
+import test.Ice.objects.Test.L;
 import test.Ice.objects.Test.A1;
 import test.Ice.objects.Test.B1;
 import test.Ice.objects.Test.D1;
@@ -30,7 +32,9 @@
 import test.Ice.objects.Test.J;
 import test.Ice.objects.Test.Recursive;
 import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrx;
-
+import test.Ice.objects.Test.M;
+import test.Ice.objects.Test.StructKey;
+import test.Ice.objects.Test.Initial.OpMResult;
 public class AllTests
 {
     private static void test(boolean b)
@@ -42,13 +46,13 @@
     }
 
     @SuppressWarnings("deprecation")
-    public static InitialPrx allTests(test.Util.Application app)
+    public static InitialPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -164,8 +168,9 @@
             test((E.class.getDeclaredField("i").getModifiers() & java.lang.reflect.Modifier.PROTECTED) != 0);
             test((E.class.getDeclaredField("s").getModifiers() & java.lang.reflect.Modifier.PROTECTED) != 0);
         }
-        catch(Exception ex)
+        catch(NoSuchFieldException ex)
         {
+            ex.printStackTrace(out);
             test(false);
         }
         F f = initial.getF();
@@ -176,8 +181,9 @@
             test((F.class.getDeclaredField("e1").getModifiers() & java.lang.reflect.Modifier.PROTECTED) != 0);
             test((F.class.getDeclaredField("e2").getModifiers() & java.lang.reflect.Modifier.PROTECTED) == 0);
         }
-        catch(Exception ex)
+        catch(NoSuchFieldException ex)
         {
+            ex.printStackTrace(out);
             test(false);
         }
         out.println("ok");
@@ -192,6 +198,40 @@
         test(h != null && ((H)h) != null);
         out.println("ok");
 
+        out.print("getting K... ");
+        out.flush();
+        {
+            K k = initial.getK();
+            test(k.value instanceof L);
+            L l = (L)k.value;
+            test(l.data.equals("l"));
+        }
+        out.println("ok");
+
+        out.print("testing Value as parameter... ");
+        {
+            com.zeroc.Ice.Value v1 = new L("l");
+            OpValueResult result = initial.opValue(v1);
+            test(((L)result.returnValue).data.equals("l"));
+            test(((L)result.v2).data.equals("l"));
+        }
+        {
+            L l = new L("l");
+            com.zeroc.Ice.Value[] v1 = { l };
+            OpValueSeqResult result = initial.opValueSeq(v1);
+            test(((L)result.returnValue[0]).data.equals("l"));
+            test(((L)result.v2[0]).data.equals("l"));
+        }
+        {
+            L l = new L("l");
+            java.util.Map<String, com.zeroc.Ice.Value> v1 = new java.util.HashMap<String, com.zeroc.Ice.Value>();
+            v1.put("l", l);
+            OpValueMapResult result = initial.opValueMap(v1);
+            test(((L)result.returnValue.get("l")).data.equals("l"));
+            test(((L)result.v2.get("l")).data.equals("l"));
+        }
+        out.println("ok");
+
         out.print("getting D1... ");
         out.flush();
         D1 d1 = new D1(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4"));
@@ -311,7 +351,7 @@
 
         out.print("testing UnexpectedObjectException...");
         out.flush();
-        ref = "uoet:" + app.getTestEndpoint(0);
+        ref = "uoet:" + helper.getTestEndpoint(0);
         base = communicator.stringToProxy(ref);
         test(base != null);
         UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrx.uncheckedCast(base);
@@ -341,6 +381,29 @@
         test(communicator.getValueFactoryManager().find("TestOF") != null);
         out.println("ok");
 
+        out.print("testing class containing complex dictionary... ");
+        out.flush();
+        {
+            M m = new M();
+            m.v = new java.util.HashMap<StructKey, L>();
+            StructKey k1 = new StructKey(1, "1");
+            m.v.put(k1, new L("one"));
+            StructKey k2 = new StructKey(2, "2");
+            m.v.put(k2, new L("two"));
+
+            Initial.OpMResult opMResult = initial.opM(m);
+            test(opMResult.returnValue.v.size() == 2);
+            test(opMResult.v2.v.size() == 2);
+
+            test(opMResult.returnValue.v.get(k1).data.equals("one"));
+            test(opMResult.v2.v.get(k1).data.equals("one"));
+
+            test(opMResult.returnValue.v.get(k2).data.equals("two"));
+            test(opMResult.v2.v.get(k2).data.equals("two"));
+
+        }
+        out.println("ok");
+
         return initial;
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/BI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/BI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/BI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/BI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/CI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/CI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/CI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/CI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
 import test.Ice.objects.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     private static class MyValueFactory implements com.zeroc.Ice.ValueFactory
     {
@@ -73,40 +68,27 @@
     }
 
     @SuppressWarnings("deprecation")
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ValueFactory factory = new MyValueFactory();
-        communicator.getValueFactoryManager().add(factory, "::Test::B");
-        communicator.getValueFactoryManager().add(factory, "::Test::C");
-        communicator.getValueFactoryManager().add(factory, "::Test::D");
-        communicator.getValueFactoryManager().add(factory, "::Test::E");
-        communicator.getValueFactoryManager().add(factory, "::Test::F");
-        communicator.getValueFactoryManager().add(factory, "::Test::I");
-        communicator.getValueFactoryManager().add(factory, "::Test::J");
-        communicator.getValueFactoryManager().add(factory, "::Test::H");
-
-        communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
-
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.objects");
+        properties.setProperty("Ice.MessageSizeMax", "2048"); // Needed on some Android versions
+        try( com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            com.zeroc.Ice.ValueFactory factory = new MyValueFactory();
+            communicator.getValueFactoryManager().add(factory, "::Test::B");
+            communicator.getValueFactoryManager().add(factory, "::Test::C");
+            communicator.getValueFactoryManager().add(factory, "::Test::D");
+            communicator.getValueFactoryManager().add(factory, "::Test::E");
+            communicator.getValueFactoryManager().add(factory, "::Test::F");
+            communicator.getValueFactoryManager().add(factory, "::Test::I");
+            communicator.getValueFactoryManager().add(factory, "::Test::J");
+            communicator.getValueFactoryManager().add(factory, "::Test::H");
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects");
-        return initData;
-    }
+            communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
 
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+            InitialPrx initial = AllTests.allTests(this);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
 import test.Ice.objects.Test.Initial;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
     private static class MyValueFactory implements com.zeroc.Ice.ValueFactory
     {
@@ -73,50 +68,37 @@
     }
 
     @SuppressWarnings("deprecation")
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ValueFactory factory = new MyValueFactory();
-        communicator.getValueFactoryManager().add(factory, "::Test::B");
-        communicator.getValueFactoryManager().add(factory, "::Test::C");
-        communicator.getValueFactoryManager().add(factory, "::Test::D");
-        communicator.getValueFactoryManager().add(factory, "::Test::E");
-        communicator.getValueFactoryManager().add(factory, "::Test::F");
-        communicator.getValueFactoryManager().add(factory, "::Test::I");
-        communicator.getValueFactoryManager().add(factory, "::Test::J");
-        communicator.getValueFactoryManager().add(factory, "::Test::H");
-
-        communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
-
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Initial initial = new InitialI(adapter);
-        adapter.add(initial, com.zeroc.Ice.Util.stringToIdentity("initial"));
-        UnexpectedObjectExceptionTestI object = new UnexpectedObjectExceptionTestI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("uoet"));
-        AllTests.allTests(this);
-        //
-        // We must call shutdown even in the collocated case for cyclic dependency cleanup.
-        //
-        initial.shutdown(null);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.objects");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            com.zeroc.Ice.ValueFactory factory = new MyValueFactory();
+            communicator.getValueFactoryManager().add(factory, "::Test::B");
+            communicator.getValueFactoryManager().add(factory, "::Test::C");
+            communicator.getValueFactoryManager().add(factory, "::Test::D");
+            communicator.getValueFactoryManager().add(factory, "::Test::E");
+            communicator.getValueFactoryManager().add(factory, "::Test::F");
+            communicator.getValueFactoryManager().add(factory, "::Test::I");
+            communicator.getValueFactoryManager().add(factory, "::Test::J");
+            communicator.getValueFactoryManager().add(factory, "::Test::H");
+
+            communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
+
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Initial initial = new InitialI(adapter);
+            adapter.add(initial, com.zeroc.Ice.Util.stringToIdentity("initial"));
+            UnexpectedObjectExceptionTestI object = new UnexpectedObjectExceptionTestI();
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("uoet"));
+            AllTests.allTests(this);
+            //
+            // We must call shutdown even in the collocated case for cyclic dependency cleanup.
+            //
+            initial.shutdown(null);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/DI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/DI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/DI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/DI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/EI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/EI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/EI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/EI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/FI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/FI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/FI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/FI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/HI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/HI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/HI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/HI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/II.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/II.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/II.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/II.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/InitialI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/InitialI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
@@ -135,6 +130,33 @@
     }
 
     @Override
+    public K getK(com.zeroc.Ice.Current current)
+    {
+        return new K(new L("l"));
+    }
+
+    @Override
+    public OpValueResult
+    opValue(com.zeroc.Ice.Value v1, com.zeroc.Ice.Current current)
+    {
+        return new OpValueResult(v1, v1);
+    }
+
+    @Override
+    public OpValueSeqResult
+    opValueSeq(com.zeroc.Ice.Value[] v1, com.zeroc.Ice.Current current)
+    {
+        return new OpValueSeqResult(v1, v1);
+    }
+
+    @Override
+    public OpValueMapResult
+    opValueMap(java.util.Map<String, com.zeroc.Ice.Value> v1, com.zeroc.Ice.Current current)
+    {
+        return new OpValueMapResult(v1, v1);
+    }
+
+    @Override
     public D1 getD1(D1 d1, com.zeroc.Ice.Current current)
     {
         return d1;
@@ -212,6 +234,15 @@
         _adapter.getCommunicator().shutdown();
     }
 
+    @Override
+    public Initial.OpMResult opM(M v1, com.zeroc.Ice.Current current)
+    {
+        Initial.OpMResult r = new Initial.OpMResult();
+        r.returnValue = v1;
+        r.v2 = v1;
+        return r;
+    }
+
     private com.zeroc.Ice.ObjectAdapter _adapter;
     private B _b1;
     private B _b2;
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/JI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/JI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/JI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/JI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     private static class MyValueFactory implements com.zeroc.Ice.ValueFactory
     {
@@ -34,40 +29,26 @@
         }
     }
 
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ValueFactory factory = new MyValueFactory();
-        communicator.getValueFactoryManager().add(factory, "::Test::I");
-        communicator.getValueFactoryManager().add(factory, "::Test::J");
-        communicator.getValueFactoryManager().add(factory, "::Test::H");
-
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new InitialI(adapter);
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
-        object = new UnexpectedObjectExceptionTestI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("uoet"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.objects");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+            com.zeroc.Ice.ValueFactory factory = new MyValueFactory();
+            communicator.getValueFactoryManager().add(factory, "::Test::I");
+            communicator.getValueFactoryManager().add(factory, "::Test::J");
+            communicator.getValueFactoryManager().add(factory, "::Test::H");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new InitialI(adapter), com.zeroc.Ice.Util.stringToIdentity("initial"));
+            adapter.add(new UnexpectedObjectExceptionTestI(), com.zeroc.Ice.Util.stringToIdentity("uoet"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -173,6 +168,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 interface Initial
 {
     void shutdown();
@@ -191,9 +212,15 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -210,6 +237,8 @@
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 class Empty
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -16,42 +11,42 @@
 
 public class AllTests
 {
-    public static MyClassPrx allTests(test.Util.Application app)
+    public static MyClassPrx allTests(test.TestHelper helper)
     {
-        PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        String ref = "test:" + app.getTestEndpoint(0);
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        String ref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrx.checkedCast(base);
         MyDerivedClassPrx derived = MyDerivedClassPrx.checkedCast(cl);
 
         out.print("testing twoway operations... ");
         out.flush();
-        Twoways.twoways(app, cl);
-        Twoways.twoways(app, derived);
+        Twoways.twoways(helper, cl);
+        Twoways.twoways(helper, derived);
         derived.opDerived();
         out.println("ok");
 
         out.print("testing oneway operations... ");
         out.flush();
-        Oneways.oneways(app, cl);
+        Oneways.oneways(helper, cl);
         out.println("ok");
 
         out.print("testing twoway operations with AMI... ");
         out.flush();
-        TwowaysAMI.twowaysAMI(app, cl);
-        TwowaysAMI.twowaysAMI(app, derived);
+        TwowaysAMI.twowaysAMI(helper, cl);
+        TwowaysAMI.twowaysAMI(helper, derived);
         out.println("ok");
 
         out.print("testing oneway operations with AMI... ");
         out.flush();
-        OnewaysAMI.onewaysAMI(app, cl);
+        OnewaysAMI.onewaysAMI(helper, cl);
         out.println("ok");
 
         out.print("testing batch oneway operations... ");
         out.flush();
-        BatchOneways.batchOneways(app, cl, out);
-        BatchOneways.batchOneways(app, derived, out);
+        BatchOneways.batchOneways(helper, cl, out);
+        BatchOneways.batchOneways(helper, derived, out);
         out.println("ok");
 
         out.print("testing batch AMI oneway operations... ");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
-
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/BatchOneways.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/BatchOneways.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/BatchOneways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/BatchOneways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -67,9 +62,9 @@
         private int _lastRequestSize;
     }
 
-    static void batchOneways(test.Util.Application app, MyClassPrx p, PrintWriter out)
+    static void batchOneways(test.TestHelper helper, MyClassPrx p, PrintWriter out)
     {
-        final com.zeroc.Ice.Communicator communicator = app.communicator();
+        final com.zeroc.Ice.Communicator communicator = helper.communicator();
         final com.zeroc.Ice.Properties properties = communicator.getProperties();
         final byte[] bs1 = new byte[10  * 1024];
 
@@ -144,40 +139,39 @@
 
         if(batch.ice_getConnection() != null && !bluetooth)
         {
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = properties._clone();
             BatchRequestInterceptorI interceptor = new BatchRequestInterceptorI();
             initData.batchRequestInterceptor = interceptor;
-            com.zeroc.Ice.Communicator ic = app.initialize(initData);
+            try(com.zeroc.Ice.Communicator ic = helper.initialize(initData))
+            {
+                batch = MyClassPrx.uncheckedCast(ic.stringToProxy(p.toString())).ice_batchOneway();
 
-            batch = MyClassPrx.uncheckedCast(ic.stringToProxy(p.toString())).ice_batchOneway();
+                test(interceptor.count() == 0);
+                batch.ice_ping();
+                batch.ice_ping();
+                batch.ice_ping();
+                test(interceptor.count() == 0);
+
+                interceptor.setEnqueue(true);
+                batch.ice_ping();
+                batch.ice_ping();
+                batch.ice_ping();
+                test(interceptor.count() == 3);
+
+                batch.ice_flushBatchRequests();
+                batch.ice_ping();
+                test(interceptor.count() == 1);
 
-            test(interceptor.count() == 0);
-            batch.ice_ping();
-            batch.ice_ping();
-            batch.ice_ping();
-            test(interceptor.count() == 0);
-
-            interceptor.setEnqueue(true);
-            batch.ice_ping();
-            batch.ice_ping();
-            batch.ice_ping();
-            test(interceptor.count() == 3);
-
-            batch.ice_flushBatchRequests();
-            batch.ice_ping();
-            test(interceptor.count() == 1);
-
-            batch.opByteSOneway(bs1);
-            test(interceptor.count() == 2);
-            batch.opByteSOneway(bs1);
-            test(interceptor.count() == 3);
-
-            batch.opByteSOneway(bs1); // This should trigger the flush
-            batch.ice_ping();
-            test(interceptor.count() == 2);
+                batch.opByteSOneway(bs1);
+                test(interceptor.count() == 2);
+                batch.opByteSOneway(bs1);
+                test(interceptor.count() == 3);
 
-            ic.destroy();
+                batch.opByteSOneway(bs1); // This should trigger the flush
+                batch.ice_ping();
+                test(interceptor.count() == 2);
+            }
         }
 
         boolean supportsCompress = true;
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
 import test.Ice.operations.Test.MyClassPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+        properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations");
+        properties.setProperty("Ice.BatchAutoFlushSize", "100");
         java.io.PrintWriter out = getWriter();
-        MyClassPrx myClass = AllTests.allTests(this);
-
-        out.print("testing server shutdown... ");
-        out.flush();
-        myClass.shutdown();
-        try
-        {
-            myClass.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
-            throw new RuntimeException();
-        }
-        catch(com.zeroc.Ice.LocalException ex)
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            out.println("ok");
-        }
-
-        return 0;
-    }
+            MyClassPrx myClass = AllTests.allTests(this);
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-        initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+            out.print("testing server shutdown... ");
+            out.flush();
+            myClass.shutdown();
+            try
+            {
+                myClass.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+                throw new RuntimeException();
+            }
+            catch(com.zeroc.Ice.LocalException ex)
+            {
+                out.println("ok");
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,63 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
-public class Collocated extends test.Util.Application
-{
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        java.io.PrintWriter out = getWriter();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        if(prx.ice_getConnection() != null)
-        {
-            throw new RuntimeException();
-        }
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
+import com.zeroc.Ice.Util;
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+public class Collocated extends test.TestHelper
+{
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || isAndroid())
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        if(properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || isAndroid())
         {
-            initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2");
+            properties.setProperty("Ice.ThreadPool.Server.Size", "2");
         }
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
-
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations");
+        properties.setProperty("Ice.BatchAutoFlushSize", "100");
 
         //
         // Its possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we supress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
-
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            java.io.PrintWriter out = getWriter();
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+
+            if(prx.ice_getConnection() != null)
+            {
+                throw new RuntimeException();
+            }
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/OnewaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -60,7 +55,7 @@
         private boolean _called;
     }
 
-    static void onewaysAMI(test.Util.Application app, MyClassPrx proxy)
+    static void onewaysAMI(test.TestHelper helper, MyClassPrx proxy)
     {
         MyClassPrx p = proxy.ice_oneway();
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Oneways.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Oneways.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Oneways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Oneways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -21,35 +16,22 @@
         }
     }
 
-    static void oneways(test.Util.Application app, MyClassPrx p)
+    static void oneways(test.TestHelper helper, MyClassPrx p)
     {
         p = p.ice_oneway();
 
-        {
-            p.ice_ping();
-        }
-
-        {
-            p.opVoid();
-        }
-
-        {
-            p.opIdempotent();
-        }
+        p.ice_ping();
+        p.opVoid();
+        p.opIdempotent();
+        p.opNonmutating();
 
+        try
         {
-            p.opNonmutating();
+            p.opByte((byte)0xff, (byte)0x0f);
+            test(false);
         }
-
+        catch(com.zeroc.Ice.TwowayOnlyException ex)
         {
-            try
-            {
-                p.opByte((byte)0xff, (byte)0x0f);
-                test(false);
-            }
-            catch(com.zeroc.Ice.TwowayOnlyException ex)
-            {
-            }
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -66,9 +61,9 @@
         private boolean _called;
     }
 
-    static void twowaysAMI(test.Util.Application app, MyClassPrx p)
+    static void twowaysAMI(test.TestHelper helper, MyClassPrx p)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
 
         {
@@ -1565,57 +1560,56 @@
             String[] impls = {"Shared", "PerThread"};
             for(int i = 0; i < 2; i++)
             {
-                com.zeroc.Ice.InitializationData initData = app.createInitializationData();
-                initData.properties = communicator.getProperties()._clone();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
-
-                com.zeroc.Ice.Communicator ic = app.initialize(initData);
+                com.zeroc.Ice.Properties properties = communicator.getProperties()._clone();
+                properties.setProperty("Ice.ImplicitContext", impls[i]);
 
-                java.util.Map<String, String> ctx = new java.util.HashMap<>();
-                ctx.put("one", "ONE");
-                ctx.put("two", "TWO");
-                ctx.put("three", "THREE");
+                try(com.zeroc.Ice.Communicator ic = helper.initialize(properties))
+                {
+                    java.util.Map<String, String> ctx = new java.util.HashMap<>();
+                    ctx.put("one", "ONE");
+                    ctx.put("two", "TWO");
+                    ctx.put("three", "THREE");
 
-                MyClassPrx p3 = MyClassPrx.uncheckedCast(ic.stringToProxy("test:" + app.getTestEndpoint(0)));
+                    MyClassPrx p3 =
+                        MyClassPrx.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint(properties, 0)));
 
-                ic.getImplicitContext().setContext(ctx);
-                test(ic.getImplicitContext().getContext().equals(ctx));
-                {
-                    java.util.Map<String, String> c = p3.opContextAsync().join();
-                    test(c.equals(ctx));
-                }
+                    ic.getImplicitContext().setContext(ctx);
+                    test(ic.getImplicitContext().getContext().equals(ctx));
+                    {
+                        java.util.Map<String, String> c = p3.opContextAsync().join();
+                        test(c.equals(ctx));
+                    }
 
-                ic.getImplicitContext().put("zero", "ZERO");
+                    ic.getImplicitContext().put("zero", "ZERO");
 
-                ctx = ic.getImplicitContext().getContext();
-                {
-                    java.util.Map<String, String> c = p3.opContextAsync().join();
-                    test(c.equals(ctx));
-                }
+                    ctx = ic.getImplicitContext().getContext();
+                    {
+                        java.util.Map<String, String> c = p3.opContextAsync().join();
+                        test(c.equals(ctx));
+                    }
 
-                java.util.Map<String, String> prxContext = new java.util.HashMap<>();
-                prxContext.put("one", "UN");
-                prxContext.put("four", "QUATRE");
+                    java.util.Map<String, String> prxContext = new java.util.HashMap<>();
+                    prxContext.put("one", "UN");
+                    prxContext.put("four", "QUATRE");
 
-                java.util.Map<String, String> combined = new java.util.HashMap<>(ctx);
-                combined.putAll(prxContext);
-                test(combined.get("one").equals("UN"));
+                    java.util.Map<String, String> combined = new java.util.HashMap<>(ctx);
+                    combined.putAll(prxContext);
+                    test(combined.get("one").equals("UN"));
 
-                p3 = p3.ice_context(prxContext);
+                    p3 = p3.ice_context(prxContext);
 
-                ic.getImplicitContext().setContext(null);
-                {
-                    java.util.Map<String, String> c = p3.opContextAsync().join();
-                    test(c.equals(prxContext));
-                }
+                    ic.getImplicitContext().setContext(null);
+                    {
+                        java.util.Map<String, String> c = p3.opContextAsync().join();
+                        test(c.equals(prxContext));
+                    }
 
-                ic.getImplicitContext().setContext(ctx);
-                {
-                    java.util.Map<String, String> c = p3.opContextAsync().join();
-                    test(c.equals(combined));
+                    ic.getImplicitContext().setContext(ctx);
+                    {
+                        java.util.Map<String, String> c = p3.opContextAsync().join();
+                        test(c.equals(combined));
+                    }
                 }
-
-                ic.destroy();
             }
         }
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Twoways.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Twoways.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/operations/Twoways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/operations/Twoways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -17,7 +12,6 @@
 import com.zeroc.Ice.*;
 
 import test.Ice.operations.Test.*;
-import test.Util.Application;
 
 class Twoways
 {
@@ -49,9 +43,9 @@
         final private MyClassPrx _proxy;
     }
 
-    static void twoways(Application app, MyClassPrx p)
+    static void twoways(test.TestHelper helper, MyClassPrx p)
     {
-        Communicator communicator = app.communicator();
+        Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
 
         String[] literals = p.opStringLiterals();
@@ -1402,64 +1396,64 @@
             String[] impls = {"Shared", "PerThread"};
             for(int i = 0; i < 2; i++)
             {
-                InitializationData initData = app.createInitializationData();
-                initData.properties = communicator.getProperties()._clone();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
+                com.zeroc.Ice.Properties properties = communicator.getProperties()._clone();
+                properties.setProperty("Ice.ImplicitContext", impls[i]);
 
-                Communicator ic = app.initialize(initData);
+                try(Communicator ic = helper.initialize(properties))
+                {
 
-                Map<String, String> ctx = new HashMap<>();
-                ctx.put("one", "ONE");
-                ctx.put("two", "TWO");
-                ctx.put("three", "THREE");
+                    Map<String, String> ctx = new HashMap<>();
+                    ctx.put("one", "ONE");
+                    ctx.put("two", "TWO");
+                    ctx.put("three", "THREE");
 
-                MyClassPrx p3 = MyClassPrx.uncheckedCast(ic.stringToProxy("test:" + app.getTestEndpoint(0)));
+                    MyClassPrx p3 =
+                        MyClassPrx.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint(properties, 0)));
 
-                ic.getImplicitContext().setContext(ctx);
-                test(ic.getImplicitContext().getContext().equals(ctx));
-                test(p3.opContext().equals(ctx));
+                    ic.getImplicitContext().setContext(ctx);
+                    test(ic.getImplicitContext().getContext().equals(ctx));
+                    test(p3.opContext().equals(ctx));
 
-                test(!ic.getImplicitContext().containsKey("zero"));
-                String r = ic.getImplicitContext().put("zero", "ZERO");
-                test(r.equals(""));
-                test(ic.getImplicitContext().containsKey("zero"));
-                test(ic.getImplicitContext().get("zero").equals("ZERO"));
+                    test(!ic.getImplicitContext().containsKey("zero"));
+                    String r = ic.getImplicitContext().put("zero", "ZERO");
+                    test(r.equals(""));
+                    test(ic.getImplicitContext().containsKey("zero"));
+                    test(ic.getImplicitContext().get("zero").equals("ZERO"));
 
-                ctx = ic.getImplicitContext().getContext();
-                test(p3.opContext().equals(ctx));
+                    ctx = ic.getImplicitContext().getContext();
+                    test(p3.opContext().equals(ctx));
 
-                Map<String, String> prxContext = new HashMap<>();
-                prxContext.put("one", "UN");
-                prxContext.put("four", "QUATRE");
+                    Map<String, String> prxContext = new HashMap<>();
+                    prxContext.put("one", "UN");
+                    prxContext.put("four", "QUATRE");
 
-                Map<String, String> combined = new HashMap<>(ctx);
-                combined.putAll(prxContext);
-                test(combined.get("one").equals("UN"));
+                    Map<String, String> combined = new HashMap<>(ctx);
+                    combined.putAll(prxContext);
+                    test(combined.get("one").equals("UN"));
 
-                p3 = p3.ice_context(prxContext);
+                    p3 = p3.ice_context(prxContext);
 
-                ic.getImplicitContext().setContext(null);
-                test(p3.opContext().equals(prxContext));
+                    ic.getImplicitContext().setContext(null);
+                    test(p3.opContext().equals(prxContext));
 
-                ic.getImplicitContext().setContext(ctx);
-                test(p3.opContext().equals(combined));
+                    ic.getImplicitContext().setContext(ctx);
+                    test(p3.opContext().equals(combined));
 
-                test(ic.getImplicitContext().remove("one").equals("ONE"));
+                    test(ic.getImplicitContext().remove("one").equals("ONE"));
 
-                if(impls[i].equals("PerThread"))
-                {
-                    Thread thread = new PerThreadContextInvokeThread(p3.ice_context(null));
-                    thread.start();
-                    try
-                    {
-                        thread.join();
-                    }
-                    catch(InterruptedException ex)
+                    if(impls[i].equals("PerThread"))
                     {
+                        Thread thread = new PerThreadContextInvokeThread(p3.ice_context(null));
+                        thread.start();
+                        try
+                        {
+                            thread.join();
+                        }
+                        catch(InterruptedException ex)
+                        {
+                        }
                     }
                 }
-
-                ic.destroy();
             }
         }
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
@@ -37,17 +32,17 @@
         T value;
     }
 
-    public static InitialPrx allTests(test.Util.Application app, boolean collocated)
+    public static InitialPrx allTests(test.TestHelper helper, boolean collocated)
     {
-        PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
         FactoryI factory = new FactoryI();
         communicator.getValueFactoryManager().add(factory, "");
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/AMDInitialI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/AMDInitialI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/AMDInitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/AMDInitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new AMDInitialI(), com.zeroc.Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional.AMD");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.optional.AMD");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDInitialI(), com.zeroc.Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
 import test.Ice.optional.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        InitialPrx initial = AllTests.allTests(this, false);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.optional");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this, false);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/InitialI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/InitialI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/SerializableClass.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/SerializableClass.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/SerializableClass.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/SerializableClass.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new InitialI(), com.zeroc.Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.optional");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new InitialI(), com.zeroc.Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
@@ -28,13 +23,13 @@
         }
     }
 
-    public static InitialPrx allTests(test.Util.Application app)
+    public static InitialPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
 import test.Ice.packagemd.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
-        initData.properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
+        properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/InitialI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/InitialI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/NoPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Package.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Package.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Package.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Package.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new InitialI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
-        initData.properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
+        properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object object = new InitialI();
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/packagemd/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/packagemd/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/plugin/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/plugin/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/plugin/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/plugin/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,185 +1,127 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin;
 
 import java.io.PrintWriter;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
+        //
         // Under Android the class comes from the communicators classloader which
         // is setup in the android test driver.
-        String jarFile;
-        if(isAndroid())
-        {
-            jarFile = "";
-        }
-        else
-        {
-            jarFile = "../../../../../../../lib/IceTestPlugins.jar";
-        }
-
-        com.zeroc.Ice.Communicator communicator = communicator();
+        //
+        String jarFile = isAndroid() ? "" : "../../../../../../../lib/IceTestPlugins.jar";
         PrintWriter printWriter = getWriter();
-        printWriter.print("testing a simple plug-in... ");
-        printWriter.flush();
-        try
-        {
-            com.zeroc.Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.Test",
-                jarFile + ":test.Ice.plugin.plugins.PluginFactory " +
-                "'C:\\Program Files\\' --DatabasePath 'C:\\Program Files\\Application\\db'");
-            communicator = com.zeroc.Ice.Util.initialize(args, initData);
-            communicator.destroy();
-        }
-        catch(com.zeroc.Ice.LocalException ex)
-        {
-            ex.printStackTrace();
-            test(false);
-        }
-        printWriter.println("ok");
-
-        printWriter.print("testing a simple plug-in that fails to initialize... ");
-        printWriter.flush();
-        communicator = null;
-        try
-        {
-            com.zeroc.Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.Test",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginInitializeFailFactory");
-            communicator = com.zeroc.Ice.Util.initialize(args, initData);
-            test(false);
-        }
-        catch(com.zeroc.Ice.PluginInitializationException ex)
-        {
-            test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
-        }
-        test(communicator == null);
-        printWriter.println("ok");
-
-        printWriter.print("testing plug-in load order... ");
-        printWriter.flush();
-        try
-        {
-            com.zeroc.Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.PluginOne",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
-            communicator = com.zeroc.Ice.Util.initialize(args, initData);
-            communicator.destroy();
-        }
-        catch(com.zeroc.Ice.LocalException ex)
-        {
-            ex.printStackTrace();
-            test(false);
-        }
-        printWriter.println("ok");
-
-        printWriter.print("testing plug-in manager... ");
-        printWriter.flush();
-        try
-        {
-            com.zeroc.Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.PluginOne",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo");
-            initData.properties.setProperty("Ice.InitPlugins", "0");
-            communicator = com.zeroc.Ice.Util.initialize(args, initData);
-
-            com.zeroc.Ice.PluginManager pm = communicator.getPluginManager();
-            test(pm.getPlugin("PluginOne") != null);
-            test(pm.getPlugin("PluginTwo") != null);
-            test(pm.getPlugin("PluginThree") != null);
-
-            MyPlugin p4 = new MyPlugin();
-            pm.addPlugin("PluginFour", p4);
-            test(pm.getPlugin("PluginFour") != null);
-
-            pm.initializePlugins();
-
-            test(p4.isInitialized());
-
-            communicator.destroy();
-
-            test(p4.isDestroyed());
-        }
-        catch(com.zeroc.Ice.LocalException ex)
-        {
-            ex.printStackTrace();
-            test(false);
-        }
-        printWriter.println("ok");
-
-        printWriter.print("testing destroy when a plug-in fails to initialize... ");
-        printWriter.flush();
-        communicator = null;
-        try
-        {
-            com.zeroc.Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.PluginOneFail",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginOneFailFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwoFail",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginTwoFailFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThreeFail",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginThreeFailFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
-            communicator = com.zeroc.Ice.Util.initialize(args, initData);
-            test(false);
-        }
-        catch(com.zeroc.Ice.PluginInitializationException ex)
         {
-            test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
+            printWriter.print("testing a simple plug-in... ");
+            printWriter.flush();
+            com.zeroc.Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.Test",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginFactory " +
+                                   "'C:\\Program Files\\' --DatabasePath 'C:\\Program Files\\Application\\db'");
+            try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+            {
+            }
+            printWriter.println("ok");
+        }
+
+        {
+            printWriter.print("testing a simple plug-in that fails to initialize... ");
+            printWriter.flush();
+            com.zeroc.Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.Test",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginInitializeFailFactory");
+            try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+            {
+                test(false);
+            }
+            catch(com.zeroc.Ice.PluginInitializationException ex)
+            {
+                test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
+            }
+            printWriter.println("ok");
+        }
+
+        {
+            printWriter.print("testing plug-in load order... ");
+            printWriter.flush();
+
+            com.zeroc.Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.PluginOne",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
+            properties.setProperty("Ice.Plugin.PluginTwo",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
+            properties.setProperty("Ice.Plugin.PluginThree",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
+            properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
+            try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+            {
+            }
+            printWriter.println("ok");
+        }
+
+        {
+            printWriter.print("testing plug-in manager... ");
+            printWriter.flush();
+
+            com.zeroc.Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.PluginOne",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
+            properties.setProperty("Ice.Plugin.PluginTwo",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
+            properties.setProperty("Ice.Plugin.PluginThree",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
+            properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo");
+            properties.setProperty("Ice.InitPlugins", "0");
+
+            try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+            {
+                com.zeroc.Ice.PluginManager pm = communicator.getPluginManager();
+                test(pm.getPlugin("PluginOne") != null);
+                test(pm.getPlugin("PluginTwo") != null);
+                test(pm.getPlugin("PluginThree") != null);
+
+                MyPlugin p4 = new MyPlugin();
+                pm.addPlugin("PluginFour", p4);
+                test(pm.getPlugin("PluginFour") != null);
+
+                pm.initializePlugins();
+
+                test(p4.isInitialized());
+
+                communicator.destroy();
+
+                test(p4.isDestroyed());
+            }
+            printWriter.println("ok");
+        }
+
+        {
+            printWriter.print("testing destroy when a plug-in fails to initialize... ");
+            printWriter.flush();
+
+            com.zeroc.Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.PluginOneFail",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginOneFailFactory");
+            properties.setProperty("Ice.Plugin.PluginTwoFail",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginTwoFailFactory");
+            properties.setProperty("Ice.Plugin.PluginThreeFail",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginThreeFailFactory");
+            properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
+            try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+            {
+                test(false);
+            }
+            catch(com.zeroc.Ice.PluginInitializationException ex)
+            {
+                test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
+            }
+            printWriter.println("ok");
         }
-        test(communicator == null);
-        printWriter.println("ok");
-
-        System.gc();
-        System.runFinalization();
-        return 0;
-    }
-
-    private com.zeroc.Ice.InitializationData createInitData()
-    {
-        com.zeroc.Ice.InitializationData initData = createInitializationData() ;
-        if(classLoader() != null)
-        {
-            initData.classLoader = classLoader();
-        }
-        initData.properties = com.zeroc.Ice.Util.createProperties();
-        return initData;
-    }
-
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 
     static class MyPlugin implements com.zeroc.Ice.Plugin
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/properties/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/properties/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/properties/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/properties/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.properties;
 
 import com.zeroc.Ice.Properties;
 import com.zeroc.Ice.Util;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     public static void test(boolean b)
     {
@@ -37,8 +32,7 @@
         }
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         {
             System.out.print("testing load properties from UTF-8 path... ");
@@ -101,16 +95,6 @@
             }
             System.out.println("ok");
         }
-
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-        System.gc();
-        System.exit(status);
     }
 
     private static String configPath = "./config/\u4E2D\u56FD_client.config";
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
@@ -29,15 +24,15 @@
         }
     }
 
-    public static MyClassPrx allTests(test.Util.Application app)
+    public static MyClassPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
 
@@ -412,7 +407,7 @@
         out.flush();
         com.zeroc.Ice.Properties prop = communicator.getProperties();
         String propertyPrefix = "Foo.Proxy";
-        prop.setProperty(propertyPrefix, "test:" + app.getTestEndpoint(0));
+        prop.setProperty(propertyPrefix, "test:" + helper.getTestEndpoint(0));
         b1 = communicator.propertyToProxy(propertyPrefix);
         test(b1.ice_getIdentity().name.equals("test") && b1.ice_getIdentity().category.length() == 0 &&
              b1.ice_getAdapterId().length() == 0 && b1.ice_getFacet().length() == 0);
@@ -456,7 +451,7 @@
         //test(b1.ice_getLocatorCacheTimeout() == 60);
         //prop.setProperty("Ice.Default.LocatorCacheTimeout", "");
 
-        prop.setProperty(propertyPrefix, "test:" + app.getTestEndpoint(0));
+        prop.setProperty(propertyPrefix, "test:" + helper.getTestEndpoint(0));
 
         property = propertyPrefix + ".Router";
         test(b1.ice_getRouter() == null);
@@ -895,7 +890,7 @@
 
         out.print("testing encoding versioning... ");
         out.flush();
-        String ref20 = "test -e 2.0:" + app.getTestEndpoint(0);
+        String ref20 = "test -e 2.0:" + helper.getTestEndpoint(0);
         MyClassPrx cl20 = MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
         try
         {
@@ -907,7 +902,7 @@
             // Server 2.0 endpoint doesn't support 1.1 version.
         }
 
-        String ref10 = "test -e 1.0:" + app.getTestEndpoint(0);
+        String ref10 = "test -e 1.0:" + helper.getTestEndpoint(0);
         MyClassPrx cl10 = MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
         cl10.ice_ping();
         cl10.ice_encodingVersion(Util.Encoding_1_0).ice_ping();
@@ -915,7 +910,7 @@
 
         // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
         // call will use the 1.1 encoding
-        String ref13 = "test -e 1.3:" + app.getTestEndpoint(0);
+        String ref13 = "test -e 1.3:" + helper.getTestEndpoint(0);
         MyClassPrx cl13 = MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
         cl13.ice_ping();
         cl13.ice_pingAsync().join();
@@ -962,7 +957,7 @@
 
         out.print("testing protocol versioning... ");
         out.flush();
-        ref20 = "test -p 2.0:" + app.getTestEndpoint(0);
+        ref20 = "test -p 2.0:" + helper.getTestEndpoint(0);
         cl20 = MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
         try
         {
@@ -974,13 +969,13 @@
             // Server 2.0 proxy doesn't support 1.0 version.
         }
 
-        ref10 = "test -p 1.0:" + app.getTestEndpoint(0);
+        ref10 = "test -p 1.0:" + helper.getTestEndpoint(0);
         cl10 = MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
         cl10.ice_ping();
 
         // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
         // call will use the 1.1 protocol
-        ref13 = "test -p 1.3:" + app.getTestEndpoint(0);
+        ref13 = "test -p 1.3:" + helper.getTestEndpoint(0);
         cl13 = MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
         cl13.ice_ping();
         cl13.ice_pingAsync().join();
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
 import test.Ice.proxy.Test.MyClassPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        MyClassPrx myClass = AllTests.allTests(this);
-        myClass.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            MyClassPrx myClass = AllTests.allTests(this);
+            myClass.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Collocated app = new Collocated();
-        int result = app.main(" extends", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
@@ -56,13 +51,13 @@
         private boolean _called;
     }
 
-    public static RetryPrx allTests(test.Util.Application app,
+    public static RetryPrx allTests(test.TestHelper helper,
                                     com.zeroc.Ice.Communicator communicator,
                                     com.zeroc.Ice.Communicator communicator2,
                                     Instrumentation instrumentation,
                                     String ref)
     {
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
         com.zeroc.Ice.ObjectPrx base1 = communicator.stringToProxy(ref);
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,72 +1,43 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
 import test.Ice.retry.Test.RetryPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     private Instrumentation instrumentation = new Instrumentation();
 
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        com.zeroc.Ice.InitializationData initData2 = createInitializationData();
-        initData2.properties = communicator.getProperties()._clone();
-        initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = instrumentation.getObserver();
-        com.zeroc.Ice.Communicator communicator2 = initialize(initData2);
-
-        try
-        {
-            RetryPrx retry = AllTests.allTests(this, communicator, communicator2, instrumentation,
-                                               "retry:" + getTestEndpoint(0));
-            retry.shutdown();
-            return 0;
-        }
-        finally
-        {
-            communicator2.destroy();
-        }
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
         initData.observer = instrumentation.getObserver();
-
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-
         initData.properties.setProperty("Ice.RetryIntervals", "0 1 400 1");
-
         //
         // We don't want connection warnings because of the timeout
         //
         initData.properties.setProperty("Ice.Warn.Connections", "0");
 
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            //
+            // Configure a second communicator for the invocation timeout
+            // + retry test, we need to configure a large retry interval
+            // to avoid time-sensitive failures.
+            //
+            initData.properties = communicator.getProperties()._clone();
+            initData.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+
+            try(com.zeroc.Ice.Communicator communicator2 = initialize(initData))
+            {
+                RetryPrx retry = AllTests.allTests(this, communicator, communicator2, instrumentation,
+                                                   "retry:" + getTestEndpoint(0));
+                retry.shutdown();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
 import test.Ice.retry.Test.RetryPrx;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
     private Instrumentation instrumentation = new Instrumentation();
 
@@ -23,60 +18,37 @@
     }
 
     @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        com.zeroc.Ice.InitializationData initData2 = createInitializationData();
-        initData2.properties = communicator.getProperties()._clone();
-        initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = instrumentation.getObserver();
-        com.zeroc.Ice.Communicator communicator2 = initialize(initData2);
-
-        setupObjectAdapter(communicator);
-        setupObjectAdapter(communicator2);
-
-        try
-        {
-            RetryPrx retry = AllTests.allTests(this, communicator, communicator2, instrumentation, "retry");
-            retry.shutdown();
-            return 0;
-        }
-        finally
-        {
-            communicator2.destroy();
-        }
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
         initData.observer = instrumentation.getObserver();
-
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-
         initData.properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
-
         //
         // We don't want connection warnings because of the timeout
         //
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(initData))
+        {
+            //
+            // Configure a second communicator for the invocation timeout
+            // + retry test, we need to configure a large retry interval
+            // to avoid time-sensitive failures.
+            //
+            initData.properties = communicator.getProperties()._clone();
+            initData.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+            initData.observer = instrumentation.getObserver();
+            try(com.zeroc.Ice.Communicator communicator2 = initialize(initData))
+            {
+
+                setupObjectAdapter(communicator);
+                setupObjectAdapter(communicator2);
+
+                RetryPrx retry = AllTests.allTests(this, communicator, communicator2, instrumentation, "retry");
+                retry.shutdown();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Instrumentation.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Instrumentation.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Instrumentation.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Instrumentation.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/RetryI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/RetryI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/RetryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/RetryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new RetryI(), com.zeroc.Ice.Util.stringToIdentity("retry"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.retry");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new RetryI(), com.zeroc.Ice.Util.stringToIdentity("retry"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/SystemFailure.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/SystemFailure.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/SystemFailure.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/SystemFailure.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/retry/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/retry/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/AllTests.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,297 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.scope;
+
+import java.io.PrintWriter;
+
+public class AllTests
+{
+    private static void test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    public static void allTests(test.TestHelper helper)
+    {
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+
+        {
+            com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.IPrx i = test.Ice.scope.Test.IPrx.checkedCast(obj);
+
+            test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            test.Ice.scope.Test.I.OpSResult opSResult = i.opS(s1);
+            test(s1.equals(opSResult.returnValue));
+            test(s1.equals(opSResult.s2));
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            test.Ice.scope.Test.I.OpSSeqResult opSSeqResult = i.opSSeq(sseq1);
+            test(opSSeqResult.returnValue[0].equals(s1));
+            test(opSSeqResult.s2[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.I.OpSMapResult opSMapResult = i.opSMap(smap1);
+            test(opSMapResult.returnValue.get("a").equals(s1));
+            test(opSMapResult.s2.get("a").equals(s1));
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            test.Ice.scope.Test.I.OpCResult opCResult = i.opC(c1);
+            test(c1.s.equals(opCResult.returnValue.s));
+            test(c1.s.equals(opCResult.c2.s));
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            test.Ice.scope.Test.I.OpCSeqResult opCSeqResult = i.opCSeq(cseq1);
+            test(opCSeqResult.returnValue[0].s.equals(s1));
+            test(opCSeqResult.c2[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.I.OpCMapResult opCMapResult = i.opCMap(cmap1);
+            test(opCMapResult.returnValue.get("a").s.equals(s1));
+            test(opCMapResult.c2.get("a").s.equals(s1));
+        }
+
+        {
+            com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.IPrx i = test.Ice.scope.Test.IPrx.checkedCast(obj);
+
+            test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            test.Ice.scope.Test.I.OpSResult opSResult = i.opSAsync(s1).join();
+            test(s1.equals(opSResult.returnValue));
+            test(s1.equals(opSResult.s2));
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            test.Ice.scope.Test.I.OpSSeqResult opSSeqResult = i.opSSeqAsync(sseq1).join();
+            test(opSSeqResult.returnValue[0].equals(s1));
+            test(opSSeqResult.s2[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.I.OpSMapResult opSMapResult = i.opSMapAsync(smap1).join();
+            test(opSMapResult.returnValue.get("a").equals(s1));
+            test(opSMapResult.s2.get("a").equals(s1));
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            test.Ice.scope.Test.I.OpCResult opCResult = i.opCAsync(c1).join();
+            test(c1.s.equals(opCResult.returnValue.s));
+            test(c1.s.equals(opCResult.c2.s));
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            test.Ice.scope.Test.I.OpCSeqResult opCSeqResult = i.opCSeqAsync(cseq1).join();
+            test(opCSeqResult.returnValue[0].s.equals(s1));
+            test(opCSeqResult.c2[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.I.OpCMapResult opCMapResult = i.opCMapAsync(cmap1).join();
+            test(opCMapResult.returnValue.get("a").s.equals(s1));
+            test(opCMapResult.c2.get("a").s.equals(s1));
+        }
+
+        {
+            com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy("i2:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.IPrx i = test.Ice.scope.Test.Inner.IPrx.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.I.OpSResult opSResult = i.opS(s1);
+            test(s1.equals(opSResult.returnValue));
+            test(s1.equals(opSResult.s2));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.I.OpSSeqResult opSSeqResult = i.opSSeq(sseq1);
+            test(opSSeqResult.returnValue[0].equals(s1));
+            test(opSSeqResult.s2[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.I.OpSMapResult opSMapResult = i.opSMap(smap1);
+            test(opSMapResult.returnValue.get("a").equals(s1));
+            test(opSMapResult.s2.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.I.OpCResult opCResult = i.opC(c1);
+            test(c1.s.equals(opCResult.returnValue.s));
+            test(c1.s.equals(opCResult.c2.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.I.OpCSeqResult opCSeqResult = i.opCSeq(cseq1);
+            test(opCSeqResult.returnValue[0].s.equals(s1));
+            test(opCSeqResult.c2[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1
+                = new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.I.OpCMapResult opCMapResult = i.opCMap(cmap1);
+            test(opCMapResult.returnValue.get("a").s.equals(s1));
+            test(opCMapResult.c2.get("a").s.equals(s1));
+        }
+
+        {
+            com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy("i2:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.IPrx i = test.Ice.scope.Test.Inner.IPrx.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.I.OpSResult opSResult = i.opSAsync(s1).join();
+            test(s1.equals(opSResult.returnValue));
+            test(s1.equals(opSResult.s2));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.I.OpSSeqResult opSSeqResult = i.opSSeqAsync(sseq1).join();
+            test(opSSeqResult.returnValue[0].equals(s1));
+            test(opSSeqResult.s2[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.I.OpSMapResult opSMapResult = i.opSMapAsync(smap1).join();
+            test(opSMapResult.returnValue.get("a").equals(s1));
+            test(opSMapResult.s2.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.I.OpCResult opCResult = i.opCAsync(c1).join();
+            test(c1.s.equals(opCResult.returnValue.s));
+            test(c1.s.equals(opCResult.c2.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.I.OpCSeqResult opCSeqResult = i.opCSeqAsync(cseq1).join();
+            test(opCSeqResult.returnValue[0].s.equals(s1));
+            test(opCSeqResult.c2[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.I.OpCMapResult opCMapResult = i.opCMapAsync(cmap1).join();
+            test(opCMapResult.returnValue.get("a").s.equals(s1));
+            test(opCMapResult.c2.get("a").s.equals(s1));
+        }
+
+        {
+            com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.Inner2.IPrx i = test.Ice.scope.Test.Inner.Inner2.IPrx.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.Inner2.I.OpSResult opSResult = i.opS(s1);
+            test(s1.equals(opSResult.returnValue));
+            test(s1.equals(opSResult.s2));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.Inner2.I.OpSSeqResult opSSeqResult = i.opSSeq(sseq1);
+            test(opSSeqResult.returnValue[0].equals(s1));
+            test(opSSeqResult.s2[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.Inner2.I.OpSMapResult opSMapResult = i.opSMap(smap1);
+            test(opSMapResult.returnValue.get("a").equals(s1));
+            test(opSMapResult.s2.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.Inner2.I.OpCResult opCResult = i.opC(c1);
+            test(c1.s.equals(opCResult.returnValue.s));
+            test(c1.s.equals(opCResult.c2.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.Inner2.I.OpCSeqResult opCSeqResult = i.opCSeq(cseq1);
+            test(opCSeqResult.returnValue[0].s.equals(s1));
+            test(opCSeqResult.c2[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1
+                = new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.Inner2.I.OpCMapResult opCMapResult = i.opCMap(cmap1);
+            test(opCMapResult.returnValue.get("a").s.equals(s1));
+            test(opCMapResult.c2.get("a").s.equals(s1));
+        }
+
+        {
+            com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.Inner2.IPrx i = test.Ice.scope.Test.Inner.Inner2.IPrx.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.Inner2.I.OpSResult opSResult = i.opSAsync(s1).join();
+            test(s1.equals(opSResult.returnValue));
+            test(s1.equals(opSResult.s2));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.Inner2.I.OpSSeqResult opSSeqResult = i.opSSeqAsync(sseq1).join();
+            test(opSSeqResult.returnValue[0].equals(s1));
+            test(opSSeqResult.s2[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.Inner2.I.OpSMapResult opSMapResult = i.opSMapAsync(smap1).join();
+            test(opSMapResult.returnValue.get("a").equals(s1));
+            test(opSMapResult.s2.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.Inner2.I.OpCResult opCResult = i.opCAsync(c1).join();
+            test(c1.s.equals(opCResult.returnValue.s));
+            test(c1.s.equals(opCResult.c2.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.Inner2.I.OpCSeqResult opCSeqResult = i.opCSeqAsync(cseq1).join();
+            test(opCSeqResult.returnValue[0].s.equals(s1));
+            test(opCSeqResult.c2[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.Inner2.I.OpCMapResult opCMapResult = i.opCMapAsync(cmap1).join();
+            test(opCMapResult.returnValue.get("a").s.equals(s1));
+            test(opCMapResult.c2.get("a").s.equals(s1));
+        }
+
+        {
+            com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy("i4:" + helper.getTestEndpoint());
+            test.Ice.scope.Inner.Test.Inner2.IPrx i = test.Ice.scope.Inner.Test.Inner2.IPrx.checkedCast(obj);
+
+            test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            test.Ice.scope.Inner.Test.Inner2.I.OpSResult opSResult = i.opSAsync(s1).join();
+            test(s1.equals(opSResult.returnValue));
+            test(s1.equals(opSResult.s2));
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            test.Ice.scope.Inner.Test.Inner2.I.OpSSeqResult opSSeqResult = i.opSSeqAsync(sseq1).join();
+            test(opSSeqResult.returnValue[0].equals(s1));
+            test(opSSeqResult.s2[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Inner.Test.Inner2.I.OpSMapResult opSMapResult = i.opSMapAsync(smap1).join();
+            test(opSMapResult.returnValue.get("a").equals(s1));
+            test(opSMapResult.s2.get("a").equals(s1));
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            test.Ice.scope.Inner.Test.Inner2.I.OpCResult opCResult = i.opCAsync(c1).join();
+            test(c1.s.equals(opCResult.returnValue.s));
+            test(c1.s.equals(opCResult.c2.s));
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            test.Ice.scope.Inner.Test.Inner2.I.OpCSeqResult opCSeqResult = i.opCSeqAsync(cseq1).join();
+            test(opCSeqResult.returnValue[0].s.equals(s1));
+            test(opCSeqResult.c2[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Inner.Test.Inner2.I.OpCMapResult opCMapResult = i.opCMapAsync(cmap1).join();
+            test(opCMapResult.returnValue.get("a").s.equals(s1));
+            test(opCMapResult.c2.get("a").s.equals(s1));
+        }
+
+        {
+            test.Ice.scope.Test.IPrx i =
+                test.Ice.scope.Test.IPrx.checkedCast(communicator.stringToProxy("i1:" + helper.getTestEndpoint()));
+            i.shutdown();
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/Client.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,22 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.scope;
+
+public class Client extends test.TestHelper
+{
+    public void run(String[] args)
+    {
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.scope");
+        java.io.PrintWriter out = getWriter();
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            out.print("test same Slice type name in different scopes... ");
+            out.flush();
+            AllTests.allTests(this);
+            out.println("ok");
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/Server.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,282 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.scope;
+
+public class Server extends test.TestHelper
+{
+    class I1 implements test.Ice.scope.Test.I
+    {
+        public test.Ice.scope.Test.I.OpSResult
+        opS(test.Ice.scope.Test.S s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.I.OpSResult result = new test.Ice.scope.Test.I.OpSResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.I.OpSSeqResult
+        opSSeq(test.Ice.scope.Test.S[] s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.I.OpSSeqResult result = new test.Ice.scope.Test.I.OpSSeqResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.I.OpSMapResult
+        opSMap(java.util.Map<String, test.Ice.scope.Test.S> s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.I.OpSMapResult result = new test.Ice.scope.Test.I.OpSMapResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.I.OpCResult
+        opC(test.Ice.scope.Test.C c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.I.OpCResult result = new test.Ice.scope.Test.I.OpCResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.I.OpCSeqResult
+        opCSeq(test.Ice.scope.Test.C[] c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.I.OpCSeqResult result = new test.Ice.scope.Test.I.OpCSeqResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.I.OpCMapResult
+        opCMap(java.util.Map<String, test.Ice.scope.Test.C> c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.I.OpCMapResult result = new test.Ice.scope.Test.I.OpCMapResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public void shutdown(com.zeroc.Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    class I2 implements test.Ice.scope.Test.Inner.I
+    {
+        public test.Ice.scope.Test.Inner.I.OpSResult
+        opS(test.Ice.scope.Test.Inner.Inner2.S s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.I.OpSResult result = new test.Ice.scope.Test.Inner.I.OpSResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.I.OpSSeqResult
+        opSSeq(test.Ice.scope.Test.Inner.Inner2.S[] s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.I.OpSSeqResult result = new test.Ice.scope.Test.Inner.I.OpSSeqResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.I.OpSMapResult
+        opSMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.I.OpSMapResult result = new test.Ice.scope.Test.Inner.I.OpSMapResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.I.OpCResult
+        opC(test.Ice.scope.Test.Inner.Inner2.C c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.I.OpCResult result = new test.Ice.scope.Test.Inner.I.OpCResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.I.OpCSeqResult
+        opCSeq(test.Ice.scope.Test.Inner.Inner2.C[] c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.I.OpCSeqResult result = new test.Ice.scope.Test.Inner.I.OpCSeqResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.I.OpCMapResult
+        opCMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.I.OpCMapResult result = new test.Ice.scope.Test.Inner.I.OpCMapResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public void shutdown(com.zeroc.Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    class I3 implements test.Ice.scope.Test.Inner.Inner2.I
+    {
+        public test.Ice.scope.Test.Inner.Inner2.I.OpSResult
+        opS(test.Ice.scope.Test.Inner.Inner2.S s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.Inner2.I.OpSResult result = new test.Ice.scope.Test.Inner.Inner2.I.OpSResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.I.OpSSeqResult
+        opSSeq(test.Ice.scope.Test.Inner.Inner2.S[] s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.Inner2.I.OpSSeqResult result =
+                new test.Ice.scope.Test.Inner.Inner2.I.OpSSeqResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.I.OpSMapResult
+        opSMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.Inner2.I.OpSMapResult result =
+                new test.Ice.scope.Test.Inner.Inner2.I.OpSMapResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.I.OpCResult
+        opC(test.Ice.scope.Test.Inner.Inner2.C c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.Inner2.I.OpCResult result = new test.Ice.scope.Test.Inner.Inner2.I.OpCResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.I.OpCSeqResult
+        opCSeq(test.Ice.scope.Test.Inner.Inner2.C[] c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.Inner2.I.OpCSeqResult result =
+                new test.Ice.scope.Test.Inner.Inner2.I.OpCSeqResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.I.OpCMapResult
+        opCMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Test.Inner.Inner2.I.OpCMapResult result
+                = new test.Ice.scope.Test.Inner.Inner2.I.OpCMapResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public void shutdown(com.zeroc.Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    class I4 implements test.Ice.scope.Inner.Test.Inner2.I
+    {
+        public test.Ice.scope.Inner.Test.Inner2.I.OpSResult
+        opS(test.Ice.scope.Test.S s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Inner.Test.Inner2.I.OpSResult result = new test.Ice.scope.Inner.Test.Inner2.I.OpSResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Inner.Test.Inner2.I.OpSSeqResult
+        opSSeq(test.Ice.scope.Test.S[] s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Inner.Test.Inner2.I.OpSSeqResult result =
+                new test.Ice.scope.Inner.Test.Inner2.I.OpSSeqResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Inner.Test.Inner2.I.OpSMapResult
+        opSMap(java.util.Map<String, test.Ice.scope.Test.S> s1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Inner.Test.Inner2.I.OpSMapResult result =
+                new test.Ice.scope.Inner.Test.Inner2.I.OpSMapResult();
+            result.returnValue = s1;
+            result.s2 = s1;
+            return result;
+        }
+
+        public test.Ice.scope.Inner.Test.Inner2.I.OpCResult
+        opC(test.Ice.scope.Test.C c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Inner.Test.Inner2.I.OpCResult result = new test.Ice.scope.Inner.Test.Inner2.I.OpCResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Inner.Test.Inner2.I.OpCSeqResult
+        opCSeq(test.Ice.scope.Test.C[] c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Inner.Test.Inner2.I.OpCSeqResult result =
+                new test.Ice.scope.Inner.Test.Inner2.I.OpCSeqResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public test.Ice.scope.Inner.Test.Inner2.I.OpCMapResult
+        opCMap(java.util.Map<String, test.Ice.scope.Test.C> c1, com.zeroc.Ice.Current current)
+        {
+            test.Ice.scope.Inner.Test.Inner2.I.OpCMapResult result =
+                new test.Ice.scope.Inner.Test.Inner2.I.OpCMapResult();
+            result.returnValue = c1;
+            result.c2 = c1;
+            return result;
+        }
+
+        public void shutdown(com.zeroc.Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    public void run(String[] args)
+    {
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.scope");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new I1(), com.zeroc.Ice.Util.stringToIdentity("i1"));
+            adapter.add(new I2(), com.zeroc.Ice.Util.stringToIdentity("i2"));
+            adapter.add(new I3(), com.zeroc.Ice.Util.stringToIdentity("i3"));
+            adapter.add(new I4(), com.zeroc.Ice.Util.stringToIdentity("i4"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,137 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["java:package:test.Ice.scope"]]
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq c1, out CSeq c2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
@@ -15,12 +10,12 @@
 
 public class AllTests
 {
-    public static MyClassPrx allTests(test.Util.Application app, boolean collocated)
+    public static MyClassPrx allTests(test.TestHelper helper, boolean collocated)
     {
-        PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx baseProxy = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrx.checkedCast(baseProxy);
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
     @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMyClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping.AMD");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMyClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
 import test.Ice.seqMapping.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         java.io.PrintWriter out = getWriter();
 
-        MyClassPrx myClass = AllTests.allTests(this, false);
-
-        out.print("shutting down server... ");
-        out.flush();
-        myClass.shutdown();
-        out.println("ok");
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            MyClassPrx myClass = AllTests.allTests(this, false);
+
+            out.print("shutting down server... ");
+            out.flush();
+            myClass.shutdown();
+            out.println("ok");
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         java.io.PrintWriter out = getWriter();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this, true);
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+            AllTests.allTests(this, true);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/MyClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.add(new MyClassI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Twoways.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Twoways.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/seqMapping/Twoways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/seqMapping/Twoways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 
@@ -23,12 +18,12 @@
         }
     }
 
-    public static InitialPrx allTests(test.Util.Application app, boolean collocated)
+    public static InitialPrx allTests(test.TestHelper helper, boolean collocated)
     {
-        PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         InitialPrx initial = InitialPrx.checkedCast(base);
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 
 import test.Ice.serialize.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         java.io.PrintWriter out = getWriter();
-        InitialPrx initial = AllTests.allTests(this, false);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this, false);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/InitialI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/InitialI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Identity ident = com.zeroc.Ice.Util.stringToIdentity("initial");
-        com.zeroc.Ice.Object object = new InitialI(adapter, ident);
-        adapter.add(object, ident);
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Identity ident = com.zeroc.Ice.Util.stringToIdentity("initial");
+            adapter.add(new InitialI(adapter, ident), ident);
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/serialize/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/serialize/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
@@ -203,13 +198,13 @@
         }
     }
 
-    public static TestIntfPrx allTests(test.Util.Application app)
+    public static TestIntfPrx allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "asm:" + app.getTestEndpoint(0);
+        String ref = "asm:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -225,7 +220,7 @@
         out.flush();
         try
         {
-            ObjectPrx o = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
+            ObjectPrx o = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
             o.ice_ids();
             test(false);
         }
@@ -240,7 +235,7 @@
 
         try
         {
-            ObjectPrx o = communicator.stringToProxy("category/finished:" + app.getTestEndpoint(0));
+            ObjectPrx o = communicator.stringToProxy("category/finished:" + helper.getTestEndpoint(0));
             o.ice_ids();
             test(false);
         }
@@ -256,11 +251,11 @@
 
         out.print("testing servant locator... ");
         out.flush();
-        base = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrx.checkedCast(base);
         try
         {
-            TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:" + app.getTestEndpoint(0)));
+            TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:" + helper.getTestEndpoint(0)));
         }
         catch(ObjectNotExistException ex)
         {
@@ -269,20 +264,20 @@
 
         out.print("testing default servant locator... ");
         out.flush();
-        base = communicator.stringToProxy("anothercat/locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("anothercat/locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrx.checkedCast(base);
-        base = communicator.stringToProxy("locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrx.checkedCast(base);
         try
         {
-            TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:" + app.getTestEndpoint(0)));
+            TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:" + helper.getTestEndpoint(0)));
         }
         catch(ObjectNotExistException ex)
         {
         }
         try
         {
-            TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:" + app.getTestEndpoint(0)));
+            TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:" + helper.getTestEndpoint(0)));
         }
         catch(ObjectNotExistException ex)
         {
@@ -291,14 +286,14 @@
 
         out.print("testing locate exceptions... ");
         out.flush();
-        base = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrx.checkedCast(base);
         testExceptions(obj);
         out.println("ok");
 
         out.print("testing finished exceptions... ");
         out.flush();
-        base = communicator.stringToProxy("category/finished:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("category/finished:" + helper.getTestEndpoint(0));
         obj = TestIntfPrx.checkedCast(base);
         testExceptions(obj);
 
@@ -342,7 +337,7 @@
 
         out.print("testing servant locator removal... ");
         out.flush();
-        base = communicator.stringToProxy("test/activation:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("test/activation:" + helper.getTestEndpoint(0));
         TestActivationPrx activation = TestActivationPrx.checkedCast(base);
         activation.activateServantLocator(false);
         try
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new AMDServantLocatorI("category"), "category");
-        adapter.addServantLocator(new AMDServantLocatorI(""), "");
-        adapter.add(new AMDTestI(), com.zeroc.Ice.Util.stringToIdentity("asm"));
-        adapter.add(new AMDTestActivationI(), com.zeroc.Ice.Util.stringToIdentity("test/activation"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new AMDServantLocatorI("category"), "category");
+            adapter.addServantLocator(new AMDServantLocatorI(""), "");
+            adapter.add(new AMDTestI(), com.zeroc.Ice.Util.stringToIdentity("asm"));
+            adapter.add(new AMDTestActivationI(), com.zeroc.Ice.Util.stringToIdentity("test/activation"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/AMDTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
 import test.Ice.servantLocator.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        TestIntfPrx obj = AllTests.allTests(this);
-        obj.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx obj = AllTests.allTests(this);
+            obj.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Collocated.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Collocated.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
     @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        adapter.addServantLocator(new ServantLocatorI(""), "");
-        adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("asm"));
-        adapter.add(new TestActivationI(), com.zeroc.Ice.Util.stringToIdentity("test/activation"));
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI("category"), "category");
+            adapter.addServantLocator(new ServantLocatorI(""), "");
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("asm"));
+            adapter.add(new TestActivationI(), com.zeroc.Ice.Util.stringToIdentity("test/activation"));
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/CookieI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/CookieI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/CookieI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/CookieI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        adapter.addServantLocator(new ServantLocatorI(""), "");
-        adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("asm"));
-        adapter.add(new TestActivationI(), com.zeroc.Ice.Util.stringToIdentity("test/activation"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI("category"), "category");
+            adapter.addServantLocator(new ServantLocatorI(""), "");
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("asm"));
+            adapter.add(new TestActivationI(), com.zeroc.Ice.Util.stringToIdentity("test/activation"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/TestActivationI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/servantLocator/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/servantLocator/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
@@ -105,14 +100,14 @@
         }
     }
 
-    public static TestIntfPrx allTests(test.Util.Application app, boolean collocated)
+    public static TestIntfPrx allTests(test.TestHelper helper, boolean collocated)
     {
-        java.io.PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        java.io.PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "Test:" + app.getTestEndpoint(0) + " -t 10000";
+        String ref = "Test:" + helper.getTestEndpoint(0) + " -t 10000";
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new AMDTestI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.serverAMD");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.serverAMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDTestI(), com.zeroc.Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
 import test.Ice.slicing.exceptions.client.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        TestIntfPrx test = AllTests.allTests(this, false);
-        test.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.client");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.client");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this, false);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new TestI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.server");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.server");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/exceptions/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
@@ -109,14 +104,14 @@
         public T v;
     }
 
-    public static TestIntfPrx allTests(test.Util.Application app, boolean collocated)
+    public static TestIntfPrx allTests(test.TestHelper helper, boolean collocated)
     {
-        PrintWriter out = app.getWriter();
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "Test:" + app.getTestEndpoint(0) + " -t 10000";
+        String ref = "Test:" + helper.getTestEndpoint(0) + " -t 10000";
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new AMDTestI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.serverAMD");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.serverAMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDTestI(), com.zeroc.Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
 import test.Ice.slicing.objects.client.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        TestIntfPrx test = AllTests.allTests(this, false);
-        test.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.client");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.client");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this, false);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new TestI();
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.server");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints",
-                                          getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.server");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), com.zeroc.Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/slicing/objects/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/slicing/objects/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/stream/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/stream/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/stream/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/stream/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.stream;
 
@@ -15,16 +10,8 @@
 import com.zeroc.Ice.OutputStream;
 import test.Ice.stream.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     private static class TestObjectWriter extends com.zeroc.Ice.ValueWriter
     {
         TestObjectWriter(MyClass obj)
@@ -100,711 +87,697 @@
         private com.zeroc.Ice.ValueFactory _factory;
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator comm = communicator();
-        MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
-        comm.getValueFactoryManager().add(factoryWrapper, MyClass.ice_staticId());
-
-        InputStream in;
-        OutputStream out;
-
-        PrintWriter printWriter = getWriter();
-        printWriter.print("testing primitive types... ");
-        printWriter.flush();
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.stream");
 
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            byte[] data = new byte[0];
-            in = new InputStream(comm, data);
-        }
+            MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
+            communicator.getValueFactoryManager().add(factoryWrapper, MyClass.ice_staticId());
 
-        {
-            out = new OutputStream(comm);
-            out.startEncapsulation();
-            out.writeBool(true);
-            out.endEncapsulation();
-            byte[] data = out.finished();
-
-            in = new InputStream(comm, data);
-            in.startEncapsulation();
-            test(in.readBool());
-            in.endEncapsulation();
-        }
+            InputStream in;
+            OutputStream out;
+
+            PrintWriter printWriter = getWriter();
+            printWriter.print("testing primitive types... ");
+            printWriter.flush();
 
-        {
-            byte[] data = new byte[0];
-            in = new InputStream(comm, data);
-            try
-            {
-                in.readBool();
-                test(false);
-            }
-            catch(com.zeroc.Ice.UnmarshalOutOfBoundsException ex)
             {
+                byte[] data = new byte[0];
+                in = new InputStream(communicator, data);
             }
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeBool(true);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readBool());
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeByte((byte)1);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readByte() == (byte)1);
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeShort((short)2);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readShort() == (short)2);
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeInt(3);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readInt() == 3);
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeLong(4);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readLong() == 4);
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeFloat((float)5.0);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readFloat() == (float)5.0);
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeDouble(6.0);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readDouble() == 6.0);
-        }
-
-        {
-            out = new OutputStream(comm);
-            out.writeString("hello world");
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(in.readString().equals("hello world"));
-        }
-
-        printWriter.println("ok");
 
-        printWriter.print("testing constructed types... ");
-        printWriter.flush();
-
-        {
-            out = new OutputStream(comm);
-            MyEnum.ice_write(out, MyEnum.enum3);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test(MyEnum.ice_read(in) == MyEnum.enum3);
-        }
+            {
+                out = new OutputStream(communicator);
+                out.startEncapsulation();
+                out.writeBool(true);
+                out.endEncapsulation();
+                byte[] data = out.finished();
 
-        {
-            out = new OutputStream(comm);
-            SmallStruct s = new SmallStruct();
-            s.bo = true;
-            s.by = (byte)1;
-            s.sh = (short)2;
-            s.i = 3;
-            s.l = 4;
-            s.f = (float)5.0;
-            s.d = 6.0;
-            s.str = "7";
-            s.e = MyEnum.enum2;
-            s.p = MyInterfacePrx.uncheckedCast(comm.stringToProxy("test:default"));
-            SmallStruct.ice_write(out, s);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            SmallStruct s2 = SmallStruct.ice_read(in);
-            test(s2.equals(s));
-        }
+                in = new InputStream(communicator, data);
+                in.startEncapsulation();
+                test(in.readBool());
+                in.endEncapsulation();
+            }
 
-        {
-            out = new OutputStream(comm);
-            OptionalClass o = new OptionalClass();
-            o.bo = true;
-            o.by = (byte)5;
-            o.setSh((short)4);
-            o.setI(3);
-            out.writeValue(o);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            final Wrapper<OptionalClass> cb = new Wrapper<>();
-            in.readValue(value -> cb.obj = value, OptionalClass.class);
-            in.readPendingValues();
-            OptionalClass o2 = cb.obj;
-            test(o2.bo == o.bo);
-            test(o2.by == o.by);
-            if(comm.getProperties().getProperty("Ice.Default.EncodingVersion").equals("1.0"))
             {
-                test(!o2.hasSh());
-                test(!o2.hasI());
+                byte[] data = new byte[0];
+                in = new InputStream(communicator, data);
+                try
+                {
+                    in.readBool();
+                    test(false);
+                }
+                catch(com.zeroc.Ice.UnmarshalOutOfBoundsException ex)
+                {
+                }
             }
-            else
+
             {
-                test(o2.getSh() == o.getSh());
-                test(o2.getI() == o.getI());
+                out = new OutputStream(communicator);
+                out.writeBool(true);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readBool());
             }
-        }
-
-        {
-            out = new OutputStream(comm, com.zeroc.Ice.Util.Encoding_1_0);
-            OptionalClass o = new OptionalClass();
-            o.bo = true;
-            o.by = (byte)5;
-            o.setSh((short)4);
-            o.setI(3);
-            out.writeValue(o);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new InputStream(comm, com.zeroc.Ice.Util.Encoding_1_0, data);
-            final Wrapper<OptionalClass> cb = new Wrapper<>();
-            in.readValue(value -> cb.obj = value, OptionalClass.class);
-            in.readPendingValues();
-            OptionalClass o2 = cb.obj;
-            test(o2.bo == o.bo);
-            test(o2.by == o.by);
-            test(!o2.hasSh());
-            test(!o2.hasI());
-        }
 
-        {
-            final boolean[] arr =
             {
-                true,
-                false,
-                true,
-                false
-            };
-            out = new OutputStream(comm);
-            out.writeBoolSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            boolean[] arr2 = in.readBoolSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final boolean[][] arrS =
-            {
-                arr,
-                new boolean[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            BoolSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            boolean[][] arr2S = BoolSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new OutputStream(communicator);
+                out.writeByte((byte)1);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readByte() == (byte)1);
+            }
 
-        {
-            final byte[] arr =
             {
-                (byte)0x01,
-                (byte)0x11,
-                (byte)0x12,
-                (byte)0x22
-            };
-            out = new OutputStream(comm);
-            out.writeByteSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            byte[] arr2 = in.readByteSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final byte[][] arrS =
-            {
-                arr,
-                new byte[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            ByteSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            byte[][] arr2S = ByteSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
-
-        {
-            test.Ice.stream.Serialize.Small small = new test.Ice.stream.Serialize.Small();
-            small.i = 99;
-            out = new OutputStream(comm);
-            out.writeSerializable(small);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            test.Ice.stream.Serialize.Small small2 = in.readSerializable(test.Ice.stream.Serialize.Small.class);
-            test(small2.i == 99);
-        }
+                out = new OutputStream(communicator);
+                out.writeShort((short)2);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readShort() == (short)2);
+            }
 
-        {
-            final short[] arr =
             {
-                (short)0x01,
-                (short)0x11,
-                (short)0x12,
-                (short)0x22
-            };
-            out = new OutputStream(comm);
-            out.writeShortSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            short[] arr2 = in.readShortSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final short[][] arrS =
-            {
-                arr,
-                new short[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            ShortSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            short[][] arr2S = ShortSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new OutputStream(communicator);
+                out.writeInt(3);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readInt() == 3);
+            }
 
-        {
-            final int[] arr =
             {
-                0x01,
-                0x11,
-                0x12,
-                0x22
-            };
-            out = new OutputStream(comm);
-            out.writeIntSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            int[] arr2 = in.readIntSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final int[][] arrS =
-            {
-                arr,
-                new int[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            IntSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            int[][] arr2S = IntSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new OutputStream(communicator);
+                out.writeLong(4);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readLong() == 4);
+            }
 
-        {
-            final long[] arr =
             {
-                0x01,
-                0x11,
-                0x12,
-                0x22
-            };
-            out = new OutputStream(comm);
-            out.writeLongSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            long[] arr2 = in.readLongSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final long[][] arrS =
-            {
-                arr,
-                new long[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            LongSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            long[][] arr2S = LongSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new OutputStream(communicator);
+                out.writeFloat((float)5.0);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readFloat() == (float)5.0);
+            }
 
-        {
-            final float[] arr =
             {
-                1,
-                2,
-                3,
-                4
-            };
-            out = new OutputStream(comm);
-            out.writeFloatSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            float[] arr2 = in.readFloatSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final float[][] arrS =
-            {
-                arr,
-                new float[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            FloatSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            float[][] arr2S = FloatSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new OutputStream(communicator);
+                out.writeDouble(6.0);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readDouble() == 6.0);
+            }
 
-        {
-            final double[] arr =
             {
-                1,
-                2,
-                3,
-                4
-            };
-            out = new OutputStream(comm);
-            out.writeDoubleSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            double[] arr2 = in.readDoubleSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final double[][] arrS =
-            {
-                arr,
-                new double[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            DoubleSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            double[][] arr2S = DoubleSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new OutputStream(communicator);
+                out.writeString("hello world");
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(in.readString().equals("hello world"));
+            }
 
-        {
-            final String[] arr =
-            {
-                "string1",
-                "string2",
-                "string3",
-                "string4"
-            };
-            out = new OutputStream(comm);
-            out.writeStringSeq(arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            String[] arr2 = in.readStringSeq();
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final String[][] arrS =
-            {
-                arr,
-                new String[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            StringSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            String[][] arr2S = StringSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+            printWriter.println("ok");
 
-        {
-            final MyEnum[] arr =
-            {
-                MyEnum.enum3,
-                MyEnum.enum2,
-                MyEnum.enum1,
-                MyEnum.enum2
-            };
-            out = new OutputStream(comm);
-            MyEnumSHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            MyEnum[] arr2 = MyEnumSHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final MyEnum[][] arrS =
-            {
-                arr,
-                new MyEnum[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            MyEnumSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            MyEnum[][] arr2S = MyEnumSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+            printWriter.print("testing constructed types... ");
+            printWriter.flush();
 
-        {
-            MyClass[] arr = new MyClass[4];
-            for(int i = 0; i < arr.length; ++i)
             {
-                arr[i] = new MyClass();
-                arr[i].c = arr[i];
-                arr[i].o = arr[i];
-                arr[i].s = new SmallStruct();
-                arr[i].s.e = MyEnum.enum2;
-                arr[i].seq1 = new boolean[] { true, false, true, false };
-                arr[i].seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
-                arr[i].seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
-                arr[i].seq4 = new int[] { 1, 2, 3, 4 };
-                arr[i].seq5 = new long[] { 1, 2, 3, 4 };
-                arr[i].seq6 = new float[] { 1, 2, 3, 4 };
-                arr[i].seq7 = new double[] { 1, 2, 3, 4 };
-                arr[i].seq8 = new String[] { "string1", "string2", "string3", "string4" };
-                arr[i].seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
-                arr[i].seq10 = new MyClass[4]; // null elements.
-                arr[i].d = new java.util.HashMap<>();
-                arr[i].d.put("hi", arr[i]);
-            }
-            out = new OutputStream(comm);
-            MyClassSHelper.write(out, arr);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            MyClass[] arr2 = MyClassSHelper.read(in);
-            in.readPendingValues();
-            test(arr2.length == arr.length);
-            for(int i = 0; i < arr2.length; ++i)
-            {
-                test(arr2[i] != null);
-                test(arr2[i].c == arr2[i]);
-                test(arr2[i].o == arr2[i]);
-                test(arr2[i].s.e == MyEnum.enum2);
-                test(java.util.Arrays.equals(arr2[i].seq1, arr[i].seq1));
-                test(java.util.Arrays.equals(arr2[i].seq2, arr[i].seq2));
-                test(java.util.Arrays.equals(arr2[i].seq3, arr[i].seq3));
-                test(java.util.Arrays.equals(arr2[i].seq4, arr[i].seq4));
-                test(java.util.Arrays.equals(arr2[i].seq5, arr[i].seq5));
-                test(java.util.Arrays.equals(arr2[i].seq6, arr[i].seq6));
-                test(java.util.Arrays.equals(arr2[i].seq7, arr[i].seq7));
-                test(java.util.Arrays.equals(arr2[i].seq8, arr[i].seq8));
-                test(java.util.Arrays.equals(arr2[i].seq9, arr[i].seq9));
-                test(arr2[i].d.get("hi") == arr2[i]);
-            }
-
-            final MyClass[][] arrS =
-            {
-                arr,
-                new MyClass[0],
-                arr
-            };
-            out = new OutputStream(comm);
-            MyClassSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new InputStream(comm, data);
-            MyClass[][] arr2S = MyClassSSHelper.read(in);
-            test(arr2S.length == arrS.length);
-            test(arr2S[0].length == arrS[0].length);
-            test(arr2S[1].length == arrS[1].length);
-            test(arr2S[2].length == arrS[2].length);
-        }
-
-        {
-            out = new OutputStream(comm);
-            MyClass obj = new MyClass();
-            obj.s = new SmallStruct();
-            obj.s.e = MyEnum.enum2;
-            TestObjectWriter writer = new TestObjectWriter(obj);
-            out.writeValue(writer);
-            out.writePendingValues();
-            out.finished();
-            test(writer.called);
-        }
-
-        {
-            out = new OutputStream(comm);
-            MyClass obj = new MyClass();
-            obj.s = new SmallStruct();
-            obj.s.e = MyEnum.enum2;
-            TestObjectWriter writer = new TestObjectWriter(obj);
-            out.writeValue(writer);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            test(writer.called);
-            factoryWrapper.setFactory(new TestValueFactory());
-            in = new InputStream(comm, data);
-            final Wrapper<TestObjectReader> cb = new Wrapper<>();
-            in.readValue(value -> cb.obj = value, TestObjectReader.class);
-            in.readPendingValues();
-            test(cb.obj != null);
-            TestObjectReader reader = cb.obj;
-            test(reader.called);
-            test(reader.obj != null);
-            test(reader.obj.s.e == MyEnum.enum2);
-            factoryWrapper.setFactory(null);
-        }
-
-        {
-            out = new OutputStream(comm);
-            MyException ex = new MyException();
-
-            MyClass c = new MyClass();
-            c.c = c;
-            c.o = c;
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum2;
-            c.seq1 = new boolean[] { true, false, true, false };
-            c.seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
-            c.seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
-            c.seq4 = new int[] { 1, 2, 3, 4 };
-            c.seq5 = new long[] { 1, 2, 3, 4 };
-            c.seq6 = new float[] { 1, 2, 3, 4 };
-            c.seq7 = new double[] { 1, 2, 3, 4 };
-            c.seq8 = new String[] { "string1", "string2", "string3", "string4" };
-            c.seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
-            c.seq10 = new MyClass[4]; // null elements.
-            c.d = new java.util.HashMap<>();
-            c.d.put("hi", c);
-
-            ex.c = c;
-
-            out.writeException(ex);
-            byte[] data = out.finished();
-
-            in = new InputStream(comm, data);
-            try
-            {
-                in.throwException();
-                test(false);
-            }
-            catch(MyException ex1)
-            {
-                test(ex1.c.s.e == c.s.e);
-                test(java.util.Arrays.equals(ex1.c.seq1, c.seq1));
-                test(java.util.Arrays.equals(ex1.c.seq2, c.seq2));
-                test(java.util.Arrays.equals(ex1.c.seq3, c.seq3));
-                test(java.util.Arrays.equals(ex1.c.seq4, c.seq4));
-                test(java.util.Arrays.equals(ex1.c.seq5, c.seq5));
-                test(java.util.Arrays.equals(ex1.c.seq6, c.seq6));
-                test(java.util.Arrays.equals(ex1.c.seq7, c.seq7));
-                test(java.util.Arrays.equals(ex1.c.seq8, c.seq8));
-                test(java.util.Arrays.equals(ex1.c.seq9, c.seq9));
+                out = new OutputStream(communicator);
+                MyEnum.ice_write(out, MyEnum.enum3);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test(MyEnum.ice_read(in) == MyEnum.enum3);
             }
-            catch(com.zeroc.Ice.UserException ex1)
+
             {
-                test(false);
+                out = new OutputStream(communicator);
+                SmallStruct s = new SmallStruct();
+                s.bo = true;
+                s.by = (byte)1;
+                s.sh = (short)2;
+                s.i = 3;
+                s.l = 4;
+                s.f = (float)5.0;
+                s.d = 6.0;
+                s.str = "7";
+                s.e = MyEnum.enum2;
+                s.p = MyInterfacePrx.uncheckedCast(communicator.stringToProxy("test:default"));
+                SmallStruct.ice_write(out, s);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                SmallStruct s2 = SmallStruct.ice_read(in);
+                test(s2.equals(s));
             }
-        }
-
-        {
-            java.util.Map<Byte, Boolean> dict = new java.util.HashMap<>();
-            dict.put((byte)4, true);
-            dict.put((byte)1, false);
-            out = new OutputStream(comm);
-            ByteBoolDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new InputStream(comm, data);
-            java.util.Map<Byte, Boolean> dict2 = ByteBoolDHelper.read(in);
-            test(dict2.equals(dict));
-        }
 
-        {
-            java.util.Map<Short, Integer> dict = new java.util.HashMap<>();
-            dict.put((short)1, 9);
-            dict.put((short)4, 8);
-            out = new OutputStream(comm);
-            ShortIntDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new InputStream(comm, data);
-            java.util.Map<Short, Integer> dict2 = ShortIntDHelper.read(in);
-            test(dict2.equals(dict));
-        }
+            {
+                out = new OutputStream(communicator);
+                OptionalClass o = new OptionalClass();
+                o.bo = true;
+                o.by = (byte)5;
+                o.setSh((short)4);
+                o.setI(3);
+                out.writeValue(o);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                final Wrapper<OptionalClass> cb = new Wrapper<>();
+                in.readValue(value -> cb.obj = value, OptionalClass.class);
+                in.readPendingValues();
+                OptionalClass o2 = cb.obj;
+                test(o2.bo == o.bo);
+                test(o2.by == o.by);
+                if(communicator.getProperties().getProperty("Ice.Default.EncodingVersion").equals("1.0"))
+                {
+                    test(!o2.hasSh());
+                    test(!o2.hasI());
+                }
+                else
+                {
+                    test(o2.getSh() == o.getSh());
+                    test(o2.getI() == o.getI());
+                }
+            }
 
-        {
-            java.util.Map<Long, Float> dict = new java.util.HashMap<>();
-            dict.put((long)123809828, 0.51f);
-            dict.put((long)123809829, 0.56f);
-            out = new OutputStream(comm);
-            LongFloatDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new InputStream(comm, data);
-            java.util.Map<Long, Float> dict2 = LongFloatDHelper.read(in);
-            test(dict2.equals(dict));
-        }
+            {
+                out = new OutputStream(communicator, com.zeroc.Ice.Util.Encoding_1_0);
+                OptionalClass o = new OptionalClass();
+                o.bo = true;
+                o.by = (byte)5;
+                o.setSh((short)4);
+                o.setI(3);
+                out.writeValue(o);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new InputStream(communicator, com.zeroc.Ice.Util.Encoding_1_0, data);
+                final Wrapper<OptionalClass> cb = new Wrapper<>();
+                in.readValue(value -> cb.obj = value, OptionalClass.class);
+                in.readPendingValues();
+                OptionalClass o2 = cb.obj;
+                test(o2.bo == o.bo);
+                test(o2.by == o.by);
+                test(!o2.hasSh());
+                test(!o2.hasI());
+            }
 
-        {
-            java.util.Map<String, String> dict = new java.util.HashMap<>();
-            dict.put("key1", "value1");
-            dict.put("key2", "value2");
-            out = new OutputStream(comm);
-            StringStringDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new InputStream(comm, data);
-            java.util.Map<String, String> dict2 = StringStringDHelper.read(in);
-            test(dict2.equals(dict));
-        }
+            {
+                final boolean[] arr =
+                    {
+                        true,
+                        false,
+                        true,
+                        false
+                    };
+                out = new OutputStream(communicator);
+                out.writeBoolSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                boolean[] arr2 = in.readBoolSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final boolean[][] arrS =
+                    {
+                        arr,
+                        new boolean[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                BoolSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                boolean[][] arr2S = BoolSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final byte[] arr =
+                    {
+                        (byte)0x01,
+                        (byte)0x11,
+                        (byte)0x12,
+                        (byte)0x22
+                    };
+                out = new OutputStream(communicator);
+                out.writeByteSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                byte[] arr2 = in.readByteSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final byte[][] arrS =
+                    {
+                        arr,
+                        new byte[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                ByteSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                byte[][] arr2S = ByteSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                test.Ice.stream.Serialize.Small small = new test.Ice.stream.Serialize.Small();
+                small.i = 99;
+                out = new OutputStream(communicator);
+                out.writeSerializable(small);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                test.Ice.stream.Serialize.Small small2 = in.readSerializable(test.Ice.stream.Serialize.Small.class);
+                test(small2.i == 99);
+            }
+
+            {
+                final short[] arr =
+                    {
+                        (short)0x01,
+                        (short)0x11,
+                        (short)0x12,
+                        (short)0x22
+                    };
+                out = new OutputStream(communicator);
+                out.writeShortSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                short[] arr2 = in.readShortSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final short[][] arrS =
+                    {
+                        arr,
+                        new short[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                ShortSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                short[][] arr2S = ShortSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final int[] arr =
+                    {
+                        0x01,
+                        0x11,
+                        0x12,
+                        0x22
+                    };
+                out = new OutputStream(communicator);
+                out.writeIntSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                int[] arr2 = in.readIntSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final int[][] arrS =
+                    {
+                        arr,
+                        new int[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                IntSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                int[][] arr2S = IntSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final long[] arr =
+                    {
+                        0x01,
+                        0x11,
+                        0x12,
+                        0x22
+                    };
+                out = new OutputStream(communicator);
+                out.writeLongSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                long[] arr2 = in.readLongSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final long[][] arrS =
+                    {
+                        arr,
+                        new long[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                LongSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                long[][] arr2S = LongSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final float[] arr =
+                    {
+                        1,
+                        2,
+                        3,
+                        4
+                    };
+                out = new OutputStream(communicator);
+                out.writeFloatSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                float[] arr2 = in.readFloatSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final float[][] arrS =
+                    {
+                        arr,
+                        new float[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                FloatSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                float[][] arr2S = FloatSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final double[] arr =
+                    {
+                        1,
+                        2,
+                        3,
+                        4
+                    };
+                out = new OutputStream(communicator);
+                out.writeDoubleSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                double[] arr2 = in.readDoubleSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final double[][] arrS =
+                    {
+                        arr,
+                        new double[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                DoubleSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                double[][] arr2S = DoubleSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final String[] arr =
+                    {
+                        "string1",
+                        "string2",
+                        "string3",
+                        "string4"
+                    };
+                out = new OutputStream(communicator);
+                out.writeStringSeq(arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                String[] arr2 = in.readStringSeq();
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final String[][] arrS =
+                    {
+                        arr,
+                        new String[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                StringSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                String[][] arr2S = StringSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final MyEnum[] arr =
+                    {
+                        MyEnum.enum3,
+                        MyEnum.enum2,
+                        MyEnum.enum1,
+                        MyEnum.enum2
+                    };
+                out = new OutputStream(communicator);
+                MyEnumSHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                MyEnum[] arr2 = MyEnumSHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final MyEnum[][] arrS =
+                    {
+                        arr,
+                        new MyEnum[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                MyEnumSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                MyEnum[][] arr2S = MyEnumSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                MyClass[] arr = new MyClass[4];
+                for(int i = 0; i < arr.length; ++i)
+                {
+                    arr[i] = new MyClass();
+                    arr[i].c = arr[i];
+                    arr[i].o = arr[i];
+                    arr[i].s = new SmallStruct();
+                    arr[i].s.e = MyEnum.enum2;
+                    arr[i].seq1 = new boolean[] { true, false, true, false };
+                    arr[i].seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
+                    arr[i].seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
+                    arr[i].seq4 = new int[] { 1, 2, 3, 4 };
+                    arr[i].seq5 = new long[] { 1, 2, 3, 4 };
+                    arr[i].seq6 = new float[] { 1, 2, 3, 4 };
+                    arr[i].seq7 = new double[] { 1, 2, 3, 4 };
+                    arr[i].seq8 = new String[] { "string1", "string2", "string3", "string4" };
+                    arr[i].seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
+                    arr[i].seq10 = new MyClass[4]; // null elements.
+                    arr[i].d = new java.util.HashMap<>();
+                    arr[i].d.put("hi", arr[i]);
+                }
+                out = new OutputStream(communicator);
+                MyClassSHelper.write(out, arr);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                MyClass[] arr2 = MyClassSHelper.read(in);
+                in.readPendingValues();
+                test(arr2.length == arr.length);
+                for(int i = 0; i < arr2.length; ++i)
+                {
+                    test(arr2[i] != null);
+                    test(arr2[i].c == arr2[i]);
+                    test(arr2[i].o == arr2[i]);
+                    test(arr2[i].s.e == MyEnum.enum2);
+                    test(java.util.Arrays.equals(arr2[i].seq1, arr[i].seq1));
+                    test(java.util.Arrays.equals(arr2[i].seq2, arr[i].seq2));
+                    test(java.util.Arrays.equals(arr2[i].seq3, arr[i].seq3));
+                    test(java.util.Arrays.equals(arr2[i].seq4, arr[i].seq4));
+                    test(java.util.Arrays.equals(arr2[i].seq5, arr[i].seq5));
+                    test(java.util.Arrays.equals(arr2[i].seq6, arr[i].seq6));
+                    test(java.util.Arrays.equals(arr2[i].seq7, arr[i].seq7));
+                    test(java.util.Arrays.equals(arr2[i].seq8, arr[i].seq8));
+                    test(java.util.Arrays.equals(arr2[i].seq9, arr[i].seq9));
+                    test(arr2[i].d.get("hi") == arr2[i]);
+                }
+
+                final MyClass[][] arrS =
+                    {
+                        arr,
+                        new MyClass[0],
+                        arr
+                    };
+                out = new OutputStream(communicator);
+                MyClassSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new InputStream(communicator, data);
+                MyClass[][] arr2S = MyClassSSHelper.read(in);
+                test(arr2S.length == arrS.length);
+                test(arr2S[0].length == arrS[0].length);
+                test(arr2S[1].length == arrS[1].length);
+                test(arr2S[2].length == arrS[2].length);
+            }
+
+            {
+                out = new OutputStream(communicator);
+                MyClass obj = new MyClass();
+                obj.s = new SmallStruct();
+                obj.s.e = MyEnum.enum2;
+                TestObjectWriter writer = new TestObjectWriter(obj);
+                out.writeValue(writer);
+                out.writePendingValues();
+                out.finished();
+                test(writer.called);
+            }
+
+            {
+                out = new OutputStream(communicator);
+                MyClass obj = new MyClass();
+                obj.s = new SmallStruct();
+                obj.s.e = MyEnum.enum2;
+                TestObjectWriter writer = new TestObjectWriter(obj);
+                out.writeValue(writer);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                test(writer.called);
+                factoryWrapper.setFactory(new TestValueFactory());
+                in = new InputStream(communicator, data);
+                final Wrapper<TestObjectReader> cb = new Wrapper<>();
+                in.readValue(value -> cb.obj = value, TestObjectReader.class);
+                in.readPendingValues();
+                test(cb.obj != null);
+                TestObjectReader reader = cb.obj;
+                test(reader.called);
+                test(reader.obj != null);
+                test(reader.obj.s.e == MyEnum.enum2);
+                factoryWrapper.setFactory(null);
+            }
+
+            {
+                out = new OutputStream(communicator);
+                MyException ex = new MyException();
+
+                MyClass c = new MyClass();
+                c.c = c;
+                c.o = c;
+                c.s = new SmallStruct();
+                c.s.e = MyEnum.enum2;
+                c.seq1 = new boolean[] { true, false, true, false };
+                c.seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
+                c.seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
+                c.seq4 = new int[] { 1, 2, 3, 4 };
+                c.seq5 = new long[] { 1, 2, 3, 4 };
+                c.seq6 = new float[] { 1, 2, 3, 4 };
+                c.seq7 = new double[] { 1, 2, 3, 4 };
+                c.seq8 = new String[] { "string1", "string2", "string3", "string4" };
+                c.seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
+                c.seq10 = new MyClass[4]; // null elements.
+                c.d = new java.util.HashMap<>();
+                c.d.put("hi", c);
+
+                ex.c = c;
+
+                out.writeException(ex);
+                byte[] data = out.finished();
+
+                in = new InputStream(communicator, data);
+                try
+                {
+                    in.throwException();
+                    test(false);
+                }
+                catch(MyException ex1)
+                {
+                    test(ex1.c.s.e == c.s.e);
+                    test(java.util.Arrays.equals(ex1.c.seq1, c.seq1));
+                    test(java.util.Arrays.equals(ex1.c.seq2, c.seq2));
+                    test(java.util.Arrays.equals(ex1.c.seq3, c.seq3));
+                    test(java.util.Arrays.equals(ex1.c.seq4, c.seq4));
+                    test(java.util.Arrays.equals(ex1.c.seq5, c.seq5));
+                    test(java.util.Arrays.equals(ex1.c.seq6, c.seq6));
+                    test(java.util.Arrays.equals(ex1.c.seq7, c.seq7));
+                    test(java.util.Arrays.equals(ex1.c.seq8, c.seq8));
+                    test(java.util.Arrays.equals(ex1.c.seq9, c.seq9));
+                }
+                catch(com.zeroc.Ice.UserException ex1)
+                {
+                    test(false);
+                }
+            }
+
+            {
+                java.util.Map<Byte, Boolean> dict = new java.util.HashMap<>();
+                dict.put((byte)4, true);
+                dict.put((byte)1, false);
+                out = new OutputStream(communicator);
+                ByteBoolDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new InputStream(communicator, data);
+                java.util.Map<Byte, Boolean> dict2 = ByteBoolDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<Short, Integer> dict = new java.util.HashMap<>();
+                dict.put((short)1, 9);
+                dict.put((short)4, 8);
+                out = new OutputStream(communicator);
+                ShortIntDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new InputStream(communicator, data);
+                java.util.Map<Short, Integer> dict2 = ShortIntDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<Long, Float> dict = new java.util.HashMap<>();
+                dict.put((long)123809828, 0.51f);
+                dict.put((long)123809829, 0.56f);
+                out = new OutputStream(communicator);
+                LongFloatDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new InputStream(communicator, data);
+                java.util.Map<Long, Float> dict2 = LongFloatDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<String, String> dict = new java.util.HashMap<>();
+                dict.put("key1", "value1");
+                dict.put("key2", "value2");
+                out = new OutputStream(communicator);
+                StringStringDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new InputStream(communicator, data);
+                java.util.Map<String, String> dict2 = StringStringDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<String, MyClass> dict = new java.util.HashMap<>();
+                MyClass c;
+                c = new MyClass();
+                c.s = new SmallStruct();
+                c.s.e = MyEnum.enum2;
+                dict.put("key1", c);
+                c = new MyClass();
+                c.s = new SmallStruct();
+                c.s.e = MyEnum.enum3;
+                dict.put("key2", c);
+                out = new OutputStream(communicator);
+                StringMyClassDHelper.write(out, dict);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new InputStream(communicator, data);
+                java.util.Map<String, MyClass> dict2 = StringMyClassDHelper.read(in);
+                in.readPendingValues();
+                test(dict2.size() == dict.size());
+                test(dict2.get("key1").s.e == MyEnum.enum2);
+                test(dict2.get("key2").s.e == MyEnum.enum3);
+            }
 
-        {
-            java.util.Map<String, MyClass> dict = new java.util.HashMap<>();
-            MyClass c;
-            c = new MyClass();
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum2;
-            dict.put("key1", c);
-            c = new MyClass();
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum3;
-            dict.put("key2", c);
-            out = new OutputStream(comm);
-            StringMyClassDHelper.write(out, dict);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new InputStream(comm, data);
-            java.util.Map<String, MyClass> dict2 = StringMyClassDHelper.read(in);
-            in.readPendingValues();
-            test(dict2.size() == dict.size());
-            test(dict2.get("key1").s.e == MyEnum.enum2);
-            test(dict2.get("key2").s.e == MyEnum.enum3);
+            printWriter.println("ok");
         }
-
-        printWriter.println("ok");
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.stream");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/stream/Serialize/Small.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/stream/Serialize/Small.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/stream/Serialize/Small.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/stream/Serialize/Small.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.stream.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/stream/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/stream/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/stream/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/stream/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.threadPoolPriority;
 
 import test.Ice.threadPoolPriority.Test.PriorityPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
+    public void run(String[] args)
     {
-        if(!b)
+        java.io.PrintWriter out = getWriter();
+        try(com.zeroc.Ice.Communicator communicator = initialize(args))
         {
-            throw new RuntimeException();
+            com.zeroc.Ice.ObjectPrx object = communicator.stringToProxy("test:" + getTestEndpoint(0) + " -t 10000");
+            PriorityPrx priority = PriorityPrx.checkedCast(object);
+            out.print("testing thread priority... ");
+            out.flush();
+            int prio = priority.getPriority();
+            test(prio == 10);
+            out.println("ok");
+            priority.shutdown();
         }
     }
-
-    @Override
-    public int run(String[] args)
-    {
-        java.io.PrintWriter out = getWriter();
-        com.zeroc.Ice.ObjectPrx object = communicator().stringToProxy("test:" + getTestEndpoint(0) + " -t 10000");
-        PriorityPrx priority = PriorityPrx.checkedCast(object);
-        out.print("testing thread priority... ");
-        out.flush();
-        int prio = priority.getPriority();
-        test(prio == 10);
-        out.println("ok");
-
-        priority.shutdown();
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
-    }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.threadPoolPriority;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.threadPoolPriority;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 10000");
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new PriorityI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "10");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "10");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 10000");
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.add(new PriorityI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/threadPoolPriority/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
@@ -76,17 +71,18 @@
         return prx.ice_getConnection(); // Establish connection
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "timeout:" + app.getTestEndpoint(0);
+        String sref = "timeout:" + helper.getTestEndpoint(0);
         com.zeroc.Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         int mult = 1;
-        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp"))
+        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp") ||
+           helper.isAndroid())
         {
             mult = 4;
         }
@@ -95,7 +91,7 @@
         test(timeout != null);
 
         ControllerPrx controller = ControllerPrx.checkedCast(
-           communicator.stringToProxy("controller:" + app.getTestEndpoint(1)));
+           communicator.stringToProxy("controller:" + helper.getTestEndpoint(1)));
         test(controller != null);
 
         out.print("testing connect timeout... ");
@@ -122,8 +118,8 @@
             //
             // Expect success.
             //
-            TimeoutPrx to = timeout.ice_timeout(1000 * mult);
-            controller.holdAdapter(200 * mult);
+            TimeoutPrx to = timeout.ice_timeout(2000 * mult);
+            controller.holdAdapter(100 * mult);
             try
             {
                 to.op();
@@ -165,7 +161,7 @@
             // Expect success.
             //
             TimeoutPrx to = timeout.ice_timeout(1000 * mult);
-            controller.holdAdapter(200 * mult);
+            controller.holdAdapter(100 * mult);
             try
             {
                 to.sendData(new byte[1000000]);
@@ -222,7 +218,7 @@
             //
             // Expect success.
             //
-            TimeoutPrx to = timeout.ice_invocationTimeout(500 * mult);
+            TimeoutPrx to = timeout.ice_invocationTimeout(1000 * mult);
             Callback cb = new Callback();
             to.sleepAsync(100 * mult).whenComplete((result, ex) ->
                 {
@@ -328,125 +324,126 @@
             // Test Ice.Override.Timeout. This property overrides all
             // endpoint timeouts.
             //
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
-            initData.properties.setProperty("Ice.Override.Timeout", "100");
-            com.zeroc.Ice.Communicator comm = app.initialize(initData);
-            TimeoutPrx to = TimeoutPrx.uncheckedCast(comm.stringToProxy(sref));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(com.zeroc.Ice.TimeoutException ex)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+            com.zeroc.Ice.Properties properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.Override.ConnectTimeout", "250");
+            properties.setProperty("Ice.Override.Timeout", "100");
+            try(com.zeroc.Ice.Communicator comm = helper.initialize(properties))
+            {
+                TimeoutPrx to = TimeoutPrx.uncheckedCast(comm.stringToProxy(sref));
+                connect(to);
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.sendData(seq);
+                    test(false);
+                }
+                catch(com.zeroc.Ice.TimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
 
-            //
-            // Calling ice_timeout() should have no effect.
-            //
-            to = TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(com.zeroc.Ice.TimeoutException ex)
-            {
-                // Expected.
+                //
+                // Calling ice_timeout() should have no effect.
+                //
+                to = TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
+                connect(to);
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.sendData(seq);
+                    test(false);
+                }
+                catch(com.zeroc.Ice.TimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
             }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-            comm.destroy();
         }
         {
             //
             // Test Ice.Override.ConnectTimeout.
             //
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
+            com.zeroc.Ice.Properties properties = communicator.getProperties()._clone();
             if(mult == 1)
             {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+                properties.setProperty("Ice.Override.ConnectTimeout", "250");
             }
             else
             {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "2500");
+                properties.setProperty("Ice.Override.ConnectTimeout", "2500");
             }
 
-            com.zeroc.Ice.Communicator comm = app.initialize(initData);
-            TimeoutPrx to = TimeoutPrx.uncheckedCast(comm.stringToProxy(sref));
-            controller.holdAdapter(-1);
-            try
+            try(com.zeroc.Ice.Communicator comm = helper.initialize(properties))
             {
-                to.op();
-                test(false);
-            }
-            catch(com.zeroc.Ice.ConnectTimeoutException ex)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+                TimeoutPrx to = TimeoutPrx.uncheckedCast(comm.stringToProxy(sref));
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.op();
+                    test(false);
+                }
+                catch(com.zeroc.Ice.ConnectTimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
 
-            //
-            // Calling ice_timeout() should have no effect on the connect timeout.
-            //
-            controller.holdAdapter(-1);
-            to = to.ice_timeout(1000 * mult);
-            try
-            {
-                to.op();
-                test(false);
-            }
-            catch(com.zeroc.Ice.ConnectTimeoutException ex)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+                //
+                // Calling ice_timeout() should have no effect on the connect timeout.
+                //
+                controller.holdAdapter(-1);
+                to = to.ice_timeout(1000 * mult);
+                try
+                {
+                    to.op();
+                    test(false);
+                }
+                catch(com.zeroc.Ice.ConnectTimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
 
-            //
-            // Verify that timeout set via ice_timeout() is still used for requests.
-            //
-            to = to.ice_timeout(250);
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(com.zeroc.Ice.TimeoutException ex)
-            {
-                // Expected.
+                //
+                // Verify that timeout set via ice_timeout() is still used for requests.
+                //
+                to = to.ice_timeout(250);
+                connect(to);
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.sendData(seq);
+                    test(false);
+                }
+                catch(com.zeroc.Ice.TimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
             }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-            comm.destroy();
         }
         {
             //
             // Test Ice.Override.CloseTimeout.
             //
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.Override.CloseTimeout", "100");
-            com.zeroc.Ice.Communicator comm = app.initialize(initData);
-            comm.stringToProxy(sref).ice_getConnection();
-            controller.holdAdapter(-1);
-            long now = System.nanoTime();
-            comm.destroy();
-            test(System.nanoTime() - now < 700 * 1000000);
-            controller.resumeAdapter();
+            com.zeroc.Ice.Properties properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.Override.CloseTimeout", "10");
+            try(com.zeroc.Ice.Communicator comm = helper.initialize(properties))
+            {
+                comm.stringToProxy(sref).ice_getConnection();
+                controller.holdAdapter(-1);
+                long now = System.nanoTime();
+                comm.destroy();
+                test(System.nanoTime() - now < 2000 * 1000000);
+                controller.resumeAdapter();
+            }
         }
         out.println("ok");
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
 import test.Ice.timeout.Test.TimeoutPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
 
         //
         // For this test, we want to disable retries.
         //
-        initData.properties.setProperty("Ice.RetryIntervals", "-1");
+        properties.setProperty("Ice.RetryIntervals", "-1");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         //
         // Limit the send buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        properties.setProperty("Ice.TCP.SndSize", "50000");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/ControllerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/ControllerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/ControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/ControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,65 +1,48 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new TimeoutI(), com.zeroc.Ice.Util.stringToIdentity("timeout"));
-        adapter.activate();
-
-        com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
 
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
         //
         // The client sends large messages to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+        properties.setProperty("Ice.MessageSizeMax", "20000");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
-    }
+        properties.setProperty("Ice.Warn.Connections", "0");
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TimeoutI(), com.zeroc.Ice.Util.stringToIdentity("timeout"));
+            adapter.activate();
+
+            com.zeroc.Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), com.zeroc.Ice.Util.stringToIdentity("controller"));
+            controllerAdapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/TimeoutI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/TimeoutI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/timeout/TimeoutI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/timeout/TimeoutI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
@@ -64,10 +59,10 @@
         private int _replies;
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         communicator.getProperties().setProperty("ReplyAdapter.Endpoints", "udp");
         com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ReplyAdapter");
@@ -78,7 +73,7 @@
 
         out.print("testing udp... ");
         out.flush();
-        com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy("test -d:" + app.getTestEndpoint(0, "udp"));
+        com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy("test -d:" + helper.getTestEndpoint(0, "udp"));
         TestIntfPrx obj = TestIntfPrx.uncheckedCast(base);
 
         int nRetry = 5;
@@ -125,9 +120,9 @@
                 test(seq.length > 16384);
             }
 
-            communicator.getProperties().setProperty("Ice.UDP.SndSize", "25000");
+            communicator.getProperties().setProperty("Ice.UDP.SndSize", "64000");
             obj.ice_getConnection().close(com.zeroc.Ice.ConnectionClose.GracefullyWithWait);
-            seq = new byte[24000];
+            seq = new byte[50000];
             try
             {
                 replyI.reset();
@@ -153,7 +148,7 @@
             if(communicator.getProperties().getProperty("Ice.IPv6").equals("1"))
             {
                 endpoint.append("udp -h \"ff15::1:1\" -p ");
-                endpoint.append(app.getTestPort(communicator.getProperties(), 10));
+                endpoint.append(helper.getTestPort(communicator.getProperties(), 10));
                 if(System.getProperty("os.name").contains("OS X") ||
                    System.getProperty("os.name").startsWith("Windows"))
                 {
@@ -163,7 +158,7 @@
             else
             {
                 endpoint.append("udp -h 239.255.1.1 -p ");
-                endpoint.append(app.getTestPort(communicator.getProperties(), 10));
+                endpoint.append(helper.getTestPort(communicator.getProperties(), 10));
                 if(System.getProperty("os.name").contains("OS X") ||
                    System.getProperty("os.name").startsWith("Windows"))
                 {
@@ -177,7 +172,7 @@
             // On Android, the test suite driver only starts one server instance. Otherwise, we expect
             // there to be five servers and we expect a response from all of them.
             //
-            final int numServers = app.isAndroid() ? 1 : 5;
+            final int numServers = helper.isAndroid() ? 1 : 5;
 
             nRetry = 5;
             while(nRetry-- > 0)
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,40 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
 import test.Ice.udp.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        AllTests.allTests(this);
+        java.util.List<String> rargs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, rargs);
+        properties.setProperty("Ice.Package.Test", "test.Ice.udp");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.UDP.RcvSize", "16384");
+        properties.setProperty("Ice.UDP.SndSize", "16384");
 
-        int num;
-        try
-        {
-            num = args.length == 1 ? Integer.parseInt(args[0]) : 1;
-        }
-        catch(NumberFormatException ex)
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            num = 1;
+            AllTests.allTests(this);
+            int num;
+            try
+            {
+                num = rargs.size() == 1 ? Integer.parseInt(rargs.get(0)) : 1;
+            }
+            catch(NumberFormatException ex)
+            {
+                num = 1;
+            }
+
+            for(int i = 0; i < num; ++i)
+            {
+                com.zeroc.Ice.ObjectPrx prx = communicator().stringToProxy("control:" + getTestEndpoint(i, "tcp"));
+                TestIntfPrx.uncheckedCast(prx).shutdown();
+            }
         }
-        for(int i = 0; i < num; ++i)
-        {
-            TestIntfPrx.uncheckedCast(communicator().stringToProxy("control:" + getTestEndpoint(i, "tcp"))).shutdown();
-        }
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
-        initData.properties.setProperty("Ice.UDP.SndSize", "16384");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,109 +1,87 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Properties properties = communicator().getProperties();
-
-        int num = 0;
-        try
-        {
-            num = args.length == 1 ? Integer.parseInt(args[0]) : 0;
-        }
-        catch(NumberFormatException ex)
-        {
-            assert(false);
-        }
-        properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(num, "tcp"));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
-        adapter.add(new TestIntfI(), com.zeroc.Ice.Util.stringToIdentity("control"));
-        adapter.activate();
+        java.util.List<String> rargs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, rargs);
+        properties.setProperty("Ice.Package.Test", "test.Ice.udp");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.UDP.RcvSize", "16384");
+        properties.setProperty("Ice.UDP.SndSize", "16384");
 
-        if(num == 0)
         {
-            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(num, "udp"));
-            com.zeroc.Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter");
-            adapter2.add(new TestIntfI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-            adapter2.activate();
-        }
-
-        StringBuilder endpoint = new StringBuilder();
-        if(properties.getProperty("Ice.IPv6").equals("1"))
-        {
-            endpoint.append("udp -h \"ff15::1:1\" -p ");
-            endpoint.append(getTestPort(properties, 10));
-            if(System.getProperty("os.name").contains("OS X") ||
-               System.getProperty("os.name").startsWith("Windows"))
+            String endpoint;
+            if(properties.getProperty("Ice.IPv6").equals("1"))
             {
-                endpoint.append(" --interface \"::1\""); // Use loopback to prevent other machines to answer.
+                if(System.getProperty("os.name").contains("OS X"))
+                {
+                    endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\"";
+                }
+                else
+                {
+                    endpoint = "udp -h \"ff15::1:1\" -p 12020";
+                }
             }
-        }
-        else
-        {
-            endpoint.append("udp -h 239.255.1.1 -p ");
-            endpoint.append(getTestPort(properties, 10));
-            if(System.getProperty("os.name").contains("OS X") ||
-               System.getProperty("os.name").startsWith("Windows"))
+            else
             {
-                endpoint.append(" --interface 127.0.0.1"); // Use loopback to prevent other machines to answer.
+                endpoint = "udp -h 239.255.1.1 -p 12020";
             }
+            properties.setProperty("McastTestAdapter.Endpoints", endpoint);
         }
-        properties.setProperty("McastTestAdapter.Endpoints", endpoint.toString());
 
-        com.zeroc.Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter");
-        mcastAdapter.add(new TestIntfI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        mcastAdapter.activate();
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            int num = rargs.size() == 1 ? Integer.parseInt(rargs.get(0)) : 0;
 
-        return WAIT;
-    }
+            communicator.getProperties().setProperty("ControlAdapter.Endpoints", getTestEndpoint(num, "tcp"));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter");
+            adapter.add(new TestIntfI(), com.zeroc.Ice.Util.stringToIdentity("control"));
+            adapter.activate();
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
-        initData.properties.setProperty("Ice.UDP.SndSize", "16384");
+            if(num == 0)
+            {
+                properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(num, "udp"));
+                com.zeroc.Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter");
+                adapter2.add(new TestIntfI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+                adapter2.activate();
+            }
 
-        String endpoint;
-        if(initData.properties.getProperty("Ice.IPv6").equals("1"))
-        {
-            if(System.getProperty("os.name").contains("OS X"))
+            StringBuilder endpoint = new StringBuilder();
+            if(properties.getProperty("Ice.IPv6").equals("1"))
             {
-                endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\"";
+                endpoint.append("udp -h \"ff15::1:1\" -p ");
+                endpoint.append(getTestPort(10));
+                if(System.getProperty("os.name").contains("OS X") ||
+                   System.getProperty("os.name").startsWith("Windows"))
+                {
+                    endpoint.append(" --interface \"::1\""); // Use loopback to prevent other machines to answer.
+                }
             }
             else
             {
-                endpoint = "udp -h \"ff15::1:1\" -p 12020";
+                endpoint.append("udp -h 239.255.1.1 -p ");
+                endpoint.append(getTestPort(10));
+                if(System.getProperty("os.name").contains("OS X") ||
+                   System.getProperty("os.name").startsWith("Windows"))
+                {
+                    endpoint.append(" --interface 127.0.0.1"); // Use loopback to prevent other machines to answer.
+                }
             }
-        }
-        else
-        {
-            endpoint = "udp -h 239.255.1.1 -p 12020";
-        }
-        initData.properties.setProperty("McastTestAdapter.Endpoints", endpoint);
+            properties.setProperty("McastTestAdapter.Endpoints", endpoint.toString());
 
-        return initData;
-    }
+            com.zeroc.Ice.ObjectAdapter mcastAdapter = communicator.createObjectAdapter("McastTestAdapter");
+            mcastAdapter.add(new TestIntfI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            mcastAdapter.activate();
 
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
+            serverReady();
 
-        System.gc();
-        System.exit(status);
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 #include <Ice/Identity.ice>
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/TestIntfI.java zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/TestIntfI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Ice/udp/TestIntfI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Ice/udp/TestIntfI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
@@ -21,9 +16,9 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
         String ref = "DemoIceBox/admin:default -p 9996 -t 10000";
         com.zeroc.Ice.ObjectPrx admin = communicator.stringToProxy(ref);
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        AllTests.allTests(this);
-
-        //
-        // Shutdown the IceBox server.
-        //
-        com.zeroc.Ice.ProcessPrx.uncheckedCast(
-            communicator().stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
-        return 0;
-    }
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
 
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+            //
+            // Shutdown the IceBox server.
+            //
+            com.zeroc.Ice.ProcessPrx.uncheckedCast(
+                communicator().stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/TestFacetI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/TestFacetI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/TestFacetI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/TestFacetI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/TestServiceI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/TestServiceI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/admin/TestServiceI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/admin/TestServiceI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
@@ -23,14 +18,18 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
-        TestIntfPrx service1 = TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(0)));
-        TestIntfPrx service2 = TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(1)));
-        TestIntfPrx service3 = TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(2)));
-        TestIntfPrx service4 = TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(3)));
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        TestIntfPrx service1 =
+            TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(0)));
+        TestIntfPrx service2 =
+            TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(1)));
+        TestIntfPrx service3 =
+            TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(2)));
+        TestIntfPrx service4 =
+            TestIntfPrx.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(3)));
 
         if(service1.getProperty("IceBox.InheritProperties").equals(""))
         {
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-
-        //
-        // Shutdown the IceBox server.
-        //
-        com.zeroc.Ice.ProcessPrx.uncheckedCast(
-            communicator().stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceBox.configuration");
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.IceBox.configuration");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+
+            //
+            // Shutdown the IceBox server.
+            //
+            com.zeroc.Ice.ProcessPrx.uncheckedCast(
+                communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
@@ -27,9 +22,9 @@
         }
     }
 
-    public static void allTests(test.Util.Application app, int num)
+    public static void allTests(test.TestHelper helper, int num)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
 
         List<ControllerPrx> proxies = new ArrayList<>();
         List<ControllerPrx> indirectProxies = new ArrayList<>();
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        int num;
-        try
-        {
-            num = args.length == 1 ? Integer.parseInt(args[0]) : 0;
-        }
-        catch(NumberFormatException ex)
+        java.util.List<String> rargs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, rargs);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            num = 0;
+            int num;
+            try
+            {
+                num = rargs.size() == 1 ? Integer.parseInt(rargs.get(0)) : 0;
+            }
+            catch(NumberFormatException ex)
+            {
+                num = 0;
+            }
+            AllTests.allTests(this, num);
         }
-        AllTests.allTests(this, num);
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/ControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Properties properties = communicator().getProperties();
-
-        int num = 0;
-        try
+        java.util.List<String> rargs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, rargs);
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            num = Integer.parseInt(args[0]);
+            int num = Integer.parseInt(rargs.get(0));
+            communicator.getProperties().setProperty("ControlAdapter.Endpoints", getTestEndpoint(num));
+            communicator.getProperties().setProperty("ControlAdapter.AdapterId", "control" + num);
+            communicator.getProperties().setProperty("ControlAdapter.ThreadPool.Size", "1");
+
+            com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
+            adapter.add(new ControllerI(), com.zeroc.Ice.Util.stringToIdentity("controller" + num));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
         }
-        catch(NumberFormatException ex)
-        {
-            assert(false);
-        }
-
-        properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(num));
-        properties.setProperty("ControlAdapter.AdapterId", "control" + num);
-        properties.setProperty("ControlAdapter.ThreadPool.Size", "1");
-
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
-        adapter.add(new ControllerI(), com.zeroc.Ice.Util.stringToIdentity("controller" + num));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 import java.io.PrintWriter;
@@ -22,10 +17,10 @@
         }
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
@@ -83,12 +78,12 @@
             // Ensure the IceGrid discovery locator can discover the
             // registries and make sure locator requests are forwarded.
             //
-            com.zeroc.Ice.InitializationData initData = app.createInitializationData();
+            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("Ice.Default.Locator", "");
             initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
                                             "IceLocatorDiscovery:com.zeroc.IceLocatorDiscovery.PluginFactory");
-            initData.properties.setProperty("IceLocatorDiscovery.Port", Integer.toString(app.getTestPort(99)));
+            initData.properties.setProperty("IceLocatorDiscovery.Port", Integer.toString(helper.getTestPort(99)));
             initData.properties.setProperty("AdapterForDiscoveryTest.AdapterId", "discoveryAdapter");
             initData.properties.setProperty("AdapterForDiscoveryTest.Endpoints", "default");
 
@@ -186,7 +181,7 @@
                 {
                     intf = " --interface \"" + intf + "\"";
                 }
-                String port = Integer.toString(app.getTestPort(99));
+                String port = Integer.toString(helper.getTestPort(99));
                 initData.properties.setProperty("IceLocatorDiscovery.Lookup",
                                                  "udp -h " + multicast + " --interface unknown:" +
                                                  "udp -h " + multicast + " -p " + port + intf);
@@ -211,8 +206,11 @@
         out.println("ok");
     }
 
-    public static void allTestsWithDeploy(com.zeroc.Ice.Communicator communicator, PrintWriter out)
+    public static void allTestsWithDeploy(test.TestHelper helper)
     {
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+
         out.print("testing stringToProxy... ");
         out.flush();
         com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy("test @ TestAdapter");
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/application.xml zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/application.xml
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/application.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/application.xml	2019-02-05 18:03:04.000000000 +0000
@@ -2,16 +2,20 @@
   <application name="Test">
     <node name="localnode">
       <server id="server" exe="${java.exe}" pwd="." activation="on-demand">
-        <option>-Djava.security.egd=file:/dev/urandom</option>
-        <option>test.IceGrid.simple.Server</option>
+        <!-- TODO: WORKAROUND for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
+        <option>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</option>
+        <option>-Dtest.class=test.IceGrid.simple.Server</option>
+        <option>test.TestDriver</option>
         <adapter name="TestAdapter" id="TestAdapter" endpoints="default">
           <object identity="test" type="Test"/>
         </adapter>
       </server>
 
       <server id="server10" exe="${java.exe}" pwd="." activation="on-demand">
-        <option>-Djava.security.egd=file:/dev/urandom</option>
-        <option>test.IceGrid.simple.Server</option>
+        <!-- TODO: WORKAROUND for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
+        <option>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</option>
+        <option>-Dtest.class=test.IceGrid.simple.Server</option>
+        <option>test.TestDriver</option>
         <adapter name="TestAdapter" endpoints="default" id="TestAdapter10">
           <object identity="test10" type="Test" property="Identity"/>
         </adapter>
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 
-public class Client extends test.Util.Application
+import java.util.stream.Stream;
+
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.Communicator communicator = communicator();
-        boolean withDeploy = false;
-        for(String arg : args)
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
         {
-            if(arg.equals("--with-deploy"))
+            boolean withDeploy =  Stream.of(args).anyMatch(v -> v.equals("--with-deploy"));
+
+            if(!withDeploy)
             {
-                withDeploy = true;
-                break;
+                AllTests.allTests(this);
+            }
+            else
+            {
+                AllTests.allTestsWithDeploy(this);
             }
         }
-
-        if(!withDeploy)
-        {
-            AllTests.allTests(this);
-        }
-        else
-        {
-            AllTests.allTestsWithDeploy(communicator, getWriter());
-        }
-
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().parseCommandLineOptions("TestAdapter", args);
-
-        com.zeroc.Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Object object = new TestI();
-        String id = communicator().getProperties().getPropertyWithDefault("Identity", "test");
-        adapter.add(object, com.zeroc.Ice.Util.stringToIdentity(id));
-        //shutdownOnInterrupt();
-        try
-        {
-            adapter.activate();
-        }
-        catch(com.zeroc.Ice.ObjectAdapterDeactivatedException ex)
-        {
-        }
-        communicator().waitForShutdown();
-        //defaultInterrupt();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
+    public void run(String[] args)
     {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("test.IceGrid.simple.Server", args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
+        try(com.zeroc.Ice.Communicator communicator = initialize(args))
+        {
+            communicator.getProperties().parseCommandLineOptions("TestAdapter", args);
 
-        System.gc();
-        System.exit(status);
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Object object = new TestI();
+            String id = communicator.getProperties().getPropertyWithDefault("Identity", "test");
+            adapter.add(object, com.zeroc.Ice.Util.stringToIdentity(id));
+            try
+            {
+                adapter.activate();
+            }
+            catch(com.zeroc.Ice.ObjectAdapterDeactivatedException ex)
+            {
+            }
+            communicator().waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/TestI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/TestI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceGrid/simple/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceGrid/simple/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/certs/makecerts.py zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/certs/makecerts.py
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/certs/makecerts.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/certs/makecerts.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2015-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 import os, sys, socket, getopt
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/AllTests.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
@@ -109,12 +104,12 @@
         return d;
     }
 
-    public static ServerFactoryPrx allTests(test.Util.Application app, String testDir)
+    public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
     {
-        com.zeroc.Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        com.zeroc.Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        final String factoryRef = "factory:" + app.getTestEndpoint(0, "tcp");
+        final String factoryRef = "factory:" + helper.getTestEndpoint(0, "tcp");
         com.zeroc.Ice.ObjectPrx b = communicator.stringToProxy(factoryRef);
         test(b != null);
         ServerFactoryPrx factory = ServerFactoryPrx.checkedCast(b);
@@ -149,33 +144,6 @@
             }
             comm.destroy();
         }
-        {
-            InitializationData initData = createClientProps(defaultProperties);
-            initData.properties.setProperty("Ice.InitPlugins", "0");
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Communicator comm = Util.initialize(args, initData);
-            com.zeroc.Ice.PluginManager pm = comm.getPluginManager();
-            pm.initializePlugins();
-            com.zeroc.Ice.ObjectPrx obj = comm.stringToProxy(factoryRef);
-            test(obj != null);
-            ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(obj);
-            java.util.Map<String, String> d = createServerProps(defaultProperties);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-        }
         out.println("ok");
 
         out.print("testing certificate verification... ");
@@ -405,37 +373,6 @@
             comm.destroy();
 
             //
-            // Test IceSSL.VerifyPeer=1. This should fail because the server
-            // does not supply a certificate.
-            //
-            initData = createClientProps(defaultProperties);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "1");
-            comm = Util.initialize(args, initData);
-            fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(com.zeroc.Ice.SecurityException ex)
-            {
-                // Expected.
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-
-            //
             // This should succeed because the self signed certificate used by the server is
             // trusted.
             //
@@ -1063,69 +1000,6 @@
         out.flush();
         {
             //
-            // ADH is allowed but will not have a certificate.
-            //
-            initData = createClientProps(defaultProperties);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Communicator comm = Util.initialize(args, initData);
-            com.zeroc.IceSSL.Plugin plugin = (com.zeroc.IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL");
-            test(plugin != null);
-            CertificateVerifierI verifier = new CertificateVerifierI();
-            plugin.setCertificateVerifier(verifier);
-
-            ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                String cipherSub = "DH_anon";
-                server.checkCipher(cipherSub);
-                com.zeroc.IceSSL.ConnectionInfo info =
-                    (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
-                test(info.cipher.indexOf(cipherSub) >= 0);
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            test(verifier.invoked());
-            test(!verifier.hadCert());
-
-            //
-            // Have the verifier return false. Close the connection explicitly
-            // to force a new connection to be established.
-            //
-            verifier.reset();
-            verifier.returnValue(false);
-            server.ice_getConnection().close(com.zeroc.Ice.ConnectionClose.GracefullyWithWait);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(com.zeroc.Ice.SecurityException ex)
-            {
-                // Expected.
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            test(verifier.invoked());
-            test(!verifier.hadCert());
-
-            fact.destroyServer(server);
-            comm.destroy();
-        }
-
-        {
-            //
             // Verify that a server certificate is present.
             //
             initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1");
@@ -1496,33 +1370,6 @@
         out.flush();
         {
             //
-            // The server has a certificate but the client doesn't. They should
-            // negotiate to use ADH since we explicitly enable it.
-            //
-            initData = createClientProps(defaultProperties);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Communicator comm = Util.initialize(args, initData);
-            ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
-            d.put("IceSSL.Ciphers", "ALL");
-            d.put("IceSSL.VerifyPeer", "1");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-        }
-        {
-            //
             // Configure a server with RSA and DSA certificates.
             //
             // First try a client with a DSA certificate.
@@ -1567,38 +1414,6 @@
             }
             fact.destroyServer(server);
             comm.destroy();
-
-            //
-            // Next try a client with ADH. This should fail.
-            //
-            initData = createClientProps(defaultProperties);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            comm = Util.initialize(args, initData);
-            fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
-            d.put("IceSSL.VerifyPeer", "1");
-            server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(com.zeroc.Ice.SecurityException ex)
-            {
-                // Expected.
-            }
-            catch(com.zeroc.Ice.ConnectionLostException ex)
-            {
-                // Expected for thread pool.
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
         }
         {
             //
@@ -1680,6 +1495,8 @@
             d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
             d.put("IceSSL.Alias", "dsacert");
             d.put("IceSSL.VerifyPeer", "1");
+            // TLS 1.3 no longer supports DSA so disable TLS 1.3 for this test.
+            d.put("IceSSL.Protocols", "ssl3, tls1_0, tls1_1, tls1_2");
             ServerPrx server = fact.createServer(d);
             try
             {
@@ -2057,62 +1874,6 @@
             }
             fact.destroyServer(server);
             comm.destroy();
-        }
-        {
-            //
-            // Test rejection when client does not supply a certificate.
-            //
-            initData = createClientProps(defaultProperties);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Communicator comm = Util.initialize(args, initData);
-
-            ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties);
-            d.put("IceSSL.TrustOnly",
-                  "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-        }
-        {
-            //
-            // Test rejection when client does not supply a certificate.
-            //
-            initData = createClientProps(defaultProperties);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Communicator comm = Util.initialize(args, initData);
-
-            ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties);
-            d.put("IceSSL.TrustOnly",
-                  "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(com.zeroc.Ice.LocalException ex)
-            {
-            }
-            fact.destroyServer(server);
-            comm.destroy();
         }
         {
             //
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
-import java.io.PrintWriter;
-
 import test.IceSSL.configuration.Test.ServerFactoryPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        PrintWriter out = getWriter();
-        if(args.length < 1)
+        java.util.List<String> rargs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, rargs);
+        if(rargs.size() < 1)
         {
-            out.println("Usage: client testdir");
-            return 1;
+            throw new RuntimeException("Usage: client testdir");
+        }
+        properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            ServerFactoryPrx factory = AllTests.allTests(this, rargs.get(0));
+            factory.shutdown();
         }
-        ServerFactoryPrx factory = AllTests.allTests(this, args[0]);
-        factory.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 import test.IceSSL.configuration.Test.ServerPrx;
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/ServerI.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/ServerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/ServerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/Server.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/Server.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        if(args.length < 1)
+        java.util.List<String> rargs = new java.util.ArrayList<String>();
+        com.zeroc.Ice.Properties properties = createTestProperties(args, rargs);
+        if(rargs.size() < 1)
         {
-            System.out.println("Usage: server testdir");
-            return 1;
+            throw new RuntimeException("Usage: server testdir");
         }
-        com.zeroc.Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp"));
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("factory");
-        adapter.add(new ServerFactoryI(args[0] + "/../certs"), id);
-        adapter.activate();
-
-        communicator.waitForShutdown();
-        return 0;
-    }
-
-    @Override
-    protected com.zeroc.Ice.InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
 
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp"));
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            com.zeroc.Ice.Identity id = com.zeroc.Ice.Util.stringToIdentity("factory");
+            adapter.add(new ServerFactoryI(rargs.get(0) + "/../certs"), id);
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceSSL/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceSSL/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/IceUtil/inputUtil/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/IceUtil/inputUtil/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/IceUtil/inputUtil/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/IceUtil/inputUtil/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceUtil.inputUtil;
 
 import com.zeroc.IceUtilInternal.Options;
 import com.zeroc.IceUtilInternal.StringUtil;
 
-public class Client
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void main(String[] argvs)
+    public void run(String[] argvs)
     {
         System.out.print("testing string to command line arguments... ");
         System.out.flush();
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 [["java:package:test.Slice.escape"]]
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/escape/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/escape/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/escape/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/escape/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Slice.escape;
 import test.Slice.escape._abstract._assert;
@@ -22,7 +17,7 @@
 import test.Slice.escape._abstract.defaultPrx;
 import test.Slice.escape._abstract.finalizePrx;
 
-public class Client
+public class Client extends test.TestHelper
 {
     static public class catchI implements _catch
     {
@@ -124,61 +119,35 @@
         assert _switch.value == 0;
     }
 
-    private static int run(String[] args, com.zeroc.Ice.Communicator communicator)
-    {
-        com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new defaultI(), com.zeroc.Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        System.out.print("Testing operation name... ");
-        System.out.flush();
-        defaultPrx p = defaultPrx.uncheckedCast(adapter.createProxy(com.zeroc.Ice.Util.stringToIdentity("test")));
-        p._do();
-        System.out.println("ok");
-
-        return 0;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        int status = 0;
-        com.zeroc.Ice.Communicator communicator = null;
-
-        try
-        {
-            //
-            // In this test, we need at least two threads in the
-            // client side thread pool for nested AMI.
-            //
-            com.zeroc.Ice.InitializationData initData = new com.zeroc.Ice.InitializationData();
-            initData.properties = com.zeroc.Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Package._abstract", "test.Slice.escape");
-            initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-            initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-            initData.properties.setProperty("TestAdapter.Endpoints", "default");
-
-            //
-            // We must set MessageSizeMax to an explicit values,
-            // because we run tests to check whether
-            // Ice.MemoryLimitException is raised as expected.
-            //
-            initData.properties.setProperty("Ice.MessageSizeMax", "100");
-
-            communicator = com.zeroc.Ice.Util.initialize(args, initData);
-            status = run(args, communicator);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
+        //
+        // In this test, we need at least two threads in the
+        // client side thread pool for nested AMI.
+        //
+        com.zeroc.Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package._abstract", "test.Slice.escape");
+        properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+        properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+        properties.setProperty("TestAdapter.Endpoints", "default");
+
+        //
+        // We must set MessageSizeMax to an explicit values,
+        // because we run tests to check whether
+        // Ice.MemoryLimitException is raised as expected.
+        //
+        properties.setProperty("Ice.MessageSizeMax", "100");
+        try(com.zeroc.Ice.Communicator communicator = initialize(properties))
+        {
+            com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new defaultI(), com.zeroc.Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+
+            System.out.print("Testing operation name... ");
+            System.out.flush();
+            defaultPrx p = defaultPrx.uncheckedCast(adapter.createProxy(com.zeroc.Ice.Util.stringToIdentity("test")));
+            p._do();
+            System.out.println("ok");
         }
-
-        if(communicator != null)
-        {
-            communicator.destroy();
-        }
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/escape/Key.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/generation/File1.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/generation/File1.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/generation/File1.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/generation/File1.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/generation/File2.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/generation/File2.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/generation/File2.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/generation/File2.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/macros/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/macros/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/macros/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/macros/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Slice.macros;
 
@@ -13,41 +8,22 @@
 import test.Slice.macros.Test.NoDefault;
 import test.Slice.macros.Test.JavaOnly;
 
-public class Client
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        int status = 0;
-        try
-        {
-            System.out.print("testing Slice predefined macros... ");
-            Default d = new Default();
-            test(d.x == 10);
-            test(d.y == 10);
-
-            NoDefault nd = new NoDefault();
-            test(nd.x != 10);
-            test(nd.y != 10);
-
-            JavaOnly c = new JavaOnly();
-            test(c.lang.equals("java"));
-            test(c.version == com.zeroc.Ice.Util.intVersion());
-            System.out.println("ok");
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
-        System.gc();
-        System.exit(status);
+        System.out.print("testing Slice predefined macros... ");
+        Default d = new Default();
+        test(d.x == 10);
+        test(d.y == 10);
+
+        NoDefault nd = new NoDefault();
+        test(nd.x != 10);
+        test(nd.y != 10);
+
+        JavaOnly c = new JavaOnly();
+        test(c.lang.equals("java"));
+        test(c.version == com.zeroc.Ice.Util.intVersion());
+        System.out.println("ok");
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/macros/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/structure/Client.java zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/structure/Client.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/structure/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/structure/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Slice.structure;
 
@@ -16,16 +11,8 @@
 import java.util.Map;
 import java.util.HashMap;
 
-public class Client
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     private static void allTests(com.zeroc.Ice.Communicator communicator)
     {
         System.out.print("testing equals() for Slice structures... ");
@@ -272,27 +259,11 @@
         System.out.println("ok");
     }
 
-    private static int run(String[] args, com.zeroc.Ice.Communicator communicator)
+    public void run(String[] args)
     {
-        allTests(communicator);
-
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        int status;
-        java.util.List<String> rArgs = new java.util.ArrayList<>();
-        try(com.zeroc.Ice.Communicator communicator = com.zeroc.Ice.Util.initialize(args, rArgs))
-        {
-            status = run(rArgs.toArray(new String[rArgs.size()]), communicator);
-        }
-        catch(Exception ex)
+        try(com.zeroc.Ice.Communicator communicator = initialize(args))
         {
-            ex.printStackTrace();
-            status = 1;
+            allTests(communicator);
         }
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/structure/Test.ice zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/structure/Test.ice
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Slice/structure/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Slice/structure/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/TestDriver.java zeroc-ice-3.7.2/java/test/src/main/java/test/TestDriver.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/TestDriver.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/TestDriver.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,31 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test;
+
+public class TestDriver
+{
+    public static void main(String[] args)
+    {
+        int status = 0;
+        try
+        {
+            String testClass = System.getProperty("test.class");
+            Class<?> c = Class.forName(testClass);
+            test.TestHelper helper = (test.TestHelper)c.getDeclaredConstructor().newInstance();
+            helper.run(args);
+            helper.getWriter().flush();
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+            status = 1;
+        }
+        finally
+        {
+            System.gc();
+        }
+        System.exit(status);
+    }
+}
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/TestHelper.java zeroc-ice-3.7.2/java/test/src/main/java/test/TestHelper.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/TestHelper.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/TestHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,226 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test;
+
+import com.zeroc.Ice.*;
+
+public abstract class TestHelper
+{
+    public static void test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    public abstract void run(String args[]);
+
+    public interface ControllerHelper
+    {
+        void communicatorInitialized(Communicator c);
+        void serverReady();
+    }
+
+    public String getTestEndpoint()
+    {
+        return getTestEndpoint(_communicator.getProperties(), 0, "");
+    }
+
+    static public String getTestEndpoint(com.zeroc.Ice.Properties properties)
+    {
+        return getTestEndpoint(properties, 0, "");
+    }
+
+    public String getTestEndpoint(int num)
+    {
+        return getTestEndpoint(_communicator.getProperties(), num, "");
+    }
+
+    static public String getTestEndpoint(com.zeroc.Ice.Properties properties, int num)
+    {
+        return getTestEndpoint(properties, num, "");
+    }
+
+    public String getTestEndpoint(int num, String protocol)
+    {
+        return getTestEndpoint(_communicator.getProperties(), num, protocol);
+    }
+
+    static public String getTestEndpoint(com.zeroc.Ice.Properties properties, int num, String prot)
+    {
+        String protocol = prot;
+        if(protocol.isEmpty())
+        {
+            protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default");
+        }
+
+        int basePort = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010);
+
+        if(protocol.indexOf("bt") == 0)
+        {
+            //
+            // For Bluetooth, there's no need to specify a port (channel) number.
+            // The client locates the server using its address and a UUID.
+            //
+            switch(num)
+            {
+                case 0:
+                {
+                    return "default -u 5e08f4de-5015-4507-abe1-a7807002db3d";
+                }
+                case 1:
+                {
+                    return "default -u dae56460-2485-46fd-a3ca-8b730e1e868b";
+                }
+                case 2:
+                {
+                    return "default -u 99e08bc6-fcda-4758-afd0-a8c00655c999";
+                }
+                default:
+                {
+                    assert(false);
+                }
+            }
+        }
+        return protocol + " -p " + Integer.toString(basePort + num);
+    }
+
+    public String getTestHost()
+    {
+        return getTestHost(_communicator.getProperties());
+    }
+
+    static public String getTestHost(com.zeroc.Ice.Properties properties)
+    {
+        return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+    }
+
+    public String getTestProtocol()
+    {
+        return getTestProtocol(_communicator.getProperties());
+    }
+
+    static public String getTestProtocol(com.zeroc.Ice.Properties properties)
+    {
+        return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+    }
+
+    public int getTestPort(int num)
+    {
+        return getTestPort(_communicator.getProperties(), num);
+    }
+
+    static public int getTestPort(com.zeroc.Ice.Properties properties, int num)
+    {
+        return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
+    }
+
+    public Properties createTestProperties(String[] args)
+    {
+        return createTestProperties(args, null);
+    }
+
+    public Properties createTestProperties(String[] args, java.util.List<String> rArgs)
+    {
+        rArgs = rArgs == null ? new java.util.ArrayList<String>() : rArgs;
+        Properties properties = Util.createProperties(args, rArgs);
+        args = properties.parseCommandLineOptions("Test", rArgs.toArray(new String[rArgs.size()]));
+        rArgs.clear();
+        rArgs.addAll(java.util.Arrays.asList(args));
+        return properties;
+    }
+
+    public Communicator initialize(String[] args)
+    {
+        InitializationData initData = new InitializationData();
+        initData.properties = createTestProperties(args);
+        return initialize(initData);
+    }
+
+    public Communicator initialize(Properties properties)
+    {
+        InitializationData initData = new InitializationData();
+        initData.properties = properties;
+        return  initialize(initData);
+    }
+
+    public Communicator initialize(InitializationData initData)
+    {
+        if(_classLoader != null && initData.classLoader == null)
+        {
+            initData.classLoader = _classLoader;
+        }
+
+        Communicator communicator = Util.initialize(initData);
+        if(_communicator == null)
+        {
+            _communicator = communicator;
+        }
+
+        if(_controllerHelper != null)
+        {
+            _controllerHelper.communicatorInitialized(communicator);
+        }
+
+        return communicator;
+    }
+
+    public void setControllerHelper(ControllerHelper controllerHelper)
+    {
+        _controllerHelper = controllerHelper;
+    }
+
+    public void serverReady()
+    {
+        if(_controllerHelper != null)
+        {
+            _controllerHelper.serverReady();
+        }
+    }
+
+    static public boolean isAndroid()
+    {
+        return com.zeroc.IceInternal.Util.isAndroid();
+    }
+
+    public void setWriter(java.io.Writer writer)
+    {
+        _printWriter = new java.io.PrintWriter(writer);
+    }
+
+    public java.io.PrintWriter getWriter()
+    {
+        return _printWriter;
+    }
+
+    public void setClassLoader(ClassLoader classLoader)
+    {
+        _classLoader = classLoader;
+    }
+
+    public ClassLoader getClassLoader()
+    {
+        return _classLoader;
+    }
+
+    public Communicator communicator()
+    {
+        return _communicator;
+    }
+
+    public void shutdown()
+    {
+        if(_communicator != null)
+        {
+            _communicator.shutdown();
+        }
+    }
+
+    private ControllerHelper _controllerHelper;
+    private ClassLoader _classLoader;
+    private Communicator _communicator;
+    private java.io.PrintWriter _printWriter = new java.io.PrintWriter(new java.io.OutputStreamWriter(System.out));
+}
diff -Nru zeroc-ice-3.7.1/java/test/src/main/java/test/Util/Application.java zeroc-ice-3.7.2/java/test/src/main/java/test/Util/Application.java
--- zeroc-ice-3.7.1/java/test/src/main/java/test/Util/Application.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java/test/src/main/java/test/Util/Application.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Util;
-
-import com.zeroc.Ice.*;
-
-public abstract class Application
-{
-    public final int WAIT = 2;
-
-    public interface ServerReadyListener
-    {
-        void serverReady();
-    }
-
-    public interface CommunicatorListener
-    {
-        void communicatorInitialized(Communicator c);
-    }
-
-    public Application()
-    {
-    }
-
-    //
-    // This main() must be called by the global main(). main()
-    // initializes the Communicator, calls run(), and destroys
-    // the Communicator upon return from run(). It thereby handles
-    // all exceptions properly, i.e., error messages are printed
-    // if exceptions propagate to main(), and the Communicator is
-    // always destroyed, regardless of exceptions.
-    //
-    public final int main(String appName, String[] args)
-    {
-        return main(appName, args, null);
-    }
-
-    public final int main(String appName, String[] args, InitializationData initializationData)
-    {
-        java.io.PrintWriter writer = getWriter();
-        if(_communicator != null)
-        {
-            writer.println(appName + ": only one instance of the Application class can be used");
-            return 1;
-        }
-
-        _testName = appName;
-
-        //
-        // We parse the properties here to extract Ice.ProgramName.
-        //
-        if(initializationData == null)
-        {
-            java.util.List<String> remainingArgs = new java.util.ArrayList<>();
-            initializationData = getInitData(args, remainingArgs);
-            args = remainingArgs.toArray(new String[remainingArgs.size()]);
-        }
-
-        InitializationData initData;
-        if(initializationData != null)
-        {
-            initData = initializationData.clone();
-        }
-        else
-        {
-            initData = new InitializationData();
-        }
-
-        java.util.List<String> remainingArgs = new java.util.ArrayList<>();
-        initData.properties = Util.createProperties(args, initData.properties, remainingArgs);
-        args = remainingArgs.toArray(new String[remainingArgs.size()]);
-
-        //
-        // If the process logger is the default logger, we replace it with a
-        // a logger that uses the program name as the prefix.
-        //
-        if(Util.getProcessLogger() instanceof LoggerI)
-        {
-            Util.setProcessLogger(new LoggerI(initData.properties.getProperty("Ice.ProgramName"), ""));
-        }
-
-        int status = 0;
-
-        try(Communicator communicator = Util.initialize(args, initData, remainingArgs))
-        {
-            _communicator = communicator;
-            args = remainingArgs.toArray(new String[remainingArgs.size()]);
-
-            if(_communicatorListener != null)
-            {
-                _communicatorListener.communicatorInitialized(_communicator);
-            }
-            status = run(args);
-            if(status == WAIT)
-            {
-                if(_cb != null)
-                {
-                    _cb.serverReady();
-                }
-                _communicator.waitForShutdown();
-                status = 0;
-            }
-        }
-        catch(LocalException ex)
-        {
-            writer.println(_testName + ": " + ex);
-            ex.printStackTrace();
-            status = 1;
-        }
-        catch(java.lang.Exception ex)
-        {
-            writer.println(_testName + ": unknown exception");
-            ex.printStackTrace(writer);
-            status = 1;
-        }
-        catch(java.lang.Error err)
-        {
-            //
-            // We catch Error to avoid hangs in some non-fatal situations
-            //
-            writer.println(_testName + ": Java error");
-            err.printStackTrace(writer);
-            status = 1;
-        }
-        finally
-        {
-            _communicator = null;
-        }
-        writer.flush();
-
-        return status;
-    }
-
-    public void stop()
-    {
-        if(_communicator != null)
-        {
-            _communicator.shutdown();
-        }
-    }
-
-    //
-    // Initialize a new communicator.
-    //
-    public Communicator initialize(InitializationData initData)
-    {
-        Communicator communicator = Util.initialize(initData);
-        if(_communicatorListener != null)
-        {
-            _communicatorListener.communicatorInitialized(communicator);
-        }
-        return communicator;
-    }
-
-    public Communicator initialize()
-    {
-        Communicator communicator = Util.initialize();
-        if(_communicatorListener != null)
-        {
-            _communicatorListener.communicatorInitialized(communicator);
-        }
-        return communicator;
-    }
-
-    public abstract int run(String[] args);
-
-    //
-    // Hook to override the initialization data. This hook is
-    // necessary because some properties must be set prior to
-    // communicator initialization.
-    //
-    protected InitializationData getInitData(String[] args, java.util.List<String> rArgs)
-    {
-        InitializationData initData = createInitializationData();
-        initData.properties = Util.createProperties(args, rArgs);
-        args = initData.properties.parseCommandLineOptions("Test", rArgs.toArray(new String[rArgs.size()]));
-        rArgs.clear();
-        rArgs.addAll(java.util.Arrays.asList(args));
-        return initData;
-    }
-
-    public java.io.PrintWriter getWriter()
-    {
-        return _printWriter;
-    }
-
-    public void setWriter(java.io.Writer writer)
-    {
-        _printWriter = new java.io.PrintWriter(writer);
-    }
-
-    public void setLogger(com.zeroc.Ice.Logger logger)
-    {
-        _logger = logger;
-    }
-
-    public void setServerReadyListener(ServerReadyListener cb)
-    {
-        _cb = cb;
-    }
-
-    public void setCommunicatorListener(CommunicatorListener listener)
-    {
-        _communicatorListener = listener;
-    }
-
-    public void serverReady()
-    {
-        if(_cb != null)
-        {
-            _cb.serverReady();
-        }
-    }
-
-    static public boolean isAndroid()
-    {
-        return com.zeroc.IceInternal.Util.isAndroid();
-    }
-    //
-    // Return the application name, i.e., argv[0].
-    //
-    public String appName()
-    {
-        return _testName;
-    }
-
-    public Communicator communicator()
-    {
-        return _communicator;
-    }
-
-    public void setClassLoader(ClassLoader c)
-    {
-        _classLoader = c;
-    }
-
-    public ClassLoader getClassLoader()
-    {
-        return _classLoader;
-    }
-
-    public InitializationData createInitializationData()
-    {
-        InitializationData initData = new InitializationData();
-        initData.classLoader = _classLoader;
-        initData.logger = _logger;
-        return initData;
-    }
-
-    public ClassLoader classLoader()
-    {
-        return _classLoader;
-    }
-
-    public String getTestEndpoint(int num)
-    {
-        return getTestEndpoint(num, "");
-    }
-
-    public String getTestEndpoint(com.zeroc.Ice.Properties properties, int num)
-    {
-        return getTestEndpoint(properties, num, "");
-    }
-
-    public String getTestEndpoint(int num, String prot)
-    {
-        return getTestEndpoint(_communicator.getProperties(), num, prot);
-    }
-
-    static public String getTestEndpoint(com.zeroc.Ice.Properties properties, int num, String prot)
-    {
-        String protocol = prot;
-        if(protocol.isEmpty())
-        {
-            protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default");
-        }
-
-        int basePort = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010);
-
-        if(protocol.indexOf("bt") == 0)
-        {
-            //
-            // For Bluetooth, there's no need to specify a port (channel) number.
-            // The client locates the server using its address and a UUID.
-            //
-            switch(num)
-            {
-            case 0:
-                return "default -u 5e08f4de-5015-4507-abe1-a7807002db3d";
-            case 1:
-                return "default -u dae56460-2485-46fd-a3ca-8b730e1e868b";
-            case 2:
-                return "default -u 99e08bc6-fcda-4758-afd0-a8c00655c999";
-            default:
-                assert(false);
-            }
-        }
-
-        return protocol + " -p " + Integer.toString(basePort + num);
-    }
-
-    public String getTestHost()
-    {
-        return getTestHost(_communicator.getProperties());
-    }
-
-    static public String getTestHost(com.zeroc.Ice.Properties properties)
-    {
-        return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
-    }
-
-    public String getTestProtocol()
-    {
-        return getTestProtocol(_communicator.getProperties());
-    }
-
-    static public String getTestProtocol(com.zeroc.Ice.Properties properties)
-    {
-        return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-    }
-
-    public int getTestPort(int num)
-    {
-        return getTestPort(_communicator.getProperties(), num);
-    }
-
-    static public int getTestPort(com.zeroc.Ice.Properties properties, int num)
-    {
-        return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
-    }
-
-    private ClassLoader _classLoader;
-    private String _testName;
-    private Communicator _communicator;
-    private Logger _logger = null;
-    private java.io.PrintWriter _printWriter = new java.io.PrintWriter(new java.io.OutputStreamWriter(System.out));
-    private ServerReadyListener _cb = null;
-    private CommunicatorListener _communicatorListener = null;
-}
diff -Nru zeroc-ice-3.7.1/java-compat/allTests.py zeroc-ice-3.7.2/java-compat/allTests.py
--- zeroc-ice-3.7.1/java-compat/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/java-compat/android/allTests.py zeroc-ice-3.7.2/java-compat/android/allTests.py
--- zeroc-ice-3.7.1/java-compat/android/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/allTests.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts"))
-
-from Util import runTestsWithPath
-
-runTestsWithPath(__file__)
diff -Nru zeroc-ice-3.7.1/java-compat/android/build.gradle zeroc-ice-3.7.2/java-compat/android/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-    }
-}
-
-subprojects {
-    project.ext.topSrcDir = "$rootProject.projectDir/../.."
-
-    project.version = iceVersion
-    project.group = "com.zeroc"
-
-    apply plugin: 'idea'
-}
-
-//
-// Used to build the gradle wrapper to automatically download and install
-// the version of gradle needed to build Ice.
-//
-task wrapper(type: Wrapper) {
-    gradleVersion = "4.7"
-    distributionType = Wrapper.DistributionType.ALL
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/.gitignore zeroc-ice-3.7.2/java-compat/android/.gitignore
--- zeroc-ice-3.7.1/java-compat/android/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-lib
-build
-.gradle
-local.properties
-*.bks
-*.iml
-/.idea
-test/src/
diff -Nru zeroc-ice-3.7.1/java-compat/android/gradle/dex.gradle zeroc-ice-3.7.2/java-compat/android/gradle/dex.gradle
--- zeroc-ice-3.7.1/java-compat/android/gradle/dex.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/gradle/dex.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-import org.apache.tools.ant.taskdefs.condition.Os
-
-// Discover the Android SDK home.
-// It either comes from the environment or from sdk.dir defined
-// in local.properties at the root of the android project.
-ext.androidSdkDir = System.env.ANDROID_HOME
-if(ext.androidSdkDir == null) {
-    Properties localProps = new Properties()
-    localProps.load(new FileInputStream(file("$rootProject.projectDir/local.properties")))
-
-    ext.androidSdkDir = localProps['sdk.dir']
-}
-
-def cmdExt = Os.isFamily(Os.FAMILY_WINDOWS) ? '.bat' : ''
-ext.dxCmd = "${androidSdkDir}/build-tools/${ice_buildToolsVersion}/dx${cmdExt}"
diff -Nru zeroc-ice-3.7.1/java-compat/android/gradle/library.gradle zeroc-ice-3.7.2/java-compat/android/gradle/library.gradle
--- zeroc-ice-3.7.1/java-compat/android/gradle/library.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/gradle/library.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-jar {
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jar.archiveName}")
-}
-
-task copyJars(type: Copy, dependsOn: jar) {
-    from "${libDir}/${jar.archiveName}"
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
-
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/gradle/tests.gradle zeroc-ice-3.7.2/java-compat/android/gradle/tests.gradle
--- zeroc-ice-3.7.1/java-compat/android/gradle/tests.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/gradle/tests.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-ext.tests = [
-    "Ice/acm",
-    "Ice/adapterDeactivation",
-    "Ice/admin",
-    "Ice/ami",
-    "Ice/background",
-    "Ice/binding",
-    "Ice/checksum",
-    "Ice/classLoader",
-    "Ice/custom",
-    "Ice/defaultServant",
-    "Ice/defaultValue",
-    "Ice/dispatcher",
-    "Ice/echo",
-    "Ice/enums",
-    "Ice/exceptions",
-    "Ice/facets",
-    "Ice/hash",
-    "Ice/hold",
-    "Ice/info",
-    "Ice/inheritance",
-    "Ice/interceptor",
-    "Ice/interrupt",
-    "Ice/invoke",
-    "Ice/location",
-    "Ice/networkProxy",
-    "Ice/objects",
-    "Ice/operations",
-    "Ice/optional",
-    "Ice/packagemd",
-    "Ice/plugin",
-    "Ice/properties",
-    "Ice/proxy",
-    "Ice/retry",
-    "Ice/seqMapping",
-    "Ice/serialize",
-    "Ice/servantLocator",
-    "Ice/slicing/exceptions",
-    "Ice/slicing/objects",
-    "Ice/stream",
-    "Ice/threadPoolPriority",
-    "Ice/timeout",
-    "Ice/udp" ]
diff -Nru zeroc-ice-3.7.1/java-compat/android/gradle.properties zeroc-ice-3.7.2/java-compat/android/gradle.properties
--- zeroc-ice-3.7.1/java-compat/android/gradle.properties	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/gradle.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-//
-// Version used in JAR files
-//
-iceVersion = 3.7.1
-
-// The Android versions used for the Ice build.
-ice_buildToolsVersion = 27.0.3
-ice_compileSdkVersion = 21
-ice_minSdkVersion = 21
-ice_targetSdkVersion = 21
-
-//
-// Set iceHome to location of Ice installation if Ice was installed in a
-// non-standard location. You must use forward slashes in the path, even on
-// Windows.
-//
-// iceHome =
-
-//
-// Set the version of the Ice Builder to use for building. It must be set to debian
-// when using the gradle-ice-builder-plugin package on Debian.
-//
-iceBuilderVersion = 1.4.5
-
-//
-// Set the builder artifact class path. It must be set to com.zeroc.gradle.ice-builder
-// when using the gradle-ice-builder-plugin package.
-//
-iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder
-
-//
-// Set the location of a local Ice Builder for Gradle source directory
-//
-iceBuilderHome =
-
-//
-// Gradle build properties
-//
-// org.gradle.daemon = false
-
-//
-// For faster builds, increase the maximum heap size
-// for the Gradle daemon to at least 1536 MB.
-//
-org.gradle.jvmargs=-Xmx2048M
-
-//
-// Package build properties
-//
-DESTDIR =
-appendVersionSuffix = yes
-prefix =
-debug = true
-
-//
-// Windows specific options
-//
-
-//
-// The platform used by the C++ build. Supported values are `x64` and `Win32`.
-// This is required to locate the slice2java compiler in the platform-dependent
-// directory.
-//
-cppPlatform = x64
-
-//
-// The configuration used by the C++ build. Supported values are `Debug` and `Release`.
-// This is required to locate the slice2java compiler in the configuration-dependent
-// directory.
-//
-cppConfiguration = Release
diff -Nru zeroc-ice-3.7.1/java-compat/android/README.md zeroc-ice-3.7.2/java-compat/android/README.md
--- zeroc-ice-3.7.1/java-compat/android/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-# Building the Ice for Android Test Suite
-
-This directory contains an Android Studio project for the Ice test suite. For
-ease of development and testing, this project also builds a subset of the Ice
-JAR files. This is not necessary for your own projects as it considerably
-complicates the project configuration.
-
-Building [Ice for Java](../README.md) is the only way to build all of the Ice
-JAR files from source. The JAR files produced by the Ice for Java build fully
-support Android. If you prefer, our [binary distributions][1] include
-pre-compiled JAR files.
-
-## Build Requirements
-
-### Android Development Tools
-
-Building any Ice application for Android requires Android Studio and the Android
-SDK build tools. We tested with the following components:
-
-- Android Studio 3.0.1
-- Android SDK 21
-- Android Build Tools 27.0.1
-
-Ice requires at minimum API level 21:
-
-- Android 5 (API21)
-
-If you want to target a later version of the Android API level for the test
-suite, edit `gradle.properties` and change the following variables:
-
-```
-ice_compileSdkVersion
-ice_minSdkVersion
-ice_targetSdkVersion
-```
-
-*NOTE: Do not use Android Studio to modify the project's settings.*
-
-### Slice to Java Compiler
-
-To build this project you'll need the Slice to Java compiler, which generates
-Java code from Slice definitions. The compiler is written in C++. If you have
-a suitable C++ development environment, you can build [Ice for C++](../../cpp)
-yourself. Otherwise, you can obtain the compiler by installing a
-[binary distribution][1].
-
-The project's Gradle-based build system will automatically search for the
-compiler in this repository and in the default installation directories used
-by the binary distributions for our supported platforms.
-
-### Bzip2 Compression
-
-Ice for Java supports protocol compression using the bzip2 classes included
-with [Apache Commons Compress][2].
-
-The Maven package id for the commons-compress JAR file is as follows:
-
-```
-groupId=org.apache.commons, version=1.14, artifactId=commons-compress
-```
-
-The demos and tests are automatically setup to enable protocol compression by
-adding the commons-compress JAR to the manifest class path. For your own
-applications you must add the commons-compress JAR to the application CLASSPATH
-to enable protocol compression.
-
-> *These classes are a pure Java implementation of the bzip2 algorithm and
-therefore add significant latency to Ice requests.*
-
-## Building the Project
-
-Follow these steps to open the project in Android Studio:
-
-1. Start Android Studio
-2. Select "Open an existing Android Studio project"
-3. Navigate to and select the "android" subdirectory
-4. Click OK and wait for the project to open and build
-
-## Running the Test Suite
-
-The Android Studio project contains a `testController` app for the Ice test
-suite. Prior to running the app, you must disable Android Studio's Instant Run
-feature, located in File / Settings / Build, Execution, Deployment /
-Instant Run.
-
-Tests are started from the dev machine using the `allTests.py` script, similar
-to the other language mappings. The script uses Ice for Python to communicate
-with the Android app, therefore you must build the [Python mapping]
-(../../python) before continuing.
-
-You also need to add the `tools\bin`, `platform-tools` and `emulator`
-directories from the Android SDK to your PATH. On macOS, you can use the
-following commands:
-
-```
-export PATH=~/Library/Android/sdk/tools/bin:$PATH
-export PATH=~/Library/Android/sdk/platform-tools:$PATH
-export PATH=~/Library/Android/sdk/emulator:$PATH
-```
-
-On Windows, you can use the following commands:
-
-```
-set PATH=%LOCALAPPDATA%\Android\sdk\tools;%PATH%
-set PATH=%LOCALAPPDATA%\Android\sdk\platform-tools;%PATH%
-set PATH=%LOCALAPPDATA%\Android\sdk\emulator;%PATH%
-```
-
-Run the tests with the Android emulator by running the following command:
-
-```
-cd android
-python allTests.py --androidemulator --controller-app
-```
-
-To run the tests on a specific Android connected device, you can use the
-`--device` argument as shown below:
-
-```
-python allTests.py --device=ZX1C2234XF --controller-app
-```
-
-You can see the list of connected devices with the `adb` command:
-
-```
-adb devices -l
-```
-
-To run the tests against a `testController` application started from Android
-Studio you should omit the `--controller-app` option from the commands above.
-
-[1]: https://zeroc.com/distributions/ice
-[2]: https://commons.apache.org/proper/commons-compress/
diff -Nru zeroc-ice-3.7.1/java-compat/android/settings.gradle zeroc-ice-3.7.2/java-compat/android/settings.gradle
--- zeroc-ice-3.7.1/java-compat/android/settings.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/settings.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply from: "$rootProject.projectDir/gradle/tests.gradle"
-
-tests.each {
-    def name = it.replace('/', '_')
-    include ":test_${name}"
-    project(":test_${name}").projectDir = new File("test/src/test_${name}")
-}
-
-// Main source
-include ':ice-compat'
-project(':ice-compat').projectDir = new File('src/Ice')
-include ':icebt-compat'
-project(':icebt-compat').projectDir = new File('src/IceBT')
-include ':icediscovery-compat'
-project(':icediscovery-compat').projectDir = new File('src/IceDiscovery')
-include ':icelocatordiscovery-compat'
-project(':icelocatordiscovery-compat').projectDir = new File('src/IceLocatorDiscovery')
-include ':icebox-compat'
-project(':icebox-compat').projectDir = new File('src/IceBox')
-include ':glacier2-compat'
-project(':glacier2-compat').projectDir = new File('src/Glacier2')
-include ':icepatch2-compat'
-project(':icepatch2-compat').projectDir = new File('src/IcePatch2')
-include ':icestorm-compat'
-project(':icestorm-compat').projectDir = new File('src/IceStorm')
-include ':icegrid-compat'
-project(':icegrid-compat').projectDir = new File('src/IceGrid')
-
-include ':test', ':testController'
-
-project(':test').projectDir = new File('test')
-project(':testController').projectDir = new File('test/controller')
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/Glacier2/build.gradle zeroc-ice-3.7.2/java-compat/android/src/Glacier2/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/Glacier2/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/Glacier2/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/Glacier2/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/Glacier2/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/Ice/build.gradle zeroc-ice-3.7.2/java-compat/android/src/Ice/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/Ice/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/Ice/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/Ice/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/Ice/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/IceBox/build.gradle zeroc-ice-3.7.2/java-compat/android/src/IceBox/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/IceBox/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/IceBox/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/IceBox/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/IceBox/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/IceBT/build.gradle zeroc-ice-3.7.2/java-compat/android/src/IceBT/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/IceBT/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/IceBT/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/IceBT/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/IceBT/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/IceDiscovery/build.gradle zeroc-ice-3.7.2/java-compat/android/src/IceDiscovery/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/IceDiscovery/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/IceDiscovery/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/IceDiscovery/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/IceDiscovery/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/IceGrid/build.gradle zeroc-ice-3.7.2/java-compat/android/src/IceGrid/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/IceGrid/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/IceGrid/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/IceGrid/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/IceGrid/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/IceLocatorDiscovery/build.gradle zeroc-ice-3.7.2/java-compat/android/src/IceLocatorDiscovery/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/IceLocatorDiscovery/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/IceLocatorDiscovery/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/IceLocatorDiscovery/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/IceLocatorDiscovery/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/IcePatch2/build.gradle zeroc-ice-3.7.2/java-compat/android/src/IcePatch2/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/IcePatch2/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/IcePatch2/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/IcePatch2/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/IcePatch2/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/src/IceStorm/build.gradle zeroc-ice-3.7.2/java-compat/android/src/IceStorm/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/src/IceStorm/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/src/IceStorm/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$project.ext.topSrcDir/java-compat/src/IceStorm/build.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/src/IceStorm/src/main/java"
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/build.gradle zeroc-ice-3.7.2/java-compat/android/test/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/test/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
- //**********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'java'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-ext.testDir = "$project.ext.topSrcDir/java-compat/test/src/main/java/test"
-apply from: "$project.ext.topSrcDir/java-compat/test/slice.gradle"
-apply from: "$rootProject.projectDir/gradle/tests.gradle"
-apply from: "$rootProject.projectDir/gradle/dex.gradle"
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-sourceSets {
-    main {
-        java {
-            srcDir "$project.ext.topSrcDir/java-compat/test/src/main/java"
-            include 'test/Util/**'
-            exclude 'test/Ice/**/lambda'
-        }
-    }
-}
-
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
-dependencies {
-    compile localDependency('ice-compat')
-}
-
-tests.each {
-    def dirName = it
-    def name = it.replace('/', '_')
-    project(":test_${name}") {
-        apply plugin: 'java'
-        apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-        slice.compat = true
-
-        sourceCompatibility = 1.7
-        targetCompatibility = 1.7
-
-        sourceSets {
-            main {
-                java {
-                    srcDir "$project.ext.topSrcDir/java-compat/test/src/main/java"
-                    include "test/${dirName}/**"
-                    exclude "test/${dirName}/lambda"
-                    srcDir "$rootProject.projectDir/test/build/generated-src/"
-                    include "test/${dirName}/**"
-                }
-            }
-        }
-
-        def dexName = "test_${name}.dex"
-        task dexClasses {
-            inputs.dir "${buildDir}/classes/java/main"
-            outputs.file "${buildDir}/classes/java/main/${dexName}"
-            doLast {
-                exec {
-                    commandLine "${dxCmd}", '--dex',
-                            "--output=${buildDir}/classes/java/main/${dexName}",
-                            "${buildDir}/classes/java/main"
-                }
-            }
-        }
-
-        dexClasses.dependsOn('classes')
-
-        configure(jar) {
-            include "${dexName}"
-        }
-        jar.dependsOn(dexClasses)
-
-        dependencies {
-            compile project(':test')
-            compile localDependency('ice-compat')
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/build.gradle zeroc-ice-3.7.2/java-compat/android/test/controller/build.gradle
--- zeroc-ice-3.7.1/java-compat/android/test/controller/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-apply plugin: 'com.android.application'
-apply from: "$project.ext.topSrcDir/java/gradle/ice.gradle"
-slice.compat = true
-apply from: "$rootProject.projectDir/gradle/tests.gradle"
-
-slice {
-    java {
-        files = fileTree(dir: "$project.ext.topSrcDir/scripts/", includes: ['*.ice'])
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-android {
-    compileSdkVersion ice_compileSdkVersion.toInteger()
-    buildToolsVersion ice_buildToolsVersion
-
-    defaultConfig {
-        applicationId "com.zeroc.testcontroller"
-        minSdkVersion ice_minSdkVersion.toInteger()
-        targetSdkVersion ice_targetSdkVersion.toInteger()
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
-        }
-    }
-
-    buildTypes {
-        debug {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
-        }
-
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
-        }
-    }
-}
-
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
-tests.each {
-    def name = it.replace("/", "_")
-    def taskName = "copyTask-${name}"
-    def testName = ":test_${name}"
-    def dexName = "test_${name}.dex"
-    task "${taskName}"(type: Copy, dependsOn: "${testName}:dexClasses") {
-        from "${rootProject.projectDir}/test/src/test_${name}/build/classes/java/main/${dexName}"
-        into "src/main/assets"
-    }
-    preBuild.dependsOn(tasks[taskName])
-
-    clean {
-        delete("src/main/assets/${dexName}")
-    }
-}
-
-task copyBksTask(type: Copy) {
-    from "${project.ext.topSrcDir}/certs/client.bks"
-    from "${project.ext.topSrcDir}/certs/server.bks"
-    into "src/main/res/raw"
-}
-preBuild.dependsOn(copyBksTask)
-
-clean {
-    delete("src/main/res/raw/client.bks")
-    delete("src/main/res/raw/server.bks")
-}
-
-dependencies {
-    compile localDependency('ice-compat')
-    compile localDependency('icediscovery-compat')
-    compile localDependency('icebt-compat')
-    compile project(':test')
-    runtimeOnly "org.apache.commons:commons-compress:1.14"
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/proguard.cfg zeroc-ice-3.7.2/java-compat/android/test/controller/proguard.cfg
--- zeroc-ice-3.7.1/java-compat/android/test/controller/proguard.cfg	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/proguard.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-# This is a configuration file for ProGuard.
-# http://proguard.sourceforge.net/index.html#manual/usage.html
-
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--verbose
-
-# Optimization is turned off by default. Dex does not like code run
-# through the ProGuard optimize and preverify steps (and performs some
-# of these optimizations on its own).
--dontoptimize
--dontpreverify
-# Note that if you want to enable optimization, you cannot just
-# include optimization flags in your own project configuration file;
-# instead you will need to point to the
-# "proguard-android-optimize.txt" file instead of this one from your
-# project.properties file.
-
--keepattributes *Annotation*
--keep public class com.google.vending.licensing.ILicensingService
--keep public class com.android.vending.licensing.ILicensingService
-
-# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-# keep setters in Views so that animations can still work.
-# see http://proguard.sourceforge.net/manual/examples.html#beans
--keepclassmembers public class * extends android.view.View {
-   void set*(***);
-   *** get*();
-}
-
-# We want to keep methods in Activity that could be used in the XML attribute onClick
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
-# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
-
--keepclassmembers class **.R$* {
-    public static <fields>;
-}
-
-# The support library contains references to newer platform versions.
-# Don't warn about those in case this app is linking against an older
-# platform version.  We know about them, and they are safe.
--dontwarn android.support.**
-
--dontwarn IceInternal.Instance$Timer*
--dontwarn java.nio.channels.*
--dontwarn java.net.StandardSocketOptions
--dontwarn java.nio.charset.StandardCharsets
-
--keepnames class ** { *; }
-
--keep class test.Ice.** { *; }
-
--keep class Ice.** { *; }
--keep enum Ice.** { *; }
-
--keep class IceSSL.** { *; }
--keep enum IceSSL.** { *; }
-
--keep class IceInternal.** { *; }
--keep enum IceInternal.** { *; }
-
-# For debugging.
--keepattributes LocalVariableTable, LocalVariableTypeTable
--dontoptimize
--dontobfuscate
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/AndroidManifest.xml zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/AndroidManifest.xml
--- zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/AndroidManifest.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.zeroc.testcontroller"
-      android:versionCode="1"
-      android:versionName="1.0.0">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-    <!--
-      http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
-    -->
-    <application android:icon="@raw/icon" android:label="@string/app_name" android:name="ControllerApp"
-                 android:allowBackup="false">
-        <activity android:name="ControllerActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-</application>
-</manifest>
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/assets/.gitignore zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/assets/.gitignore
--- zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/assets/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/assets/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-*.dex
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java
--- zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.testcontroller;
-
-import java.util.LinkedList;
-import android.app.*;
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.widget.*;
-import android.view.View;
-
-public class ControllerActivity extends ListActivity
-{
-    private WifiManager _wifiManager;
-    private WifiManager.MulticastLock _lock;
-    private LinkedList<String> _output = new LinkedList<String>();
-    private ArrayAdapter<String> _outputAdapter;
-    private ArrayAdapter<String> _ipv4Adapter;
-    private ArrayAdapter<String> _ipv6Adapter;
-
-    private static final int REQUEST_ENABLE_BT = 1;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        _wifiManager = (WifiManager)getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-        _lock = _wifiManager.createMulticastLock("com.zeroc.testcontroller");
-        _lock.acquire();
-    }
-
-    @Override
-    public void onStart()
-    {
-        super.onStart();
-
-        //
-        // Enable Bluetooth if necessary.
-        //
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        if(adapter == null)
-        {
-            Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
-            setup(false);
-        }
-        else if(!adapter.isEnabled())
-        {
-            Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-            startActivityForResult(enableIntent, REQUEST_ENABLE_BT);
-        }
-        else
-        {
-            setup(true);
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int req, int res, Intent data)
-    {
-        switch(req)
-        {
-            case REQUEST_ENABLE_BT:
-            {
-                if(_outputAdapter == null)
-                {
-                    if(res == Activity.RESULT_OK)
-                    {
-                        setup(true);
-                    }
-                    else
-                    {
-                        Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
-                        setup(false);
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    synchronized private void setup(boolean bluetooth)
-    {
-        _outputAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, _output);
-        setListAdapter(_outputAdapter);
-
-        final ControllerApp app = (ControllerApp)getApplication();
-        final java.util.List<String> ipv4Addresses = app.getAddresses(false);
-        _ipv4Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv4Addresses);
-        Spinner s = (Spinner)findViewById(R.id.ipv4);
-        s.setAdapter(_ipv4Adapter);
-        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
-            {
-                @Override
-                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
-                {
-                    app.setIpv4Address(ipv4Addresses.get((int)id));
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> arg0)
-                {
-                }
-            });
-        s.setSelection(0);
-
-        final java.util.List<String> ipv6Addresses = app.getAddresses(true);
-        _ipv6Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv6Addresses);
-        s = (Spinner)findViewById(R.id.ipv6);
-        s.setAdapter(_ipv6Adapter);
-        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
-            {
-                @Override
-                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
-                {
-                    app.setIpv6Address(ipv6Addresses.get((int)id));
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> arg0)
-                {
-                }
-            });
-        s.setSelection(0);
-        app.startController(this, bluetooth);
-    }
-
-    public synchronized void println(String data)
-    {
-        _output.add(data);
-        _outputAdapter.notifyDataSetChanged();
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
--- zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,605 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.testcontroller;
-
-import java.io.*;
-import java.util.*;
-
-import Ice.Logger;
-import Ice.Communicator;
-
-import dalvik.system.DexClassLoader;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.Log;
-import android.app.Application;
-
-import Test.Common.ProcessControllerRegistryPrxHelper;
-import Test.Common.ProcessControllerRegistryPrx;
-import Test.Common.ProcessControllerPrx;
-import Test.Common.ProcessControllerPrxHelper;
-import test.Util.Application.CommunicatorListener;
-
-public class ControllerApp extends Application
-{
-    private final String TAG = "ControllerApp";
-    private ControllerHelper _helper;
-    private ControllerActivity _controller;
-    private java.util.Map<String, ClassLoader> _classLoaders = new java.util.HashMap<String, ClassLoader>();
-    private String _ipv4Address;
-    private String _ipv6Address;
-
-    private ClassLoader getDEXClassLoader(String classDir, ClassLoader parent) throws IOException
-    {
-        ClassLoader classLoader = _classLoaders.get(classDir);
-        if(classLoader == null)
-        {
-            if(parent == null)
-            {
-                parent = getClassLoader();
-            }
-
-            File dexInternalStoragePath = new java.io.File(getDir("dex", Context.MODE_PRIVATE), classDir);
-            BufferedInputStream bis = new BufferedInputStream(getAssets().open(classDir));
-            OutputStream dexWriter = new BufferedOutputStream(new FileOutputStream(dexInternalStoragePath));
-            final int sz = 8 * 1024;
-            byte[] buf = new byte[sz];
-            int len;
-            while((len = bis.read(buf, 0, sz)) > 0)
-            {
-                dexWriter.write(buf, 0, len);
-            }
-            dexWriter.close();
-            bis.close();
-
-            // Internal storage where the DexClassLoader writes the optimized dex file to
-            final File optimizedDexOutputPath = getDir("outdex", Context.MODE_PRIVATE);
-
-            classLoader = new DexClassLoader(
-                    dexInternalStoragePath.getAbsolutePath(),
-                    optimizedDexOutputPath.getAbsolutePath(),
-                    null,
-                    parent);
-            _classLoaders.put(classDir, classLoader);
-        }
-        return classLoader;
-    }
-
-    static private class TestSuiteBundle
-    {
-        @SuppressWarnings("unchecked")
-        TestSuiteBundle(String name, ClassLoader loader)
-        {
-            _loader = loader;
-            try
-            {
-                _class = (Class<? extends test.Util.Application>)_loader.loadClass(name);
-            }
-            catch(ClassNotFoundException e)
-            {
-            }
-        }
-
-        test.Util.Application newInstance()
-                throws IllegalAccessException, InstantiationException
-        {
-            if(_class == null)
-            {
-                return null;
-            }
-            return _class.newInstance();
-        }
-
-        ClassLoader getClassLoader()
-        {
-            return  _loader;
-        }
-
-        private String _name;
-        private ClassLoader _loader;
-        private Class<? extends test.Util.Application> _class;
-    }
-
-    class AndroidLogger implements Ice.Logger
-    {
-        private final String _prefix;
-
-        AndroidLogger(String prefix)
-        {
-            _prefix = prefix;
-        }
-
-        @Override
-        public void print(String message)
-        {
-            Log.d(TAG, message);
-        }
-
-        @Override
-        public void trace(String category, String message)
-        {
-            Log.v(category, message);
-        }
-
-        @Override
-        public void warning(String message)
-        {
-            Log.w(TAG, message);
-        }
-
-        @Override
-        public void error(String message)
-        {
-            Log.e(TAG, message);
-        }
-
-        @Override
-        public String getPrefix()
-        {
-            return _prefix;
-        }
-
-        @Override
-        public Logger cloneWithPrefix(String s)
-        {
-            return new AndroidLogger(s);
-        }
-    }
-
-    @Override
-    public void onCreate()
-    {
-        super.onCreate();
-        Ice.Util.setProcessLogger(new AndroidLogger(""));
-    }
-
-    synchronized public void setIpv4Address(String address)
-    {
-        _ipv4Address = address;
-    }
-
-    synchronized public void setIpv6Address(String address)
-    {
-        int i = address.indexOf("%");
-        _ipv6Address = i == -1 ? address : address.substring(i);
-    }
-
-    public List<String> getAddresses(boolean ipv6)
-    {
-        List<String> addresses = new java.util.ArrayList<String>();
-        try
-        {
-            java.util.Enumeration<java.net.NetworkInterface> ifaces = java.net.NetworkInterface.getNetworkInterfaces();
-            while(ifaces.hasMoreElements())
-            {
-                java.net.NetworkInterface iface = ifaces.nextElement();
-                java.util.Enumeration<java.net.InetAddress> addrs = iface.getInetAddresses();
-                while (addrs.hasMoreElements())
-                {
-                    java.net.InetAddress addr = addrs.nextElement();
-                    if((ipv6 && addr instanceof java.net.Inet6Address) ||
-                       (!ipv6 && !(addr instanceof java.net.Inet6Address)))
-                    {
-                        addresses.add(addr.getHostAddress());
-                    }
-                }
-            }
-        }
-        catch(java.net.SocketException ex)
-        {
-        }
-        return addresses;
-    }
-
-    public synchronized void startController(ControllerActivity controller, boolean bluetooth)
-    {
-        if(_helper == null)
-        {
-            _controller = controller;
-            _helper = new ControllerHelper(bluetooth);
-        }
-        else
-        {
-            _controller = controller;
-        }
-    }
-
-    public synchronized void println(final String data)
-    {
-        _controller.runOnUiThread(new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                synchronized(ControllerApp.this)
-                {
-                    _controller.println(data);
-                }
-            }
-        });
-    }
-
-    public static boolean isEmulator()
-    {
-        return Build.FINGERPRINT.startsWith("generic") ||
-               Build.FINGERPRINT.startsWith("unknown") ||
-               Build.MODEL.contains("google_sdk") ||
-               Build.MODEL.contains("Emulator") ||
-               Build.MODEL.contains("Android SDK built for x86") ||
-               Build.MANUFACTURER.contains("Genymotion") ||
-               (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) ||
-               Build.PRODUCT.equals("google_sdk");
-    }
-
-    class ControllerHelper
-    {
-        public ControllerHelper(boolean bluetooth)
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.ThreadPool.Server.SizeMax", "10");
-            initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp");
-            initData.properties.setProperty("ControllerAdapter.AdapterId", java.util.UUID.randomUUID().toString());
-            initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
-            if(!isEmulator())
-            {
-                if(bluetooth)
-                {
-                    initData.properties.setProperty("Ice.Plugin.IceBT", "IceBT.PluginFactory");
-                }
-                initData.properties.setProperty("Ice.Plugin.IceDiscovery", "IceDiscovery.PluginFactory");
-                initData.properties.setProperty("IceDiscovery.DomainId", "TestController");
-            }
-            _communicator = Ice.Util.initialize(initData);
-            Ice.ObjectAdapter adapter = _communicator.createObjectAdapter("ControllerAdapter");
-            ProcessControllerPrx processController = ProcessControllerPrxHelper.uncheckedCast(
-                    adapter.add(new ProcessControllerI(), Ice.Util.stringToIdentity("Android/ProcessController")));
-            adapter.activate();
-            if(isEmulator())
-            {
-                ProcessControllerRegistryPrx registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
-                        _communicator.stringToProxy("Util/ProcessControllerRegistry:tcp -h 10.0.2.2 -p 15001"));
-                registerProcessController(adapter, registry, processController);
-            }
-            println("Android/ProcessController");
-        }
-
-        public void
-        registerProcessController(final Ice.ObjectAdapter adapter,
-                                  final ProcessControllerRegistryPrx registry,
-                                  final ProcessControllerPrx processController)
-        {
-            registry.begin_ice_ping(
-                new Ice.Callback()
-                {
-                    public void completed(Ice.AsyncResult r)
-                    {
-                        try
-                        {
-                            registry.end_ice_ping(r);
-                            Ice.Connection connection = registry.ice_getCachedConnection();
-                            connection.setAdapter(adapter);
-                            connection.setACM(new Ice.IntOptional(5),
-                                              new Ice.Optional<Ice.ACMClose>(Ice.ACMClose.CloseOff),
-                                              new Ice.Optional<Ice.ACMHeartbeat>(Ice.ACMHeartbeat.HeartbeatAlways));
-
-                            connection.setCloseCallback(new Ice.CloseCallback()
-                                {
-                                    @Override
-                                    public void closed(Ice.Connection con)
-                                    {
-                                        println("connection with process controller registry closed");
-                                        while(true)
-                                        {
-                                            try
-                                            {
-                                                Thread.sleep(500);
-                                                break;
-                                            }
-                                            catch(InterruptedException e)
-                                            {
-                                            }
-                                        }
-                                        registerProcessController(adapter, registry, processController);
-                                    }
-                                });
-
-                            registry.begin_setProcessController(processController,
-                                new Ice.Callback()
-                                {
-                                    public void completed(Ice.AsyncResult r)
-                                    {
-                                        try
-                                        {
-                                            registry.end_setProcessController(r);
-                                        }
-                                        catch(Ice.Exception ex)
-                                        {
-                                            handleException(ex, adapter, registry, processController);
-                                        }
-                                    }
-                                });
-                        }
-                        catch(Ice.Exception ex)
-                        {
-                            handleException(ex, adapter, registry, processController);
-                        }
-                    }
-                });
-        }
-
-        public void handleException(Throwable ex,
-                                    final Ice.ObjectAdapter adapter,
-                                    final ProcessControllerRegistryPrx registry,
-                                    final ProcessControllerPrx processController)
-        {
-            if(ex instanceof Ice.ConnectFailedException || ex instanceof  Ice.TimeoutException)
-            {
-                while (true)
-                {
-                    try
-                    {
-                        Thread.sleep(500);
-                        break;
-                    }
-                    catch(InterruptedException e)
-                    {
-                    }
-                }
-                registerProcessController(adapter, registry, processController);
-            }
-            else
-            {
-                println(ex.toString());
-            }
-        }
-
-        public void destroy()
-        {
-            _communicator.destroy();
-        }
-
-        private ProcessControllerRegistryPrx _registry;
-        private Ice.Communicator _communicator;
-    }
-
-    class MainHelperI extends Thread implements test.Util.Application.ServerReadyListener
-    {
-        public MainHelperI(TestSuiteBundle bundle, String[] args, String exe)
-        {
-            _bundle = bundle;
-            _args = args;
-        }
-
-        public void run()
-        {
-            try
-            {
-                _app = _bundle.newInstance();
-                _app.setClassLoader(_bundle.getClassLoader());
-                _app.setCommunicatorListener(new CommunicatorListener()
-                {
-                    public void communicatorInitialized(Communicator communicator)
-                    {
-                        if(communicator.getProperties().getProperty("Ice.Plugin.IceSSL").equals("IceSSL.PluginFactory"))
-                        {
-                            IceSSL.Plugin plugin = (IceSSL.Plugin)communicator.getPluginManager().getPlugin("IceSSL");
-                            String keystore = communicator.getProperties().getProperty("IceSSL.Keystore");
-                            communicator.getProperties().setProperty("IceSSL.Keystore", "");
-                            java.io.InputStream certs = getResources().openRawResource(
-                                keystore.equals("client.bks") ? R.raw.client : R.raw.server);
-                            plugin.setKeystoreStream(certs);
-                            plugin.setTruststoreStream(certs);
-                            communicator.getPluginManager().initializePlugins();
-                        }
-                    }
-                });
-                _app.setWriter(new Writer()
-                    {
-                        @Override
-                        public void close() throws IOException
-                        {
-                        }
-
-                        @Override
-                        public void flush() throws IOException
-                        {
-                        }
-
-                        @Override
-                        public void write(char[] buf, int offset, int count)
-                            throws IOException
-                        {
-                            _out.append(buf, offset, count);
-                        }
-                    });
-                _app.setServerReadyListener(this);
-
-                int status = _app.main(_exe, _args);
-                synchronized(this)
-                {
-                    _status = status;
-                    _completed = true;
-                    notifyAll();
-                }
-            }
-            catch(Exception ex)
-            {
-                _out.append(ex.toString());
-                synchronized(this)
-                {
-                    _status = -1;
-                    _completed = true;
-                    notifyAll();
-                }
-            }
-        }
-
-        public void shutdown()
-        {
-            if(_app != null)
-            {
-                _app.stop();
-            }
-        }
-
-        public String getOutput()
-        {
-            return _out.toString();
-        }
-
-        synchronized private void completed(int status)
-        {
-            _completed = true;
-            _status = status;
-            notifyAll();
-        }
-
-        synchronized public void serverReady()
-        {
-            _ready = true;
-            notifyAll();
-        }
-
-        synchronized private void waitReady(int timeout)
-            throws Test.Common.ProcessFailedException
-        {
-            long now = IceInternal.Time.currentMonotonicTimeMillis();
-            while(!_ready && !_completed)
-            {
-                try
-                {
-                    wait(timeout * 1000);
-                    if(IceInternal.Time.currentMonotonicTimeMillis() - now > timeout * 1000)
-                    {
-                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
-                    }
-                }
-                catch(java.lang.InterruptedException ex)
-                {
-                }
-            }
-
-            if(_completed && _status != 0)
-            {
-                throw new Test.Common.ProcessFailedException(_out.toString());
-            }
-        }
-
-        synchronized private int waitSuccess(int timeout)
-            throws Test.Common.ProcessFailedException
-        {
-            long now = IceInternal.Time.currentMonotonicTimeMillis();
-            while(!_completed)
-            {
-                try
-                {
-                    wait(timeout * 1000);
-                    if(IceInternal.Time.currentMonotonicTimeMillis() - now > timeout * 1000)
-                    {
-                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
-                    }
-                }
-                catch(java.lang.InterruptedException ex)
-                {
-                }
-            }
-            return _status;
-        }
-
-        private TestSuiteBundle _bundle;
-        private String[] _args;
-        private String _exe;
-        private test.Util.Application _app;
-        private boolean _ready = false;
-        private boolean _completed = false;
-        private int _status = 0;
-        private final StringBuffer _out = new StringBuffer();
-    }
-
-    class ProcessControllerI extends Test.Common._ProcessControllerDisp
-    {
-        public Test.Common.ProcessPrx start(final String testsuite, final String exe, String[] args, Ice.Current current)
-            throws Test.Common.ProcessFailedException
-        {
-            println("starting " + testsuite + " " + exe + "... ");
-            String className = "test." + testsuite.replace("/", ".") + "." + exe.substring(0, 1).toUpperCase() + exe.substring(1);
-            String dexFile = "test_" + testsuite.replace("/", "_") + ".dex";
-            try
-            {
-                TestSuiteBundle bundle = new TestSuiteBundle(className, getDEXClassLoader(dexFile, null));
-                MainHelperI mainHelper = new MainHelperI(bundle, args, exe);
-                mainHelper.start();
-                return Test.Common.ProcessPrxHelper.uncheckedCast(current.adapter.addWithUUID(new ProcessI(mainHelper)));
-            }
-            catch(IOException ex)
-            {
-                throw new Test.Common.ProcessFailedException(
-                    "testsuite `" + testsuite + "' exe ` " + exe + "' start failed:\n" + ex.toString());
-            }
-        }
-
-        public String getHost(String protocol, boolean ipv6, Ice.Current current)
-        {
-            if(isEmulator())
-            {
-                return  "127.0.0.1";
-            }
-            else
-            {
-                synchronized(ControllerApp.this)
-                {
-                    return ipv6 ? _ipv6Address : _ipv4Address;
-                }
-            }
-        }
-    }
-
-    class ProcessI extends Test.Common._ProcessDisp
-    {
-        public ProcessI(MainHelperI helper)
-        {
-            _helper = helper;
-        }
-
-        public void waitReady(int timeout, Ice.Current current)
-            throws Test.Common.ProcessFailedException
-        {
-            _helper.waitReady(timeout);
-        }
-
-        public int waitSuccess(int timeout, Ice.Current current)
-            throws Test.Common.ProcessFailedException
-        {
-            return _helper.waitSuccess(timeout);
-        }
-
-        public String terminate(Ice.Current current)
-        {
-            _helper.shutdown();
-            current.adapter.remove(current.id);
-            while(true)
-            {
-                try
-                {
-                    _helper.join();
-                    break;
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-            return _helper.getOutput();
-        }
-
-        private MainHelperI _helper;
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/res/layout/main.xml zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/res/layout/main.xml
--- zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/res/layout/main.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/res/layout/main.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="5dip">
-        <TextView
-            android:layout_width="5dip"
-            android:layout_weight="25"
-            android:layout_height="wrap_content"
-            android:text="IPv4"
-            android:layout_gravity="center_vertical"/>
-
-        <Spinner
-            android:id="@+id/ipv4"
-            android:layout_width="5dip"
-            android:layout_weight="75"
-            android:layout_height="wrap_content"
-            android:drawSelectorOnTop="false"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="5dip">
-        <TextView
-            android:layout_width="0dip"
-            android:layout_weight="25"
-            android:layout_height="wrap_content"
-            android:text="IPv6"
-            android:layout_gravity="center_vertical"/>
-
-        <Spinner
-            android:id="@+id/ipv6"
-            android:layout_width="0dip"
-            android:layout_weight="75"
-            android:layout_height="wrap_content"
-            android:drawSelectorOnTop="false"/>
-    </LinearLayout>
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:stackFromBottom="true"
-        android:transcriptMode="alwaysScroll"/>
-</LinearLayout>
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/res/raw/icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/res/raw/icon.png differ
diff -Nru zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/res/values/strings.xml zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/res/values/strings.xml
--- zeroc-ice-3.7.1/java-compat/android/test/controller/src/main/res/values/strings.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/android/test/controller/src/main/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Test Controller</string>
-    <string name="no_bluetooth">Bluetooth disabled</string>
-</resources>
diff -Nru zeroc-ice-3.7.1/java-compat/build.gradle zeroc-ice-3.7.2/java-compat/build.gradle
--- zeroc-ice-3.7.1/java-compat/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 subprojects {
     project.ext.topSrcDir = "$rootProject.projectDir/.."
@@ -76,6 +71,6 @@
 // Used to build the gradle wrapper to automatically download and install
 // the version of gradle needed to build Ice.
 //
-task wrapper(type: Wrapper) {
-    gradleVersion = "4.7"
+wrapper {
+    gradleVersion = "4.10.2"
 }
diff -Nru zeroc-ice-3.7.1/java-compat/.gitignore zeroc-ice-3.7.2/java-compat/.gitignore
--- zeroc-ice-3.7.1/java-compat/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -4,3 +4,4 @@
 *.iml
 *.dex
 .idea
+local.properties
diff -Nru zeroc-ice-3.7.1/java-compat/gradle.properties zeroc-ice-3.7.2/java-compat/gradle.properties
--- zeroc-ice-3.7.1/java-compat/gradle.properties	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/gradle.properties	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Version used in JAR files
 //
-iceVersion = 3.7.1
+iceVersion = 3.7.2
 
 //
 // Select an installation base directory. The directory will be created
@@ -22,6 +17,11 @@
 prefix =
 
 //
+// Used to set --release (with javac >=9) or -source/-target with older javac versions.
+//
+targetJavaRelease = 7
+
+//
 // Define debug as true if you want to build with debug information,
 // false otherwise.
 //
@@ -31,7 +31,7 @@
 // Set the version of the Ice Builder to use for building. It must be set to debian
 // when using the gradle-ice-builder-plugin package on Debian.
 //
-iceBuilderVersion = 1.4.5
+iceBuilderVersion = 1.4.7
 
 //
 // Set the builder artifact class path. It must be set to com.zeroc.gradle.ice-builder
diff -Nru zeroc-ice-3.7.1/java-compat/Makefile zeroc-ice-3.7.2/java-compat/Makefile
--- zeroc-ice-3.7.1/java-compat/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 ifeq ($(GRADLE),)
 GRADLE = ./gradlew
diff -Nru zeroc-ice-3.7.1/java-compat/README.md zeroc-ice-3.7.2/java-compat/README.md
--- zeroc-ice-3.7.1/java-compat/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -9,11 +9,10 @@
   * [Java Version](#java-version)
   * [Gradle](#gradle)
   * [Bzip2 Compression](#bzip2-compression)
-* [Compiling Ice for Java](#compiling-ice-for-java)
-  * [Preparing to Build](#preparing-to-build)
-  * [Building Ice for Java](#building-ice-for-java-1)
-* [Installing Ice for Java](#installing-ice-for-java)
-* [Running the Java Tests](#running-the-java-tests)
+* [Building Ice for Java Compat](#building-ice-for-java-compat-1)
+* [Installing Ice for Java Compat](#installing-ice-for-java-compat)
+* [Running the Java Compat Tests](#running-the-java-compat-tests)
+* [Building the Ice for Android Tests](#building-the-ice-for-android-tests)
 
 ## Build Requirements
 
@@ -40,11 +39,9 @@
 ### Gradle
 
 Ice for Java uses the [Gradle][3] build system, and includes the Gradle wrapper
-version 2.4 in the distribution. You cannot build the Ice for Java source
-distribution without an Internet connection. Gradle will download all required
-packages automatically from ZeroC's Maven repository located at
-
-    https://repo.zeroc.com/nexus/content/repositories/thirdparty
+in the distribution. You cannot build the Ice for Java source distribution without
+an Internet connection. Gradle will download all required packages automatically
+from Maven Central repository located at http://central.maven.org/maven2/
 
 ### Bzip2 Compression
 
@@ -53,7 +50,9 @@
 
 The Maven package id for the commons-compress JAR file is as follows:
 
-    groupId=org.apache.commons, version=1.14, artifactId=commons-compress
+```
+groupId=org.apache.commons, version=1.14, artifactId=commons-compress
+```
 
 The demos and tests are automatically setup to enable protocol compression by
 adding the commons-compress JAR to the manifest class path. For your own
@@ -63,67 +62,77 @@
 > *These classes are a pure Java implementation of the bzip2 algorithm and
 therefore add significant latency to Ice requests.*
 
-## Compiling Ice for Java
-
-### Preparing to Build
+## Building Ice for Java
 
 The build system requires the Slice to Java compiler from Ice for C++. If you
 have not built Ice for C++ in this source distribution, you must set the
 `ICE_HOME` environment variable with the path name of your Ice installation. For
 example, on Linux:
 
-    $ export ICE_HOME=/opt/Ice-3.7.1 (For local build)
-    $ export ICE_HOME=/usr (For RPM installation)
+```
+export ICE_HOME=/opt/Ice-3.7.2 (For local build)
+export ICE_HOME=/usr (For RPM installation)
+```
 
 On Windows:
 
-    > set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.1 (MSI installation)
+```
+set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.2 (MSI installation)
+```
 
 On Windows if you are using Ice for C++ from a source distribution, you must set
 the `CPP_PLATFORM` and `CPP_CONFIGURATION` environment variables to match the
 platform and configuration used in your C++ build:
 
-    > set CPP_PLATFORM=x64
-    > set CPP_CONFIGURATION=Debug
+```
+set CPP_PLATFORM=x64
+set CPP_CONFIGURATION=Debug
+```
 
 The supported values for `CPP_PLATFORM` are `Win32` and `x64` and the supported
 values for `CPP_CONFIGURATION` are `Debug` and `Release`.
 
-Before building Ice for Java, review the settings in the file
-`gradle.properties` and edit as necessary.
-
-### Building Ice for Java
+Before building Ice for Java, review the settings in the file `gradle.properties`
+and edit as necessary.
 
 To build Ice, all services, and tests, run
 
-    > gradlew build
+```
+gradlew build
+```
 
 Upon completion, the Ice JAR and POM files are placed in the `lib` subdirectory.
 
 If at any time you wish to discard the current build and start a new one, use
 these commands:
 
-    > gradlew clean
-    > gradlew build
+```
+gradlew clean
+gradlew build
+```
 
 ## Installing Ice for Java
 
 To install Ice for Java in the directory specified by the `prefix` variable in
 `gradle.properties` run the following command:
 
-    > gradlew install
+```
+gradlew install
+```
 
 The installation installs the following JAR files to `<prefix>/lib`.
 
-    glacier2-compat-3.7.1.jar
-    ice-compat-3.7.1.jar
-    icebox-compat-3.7.1.jar
-    icebt-compat-3.7.1.jar
-    icediscovery-compat-3.7.1.jar
-    icegrid-compat-3.7.1.jar
-    icelocatordiscovery-compat-3.7.1.jar
-    icepatch2-compat-3.7.1.jar
-    icestorm-compat-3.7.1.jar
+```
+glacier2-compat-3.7.2.jar
+ice-compat-3.7.2.jar
+icebox-compat-3.7.2.jar
+icebt-compat-3.7.2.jar
+icediscovery-compat-3.7.2.jar
+icegrid-compat-3.7.2.jar
+icelocatordiscovery-compat-3.7.2.jar
+icepatch2-compat-3.7.2.jar
+icestorm-compat-3.7.2.jar
+```
 
 POM files are also installed for ease of deployment to a Maven-based
 distribution system.
@@ -135,22 +144,121 @@
 then you must set the `ICE_HOME` environment variable with the path name of your
 Ice installation. On Linux or macOS:
 
-    $ export ICE_HOME=/opt/Ice-3.7.1 (For local build)
-    $ export ICE_HOME=/usr (For RPM installation)
+```
+export ICE_HOME=/opt/Ice-3.7.2 (For local build)
+export ICE_HOME=/usr (For RPM installation)
+```
 
 On Windows:
 
-    > set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.1
+```
+set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.2
+```
 
 Python is required to run the test suite. To run the tests, open a command
 window and change to the top-level directory. At the command prompt, execute:
 
-    > python allTests.py
+```
+python allTests.py
+```
 
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
 
+## Building the Ice for Android Tests
+
+The `test/android/controller` directory contains an Android Studio project
+for the Ice test suite controller.
+
+### Build Requirements
+
+Building any Ice application for Android requires Android Studio and the Android
+SDK build tools. We tested with the following components:
+
+- Android Studio 3.2.1
+- Android SDK 21
+- Android Build Tools 27.0.1
+
+Ice requires at minimum API level 21:
+
+- Android 5 (API21)
+
+If you want to target a later version of the Android API level for the test
+suite, edit `test/android/controller/gradle.properties` and change the
+following variables:
+
+```
+ice_compileSdkVersion
+ice_minSdkVersion
+ice_targetSdkVersion
+```
+
+*NOTE: Do not use Android Studio to modify the project's settings.*
+
+### Building the Android Test Controller
+
+You must first build Ice for Java refer to [Building Ice for Java](#building-ice-for-java-1)
+for instructions, then follow these steps:
+
+1. Start Android Studio
+2. Select "Open an existing Android Studio project"
+3. Navigate to and select the "android" subdirectory
+4. Click OK and wait for the project to open and build
+
+## Running the Android Tests
+
+The Android Studio project contains a `controller` app for the Ice test
+suite. Prior to running the app, you must disable Android Studio's Instant Run
+feature, located in File / Settings / Build, Execution, Deployment /
+Instant Run.
+
+Tests are started from the dev machine using the `allTests.py` script, similar
+to the other language mappings. The script uses Ice for Python to communicate
+with the Android app, therefore you must build the [Python mapping]
+(../../python) before continuing.
+
+You also need to add the `tools\bin`, `platform-tools` and `emulator`
+directories from the Android SDK to your PATH. On macOS, you can use the
+following commands:
+
+```
+export PATH=~/Library/Android/sdk/tools/bin:$PATH
+export PATH=~/Library/Android/sdk/platform-tools:$PATH
+export PATH=~/Library/Android/sdk/emulator:$PATH
+```
+
+On Windows, you can use the following commands:
+
+```
+set PATH=%LOCALAPPDATA%\Android\sdk\tools\bin;%PATH%
+set PATH=%LOCALAPPDATA%\Android\sdk\platform-tools;%PATH%
+set PATH=%LOCALAPPDATA%\Android\sdk\emulator;%PATH%
+```
+
+Run the tests with the Android emulator by running the following command:
+
+```
+python allTests.py --android --controller-app
+```
+
+To run the tests on a Android device connected through USB, you can use
+the `--device=usb` option as shown below:
+
+```
+python allTests.py --android --device=usb --controller-app
+```
+
+To connect to an Android device that is running adb you can use the
+`--device=<ip-address>`
+
+```
+python allTests.py --android --device=<ip-address> --controller-app
+```
+
+To run the tests against a `controller` application started from Android
+Studio you should omit the `--controller-app` option from the commands above.
+
 [1]: https://zeroc.com/distributions/ice
-[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.1
+[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2
 [3]: https://gradle.org
 [4]: https://commons.apache.org/proper/commons-compress/
diff -Nru zeroc-ice-3.7.1/java-compat/settings.gradle zeroc-ice-3.7.2/java-compat/settings.gradle
--- zeroc-ice-3.7.1/java-compat/settings.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/settings.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Main source
 include ':ice-compat'
@@ -29,7 +24,11 @@
 
 // Tests
 include ':test'
+
 include ':testPlugins'
 project(':testPlugins').projectDir = new File('test/plugins')
-include ':testController'
-project(':testController').projectDir = new File('test/controller')
+
+if(org.gradle.internal.jvm.Jvm.current().getJavaVersion().toString().toFloat() >= 1.8f) {
+    include ':testLambda'
+    project(':testLambda').projectDir = new File('test/lambda')
+}
diff -Nru zeroc-ice-3.7.1/java-compat/src/Glacier2/build.gradle zeroc-ice-3.7.2/java-compat/src/Glacier2/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/Glacier2/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Glacier2/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "Glacier2 Compat"
 project.ext.description = "Firewall traversal for Ice"
 
 slice {
     java {
-        set1 {
-            args = "--tie --checksum Glacier2.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--tie --checksum Glacier2.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice-compat')
+    implementation project(':ice-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java
--- zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/SessionCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
--- zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
--- zeroc-ice-3.7.1/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Glacier2;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/build.gradle zeroc-ice-3.7.2/java-compat/src/Ice/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/Ice/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "Ice Compat"
 project.ext.description = "Ice is a comprehensive RPC framework that helps you build distributed applications" +
@@ -16,9 +8,7 @@
 
 slice {
     java {
-        set1 {
-            files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['Ice/*.ice', 'IceSSL/*.ice'], excludes:['Ice/*F.ice'])
-        }
+        files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['Ice/*.ice', 'IceSSL/*.ice'], excludes:['Ice/*F.ice'])
     }
 }
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AMDCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
 /**
  * Callback interface for Blobject AMD servants.
- *
- @see BlobjectAsync
+ * @see BlobjectAsync
  **/
 public interface AMD_Object_ice_invoke
 {
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Application.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Application.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Application.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Application.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AsyncCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/AsyncResult.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BatchRequestInterceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BatchRequest.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Blobject.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Blobject.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Blobject.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Blobject.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BooleanHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/BooleanOptional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ByteHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ByteOptional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ClassResolver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
@@ -289,9 +284,6 @@
     private Ice.AsyncResult
     begin_flushBatchRequestsInternal(Ice.CompressBatch compressBatch, IceInternal.CallbackBase cb)
     {
-        IceInternal.OutgoingConnectionFactory connectionFactory = _instance.outgoingConnectionFactory();
-        IceInternal.ObjectAdapterFactory adapterFactory = _instance.objectAdapterFactory();
-
         //
         // This callback object receives the results of all invocations
         // of Connection.begin_flushBatchRequests.
@@ -300,16 +292,7 @@
                                                                                            _instance,
                                                                                            _flushBatchRequests_name,
                                                                                            cb);
-
-        connectionFactory.flushAsyncBatchRequests(compressBatch, result);
-        adapterFactory.flushAsyncBatchRequests(compressBatch, result);
-
-        //
-        // Inform the callback that we have finished initiating all of the
-        // flush requests.
-        //
-        result.ready();
-
+        result.invoke(compressBatch);
         return result;
     }
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/CompactIdResolver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Dispatcher.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DoubleHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/DoubleOptional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Exception.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Exception.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Exception.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Exception.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/FloatHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/FloatOptional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/FormatType.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/FormatType.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/FormatType.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/FormatType.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Holder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Holder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Holder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Holder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ImplicitContextI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/InitializationData.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/InitializationData.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/InitializationData.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/InitializationData.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/InputStream.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/InputStream.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/InputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/InputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/IntHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/IntHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/IntHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/IntHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/IntOptional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/IntOptional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/IntOptional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/IntOptional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LocalException.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LocalException.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LocalException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LocalException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LocalObjectHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LoggerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LoggerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LoggerPlugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LongHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LongHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LongHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LongHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LongOptional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LongOptional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/LongOptional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/LongOptional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectHolderBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectInputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Object.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Object.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Object.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Object.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OptionalFormat.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Optional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Optional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Optional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Optional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OptionalObject.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OutputStream.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OutputStream.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/OutputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/OutputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PluginManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/PropertiesI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
@@ -317,7 +312,8 @@
     public void
     load(String file)
     {
-        if(System.getProperty("os.name").startsWith("Windows") && file.startsWith("HKLM\\"))
+        if(System.getProperty("os.name").startsWith("Windows") &&
+           (file.startsWith("HKCU\\") || file.startsWith("HKLM\\")))
         {
             String regQuery = "reg query " + file;
             try
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ProxyIdentityKey.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ReadValueCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Request.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Request.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Request.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Request.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ShortHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ShortOptional.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SignalPolicy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SlicedData.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SlicedData.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SlicedData.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SlicedData.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SliceInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/StringHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/StringHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/StringHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/StringHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SystemException.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SystemException.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/SystemException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/SystemException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ThreadHookPlugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ThreadNotification.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TieBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TieBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TieBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TieBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBool.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByte.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackInt.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLong.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShort.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/UserExceptionFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/UserException.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/UserException.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/UserException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/UserException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Util.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Util.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/Util.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/Util.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
@@ -568,7 +563,7 @@
     public static String
     stringVersion()
     {
-        return "3.7.1"; // "A.B.C", with A=major, B=minor, C=patch
+        return "3.7.2"; // "A.B.C", with A=major, B=minor, C=patch
     }
 
     /**
@@ -581,7 +576,7 @@
     public static int
     intVersion()
     {
-        return 30701; // AABBCC, with AA=major, BB=minor, CC=patch
+        return 30702; // AABBCC, with AA=major, BB=minor, CC=patch
     }
 
     /**
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/Ice/ValueFactoryManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Ice;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Acceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ACMMonitor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/AsyncStatus.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/BatchRequestQueue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Buffer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/BufSizeWarnInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CancellationHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -157,8 +152,10 @@
         }
     }
 
-    public void ready()
+    public void invoke(Ice.CompressBatch compressBatch)
     {
+        _instance.outgoingConnectionFactory().flushAsyncBatchRequests(compressBatch, this);
+        _instance.objectAdapterFactory().flushAsyncBatchRequests(compressBatch, this);
         doCheck(true);
     }
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -44,6 +39,7 @@
 
     public void invoke(final Ice.CompressBatch compressBatch)
     {
+        _observer = ObserverHelper.get(_instance, "flushBatchRequests");
         try
         {
             final Ice.BooleanHolder compress = new Ice.BooleanHolder();
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Connector.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Connector.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Connector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Connector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DispatchObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointFactoryWithUnderlying.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointIHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EventHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Ex.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Ex.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Ex.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Ex.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -25,8 +20,8 @@
         }
 
         String type = v.ice_id();
-        throw new Ice.UnexpectedObjectException("expected element of type `" + expectedType + "' but received '" +
-                                                type, type, expectedType);
+        throw new Ice.UnexpectedObjectException("expected element of type `" + expectedType + "' but received `" +
+                                                type + "'", type, expectedType);
     }
 
     public static void throwMemoryLimitException(int requested, int maximum)
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/HashUtil.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/HttpParser.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IncomingAsync.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -312,6 +307,8 @@
                         // Ignore, could be a class loading error.
                     }
 
+                    assert(_acceptorStarted);
+                    _acceptorStarted = false;
                     if(_adapter.getThreadPool().finish(this, true))
                     {
                         closeAcceptor();
@@ -369,17 +366,29 @@
     {
         if(_state < StateClosed)
         {
-            if(_acceptorStarted && close)
+            if(close)
             {
                 closeAcceptor();
             }
+
+            //
+            // If the acceptor hasn't been explicitly stopped (which is the case if the acceptor got closed
+            // because of an unexpected error), try to restart the acceptor in 1 second.
+            //
+            _instance.timer().schedule(new Runnable()
+                                       {
+                                            public void run()
+                                            {
+                                                startAcceptor();
+                                            }
+                                       }, 1, java.util.concurrent.TimeUnit.SECONDS);
             return;
         }
 
-        assert(_state == StateClosed);
+        assert(_state >= StateClosed);
         setState(StateFinished);
 
-        if(_acceptorStarted && close)
+        if(close)
         {
             closeAcceptor();
         }
@@ -626,6 +635,7 @@
                     // if there are no more threads in the thread pool available to dispatch
                     // the finish() call.
                     //
+                    _acceptorStarted = false;
                     if(_adapter.getThreadPool().finish(this, true))
                     {
                         closeAcceptor();
@@ -716,19 +726,8 @@
             _instance.initializationData().logger.trace(_instance.traceLevels().networkCat, s.toString());
         }
 
-        _acceptorStarted = false;
+        assert(!_acceptorStarted);
         _acceptor.close();
-
-        if(_state == StateHolding || _state == StateActive)
-        {
-            _instance.timer().schedule(new Runnable()
-                                       {
-                                            public void run()
-                                            {
-                                                startAcceptor();
-                                            }
-                                       }, 1, java.util.concurrent.TimeUnit.SECONDS);
-        }
     }
 
     private void
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -221,6 +216,10 @@
                 response(false);
             }
         }
+        catch(IceInternal.ServantError ex)
+        {
+            throw ex;
+        }
         catch(java.lang.Throwable ex)
         {
             if(_inAsync != null)
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Instance.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Instance.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Instance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Instance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -69,11 +64,7 @@
         Timer(Ice.Properties props, String threadName)
         {
             super(1, Util.createThreadFactory(props, threadName)); // Single thread executor
-            if(!Util.isAndroid())
-            {
-                // This API doesn't exist on Android up to API level 20.
-                setRemoveOnCancelPolicy(true);
-            }
+            setRemoveOnCancelPolicy(true);
             setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
             _observerHelper = new ThreadObserverHelper(threadName);
         }
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/InvocationObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ListPatcher.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LocatorTable.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -190,7 +185,7 @@
 
         //
         // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to
-        // remote logggers
+        // remote loggers
         //
         if(sendLogCommunicator != null)
         {
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/MetricsAdminI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/MetricsMap.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/MetricsViewI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Network.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Network.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Network.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Network.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/NetworkProxy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ObjectInputStream.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
@@ -34,10 +29,11 @@
 
     public final void attachRemoteObserver(Ice.ConnectionInfo info, Ice.Endpoint endpt, int requestId)
     {
-        if(_observer != null)
+        Ice.Instrumentation.InvocationObserver observer = getObserver();
+        if(observer != null)
         {
             final int size = _os.size() - IceInternal.Protocol.headerSize - 4;
-            _childObserver = getObserver().getRemoteObserver(info, endpt, requestId, size);
+            _childObserver = observer.getRemoteObserver(info, endpt, requestId, size);
             if(_childObserver != null)
             {
                 _childObserver.attach();
@@ -47,10 +43,11 @@
 
     public final void attachCollocatedObserver(Ice.ObjectAdapter adapter, int requestId)
     {
-        if(_observer != null)
+        Ice.Instrumentation.InvocationObserver observer = getObserver();
+        if(observer != null)
         {
             final int size = _os.size() - IceInternal.Protocol.headerSize - 4;
-            _childObserver = getObserver().getCollocatedObserver(adapter, requestId, size);
+            _childObserver = observer.getCollocatedObserver(adapter, requestId, size);
             if(_childObserver != null)
             {
                 _childObserver.attach();
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProcessI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Property.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Property.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Property.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Property.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 14 10:24:07 2018
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -183,6 +178,7 @@
         new Property("Ice\\.TCP\\.SndSize", false, null),
         new Property("Ice\\.UseApplicationClassLoader", false, null),
         new Property("Ice\\.UseSyslog", false, null),
+        new Property("Ice\\.UseSystemdJournal", false, null),
         new Property("Ice\\.Warn\\.AMICallback", false, null),
         new Property("Ice\\.Warn\\.Connections", false, null),
         new Property("Ice\\.Warn\\.Datagrams", false, null),
@@ -192,7 +188,7 @@
         new Property("Ice\\.Warn\\.UnusedProperties", false, null),
         new Property("Ice\\.CacheMessageBuffers", false, null),
         new Property("Ice\\.ThreadInterruptSafe", false, null),
-        new Property("Ice\\.Voip", false, null),
+        new Property("Ice\\.Voip", true, null),
         null
     };
 
@@ -510,6 +506,43 @@
         new Property("IceGridAdmin\\.Host", false, null),
         new Property("IceGridAdmin\\.Port", false, null),
         new Property("IceGridAdmin\\.InstanceName", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM\\.Timeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM\\.Heartbeat", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM\\.Close", false, null),
+        new Property("IceGridAdmin\\.Server\\.ACM", false, null),
+        new Property("IceGridAdmin\\.Server\\.AdapterId", false, null),
+        new Property("IceGridAdmin\\.Server\\.Endpoints", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.EndpointSelection", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.ConnectionCached", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.PreferSecure", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.LocatorCacheTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.InvocationTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.Locator", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.Router", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.CollocationOptimized", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator\\.Context\\.[^\\s]+", false, null),
+        new Property("IceGridAdmin\\.Server\\.Locator", false, null),
+        new Property("IceGridAdmin\\.Server\\.PublishedEndpoints", false, null),
+        new Property("IceGridAdmin\\.Server\\.ReplicaGroupId", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.EndpointSelection", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.ConnectionCached", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.PreferSecure", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.LocatorCacheTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.InvocationTimeout", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.Locator", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.Router", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.CollocationOptimized", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router\\.Context\\.[^\\s]+", false, null),
+        new Property("IceGridAdmin\\.Server\\.Router", false, null),
+        new Property("IceGridAdmin\\.Server\\.ProxyOptions", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Size", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeMax", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeWarn", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.StackSize", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Serialize", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadIdleTime", false, null),
+        new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadPriority", false, null),
+        new Property("IceGridAdmin\\.Server\\.MessageSizeMax", false, null),
         new Property("IceGridAdmin\\.Discovery\\.Address", false, null),
         new Property("IceGridAdmin\\.Discovery\\.Interface", false, null),
         new Property("IceGridAdmin\\.Discovery\\.Lookup", false, null),
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProtocolInstance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Protocol.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/QueueExecutorService.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ReadyCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Reference.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Reference.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Reference.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Reference.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RemoteObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ReplyStatus.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RequestHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ResponseHandler.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RetryException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RetryQueue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RetryTask.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/RouterManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Selector.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Selector.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Selector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Selector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/SequencePatcher.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ServantError.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ServantManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/SocketOperation.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/StreamSocket.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpAcceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpConnector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TcpTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Time.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Time.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Time.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Time.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TraceLevels.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Transceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpConnector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastClientTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/UnderlyingEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Util.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Util.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/Util.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/Util.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ValueFactoryManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WebSocketException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSAcceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSConnector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSEndpoint.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceInternal/WSTransceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/MetricsHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceMX;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceMX;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceMX;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/Observer.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/Observer.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/Observer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/Observer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceMX;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceMX;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceMX;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/AcceptorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/CertificateVerifier.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/ConnectorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/Instance.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/Instance.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/Instance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/Instance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/PasswordCallback.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/Plugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/RFC2253.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
@@ -70,6 +65,10 @@
                 {
                     l.add("TLSv1.2");
                 }
+                else if(s.equals("TLS1_3") || s.equals("TLSV1_3"))
+                {
+                    l.add("TLSv1.3");
+                }
                 else
                 {
                     Ice.PluginInitializationException e = new Ice.PluginInitializationException();
@@ -781,15 +780,22 @@
     javax.net.ssl.SSLEngine createSSLEngine(boolean incoming, String host, int port)
     {
         javax.net.ssl.SSLEngine engine;
-        if(host != null)
+        try
         {
-            engine = _context.createSSLEngine(host, port);
+            if(host != null)
+            {
+                engine = _context.createSSLEngine(host, port);
+            }
+            else
+            {
+                engine = _context.createSSLEngine();
+            }
+            engine.setUseClientMode(!incoming);
         }
-        else
+        catch(Exception ex)
         {
-            engine = _context.createSSLEngine();
+            throw new Ice.SecurityException("IceSSL: couldn't create SSL engine", ex);
         }
-        engine.setUseClientMode(!incoming);
 
         String[] cipherSuites = filterCiphers(engine.getSupportedCipherSuites(), engine.getEnabledCipherSuites());
         try
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
@@ -51,20 +46,23 @@
             final String host = _incoming ? (ipInfo != null ? ipInfo.remoteAddress : "") : _host;
             final int port = ipInfo != null ? ipInfo.remotePort : -1;
             _engine = _instance.createSSLEngine(_incoming, host, port);
-            _appInput = ByteBuffer.allocateDirect(_engine.getSession().getApplicationBufferSize() * 2);
+            _appInput = ByteBuffer.allocate(_engine.getSession().getApplicationBufferSize() * 2);
+
+            // Require BIG_ENDIAN byte buffers. This is needed for Android >= 8.0 which can read
+            // the SSL messages directly with these buffers.
             int bufSize = _engine.getSession().getPacketBufferSize() * 2;
-            _netInput = new IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2));
-            _netOutput = new IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2));
+            _netInput = new IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2), java.nio.ByteOrder.BIG_ENDIAN);
+            _netOutput = new IceInternal.Buffer(ByteBuffer.allocateDirect(bufSize * 2), java.nio.ByteOrder.BIG_ENDIAN);
         }
 
+        assert(_engine != null);
+
         int status = handshakeNonBlocking();
         if(status != IceInternal.SocketOperation.None)
         {
             return status;
         }
 
-        assert(_engine != null);
-
         SSLSession session = _engine.getSession();
         _cipher = session.getCipherSuite();
         try
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/TrustManager.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/Util.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/Util.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/Util.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/Util.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package IceSSL;
-
-public final class Util
-{
-    //
-    // Create a certificate from a PEM-encoded string.
-    //
-    public static java.security.cert.X509Certificate
-    createCertificate(String certPEM)
-        throws java.security.cert.CertificateException
-    {
-        final String header = "-----BEGIN CERTIFICATE-----";
-        final String footer = "-----END CERTIFICATE-----";
-
-        //
-        // The generateCertificate method requires that its input begin
-        // with the PEM header.
-        //
-        int pos = certPEM.indexOf(header);
-        if(pos == -1)
-        {
-            certPEM = header + "\n" + certPEM;
-        }
-        else if(pos > 0)
-        {
-            certPEM = certPEM.substring(pos);
-        }
-
-        //
-        // Add the footer if necessary.
-        //
-        if(certPEM.indexOf(footer) == -1)
-        {
-            certPEM = certPEM + footer;
-        }
-
-        byte[] bytes = null;
-        try
-        {
-            bytes = certPEM.getBytes("UTF8");
-        }
-        catch(java.io.UnsupportedEncodingException ex)
-        {
-            assert(false);
-            return null;
-        }
-
-        java.io.ByteArrayInputStream in = new java.io.ByteArrayInputStream(bytes);
-        java.security.cert.CertificateFactory cf = java.security.cert.CertificateFactory.getInstance("X.509");
-        return (java.security.cert.X509Certificate)cf.generateCertificate(in);
-    }
-
-    public final static String jdkTarget = "1.5";
-
-    //
-    // Needed by the test scripts to determine the JDK target of the SSL plug-in.
-    //
-    public static void
-    main(String[] args)
-    {
-        System.out.println(jdkTarget);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceSSL;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/Assert.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/Base64.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/OutputBase.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/StopWatch.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java
--- zeroc-ice-3.7.1/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceUtilInternal;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBox/build.gradle zeroc-ice-3.7.2/java-compat/src/IceBox/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/IceBox/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBox/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "IceBox Compat"
 project.ext.description = "IceBox is an easy-to-use framework for Ice application services"
 
 slice {
     java {
-        set1 {
-            args = "--tie --checksum IceBox.SliceChecksums"
+        args = "--tie --checksum IceBox.SliceChecksums"
             files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"])
-        }
     }
 }
 
 dependencies {
-    compile project(':ice-compat')
+    implementation project(':ice-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBox/src/main/java/IceBox/Admin.java zeroc-ice-3.7.2/java-compat/src/IceBox/src/main/java/IceBox/Admin.java
--- zeroc-ice-3.7.1/java-compat/src/IceBox/src/main/java/IceBox/Admin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBox/src/main/java/IceBox/Admin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,184 +1,198 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBox;
 
 public final class Admin
 {
-    private static class Client extends Ice.Application
+    static class ShutdownHook implements Runnable
     {
-        private void
-        usage()
+        private Ice.Communicator communicator;
+
+        ShutdownHook(Ice.Communicator communicator)
         {
-            System.err.println(
-                "Usage: " + appName() + " [options] [command...]\n" +
-                "Options:\n" +
-                "-h, --help          Show this message.\n" +
-                "\n" +
-                "Commands:\n" +
-                "start SERVICE       Start a service.\n" +
-                "stop SERVICE        Stop a service.\n" +
-                "shutdown            Shutdown the server.");
+            this.communicator = communicator;
         }
 
         @Override
-        public int
-        run(String[] args)
+        public void
+        run()
         {
-            java.util.List<String> commands = new java.util.ArrayList<String>();
+            communicator.destroy();
+        }
+    }
 
-            int idx = 0;
-            while(idx < args.length)
-            {
-                if(args[idx].equals("-h") || args[idx].equals("--help"))
-                {
-                    usage();
-                    return 1;
-                }
-                else if(args[idx].charAt(0) == '-')
-                {
-                    System.err.println(appName() + ": unknown option `" + args[idx] + "'");
-                    usage();
-                    return 1;
-                }
-                else
-                {
-                    commands.add(args[idx]);
-                    ++idx;
-                }
-            }
+    private static void
+    usage()
+    {
+        System.err.println(
+            "Usage: IceBox.Admin [options] [command...]\n" +
+            "Options:\n" +
+            "-h, --help          Show this message.\n" +
+            "-v, --version       Display the Ice version.\n" +
+            "\n" +
+            "Commands:\n" +
+            "start SERVICE       Start a service.\n" +
+            "stop SERVICE        Stop a service.\n" +
+            "shutdown            Shutdown the server.");
+    }
+
+    public static void
+    main(String[] args)
+    {
+        int status = 0;
+        Ice.StringSeqHolder argHolder = new Ice.StringSeqHolder(args);
+
+        try(Ice.Communicator communicator = Ice.Util.initialize(argHolder))
+        {
+            Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownHook(communicator)));
+
+            java.util.List<String> commands = new java.util.ArrayList<String>(java.util.Arrays.asList(argHolder.value));
+            status = run(communicator, commands);
+        }
 
-            if(commands.isEmpty())
+        System.exit(status);
+    }
+
+    public static int
+    run(Ice.Communicator communicator, java.util.List<String> commands)
+    {
+        if(commands.isEmpty())
+        {
+            usage();
+            return 0;
+        }
+
+        for(String command : commands)
+        {
+            if(command.equals("-h") || command.equals("--help"))
             {
                 usage();
                 return 0;
             }
-
-            Ice.ObjectPrx base = communicator().propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
-
-            if(base == null)
+            else if(command.equals("-v") || command.equals("--version"))
+            {
+                System.out.println(Ice.Util.stringVersion());
+                return 0;
+            }
+            else if(command.startsWith("-"))
             {
-                //
-                // The old deprecated way to retrieve the service manager proxy
-                //
+                System.err.println("IceBox.Admin: unknown option `" + command + "'");
+                usage();
+                return 1;
+            }
+        }
 
-                Ice.Properties properties = communicator().getProperties();
+        Ice.ObjectPrx base = communicator.propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
 
-                Ice.Identity managerIdentity = new Ice.Identity();
-                managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
-                managerIdentity.name = "ServiceManager";
+        if(base == null)
+        {
+            //
+            // The old deprecated way to retrieve the service manager proxy
+            //
+
+            Ice.Properties properties = communicator.getProperties();
+
+            Ice.Identity managerIdentity = new Ice.Identity();
+            managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+            managerIdentity.name = "ServiceManager";
 
-                String managerProxy;
-                if(properties.getProperty("Ice.Default.Locator").length() == 0)
+            String managerProxy;
+            if(properties.getProperty("Ice.Default.Locator").length() == 0)
+            {
+                String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
+                if(managerEndpoints.length() == 0)
                 {
-                    String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
-                    if(managerEndpoints.length() == 0)
-                    {
-                        System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set");
-                        return 1;
-                    }
-
-                    managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints;
+                    System.err.println("IceBox.Admin: property `IceBoxAdmin.ServiceManager.Proxy' is not set");
+                    return 1;
                 }
-                else
-                {
-                    String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
-                    if(managerAdapterId.length() == 0)
-                    {
-                        System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set");
-                        return 1;
-                    }
 
-                    managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId;
+                managerProxy = "\"" + communicator.identityToString(managerIdentity) + "\" :" + managerEndpoints;
+            }
+            else
+            {
+                String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
+                if(managerAdapterId.length() == 0)
+                {
+                    System.err.println("IceBox.Admin: property `IceBoxAdmin.ServiceManager.Proxy' is not set");
+                    return 1;
                 }
 
-                base = communicator().stringToProxy(managerProxy);
+                managerProxy = "\"" + communicator.identityToString(managerIdentity) + "\" @" + managerAdapterId;
             }
 
-            IceBox.ServiceManagerPrx manager = IceBox.ServiceManagerPrxHelper.checkedCast(base);
-            if(manager == null)
+            base = communicator.stringToProxy(managerProxy);
+        }
+
+        IceBox.ServiceManagerPrx manager = IceBox.ServiceManagerPrxHelper.checkedCast(base);
+        if(manager == null)
+        {
+            System.err.println("IceBox.Admin: `" + base.toString() + "' is not an IceBox::ServiceManager");
+            return 1;
+        }
+
+        for(int i = 0; i < commands.size(); i++)
+        {
+            String command = commands.get(i);
+            if(command.equals("shutdown"))
             {
-                System.err.println(appName() + ": `" + base.toString() + "' is not an IceBox::ServiceManager");
-                return 1;
+                manager.shutdown();
             }
-
-            for(int i = 0; i < commands.size(); i++)
+            else if(command.equals("start"))
             {
-                String command = commands.get(i);
-                if(command.equals("shutdown"))
+                if(++i >= commands.size())
                 {
-                    manager.shutdown();
+                    System.err.println("IceBox.Admin: no service name specified.");
+                    return 1;
                 }
-                else if(command.equals("start"))
+
+                String service = commands.get(i);
+                try
                 {
-                    if(++i >= commands.size())
-                    {
-                        System.err.println(appName() + ": no service name specified.");
-                        return 1;
-                    }
-
-                    String service = commands.get(i);
-                    try
-                    {
-                        manager.startService(service);
-                    }
-                    catch(IceBox.NoSuchServiceException ex)
-                    {
-                        System.err.println(appName() + ": unknown service `" + service + "'");
-                        return 1;
-                    }
-                    catch(IceBox.AlreadyStartedException ex)
-                    {
-                        System.err.println(appName() + "service already started.");
-                    }
-                }
-                else if(command.equals("stop"))
-                {
-                    if(++i >= commands.size())
-                    {
-                        System.err.println(appName() + ": no service name specified.");
-                        return 1;
-                    }
-
-                    String service = commands.get(i);
-                    try
-                    {
-                        manager.stopService(service);
-                    }
-                    catch(IceBox.NoSuchServiceException ex)
-                    {
-                        System.err.println(appName() + ": unknown service `" + service + "'");
-                        return 1;
-                    }
-                    catch(IceBox.AlreadyStoppedException ex)
-                    {
-                        System.err.println(appName() + "service already stopped.");
-                    }
+                    manager.startService(service);
                 }
-                else
+                catch(IceBox.NoSuchServiceException ex)
                 {
-                    System.err.println(appName() + ": unknown command `" + command + "'");
-                    usage();
+                    System.err.println("IceBox.Admin: unknown service `" + service + "'");
                     return 1;
                 }
+                catch(IceBox.AlreadyStartedException ex)
+                {
+                    System.err.println("IceBox.Admin: service already started.");
+                }
             }
+            else if(command.equals("stop"))
+            {
+                if(++i >= commands.size())
+                {
+                    System.err.println("IceBox.Admin: no service name specified.");
+                    return 1;
+                }
 
-            return 0;
+                String service = commands.get(i);
+                try
+                {
+                    manager.stopService(service);
+                }
+                catch(IceBox.NoSuchServiceException ex)
+                {
+                    System.err.println("IceBox.Admin: unknown service `" + service + "'");
+                    return 1;
+                }
+                catch(IceBox.AlreadyStoppedException ex)
+                {
+                    System.err.println("IceBox.Admin: service already stopped.");
+                }
+            }
+            else
+            {
+                System.err.println("IceBox.Admin: unknown command `" + command + "'");
+                usage();
+                return 1;
+            }
         }
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        int rc = app.main("IceBox.Admin", args);
 
-        System.exit(rc);
+        return 0;
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBox/src/main/java/IceBox/Server.java zeroc-ice-3.7.2/java-compat/src/IceBox/src/main/java/IceBox/Server.java
--- zeroc-ice-3.7.1/java-compat/src/IceBox/src/main/java/IceBox/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBox/src/main/java/IceBox/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,79 +1,146 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBox;
 
-public final class Server extends Ice.Application
+public final class Server
 {
+    static class ShutdownHook extends Thread
+    {
+        private Ice.Communicator _communicator;
+        private final java.lang.Object _doneMutex = new java.lang.Object();
+        private boolean _done = false;
+
+        ShutdownHook(Ice.Communicator communicator)
+        {
+            _communicator = communicator;
+        }
+
+        @Override
+        public void
+        run()
+        {
+            _communicator.shutdown();
+
+            synchronized(_doneMutex)
+            {
+                //
+                // Wait on the server to finish shutting down before exiting the ShutdownHook. This ensures
+                // that all IceBox services have had a chance to shutdown cleanly before the JVM terminates.
+                //
+                while(!_done)
+                {
+                    try
+                    {
+                        _doneMutex.wait();
+                    }
+                    catch(InterruptedException ex)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        public void
+        done()
+        {
+            synchronized(_doneMutex)
+            {
+                _done = true;
+                _doneMutex.notify();
+            }
+        }
+    }
+
     private static void
     usage()
     {
         System.err.println("Usage: IceBox.Server [options] --Ice.Config=<file>\n");
         System.err.println(
             "Options:\n" +
-            "-h, --help           Show this message.\n"
+            "-h, --help           Show this message.\n" +
+            "-v, --version        Display the Ice version."
         );
     }
 
-    public static void
-    main(String[] args)
-    {
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties();
-        initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
-
-        Server server = new Server();
-        System.exit(server.main("IceBox.Server", args, initData));
-    }
-
-    @Override
-    public int
-    run(String[] args)
+    private static int
+    run(Ice.Communicator communicator, String[] argSeq)
     {
         final String prefix = "IceBox.Service.";
-        Ice.Properties properties = communicator().getProperties();
+        Ice.Properties properties = communicator.getProperties();
         java.util.Map<String, String> services = properties.getPropertiesForPrefix(prefix);
-        java.util.List<String> argSeq = new java.util.ArrayList<String>(args.length);
-        for(String s : args)
+
+        java.util.List<String> iceBoxArgs = new java.util.ArrayList<String>();
+        for(String s : argSeq)
         {
-            argSeq.add(s);
+            iceBoxArgs.add(s);
         }
 
-        for(java.util.Map.Entry<String, String> entry : services.entrySet())
+        for(String key : services.keySet())
         {
-            String name = entry.getKey().substring(prefix.length());
-            for(int i = 0; i < argSeq.size(); ++i)
+            String name = key.substring(prefix.length());
+            for(int i = 0; i < iceBoxArgs.size(); ++i)
             {
-                if(argSeq.get(i).startsWith("--" + name))
+                if(iceBoxArgs.get(i).startsWith("--" + name))
                 {
-                    argSeq.remove(i);
+                    iceBoxArgs.remove(i);
                     i--;
                 }
             }
         }
 
-        for(String arg : argSeq)
+        for(String arg : iceBoxArgs)
         {
             if(arg.equals("-h") || arg.equals("--help"))
             {
                 usage();
                 return 0;
             }
+            else if(arg.equals("-v") || arg.equals("--version"))
+            {
+                System.out.println(Ice.Util.stringVersion());
+                return 0;
+            }
             else
             {
-                System.err.println("Server: unknown option `" + arg + "'");
+                System.err.println("IceBox.Server: unknown option `" + arg + "'");
                 usage();
                 return 1;
             }
         }
 
-        ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator(), args);
+        ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator, argSeq);
         return serviceManagerImpl.run();
     }
+
+    public static void
+    main(String[] args)
+    {
+        int status = 0;
+        Ice.StringSeqHolder argHolder = new Ice.StringSeqHolder(args);
+
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = Ice.Util.createProperties();
+        initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
+        ShutdownHook shutdownHook = null;
+
+        try(Ice.Communicator communicator = Ice.Util.initialize(argHolder, initData))
+        {
+            shutdownHook = new ShutdownHook(communicator);
+            Runtime.getRuntime().addShutdownHook(shutdownHook);
+
+            status = run(communicator, argHolder.value);
+        }
+        finally
+        {
+            if(shutdownHook != null)
+            {
+                shutdownHook.done();
+            }
+        }
+
+        System.exit(status);
+    }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java zeroc-ice-3.7.2/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java
--- zeroc-ice-3.7.1/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBox;
 
@@ -430,14 +425,6 @@
             }
 
             //
-            // Don't move after the adapter activation. This allows
-            // applications to wait for the service manager to be
-            // reachable before sending a signal to shutdown the
-            // IceBox.
-            //
-            Ice.Application.shutdownOnInterrupt();
-
-            //
             // Register "this" as a facet to the Admin object and
             // create Admin object
             //
@@ -471,7 +458,6 @@
             }
 
             _communicator.waitForShutdown();
-            Ice.Application.defaultInterrupt();
         }
         catch(FailureException ex)
         {
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/build.gradle zeroc-ice-3.7.2/java-compat/src/IceBT/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/IceBT/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "IceBT Compat"
 project.ext.description = "Bluetooth support for Ice"
 
 slice {
     java {
-        set1 {
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBT", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBT", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice-compat')
+    implementation project(':ice-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothAdapter.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothDevice.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothServerSocket.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/android/bluetooth/BluetoothSocket.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This is a placeholder for the Android API. It is not included in the IceBT JAR file.
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/AcceptorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
@@ -22,9 +17,10 @@
     }
 
     @Override
-    public void setReadyCallback(IceInternal.ReadyCallback callback)
+    public synchronized void setReadyCallback(IceInternal.ReadyCallback callback)
     {
         _readyCallback = callback;
+        notify(); // Notify the acceptor thread
     }
 
     @Override
@@ -168,9 +164,26 @@
 
     private void runAccept()
     {
-        try
+        synchronized(this)
         {
-            while(true)
+            //
+            // Wait for the ready callback to be set by the selector.
+            //
+            while(_readyCallback == null)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+        }
+
+        while(true)
+        {
+            try
             {
                 BluetoothSocket socket = _socket.accept();
                 synchronized(this)
@@ -184,13 +197,14 @@
                     _readyCallback.ready(IceInternal.SocketOperation.Read, true);
                 }
             }
-        }
-        catch(Exception ex)
-        {
-            synchronized(this)
+            catch(Exception ex)
             {
-                if(!_closed)
+                synchronized(this)
                 {
+                    if(_closed)
+                    {
+                        break;
+                    }
                     _exception = ex;
                     _readyCallback.ready(IceInternal.SocketOperation.Read, true);
                 }
@@ -200,14 +214,7 @@
         //
         // Close any remaining incoming sockets that haven't been accepted yet.
         //
-        java.util.Stack<BluetoothSocket> pending;
-        synchronized(this)
-        {
-            pending = _pending;
-            _pending = null;
-        }
-
-        for(BluetoothSocket s : pending)
+        for(BluetoothSocket s : _pending)
         {
             try
             {
@@ -218,6 +225,7 @@
                 // Ignore.
             }
         }
+        _pending.clear();
     }
 
     private EndpointI _endpoint;
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/EndpointFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/Instance.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/Instance.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/Instance.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/Instance.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/Util.java zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/Util.java
--- zeroc-ice-3.7.1/java-compat/src/IceBT/src/main/java/IceBT/Util.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceBT/src/main/java/IceBT/Util.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceBT;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceDiscovery/build.gradle zeroc-ice-3.7.2/java-compat/src/IceDiscovery/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/IceDiscovery/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceDiscovery/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "IceDiscovery Compat"
 project.ext.description = "Allow Ice applications to discover objects and object adapters"
@@ -20,7 +12,7 @@
 }
 
 dependencies {
-    compile project(':ice-compat')
+    implementation project(':ice-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java
--- zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java
--- zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java
--- zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java
--- zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java
--- zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java
--- zeroc-ice-3.7.1/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceGrid/build.gradle zeroc-ice-3.7.2/java-compat/src/IceGrid/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/IceGrid/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceGrid/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "IceGrid Compat"
 project.ext.description = "Locate, deploy, and manage Ice servers"
 
 slice {
     java {
-        set1 {
-            args = "--tie --checksum IceGrid.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--tie --checksum IceGrid.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice-compat')
-    compile project(':glacier2-compat')
+    implementation project(':ice-compat')
+    implementation project(':glacier2-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/build.gradle zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "IceLocatorDiscovery Compat"
 project.ext.description = "Ice plug-in that enables the discovery of IceGrid and custom locators via UDP multicast"
@@ -20,7 +12,7 @@
 }
 
 dependencies {
-    compile project(':ice-compat')
+    implementation project(':ice-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java
--- zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceLocatorDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java
--- zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceLocatorDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java
--- zeroc-ice-3.7.1/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/Plugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package IceLocatorDiscovery;
 
diff -Nru zeroc-ice-3.7.1/java-compat/src/IcePatch2/build.gradle zeroc-ice-3.7.2/java-compat/src/IcePatch2/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/IcePatch2/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IcePatch2/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "IcePatch2 Compat"
 project.ext.description = "File distribution and patching for Ice"
 
 slice {
     java {
-        set1 {
-            args = "--tie --checksum IcePatch2.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
-        }
+         args = "--tie --checksum IcePatch2.SliceChecksums"
+         files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice-compat')
+    implementation project(':ice-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/src/IceStorm/build.gradle zeroc-ice-3.7.2/java-compat/src/IceStorm/build.gradle
--- zeroc-ice-3.7.1/java-compat/src/IceStorm/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/src/IceStorm/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 
 project.ext.displayName = "IceStorm Compat"
 project.ext.description = "Publish-subscribe event distribution service"
 
 slice {
     java {
-        set1 {
-            args = "--tie --checksum IceStorm.SliceChecksums"
-            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
-        }
+        args = "--tie --checksum IceStorm.SliceChecksums"
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
 dependencies {
-    compile project(':ice-compat')
+    implementation project(':ice-compat')
 }
 
 apply from: "$project.ext.topSrcDir/java/gradle/library.gradle"
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/build.gradle zeroc-ice-3.7.2/java-compat/test/android/controller/build.gradle
--- zeroc-ice-3.7.1/java-compat/test/android/controller/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,101 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+buildscript {
+    repositories {
+        jcenter()
+        google()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'gradle.plugin.com.zeroc.gradle.ice-builder:slice:1.4.5'
+    }
+}
+
+apply plugin: 'com.android.application'
+apply plugin: "com.zeroc.gradle.ice-builder.slice"
+
+slice {
+    compat = true
+    output = file("${project.buildDir}/generated/source/ice")
+    cppConfiguration = project.cppConfiguration
+    cppPlatform = project.cppPlatform
+    if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) {
+        iceHome =  project.hasProperty('iceHome') ? project.iceHome
+            : System.getenv("ICE_HOME") != null ? System.env.ICE_HOME : new File("$rootProject.projectDir/../../../..").getCanonicalPath()
+    }
+    java {
+        files = fileTree(dir: "$rootProject.projectDir/../../../../scripts/", includes: ['*.ice'])
+    }
+}
+
+repositories {
+    if(slice.jarDir != null) {
+        flatDir {
+            name "local"
+            dirs slice.jarDir
+        }
+    }
+
+    if(this.devRepo) {
+        maven {
+            url this.devRepo
+        }
+    }
+
+    google()
+    jcenter()
+}
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        applicationId "com.zeroc.testcontroller"
+        minSdkVersion 21
+        targetSdkVersion 28
+        multiDexEnabled true // Necessary otherwise we'd exceed the 64K DEX limit.
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+        }
+
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+        }
+    }
+}
+
+task copyBksTask(type: Copy) {
+    from "${rootProject.projectDir}/../../../../certs/client.bks"
+    from "${rootProject.projectDir}/../../../../certs/server.bks"
+    into "src/main/res/raw"
+}
+preBuild.dependsOn(copyBksTask)
+
+clean {
+    delete("src/main/res/raw/client.bks")
+    delete("src/main/res/raw/server.bks")
+}
+
+dependencies {
+    implementation "com.zeroc:glacier2-compat:${project.iceVersion}"
+    implementation "com.zeroc:ice-compat:${project.iceVersion}"
+    runtimeOnly "com.zeroc:icediscovery-compat:${project.iceVersion}"
+    runtimeOnly "com.zeroc:icebt-compat:${project.iceVersion}"
+
+    implementation files("${rootProject.projectDir}/../../../lib/test.jar")
+    runtimeOnly "org.apache.commons:commons-compress:1.14"
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/gradle.properties zeroc-ice-3.7.2/java-compat/test/android/controller/gradle.properties
--- zeroc-ice-3.7.1/java-compat/test/android/controller/gradle.properties	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/gradle.properties	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,56 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+//
+// Version used in JAR files
+//
+iceVersion = 3.7.2
+
+//
+// Set iceHome to location of Ice installation if Ice was installed in a
+// non-standard location. You must use forward slashes in the path, even on
+// Windows.
+//
+// iceHome =
+
+//
+// Gradle build properties
+//
+// org.gradle.daemon = false
+
+//
+// For faster builds, increase the maximum heap size
+// for the Gradle daemon to at least 1536 MB.
+//
+org.gradle.jvmargs=-Xmx2048M
+
+//
+// If the dev repository is set it will be used as the first repository when
+// resolving dependencies
+//
+devRepo =
+
+//
+// Windows specific options
+//
+
+//
+// The platform used by the C++ build. Supported values are `x64` and `Win32`.
+// This is required to locate the slice2java compiler in the platform-dependent
+// directory.
+//
+cppPlatform = x64
+
+//
+// The configuration used by the C++ build. Supported values are `Debug` and `Release`.
+// This is required to locate the slice2java compiler in the configuration-dependent
+// directory.
+//
+cppConfiguration = Release
+
+//
+// If the dev repository is set it will be used as the first repository when
+// resolving dependencies
+//
+devRepo =
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/proguard.cfg zeroc-ice-3.7.2/java-compat/test/android/controller/proguard.cfg
--- zeroc-ice-3.7.1/java-compat/test/android/controller/proguard.cfg	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/proguard.cfg	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,80 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Optimization is turned off by default. Dex does not like code run
+# through the ProGuard optimize and preverify steps (and performs some
+# of these optimizations on its own).
+-dontoptimize
+-dontpreverify
+# Note that if you want to enable optimization, you cannot just
+# include optimization flags in your own project configuration file;
+# instead you will need to point to the
+# "proguard-android-optimize.txt" file instead of this one from your
+# project.properties file.
+
+-keepattributes *Annotation*
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# keep setters in Views so that animations can still work.
+# see http://proguard.sourceforge.net/manual/examples.html#beans
+-keepclassmembers public class * extends android.view.View {
+   void set*(***);
+   *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.**
+
+-dontwarn IceInternal.Instance$Timer*
+-dontwarn java.nio.channels.*
+-dontwarn java.net.StandardSocketOptions
+-dontwarn java.nio.charset.StandardCharsets
+
+-keepnames class ** { *; }
+
+-keep class test.Ice.** { *; }
+
+-keep class Ice.** { *; }
+-keep enum Ice.** { *; }
+
+-keep class IceSSL.** { *; }
+-keep enum IceSSL.** { *; }
+
+-keep class IceInternal.** { *; }
+-keep enum IceInternal.** { *; }
+
+# For debugging.
+-keepattributes LocalVariableTable, LocalVariableTypeTable
+-dontoptimize
+-dontobfuscate
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/AndroidManifest.xml zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/AndroidManifest.xml
--- zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/AndroidManifest.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.zeroc.testcontroller"
+    android:versionCode="1"
+    android:versionName="1.0.0">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <!--
+      http://developer.android.com/guide/topics/manifest/uses-sdk-element.html
+    -->
+    <application
+        android:icon="@raw/icon"
+        android:label="@string/app_name"
+        android:name="ControllerApp"
+        android:allowBackup="false">
+        <activity
+            android:name="ControllerActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="http"
+                    android:host="zeroc.com" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/assets/.gitignore zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/assets/.gitignore
--- zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/assets/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/assets/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1 @@
+*.dex
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java
--- zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerActivity.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,139 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package com.zeroc.testcontroller;
+
+import java.util.LinkedList;
+import android.app.*;
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.widget.*;
+import android.view.View;
+
+public class ControllerActivity extends ListActivity
+{
+    private WifiManager _wifiManager;
+    private WifiManager.MulticastLock _lock;
+    private LinkedList<String> _output = new LinkedList<String>();
+    private ArrayAdapter<String> _outputAdapter;
+    private ArrayAdapter<String> _ipv4Adapter;
+    private ArrayAdapter<String> _ipv6Adapter;
+
+    private static final int REQUEST_ENABLE_BT = 1;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        _wifiManager = (WifiManager)getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        _lock = _wifiManager.createMulticastLock("com.zeroc.testcontroller");
+        _lock.acquire();
+    }
+
+    @Override
+    public void onStart()
+    {
+        super.onStart();
+
+        //
+        // Enable Bluetooth if necessary.
+        //
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if(adapter == null)
+        {
+            Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
+            setup(false);
+        }
+        else if(!adapter.isEnabled())
+        {
+            Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+            startActivityForResult(enableIntent, REQUEST_ENABLE_BT);
+        }
+        else
+        {
+            setup(true);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int req, int res, Intent data)
+    {
+        switch(req)
+        {
+            case REQUEST_ENABLE_BT:
+            {
+                if(_outputAdapter == null)
+                {
+                    if(res == Activity.RESULT_OK)
+                    {
+                        setup(true);
+                    }
+                    else
+                    {
+                        Toast.makeText(this, R.string.no_bluetooth, Toast.LENGTH_SHORT).show();
+                        setup(false);
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    synchronized private void setup(boolean bluetooth)
+    {
+        _outputAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, _output);
+        setListAdapter(_outputAdapter);
+
+        final ControllerApp app = (ControllerApp)getApplication();
+        final java.util.List<String> ipv4Addresses = app.getAddresses(false);
+        _ipv4Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv4Addresses);
+        Spinner s = (Spinner)findViewById(R.id.ipv4);
+        s.setAdapter(_ipv4Adapter);
+        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
+            {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+                {
+                    app.setIpv4Address(ipv4Addresses.get((int)id));
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> arg0)
+                {
+                }
+            });
+        s.setSelection(0);
+
+        final java.util.List<String> ipv6Addresses = app.getAddresses(true);
+        _ipv6Adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, ipv6Addresses);
+        s = (Spinner)findViewById(R.id.ipv6);
+        s.setAdapter(_ipv6Adapter);
+        s.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener()
+            {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+                {
+                    app.setIpv6Address(ipv6Addresses.get((int)id));
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> arg0)
+                {
+                }
+            });
+        s.setSelection(0);
+        app.startController(this, bluetooth);
+    }
+
+    public synchronized void println(String data)
+    {
+        _output.add(data);
+        _outputAdapter.notifyDataSetChanged();
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
--- zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,549 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package com.zeroc.testcontroller;
+
+import java.io.*;
+import java.util.*;
+
+import Ice.Logger;
+import Ice.Communicator;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+import android.app.Application;
+
+import Test.Common.ProcessControllerRegistryPrxHelper;
+import Test.Common.ProcessControllerRegistryPrx;
+import Test.Common.ProcessControllerPrx;
+import Test.Common.ProcessControllerPrxHelper;
+
+public class ControllerApp extends Application
+{
+    private final String TAG = "ControllerApp";
+    private ControllerI _controllerI;
+    private ControllerActivity _activity;
+    private java.util.Map<String, ClassLoader> _classLoaders = new java.util.HashMap<String, ClassLoader>();
+    private String _ipv4Address;
+    private String _ipv6Address;
+
+    static private class TestSuiteBundle
+    {
+        @SuppressWarnings("unchecked")
+        TestSuiteBundle(String name, ClassLoader loader) throws ClassNotFoundException
+        {
+            _loader = loader;
+            _class = (Class<? extends test.TestHelper>)_loader.loadClass(name);
+        }
+
+        test.TestHelper newInstance()
+                throws IllegalAccessException, InstantiationException
+        {
+            if(_class == null)
+            {
+                return null;
+            }
+            return _class.newInstance();
+        }
+
+        ClassLoader getClassLoader()
+        {
+            return  _loader;
+        }
+
+        private String _name;
+        private ClassLoader _loader;
+        private Class<? extends test.TestHelper> _class;
+    }
+
+    class AndroidLogger implements Ice.Logger
+    {
+        private final String _prefix;
+
+        AndroidLogger(String prefix)
+        {
+            _prefix = prefix;
+        }
+
+        @Override
+        public void print(String message)
+        {
+            Log.d(TAG, message);
+        }
+
+        @Override
+        public void trace(String category, String message)
+        {
+            Log.v(category, message);
+        }
+
+        @Override
+        public void warning(String message)
+        {
+            Log.w(TAG, message);
+        }
+
+        @Override
+        public void error(String message)
+        {
+            Log.e(TAG, message);
+        }
+
+        @Override
+        public String getPrefix()
+        {
+            return _prefix;
+        }
+
+        @Override
+        public Logger cloneWithPrefix(String s)
+        {
+            return new AndroidLogger(s);
+        }
+    }
+
+    @Override
+    public void onCreate()
+    {
+        super.onCreate();
+        Ice.Util.setProcessLogger(new AndroidLogger(""));
+    }
+
+    synchronized public void setIpv4Address(String address)
+    {
+        _ipv4Address = address;
+    }
+
+    synchronized public void setIpv6Address(String address)
+    {
+        int i = address.indexOf("%");
+        _ipv6Address = i == -1 ? address : address.substring(i);
+    }
+
+    public List<String> getAddresses(boolean ipv6)
+    {
+        List<String> addresses = new java.util.ArrayList<String>();
+        try
+        {
+            java.util.Enumeration<java.net.NetworkInterface> ifaces = java.net.NetworkInterface.getNetworkInterfaces();
+            while(ifaces.hasMoreElements())
+            {
+                java.net.NetworkInterface iface = ifaces.nextElement();
+                java.util.Enumeration<java.net.InetAddress> addrs = iface.getInetAddresses();
+                while (addrs.hasMoreElements())
+                {
+                    java.net.InetAddress addr = addrs.nextElement();
+                    if((ipv6 && addr instanceof java.net.Inet6Address) ||
+                       (!ipv6 && !(addr instanceof java.net.Inet6Address)))
+                    {
+                        addresses.add(addr.getHostAddress());
+                    }
+                }
+            }
+        }
+        catch(java.net.SocketException ex)
+        {
+        }
+        return addresses;
+    }
+
+    public synchronized void startController(ControllerActivity activity, boolean bluetooth)
+    {
+        _activity = activity;
+        if(_controllerI == null)
+        {
+            _controllerI = new ControllerI(bluetooth);
+        }
+    }
+
+    public synchronized void println(final String data)
+    {
+        _activity.runOnUiThread(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                synchronized(ControllerApp.this)
+                {
+                    _activity.println(data);
+                }
+            }
+        });
+    }
+
+    public static boolean isEmulator()
+    {
+        return Build.FINGERPRINT.startsWith("generic") ||
+               Build.FINGERPRINT.startsWith("unknown") ||
+               Build.MODEL.contains("google_sdk") ||
+               Build.MODEL.contains("Emulator") ||
+               Build.MODEL.contains("Android SDK built for x86") ||
+               Build.MANUFACTURER.contains("Genymotion") ||
+               (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) ||
+               Build.PRODUCT.equals("google_sdk");
+    }
+
+    class ControllerI
+    {
+        public ControllerI(boolean bluetooth)
+        {
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = Ice.Util.createProperties();
+            initData.properties.setProperty("Ice.ThreadPool.Server.SizeMax", "10");
+            initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp");
+            //initData.properties.setProperty("Ice.Trace.Network", "3");
+            //initData.properties.setProperty("Ice.Trace.Protocol", "1");
+            initData.properties.setProperty("ControllerAdapter.AdapterId", java.util.UUID.randomUUID().toString());
+            initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
+            if(!isEmulator())
+            {
+                if(bluetooth)
+                {
+                    initData.properties.setProperty("Ice.Plugin.IceBT", "IceBT.PluginFactory");
+                }
+                initData.properties.setProperty("Ice.Plugin.IceDiscovery", "IceDiscovery.PluginFactory");
+                initData.properties.setProperty("IceDiscovery.DomainId", "TestController");
+            }
+            _communicator = Ice.Util.initialize(initData);
+            Ice.ObjectAdapter adapter = _communicator.createObjectAdapter("ControllerAdapter");
+            ProcessControllerPrx processController = ProcessControllerPrxHelper.uncheckedCast(
+                    adapter.add(new ProcessControllerI(), Ice.Util.stringToIdentity("AndroidCompat/ProcessController")));
+            adapter.activate();
+            ProcessControllerRegistryPrx registry;
+            if(isEmulator())
+            {
+                registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
+                        _communicator.stringToProxy("Util/ProcessControllerRegistry:tcp -h 10.0.2.2 -p 15001"));
+            }
+            else
+            {
+                // Use IceDiscovery to find a process controller registry
+                registry = ProcessControllerRegistryPrxHelper.uncheckedCast(
+                        _communicator.stringToProxy("Util/ProcessControllerRegistry"));
+            }
+            registerProcessController(adapter, registry, processController);
+            println("AndroidCompat/ProcessController");
+        }
+
+        public void
+        registerProcessController(final Ice.ObjectAdapter adapter,
+                                  final ProcessControllerRegistryPrx registry,
+                                  final ProcessControllerPrx processController)
+        {
+            registry.begin_ice_ping(
+                new Ice.Callback()
+                {
+                    public void completed(Ice.AsyncResult r)
+                    {
+                        try
+                        {
+                            registry.end_ice_ping(r);
+                            Ice.Connection connection = registry.ice_getCachedConnection();
+                            connection.setAdapter(adapter);
+                            connection.setACM(new Ice.IntOptional(5),
+                                              new Ice.Optional<Ice.ACMClose>(Ice.ACMClose.CloseOff),
+                                              new Ice.Optional<Ice.ACMHeartbeat>(Ice.ACMHeartbeat.HeartbeatAlways));
+
+                            connection.setCloseCallback(new Ice.CloseCallback()
+                                {
+                                    @Override
+                                    public void closed(Ice.Connection con)
+                                    {
+                                        println("connection with process controller registry closed");
+                                        while(true)
+                                        {
+                                            try
+                                            {
+                                                Thread.sleep(500);
+                                                break;
+                                            }
+                                            catch(InterruptedException e)
+                                            {
+                                            }
+                                        }
+                                        registerProcessController(adapter, registry, processController);
+                                    }
+                                });
+
+                            registry.begin_setProcessController(processController,
+                                new Ice.Callback()
+                                {
+                                    public void completed(Ice.AsyncResult r)
+                                    {
+                                        try
+                                        {
+                                            registry.end_setProcessController(r);
+                                        }
+                                        catch(Ice.Exception ex)
+                                        {
+                                            handleException(ex, adapter, registry, processController);
+                                        }
+                                    }
+                                });
+                        }
+                        catch(Ice.Exception ex)
+                        {
+                            handleException(ex, adapter, registry, processController);
+                        }
+                    }
+                });
+        }
+
+        public void handleException(Throwable ex,
+                                    final Ice.ObjectAdapter adapter,
+                                    final ProcessControllerRegistryPrx registry,
+                                    final ProcessControllerPrx processController)
+        {
+            if(ex instanceof Ice.ConnectFailedException || ex instanceof Ice.TimeoutException)
+            {
+                while(true)
+                {
+                    try
+                    {
+                        Thread.sleep(500);
+                        break;
+                    }
+                    catch(InterruptedException e)
+                    {
+                    }
+                }
+                registerProcessController(adapter, registry, processController);
+            }
+            else
+            {
+                println(ex.toString());
+            }
+        }
+
+        public void destroy()
+        {
+            _communicator.destroy();
+        }
+
+        private ProcessControllerRegistryPrx _registry;
+        private Ice.Communicator _communicator;
+    }
+
+    class ControllerHelperI extends Thread implements test.TestHelper.ControllerHelper
+    {
+        public ControllerHelperI(TestSuiteBundle bundle, String[] args, String exe)
+        {
+            _bundle = bundle;
+            _args = args;
+        }
+
+        public void communicatorInitialized(Communicator communicator)
+        {
+            if(communicator.getProperties().getProperty("Ice.Plugin.IceSSL").equals("IceSSL.PluginFactory"))
+            {
+                IceSSL.Plugin plugin = (IceSSL.Plugin)communicator.getPluginManager().getPlugin("IceSSL");
+                String keystore = communicator.getProperties().getProperty("IceSSL.Keystore");
+                communicator.getProperties().setProperty("IceSSL.Keystore", "");
+                java.io.InputStream certs = getResources().openRawResource(
+                        keystore.equals("client.bks") ? R.raw.client : R.raw.server);
+                plugin.setKeystoreStream(certs);
+                plugin.setTruststoreStream(certs);
+                communicator.getPluginManager().initializePlugins();
+            }
+        }
+
+        public void run()
+        {
+            try
+            {
+                _helper = _bundle.newInstance();
+                _helper.setClassLoader(_bundle.getClassLoader());
+                _helper.setControllerHelper(this);
+                _helper.setWriter(new Writer()
+                    {
+                        @Override
+                        public void close() throws IOException
+                        {
+                        }
+
+                        @Override
+                        public void flush() throws IOException
+                        {
+                        }
+
+                        @Override
+                        public void write(char[] buf, int offset, int count)
+                            throws IOException
+                        {
+                            _out.append(buf, offset, count);
+                        }
+                    });
+
+                _helper.run(_args);
+                completed(0);
+            }
+            catch(Exception ex)
+            {
+                ex.printStackTrace(_helper.getWriter());
+                completed(-1);
+            }
+        }
+
+        public void shutdown()
+        {
+            if(_helper != null)
+            {
+                _helper.shutdown();
+            }
+        }
+
+        public String getOutput()
+        {
+            return _out.toString();
+        }
+
+        synchronized public void serverReady()
+        {
+            _ready = true;
+            notifyAll();
+        }
+
+        synchronized private void completed(int status)
+        {
+            _completed = true;
+            _status = status;
+            notifyAll();
+        }
+
+        synchronized private void waitReady(int timeout)
+            throws Test.Common.ProcessFailedException
+        {
+            long now = IceInternal.Time.currentMonotonicTimeMillis();
+            while(!_ready && !_completed)
+            {
+                try
+                {
+                    wait(timeout * 1000);
+                    if(IceInternal.Time.currentMonotonicTimeMillis() - now > timeout * 1000)
+                    {
+                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
+                    }
+                }
+                catch(java.lang.InterruptedException ex)
+                {
+                }
+            }
+
+            if(_completed && _status != 0)
+            {
+                throw new Test.Common.ProcessFailedException(_out.toString());
+            }
+        }
+
+        synchronized private int waitSuccess(int timeout)
+            throws Test.Common.ProcessFailedException
+        {
+            long now = IceInternal.Time.currentMonotonicTimeMillis();
+            while(!_completed)
+            {
+                try
+                {
+                    wait(timeout * 1000);
+                    if(IceInternal.Time.currentMonotonicTimeMillis() - now > timeout * 1000)
+                    {
+                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
+                    }
+                }
+                catch(java.lang.InterruptedException ex)
+                {
+                }
+            }
+            return _status;
+        }
+
+        private TestSuiteBundle _bundle;
+        private String[] _args;
+        private String _exe;
+        private test.TestHelper _helper;
+        private boolean _ready = false;
+        private boolean _completed = false;
+        private int _status = 0;
+        private final StringBuffer _out = new StringBuffer();
+    }
+
+    class ProcessControllerI extends Test.Common._ProcessControllerDisp
+    {
+        public Test.Common.ProcessPrx start(final String testsuite, final String exe, String[] args, Ice.Current current)
+            throws Test.Common.ProcessFailedException
+        {
+            println("starting " + testsuite + " " + exe + "... ");
+            String className = "test." + testsuite.replace("/", ".") + "." +
+                exe.substring(0, 1).toUpperCase(Locale.ROOT) + exe.substring(1);
+            try
+            {
+                TestSuiteBundle bundle = new TestSuiteBundle(className, getClassLoader());
+                ControllerHelperI controllerHelper = new ControllerHelperI(bundle, args, exe);
+                controllerHelper.start();
+                return Test.Common.ProcessPrxHelper.uncheckedCast(
+                    current.adapter.addWithUUID(new ProcessI(controllerHelper)));
+            }
+            catch(ClassNotFoundException ex)
+            {
+                throw new Test.Common.ProcessFailedException(
+                    "testsuite `" + testsuite + "' exe ` " + exe + "' start failed:\n" + ex.toString());
+            }
+        }
+
+        public String getHost(String protocol, boolean ipv6, Ice.Current current)
+        {
+            if(isEmulator())
+            {
+                return  "127.0.0.1";
+            }
+            else
+            {
+                synchronized(ControllerApp.this)
+                {
+                    return ipv6 ? _ipv6Address : _ipv4Address;
+                }
+            }
+        }
+    }
+
+    class ProcessI extends Test.Common._ProcessDisp
+    {
+        public ProcessI(ControllerHelperI controllerHelper)
+        {
+            _controllerHelper = controllerHelper;
+        }
+
+        public void waitReady(int timeout, Ice.Current current)
+            throws Test.Common.ProcessFailedException
+        {
+            _controllerHelper.waitReady(timeout);
+        }
+
+        public int waitSuccess(int timeout, Ice.Current current)
+            throws Test.Common.ProcessFailedException
+        {
+            return _controllerHelper.waitSuccess(timeout);
+        }
+
+        public String terminate(Ice.Current current)
+        {
+            _controllerHelper.shutdown();
+            current.adapter.remove(current.id);
+            while(true)
+            {
+                try
+                {
+                    _controllerHelper.join();
+                    break;
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+            return _controllerHelper.getOutput();
+        }
+
+        private ControllerHelperI _controllerHelper;
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/res/layout/main.xml zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/res/layout/main.xml
--- zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/res/layout/main.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/res/layout/main.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="5dip">
+        <TextView
+            android:layout_width="5dip"
+            android:layout_weight="25"
+            android:layout_height="wrap_content"
+            android:text="@string/ipv4"
+            android:layout_gravity="center_vertical"/>
+
+        <Spinner
+            android:id="@+id/ipv4"
+            android:layout_width="5dip"
+            android:layout_weight="75"
+            android:layout_height="wrap_content"
+            android:drawSelectorOnTop="false"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="5dip">
+        <TextView
+            android:layout_width="0dip"
+            android:layout_weight="25"
+            android:layout_height="wrap_content"
+            android:text="@string/ipv6"
+            android:layout_gravity="center_vertical"/>
+
+        <Spinner
+            android:id="@+id/ipv6"
+            android:layout_width="0dip"
+            android:layout_weight="75"
+            android:layout_height="wrap_content"
+            android:drawSelectorOnTop="false"/>
+    </LinearLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:stackFromBottom="true"
+        android:transcriptMode="alwaysScroll"/>
+</LinearLayout>
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/res/raw/client.bks and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/res/raw/client.bks differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/res/raw/icon.png and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/res/raw/icon.png differ
Binary files /tmp/woxfVAWQuO/zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/res/raw/server.bks and /tmp/8caLpp1yxR/zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/res/raw/server.bks differ
diff -Nru zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/res/values/strings.xml zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/res/values/strings.xml
--- zeroc-ice-3.7.1/java-compat/test/android/controller/src/main/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/android/controller/src/main/res/values/strings.xml	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Test Controller</string>
+    <string name="no_bluetooth">Bluetooth disabled</string>
+    <string name="ipv4">IPv4</string>
+    <string name="ipv6">IPv6</string>
+</resources>
diff -Nru zeroc-ice-3.7.1/java-compat/test/build.gradle zeroc-ice-3.7.2/java-compat/test/build.gradle
--- zeroc-ice-3.7.1/java-compat/test/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 ext.testDir = "${projectDir}/src/main/java/test"
 apply from: "slice.gradle"
@@ -15,24 +10,21 @@
 sourceSets {
     main {
         java {
-            if(!hasLambda) {
-                exclude '**/lambda'
-            }
+            exclude '**/lambda'
             exclude 'plugins'
-            exclude 'ejb'
         }
     }
 }
 
 dependencies {
-    compile localDependency('ice-compat')
-    compile localDependency('icediscovery-compat')
-    compile localDependency('icelocatordiscovery-compat')
-    compile localDependency('icebox-compat')
-    compile localDependency('glacier2-compat')
-    compile localDependency('icestorm-compat')
-    compile localDependency('icegrid-compat')
-    compile project(':testPlugins')
+    implementation localDependency('ice-compat')
+    runtimeOnly localDependency('icediscovery-compat')
+    runtimeOnly localDependency('icelocatordiscovery-compat')
+    implementation localDependency('icebox-compat')
+    implementation localDependency('glacier2-compat')
+    implementation localDependency('icestorm-compat')
+    implementation localDependency('icegrid-compat')
+    implementation project(':testPlugins')
 }
 
 if(!gradle.startParameter.isOffline()) {
@@ -45,7 +37,7 @@
     archiveName = "test.jar"
     destinationDir = new File("$rootProject.projectDir/lib/")
     manifest {
-        attributes("Class-Path": configurations.runtime.resolve().collect { it.toURI() }.join(' '))
+        attributes("Class-Path": configurations.runtimeClasspath.resolve().collect { it.toURI() }.join(' '))
     }
 }
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/README.md zeroc-ice-3.7.2/java-compat/test/ejb/README.md
--- zeroc-ice-3.7.1/java-compat/test/ejb/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-This test demonstrates the sharing of a single Ice object adapter for
-multiple EJBs.
-
-It setups 2 EJBs which both implement a similar service but with
-slightly different Slice types: the Account class in the first version
-has 1 string member and the second version has 2 string members:
-
-// Version 1
-class Account extends Base
-{
-    string id;
-};
-
-// Version 2
-class Account extends Base
-{
-    string id;
-    string foo;
-};
-
-The Base class is defined in a Jar shared by both EJBs and install in
-the lib directory of the application server.
-
-Each EJB registers servants using the IceAdapter helper class. This
-helper manages the shared Ice object adapter.
-
-The helper registers the servant with the object adapter and uses a
-dispatch interceptor to setup the thread context class loader to
-ensure the servant invocations are un-marhsalled with the EJB class
-loader.
-
-With Ice 3.5, this interceptor will no longer be necessary, the Ice
-core will provide a property to enable the setting of the thread
-context class loader from the Ice core directly.
-
-Building the test
------------------
-
-Set the JBOSS_HOME environment variable to your jboss-eap-5.1/jboss-as
-directory, for example:
-
-  $ export JBOSS_HOME=$HOME/EnterprisePlatform-5.1.2/jboss-eap-5.1/jboss-as/
-
-If Ice isn't installed in the default location set the ICE_HOME
-environment variable to your Ice 3.7.1 installation directory.
-
-Run ant to build and deploy the application:
-
-  $ ant deploy
-
-This will deploy the following Jars to your JBoss server default
-configuration:
-
-  $JBOSS_HOME/server/default/lib/Ice.jar
-  $JBOSS_HOME/server/default/lib/ice-ejb-test-common.jar
-  $JBOSS_HOME/server/default/deploy/ice-ejb-test-ejb1.jar
-  $JBOSS_HOME/server/default/deploy/ice-ejb-test-ejb2.jar
-
-Run the clients
----------------
-
-To run the client for the first EJB version:
-
-  $ ant run.client1
-
-For the second EJB version:
-
-  $ ant run.client2
-
-Note that the clients uses the Java naming provier specified in
-src/resources/jndi.properties (jnp://127.0.0.1:1099) to obtain a
-reference on the initialization EJB of each service. The Ice object
-adapter listen on the port 10000 of the loopback interface.
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/common/com/zeroc/ice/IceAdapter.java zeroc-ice-3.7.2/java-compat/test/ejb/src/common/com/zeroc/ice/IceAdapter.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/common/com/zeroc/ice/IceAdapter.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/common/com/zeroc/ice/IceAdapter.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ice;
-
-public class IceAdapter
-{
-    synchronized static public void
-    add(Ice.Object servant, Ice.Identity id)
-    {
-        if(_objectAdapter == null)
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Default.Package", "com.zeroc.ice");
-            initData.properties.setProperty("Ice.UseApplicationClassLoader", "1");
-            Ice.Communicator communicator = Ice.Util.initialize(initData);
-            _objectAdapter = communicator.createObjectAdapterWithEndpoints("EJB", "tcp -h localhost -p 10000");
-            _objectAdapter.activate();
-        }
-        ++_servantCount;
-        _objectAdapter.add(servant, id);
-    }
-
-    synchronized static public void
-    remove(Ice.Identity id)
-    {
-        assert _servantCount > 0;
-        _objectAdapter.remove(id);
-        if(--_servantCount == 0)
-        {
-            _objectAdapter.getCommunicator().destroy();
-            _objectAdapter = null;
-        }
-    }
-
-    synchronized static public Ice.ObjectPrx
-    stringToProxy(String str)
-    {
-        assert _objectAdapter != null;
-        return _objectAdapter.getCommunicator().stringToProxy(str);
-    }
-
-    static private Ice.ObjectAdapter _objectAdapter = null;
-    static private int _servantCount;
-};
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Client.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Client.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Client.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.naming.*;
-
-import com.zeroc.ice.Test.*;
-
-public class Client extends Ice.Application
-{
-    public int
-    run(String[] args)
-    {
-        System.out.print("initializing EJBs... ");
-        System.out.flush();
-        try
-        {
-            // Initialize the EJBs
-            InitialContext ic = new InitialContext();
-            Init init = (Init)ic.lookup("InitEJB1Service");
-            init.init();
-        }
-        catch(Exception ex)
-        {
-            System.err.println("couldn't resolve init bean:\n" + ex);
-            return 1;
-        }
-        System.out.println("ok");
-
-        System.out.print("setting and getting account... ");
-        System.out.flush();
-        String str = "ejb1/service:tcp -h localhost -p 10000";
-        ServicePrx proxy = ServicePrxHelper.checkedCast(communicator().stringToProxy(str));
-        proxy.addAccount(new Account("id1"));
-        Account s = proxy.getAccount("id1");
-        if(!s.id.equals("id1"))
-        {
-            throw new RuntimeException("invalid value: " + s.id);
-        }
-
-        s = proxy.getAccount("id2");
-        if(!s.id.equals("id2"))
-        {
-            throw new RuntimeException("invalid value: " + s.id);
-        }
-
-        System.out.println("ok");
-        return 0;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties();
-        initData.properties.setProperty("Ice.Default.Package", "com.zeroc.ice");
-        int status = app.main("Client", args, initData);
-        System.exit(status);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseI.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseI.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import com.zeroc.ice.Test.*;
-
-public class DatabaseI extends _DatabaseDisp
-{
-    public final Account
-    getAccount(String id, Ice.Current current)
-        throws AccountNotExistException
-    {
-        Account account = accounts.get(id);
-        if(account == null)
-        {
-            throw new AccountNotExistException();
-        }
-        return account;
-    }
-
-    public final void
-    addAccount(Account s, Ice.Current current)
-    {
-        accounts.put(s.id, s);
-    }
-
-    private java.util.Map<String, Account> accounts = new java.util.HashMap<String, Account>();
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import com.zeroc.ice.Test.*;
-
-public class DatabaseServer extends Ice.Application
-{
-    public int
-    run(String[] args)
-    {
-        if(args.length > 0)
-        {
-            System.err.println(appName() + ": too many arguments");
-            return 1;
-        }
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapterWithEndpoints("DB", "tcp -h localhost -p 10001");
-        adapter.add(new DatabaseI(), Ice.Util.stringToIdentity("db"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties();
-        initData.properties.setProperty("Ice.Default.Package", "com.zeroc.ice");
-
-        DatabaseServer app = new DatabaseServer();
-        int status = app.main("Server", args, initData);
-        System.exit(status);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.annotation.*;
-import javax.ejb.*;
-
-import com.zeroc.ice.IceAdapter;
-
-//
-// The initialization EJB is used to register Ice servants for each
-// the EJBs from this EJB3 Jar.
-//
-@Stateless(mappedName="InitEJB1Service", name="Init1")
-public class InitBean implements Init
-{
-    private @EJB Service service;
-
-    @PostConstruct
-    public void
-    create()
-    {
-        IceAdapter.add(new ServiceI(service), new Ice.Identity("service", "ejb1"));
-    }
-
-    @PreDestroy
-    public void
-    destroy()
-    {
-        IceAdapter.remove(new Ice.Identity("service", "ejb1"));
-    }
-
-    public void
-    init()
-    {
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Init.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Init.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Init.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Init.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.ejb.*;
-
-@Remote
-public interface Init
-{
-    void init();
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceBean.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceBean.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceBean.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceBean.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.annotation.*;
-import javax.ejb.*;
-import com.zeroc.ice.IceAdapter;
-import com.zeroc.ice.Test.*;
-
-@Stateless(name="EJB1ServiceBean")
-public class ServiceBean implements Service
-{
-    @PostConstruct
-    public void
-    create()
-    {
-        Ice.ObjectPrx db = IceAdapter.stringToProxy("db:tcp -h localhost -p 10001");
-        database = DatabasePrxHelper.uncheckedCast(db);
-    }
-
-    public final Account
-    getAccount(String id)
-    {
-        try
-        {
-            return database.getAccount(id);
-        }
-        catch(AccountNotExistException ex)
-        {
-            Account a = new Account(id);
-            database.addAccount(a);
-            return a;
-        }
-    }
-
-    public final void
-    addAccount(Account s)
-    {
-        database.addAccount(s);
-    }
-
-    private DatabasePrx database;
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.ejb.*;
-
-import com.zeroc.ice.Test._ServiceDisp;
-import com.zeroc.ice.Test.Account;
-import com.zeroc.ice.Test.AccountNotExistException;
-
-//
-// This Ice servant delegates the calls to the Service EJB
-//
-public class ServiceI extends _ServiceDisp
-{
-    final private Service service;
-
-    public ServiceI(Service service)
-    {
-        this.service = service;
-    }
-
-    public final Account
-    getAccount(String id, Ice.Current current)
-    {
-        return service.getAccount(id);
-    }
-
-    public final void
-    addAccount(Account s, Ice.Current current)
-    {
-        service.addAccount(s);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Service.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Service.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Service.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/Service.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.ejb.Local;
-import com.zeroc.ice.Test.Account;
-import com.zeroc.ice.Test.AccountNotExistException;
-
-@Local
-public interface Service
-{
-    Account getAccount(String id);
-
-    void addAccount(Account s);
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/META-INF/jboss.xml zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/META-INF/jboss.xml
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb1/META-INF/jboss.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb1/META-INF/jboss.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<jboss>
-  <loader-repository>
-    com.zeroc.ejb1:loader=EJB1ClassLoader
-       <loader-repository-config>
-         java2ParentDelegation=false
-       </loader-repository-config>
-  </loader-repository>
-</jboss>
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Client.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Client.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Client.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.naming.*;
-
-import com.zeroc.ice.Test.*;
-
-public class Client extends Ice.Application
-{
-    public int
-    run(String[] args)
-    {
-        System.out.print("initializing EJBs... ");
-        System.out.flush();
-        try
-        {
-            // Initialize the EJBs
-            InitialContext ic = new InitialContext();
-            Init init = (Init)ic.lookup("InitEJB2Service");
-            init.init();
-        }
-        catch(Exception ex)
-        {
-            System.err.println("couldn't resolve init bean:\n" + ex);
-            return 1;
-        }
-        System.out.println("ok");
-
-        System.out.print("setting and getting account... ");
-        System.out.flush();
-        String str = "ejb2/service:tcp -h localhost -p 10000";
-        ServicePrx proxy = ServicePrxHelper.checkedCast(communicator().stringToProxy(str));
-        proxy.addAccount(new Account("id1", "foo"));
-        Account s = proxy.getAccount("id1");
-        if(!s.id.equals("id1") || !s.foo.equals("foo"))
-        {
-            throw new RuntimeException("invalid value: " + s.id);
-        }
-
-        s = proxy.getAccount("id2");
-        if(!s.id.equals("id2"))
-        {
-            throw new RuntimeException("invalid value: " + s.id);
-        }
-
-        System.out.println("ok");
-        return 0;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties();
-        initData.properties.setProperty("Ice.Default.Package", "com.zeroc.ice");
-        int status = app.main("Client", args, initData);
-        System.exit(status);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseI.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseI.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import com.zeroc.ice.Test.*;
-
-public class DatabaseI extends _DatabaseDisp
-{
-    public final Account
-    getAccount(String id, Ice.Current current)
-        throws AccountNotExistException
-    {
-        Account account = accounts.get(id);
-        if(account == null)
-        {
-            throw new AccountNotExistException(id);
-        }
-        return account;
-    }
-
-    public final void
-    addAccount(Account s, Ice.Current current)
-    {
-        accounts.put(s.id, s);
-    }
-
-    private java.util.Map<String, Account> accounts = new java.util.HashMap<String, Account>();
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import com.zeroc.ice.Test.*;
-
-public class DatabaseServer extends Ice.Application
-{
-    public int
-    run(String[] args)
-    {
-        if(args.length > 0)
-        {
-            System.err.println(appName() + ": too many arguments");
-            return 1;
-        }
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapterWithEndpoints("DB", "tcp -h localhost -p 10002");
-        adapter.add(new DatabaseI(), Ice.Util.stringToIdentity("db"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties();
-        initData.properties.setProperty("Ice.Default.Package", "com.zeroc.ice");
-
-        DatabaseServer app = new DatabaseServer();
-        int status = app.main("Server", args, initData);
-        System.exit(status);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.annotation.*;
-import javax.ejb.*;
-
-import com.zeroc.ice.IceAdapter;
-
-//
-// The initialization EJB is used to register Ice servants for each
-// the EJBs from this EJB3 Jar.
-//
-@Stateless(mappedName="InitEJB2Service", name="Init2")
-public class InitBean implements Init
-{
-    private @EJB Service service;
-
-    @PostConstruct
-    public void
-    create()
-    {
-        IceAdapter.add(new ServiceI(service), new Ice.Identity("service", "ejb2"));
-    }
-
-    @PreDestroy
-    public void
-    destroy()
-    {
-        IceAdapter.remove(new Ice.Identity("service", "ejb2"));
-    }
-
-    public void
-    init()
-    {
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Init.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Init.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Init.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Init.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.ejb.*;
-
-@Remote
-public interface Init
-{
-    void init();
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceBean.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceBean.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceBean.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceBean.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.annotation.*;
-import javax.ejb.*;
-import com.zeroc.ice.IceAdapter;
-import com.zeroc.ice.Test.*;
-
-@Stateless(name="EJB2ServiceBean")
-public class ServiceBean implements Service
-{
-    @PostConstruct
-    public void
-    create()
-    {
-        Ice.ObjectPrx db = IceAdapter.stringToProxy("db:tcp -h localhost -p 10002");
-        database = DatabasePrxHelper.uncheckedCast(db);
-    }
-
-    public final Account
-    getAccount(String id)
-    {
-        final AccountHolder holder = new AccountHolder();
-        database.begin_getAccount(id, new Callback_Database_getAccount() {
-                public void
-                response(Account a)
-                {
-                    synchronized(holder)
-                    {
-                        holder.value = a;
-                        holder.notify();
-                    }
-                }
-
-                public void
-                exception(Ice.LocalException ex)
-                {
-                    ex.printStackTrace();
-                    assert(false);
-                }
-
-                public void
-                exception(Ice.UserException ex)
-                {
-                    Account a = new Account(((AccountNotExistException)ex).id, "");
-                    database.begin_addAccount(a);
-                    synchronized(holder)
-                    {
-                        holder.value = a;
-                        holder.notify();
-                    }
-                }
-            });
-
-        synchronized(holder)
-        {
-            while(holder.value == null)
-            {
-                try
-                {
-                    holder.wait();
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-        }
-        return holder.value;
-    }
-
-    public final void
-    addAccount(Account s)
-    {
-        database.addAccount(s);
-    }
-
-    private DatabasePrx database;
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.ejb.*;
-
-import com.zeroc.ice.Test._ServiceDisp;
-import com.zeroc.ice.Test.Account;
-import com.zeroc.ice.Test.AccountNotExistException;
-
-//
-// This Ice servant delegates the calls to the Service EJB
-//
-public class ServiceI extends _ServiceDisp
-{
-    final private Service service;
-
-    public ServiceI(Service service)
-    {
-        this.service = service;
-    }
-
-    public final Account
-    getAccount(String id, Ice.Current current)
-    {
-        return service.getAccount(id);
-    }
-
-    public final void
-    addAccount(Account s, Ice.Current current)
-    {
-        service.addAccount(s);
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Service.java zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Service.java
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Service.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/Service.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package com.zeroc.ejb;
-
-import javax.ejb.Local;
-import com.zeroc.ice.Test.Account;
-import com.zeroc.ice.Test.AccountNotExistException;
-
-@Local
-public interface Service
-{
-    Account getAccount(String id);
-
-    void addAccount(Account s);
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/META-INF/jboss.xml zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/META-INF/jboss.xml
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/ejb2/META-INF/jboss.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/ejb2/META-INF/jboss.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<jboss>
-  <loader-repository>
-    com.zeroc.ejb2:loader=EJB2ClassLoader
-       <loader-repository-config>
-         java2ParentDelegation=false
-       </loader-repository-config>
-  </loader-repository>
-</jboss>
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/resources/jndi.properties zeroc-ice-3.7.2/java-compat/test/ejb/src/resources/jndi.properties
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/resources/jndi.properties	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/resources/jndi.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://127.0.0.1:1099
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/slice/common.ice zeroc-ice-3.7.2/java-compat/test/ejb/src/slice/common.ice
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/slice/common.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/slice/common.ice	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-[["java:package:com.zeroc.ice"]]
-module Test
-{
-
-class Base
-{
-}
-
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/slice/ejb1.ice zeroc-ice-3.7.2/java-compat/test/ejb/src/slice/ejb1.ice
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/slice/ejb1.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/slice/ejb1.ice	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include "common.ice"
-
-[["java:package:com.zeroc.ice"]]
-module Test
-{
-
-exception AccountNotExistException
-{
-}
-
-class Account extends Base
-{
-    string id;
-}
-
-interface Database
-{
-    void addAccount(Account s);
-
-    Account getAccount(string id)
-        throws AccountNotExistException;
-}
-
-interface Service
-{
-    void addAccount(Account s);
-
-    Account getAccount(string id);
-}
-
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/ejb/src/slice/ejb2.ice zeroc-ice-3.7.2/java-compat/test/ejb/src/slice/ejb2.ice
--- zeroc-ice-3.7.1/java-compat/test/ejb/src/slice/ejb2.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/ejb/src/slice/ejb2.ice	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include "common.ice"
-
-[["java:package:com.zeroc.ice"]]
-module Test
-{
-
-exception AccountNotExistException
-{
-    string id;
-}
-
-class Account extends Base
-{
-    string id;
-    string foo;
-}
-
-interface Database
-{
-    void addAccount(Account s);
-
-    Account getAccount(string id)
-        throws AccountNotExistException;
-}
-
-interface Service
-{
-    void addAccount(Account s);
-
-    Account getAccount(string id);
-}
-
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/DoubleModuleNoPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // dmnp = double module no package
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/DoubleModuleWithPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // dmwp = double module with package
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/Metadata.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/Metadata.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/Metadata.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/Metadata.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module MetadataTest
 {
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/SingleModuleNoPackage.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/SingleModuleNoPackage.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/SingleModuleNoPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/SingleModuleNoPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // smnp = single module no package
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/SingleModuleWithPackage.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/SingleModuleWithPackage.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/SingleModuleWithPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/SingleModuleWithPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // smwp = single module with package
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/Test/CustomList.java zeroc-ice-3.7.2/java-compat/test/Ice/translator/Test/CustomList.java
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/Test/CustomList.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/Test/CustomList.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package Test;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage5.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleNoPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleNoPackage types from (same) double module with package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage10.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) double module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage11.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) double module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (different) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage5.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) single module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) single module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage8.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestDoubleModuleWithPackage9.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use DoubleModuleWithPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleNoPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleNoPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleNoPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleNoPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleNoPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleNoPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage10.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (same) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage11.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) double module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage12.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) double module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage13.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (same) double module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage4.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage5.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (same) single module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage6.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) single module with (different) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage7.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) single module with (same) package definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/TestSingleModuleWithPackage9.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test: use SingleModuleWithPackage types from (different) double module definitions
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/Ice/translator/Underscore.ice zeroc-ice-3.7.2/java-compat/test/Ice/translator/Underscore.ice
--- zeroc-ice-3.7.1/java-compat/test/Ice/translator/Underscore.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/Ice/translator/Underscore.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Underscore_Test
 {
diff -Nru zeroc-ice-3.7.1/java-compat/test/lambda/build.gradle zeroc-ice-3.7.2/java-compat/test/lambda/build.gradle
--- zeroc-ice-3.7.1/java-compat/test/lambda/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/lambda/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,37 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+// Override defaults otherwise this code won't compile!
+//
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+compileJava {
+    // See ice.gradle
+    if(JavaVersion.current() > JavaVersion.VERSION_1_8) {
+        options.compilerArgs.addAll(['--release', '8'])
+    }
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs "$rootProject.projectDir/test/lambda"
+        }
+    }
+}
+
+dependencies {
+    implementation localDependency('ice-compat')
+    implementation project(':test')
+}
+
+jar {
+    archiveName = "IceTestLambda.jar"
+    destinationDir = new File("$rootProject.projectDir/lib/")
+}
+
+clean {
+    delete("$rootProject.projectDir/lib/IceTestLambda.jar")
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/ami/lambda/AMI.java zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/ami/lambda/AMI.java
--- zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/ami/lambda/AMI.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/ami/lambda/AMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,1183 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.ami.lambda;
+
+import java.io.PrintWriter;
+
+import test.Ice.ami.Test.TestIntfPrx;
+import test.Ice.ami.Test.TestIntfPrxHelper;
+import test.Ice.ami.Test.TestIntfControllerPrx;
+import test.Ice.ami.Test.TestIntfControllerPrxHelper;
+import test.Ice.ami.Test.PingReplyPrx;
+import test.Ice.ami.Test.PingReplyPrxHelper;
+import test.Ice.ami.Test.TestIntfException;
+import test.Ice.ami.Test.Callback_TestIntf_op;
+import test.Ice.ami.Test.Callback_TestIntf_opWithResult;
+import test.Ice.ami.Test.Callback_TestIntf_opWithUE;
+import test.Ice.ami.Test.Callback_TestIntf_opWithPayload;
+
+public class AMI
+{
+    private static void
+    test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    public static class PingReplyI extends test.Ice.ami.Test._PingReplyDisp
+    {
+        @Override
+        public void reply(Ice.Current current)
+        {
+            _received = true;
+        }
+
+        public boolean checkReceived()
+        {
+            return _received;
+        }
+
+        private boolean _received = false;
+    }
+
+    private static class CallbackBase
+    {
+        CallbackBase()
+        {
+            _called = false;
+        }
+
+        public synchronized void check()
+        {
+            while(!_called)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+
+            _called = false;
+        }
+
+        public synchronized void called()
+        {
+            assert(!_called);
+            _called = true;
+            notify();
+        }
+
+        private boolean _called;
+    }
+
+    static class AsyncCallback extends CallbackBase
+    {
+        public AsyncCallback()
+        {
+        }
+
+        public void
+        isA(Ice.AsyncResult result)
+        {
+            test(result.getProxy().end_ice_isA(result));
+            called();
+        }
+
+        public void
+        ping(Ice.AsyncResult result)
+        {
+            result.getProxy().end_ice_ping(result);
+            called();
+        }
+
+        public void
+        id(Ice.AsyncResult result)
+        {
+            test(result.getProxy().end_ice_id(result).equals("::Test::TestIntf"));
+            called();
+        }
+
+        public void
+        ids(Ice.AsyncResult result)
+        {
+            test(result.getProxy().end_ice_ids(result).length == 2);
+            called();
+        }
+
+        public void
+        connection(Ice.AsyncResult result)
+        {
+            test(result.getProxy().end_ice_getConnection(result) != null);
+            called();
+        }
+
+        public void
+        op(Ice.AsyncResult result)
+        {
+            TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
+            called();
+        }
+
+        public void
+        opWithResult(Ice.AsyncResult result)
+        {
+            test(TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithResult(result) == 15);
+            called();
+        }
+
+        public void
+        opWithUE(Ice.AsyncResult result)
+        {
+            try
+            {
+                TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithUE(result);
+                test(false);
+            }
+            catch(TestIntfException ex)
+            {
+                called();
+            }
+            catch(Ice.Exception ex)
+            {
+                test(false);
+            }
+        }
+
+        public void
+        isAEx(Ice.AsyncResult result)
+        {
+            try
+            {
+                result.getProxy().end_ice_isA(result);
+                test(false);
+            }
+            catch(Ice.NoEndpointException ex)
+            {
+                called();
+            }
+            catch(Ice.Exception ex)
+            {
+                test(false);
+            }
+        }
+
+        public void
+        pingEx(Ice.AsyncResult result)
+        {
+            try
+            {
+                result.getProxy().end_ice_ping(result);
+                test(false);
+            }
+            catch(Ice.NoEndpointException ex)
+            {
+                called();
+            }
+            catch(Ice.Exception ex)
+            {
+                test(false);
+            }
+        }
+
+        public void
+        idEx(Ice.AsyncResult result)
+        {
+            try
+            {
+                result.getProxy().end_ice_id(result);
+                test(false);
+            }
+            catch(Ice.NoEndpointException ex)
+            {
+                called();
+            }
+            catch(Ice.Exception ex)
+            {
+                test(false);
+            }
+        }
+
+        public void
+        idsEx(Ice.AsyncResult result)
+        {
+            try
+            {
+                result.getProxy().end_ice_ids(result);
+                test(false);
+            }
+            catch(Ice.NoEndpointException ex)
+            {
+                called();
+            }
+            catch(Ice.Exception ex)
+            {
+                test(false);
+            }
+        }
+
+        public void
+        connectionEx(Ice.AsyncResult result)
+        {
+            try
+            {
+                result.getProxy().end_ice_getConnection(result);
+                test(false);
+            }
+            catch(Ice.NoEndpointException ex)
+            {
+                called();
+            }
+            catch(Ice.Exception ex)
+            {
+                test(false);
+            }
+        }
+
+        public void
+        opEx(Ice.AsyncResult result)
+        {
+            try
+            {
+                TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
+                test(false);
+            }
+            catch(Ice.NoEndpointException ex)
+            {
+                called();
+            }
+            catch(Ice.Exception ex)
+            {
+                test(false);
+            }
+        }
+    }
+
+    static class ResponseCallback extends CallbackBase
+    {
+        ResponseCallback()
+        {
+        }
+
+        public void
+        isA(boolean r)
+        {
+            test(r);
+            called();
+        }
+
+        public void
+        ping()
+        {
+            called();
+        }
+
+        public void
+        id(String id)
+        {
+            test(id.equals("::Test::TestIntf"));
+            called();
+        }
+
+        public void
+        ids(String[] ids)
+        {
+            test(ids.length == 2);
+            called();
+        }
+
+        public void
+        connection(Ice.Connection conn)
+        {
+            test(conn != null);
+            called();
+        }
+
+        public void
+        op()
+        {
+            called();
+        }
+
+        public void
+        opWithResult(int r)
+        {
+            test(r == 15);
+            called();
+        }
+
+        public void
+        opWithUE(Ice.UserException e)
+        {
+            try
+            {
+                throw e;
+            }
+            catch(TestIntfException ex)
+            {
+                called();
+            }
+            catch(Ice.UserException ex)
+            {
+                test(false);
+            }
+        }
+    }
+
+    static class ExceptionCallback extends CallbackBase
+    {
+        public ExceptionCallback()
+        {
+        }
+
+        public void
+        isA(boolean r)
+        {
+            test(false);
+        }
+
+        public void
+        ping()
+        {
+            test(false);
+        }
+
+        public void
+        id(String id)
+        {
+            test(false);
+        }
+
+        public void
+        ids(String[] ids)
+        {
+            test(false);
+        }
+
+        public void
+        connection(Ice.Connection conn)
+        {
+            test(false);
+        }
+
+        public void
+        op()
+        {
+            test(false);
+        }
+
+        public void
+        ex(Ice.Exception ex)
+        {
+            test(ex instanceof Ice.NoEndpointException);
+            called();
+        }
+
+        public void
+        noEx(Ice.Exception ex)
+        {
+            test(false);
+        }
+    }
+
+    static class SentCallback extends CallbackBase
+    {
+        SentCallback()
+        {
+            _thread = Thread.currentThread().getId();
+        }
+
+        public void
+        isA(boolean r)
+        {
+        }
+
+        public void
+        ping()
+        {
+        }
+
+        public void
+        id(String s)
+        {
+        }
+
+        public void
+        ids(String[] s)
+        {
+        }
+
+        public void
+        opAsync(Ice.AsyncResult r)
+        {
+        }
+
+        public void
+        op()
+        {
+        }
+
+        public void
+        ex(Ice.Exception ex)
+        {
+        }
+
+        public void
+        sent(Ice.AsyncResult r)
+        {
+            test(r.sentSynchronously() && _thread == Thread.currentThread().getId() ||
+                 !r.sentSynchronously() && _thread != Thread.currentThread().getId());
+            called();
+        }
+
+        public void
+        sent(boolean ss)
+        {
+            test(ss && _thread == Thread.currentThread().getId() ||
+                 !ss && _thread != Thread.currentThread().getId());
+            called();
+        }
+
+        long _thread;
+    }
+
+    static class FlushCallback extends CallbackBase
+    {
+        FlushCallback()
+        {
+            _thread = Thread.currentThread().getId();
+        }
+
+        public void
+        completedAsync(Ice.AsyncResult r)
+        {
+            test(false);
+        }
+
+        public void
+        exception(Ice.Exception ex)
+        {
+            test(false);
+        }
+
+        public void
+        sentAsync(Ice.AsyncResult r)
+        {
+            test((r.sentSynchronously() && _thread == Thread.currentThread().getId()) ||
+                 (!r.sentSynchronously() && _thread != Thread.currentThread().getId()));
+            called();
+        }
+
+        public void
+        sent(boolean sentSynchronously)
+        {
+            test((sentSynchronously && _thread == Thread.currentThread().getId()) ||
+                 (!sentSynchronously && _thread != Thread.currentThread().getId()));
+            called();
+        }
+
+        long _thread;
+    }
+
+    static class FlushExCallback extends CallbackBase
+    {
+        FlushExCallback()
+        {
+        }
+
+        public void
+        completedAsync(Ice.AsyncResult r)
+        {
+            try
+            {
+                if(r.getConnection() != null)
+                {
+                    r.getConnection().end_flushBatchRequests(r);
+                }
+                else
+                {
+                    r.getProxy().end_ice_flushBatchRequests(r);
+                }
+                test(false);
+            }
+            catch(Ice.Exception ex)
+            {
+                called();
+            }
+        }
+
+        public void
+        exception(Ice.Exception ex)
+        {
+            called();
+        }
+
+        public void
+        sentAsync(Ice.AsyncResult r)
+        {
+            test(false);
+        }
+
+        public void
+        sent(boolean sentSynchronously)
+        {
+            test(false);
+        }
+    }
+
+    enum ThrowType { LocalException, OtherException };
+
+    static class Thrower extends CallbackBase
+    {
+        public Thrower(ThrowType t)
+        {
+            _t = t;
+        }
+
+        public void
+        opAsync(Ice.AsyncResult r)
+        {
+            called();
+            throwEx();
+        }
+
+        public void
+        op()
+        {
+            called();
+            throwEx();
+        }
+
+        public void
+        noOp()
+        {
+        }
+
+        public void
+        ex(Ice.Exception ex)
+        {
+            called();
+            throwEx();
+        }
+
+        public void
+        sent(boolean ss)
+        {
+            called();
+            throwEx();
+        }
+
+        private void
+        throwEx()
+        {
+            switch(_t)
+            {
+            case LocalException:
+            {
+                throw new Ice.ObjectNotExistException();
+            }
+            case OtherException:
+            {
+                throw new RuntimeException();
+            }
+            default:
+            {
+                assert(false);
+                break;
+            }
+            }
+        }
+
+        ThrowType _t;
+    }
+
+    public static void
+    run(test.TestHelper helper, Ice.Communicator communicator, boolean collocated, TestIntfPrx p,
+        TestIntfControllerPrx testController)
+    {
+
+        PrintWriter out = helper.getWriter();
+
+        out.print("testing response callback... ");
+        out.flush();
+        {
+            final ResponseCallback cb = new ResponseCallback();
+            java.util.Map<String, String> ctx = new java.util.HashMap<String, String>();
+
+            p.begin_ice_isA("::Test::TestIntf",
+                (boolean r) -> cb.isA(r),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_ice_isA("::Test::TestIntf",
+                (boolean r) -> cb.isA(r),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_ice_ping(
+                () -> cb.ping(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_ice_ping(ctx,
+                () -> cb.ping(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_ice_id(
+                (String id) -> cb.id(id),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_ice_id(ctx,
+                (String id) -> cb.id(id),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_ice_ids(
+                (String[] ids) -> cb.ids(ids),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_ice_ids(ctx,
+                (String[] ids) -> cb.ids(ids),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            if(!collocated)
+            {
+                p.begin_ice_getConnection(
+                    (Ice.Connection conn) -> cb.connection(conn),
+                    (Ice.Exception ex) -> test(false));
+                cb.check();
+            }
+
+            p.begin_op(
+                () -> cb.op(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_op(ctx,
+                () -> cb.op(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_opWithResult(
+                (int r) -> cb.opWithResult(r),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_opWithResult(ctx,
+                (int r) -> cb.opWithResult(r),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_opWithUE(
+                () -> test(false),
+                (Ice.UserException ex) -> cb.opWithUE(ex),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+
+            p.begin_opWithUE(ctx,
+                () -> test(false),
+                (Ice.UserException ex) -> cb.opWithUE(ex),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+        out.println("ok");
+
+        out.print("testing local exceptions with response callback... ");
+        out.flush();
+        {
+            TestIntfPrx i = TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+            final ExceptionCallback cb = new ExceptionCallback();
+
+            i.begin_ice_isA("::Test::TestIntf",
+                (boolean r) -> test(false),
+                (Ice.Exception ex) -> cb.ex(ex));
+            cb.check();
+
+            i.begin_ice_ping(
+                () -> test(false),
+                (Ice.Exception ex) -> cb.ex(ex));
+            cb.check();
+
+            i.begin_ice_id(
+                (String id) -> test(false),
+                (Ice.Exception ex) -> cb.ex(ex));
+            cb.check();
+
+            i.begin_ice_ids(
+                (String[] ids) -> test(false),
+                (Ice.Exception ex) -> cb.ex(ex));
+            cb.check();
+
+            if(!collocated)
+            {
+                i.begin_ice_getConnection(
+                    (Ice.Connection conn) -> test(false),
+                    (Ice.Exception ex) -> cb.ex(ex));
+                cb.check();
+            }
+
+            i.begin_op(
+                () -> test(false),
+                (Ice.Exception ex) -> cb.ex(ex));
+            cb.check();
+        }
+        out.println("ok");
+
+        out.print("testing sent callback... ");
+        out.flush();
+        {
+            final SentCallback cb = new SentCallback();
+
+            p.begin_ice_isA("",
+                (boolean r) -> cb.isA(r),
+                (Ice.Exception ex) -> cb.ex(ex),
+                (boolean ss) -> cb.sent(ss));
+            cb.check();
+
+            p.begin_ice_ping(
+                () -> cb.ping(),
+                (Ice.Exception ex) -> cb.ex(ex),
+                (boolean ss) -> cb.sent(ss));
+            cb.check();
+
+            p.begin_ice_id(
+                (String id) -> cb.id(id),
+                (Ice.Exception ex) -> cb.ex(ex),
+                (boolean ss) -> cb.sent(ss));
+            cb.check();
+
+            p.begin_ice_ids(
+                (String[] ids) -> cb.ids(ids),
+                (Ice.Exception ex) -> cb.ex(ex),
+                (boolean ss) -> cb.sent(ss));
+            cb.check();
+
+            p.begin_op(
+                () -> cb.op(),
+                (Ice.Exception ex) -> cb.ex(ex),
+                (boolean ss) -> cb.sent(ss));
+            cb.check();
+
+            java.util.List<SentCallback> cbs = new java.util.ArrayList<SentCallback>();
+            byte[] seq = new byte[10024];
+            new java.util.Random().nextBytes(seq); // Make sure the request doesn't compress too well.
+            Ice.AsyncResult r;
+            testController.holdAdapter();
+            try
+            {
+                do
+                {
+                    final SentCallback cb2 = new SentCallback();
+                    r = p.begin_opWithPayload(seq,
+                        () -> {},
+                        (Ice.Exception ex) -> cb2.ex(ex),
+                        (boolean ss) -> cb2.sent(ss));
+                    cbs.add(cb2);
+                }
+                while(r.sentSynchronously());
+            }
+            finally
+            {
+                testController.resumeAdapter();
+            }
+            for(SentCallback cb3 : cbs)
+            {
+                cb3.check();
+            }
+        }
+        out.println("ok");
+
+        out.print("testing unexpected exceptions from callback... ");
+        out.flush();
+        {
+            TestIntfPrx q = TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
+            ThrowType throwEx[] = { ThrowType.LocalException, ThrowType.OtherException };
+
+            for(int i = 0; i < 2; ++i)
+            {
+                final Thrower cb = new Thrower(throwEx[i]);
+
+                p.begin_op(
+                    () -> cb.op(),
+                    null);
+                cb.check();
+
+                q.begin_op(
+                    () -> cb.op(),
+                    (Ice.Exception ex) -> cb.ex(ex));
+                cb.check();
+
+                p.begin_op(
+                    () -> {},
+                    (Ice.Exception ex) -> {},
+                    (boolean ss) -> cb.sent(ss));
+                cb.check();
+            }
+        }
+        out.println("ok");
+
+        out.print("testing batch requests with proxy... ");
+        out.flush();
+        {
+            {
+                //
+                // Type-safe.
+                //
+                test(p.opBatchCount() == 0);
+                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
+                b1.opBatch();
+                b1.opBatch();
+                final FlushCallback cb = new FlushCallback();
+                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
+                    null,
+                    (Ice.Exception ex) -> cb.exception(ex),
+                    (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                cb.check();
+                test(r.isSent());
+                test(r.isCompleted());
+                test(p.waitForBatch(2));
+            }
+
+            if(p.ice_getConnection() != null)
+            {
+                //
+                // Type-safe exception.
+                //
+                test(p.opBatchCount() == 0);
+                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
+                b1.opBatch();
+                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                final FlushCallback cb = new FlushCallback();
+                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
+                    null,
+                    (Ice.Exception ex) -> cb.exception(ex),
+                    (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                cb.check();
+                test(r.isSent());
+                test(r.isCompleted());
+                test(p.waitForBatch(1));
+            }
+        }
+        out.println("ok");
+
+        if(p.ice_getConnection() != null)
+        {
+            out.print("testing batch requests with connection... ");
+            out.flush();
+            {
+                {
+                    //
+                    // Type-safe.
+                    //
+                    test(p.opBatchCount() == 0);
+                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                         p.ice_getIdentity()).ice_batchOneway());
+                    b1.opBatch();
+                    b1.opBatch();
+                    final FlushCallback cb = new FlushCallback();
+                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb.exception(ex),
+                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                    cb.check();
+                    test(r.isSent());
+                    test(r.isCompleted());
+                    test(p.waitForBatch(2));
+
+                    final FlushCallback cb2 = new FlushCallback();
+                    Ice.AsyncResult r2 = b1.ice_getConnection().begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb2.exception(ex),
+                        (boolean sentSynchronously) -> cb2.sent(sentSynchronously));
+                    cb2.check();
+                    test(r2.isSent());
+                    test(r2.isCompleted());
+                }
+
+                {
+                    //
+                    // Type-safe exception.
+                    //
+                    test(p.opBatchCount() == 0);
+                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                         p.ice_getIdentity()).ice_batchOneway());
+                    b1.opBatch();
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    final FlushExCallback cb = new FlushExCallback();
+                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb.exception(ex),
+                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                    cb.check();
+                    test(!r.isSent());
+                    test(r.isCompleted());
+                    test(p.opBatchCount() == 0);
+                }
+            }
+            out.println("ok");
+
+            out.print("testing batch requests with communicator... ");
+            out.flush();
+            {
+                {
+                    //
+                    // Type-safe - 1 connection.
+                    //
+                    test(p.opBatchCount() == 0);
+                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                         p.ice_getIdentity()).ice_batchOneway());
+                    b1.opBatch();
+                    b1.opBatch();
+                    final FlushCallback cb = new FlushCallback();
+                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb.exception(ex),
+                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                    cb.check();
+                    test(r.isSent());
+                    test(r.isCompleted());
+                    test(p.waitForBatch(2));
+                }
+
+                {
+                    //
+                    // Type-safe exception - 1 connection.
+                    //
+                    test(p.opBatchCount() == 0);
+                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                         p.ice_getIdentity()).ice_batchOneway());
+                    b1.opBatch();
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    final FlushCallback cb = new FlushCallback();
+                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb.exception(ex),
+                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                    cb.check();
+                    test(r.isSent()); // Exceptions are ignored!
+                    test(r.isCompleted());
+                    test(p.opBatchCount() == 0);
+                }
+
+                {
+                    //
+                    // 2 connections.
+                    //
+                    test(p.opBatchCount() == 0);
+                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                         p.ice_getIdentity()).ice_batchOneway());
+                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
+                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                    b2.ice_getConnection(); // Ensure connection is established.
+                    b1.opBatch();
+                    b1.opBatch();
+                    b2.opBatch();
+                    b2.opBatch();
+                    final FlushCallback cb = new FlushCallback();
+                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb.exception(ex),
+                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                    cb.check();
+                    test(r.isSent());
+                    test(r.isCompleted());
+                    test(p.waitForBatch(4));
+                }
+
+                {
+                    //
+                    // Exception - 2 connections - 1 failure.
+                    //
+                    // All connections should be flushed even if there are failures on some connections.
+                    // Exceptions should not be reported.
+                    //
+                    test(p.opBatchCount() == 0);
+                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                         p.ice_getIdentity()).ice_batchOneway());
+                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
+                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                    b2.ice_getConnection(); // Ensure connection is established.
+                    b1.opBatch();
+                    b2.opBatch();
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    final FlushCallback cb = new FlushCallback();
+                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb.exception(ex),
+                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                    cb.check();
+                    test(r.isSent()); // Exceptions are ignored!
+                    test(r.isCompleted());
+                    test(p.waitForBatch(1));
+                }
+
+                {
+                    //
+                    // Exception - 2 connections - 2 failures.
+                    //
+                    // The sent callback should be invoked even if all connections fail.
+                    //
+                    test(p.opBatchCount() == 0);
+                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
+                                                                         p.ice_getIdentity()).ice_batchOneway());
+                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
+                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
+                    b2.ice_getConnection(); // Ensure connection is established.
+                    b1.opBatch();
+                    b2.opBatch();
+                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
+                    final FlushCallback cb = new FlushCallback();
+                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+                        Ice.CompressBatch.BasedOnProxy,
+                        null,
+                        (Ice.Exception ex) -> cb.exception(ex),
+                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
+                    cb.check();
+                    test(r.isSent()); // Exceptions are ignored!
+                    test(r.isCompleted());
+                    test(p.opBatchCount() == 0);
+                }
+            }
+            out.println("ok");
+        }
+
+        out.print("testing null callbacks...");
+        try
+        {
+            IceInternal.Functional_VoidCallback response = null;
+            IceInternal.Functional_GenericCallback1<Ice.Exception> exception = null;
+            p.begin_ice_ping(response, exception);
+            test(false);
+        }
+        catch(IllegalArgumentException ex)
+        {
+            // Excepted when response and exception callback are both null.
+        }
+
+        try
+        {
+            p.begin_ice_ping(() -> {}, null);
+
+        }
+        catch(IllegalArgumentException ex)
+        {
+            test(false);
+        }
+
+        try
+        {
+            p.begin_ice_ping(null, (Ice.Exception ex) -> {});
+
+        }
+        catch(IllegalArgumentException ex)
+        {
+            test(false);
+        }
+
+        try
+        {
+            IceInternal.Functional_BoolCallback response = null;
+            IceInternal.Functional_GenericCallback1<Ice.Exception> exception = null;
+            p.begin_ice_isA("::Test::TestIntf", response, exception);
+            test(false);
+        }
+        catch(IllegalArgumentException ex)
+        {
+            // Excepted when response and exception callback are both null.
+        }
+
+        try
+        {
+            p.begin_ice_isA("::Test::TestIntf", (boolean v) -> {}, null);
+
+        }
+        catch(IllegalArgumentException ex)
+        {
+            test(false);
+        }
+
+        try
+        {
+            p.begin_ice_isA("::Test::TestIntf", null, (Ice.Exception ex) -> {});
+
+        }
+        catch(IllegalArgumentException ex)
+        {
+            test(false);
+        }
+
+        try
+        {
+            IceInternal.Functional_VoidCallback response = null;
+            p.begin_opWithUE(response, null, (Ice.Exception ex) -> {});
+            test(false);
+        }
+        catch(IllegalArgumentException ex)
+        {
+            // Excepted when response and exception callback are both null, for
+            // an operation that throws user exceptions both user exception callback
+            // an local exception callback must be present.
+        }
+
+        try
+        {
+            IceInternal.Functional_VoidCallback response = null;
+            p.begin_opWithUE(response, (Ice.UserException ex) -> {}, null);
+            test(false);
+        }
+        catch(IllegalArgumentException ex)
+        {
+            // Excepted when response and exception callback are both null, for
+            // an operation that throws user exceptions both user exception callback
+            // an local exception callback must be present.
+        }
+
+        try
+        {
+            IceInternal.Functional_VoidCallback response = null;
+            IceInternal.Functional_GenericCallback1<Ice.UserException> userException = null;
+            IceInternal.Functional_GenericCallback1<Ice.Exception> exception = null;
+            p.begin_opWithUE(response, userException, exception);
+            test(false);
+        }
+        catch(IllegalArgumentException ex)
+        {
+            // Excepted when response and exception callback are both null.
+        }
+        out.println("ok");
+
+        if(!collocated)
+        {
+            out.print("testing bidir...");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
+            PingReplyI replyI = new PingReplyI();
+            PingReplyPrx reply = PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI));
+            adapter.activate();
+
+            p.ice_getConnection().setAdapter(adapter);
+            p.pingBiDir(reply);
+            test(replyI.checkReceived());
+            adapter.destroy();
+            out.println("ok");
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/invoke/lambda/AllTests.java zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/invoke/lambda/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/invoke/lambda/AllTests.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/invoke/lambda/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,196 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.invoke.lambda;
+import java.io.PrintWriter;
+
+import test.Ice.invoke.Test.MyClassPrx;
+import test.Ice.invoke.Test.MyClassPrxHelper;
+import test.Ice.invoke.Test.MyException;
+
+public class AllTests
+{
+    final static String testString = "This is a test string";
+
+    private static void
+    test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    private static class Callback
+    {
+        Callback()
+        {
+            _called = false;
+        }
+
+        public synchronized void check()
+        {
+            while(!_called)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+
+            _called = false;
+        }
+
+        public synchronized void called()
+        {
+            assert(!_called);
+            _called = true;
+            notify();
+        }
+
+        private boolean _called;
+    }
+
+    private static class Callback_Object_opStringI
+    {
+        public Callback_Object_opStringI(Ice.Communicator communicator)
+        {
+            _communicator = communicator;
+        }
+
+        public void response(boolean ok, byte[] outEncaps)
+        {
+            if(ok)
+            {
+                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
+                inS.startEncapsulation();
+                String s = inS.readString();
+                test(s.equals(testString));
+                s = inS.readString();
+                test(s.equals(testString));
+                inS.endEncapsulation();
+                callback.called();
+            }
+            else
+            {
+                test(false);
+            }
+        }
+
+        public void exception(Ice.Exception ex)
+        {
+            test(false);
+        }
+
+        public void sent(boolean sent)
+        {
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Ice.Communicator _communicator;
+        private Callback callback = new Callback();
+    }
+
+    private static class Callback_Object_opExceptionI
+    {
+        public Callback_Object_opExceptionI(Ice.Communicator communicator)
+        {
+            _communicator = communicator;
+        }
+
+        public void response(boolean ok, byte[] outEncaps)
+        {
+            if(ok)
+            {
+                test(false);
+            }
+            else
+            {
+                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
+                inS.startEncapsulation();
+                try
+                {
+                    inS.throwException();
+                }
+                catch(MyException ex)
+                {
+                    inS.endEncapsulation();
+                    callback.called();
+                }
+                catch(java.lang.Exception ex)
+                {
+                    test(false);
+                }
+            }
+        }
+
+        public void exception(Ice.Exception ex)
+        {
+            test(false);
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        public void sent(boolean sent)
+        {
+        }
+
+        private Ice.Communicator _communicator;
+        private Callback callback = new Callback();
+    }
+
+    public static MyClassPrx
+    allTests(test.TestHelper helper)
+    {
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        String ref = "test:" + helper.getTestEndpoint(0);
+        Ice.ObjectPrx base = communicator.stringToProxy(ref);
+        MyClassPrx cl = MyClassPrxHelper.checkedCast(base);
+        MyClassPrx oneway = MyClassPrxHelper.uncheckedCast(cl.ice_oneway());
+
+        out.print("testing asynchronous ice_invoke with lambda callbacks... ");
+        out.flush();
+
+        {
+            Ice.OutputStream outS = new Ice.OutputStream(communicator);
+            outS.startEncapsulation();
+            outS.writeString(testString);
+            outS.endEncapsulation();
+            byte[] inEncaps = outS.finished();
+
+            // begin_ice_invoke with Callback_Object_ice_invoke
+            Callback_Object_opStringI cb2 = new Callback_Object_opStringI(communicator);
+            cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps,
+                (boolean ret, byte[] outParams) -> cb2.response(ret, outParams),
+                (Ice.Exception ex) -> cb2.exception(ex),
+                (boolean sent) -> cb2.sent(sent));
+            cb2.check();
+        }
+
+        {
+            // begin_ice_invoke with Callback_Object_ice_invoke
+            Callback_Object_opExceptionI cb2 = new Callback_Object_opExceptionI(communicator);
+            cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null,
+                (boolean ret, byte[] outParams) -> cb2.response(ret, outParams),
+                (Ice.Exception ex) -> cb2.exception(ex),
+                (boolean sent) -> cb2.sent(sent));
+            cb2.check();
+        }
+
+        out.println("ok");
+
+        return cl;
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/operations/lambda/OnewaysLambdaAMI.java zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/operations/lambda/OnewaysLambdaAMI.java
--- zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/operations/lambda/OnewaysLambdaAMI.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/operations/lambda/OnewaysLambdaAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,153 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.operations.lambda;
+
+import test.Ice.operations.Test.MyClassPrx;
+
+public class OnewaysLambdaAMI
+{
+    private static void
+    test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    private static class Callback
+    {
+        Callback()
+        {
+            _called = false;
+        }
+
+        public synchronized void check()
+        {
+            while(!_called)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+
+            _called = false;
+        }
+
+        public synchronized void called()
+        {
+            assert(!_called);
+            _called = true;
+            notify();
+        }
+
+        public void
+        sent(boolean sentSynchronously)
+        {
+            called();
+        }
+
+        void noException(Ice.Exception ex)
+        {
+            test(false);
+        }
+
+        private boolean _called;
+    }
+
+    public static void
+    onewaysLambdaAMI(test.TestHelper helper, MyClassPrx proxy)
+    {
+        MyClassPrx p = (MyClassPrx)proxy.ice_oneway();
+
+        {
+            final Callback cb = new Callback();
+            p.begin_ice_ping(
+                () -> test(false),
+                (Ice.Exception ex) -> cb.noException(ex),
+                (boolean sent) -> cb.sent(sent)
+            );
+            cb.check();
+        }
+
+        {
+            try
+            {
+                p.begin_ice_isA("::Test::MyClass");
+                test(false);
+            }
+            catch(java.lang.IllegalArgumentException ex)
+            {
+            }
+        }
+
+        {
+            try
+            {
+                p.begin_ice_id();
+                test(false);
+            }
+            catch(java.lang.IllegalArgumentException ex)
+            {
+            }
+        }
+
+        {
+            try
+            {
+                p.begin_ice_ids();
+                test(false);
+            }
+            catch(java.lang.IllegalArgumentException ex)
+            {
+            }
+        }
+
+        {
+            final Callback cb = new Callback();
+            p.begin_opVoid(
+                () -> test(false),
+                (Ice.Exception ex) -> cb.noException(ex),
+                (boolean sent) -> cb.sent(sent)
+            );
+            cb.check();
+        }
+
+        {
+            final Callback cb = new Callback();
+            p.begin_opIdempotent(
+                () -> test(false),
+                (Ice.Exception ex) -> cb.noException(ex),
+                (boolean sent) -> cb.sent(sent)
+            );
+            cb.check();
+        }
+
+        {
+            final Callback cb = new Callback();
+            p.begin_opNonmutating(
+                () -> test(false),
+                (Ice.Exception ex) -> cb.noException(ex),
+                (boolean sent) -> cb.sent(sent)
+            );
+            cb.check();
+        }
+
+        {
+            try
+            {
+                p.begin_opByte((byte)0xff, (byte)0x0f);
+                test(false);
+            }
+            catch(java.lang.IllegalArgumentException ex)
+            {
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/operations/lambda/TwowaysLambdaAMI.java zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/operations/lambda/TwowaysLambdaAMI.java
--- zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/operations/lambda/TwowaysLambdaAMI.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/operations/lambda/TwowaysLambdaAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,1427 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.operations.lambda;
+
+import test.Ice.operations.Test.AnotherStruct;
+import test.Ice.operations.Test._MyClassDisp;
+import test.Ice.operations.Test.MyClassPrx;
+import test.Ice.operations.Test._MyDerivedClassDisp;
+import test.Ice.operations.Test.MyDerivedClassPrx;
+import test.Ice.operations.Test.MyDerivedClassPrxHelper;
+import test.Ice.operations.Test.MyEnum;
+import test.Ice.operations.Test.Structure;
+import test.Ice.operations.Test.MyStruct;
+
+import java.util.Map;
+
+public class TwowaysLambdaAMI
+{
+    private static void
+    test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    private static class Callback
+    {
+        Callback()
+        {
+            _called = false;
+        }
+
+        public synchronized void check()
+        {
+            while(!_called)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+
+            _called = false;
+        }
+
+        public synchronized void called()
+        {
+            assert(!_called);
+            _called = true;
+            notify();
+        }
+
+        private boolean _called;
+    }
+
+    private static class pingI
+    {
+        public void response()
+        {
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class isAI
+    {
+        public void response(boolean r)
+        {
+            test(r);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class idI
+    {
+        public void response(String id)
+        {
+            test(id.equals(_MyDerivedClassDisp.ice_staticId()));
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class idsI
+    {
+        public void response(String[] ids)
+        {
+            test(ids.length == 3);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opVoidI
+    {
+        public void response()
+        {
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opByteI
+    {
+        public void response(byte r, byte b)
+        {
+            test(b == (byte)0xf0);
+            test(r == (byte)0xff);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opBoolI
+    {
+        public void response(boolean r, boolean b)
+        {
+            test(b);
+            test(!r);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opShortIntLongI
+    {
+        public void response(long r, short s, int i, long l)
+        {
+            test(s == 10);
+            test(i == 11);
+            test(l == 12);
+            test(r == 12);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opFloatDoubleI
+    {
+        public void response(double r, float f, double d)
+        {
+            test(f == 3.14f);
+            test(d == 1.1E10);
+            test(r == 1.1E10);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opStringI
+    {
+        public void response(String r, String s)
+        {
+            test(s.equals("world hello"));
+            test(r.equals("hello world"));
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opMyEnumI
+    {
+        public void response(MyEnum r, MyEnum e)
+        {
+            test(e == MyEnum.enum2);
+            test(r == MyEnum.enum3);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opMyClassI
+    {
+        opMyClassI(Ice.Communicator communicator)
+        {
+            _communicator = communicator;
+        }
+
+        public void response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2)
+        {
+            test(c1.ice_getIdentity().equals(Ice.Util.stringToIdentity("test")));
+            test(c2.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity")));
+            test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test")));
+            // We can't do the callbacks below in connection serialization mode.
+            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
+            {
+                r.opVoid();
+                c1.opVoid();
+                try
+                {
+                    c2.opVoid();
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException ex)
+                {
+                }
+            }
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+        private Ice.Communicator _communicator;
+    }
+
+    private static class opStructI
+    {
+        opStructI(Ice.Communicator communicator)
+        {
+            _communicator = communicator;
+        }
+
+        public void response(Structure rso, Structure so)
+        {
+            test(rso.p == null);
+            test(rso.e == MyEnum.enum2);
+            test(rso.s.s.equals("def"));
+            test(so.e == MyEnum.enum3);
+            test(so.s.s.equals("a new string"));
+            // We can't do the callbacks below in connection serialization mode.
+            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
+            {
+                so.p.opVoid();
+            }
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+        private Ice.Communicator _communicator;
+    }
+
+    private static class opByteSI
+    {
+        public void response(byte[] rso, byte[] bso)
+        {
+            test(bso.length == 4);
+            test(bso[0] == (byte)0x22);
+            test(bso[1] == (byte)0x12);
+            test(bso[2] == (byte)0x11);
+            test(bso[3] == (byte)0x01);
+            test(rso.length == 8);
+            test(rso[0] == (byte)0x01);
+            test(rso[1] == (byte)0x11);
+            test(rso[2] == (byte)0x12);
+            test(rso[3] == (byte)0x22);
+            test(rso[4] == (byte)0xf1);
+            test(rso[5] == (byte)0xf2);
+            test(rso[6] == (byte)0xf3);
+            test(rso[7] == (byte)0xf4);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opBoolSI
+    {
+        public void response(boolean[] rso, boolean[] bso)
+        {
+            test(bso.length == 4);
+            test(bso[0]);
+            test(bso[1]);
+            test(!bso[2]);
+            test(!bso[3]);
+            test(rso.length == 3);
+            test(!rso[0]);
+            test(rso[1]);
+            test(rso[2]);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opShortIntLongSI
+    {
+        public void response(long[] rso, short[] sso, int[] iso, long[] lso)
+        {
+            test(sso.length == 3);
+            test(sso[0] == 1);
+            test(sso[1] == 2);
+            test(sso[2] == 3);
+            test(iso.length == 4);
+            test(iso[0] == 8);
+            test(iso[1] == 7);
+            test(iso[2] == 6);
+            test(iso[3] == 5);
+            test(lso.length == 6);
+            test(lso[0] == 10);
+            test(lso[1] == 30);
+            test(lso[2] == 20);
+            test(lso[3] == 10);
+            test(lso[4] == 30);
+            test(lso[5] == 20);
+            test(rso.length == 3);
+            test(rso[0] == 10);
+            test(rso[1] == 30);
+            test(rso[2] == 20);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opFloatDoubleSI
+    {
+        public void response(double[] rso, float[] fso, double[] dso)
+        {
+            test(fso.length == 2);
+            test(fso[0] == 3.14f);
+            test(fso[1] == 1.11f);
+            test(dso.length == 3);
+            test(dso[0] == 1.3E10);
+            test(dso[1] == 1.2E10);
+            test(dso[2] == 1.1E10);
+            test(rso.length == 5);
+            test(rso[0] == 1.1E10);
+            test(rso[1] == 1.2E10);
+            test(rso[2] == 1.3E10);
+            test((float)rso[3] == 3.14f);
+            test((float)rso[4] == 1.11f);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opStringSI
+    {
+        public void response(String[] rso, String[] sso)
+        {
+            test(sso.length == 4);
+            test(sso[0].equals("abc"));
+            test(sso[1].equals("de"));
+            test(sso[2].equals("fghi"));
+            test(sso[3].equals("xyz"));
+            test(rso.length == 3);
+            test(rso[0].equals("fghi"));
+            test(rso[1].equals("de"));
+            test(rso[2].equals("abc"));
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opByteSSI
+    {
+        public void response(byte[][] rso, byte[][] bso)
+        {
+            test(bso.length == 2);
+            test(bso[0].length == 1);
+            test(bso[0][0] == (byte)0xff);
+            test(bso[1].length == 3);
+            test(bso[1][0] == (byte)0x01);
+            test(bso[1][1] == (byte)0x11);
+            test(bso[1][2] == (byte)0x12);
+            test(rso.length == 4);
+            test(rso[0].length == 3);
+            test(rso[0][0] == (byte)0x01);
+            test(rso[0][1] == (byte)0x11);
+            test(rso[0][2] == (byte)0x12);
+            test(rso[1].length == 1);
+            test(rso[1][0] == (byte)0xff);
+            test(rso[2].length == 1);
+            test(rso[2][0] == (byte)0x0e);
+            test(rso[3].length == 2);
+            test(rso[3][0] == (byte)0xf2);
+            test(rso[3][1] == (byte)0xf1);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opBoolSSI
+    {
+        public void response(boolean[][] rso, boolean[][] bso)
+        {
+            test(bso.length == 4);
+            test(bso[0].length == 1);
+            test(bso[0][0]);
+            test(bso[1].length == 1);
+            test(!bso[1][0]);
+            test(bso[2].length == 2);
+            test(bso[2][0]);
+            test(bso[2][1]);
+            test(bso[3].length == 3);
+            test(!bso[3][0]);
+            test(!bso[3][1]);
+            test(bso[3][2]);
+            test(rso.length == 3);
+            test(rso[0].length == 2);
+            test(rso[0][0]);
+            test(rso[0][1]);
+            test(rso[1].length == 1);
+            test(!rso[1][0]);
+            test(rso[2].length == 1);
+            test(rso[2][0]);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opShortIntLongSSI
+    {
+        public void response(long[][] rso, short[][] sso, int[][] iso, long[][] lso)
+        {
+            test(rso.length == 1);
+            test(rso[0].length == 2);
+            test(rso[0][0] == 496);
+            test(rso[0][1] == 1729);
+            test(sso.length == 3);
+            test(sso[0].length == 3);
+            test(sso[0][0] == 1);
+            test(sso[0][1] == 2);
+            test(sso[0][2] == 5);
+            test(sso[1].length == 1);
+            test(sso[1][0] == 13);
+            test(sso[2].length == 0);
+            test(iso.length == 2);
+            test(iso[0].length == 1);
+            test(iso[0][0] == 42);
+            test(iso[1].length == 2);
+            test(iso[1][0] == 24);
+            test(iso[1][1] == 98);
+            test(lso.length == 2);
+            test(lso[0].length == 2);
+            test(lso[0][0] == 496);
+            test(lso[0][1] == 1729);
+            test(lso[1].length == 2);
+            test(lso[1][0] == 496);
+            test(lso[1][1] == 1729);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opFloatDoubleSSI
+    {
+        public void response(double[][] rso, float[][] fso, double[][] dso)
+        {
+            test(fso.length == 3);
+            test(fso[0].length == 1);
+            test(fso[0][0] == 3.14f);
+            test(fso[1].length == 1);
+            test(fso[1][0] == 1.11f);
+            test(fso[2].length == 0);
+            test(dso.length == 1);
+            test(dso[0].length == 3);
+            test(dso[0][0] == 1.1E10);
+            test(dso[0][1] == 1.2E10);
+            test(dso[0][2] == 1.3E10);
+            test(rso.length == 2);
+            test(rso[0].length == 3);
+            test(rso[0][0] == 1.1E10);
+            test(rso[0][1] == 1.2E10);
+            test(rso[0][2] == 1.3E10);
+            test(rso[1].length == 3);
+            test(rso[1][0] == 1.1E10);
+            test(rso[1][1] == 1.2E10);
+            test(rso[1][2] == 1.3E10);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opStringSSI
+    {
+        public void response(String[][] rso, String[][] sso)
+        {
+            test(sso.length == 5);
+            test(sso[0].length == 1);
+            test(sso[0][0].equals("abc"));
+            test(sso[1].length == 2);
+            test(sso[1][0].equals("de"));
+            test(sso[1][1].equals("fghi"));
+            test(sso[2].length == 0);
+            test(sso[3].length == 0);
+            test(sso[4].length == 1);
+            test(sso[4][0].equals("xyz"));
+            test(rso.length == 3);
+            test(rso[0].length == 1);
+            test(rso[0][0].equals("xyz"));
+            test(rso[1].length == 0);
+            test(rso[2].length == 0);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opStringSSSI
+    {
+        public void response(String[][][] rsso, String[][][] ssso)
+        {
+            test(ssso.length == 5);
+            test(ssso[0].length == 2);
+            test(ssso[0][0].length == 2);
+            test(ssso[0][1].length == 1);
+            test(ssso[1].length == 1);
+            test(ssso[1][0].length == 1);
+            test(ssso[2].length == 2);
+            test(ssso[2][0].length == 2);
+            test(ssso[2][1].length == 1);
+            test(ssso[3].length == 1);
+            test(ssso[3][0].length == 1);
+            test(ssso[4].length == 0);
+            test(ssso[0][0][0].equals("abc"));
+            test(ssso[0][0][1].equals("de"));
+            test(ssso[0][1][0].equals("xyz"));
+            test(ssso[1][0][0].equals("hello"));
+            test(ssso[2][0][0].equals(""));
+            test(ssso[2][0][1].equals(""));
+            test(ssso[2][1][0].equals("abcd"));
+            test(ssso[3][0][0].equals(""));
+
+            test(rsso.length == 3);
+            test(rsso[0].length == 0);
+            test(rsso[1].length == 1);
+            test(rsso[1][0].length == 1);
+            test(rsso[2].length == 2);
+            test(rsso[2][0].length == 2);
+            test(rsso[2][1].length == 1);
+            test(rsso[1][0][0].equals(""));
+            test(rsso[2][0][0].equals(""));
+            test(rsso[2][0][1].equals(""));
+            test(rsso[2][1][0].equals("abcd"));
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opByteBoolDI
+    {
+        public void response(java.util.Map<Byte, Boolean> ro, java.util.Map<Byte, Boolean> _do)
+        {
+            java.util.Map<Byte, Boolean> di1 = new java.util.HashMap<Byte, Boolean>();
+            di1.put((byte)10, Boolean.TRUE);
+            di1.put((byte)100, Boolean.FALSE);
+            test(_do.equals(di1));
+            test(ro.size() == 4);
+            test(ro.get((byte)10).booleanValue() == true);
+            test(ro.get((byte)11).booleanValue() == false);
+            test(ro.get((byte)100).booleanValue() == false);
+            test(ro.get((byte)101).booleanValue() == true);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opShortIntDI
+    {
+        public void response(java.util.Map<Short, Integer> ro, java.util.Map<Short, Integer> _do)
+        {
+            java.util.Map<Short, Integer> di1 = new java.util.HashMap<Short, Integer>();
+            di1.put((short)110, -1);
+            di1.put((short)1100, 123123);
+            test(_do.equals(di1));
+            test(ro.size() == 4);
+            test(ro.get((short)110).intValue() == -1);
+            test(ro.get((short)111).intValue() == -100);
+            test(ro.get((short)1100).intValue() == 123123);
+            test(ro.get((short)1101).intValue() == 0);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opLongFloatDI
+    {
+        public void response(java.util.Map<Long, Float> ro, java.util.Map<Long, Float> _do)
+        {
+            java.util.Map<Long, Float> di1 = new java.util.HashMap<Long, Float>();
+            di1.put(999999110L, Float.valueOf((float)-1.1f));
+            di1.put(999999111L, Float.valueOf((float)123123.2f));
+            test(_do.equals(di1));
+            test(ro.size() == 4);
+            test(ro.get(999999110L).floatValue() == -1.1f);
+            test(ro.get(999999120L).floatValue() == -100.4f);
+            test(ro.get(999999111L).floatValue() == 123123.2f);
+            test(ro.get(999999130L).floatValue() == 0.5f);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opStringStringDI
+    {
+        public void response(java.util.Map<String, String> ro, java.util.Map<String, String> _do)
+        {
+            java.util.Map<String, String> di1 = new java.util.HashMap<String, String>();
+            di1.put("foo", "abc -1.1");
+            di1.put("bar", "abc 123123.2");
+            test(_do.equals(di1));
+            test(ro.size() == 4);
+            test(ro.get("foo").equals("abc -1.1"));
+            test(ro.get("FOO").equals("abc -100.4"));
+            test(ro.get("bar").equals("abc 123123.2"));
+            test(ro.get("BAR").equals("abc 0.5"));
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opStringMyEnumDI
+    {
+        public void response(java.util.Map<String, MyEnum> ro, java.util.Map<String, MyEnum> _do)
+        {
+            java.util.Map<String, MyEnum> di1 = new java.util.HashMap<String, MyEnum>();
+            di1.put("abc", MyEnum.enum1);
+            di1.put("", MyEnum.enum2);
+            test(_do.equals(di1));
+            test(ro.size() == 4);
+            test(ro.get("abc") == MyEnum.enum1);
+            test(ro.get("qwerty") == MyEnum.enum3);
+            test(ro.get("") == MyEnum.enum2);
+            test(ro.get("Hello!!") == MyEnum.enum2);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opMyEnumStringDI
+    {
+        public void response(java.util.Map<MyEnum, String> ro, java.util.Map<MyEnum, String> _do)
+        {
+            java.util.Map<MyEnum, String> di1 = new java.util.HashMap<MyEnum, String>();
+            di1.put(MyEnum.enum1, "abc");
+            test(_do.equals(di1));
+            test(ro.size() == 3);
+            test(ro.get(MyEnum.enum1).equals("abc"));
+            test(ro.get(MyEnum.enum2).equals("Hello!!"));
+            test(ro.get(MyEnum.enum3).equals("qwerty"));
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opMyStructMyEnumDI
+    {
+        public void response(java.util.Map<MyStruct, MyEnum> ro, java.util.Map<MyStruct, MyEnum> _do)
+        {
+            MyStruct s11 = new MyStruct(1, 1);
+            MyStruct s12 = new MyStruct(1, 2);
+            java.util.Map<MyStruct, MyEnum> di1 = new java.util.HashMap<MyStruct, MyEnum>();
+            di1.put(s11, MyEnum.enum1);
+            di1.put(s12, MyEnum.enum2);
+            test(_do.equals(di1));
+            MyStruct s22 = new MyStruct(2, 2);
+            MyStruct s23 = new MyStruct(2, 3);
+            test(ro.size() == 4);
+            test(ro.get(s11) == MyEnum.enum1);
+            test(ro.get(s12) == MyEnum.enum2);
+            test(ro.get(s22) == MyEnum.enum3);
+            test(ro.get(s23) == MyEnum.enum2);
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opIntSI
+    {
+        opIntSI(int l)
+        {
+            _l = l;
+        }
+
+        public void response(int[] r)
+        {
+            test(r.length == _l);
+            for(int j = 0; j < r.length; ++j)
+            {
+                test(r[j] == -j);
+            }
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private int _l;
+        private Callback callback = new Callback();
+    }
+
+    private static class opDerivedI
+    {
+        public void response()
+        {
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opDoubleMarshalingI
+    {
+        public void response()
+        {
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opIdempotentI
+    {
+        public void response()
+        {
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    private static class opNonmutatingI
+    {
+        public void response()
+        {
+            callback.called();
+        }
+
+        public void check()
+        {
+            callback.check();
+        }
+
+        private Callback callback = new Callback();
+    }
+
+    public static void
+    twowaysLambdaAMI(test.TestHelper helper, MyClassPrx p)
+    {
+        Ice.Communicator communicator = helper.communicator();
+
+        {
+            pingI cb = new pingI();
+            p.begin_ice_ping(() -> cb.response(), (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            isAI cb = new isAI();
+            p.begin_ice_isA(_MyClassDisp.ice_staticId(), (boolean r) -> cb.response(r), (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            idI cb = new idI();
+            p.begin_ice_id((String id) -> cb.response(id), (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            idsI cb = new idsI();
+            p.begin_ice_ids((String[] ids) -> cb.response(ids), (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opVoidI cb = new opVoidI();
+            p.begin_opVoid(() -> cb.response(), (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opByteI cb = new opByteI();
+            p.begin_opByte((byte)0xff, (byte)0x0f,
+                (byte p1, byte p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opBoolI cb = new opBoolI();
+            p.begin_opBool(true, false,
+                (boolean p1, boolean p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opShortIntLongI cb = new opShortIntLongI();
+            p.begin_opShortIntLong((short)10, 11, 12L,
+                (long p1, short p2, int p3, long p4) -> cb.response(p1, p2, p3, p4),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opFloatDoubleI cb = new opFloatDoubleI();
+            p.begin_opFloatDouble(3.14f, 1.1E10,
+                (double p1, float p2, double p3) -> cb.response(p1, p2, p3),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opStringI cb = new opStringI();
+            p.begin_opString("hello", "world",
+                (String p1, String p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opMyEnumI cb = new opMyEnumI();
+            p.begin_opMyEnum(MyEnum.enum2,
+                (MyEnum p1, MyEnum p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opMyClassI cb = new opMyClassI(communicator);
+            p.begin_opMyClass(p,
+                (MyClassPrx p1, MyClassPrx p2, MyClassPrx p3) -> cb.response(p1, p2, p3),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            Structure si1 = new Structure();
+            si1.p = p;
+            si1.e = MyEnum.enum3;
+            si1.s = new AnotherStruct();
+            si1.s.s = "abc";
+            Structure si2 = new Structure();
+            si2.p = null;
+            si2.e = MyEnum.enum2;
+            si2.s = new AnotherStruct();
+            si2.s.s = "def";
+
+            opStructI cb = new opStructI(communicator);
+            p.begin_opStruct(si1, si2,
+                (Structure p1, Structure p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final byte[] bsi1 =
+                {
+                    (byte)0x01,
+                    (byte)0x11,
+                    (byte)0x12,
+                    (byte)0x22
+                };
+            final byte[] bsi2 =
+                {
+                    (byte)0xf1,
+                    (byte)0xf2,
+                    (byte)0xf3,
+                    (byte)0xf4
+                };
+
+            opByteSI cb = new opByteSI();
+            p.begin_opByteS(bsi1, bsi2,
+                (byte[] p1, byte[] p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final boolean[] bsi1 = { true, true, false };
+            final boolean[] bsi2 = { false };
+
+            opBoolSI cb = new opBoolSI();
+            p.begin_opBoolS(bsi1, bsi2,
+                (boolean[] p1, boolean[] p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final short[] ssi = { 1, 2, 3 };
+            final int[] isi = { 5, 6, 7, 8 };
+            final long[] lsi = { 10, 30, 20 };
+
+            opShortIntLongSI cb = new opShortIntLongSI();
+            p.begin_opShortIntLongS(ssi, isi, lsi,
+                (long[] p1, short[] p2, int[] p3, long[] p4) -> cb.response(p1, p2, p3, p4),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final float[] fsi = { 3.14f, 1.11f };
+            final double[] dsi = { 1.1E10, 1.2E10, 1.3E10 };
+
+            opFloatDoubleSI cb = new opFloatDoubleSI();
+            p.begin_opFloatDoubleS(fsi, dsi,
+                (double[] p1, float[] p2, double[] p3) -> cb.response(p1, p2, p3),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final String[] ssi1 = { "abc", "de", "fghi" };
+            final String[] ssi2 = { "xyz" };
+
+            opStringSI cb = new opStringSI();
+            p.begin_opStringS(ssi1, ssi2,
+                (String[] p1, String[] p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final byte[][] bsi1 =
+                {
+                    { (byte)0x01, (byte)0x11, (byte)0x12 },
+                    { (byte)0xff }
+                };
+            final byte[][] bsi2 =
+                {
+                    { (byte)0x0e },
+                    { (byte)0xf2, (byte)0xf1 }
+                };
+
+            opByteSSI cb = new opByteSSI();
+            p.begin_opByteSS(bsi1, bsi2,
+                (byte[][] p1, byte[][] p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final boolean[][] bsi1 =
+                {
+                    { true },
+                    { false },
+                    { true, true}
+                };
+
+            final boolean[][] bsi2 =
+                {
+                    { false, false, true }
+                };
+
+            opBoolSSI cb = new opBoolSSI();
+            p.begin_opBoolSS(bsi1, bsi2,
+                    (boolean[][] rso, boolean[][] bso) -> cb.response(rso, bso),
+                    (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final short[][] ssi=
+                {
+                    {1, 2, 5},
+                    {13},
+                    {}
+                };
+            final int[][] isi =
+                {
+                    {24, 98},
+                    {42}
+                };
+            final long[][] lsi =
+                {
+                    {496, 1729},
+                };
+
+            opShortIntLongSSI cb = new opShortIntLongSSI();
+            p.begin_opShortIntLongSS(ssi, isi, lsi,
+                    (long[][] rso, short[][] sso, int[][] iso, long[][] lso) -> cb.response(rso, sso, iso, lso),
+                    (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+        {
+            final float[][] fsi =
+                {
+                    { 3.14f },
+                    { 1.11f },
+                    { },
+                };
+            final double[][] dsi =
+                {
+                    { 1.1E10, 1.2E10, 1.3E10 }
+                };
+
+            opFloatDoubleSSI cb = new opFloatDoubleSSI();
+            p.begin_opFloatDoubleSS(fsi, dsi,
+                (double[][] p1, float[][] p2, double[][] p3) -> cb.response(p1, p2, p3),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final String[][] ssi1 =
+                {
+                    { "abc" },
+                    { "de", "fghi" }
+                };
+            final String[][] ssi2 =
+                {
+                    { },
+                    { },
+                    { "xyz" }
+                };
+
+            opStringSSI cb = new opStringSSI();
+            p.begin_opStringSS(ssi1, ssi2,
+                (String[][] p1, String[][] p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            final String[][][] sssi1 =
+            {
+                {
+                    {
+                        "abc", "de"
+                    },
+                    {
+                        "xyz"
+                    }
+                },
+                {
+                    {
+                        "hello"
+                    }
+                }
+            };
+
+            final String[][][] sssi2 =
+            {
+                {
+                    {
+                        "", ""
+                    },
+                    {
+                        "abcd"
+                    }
+                },
+                {
+                    {
+                        ""
+                    }
+                },
+                {
+                }
+            };
+
+            opStringSSSI cb = new opStringSSSI();
+            p.begin_opStringSSS(sssi1, sssi2,
+                (String[][][] p1, String[][][] p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            java.util.Map<Byte, Boolean> di1 = new java.util.HashMap<Byte, Boolean>();
+            di1.put((byte)10, Boolean.TRUE);
+            di1.put((byte)100, Boolean.FALSE);
+            java.util.Map<Byte, Boolean> di2 = new java.util.HashMap<Byte, Boolean>();
+            di2.put((byte)10, Boolean.TRUE);
+            di2.put((byte)11, Boolean.FALSE);
+            di2.put((byte)101, Boolean.TRUE);
+
+            opByteBoolDI cb = new opByteBoolDI();
+            p.begin_opByteBoolD(di1, di2,
+                (Map<Byte, Boolean> p1, Map<Byte, Boolean> p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            java.util.Map<Short, Integer> di1 = new java.util.HashMap<Short, Integer>();
+            di1.put((short)110, -1);
+            di1.put((short)1100, 123123);
+            java.util.Map<Short, Integer> di2 = new java.util.HashMap<Short, Integer>();
+            di2.put((short)110, -1);
+            di2.put((short)111, -100);
+            di2.put((short)1101, 0);
+
+            opShortIntDI cb = new opShortIntDI();
+            p.begin_opShortIntD(di1, di2,
+                (Map<Short, Integer> p1, Map<Short, Integer> p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            java.util.Map<Long, Float> di1 = new java.util.HashMap<Long, Float>();
+            di1.put(999999110L, Float.valueOf((float)-1.1f));
+            di1.put(999999111L, Float.valueOf((float)123123.2f));
+            java.util.Map<Long, Float> di2 = new java.util.HashMap<Long, Float>();
+            di2.put(999999110L, Float.valueOf((float)-1.1f));
+            di2.put(999999120L, Float.valueOf((float)-100.4f));
+            di2.put(999999130L, Float.valueOf((float)0.5f));
+
+            opLongFloatDI cb = new opLongFloatDI();
+            p.begin_opLongFloatD(di1, di2,
+                (Map<Long, Float> p1, Map<Long, Float> p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            java.util.Map<String, String> di1 = new java.util.HashMap<String, String>();
+            di1.put("foo", "abc -1.1");
+            di1.put("bar", "abc 123123.2");
+            java.util.Map<String, String> di2 = new java.util.HashMap<String, String>();
+            di2.put("foo", "abc -1.1");
+            di2.put("FOO", "abc -100.4");
+            di2.put("BAR", "abc 0.5");
+
+            opStringStringDI cb = new opStringStringDI();
+            p.begin_opStringStringD(di1, di2,
+                (Map<String, String> p1, Map<String, String> p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            java.util.Map<String, MyEnum> di1 = new java.util.HashMap<String, MyEnum>();
+            di1.put("abc", MyEnum.enum1);
+            di1.put("", MyEnum.enum2);
+            java.util.Map<String, MyEnum> di2 = new java.util.HashMap<String, MyEnum>();
+            di2.put("abc", MyEnum.enum1);
+            di2.put("qwerty", MyEnum.enum3);
+            di2.put("Hello!!", MyEnum.enum2);
+
+            opStringMyEnumDI cb = new opStringMyEnumDI();
+            p.begin_opStringMyEnumD(di1, di2,
+                (Map<String, MyEnum> p1, Map<String, MyEnum> p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            java.util.Map<MyEnum, String> di1 = new java.util.HashMap<MyEnum, String>();
+            di1.put(MyEnum.enum1, "abc");
+            java.util.Map<MyEnum, String> di2 = new java.util.HashMap<MyEnum, String>();
+            di2.put(MyEnum.enum2, "Hello!!");
+            di2.put(MyEnum.enum3, "qwerty");
+
+            opMyEnumStringDI cb = new opMyEnumStringDI();
+            p.begin_opMyEnumStringD(di1, di2,
+                (Map<MyEnum, String> p1, Map<MyEnum, String> p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            MyStruct s11 = new MyStruct(1, 1);
+            MyStruct s12 = new MyStruct(1, 2);
+            java.util.Map<MyStruct, MyEnum> di1 = new java.util.HashMap<MyStruct, MyEnum>();
+            di1.put(s11, MyEnum.enum1);
+            di1.put(s12, MyEnum.enum2);
+            MyStruct s22 = new MyStruct(2, 2);
+            MyStruct s23 = new MyStruct(2, 3);
+            java.util.Map<MyStruct, MyEnum> di2 = new java.util.HashMap<MyStruct, MyEnum>();
+            di2.put(s11, MyEnum.enum1);
+            di2.put(s22, MyEnum.enum3);
+            di2.put(s23, MyEnum.enum2);
+
+            opMyStructMyEnumDI cb = new opMyStructMyEnumDI();
+            p.begin_opMyStructMyEnumD(di1, di2,
+                (Map<MyStruct, MyEnum> p1, Map<MyStruct, MyEnum> p2) -> cb.response(p1, p2),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            int[] lengths = { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
+
+            for(int l : lengths)
+            {
+                int[] s = new int[l];
+                for(int i = 0; i < s.length; ++i)
+                {
+                    s[i] = i;
+                }
+                opIntSI cb = new opIntSI(l);
+                p.begin_opIntS(s,
+                    (int[] p1) -> cb.response(p1),
+                    (Ice.Exception ex) -> test(false));
+                cb.check();
+            }
+        }
+
+        {
+            double d = 1278312346.0 / 13.0;
+            double[] ds = new double[5];
+            for(int i = 0; i < 5; i++)
+            {
+                ds[i] = d;
+            }
+            opDoubleMarshalingI cb = new opDoubleMarshalingI();
+            p.begin_opDoubleMarshaling(d, ds,
+                () -> cb.response(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opIdempotentI cb = new opIdempotentI();
+            p.begin_opIdempotent(
+                () -> cb.response(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            opNonmutatingI cb = new opNonmutatingI();
+            p.begin_opNonmutating(
+                () -> cb.response(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+
+        {
+            MyDerivedClassPrx derived = MyDerivedClassPrxHelper.checkedCast(p);
+            test(derived != null);
+            opDerivedI cb = new opDerivedI();
+            derived.begin_opDerived(
+                () -> cb.response(),
+                (Ice.Exception ex) -> test(false));
+            cb.check();
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/optional/lambda/AllTests.java zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/optional/lambda/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/lambda/src/main/java/Ice/optional/lambda/AllTests.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/lambda/src/main/java/Ice/optional/lambda/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,786 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.optional.lambda;
+import java.io.PrintWriter;
+
+import test.Ice.optional.Test.*;
+import test.Ice.optional.SerializableClass;
+
+public class AllTests
+{
+    private static void
+    test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    private static class CallbackBase
+    {
+        CallbackBase()
+        {
+            _called = false;
+        }
+
+        public synchronized void check()
+        {
+            while(!_called)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+
+            _called = false;
+            test(_value);
+            _value = false;
+        }
+
+        public synchronized void called(boolean value)
+        {
+            assert(!_called);
+            _value = value;
+            _called = true;
+            notify();
+        }
+
+        private boolean _value;
+        private boolean _called;
+    }
+
+    public static InitialPrx
+    allTests(test.TestHelper helper)
+    {
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+
+        String ref = "initial:" + helper.getTestEndpoint(0);
+        Ice.ObjectPrx base = communicator.stringToProxy(ref);
+
+        InitialPrx initial = InitialPrxHelper.uncheckedCast(base);
+
+        out.print("testing optional parameters with async lambda callbacks... ");
+        out.flush();
+        final boolean reqParams = initial.supportsRequiredParams();
+
+        final boolean supportsJavaSerializable = initial.supportsJavaSerializable();
+
+        {
+            Ice.ByteOptional p1 = new Ice.ByteOptional((byte)56);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opByte(p1.get(),
+                    (Ice.ByteOptional ret, Ice.ByteOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opByte(p1,
+                    (Ice.ByteOptional ret, Ice.ByteOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.BooleanOptional p1 = new Ice.BooleanOptional(true);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opBool(p1.get(),
+                    (Ice.BooleanOptional ret, Ice.BooleanOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opBool(p1,
+                    (Ice.BooleanOptional ret, Ice.BooleanOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.ShortOptional p1 = new Ice.ShortOptional((short)56);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opShort(p1.get(),
+                    (Ice.ShortOptional ret, Ice.ShortOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opShort(p1,
+                    (Ice.ShortOptional ret, Ice.ShortOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.IntOptional p1 = new Ice.IntOptional(56);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opInt(p1.get(),
+                    (Ice.IntOptional ret, Ice.IntOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opInt(p1,
+                    (Ice.IntOptional ret, Ice.IntOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.LongOptional p1 = new Ice.LongOptional(56);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opLong(p1.get(),
+                    (Ice.LongOptional ret, Ice.LongOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opLong(p1,
+                    (Ice.LongOptional ret, Ice.LongOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.FloatOptional p1 = new Ice.FloatOptional(1.0f);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFloat(p1.get(),
+                    (Ice.FloatOptional ret, Ice.FloatOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFloat(p1,
+                    (Ice.FloatOptional ret, Ice.FloatOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.DoubleOptional p1 = new Ice.DoubleOptional(1.0);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opDouble(p1.get(),
+                    (Ice.DoubleOptional ret, Ice.DoubleOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opDouble(p1,
+                    (Ice.DoubleOptional ret, Ice.DoubleOptional p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<String> p1 = new Ice.Optional<String>("test");
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opString(p1.get(),
+                    (Ice.Optional<String> ret, Ice.Optional<String> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opString(p1,
+                    (Ice.Optional<String> ret, Ice.Optional<String> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<MyEnum> p1 = new Ice.Optional<MyEnum>(MyEnum.MyEnumMember);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opMyEnum(p1.get(),
+                    (Ice.Optional<MyEnum> ret, Ice.Optional<MyEnum> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opMyEnum(p1,
+                    (Ice.Optional<MyEnum> ret, Ice.Optional<MyEnum> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<SmallStruct> p1 = new Ice.Optional<SmallStruct>(new SmallStruct((byte)56));
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opSmallStruct(p1.get(),
+                    (Ice.Optional<SmallStruct> ret, Ice.Optional<SmallStruct> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opSmallStruct(p1,
+                    (Ice.Optional<SmallStruct> ret, Ice.Optional<SmallStruct> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<FixedStruct> p1 = new Ice.Optional<FixedStruct>(new FixedStruct((byte)56));
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFixedStruct(p1.get(),
+                    (Ice.Optional<FixedStruct> ret, Ice.Optional<FixedStruct> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFixedStruct(p1,
+                    (Ice.Optional<FixedStruct> ret, Ice.Optional<FixedStruct> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<VarStruct> p1 = new Ice.Optional<VarStruct>(new VarStruct("test"));
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opVarStruct(p1.get(),
+                    (Ice.Optional<VarStruct> ret, Ice.Optional<VarStruct> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opVarStruct(p1,
+                    (Ice.Optional<VarStruct> ret, Ice.Optional<VarStruct> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<OneOptional> p1 = new Ice.Optional<OneOptional>(new OneOptional(58));
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opOneOptional(p1.get(),
+                    (Ice.Optional<OneOptional> ret, Ice.Optional<OneOptional> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().getA() == p2.get().getA() &&
+                                ret.get().getA() == p1.get().getA()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opOneOptional(p1,
+                    (Ice.Optional<OneOptional> ret, Ice.Optional<OneOptional> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().getA() == p2.get().getA() &&
+                                ret.get().getA() == p1.get().getA()),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<OneOptionalPrx> p1 = new Ice.Optional<OneOptionalPrx>(
+                OneOptionalPrxHelper.uncheckedCast(communicator.stringToProxy("test")));
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opOneOptionalProxy(p1.get(),
+                    (Ice.Optional<OneOptionalPrx> ret, Ice.Optional<OneOptionalPrx> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opOneOptionalProxy(p1,
+                    (Ice.Optional<OneOptionalPrx> ret, Ice.Optional<OneOptionalPrx> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<byte[]> p1 = new Ice.Optional<byte[]>(new byte[100]);
+            java.util.Arrays.fill(p1.get(), (byte)56);
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opByteSeq(p1.get(),
+                    (Ice.Optional<byte[]> ret, Ice.Optional<byte[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                                java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opByteSeq(p1,
+                    (Ice.Optional<byte[]> ret, Ice.Optional<byte[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                                java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<boolean[]> p1 = new Ice.Optional<boolean[]>(new boolean[100]);
+            java.util.Arrays.fill(p1.get(), true);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opBoolSeq(p1.get(),
+                    (Ice.Optional<boolean[]> ret, Ice.Optional<boolean[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                                java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opBoolSeq(p1,
+                    (Ice.Optional<boolean[]> ret, Ice.Optional<boolean[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                                java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<short[]> p1 = new Ice.Optional<short[]>(new short[100]);
+            java.util.Arrays.fill(p1.get(), (short)56);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opShortSeq(p1.get(),
+                    (Ice.Optional<short[]> ret, Ice.Optional<short[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                                java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opShortSeq(p1,
+                    (Ice.Optional<short[]> ret, Ice.Optional<short[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                                java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<int[]> p1 = new Ice.Optional<int[]>(new int[100]);
+            java.util.Arrays.fill(p1.get(), 56);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opIntSeq(p1.get(),
+                    (Ice.Optional<int[]> ret, Ice.Optional<int[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                                java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opIntSeq(p1,
+                    (Ice.Optional<int[]> ret, Ice.Optional<int[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<long[]> p1 = new Ice.Optional<long[]>(new long[100]);
+            java.util.Arrays.fill(p1.get(), 56);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opLongSeq(p1.get(),
+                    (Ice.Optional<long[]> ret, Ice.Optional<long[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opLongSeq(p1,
+                    (Ice.Optional<long[]> ret, Ice.Optional<long[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<float[]> p1 = new Ice.Optional<float[]>(new float[100]);
+            java.util.Arrays.fill(p1.get(), 1.0f);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFloatSeq(p1.get(),
+                    (Ice.Optional<float[]> ret, Ice.Optional<float[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                CallbackBase cb = new CallbackBase();
+                initial.begin_opFloatSeq(p1,
+                    (Ice.Optional<float[]> ret, Ice.Optional<float[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<double[]> p1 = new Ice.Optional<double[]>(new double[100]);
+            java.util.Arrays.fill(p1.get(), 1.0);
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opDoubleSeq(p1.get(),
+                    (Ice.Optional<double[]> ret, Ice.Optional<double[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                CallbackBase cb = new CallbackBase();
+                initial.begin_opDoubleSeq(p1,
+                    (Ice.Optional<double[]> ret, Ice.Optional<double[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<String[]> p1 = new Ice.Optional<String[]>(new String[10]);
+            java.util.Arrays.fill(p1.get(), "test");
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opStringSeq(p1.get(),
+                    (Ice.Optional<String[]> ret, Ice.Optional<String[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opStringSeq(p1,
+                    (Ice.Optional<String[]> ret, Ice.Optional<String[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<SmallStruct[]> p1 = new Ice.Optional<SmallStruct[]>();
+            p1.set(new SmallStruct[10]);
+            for(int i = 0; i < p1.get().length; ++i)
+            {
+                p1.get()[i] = new SmallStruct();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opSmallStructSeq(p1.get(),
+                    (Ice.Optional<SmallStruct[]> ret, Ice.Optional<SmallStruct[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opSmallStructSeq(p1,
+                    (Ice.Optional<SmallStruct[]> ret, Ice.Optional<SmallStruct[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<java.util.List<SmallStruct>> p1 = new Ice.Optional<java.util.List<SmallStruct>>();
+            p1.set(new java.util.ArrayList<SmallStruct>());
+            for(int i = 0; i < 10; ++i)
+            {
+                p1.get().add(new SmallStruct());
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opSmallStructList(p1.get(),
+                    (Ice.Optional<java.util.List<SmallStruct>> ret, Ice.Optional<java.util.List<SmallStruct>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                CallbackBase cb = new CallbackBase();
+                initial.begin_opSmallStructList(p1,
+                    (Ice.Optional<java.util.List<SmallStruct>> ret, Ice.Optional<java.util.List<SmallStruct>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<FixedStruct[]> p1 = new Ice.Optional<FixedStruct[]>();
+            p1.set(new FixedStruct[10]);
+            for(int i = 0; i < p1.get().length; ++i)
+            {
+                p1.get()[i] = new FixedStruct();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFixedStructSeq(p1.get(),
+                    (Ice.Optional<FixedStruct[]> ret, Ice.Optional<FixedStruct[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFixedStructSeq(p1,
+                    (Ice.Optional<FixedStruct[]> ret, Ice.Optional<FixedStruct[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<java.util.List<FixedStruct>> p1 = new Ice.Optional<java.util.List<FixedStruct>>();
+            p1.set(new java.util.ArrayList<FixedStruct>());
+            for(int i = 0; i < 10; ++i)
+            {
+                p1.get().add(new FixedStruct());
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFixedStructList(p1.get(),
+                    (Ice.Optional<java.util.List<FixedStruct>> ret, Ice.Optional<java.util.List<FixedStruct>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opFixedStructList(p1,
+                    (Ice.Optional<java.util.List<FixedStruct>> ret, Ice.Optional<java.util.List<FixedStruct>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<VarStruct[]> p1 = new Ice.Optional<VarStruct[]>();
+            p1.set(new VarStruct[10]);
+            for(int i = 0; i < p1.get().length; ++i)
+            {
+                p1.get()[i] = new VarStruct("");
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opVarStructSeq(p1.get(),
+                    (Ice.Optional<VarStruct[]> ret, Ice.Optional<VarStruct[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opVarStructSeq(p1,
+                    (Ice.Optional<VarStruct[]> ret, Ice.Optional<VarStruct[]> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
+                            java.util.Arrays.equals(ret.get(), p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        if(supportsJavaSerializable)
+        {
+            Ice.Optional<SerializableClass> p1 = new Ice.Optional<SerializableClass>(new SerializableClass(58));
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opSerializable(p1.get(),
+                    (Ice.Optional<SerializableClass> ret, Ice.Optional<SerializableClass> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opSerializable(p1,
+                    (Ice.Optional<SerializableClass> ret, Ice.Optional<SerializableClass> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<java.util.Map<Integer, Integer>> p1 = new Ice.Optional<java.util.Map<Integer, Integer>>();
+            p1.set(new java.util.HashMap<Integer, Integer>());
+            p1.get().put(1, 2);
+            p1.get().put(2, 3);
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opIntIntDict(p1.get(),
+                    (Ice.Optional<java.util.Map<Integer, Integer>> ret,
+                    Ice.Optional<java.util.Map<Integer, Integer>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opIntIntDict(p1,
+                    (Ice.Optional<java.util.Map<Integer, Integer>> ret,
+                    Ice.Optional<java.util.Map<Integer, Integer>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        {
+            Ice.Optional<java.util.Map<String, Integer>> p1 = new Ice.Optional<java.util.Map<String, Integer>>();
+            p1.set(new java.util.HashMap<String, Integer>());
+            p1.get().put("1", 1);
+            p1.get().put("2", 2);
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opStringIntDict(p1.get(),
+                    (Ice.Optional<java.util.Map<String, Integer>> ret,
+                    Ice.Optional<java.util.Map<String, Integer>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+
+            {
+                final CallbackBase cb = new CallbackBase();
+                initial.begin_opStringIntDict(p1,
+                    (Ice.Optional<java.util.Map<String, Integer>> ret,
+                    Ice.Optional<java.util.Map<String, Integer>> p2) ->
+                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
+                    (Ice.Exception ex) -> cb.called(false));
+                cb.check();
+            }
+        }
+
+        out.println("ok");
+
+        return initial;
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/build.gradle zeroc-ice-3.7.2/java-compat/test/plugins/build.gradle
--- zeroc-ice-3.7.1/java-compat/test/plugins/build.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/build.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 sourceSets {
     main {
@@ -16,7 +11,7 @@
 }
 
 dependencies {
-    compile localDependency('ice-compat')
+    implementation localDependency('ice-compat')
 }
 
 jar {
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePluginFail.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/BasePlugin.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginOneFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java
--- zeroc-ice-3.7.1/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/plugins/src/main/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin.plugins;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/slice.gradle zeroc-ice-3.7.2/java-compat/test/slice.gradle
--- zeroc-ice-3.7.1/java-compat/test/slice.gradle	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/slice.gradle	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 task testSliceTask {
     slice {
@@ -52,6 +47,7 @@
                                                          'Ice/optional/*.ice',
                                                          'Ice/stream/*.ice',
                                                          'Ice/enums/*.ice',
+                                                         'Ice/scope/*.ice',
                                                          'Glacier2/application/*.ice',
                                                          'Glacier2/router/*.ice',
                                                          'Glacier2/sessionHelper/*.ice',
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/CallbackI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/CallbackI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/CallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/CallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.application;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.application;
 
@@ -16,21 +11,13 @@
 import test.Glacier2.application.Test.CallbackReceiverPrxHelper;
 import test.Glacier2.application.Test._CallbackReceiverDisp;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    Client()
+    public Client()
     {
         out = getWriter();
     }
 
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     class CallbackReceiverI extends test.Glacier2.application.Test._CallbackReceiverDisp
     {
         public synchronized void
@@ -137,63 +124,55 @@
         private CallbackReceiverI _receiver;
     }
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        _initData = super.getInitData(argsH);
-        _initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return _initData;
-    }
-
-    public int run(String[] args)
+    public void run(String[] args)
     {
         Application app = new Application();
 
-        _initData.properties.setProperty("Ice.Default.Router",
-                                         "Glacier2/router:" + getTestEndpoint(_initData.properties, 50));
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Warn.Connections", "0");
 
-        int status = app.main("Client", args, _initData);
-
-        out.print("testing stringToProxy for process object... ");
-        out.flush();
-        Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:" +
-                                                               getTestEndpoint(communicator().getProperties(), 51));
-        out.println("ok");
-
-        out.print("testing checked cast for admin object... ");
-        out.flush();
-        Ice.ProcessPrx process = Ice.ProcessPrxHelper.checkedCast(processBase);
-        test(process != null);
-        out.println("ok");
-
-        out.print("testing Glacier2 shutdown... ");
-        out.flush();
-        process.shutdown();
-        try
-        {
-            process.ice_ping();
-            test(false);
-        }
-        catch(Ice.LocalException ex)
+        try(Ice.Communicator communicator = initialize(args))
         {
+            properties.setProperty("Ice.Default.Router", "Glacier2/router:" + getTestEndpoint(50));
+
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = properties._clone();
+
+            int status = app.main("Client", args, initData);
+            if(status != 0)
+            {
+                test(false);
+            }
+
+            out.print("testing stringToProxy for process object... ");
+            out.flush();
+            Ice.ObjectPrx processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
             out.println("ok");
-        }
 
-        test(app._restart == 5);
-        test(app._destroyed);
+            out.print("testing checked cast for admin object... ");
+            out.flush();
+            Ice.ProcessPrx process = Ice.ProcessPrxHelper.checkedCast(processBase);
+            test(process != null);
+            out.println("ok");
 
-        return status;
-    }
+            out.print("testing Glacier2 shutdown... ");
+            out.flush();
+            process.shutdown();
 
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
+            try
+            {
+                process.ice_ping();
+                test(false);
+            }
+            catch(Ice.LocalException ex)
+            {
+                out.println("ok");
+            }
 
-        System.gc();
-        System.exit(status);
+            test(app._restart == 5);
+            test(app._destroyed);
+        }
     }
 
     final public PrintWriter out;
-    private Ice.InitializationData _initData;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/application/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/application/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.application;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int
-    run(String[] args)
-    {
-        communicator().getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
-        communicator().createObjectAdapter("DeactivatedAdapter");
-
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
-
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+            communicator.createObjectAdapter("DeactivatedAdapter");
+
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/CallbackI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/CallbackI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/CallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/CallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
@@ -17,482 +12,461 @@
 import test.Glacier2.router.Test.CallbackReceiverPrx;
 import test.Glacier2.router.Test.CallbackReceiverPrxHelper;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectPrx routerBase;
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
 
-        PrintWriter out = getWriter();
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            out.print("testing stringToProxy for router... ");
-            out.flush();
-            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(50));
-            out.println("ok");
-        }
+            Ice.ObjectPrx routerBase;
 
-        Glacier2.RouterPrx router;
-
-        {
-            out.print("testing checked cast for router... ");
-            out.flush();
-            router = Glacier2.RouterPrxHelper.checkedCast(routerBase);
-            test(router != null);
-            out.println("ok");
-        }
+            PrintWriter out = getWriter();
+            {
+                out.print("testing stringToProxy for router... ");
+                out.flush();
+                routerBase = communicator.stringToProxy("Glacier2/router:" + getTestEndpoint(50));
+                out.println("ok");
+            }
 
-        {
-            out.print("testing router finder... ");
-            out.flush();
-            Ice.RouterFinderPrx finder = Ice.RouterFinderPrxHelper.uncheckedCast(
-                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
-            test(finder.getRouter().ice_getIdentity().equals(router.ice_getIdentity()));
-            out.println("ok");
-        }
+            Glacier2.RouterPrx router;
 
-        {
-            out.print("installing router with communicator... ");
-            out.flush();
-            communicator().setDefaultRouter(router);
-            out.println("ok");
-        }
-
-        {
-            out.print("getting the session timeout... ");
-            out.flush();
-            long timeout = router.getSessionTimeout();
-            test(timeout == 30);
-            out.println("ok");
-        }
+            {
+                out.print("testing checked cast for router... ");
+                out.flush();
+                router = Glacier2.RouterPrxHelper.checkedCast(routerBase);
+                test(router != null);
+                out.println("ok");
+            }
 
-        Ice.ObjectPrx base;
+            {
+                out.print("testing router finder... ");
+                out.flush();
+                Ice.RouterFinderPrx finder =
+                    Ice.RouterFinderPrxHelper.uncheckedCast(communicator.stringToProxy("Ice/RouterFinder:" +
+                                                                                       getTestEndpoint(50)));
+                test(finder.getRouter().ice_getIdentity().equals(router.ice_getIdentity()));
+                out.println("ok");
+            }
 
-        {
-            out.print("testing stringToProxy for server object... ");
-            out.flush();
-            base = communicator().stringToProxy("c1/callback:" + getTestEndpoint(0));
-            out.println("ok");
-        }
+            {
+                out.print("installing router with communicator... ");
+                out.flush();
+                communicator.setDefaultRouter(router);
+                out.println("ok");
+            }
 
-        {
-            out.print("trying to ping server before session creation... ");
-            out.flush();
-            try
             {
-                base.ice_ping();
-                test(false);
+                out.print("getting the session timeout... ");
+                out.flush();
+                long timeout = router.getSessionTimeout();
+                test(timeout == 30);
+                out.println("ok");
             }
-            catch(Ice.ConnectionLostException ex)
+
+            Ice.ObjectPrx base;
+
             {
+                out.print("testing stringToProxy for server object... ");
+                out.flush();
+                base = communicator.stringToProxy("c1/callback:" + getTestEndpoint(0));
                 out.println("ok");
             }
-            catch(Ice.SocketException ex)
+
             {
-                //
-                // The JSSE implementation in the AIX JDK appears to have a
-                // bug that causes a "bad certificate" exception to be raised
-                // when the connection is forcefully dropped and a retry occurs.
-                //
-                if(System.getProperty("os.name").equals("AIX"))
+                out.print("trying to ping server before session creation... ");
+                out.flush();
+                try
+                {
+                    base.ice_ping();
+                    test(false);
+                }
+                catch(Ice.ConnectionLostException ex)
                 {
                     out.println("ok");
                 }
-                else
+                catch(Ice.SocketException ex)
                 {
-                    test(false);
+                    //
+                    // The JSSE implementation in the AIX JDK appears to have a
+                    // bug that causes a "bad certificate" exception to be raised
+                    // when the connection is forcefully dropped and a retry occurs.
+                    //
+                    if(System.getProperty("os.name").equals("AIX"))
+                    {
+                        out.println("ok");
+                    }
+                    else
+                    {
+                        test(false);
+                    }
                 }
             }
-        }
 
-        {
-            out.print("trying to create session with wrong password... ");
-            out.flush();
-            try
-            {
-                router.createSession("userid", "xxx");
-                test(false);
-            }
-            catch(Glacier2.PermissionDeniedException ex)
-            {
-                out.println("ok");
-            }
-            catch(Glacier2.CannotCreateSessionException ex)
             {
-                test(false);
+                out.print("trying to create session with wrong password... ");
+                out.flush();
+                try
+                {
+                    router.createSession("userid", "xxx");
+                    test(false);
+                }
+                catch(Glacier2.PermissionDeniedException ex)
+                {
+                    out.println("ok");
+                }
+                catch(Glacier2.CannotCreateSessionException ex)
+                {
+                    test(false);
+                }
             }
-        }
 
-        {
-            out.print("trying to destroy non-existing session... ");
-            out.flush();
-            try
             {
-                router.destroySession();
-                test(false);
+                out.print("trying to destroy non-existing session... ");
+                out.flush();
+                try
+                {
+                    router.destroySession();
+                    test(false);
+                }
+                catch(Glacier2.SessionNotExistException ex)
+                {
+                    out.println("ok");
+                }
             }
-            catch(Glacier2.SessionNotExistException ex)
+
             {
+                out.print("creating session with correct password... ");
+                out.flush();
+                try
+                {
+                    router.createSession("userid", "abc123");
+                }
+                catch(Glacier2.PermissionDeniedException ex)
+                {
+                    test(false);
+                }
+                catch(Glacier2.CannotCreateSessionException ex)
+                {
+                    test(false);
+                }
                 out.println("ok");
             }
-        }
 
-        {
-            out.print("creating session with correct password... ");
-            out.flush();
-            try
-            {
-                router.createSession("userid", "abc123");
-            }
-            catch(Glacier2.PermissionDeniedException ex)
-            {
-                test(false);
-            }
-            catch(Glacier2.CannotCreateSessionException ex)
             {
-                test(false);
+                out.print("trying to create a second session... ");
+                out.flush();
+                try
+                {
+                    router.createSession("userid", "abc123");
+                    test(false);
+                }
+                catch(Glacier2.PermissionDeniedException ex)
+                {
+                    test(false);
+                }
+                catch(Glacier2.CannotCreateSessionException ex)
+                {
+                    out.println("ok");
+                }
             }
-            out.println("ok");
-        }
 
-        {
-            out.print("trying to create a second session... ");
-            out.flush();
-            try
-            {
-                router.createSession("userid", "abc123");
-                test(false);
-            }
-            catch(Glacier2.PermissionDeniedException ex)
-            {
-                test(false);
-            }
-            catch(Glacier2.CannotCreateSessionException ex)
             {
+                out.print("pinging server after session creation... ");
+                out.flush();
+                base.ice_ping();
                 out.println("ok");
             }
-        }
-
-        {
-            out.print("pinging server after session creation... ");
-            out.flush();
-            base.ice_ping();
-            out.println("ok");
-        }
 
-        {
-            out.print("pinging object with client endpoint... ");
-            out.flush();
-            Ice.ObjectPrx baseC = communicator().stringToProxy("collocated:" + getTestEndpoint(50));
-            try
-            {
-                baseC.ice_ping();
-            }
-            catch(Ice.ObjectNotExistException ex)
             {
+                out.print("pinging object with client endpoint... ");
+                out.flush();
+                Ice.ObjectPrx baseC = communicator.stringToProxy("collocated:" + getTestEndpoint(50));
+                try
+                {
+                    baseC.ice_ping();
+                }
+                catch(Ice.ObjectNotExistException ex)
+                {
+                }
+                out.println("ok");
             }
-            out.println("ok");
-        }
-
-        CallbackPrx twoway;
-
-        {
-            out.print("testing checked cast for server object... ");
-            out.flush();
-            twoway = CallbackPrxHelper.checkedCast(base);
-            test(twoway != null);
-            out.println("ok");
-        }
-
-        Ice.ObjectAdapter adapter;
-
-        {
-            out.print("creating and activating callback receiver adapter... ");
-            out.flush();
-            communicator().getProperties().setProperty("Ice.PrintAdapterReady", "0");
-            adapter = communicator().createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
-            adapter.activate();
-            out.println("ok");
-        }
 
-        String category;
+            CallbackPrx twoway;
 
-        {
-            out.print("getting category from router... ");
-            out.flush();
-            category = router.getCategoryForClient();
-            out.println("ok");
-        }
-
-        CallbackReceiverI callbackReceiverImpl;
-        Ice.Object callbackReceiver;
-        CallbackReceiverPrx twowayR;
-        CallbackReceiverPrx fakeTwowayR;
-
-        {
-            out.print("creating and adding callback receiver object... ");
-            out.flush();
-            callbackReceiverImpl = new CallbackReceiverI();
-            callbackReceiver = callbackReceiverImpl;
-            Ice.Identity callbackReceiverIdent = new Ice.Identity();
-            callbackReceiverIdent.name = "callbackReceiver";
-            callbackReceiverIdent.category = category;
-            twowayR = CallbackReceiverPrxHelper.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
-            Ice.Identity fakeCallbackReceiverIdent = new Ice.Identity();
-            fakeCallbackReceiverIdent.name = "callbackReceiver";
-            fakeCallbackReceiverIdent.category = "dummy";
-            fakeTwowayR = CallbackReceiverPrxHelper.uncheckedCast(
-                adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
-            out.println("ok");
-        }
-
-        {
-            out.print("testing oneway callback... ");
-            out.flush();
-            CallbackPrx oneway = CallbackPrxHelper.uncheckedCast(twoway.ice_oneway());
-            CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
-            java.util.Map<String, String> context = new java.util.HashMap<String, String>();
-            context.put("_fwd", "o");
-            oneway.initiateCallback(onewayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
-
-        {
-            out.print("testing twoway callback... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<String, String>();
-            context.put("_fwd", "t");
-            twoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
-
-        {
-            out.print("ditto, but with user exception... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<String, String>();
-            context.put("_fwd", "t");
-            try
-            {
-                twoway.initiateCallbackEx(twowayR, context);
-                test(false);
-            }
-            catch(CallbackException ex)
             {
-                test(ex.someValue == 3.14);
-                test(ex.someString.equals("3.14"));
+                out.print("testing checked cast for server object... ");
+                out.flush();
+                twoway = CallbackPrxHelper.checkedCast(base);
+                test(twoway != null);
+                out.println("ok");
             }
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
 
-        {
-            out.print("trying twoway callback with fake category... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<String, String>();
-            context.put("_fwd", "t");
-            try
-            {
-                twoway.initiateCallback(fakeTwowayR, context);
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException ex)
+            Ice.ObjectAdapter adapter;
+
             {
+                out.print("creating and activating callback receiver adapter... ");
+                out.flush();
+                communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+                adapter = communicator.createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
+                adapter.activate();
                 out.println("ok");
             }
-        }
 
-        {
-            out.print("testing whether other allowed category is accepted... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<String, String>();
-            context.put("_fwd", "t");
-            CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-                twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback")));
-            otherCategoryTwoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
+            String category;
 
-        {
-            out.print("testing whether disallowed category gets rejected... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<String, String>();
-            context.put("_fwd", "t");
-            try
-            {
-                CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-                    twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback")));
-                otherCategoryTwoway.initiateCallback(twowayR, context);
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException ex)
             {
+                out.print("getting category from router... ");
+                out.flush();
+                category = router.getCategoryForClient();
                 out.println("ok");
             }
-        }
 
-        {
-            out.print("testing whether user-id as category is accepted... ");
-            out.flush();
-            java.util.Map<String, String> context = new java.util.HashMap<String, String>();
-            context.put("_fwd", "t");
-            CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-                twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback")));
-            otherCategoryTwoway.initiateCallback(twowayR, context);
-            callbackReceiverImpl.callbackOK();
-            out.println("ok");
-        }
-
-        if(args.length >= 1 && args[0].equals("--shutdown"))
-        {
-            out.print("testing server shutdown... ");
-            out.flush();
-            twoway.shutdown();
-            // No ping, otherwise the router prints a warning message if it's
-            // started with --Ice.Warn.Connections.
-            out.println("ok");
-            /*
-              try
-              {
-                  base.ice_ping();
-                  test(false);
-              }
-              // If we use the glacier router, the exact exception reason gets
-              // lost.
-              catch(Ice.UnknownLocalException ex)
-              {
-                  System.out.println("ok");
-              }
-            */
-        }
+            CallbackReceiverI callbackReceiverImpl;
+            Ice.Object callbackReceiver;
+            CallbackReceiverPrx twowayR;
+            CallbackReceiverPrx fakeTwowayR;
 
-        {
-            out.print("destroying session... ");
-            out.flush();
-            try
             {
-                router.destroySession();
-            }
-            catch(Glacier2.SessionNotExistException ex)
-            {
-                test(false);
+                out.print("creating and adding callback receiver object... ");
+                out.flush();
+                callbackReceiverImpl = new CallbackReceiverI();
+                callbackReceiver = callbackReceiverImpl;
+                Ice.Identity callbackReceiverIdent = new Ice.Identity();
+                callbackReceiverIdent.name = "callbackReceiver";
+                callbackReceiverIdent.category = category;
+                twowayR = CallbackReceiverPrxHelper.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
+                Ice.Identity fakeCallbackReceiverIdent = new Ice.Identity();
+                fakeCallbackReceiverIdent.name = "callbackReceiver";
+                fakeCallbackReceiverIdent.category = "dummy";
+                fakeTwowayR =
+                    CallbackReceiverPrxHelper.uncheckedCast(adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
+                out.println("ok");
             }
-            catch(Ice.LocalException ex)
+
             {
-                test(false);
+                out.print("testing oneway callback... ");
+                out.flush();
+                CallbackPrx oneway = CallbackPrxHelper.uncheckedCast(twoway.ice_oneway());
+                CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
+                java.util.Map<String, String> context = new java.util.HashMap<String, String>();
+                context.put("_fwd", "o");
+                oneway.initiateCallback(onewayR, context);
+                callbackReceiverImpl.callbackOK();
+                out.println("ok");
             }
-            out.println("ok");
-        }
 
-        {
-            out.print("trying to ping server after session destruction... ");
-            out.flush();
-            try
             {
-                base.ice_ping();
-                test(false);
+                out.print("testing twoway callback... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<String, String>();
+                context.put("_fwd", "t");
+                twoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
+                out.println("ok");
             }
-            catch(Ice.ConnectionLostException ex)
+
             {
+                out.print("ditto, but with user exception... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<String, String>();
+                context.put("_fwd", "t");
+                try
+                {
+                    twoway.initiateCallbackEx(twowayR, context);
+                    test(false);
+                }
+                catch(CallbackException ex)
+                {
+                    test(ex.someValue == 3.14);
+                    test(ex.someString.equals("3.14"));
+                }
+                callbackReceiverImpl.callbackOK();
                 out.println("ok");
             }
-            catch(Ice.SocketException ex)
+
             {
-                //
-                // The JSSE implementation in the AIX JDK appears to have a
-                // bug that causes a "bad certificate" exception to be raised
-                // when the connection is forcefully dropped and a retry occurs.
-                //
-                if(System.getProperty("os.name").equals("AIX"))
+                out.print("trying twoway callback with fake category... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<String, String>();
+                context.put("_fwd", "t");
+                try
                 {
-                    out.println("ok");
+                    twoway.initiateCallback(fakeTwowayR, context);
+                    test(false);
                 }
-                else
+                catch(Ice.ObjectNotExistException ex)
                 {
-                    System.err.println(ex);
-                    test(false);
+                    out.println("ok");
                 }
             }
-        }
 
-        if(args.length >= 1 && args[0].equals("--shutdown"))
-        {
             {
-                out.print("uninstalling router with communicator... ");
+                out.print("testing whether other allowed category is accepted... ");
                 out.flush();
-                communicator().setDefaultRouter(null);
+                java.util.Map<String, String> context = new java.util.HashMap<String, String>();
+                context.put("_fwd", "t");
+                CallbackPrx otherCategoryTwoway =
+                    CallbackPrxHelper.uncheckedCast(twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback")));
+                otherCategoryTwoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
                 out.println("ok");
             }
 
-            Ice.ObjectPrx processBase;
-
             {
-                out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
-                out.println("ok");
+                out.print("testing whether disallowed category gets rejected... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<String, String>();
+                context.put("_fwd", "t");
+                try
+                {
+                    CallbackPrx otherCategoryTwoway =
+                        CallbackPrxHelper.uncheckedCast(twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback")));
+                    otherCategoryTwoway.initiateCallback(twowayR, context);
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException ex)
+                {
+                    out.println("ok");
+                }
             }
 
-/*
             {
-                out.print("uninstalling router with process object... ");
-                processBase.ice_router(null);
+                out.print("testing whether user-id as category is accepted... ");
+                out.flush();
+                java.util.Map<String, String> context = new java.util.HashMap<String, String>();
+                context.put("_fwd", "t");
+                CallbackPrx otherCategoryTwoway =
+                    CallbackPrxHelper.uncheckedCast(twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback")));
+                otherCategoryTwoway.initiateCallback(twowayR, context);
+                callbackReceiverImpl.callbackOK();
                 out.println("ok");
             }
-*/
 
-            Ice.ProcessPrx process;
+            if(argsH.value.length >= 1 && argsH.value[0].equals("--shutdown"))
+            {
+                out.print("testing server shutdown... ");
+                out.flush();
+                twoway.shutdown();
+                // No ping, otherwise the router prints a warning message if it's
+                // started with --Ice.Warn.Connections.
+                out.println("ok");
+                /*
+                  try
+                  {
+                  base.ice_ping();
+                  test(false);
+                  }
+                  // If we use the glacier router, the exact exception reason gets
+                  // lost.
+                  catch(Ice.UnknownLocalException ex)
+                  {
+                  System.out.println("ok");
+                  }
+                */
+            }
 
             {
-                out.print("testing checked cast for admin object... ");
-                process = Ice.ProcessPrxHelper.checkedCast(processBase);
-                test(process != null);
+                out.print("destroying session... ");
+                out.flush();
+                try
+                {
+                    router.destroySession();
+                }
+                catch(Glacier2.SessionNotExistException ex)
+                {
+                    test(false);
+                }
+                catch(Ice.LocalException ex)
+                {
+                    test(false);
+                }
                 out.println("ok");
             }
 
-            out.print("testing Glacier2 shutdown... ");
-            process.shutdown();
-            try
             {
-                process.ice_ping();
-                test(false);
+                out.print("trying to ping server after session destruction... ");
+                out.flush();
+                try
+                {
+                    base.ice_ping();
+                    test(false);
+                }
+                catch(Ice.ConnectionLostException ex)
+                {
+                    out.println("ok");
+                }
+                catch(Ice.SocketException ex)
+                {
+                    //
+                    // The JSSE implementation in the AIX JDK appears to have a
+                    // bug that causes a "bad certificate" exception to be raised
+                    // when the connection is forcefully dropped and a retry occurs.
+                    //
+                    if(System.getProperty("os.name").equals("AIX"))
+                    {
+                        out.println("ok");
+                    }
+                    else
+                    {
+                        System.err.println(ex);
+                        test(false);
+                    }
+                }
             }
-            catch(Ice.LocalException ex)
+
+            if(argsH.value.length >= 1 && argsH.value[0].equals("--shutdown"))
             {
-                out.println("ok");
-            }
-        }
+                {
+                    out.print("uninstalling router with communicator... ");
+                    out.flush();
+                    communicator.setDefaultRouter(null);
+                    out.println("ok");
+                }
 
-        return 0;
-    }
+                Ice.ObjectPrx processBase;
 
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
+                {
+                    out.print("testing stringToProxy for process object... ");
+                    processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
+                    out.println("ok");
+                }
 
-        return initData;
-    }
+                /*
+                  {
+                  out.print("uninstalling router with process object... ");
+                  processBase.ice_router(null);
+                  out.println("ok");
+                  }
+                */
 
-    public static void
-    main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
+                Ice.ProcessPrx process;
+
+                {
+                    out.print("testing checked cast for admin object... ");
+                    process = Ice.ProcessPrxHelper.checkedCast(processBase);
+                    test(process != null);
+                    out.println("ok");
+                }
 
-        System.gc();
-        System.exit(status);
+                out.print("testing Glacier2 shutdown... ");
+                process.shutdown();
+                try
+                {
+                    process.ice_ping();
+                    test(false);
+                }
+                catch(Ice.LocalException ex)
+                {
+                    out.println("ok");
+                }
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/router/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/router/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.router;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int
+    public void
     run(String[] args)
     {
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(),
-                    Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category.
-        adapter.add(new CallbackI(),
-                    Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category.
-        adapter.add(new CallbackI(),
-                    Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category.
-        adapter.add(new CallbackI(),
-                    Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid.
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
-
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+            adapter.add(new CallbackI(),
+                        Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category.
+            adapter.add(new CallbackI(),
+                        Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category.
+            adapter.add(new CallbackI(),
+                        Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category.
+            adapter.add(new CallbackI(),
+                        Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid.
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/CallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.sessionHelper;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.sessionHelper;
 
@@ -16,461 +11,404 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    Client()
-    {
-        out = getWriter();
-        me = this;
-    }
-
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        _initData = super.getInitData(argsH);
-        _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                         getTestEndpoint(_initData.properties, 50));
-        _initData.dispatcher = new Ice.Dispatcher()
+        final ExecutorService workQueue = Executors.newSingleThreadExecutor();
+        final PrintWriter out = getWriter();
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = createTestProperties(args);
+        initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
+                                        getTestEndpoint(initData.properties, 50));
+        initData.dispatcher = new Ice.Dispatcher()
             {
                 @Override
-                public void
-                dispatch(Runnable runnable, Ice.Connection connection)
+                public void dispatch(Runnable runnable, Ice.Connection connection)
                 {
-                    _workQueue.submit(runnable);
+                    workQueue.submit(runnable);
                 }
             };
 
-        return _initData;
-    }
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            String protocol = getTestProtocol();
+            String host = getTestHost();
 
-    @Override
-    public int run(String[] args)
-    {
-        String protocol = getTestProtocol();
-        String host = getTestHost();
+            Glacier2.SessionFactoryHelper factory =
+                new Glacier2.SessionFactoryHelper(initData, new Glacier2.SessionCallback()
+                    {
+                        @Override
+                        public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException
+                        {
+                            test(false);
+                        }
+
+                        @Override
+                        public void disconnected(Glacier2.SessionHelper session)
+                        {
+                            test(false);
+                        }
 
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback()
+                        @Override
+                        public void connectFailed(Glacier2.SessionHelper session, Throwable exception)
+                        {
+                            try
+                            {
+                                throw exception;
+                            }
+                            catch(Glacier2.PermissionDeniedException ex)
+                            {
+                                out.println("ok");
+                                synchronized(test.Glacier2.sessionHelper.Client.this)
+                                {
+                                    test.Glacier2.sessionHelper.Client.this.notify();
+                                }
+                            }
+                            catch(Throwable ex)
+                            {
+                                test(false);
+                            }
+                        }
+
+                        @Override
+                        public void createdCommunicator(Glacier2.SessionHelper session)
+                        {
+                            test(session.communicator() != null);
+                        }
+                    });
+
+            Glacier2.SessionHelper session;
+            //
+            // Test to create a session with wrong userid/password
+            //
+            synchronized(this)
             {
-                @Override
-                public void
-                connected(Glacier2.SessionHelper session)
-                    throws Glacier2.SessionNotExistException
-                {
-                     test(false);
-                }
+                out.print("testing SessionHelper connect with wrong userid/password... ");
+                out.flush();
 
-                @Override
-                public void
-                disconnected(Glacier2.SessionHelper session)
+                session = factory.connect("userid", "xxx");
+                while(true)
                 {
-                    test(false);
+                    try
+                    {
+                        wait(30000);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
+                test(!session.isConnected());
+            }
 
-                @Override
-                public void
-                connectFailed(Glacier2.SessionHelper session, Throwable exception)
+            initData.properties.setProperty("Ice.Default.Router", "");
+            factory = new Glacier2.SessionFactoryHelper(initData, new Glacier2.SessionCallback()
                 {
-                    try
+                    @Override
+                    public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException
                     {
-                        throw exception;
+                        test(false);
                     }
-                    catch(Glacier2.PermissionDeniedException ex)
+
+                    @Override
+                    public void disconnected(Glacier2.SessionHelper session)
                     {
-                        out.println("ok");
-                        synchronized(test.Glacier2.sessionHelper.Client.this)
+                        test(false);
+                    }
+
+                    @Override
+                    public void connectFailed(Glacier2.SessionHelper session, Throwable exception)
+                    {
+                        try
+                        {
+                            throw exception;
+                        }
+                        catch(Ice.CommunicatorDestroyedException ex)
                         {
-                            test.Glacier2.sessionHelper.Client.wakeUp();
+                            out.println("ok");
+                            synchronized(test.Glacier2.sessionHelper.Client.this)
+                            {
+                                test.Glacier2.sessionHelper.Client.this.notify();
+                            }
+                        }
+                        catch(Throwable ex)
+                        {
+                            test(false);
                         }
                     }
-                    catch(Throwable ex)
+
+                    @Override
+                    public void createdCommunicator(Glacier2.SessionHelper session)
                     {
-                        test(false);
+                        test(session.communicator() != null);
                     }
-                }
+                });
 
-                @Override
-                public void
-                createdCommunicator(Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
-
-        //
-        // Test to create a session with wrong userid/password
-        //
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect with wrong userid/password... ");
-            out.flush();
-
-            _session = _factory.connect("userid", "xxx");
-            while(true)
+            synchronized(this)
             {
-                try
-                {
-                    wait(30000);
-                    break;
-                }
-                catch(java.lang.InterruptedException ex)
-                {
-                }
-            }
-            test(!_session.isConnected());
-        }
+                out.print("testing SessionHelper connect interrupt... ");
+                out.flush();
+                factory.setRouterHost(host);
+                factory.setPort(getTestPort(1));
+                factory.setProtocol(protocol);
+                session = factory.connect("userid", "abc123");
 
-        _initData.properties.setProperty("Ice.Default.Router", "");
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback()
-            {
-                @Override
-                public void
-                connected(Glacier2.SessionHelper session)
-                    throws Glacier2.SessionNotExistException
+                while(true)
                 {
-                    test(false);
+                    try
+                    {
+                        Thread.sleep(100);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
+                session.destroy();
 
-                @Override
-                public void
-                disconnected(Glacier2.SessionHelper session)
+                while(true)
                 {
-                    test(false);
+                    try
+                    {
+                        wait(30000);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
+                test(!session.isConnected());
+            };
 
-                @Override
-                public void
-                connectFailed(Glacier2.SessionHelper session, Throwable exception)
+            factory = new Glacier2.SessionFactoryHelper(initData, new Glacier2.SessionCallback()
                 {
-                    try
+                    @Override
+                    public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException
                     {
-                        throw exception;
+                        out.println("ok");
+                        synchronized(test.Glacier2.sessionHelper.Client.this)
+                        {
+                            test.Glacier2.sessionHelper.Client.this.notify();
+                        }
                     }
-                    catch(Ice.CommunicatorDestroyedException ex)
+
+                    @Override
+                    public void disconnected(Glacier2.SessionHelper session)
                     {
                         out.println("ok");
                         synchronized(test.Glacier2.sessionHelper.Client.this)
                         {
-                            test.Glacier2.sessionHelper.Client.wakeUp();
+                            test.Glacier2.sessionHelper.Client.this.notify();
                         }
                     }
-                    catch(Throwable ex)
+
+                    @Override
+                    public void connectFailed(Glacier2.SessionHelper session, Throwable ex)
                     {
                         test(false);
                     }
-                }
 
-                @Override
-                public void
-                createdCommunicator(Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
-
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect interrupt... ");
-            out.flush();
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(1));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
+                    @Override
+                    public void createdCommunicator(Glacier2.SessionHelper session)
+                    {
+                        test(session.communicator() != null);
+                    }
+                });
 
-            while(true)
+            synchronized(this)
             {
-                try
-                {
-                    Thread.sleep(100);
-                    break;
-                }
-                catch(java.lang.InterruptedException ex)
+                out.print("testing SessionHelper connect... ");
+                out.flush();
+                factory.setRouterHost(host);
+                factory.setPort(getTestPort(50));
+                factory.setProtocol(protocol);
+                session = factory.connect("userid", "abc123");
+                while(true)
                 {
+                    try
+                    {
+                        wait(30000);
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
                 }
-            }
-            _session.destroy();
 
-            while(true)
-            {
+                out.print("testing SessionHelper isConnected after connect... ");
+                out.flush();
+                test(session.isConnected());
+                out.println("ok");
+
+                out.print("testing SessionHelper categoryForClient after connect... ");
+                out.flush();
                 try
                 {
-                    wait(30000);
-                    break;
+                    test(!session.categoryForClient().equals(""));
                 }
-                catch(java.lang.InterruptedException ex)
+                catch(Glacier2.SessionNotExistException ex)
                 {
+                    test(false);
                 }
-            }
-            test(!_session.isConnected());
-        };
+                out.println("ok");
 
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback()
-            {
-                @Override
-                public void
-                connected(Glacier2.SessionHelper session)
-                    throws Glacier2.SessionNotExistException
+                test(session.session() == null);
+
+                out.print("testing stringToProxy for server object... ");
+                out.flush();
+                Ice.ObjectPrx base = session.communicator().stringToProxy("callback:" + getTestEndpoint(0));
+                out.println("ok");
+
+                out.print("pinging server after session creation... ");
+                out.flush();
+                base.ice_ping();
+                out.println("ok");
+
+                out.print("testing checked cast for server object... ");
+                out.flush();
+                CallbackPrx twoway = CallbackPrxHelper.checkedCast(base);
+                test(twoway != null);
+                out.println("ok");
+
+                out.print("testing server shutdown... ");
+                out.flush();
+                twoway.shutdown();
+                out.println("ok");
+
+                test(session.communicator() != null);
+                out.print("testing SessionHelper destroy... ");
+                out.flush();
+                session.destroy();
+                while(true)
                 {
-                    out.println("ok");
-                    synchronized(test.Glacier2.sessionHelper.Client.this)
+                    try
                     {
-                        test.Glacier2.sessionHelper.Client.wakeUp();
+                        wait();
+                        break;
                     }
-                }
-
-                @Override
-                public void
-                disconnected(Glacier2.SessionHelper session)
-                {
-                    out.println("ok");
-                    synchronized(test.Glacier2.sessionHelper.Client.this)
+                    catch(java.lang.InterruptedException ex)
                     {
-                        test.Glacier2.sessionHelper.Client.wakeUp();
                     }
                 }
 
-                @Override
-                public void
-                connectFailed(Glacier2.SessionHelper session, Throwable ex)
-                {
-                    test(false);
-                }
-
-                @Override
-                public void
-                createdCommunicator(Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
+                out.print("testing SessionHelper isConnected after destroy... ");
+                out.flush();
+                test(session.isConnected() == false);
+                out.println("ok");
 
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect... ");
-            out.flush();
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(50));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
-            while(true)
-            {
+                out.print("testing SessionHelper categoryForClient after destroy... ");
+                out.flush();
                 try
                 {
-                    wait(30000);
-                    break;
+                    test(!session.categoryForClient().equals(""));
+                    test(false);
                 }
-                catch(java.lang.InterruptedException ex)
+                catch(Glacier2.SessionNotExistException ex)
                 {
                 }
-            }
-
-            out.print("testing SessionHelper isConnected after connect... ");
-            out.flush();
-            test(_session.isConnected());
-            out.println("ok");
-
-            out.print("testing SessionHelper categoryForClient after connect... ");
-            out.flush();
-            try
-            {
-                test(!_session.categoryForClient().equals(""));
-            }
-            catch(Glacier2.SessionNotExistException ex)
-            {
-                test(false);
-            }
-            out.println("ok");
+                out.println("ok");
 
-            test(_session.session() == null);
+                out.print("testing SessionHelper session after destroy... ");
+                test(session.session() == null);
+                out.println("ok");
 
-            out.print("testing stringToProxy for server object... ");
-            out.flush();
-            Ice.ObjectPrx base = _session.communicator().stringToProxy("callback:" + getTestEndpoint(0));
-            out.println("ok");
-
-            out.print("pinging server after session creation... ");
-            out.flush();
-            base.ice_ping();
-            out.println("ok");
-
-            out.print("testing checked cast for server object... ");
-            out.flush();
-            CallbackPrx twoway = CallbackPrxHelper.checkedCast(base);
-            test(twoway != null);
-            out.println("ok");
-
-            out.print("testing server shutdown... ");
-            out.flush();
-            twoway.shutdown();
-            out.println("ok");
-
-            test(_session.communicator() != null);
-            out.print("testing SessionHelper destroy... ");
-            out.flush();
-            _session.destroy();
-            while(true)
-            {
+                out.print("testing SessionHelper communicator after destroy... ");
+                out.flush();
                 try
                 {
-                    wait();
-                    break;
+                    test(session.communicator() != null);
+                    session.communicator().stringToProxy("dummy");
+                    test(false);
                 }
-                catch(java.lang.InterruptedException ex)
+                catch(Ice.CommunicatorDestroyedException ex)
                 {
                 }
-            }
-
-            out.print("testing SessionHelper isConnected after destroy... ");
-            out.flush();
-            test(_session.isConnected() == false);
-            out.println("ok");
-
-            out.print("testing SessionHelper categoryForClient after destroy... ");
-            out.flush();
-            try
-            {
-                test(!_session.categoryForClient().equals(""));
-                test(false);
-            }
-            catch(Glacier2.SessionNotExistException ex)
-            {
-            }
-            out.println("ok");
-
-            out.print("testing SessionHelper session after destroy... ");
-            test(_session.session() == null);
-            out.println("ok");
-
-            out.print("testing SessionHelper communicator after destroy... ");
-            out.flush();
-            try
-            {
-                test(_session.communicator() != null);
-                _session.communicator().stringToProxy("dummy");
-                test(false);
-            }
-            catch(Ice.CommunicatorDestroyedException ex)
-            {
-            }
-            out.println("ok");
-
-            out.print("uninstalling router with communicator... ");
-            out.flush();
-            communicator().setDefaultRouter(null);
-            out.println("ok");
-
-            Ice.ObjectPrx processBase;
-            {
-                out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 out.println("ok");
-            }
 
-            Ice.ProcessPrx process;
-            {
-                out.print("testing checked cast for admin object... ");
-                process = Ice.ProcessPrxHelper.checkedCast(processBase);
-                test(process != null);
+                out.print("uninstalling router with communicator... ");
+                out.flush();
+                communicator().setDefaultRouter(null);
                 out.println("ok");
-            }
 
-            out.print("testing Glacier2 shutdown... ");
-            process.shutdown();
-            try
-            {
-                process.ice_ping();
-                test(false);
-            }
-            catch(Ice.LocalException ex)
-            {
-                out.println("ok");
-            }
-        }
+                Ice.ObjectPrx processBase;
+                {
+                    out.print("testing stringToProxy for process object... ");
+                    processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
+                    out.println("ok");
+                }
 
-        _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback()
-            {
-                @Override
-                public void
-                connected(Glacier2.SessionHelper session)
-                    throws Glacier2.SessionNotExistException
+                Ice.ProcessPrx process;
                 {
-                     test(false);
+                    out.print("testing checked cast for admin object... ");
+                    process = Ice.ProcessPrxHelper.checkedCast(processBase);
+                    test(process != null);
+                    out.println("ok");
                 }
 
-                @Override
-                public void
-                disconnected(Glacier2.SessionHelper session)
+                out.print("testing Glacier2 shutdown... ");
+                process.shutdown();
+                try
                 {
+                    process.ice_ping();
                     test(false);
                 }
+                catch(Ice.LocalException ex)
+                {
+                    out.println("ok");
+                }
+            }
 
-                @Override
-                public void
-                connectFailed(Glacier2.SessionHelper session, Throwable exception)
+            factory = new Glacier2.SessionFactoryHelper(initData, new Glacier2.SessionCallback()
                 {
-                    try
+                    @Override
+                    public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException
                     {
-                        throw exception;
+                        test(false);
                     }
-                    catch(Ice.ConnectFailedException ex)
+
+                    @Override
+                    public void disconnected(Glacier2.SessionHelper session)
                     {
-                        out.println("ok");
-                        synchronized(test.Glacier2.sessionHelper.Client.this)
+                        test(false);
+                    }
+
+                    @Override
+                    public void connectFailed(Glacier2.SessionHelper session, Throwable exception)
+                    {
+                        try
+                        {
+                            throw exception;
+                        }
+                        catch(Ice.ConnectFailedException ex)
                         {
-                            test.Glacier2.sessionHelper.Client.wakeUp();
+                            out.println("ok");
+                            synchronized(test.Glacier2.sessionHelper.Client.this)
+                            {
+                                test.Glacier2.sessionHelper.Client.this.notify();
+                            }
+                        }
+                        catch(Throwable ex)
+                        {
+                            test(false);
                         }
                     }
-                    catch(Throwable ex)
+
+                    @Override
+                    public void createdCommunicator(Glacier2.SessionHelper session)
                     {
-                        test(false);
+                        test(session.communicator() != null);
                     }
-                }
-
-                @Override
-                public void
-                createdCommunicator(Glacier2.SessionHelper session)
-                {
-                    test(session.communicator() != null);
-                }
-            });
-
-        //
-        // Wait a bit to ensure glaci2router has been shutdown.
-        //
-        while(true)
-        {
-            try
-            {
-                Thread.sleep(100);
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }
+                });
 
-        synchronized(this)
-        {
-            out.print("testing SessionHelper connect after router shutdown... ");
-            out.flush();
-
-            _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(50));
-            _factory.setProtocol(protocol);
-            _session = _factory.connect("userid", "abc123");
+            //
+            // Wait a bit to ensure glaci2router has been shutdown.
+            //
             while(true)
             {
                 try
                 {
-                    wait();
+                    Thread.sleep(100);
                     break;
                 }
                 catch(java.lang.InterruptedException ex)
@@ -478,55 +416,51 @@
                 }
             }
 
-            out.print("testing SessionHelper isConnect after connect failure... ");
-            out.flush();
-            test(_session.isConnected() == false);
-            out.println("ok");
-
-            out.print("testing SessionHelper communicator after connect failure... ");
-            out.flush();
-            try
-            {
-                test(_session.communicator() != null);
-                _session.communicator().stringToProxy("dummy");
-                test(false);
-            }
-            catch(Ice.CommunicatorDestroyedException ex)
+            synchronized(this)
             {
-            }
-            out.println("ok");
-
-            out.print("testing SessionHelper destroy after connect failure... ");
-            out.flush();
-            _session.destroy();
-            out.println("ok");
-        }
-
-        _workQueue.shutdown();
+                out.print("testing SessionHelper connect after router shutdown... ");
+                out.flush();
 
-        return 0;
-    }
+                factory.setRouterHost(host);
+                factory.setPort(getTestPort(50));
+                factory.setProtocol(protocol);
+                session = factory.connect("userid", "abc123");
+                while(true)
+                {
+                    try
+                    {
+                        wait();
+                        break;
+                    }
+                    catch(java.lang.InterruptedException ex)
+                    {
+                    }
+                }
 
-    public static void
-    wakeUp()
-    {
-        me.notify();
-    }
+                out.print("testing SessionHelper isConnect after connect failure... ");
+                out.flush();
+                test(session.isConnected() == false);
+                out.println("ok");
 
-    public static void
-    main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
+                out.print("testing SessionHelper communicator after connect failure... ");
+                out.flush();
+                try
+                {
+                    test(session.communicator() != null);
+                    session.communicator().stringToProxy("dummy");
+                    test(false);
+                }
+                catch(Ice.CommunicatorDestroyedException ex)
+                {
+                }
+                out.println("ok");
 
-        System.gc();
-        System.exit(status);
+                out.print("testing SessionHelper destroy after connect failure... ");
+                out.flush();
+                session.destroy();
+                out.println("ok");
+            }
+        }
+        workQueue.shutdown();
     }
-
-    private Glacier2.SessionHelper _session;
-    private Glacier2.SessionFactoryHelper _factory;
-    private Ice.InitializationData _initData;
-    private ExecutorService _workQueue = Executors.newSingleThreadExecutor();
-    static public Client me;
-    final public PrintWriter out;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Glacier2.sessionHelper;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int
-    run(String[] args)
-    {
-        communicator().getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
-        communicator().createObjectAdapter("DeactivatedAdapter");
-
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
-        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
-
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Glacier2.router");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
+            communicator.createObjectAdapter("DeactivatedAdapter");
+
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("CallbackAdapter");
+            adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
@@ -17,7 +12,6 @@
 import test.Ice.acm.Test.RemoteObjectAdapterPrx;
 import test.Ice.acm.Test.TestIntfPrx;
 import test.Ice.acm.Test.TestIntfPrxHelper;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -121,9 +115,9 @@
 
     static abstract class TestCase
     {
-        public TestCase(Application app, String name, RemoteCommunicatorPrx com, PrintWriter out)
+        public TestCase(test.TestHelper helper, String name, RemoteCommunicatorPrx com, PrintWriter out)
         {
-            _app = app;
+            _helper = helper;
             _name = name;
             _com = com;
             _logger = new LoggerI(out);
@@ -144,8 +138,8 @@
         {
             _adapter = _com.createObjectAdapter(_serverACMTimeout, _serverACMClose, _serverACMHeartbeat);
 
-            Ice.InitializationData initData = _app.createInitializationData();
-            initData.properties = _app.communicator().getProperties()._clone();
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = _helper.communicator().getProperties()._clone();
             initData.logger = _logger;
             initData.properties.setProperty("Ice.ACM.Timeout", "2");
             if(_clientACMTimeout >= 0)
@@ -162,7 +156,7 @@
             }
             //initData.properties.setProperty("Ice.Trace.Protocol", "2");
             //initData.properties.setProperty("Ice.Trace.Network", "2");
-            _communicator = _app.initialize(initData);
+            _communicator = _helper.initialize(initData);
 
             _thread = new Thread(
                 new Runnable()
@@ -284,7 +278,7 @@
             _serverACMHeartbeat = heartbeat;
         }
 
-        private final Application _app;
+        private final test.TestHelper _helper;
         private String _name;
         private RemoteCommunicatorPrx _com;
         private String _msg;
@@ -307,9 +301,9 @@
 
     static class InvocationHeartbeatTest extends TestCase
     {
-        public InvocationHeartbeatTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationHeartbeatTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation heartbeat", com, out);
+            super(helper, "invocation heartbeat", com, out);
             setServerACM(1, -1, -1); // Faster ACM to make sure we receive enough ACM heartbeats
         }
 
@@ -322,9 +316,9 @@
 
     static class InvocationHeartbeatOnHoldTest extends TestCase
     {
-        public InvocationHeartbeatOnHoldTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationHeartbeatOnHoldTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation with heartbeat on hold", com, out);
+            super(helper, "invocation with heartbeat on hold", com, out);
             // Use default ACM configuration.
         }
 
@@ -349,9 +343,9 @@
 
     static class InvocationNoHeartbeatTest extends TestCase
     {
-        public InvocationNoHeartbeatTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationNoHeartbeatTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation with no heartbeat", com, out);
+            super(helper, "invocation with no heartbeat", com, out);
             setServerACM(2, 2, 0); // Disable heartbeat on invocations
         }
 
@@ -380,9 +374,9 @@
 
     static class InvocationHeartbeatCloseOnIdleTest extends TestCase
     {
-        public InvocationHeartbeatCloseOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public InvocationHeartbeatCloseOnIdleTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "invocation with no heartbeat and close on idle", com, out);
+            super(helper, "invocation with no heartbeat and close on idle", com, out);
             setClientACM(1, 1, 0); // Only close on idle.
             setServerACM(1, 2, 0); // Disable heartbeat on invocations
         }
@@ -403,9 +397,9 @@
 
     static class CloseOnIdleTest extends TestCase
     {
-        public CloseOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public CloseOnIdleTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "close on idle", com, out);
+            super(helper, "close on idle", com, out);
             setClientACM(1, 1, 0); // Only close on idle
         }
 
@@ -430,9 +424,9 @@
 
     static class CloseOnInvocationTest extends TestCase
     {
-        public CloseOnInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public CloseOnInvocationTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "close on invocation", com, out);
+            super(helper, "close on invocation", com, out);
             setClientACM(1, 2, 0); // Only close on invocation
         }
 
@@ -456,9 +450,9 @@
 
     static class CloseOnIdleAndInvocationTest extends TestCase
     {
-        public CloseOnIdleAndInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public CloseOnIdleAndInvocationTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "close on idle and invocation", com, out);
+            super(helper, "close on idle and invocation", com, out);
             setClientACM(1, 3, 0); // Only close on idle and invocation
         }
 
@@ -499,9 +493,9 @@
 
     static class ForcefulCloseOnIdleAndInvocationTest extends TestCase
     {
-        public ForcefulCloseOnIdleAndInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public ForcefulCloseOnIdleAndInvocationTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "forceful close on idle and invocation", com, out);
+            super(helper, "forceful close on idle and invocation", com, out);
             setClientACM(1, 4, 0); // Only close on idle and invocation
         }
 
@@ -525,9 +519,9 @@
 
     static class HeartbeatOnIdleTest extends TestCase
     {
-        public HeartbeatOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public HeartbeatOnIdleTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "heartbeat on idle", com, out);
+            super(helper, "heartbeat on idle", com, out);
             setServerACM(1, -1, 2); // Enable server heartbeats.
         }
 
@@ -550,9 +544,9 @@
 
     static class HeartbeatAlwaysTest extends TestCase
     {
-        public HeartbeatAlwaysTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public HeartbeatAlwaysTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "heartbeat always", com, out);
+            super(helper, "heartbeat always", com, out);
             setServerACM(1, -1, 3); // Enable server heartbeats.
         }
 
@@ -579,9 +573,9 @@
 
     static class HeartbeatManualTest extends TestCase
     {
-        public HeartbeatManualTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public HeartbeatManualTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "manual heartbeats", com, out);
+            super(helper, "manual heartbeats", com, out);
             //
             // Disable heartbeats.
             //
@@ -604,9 +598,9 @@
 
     static class SetACMTest extends TestCase
     {
-        public SetACMTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out)
+        public SetACMTest(test.TestHelper helper, RemoteCommunicatorPrx com, java.io.PrintWriter out)
         {
-            super(app, "setACM/getACM", com, out);
+            super(helper, "setACM/getACM", com, out);
             setClientACM(15, 4, 0);
         }
 
@@ -706,30 +700,30 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "communicator:" + app.getTestEndpoint(0);
+        String ref = "communicator:" + helper.getTestEndpoint(0);
         RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref));
 
         java.util.List<TestCase> tests = new java.util.ArrayList<TestCase>();
 
-        tests.add(new InvocationHeartbeatTest(app, com, out));
-        tests.add(new InvocationHeartbeatOnHoldTest(app, com, out));
-        tests.add(new InvocationNoHeartbeatTest(app, com, out));
-        tests.add(new InvocationHeartbeatCloseOnIdleTest(app, com, out));
-
-        tests.add(new CloseOnIdleTest(app, com, out));
-        tests.add(new CloseOnInvocationTest(app, com, out));
-        tests.add(new CloseOnIdleAndInvocationTest(app, com, out));
-        tests.add(new ForcefulCloseOnIdleAndInvocationTest(app, com, out));
-
-        tests.add(new HeartbeatOnIdleTest(app, com, out));
-        tests.add(new HeartbeatAlwaysTest(app, com, out));
-        tests.add(new HeartbeatManualTest(app, com, out));
-        tests.add(new SetACMTest(app, com, out));
+        tests.add(new InvocationHeartbeatTest(helper, com, out));
+        tests.add(new InvocationHeartbeatOnHoldTest(helper, com, out));
+        tests.add(new InvocationNoHeartbeatTest(helper, com, out));
+        tests.add(new InvocationHeartbeatCloseOnIdleTest(helper, com, out));
+
+        tests.add(new CloseOnIdleTest(helper, com, out));
+        tests.add(new CloseOnInvocationTest(helper, com, out));
+        tests.add(new CloseOnIdleAndInvocationTest(helper, com, out));
+        tests.add(new ForcefulCloseOnIdleAndInvocationTest(helper, com, out));
+
+        tests.add(new HeartbeatOnIdleTest(helper, com, out));
+        tests.add(new HeartbeatAlwaysTest(helper, com, out));
+        tests.add(new HeartbeatManualTest(helper, com, out));
+        tests.add(new SetACMTest(helper, com, out));
 
         for(TestCase test : tests)
         {
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.acm");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.acm");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/RemoteCommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int
-    run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Identity id = Ice.Util.stringToIdentity("communicator");
-        adapter.add(new RemoteCommunicatorI(), id);
-        adapter.activate();
-
-        // Disable ready print for further adapters.
-        communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
-
-        return WAIT;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.acm");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.ACM.Timeout", "1");
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.acm");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.ACM.Timeout", "1");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Identity id = Ice.Util.stringToIdentity("communicator");
+            adapter.add(new RemoteCommunicatorI(), id);
+            adapter.activate();
+
+            // Disable ready print for further adapters.
+            communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/acm/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/acm/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.acm;
 import test.Ice.acm.Test._TestIntfDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
@@ -25,14 +20,14 @@
     }
 
     public static TestIntfPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        java.io.PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        java.io.PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -77,11 +72,12 @@
             out.flush();
             for(int i = 0; i < 10; ++i)
             {
-                Ice.InitializationData initData = app.createInitializationData();
+                Ice.InitializationData initData = new Ice.InitializationData();
                 initData.properties = communicator.getProperties()._clone();
-                Ice.Communicator comm = app.initialize(initData);
-                comm.stringToProxy("test:" + app.getTestEndpoint(0)).begin_ice_ping();
-                comm.destroy();
+                try(Ice.Communicator comm = helper.initialize(initData))
+                {
+                    comm.stringToProxy("test:" + helper.getTestEndpoint(0)).begin_ice_ping();
+                }
             }
             out.println("ok");
         }
@@ -170,7 +166,8 @@
 
             try
             {
-                router = Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(1)));
+                router =
+                    Ice.RouterPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(1)));
                 communicator.createObjectAdapterWithRouter("", router);
                 test(false);
             }
@@ -184,10 +181,10 @@
         out.flush();
         {
             Ice.ObjectAdapter adapter1 =
-                communicator.createObjectAdapterWithEndpoints("Adpt1", app.getTestEndpoint(10));
+                communicator.createObjectAdapterWithEndpoints("Adpt1", helper.getTestEndpoint(10));
             try
             {
-                communicator.createObjectAdapterWithEndpoints("Adpt2", app.getTestEndpoint(10));
+                communicator.createObjectAdapterWithEndpoints("Adpt2", helper.getTestEndpoint(10));
                 test(false);
             }
             catch(Ice.LocalException ex)
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    public int
+    public void
     run(String[] args)
     {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,29 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ServantLocator locator = new ServantLocatorI();
-        adapter.addServantLocator(locator, "");
-
-        AllTests.allTests(this);
-
-        adapter.waitForDeactivate();
-        return 0;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-
+        Ice.Properties properties = createTestProperties(args);
         //
         // 2 threads are necessary to dispatch the collocated transient() call with AMI
         //
-        initData.properties.setProperty("TestAdapter.ThreadPool.Size", "2");
+        properties.setProperty("TestAdapter.ThreadPool.Size", "2");
 
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.exit(result);
+        properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ServantLocator locator = new ServantLocatorI();
+            adapter.addServantLocator(locator, "");
+            AllTests.allTests(this);
+            adapter.waitForDeactivate();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/CookieI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ServantLocator locator = new ServantLocatorI();
-
-        adapter.addServantLocator(locator, "");
-        adapter.activate();
-        serverReady();
-        adapter.waitForDeactivate();
-        return 0;
-    }
-
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ServantLocator locator = new ServantLocatorI();
+
+            adapter.addServantLocator(locator, "");
+            adapter.activate();
+            serverReady();
+            adapter.waitForDeactivate();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/adapterDeactivation/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/adapterDeactivation/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.adapterDeactivation;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
@@ -100,9 +95,9 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing communicator operations... ");
         out.flush();
@@ -110,81 +105,84 @@
             //
             // Test: Exercise addAdminFacet, findAdminFacet, removeAdminFacet with a typical configuration.
             //
-            Ice.InitializationData init = app.createInitializationData();
+            Ice.InitializationData init = new Ice.InitializationData();
             init.properties = Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
             init.properties.setProperty("Ice.Admin.InstanceName", "Test");
-            Ice.Communicator com = Ice.Util.initialize(init);
-            testFacets(com, true);
-            com.destroy();
+            try(Ice.Communicator com = Ice.Util.initialize(init))
+            {
+                testFacets(com, true);
+            }
         }
         {
             //
             // Test: Verify that the operations work correctly in the presence of facet filters.
             //
-            Ice.InitializationData init = app.createInitializationData();
+            Ice.InitializationData init = new Ice.InitializationData();
             init.properties = Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
             init.properties.setProperty("Ice.Admin.InstanceName", "Test");
             init.properties.setProperty("Ice.Admin.Facets", "Properties");
-            Ice.Communicator com = Ice.Util.initialize(init);
-            testFacets(com, false);
-            com.destroy();
+            try(Ice.Communicator com = Ice.Util.initialize(init))
+            {
+                testFacets(com, false);
+            }
         }
         {
             //
             // Test: Verify that the operations work correctly with the Admin object disabled.
             //
-            Ice.Communicator com = Ice.Util.initialize();
-            testFacets(com, false);
-            com.destroy();
+            try(Ice.Communicator com = Ice.Util.initialize())
+            {
+                testFacets(com, false);
+            }
         }
         {
             //
             // Test: Verify that the operations work correctly when Ice.Admin.Enabled is set
             //
-            Ice.InitializationData init = app.createInitializationData();
+            Ice.InitializationData init = new Ice.InitializationData();
             init.properties = Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Enabled", "1");
-            Ice.Communicator com = Ice.Util.initialize(init);
-
-            test(com.getAdmin() == null);
-            Ice.Identity id = Ice.Util.stringToIdentity("test-admin");
-            try
-            {
-                com.createAdmin(null, id);
-                test(false);
-            }
-            catch(Ice.InitializationException ex)
+            try(Ice.Communicator com = Ice.Util.initialize(init))
             {
+                test(com.getAdmin() == null);
+                Ice.Identity id = Ice.Util.stringToIdentity("test-admin");
+                try
+                {
+                    com.createAdmin(null, id);
+                    test(false);
+                }
+                catch(Ice.InitializationException ex)
+                {
+                }
+                Ice.ObjectAdapter adapter = com.createObjectAdapter("");
+                test(com.createAdmin(adapter, id) != null);
+                test(com.getAdmin() != null);
+                testFacets(com, true);
             }
-
-            Ice.ObjectAdapter adapter = com.createObjectAdapter("");
-            test(com.createAdmin(adapter, id) != null);
-            test(com.getAdmin() != null);
-            testFacets(com, true);
-            com.destroy();
         }
         {
             //
             // Test: Verify that the operations work correctly when creation of the Admin object is delayed.
             //
-            Ice.InitializationData init = app.createInitializationData();
+            Ice.InitializationData init = new Ice.InitializationData();
             init.properties = Ice.Util.createProperties();
             init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
             init.properties.setProperty("Ice.Admin.InstanceName", "Test");
             init.properties.setProperty("Ice.Admin.DelayCreation", "1");
-            Ice.Communicator com = Ice.Util.initialize(init);
-            testFacets(com, true);
-            com.getAdmin();
-            testFacets(com, true);
-            com.destroy();
+            try(Ice.Communicator com = Ice.Util.initialize(init))
+            {
+                testFacets(com, true);
+                com.getAdmin();
+                testFacets(com, true);
+            }
         }
         out.println("ok");
 
-        String ref = "factory:" + app.getTestEndpoint(0) + " -t 10000";
+        String ref = "factory:" + helper.getTestEndpoint(0) + " -t 10000";
         RemoteCommunicatorFactoryPrx factory =
-            RemoteCommunicatorFactoryPrxHelper.uncheckedCast(app.communicator().stringToProxy(ref));
+            RemoteCommunicatorFactoryPrxHelper.uncheckedCast(helper.communicator().stringToProxy(ref));
 
         out.print("testing process facet... ");
         out.flush();
@@ -352,7 +350,7 @@
             // Now, test RemoteLogger
             //
             Ice.ObjectAdapter adapter =
-                app.communicator().createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost");
+                helper.communicator().createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost");
 
             RemoteLoggerI remoteLogger = new RemoteLoggerI();
 
@@ -364,7 +362,6 @@
             // No filtering
             //
             logMessages = logger.getLog(null, null, -1, prefix);
-            remoteLogger.checkNextInit(prefix.value, logMessages);
 
             try
             {
@@ -374,13 +371,13 @@
             {
                 test(false);
             }
-
             remoteLogger.wait(1);
 
-            remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace", "testCat");
-            remoteLogger.checkNextLog(Ice.LogMessageType.WarningMessage, "rwarning", "");
-            remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror", "");
-            remoteLogger.checkNextLog(Ice.LogMessageType.PrintMessage, "rprint", "");
+            for(int i = 0; i < logMessages.length; ++i)
+            {
+                Ice.LogMessage m = logMessages[i];
+                remoteLogger.checkNextInit(prefix.value, m.type, m.message, m.traceCategory);
+            }
 
             com.trace("testCat", "rtrace");
             com.warning("rwarning");
@@ -389,6 +386,11 @@
 
             remoteLogger.wait(4);
 
+            remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace", "testCat");
+            remoteLogger.checkNextLog(Ice.LogMessageType.WarningMessage, "rwarning", "");
+            remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror", "");
+            remoteLogger.checkNextLog(Ice.LogMessageType.PrintMessage, "rprint", "");
+
             test(logger.detachRemoteLogger(myProxy));
             test(!logger.detachRemoteLogger(myProxy));
 
@@ -397,7 +399,6 @@
             //
             logMessages = logger.getLog(messageTypes, categories, 4, prefix);
             test(logMessages.length == 4);
-            remoteLogger.checkNextInit(prefix.value, logMessages);
 
             try
             {
@@ -409,9 +410,11 @@
             }
 
             remoteLogger.wait(1);
-
-            remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace2", "testCat");
-            remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror2", "");
+            for(int i = 0; i < logMessages.length; ++i)
+            {
+                Ice.LogMessage m = logMessages[i];
+                remoteLogger.checkNextInit(prefix.value, m.type, m.message, m.traceCategory);
+            }
 
             com.warning("rwarning2");
             com.trace("testCat", "rtrace2");
@@ -421,6 +424,9 @@
 
             remoteLogger.wait(2);
 
+            remoteLogger.checkNextLog(Ice.LogMessageType.TraceMessage, "rtrace2", "testCat");
+            remoteLogger.checkNextLog(Ice.LogMessageType.ErrorMessage, "rerror2", "");
+
             //
             // Attempt reconnection with slightly different proxy
             //
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(args))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
@@ -15,8 +10,11 @@
     @Override
     public synchronized void init(String prefix, Ice.LogMessage[] logMessages, Ice.Current current)
     {
-        test(prefix.equals(_expectedPrefix));
-        test(java.util.Arrays.equals(logMessages, _expectedInitMessages));
+        _prefix = prefix;
+        for(int i = 0; i < logMessages.length; ++i)
+        {
+            _initMessages.add(logMessages[i]);
+        }
         _receivedCalls++;
         notifyAll();
     }
@@ -24,24 +22,28 @@
     @Override
     public synchronized void log(Ice.LogMessage logMessage, Ice.Current current)
     {
-        Ice.LogMessage front = _expectedLogMessages.pollFirst();
-        test(front.type == logMessage.type && front.message.equals(logMessage.message) &&
-             front.traceCategory.equals(logMessage.traceCategory));
-
+        _logMessages.add(logMessage);
         _receivedCalls++;
         notifyAll();
     }
 
-    synchronized void checkNextInit(String prefix, Ice.LogMessage[] logMessages)
-    {
-        _expectedPrefix = prefix;
-        _expectedInitMessages = logMessages;
-    }
-
-    synchronized void checkNextLog(Ice.LogMessageType messageType, String message, String category)
+    synchronized void checkNextInit(String prefix, Ice.LogMessageType type, String message, String category)
     {
-        Ice.LogMessage logMessage = new Ice.LogMessage(messageType, 0, category, message);
-        _expectedLogMessages.addLast(logMessage);
+        test(_prefix.equals(prefix));
+        test(_initMessages.size() > 0);
+        Ice.LogMessage logMessage = _initMessages.pop();
+        test(logMessage.type == type);
+        test(logMessage.message.equals(message));
+        test(logMessage.traceCategory.equals(category));
+    }
+
+    synchronized void checkNextLog(Ice.LogMessageType type, String message, String category)
+    {
+        test(_logMessages.size() > 0);
+        Ice.LogMessage logMessage = _logMessages.pop();
+        test(logMessage.type == type);
+        test(logMessage.message.equals(message));
+        test(logMessage.traceCategory.equals(category));
     }
 
     synchronized void wait(int calls)
@@ -71,7 +73,7 @@
     }
 
     private int _receivedCalls;
-    private String _expectedPrefix;
-    private Ice.LogMessage[] _expectedInitMessages;
-    private java.util.Deque<Ice.LogMessage> _expectedLogMessages = new java.util.ArrayDeque<Ice.LogMessage>();
+    private String _prefix;
+    private java.util.Deque<Ice.LogMessage> _initMessages = new java.util.ArrayDeque<Ice.LogMessage>();
+    private java.util.Deque<Ice.LogMessage> _logMessages = new java.util.ArrayDeque<Ice.LogMessage>();
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new RemoteCommunicatorFactoryI(), Ice.Util.stringToIdentity("factory"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.admin");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.admin");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new RemoteCommunicatorFactoryI(), Ice.Util.stringToIdentity("factory"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/TestFacetI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/TestFacetI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/TestFacetI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/TestFacetI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.admin;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
@@ -15,7 +10,6 @@
 import test.Ice.ami.Test.TestIntfPrxHelper;
 import test.Ice.ami.Test.TestIntfControllerPrx;
 import test.Ice.ami.Test.TestIntfControllerPrxHelper;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -29,25 +23,25 @@
     }
 
     public static void
-    allTests(Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "test:" + app.getTestEndpoint(0);
+        String sref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         TestIntfPrx p = TestIntfPrxHelper.uncheckedCast(obj);
 
-        sref = "testController:" + app.getTestEndpoint(1);
+        sref = "testController:" + helper.getTestEndpoint(1);
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         TestIntfControllerPrx testController = TestIntfControllerPrxHelper.uncheckedCast(obj);
 
         out.println("testing with new AMI mapping... ");
-        test.Ice.ami.AMI.run(app, communicator, collocated, p, testController);
+        test.Ice.ami.AMI.run(helper, communicator, collocated, p, testController);
 
         //
         // Use reflection to load TwowaysLambdaAMI as that is only supported with Java >= 1.8
@@ -61,7 +55,7 @@
                     "run",
                     new Class<?>[]
                     {
-                        test.Util.Application.class,
+                        test.TestHelper.class,
                         Ice.Communicator.class,
                         boolean.class,
                         TestIntfPrx.class,
@@ -69,7 +63,7 @@
                     });
                 out.println("testing with lambda AMI mapping... ");
                 out.flush();
-                run.invoke(null, app, communicator, collocated, p, testController);
+                run.invoke(null, helper, communicator, collocated, p, testController);
             }
         }
         catch(java.lang.NoSuchMethodException ex)
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/AMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/AMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/AMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/AMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
@@ -20,7 +15,6 @@
 import test.Ice.ami.Test.Callback_TestIntf_opWithUE;
 import test.Ice.ami.Test.Callback_TestIntf_opWithPayload;
 import test.Ice.ami.Test.CloseMode;
-import test.Util.Application;
 
 public class AMI
 {
@@ -626,11 +620,11 @@
     }
 
     public static void
-    run(Application app, Ice.Communicator communicator, boolean collocated, TestIntfPrx p,
+    run(test.TestHelper helper, Ice.Communicator communicator, boolean collocated, TestIntfPrx p,
         TestIntfControllerPrx testController)
     {
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing begin/end invocation... ");
         out.flush();
@@ -1207,15 +1201,15 @@
             //
             if(p.ice_getConnection() != null)
             {
-                Ice.InitializationData initData = app.createInitializationData();
+                Ice.InitializationData initData = new Ice.InitializationData();
                 initData.properties = communicator.getProperties()._clone();
-                Ice.Communicator ic = app.initialize(initData);
-                Ice.ObjectPrx o = ic.stringToProxy(p.toString());
-                TestIntfPrx p2 = TestIntfPrxHelper.uncheckedCast(o);
-                ic.destroy();
 
                 try
                 {
+                    Ice.Communicator ic = helper.initialize(initData);
+                    Ice.ObjectPrx o = ic.stringToProxy(p.toString());
+                    TestIntfPrx p2 = TestIntfPrxHelper.uncheckedCast(o);
+                    ic.destroy();
                     p2.begin_op();
                     test(false);
                 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this, false);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami");
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.ami");
+        properties.setProperty("Ice.Warn.AMICallback", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         //
         // Limit the send buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        properties.setProperty("Ice.TCP.SndSize", "50000");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this, false);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Collocated test doesn't need to activate the OA
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Collocated test doesn't need to activate the OA
-
-        AllTests.allTests(this, true);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-        return initData;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.ami");
+        properties.setProperty("Ice.Warn.AMICallback", "0");
+
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Collocated test doesn't need to activate the OA
+
+            properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
+            Ice.ObjectAdapter adapter2  = communicator.createObjectAdapter("ControllerAdapter");
+            adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+            //adapter2.activate(); // Collocated test doesn't need to activate the OA
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+            AllTests.allTests(this, true);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/lambda/AMI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,1156 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Ice.ami.lambda;
-
-import java.io.PrintWriter;
-
-import test.Ice.ami.Test.TestIntfPrx;
-import test.Ice.ami.Test.TestIntfPrxHelper;
-import test.Ice.ami.Test.TestIntfControllerPrx;
-import test.Ice.ami.Test.TestIntfControllerPrxHelper;
-import test.Ice.ami.Test.TestIntfException;
-import test.Ice.ami.Test.Callback_TestIntf_op;
-import test.Ice.ami.Test.Callback_TestIntf_opWithResult;
-import test.Ice.ami.Test.Callback_TestIntf_opWithUE;
-import test.Ice.ami.Test.Callback_TestIntf_opWithPayload;
-import test.Util.Application;
-
-public class AMI
-{
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    private static class CallbackBase
-    {
-        CallbackBase()
-        {
-            _called = false;
-        }
-
-        public synchronized void check()
-        {
-            while(!_called)
-            {
-                try
-                {
-                    wait();
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-
-            _called = false;
-        }
-
-        public synchronized void called()
-        {
-            assert(!_called);
-            _called = true;
-            notify();
-        }
-
-        private boolean _called;
-    }
-
-    static class AsyncCallback extends CallbackBase
-    {
-        public AsyncCallback()
-        {
-        }
-
-        public void
-        isA(Ice.AsyncResult result)
-        {
-            test(result.getProxy().end_ice_isA(result));
-            called();
-        }
-
-        public void
-        ping(Ice.AsyncResult result)
-        {
-            result.getProxy().end_ice_ping(result);
-            called();
-        }
-
-        public void
-        id(Ice.AsyncResult result)
-        {
-            test(result.getProxy().end_ice_id(result).equals("::Test::TestIntf"));
-            called();
-        }
-
-        public void
-        ids(Ice.AsyncResult result)
-        {
-            test(result.getProxy().end_ice_ids(result).length == 2);
-            called();
-        }
-
-        public void
-        connection(Ice.AsyncResult result)
-        {
-            test(result.getProxy().end_ice_getConnection(result) != null);
-            called();
-        }
-
-        public void
-        op(Ice.AsyncResult result)
-        {
-            TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
-            called();
-        }
-
-        public void
-        opWithResult(Ice.AsyncResult result)
-        {
-            test(TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithResult(result) == 15);
-            called();
-        }
-
-        public void
-        opWithUE(Ice.AsyncResult result)
-        {
-            try
-            {
-                TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_opWithUE(result);
-                test(false);
-            }
-            catch(TestIntfException ex)
-            {
-                called();
-            }
-            catch(Ice.Exception ex)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        isAEx(Ice.AsyncResult result)
-        {
-            try
-            {
-                result.getProxy().end_ice_isA(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-                called();
-            }
-            catch(Ice.Exception ex)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        pingEx(Ice.AsyncResult result)
-        {
-            try
-            {
-                result.getProxy().end_ice_ping(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-                called();
-            }
-            catch(Ice.Exception ex)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        idEx(Ice.AsyncResult result)
-        {
-            try
-            {
-                result.getProxy().end_ice_id(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-                called();
-            }
-            catch(Ice.Exception ex)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        idsEx(Ice.AsyncResult result)
-        {
-            try
-            {
-                result.getProxy().end_ice_ids(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-                called();
-            }
-            catch(Ice.Exception ex)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        connectionEx(Ice.AsyncResult result)
-        {
-            try
-            {
-                result.getProxy().end_ice_getConnection(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-                called();
-            }
-            catch(Ice.Exception ex)
-            {
-                test(false);
-            }
-        }
-
-        public void
-        opEx(Ice.AsyncResult result)
-        {
-            try
-            {
-                TestIntfPrxHelper.uncheckedCast(result.getProxy()).end_op(result);
-                test(false);
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-                called();
-            }
-            catch(Ice.Exception ex)
-            {
-                test(false);
-            }
-        }
-    }
-
-    static class ResponseCallback extends CallbackBase
-    {
-        ResponseCallback()
-        {
-        }
-
-        public void
-        isA(boolean r)
-        {
-            test(r);
-            called();
-        }
-
-        public void
-        ping()
-        {
-            called();
-        }
-
-        public void
-        id(String id)
-        {
-            test(id.equals("::Test::TestIntf"));
-            called();
-        }
-
-        public void
-        ids(String[] ids)
-        {
-            test(ids.length == 2);
-            called();
-        }
-
-        public void
-        connection(Ice.Connection conn)
-        {
-            test(conn != null);
-            called();
-        }
-
-        public void
-        op()
-        {
-            called();
-        }
-
-        public void
-        opWithResult(int r)
-        {
-            test(r == 15);
-            called();
-        }
-
-        public void
-        opWithUE(Ice.UserException e)
-        {
-            try
-            {
-                throw e;
-            }
-            catch(TestIntfException ex)
-            {
-                called();
-            }
-            catch(Ice.UserException ex)
-            {
-                test(false);
-            }
-        }
-    }
-
-    static class ExceptionCallback extends CallbackBase
-    {
-        public ExceptionCallback()
-        {
-        }
-
-        public void
-        isA(boolean r)
-        {
-            test(false);
-        }
-
-        public void
-        ping()
-        {
-            test(false);
-        }
-
-        public void
-        id(String id)
-        {
-            test(false);
-        }
-
-        public void
-        ids(String[] ids)
-        {
-            test(false);
-        }
-
-        public void
-        connection(Ice.Connection conn)
-        {
-            test(false);
-        }
-
-        public void
-        op()
-        {
-            test(false);
-        }
-
-        public void
-        ex(Ice.Exception ex)
-        {
-            test(ex instanceof Ice.NoEndpointException);
-            called();
-        }
-
-        public void
-        noEx(Ice.Exception ex)
-        {
-            test(false);
-        }
-    }
-
-    static class SentCallback extends CallbackBase
-    {
-        SentCallback()
-        {
-            _thread = Thread.currentThread().getId();
-        }
-
-        public void
-        isA(boolean r)
-        {
-        }
-
-        public void
-        ping()
-        {
-        }
-
-        public void
-        id(String s)
-        {
-        }
-
-        public void
-        ids(String[] s)
-        {
-        }
-
-        public void
-        opAsync(Ice.AsyncResult r)
-        {
-        }
-
-        public void
-        op()
-        {
-        }
-
-        public void
-        ex(Ice.Exception ex)
-        {
-        }
-
-        public void
-        sent(Ice.AsyncResult r)
-        {
-            test(r.sentSynchronously() && _thread == Thread.currentThread().getId() ||
-                 !r.sentSynchronously() && _thread != Thread.currentThread().getId());
-            called();
-        }
-
-        public void
-        sent(boolean ss)
-        {
-            test(ss && _thread == Thread.currentThread().getId() ||
-                 !ss && _thread != Thread.currentThread().getId());
-            called();
-        }
-
-        long _thread;
-    }
-
-    static class FlushCallback extends CallbackBase
-    {
-        FlushCallback()
-        {
-            _thread = Thread.currentThread().getId();
-        }
-
-        public void
-        completedAsync(Ice.AsyncResult r)
-        {
-            test(false);
-        }
-
-        public void
-        exception(Ice.Exception ex)
-        {
-            test(false);
-        }
-
-        public void
-        sentAsync(Ice.AsyncResult r)
-        {
-            test((r.sentSynchronously() && _thread == Thread.currentThread().getId()) ||
-                 (!r.sentSynchronously() && _thread != Thread.currentThread().getId()));
-            called();
-        }
-
-        public void
-        sent(boolean sentSynchronously)
-        {
-            test((sentSynchronously && _thread == Thread.currentThread().getId()) ||
-                 (!sentSynchronously && _thread != Thread.currentThread().getId()));
-            called();
-        }
-
-        long _thread;
-    }
-
-    static class FlushExCallback extends CallbackBase
-    {
-        FlushExCallback()
-        {
-        }
-
-        public void
-        completedAsync(Ice.AsyncResult r)
-        {
-            try
-            {
-                if(r.getConnection() != null)
-                {
-                    r.getConnection().end_flushBatchRequests(r);
-                }
-                else
-                {
-                    r.getProxy().end_ice_flushBatchRequests(r);
-                }
-                test(false);
-            }
-            catch(Ice.Exception ex)
-            {
-                called();
-            }
-        }
-
-        public void
-        exception(Ice.Exception ex)
-        {
-            called();
-        }
-
-        public void
-        sentAsync(Ice.AsyncResult r)
-        {
-            test(false);
-        }
-
-        public void
-        sent(boolean sentSynchronously)
-        {
-            test(false);
-        }
-    }
-
-    enum ThrowType { LocalException, OtherException };
-
-    static class Thrower extends CallbackBase
-    {
-        public Thrower(ThrowType t)
-        {
-            _t = t;
-        }
-
-        public void
-        opAsync(Ice.AsyncResult r)
-        {
-            called();
-            throwEx();
-        }
-
-        public void
-        op()
-        {
-            called();
-            throwEx();
-        }
-
-        public void
-        noOp()
-        {
-        }
-
-        public void
-        ex(Ice.Exception ex)
-        {
-            called();
-            throwEx();
-        }
-
-        public void
-        sent(boolean ss)
-        {
-            called();
-            throwEx();
-        }
-
-        private void
-        throwEx()
-        {
-            switch(_t)
-            {
-            case LocalException:
-            {
-                throw new Ice.ObjectNotExistException();
-            }
-            case OtherException:
-            {
-                throw new RuntimeException();
-            }
-            default:
-            {
-                assert(false);
-                break;
-            }
-            }
-        }
-
-        ThrowType _t;
-    }
-
-    public static void
-    run(Application app, Ice.Communicator communicator, boolean collocated, TestIntfPrx p,
-        TestIntfControllerPrx testController)
-    {
-
-        PrintWriter out = app.getWriter();
-
-        out.print("testing response callback... ");
-        out.flush();
-        {
-            final ResponseCallback cb = new ResponseCallback();
-            java.util.Map<String, String> ctx = new java.util.HashMap<String, String>();
-
-            p.begin_ice_isA("::Test::TestIntf",
-                (boolean r) -> cb.isA(r),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_ice_isA("::Test::TestIntf",
-                (boolean r) -> cb.isA(r),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_ice_ping(
-                () -> cb.ping(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_ice_ping(ctx,
-                () -> cb.ping(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_ice_id(
-                (String id) -> cb.id(id),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_ice_id(ctx,
-                (String id) -> cb.id(id),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_ice_ids(
-                (String[] ids) -> cb.ids(ids),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_ice_ids(ctx,
-                (String[] ids) -> cb.ids(ids),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            if(!collocated)
-            {
-                p.begin_ice_getConnection(
-                    (Ice.Connection conn) -> cb.connection(conn),
-                    (Ice.Exception ex) -> test(false));
-                cb.check();
-            }
-
-            p.begin_op(
-                () -> cb.op(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_op(ctx,
-                () -> cb.op(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_opWithResult(
-                (int r) -> cb.opWithResult(r),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_opWithResult(ctx,
-                (int r) -> cb.opWithResult(r),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_opWithUE(
-                () -> test(false),
-                (Ice.UserException ex) -> cb.opWithUE(ex),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-
-            p.begin_opWithUE(ctx,
-                () -> test(false),
-                (Ice.UserException ex) -> cb.opWithUE(ex),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-        out.println("ok");
-
-        out.print("testing local exceptions with response callback... ");
-        out.flush();
-        {
-            TestIntfPrx i = TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            final ExceptionCallback cb = new ExceptionCallback();
-
-            i.begin_ice_isA("::Test::TestIntf",
-                (boolean r) -> test(false),
-                (Ice.Exception ex) -> cb.ex(ex));
-            cb.check();
-
-            i.begin_ice_ping(
-                () -> test(false),
-                (Ice.Exception ex) -> cb.ex(ex));
-            cb.check();
-
-            i.begin_ice_id(
-                (String id) -> test(false),
-                (Ice.Exception ex) -> cb.ex(ex));
-            cb.check();
-
-            i.begin_ice_ids(
-                (String[] ids) -> test(false),
-                (Ice.Exception ex) -> cb.ex(ex));
-            cb.check();
-
-            if(!collocated)
-            {
-                i.begin_ice_getConnection(
-                    (Ice.Connection conn) -> test(false),
-                    (Ice.Exception ex) -> cb.ex(ex));
-                cb.check();
-            }
-
-            i.begin_op(
-                () -> test(false),
-                (Ice.Exception ex) -> cb.ex(ex));
-            cb.check();
-        }
-        out.println("ok");
-
-        out.print("testing sent callback... ");
-        out.flush();
-        {
-            final SentCallback cb = new SentCallback();
-
-            p.begin_ice_isA("",
-                (boolean r) -> cb.isA(r),
-                (Ice.Exception ex) -> cb.ex(ex),
-                (boolean ss) -> cb.sent(ss));
-            cb.check();
-
-            p.begin_ice_ping(
-                () -> cb.ping(),
-                (Ice.Exception ex) -> cb.ex(ex),
-                (boolean ss) -> cb.sent(ss));
-            cb.check();
-
-            p.begin_ice_id(
-                (String id) -> cb.id(id),
-                (Ice.Exception ex) -> cb.ex(ex),
-                (boolean ss) -> cb.sent(ss));
-            cb.check();
-
-            p.begin_ice_ids(
-                (String[] ids) -> cb.ids(ids),
-                (Ice.Exception ex) -> cb.ex(ex),
-                (boolean ss) -> cb.sent(ss));
-            cb.check();
-
-            p.begin_op(
-                () -> cb.op(),
-                (Ice.Exception ex) -> cb.ex(ex),
-                (boolean ss) -> cb.sent(ss));
-            cb.check();
-
-            java.util.List<SentCallback> cbs = new java.util.ArrayList<SentCallback>();
-            byte[] seq = new byte[10024];
-            new java.util.Random().nextBytes(seq); // Make sure the request doesn't compress too well.
-            Ice.AsyncResult r;
-            testController.holdAdapter();
-            try
-            {
-                do
-                {
-                    final SentCallback cb2 = new SentCallback();
-                    r = p.begin_opWithPayload(seq,
-                        () -> {},
-                        (Ice.Exception ex) -> cb2.ex(ex),
-                        (boolean ss) -> cb2.sent(ss));
-                    cbs.add(cb2);
-                }
-                while(r.sentSynchronously());
-            }
-            finally
-            {
-                testController.resumeAdapter();
-            }
-            for(SentCallback cb3 : cbs)
-            {
-                cb3.check();
-            }
-        }
-        out.println("ok");
-
-        out.print("testing unexpected exceptions from callback... ");
-        out.flush();
-        {
-            TestIntfPrx q = TestIntfPrxHelper.uncheckedCast(p.ice_adapterId("dummy"));
-            ThrowType throwEx[] = { ThrowType.LocalException, ThrowType.OtherException };
-
-            for(int i = 0; i < 2; ++i)
-            {
-                final Thrower cb = new Thrower(throwEx[i]);
-
-                p.begin_op(
-                    () -> cb.op(),
-                    null);
-                cb.check();
-
-                q.begin_op(
-                    () -> cb.op(),
-                    (Ice.Exception ex) -> cb.ex(ex));
-                cb.check();
-
-                p.begin_op(
-                    () -> {},
-                    (Ice.Exception ex) -> {},
-                    (boolean ss) -> cb.sent(ss));
-                cb.check();
-            }
-        }
-        out.println("ok");
-
-        out.print("testing batch requests with proxy... ");
-        out.flush();
-        {
-            {
-                //
-                // Type-safe.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.opBatch();
-                final FlushCallback cb = new FlushCallback();
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
-                    null,
-                    (Ice.Exception ex) -> cb.exception(ex),
-                    (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                cb.check();
-                test(r.isSent());
-                test(r.isCompleted());
-                test(p.waitForBatch(2));
-            }
-
-            if(p.ice_getConnection() != null)
-            {
-                //
-                // Type-safe exception.
-                //
-                test(p.opBatchCount() == 0);
-                TestIntfPrx b1 = (TestIntfPrx)p.ice_batchOneway();
-                b1.opBatch();
-                b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                final FlushCallback cb = new FlushCallback();
-                Ice.AsyncResult r = b1.begin_ice_flushBatchRequests(
-                    null,
-                    (Ice.Exception ex) -> cb.exception(ex),
-                    (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                cb.check();
-                test(r.isSent());
-                test(r.isCompleted());
-                test(p.waitForBatch(1));
-            }
-        }
-        out.println("ok");
-
-        if(p.ice_getConnection() != null)
-        {
-            out.print("testing batch requests with connection... ");
-            out.flush();
-            {
-                {
-                    //
-                    // Type-safe.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    final FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb.exception(ex),
-                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                    cb.check();
-                    test(r.isSent());
-                    test(r.isCompleted());
-                    test(p.waitForBatch(2));
-
-                    final FlushCallback cb2 = new FlushCallback();
-                    Ice.AsyncResult r2 = b1.ice_getConnection().begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb2.exception(ex),
-                        (boolean sentSynchronously) -> cb2.sent(sentSynchronously));
-                    cb2.check();
-                    test(r2.isSent());
-                    test(r2.isCompleted());
-                }
-
-                {
-                    //
-                    // Type-safe exception.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    final FlushExCallback cb = new FlushExCallback();
-                    Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb.exception(ex),
-                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                    cb.check();
-                    test(!r.isSent());
-                    test(r.isCompleted());
-                    test(p.opBatchCount() == 0);
-                }
-            }
-            out.println("ok");
-
-            out.print("testing batch requests with communicator... ");
-            out.flush();
-            {
-                {
-                    //
-                    // Type-safe - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.opBatch();
-                    final FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb.exception(ex),
-                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                    cb.check();
-                    test(r.isSent());
-                    test(r.isCompleted());
-                    test(p.waitForBatch(2));
-                }
-
-                {
-                    //
-                    // Type-safe exception - 1 connection.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    b1.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    final FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb.exception(ex),
-                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.isCompleted());
-                    test(p.opBatchCount() == 0);
-                }
-
-                {
-                    //
-                    // 2 connections.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b1.opBatch();
-                    b2.opBatch();
-                    b2.opBatch();
-                    final FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb.exception(ex),
-                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                    cb.check();
-                    test(r.isSent());
-                    test(r.isCompleted());
-                    test(p.waitForBatch(4));
-                }
-
-                {
-                    //
-                    // Exception - 2 connections - 1 failure.
-                    //
-                    // All connections should be flushed even if there are failures on some connections.
-                    // Exceptions should not be reported.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    final FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb.exception(ex),
-                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.isCompleted());
-                    test(p.waitForBatch(1));
-                }
-
-                {
-                    //
-                    // Exception - 2 connections - 2 failures.
-                    //
-                    // The sent callback should be invoked even if all connections fail.
-                    //
-                    test(p.opBatchCount() == 0);
-                    TestIntfPrx b1 = TestIntfPrxHelper.uncheckedCast(p.ice_getConnection().createProxy(
-                                                                         p.ice_getIdentity()).ice_batchOneway());
-                    TestIntfPrx b2 = TestIntfPrxHelper.uncheckedCast(
-                        p.ice_connectionId("2").ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway());
-                    b2.ice_getConnection(); // Ensure connection is established.
-                    b1.opBatch();
-                    b2.opBatch();
-                    b1.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    b2.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-                    final FlushCallback cb = new FlushCallback();
-                    Ice.AsyncResult r = communicator.begin_flushBatchRequests(
-                        Ice.CompressBatch.BasedOnProxy,
-                        null,
-                        (Ice.Exception ex) -> cb.exception(ex),
-                        (boolean sentSynchronously) -> cb.sent(sentSynchronously));
-                    cb.check();
-                    test(r.isSent()); // Exceptions are ignored!
-                    test(r.isCompleted());
-                    test(p.opBatchCount() == 0);
-                }
-            }
-            out.println("ok");
-        }
-
-        out.print("testing null callbacks...");
-        try
-        {
-            IceInternal.Functional_VoidCallback response = null;
-            IceInternal.Functional_GenericCallback1<Ice.Exception> exception = null;
-            p.begin_ice_ping(response, exception);
-            test(false);
-        }
-        catch(IllegalArgumentException ex)
-        {
-            // Excepted when response and exception callback are both null.
-        }
-
-        try
-        {
-            p.begin_ice_ping(() -> {}, null);
-
-        }
-        catch(IllegalArgumentException ex)
-        {
-            test(false);
-        }
-
-        try
-        {
-            p.begin_ice_ping(null, (Ice.Exception ex) -> {});
-
-        }
-        catch(IllegalArgumentException ex)
-        {
-            test(false);
-        }
-
-        try
-        {
-            IceInternal.Functional_BoolCallback response = null;
-            IceInternal.Functional_GenericCallback1<Ice.Exception> exception = null;
-            p.begin_ice_isA("::Test::TestIntf", response, exception);
-            test(false);
-        }
-        catch(IllegalArgumentException ex)
-        {
-            // Excepted when response and exception callback are both null.
-        }
-
-        try
-        {
-            p.begin_ice_isA("::Test::TestIntf", (boolean v) -> {}, null);
-
-        }
-        catch(IllegalArgumentException ex)
-        {
-            test(false);
-        }
-
-        try
-        {
-            p.begin_ice_isA("::Test::TestIntf", null, (Ice.Exception ex) -> {});
-
-        }
-        catch(IllegalArgumentException ex)
-        {
-            test(false);
-        }
-
-        try
-        {
-            IceInternal.Functional_VoidCallback response = null;
-            p.begin_opWithUE(response, null, (Ice.Exception ex) -> {});
-            test(false);
-        }
-        catch(IllegalArgumentException ex)
-        {
-            // Excepted when response and exception callback are both null, for
-            // an operation that throws user exceptions both user exception callback
-            // an local exception callback must be present.
-        }
-
-        try
-        {
-            IceInternal.Functional_VoidCallback response = null;
-            p.begin_opWithUE(response, (Ice.UserException ex) -> {}, null);
-            test(false);
-        }
-        catch(IllegalArgumentException ex)
-        {
-            // Excepted when response and exception callback are both null, for
-            // an operation that throws user exceptions both user exception callback
-            // an local exception callback must be present.
-        }
-
-        try
-        {
-            IceInternal.Functional_VoidCallback response = null;
-            IceInternal.Functional_GenericCallback1<Ice.UserException> userException = null;
-            IceInternal.Functional_GenericCallback1<Ice.Exception> exception = null;
-            p.begin_opWithUE(response, userException, exception);
-            test(false);
-        }
-        catch(IllegalArgumentException ex)
-        {
-            // Excepted when response and exception callback are both null.
-        }
-        out.println("ok");
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,43 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
-    run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.add(new TestII(), Ice.Util.stringToIdentity("test2"));
-        adapter.activate();
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.ami");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        return initData;
-    }
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+            adapter.add(new TestII(), Ice.Util.stringToIdentity("test2"));
+            adapter.activate();
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+            Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
+            adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+            adapter2.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.ami;
 
 import test.Ice.ami.Test._TestIntfControllerDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -58,7 +53,7 @@
     float opFloat(float f);
     double opDouble(double d);
 
-    void pingBiDir(Ice::Identity id);
+    void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/TestII.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/TestII.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/TestII.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/TestII.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/ami/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/ami/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.ami;
 
@@ -13,6 +8,7 @@
 import test.Ice.ami.Test.AMD_TestIntf_startDispatch;
 import test.Ice.ami.Test.CloseMode;
 import test.Ice.ami.Test.TestIntfException;
+import test.Ice.ami.Test.PingReplyPrx;
 import test.Ice.ami.Test.PingReplyPrxHelper;
 
 public class TestI extends _TestIntfDisp
@@ -118,9 +114,11 @@
     }
 
     @Override
-    public void pingBiDir(Ice.Identity id, Ice.Current current)
+    public void pingBiDir(PingReplyPrx reply, Ice.Current current)
     {
-        PingReplyPrxHelper.uncheckedCast(current.con.createProxy(id)).reply();
+        reply = PingReplyPrxHelper.uncheckedCast(reply.ice_fixed(current.con));
+        Ice.AsyncResult result = reply.begin_reply();
+        reply.end_reply(result);
     }
 
     @Override
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Acceptor.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Acceptor.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Acceptor.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Acceptor.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 import java.io.PrintWriter;
@@ -264,18 +259,18 @@
     }
 
     public static BackgroundPrx
-    allTests(test.Util.Application app, Configuration configuration)
+    allTests(test.TestHelper helper, Configuration configuration)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "background:" + app.getTestEndpoint(0);
+        String sref = "background:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         BackgroundPrx background = BackgroundPrxHelper.uncheckedCast(obj);
 
-        sref = "backgroundController:" + app.getTestEndpoint(1, "tcp");
+        sref = "backgroundController:" + helper.getTestEndpoint(1, "tcp");
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -313,7 +308,7 @@
         out.flush();
         {
             Ice.LocatorPrx locator;
-            obj = communicator.stringToProxy("locator:" + app.getTestEndpoint(0)).ice_invocationTimeout(250);
+            obj = communicator.stringToProxy("locator:" + helper.getTestEndpoint(0)).ice_invocationTimeout(250);
             locator = Ice.LocatorPrxHelper.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_locator(locator).ice_oneway();
 
@@ -328,7 +323,7 @@
             }
             backgroundController.resumeCall("findAdapterById");
 
-            obj = communicator.stringToProxy("locator:" + app.getTestEndpoint(0));
+            obj = communicator.stringToProxy("locator:" + helper.getTestEndpoint(0));
             locator = Ice.LocatorPrxHelper.uncheckedCast(obj);
             obj = obj.ice_locator(locator);
             obj.ice_ping();
@@ -354,7 +349,7 @@
         {
             Ice.RouterPrx router;
 
-            obj = communicator.stringToProxy("router:" + app.getTestEndpoint(0)).ice_invocationTimeout(250);
+            obj = communicator.stringToProxy("router:" + helper.getTestEndpoint(0)).ice_invocationTimeout(250);
             router = Ice.RouterPrxHelper.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_router(router).ice_oneway();
 
@@ -369,7 +364,7 @@
             }
             backgroundController.resumeCall("getClientProxy");
 
-            obj = communicator.stringToProxy("router:" + app.getTestEndpoint(0));
+            obj = communicator.stringToProxy("router:" + helper.getTestEndpoint(0));
             router = Ice.RouterPrxHelper.uncheckedCast(obj);
             obj = communicator.stringToProxy("background@Test").ice_router(router);
             BackgroundPrx bg = BackgroundPrxHelper.uncheckedCast(obj);
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 import test.Ice.background.Test._BackgroundControllerDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/BackgroundI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/BackgroundI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/BackgroundI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/BackgroundI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 import test.Ice.background.Test._BackgroundDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,64 +1,45 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 import test.Ice.background.PluginFactory.PluginI;
 import test.Ice.background.Test.BackgroundPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        PluginI plugin = (PluginI)communicator().getPluginManager().getPlugin("Test");
-        BackgroundPrx background = AllTests.allTests(this, plugin.getConfiguration());
-        background.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
 
         // For this test, we want to disable retries.
         //
-        initData.properties.setProperty("Ice.RetryIntervals", "-1");
+        properties.setProperty("Ice.RetryIntervals", "-1");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+        properties.setProperty("Ice.TCP.SndSize", "50000");
 
         //
         // Setup the test transport plug-in.
         //
-        initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
-        String defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.background");
-
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
+        String defaultProtocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+        properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
+
+        properties.setProperty("Ice.Package.Test", "test.Ice.background");
+
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            PluginI plugin = (PluginI)communicator.getPluginManager().getPlugin("Test");
+            BackgroundPrx background = AllTests.allTests(this, plugin.getConfiguration());
+            background.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Configuration.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Configuration.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Configuration.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Configuration.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Connector.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Connector.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Connector.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Connector.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 final class Connector implements IceInternal.Connector
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/EndpointFactory.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/EndpointFactory.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/EndpointFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/EndpointFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 final class EndpointFactory implements IceInternal.EndpointFactory
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/EndpointI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/EndpointI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/EndpointI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/EndpointI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 final class EndpointI extends IceInternal.EndpointI
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/PluginFactory.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/PluginFactory.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/PluginFactory.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/PluginFactory.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.background;
 
 import test.Ice.background.PluginFactory.PluginI;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     static public class LocatorI extends Ice._LocatorDisp
     {
@@ -82,66 +77,54 @@
         final private BackgroundControllerI _controller;
     }
 
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        PluginI plugin = (PluginI)communicator().getPluginManager().getPlugin("Test");
-        Configuration configuration = plugin.getConfiguration();
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        BackgroundControllerI backgroundController = new BackgroundControllerI(configuration, adapter);
-
-        adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background"));
-        adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator"));
-        adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router"));
-        adapter.activate();
-
-        adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
 
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
         //
         // Setup the test transport plug-in.
         //
-        initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
-        String defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
+        properties.setProperty("Ice.Plugin.Test", "test.Ice.background.PluginFactory");
+        String defaultProtocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+        properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
 
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.background");
+        properties.setProperty("Ice.Package.Test", "test.Ice.background");
 
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1, "tcp"));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
-        return initData;
-    }
+            PluginI plugin = (PluginI)communicator().getPluginManager().getPlugin("Test");
+            Configuration configuration = plugin.getConfiguration();
 
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+
+            BackgroundControllerI backgroundController = new BackgroundControllerI(configuration, adapter);
+
+            adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background"));
+            adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator"));
+            adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router"));
+            adapter.activate();
+
+            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+            adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController"));
+            adapter2.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Transceiver.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Transceiver.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/background/Transceiver.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/background/Transceiver.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.background;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
@@ -16,7 +11,6 @@
 import test.Ice.binding.Test.RemoteObjectAdapterPrx;
 import test.Ice.binding.Test.TestIntfPrx;
 import test.Ice.binding.Test.TestIntfPrxHelper;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -98,12 +92,12 @@
     }
 
     public static void
-    allTests(Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "communicator:" + app.getTestEndpoint(0);
+        String ref = "communicator:" + helper.getTestEndpoint(0);
         RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref));
 
         out.print("testing binding with single endpoint... ");
@@ -905,7 +899,7 @@
             clientProps.add(bothPreferIPv4);
             clientProps.add(bothPreferIPv6);
 
-            String endpoint = "tcp -p " + app.getTestPort(2);
+            String endpoint = "tcp -p " + helper.getTestPort(2);
 
             Ice.Properties anyipv4 = ipv4._clone();
             anyipv4.setProperty("Adapter.Endpoints", endpoint);
@@ -937,68 +931,66 @@
             boolean ipv6NotSupported = false;
             for(Ice.Properties p : serverProps)
             {
-                Ice.InitializationData serverInitData = app.createInitializationData();
-                serverInitData.properties = p;
-                Ice.Communicator serverCommunicator = app.initialize(serverInitData);
-                Ice.ObjectAdapter oa;
-                try
-                {
-                    oa = serverCommunicator.createObjectAdapter("Adapter");
-                    oa.activate();
-                }
-                catch(Ice.DNSException ex)
-                {
-                    serverCommunicator.destroy();
-                    continue; // IP version not supported.
-                }
-                catch(Ice.SocketException ex)
-                {
-                    if(p == ipv6)
-                    {
-                        ipv6NotSupported = true;
-                    }
-                    serverCommunicator.destroy();
-                    continue; // IP version not supported.
-                }
-
-                String strPrx = oa.createProxy(Ice.Util.stringToIdentity("dummy")).toString();
-                for(Ice.Properties q : clientProps)
+                try(Ice.Communicator serverCommunicator = helper.initialize(p))
                 {
-                    Ice.InitializationData clientInitData = app.createInitializationData();
-                    clientInitData.properties = q;
-                    Ice.Communicator clientCommunicator = app.initialize(clientInitData);
-                    Ice.ObjectPrx prx = clientCommunicator.stringToProxy(strPrx);
+                    Ice.ObjectAdapter oa;
                     try
                     {
-                        prx.ice_ping();
-                        test(false);
-                    }
-                    catch(Ice.ObjectNotExistException ex)
-                    {
-                        // Expected, no object registered.
+                        oa = serverCommunicator.createObjectAdapter("Adapter");
+                        oa.activate();
                     }
                     catch(Ice.DNSException ex)
                     {
-                        // Expected if no IPv4 or IPv6 address is
-                        // associated to localhost or if trying to connect
-                        // to an any endpoint with the wrong IP version,
-                        // e.g.: resolving an IPv4 address when only IPv6
-                        // is enabled fails with a DNS exception.
+                        serverCommunicator.destroy();
+                        continue; // IP version not supported.
                     }
                     catch(Ice.SocketException ex)
                     {
-                        test((p == ipv4 && q == ipv6) || (p == ipv6 && q == ipv4) ||
-                             (p == bothPreferIPv4 && q == ipv6) || (p == bothPreferIPv6 && q == ipv4) ||
-                             (p == bothPreferIPv6 && q == ipv6 && ipv6NotSupported) ||
-                             (p == anyipv4 && q == ipv6) || (p == anyipv6 && q == ipv4) ||
-                             (p == localipv4 && q == ipv6) || (p == localipv6 && q == ipv4) ||
-                             (p == ipv6 && q == bothPreferIPv4) || (p == bothPreferIPv6 && q == ipv6) ||
-                             (p == ipv6 && q == bothPreferIPv4) || (p == ipv6 && q == bothPreferIPv6) ||
-                             (p == bothPreferIPv6 && q == ipv6));
+                        if(p == ipv6)
+                        {
+                            ipv6NotSupported = true;
+                        }
+                        serverCommunicator.destroy();
+                        continue; // IP version not supported.
+                    }
+
+                    String strPrx = oa.createProxy(Ice.Util.stringToIdentity("dummy")).toString();
+                    for(Ice.Properties q : clientProps)
+                    {
+                        try(Ice.Communicator clientCommunicator = helper.initialize(q))
+                        {
+                            Ice.ObjectPrx prx = clientCommunicator.stringToProxy(strPrx);
+                            try
+                            {
+                                prx.ice_ping();
+                                test(false);
+                            }
+                            catch(Ice.ObjectNotExistException ex)
+                            {
+                                // Expected, no object registered.
+                            }
+                            catch(Ice.DNSException ex)
+                            {
+                                // Expected if no IPv4 or IPv6 address is
+                                // associated to localhost or if trying to connect
+                                // to an any endpoint with the wrong IP version,
+                                // e.g.: resolving an IPv4 address when only IPv6
+                                // is enabled fails with a DNS exception.
+                            }
+                            catch(Ice.SocketException ex)
+                            {
+                                test((p == ipv4 && q == ipv6) || (p == ipv6 && q == ipv4) ||
+                                     (p == bothPreferIPv4 && q == ipv6) || (p == bothPreferIPv6 && q == ipv4) ||
+                                     (p == bothPreferIPv6 && q == ipv6 && ipv6NotSupported) ||
+                                     (p == anyipv4 && q == ipv6) || (p == anyipv6 && q == ipv4) ||
+                                     (p == localipv4 && q == ipv6) || (p == localipv6 && q == ipv4) ||
+                                     (p == ipv6 && q == bothPreferIPv4) || (p == bothPreferIPv6 && q == ipv6) ||
+                                     (p == ipv6 && q == bothPreferIPv4) || (p == ipv6 && q == bothPreferIPv6) ||
+                                     (p == bothPreferIPv6 && q == ipv6));
+                            }
+                        }
                     }
-                    clientCommunicator.destroy();
                 }
-                serverCommunicator.destroy();
             }
 
             out.println("ok");
@@ -1008,7 +1000,7 @@
         // On Windows, the FD limit is very high and there's no way to limit the number of FDs
         // for the server so we don't run this test.
         //
-        if(!System.getProperty("os.name").startsWith("Windows"))
+        if(!System.getProperty("os.name").startsWith("Windows") && !helper.isAndroid())
         {
             out.print("testing FD limit... ");
             out.flush();
@@ -1038,7 +1030,7 @@
             catch(Ice.ConnectionRefusedException ex)
             {
                 // Close the connection now to free a FD (it could be done after the sleep but
-                // there could be race condiutation since the connection might not be closed
+                // there could be race condition since the connection might not be closed
                 // immediately due to threading).
                 test.ice_connectionId("0").ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.binding");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.binding");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/RemoteCommunicatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 package test.Ice.binding;
 import test.Ice.binding.Test.RemoteObjectAdapterPrx;
 import test.Ice.binding.Test.RemoteObjectAdapterPrxHelper;
@@ -13,12 +8,6 @@
 
 public class RemoteCommunicatorI extends _RemoteCommunicatorDisp
 {
-    public
-    RemoteCommunicatorI(test.Util.Application app)
-    {
-        _app = app;
-    }
-
     @Override
     public RemoteObjectAdapterPrx
     createObjectAdapter(String name, String endpts, Ice.Current current)
@@ -31,13 +20,16 @@
                 String endpoints = endpts;
                 if(endpoints.indexOf("-p") < 0)
                 {
-                    endpoints = _app.getTestEndpoint(_nextPort++, endpoints);
+                    endpoints = test.TestHelper.getTestEndpoint(current.adapter.getCommunicator().getProperties(),
+                                                                _nextPort++,
+                                                                endpoints);
                 }
 
                 Ice.Communicator com = current.adapter.getCommunicator();
                 com.getProperties().setProperty(name + ".ThreadPool.Size", "1");
                 Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, endpoints);
-                return RemoteObjectAdapterPrxHelper.uncheckedCast(current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter)));
+                Ice.Object obj = new RemoteObjectAdapterI(adapter);
+                return RemoteObjectAdapterPrxHelper.uncheckedCast(current.adapter.addWithUUID(obj));
             }
             catch(Ice.SocketException ex)
             {
@@ -63,6 +55,5 @@
         current.adapter.getCommunicator().shutdown();
     }
 
-    private final test.Util.Application _app;
     private int _nextPort = 10;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,18 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// **********************************************************************
 
 package test.Ice.binding;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Identity id = Ice.Util.stringToIdentity("communicator");
-        adapter.add(new RemoteCommunicatorI(this), id);
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.binding");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.logger = new Ice.Logger() {
             @Override public void print(String message)
             {
@@ -57,15 +40,16 @@
                 return this;
             }
         };
-        return initData;
-    }
 
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Identity id = Ice.Util.stringToIdentity("communicator");
+            adapter.add(new RemoteCommunicatorI(), id);
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/binding/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/binding/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.binding;
 import test.Ice.binding.Test._TestIntfDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
@@ -24,12 +19,12 @@
     }
 
     public static ChecksumPrx
-    allTests(test.Util.Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/ChecksumI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/ChecksumI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/ChecksumI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/ChecksumI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
 import test.Ice.checksum.Test.ChecksumPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        ChecksumPrx checksum = AllTests.allTests(this, false);
-        checksum.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.checksum");
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.checksum");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            ChecksumPrx checksum = AllTests.allTests(this, false);
+            checksum.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.checksum;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new ChecksumI();
-        adapter.add(object, Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server");
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new ChecksumI();
+            adapter.add(object, Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Types.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Types.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/Types.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/Types.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/AbstractClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/AbstractClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/AbstractClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/AbstractClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
@@ -16,7 +11,6 @@
 import test.Ice.classLoader.Test.E;
 import test.Ice.classLoader.Test.InitialPrx;
 import test.Ice.classLoader.Test.InitialPrxHelper;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -72,10 +66,10 @@
     }
 
     public static void
-    allTests(Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         //
         // Verify that the class loader is used for Slice packages.
@@ -83,14 +77,15 @@
         {
             out.print("testing package... ");
             out.flush();
-            Ice.InitializationData initData = app.createInitializationData();
+            Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            Ice.Communicator ic = app.initialize(initData);
-            test(classLoader.check("test.Ice.classLoader.Test._Marker"));
-            ic.destroy();
-            out.println("ok");
+            try(Ice.Communicator ic = helper.initialize(initData))
+            {
+                test(classLoader.check("test.Ice.classLoader.Test._Marker"));
+                out.println("ok");
+            }
         }
 
         //
@@ -99,15 +94,16 @@
         {
             out.print("testing plug-in... ");
             out.flush();
-            Ice.InitializationData initData = app.createInitializationData();
+            Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.classLoader.PluginFactoryI");
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            Ice.Communicator ic = app.initialize(initData);
-            test(classLoader.check("test.Ice.classLoader.PluginFactoryI"));
-            ic.destroy();
-            out.println("ok");
+            try(Ice.Communicator ic = helper.initialize(initData))
+            {
+                test(classLoader.check("test.Ice.classLoader.PluginFactoryI"));
+                out.println("ok");
+            }
         }
 
         //
@@ -117,99 +113,101 @@
         {
             out.print("testing IceSSL certificate verifier and password callback... ");
             out.flush();
-            Ice.InitializationData initData = app.createInitializationData();
+            Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("IceSSL.CertVerifier", "test.Ice.classLoader.CertificateVerifierI");
             initData.properties.setProperty("IceSSL.PasswordCallback", "test.Ice.classLoader.PasswordCallbackI");
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            Ice.Communicator ic = app.initialize(initData);
-            test(classLoader.check("test.Ice.classLoader.CertificateVerifierI"));
-            test(classLoader.check("test.Ice.classLoader.PasswordCallbackI"));
-            ic.destroy();
-            out.println("ok");
+            try(Ice.Communicator ic = helper.initialize(initData))
+            {
+                test(classLoader.check("test.Ice.classLoader.CertificateVerifierI"));
+                test(classLoader.check("test.Ice.classLoader.PasswordCallbackI"));
+                out.println("ok");
+            }
         }
 
         //
         // Marshaling tests.
         //
         {
-            Ice.InitializationData initData = app.createInitializationData();
+            Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
-            MyClassLoader classLoader = new MyClassLoader(initData.classLoader);
+            MyClassLoader classLoader = new MyClassLoader(helper.getClassLoader());
             initData.classLoader = classLoader;
-            Ice.Communicator ic = app.initialize(initData);
-
-            String ref = "initial:" + app.getTestEndpoint(0);
-            Ice.ObjectPrx base = ic.stringToProxy(ref);
-            test(base != null);
-
-            InitialPrx initial = InitialPrxHelper.checkedCast(base);
-            test(initial != null);
-
-            //
-            // Verify that the class loader is used for concrete classes.
-            //
+            try(Ice.Communicator ic = helper.initialize(initData))
             {
-                out.print("testing concrete class... ");
-                out.flush();
-                ConcreteClass cc = initial.getConcreteClass();
-                test(cc != null);
-                test(classLoader.check("Test.ConcreteClass"));
-                test(classLoader.check("test.Ice.classLoader.Test.ConcreteClass"));
-                classLoader.reset();
-                out.println("ok");
-            }
 
-            //
-            // Verify that the class loader is invoked when a factory is not installed, and is
-            // not invoked when a factory is installed.
-            //
-            {
-                out.print("testing abstract class... ");
-                out.flush();
+                String ref = "initial:" + helper.getTestEndpoint(0);
+                Ice.ObjectPrx base = ic.stringToProxy(ref);
+                test(base != null);
+
+                InitialPrx initial = InitialPrxHelper.checkedCast(base);
+                test(initial != null);
+
+                //
+                // Verify that the class loader is used for concrete classes.
+                //
+                {
+                    out.print("testing concrete class... ");
+                    out.flush();
+                    ConcreteClass cc = initial.getConcreteClass();
+                    test(cc != null);
+                    test(classLoader.check("Test.ConcreteClass"));
+                    test(classLoader.check("test.Ice.classLoader.Test.ConcreteClass"));
+                    classLoader.reset();
+                    out.println("ok");
+                }
+
+                //
+                // Verify that the class loader is invoked when a factory is not installed, and is
+                // not invoked when a factory is installed.
+                //
+                {
+                    out.print("testing abstract class... ");
+                    out.flush();
 
+                    try
+                    {
+                        initial.getAbstractClass();
+                    }
+                    catch(Ice.NoValueFactoryException ex)
+                    {
+                        // Expected.
+                    }
+                    test(classLoader.check("Test.AbstractClass"));
+                    test(classLoader.check("test.Ice.classLoader.Test.AbstractClass"));
+                    classLoader.reset();
+
+                    ic.getValueFactoryManager().add(new MyValueFactory(), "::Test::AbstractClass");
+                    AbstractClass ac = initial.getAbstractClass();
+                    test(ac != null);
+                    test(!classLoader.check("Test.AbstractClass"));
+                    test(!classLoader.check("test.Ice.classLoader.Test.AbstractClass"));
+                    classLoader.reset();
+
+                    out.println("ok");
+                }
+
+                //
+                // Verify that the class loader is used for user exceptions.
+                //
+                out.print("testing user exception... ");
+                out.flush();
                 try
                 {
-                    initial.getAbstractClass();
+                    initial.throwException();
+                    test(false);
                 }
-                catch(Ice.NoValueFactoryException ex)
+                catch(E ex)
                 {
-                    // Expected.
                 }
-                test(classLoader.check("Test.AbstractClass"));
-                test(classLoader.check("test.Ice.classLoader.Test.AbstractClass"));
-                classLoader.reset();
-
-                ic.getValueFactoryManager().add(new MyValueFactory(), "::Test::AbstractClass");
-                AbstractClass ac = initial.getAbstractClass();
-                test(ac != null);
-                test(!classLoader.check("Test.AbstractClass"));
-                test(!classLoader.check("test.Ice.classLoader.Test.AbstractClass"));
-                classLoader.reset();
-
+                test(classLoader.check("Test.E"));
+                test(classLoader.check("test.Ice.classLoader.Test.E"));
                 out.println("ok");
-            }
 
-            //
-            // Verify that the class loader is used for user exceptions.
-            //
-            out.print("testing user exception... ");
-            out.flush();
-            try
-            {
-                initial.throwException();
-                test(false);
+                initial.shutdown();
             }
-            catch(E ex)
-            {
-            }
-            test(classLoader.check("Test.E"));
-            test(classLoader.check("test.Ice.classLoader.Test.E"));
-            out.println("ok");
-
-            initial.shutdown();
-            ic.destroy();
         }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this, false);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        _initData = super.getInitData(argsH);
-        _initData.properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
-        return _initData;
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this, false);
+        }
     }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
-    }
-
-    private Ice.InitializationData _initData;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/InitialI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/InitialI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/PasswordCallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/PluginFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.classLoader;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new InitialI(adapter);
-        adapter.add(object, Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Default.SlicedFormat", "1");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.classLoader");
+        properties.setProperty("Ice.Default.SlicedFormat", "1");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new InitialI(adapter);
+            adapter.add(object, Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
@@ -56,13 +51,13 @@
     }
 
     public static TestIntfPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(ref);
         test(obj != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
 import test.Ice.custom.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        TestIntfPrx test = AllTests.allTests(this);
-        test.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom");
-        initData.properties.setProperty("Ice.CacheMessageBuffers", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.custom");
+        properties.setProperty("Ice.CacheMessageBuffers", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object test = new TestI(communicator);
-        adapter.add(test, Ice.Util.stringToIdentity("test"));
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.CacheMessageBuffers", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.custom");
+        properties.setProperty("Ice.CacheMessageBuffers", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object test = new TestI(communicator);
+            adapter.add(test, Ice.Util.stringToIdentity("test"));
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object test = new TestI(communicator);
-        adapter.add(test, Ice.Util.stringToIdentity("test"));
-
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.CacheMessageBuffers", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.custom");
+        properties.setProperty("Ice.CacheMessageBuffers", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object test = new TestI(communicator);
+            adapter.add(test, Ice.Util.stringToIdentity("test"));
+
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/custom/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/custom/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.custom;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultServant;
 import java.io.PrintWriter;
@@ -24,10 +19,10 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost");
         oa.activate();
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultServant;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(args))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/MyObjectI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/MyObjectI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/MyObjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/MyObjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultServant;
 import test.Ice.defaultServant.Test.*;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultServant/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultValue/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultValue/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultValue/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultValue/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultValue;
 
@@ -24,9 +19,9 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
         out.print("testing default values... ");
         out.flush();
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultValue/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultValue/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultValue/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultValue/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,16 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.defaultValue;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(args))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
@@ -21,11 +16,12 @@
 
 public class AllTests
 {
-    private static abstract class OpCallback extends Callback_TestIntf_op
+    private static class Callback
     {
-        OpCallback()
+        Callback()
         {
             _called = false;
+            _exception = null;
         }
 
         public synchronized void check()
@@ -40,10 +36,28 @@
                 {
                 }
             }
-
+            if(_exception != null)
+            {
+                throw _exception;
+            }
             _called = false;
         }
 
+        public synchronized void exception(Exception ex)
+        {
+            assert(!_called);
+            _called = true;
+            if(ex instanceof RuntimeException)
+            {
+                _exception = (RuntimeException)ex;
+            }
+            else
+            {
+                _exception = new RuntimeException(ex);
+            }
+            notify();
+        }
+
         public synchronized void called()
         {
             assert(!_called);
@@ -52,6 +66,7 @@
         }
 
         private boolean _called;
+        private RuntimeException _exception;
     }
 
     private static void
@@ -63,24 +78,25 @@
         }
     }
 
-    public static void allTests(test.Util.Application app, final Dispatcher dispatcher)
+    public static void allTests(test.TestHelper helper, final Dispatcher dispatcher)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "test:" + app.getTestEndpoint(0);
+        String sref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         int mult = 1;
-        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp"))
+        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp") ||
+           helper.isAndroid())
         {
             mult = 4;
         }
 
         TestIntfPrx p = TestIntfPrxHelper.uncheckedCast(obj);
 
-        sref = "testController:" + app.getTestEndpoint(1, "tcp");
+        sref = "testController:" + helper.getTestEndpoint(1, "tcp");
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -91,61 +107,59 @@
         {
             p.op();
 
-            OpCallback cb = new OpCallback()
+            final Callback cb1 = new Callback();
+            p.begin_op(new Callback_TestIntf_op() {
+                @Override
+                public void
+                response()
                 {
-                    @Override
-                    public void
-                    response()
-                    {
-                        test(dispatcher.isDispatcherThread());
-                        called();
-                    }
+                    test(dispatcher.isDispatcherThread());
+                    cb1.called();
+                }
 
-                    @Override
-                    public void
-                    exception(Ice.LocalException ex)
-                    {
-                        ex.printStackTrace();
-                        test(false);
-                    }
-                };
-            p.begin_op(cb);
-            cb.check();
+                @Override
+                public void
+                exception(Ice.LocalException ex)
+                {
+                    cb1.exception(ex);
+                }
+            });
+            cb1.check();
 
+            final Callback cb2 = new Callback();
             TestIntfPrx i = (TestIntfPrx)p.ice_adapterId("dummy");
-            cb = new OpCallback()
+            i.begin_op(new Callback_TestIntf_op() {
+                @Override
+                public void
+                response()
                 {
-                    @Override
-                    public void
-                    response()
-                    {
-                        test(false);
-                    }
+                    cb2.exception(new RuntimeException());
+                }
 
-                    @Override
-                    public void
-                    exception(Ice.LocalException ex)
-                    {
-                        test(ex instanceof Ice.NoEndpointException);
-                        test(dispatcher.isDispatcherThread());
-                        called();
-                    }
-                };
-            i.begin_op(cb);
-            cb.check();
+                @Override
+                public void
+                exception(Ice.LocalException ex)
+                {
+                    test(ex instanceof Ice.NoEndpointException);
+                    test(dispatcher.isDispatcherThread());
+                    cb2.called();
+                }
+            });
+            cb2.check();
 
             {
                 //
                 // Expect InvocationTimeoutException.
                 //
-                TestIntfPrx to = TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(250));
-                class Callback_TestIntf_sleepImpl extends Callback_TestIntf_sleep
+                TestIntfPrx to = TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(10));
+                final Callback cb3 = new Callback();
+                to.begin_sleep(500 * mult, new Callback_TestIntf_sleep()
                 {
                     @Override
                     public void
                     response()
                     {
-                        test(false);
+                        cb3.exception(new RuntimeException());
                     }
 
                     @Override
@@ -154,7 +168,7 @@
                     {
                         test(ex instanceof Ice.InvocationTimeoutException);
                         test(dispatcher.isDispatcherThread());
-                        called();
+                        cb3.called();
                     }
 
                     @Override
@@ -163,33 +177,8 @@
                     {
                         test(sentSynchronously || dispatcher.isDispatcherThread());
                     }
-
-                    public synchronized void check()
-                    {
-                        while(!_called)
-                        {
-                            try
-                            {
-                                wait();
-                            }
-                            catch(InterruptedException ex)
-                            {
-                            }
-                        }
-
-                        _called = false;
-                    }
-                    private synchronized void called()
-                    {
-                        assert(!_called);
-                        _called = true;
-                        notify();
-                    }
-                    private boolean _called;
-                };
-                Callback_TestIntf_sleepImpl callback = new Callback_TestIntf_sleepImpl();
-                to.begin_sleep(500 * mult, callback);
-                callback.check();
+                });
+                cb3.check();
             }
 
             testController.holdAdapter();
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,34 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        AllTests.allTests(this, _dispatcher);
-        return 0;
+        Dispatcher dispatcher = new Dispatcher();
+        try
+        {
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = createTestProperties(args);
+            initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
+
+            //
+            // Limit the send buffer size, this test relies on the socket
+            // send() blocking after sending a given amount of data.
+            //
+            initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+            initData.dispatcher = dispatcher;
+            try(Ice.Communicator communicator = initialize(initData))
+            {
+                AllTests.allTests(this, dispatcher);
+            }
+        }
+        finally
+        {
+            dispatcher.terminate();
+        }
     }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        assert(_dispatcher == null);
-        _dispatcher = new Dispatcher();
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
-
-        //
-        // Limit the send buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-        initData.dispatcher = _dispatcher;
-        return initData;
-    }
-
-    Dispatcher getDispatcher()
-    {
-        return _dispatcher;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        app.getDispatcher().terminate();
-        System.gc();
-        System.exit(result);
-    }
-
-    //
-    // The Dispatcher class uses a static "_instance" member in other language
-    // mappings. In Java, we avoid the use of static members because we need to
-    // maintain support for Android (in which the client and server run in the
-    // same process).
-    //
-    private Dispatcher _dispatcher;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,65 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        assert(_dispatcher != null);
-        adapter.add(new TestI(_dispatcher), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this, _dispatcher);
-        return 0;
+        Dispatcher dispatcher = new Dispatcher();
+        try
+        {
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = createTestProperties(args);
+            initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
+            initData.dispatcher = dispatcher;
+            try(Ice.Communicator communicator = initialize(initData))
+            {
+                communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+                communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+                adapter.add(new TestI(dispatcher), Ice.Util.stringToIdentity("test"));
+                //adapter.activate(); // Don't activate OA to ensure collocation is used.
+                adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+                //adapter2.activate(); // Don't activate OA to ensure collocation is used.
+                AllTests.allTests(this, dispatcher);
+            }
+        }
+        finally
+        {
+            dispatcher.terminate();
+        }
     }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        assert(_dispatcher == null);
-        _dispatcher = new Dispatcher();
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1, "tcp"));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-        initData.dispatcher = _dispatcher;
-        return initData;
-    }
-
-    Dispatcher getDispatcher()
-    {
-        return _dispatcher;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        app.getDispatcher().terminate();
-        System.gc();
-        System.exit(result);
-    }
-
-    //
-    // The Dispatcher class uses a static "_instance" member in other language
-    // mappings. In Java, we avoid the use of static members because we need to
-    // maintain support for Android (in which the client and server run in the
-    // same process).
-    //
-    private Dispatcher _dispatcher;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,74 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        assert(_dispatcher != null);
-        adapter.add(new TestI(_dispatcher), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        assert(_dispatcher == null);
-        _dispatcher = new Dispatcher();
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1, "tcp"));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-        //
-        // Limit the recv buffer size, this test relies on the socket
-        // send() blocking after sending a given amount of data.
-        //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        initData.dispatcher = _dispatcher;
-        return initData;
-    }
-
-    public void terminate()
-    {
-        if(_dispatcher != null)
+        Dispatcher dispatcher = new Dispatcher();
+        try
         {
-            _dispatcher.terminate();
+            Ice.InitializationData initData = new Ice.InitializationData();
+            initData.properties = createTestProperties(args);
+            initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
+            //
+            // Limit the recv buffer size, this test relies on the socket
+            // send() blocking after sending a given amount of data.
+            //
+            initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
+            initData.dispatcher = dispatcher;
+            try(Ice.Communicator communicator = initialize(initData))
+            {
+                communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+                communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1, "tcp"));
+                communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+                Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+                Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+                adapter.add(new TestI(dispatcher), Ice.Util.stringToIdentity("test"));
+                adapter.activate();
+                adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
+                adapter2.activate();
+
+                serverReady();
+                communicator.waitForShutdown();
+            }
+        }
+        finally
+        {
+            dispatcher.terminate();
         }
     }
-
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        app.terminate();
-        System.gc();
-        System.exit(result);
-    }
-
-    //
-    // The Dispatcher class uses a static "_instance" member in other language
-    // mappings. In Java, we avoid the use of static members because we need to
-    // maintain support for Android (in which the client and server run in the
-    // same process).
-    //
-    private Dispatcher _dispatcher;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/dispatcher/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/dispatcher/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.dispatcher;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.echo;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/echo/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/echo/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/echo/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/echo/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.echo;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     class EchoI extends test.Ice.echo.Test._EchoDisp
     {
@@ -39,32 +34,20 @@
         final private BlobjectI _blob;
     };
 
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        BlobjectI blob = new BlobjectI();
-        adapter.addDefaultServant(blob, "");
-        adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.echo");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.echo");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            BlobjectI blob = new BlobjectI();
+            adapter.addDefaultServant(blob, "");
+            adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/echo/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/echo/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/echo/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/echo/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
@@ -24,11 +19,11 @@
     }
 
     public static TestIntfPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
-        String ref = "test:" + app.getTestEndpoint(0);
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(ref);
         test(obj != null);
         TestIntfPrx proxy = TestIntfPrxHelper.checkedCast(obj);
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
 import test.Ice.enums.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        TestIntfPrx test = AllTests.allTests(this);
-        test.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.enums");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.enums");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object test = new TestIntfI();
-        adapter.add(test, Ice.Util.stringToIdentity("test"));
-
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.enums");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.enums");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object test = new TestIntfI();
+            adapter.add(test, Ice.Util.stringToIdentity("test"));
+
+            adapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/TestIntfI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/TestIntfI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/enums/TestIntfI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/enums/TestIntfI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.enums;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
@@ -722,11 +717,11 @@
     }
 
     public static ThrowerPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
+        Ice.Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
         {
             out.print("testing object adapter registration exceptions... ");
             Ice.ObjectAdapter first;
@@ -846,7 +841,7 @@
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "thrower:" + app.getTestEndpoint(0);
+        String ref = "thrower:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -1150,7 +1145,7 @@
             try
             {
                 ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(
-                    communicator.stringToProxy("thrower:" + app.getTestEndpoint(1)));
+                    communicator.stringToProxy("thrower:" + helper.getTestEndpoint(1)));
                 try
                 {
                     thrower2.throwMemoryLimitException(new byte[2 * 1024 * 1024]); // 2MB (no limits)
@@ -1159,7 +1154,7 @@
                 {
                 }
                 ThrowerPrx thrower3 = ThrowerPrxHelper.uncheckedCast(
-                    communicator.stringToProxy("thrower:" + app.getTestEndpoint(2)));
+                    communicator.stringToProxy("thrower:" + helper.getTestEndpoint(2)));
                 try
                 {
                     thrower3.throwMemoryLimitException(new byte[1024]); // 1KB limit
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
-        Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
-        Ice.Object object = new AMDThrowerI();
-        adapter.add(object, Ice.Util.stringToIdentity("thrower"));
-        adapter2.add(object, Ice.Util.stringToIdentity("thrower"));
-        adapter3.add(object, Ice.Util.stringToIdentity("thrower"));
-        adapter.activate();
-        adapter2.activate();
-        adapter3.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
         // For this test, we need a dummy logger, otherwise the
         // assertion test will print an error message.
         //
         initData.logger = new DummyLogger();
 
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0");
-        initData.properties.setProperty("TestAdapter3.Endpoints", getTestEndpoint(initData.properties, 2));
-        initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1");
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0");
+            communicator.getProperties().setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
+            communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+            Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
+            Ice.Object object = new AMDThrowerI();
+            adapter.add(object, Ice.Util.stringToIdentity("thrower"));
+            adapter2.add(object, Ice.Util.stringToIdentity("thrower"));
+            adapter3.add(object, Ice.Util.stringToIdentity("thrower"));
+            adapter.activate();
+            adapter2.activate();
+            adapter3.activate();
 
-        return initData;
-    }
+            serverReady();
 
-    public static void main(String[] args)
-    {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/AMDThrowerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
 import test.Ice.exceptions.Test.ThrowerPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        ThrowerPrx thrower = AllTests.allTests(this);
-        thrower.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            ThrowerPrx thrower = AllTests.allTests(this);
+            thrower.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,54 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new ThrowerI();
-        adapter.add(object, Ice.Util.stringToIdentity("thrower"));
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
         // For this test, we need a dummy logger, otherwise the
         // assertion test will print an error message.
         //
         initData.logger = new DummyLogger();
 
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
         initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new ThrowerI(), Ice.Util.stringToIdentity("thrower"));
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/DummyLogger.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/EmptyI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,48 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
-        Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
-        Ice.Object object = new ThrowerI();
-        adapter.add(object, Ice.Util.stringToIdentity("thrower"));
-        adapter2.add(object, Ice.Util.stringToIdentity("thrower"));
-        adapter3.add(object, Ice.Util.stringToIdentity("thrower"));
-        adapter.activate();
-        adapter2.activate();
-        adapter3.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
         // For this test, we need a dummy logger, otherwise the
         // assertion test will print an error message.
         //
         initData.logger = new DummyLogger();
 
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0");
-        initData.properties.setProperty("TestAdapter3.Endpoints", getTestEndpoint(initData.properties, 2));
-        initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1");
 
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0");
+            communicator.getProperties().setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
+            communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+            Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
+            Ice.Object object = new ThrowerI();
+
+            adapter.add(object, Ice.Util.stringToIdentity("thrower"));
+            adapter2.add(object, Ice.Util.stringToIdentity("thrower"));
+            adapter3.add(object, Ice.Util.stringToIdentity("thrower"));
+
+            adapter.activate();
+            adapter2.activate();
+            adapter3.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/ThrowerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/ThrowerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/ThrowerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/ThrowerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/exceptions/ValueFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/AI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/AI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/AI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/AI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
@@ -32,10 +27,10 @@
     }
 
     public static GPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing Ice.Admin.Facets property... ");
         test(communicator.getProperties().getPropertyAsList("Ice.Admin.Facets").length == 0);
         communicator.getProperties().setProperty("Ice.Admin.Facets", "foobar");
@@ -115,7 +110,7 @@
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "d:" + app.getTestEndpoint(0);
+        String ref = "d:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx db = communicator.stringToProxy(ref);
         test(db != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/BI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/BI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/BI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/BI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/CI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/CI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/CI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/CI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
 import test.Ice.facets.Test.GPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        GPrx g = AllTests.allTests(this);
-        g.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.facets");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            GPrx g = AllTests.allTests(this);
+            g.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object d = new DI();
-        adapter.add(d, Ice.Util.stringToIdentity("d"));
-        adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
-        Ice.Object f = new FI();
-        adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
-        Ice.Object h = new HI(communicator);
-        adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
-        return initData;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.facets");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object d = new DI();
+            adapter.add(d, Ice.Util.stringToIdentity("d"));
+            adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
+            Ice.Object f = new FI();
+            adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
+            Ice.Object h = new HI(communicator);
+            adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/DI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/DI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/DI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/DI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/EI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/EI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/EI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/EI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/EmptyI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/EmptyI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/EmptyI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/EmptyI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/FI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/FI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/FI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/FI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/GI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/GI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/GI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/GI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/HI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/HI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/HI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/HI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,31 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.facets;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object d = new DI();
-        adapter.add(d, Ice.Util.stringToIdentity("d"));
-        adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
-        Ice.Object f = new FI();
-        adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
-        Ice.Object h = new HI(communicator);
-        adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
-
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.facets");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object d = new DI();
+            adapter.add(d, Ice.Util.stringToIdentity("d"));
+            adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD");
+            Ice.Object f = new FI();
+            adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF");
+            Ice.Object h = new HI(communicator);
+            adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH");
+
+            adapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
@@ -166,17 +161,17 @@
     }
 
     public static void
-    allTests(test.Util.Application app, int[] ports)
+    allTests(test.TestHelper helper, int[] ports)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
         String ref = "test";
         for(int port : ports)
         {
-            ref += ":" + app.getTestEndpoint(port);
+            ref += ":" + helper.getTestEndpoint(port);
         }
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,103 +1,53 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
 import java.io.PrintWriter;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void
-    usage()
-    {
-        System.err.println("Usage: Client port...");
-    }
-
-    @Override
-    public int
+    public void
     run(String[] args)
     {
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
+        //
+        // This test aborts servers, so we don't want warnings.
+        //
+        properties.setProperty("Ice.Warn.Connections", "0");
         PrintWriter out = getWriter();
 
-        Ice.Communicator communicator = communicator();
-        java.util.List<Integer> ports = new java.util.ArrayList<Integer>(args.length);
-        for(String arg : args)
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            if(arg.charAt(0) == '-')
+            java.util.List<Integer> ports = new java.util.ArrayList<Integer>(argsH.value.length);
+            for(String arg : argsH.value)
             {
-                //
-                // TODO: Arguments recognized by the communicator are not
-                // removed from the argument list.
-                //
-                //System.err.println("Client: unknown option `" + arg + "'");
-                //usage();
-                //return 1;
-                continue;
+                if(arg.charAt(0) == '-')
+                {
+                    //
+                    // Arguments recognized by the communicator are not
+                    // removed from the argument list.
+                    //
+                    continue;
+                }
+                ports.add(Integer.parseInt(arg));
             }
 
-            int port = 0;
-            try
+            if(ports.isEmpty())
             {
-                port = Integer.parseInt(arg);
+                throw new RuntimeException("Client: no ports specified");
             }
-            catch(NumberFormatException ex)
+
+            int[] arr = new int[ports.size()];
+            for(int i = 0; i < arr.length; i++)
             {
-                ex.printStackTrace();
-                return 1;
+                arr[i] = ports.get(i).intValue();
             }
-            ports.add(port);
-        }
-
-        if(ports.isEmpty())
-        {
-                        out.println("Client: no ports specified");
-            usage();
-            return 1;
-        }
-
-        int[] arr = new int[ports.size()];
-        for(int i = 0; i < arr.length; i++)
-        {
-            arr[i] = ports.get(i).intValue();
-        }
 
-        try
-        {
             AllTests.allTests(this, arr);
         }
-        catch(Ice.LocalException ex)
-        {
-            ex.printStackTrace();
-            AllTests.test(false);
-        }
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
-        //
-        // This test aborts servers, so we don't want warnings.
-        //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,90 +1,55 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
 import java.io.PrintWriter;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    private static void
-    usage()
-    {
-        System.err.println("Usage: Server port");
-    }
-
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        int port = 0;
-        PrintWriter out = getWriter();
-        for(String arg : args)
-        {
-            if(arg.charAt(0) == '-')
-            {
-                out.println("Server: unknown option `" + arg + "'");
-                usage();
-                return 1;
-            }
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
+        properties.setProperty("Ice.ServerIdleTime", "120");
 
-            if(port > 0)
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            int port = 0;
+            PrintWriter out = getWriter();
+            for(String arg : argsH.value)
             {
-                out.println("Server: only one port can be specified");
-                usage();
-                return 1;
-            }
+                if(arg.charAt(0) == '-')
+                {
+                    throw new RuntimeException("Server: unknown option `" + arg + "'");
+                }
+
+                if(port > 0)
+                {
+                    throw new RuntimeException("Server: only one port can be specified");
+                }
 
-            try
-            {
                 port = Integer.parseInt(arg);
             }
-            catch(NumberFormatException ex)
+
+            if(port <= 0)
             {
-                out.println("Server: invalid port");
-                usage();
-                return 1;
+                throw new RuntimeException("Server: no port specified");
             }
-        }
-
-        if(port <= 0)
-        {
-            out.println("Server: no port specified");
-            usage();
-            return 1;
-        }
 
-        // Don't move this, it needs the port.
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(port));
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI(port);
-        adapter.add(object, Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
+            // Don't move this, it needs the port.
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(port));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new TestI(port);
+            adapter.add(object, Ice.Util.stringToIdentity("test"));
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance");
-        // Two minutes.
-        initData.properties.setProperty("Ice.ServerIdleTime", "120");
-        return initData;
-    }
+            adapter.activate();
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/faultTolerance/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/faultTolerance/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.faultTolerance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hash/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hash/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hash/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hash/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hash;
 
@@ -13,33 +8,16 @@
 
 import test.Ice.hash.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void
-    test(boolean b)
+    public void run(String[] args)
     {
-        if(!b)
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory");
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
-    }
+            PrintWriter out = getWriter();
 
-    @Override
-    public int run(String[] args)
-    {
-        PrintWriter out = getWriter();
-        int status = 0;
-        try
-        {
             java.util.Map<Integer, Ice.ObjectPrx> seenProxy = new java.util.HashMap<Integer, Ice.ObjectPrx>();
             java.util.Map<Integer, Ice.Endpoint> seenEndpoint = new java.util.HashMap<Integer, Ice.Endpoint>();
             int proxyCollisions = 0;
@@ -48,17 +26,12 @@
             int maxCollisions = 10;
             int maxIterations = 10000;
 
-            Ice.InitializationData initData = createInitializationData();
-            initData.properties = Ice.Util.createProperties(args);
-            initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory");
-            Ice.Communicator  communicator = Ice.Util.initialize(args, initData);
-
             out.print("testing proxy & endpoint hash algorithm collisions... ");
             out.flush();
             {
                 java.util.Random rand = new java.util.Random();
                 for(i = 0; proxyCollisions < maxCollisions &&
-                        endpointCollisions < maxCollisions  &&
+                        endpointCollisions < maxCollisions &&
                         i < maxIterations; ++i)
                 {
                     java.io.StringWriter sw = new java.io.StringWriter();
@@ -73,7 +46,8 @@
                     sw.write(Integer.toString(rand.nextInt(100)));
 
                     Ice.ObjectPrx obj = communicator.stringToProxy(sw.toString());
-                    java.util.List<Ice.Endpoint> endpoints = new java.util.ArrayList<Ice.Endpoint>(java.util.Arrays.asList(obj.ice_getEndpoints()));
+                    java.util.List<Ice.Endpoint> endpoints =
+                        new java.util.ArrayList<Ice.Endpoint>(java.util.Arrays.asList(obj.ice_getEndpoints()));
                     if(seenProxy.containsKey(obj.hashCode()))
                     {
                         if(obj.equals(seenProxy.get(obj.hashCode())))
@@ -166,7 +140,8 @@
                     sw.write(" -h ");
                     sw.write(Integer.toString(rand.nextInt(100)));
 
-                    Ice.ProxyIdentityFacetKey obj = new Ice.ProxyIdentityFacetKey(communicator.stringToProxy(sw.toString()));
+                    Ice.ProxyIdentityFacetKey obj =
+                        new Ice.ProxyIdentityFacetKey(communicator.stringToProxy(sw.toString()));
                     if(seenProxy.containsKey(obj.hashCode()))
                     {
                         ++proxyCollisions;
@@ -190,8 +165,10 @@
                 Ice.ObjectPrx prx6 = communicator.stringToProxy("Glacier2/router:udp -h zeroc.com -p 10012");
                 Ice.ObjectPrx prx7 = communicator.stringToProxy("Glacier2/router:tcp -p 10010 -t 10000");
                 Ice.ObjectPrx prx8 = communicator.stringToProxy("Glacier2/router:ssl -p 10011 -t 10000");
-                Ice.ObjectPrx prx9 = communicator.stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010 -t 10000");
-                Ice.ObjectPrx prx10 = communicator.stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011 -t 10000");
+                Ice.ObjectPrx prx9 =
+                    communicator.stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010 -t 10000");
+                Ice.ObjectPrx prx10 =
+                    communicator.stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011 -t 10000");
 
                 java.util.Map<String, Integer> proxyMap = new java.util.HashMap<String, Integer>();
                 proxyMap.put("prx1", prx1.hashCode());
@@ -208,43 +185,70 @@
                 test(communicator.stringToProxy("Glacier2/router:tcp -p 10010").hashCode() == proxyMap.get("prx1"));
                 test(communicator.stringToProxy("Glacier2/router:ssl -p 10011").hashCode() == proxyMap.get("prx2"));
                 test(communicator.stringToProxy("Glacier2/router:udp -p 10012").hashCode() == proxyMap.get("prx3"));
-                test(communicator.stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010").hashCode() == proxyMap.get("prx4"));
-                test(communicator.stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011").hashCode() == proxyMap.get("prx5"));
-                test(communicator.stringToProxy("Glacier2/router:udp -h zeroc.com -p 10012").hashCode() == proxyMap.get("prx6"));
-                test(communicator.stringToProxy("Glacier2/router:tcp -p 10010 -t 10000").hashCode() == proxyMap.get("prx7"));
-                test(communicator.stringToProxy("Glacier2/router:ssl -p 10011 -t 10000").hashCode() == proxyMap.get("prx8"));
-                test(communicator.stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010 -t 10000").hashCode() == proxyMap.get("prx9"));
-                test(communicator.stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011 -t 10000").hashCode() == proxyMap.get("prx10"));
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx1).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx1).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx2).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx2).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx3).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx3).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx4).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx4).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx5).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx5).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx6).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx6).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx7).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx7).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx8).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx8).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx9).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx9).hashCode());
-
-                test(new Ice.ProxyIdentityKey(prx1).hashCode() == new Ice.ProxyIdentityKey(prx10).hashCode());
-                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() == new Ice.ProxyIdentityFacetKey(prx10).hashCode());
+                test(communicator.stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010").hashCode() ==
+                     proxyMap.get("prx4"));
+                test(communicator.stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011").hashCode() ==
+                     proxyMap.get("prx5"));
+                test(communicator.stringToProxy("Glacier2/router:udp -h zeroc.com -p 10012").hashCode() ==
+                     proxyMap.get("prx6"));
+                test(communicator.stringToProxy("Glacier2/router:tcp -p 10010 -t 10000").hashCode() ==
+                     proxyMap.get("prx7"));
+                test(communicator.stringToProxy("Glacier2/router:ssl -p 10011 -t 10000").hashCode() ==
+                     proxyMap.get("prx8"));
+                test(communicator.stringToProxy("Glacier2/router:tcp -h zeroc.com -p 10010 -t 10000").hashCode() ==
+                     proxyMap.get("prx9"));
+                test(communicator.stringToProxy("Glacier2/router:ssl -h zeroc.com -p 10011 -t 10000").hashCode() ==
+                     proxyMap.get("prx10"));
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx1).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx1).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx2).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx2).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx3).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx3).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx4).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx4).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx5).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx5).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx6).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx6).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx7).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx7).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx8).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx8).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx9).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx9).hashCode());
+
+                test(new Ice.ProxyIdentityKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityKey(prx10).hashCode());
+                test(new Ice.ProxyIdentityFacetKey(prx1).hashCode() ==
+                     new Ice.ProxyIdentityFacetKey(prx10).hashCode());
             }
 
             out.println("ok");
@@ -334,7 +338,8 @@
                 }
                 test(structCollisions < maxCollisions);
 
-                java.util.Map<Integer, ColorPalette> seenColorPalette = new java.util.HashMap<Integer, ColorPalette>();
+                java.util.Map<Integer, ColorPalette> seenColorPalette =
+                    new java.util.HashMap<Integer, ColorPalette>();
                 structCollisions = 0;
                 for(i = 0; i < maxIterations && structCollisions < maxCollisions; ++i)
                 {
@@ -342,7 +347,10 @@
                     colorPalette.colors = new java.util.HashMap<Integer, Color>();
                     for(int j = 0; j < 100; ++j)
                     {
-                        colorPalette.colors.put(j, new Color(rand.nextInt(255), rand.nextInt(255), rand.nextInt(255), rand.nextInt(255)));
+                        colorPalette.colors.put(j, new Color(rand.nextInt(255),
+                                                             rand.nextInt(255),
+                                                             rand.nextInt(255),
+                                                             rand.nextInt(255)));
                     }
 
                     if(seenColorPalette.containsKey(colorPalette.hashCode()))
@@ -394,11 +402,17 @@
                 structCollisions = 0;
                 for(i = 0; i < maxIterations && structCollisions < maxCollisions; ++i)
                 {
-                    Draw draw =  new Draw(
-                        new Color(rand.nextInt(255), rand.nextInt(255), rand.nextInt(255), rand.nextInt(255)),
-                        new Pen(rand.nextInt(10),
-                                     new Color(rand.nextInt(255), rand.nextInt(255), rand.nextInt(255), rand.nextInt(255))),
-                                     false);
+                    Draw draw =
+                        new Draw(new Color(rand.nextInt(255),
+                                           rand.nextInt(255),
+                                           rand.nextInt(255),
+                                           rand.nextInt(255)),
+                                 new Pen(rand.nextInt(10),
+                                         new Color(rand.nextInt(255),
+                                                   rand.nextInt(255),
+                                                   rand.nextInt(255),
+                                                   rand.nextInt(255))),
+                                 false);
 
                     if(seenDraw.containsKey(draw.hashCode()))
                     {
@@ -420,17 +434,6 @@
                 test(structCollisions < maxCollisions);
             }
             out.println("ok");
-
-            if(communicator != null)
-            {
-                communicator.destroy();
-            }
-        }
-        catch(Exception ex)
-        {
-            System.out.println(ex.toString());
-            status = 1;
         }
-        return status;
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hash/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hash/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hash/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hash/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
@@ -84,17 +79,17 @@
     };
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "hold:" + app.getTestEndpoint(0);
+        String ref = "hold:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
-        String refSerialized = "hold:" + app.getTestEndpoint(1);
+        String refSerialized = "hold:" + helper.getTestEndpoint(1);
         Ice.ObjectPrx baseSerialized = communicator.stringToProxy(refSerialized);
         test(baseSerialized != null);
         out.println("ok");
@@ -196,7 +191,7 @@
             int value = 0;
             holdSerialized.set(value, 0);
             Ice.AsyncResult result = null;
-            int max = app.isAndroid() ? 5000 : 10000;
+            int max = helper.isAndroid() ? 5000 : 10000;
             for(int i = 0; i < max; ++i)
             {
                 // Create a new proxy for each request
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.hold");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/HoldI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/HoldI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/HoldI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/HoldI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,63 +1,45 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.hold;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        java.util.Timer timer = new java.util.Timer();
-
-        Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1");
-        adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold"));
-
-        Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
-        adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold"));
-
-        adapter1.activate();
-        adapter2.activate();
-
-        serverReady();
-        communicator.waitForShutdown();
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.hold");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("Ice.Package.Test", "test.Ice.hold");
+            communicator.getProperties().setProperty("TestAdapter1.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Size", "5");
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
+            communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Serialize", "0");
+
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Size", "5");
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
+            communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Serialize", "1");
+
+            java.util.Timer timer = new java.util.Timer();
+
+            Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1");
+            adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold"));
+
+            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+            adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold"));
 
-        timer.cancel();
+            adapter1.activate();
+            adapter2.activate();
 
-        return 0;
-    }
+            serverReady();
+            communicator.waitForShutdown();
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold");
-        initData.properties.setProperty("TestAdapter1.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("TestAdapter1.ThreadPool.Size", "5");
-        initData.properties.setProperty("TestAdapter1.ThreadPool.SizeMax", "5");
-        initData.properties.setProperty("TestAdapter1.ThreadPool.SizeWarn", "0");
-        initData.properties.setProperty("TestAdapter1.ThreadPool.Serialize", "0");
-
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.ThreadPool.Size", "5");
-        initData.properties.setProperty("TestAdapter2.ThreadPool.SizeMax", "5");
-        initData.properties.setProperty("TestAdapter2.ThreadPool.SizeWarn", "0");
-        initData.properties.setProperty("TestAdapter2.ThreadPool.Serialize", "1");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+            timer.cancel();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/hold/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/hold/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.impl;
 
 import test.Ice.impl.AMD.Test.MyDerivedClassI;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.impl.AMD");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.impl.AMD");
 
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.impl;
 
 import test.Ice.impl.Test.MyDerivedClassI;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.impl");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.impl");
 
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/impl/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/impl/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 
@@ -51,10 +46,10 @@
         return null;
     }
 
-    public static void allTests(test.Util.Application app)
+    public static void allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator=app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing proxy endpoint information... ");
         out.flush();
         {
@@ -132,7 +127,7 @@
 
             adapter.destroy();
 
-            int port = app.getTestPort(1);
+            int port = helper.getTestPort(1);
             communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -h * -p " + port);
             communicator.getProperties().setProperty("TestAdapter.PublishedEndpoints", "tcp -h dummy -p " + port);
             adapter = communicator.createObjectAdapter("TestAdapter");
@@ -157,10 +152,10 @@
         out.println("ok");
 
         Ice.ObjectPrx base = communicator.stringToProxy("test:" +
-                                                        app.getTestEndpoint(0) + ":" +
-                                                        app.getTestEndpoint(0, "udp"));
+                                                        helper.getTestEndpoint(0) + ":" +
+                                                        helper.getTestEndpoint(0, "udp"));
         TestIntfPrx testIntf = TestIntfPrxHelper.checkedCast(base);
-        int endpointPort = app.getTestPort(0);
+        int endpointPort = helper.getTestPort(0);
 
         final String defaultHost = communicator.getProperties().getProperty("Ice.Default.Host");
         out.print("test connection endpoint information... ");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.info");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.info");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + ":" + getTestEndpoint(1, "udp"));
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        initData.properties.setProperty("TestAdapter.Endpoints",
-                                        getTestEndpoint(initData.properties, 0) + ":" +
-                                        getTestEndpoint(initData.properties, 1, "udp"));
-        return initData;
-    }
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/info/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/info/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.info;
 import test.Ice.info.Test._TestIntfDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
@@ -34,13 +29,13 @@
     }
 
     public static InitialPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CAI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CAI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CAI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CAI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CBI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CBI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CBI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CBI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CCI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CCI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CCI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CCI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CDI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CDI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/CDI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/CDI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
 import test.Ice.inheritance.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new InitialI(adapter);
-        adapter.add(object, Ice.Util.stringToIdentity("initial"));
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new InitialI(adapter);
+            adapter.add(object, Ice.Util.stringToIdentity("initial"));
 
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
-
-        System.gc();
-        System.exit(status);
+            AllTests.allTests(this);
+        }
     }
-
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/IAI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/IAI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/IAI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/IAI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/IB1I.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/IB1I.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/IB1I.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/IB1I.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/IB2I.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/IB2I.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/IB2I.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/IB2I.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/ICI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/ICI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/ICI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/ICI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/InitialI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/InitialI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.inheritance;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new InitialI(adapter);
-        adapter.add(object, Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.inheritance");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new InitialI(adapter);
+            adapter.add(object, Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/AMDInterceptorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
@@ -15,19 +10,10 @@
 import test.Ice.interceptor.Test.MyObjectPrx;
 import test.Ice.interceptor.Test.MyObjectPrxHelper;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    private int
-    run(MyObjectPrx prx, InterceptorI interceptor)
+    private void
+    runTest(MyObjectPrx prx, InterceptorI interceptor)
     {
         PrintWriter out = getWriter();
         out.print("testing simple interceptor... ");
@@ -110,12 +96,10 @@
         test(interceptor.getLastOperation().equals("amdAdd"));
         test(!interceptor.getLastStatus());
         out.println("ok");
-
-        return 0;
     }
 
-    private int
-    runAmd(MyObjectPrx prx, AMDInterceptorI interceptor, PrintWriter out)
+    private void
+    runAmdTest(MyObjectPrx prx, AMDInterceptorI interceptor, PrintWriter out)
     {
         out.print("testing simple interceptor... ");
         out.flush();
@@ -185,74 +169,45 @@
         test(!interceptor.getLastStatus());
         test(interceptor.getException() instanceof MySystemException);
         out.println("ok");
-        return 0;
     }
 
-    @Override
-    public int
-    run(String[] args)
+    public void run(String[] args)
     {
-        //
-        // Create OA and servants
-        //
-        communicator().getProperties().setProperty("MyOA.AdapterId", "myOA");
-
-        Ice.ObjectAdapter oa = communicator().createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
-
-        Ice.Object servant = new MyObjectI();
-        InterceptorI interceptor = new InterceptorI(servant);
-        AMDInterceptorI amdInterceptor = new AMDInterceptorI(servant);
-
-        MyObjectPrx prx = MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(interceptor));
-        MyObjectPrx prxForAMD = MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(amdInterceptor));
-
-        PrintWriter out = getWriter();
-        out.println("Collocation optimization on");
-        int rs = run(prx, interceptor);
-        if(rs != 0)
-        {
-            return rs;
-        }
-
-        out.println("Now with AMD");
-        rs = runAmd(prxForAMD, amdInterceptor, out);
-        if(rs != 0)
-        {
-            return rs;
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interceptor");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            //
+            // Create OA and servants
+            //
+            communicator.getProperties().setProperty("MyOA.AdapterId", "myOA");
+
+            Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA2", "tcp -h localhost");
+
+            Ice.Object servant = new MyObjectI();
+            InterceptorI interceptor = new InterceptorI(servant);
+            AMDInterceptorI amdInterceptor = new AMDInterceptorI(servant);
+
+            MyObjectPrx prx = MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(interceptor));
+            MyObjectPrx prxForAMD = MyObjectPrxHelper.uncheckedCast(oa.addWithUUID(amdInterceptor));
+
+            PrintWriter out = getWriter();
+            out.println("Collocation optimization on");
+            runTest(prx, interceptor);
+
+            out.println("Now with AMD");
+            runAmdTest(prxForAMD, amdInterceptor, out);
+
+            oa.activate(); // Only necessary for non-collocation optimized tests
+
+            out.println("Collocation optimization off");
+            interceptor.clear();
+            prx = MyObjectPrxHelper.uncheckedCast(prx.ice_collocationOptimized(false));
+            runTest(prx, interceptor);
+            out.println("Now with AMD");
+            amdInterceptor.clear();
+            prxForAMD = MyObjectPrxHelper.uncheckedCast(prxForAMD.ice_collocationOptimized(false));
+            runAmdTest(prxForAMD, amdInterceptor, out);
         }
-
-        oa.activate(); // Only necessary for non-collocation optimized tests
-
-        out.println("Collocation optimization off");
-        interceptor.clear();
-        prx = MyObjectPrxHelper.uncheckedCast(prx.ice_collocationOptimized(false));
-        rs = run(prx, interceptor);
-        if(rs != 0)
-        {
-            return rs;
-        }
-
-        out.println("Now with AMD");
-        amdInterceptor.clear();
-        prxForAMD = MyObjectPrxHelper.uncheckedCast(prxForAMD.ice_collocationOptimized(false));
-        rs = runAmd(prxForAMD, amdInterceptor, out);
-
-        return rs;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interceptor");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int status = app.main("Interceptor", args);
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/InterceptorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/InterceptorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/InterceptorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/InterceptorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/MySystemException.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interceptor;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
@@ -85,18 +80,18 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
         throws InterruptedException
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
-        String sref = "test:" + app.getTestEndpoint(0);
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        String sref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         final TestIntfPrx p = TestIntfPrxHelper.uncheckedCast(obj);
 
-        sref = "testController:" + app.getTestEndpoint(1);
+        sref = "testController:" + helper.getTestEndpoint(1);
         obj = communicator.stringToProxy(sref);
         test(obj != null);
 
@@ -572,9 +567,8 @@
             //
             // Check that CommunicatorDestroyedException is raised directly.
             //
-            Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            Ice.Communicator ic = app.initialize(initData);
+            Ice.Properties properties = communicator.getProperties()._clone();
+            Ice.Communicator ic = helper.initialize(properties);
 
             Thread.currentThread().interrupt();
             try
@@ -590,7 +584,7 @@
 
             ExecutorService executor = java.util.concurrent.Executors.newFixedThreadPool(2);
 
-            ic = app.initialize(initData);
+            ic = helper.initialize(properties);
             Ice.ObjectPrx o = ic.stringToProxy(p.toString());
 
             final Thread[] thread = new Thread[1];
@@ -632,6 +626,7 @@
 
                 }
             });
+
             executor.submit(new Runnable() {
                 @Override
                 public void run()
@@ -718,96 +713,96 @@
         {
             final Thread mainThread = Thread.currentThread();
             ExecutorService executor = java.util.concurrent.Executors.newFixedThreadPool(1);
-            Ice.InitializationData initData = app.createInitializationData();
+            Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             initData.properties.setProperty("ClientTestAdapter.Endpoints", "tcp -h *");
-            Ice.Communicator ic = app.initialize(initData);
-            final Ice.ObjectAdapter adapter = ic.createObjectAdapter("ClientTestAdapter");
-            adapter.activate();
-
-            try
-            {
-                mainThread.interrupt();
-                adapter.waitForHold();
-                test(false);
-            }
-            catch(Ice.OperationInterruptedException e)
+            try(Ice.Communicator ic = helper.initialize(initData))
             {
-                // Expected.
-            }
+                final Ice.ObjectAdapter adapter = ic.createObjectAdapter("ClientTestAdapter");
+                adapter.activate();
 
-            try
-            {
-                mainThread.interrupt();
-                adapter.waitForDeactivate();
-                test(false);
-            }
-            catch(Ice.OperationInterruptedException e)
-            {
-                // Expected.
-            }
+                try
+                {
+                    mainThread.interrupt();
+                    adapter.waitForHold();
+                    test(false);
+                }
+                catch(Ice.OperationInterruptedException e)
+                {
+                    // Expected.
+                }
 
-            try
-            {
-                mainThread.interrupt();
-                ic.waitForShutdown();
-                test(false);
-            }
-            catch(Ice.OperationInterruptedException e)
-            {
-                // Expected.
-            }
+                try
+                {
+                    mainThread.interrupt();
+                    adapter.waitForDeactivate();
+                    test(false);
+                }
+                catch(Ice.OperationInterruptedException e)
+                {
+                    // Expected.
+                }
 
-            Runnable interruptMainThread = new Runnable() {
-                @Override
-                public void run()
+                try
                 {
-                    try
-                    {
-                        Thread.sleep(250);
-                    }
-                    catch(InterruptedException e)
-                    {
-                        test(false);
-                    }
                     mainThread.interrupt();
+                    ic.waitForShutdown();
+                    test(false);
+                }
+                catch(Ice.OperationInterruptedException e)
+                {
+                    // Expected.
                 }
-            };
 
-            executor.execute(interruptMainThread);
-            try
-            {
-                adapter.waitForHold();
-                test(false);
-            }
-            catch(Ice.OperationInterruptedException e)
-            {
-                // Expected.
-            }
+                Runnable interruptMainThread = new Runnable() {
+                        @Override
+                        public void run()
+                        {
+                            try
+                            {
+                                Thread.sleep(250);
+                            }
+                            catch(InterruptedException e)
+                            {
+                                test(false);
+                            }
+                            mainThread.interrupt();
+                        }
+                    };
 
-            executor.execute(interruptMainThread);
-            try
-            {
-                adapter.waitForDeactivate();
-                test(false);
-            }
-            catch(Ice.OperationInterruptedException e)
-            {
-                // Expected.
-            }
+                executor.execute(interruptMainThread);
+                try
+                {
+                    adapter.waitForHold();
+                    test(false);
+                }
+                catch(Ice.OperationInterruptedException e)
+                {
+                    // Expected.
+                }
 
-            executor.execute(interruptMainThread);
-            try
-            {
-                ic.waitForShutdown();
-                test(false);
-            }
-            catch(Ice.OperationInterruptedException e)
-            {
-                // Expected.
-            }
+                executor.execute(interruptMainThread);
+                try
+                {
+                    adapter.waitForDeactivate();
+                    test(false);
+                }
+                catch(Ice.OperationInterruptedException e)
+                {
+                    // Expected.
+                }
 
-            ic.destroy();
+                executor.execute(interruptMainThread);
+                try
+                {
+                    ic.waitForShutdown();
+                    test(false);
+                }
+                catch(Ice.OperationInterruptedException e)
+                {
+                    // Expected.
+                }
+            }
 
             executor.shutdown();
             while(!executor.isTerminated())
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,64 +1,47 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        try
-        {
-            AllTests.allTests(this);
-        }
-        catch (InterruptedException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException();
-        }
-        return 0;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
         // We need to enable the ThreadInterruptSafe property so that Ice is
         // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
+        properties.setProperty("Ice.ThreadInterruptSafe", "1");
+
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+        properties.setProperty("Ice.MessageSizeMax", "20000");
+
         //
-        // Retry up to 2 times, sleep 1s for the last retry. This is
+        // Retry up to 2 times, sleep 2s for the last retry. This is
         // useful to test interrupting the retry sleep
         //
-        initData.properties.setProperty("Ice.RetryIntervals", "0 1000");
+        properties.setProperty("Ice.RetryIntervals", "0 2000");
+
         //
         // Limit the send buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-        return initData;
-    }
+        properties.setProperty("Ice.TCP.SndSize", "50000");
 
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
+        catch(Exception ex)
+        {
+            throw new RuntimeException(ex);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,70 +1,46 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-        TestControllerI controller = new TestControllerI(adapter);
-        adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-        adapter2.add(controller, Ice.Util.stringToIdentity("testController"));
-        //adapter2.activate(); // Don't activate OA to ensure collocation is used.
-
-        try
-        {
-            AllTests.allTests(this);
-        }
-        catch (InterruptedException e)
-        {
-            e.printStackTrace();
-            throw new RuntimeException();
-        }
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
         // We need to enable the ThreadInterruptSafe property so that Ice is
         // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
+        properties.setProperty("Ice.ThreadInterruptSafe", "1");
+
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
-
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-        return initData;
-    }
+        properties.setProperty("Ice.MessageSizeMax", "20000");
 
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
+            TestControllerI controller = new TestControllerI(adapter);
+            adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+            adapter2.add(controller, Ice.Util.stringToIdentity("testController"));
+            //adapter2.activate(); // Don't activate OA to ensure collocation is used.
 
-        System.gc();
-        System.exit(status);
+            AllTests.allTests(this);
+        }
+        catch(Exception ex)
+        {
+            throw new RuntimeException(ex);
+        }
     }
-
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,70 +1,58 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        TestControllerI controller = new TestControllerI(adapter);
-        adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        adapter2.add(controller, Ice.Util.stringToIdentity("testController"));
-        adapter2.activate();
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
 
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
         // We need to enable the ThreadInterruptSafe property so that Ice is
         // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
+        properties.setProperty("Ice.ThreadInterruptSafe", "1");
+
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+        properties.setProperty("Ice.MessageSizeMax", "20000");
+
         //
         // opIndempotent raises UnknownException, we disable dispatch
         // warnings to prevent warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
 
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-        return initData;
-    }
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+
+            TestControllerI controller = new TestControllerI(adapter);
+            adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            adapter2.add(controller, Ice.Util.stringToIdentity("testController"));
+            adapter2.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/interrupt/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.interrupt;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 import java.io.PrintWriter;
@@ -233,11 +228,11 @@
     }
 
     public static MyClassPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
-        String ref = "test:" + app.getTestEndpoint(0);
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrxHelper.checkedCast(base);
         MyClassPrx oneway = MyClassPrxHelper.uncheckedCast(cl.ice_oneway());
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/BlobjectAsyncI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/BlobjectI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/BlobjectI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/BlobjectI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/BlobjectI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,68 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
 import test.Ice.invoke.Test.MyClassPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        MyClassPrx myClass = AllTests.allTests(this);
-
-        //
-        // Use reflection to load lambda.AllTests as that is only supported with Java >= 1.8
-        //
-        try
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            Class<?> cls = IceInternal.Util.findClass("test.Ice.invoke.lambda.AllTests", null);
-            if(cls != null)
+            MyClassPrx myClass = AllTests.allTests(this);
+
+            //
+            // Use reflection to load lambda.AllTests as that is only supported with Java >= 1.8
+            //
+            try
             {
-                java.lang.reflect.Method allTests = cls.getDeclaredMethod("allTests",
-                    new Class<?>[]{test.Util.Application.class});
-                allTests.invoke(null, this);
+                Class<?> cls = IceInternal.Util.findClass("test.Ice.invoke.lambda.AllTests", null);
+                if(cls != null)
+                {
+                    java.lang.reflect.Method allTests =
+                        cls.getDeclaredMethod("allTests", new Class<?>[]{ test.TestHelper.class });
+                    allTests.invoke(null, this);
+                }
             }
+            catch(Exception ex)
+            {
+                throw new RuntimeException(ex);
+            }
+            myClass.shutdown();
         }
-        catch(java.lang.NoSuchMethodException ex)
-        {
-            throw new RuntimeException(ex);
-        }
-        catch(java.lang.IllegalAccessException ex)
-        {
-            throw new RuntimeException(ex);
-        }
-        catch(java.lang.reflect.InvocationTargetException ex)
-        {
-            throw new RuntimeException(ex);
-        }
-
-        myClass.shutdown();
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/lambda/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/lambda/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/lambda/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/lambda/AllTests.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Ice.invoke.lambda;
-import java.io.PrintWriter;
-
-import test.Ice.invoke.Test.MyClassPrx;
-import test.Ice.invoke.Test.MyClassPrxHelper;
-import test.Ice.invoke.Test.MyException;
-
-public class AllTests
-{
-    final static String testString = "This is a test string";
-
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    private static class Callback
-    {
-        Callback()
-        {
-            _called = false;
-        }
-
-        public synchronized void check()
-        {
-            while(!_called)
-            {
-                try
-                {
-                    wait();
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-
-            _called = false;
-        }
-
-        public synchronized void called()
-        {
-            assert(!_called);
-            _called = true;
-            notify();
-        }
-
-        private boolean _called;
-    }
-
-    private static class Callback_Object_opStringI
-    {
-        public Callback_Object_opStringI(Ice.Communicator communicator)
-        {
-            _communicator = communicator;
-        }
-
-        public void response(boolean ok, byte[] outEncaps)
-        {
-            if(ok)
-            {
-                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
-                inS.startEncapsulation();
-                String s = inS.readString();
-                test(s.equals(testString));
-                s = inS.readString();
-                test(s.equals(testString));
-                inS.endEncapsulation();
-                callback.called();
-            }
-            else
-            {
-                test(false);
-            }
-        }
-
-        public void exception(Ice.Exception ex)
-        {
-            test(false);
-        }
-
-        public void sent(boolean sent)
-        {
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Ice.Communicator _communicator;
-        private Callback callback = new Callback();
-    }
-
-    private static class Callback_Object_opExceptionI
-    {
-        public Callback_Object_opExceptionI(Ice.Communicator communicator)
-        {
-            _communicator = communicator;
-        }
-
-        public void response(boolean ok, byte[] outEncaps)
-        {
-            if(ok)
-            {
-                test(false);
-            }
-            else
-            {
-                Ice.InputStream inS = new Ice.InputStream(_communicator, outEncaps);
-                inS.startEncapsulation();
-                try
-                {
-                    inS.throwException();
-                }
-                catch(MyException ex)
-                {
-                    inS.endEncapsulation();
-                    callback.called();
-                }
-                catch(java.lang.Exception ex)
-                {
-                    test(false);
-                }
-            }
-        }
-
-        public void exception(Ice.Exception ex)
-        {
-            test(false);
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        public void sent(boolean sent)
-        {
-        }
-
-        private Ice.Communicator _communicator;
-        private Callback callback = new Callback();
-    }
-
-    public static MyClassPrx
-    allTests(test.Util.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
-        String ref = "test:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx base = communicator.stringToProxy(ref);
-        MyClassPrx cl = MyClassPrxHelper.checkedCast(base);
-        MyClassPrx oneway = MyClassPrxHelper.uncheckedCast(cl.ice_oneway());
-
-        out.print("testing asynchronous ice_invoke with lambda callbacks... ");
-        out.flush();
-
-        {
-            Ice.OutputStream outS = new Ice.OutputStream(communicator);
-            outS.startEncapsulation();
-            outS.writeString(testString);
-            outS.endEncapsulation();
-            byte[] inEncaps = outS.finished();
-
-            // begin_ice_invoke with Callback_Object_ice_invoke
-            Callback_Object_opStringI cb2 = new Callback_Object_opStringI(communicator);
-            cl.begin_ice_invoke("opString", Ice.OperationMode.Normal, inEncaps,
-                (boolean ret, byte[] outParams) -> cb2.response(ret, outParams),
-                (Ice.Exception ex) -> cb2.exception(ex),
-                (boolean sent) -> cb2.sent(sent));
-            cb2.check();
-        }
-
-        {
-            // begin_ice_invoke with Callback_Object_ice_invoke
-            Callback_Object_opExceptionI cb2 = new Callback_Object_opExceptionI(communicator);
-            cl.begin_ice_invoke("opException", Ice.OperationMode.Normal, null,
-                (boolean ret, byte[] outParams) -> cb2.response(ret, outParams),
-                (Ice.Exception ex) -> cb2.exception(ex),
-                (boolean sent) -> cb2.sent(sent));
-            cb2.check();
-        }
-
-        out.println("ok");
-
-        return cl;
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/ServantLocatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/ServantLocatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.invoke;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
         boolean async = false;
         for(int i = 0; i < args.length; ++i)
         {
@@ -23,27 +19,15 @@
             }
         }
 
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI(async), "");
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.invoke");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI(async), "");
+            adapter.activate();
 
-        System.gc();
-        System.exit(status);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/invoke/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/invoke/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
@@ -22,7 +17,6 @@
 import test.Ice.location.Test.TestLocatorPrxHelper;
 import test.Ice.location.Test.TestLocatorRegistryPrx;
 import test.Ice.location.Test.TestLocatorRegistryPrxHelper;
-import test.Util.Application;
 
 public class AllTests
 {
@@ -35,15 +29,14 @@
         }
     }
 
-    public static void
-    allTests(Application app)
+    public static void allTests(test.TestHelper helper)
         throws Ice.AdapterAlreadyActiveException, Ice.AdapterNotFoundException, InterruptedException
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         ServerManagerPrx manager = ServerManagerPrxHelper.checkedCast(
-            communicator.stringToProxy("ServerManager :" + app.getTestEndpoint(0)));
+            communicator.stringToProxy("ServerManager :" + helper.getTestEndpoint(0)));
         test(manager != null);
 
         TestLocatorPrx locator = TestLocatorPrxHelper.uncheckedCast(communicator.getDefaultLocator());
@@ -119,6 +112,7 @@
         out.flush();
         obj.shutdown();
         manager.startServer();
+
         try
         {
             obj2.ice_ping();
@@ -134,6 +128,7 @@
         out.flush();
         obj.shutdown();
         manager.startServer();
+
         try
         {
             obj6.ice_ping();
@@ -149,6 +144,7 @@
         out.flush();
         obj.shutdown();
         manager.startServer();
+
         try
         {
             obj3.ice_ping();
@@ -158,6 +154,7 @@
             ex.printStackTrace();
             test(false);
         }
+
         try
         {
             obj2.ice_ping();
@@ -169,6 +166,7 @@
         }
         obj.shutdown();
         manager.startServer();
+
         try
         {
             obj2.ice_ping();
@@ -178,6 +176,7 @@
             ex.printStackTrace();
             test(false);
         }
+
         try
         {
             obj3.ice_ping();
@@ -212,6 +211,7 @@
         }
         obj.shutdown();
         manager.startServer();
+
         try
         {
             obj2.ice_ping();
@@ -268,23 +268,24 @@
         out.print("testing locator cache timeout... ");
         out.flush();
 
+        Ice.ObjectPrx basencc = communicator.stringToProxy("test@TestAdapter").ice_connectionCached(false);
         int count = locator.getRequestCount();
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+        basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
         test(++count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+        basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
         test(++count == locator.getRequestCount());
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+        basencc.ice_locatorCacheTimeout(2).ice_ping(); // 2s timeout.
         test(count == locator.getRequestCount());
-        Thread.sleep(1200);
-        communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+        Thread.sleep(1300);
+        basencc.ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
         test(++count == locator.getRequestCount());
 
         communicator.stringToProxy("test").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
         count += 2;
         test(count == locator.getRequestCount());
-        communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
+        communicator.stringToProxy("test").ice_locatorCacheTimeout(2).ice_ping(); // 2s timeout
         test(count == locator.getRequestCount());
-        Thread.sleep(1200);
+        Thread.sleep(1300);
         communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
         count += 2;
         test(count == locator.getRequestCount());
@@ -400,6 +401,7 @@
 
         out.print("testing adapter locator cache... ");
         out.flush();
+
         try
         {
             communicator.stringToProxy("test@TestAdapter3").ice_ping();
@@ -411,10 +413,12 @@
             test(ex.id.equals("TestAdapter3"));
         }
         registry.setAdapterDirectProxy("TestAdapter3", locator.findAdapterById("TestAdapter"));
+
         try
         {
             communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            registry.setAdapterDirectProxy("TestAdapter3", communicator.stringToProxy("dummy:tcp"));
+            registry.setAdapterDirectProxy("TestAdapter3",
+                                           communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
             communicator.stringToProxy("test@TestAdapter3").ice_ping();
         }
         catch(Ice.LocalException ex)
@@ -431,6 +435,7 @@
         catch(Ice.LocalException ex)
         {
         }
+
         try
         {
             communicator.stringToProxy("test@TestAdapter3").ice_ping();
@@ -440,6 +445,7 @@
         {
         }
         registry.setAdapterDirectProxy("TestAdapter3", locator.findAdapterById("TestAdapter"));
+
         try
         {
             communicator.stringToProxy("test@TestAdapter3").ice_ping();
@@ -466,7 +472,8 @@
             test(ex.id.equals("TestUnknown"));
         }
         registry.addObject(communicator.stringToProxy("test3@TestAdapter4")); // Update
-        registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:tcp"));
+        registry.setAdapterDirectProxy("TestAdapter4",
+                                       communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
 
         try
         {
@@ -477,6 +484,7 @@
         {
         }
         registry.setAdapterDirectProxy("TestAdapter4", locator.findAdapterById("TestAdapter"));
+
         try
         {
             communicator.stringToProxy("test3").ice_ping();
@@ -487,14 +495,15 @@
             test(false);
         }
 
-        registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:tcp"));
+        registry.setAdapterDirectProxy("TestAdapter4",
+                                       communicator.stringToProxy("dummy:" + helper.getTestEndpoint(99)));
         try
         {
             communicator.stringToProxy("test3").ice_ping();
         }
         catch(Ice.LocalException ex)
         {
-        ex.printStackTrace();
+            ex.printStackTrace();
             test(false);
         }
 
@@ -506,6 +515,7 @@
         catch(Ice.LocalException ex)
         {
         }
+
         try
         {
             communicator.stringToProxy("test@TestAdapter4").ice_ping();
@@ -514,6 +524,7 @@
         catch(Ice.LocalException ex)
         {
         }
+
         try
         {
             communicator.stringToProxy("test3").ice_ping();
@@ -523,6 +534,7 @@
         {
         }
         registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+
         try
         {
             communicator.stringToProxy("test3").ice_ping();
@@ -546,56 +558,57 @@
         out.print("testing locator cache background updates... ");
         out.flush();
         {
-            Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
-            Ice.Communicator ic = app.initialize(initData);
-
-            registry.setAdapterDirectProxy("TestAdapter5", locator.findAdapterById("TestAdapter"));
-            registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
-
-            count = locator.getRequestCount();
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            count += 3;
-            test(count == locator.getRequestCount());
-            registry.setAdapterDirectProxy("TestAdapter5", null);
-            registry.addObject(communicator.stringToProxy("test3:tcp"));
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            test(count == locator.getRequestCount());
-            Thread.sleep(1200);
-
-            // The following request should trigger the background updates but still use the cached endpoints
-            // and therefore succeed.
-            ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-            ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-
-            try
+            Ice.Properties properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
+            try(Ice.Communicator ic = helper.initialize(properties))
             {
-                while(true)
+                registry.setAdapterDirectProxy("TestAdapter5", locator.findAdapterById("TestAdapter"));
+                registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+
+                count = locator.getRequestCount();
+                ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                count += 3;
+                test(count == locator.getRequestCount());
+                registry.setAdapterDirectProxy("TestAdapter5", null);
+                registry.addObject(communicator.stringToProxy("test3:" + helper.getTestEndpoint(99)));
+                ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                test(count == locator.getRequestCount());
+                Thread.sleep(1200);
+
+                // The following request should trigger the background updates but still use the cached endpoints
+                // and therefore succeed.
+                ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+
+                try
                 {
-                    ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    Thread.sleep(10);
+                    while(true)
+                    {
+                        ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                        Thread.sleep(10);
+                    }
                 }
-            }
-            catch(Ice.LocalException ex)
-            {
-                // Expected to fail once they endpoints have been updated in the background.
-            }
-            try
-            {
-                while(true)
+                catch(Ice.LocalException ex)
                 {
-                    ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    Thread.sleep(10);
+                    // Expected to fail once they endpoints have been updated in the background.
                 }
+
+                try
+                {
+                    while(true)
+                    {
+                        ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                        Thread.sleep(10);
+                    }
+                }
+                catch(Ice.LocalException ex)
+                {
+                    // Expected to fail once they endpoints have been updated in the background.
+                }
+                ic.destroy();
             }
-            catch(Ice.LocalException ex)
-            {
-                // Expected to fail once they endpoints have been updated in the background.
-            }
-            ic.destroy();
         }
         out.println("ok");
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        try
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.location");
+        properties.setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(properties, 0));
+        try(Ice.Communicator communicator = initialize(properties))
         {
             AllTests.allTests(this);
         }
-        catch(Ice.AdapterAlreadyActiveException ex)
-        {
-            ex.printStackTrace();
-            throw new RuntimeException();
-        }
-        catch(Ice.AdapterNotFoundException ex)
+        catch(Exception ex)
         {
-            ex.printStackTrace();
-            throw new RuntimeException();
+            throw new RuntimeException(ex);
         }
-        catch(InterruptedException ex)
-        {
-            ex.printStackTrace();
-            throw new RuntimeException();
-        }
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.location");
-        initData.properties.setProperty("Ice.Default.Locator", "locator:" + getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/HelloI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/HelloI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/HelloI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/HelloI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,69 +1,50 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    private Ice.InitializationData _initData;
-
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-
-        //
-        // Register the server manager. The server manager creates a new
-        // 'server' (a server isn't a different process, it's just a new
-        // communicator and object adapter).
-        //
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter");
-
-        //
-        // We also register a sample server locator which implements the
-        // locator interface, this locator is used by the clients and the
-        // 'servers' created with the server manager interface.
-        //
-        ServerLocatorRegistry registry = new ServerLocatorRegistry();
-        registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager")));
-        Ice.Object object = new ServerManagerI(registry, _initData, this);
-        adapter.add(object, Ice.Util.stringToIdentity("ServerManager"));
-
-        Ice.LocatorRegistryPrx registryPrx = Ice.LocatorRegistryPrxHelper.uncheckedCast(adapter.add(registry,
-                Ice.Util.stringToIdentity("registry")));
-
-        ServerLocator locator = new ServerLocator(registry, registryPrx);
-        adapter.add(locator, Ice.Util.stringToIdentity("locator"));
-
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.location");
-        initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2");
-        initData.properties.setProperty("Ice.ThreadPool.Server.SizeWarn", "0");
-        initData.properties.setProperty("ServerManagerAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-
-        _initData = initData;
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.location");
+        properties.setProperty("Ice.ThreadPool.Server.Size", "2");
+        properties.setProperty("Ice.ThreadPool.Server.SizeWarn", "0");
+
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("ServerManagerAdapter.Endpoints", getTestEndpoint(0));
+
+            //
+            // Register the server manager. The server manager creates a new
+            // 'server' (a server isn't a different process, it's just a new
+            // communicator and object adapter).
+            //
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter");
+
+            //
+            // We also register a sample server locator which implements the
+            // locator interface, this locator is used by the clients and the
+            // 'servers' created with the server manager interface.
+            //
+            ServerLocatorRegistry registry = new ServerLocatorRegistry();
+            registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager")));
+            Ice.Object object = new ServerManagerI(registry, this);
+            adapter.add(object, Ice.Util.stringToIdentity("ServerManager"));
+
+            Ice.LocatorRegistryPrx registryPrx =
+                Ice.LocatorRegistryPrxHelper.uncheckedCast(adapter.add(registry,
+                                                                       Ice.Util.stringToIdentity("registry")));
+
+            ServerLocator locator = new ServerLocator(registry, registryPrx);
+            adapter.add(locator, Ice.Util.stringToIdentity("locator"));
+
+            adapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/ServerManagerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
@@ -14,17 +9,17 @@
 
 public class ServerManagerI extends _ServerManagerDisp
 {
-    ServerManagerI(ServerLocatorRegistry registry, Ice.InitializationData initData, test.Util.Application app)
+    ServerManagerI(ServerLocatorRegistry registry, test.TestHelper helper)
     {
         _registry = registry;
         _communicators = new java.util.ArrayList<Ice.Communicator>();
 
-        _app = app;
-        _initData = initData;
+        _helper = helper;
+        _properties = helper.communicator().getProperties()._clone();
 
-        _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
-        _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
-        _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
+        _properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
+        _properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+        _properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
     }
 
     @Override
@@ -46,7 +41,7 @@
         // its endpoints with the locator and create references containing
         // the adapter id instead of the endpoints.
         //
-        Ice.Communicator serverCommunicator = _app.initialize(_initData);
+        Ice.Communicator serverCommunicator = _helper.initialize(_properties);
         _communicators.add(serverCommunicator);
 
         int nRetry = 10;
@@ -61,14 +56,14 @@
                 // another OA (e.g.: TestAdapter2 is re-activated using port of TestAdapter).
                 //
                 serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints",
-                                                               _app.getTestEndpoint(_nextPort++));
+                                                               _helper.getTestEndpoint(_nextPort++));
                 serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints",
-                                                               _app.getTestEndpoint(_nextPort++));
+                                                               _helper.getTestEndpoint(_nextPort++));
 
                 adapter = serverCommunicator.createObjectAdapter("TestAdapter");
                 adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2");
 
-                Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:" + _app.getTestEndpoint(0));
+                Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:" + _helper.getTestEndpoint(0));
                 adapter.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
                 adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
 
@@ -115,7 +110,7 @@
 
     private ServerLocatorRegistry _registry;
     private java.util.List<Ice.Communicator> _communicators;
-    private Ice.InitializationData _initData;
-    private test.Util.Application _app;
+    private Ice.Properties _properties;
+    private test.TestHelper _helper;
     private int _nextPort = 1;
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/location/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/location/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.location;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/logger/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/logger/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/logger/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/logger/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.logger;
 
-import Ice.Util;
-import Ice.InitializationData;
-import Ice.Communicator;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    public static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         System.out.print("testing Ice.LogFile... ");
         if(new File("log.txt").exists())
         {
             new File("log.txt").delete();
         }
-        InitializationData initData = new InitializationData();
-        initData.properties = Util.createProperties();
-        initData.properties.setProperty("Ice.LogFile", "log.txt");
-        try(Communicator communicator = Util.initialize(initData))
+
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.LogFile", "log.txt");
+        try(Ice.Communicator communicator = initialize(properties))
         {
             communicator.getLogger().trace("info", "my logger");
         }
         test(new File("log.txt").exists());
+
         try
         {
             test(new String(Files.readAllBytes(Paths.get("log.txt"))).contains("my logger"));
@@ -53,14 +37,5 @@
         }
         new File("log.txt").delete();
         System.out.println("ok");
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
@@ -27,7 +22,7 @@
 
     static String getPort(Ice.PropertiesAdminPrx p)
     {
-        return Integer.toString(test.Util.Application.getTestPort(p.ice_getCommunicator().getProperties(), 0));
+        return Integer.toString(test.TestHelper.getTestPort(p.ice_getCommunicator().getProperties(), 0));
     }
 
     static IceMX.ConnectionMetrics getServerConnectionMetrics(IceMX.MetricsAdminPrx metrics, long expected)
@@ -442,19 +437,20 @@
         return m;
     }
 
-    static MetricsPrx allTests(test.Util.Application app, CommunicatorObserverI obsv)
+    static MetricsPrx allTests(test.TestHelper helper, CommunicatorObserverI obsv)
         throws IceMX.UnknownMetricsView
     {
-        PrintWriter out = app.getWriter();
-        Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        Ice.Communicator communicator = helper.communicator();
 
-        String host = app.getTestHost();
-        String port = Integer.toString(app.getTestPort(0));
+        String host = helper.getTestHost();
+        String port = Integer.toString(helper.getTestPort(0));
         String hostAndPort = host + ":" + port;
-        String protocol = app.getTestProtocol();
+        String protocol = helper.getTestProtocol();
         String endpoint = protocol + " -h " + host + " -p " + port;
 
-        MetricsPrx metrics = MetricsPrxHelper.checkedCast(communicator.stringToProxy("metrics:" + app.getTestEndpoint(0)));
+        MetricsPrx metrics = MetricsPrxHelper.checkedCast(communicator.stringToProxy("metrics:" +
+                                                                                     helper.getTestEndpoint(0)));
         boolean collocated = metrics.ice_getConnection() == null;
 
         int threadCount = 4;
@@ -642,7 +638,7 @@
             test(map.get("active").current == 1);
 
             ControllerPrx controller = ControllerPrxHelper.checkedCast(
-                communicator.stringToProxy("controller:" + app.getTestEndpoint(1)));
+                communicator.stringToProxy("controller:" + helper.getTestEndpoint(1)));
             controller.hold();
 
             map = toMap(clientMetrics.getMetricsView("View", timestamp).get("Connection"));
@@ -871,6 +867,7 @@
         catch(UserEx ex)
         {
         }
+
         try
         {
             metrics.opWithRequestFailedException();
@@ -879,6 +876,7 @@
         catch(Ice.RequestFailedException ex)
         {
         }
+
         try
         {
             metrics.opWithLocalException();
@@ -887,6 +885,7 @@
         catch(Ice.LocalException ex)
         {
         }
+
         try
         {
             metrics.opWithUnknownException();
@@ -895,17 +894,19 @@
         catch(Ice.UnknownException ex)
         {
         }
+
         if(!collocated)
         {
             try
             {
-            metrics.fail();
-            test(false);
+                metrics.fail();
+                test(false);
             }
             catch(Ice.ConnectionLostException ex)
             {
             }
         }
+
         map = toMap(serverMetrics.getMetricsView("View", timestamp).get("Dispatch"));
         test(map.size() == (collocated ? 5 : 6));
 
@@ -999,6 +1000,7 @@
         catch(UserEx ex)
         {
         }
+
         try
         {
             metrics.end_opWithUserException(metrics.begin_opWithUserException());
@@ -1018,6 +1020,7 @@
         catch(Ice.RequestFailedException ex)
         {
         }
+
         try
         {
             metrics.end_opWithRequestFailedException(metrics.begin_opWithRequestFailedException());
@@ -1037,6 +1040,7 @@
         catch(Ice.LocalException ex)
         {
         }
+
         try
         {
             metrics.end_opWithLocalException(metrics.begin_opWithLocalException());
@@ -1056,6 +1060,7 @@
         catch(Ice.UnknownException ex)
         {
         }
+
         try
         {
             metrics.end_opWithUnknownException(metrics.begin_opWithUnknownException());
@@ -1077,6 +1082,7 @@
             catch(Ice.ConnectionLostException ex)
             {
             }
+
             try
             {
                 metrics.end_fail(metrics.begin_fail());
@@ -1203,14 +1209,66 @@
         test(map.size() == 1);
 
         im1 = (IceMX.InvocationMetrics)map.get("op");
-        out.print(im1.current);
-        out.print(im1.total);
         test(im1.current == 0 && im1.total == 3 && im1.failures == 0 && im1.retry == 0);
         test(im1.remotes.length == 0);
 
         testAttribute(clientMetrics, clientProps, update, "Invocation", "mode", "batch-oneway",
                       new InvokeOp(metricsBatchOneway), out);
 
+        //
+        // Tests flushBatchRequests
+        //
+        props.put("IceMX.Metrics.View.Map.Invocation.GroupBy", "operation");
+        props.put("IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy", "localPort");
+        updateProps(clientProps, serverProps, update, props, "Invocation");
+
+        metricsBatchOneway = (MetricsPrx)metrics.ice_batchOneway();
+        metricsBatchOneway.op();
+
+        metricsBatchOneway.ice_flushBatchRequests();
+        metricsBatchOneway.end_ice_flushBatchRequests(metricsBatchOneway.begin_ice_flushBatchRequests());
+
+        map = toMap(clientMetrics.getMetricsView("View", timestamp).get("Invocation"));
+        test(map.size() == 2);
+
+        im1 = (IceMX.InvocationMetrics)map.get("ice_flushBatchRequests");
+        test(im1.current <= 1 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+        if(!collocated)
+        {
+            test(im1.remotes.length == 1); // The first operation got sent over a connection
+        }
+
+        if(!collocated)
+        {
+            clearView(clientProps, serverProps, update);
+
+            Ice.Connection con = metricsBatchOneway.ice_getConnection();
+
+            metricsBatchOneway = (MetricsPrx)metricsBatchOneway.ice_fixed(con);
+            metricsBatchOneway.op();
+
+            con.flushBatchRequests(Ice.CompressBatch.No);
+            con.end_flushBatchRequests(con.begin_flushBatchRequests(Ice.CompressBatch.No));
+
+            map = toMap(clientMetrics.getMetricsView("View", timestamp).get("Invocation"));
+            test(map.size() == 3);
+
+            im1 = (IceMX.InvocationMetrics)map.get("flushBatchRequests");
+            test(im1.current == 0 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+            test(im1.remotes.length == 1); // The first operation got sent over a connection
+
+            clearView(clientProps, serverProps, update);
+            metricsBatchOneway.op();
+
+            communicator.flushBatchRequests(Ice.CompressBatch.No);
+            communicator.end_flushBatchRequests(communicator.begin_flushBatchRequests(Ice.CompressBatch.No));
+            map = toMap(clientMetrics.getMetricsView("View", timestamp).get("Invocation"));
+            test(map.size() == 2);
+
+            im1 = (IceMX.InvocationMetrics)map.get("flushBatchRequests");
+            test(im1.current <= 1 && im1.total == 2 && im1.failures == 0 && im1.retry == 0);
+            test(im1.remotes.length == 1); // The first operation got sent over a connection
+        }
         out.println("ok");
 
         out.print("testing metrics view enable/disable...");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/AMDMetricsI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 import test.Ice.metrics.AMD.Test.*;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMetricsI(), Ice.Util.stringToIdentity("metrics"));
-        adapter.activate();
-
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties.setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer app = new AMDServer();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.retry");
+        properties.setProperty("Ice.Admin.Endpoints", "tcp");
+        properties.setProperty("Ice.Admin.InstanceName", "server");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
+
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMetricsI(), Ice.Util.stringToIdentity("metrics"));
+            adapter.activate();
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+            controllerAdapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
 import test.Ice.metrics.Test.MetricsPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        try
-        {
-            MetricsPrx metrics = AllTests.allTests(this, _observer);
-            metrics.shutdown();
-        }
-        catch(Ice.UserException ex)
-        {
-            ex.printStackTrace();
-            assert(false);
-            return 1;
-        }
-        return 0;
-    }
+        CommunicatorObserverI observer = new CommunicatorObserverI();
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.metrics");
         initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
+        initData.observer = observer;
 
-        initData.observer = _observer;
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            MetricsPrx metrics = AllTests.allTests(this, observer);
+            metrics.shutdown();
+        }
+        catch(Exception ex)
+        {
+            throw new RuntimeException(ex);
+        }
     }
-
-    private CommunicatorObserverI _observer = new CommunicatorObserverI();
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
 import test.Ice.metrics.Test.MetricsPrx;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
-        //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        try
-        {
-            MetricsPrx metrics = AllTests.allTests(this, _observer);
-            metrics.shutdown();
-        }
-        catch(Ice.UserException ex)
-        {
-            ex.printStackTrace();
-            assert(false);
-            return 1;
-        }
-        return 0;
-    }
+        CommunicatorObserverI observer = new CommunicatorObserverI();
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = createTestProperties(args);
         if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
         {
             // With background IO, collocated invocations are
@@ -56,21 +25,29 @@
         initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        initData.observer = _observer;
-        return initData;
-    }
+        initData.observer = observer;
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
-    }
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+            //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used.
 
-    private CommunicatorObserverI _observer = new CommunicatorObserverI();
+            MetricsPrx metrics = AllTests.allTests(this, observer);
+            metrics.shutdown();
+        }
+        catch(Exception ex)
+        {
+            throw new RuntimeException(ex);
+        }
+    }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/CollocatedObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ControllerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ControllerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 import test.Ice.metrics.Test._ControllerDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/MetricsI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 import test.Ice.metrics.Test.*;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/RemoveObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/RemoveObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/RemoveObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/RemoveObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
-        adapter.activate();
-
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
-        Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties.setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.retry");
+        properties.setProperty("Ice.Admin.Endpoints", "tcp");
+        properties.setProperty("Ice.Admin.InstanceName", "server");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.MessageSizeMax", "50000");
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics"));
+            adapter.activate();
+
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+            controllerAdapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.metrics;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.networkProxy;
 
@@ -26,12 +21,12 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "test:" + app.getTestEndpoint(0);
+        String sref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.networkProxy;
 
 import test.Ice.networkProxy.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.networkProxy;
 
 import test.Ice.networkProxy.Test._TestIntfDisp;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     static public class TestI extends _TestIntfDisp
     {
@@ -21,30 +16,18 @@
         }
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/networkProxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
@@ -22,6 +17,10 @@
 import test.Ice.objects.Test.G;
 import test.Ice.objects.Test.H;
 import test.Ice.objects.Test.I;
+import test.Ice.objects.Test.K;
+import test.Ice.objects.Test.L;
+import test.Ice.objects.Test.ValueSeqHolder;
+import test.Ice.objects.Test.ValueMapHolder;
 import test.Ice.objects.Test.A1;
 import test.Ice.objects.Test.B1;
 import test.Ice.objects.Test.D1;
@@ -35,6 +34,9 @@
 import test.Ice.objects.Test.Recursive;
 import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrx;
 import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrxHelper;
+import test.Ice.objects.Test.StructKey;
+import test.Ice.objects.Test.M;
+import test.Ice.objects.Test.MHolder;
 
 public class AllTests
 {
@@ -49,13 +51,13 @@
 
     @SuppressWarnings("deprecation")
     public static InitialPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -202,6 +204,42 @@
         test(h != null && ((H)h) != null);
         out.println("ok");
 
+        out.print("getting K... ");
+        out.flush();
+        {
+            K k = initial.getK();
+            test(k.value instanceof L);
+            L l = (L)k.value;
+            test(l.data.equals("l"));
+        }
+        out.println("ok");
+
+        out.print("testing Value as parameter... ");
+        out.flush();
+        {
+            L v1 = new L("l");
+            Ice.ObjectHolder v2 = new Ice.ObjectHolder();
+            Ice.Object v3 = initial.opValue(v1, v2);
+            test(((L)v2.value).data.equals("l"));
+            test(((L)v3).data.equals("l"));
+        }
+        {
+            L[] v1 = { new L("l") };
+            ValueSeqHolder v2 = new ValueSeqHolder();
+            Ice.Object[] v3 = initial.opValueSeq(v1, v2);
+            test(((L)v2.value[0]).data.equals("l"));
+            test(((L)v3[0]).data.equals("l"));
+        }
+        {
+            java.util.Map<String, Ice.Object> v1 = new java.util.HashMap<String, Ice.Object>();
+            v1.put("l", new L("l"));
+            ValueMapHolder v2 = new ValueMapHolder();
+            java.util.Map<String, Ice.Object> v3 = initial.opValueMap(v1, v2);
+            test(((L)v2.value.get("l")).data.equals("l"));
+            test(((L)v3.get("l")).data.equals("l"));
+        }
+        out.println("ok");
+
         out.print("getting D1... ");
         out.flush();
         D1 d1 = new D1(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4"));
@@ -314,7 +352,7 @@
 
         out.print("testing UnexpectedObjectException...");
         out.flush();
-        ref = "uoet:" + app.getTestEndpoint(0);
+        ref = "uoet:" + helper.getTestEndpoint(0);
         base = communicator.stringToProxy(ref);
         test(base != null);
         UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrxHelper.uncheckedCast(base);
@@ -344,6 +382,30 @@
         test(communicator.getValueFactoryManager().find("TestOF") != null);
         out.println("ok");
 
+        out.print("testing class containing complex dictionary... ");
+        out.flush();
+        {
+            M m = new M();
+            m.v = new java.util.HashMap<StructKey, L>();
+            StructKey k1 = new StructKey(1, "1");
+            m.v.put(k1, new L("one"));
+            StructKey k2 = new StructKey(2, "2");
+            m.v.put(k2, new L("two"));
+
+            MHolder m1 = new MHolder();
+            M m2 = initial.opM(m, m1);
+            test(m1.value.v.size() == 2);
+            test(m2.v.size() == 2);
+
+            test(m1.value.v.get(k1).data.equals("one"));
+            test(m2.v.get(k1).data.equals("one"));
+
+            test(m1.value.v.get(k2).data.equals("two"));
+            test(m2.v.get(k2).data.equals("two"));
+
+        }
+        out.println("ok");
+
         return initial;
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/BI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/BI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/BI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/BI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/CI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/CI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/CI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/CI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
 import test.Ice.objects.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     private static class MyValueFactory implements Ice.ValueFactory
     {
@@ -74,41 +69,27 @@
     }
 
     @SuppressWarnings("deprecation")
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ValueFactory factory = new MyValueFactory();
-        communicator.getValueFactoryManager().add(factory, "::Test::B");
-        communicator.getValueFactoryManager().add(factory, "::Test::C");
-        communicator.getValueFactoryManager().add(factory, "::Test::D");
-        communicator.getValueFactoryManager().add(factory, "::Test::E");
-        communicator.getValueFactoryManager().add(factory, "::Test::F");
-        communicator.getValueFactoryManager().add(factory, "::Test::I");
-        communicator.getValueFactoryManager().add(factory, "::Test::J");
-        communicator.getValueFactoryManager().add(factory, "::Test::H");
-
-        communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
-
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.objects");
+        properties.setProperty("Ice.MessageSizeMax", "2048"); // Needed on some Android versions
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            Ice.ValueFactory factory = new MyValueFactory();
+            communicator.getValueFactoryManager().add(factory, "::Test::B");
+            communicator.getValueFactoryManager().add(factory, "::Test::C");
+            communicator.getValueFactoryManager().add(factory, "::Test::D");
+            communicator.getValueFactoryManager().add(factory, "::Test::E");
+            communicator.getValueFactoryManager().add(factory, "::Test::F");
+            communicator.getValueFactoryManager().add(factory, "::Test::I");
+            communicator.getValueFactoryManager().add(factory, "::Test::J");
+            communicator.getValueFactoryManager().add(factory, "::Test::H");
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects");
-        initData.properties.setProperty("Ice.MessageSizeMax", "2048"); // Needed on some Android versions
-        return initData;
-    }
+            communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
 
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+            InitialPrx initial = AllTests.allTests(this);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
 import test.Ice.objects.Test.Initial;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
     private static class MyValueFactory implements Ice.ValueFactory
     {
@@ -73,49 +68,35 @@
     }
 
     @SuppressWarnings("deprecation")
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ValueFactory factory = new MyValueFactory();
-        communicator.getValueFactoryManager().add(factory, "::Test::B");
-        communicator.getValueFactoryManager().add(factory, "::Test::C");
-        communicator.getValueFactoryManager().add(factory, "::Test::D");
-        communicator.getValueFactoryManager().add(factory, "::Test::E");
-        communicator.getValueFactoryManager().add(factory, "::Test::F");
-        communicator.getValueFactoryManager().add(factory, "::Test::I");
-        communicator.getValueFactoryManager().add(factory, "::Test::J");
-        communicator.getValueFactoryManager().add(factory, "::Test::H");
-
-        communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
-
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Initial initial = new InitialI(adapter);
-        adapter.add(initial, Ice.Util.stringToIdentity("initial"));
-        UnexpectedObjectExceptionTestI object = new UnexpectedObjectExceptionTestI();
-        adapter.add(object, Ice.Util.stringToIdentity("uoet"));
-        AllTests.allTests(this);
-        // We must call shutdown even in the collocated case for cyclic
-        // dependency cleanup
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.objects");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            Ice.ValueFactory factory = new MyValueFactory();
+            communicator.getValueFactoryManager().add(factory, "::Test::B");
+            communicator.getValueFactoryManager().add(factory, "::Test::C");
+            communicator.getValueFactoryManager().add(factory, "::Test::D");
+            communicator.getValueFactoryManager().add(factory, "::Test::E");
+            communicator.getValueFactoryManager().add(factory, "::Test::F");
+            communicator.getValueFactoryManager().add(factory, "::Test::I");
+            communicator.getValueFactoryManager().add(factory, "::Test::J");
+            communicator.getValueFactoryManager().add(factory, "::Test::H");
+
+            communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
+
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Initial initial = new InitialI(adapter);
+            adapter.add(initial, Ice.Util.stringToIdentity("initial"));
+            UnexpectedObjectExceptionTestI object = new UnexpectedObjectExceptionTestI();
+            adapter.add(object, Ice.Util.stringToIdentity("uoet"));
+            AllTests.allTests(this);
+            // We must call shutdown even in the collocated case for cyclic
+            // dependency cleanup
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/DI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/DI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/DI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/DI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/EI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/EI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/EI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/EI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/FI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/FI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/FI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/FI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/HI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/HI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/HI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/HI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/II.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/II.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/II.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/II.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/InitialI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/InitialI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
@@ -20,6 +15,10 @@
 import test.Ice.objects.Test.F;
 import test.Ice.objects.Test.G;
 import test.Ice.objects.Test.I;
+import test.Ice.objects.Test.K;
+import test.Ice.objects.Test.L;
+import test.Ice.objects.Test.ValueSeqHolder;
+import test.Ice.objects.Test.ValueMapHolder;
 import test.Ice.objects.Test.A1;
 import test.Ice.objects.Test.D1;
 import test.Ice.objects.Test.EDerived;
@@ -29,6 +28,8 @@
 import test.Ice.objects.Test.Initial;
 import test.Ice.objects.Test.Compact;
 import test.Ice.objects.Test.CompactExt;
+import test.Ice.objects.Test.M;
+import test.Ice.objects.Test.MHolder;
 
 public final class InitialI extends Initial
 {
@@ -175,6 +176,37 @@
     }
 
     @Override
+    public K
+    getK(Ice.Current current)
+    {
+        return new K(new L("l"));
+    }
+
+    @Override
+    public Ice.Object
+    opValue(Ice.Object v1, Ice.ObjectHolder v2, Ice.Current current)
+    {
+        v2.value = v1;
+        return v1;
+    }
+
+    @Override
+    public Ice.Object[]
+    opValueSeq(Ice.Object[] v1, ValueSeqHolder v2, Ice.Current current)
+    {
+        v2.value = v1;
+        return v1;
+    }
+
+    @Override
+    public java.util.Map<String, Ice.Object>
+    opValueMap(java.util.Map<String, Ice.Object> v1, ValueMapHolder v2, Ice.Current current)
+    {
+        v2.value = v1;
+        return v1;
+    }
+
+    @Override
     public D1
     getD1(D1 d1, Ice.Current current)
     {
@@ -250,6 +282,14 @@
         _adapter.getCommunicator().shutdown();
     }
 
+    @Override
+    public M
+    opM(M v1, MHolder v2, Ice.Current current)
+    {
+        v2.value = v1;
+        return v1;
+    }
+
     private Ice.ObjectAdapter _adapter;
     private B _b1;
     private B _b2;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/JI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/JI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/JI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/JI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
     private static class MyValueFactory implements Ice.ValueFactory
     {
@@ -34,41 +29,30 @@
         }
     }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ValueFactory factory = new MyValueFactory();
-        communicator.getValueFactoryManager().add(factory, "::Test::I");
-        communicator.getValueFactoryManager().add(factory, "::Test::J");
-        communicator.getValueFactoryManager().add(factory, "::Test::H");
-
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new InitialI(adapter);
-        adapter.add(object, Ice.Util.stringToIdentity("initial"));
-        object = new UnexpectedObjectExceptionTestI();
-        adapter.add(object, Ice.Util.stringToIdentity("uoet"));
-        adapter.activate();
-
-        return WAIT;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.objects");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.MessageSizeMax", "2048"); // Needed on some Android versions
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "2048"); // Needed on some Android versions
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ValueFactory factory = new MyValueFactory();
+            communicator.getValueFactoryManager().add(factory, "::Test::I");
+            communicator.getValueFactoryManager().add(factory, "::Test::J");
+            communicator.getValueFactoryManager().add(factory, "::Test::H");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new InitialI(adapter);
+            adapter.add(object, Ice.Util.stringToIdentity("initial"));
+            object = new UnexpectedObjectExceptionTestI();
+            adapter.add(object, Ice.Util.stringToIdentity("uoet"));
+            adapter.activate();
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -173,6 +168,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 class Initial
 {
     void shutdown();
@@ -191,9 +212,15 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -210,6 +237,8 @@
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 class Empty
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
+
 import java.io.PrintWriter;
 
 import test.Ice.operations.Test.MyClassPrx;
@@ -18,32 +14,32 @@
 public class AllTests
 {
     public static MyClassPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrxHelper.checkedCast(base);
         MyDerivedClassPrx derived = MyDerivedClassPrxHelper.checkedCast(cl);
 
         out.print("testing twoway operations... ");
         out.flush();
-        Twoways.twoways(app, cl);
-        Twoways.twoways(app, derived);
+        Twoways.twoways(helper, cl);
+        Twoways.twoways(helper, derived);
         derived.opDerived();
         out.println("ok");
 
         out.print("testing oneway operations... ");
         out.flush();
-        Oneways.oneways(app, cl);
+        Oneways.oneways(helper, cl);
         out.println("ok");
 
         out.print("testing twoway operations with AMI... ");
         out.flush();
-        TwowaysAMI.twowaysAMI(app, cl);
-        TwowaysAMI.twowaysAMI(app, derived);
+        TwowaysAMI.twowaysAMI(helper, cl);
+        TwowaysAMI.twowaysAMI(helper, derived);
         out.println("ok");
 
         //
@@ -56,11 +52,11 @@
             {
                 java.lang.reflect.Method twowaysLambdaAMI =
                     cls.getDeclaredMethod("twowaysLambdaAMI",
-                                          new Class<?>[]{test.Util.Application.class, MyClassPrx.class});
+                                          new Class<?>[]{test.TestHelper.class, MyClassPrx.class});
                 out.print("testing twoway operations with lambda AMI mapping... ");
                 out.flush();
-                twowaysLambdaAMI.invoke(null, app, cl);
-                twowaysLambdaAMI.invoke(null, app, derived);
+                twowaysLambdaAMI.invoke(null, helper, cl);
+                twowaysLambdaAMI.invoke(null, helper, derived);
                 out.println("ok");
             }
         }
@@ -79,7 +75,7 @@
 
         out.print("testing oneway operations with AMI... ");
         out.flush();
-        OnewaysAMI.onewaysAMI(app, cl);
+        OnewaysAMI.onewaysAMI(helper, cl);
         out.println("ok");
 
         //
@@ -92,11 +88,11 @@
             {
                 java.lang.reflect.Method onewaysLambdaAMI =
                     cls.getDeclaredMethod("onewaysLambdaAMI",
-                                          new Class<?>[]{test.Util.Application.class, MyClassPrx.class});
+                                          new Class<?>[]{test.TestHelper.class, MyClassPrx.class});
                 out.print("testing twoway operations with lambda AMI mapping... ");
                 out.flush();
-                onewaysLambdaAMI.invoke(null, app, cl);
-                onewaysLambdaAMI.invoke(null, app, derived);
+                onewaysLambdaAMI.invoke(null, helper, cl);
+                onewaysLambdaAMI.invoke(null, helper, derived);
                 out.println("ok");
             }
         }
@@ -115,8 +111,8 @@
 
         out.print("testing batch oneway operations... ");
         out.flush();
-        BatchOneways.batchOneways(app, cl, out);
-        BatchOneways.batchOneways(app, derived, out);
+        BatchOneways.batchOneways(helper, cl, out);
+        BatchOneways.batchOneways(helper, derived, out);
         out.println("ok");
 
         out.print("testing batch AMI oneway operations... ");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
-
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDTieServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDTieServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/AMDTieServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/AMDTieServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,32 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
 import test.Ice.operations.AMD.Test._MyDerivedClassTie;
 
-public class AMDTieServer extends test.Util.Application
+public class AMDTieServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new _MyDerivedClassTie(new AMDTieMyDerivedClassI()), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
 
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new _MyDerivedClassTie(new AMDTieMyDerivedClassI()), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/BatchOnewaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -73,9 +68,9 @@
     }
 
     static void
-    batchOneways(test.Util.Application app, MyClassPrx p, PrintWriter out)
+    batchOneways(test.TestHelper helper, MyClassPrx p, PrintWriter out)
     {
-        final Ice.Communicator communicator = app.communicator();
+        final Ice.Communicator communicator = helper.communicator();
         final Ice.Properties properties = communicator.getProperties();
         final byte[] bs1 = new byte[10  * 1024];
 
@@ -150,40 +145,39 @@
 
         if(batch.ice_getConnection() != null && !bluetooth)
         {
-            Ice.InitializationData initData = app.createInitializationData();
+            Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = properties._clone();
             BatchRequestInterceptorI interceptor = new BatchRequestInterceptorI();
             initData.batchRequestInterceptor = interceptor;
-            Ice.Communicator ic = app.initialize(initData);
+            try(Ice.Communicator ic = helper.initialize(initData))
+            {
+                batch = MyClassPrxHelper.uncheckedCast(ic.stringToProxy(p.toString()).ice_batchOneway());
 
-            batch = MyClassPrxHelper.uncheckedCast(ic.stringToProxy(p.toString()).ice_batchOneway());
+                test(interceptor.count() == 0);
+                batch.ice_ping();
+                batch.ice_ping();
+                batch.ice_ping();
+                test(interceptor.count() == 0);
+
+                interceptor.setEnqueue(true);
+                batch.ice_ping();
+                batch.ice_ping();
+                batch.ice_ping();
+                test(interceptor.count() == 3);
+
+                batch.ice_flushBatchRequests();
+                batch.ice_ping();
+                test(interceptor.count() == 1);
 
-            test(interceptor.count() == 0);
-            batch.ice_ping();
-            batch.ice_ping();
-            batch.ice_ping();
-            test(interceptor.count() == 0);
-
-            interceptor.setEnqueue(true);
-            batch.ice_ping();
-            batch.ice_ping();
-            batch.ice_ping();
-            test(interceptor.count() == 3);
-
-            batch.ice_flushBatchRequests();
-            batch.ice_ping();
-            test(interceptor.count() == 1);
-
-            batch.opByteSOneway(bs1);
-            test(interceptor.count() == 2);
-            batch.opByteSOneway(bs1);
-            test(interceptor.count() == 3);
-
-            batch.opByteSOneway(bs1); // This should trigger the flush
-            batch.ice_ping();
-            test(interceptor.count() == 2);
+                batch.opByteSOneway(bs1);
+                test(interceptor.count() == 2);
+                batch.opByteSOneway(bs1);
+                test(interceptor.count() == 3);
 
-            ic.destroy();
+                batch.opByteSOneway(bs1); // This should trigger the flush
+                batch.ice_ping();
+                test(interceptor.count() == 2);
+            }
         }
 
         boolean supportsCompress = true;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
 import test.Ice.operations.Test.MyClassPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        java.io.PrintWriter out = getWriter();
-        MyClassPrx myClass = AllTests.allTests(this);
-
-        out.print("testing server shutdown... ");
-        out.flush();
-        myClass.shutdown();
-        try
-        {
-            myClass.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
-            throw new RuntimeException();
-        }
-        catch(Ice.LocalException ex)
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+        properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations");
+        properties.setProperty("Ice.BatchAutoFlushSize", "100");
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            out.println("ok");
-        }
-
-        return 0;
-    }
+            java.io.PrintWriter out = getWriter();
+            MyClassPrx myClass = AllTests.allTests(this);
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-        initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+            out.print("testing server shutdown... ");
+            out.flush();
+            myClass.shutdown();
+            try
+            {
+                myClass.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+                throw new RuntimeException();
+            }
+            catch(Ice.LocalException ex)
+            {
+                out.println("ok");
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,62 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        if(prx.ice_getConnection() != null)
-        {
-            throw new RuntimeException();
-        }
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || isAndroid())
+        Ice.Properties properties = createTestProperties(args);
+        if(properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || isAndroid())
         {
-            initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2");
+            properties.setProperty("Ice.ThreadPool.Server.Size", "2");
         }
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations");
 
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
+        properties.setProperty("Ice.BatchAutoFlushSize", "100");
 
         //
         // Its possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we supress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
+        properties.setProperty("Ice.Warn.Dispatch", "0");
 
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
+
+            if(prx.ice_getConnection() != null)
+            {
+                throw new RuntimeException();
+            }
 
-        System.gc();
-        System.exit(status);
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/lambda/OnewaysLambdaAMI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Ice.operations.lambda;
-
-import test.Ice.operations.Test.MyClassPrx;
-
-public class OnewaysLambdaAMI
-{
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    private static class Callback
-    {
-        Callback()
-        {
-            _called = false;
-        }
-
-        public synchronized void check()
-        {
-            while(!_called)
-            {
-                try
-                {
-                    wait();
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-
-            _called = false;
-        }
-
-        public synchronized void called()
-        {
-            assert(!_called);
-            _called = true;
-            notify();
-        }
-
-        public void
-        sent(boolean sentSynchronously)
-        {
-            called();
-        }
-
-        void noException(Ice.Exception ex)
-        {
-            test(false);
-        }
-
-        private boolean _called;
-    }
-
-    public static void
-    onewaysLambdaAMI(test.Util.Application app, MyClassPrx proxy)
-    {
-        MyClassPrx p = (MyClassPrx)proxy.ice_oneway();
-
-        {
-            final Callback cb = new Callback();
-            p.begin_ice_ping(
-                () -> test(false),
-                (Ice.Exception ex) -> cb.noException(ex),
-                (boolean sent) -> cb.sent(sent)
-            );
-            cb.check();
-        }
-
-        {
-            try
-            {
-                p.begin_ice_isA("::Test::MyClass");
-                test(false);
-            }
-            catch(java.lang.IllegalArgumentException ex)
-            {
-            }
-        }
-
-        {
-            try
-            {
-                p.begin_ice_id();
-                test(false);
-            }
-            catch(java.lang.IllegalArgumentException ex)
-            {
-            }
-        }
-
-        {
-            try
-            {
-                p.begin_ice_ids();
-                test(false);
-            }
-            catch(java.lang.IllegalArgumentException ex)
-            {
-            }
-        }
-
-        {
-            final Callback cb = new Callback();
-            p.begin_opVoid(
-                () -> test(false),
-                (Ice.Exception ex) -> cb.noException(ex),
-                (boolean sent) -> cb.sent(sent)
-            );
-            cb.check();
-        }
-
-        {
-            final Callback cb = new Callback();
-            p.begin_opIdempotent(
-                () -> test(false),
-                (Ice.Exception ex) -> cb.noException(ex),
-                (boolean sent) -> cb.sent(sent)
-            );
-            cb.check();
-        }
-
-        {
-            final Callback cb = new Callback();
-            p.begin_opNonmutating(
-                () -> test(false),
-                (Ice.Exception ex) -> cb.noException(ex),
-                (boolean sent) -> cb.sent(sent)
-            );
-            cb.check();
-        }
-
-        {
-            try
-            {
-                p.begin_opByte((byte)0xff, (byte)0x0f);
-                test(false);
-            }
-            catch(java.lang.IllegalArgumentException ex)
-            {
-            }
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,1432 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Ice.operations.lambda;
-
-import test.Ice.operations.Test.AnotherStruct;
-import test.Ice.operations.Test._MyClassDisp;
-import test.Ice.operations.Test.MyClassPrx;
-import test.Ice.operations.Test._MyDerivedClassDisp;
-import test.Ice.operations.Test.MyDerivedClassPrx;
-import test.Ice.operations.Test.MyDerivedClassPrxHelper;
-import test.Ice.operations.Test.MyEnum;
-import test.Ice.operations.Test.Structure;
-import test.Ice.operations.Test.MyStruct;
-
-import java.util.Map;
-
-public class TwowaysLambdaAMI
-{
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    private static class Callback
-    {
-        Callback()
-        {
-            _called = false;
-        }
-
-        public synchronized void check()
-        {
-            while(!_called)
-            {
-                try
-                {
-                    wait();
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-
-            _called = false;
-        }
-
-        public synchronized void called()
-        {
-            assert(!_called);
-            _called = true;
-            notify();
-        }
-
-        private boolean _called;
-    }
-
-    private static class pingI
-    {
-        public void response()
-        {
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class isAI
-    {
-        public void response(boolean r)
-        {
-            test(r);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class idI
-    {
-        public void response(String id)
-        {
-            test(id.equals(_MyDerivedClassDisp.ice_staticId()));
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class idsI
-    {
-        public void response(String[] ids)
-        {
-            test(ids.length == 3);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opVoidI
-    {
-        public void response()
-        {
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opByteI
-    {
-        public void response(byte r, byte b)
-        {
-            test(b == (byte)0xf0);
-            test(r == (byte)0xff);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opBoolI
-    {
-        public void response(boolean r, boolean b)
-        {
-            test(b);
-            test(!r);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opShortIntLongI
-    {
-        public void response(long r, short s, int i, long l)
-        {
-            test(s == 10);
-            test(i == 11);
-            test(l == 12);
-            test(r == 12);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opFloatDoubleI
-    {
-        public void response(double r, float f, double d)
-        {
-            test(f == 3.14f);
-            test(d == 1.1E10);
-            test(r == 1.1E10);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opStringI
-    {
-        public void response(String r, String s)
-        {
-            test(s.equals("world hello"));
-            test(r.equals("hello world"));
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opMyEnumI
-    {
-        public void response(MyEnum r, MyEnum e)
-        {
-            test(e == MyEnum.enum2);
-            test(r == MyEnum.enum3);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opMyClassI
-    {
-        opMyClassI(Ice.Communicator communicator)
-        {
-            _communicator = communicator;
-        }
-
-        public void response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2)
-        {
-            test(c1.ice_getIdentity().equals(Ice.Util.stringToIdentity("test")));
-            test(c2.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity")));
-            test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test")));
-            // We can't do the callbacks below in connection serialization mode.
-            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
-            {
-                r.opVoid();
-                c1.opVoid();
-                try
-                {
-                    c2.opVoid();
-                    test(false);
-                }
-                catch(Ice.ObjectNotExistException ex)
-                {
-                }
-            }
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-        private Ice.Communicator _communicator;
-    }
-
-    private static class opStructI
-    {
-        opStructI(Ice.Communicator communicator)
-        {
-            _communicator = communicator;
-        }
-
-        public void response(Structure rso, Structure so)
-        {
-            test(rso.p == null);
-            test(rso.e == MyEnum.enum2);
-            test(rso.s.s.equals("def"));
-            test(so.e == MyEnum.enum3);
-            test(so.s.s.equals("a new string"));
-            // We can't do the callbacks below in connection serialization mode.
-            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0)
-            {
-                so.p.opVoid();
-            }
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-        private Ice.Communicator _communicator;
-    }
-
-    private static class opByteSI
-    {
-        public void response(byte[] rso, byte[] bso)
-        {
-            test(bso.length == 4);
-            test(bso[0] == (byte)0x22);
-            test(bso[1] == (byte)0x12);
-            test(bso[2] == (byte)0x11);
-            test(bso[3] == (byte)0x01);
-            test(rso.length == 8);
-            test(rso[0] == (byte)0x01);
-            test(rso[1] == (byte)0x11);
-            test(rso[2] == (byte)0x12);
-            test(rso[3] == (byte)0x22);
-            test(rso[4] == (byte)0xf1);
-            test(rso[5] == (byte)0xf2);
-            test(rso[6] == (byte)0xf3);
-            test(rso[7] == (byte)0xf4);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opBoolSI
-    {
-        public void response(boolean[] rso, boolean[] bso)
-        {
-            test(bso.length == 4);
-            test(bso[0]);
-            test(bso[1]);
-            test(!bso[2]);
-            test(!bso[3]);
-            test(rso.length == 3);
-            test(!rso[0]);
-            test(rso[1]);
-            test(rso[2]);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opShortIntLongSI
-    {
-        public void response(long[] rso, short[] sso, int[] iso, long[] lso)
-        {
-            test(sso.length == 3);
-            test(sso[0] == 1);
-            test(sso[1] == 2);
-            test(sso[2] == 3);
-            test(iso.length == 4);
-            test(iso[0] == 8);
-            test(iso[1] == 7);
-            test(iso[2] == 6);
-            test(iso[3] == 5);
-            test(lso.length == 6);
-            test(lso[0] == 10);
-            test(lso[1] == 30);
-            test(lso[2] == 20);
-            test(lso[3] == 10);
-            test(lso[4] == 30);
-            test(lso[5] == 20);
-            test(rso.length == 3);
-            test(rso[0] == 10);
-            test(rso[1] == 30);
-            test(rso[2] == 20);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opFloatDoubleSI
-    {
-        public void response(double[] rso, float[] fso, double[] dso)
-        {
-            test(fso.length == 2);
-            test(fso[0] == 3.14f);
-            test(fso[1] == 1.11f);
-            test(dso.length == 3);
-            test(dso[0] == 1.3E10);
-            test(dso[1] == 1.2E10);
-            test(dso[2] == 1.1E10);
-            test(rso.length == 5);
-            test(rso[0] == 1.1E10);
-            test(rso[1] == 1.2E10);
-            test(rso[2] == 1.3E10);
-            test((float)rso[3] == 3.14f);
-            test((float)rso[4] == 1.11f);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opStringSI
-    {
-        public void response(String[] rso, String[] sso)
-        {
-            test(sso.length == 4);
-            test(sso[0].equals("abc"));
-            test(sso[1].equals("de"));
-            test(sso[2].equals("fghi"));
-            test(sso[3].equals("xyz"));
-            test(rso.length == 3);
-            test(rso[0].equals("fghi"));
-            test(rso[1].equals("de"));
-            test(rso[2].equals("abc"));
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opByteSSI
-    {
-        public void response(byte[][] rso, byte[][] bso)
-        {
-            test(bso.length == 2);
-            test(bso[0].length == 1);
-            test(bso[0][0] == (byte)0xff);
-            test(bso[1].length == 3);
-            test(bso[1][0] == (byte)0x01);
-            test(bso[1][1] == (byte)0x11);
-            test(bso[1][2] == (byte)0x12);
-            test(rso.length == 4);
-            test(rso[0].length == 3);
-            test(rso[0][0] == (byte)0x01);
-            test(rso[0][1] == (byte)0x11);
-            test(rso[0][2] == (byte)0x12);
-            test(rso[1].length == 1);
-            test(rso[1][0] == (byte)0xff);
-            test(rso[2].length == 1);
-            test(rso[2][0] == (byte)0x0e);
-            test(rso[3].length == 2);
-            test(rso[3][0] == (byte)0xf2);
-            test(rso[3][1] == (byte)0xf1);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opBoolSSI
-    {
-        public void response(boolean[][] rso, boolean[][] bso)
-        {
-            test(bso.length == 4);
-            test(bso[0].length == 1);
-            test(bso[0][0]);
-            test(bso[1].length == 1);
-            test(!bso[1][0]);
-            test(bso[2].length == 2);
-            test(bso[2][0]);
-            test(bso[2][1]);
-            test(bso[3].length == 3);
-            test(!bso[3][0]);
-            test(!bso[3][1]);
-            test(bso[3][2]);
-            test(rso.length == 3);
-            test(rso[0].length == 2);
-            test(rso[0][0]);
-            test(rso[0][1]);
-            test(rso[1].length == 1);
-            test(!rso[1][0]);
-            test(rso[2].length == 1);
-            test(rso[2][0]);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opShortIntLongSSI
-    {
-        public void response(long[][] rso, short[][] sso, int[][] iso, long[][] lso)
-        {
-            test(rso.length == 1);
-            test(rso[0].length == 2);
-            test(rso[0][0] == 496);
-            test(rso[0][1] == 1729);
-            test(sso.length == 3);
-            test(sso[0].length == 3);
-            test(sso[0][0] == 1);
-            test(sso[0][1] == 2);
-            test(sso[0][2] == 5);
-            test(sso[1].length == 1);
-            test(sso[1][0] == 13);
-            test(sso[2].length == 0);
-            test(iso.length == 2);
-            test(iso[0].length == 1);
-            test(iso[0][0] == 42);
-            test(iso[1].length == 2);
-            test(iso[1][0] == 24);
-            test(iso[1][1] == 98);
-            test(lso.length == 2);
-            test(lso[0].length == 2);
-            test(lso[0][0] == 496);
-            test(lso[0][1] == 1729);
-            test(lso[1].length == 2);
-            test(lso[1][0] == 496);
-            test(lso[1][1] == 1729);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opFloatDoubleSSI
-    {
-        public void response(double[][] rso, float[][] fso, double[][] dso)
-        {
-            test(fso.length == 3);
-            test(fso[0].length == 1);
-            test(fso[0][0] == 3.14f);
-            test(fso[1].length == 1);
-            test(fso[1][0] == 1.11f);
-            test(fso[2].length == 0);
-            test(dso.length == 1);
-            test(dso[0].length == 3);
-            test(dso[0][0] == 1.1E10);
-            test(dso[0][1] == 1.2E10);
-            test(dso[0][2] == 1.3E10);
-            test(rso.length == 2);
-            test(rso[0].length == 3);
-            test(rso[0][0] == 1.1E10);
-            test(rso[0][1] == 1.2E10);
-            test(rso[0][2] == 1.3E10);
-            test(rso[1].length == 3);
-            test(rso[1][0] == 1.1E10);
-            test(rso[1][1] == 1.2E10);
-            test(rso[1][2] == 1.3E10);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opStringSSI
-    {
-        public void response(String[][] rso, String[][] sso)
-        {
-            test(sso.length == 5);
-            test(sso[0].length == 1);
-            test(sso[0][0].equals("abc"));
-            test(sso[1].length == 2);
-            test(sso[1][0].equals("de"));
-            test(sso[1][1].equals("fghi"));
-            test(sso[2].length == 0);
-            test(sso[3].length == 0);
-            test(sso[4].length == 1);
-            test(sso[4][0].equals("xyz"));
-            test(rso.length == 3);
-            test(rso[0].length == 1);
-            test(rso[0][0].equals("xyz"));
-            test(rso[1].length == 0);
-            test(rso[2].length == 0);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opStringSSSI
-    {
-        public void response(String[][][] rsso, String[][][] ssso)
-        {
-            test(ssso.length == 5);
-            test(ssso[0].length == 2);
-            test(ssso[0][0].length == 2);
-            test(ssso[0][1].length == 1);
-            test(ssso[1].length == 1);
-            test(ssso[1][0].length == 1);
-            test(ssso[2].length == 2);
-            test(ssso[2][0].length == 2);
-            test(ssso[2][1].length == 1);
-            test(ssso[3].length == 1);
-            test(ssso[3][0].length == 1);
-            test(ssso[4].length == 0);
-            test(ssso[0][0][0].equals("abc"));
-            test(ssso[0][0][1].equals("de"));
-            test(ssso[0][1][0].equals("xyz"));
-            test(ssso[1][0][0].equals("hello"));
-            test(ssso[2][0][0].equals(""));
-            test(ssso[2][0][1].equals(""));
-            test(ssso[2][1][0].equals("abcd"));
-            test(ssso[3][0][0].equals(""));
-
-            test(rsso.length == 3);
-            test(rsso[0].length == 0);
-            test(rsso[1].length == 1);
-            test(rsso[1][0].length == 1);
-            test(rsso[2].length == 2);
-            test(rsso[2][0].length == 2);
-            test(rsso[2][1].length == 1);
-            test(rsso[1][0][0].equals(""));
-            test(rsso[2][0][0].equals(""));
-            test(rsso[2][0][1].equals(""));
-            test(rsso[2][1][0].equals("abcd"));
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opByteBoolDI
-    {
-        public void response(java.util.Map<Byte, Boolean> ro, java.util.Map<Byte, Boolean> _do)
-        {
-            java.util.Map<Byte, Boolean> di1 = new java.util.HashMap<Byte, Boolean>();
-            di1.put((byte)10, Boolean.TRUE);
-            di1.put((byte)100, Boolean.FALSE);
-            test(_do.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get((byte)10).booleanValue() == true);
-            test(ro.get((byte)11).booleanValue() == false);
-            test(ro.get((byte)100).booleanValue() == false);
-            test(ro.get((byte)101).booleanValue() == true);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opShortIntDI
-    {
-        public void response(java.util.Map<Short, Integer> ro, java.util.Map<Short, Integer> _do)
-        {
-            java.util.Map<Short, Integer> di1 = new java.util.HashMap<Short, Integer>();
-            di1.put((short)110, -1);
-            di1.put((short)1100, 123123);
-            test(_do.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get((short)110).intValue() == -1);
-            test(ro.get((short)111).intValue() == -100);
-            test(ro.get((short)1100).intValue() == 123123);
-            test(ro.get((short)1101).intValue() == 0);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opLongFloatDI
-    {
-        public void response(java.util.Map<Long, Float> ro, java.util.Map<Long, Float> _do)
-        {
-            java.util.Map<Long, Float> di1 = new java.util.HashMap<Long, Float>();
-            di1.put(999999110L, Float.valueOf((float)-1.1f));
-            di1.put(999999111L, Float.valueOf((float)123123.2f));
-            test(_do.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get(999999110L).floatValue() == -1.1f);
-            test(ro.get(999999120L).floatValue() == -100.4f);
-            test(ro.get(999999111L).floatValue() == 123123.2f);
-            test(ro.get(999999130L).floatValue() == 0.5f);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opStringStringDI
-    {
-        public void response(java.util.Map<String, String> ro, java.util.Map<String, String> _do)
-        {
-            java.util.Map<String, String> di1 = new java.util.HashMap<String, String>();
-            di1.put("foo", "abc -1.1");
-            di1.put("bar", "abc 123123.2");
-            test(_do.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get("foo").equals("abc -1.1"));
-            test(ro.get("FOO").equals("abc -100.4"));
-            test(ro.get("bar").equals("abc 123123.2"));
-            test(ro.get("BAR").equals("abc 0.5"));
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opStringMyEnumDI
-    {
-        public void response(java.util.Map<String, MyEnum> ro, java.util.Map<String, MyEnum> _do)
-        {
-            java.util.Map<String, MyEnum> di1 = new java.util.HashMap<String, MyEnum>();
-            di1.put("abc", MyEnum.enum1);
-            di1.put("", MyEnum.enum2);
-            test(_do.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get("abc") == MyEnum.enum1);
-            test(ro.get("qwerty") == MyEnum.enum3);
-            test(ro.get("") == MyEnum.enum2);
-            test(ro.get("Hello!!") == MyEnum.enum2);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opMyEnumStringDI
-    {
-        public void response(java.util.Map<MyEnum, String> ro, java.util.Map<MyEnum, String> _do)
-        {
-            java.util.Map<MyEnum, String> di1 = new java.util.HashMap<MyEnum, String>();
-            di1.put(MyEnum.enum1, "abc");
-            test(_do.equals(di1));
-            test(ro.size() == 3);
-            test(ro.get(MyEnum.enum1).equals("abc"));
-            test(ro.get(MyEnum.enum2).equals("Hello!!"));
-            test(ro.get(MyEnum.enum3).equals("qwerty"));
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opMyStructMyEnumDI
-    {
-        public void response(java.util.Map<MyStruct, MyEnum> ro, java.util.Map<MyStruct, MyEnum> _do)
-        {
-            MyStruct s11 = new MyStruct(1, 1);
-            MyStruct s12 = new MyStruct(1, 2);
-            java.util.Map<MyStruct, MyEnum> di1 = new java.util.HashMap<MyStruct, MyEnum>();
-            di1.put(s11, MyEnum.enum1);
-            di1.put(s12, MyEnum.enum2);
-            test(_do.equals(di1));
-            MyStruct s22 = new MyStruct(2, 2);
-            MyStruct s23 = new MyStruct(2, 3);
-            test(ro.size() == 4);
-            test(ro.get(s11) == MyEnum.enum1);
-            test(ro.get(s12) == MyEnum.enum2);
-            test(ro.get(s22) == MyEnum.enum3);
-            test(ro.get(s23) == MyEnum.enum2);
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opIntSI
-    {
-        opIntSI(int l)
-        {
-            _l = l;
-        }
-
-        public void response(int[] r)
-        {
-            test(r.length == _l);
-            for(int j = 0; j < r.length; ++j)
-            {
-                test(r[j] == -j);
-            }
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private int _l;
-        private Callback callback = new Callback();
-    }
-
-    private static class opDerivedI
-    {
-        public void response()
-        {
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opDoubleMarshalingI
-    {
-        public void response()
-        {
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opIdempotentI
-    {
-        public void response()
-        {
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    private static class opNonmutatingI
-    {
-        public void response()
-        {
-            callback.called();
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-
-    public static void
-    twowaysLambdaAMI(test.Util.Application app, MyClassPrx p)
-    {
-        Ice.Communicator communicator = app.communicator();
-
-        {
-            pingI cb = new pingI();
-            p.begin_ice_ping(() -> cb.response(), (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            isAI cb = new isAI();
-            p.begin_ice_isA(_MyClassDisp.ice_staticId(), (boolean r) -> cb.response(r), (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            idI cb = new idI();
-            p.begin_ice_id((String id) -> cb.response(id), (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            idsI cb = new idsI();
-            p.begin_ice_ids((String[] ids) -> cb.response(ids), (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opVoidI cb = new opVoidI();
-            p.begin_opVoid(() -> cb.response(), (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opByteI cb = new opByteI();
-            p.begin_opByte((byte)0xff, (byte)0x0f,
-                (byte p1, byte p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opBoolI cb = new opBoolI();
-            p.begin_opBool(true, false,
-                (boolean p1, boolean p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opShortIntLongI cb = new opShortIntLongI();
-            p.begin_opShortIntLong((short)10, 11, 12L,
-                (long p1, short p2, int p3, long p4) -> cb.response(p1, p2, p3, p4),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opFloatDoubleI cb = new opFloatDoubleI();
-            p.begin_opFloatDouble(3.14f, 1.1E10,
-                (double p1, float p2, double p3) -> cb.response(p1, p2, p3),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opStringI cb = new opStringI();
-            p.begin_opString("hello", "world",
-                (String p1, String p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opMyEnumI cb = new opMyEnumI();
-            p.begin_opMyEnum(MyEnum.enum2,
-                (MyEnum p1, MyEnum p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opMyClassI cb = new opMyClassI(communicator);
-            p.begin_opMyClass(p,
-                (MyClassPrx p1, MyClassPrx p2, MyClassPrx p3) -> cb.response(p1, p2, p3),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            Structure si1 = new Structure();
-            si1.p = p;
-            si1.e = MyEnum.enum3;
-            si1.s = new AnotherStruct();
-            si1.s.s = "abc";
-            Structure si2 = new Structure();
-            si2.p = null;
-            si2.e = MyEnum.enum2;
-            si2.s = new AnotherStruct();
-            si2.s.s = "def";
-
-            opStructI cb = new opStructI(communicator);
-            p.begin_opStruct(si1, si2,
-                (Structure p1, Structure p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final byte[] bsi1 =
-                {
-                    (byte)0x01,
-                    (byte)0x11,
-                    (byte)0x12,
-                    (byte)0x22
-                };
-            final byte[] bsi2 =
-                {
-                    (byte)0xf1,
-                    (byte)0xf2,
-                    (byte)0xf3,
-                    (byte)0xf4
-                };
-
-            opByteSI cb = new opByteSI();
-            p.begin_opByteS(bsi1, bsi2,
-                (byte[] p1, byte[] p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final boolean[] bsi1 = { true, true, false };
-            final boolean[] bsi2 = { false };
-
-            opBoolSI cb = new opBoolSI();
-            p.begin_opBoolS(bsi1, bsi2,
-                (boolean[] p1, boolean[] p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final short[] ssi = { 1, 2, 3 };
-            final int[] isi = { 5, 6, 7, 8 };
-            final long[] lsi = { 10, 30, 20 };
-
-            opShortIntLongSI cb = new opShortIntLongSI();
-            p.begin_opShortIntLongS(ssi, isi, lsi,
-                (long[] p1, short[] p2, int[] p3, long[] p4) -> cb.response(p1, p2, p3, p4),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final float[] fsi = { 3.14f, 1.11f };
-            final double[] dsi = { 1.1E10, 1.2E10, 1.3E10 };
-
-            opFloatDoubleSI cb = new opFloatDoubleSI();
-            p.begin_opFloatDoubleS(fsi, dsi,
-                (double[] p1, float[] p2, double[] p3) -> cb.response(p1, p2, p3),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final String[] ssi1 = { "abc", "de", "fghi" };
-            final String[] ssi2 = { "xyz" };
-
-            opStringSI cb = new opStringSI();
-            p.begin_opStringS(ssi1, ssi2,
-                (String[] p1, String[] p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final byte[][] bsi1 =
-                {
-                    { (byte)0x01, (byte)0x11, (byte)0x12 },
-                    { (byte)0xff }
-                };
-            final byte[][] bsi2 =
-                {
-                    { (byte)0x0e },
-                    { (byte)0xf2, (byte)0xf1 }
-                };
-
-            opByteSSI cb = new opByteSSI();
-            p.begin_opByteSS(bsi1, bsi2,
-                (byte[][] p1, byte[][] p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final boolean[][] bsi1 =
-                {
-                    { true },
-                    { false },
-                    { true, true}
-                };
-
-            final boolean[][] bsi2 =
-                {
-                    { false, false, true }
-                };
-
-            opBoolSSI cb = new opBoolSSI();
-            p.begin_opBoolSS(bsi1, bsi2,
-                    (boolean[][] rso, boolean[][] bso) -> cb.response(rso, bso),
-                    (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final short[][] ssi=
-                {
-                    {1, 2, 5},
-                    {13},
-                    {}
-                };
-            final int[][] isi =
-                {
-                    {24, 98},
-                    {42}
-                };
-            final long[][] lsi =
-                {
-                    {496, 1729},
-                };
-
-            opShortIntLongSSI cb = new opShortIntLongSSI();
-            p.begin_opShortIntLongSS(ssi, isi, lsi,
-                    (long[][] rso, short[][] sso, int[][] iso, long[][] lso) -> cb.response(rso, sso, iso, lso),
-                    (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-        {
-            final float[][] fsi =
-                {
-                    { 3.14f },
-                    { 1.11f },
-                    { },
-                };
-            final double[][] dsi =
-                {
-                    { 1.1E10, 1.2E10, 1.3E10 }
-                };
-
-            opFloatDoubleSSI cb = new opFloatDoubleSSI();
-            p.begin_opFloatDoubleSS(fsi, dsi,
-                (double[][] p1, float[][] p2, double[][] p3) -> cb.response(p1, p2, p3),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final String[][] ssi1 =
-                {
-                    { "abc" },
-                    { "de", "fghi" }
-                };
-            final String[][] ssi2 =
-                {
-                    { },
-                    { },
-                    { "xyz" }
-                };
-
-            opStringSSI cb = new opStringSSI();
-            p.begin_opStringSS(ssi1, ssi2,
-                (String[][] p1, String[][] p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            final String[][][] sssi1 =
-            {
-                {
-                    {
-                        "abc", "de"
-                    },
-                    {
-                        "xyz"
-                    }
-                },
-                {
-                    {
-                        "hello"
-                    }
-                }
-            };
-
-            final String[][][] sssi2 =
-            {
-                {
-                    {
-                        "", ""
-                    },
-                    {
-                        "abcd"
-                    }
-                },
-                {
-                    {
-                        ""
-                    }
-                },
-                {
-                }
-            };
-
-            opStringSSSI cb = new opStringSSSI();
-            p.begin_opStringSSS(sssi1, sssi2,
-                (String[][][] p1, String[][][] p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            java.util.Map<Byte, Boolean> di1 = new java.util.HashMap<Byte, Boolean>();
-            di1.put((byte)10, Boolean.TRUE);
-            di1.put((byte)100, Boolean.FALSE);
-            java.util.Map<Byte, Boolean> di2 = new java.util.HashMap<Byte, Boolean>();
-            di2.put((byte)10, Boolean.TRUE);
-            di2.put((byte)11, Boolean.FALSE);
-            di2.put((byte)101, Boolean.TRUE);
-
-            opByteBoolDI cb = new opByteBoolDI();
-            p.begin_opByteBoolD(di1, di2,
-                (Map<Byte, Boolean> p1, Map<Byte, Boolean> p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            java.util.Map<Short, Integer> di1 = new java.util.HashMap<Short, Integer>();
-            di1.put((short)110, -1);
-            di1.put((short)1100, 123123);
-            java.util.Map<Short, Integer> di2 = new java.util.HashMap<Short, Integer>();
-            di2.put((short)110, -1);
-            di2.put((short)111, -100);
-            di2.put((short)1101, 0);
-
-            opShortIntDI cb = new opShortIntDI();
-            p.begin_opShortIntD(di1, di2,
-                (Map<Short, Integer> p1, Map<Short, Integer> p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            java.util.Map<Long, Float> di1 = new java.util.HashMap<Long, Float>();
-            di1.put(999999110L, Float.valueOf((float)-1.1f));
-            di1.put(999999111L, Float.valueOf((float)123123.2f));
-            java.util.Map<Long, Float> di2 = new java.util.HashMap<Long, Float>();
-            di2.put(999999110L, Float.valueOf((float)-1.1f));
-            di2.put(999999120L, Float.valueOf((float)-100.4f));
-            di2.put(999999130L, Float.valueOf((float)0.5f));
-
-            opLongFloatDI cb = new opLongFloatDI();
-            p.begin_opLongFloatD(di1, di2,
-                (Map<Long, Float> p1, Map<Long, Float> p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            java.util.Map<String, String> di1 = new java.util.HashMap<String, String>();
-            di1.put("foo", "abc -1.1");
-            di1.put("bar", "abc 123123.2");
-            java.util.Map<String, String> di2 = new java.util.HashMap<String, String>();
-            di2.put("foo", "abc -1.1");
-            di2.put("FOO", "abc -100.4");
-            di2.put("BAR", "abc 0.5");
-
-            opStringStringDI cb = new opStringStringDI();
-            p.begin_opStringStringD(di1, di2,
-                (Map<String, String> p1, Map<String, String> p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            java.util.Map<String, MyEnum> di1 = new java.util.HashMap<String, MyEnum>();
-            di1.put("abc", MyEnum.enum1);
-            di1.put("", MyEnum.enum2);
-            java.util.Map<String, MyEnum> di2 = new java.util.HashMap<String, MyEnum>();
-            di2.put("abc", MyEnum.enum1);
-            di2.put("qwerty", MyEnum.enum3);
-            di2.put("Hello!!", MyEnum.enum2);
-
-            opStringMyEnumDI cb = new opStringMyEnumDI();
-            p.begin_opStringMyEnumD(di1, di2,
-                (Map<String, MyEnum> p1, Map<String, MyEnum> p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            java.util.Map<MyEnum, String> di1 = new java.util.HashMap<MyEnum, String>();
-            di1.put(MyEnum.enum1, "abc");
-            java.util.Map<MyEnum, String> di2 = new java.util.HashMap<MyEnum, String>();
-            di2.put(MyEnum.enum2, "Hello!!");
-            di2.put(MyEnum.enum3, "qwerty");
-
-            opMyEnumStringDI cb = new opMyEnumStringDI();
-            p.begin_opMyEnumStringD(di1, di2,
-                (Map<MyEnum, String> p1, Map<MyEnum, String> p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            MyStruct s11 = new MyStruct(1, 1);
-            MyStruct s12 = new MyStruct(1, 2);
-            java.util.Map<MyStruct, MyEnum> di1 = new java.util.HashMap<MyStruct, MyEnum>();
-            di1.put(s11, MyEnum.enum1);
-            di1.put(s12, MyEnum.enum2);
-            MyStruct s22 = new MyStruct(2, 2);
-            MyStruct s23 = new MyStruct(2, 3);
-            java.util.Map<MyStruct, MyEnum> di2 = new java.util.HashMap<MyStruct, MyEnum>();
-            di2.put(s11, MyEnum.enum1);
-            di2.put(s22, MyEnum.enum3);
-            di2.put(s23, MyEnum.enum2);
-
-            opMyStructMyEnumDI cb = new opMyStructMyEnumDI();
-            p.begin_opMyStructMyEnumD(di1, di2,
-                (Map<MyStruct, MyEnum> p1, Map<MyStruct, MyEnum> p2) -> cb.response(p1, p2),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            int[] lengths = { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
-
-            for(int l : lengths)
-            {
-                int[] s = new int[l];
-                for(int i = 0; i < s.length; ++i)
-                {
-                    s[i] = i;
-                }
-                opIntSI cb = new opIntSI(l);
-                p.begin_opIntS(s,
-                    (int[] p1) -> cb.response(p1),
-                    (Ice.Exception ex) -> test(false));
-                cb.check();
-            }
-        }
-
-        {
-            double d = 1278312346.0 / 13.0;
-            double[] ds = new double[5];
-            for(int i = 0; i < 5; i++)
-            {
-                ds[i] = d;
-            }
-            opDoubleMarshalingI cb = new opDoubleMarshalingI();
-            p.begin_opDoubleMarshaling(d, ds,
-                () -> cb.response(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opIdempotentI cb = new opIdempotentI();
-            p.begin_opIdempotent(
-                () -> cb.response(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            opNonmutatingI cb = new opNonmutatingI();
-            p.begin_opNonmutating(
-                () -> cb.response(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-
-        {
-            MyDerivedClassPrx derived = MyDerivedClassPrxHelper.checkedCast(p);
-            test(derived != null);
-            opDerivedI cb = new opDerivedI();
-            derived.begin_opDerived(
-                () -> cb.response(),
-                (Ice.Exception ex) -> test(false));
-            cb.check();
-        }
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/OnewaysAMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/OnewaysAMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/OnewaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/OnewaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -77,7 +72,7 @@
     }
 
     static void
-    onewaysAMI(test.Util.Application app, MyClassPrx proxy)
+    onewaysAMI(test.TestHelper helper, MyClassPrx proxy)
     {
         MyClassPrx p = (MyClassPrx)proxy.ice_oneway();
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Oneways.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Oneways.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Oneways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Oneways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -24,7 +19,7 @@
     }
 
     static void
-    oneways(test.Util.Application app, MyClassPrx p)
+    oneways(test.TestHelper helper, MyClassPrx p)
     {
         p = MyClassPrxHelper.uncheckedCast(p.ice_oneway());
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
 
-        System.gc();
-        System.exit(status);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TieServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TieServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TieServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TieServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,33 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
 import test.Ice.operations.Test._MyDerivedClassTie;
 
-public class TieServer extends test.Util.Application
+public class TieServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new _MyDerivedClassTie(new TieMyDerivedClassI()), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(args);
         //
         // It's possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we suppress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.operations");
 
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new _MyDerivedClassTie(new TieMyDerivedClassI()), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
@@ -1909,9 +1904,9 @@
     }
 
     static void
-    twowaysAMI(test.Util.Application app, MyClassPrx p)
+    twowaysAMI(test.TestHelper helper, MyClassPrx p)
     {
-        Ice.Communicator communicator = app.communicator();
+        Ice.Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
 
         {
@@ -2682,61 +2677,60 @@
             String[] impls = {"Shared", "PerThread"};
             for(int i = 0; i < 2; i++)
             {
-                Ice.InitializationData initData = app.createInitializationData();
-                initData.properties = communicator.getProperties()._clone();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
-
-                Ice.Communicator ic = app.initialize(initData);
+                Ice.Properties properties = communicator.getProperties()._clone();
+                properties.setProperty("Ice.ImplicitContext", impls[i]);
 
-                java.util.Map<String, String> ctx = new java.util.HashMap<>();
-                ctx.put("one", "ONE");
-                ctx.put("two", "TWO");
-                ctx.put("three", "THREE");
+                try(Ice.Communicator ic = helper.initialize(properties))
+                {
+                    java.util.Map<String, String> ctx = new java.util.HashMap<>();
+                    ctx.put("one", "ONE");
+                    ctx.put("two", "TWO");
+                    ctx.put("three", "THREE");
 
-                MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:" + app.getTestEndpoint(0)));
+                    MyClassPrx p3 =
+                        MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint(0)));
 
-                ic.getImplicitContext().setContext(ctx);
-                test(ic.getImplicitContext().getContext().equals(ctx));
-                {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    java.util.Map<String, String> c = p3.end_opContext(r);
-                    test(c.equals(ctx));
-                }
+                    ic.getImplicitContext().setContext(ctx);
+                    test(ic.getImplicitContext().getContext().equals(ctx));
+                    {
+                        Ice.AsyncResult r = p3.begin_opContext();
+                        java.util.Map<String, String> c = p3.end_opContext(r);
+                        test(c.equals(ctx));
+                    }
 
-                ic.getImplicitContext().put("zero", "ZERO");
+                    ic.getImplicitContext().put("zero", "ZERO");
 
-                ctx = ic.getImplicitContext().getContext();
-                {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    java.util.Map<String, String> c = p3.end_opContext(r);
-                    test(c.equals(ctx));
-                }
+                    ctx = ic.getImplicitContext().getContext();
+                    {
+                        Ice.AsyncResult r = p3.begin_opContext();
+                        java.util.Map<String, String> c = p3.end_opContext(r);
+                        test(c.equals(ctx));
+                    }
 
-                java.util.Map<String, String> prxContext = new java.util.HashMap<>();
-                prxContext.put("one", "UN");
-                prxContext.put("four", "QUATRE");
+                    java.util.Map<String, String> prxContext = new java.util.HashMap<>();
+                    prxContext.put("one", "UN");
+                    prxContext.put("four", "QUATRE");
 
-                java.util.Map<String, String> combined = new java.util.HashMap<>(ctx);
-                combined.putAll(prxContext);
-                test(combined.get("one").equals("UN"));
+                    java.util.Map<String, String> combined = new java.util.HashMap<>(ctx);
+                    combined.putAll(prxContext);
+                    test(combined.get("one").equals("UN"));
 
-                p3 = MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
+                    p3 = MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
 
-                ic.getImplicitContext().setContext(null);
-                {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    java.util.Map<String, String> c = p3.end_opContext(r);
-                    test(c.equals(prxContext));
-                }
+                    ic.getImplicitContext().setContext(null);
+                    {
+                        Ice.AsyncResult r = p3.begin_opContext();
+                        java.util.Map<String, String> c = p3.end_opContext(r);
+                        test(c.equals(prxContext));
+                    }
 
-                ic.getImplicitContext().setContext(ctx);
-                {
-                    Ice.AsyncResult r = p3.begin_opContext();
-                    java.util.Map<String, String> c = p3.end_opContext(r);
-                    test(c.equals(combined));
+                    ic.getImplicitContext().setContext(ctx);
+                    {
+                        Ice.AsyncResult r = p3.begin_opContext();
+                        java.util.Map<String, String> c = p3.end_opContext(r);
+                        test(c.equals(combined));
+                    }
                 }
-
-                ic.destroy();
             }
         }
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Twoways.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Twoways.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/operations/Twoways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/operations/Twoways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.operations;
 
 import Ice.*;
 import Ice.Object;
 import test.Ice.operations.Test.*;
-import test.Util.Application;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,9 +46,9 @@
     }
 
     static void
-    twoways(Application app, MyClassPrx p)
+    twoways(test.TestHelper helper, MyClassPrx p)
     {
-        Communicator communicator = app.communicator();
+        Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
 
         String[] literals = p.opStringLiterals();
@@ -1496,65 +1490,62 @@
             String[] impls = {"Shared", "PerThread"};
             for(int i = 0; i < 2; i++)
             {
-                InitializationData initData = app.createInitializationData();
-                initData.properties = communicator.getProperties()._clone();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
-
-                Communicator ic = app.initialize(initData);
-
-                Map<String, String> ctx = new HashMap<>();
-                ctx.put("one", "ONE");
-                ctx.put("two", "TWO");
-                ctx.put("three", "THREE");
+                Properties properties = communicator.getProperties()._clone();
+                properties.setProperty("Ice.ImplicitContext", impls[i]);
+                try(Communicator ic = helper.initialize(properties))
+                {
+                    Map<String, String> ctx = new HashMap<>();
+                    ctx.put("one", "ONE");
+                    ctx.put("two", "TWO");
+                    ctx.put("three", "THREE");
 
-                MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:" + app.getTestEndpoint(0)));
+                    MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint(0)));
 
-                ic.getImplicitContext().setContext(ctx);
-                test(ic.getImplicitContext().getContext().equals(ctx));
-                test(p3.opContext().equals(ctx));
+                    ic.getImplicitContext().setContext(ctx);
+                    test(ic.getImplicitContext().getContext().equals(ctx));
+                    test(p3.opContext().equals(ctx));
 
-                test(!ic.getImplicitContext().containsKey("zero"));
-                String r = ic.getImplicitContext().put("zero", "ZERO");
-                test(r.equals(""));
-                test(ic.getImplicitContext().containsKey("zero"));
-                test(ic.getImplicitContext().get("zero").equals("ZERO"));
+                    test(!ic.getImplicitContext().containsKey("zero"));
+                    String r = ic.getImplicitContext().put("zero", "ZERO");
+                    test(r.equals(""));
+                    test(ic.getImplicitContext().containsKey("zero"));
+                    test(ic.getImplicitContext().get("zero").equals("ZERO"));
 
-                ctx = ic.getImplicitContext().getContext();
-                test(p3.opContext().equals(ctx));
+                    ctx = ic.getImplicitContext().getContext();
+                    test(p3.opContext().equals(ctx));
 
-                Map<String, String> prxContext = new HashMap<>();
-                prxContext.put("one", "UN");
-                prxContext.put("four", "QUATRE");
+                    Map<String, String> prxContext = new HashMap<>();
+                    prxContext.put("one", "UN");
+                    prxContext.put("four", "QUATRE");
 
-                Map<String, String> combined = new HashMap<>(ctx);
-                combined.putAll(prxContext);
-                test(combined.get("one").equals("UN"));
+                    Map<String, String> combined = new HashMap<>(ctx);
+                    combined.putAll(prxContext);
+                    test(combined.get("one").equals("UN"));
 
-                p3 = MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
+                    p3 = MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
 
-                ic.getImplicitContext().setContext(null);
-                test(p3.opContext().equals(prxContext));
+                    ic.getImplicitContext().setContext(null);
+                    test(p3.opContext().equals(prxContext));
 
-                ic.getImplicitContext().setContext(ctx);
-                test(p3.opContext().equals(combined));
+                    ic.getImplicitContext().setContext(ctx);
+                    test(p3.opContext().equals(combined));
 
-                test(ic.getImplicitContext().remove("one").equals("ONE"));
+                    test(ic.getImplicitContext().remove("one").equals("ONE"));
 
-                if(impls[i].equals("PerThread"))
-                {
-                    Thread thread = new PerThreadContextInvokeThread(
-                            MyClassPrxHelper.uncheckedCast(p3.ice_context(null)));
-                    thread.start();
-                    try
-                    {
-                        thread.join();
-                    }
-                    catch(InterruptedException ex)
+                    if(impls[i].equals("PerThread"))
                     {
+                        Thread thread =
+                            new PerThreadContextInvokeThread(MyClassPrxHelper.uncheckedCast(p3.ice_context(null)));
+                        thread.start();
+                        try
+                        {
+                            thread.join();
+                        }
+                        catch(InterruptedException ex)
+                        {
+                        }
                     }
                 }
-
-                ic.destroy();
             }
         }
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 import java.io.PrintWriter;
@@ -24,17 +19,17 @@
     }
 
     public static InitialPrx
-    allTests(test.Util.Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        PrintWriter out = app.getWriter();
-        Ice.Communicator communicator = app.communicator();
+        PrintWriter out = helper.getWriter();
+        Ice.Communicator communicator = helper.communicator();
 
         FactoryI factory = new FactoryI();
         communicator.getValueFactoryManager().add(factory, "");
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -2350,8 +2345,8 @@
             if(cls != null)
             {
                 java.lang.reflect.Method allTests = cls.getDeclaredMethod("allTests",
-                    new Class<?>[]{test.Util.Application.class});
-                allTests.invoke(null, app);
+                    new Class<?>[]{test.TestHelper.class});
+                allTests.invoke(null, helper);
             }
         }
         catch(java.lang.NoSuchMethodException ex)
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new AMDInitialI(), Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional.AMD");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer c = new AMDServer();
-        int status = c.main("Server", args);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.optional.AMD");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDInitialI(), Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
 
-        System.gc();
-        System.exit(status);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
 import test.Ice.optional.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        InitialPrx initial = AllTests.allTests(this, false);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.optional");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this, false);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/InitialI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/InitialI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/lambda/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/lambda/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/lambda/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/lambda/AllTests.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,791 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Ice.optional.lambda;
-import java.io.PrintWriter;
-
-import test.Ice.optional.Test.*;
-import test.Ice.optional.SerializableClass;
-
-public class AllTests
-{
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    private static class CallbackBase
-    {
-        CallbackBase()
-        {
-            _called = false;
-        }
-
-        public synchronized void check()
-        {
-            while(!_called)
-            {
-                try
-                {
-                    wait();
-                }
-                catch(InterruptedException ex)
-                {
-                }
-            }
-
-            _called = false;
-            test(_value);
-            _value = false;
-        }
-
-        public synchronized void called(boolean value)
-        {
-            assert(!_called);
-            _value = value;
-            _called = true;
-            notify();
-        }
-
-        private boolean _value;
-        private boolean _called;
-    }
-
-    public static InitialPrx
-    allTests(test.Util.Application app)
-    {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
-
-        String ref = "initial:" + app.getTestEndpoint(0);
-        Ice.ObjectPrx base = communicator.stringToProxy(ref);
-
-        InitialPrx initial = InitialPrxHelper.uncheckedCast(base);
-
-        out.print("testing optional parameters with async lambda callbacks... ");
-        out.flush();
-        final boolean reqParams = initial.supportsRequiredParams();
-
-        final boolean supportsJavaSerializable = initial.supportsJavaSerializable();
-
-        {
-            Ice.ByteOptional p1 = new Ice.ByteOptional((byte)56);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opByte(p1.get(),
-                    (Ice.ByteOptional ret, Ice.ByteOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opByte(p1,
-                    (Ice.ByteOptional ret, Ice.ByteOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.BooleanOptional p1 = new Ice.BooleanOptional(true);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opBool(p1.get(),
-                    (Ice.BooleanOptional ret, Ice.BooleanOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opBool(p1,
-                    (Ice.BooleanOptional ret, Ice.BooleanOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.ShortOptional p1 = new Ice.ShortOptional((short)56);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opShort(p1.get(),
-                    (Ice.ShortOptional ret, Ice.ShortOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opShort(p1,
-                    (Ice.ShortOptional ret, Ice.ShortOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.IntOptional p1 = new Ice.IntOptional(56);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opInt(p1.get(),
-                    (Ice.IntOptional ret, Ice.IntOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opInt(p1,
-                    (Ice.IntOptional ret, Ice.IntOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.LongOptional p1 = new Ice.LongOptional(56);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opLong(p1.get(),
-                    (Ice.LongOptional ret, Ice.LongOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opLong(p1,
-                    (Ice.LongOptional ret, Ice.LongOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.FloatOptional p1 = new Ice.FloatOptional(1.0f);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFloat(p1.get(),
-                    (Ice.FloatOptional ret, Ice.FloatOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFloat(p1,
-                    (Ice.FloatOptional ret, Ice.FloatOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.DoubleOptional p1 = new Ice.DoubleOptional(1.0);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opDouble(p1.get(),
-                    (Ice.DoubleOptional ret, Ice.DoubleOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opDouble(p1,
-                    (Ice.DoubleOptional ret, Ice.DoubleOptional p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<String> p1 = new Ice.Optional<String>("test");
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opString(p1.get(),
-                    (Ice.Optional<String> ret, Ice.Optional<String> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opString(p1,
-                    (Ice.Optional<String> ret, Ice.Optional<String> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<MyEnum> p1 = new Ice.Optional<MyEnum>(MyEnum.MyEnumMember);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opMyEnum(p1.get(),
-                    (Ice.Optional<MyEnum> ret, Ice.Optional<MyEnum> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opMyEnum(p1,
-                    (Ice.Optional<MyEnum> ret, Ice.Optional<MyEnum> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get() == p2.get() && ret.get() == p1.get()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<SmallStruct> p1 = new Ice.Optional<SmallStruct>(new SmallStruct((byte)56));
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opSmallStruct(p1.get(),
-                    (Ice.Optional<SmallStruct> ret, Ice.Optional<SmallStruct> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opSmallStruct(p1,
-                    (Ice.Optional<SmallStruct> ret, Ice.Optional<SmallStruct> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<FixedStruct> p1 = new Ice.Optional<FixedStruct>(new FixedStruct((byte)56));
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFixedStruct(p1.get(),
-                    (Ice.Optional<FixedStruct> ret, Ice.Optional<FixedStruct> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFixedStruct(p1,
-                    (Ice.Optional<FixedStruct> ret, Ice.Optional<FixedStruct> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<VarStruct> p1 = new Ice.Optional<VarStruct>(new VarStruct("test"));
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opVarStruct(p1.get(),
-                    (Ice.Optional<VarStruct> ret, Ice.Optional<VarStruct> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opVarStruct(p1,
-                    (Ice.Optional<VarStruct> ret, Ice.Optional<VarStruct> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<OneOptional> p1 = new Ice.Optional<OneOptional>(new OneOptional(58));
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opOneOptional(p1.get(),
-                    (Ice.Optional<OneOptional> ret, Ice.Optional<OneOptional> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().getA() == p2.get().getA() &&
-                                ret.get().getA() == p1.get().getA()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opOneOptional(p1,
-                    (Ice.Optional<OneOptional> ret, Ice.Optional<OneOptional> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().getA() == p2.get().getA() &&
-                                ret.get().getA() == p1.get().getA()),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<OneOptionalPrx> p1 = new Ice.Optional<OneOptionalPrx>(
-                OneOptionalPrxHelper.uncheckedCast(communicator.stringToProxy("test")));
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opOneOptionalProxy(p1.get(),
-                    (Ice.Optional<OneOptionalPrx> ret, Ice.Optional<OneOptionalPrx> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opOneOptionalProxy(p1,
-                    (Ice.Optional<OneOptionalPrx> ret, Ice.Optional<OneOptionalPrx> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<byte[]> p1 = new Ice.Optional<byte[]>(new byte[100]);
-            java.util.Arrays.fill(p1.get(), (byte)56);
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opByteSeq(p1.get(),
-                    (Ice.Optional<byte[]> ret, Ice.Optional<byte[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                                java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opByteSeq(p1,
-                    (Ice.Optional<byte[]> ret, Ice.Optional<byte[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                                java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<boolean[]> p1 = new Ice.Optional<boolean[]>(new boolean[100]);
-            java.util.Arrays.fill(p1.get(), true);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opBoolSeq(p1.get(),
-                    (Ice.Optional<boolean[]> ret, Ice.Optional<boolean[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                                java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opBoolSeq(p1,
-                    (Ice.Optional<boolean[]> ret, Ice.Optional<boolean[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                                java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<short[]> p1 = new Ice.Optional<short[]>(new short[100]);
-            java.util.Arrays.fill(p1.get(), (short)56);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opShortSeq(p1.get(),
-                    (Ice.Optional<short[]> ret, Ice.Optional<short[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                                java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opShortSeq(p1,
-                    (Ice.Optional<short[]> ret, Ice.Optional<short[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                                java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<int[]> p1 = new Ice.Optional<int[]>(new int[100]);
-            java.util.Arrays.fill(p1.get(), 56);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opIntSeq(p1.get(),
-                    (Ice.Optional<int[]> ret, Ice.Optional<int[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                                java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opIntSeq(p1,
-                    (Ice.Optional<int[]> ret, Ice.Optional<int[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<long[]> p1 = new Ice.Optional<long[]>(new long[100]);
-            java.util.Arrays.fill(p1.get(), 56);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opLongSeq(p1.get(),
-                    (Ice.Optional<long[]> ret, Ice.Optional<long[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opLongSeq(p1,
-                    (Ice.Optional<long[]> ret, Ice.Optional<long[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<float[]> p1 = new Ice.Optional<float[]>(new float[100]);
-            java.util.Arrays.fill(p1.get(), 1.0f);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFloatSeq(p1.get(),
-                    (Ice.Optional<float[]> ret, Ice.Optional<float[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                CallbackBase cb = new CallbackBase();
-                initial.begin_opFloatSeq(p1,
-                    (Ice.Optional<float[]> ret, Ice.Optional<float[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<double[]> p1 = new Ice.Optional<double[]>(new double[100]);
-            java.util.Arrays.fill(p1.get(), 1.0);
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opDoubleSeq(p1.get(),
-                    (Ice.Optional<double[]> ret, Ice.Optional<double[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                CallbackBase cb = new CallbackBase();
-                initial.begin_opDoubleSeq(p1,
-                    (Ice.Optional<double[]> ret, Ice.Optional<double[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<String[]> p1 = new Ice.Optional<String[]>(new String[10]);
-            java.util.Arrays.fill(p1.get(), "test");
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opStringSeq(p1.get(),
-                    (Ice.Optional<String[]> ret, Ice.Optional<String[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opStringSeq(p1,
-                    (Ice.Optional<String[]> ret, Ice.Optional<String[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<SmallStruct[]> p1 = new Ice.Optional<SmallStruct[]>();
-            p1.set(new SmallStruct[10]);
-            for(int i = 0; i < p1.get().length; ++i)
-            {
-                p1.get()[i] = new SmallStruct();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opSmallStructSeq(p1.get(),
-                    (Ice.Optional<SmallStruct[]> ret, Ice.Optional<SmallStruct[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opSmallStructSeq(p1,
-                    (Ice.Optional<SmallStruct[]> ret, Ice.Optional<SmallStruct[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<java.util.List<SmallStruct>> p1 = new Ice.Optional<java.util.List<SmallStruct>>();
-            p1.set(new java.util.ArrayList<SmallStruct>());
-            for(int i = 0; i < 10; ++i)
-            {
-                p1.get().add(new SmallStruct());
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opSmallStructList(p1.get(),
-                    (Ice.Optional<java.util.List<SmallStruct>> ret, Ice.Optional<java.util.List<SmallStruct>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                CallbackBase cb = new CallbackBase();
-                initial.begin_opSmallStructList(p1,
-                    (Ice.Optional<java.util.List<SmallStruct>> ret, Ice.Optional<java.util.List<SmallStruct>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<FixedStruct[]> p1 = new Ice.Optional<FixedStruct[]>();
-            p1.set(new FixedStruct[10]);
-            for(int i = 0; i < p1.get().length; ++i)
-            {
-                p1.get()[i] = new FixedStruct();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFixedStructSeq(p1.get(),
-                    (Ice.Optional<FixedStruct[]> ret, Ice.Optional<FixedStruct[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFixedStructSeq(p1,
-                    (Ice.Optional<FixedStruct[]> ret, Ice.Optional<FixedStruct[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<java.util.List<FixedStruct>> p1 = new Ice.Optional<java.util.List<FixedStruct>>();
-            p1.set(new java.util.ArrayList<FixedStruct>());
-            for(int i = 0; i < 10; ++i)
-            {
-                p1.get().add(new FixedStruct());
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFixedStructList(p1.get(),
-                    (Ice.Optional<java.util.List<FixedStruct>> ret, Ice.Optional<java.util.List<FixedStruct>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opFixedStructList(p1,
-                    (Ice.Optional<java.util.List<FixedStruct>> ret, Ice.Optional<java.util.List<FixedStruct>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<VarStruct[]> p1 = new Ice.Optional<VarStruct[]>();
-            p1.set(new VarStruct[10]);
-            for(int i = 0; i < p1.get().length; ++i)
-            {
-                p1.get()[i] = new VarStruct("");
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opVarStructSeq(p1.get(),
-                    (Ice.Optional<VarStruct[]> ret, Ice.Optional<VarStruct[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opVarStructSeq(p1,
-                    (Ice.Optional<VarStruct[]> ret, Ice.Optional<VarStruct[]> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && java.util.Arrays.equals(ret.get(), p2.get()) &&
-                            java.util.Arrays.equals(ret.get(), p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        if(supportsJavaSerializable)
-        {
-            Ice.Optional<SerializableClass> p1 = new Ice.Optional<SerializableClass>(new SerializableClass(58));
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opSerializable(p1.get(),
-                    (Ice.Optional<SerializableClass> ret, Ice.Optional<SerializableClass> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opSerializable(p1,
-                    (Ice.Optional<SerializableClass> ret, Ice.Optional<SerializableClass> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<java.util.Map<Integer, Integer>> p1 = new Ice.Optional<java.util.Map<Integer, Integer>>();
-            p1.set(new java.util.HashMap<Integer, Integer>());
-            p1.get().put(1, 2);
-            p1.get().put(2, 3);
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opIntIntDict(p1.get(),
-                    (Ice.Optional<java.util.Map<Integer, Integer>> ret,
-                    Ice.Optional<java.util.Map<Integer, Integer>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opIntIntDict(p1,
-                    (Ice.Optional<java.util.Map<Integer, Integer>> ret,
-                    Ice.Optional<java.util.Map<Integer, Integer>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        {
-            Ice.Optional<java.util.Map<String, Integer>> p1 = new Ice.Optional<java.util.Map<String, Integer>>();
-            p1.set(new java.util.HashMap<String, Integer>());
-            p1.get().put("1", 1);
-            p1.get().put("2", 2);
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opStringIntDict(p1.get(),
-                    (Ice.Optional<java.util.Map<String, Integer>> ret,
-                    Ice.Optional<java.util.Map<String, Integer>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-
-            {
-                final CallbackBase cb = new CallbackBase();
-                initial.begin_opStringIntDict(p1,
-                    (Ice.Optional<java.util.Map<String, Integer>> ret,
-                    Ice.Optional<java.util.Map<String, Integer>> p2) ->
-                        cb.called(ret.isSet() && p2.isSet() && ret.get().equals(p2.get()) && ret.get().equals(p1.get())),
-                    (Ice.Exception ex) -> cb.called(false));
-                cb.check();
-            }
-        }
-
-        out.println("ok");
-
-        return initial;
-    }
-}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/SerializableClass.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/SerializableClass.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/SerializableClass.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/SerializableClass.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.optional;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server c = new Server();
-        int status = c.main("Server", args);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.optional");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
 
-        System.gc();
-        System.exit(status);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
@@ -31,13 +26,13 @@
     }
 
     public static InitialPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
                 out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
 import test.Ice.packagemd.Test.InitialPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        InitialPrx initial = AllTests.allTests(this);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
-        initData.properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
+        properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/NoPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Package.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.packagemd;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new InitialI();
-        adapter.add(object, Ice.Util.stringToIdentity("initial"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
-        initData.properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server c = new Server();
-        int status = c.main("Server", args);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.packagemd");
+        properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial"));
+            adapter.activate();
 
-        System.gc();
-        System.exit(status);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/packagemd/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/plugin/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/plugin/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/plugin/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/plugin/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.plugin;
 
 import java.io.PrintWriter;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         // Under Android the class comes from the communicators classloader which
         // is setup in the android test driver.
@@ -28,157 +22,108 @@
             jarFile = "../../../../../../../lib/IceTestPlugins.jar";
         }
 
-        Ice.Communicator communicator = communicator();
         PrintWriter printWriter = getWriter();
         printWriter.print("testing a simple plug-in... ");
         printWriter.flush();
-        try
-        {
-            Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.Test",
-                jarFile + ":test.Ice.plugin.plugins.PluginFactory " +
-                "'C:\\Program Files\\' --DatabasePath 'C:\\Program Files\\Application\\db'");
-            communicator = Ice.Util.initialize(args, initData);
-            communicator.destroy();
-        }
-        catch(Ice.LocalException ex)
+
         {
-            ex.printStackTrace();
-            test(false);
+            Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.Test",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginFactory " +
+                                   "'C:\\Program Files\\' --DatabasePath 'C:\\Program Files\\Application\\db'");
+            try(Ice.Communicator communicator = initialize(properties))
+            {
+            }
         }
         printWriter.println("ok");
 
         printWriter.print("testing a simple plug-in that fails to initialize... ");
         printWriter.flush();
-        communicator = null;
-        try
         {
-            Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.Test",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginInitializeFailFactory");
-            communicator = Ice.Util.initialize(args, initData);
-            test(false);
+            Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.Test",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginInitializeFailFactory");
+            try(Ice.Communicator communicator = initialize(properties))
+            {
+                test(false);
+            }
+            catch(Ice.PluginInitializationException ex)
+            {
+                test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
+            }
         }
-        catch(Ice.PluginInitializationException ex)
-        {
-            test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
-        }
-        test(communicator == null);
         printWriter.println("ok");
 
         printWriter.print("testing plug-in load order... ");
         printWriter.flush();
-        try
-        {
-            Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.PluginOne",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
-            communicator = Ice.Util.initialize(args, initData);
-            communicator.destroy();
-        }
-        catch(Ice.LocalException ex)
         {
-            ex.printStackTrace();
-            test(false);
+            Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.PluginOne",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
+            properties.setProperty("Ice.Plugin.PluginTwo",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
+            properties.setProperty("Ice.Plugin.PluginThree",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
+            properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
+            try(Ice.Communicator communicator = initialize(properties))
+            {
+            }
         }
         printWriter.println("ok");
 
         printWriter.print("testing plug-in manager... ");
         printWriter.flush();
-        try
         {
-            Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.PluginOne",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree",
-                                            jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo");
-            initData.properties.setProperty("Ice.InitPlugins", "0");
-            communicator = Ice.Util.initialize(args, initData);
-
-            Ice.PluginManager pm = communicator.getPluginManager();
-            test(pm.getPlugin("PluginOne") != null);
-            test(pm.getPlugin("PluginTwo") != null);
-            test(pm.getPlugin("PluginThree") != null);
-
-            MyPlugin p4 = new MyPlugin();
-            pm.addPlugin("PluginFour", p4);
-            test(pm.getPlugin("PluginFour") != null);
-
-            pm.initializePlugins();
+            Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.PluginOne",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginOneFactory");
+            properties.setProperty("Ice.Plugin.PluginTwo",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory");
+            properties.setProperty("Ice.Plugin.PluginThree",
+                                   jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory");
+            properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo");
+            properties.setProperty("Ice.InitPlugins", "0");
+
+            MyPlugin p4 = null;
+            try(Ice.Communicator communicator = initialize(properties))
+            {
+                Ice.PluginManager pm = communicator.getPluginManager();
+                test(pm.getPlugin("PluginOne") != null);
+                test(pm.getPlugin("PluginTwo") != null);
+                test(pm.getPlugin("PluginThree") != null);
+
+                p4 = new MyPlugin();
+                pm.addPlugin("PluginFour", p4);
+                test(pm.getPlugin("PluginFour") != null);
 
-            test(p4.isInitialized());
-
-            communicator.destroy();
+                pm.initializePlugins();
 
+                test(p4.isInitialized());
+            }
             test(p4.isDestroyed());
         }
-        catch(Ice.LocalException ex)
-        {
-            ex.printStackTrace();
-            test(false);
-        }
         printWriter.println("ok");
 
         printWriter.print("testing destroy when a plug-in fails to initialize... ");
         printWriter.flush();
-        communicator = null;
-        try
         {
-            Ice.InitializationData initData = createInitData();
-            initData.properties.setProperty("Ice.Plugin.PluginOneFail",
+            Ice.Properties properties = createTestProperties(args);
+            properties.setProperty("Ice.Plugin.PluginOneFail",
                                             jarFile + ":test.Ice.plugin.plugins.PluginOneFailFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwoFail",
+            properties.setProperty("Ice.Plugin.PluginTwoFail",
                                             jarFile + ":test.Ice.plugin.plugins.PluginTwoFailFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThreeFail",
+            properties.setProperty("Ice.Plugin.PluginThreeFail",
                                             jarFile + ":test.Ice.plugin.plugins.PluginThreeFailFactory");
-            initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
-            communicator = Ice.Util.initialize(args, initData);
-        }
-        catch(Ice.PluginInitializationException ex)
-        {
-            test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
+            properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
+            try(Ice.Communicator communicator = initialize(properties))
+            {
+            }
+            catch(Ice.PluginInitializationException ex)
+            {
+                test(ex.getCause().getMessage().equals("PluginInitializeFailException"));
+            }
         }
-        test(communicator == null);
         printWriter.println("ok");
-
-        System.gc();
-        System.runFinalization();
-        return 0;
-    }
-
-    private Ice.InitializationData createInitData()
-    {
-        Ice.InitializationData initData = createInitializationData() ;
-        if(classLoader() != null)
-        {
-            initData.classLoader = classLoader();
-        }
-        initData.properties = Ice.Util.createProperties();
-        return initData;
-    }
-
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 
     static class MyPlugin implements Ice.Plugin
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/properties/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/properties/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/properties/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/properties/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.properties;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    public static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     class PropertiesClient extends Ice.Application
     {
         @Override
@@ -34,10 +20,9 @@
             test(appName().equals(properties.getProperty("Ice.ProgramName")));
             return 0;
         };
-    };
+    }
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
         {
             System.out.print("testing load properties from UTF-8 path... ");
@@ -53,6 +38,7 @@
             c.main("", args, configPath);
             System.out.println("ok");
         }
+
         {
             //
             // Try to load multiple config files.
@@ -100,16 +86,6 @@
             }
             System.out.println("ok");
         }
-
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-        System.gc();
-        System.exit(status);
     }
 
     private static String configPath = "./config/\u4E2D\u56FD_client.config";
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 import java.io.PrintWriter;
@@ -27,15 +22,15 @@
     }
 
     public static MyClassPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
+        Ice.Communicator communicator = helper.communicator();
         final boolean bluetooth = communicator.getProperties().getProperty("Ice.Default.Protocol").indexOf("bt") == 0;
-        PrintWriter out = app.getWriter();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
 
@@ -409,7 +404,7 @@
         out.flush();
         Ice.Properties prop = communicator.getProperties();
         String propertyPrefix = "Foo.Proxy";
-        prop.setProperty(propertyPrefix, "test:" + app.getTestEndpoint(0));
+        prop.setProperty(propertyPrefix, "test:" + helper.getTestEndpoint(0));
         b1 = communicator.propertyToProxy(propertyPrefix);
         test(b1.ice_getIdentity().name.equals("test") && b1.ice_getIdentity().category.length() == 0 &&
              b1.ice_getAdapterId().length() == 0 && b1.ice_getFacet().length() == 0);
@@ -453,7 +448,7 @@
         //test(b1.ice_getLocatorCacheTimeout() == 60);
         //prop.setProperty("Ice.Default.LocatorCacheTimeout", "");
 
-        prop.setProperty(propertyPrefix, "test:" + app.getTestEndpoint(0));
+        prop.setProperty(propertyPrefix, "test:" + helper.getTestEndpoint(0));
 
         property = propertyPrefix + ".Router";
         test(b1.ice_getRouter() == null);
@@ -831,7 +826,7 @@
 
         out.print("testing encoding versioning... ");
         out.flush();
-        String ref20 = "test -e 2.0:" + app.getTestEndpoint(0);
+        String ref20 = "test -e 2.0:" + helper.getTestEndpoint(0);
         MyClassPrx cl20 = MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref20));
         try
         {
@@ -843,7 +838,7 @@
             // Server 2.0 endpoint doesn't support 1.1 version.
         }
 
-        String ref10 = "test -e 1.0:" + app.getTestEndpoint(0);
+        String ref10 = "test -e 1.0:" + helper.getTestEndpoint(0);
         MyClassPrx cl10 = MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref10));
         cl10.ice_ping();
         cl10.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
@@ -851,7 +846,7 @@
 
         // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
         // call will use the 1.1 encoding
-        String ref13 = "test -e 1.3:" + app.getTestEndpoint(0);
+        String ref13 = "test -e 1.3:" + helper.getTestEndpoint(0);
         MyClassPrx cl13 = MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref13));
         cl13.ice_ping();
         cl13.end_ice_ping(cl13.begin_ice_ping());
@@ -957,7 +952,7 @@
 
         out.print("testing protocol versioning... ");
         out.flush();
-        ref20 = "test -p 2.0:" + app.getTestEndpoint(0);
+        ref20 = "test -p 2.0:" + helper.getTestEndpoint(0);
         cl20 = MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref20));
         try
         {
@@ -969,13 +964,13 @@
             // Server 2.0 proxy doesn't support 1.0 version.
         }
 
-        ref10 = "test -p 1.0:" + app.getTestEndpoint(0);
+        ref10 = "test -p 1.0:" + helper.getTestEndpoint(0);
         cl10 = MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref10));
         cl10.ice_ping();
 
         // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
         // call will use the 1.1 protocol
-        ref13 = "test -p 1.3:" + app.getTestEndpoint(0);
+        ref13 = "test -p 1.3:" + helper.getTestEndpoint(0);
         cl13 = MyClassPrxHelper.uncheckedCast(communicator.stringToProxy(ref13));
         cl13.ice_ping();
         cl13.end_ice_ping(cl13.begin_ice_ping());
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 import test.Ice.proxy.AMD.Test.AMD_MyClass_getContext;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
 import test.Ice.proxy.Test.MyClassPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        MyClassPrx myClass = AllTests.allTests(this);
-        myClass.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            MyClassPrx myClass = AllTests.allTests(this);
+            myClass.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
 
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main(" extends", args);
-        System.gc();
-        System.exit(result);
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 import test.Ice.proxy.Test._MyDerivedClassDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.proxy;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
 import test.Ice.retry.Test.RetryPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
     private Instrumentation instrumentation = new Instrumentation();
 
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        Ice.InitializationData initData2 = createInitializationData();
-        initData2.properties = communicator.getProperties()._clone();
-        initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = instrumentation.getObserver();
-        Ice.Communicator communicator2 = initialize(initData2);
-
-        try
-        {
-            RetryPrx retry = AllTests.allTests(communicator, communicator2, getWriter(), instrumentation,
-                                               "retry:" + getTestEndpoint(0));
-            retry.shutdown();
-            return 0;
-        }
-        finally
-        {
-            communicator2.destroy();
-        }
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
         initData.observer = instrumentation.getObserver();
 
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-
         initData.properties.setProperty("Ice.RetryIntervals", "0 1 400 1");
 
         //
@@ -59,14 +24,22 @@
         //
         initData.properties.setProperty("Ice.Warn.Connections", "0");
 
-        return initData;
-    }
+        try(Ice.Communicator communicator = initialize(initData))
+        {
 
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+            //
+            // Configure a second communicator for the invocation timeout
+            // + retry test, we need to configure a large retry interval
+            // to avoid time-sensitive failures.
+            //
+            initData.properties = communicator.getProperties()._clone();
+            initData.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+            try(Ice.Communicator communicator2 = initialize(initData))
+            {
+                RetryPrx retry = AllTests.allTests(communicator, communicator2, getWriter(), instrumentation,
+                                                   "retry:" + getTestEndpoint(0));
+                retry.shutdown();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
 import test.Ice.retry.Test.RetryPrx;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
     private Instrumentation instrumentation = new Instrumentation();
 
@@ -23,45 +18,13 @@
         //adapter.activate(); // Don't activate OA to ensure collocation is used.
     }
 
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        Ice.InitializationData initData2 = createInitializationData();
-        initData2.properties = communicator.getProperties()._clone();
-        initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = instrumentation.getObserver();
-        Ice.Communicator communicator2 = initialize(initData2);
-
-        setupObjectAdapter(communicator);
-        setupObjectAdapter(communicator2);
-
-        try
-        {
-            RetryPrx retry = AllTests.allTests(communicator, communicator2, getWriter(), instrumentation, "retry");
-            retry.shutdown();
-            return 0;
-        }
-        finally
-        {
-            communicator2.destroy();
-        }
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.InitializationData initData = new Ice.InitializationData();
         initData.observer = instrumentation.getObserver();
 
+        initData.properties = createTestProperties(args);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-
         initData.properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
 
         //
@@ -69,15 +32,23 @@
         //
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(initData))
+        {
+            //
+            // Configure a second communicator for the invocation timeout
+            // + retry test, we need to configure a large retry interval
+            // to avoid time-sensitive failures.
+            //
+            initData.properties = communicator.getProperties()._clone();
+            initData.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+            try(Ice.Communicator communicator2 = initialize(initData))
+            {
+                setupObjectAdapter(communicator);
+                setupObjectAdapter(communicator2);
+
+                RetryPrx retry = AllTests.allTests(communicator, communicator2, getWriter(), instrumentation, "retry");
+                retry.shutdown();
+            }
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/RetryI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/RetryI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/RetryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/RetryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 import test.Ice.retry.Test._RetryDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.retry");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/SystemFailure.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/SystemFailure.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/SystemFailure.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/SystemFailure.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.retry;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/retry/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/retry/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/AllTests.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,1154 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.scope;
+
+import java.io.PrintWriter;
+
+public class AllTests
+{
+    private static void test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    private static class Callback
+    {
+        Callback()
+        {
+            _called = false;
+        }
+
+        public synchronized void check()
+        {
+            while(!_called)
+            {
+                try
+                {
+                    wait();
+                }
+                catch(InterruptedException ex)
+                {
+                }
+            }
+
+            _called = false;
+        }
+
+        public synchronized void called()
+        {
+            assert(!_called);
+            _called = true;
+            notify();
+        }
+
+        private boolean _called;
+    }
+
+    public static void allTests(test.TestHelper helper)
+    {
+        PrintWriter out = helper.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.IPrx i = test.Ice.scope.Test.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            test.Ice.scope.Test.SHolder s2 = new test.Ice.scope.Test.SHolder();
+            test.Ice.scope.Test.S s3 = i.opS(s1, s2);
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            test.Ice.scope.Test.SSeqHolder sseq2 = new test.Ice.scope.Test.SSeqHolder();
+            test.Ice.scope.Test.S[] sseq3 = i.opSSeq(sseq1, sseq2);
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.SMapHolder smap2 = new test.Ice.scope.Test.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.S> smap3 = i.opSMap(smap1, smap2);
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            test.Ice.scope.Test.CHolder c2 = new test.Ice.scope.Test.CHolder();
+            test.Ice.scope.Test.C c3 = i.opC(c1, c2);
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            test.Ice.scope.Test.CSeqHolder cseq2 = new test.Ice.scope.Test.CSeqHolder();
+            test.Ice.scope.Test.C[] cseq3 = i.opCSeq(cseq1, cseq2);
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.CMapHolder cmap2 = new test.Ice.scope.Test.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.C> cmap3 = i.opCMap(cmap1, cmap2);
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.IPrx i = test.Ice.scope.Test.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            test.Ice.scope.Test.SHolder s2 = new test.Ice.scope.Test.SHolder();
+            test.Ice.scope.Test.S s3 = i.end_opS(s2, i.begin_opS(s1));
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            test.Ice.scope.Test.SSeqHolder sseq2 = new test.Ice.scope.Test.SSeqHolder();
+            test.Ice.scope.Test.S[] sseq3 = i.end_opSSeq(sseq2, i.begin_opSSeq(sseq1));
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.SMapHolder smap2 = new test.Ice.scope.Test.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.S> smap3 = i.end_opSMap(smap2, i.begin_opSMap(smap1));
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            test.Ice.scope.Test.CHolder c2 = new test.Ice.scope.Test.CHolder();
+            test.Ice.scope.Test.C c3 = i.end_opC(c2, i.begin_opC(c1));
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            test.Ice.scope.Test.CSeqHolder cseq2 = new test.Ice.scope.Test.CSeqHolder();
+            test.Ice.scope.Test.C[] cseq3 = i.end_opCSeq(cseq2, i.begin_opCSeq(cseq1));
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.CMapHolder cmap2 = new test.Ice.scope.Test.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.C> cmap3 = i.end_opCMap(cmap2, i.begin_opCMap(cmap1));
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.IPrx i = test.Ice.scope.Test.IPrxHelper.checkedCast(obj);
+
+            final test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            {
+                class OpSCallback extends test.Ice.scope.Test.Callback_I_opS
+                {
+                    public void response(test.Ice.scope.Test.S s2, test.Ice.scope.Test.S s3)
+                    {
+                        test(s1.equals(s2));
+                        test(s1.equals(s3));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSCallback cb = new OpSCallback();
+                i.begin_opS(s1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            {
+                class OpSSeqCallback extends test.Ice.scope.Test.Callback_I_opSSeq
+                {
+                    public void response(test.Ice.scope.Test.S[] s2, test.Ice.scope.Test.S[] s3)
+                    {
+                        test(s1.equals(s2[0]));
+                        test(s1.equals(s3[0]));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSSeqCallback cb = new OpSSeqCallback();
+                i.begin_opSSeq(sseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            {
+                class OpSMapCallback extends test.Ice.scope.Test.Callback_I_opSMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.S> s2,
+                                         java.util.Map<String, test.Ice.scope.Test.S> s3)
+                    {
+                        test(s1.equals(s2.get("a")));
+                        test(s1.equals(s3.get("a")));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSMapCallback cb = new OpSMapCallback();
+                i.begin_opSMap(smap1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            {
+                class OpCCallback extends test.Ice.scope.Test.Callback_I_opC
+                {
+                    public void response(test.Ice.scope.Test.C c2,
+                                         test.Ice.scope.Test.C c3)
+                    {
+                        test(s1.equals(c2.s));
+                        test(s1.equals(c3.s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCCallback cb = new OpCCallback();
+                i.begin_opC(c1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            {
+                class OpCSeqCallback extends test.Ice.scope.Test.Callback_I_opCSeq
+                {
+                    public void response(test.Ice.scope.Test.C[] c2,
+                                         test.Ice.scope.Test.C[] c3)
+                    {
+                        test(s1.equals(c2[0].s));
+                        test(s1.equals(c3[0].s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCSeqCallback cb = new OpCSeqCallback();
+                i.begin_opCSeq(cseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            {
+                class OpCMapCallback extends test.Ice.scope.Test.Callback_I_opCMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.C> c2,
+                                         java.util.Map<String, test.Ice.scope.Test.C> c3)
+                    {
+                        test(s1.equals(c2.get("a").s));
+                        test(s1.equals(c3.get("a").s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCMapCallback cb = new OpCMapCallback();
+                i.begin_opCMap(cmap1, cb);
+                cb.check();
+            }
+        }
+
+        //  test.Ice.scope
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i2:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.IPrx i = test.Ice.scope.Test.Inner.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.Inner2.SHolder s2 = new test.Ice.scope.Test.Inner.Inner2.SHolder();
+            test.Ice.scope.Test.Inner.Inner2.S s3 = i.opS(s1, s2);
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.Inner2.SSeqHolder sseq2 = new test.Ice.scope.Test.Inner.Inner2.SSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq3 = i.opSSeq(sseq1, sseq2);
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.Inner2.SMapHolder smap2 = new test.Ice.scope.Test.Inner.Inner2.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap3 = i.opSMap(smap1, smap2);
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.Inner2.CHolder c2 = new test.Ice.scope.Test.Inner.Inner2.CHolder();
+            test.Ice.scope.Test.Inner.Inner2.C c3 = i.opC(c1, c2);
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.Inner2.CSeqHolder cseq2 = new test.Ice.scope.Test.Inner.Inner2.CSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq3 = i.opCSeq(cseq1, cseq2);
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.Inner2.CMapHolder cmap2 = new test.Ice.scope.Test.Inner.Inner2.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap3 = i.opCMap(cmap1, cmap2);
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i2:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.IPrx i = test.Ice.scope.Test.Inner.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.Inner2.SHolder s2 = new test.Ice.scope.Test.Inner.Inner2.SHolder();
+            test.Ice.scope.Test.Inner.Inner2.S s3 = i.end_opS(s2, i.begin_opS(s1));
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.Inner2.SSeqHolder sseq2 = new test.Ice.scope.Test.Inner.Inner2.SSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq3 = i.end_opSSeq(sseq2, i.begin_opSSeq(sseq1));
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.Inner2.SMapHolder smap2 = new test.Ice.scope.Test.Inner.Inner2.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap3 =
+                i.end_opSMap(smap2, i.begin_opSMap(smap1));
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.Inner2.CHolder c2 = new test.Ice.scope.Test.Inner.Inner2.CHolder();
+            test.Ice.scope.Test.Inner.Inner2.C c3 = i.end_opC(c2, i.begin_opC(c1));
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.Inner2.CSeqHolder cseq2 = new test.Ice.scope.Test.Inner.Inner2.CSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq3 = i.end_opCSeq(cseq2, i.begin_opCSeq(cseq1));
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.Inner2.CMapHolder cmap2 = new test.Ice.scope.Test.Inner.Inner2.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap3 =
+                i.end_opCMap(cmap2, i.begin_opCMap(cmap1));
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i2:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.IPrx i = test.Ice.scope.Test.Inner.IPrxHelper.checkedCast(obj);
+
+            final test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            {
+                class OpSCallback extends test.Ice.scope.Test.Inner.Callback_I_opS
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.S s2,
+                                         test.Ice.scope.Test.Inner.Inner2.S s3)
+                    {
+                        test(s1.equals(s2));
+                        test(s1.equals(s3));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSCallback cb = new OpSCallback();
+                i.begin_opS(s1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            {
+                class OpSSeqCallback extends test.Ice.scope.Test.Inner.Callback_I_opSSeq
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.S[] s2,
+                                         test.Ice.scope.Test.Inner.Inner2.S[] s3)
+                    {
+                        test(s1.equals(s2[0]));
+                        test(s1.equals(s3[0]));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSSeqCallback cb = new OpSSeqCallback();
+                i.begin_opSSeq(sseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            {
+                class OpSMapCallback extends test.Ice.scope.Test.Inner.Callback_I_opSMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s2,
+                                         java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s3)
+                    {
+                        test(s1.equals(s2.get("a")));
+                        test(s1.equals(s3.get("a")));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSMapCallback cb = new OpSMapCallback();
+                i.begin_opSMap(smap1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            {
+                class OpCCallback extends test.Ice.scope.Test.Inner.Callback_I_opC
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.C c2,
+                                         test.Ice.scope.Test.Inner.Inner2.C c3)
+                    {
+                        test(s1.equals(c2.s));
+                        test(s1.equals(c3.s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCCallback cb = new OpCCallback();
+                i.begin_opC(c1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 =
+                new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            {
+                class OpCSeqCallback extends test.Ice.scope.Test.Inner.Callback_I_opCSeq
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.C[] c2,
+                                         test.Ice.scope.Test.Inner.Inner2.C[] c3)
+                    {
+                        test(s1.equals(c2[0].s));
+                        test(s1.equals(c3[0].s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCSeqCallback cb = new OpCSeqCallback();
+                i.begin_opCSeq(cseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            {
+                class OpCMapCallback extends test.Ice.scope.Test.Inner.Callback_I_opCMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c2,
+                                         java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c3)
+                    {
+                        test(s1.equals(c2.get("a").s));
+                        test(s1.equals(c3.get("a").s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCMapCallback cb = new OpCMapCallback();
+                i.begin_opCMap(cmap1, cb);
+                cb.check();
+            }
+        }
+
+        //  test.Ice.scope
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.Inner2.IPrx i = test.Ice.scope.Test.Inner.Inner2.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.Inner2.SHolder s2 = new test.Ice.scope.Test.Inner.Inner2.SHolder();
+            test.Ice.scope.Test.Inner.Inner2.S s3 = i.opS(s1, s2);
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.Inner2.SSeqHolder sseq2 = new test.Ice.scope.Test.Inner.Inner2.SSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq3 = i.opSSeq(sseq1, sseq2);
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.Inner2.SMapHolder smap2 = new test.Ice.scope.Test.Inner.Inner2.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap3 = i.opSMap(smap1, smap2);
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.Inner2.CHolder c2 = new test.Ice.scope.Test.Inner.Inner2.CHolder();
+            test.Ice.scope.Test.Inner.Inner2.C c3 = i.opC(c1, c2);
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.Inner2.CSeqHolder cseq2 = new test.Ice.scope.Test.Inner.Inner2.CSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq3 = i.opCSeq(cseq1, cseq2);
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.Inner2.CMapHolder cmap2 = new test.Ice.scope.Test.Inner.Inner2.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap3 = i.opCMap(cmap1, cmap2);
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.Inner2.IPrx i = test.Ice.scope.Test.Inner.Inner2.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            test.Ice.scope.Test.Inner.Inner2.SHolder s2 = new test.Ice.scope.Test.Inner.Inner2.SHolder();
+            test.Ice.scope.Test.Inner.Inner2.S s3 = i.end_opS(s2, i.begin_opS(s1));
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            test.Ice.scope.Test.Inner.Inner2.SSeqHolder sseq2 = new test.Ice.scope.Test.Inner.Inner2.SSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq3 = i.end_opSSeq(sseq2, i.begin_opSSeq(sseq1));
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.Inner.Inner2.SMapHolder smap2 = new test.Ice.scope.Test.Inner.Inner2.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap3 =
+                i.end_opSMap(smap2, i.begin_opSMap(smap1));
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            test.Ice.scope.Test.Inner.Inner2.CHolder c2 = new test.Ice.scope.Test.Inner.Inner2.CHolder();
+            test.Ice.scope.Test.Inner.Inner2.C c3 = i.end_opC(c2, i.begin_opC(c1));
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 = new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            test.Ice.scope.Test.Inner.Inner2.CSeqHolder cseq2 = new test.Ice.scope.Test.Inner.Inner2.CSeqHolder();
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq3 = i.end_opCSeq(cseq2, i.begin_opCSeq(cseq1));
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.Inner.Inner2.CMapHolder cmap2 = new test.Ice.scope.Test.Inner.Inner2.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap3 =
+                i.end_opCMap(cmap2, i.begin_opCMap(cmap1));
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.Inner2.IPrx i = test.Ice.scope.Test.Inner.Inner2.IPrxHelper.checkedCast(obj);
+
+            final test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            {
+                class OpSCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opS
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.S s2,
+                                         test.Ice.scope.Test.Inner.Inner2.S s3)
+                    {
+                        test(s1.equals(s2));
+                        test(s1.equals(s3));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSCallback cb = new OpSCallback();
+                i.begin_opS(s1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            {
+                class OpSSeqCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opSSeq
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.S[] s2,
+                                         test.Ice.scope.Test.Inner.Inner2.S[] s3)
+                    {
+                        test(s1.equals(s2[0]));
+                        test(s1.equals(s3[0]));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSSeqCallback cb = new OpSSeqCallback();
+                i.begin_opSSeq(sseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            {
+                class OpSMapCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opSMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s2,
+                                         java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s3)
+                    {
+                        test(s1.equals(s2.get("a")));
+                        test(s1.equals(s3.get("a")));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSMapCallback cb = new OpSMapCallback();
+                i.begin_opSMap(smap1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            {
+                class OpCCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opC
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.C c2,
+                                         test.Ice.scope.Test.Inner.Inner2.C c3)
+                    {
+                        test(s1.equals(c2.s));
+                        test(s1.equals(c3.s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCCallback cb = new OpCCallback();
+                i.begin_opC(c1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 =
+                new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            {
+                class OpCSeqCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opCSeq
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.C[] c2,
+                                         test.Ice.scope.Test.Inner.Inner2.C[] c3)
+                    {
+                        test(s1.equals(c2[0].s));
+                        test(s1.equals(c3[0].s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCSeqCallback cb = new OpCSeqCallback();
+                i.begin_opCSeq(cseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            {
+                class OpCMapCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opCMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c2,
+                                         java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c3)
+                    {
+                        test(s1.equals(c2.get("a").s));
+                        test(s1.equals(c3.get("a").s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCMapCallback cb = new OpCMapCallback();
+                i.begin_opCMap(cmap1, cb);
+                cb.check();
+            }
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i4:" + helper.getTestEndpoint());
+            test.Ice.scope.Inner.Test.Inner2.IPrx i = test.Ice.scope.Inner.Test.Inner2.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            test.Ice.scope.Test.SHolder s2 = new test.Ice.scope.Test.SHolder();
+            test.Ice.scope.Test.S s3 = i.opS(s1, s2);
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            test.Ice.scope.Test.SSeqHolder sseq2 = new test.Ice.scope.Test.SSeqHolder();
+            test.Ice.scope.Test.S[] sseq3 = i.opSSeq(sseq1, sseq2);
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.SMapHolder smap2 = new test.Ice.scope.Test.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.S> smap3 = i.opSMap(smap1, smap2);
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            test.Ice.scope.Test.CHolder c2 = new test.Ice.scope.Test.CHolder();
+            test.Ice.scope.Test.C c3 = i.opC(c1, c2);
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            test.Ice.scope.Test.CSeqHolder cseq2 = new test.Ice.scope.Test.CSeqHolder();
+            test.Ice.scope.Test.C[] cseq3 = i.opCSeq(cseq1, cseq2);
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.CMapHolder cmap2 = new test.Ice.scope.Test.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.C> cmap3 = i.opCMap(cmap1, cmap2);
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i4:" + helper.getTestEndpoint());
+            test.Ice.scope.Inner.Test.Inner2.IPrx i = test.Ice.scope.Inner.Test.Inner2.IPrxHelper.checkedCast(obj);
+
+            test.Ice.scope.Test.S s1 = new test.Ice.scope.Test.S(0);
+            test.Ice.scope.Test.SHolder s2 = new test.Ice.scope.Test.SHolder();
+            test.Ice.scope.Test.S s3 = i.end_opS(s2, i.begin_opS(s1));
+            test(s1.equals(s2.value));
+            test(s1.equals(s3));
+
+            test.Ice.scope.Test.S[] sseq1 = new test.Ice.scope.Test.S[]{ s1 };
+            test.Ice.scope.Test.SSeqHolder sseq2 = new test.Ice.scope.Test.SSeqHolder();
+            test.Ice.scope.Test.S[] sseq3 = i.end_opSSeq(sseq2, i.begin_opSSeq(sseq1));
+            test(sseq2.value[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.S> smap1 = new java.util.HashMap<String, test.Ice.scope.Test.S>();
+            smap1.put("a", s1);
+            test.Ice.scope.Test.SMapHolder smap2 = new test.Ice.scope.Test.SMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.S> smap3 = i.end_opSMap(smap2, i.begin_opSMap(smap1));
+            test(smap2.value.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            test.Ice.scope.Test.C c1 = new test.Ice.scope.Test.C(s1);
+            test.Ice.scope.Test.CHolder c2 = new test.Ice.scope.Test.CHolder();
+            test.Ice.scope.Test.C c3 = i.end_opC(c2, i.begin_opC(c1));
+            test(c1.s.equals(c2.value.s));
+            test(c1.s.equals(c3.s));
+
+            test.Ice.scope.Test.C[] cseq1 = new test.Ice.scope.Test.C[]{ c1 };
+            test.Ice.scope.Test.CSeqHolder cseq2 = new test.Ice.scope.Test.CSeqHolder();
+            test.Ice.scope.Test.C[] cseq3 = i.end_opCSeq(cseq2, i.begin_opCSeq(cseq1));
+            test(cseq2.value[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            java.util.Map<String, test.Ice.scope.Test.C> cmap1 = new java.util.HashMap<String, test.Ice.scope.Test.C>();
+            cmap1.put("a", c1);
+            test.Ice.scope.Test.CMapHolder cmap2 = new test.Ice.scope.Test.CMapHolder();
+            java.util.Map<String, test.Ice.scope.Test.C> cmap3 = i.end_opCMap(cmap2, i.begin_opCMap(cmap1));
+            test(cmap2.value.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i3:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.Inner.Inner2.IPrx i = test.Ice.scope.Test.Inner.Inner2.IPrxHelper.checkedCast(obj);
+
+            final test.Ice.scope.Test.Inner.Inner2.S s1 = new test.Ice.scope.Test.Inner.Inner2.S(0);
+            {
+                class OpSCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opS
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.S s2,
+                                         test.Ice.scope.Test.Inner.Inner2.S s3)
+                    {
+                        test(s1.equals(s2));
+                        test(s1.equals(s3));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSCallback cb = new OpSCallback();
+                i.begin_opS(s1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.S[] sseq1 = new test.Ice.scope.Test.Inner.Inner2.S[]{ s1 };
+            {
+                class OpSSeqCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opSSeq
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.S[] s2,
+                                         test.Ice.scope.Test.Inner.Inner2.S[] s3)
+                    {
+                        test(s1.equals(s2[0]));
+                        test(s1.equals(s3[0]));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSSeqCallback cb = new OpSSeqCallback();
+                i.begin_opSSeq(sseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> smap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.S>();
+            smap1.put("a", s1);
+            {
+                class OpSMapCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opSMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s2,
+                                         java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s3)
+                    {
+                        test(s1.equals(s2.get("a")));
+                        test(s1.equals(s3.get("a")));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpSMapCallback cb = new OpSMapCallback();
+                i.begin_opSMap(smap1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.C c1 = new test.Ice.scope.Test.Inner.Inner2.C(s1);
+            {
+                class OpCCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opC
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.C c2,
+                                         test.Ice.scope.Test.Inner.Inner2.C c3)
+                    {
+                        test(s1.equals(c2.s));
+                        test(s1.equals(c3.s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCCallback cb = new OpCCallback();
+                i.begin_opC(c1, cb);
+                cb.check();
+            }
+
+            test.Ice.scope.Test.Inner.Inner2.C[] cseq1 =
+                new test.Ice.scope.Test.Inner.Inner2.C[]{ c1 };
+            {
+                class OpCSeqCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opCSeq
+                {
+                    public void response(test.Ice.scope.Test.Inner.Inner2.C[] c2,
+                                         test.Ice.scope.Test.Inner.Inner2.C[] c3)
+                    {
+                        test(s1.equals(c2[0].s));
+                        test(s1.equals(c3[0].s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCSeqCallback cb = new OpCSeqCallback();
+                i.begin_opCSeq(cseq1, cb);
+                cb.check();
+            }
+
+            java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> cmap1 =
+                new java.util.HashMap<String, test.Ice.scope.Test.Inner.Inner2.C>();
+            cmap1.put("a", c1);
+            {
+                class OpCMapCallback extends test.Ice.scope.Test.Inner.Inner2.Callback_I_opCMap
+                {
+                    public void response(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c2,
+                                         java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c3)
+                    {
+                        test(s1.equals(c2.get("a").s));
+                        test(s1.equals(c3.get("a").s));
+                        _callback.called();
+                    }
+
+                    public void exception(Ice.LocalException ex)
+                    {
+                        test(false);
+                    }
+
+                    public void check()
+                    {
+                        _callback.check();
+                    }
+
+                    private Callback _callback = new Callback();
+                }
+                OpCMapCallback cb = new OpCMapCallback();
+                i.begin_opCMap(cmap1, cb);
+                cb.check();
+            }
+        }
+
+        {
+            Ice.ObjectPrx obj = communicator.stringToProxy("i1:" + helper.getTestEndpoint());
+            test.Ice.scope.Test.IPrx i = test.Ice.scope.Test.IPrxHelper.checkedCast(obj);
+            i.shutdown();
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/Client.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,22 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.scope;
+
+public class Client extends test.TestHelper
+{
+    public void run(String[] args)
+    {
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.scope");
+        java.io.PrintWriter out = getWriter();
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            out.print("test same Slice type name in different scopes... ");
+            out.flush();
+            AllTests.allTests(this);
+            out.println("ok");
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/Server.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,255 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test.Ice.scope;
+
+public class Server extends test.TestHelper
+{
+    class I1 extends test.Ice.scope.Test._IDisp
+    {
+        public test.Ice.scope.Test.S
+        opS(test.Ice.scope.Test.S s1, test.Ice.scope.Test.SHolder s2, Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.S[]
+        opSSeq(test.Ice.scope.Test.S[] s1, test.Ice.scope.Test.SSeqHolder s2, Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.S>
+        opSMap(java.util.Map<String, test.Ice.scope.Test.S> s1,
+               test.Ice.scope.Test.SMapHolder s2, Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.C
+        opC(test.Ice.scope.Test.C c1, test.Ice.scope.Test.CHolder c2, Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public test.Ice.scope.Test.C[]
+        opCSeq(test.Ice.scope.Test.C[] c1,
+               test.Ice.scope.Test.CSeqHolder c2,
+               Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.C>
+        opCMap(java.util.Map<String, test.Ice.scope.Test.C> c1,
+               test.Ice.scope.Test.CMapHolder c2,
+               Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public void shutdown(Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    class I2 extends test.Ice.scope.Test.Inner._IDisp
+    {
+        public test.Ice.scope.Test.Inner.Inner2.S
+        opS(test.Ice.scope.Test.Inner.Inner2.S s1,
+            test.Ice.scope.Test.Inner.Inner2.SHolder s2,
+            Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.S[]
+        opSSeq(test.Ice.scope.Test.Inner.Inner2.S[] s1,
+               test.Ice.scope.Test.Inner.Inner2.SSeqHolder s2,
+               Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S>
+        opSMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s1,
+               test.Ice.scope.Test.Inner.Inner2.SMapHolder s2,
+               Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.C
+        opC(test.Ice.scope.Test.Inner.Inner2.C c1,
+            test.Ice.scope.Test.Inner.Inner2.CHolder c2,
+            Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.C[]
+        opCSeq(test.Ice.scope.Test.Inner.Inner2.C[] c1,
+               test.Ice.scope.Test.Inner.Inner2.CSeqHolder c2,
+               Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C>
+        opCMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c1,
+               test.Ice.scope.Test.Inner.Inner2.CMapHolder c2,
+               Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public void shutdown(Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    class I3 extends test.Ice.scope.Test.Inner.Inner2._IDisp
+    {
+        public test.Ice.scope.Test.Inner.Inner2.S
+        opS(test.Ice.scope.Test.Inner.Inner2.S s1,
+            test.Ice.scope.Test.Inner.Inner2.SHolder s2,
+            Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.S[]
+        opSSeq(test.Ice.scope.Test.Inner.Inner2.S[] s1,
+               test.Ice.scope.Test.Inner.Inner2.SSeqHolder s2,
+               Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S>
+        opSMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.S> s1,
+               test.Ice.scope.Test.Inner.Inner2.SMapHolder s2,
+               Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.C
+        opC(test.Ice.scope.Test.Inner.Inner2.C c1,
+            test.Ice.scope.Test.Inner.Inner2.CHolder c2,
+            Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public test.Ice.scope.Test.Inner.Inner2.C[]
+        opCSeq(test.Ice.scope.Test.Inner.Inner2.C[] c1,
+               test.Ice.scope.Test.Inner.Inner2.CSeqHolder c2,
+               Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C>
+        opCMap(java.util.Map<String, test.Ice.scope.Test.Inner.Inner2.C> c1,
+               test.Ice.scope.Test.Inner.Inner2.CMapHolder c2,
+               Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public void shutdown(Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    class I4 extends test.Ice.scope.Inner.Test.Inner2._IDisp
+    {
+        public test.Ice.scope.Test.S
+        opS(test.Ice.scope.Test.S s1, test.Ice.scope.Test.SHolder s2, Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.S[]
+        opSSeq(test.Ice.scope.Test.S[] s1, test.Ice.scope.Test.SSeqHolder s2, Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.S>
+        opSMap(java.util.Map<String, test.Ice.scope.Test.S> s1, test.Ice.scope.Test.SMapHolder s2, Ice.Current current)
+        {
+            s2.value = s1;
+            return s1;
+        }
+
+        public test.Ice.scope.Test.C
+        opC(test.Ice.scope.Test.C c1, test.Ice.scope.Test.CHolder c2, Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public test.Ice.scope.Test.C[]
+        opCSeq(test.Ice.scope.Test.C[] c1, test.Ice.scope.Test.CSeqHolder c2, Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public java.util.Map<String, test.Ice.scope.Test.C>
+        opCMap(java.util.Map<String, test.Ice.scope.Test.C> c1, test.Ice.scope.Test.CMapHolder c2, Ice.Current current)
+        {
+            c2.value = c1;
+            return c1;
+        }
+
+        public void shutdown(Ice.Current current)
+        {
+            current.adapter.getCommunicator().shutdown();
+        }
+    }
+
+    public void run(String[] args)
+    {
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.scope");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new I1(), Ice.Util.stringToIdentity("i1"));
+            adapter.add(new I2(), Ice.Util.stringToIdentity("i2"));
+            adapter.add(new I3(), Ice.Util.stringToIdentity("i3"));
+            adapter.add(new I4(), Ice.Util.stringToIdentity("i4"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,137 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["java:package:test.Ice.scope"]]
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq c1, out CSeq c2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
@@ -16,12 +11,12 @@
 public class AllTests
 {
     public static MyClassPrx
-    allTests(test.Util.Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "test:" + app.getTestEndpoint(0);
+        String ref = "test:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx baseProxy = communicator.stringToProxy(ref);
         MyClassPrx cl = MyClassPrxHelper.checkedCast(baseProxy);
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMyClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping.AMD");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.add(new AMDMyClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
 import test.Ice.seqMapping.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        java.io.PrintWriter out = getWriter();
-        MyClassPrx myClass = AllTests.allTests(this, false);
-
-        out.print("shutting down server... ");
-        out.flush();
-        myClass.shutdown();
-        out.println("ok");
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            java.io.PrintWriter out = getWriter();
+            MyClassPrx myClass = AllTests.allTests(this, false);
+
+            out.print("shutting down server... ");
+            out.flush();
+            myClass.shutdown();
+            out.println("ok");
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
-        //adapter.activate(); // Don't activate OA to ensure collocation is used.
-
-        AllTests.allTests(this, true);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated c = new Collocated();
-        int status = c.main("Collocated", args);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+            //adapter.activate(); // Don't activate OA to ensure collocation is used.
 
-        System.gc();
-        System.exit(status);
+            AllTests.allTests(this, true);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Large.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/SmallHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Small.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/StructHolder.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Serialize/Struct.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/TwowaysAMI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Twoways.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Twoways.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/seqMapping/Twoways.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/seqMapping/Twoways.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.seqMapping;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 import test.Ice.serialize.Test.*;
@@ -23,12 +18,12 @@
     }
 
     public static InitialPrx
-    allTests(test.Util.Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String ref = "initial:" + app.getTestEndpoint(0);
+        String ref = "initial:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         InitialPrx initial = InitialPrxHelper.checkedCast(base);
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 import test.Ice.serialize.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        InitialPrx initial = AllTests.allTests(this, false);
-        initial.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            InitialPrx initial = AllTests.allTests(this, false);
+            initial.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/InitialI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/InitialI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/InitialI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/InitialI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 import test.Ice.serialize.Test.*;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.serialize;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Identity ident = Ice.Util.stringToIdentity("initial");
-        Ice.Object object = new InitialI(adapter, ident);
-        adapter.add(object, ident);
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.serialize");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            Ice.Identity ident = Ice.Util.stringToIdentity("initial");
+            Ice.Object object = new InitialI(adapter, ident);
+            adapter.add(object, ident);
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/serialize/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/serialize/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
@@ -208,13 +203,13 @@
     }
 
     public static TestIntfPrx
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "asm:" + app.getTestEndpoint(0);
+        String ref = "asm:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
@@ -230,7 +225,7 @@
         out.flush();
         try
         {
-            ObjectPrx o = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
+            ObjectPrx o = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
             o.ice_ids();
             test(false);
         }
@@ -245,7 +240,7 @@
 
         try
         {
-            ObjectPrx o = communicator.stringToProxy("category/finished:" + app.getTestEndpoint(0));
+            ObjectPrx o = communicator.stringToProxy("category/finished:" + helper.getTestEndpoint(0));
             o.ice_ids();
             test(false);
         }
@@ -261,11 +256,11 @@
 
         out.print("testing servant locator... ");
         out.flush();
-        base = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrxHelper.checkedCast(base);
         try
         {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:" + app.getTestEndpoint(0)));
+            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:" + helper.getTestEndpoint(0)));
         }
         catch(ObjectNotExistException ex)
         {
@@ -274,20 +269,20 @@
 
         out.print("testing default servant locator... ");
         out.flush();
-        base = communicator.stringToProxy("anothercat/locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("anothercat/locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrxHelper.checkedCast(base);
-        base = communicator.stringToProxy("locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrxHelper.checkedCast(base);
         try
         {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:" + app.getTestEndpoint(0)));
+            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:" + helper.getTestEndpoint(0)));
         }
         catch(ObjectNotExistException ex)
         {
         }
         try
         {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:" + app.getTestEndpoint(0)));
+            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:" + helper.getTestEndpoint(0)));
         }
         catch(ObjectNotExistException ex)
         {
@@ -296,14 +291,14 @@
 
         out.print("testing locate exceptions... ");
         out.flush();
-        base = communicator.stringToProxy("category/locate:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("category/locate:" + helper.getTestEndpoint(0));
         obj = TestIntfPrxHelper.checkedCast(base);
         testExceptions(obj);
         out.println("ok");
 
         out.print("testing finished exceptions... ");
         out.flush();
-        base = communicator.stringToProxy("category/finished:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("category/finished:" + helper.getTestEndpoint(0));
         obj = TestIntfPrxHelper.checkedCast(base);
         testExceptions(obj);
 
@@ -347,7 +342,7 @@
 
         out.print("testing servant locator removal... ");
         out.flush();
-        base = communicator.stringToProxy("test/activation:" + app.getTestEndpoint(0));
+        base = communicator.stringToProxy("test/activation:" + helper.getTestEndpoint(0));
         TestActivationPrx activation = TestActivationPrxHelper.checkedCast(base);
         activation.activateServantLocator(false);
         try
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDCookieI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new AMDServantLocatorI("category"), "category");
-        adapter.addServantLocator(new AMDServantLocatorI(""), "");
-        adapter.add(new AMDTestI(), Ice.Util.stringToIdentity("asm"));
-        adapter.add(new AMDTestActivationI(), Ice.Util.stringToIdentity("test/activation"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new AMDServantLocatorI("category"), "category");
+            adapter.addServantLocator(new AMDServantLocatorI(""), "");
+            adapter.add(new AMDTestI(), Ice.Util.stringToIdentity("asm"));
+            adapter.add(new AMDTestActivationI(), Ice.Util.stringToIdentity("test/activation"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestActivationI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
 import test.Ice.servantLocator.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        TestIntfPrx obj = AllTests.allTests(this);
-        obj.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx obj = AllTests.allTests(this);
+            obj.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Collocated.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Collocated.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Collocated.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Collocated.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
-public class Collocated extends test.Util.Application
+public class Collocated extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        adapter.addServantLocator(new ServantLocatorI(""), "");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
-        adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
-        AllTests.allTests(this);
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Collocated app = new Collocated();
-        int result = app.main("Collocated", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI("category"), "category");
+            adapter.addServantLocator(new ServantLocatorI(""), "");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
+            adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/CookieI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/CookieI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/CookieI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/CookieI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        adapter.addServantLocator(new ServantLocatorI(""), "");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
-        adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI("category"), "category");
+            adapter.addServantLocator(new ServantLocatorI(""), "");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
+            adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/TestActivationI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/TestActivationI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/TestActivationI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/TestActivationI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/TestAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.servantLocator;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
@@ -714,14 +709,14 @@
     }
 
     public static TestIntfPrx
-    allTests(test.Util.Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        java.io.PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        java.io.PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "Test:" + app.getTestEndpoint(0) + " -t 10000";
+        String ref = "Test:" + helper.getTestEndpoint(0) + " -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object object = new AMDTestI();
-        adapter.add(object, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.serverAMD");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer c = new AMDServer();
-        int status = c.main("AMDServer", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.serverAMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new AMDTestI();
+            adapter.add(object, Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/AMDTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
 import test.Ice.slicing.exceptions.client.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.client");
-        return initData;
-    }
-
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        TestIntfPrx test = AllTests.allTests(this, false);
-        test.shutdown();
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.client");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this, false);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI();
-        adapter.add(object, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.server");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.server");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new TestI();
+            adapter.add(object, Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/exceptions/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/exceptions/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.exceptions;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
@@ -1319,14 +1314,14 @@
     }
 
     public static TestIntfPrx
-    allTests(test.Util.Application app, boolean collocated)
+    allTests(test.TestHelper helper, boolean collocated)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
-        String ref = "Test:" + app.getTestEndpoint(0) + " -t 10000";
+        String ref = "Test:" + helper.getTestEndpoint(0) + " -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDServer.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDServer.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDServer.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDServer.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
-public class AMDServer extends test.Util.Application
+public class AMDServer extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new AMDTestI();
-        adapter.add(object, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.serverAMD");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        AMDServer app = new AMDServer();
-        int result = app.main("AMDServer", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.serverAMD");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new AMDTestI();
+            adapter.add(object, Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/AMDTestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
 import test.Ice.slicing.objects.client.Test.TestIntfPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        TestIntfPrx test = AllTests.allTests(this, false);
-        test.shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.client");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.client");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            TestIntfPrx test = AllTests.allTests(this, false);
+            test.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI();
-        adapter.add(object, Ice.Util.stringToIdentity("Test"));
-        adapter.activate();
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.server");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0) + " -t 2000");
-        return initData;
-    }
-
-    public static void main(String[] args)
+    public void run(String[] args)
     {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.server");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new TestI();
+            adapter.add(object, Ice.Util.stringToIdentity("Test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivateAMD.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/slicing/objects/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/slicing/objects/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.slicing.objects;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/stream/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/stream/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/stream/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/stream/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.stream;
 
@@ -21,17 +16,8 @@
 import Ice.StringSeqHelper;
 import test.Ice.stream.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     private static class TestObjectWriter extends Ice.ObjectWriter
     {
         TestObjectWriter(MyClass obj)
@@ -133,727 +119,712 @@
         private Ice.ValueFactory _factory;
     }
 
-    @Override
-    public int
+    public void
     run(String[] args)
     {
-        Ice.Communicator comm = communicator();
-        MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
-        comm.getValueFactoryManager().add(factoryWrapper, MyClass.ice_staticId());
-        comm.getValueFactoryManager().add(new MyInterfaceFactory(), _MyInterfaceDisp.ice_staticId());
-
-        Ice.InputStream in;
-        Ice.OutputStream out;
-
-        PrintWriter printWriter = getWriter();
-        printWriter.print("testing primitive types... ");
-        printWriter.flush();
-
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.stream");
+        try(Ice.Communicator comm = initialize(properties))
         {
-            byte[] data = new byte[0];
-            in = new Ice.InputStream(comm, data);
-        }
+            MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
+            comm.getValueFactoryManager().add(factoryWrapper, MyClass.ice_staticId());
+            comm.getValueFactoryManager().add(new MyInterfaceFactory(), _MyInterfaceDisp.ice_staticId());
 
-        {
-            out = new Ice.OutputStream(comm);
-            out.startEncapsulation();
-            out.writeBool(true);
-            out.endEncapsulation();
-            byte[] data = out.finished();
-
-            in = new Ice.InputStream(comm, data);
-            in.startEncapsulation();
-            test(in.readBool());
-            in.endEncapsulation();
-        }
+            Ice.InputStream in;
+            Ice.OutputStream out;
+
+            PrintWriter printWriter = getWriter();
+            printWriter.print("testing primitive types... ");
+            printWriter.flush();
 
-        {
-            byte[] data = new byte[0];
-            in = new Ice.InputStream(comm, data);
-            try
-            {
-                in.readBool();
-                test(false);
-            }
-            catch(Ice.UnmarshalOutOfBoundsException ex)
             {
+                byte[] data = new byte[0];
+                in = new Ice.InputStream(comm, data);
             }
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeBool(true);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readBool());
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeByte((byte)1);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readByte() == (byte)1);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeShort((short)2);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readShort() == (short)2);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeInt(3);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readInt() == 3);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeLong(4);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readLong() == 4);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeFloat((float)5.0);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readFloat() == (float)5.0);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeDouble(6.0);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readDouble() == 6.0);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            out.writeString("hello world");
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(in.readString().equals("hello world"));
-        }
-
-        printWriter.println("ok");
 
-        printWriter.print("testing constructed types... ");
-        printWriter.flush();
-
-        {
-            out = new Ice.OutputStream(comm);
-            MyEnum.ice_write(out, MyEnum.enum3);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test(MyEnum.ice_read(in) == MyEnum.enum3);
-        }
+            {
+                out = new Ice.OutputStream(comm);
+                out.startEncapsulation();
+                out.writeBool(true);
+                out.endEncapsulation();
+                byte[] data = out.finished();
 
-        {
-            out = new Ice.OutputStream(comm);
-            SmallStruct s = new SmallStruct();
-            s.bo = true;
-            s.by = (byte)1;
-            s.sh = (short)2;
-            s.i = 3;
-            s.l = 4;
-            s.f = (float)5.0;
-            s.d = 6.0;
-            s.str = "7";
-            s.e = MyEnum.enum2;
-            s.p = MyInterfacePrxHelper.uncheckedCast(comm.stringToProxy("test:default"));
-            SmallStruct.ice_write(out, s);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            SmallStruct s2 = SmallStruct.ice_read(in);
-            test(s2.equals(s));
-        }
+                in = new Ice.InputStream(comm, data);
+                in.startEncapsulation();
+                test(in.readBool());
+                in.endEncapsulation();
+            }
 
-        {
-            out = new Ice.OutputStream(comm);
-            OptionalClass o = new OptionalClass();
-            o.bo = true;
-            o.by = (byte)5;
-            o.setSh((short)4);
-            o.setI(3);
-            out.writeValue(o);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            TestReadValueCallback cb = new TestReadValueCallback();
-            in.readValue(cb);
-            in.readPendingValues();
-            OptionalClass o2 = (OptionalClass)cb.obj;
-            test(o2.bo == o.bo);
-            test(o2.by == o.by);
-            if(comm.getProperties().getProperty("Ice.Default.EncodingVersion").equals("1.0"))
             {
-                test(!o2.hasSh());
-                test(!o2.hasI());
+                byte[] data = new byte[0];
+                in = new Ice.InputStream(comm, data);
+                try
+                {
+                    in.readBool();
+                    test(false);
+                }
+                catch(Ice.UnmarshalOutOfBoundsException ex)
+                {
+                }
             }
-            else
+
             {
-                test(o2.getSh() == o.getSh());
-                test(o2.getI() == o.getI());
+                out = new Ice.OutputStream(comm);
+                out.writeBool(true);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readBool());
             }
-        }
-
-        {
-            out = new Ice.OutputStream(comm, Ice.Util.Encoding_1_0);
-            OptionalClass o = new OptionalClass();
-            o.bo = true;
-            o.by = (byte)5;
-            o.setSh((short)4);
-            o.setI(3);
-            out.writeValue(o);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, Ice.Util.Encoding_1_0, data);
-            TestReadValueCallback cb = new TestReadValueCallback();
-            in.readValue(cb);
-            in.readPendingValues();
-            OptionalClass o2 = (OptionalClass)cb.obj;
-            test(o2.bo == o.bo);
-            test(o2.by == o.by);
-            test(!o2.hasSh());
-            test(!o2.hasI());
-        }
 
-        {
-            final boolean[] arr =
             {
-                true,
-                false,
-                true,
-                false
-            };
-            out = new Ice.OutputStream(comm);
-            BoolSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            boolean[] arr2 = BoolSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final boolean[][] arrS =
-            {
-                arr,
-                new boolean[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            BoolSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            boolean[][] arr2S = BoolSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new Ice.OutputStream(comm);
+                out.writeByte((byte)1);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readByte() == (byte)1);
+            }
 
-        {
-            final byte[] arr =
             {
-                (byte)0x01,
-                (byte)0x11,
-                (byte)0x12,
-                (byte)0x22
-            };
-            out = new Ice.OutputStream(comm);
-            ByteSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            byte[] arr2 = ByteSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final byte[][] arrS =
-            {
-                arr,
-                new byte[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            ByteSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            byte[][] arr2S = ByteSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
-
-        {
-            test.Ice.stream.Serialize.Small small = new test.Ice.stream.Serialize.Small();
-            small.i = 99;
-            out = new Ice.OutputStream(comm);
-            out.writeSerializable(small);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            test.Ice.stream.Serialize.Small small2 = (test.Ice.stream.Serialize.Small)in.readSerializable();
-            test(small2.i == 99);
-        }
+                out = new Ice.OutputStream(comm);
+                out.writeShort((short)2);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readShort() == (short)2);
+            }
 
-        {
-            final short[] arr =
             {
-                (short)0x01,
-                (short)0x11,
-                (short)0x12,
-                (short)0x22
-            };
-            out = new Ice.OutputStream(comm);
-            ShortSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            short[] arr2 = ShortSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final short[][] arrS =
-            {
-                arr,
-                new short[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            ShortSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            short[][] arr2S = ShortSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new Ice.OutputStream(comm);
+                out.writeInt(3);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readInt() == 3);
+            }
 
-        {
-            final int[] arr =
             {
-                0x01,
-                0x11,
-                0x12,
-                0x22
-            };
-            out = new Ice.OutputStream(comm);
-            IntSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            int[] arr2 = IntSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final int[][] arrS =
-            {
-                arr,
-                new int[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            IntSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            int[][] arr2S = IntSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new Ice.OutputStream(comm);
+                out.writeLong(4);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readLong() == 4);
+            }
 
-        {
-            final long[] arr =
             {
-                0x01,
-                0x11,
-                0x12,
-                0x22
-            };
-            out = new Ice.OutputStream(comm);
-            LongSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            long[] arr2 = LongSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final long[][] arrS =
-            {
-                arr,
-                new long[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            LongSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            long[][] arr2S = LongSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new Ice.OutputStream(comm);
+                out.writeFloat((float)5.0);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readFloat() == (float)5.0);
+            }
 
-        {
-            final float[] arr =
             {
-                1,
-                2,
-                3,
-                4
-            };
-            out = new Ice.OutputStream(comm);
-            FloatSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            float[] arr2 = FloatSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final float[][] arrS =
-            {
-                arr,
-                new float[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            FloatSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            float[][] arr2S = FloatSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new Ice.OutputStream(comm);
+                out.writeDouble(6.0);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readDouble() == 6.0);
+            }
 
-        {
-            final double[] arr =
             {
-                1,
-                2,
-                3,
-                4
-            };
-            out = new Ice.OutputStream(comm);
-            DoubleSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            double[] arr2 = DoubleSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final double[][] arrS =
-            {
-                arr,
-                new double[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            DoubleSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            double[][] arr2S = DoubleSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+                out = new Ice.OutputStream(comm);
+                out.writeString("hello world");
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(in.readString().equals("hello world"));
+            }
 
-        {
-            final String[] arr =
-            {
-                "string1",
-                "string2",
-                "string3",
-                "string4"
-            };
-            out = new Ice.OutputStream(comm);
-            StringSeqHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            String[] arr2 = StringSeqHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final String[][] arrS =
-            {
-                arr,
-                new String[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            StringSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            String[][] arr2S = StringSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+            printWriter.println("ok");
 
-        {
-            final MyEnum[] arr =
-            {
-                MyEnum.enum3,
-                MyEnum.enum2,
-                MyEnum.enum1,
-                MyEnum.enum2
-            };
-            out = new Ice.OutputStream(comm);
-            MyEnumSHelper.write(out, arr);
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            MyEnum[] arr2 = MyEnumSHelper.read(in);
-            test(java.util.Arrays.equals(arr2, arr));
-
-            final MyEnum[][] arrS =
-            {
-                arr,
-                new MyEnum[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            MyEnumSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            MyEnum[][] arr2S = MyEnumSSHelper.read(in);
-            test(java.util.Arrays.deepEquals(arr2S, arrS));
-        }
+            printWriter.print("testing constructed types... ");
+            printWriter.flush();
 
-        {
-            MyClass[] arr = new MyClass[4];
-            for(int i = 0; i < arr.length; ++i)
             {
-                arr[i] = new MyClass();
-                arr[i].c = arr[i];
-                arr[i].o = arr[i];
-                arr[i].s = new SmallStruct();
-                arr[i].s.e = MyEnum.enum2;
-                arr[i].seq1 = new boolean[] { true, false, true, false };
-                arr[i].seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
-                arr[i].seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
-                arr[i].seq4 = new int[] { 1, 2, 3, 4 };
-                arr[i].seq5 = new long[] { 1, 2, 3, 4 };
-                arr[i].seq6 = new float[] { 1, 2, 3, 4 };
-                arr[i].seq7 = new double[] { 1, 2, 3, 4 };
-                arr[i].seq8 = new String[] { "string1", "string2", "string3", "string4" };
-                arr[i].seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
-                arr[i].seq10 = new MyClass[4]; // null elements.
-                arr[i].d = new java.util.HashMap<String, MyClass>();
-                arr[i].d.put("hi", arr[i]);
-            }
-            out = new Ice.OutputStream(comm);
-            MyClassSHelper.write(out, arr);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            MyClass[] arr2 = MyClassSHelper.read(in);
-            in.readPendingValues();
-            test(arr2.length == arr.length);
-            for(int i = 0; i < arr2.length; ++i)
-            {
-                test(arr2[i] != null);
-                test(arr2[i].c == arr2[i]);
-                test(arr2[i].o == arr2[i]);
-                test(arr2[i].s.e == MyEnum.enum2);
-                test(java.util.Arrays.equals(arr2[i].seq1, arr[i].seq1));
-                test(java.util.Arrays.equals(arr2[i].seq2, arr[i].seq2));
-                test(java.util.Arrays.equals(arr2[i].seq3, arr[i].seq3));
-                test(java.util.Arrays.equals(arr2[i].seq4, arr[i].seq4));
-                test(java.util.Arrays.equals(arr2[i].seq5, arr[i].seq5));
-                test(java.util.Arrays.equals(arr2[i].seq6, arr[i].seq6));
-                test(java.util.Arrays.equals(arr2[i].seq7, arr[i].seq7));
-                test(java.util.Arrays.equals(arr2[i].seq8, arr[i].seq8));
-                test(java.util.Arrays.equals(arr2[i].seq9, arr[i].seq9));
-                test(arr2[i].d.get("hi") == arr2[i]);
-            }
-
-            final MyClass[][] arrS =
-            {
-                arr,
-                new MyClass[0],
-                arr
-            };
-            out = new Ice.OutputStream(comm);
-            MyClassSSHelper.write(out, arrS);
-            data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            MyClass[][] arr2S = MyClassSSHelper.read(in);
-            test(arr2S.length == arrS.length);
-            test(arr2S[0].length == arrS[0].length);
-            test(arr2S[1].length == arrS[1].length);
-            test(arr2S[2].length == arrS[2].length);
-        }
-
-        {
-            MyInterface i = new MyInterfaceI();
-            out = new Ice.OutputStream(comm);
-            out.writeValue(i);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            MyInterfaceHolder j = new MyInterfaceHolder();
-            in.readValue(j);
-            in.readPendingValues();
-            test(j.value != null);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            MyClass obj = new MyClass();
-            obj.s = new SmallStruct();
-            obj.s.e = MyEnum.enum2;
-            TestObjectWriter writer = new TestObjectWriter(obj);
-            out.writeValue(writer);
-            out.writePendingValues();
-            out.finished();
-            test(writer.called);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            MyClass obj = new MyClass();
-            obj.s = new SmallStruct();
-            obj.s.e = MyEnum.enum2;
-            TestObjectWriter writer = new TestObjectWriter(obj);
-            out.writeValue(writer);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            test(writer.called);
-            factoryWrapper.setFactory(new TestValueFactory());
-            in = new Ice.InputStream(comm, data);
-            TestReadValueCallback cb = new TestReadValueCallback();
-            in.readValue(cb);
-            in.readPendingValues();
-            test(cb.obj != null);
-            test(cb.obj instanceof TestObjectReader);
-            TestObjectReader reader = (TestObjectReader)cb.obj;
-            test(reader.called);
-            test(reader.obj != null);
-            test(reader.obj.s.e == MyEnum.enum2);
-            factoryWrapper.setFactory(null);
-        }
-
-        {
-            out = new Ice.OutputStream(comm);
-            MyException ex = new MyException();
-
-            MyClass c = new MyClass();
-            c.c = c;
-            c.o = c;
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum2;
-            c.seq1 = new boolean[] { true, false, true, false };
-            c.seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
-            c.seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
-            c.seq4 = new int[] { 1, 2, 3, 4 };
-            c.seq5 = new long[] { 1, 2, 3, 4 };
-            c.seq6 = new float[] { 1, 2, 3, 4 };
-            c.seq7 = new double[] { 1, 2, 3, 4 };
-            c.seq8 = new String[] { "string1", "string2", "string3", "string4" };
-            c.seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
-            c.seq10 = new MyClass[4]; // null elements.
-            c.d = new java.util.HashMap<String, MyClass>();
-            c.d.put("hi", c);
-
-            ex.c = c;
-
-            out.writeException(ex);
-            byte[] data = out.finished();
-
-            in = new Ice.InputStream(comm, data);
-            try
-            {
-                in.throwException();
-                test(false);
-            }
-            catch(MyException ex1)
-            {
-                test(ex1.c.s.e == c.s.e);
-                test(java.util.Arrays.equals(ex1.c.seq1, c.seq1));
-                test(java.util.Arrays.equals(ex1.c.seq2, c.seq2));
-                test(java.util.Arrays.equals(ex1.c.seq3, c.seq3));
-                test(java.util.Arrays.equals(ex1.c.seq4, c.seq4));
-                test(java.util.Arrays.equals(ex1.c.seq5, c.seq5));
-                test(java.util.Arrays.equals(ex1.c.seq6, c.seq6));
-                test(java.util.Arrays.equals(ex1.c.seq7, c.seq7));
-                test(java.util.Arrays.equals(ex1.c.seq8, c.seq8));
-                test(java.util.Arrays.equals(ex1.c.seq9, c.seq9));
+                out = new Ice.OutputStream(comm);
+                MyEnum.ice_write(out, MyEnum.enum3);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test(MyEnum.ice_read(in) == MyEnum.enum3);
             }
-            catch(Ice.UserException ex1)
+
             {
-                test(false);
+                out = new Ice.OutputStream(comm);
+                SmallStruct s = new SmallStruct();
+                s.bo = true;
+                s.by = (byte)1;
+                s.sh = (short)2;
+                s.i = 3;
+                s.l = 4;
+                s.f = (float)5.0;
+                s.d = 6.0;
+                s.str = "7";
+                s.e = MyEnum.enum2;
+                s.p = MyInterfacePrxHelper.uncheckedCast(comm.stringToProxy("test:default"));
+                SmallStruct.ice_write(out, s);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                SmallStruct s2 = SmallStruct.ice_read(in);
+                test(s2.equals(s));
             }
-        }
-
-        {
-            java.util.Map<Byte, Boolean> dict = new java.util.HashMap<Byte, Boolean>();
-            dict.put((byte)4, true);
-            dict.put((byte)1, false);
-            out = new Ice.OutputStream(comm);
-            ByteBoolDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new Ice.InputStream(comm, data);
-            java.util.Map<Byte, Boolean> dict2 = ByteBoolDHelper.read(in);
-            test(dict2.equals(dict));
-        }
 
-        {
-            java.util.Map<Short, Integer> dict = new java.util.HashMap<Short, Integer>();
-            dict.put((short)1, 9);
-            dict.put((short)4, 8);
-            out = new Ice.OutputStream(comm);
-            ShortIntDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new Ice.InputStream(comm, data);
-            java.util.Map<Short, Integer> dict2 = ShortIntDHelper.read(in);
-            test(dict2.equals(dict));
-        }
+            {
+                out = new Ice.OutputStream(comm);
+                OptionalClass o = new OptionalClass();
+                o.bo = true;
+                o.by = (byte)5;
+                o.setSh((short)4);
+                o.setI(3);
+                out.writeValue(o);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                TestReadValueCallback cb = new TestReadValueCallback();
+                in.readValue(cb);
+                in.readPendingValues();
+                OptionalClass o2 = (OptionalClass)cb.obj;
+                test(o2.bo == o.bo);
+                test(o2.by == o.by);
+                if(comm.getProperties().getProperty("Ice.Default.EncodingVersion").equals("1.0"))
+                {
+                    test(!o2.hasSh());
+                    test(!o2.hasI());
+                }
+                else
+                {
+                    test(o2.getSh() == o.getSh());
+                    test(o2.getI() == o.getI());
+                }
+            }
 
-        {
-            java.util.Map<Long, Float> dict = new java.util.HashMap<Long, Float>();
-            dict.put((long)123809828, 0.51f);
-            dict.put((long)123809829, 0.56f);
-            out = new Ice.OutputStream(comm);
-            LongFloatDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new Ice.InputStream(comm, data);
-            java.util.Map<Long, Float> dict2 = LongFloatDHelper.read(in);
-            test(dict2.equals(dict));
-        }
+            {
+                out = new Ice.OutputStream(comm, Ice.Util.Encoding_1_0);
+                OptionalClass o = new OptionalClass();
+                o.bo = true;
+                o.by = (byte)5;
+                o.setSh((short)4);
+                o.setI(3);
+                out.writeValue(o);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, Ice.Util.Encoding_1_0, data);
+                TestReadValueCallback cb = new TestReadValueCallback();
+                in.readValue(cb);
+                in.readPendingValues();
+                OptionalClass o2 = (OptionalClass)cb.obj;
+                test(o2.bo == o.bo);
+                test(o2.by == o.by);
+                test(!o2.hasSh());
+                test(!o2.hasI());
+            }
 
-        {
-            java.util.Map<String, String> dict = new java.util.HashMap<String, String>();
-            dict.put("key1", "value1");
-            dict.put("key2", "value2");
-            out = new Ice.OutputStream(comm);
-            StringStringDHelper.write(out, dict);
-            byte data[] = out.finished();
-            in = new Ice.InputStream(comm, data);
-            java.util.Map<String, String> dict2 = StringStringDHelper.read(in);
-            test(dict2.equals(dict));
-        }
+            {
+                final boolean[] arr =
+                    {
+                        true,
+                        false,
+                        true,
+                        false
+                    };
+                out = new Ice.OutputStream(comm);
+                BoolSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                boolean[] arr2 = BoolSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final boolean[][] arrS =
+                    {
+                        arr,
+                        new boolean[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                BoolSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                boolean[][] arr2S = BoolSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final byte[] arr =
+                    {
+                        (byte)0x01,
+                        (byte)0x11,
+                        (byte)0x12,
+                        (byte)0x22
+                    };
+                out = new Ice.OutputStream(comm);
+                ByteSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                byte[] arr2 = ByteSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final byte[][] arrS =
+                    {
+                        arr,
+                        new byte[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                ByteSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                byte[][] arr2S = ByteSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                test.Ice.stream.Serialize.Small small = new test.Ice.stream.Serialize.Small();
+                small.i = 99;
+                out = new Ice.OutputStream(comm);
+                out.writeSerializable(small);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                test.Ice.stream.Serialize.Small small2 = (test.Ice.stream.Serialize.Small)in.readSerializable();
+                test(small2.i == 99);
+            }
+
+            {
+                final short[] arr =
+                    {
+                        (short)0x01,
+                        (short)0x11,
+                        (short)0x12,
+                        (short)0x22
+                    };
+                out = new Ice.OutputStream(comm);
+                ShortSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                short[] arr2 = ShortSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final short[][] arrS =
+                    {
+                        arr,
+                        new short[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                ShortSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                short[][] arr2S = ShortSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final int[] arr =
+                    {
+                        0x01,
+                        0x11,
+                        0x12,
+                        0x22
+                    };
+                out = new Ice.OutputStream(comm);
+                IntSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                int[] arr2 = IntSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final int[][] arrS =
+                    {
+                        arr,
+                        new int[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                IntSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                int[][] arr2S = IntSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final long[] arr =
+                    {
+                        0x01,
+                        0x11,
+                        0x12,
+                        0x22
+                    };
+                out = new Ice.OutputStream(comm);
+                LongSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                long[] arr2 = LongSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final long[][] arrS =
+                    {
+                        arr,
+                        new long[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                LongSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                long[][] arr2S = LongSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final float[] arr =
+                    {
+                        1,
+                        2,
+                        3,
+                        4
+                    };
+                out = new Ice.OutputStream(comm);
+                FloatSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                float[] arr2 = FloatSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final float[][] arrS =
+                    {
+                        arr,
+                        new float[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                FloatSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                float[][] arr2S = FloatSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final double[] arr =
+                    {
+                        1,
+                        2,
+                        3,
+                        4
+                    };
+                out = new Ice.OutputStream(comm);
+                DoubleSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                double[] arr2 = DoubleSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final double[][] arrS =
+                    {
+                        arr,
+                        new double[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                DoubleSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                double[][] arr2S = DoubleSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final String[] arr =
+                    {
+                        "string1",
+                        "string2",
+                        "string3",
+                        "string4"
+                    };
+                out = new Ice.OutputStream(comm);
+                StringSeqHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                String[] arr2 = StringSeqHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final String[][] arrS =
+                    {
+                        arr,
+                        new String[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                StringSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                String[][] arr2S = StringSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                final MyEnum[] arr =
+                    {
+                        MyEnum.enum3,
+                        MyEnum.enum2,
+                        MyEnum.enum1,
+                        MyEnum.enum2
+                    };
+                out = new Ice.OutputStream(comm);
+                MyEnumSHelper.write(out, arr);
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                MyEnum[] arr2 = MyEnumSHelper.read(in);
+                test(java.util.Arrays.equals(arr2, arr));
+
+                final MyEnum[][] arrS =
+                    {
+                        arr,
+                        new MyEnum[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                MyEnumSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                MyEnum[][] arr2S = MyEnumSSHelper.read(in);
+                test(java.util.Arrays.deepEquals(arr2S, arrS));
+            }
+
+            {
+                MyClass[] arr = new MyClass[4];
+                for(int i = 0; i < arr.length; ++i)
+                {
+                    arr[i] = new MyClass();
+                    arr[i].c = arr[i];
+                    arr[i].o = arr[i];
+                    arr[i].s = new SmallStruct();
+                    arr[i].s.e = MyEnum.enum2;
+                    arr[i].seq1 = new boolean[] { true, false, true, false };
+                    arr[i].seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
+                    arr[i].seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
+                    arr[i].seq4 = new int[] { 1, 2, 3, 4 };
+                    arr[i].seq5 = new long[] { 1, 2, 3, 4 };
+                    arr[i].seq6 = new float[] { 1, 2, 3, 4 };
+                    arr[i].seq7 = new double[] { 1, 2, 3, 4 };
+                    arr[i].seq8 = new String[] { "string1", "string2", "string3", "string4" };
+                    arr[i].seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
+                    arr[i].seq10 = new MyClass[4]; // null elements.
+                    arr[i].d = new java.util.HashMap<String, MyClass>();
+                    arr[i].d.put("hi", arr[i]);
+                }
+                out = new Ice.OutputStream(comm);
+                MyClassSHelper.write(out, arr);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                MyClass[] arr2 = MyClassSHelper.read(in);
+                in.readPendingValues();
+                test(arr2.length == arr.length);
+                for(int i = 0; i < arr2.length; ++i)
+                {
+                    test(arr2[i] != null);
+                    test(arr2[i].c == arr2[i]);
+                    test(arr2[i].o == arr2[i]);
+                    test(arr2[i].s.e == MyEnum.enum2);
+                    test(java.util.Arrays.equals(arr2[i].seq1, arr[i].seq1));
+                    test(java.util.Arrays.equals(arr2[i].seq2, arr[i].seq2));
+                    test(java.util.Arrays.equals(arr2[i].seq3, arr[i].seq3));
+                    test(java.util.Arrays.equals(arr2[i].seq4, arr[i].seq4));
+                    test(java.util.Arrays.equals(arr2[i].seq5, arr[i].seq5));
+                    test(java.util.Arrays.equals(arr2[i].seq6, arr[i].seq6));
+                    test(java.util.Arrays.equals(arr2[i].seq7, arr[i].seq7));
+                    test(java.util.Arrays.equals(arr2[i].seq8, arr[i].seq8));
+                    test(java.util.Arrays.equals(arr2[i].seq9, arr[i].seq9));
+                    test(arr2[i].d.get("hi") == arr2[i]);
+                }
+
+                final MyClass[][] arrS =
+                    {
+                        arr,
+                        new MyClass[0],
+                        arr
+                    };
+                out = new Ice.OutputStream(comm);
+                MyClassSSHelper.write(out, arrS);
+                data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                MyClass[][] arr2S = MyClassSSHelper.read(in);
+                test(arr2S.length == arrS.length);
+                test(arr2S[0].length == arrS[0].length);
+                test(arr2S[1].length == arrS[1].length);
+                test(arr2S[2].length == arrS[2].length);
+            }
+
+            {
+                MyInterface i = new MyInterfaceI();
+                out = new Ice.OutputStream(comm);
+                out.writeValue(i);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                MyInterfaceHolder j = new MyInterfaceHolder();
+                in.readValue(j);
+                in.readPendingValues();
+                test(j.value != null);
+            }
+
+            {
+                out = new Ice.OutputStream(comm);
+                MyClass obj = new MyClass();
+                obj.s = new SmallStruct();
+                obj.s.e = MyEnum.enum2;
+                TestObjectWriter writer = new TestObjectWriter(obj);
+                out.writeValue(writer);
+                out.writePendingValues();
+                out.finished();
+                test(writer.called);
+            }
+
+            {
+                out = new Ice.OutputStream(comm);
+                MyClass obj = new MyClass();
+                obj.s = new SmallStruct();
+                obj.s.e = MyEnum.enum2;
+                TestObjectWriter writer = new TestObjectWriter(obj);
+                out.writeValue(writer);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                test(writer.called);
+                factoryWrapper.setFactory(new TestValueFactory());
+                in = new Ice.InputStream(comm, data);
+                TestReadValueCallback cb = new TestReadValueCallback();
+                in.readValue(cb);
+                in.readPendingValues();
+                test(cb.obj != null);
+                test(cb.obj instanceof TestObjectReader);
+                TestObjectReader reader = (TestObjectReader)cb.obj;
+                test(reader.called);
+                test(reader.obj != null);
+                test(reader.obj.s.e == MyEnum.enum2);
+                factoryWrapper.setFactory(null);
+            }
+
+            {
+                out = new Ice.OutputStream(comm);
+                MyException ex = new MyException();
+
+                MyClass c = new MyClass();
+                c.c = c;
+                c.o = c;
+                c.s = new SmallStruct();
+                c.s.e = MyEnum.enum2;
+                c.seq1 = new boolean[] { true, false, true, false };
+                c.seq2 = new byte[] { (byte)1, (byte)2, (byte)3, (byte)4 };
+                c.seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 };
+                c.seq4 = new int[] { 1, 2, 3, 4 };
+                c.seq5 = new long[] { 1, 2, 3, 4 };
+                c.seq6 = new float[] { 1, 2, 3, 4 };
+                c.seq7 = new double[] { 1, 2, 3, 4 };
+                c.seq8 = new String[] { "string1", "string2", "string3", "string4" };
+                c.seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 };
+                c.seq10 = new MyClass[4]; // null elements.
+                c.d = new java.util.HashMap<String, MyClass>();
+                c.d.put("hi", c);
+
+                ex.c = c;
+
+                out.writeException(ex);
+                byte[] data = out.finished();
+
+                in = new Ice.InputStream(comm, data);
+                try
+                {
+                    in.throwException();
+                    test(false);
+                }
+                catch(MyException ex1)
+                {
+                    test(ex1.c.s.e == c.s.e);
+                    test(java.util.Arrays.equals(ex1.c.seq1, c.seq1));
+                    test(java.util.Arrays.equals(ex1.c.seq2, c.seq2));
+                    test(java.util.Arrays.equals(ex1.c.seq3, c.seq3));
+                    test(java.util.Arrays.equals(ex1.c.seq4, c.seq4));
+                    test(java.util.Arrays.equals(ex1.c.seq5, c.seq5));
+                    test(java.util.Arrays.equals(ex1.c.seq6, c.seq6));
+                    test(java.util.Arrays.equals(ex1.c.seq7, c.seq7));
+                    test(java.util.Arrays.equals(ex1.c.seq8, c.seq8));
+                    test(java.util.Arrays.equals(ex1.c.seq9, c.seq9));
+                }
+                catch(Ice.UserException ex1)
+                {
+                    test(false);
+                }
+            }
+
+            {
+                java.util.Map<Byte, Boolean> dict = new java.util.HashMap<Byte, Boolean>();
+                dict.put((byte)4, true);
+                dict.put((byte)1, false);
+                out = new Ice.OutputStream(comm);
+                ByteBoolDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new Ice.InputStream(comm, data);
+                java.util.Map<Byte, Boolean> dict2 = ByteBoolDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<Short, Integer> dict = new java.util.HashMap<Short, Integer>();
+                dict.put((short)1, 9);
+                dict.put((short)4, 8);
+                out = new Ice.OutputStream(comm);
+                ShortIntDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new Ice.InputStream(comm, data);
+                java.util.Map<Short, Integer> dict2 = ShortIntDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<Long, Float> dict = new java.util.HashMap<Long, Float>();
+                dict.put((long)123809828, 0.51f);
+                dict.put((long)123809829, 0.56f);
+                out = new Ice.OutputStream(comm);
+                LongFloatDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new Ice.InputStream(comm, data);
+                java.util.Map<Long, Float> dict2 = LongFloatDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<String, String> dict = new java.util.HashMap<String, String>();
+                dict.put("key1", "value1");
+                dict.put("key2", "value2");
+                out = new Ice.OutputStream(comm);
+                StringStringDHelper.write(out, dict);
+                byte data[] = out.finished();
+                in = new Ice.InputStream(comm, data);
+                java.util.Map<String, String> dict2 = StringStringDHelper.read(in);
+                test(dict2.equals(dict));
+            }
+
+            {
+                java.util.Map<String, MyClass> dict = new java.util.HashMap<String, MyClass>();
+                MyClass c;
+                c = new MyClass();
+                c.s = new SmallStruct();
+                c.s.e = MyEnum.enum2;
+                dict.put("key1", c);
+                c = new MyClass();
+                c.s = new SmallStruct();
+                c.s.e = MyEnum.enum3;
+                dict.put("key2", c);
+                out = new Ice.OutputStream(comm);
+                StringMyClassDHelper.write(out, dict);
+                out.writePendingValues();
+                byte[] data = out.finished();
+                in = new Ice.InputStream(comm, data);
+                java.util.Map<String, MyClass> dict2 = StringMyClassDHelper.read(in);
+                in.readPendingValues();
+                test(dict2.size() == dict.size());
+                test(dict2.get("key1").s.e == MyEnum.enum2);
+                test(dict2.get("key2").s.e == MyEnum.enum3);
+            }
 
-        {
-            java.util.Map<String, MyClass> dict = new java.util.HashMap<String, MyClass>();
-            MyClass c;
-            c = new MyClass();
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum2;
-            dict.put("key1", c);
-            c = new MyClass();
-            c.s = new SmallStruct();
-            c.s.e = MyEnum.enum3;
-            dict.put("key2", c);
-            out = new Ice.OutputStream(comm);
-            StringMyClassDHelper.write(out, dict);
-            out.writePendingValues();
-            byte[] data = out.finished();
-            in = new Ice.InputStream(comm, data);
-            java.util.Map<String, MyClass> dict2 = StringMyClassDHelper.read(in);
-            in.readPendingValues();
-            test(dict2.size() == dict.size());
-            test(dict2.get("key1").s.e == MyEnum.enum2);
-            test(dict2.get("key2").s.e == MyEnum.enum3);
+            printWriter.println("ok");
         }
-
-        printWriter.println("ok");
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.stream");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/stream/Serialize/Small.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/stream/Serialize/Small.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/stream/Serialize/Small.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/stream/Serialize/Small.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.stream.Serialize;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/stream/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/stream/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/stream/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/stream/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.threadPoolPriority;
 
 import test.Ice.threadPoolPriority.Test.PriorityPrx;
 import test.Ice.threadPoolPriority.Test.PriorityPrxHelper;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    private static void
-    test(boolean b)
+    public void run(String[] args)
     {
-        if(!b)
+        try(Ice.Communicator communicator = initialize(args))
         {
-            throw new RuntimeException();
-        }
-    }
-
-    @Override
-    public int run(String[] args)
-    {
-        java.io.PrintWriter out = getWriter();
-        Ice.ObjectPrx object = communicator().stringToProxy("test:" + getTestEndpoint(0) + " -t 10000");
-        PriorityPrx priority = PriorityPrxHelper.checkedCast(object);
-        out.print("testing thread priority... ");
-        out.flush();
-        int prio = priority.getPriority();
-        test(prio == 10);
-        out.println("ok");
+            java.io.PrintWriter out = getWriter();
+            Ice.ObjectPrx object = communicator().stringToProxy("test:" + getTestEndpoint(0) + " -t 10000");
+            PriorityPrx priority = PriorityPrxHelper.checkedCast(object);
+            out.print("testing thread priority... ");
+            out.flush();
+            int prio = priority.getPriority();
+            test(prio == 10);
+            out.println("ok");
 
-        priority.shutdown();
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+            priority.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/PriorityI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.threadPoolPriority;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.threadPoolPriority;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 10000");
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "10");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "10");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 10000");
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/threadPoolPriority/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
@@ -154,17 +149,18 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        String sref = "timeout:" + app.getTestEndpoint(0);
+        String sref = "timeout:" + helper.getTestEndpoint(0);
         Ice.ObjectPrx obj = communicator.stringToProxy(sref);
         test(obj != null);
 
         int mult = 1;
-        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp"))
+        if(!communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp").equals("tcp") ||
+           helper.isAndroid())
         {
             mult = 4;
         }
@@ -173,7 +169,7 @@
         test(timeout != null);
 
         ControllerPrx controller = ControllerPrxHelper.checkedCast(
-           communicator.stringToProxy("controller:" + app.getTestEndpoint(1)));
+           communicator.stringToProxy("controller:" + helper.getTestEndpoint(1)));
         test(controller != null);
 
         out.print("testing connect timeout... ");
@@ -183,7 +179,7 @@
             // Expect ConnectTimeoutException.
             //
             TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(100 * mult));
-            controller.holdAdapter(200 * mult);
+            controller.holdAdapter(-1);
             try
             {
                 to.op();
@@ -193,14 +189,16 @@
             {
                 // Expected.
             }
+            controller.resumeAdapter();
+            timeout.op(); // Ensure adapter is active.
         }
         {
             //
             // Expect success.
             //
             timeout.op(); // Ensure adapter is active.
-            TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(1000 * mult));
-            controller.holdAdapter(200 * mult);
+            TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(2000 * mult));
+            controller.holdAdapter(100 * mult);
             try
             {
                 to.op();
@@ -242,7 +240,7 @@
             // Expect success.
             //
             TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(1000 * mult));
-            controller.holdAdapter(200 * mult);
+            controller.holdAdapter(100 * mult);
             try
             {
                 to.sendData(new byte[1000000]);
@@ -295,7 +293,7 @@
             //
             // Expect success.
             //
-            TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(500 * mult));
+            TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_invocationTimeout(1000 * mult));
             CallbackSuccess cb = new CallbackSuccess();
             to.begin_sleep(100 * mult, cb);
             cb.check();
@@ -396,124 +394,124 @@
             // Test Ice.Override.Timeout. This property overrides all
             // endpoint timeouts.
             //
-            Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
-            initData.properties.setProperty("Ice.Override.Timeout", "100");
-            Ice.Communicator comm = app.initialize(initData);
-            TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(Ice.TimeoutException ex)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+            Ice.Properties properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.Override.ConnectTimeout", "250");
+            properties.setProperty("Ice.Override.Timeout", "100");
+
+            try(Ice.Communicator comm = helper.initialize(properties))
+            {
+                TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
+                connect(to);
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.sendData(seq);
+                    test(false);
+                }
+                catch(Ice.TimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
 
-            //
-            // Calling ice_timeout() should have no effect.
-            //
-            to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000 * mult));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(Ice.TimeoutException ex)
-            {
-                // Expected.
+                //
+                // Calling ice_timeout() should have no effect.
+                //
+                to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000 * mult));
+                connect(to);
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.sendData(seq);
+                    test(false);
+                }
+                catch(Ice.TimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
             }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-            comm.destroy();
         }
         {
             //
             // Test Ice.Override.ConnectTimeout.
             //
-            Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
+            Ice.Properties properties = communicator.getProperties()._clone();
             if(mult == 1)
             {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+                properties.setProperty("Ice.Override.ConnectTimeout", "250");
             }
             else
             {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "2500");
+                properties.setProperty("Ice.Override.ConnectTimeout", "2500");
             }
 
-            Ice.Communicator comm = app.initialize(initData);
-            TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
-            controller.holdAdapter(-1);
-            try
-            {
-                to.op();
-                test(false);
-            }
-            catch(Ice.ConnectTimeoutException ex)
+            try(Ice.Communicator comm = helper.initialize(properties))
             {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+                TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref));
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.op();
+                    test(false);
+                }
+                catch(Ice.ConnectTimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
 
-            //
-            // Calling ice_timeout() should have no effect on the connect timeout.
-            //
-            controller.holdAdapter(-1);
-            to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000 * mult));
-            try
-            {
-                to.op();
-                test(false);
-            }
-            catch(Ice.ConnectTimeoutException ex)
-            {
-                // Expected.
-            }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+                //
+                // Calling ice_timeout() should have no effect on the connect timeout.
+                //
+                controller.holdAdapter(-1);
+                to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(1000 * mult));
+                try
+                {
+                    to.op();
+                    test(false);
+                }
+                catch(Ice.ConnectTimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
 
-            //
-            // Verify that timeout set via ice_timeout() is still used for requests.
-            //
-            to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(250));
-            connect(to);
-            controller.holdAdapter(-1);
-            try
-            {
-                to.sendData(seq);
-                test(false);
-            }
-            catch(Ice.TimeoutException ex)
-            {
-                // Expected.
+                //
+                // Verify that timeout set via ice_timeout() is still used for requests.
+                //
+                to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(250));
+                connect(to);
+                controller.holdAdapter(-1);
+                try
+                {
+                    to.sendData(seq);
+                    test(false);
+                }
+                catch(Ice.TimeoutException ex)
+                {
+                    // Expected.
+                }
+                controller.resumeAdapter();
+                timeout.op(); // Ensure adapter is active.
             }
-            controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
-            comm.destroy();
         }
         {
             //
             // Test Ice.Override.CloseTimeout.
             //
-            Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.Override.CloseTimeout", "100");
-            Ice.Communicator comm = app.initialize(initData);
+            Ice.Properties properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.Override.CloseTimeout", "10");
+            Ice.Communicator comm = helper.initialize(properties);
             comm.stringToProxy(sref).ice_getConnection();
             controller.holdAdapter(-1);
             long now = System.nanoTime();
             comm.destroy();
-            test(System.nanoTime() - now < 700 * 1000000);
+            test(System.nanoTime() - now < 2000 * 1000000);
             controller.resumeAdapter();
         }
         out.println("ok");
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,55 +1,37 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
 import test.Ice.timeout.Test.TimeoutPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        AllTests.allTests(this);
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
 
         //
         // For this test, we want to disable retries.
         //
-        initData.properties.setProperty("Ice.RetryIntervals", "-1");
+        properties.setProperty("Ice.RetryIntervals", "-1");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
 
         //
         // Limit the send buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+        properties.setProperty("Ice.TCP.SndSize", "50000");
 
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/ControllerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/ControllerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/ControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/ControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,65 +1,49 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout"));
-        adapter.activate();
-
-        Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("ControllerAdapter.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
 
         //
         // Limit the recv buffer size, this test relies on the socket
         // send() blocking after sending a given amount of data.
         //
-        initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
+        properties.setProperty("Ice.TCP.RcvSize", "50000");
 
         //
         // The client sends large messages to cause the transport
         // buffers to fill up.
         //
-        initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+        properties.setProperty("Ice.MessageSizeMax", "20000");
 
         //
         // This test kills connections, so we don't want warnings.
         //
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        return initData;
-    }
+        properties.setProperty("Ice.Warn.Connections", "0");
 
-    public static void main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout"));
+            adapter.activate();
+
+            Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
+            controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+            controllerAdapter.activate();
+
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/timeout/TimeoutI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.timeout;
 import test.Ice.timeout.Test._TimeoutDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
@@ -69,10 +64,10 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         communicator.getProperties().setProperty("ReplyAdapter.Endpoints", "udp");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ReplyAdapter");
@@ -84,7 +79,7 @@
 
         out.print("testing udp... ");
         out.flush();
-        Ice.ObjectPrx base = communicator.stringToProxy("test -d:" + app.getTestEndpoint(0, "udp"));
+        Ice.ObjectPrx base = communicator.stringToProxy("test -d:" + helper.getTestEndpoint(0, "udp"));
         TestIntfPrx obj = TestIntfPrxHelper.uncheckedCast(base);
 
         int nRetry = 5;
@@ -135,9 +130,9 @@
             // We occasionally encounter an IOException("No buffer space is available") on Linux/Android
             // when using a large packet (e.g., 50K), so we use a smaller value here.
             //
-            communicator.getProperties().setProperty("Ice.UDP.SndSize", "25000");
+            communicator.getProperties().setProperty("Ice.UDP.SndSize", "64000");
             obj.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            seq = new byte[24000];
+            seq = new byte[50000];
             try
             {
                 replyI.reset();
@@ -148,7 +143,7 @@
                 // Ice.UDP.RcvSize is too small, therefore it will not send a reply. However, on some
                 // versions of Android, the server might still receive the request.
                 //
-                if(!app.isAndroid())
+                if(!helper.isAndroid())
                 {
                     test(!b);
                 }
@@ -169,7 +164,7 @@
             if(communicator.getProperties().getProperty("Ice.IPv6").equals("1"))
             {
                 endpoint.append("udp -h \"ff15::1:1\" -p ");
-                endpoint.append(app.getTestPort(communicator.getProperties(), 10));
+                endpoint.append(helper.getTestPort(communicator.getProperties(), 10));
                 if(System.getProperty("os.name").contains("OS X") ||
                    System.getProperty("os.name").startsWith("Windows"))
                 {
@@ -179,7 +174,7 @@
             else
             {
                 endpoint.append("udp -h 239.255.1.1 -p ");
-                endpoint.append(app.getTestPort(communicator.getProperties(), 10));
+                endpoint.append(helper.getTestPort(communicator.getProperties(), 10));
                 if(System.getProperty("os.name").contains("OS X") ||
                    System.getProperty("os.name").startsWith("Windows"))
                 {
@@ -193,7 +188,7 @@
             // On Android, the test suite driver only starts one server instance. Otherwise, we expect
             // there to be five servers and we expect a response from all of them.
             //
-            final int numServers = app.isAndroid() ? 1 : 5;
+            final int numServers = helper.isAndroid() ? 1 : 5;
 
             nRetry = 5;
             while(nRetry-- > 0)
@@ -221,7 +216,7 @@
         //
         // Bidir requests don't seem to work on older Android versions.
         //
-        if(!app.isAndroid())
+        if(!helper.isAndroid())
         {
             out.print("testing udp bi-dir connection... ");
             out.flush();
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
 import test.Ice.udp.Test.*;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        AllTests.allTests(this);
-
-        int num;
-        try
-        {
-            num = args.length == 1 ? Integer.parseInt(args[0]) : 1;
-        }
-        catch(NumberFormatException ex)
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        properties.setProperty("Ice.Package.Test", "test.Ice.udp");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.UDP.RcvSize", "16384");
+        properties.setProperty("Ice.UDP.SndSize", "16384");
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            num = 1;
+            AllTests.allTests(this);
+            int num = argsH.value.length == 1 ? Integer.parseInt(argsH.value[0]) : 1;
+            for(int i = 0; i < num; ++i)
+            {
+                Ice.ObjectPrx prx = communicator.stringToProxy("control:" + getTestEndpoint(i, "tcp"));
+                TestIntfPrxHelper.uncheckedCast(prx).shutdown();
+            }
         }
-        for(int i = 0; i < num; ++i)
-        {
-            TestIntfPrxHelper.uncheckedCast(communicator().stringToProxy("control:" +
-                                                                         getTestEndpoint(i, "tcp"))).shutdown();
-        }
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
-        initData.properties.setProperty("Ice.UDP.SndSize", "16384");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,107 +1,92 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Properties properties = communicator().getProperties();
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        {
+            properties.setProperty("Ice.Package.Test", "test.Ice.udp");
+            properties.setProperty("Ice.Warn.Connections", "0");
+            properties.setProperty("Ice.UDP.RcvSize", "16384");
+            properties.setProperty("Ice.UDP.SndSize", "16384");
+
+            String endpoint;
+            if(properties.getProperty("Ice.IPv6").equals("1"))
+            {
+                if(System.getProperty("os.name").contains("OS X"))
+                {
+                    endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\"";
+                }
+                else
+                {
+                    endpoint = "udp -h \"ff15::1:1\" -p 12020";
+                }
+            }
+            else
+            {
+                endpoint = "udp -h 239.255.1.1 -p 12020";
+            }
+            properties.setProperty("McastTestAdapter.Endpoints", endpoint);
+        }
 
         int port = 0;
         try
         {
-            port += args.length == 1 ? Integer.parseInt(args[0]) : 0;
+            port += argsH.value.length == 1 ? Integer.parseInt(argsH.value[0]) : 0;
         }
         catch(NumberFormatException ex)
         {
         }
-        properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(port, "tcp"));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
-        adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control"));
-        adapter.activate();
 
-        if(port == 0)
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(port, "udp"));
-            Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter");
-            adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
-            adapter2.activate();
-        }
+            properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(port, "tcp"));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter");
+            adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control"));
+            adapter.activate();
 
-        StringBuilder endpoint = new StringBuilder();
-        if(properties.getProperty("Ice.IPv6").equals("1"))
-        {
-            endpoint.append("udp -h \"ff15::1:1\" -p ");
-            endpoint.append(getTestPort(properties, 10));
-            if(System.getProperty("os.name").contains("OS X") ||
-               System.getProperty("os.name").startsWith("Windows"))
-            {
-                endpoint.append(" --interface \"::1\"");
-            }
-        }
-        else
-        {
-            endpoint.append("udp -h 239.255.1.1 -p ");
-            endpoint.append(getTestPort(properties, 10));
-            if(System.getProperty("os.name").contains("OS X") ||
-               System.getProperty("os.name").startsWith("Windows"))
+            if(port == 0)
             {
-                endpoint.append(" --interface 127.0.0.1");
+                properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(port, "udp"));
+                Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter");
+                adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
+                adapter2.activate();
             }
-        }
-        properties.setProperty("McastTestAdapter.Endpoints", endpoint.toString());
-        Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter");
-        mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
-        mcastAdapter.activate();
-
-        return WAIT;
-    }
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
-        initData.properties.setProperty("Ice.UDP.SndSize", "16384");
-
-        String endpoint;
-        if(initData.properties.getProperty("Ice.IPv6").equals("1"))
-        {
-            if(System.getProperty("os.name").contains("OS X"))
+            StringBuilder endpoint = new StringBuilder();
+            if(properties.getProperty("Ice.IPv6").equals("1"))
             {
-                endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\"";
+                endpoint.append("udp -h \"ff15::1:1\" -p ");
+                endpoint.append(getTestPort(properties, 10));
+                if(System.getProperty("os.name").contains("OS X") ||
+                   System.getProperty("os.name").startsWith("Windows"))
+                {
+                    endpoint.append(" --interface \"::1\"");
+                }
             }
             else
             {
-                endpoint = "udp -h \"ff15::1:1\" -p 12020";
+                endpoint.append("udp -h 239.255.1.1 -p ");
+                endpoint.append(getTestPort(properties, 10));
+                if(System.getProperty("os.name").contains("OS X") ||
+                   System.getProperty("os.name").startsWith("Windows"))
+                {
+                    endpoint.append(" --interface 127.0.0.1");
+                }
             }
-        }
-        else
-        {
-            endpoint = "udp -h 239.255.1.1 -p 12020";
-        }
-        initData.properties.setProperty("McastTestAdapter.Endpoints", endpoint);
-
-        return initData;
-    }
+            properties.setProperty("McastTestAdapter.Endpoints", endpoint.toString());
+            Ice.ObjectAdapter mcastAdapter = communicator.createObjectAdapter("McastTestAdapter");
+            mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
+            mcastAdapter.activate();
 
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 #include <Ice/Identity.ice>
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/TestIntfI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/TestIntfI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Ice/udp/TestIntfI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Ice/udp/TestIntfI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Ice.udp;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        AllTests.allTests(communicator);
-
-        //
-        // Shutdown the IceBox server.
-        //
-        Ice.ProcessPrxHelper.uncheckedCast(
-            communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996")).shutdown();
-        return 0;
-    }
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(communicator);
 
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client app = new Client();
-        int result = app.main("Client", args);
-        System.gc();
-        System.exit(result);
+            //
+            // Shutdown the IceBox server.
+            //
+            Ice.ObjectPrx prx = communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996");
+            Ice.ProcessPrxHelper.uncheckedCast(prx).shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/TestFacetI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/TestFacetI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/TestFacetI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/TestFacetI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/TestServiceI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/TestServiceI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/admin/TestServiceI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/admin/TestServiceI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.admin;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
@@ -26,18 +21,18 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
         TestIntfPrx service1 =
-            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(0)));
+            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(0)));
         TestIntfPrx service2 =
-            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(1)));
+            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(1)));
         TestIntfPrx service3 =
-            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(2)));
+            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(2)));
         TestIntfPrx service4 =
-            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + app.getTestEndpoint(3)));
+            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:" + helper.getTestEndpoint(3)));
 
         if(service1.getProperty("IceBox.InheritProperties").equals(""))
         {
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        AllTests.allTests(this);
-
-        //
-        // Shutdown the IceBox server.
-        //
-        Ice.ProcessPrxHelper.uncheckedCast(communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996"))
-                .shutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceBox.configuration");
-        initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.IceBox.configuration");
+        properties.setProperty("Ice.Default.Host", "127.0.0.1");
+
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            AllTests.allTests(this);
+            //
+            // Shutdown the IceBox server.
+            //
+            Ice.ObjectPrx prx = communicator.stringToProxy("DemoIceBox/admin -f Process:default -p 9996");
+            Ice.ProcessPrxHelper.uncheckedCast(prx).shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceBox.configuration;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,27 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        int num;
-        try
-        {
-            num = args.length == 1 ? Integer.parseInt(args[0]) : 0;
-        }
-        catch(NumberFormatException ex)
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            num = 0;
+            int num;
+            try
+            {
+                num = argsH.value.length == 1 ? Integer.parseInt(argsH.value[0]) : 0;
+            }
+            catch(NumberFormatException ex)
+            {
+                num = 0;
+            }
+            AllTests.allTests(communicator, num);
         }
-        AllTests.allTests(communicator(), num);
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Properties properties = communicator().getProperties();
-
-        int num = 0;
-        try
-        {
-            num = Integer.parseInt(args[0]);
-        }
-        catch(NumberFormatException ex)
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        try(Ice.Communicator communicator = initialize(properties))
         {
-        }
-
-        properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(num));
-        properties.setProperty("ControlAdapter.AdapterId", "control" + num);
-        properties.setProperty("ControlAdapter.ThreadPool.Size", "1");
+            int num = 0;
+            try
+            {
+                num = Integer.parseInt(argsH.value[0]);
+            }
+            catch(NumberFormatException ex)
+            {
+            }
+
+            communicator.getProperties().setProperty("ControlAdapter.Endpoints", getTestEndpoint(num));
+            communicator.getProperties().setProperty("ControlAdapter.AdapterId", "control" + num);
+            communicator.getProperties().setProperty("ControlAdapter.ThreadPool.Size", "1");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter");
+            adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num));
+            adapter.activate();
 
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
-        adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num));
-        adapter.activate();
-
-        return WAIT;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-        System.gc();
-        System.exit(status);
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceDiscovery.simple;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 import java.io.PrintWriter;
@@ -25,10 +20,10 @@
     }
 
     public static void
-    allTests(test.Util.Application app)
+    allTests(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
@@ -86,67 +81,67 @@
             // Ensure the IceGrid discovery locator can discover the
             // registries and make sure locator requests are forwarded.
             //
-            Ice.InitializationData initData = app.createInitializationData();
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.Default.Locator", "");
-            initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
+            Ice.Properties properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.Default.Locator", "");
+            properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
                                             "IceLocatorDiscovery:IceLocatorDiscovery.PluginFactory");
-            initData.properties.setProperty("IceLocatorDiscovery.Port", Integer.toString(app.getTestPort(99)));
-            initData.properties.setProperty("AdapterForDiscoveryTest.AdapterId", "discoveryAdapter");
-            initData.properties.setProperty("AdapterForDiscoveryTest.Endpoints", "default");
-
-            Ice.Communicator com =  Ice.Util.initialize(initData);
-            test(com.getDefaultLocator() != null);
-            com.stringToProxy("test @ TestAdapter").ice_ping();
-            com.stringToProxy("test").ice_ping();
-
-            test(com.getDefaultLocator().getRegistry() != null);
-            test(IceGrid.LocatorPrxHelper.uncheckedCast(com.getDefaultLocator()).getLocalRegistry() != null);
-            test(IceGrid.LocatorPrxHelper.uncheckedCast(com.getDefaultLocator()).getLocalQuery() != null);
-
-            Ice.ObjectAdapter adapter = com.createObjectAdapter("AdapterForDiscoveryTest");
-            adapter.activate();
-            adapter.deactivate();
-            com.destroy();
+            properties.setProperty("IceLocatorDiscovery.Port", Integer.toString(helper.getTestPort(99)));
+            properties.setProperty("AdapterForDiscoveryTest.AdapterId", "discoveryAdapter");
+            properties.setProperty("AdapterForDiscoveryTest.Endpoints", "default");
 
-            //
-            // Now, ensure that the IceGrid discovery locator correctly
-            // handles failure to find a locator.
-            //
-            initData.properties.setProperty("IceLocatorDiscovery.InstanceName", "unknown");
-            initData.properties.setProperty("IceLocatorDiscovery.RetryCount", "1");
-            initData.properties.setProperty("IceLocatorDiscovery.Timeout", "100");
-            com = Ice.Util.initialize(initData);
-            test(com.getDefaultLocator() != null);
-            try
+            try(Ice.Communicator com = helper.initialize(properties))
             {
+                test(com.getDefaultLocator() != null);
                 com.stringToProxy("test @ TestAdapter").ice_ping();
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-            }
-            try
-            {
                 com.stringToProxy("test").ice_ping();
-            }
-            catch(Ice.NoEndpointException ex)
-            {
-            }
-            test(com.getDefaultLocator().getRegistry() == null);
-            test(IceGrid.LocatorPrxHelper.checkedCast(com.getDefaultLocator()) == null);
-            try
-            {
-                IceGrid.LocatorPrxHelper.uncheckedCast(com.getDefaultLocator()).getLocalQuery();
-            }
-            catch(Ice.OperationNotExistException ex)
-            {
+
+                test(com.getDefaultLocator().getRegistry() != null);
+                test(IceGrid.LocatorPrxHelper.uncheckedCast(com.getDefaultLocator()).getLocalRegistry() != null);
+                test(IceGrid.LocatorPrxHelper.uncheckedCast(com.getDefaultLocator()).getLocalQuery() != null);
+
+                Ice.ObjectAdapter adapter = com.createObjectAdapter("AdapterForDiscoveryTest");
+                adapter.activate();
+                adapter.deactivate();
             }
 
-            adapter = com.createObjectAdapter("AdapterForDiscoveryTest");
-            adapter.activate();
-            adapter.deactivate();
+            //
+            // Now, ensure that the IceGrid discovery locator correctly
+            // handles failure to find a locator.
+            //
+            properties.setProperty("IceLocatorDiscovery.InstanceName", "unknown");
+            properties.setProperty("IceLocatorDiscovery.RetryCount", "1");
+            properties.setProperty("IceLocatorDiscovery.Timeout", "100");
+            try(Ice.Communicator com = helper.initialize(properties))
+            {
+                test(com.getDefaultLocator() != null);
+                try
+                {
+                    com.stringToProxy("test @ TestAdapter").ice_ping();
+                }
+                catch(Ice.NoEndpointException ex)
+                {
+                }
+                try
+                {
+                    com.stringToProxy("test").ice_ping();
+                }
+                catch(Ice.NoEndpointException ex)
+                {
+                }
+                test(com.getDefaultLocator().getRegistry() == null);
+                test(IceGrid.LocatorPrxHelper.checkedCast(com.getDefaultLocator()) == null);
+                try
+                {
+                    IceGrid.LocatorPrxHelper.uncheckedCast(com.getDefaultLocator()).getLocalQuery();
+                }
+                catch(Ice.OperationNotExistException ex)
+                {
+                }
 
-            com.destroy();
+                Ice.ObjectAdapter adapter = com.createObjectAdapter("AdapterForDiscoveryTest");
+                adapter.activate();
+                adapter.deactivate();
+            }
 
             String multicast;
             if(communicator.getProperties().getProperty("Ice.IPv6").equals("1"))
@@ -161,50 +156,53 @@
             //
             // Test invalid lookup endpoints
             //
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.Default.Locator", "");
-            initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
-                                            "IceLocatorDiscovery.PluginFactory");
-            initData.properties.setProperty("IceLocatorDiscovery.Lookup",
-                                             "udp -h " + multicast + " --interface unknown");
-            com = Ice.Util.initialize(initData);
-            test(com.getDefaultLocator() != null);
-            try
-            {
-                com.stringToProxy("test @ TestAdapter").ice_ping();
-                test(false);
-            }
-            catch(Ice.NoEndpointException ex)
+            properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.Default.Locator", "");
+            properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
+                                   "IceLocatorDiscovery.PluginFactory");
+            properties.setProperty("IceLocatorDiscovery.Lookup",
+                                   "udp -h " + multicast + " --interface unknown");
+            try(Ice.Communicator com = helper.initialize(properties))
             {
+                test(com.getDefaultLocator() != null);
+                try
+                {
+                    com.stringToProxy("test @ TestAdapter").ice_ping();
+                    test(false);
+                }
+                catch(Ice.NoEndpointException ex)
+                {
+                }
             }
-            com.destroy();
 
-            initData.properties = communicator.getProperties()._clone();
-            initData.properties.setProperty("Ice.Default.Locator", "");
-            initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
-                                            "IceLocatorDiscovery.PluginFactory");
+            properties = communicator.getProperties()._clone();
+            properties.setProperty("Ice.Default.Locator", "");
+            properties.setProperty("Ice.Plugin.IceLocatorDiscovery",
+                                   "IceLocatorDiscovery.PluginFactory");
             {
-                String intf = initData.properties.getProperty("IceLocatorDiscovery.Interface");
+                String intf = properties.getProperty("IceLocatorDiscovery.Interface");
                 if(!intf.isEmpty())
                 {
                     intf = " --interface \"" + intf + "\"";
                 }
-                String port = Integer.toString(app.getTestPort(99));
-                initData.properties.setProperty("IceLocatorDiscovery.Lookup",
-                                                 "udp -h " + multicast + " --interface unknown:" +
-                                                 "udp -h " + multicast + " -p " + port + intf);
-            }
-            com = Ice.Util.initialize(initData);
-            test(com.getDefaultLocator() != null);
-            try
-            {
-                com.stringToProxy("test @ TestAdapter").ice_ping();
+                String port = Integer.toString(helper.getTestPort(99));
+                properties.setProperty("IceLocatorDiscovery.Lookup",
+                                       "udp -h " + multicast + " --interface unknown:" +
+                                       "udp -h " + multicast + " -p " + port + intf);
             }
-            catch(Ice.NoEndpointException ex)
+
+            try(Ice.Communicator com = helper.initialize(properties))
             {
-                test(false);
+                test(com.getDefaultLocator() != null);
+                try
+                {
+                    com.stringToProxy("test @ TestAdapter").ice_ping();
+                }
+                catch(Ice.NoEndpointException ex)
+                {
+                    test(false);
+                }
             }
-            com.destroy();
         }
         out.println("ok");
 
@@ -215,10 +213,10 @@
     }
 
     public static void
-    allTestsWithDeploy(test.Util.Application app)
+    allTestsWithDeploy(test.TestHelper helper)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
         out.print("testing stringToProxy... ");
         out.flush();
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/application.xml zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/application.xml
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/application.xml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/application.xml	2019-02-05 18:03:04.000000000 +0000
@@ -2,16 +2,20 @@
   <application name="Test">
     <node name="localnode">
       <server id="server" exe="${java.exe}" pwd="." activation="on-demand">
-        <option>-Djava.security.egd=file:/dev/urandom</option>
-        <option>test.IceGrid.simple.Server</option>
+        <!-- TODO: WORKAROUND for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
+        <option>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</option>
+        <option>-Dtest.class=test.IceGrid.simple.Server</option>
+        <option>test.TestDriver</option>
         <adapter name="TestAdapter" id="TestAdapter" endpoints="default">
           <object identity="test" type="Test"/>
         </adapter>
       </server>
 
       <server id="server10" exe="${java.exe}" pwd="." activation="on-demand">
-        <option>-Djava.security.egd=file:/dev/urandom</option>
-        <option>test.IceGrid.simple.Server</option>
+        <!-- TODO: WORKAROUND for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 -->
+        <option>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</option>
+        <option>-Dtest.class=test.IceGrid.simple.Server</option>
+        <option>test.TestDriver</option>
         <adapter name="TestAdapter" endpoints="default" id="TestAdapter10">
           <object identity="test10" type="Test" property="Identity"/>
         </adapter>
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
-        Ice.Communicator communicator = communicator();
-        boolean withDeploy = false;
-        for(String arg : args)
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
+        try(Ice.Communicator communicator = initialize(properties))
         {
-            if(arg.equals("--with-deploy"))
+            boolean withDeploy = false;
+            for(String arg : args)
             {
-                withDeploy = true;
-                break;
+                if(arg.equals("--with-deploy"))
+                {
+                    withDeploy = true;
+                    break;
+                }
             }
-        }
 
-        if(!withDeploy)
-        {
-            AllTests.allTests(this);
-        }
-        else
-        {
-            AllTests.allTestsWithDeploy(this);
+            if(!withDeploy)
+            {
+                AllTests.allTests(this);
+            }
+            else
+            {
+                AllTests.allTestsWithDeploy(this);
+            }
         }
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,61 +1,39 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int
-    run(String[] args)
+    public void run(String[] args)
     {
         Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-        argsH.value = communicator().getProperties().parseCommandLineOptions("TestAdapter", argsH.value);
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI();
-        String id = communicator().getProperties().getPropertyWithDefault("Identity", "test");
-        adapter.add(object, Ice.Util.stringToIdentity(id));
-        //shutdownOnInterrupt();
-        try
-        {
-            adapter.activate();
-        }
-        catch(Ice.ObjectAdapterDeactivatedException ex)
-        {
-        }
-        communicator().waitForShutdown();
-        //defaultInterrupt();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
+        Ice.Properties properties = createTestProperties(argsH);
         //
         // Its possible to have batch oneway requests dispatched
         // after the adapter is deactivated due to thread
         // scheduling so we supress this warning.
         //
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
-        return initData;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("test.IceGrid.simple.Server", args);
-
-        System.gc();
-        System.exit(status);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
+        properties.parseCommandLineOptions("TestAdapter", argsH.value);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Object object = new TestI();
+            String id = communicator.getProperties().getPropertyWithDefault("Identity", "test");
+            adapter.add(object, Ice.Util.stringToIdentity(id));
+            //shutdownOnInterrupt();
+            try
+            {
+                adapter.activate();
+            }
+            catch(Ice.ObjectAdapterDeactivatedException ex)
+            {
+            }
+            communicator.waitForShutdown();
+            //defaultInterrupt();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/TestI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/TestI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceGrid/simple/TestI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceGrid/simple/TestI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceGrid.simple;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/certs/makecerts.py zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/certs/makecerts.py
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/certs/makecerts.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/certs/makecerts.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2015-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 import os, sys, socket, getopt
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 import java.io.PrintWriter;
@@ -116,12 +111,12 @@
     }
 
     public static ServerFactoryPrx
-    allTests(test.Util.Application app, String testDir)
+    allTests(test.TestHelper helper, String testDir)
     {
-        Ice.Communicator communicator = app.communicator();
-        PrintWriter out = app.getWriter();
+        Ice.Communicator communicator = helper.communicator();
+        PrintWriter out = helper.getWriter();
 
-        final String factoryRef = "factory:" + app.getTestEndpoint(0, "tcp");
+        final String factoryRef = "factory:" + helper.getTestEndpoint(0, "tcp");
         Ice.ObjectPrx b = communicator.stringToProxy(factoryRef);
         test(b != null);
         ServerFactoryPrx factory = ServerFactoryPrxHelper.checkedCast(b);
@@ -154,33 +149,6 @@
             }
             comm.destroy();
         }
-        {
-            Ice.InitializationData initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("Ice.InitPlugins", "0");
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Ice.Communicator comm = Ice.Util.initialize(args, initData);
-            Ice.PluginManager pm = comm.getPluginManager();
-            pm.initializePlugins();
-            Ice.ObjectPrx obj = comm.stringToProxy(factoryRef);
-            test(obj != null);
-            ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(obj);
-            java.util.Map<String, String> d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-        }
         out.println("ok");
 
         out.print("testing certificate verification... ");
@@ -408,37 +376,6 @@
             comm.destroy();
 
             //
-            // Test IceSSL.VerifyPeer=1. This should fail because the server
-            // does not supply a certificate.
-            //
-            initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "1");
-            comm = Ice.Util.initialize(args, initData);
-            fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(Ice.SecurityException ex)
-            {
-                // Expected.
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-
-            //
             // This should succeed because the self signed certificate used by the server is
             // trusted.
             //
@@ -1066,68 +1003,6 @@
         out.flush();
         {
             //
-            // ADH is allowed but will not have a certificate.
-            //
-            initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Ice.Communicator comm = Ice.Util.initialize(args, initData);
-            IceSSL.Plugin plugin = (IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL");
-            test(plugin != null);
-            CertificateVerifierI verifier = new CertificateVerifierI();
-            plugin.setCertificateVerifier(verifier);
-
-            ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                String cipherSub = "DH_anon";
-                server.checkCipher(cipherSub);
-                IceSSL.ConnectionInfo info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
-                test(info.cipher.indexOf(cipherSub) >= 0);
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            test(verifier.invoked());
-            test(!verifier.hadCert());
-
-            //
-            // Have the verifier return false. Close the connection explicitly
-            // to force a new connection to be established.
-            //
-            verifier.reset();
-            verifier.returnValue(false);
-            server.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(Ice.SecurityException ex)
-            {
-                // Expected.
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            test(verifier.invoked());
-            test(!verifier.hadCert());
-
-            fact.destroyServer(server);
-            comm.destroy();
-        }
-
-        {
-            //
             // Verify that a server certificate is present.
             //
             initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1");
@@ -1496,33 +1371,6 @@
         out.flush();
         {
             //
-            // The server has a certificate but the client doesn't. They should
-            // negotiate to use ADH since we explicitly enable it.
-            //
-            initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Ice.Communicator comm = Ice.Util.initialize(args, initData);
-            ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1");
-            d.put("IceSSL.Ciphers", "ALL");
-            d.put("IceSSL.VerifyPeer", "1");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-        }
-        {
-            //
             // Configure a server with RSA and DSA certificates.
             //
             // First try a client with a DSA certificate.
@@ -1567,38 +1415,6 @@
             }
             fact.destroyServer(server);
             comm.destroy();
-
-            //
-            // Next try a client with ADH. This should fail.
-            //
-            initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            comm = Ice.Util.initialize(args, initData);
-            fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_dsa_ca1", "cacert1");
-            d.put("IceSSL.VerifyPeer", "1");
-            server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(Ice.SecurityException ex)
-            {
-                // Expected.
-            }
-            catch(Ice.ConnectionLostException ex)
-            {
-                // Expected for thread pool.
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                test(false);
-            }
-            fact.destroyServer(server);
-            comm.destroy();
         }
         {
             //
@@ -1680,6 +1496,8 @@
             d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_dsa_ca1", "cacert1");
             d.put("IceSSL.Alias", "dsacert");
             d.put("IceSSL.VerifyPeer", "1");
+            // TLS 1.3 no longer supports DSA so disable TLS 1.3 for this test.
+            d.put("IceSSL.Protocols", "ssl3, tls1_0, tls1_1, tls1_2");
             ServerPrx server = fact.createServer(d);
             try
             {
@@ -2056,62 +1874,6 @@
             }
             fact.destroyServer(server);
             comm.destroy();
-        }
-        {
-            //
-            // Test rejection when client does not supply a certificate.
-            //
-            initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Ice.Communicator comm = Ice.Util.initialize(args, initData);
-
-            ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.TrustOnly",
-                  "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(Ice.LocalException ex)
-            {
-            }
-            fact.destroyServer(server);
-            comm.destroy();
-        }
-        {
-            //
-            // Test rejection when client does not supply a certificate.
-            //
-            initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            Ice.Communicator comm = Ice.Util.initialize(args, initData);
-
-            ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
-            test(fact != null);
-            d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.TrustOnly",
-                  "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
-            d.put("IceSSL.VerifyPeer", "0");
-            ServerPrx server = fact.createServer(d);
-            try
-            {
-                server.ice_ping();
-                test(false);
-            }
-            catch(Ice.LocalException ex)
-            {
-            }
-            fact.destroyServer(server);
-            comm.destroy();
         }
         {
             //
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
@@ -13,38 +8,23 @@
 
 import test.IceSSL.configuration.Test.ServerFactoryPrx;
 
-public class Client extends test.Util.Application
+public class Client extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
+    public void run(String[] args)
     {
+        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
+        Ice.Properties properties = createTestProperties(argsH);
+        properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
         PrintWriter out = getWriter();
-        if(args.length < 1)
+        if(argsH.value.length < 1)
         {
-            out.println("Usage: client testdir");
-            return 1;
+            throw new RuntimeException("Usage: client testdir");
         }
 
-        ServerFactoryPrx factory = AllTests.allTests(this, args[0]);
-        factory.shutdown();
-
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Client c = new Client();
-        int status = c.main("Client", args);
-
-        System.gc();
-        System.exit(status);
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            ServerFactoryPrx factory = AllTests.allTests(this, argsH.value[0]);
+            factory.shutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/PasswordCallbackI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 import test.IceSSL.configuration.Test.ServerPrx;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/ServerI.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/ServerI.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/ServerI.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/ServerI.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 import test.IceSSL.configuration.Test._ServerDisp;
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,24 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceSSL.configuration;
 
-public class Server extends test.Util.Application
+public class Server extends test.TestHelper
 {
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp"));
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Identity id = Ice.Util.stringToIdentity("factory");
-        adapter.add(new ServerFactoryI(), id);
-        adapter.activate();
-
-        communicator.waitForShutdown();
-        return 0;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    public void run(String[] args)
     {
-        Ice.InitializationData initData = super.getInitData(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Server c = new Server();
-        int status = c.main("Server", args);
-
-        System.gc();
-        System.exit(status);
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp"));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.Identity id = Ice.Util.stringToIdentity("factory");
+            adapter.add(new ServerFactoryI(), id);
+            adapter.activate();
+            serverReady();
+            communicator.waitForShutdown();
+        }
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceSSL/configuration/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.IceUtil.inputUtil;
 
-public class Client
+public class Client extends test.TestHelper
 {
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void
-    main(String[] argvs)
+    public void run(String[] argvs)
     {
         System.out.print("testing string to command line arguments... ");
         System.out.flush();
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 [["java:package:test.Slice.escape"]]
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/escape/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/escape/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/escape/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/escape/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Slice.escape;
 import test.Slice.escape._abstract.AMD_catch_checkedCast;
@@ -30,7 +25,7 @@
 import test.Slice.escape._abstract.forHolder;
 import test.Slice.escape._abstract.gotoHolder;
 
-public class Client
+public class Client extends test.TestHelper
 {
     static public class catchI extends _catchDisp
     {
@@ -149,65 +144,37 @@
         assert _switch.value == 0;
     }
 
-    private static int
-    run(String[] args, Ice.Communicator communicator)
-    {
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new defaultI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        System.out.print("Testing operation name... ");
-        System.out.flush();
-        defaultPrx p = defaultPrxHelper.uncheckedCast(
-            adapter.createProxy(Ice.Util.stringToIdentity("test")));
-        p._do();
-        System.out.println("ok");
-
-        return 0;
-    }
-
-    public static void
-    main(String[] args)
+    public void
+    run(String[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            //
-            // In this test, we need at least two threads in the
-            // client side thread pool for nested AMI.
-            //
-            Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(argsH);
-            initData.properties.setProperty("Ice.Package._abstract", "test.Slice.escape");
-            initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-            initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-            initData.properties.setProperty("TestAdapter.Endpoints", "default");
-
-            //
-            // We must set MessageSizeMax to an explicit values,
-            // because we run tests to check whether
-            // Ice.MemoryLimitException is raised as expected.
-            //
-            initData.properties.setProperty("Ice.MessageSizeMax", "100");
-
-            communicator = Ice.Util.initialize(argsH, initData);
-            status = run(argsH.value, communicator);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
+        //
+        // In this test, we need at least two threads in the
+        // client side thread pool for nested AMI.
+        //
+        Ice.Properties properties = createTestProperties(args);
+        properties.setProperty("Ice.Package._abstract", "test.Slice.escape");
+        properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+        properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+        properties.setProperty("TestAdapter.Endpoints", "default");
+
+        //
+        // We must set MessageSizeMax to an explicit values,
+        // because we run tests to check whether
+        // Ice.MemoryLimitException is raised as expected.
+        //
+        properties.setProperty("Ice.MessageSizeMax", "100");
+
+        try(Ice.Communicator communicator = initialize(properties))
+        {
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new defaultI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+
+            System.out.print("Testing operation name... ");
+            System.out.flush();
+            defaultPrx p = defaultPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("test")));
+            p._do();
+            System.out.println("ok");
         }
-
-        if(communicator != null)
-        {
-            communicator.destroy();
-        }
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/escape/Key.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/generation/File1.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/generation/File1.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/generation/File1.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/generation/File1.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/generation/File2.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/generation/File2.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/generation/File2.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/generation/File2.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/macros/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/macros/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/macros/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/macros/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Slice.macros;
 
@@ -13,42 +8,23 @@
 import test.Slice.macros.Test.NoDefault;
 import test.Slice.macros.Test.JavaOnly;
 
-public class Client
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void
-    main(String[] args)
+    public void
+    run(String[] args)
     {
-        int status = 0;
-        try
-        {
-            System.out.print("testing Slice predefined macros... ");
-            Default d = new Default();
-            test(d.x == 10);
-            test(d.y == 10);
-
-            NoDefault nd = new NoDefault();
-            test(nd.x != 10);
-            test(nd.y != 10);
-
-            JavaOnly c = new JavaOnly();
-            test(c.lang.equals("java"));
-            test(c.version == Ice.Util.intVersion());
-            System.out.println("ok");
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
-        System.gc();
-        System.exit(status);
+        System.out.print("testing Slice predefined macros... ");
+        Default d = new Default();
+        test(d.x == 10);
+        test(d.y == 10);
+
+        NoDefault nd = new NoDefault();
+        test(nd.x != 10);
+        test(nd.y != 10);
+
+        JavaOnly c = new JavaOnly();
+        test(c.lang.equals("java"));
+        test(c.version == Ice.Util.intVersion());
+        System.out.println("ok");
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/macros/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/structure/Client.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/structure/Client.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/structure/Client.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/structure/Client.java	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 package test.Slice.structure;
 
@@ -16,16 +11,8 @@
 import java.util.Map;
 import java.util.HashMap;
 
-public class Client
+public class Client extends test.TestHelper
 {
-    private static void test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
     private static void allTests(Ice.Communicator communicator)
     {
         System.out.print("testing equals() for Slice structures... ");
@@ -272,36 +259,11 @@
         System.out.println("ok");
     }
 
-    private static int run(String[] args, Ice.Communicator communicator)
+    public void run(String[] args)
     {
-        allTests(communicator);
-
-        return 0;
-    }
-
-    public static void main(String[] args)
-    {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-            communicator = Ice.Util.initialize(argsH);
-            status = run(argsH.value, communicator);
-        }
-        catch(Exception ex)
+        try(Ice.Communicator communicator = initialize(args))
         {
-            ex.printStackTrace();
-            status = 1;
+            allTests(communicator);
         }
-
-        if(communicator != null)
-        {
-            communicator.destroy();
-        }
-
-        System.gc();
-        System.exit(status);
     }
 }
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/structure/Test.ice zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/structure/Test.ice
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Slice/structure/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Slice/structure/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/TestDriver.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/TestDriver.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/TestDriver.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/TestDriver.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,31 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test;
+
+public class TestDriver
+{
+    public static void main(String[] args)
+    {
+        int status = 0;
+        try
+        {
+            String testClass = System.getProperty("test.class");
+            Class<?> c = Class.forName(testClass);
+            test.TestHelper helper = (test.TestHelper)c.getDeclaredConstructor().newInstance();
+            helper.run(args);
+            helper.getWriter().flush();
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+            status = 1;
+        }
+        finally
+        {
+            System.gc();
+        }
+        System.exit(status);
+    }
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/TestHelper.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/TestHelper.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/TestHelper.java	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/TestHelper.java	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,224 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+package test;
+
+import Ice.*;
+
+public abstract class TestHelper
+{
+    public static void test(boolean b)
+    {
+        if(!b)
+        {
+            throw new RuntimeException();
+        }
+    }
+
+    public abstract void run(String args[]);
+
+    public interface ControllerHelper
+    {
+        void communicatorInitialized(Communicator c);
+        void serverReady();
+    }
+
+    public String getTestEndpoint()
+    {
+        return getTestEndpoint(_communicator.getProperties(), 0, "");
+    }
+
+    static public String getTestEndpoint(Ice.Properties properties)
+    {
+        return getTestEndpoint(properties, 0, "");
+    }
+
+    public String getTestEndpoint(int num)
+    {
+        return getTestEndpoint(_communicator.getProperties(), num, "");
+    }
+
+    static public String getTestEndpoint(Ice.Properties properties, int num)
+    {
+        return getTestEndpoint(properties, num, "");
+    }
+
+    public String getTestEndpoint(int num, String protocol)
+    {
+        return getTestEndpoint(_communicator.getProperties(), num, protocol);
+    }
+
+    static public String getTestEndpoint(Ice.Properties properties, int num, String prot)
+    {
+        String protocol = prot;
+        if(protocol.isEmpty())
+        {
+            protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default");
+        }
+
+        int basePort = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010);
+
+        if(protocol.indexOf("bt") == 0)
+        {
+            //
+            // For Bluetooth, there's no need to specify a port (channel) number.
+            // The client locates the server using its address and a UUID.
+            //
+            switch(num)
+            {
+                case 0:
+                {
+                    return "default -u 5e08f4de-5015-4507-abe1-a7807002db3d";
+                }
+                case 1:
+                {
+                    return "default -u dae56460-2485-46fd-a3ca-8b730e1e868b";
+                }
+                case 2:
+                {
+                    return "default -u 99e08bc6-fcda-4758-afd0-a8c00655c999";
+                }
+                default:
+                {
+                    assert(false);
+                }
+            }
+        }
+        return protocol + " -p " + Integer.toString(basePort + num);
+    }
+
+    public String getTestHost()
+    {
+        return getTestHost(_communicator.getProperties());
+    }
+
+    static public String getTestHost(Ice.Properties properties)
+    {
+        return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+    }
+
+    public String getTestProtocol()
+    {
+        return getTestProtocol(_communicator.getProperties());
+    }
+
+    static public String getTestProtocol(Ice.Properties properties)
+    {
+        return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+    }
+
+    public int getTestPort(int num)
+    {
+        return getTestPort(_communicator.getProperties(), num);
+    }
+
+    static public int getTestPort(Ice.Properties properties, int num)
+    {
+        return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
+    }
+
+    public Properties createTestProperties(String[] args)
+    {
+        StringSeqHolder argsH = new StringSeqHolder(args);
+        return createTestProperties(argsH);
+    }
+
+    public Properties createTestProperties(StringSeqHolder args)
+    {
+        Properties properties = Ice.Util.createProperties(args);
+        args.value = properties.parseCommandLineOptions("Test", args.value);
+        return properties;
+    }
+
+    public Communicator initialize(String[] args)
+    {
+        InitializationData initData = new InitializationData();
+        initData.properties = createTestProperties(args);
+        return initialize(initData);
+    }
+
+    public Communicator initialize(Properties properties)
+    {
+        InitializationData initData = new InitializationData();
+        initData.properties = properties;
+        return initialize(initData);
+    }
+
+    public Communicator initialize(InitializationData initData)
+    {
+        if(_classLoader != null && initData.classLoader == null)
+        {
+            initData.classLoader = _classLoader;
+        }
+
+        Communicator communicator = Ice.Util.initialize(initData);
+        if(_communicator == null)
+        {
+            _communicator = communicator;
+        }
+
+        if(_controllerHelper != null)
+        {
+            _controllerHelper.communicatorInitialized(communicator);
+        }
+
+        return  communicator;
+    }
+
+    synchronized public void setControllerHelper(ControllerHelper controllerHelper)
+    {
+        _controllerHelper = controllerHelper;
+    }
+
+    public void serverReady()
+    {
+        if(_controllerHelper != null)
+        {
+            _controllerHelper.serverReady();
+        }
+    }
+
+    static public boolean isAndroid()
+    {
+        return IceInternal.Util.isAndroid();
+    }
+
+    public void setWriter(java.io.Writer writer)
+    {
+        _printWriter = new java.io.PrintWriter(writer);
+    }
+
+    public java.io.PrintWriter getWriter()
+    {
+        return _printWriter;
+    }
+
+    public void setClassLoader(ClassLoader classLoader)
+    {
+        _classLoader = classLoader;
+    }
+
+    public ClassLoader getClassLoader()
+    {
+        return _classLoader;
+    }
+
+    public Communicator communicator()
+    {
+        return _communicator;
+    }
+
+    public  void  shutdown()
+    {
+        if(_communicator != null)
+        {
+            _communicator.shutdown();
+        }
+    }
+
+    private ControllerHelper _controllerHelper;
+    private ClassLoader _classLoader;
+    private Communicator _communicator;
+    private java.io.PrintWriter _printWriter = new java.io.PrintWriter(new java.io.OutputStreamWriter(System.out));
+}
diff -Nru zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Util/Application.java zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Util/Application.java
--- zeroc-ice-3.7.1/java-compat/test/src/main/java/test/Util/Application.java	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/java-compat/test/src/main/java/test/Util/Application.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,343 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Util;
-
-import Ice.*;
-
-public abstract class Application
-{
-    public final int WAIT = 2;
-
-    public interface ServerReadyListener
-    {
-        void serverReady();
-    }
-
-    public interface CommunicatorListener
-    {
-        void communicatorInitialized(Communicator c);
-    }
-
-    public
-    Application()
-    {
-    }
-
-    //
-    // This main() must be called by the global main(). main()
-    // initializes the Communicator, calls run(), and destroys
-    // the Communicator upon return from run(). It thereby handles
-    // all exceptions properly, i.e., error messages are printed
-    // if exceptions propagate to main(), and the Communicator is
-    // always destroyed, regardless of exceptions.
-    //
-    public final int
-    main(String appName, String[] args)
-    {
-        Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-        Ice.InitializationData initData = getInitData(argsH);
-        initData.classLoader = _classLoader;
-        return main(appName, argsH.value, initData);
-    }
-
-    public final int
-    main(String appName, String[] args, InitializationData initializationData)
-    {
-        java.io.PrintWriter writer = getWriter();
-        if(_communicator != null)
-        {
-            writer.println(appName + ": only one instance of the Application class can be used");
-            return 1;
-        }
-
-        _testName = appName;
-
-        //
-        // We parse the properties here to extract Ice.ProgramName.
-        //
-        StringSeqHolder argHolder = new StringSeqHolder(args);
-        if(initializationData == null)
-        {
-            initializationData = getInitData(argHolder);
-        }
-
-        InitializationData initData;
-        if(initializationData != null)
-        {
-            initData = initializationData.clone();
-        }
-        else
-        {
-            initData = new InitializationData();
-        }
-        initData.properties = Util.createProperties(argHolder, initData.properties);
-
-        //
-        // If the process logger is the default logger, we replace it with a
-        // a logger that uses the program name as the prefix.
-        //
-        if(Util.getProcessLogger() instanceof LoggerI)
-        {
-            Util.setProcessLogger(new LoggerI(initData.properties.getProperty("Ice.ProgramName"), ""));
-        }
-
-        int status = 0;
-
-        try(Ice.Communicator communicator = Util.initialize(argHolder, initData))
-        {
-            _communicator = communicator;
-            if(_communicatorListener != null)
-            {
-                _communicatorListener.communicatorInitialized(_communicator);
-            }
-            status = run(argHolder.value);
-            if(status == WAIT)
-            {
-                if(_cb != null)
-                {
-                    _cb.serverReady();
-                }
-                _communicator.waitForShutdown();
-                status = 0;
-            }
-        }
-        catch(LocalException ex)
-        {
-            writer.println(_testName + ": " + ex);
-            ex.printStackTrace();
-            status = 1;
-        }
-        catch(java.lang.Exception ex)
-        {
-            writer.println(_testName + ": unknown exception");
-            ex.printStackTrace(writer);
-            status = 1;
-        }
-        catch(java.lang.Error err)
-        {
-            //
-            // We catch Error to avoid hangs in some non-fatal situations
-            //
-            writer.println(_testName + ": Java error");
-            err.printStackTrace(writer);
-            status = 1;
-        }
-        finally
-        {
-            _communicator = null;
-        }
-        writer.flush();
-        return status;
-    }
-
-    public void stop()
-    {
-        if(_communicator != null)
-        {
-            _communicator.shutdown();
-        }
-    }
-
-    //
-    // Initialize a new communicator.
-    //
-    public Ice.Communicator initialize(InitializationData initData)
-    {
-        Ice.Communicator communicator = Util.initialize(initData);
-        if(_communicatorListener != null)
-        {
-            _communicatorListener.communicatorInitialized(communicator);
-        }
-        return communicator;
-    }
-
-    public Ice.Communicator initialize()
-    {
-        Ice.Communicator communicator = Util.initialize();
-        if(_communicatorListener != null)
-        {
-            _communicatorListener.communicatorInitialized(communicator);
-        }
-        return communicator;
-    }
-
-    public abstract int run(String[] args);
-
-    //
-    // Hook to override the initialization data. This hook is
-    // necessary because some properties must be set prior to
-    // communicator initialization.
-    //
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = createInitializationData();
-        initData.properties = Ice.Util.createProperties(argsH);
-        argsH.value = initData.properties.parseCommandLineOptions("Test", argsH.value);
-        return initData;
-    }
-
-    public java.io.PrintWriter getWriter()
-    {
-        return _printWriter;
-    }
-
-    public void setWriter(java.io.Writer writer)
-    {
-        _printWriter = new java.io.PrintWriter(writer);
-    }
-
-    public void setLogger(Ice.Logger logger)
-    {
-        _logger = logger;
-    }
-
-    public void setServerReadyListener(ServerReadyListener cb)
-    {
-        _cb = cb;
-    }
-
-    public void setCommunicatorListener(CommunicatorListener listener)
-    {
-        _communicatorListener = listener;
-    }
-
-    public void serverReady()
-    {
-        if(_cb != null)
-        {
-            _cb.serverReady();
-        }
-    }
-
-    static public boolean isAndroid()
-    {
-        return IceInternal.Util.isAndroid();
-    }
-    //
-    // Return the application name, i.e., argv[0].
-    //
-    public String appName()
-    {
-        return _testName;
-    }
-
-    public Communicator communicator()
-    {
-        return _communicator;
-    }
-
-    public void setClassLoader(ClassLoader c)
-    {
-        _classLoader = c;
-    }
-
-    public ClassLoader getClassLoader()
-    {
-        return _classLoader;
-    }
-
-    public InitializationData createInitializationData()
-    {
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.classLoader = _classLoader;
-        initData.logger = _logger;
-        return initData;
-    }
-
-    public ClassLoader classLoader()
-    {
-        return _classLoader;
-    }
-
-    public String getTestEndpoint(int num)
-    {
-        return getTestEndpoint(num, "");
-    }
-
-    public String getTestEndpoint(Ice.Properties properties, int num)
-    {
-        return getTestEndpoint(properties, num, "");
-    }
-
-    public String getTestEndpoint(int num, String prot)
-    {
-        return getTestEndpoint(_communicator.getProperties(), num, prot);
-    }
-
-    static public String getTestEndpoint(Ice.Properties properties, int num, String prot)
-    {
-        String protocol = prot;
-        if(protocol.isEmpty())
-        {
-            protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default");
-        }
-
-        int basePort = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010);
-
-        if(protocol.indexOf("bt") == 0)
-        {
-            //
-            // For Bluetooth, there's no need to specify a port (channel) number.
-            // The client locates the server using its address and a UUID.
-            //
-            switch(num)
-            {
-            case 0:
-                return "default -u 5e08f4de-5015-4507-abe1-a7807002db3d";
-            case 1:
-                return "default -u dae56460-2485-46fd-a3ca-8b730e1e868b";
-            case 2:
-                return "default -u 99e08bc6-fcda-4758-afd0-a8c00655c999";
-            default:
-                assert(false);
-            }
-        }
-
-        return protocol + " -p " + Integer.toString(basePort + num);
-    }
-
-    public String getTestHost()
-    {
-        return getTestHost(_communicator.getProperties());
-    }
-
-    static public String getTestHost(Ice.Properties properties)
-    {
-        return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
-    }
-
-    public String getTestProtocol()
-    {
-        return getTestProtocol(_communicator.getProperties());
-    }
-
-    static public String getTestProtocol(Ice.Properties properties)
-    {
-        return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-    }
-
-    public int getTestPort(int num)
-    {
-        return getTestPort(_communicator.getProperties(), num);
-    }
-
-    static public int getTestPort(Ice.Properties properties, int num)
-    {
-        return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
-    }
-
-    private ClassLoader _classLoader;
-    private String _testName;
-    private Communicator _communicator;
-    private Ice.Logger _logger = null;
-    private java.io.PrintWriter _printWriter = new java.io.PrintWriter(new java.io.OutputStreamWriter(System.out));
-    private ServerReadyListener _cb = null;
-    private CommunicatorListener _communicatorListener = null;
-}
diff -Nru zeroc-ice-3.7.1/js/allTests.py zeroc-ice-3.7.2/js/allTests.py
--- zeroc-ice-3.7.1/js/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/js/assets/common.css zeroc-ice-3.7.2/js/assets/common.css
--- zeroc-ice-3.7.1/js/assets/common.css	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/assets/common.css	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-/* **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// *********************************************************************/
 .noUiSlider{ margin-top:7px; }
 
 #wss, #loop, #worker{ margin-top:10px;}
diff -Nru zeroc-ice-3.7.1/js/assets/common.js zeroc-ice-3.7.2/js/assets/common.js
--- zeroc-ice-3.7.1/js/assets/common.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/assets/common.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(){
 
diff -Nru zeroc-ice-3.7.1/js/.babelrc zeroc-ice-3.7.2/js/.babelrc
--- zeroc-ice-3.7.1/js/.babelrc	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/.babelrc	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,18 @@
 {
-"presets":
-    [
-        "babel-preset-es2015-script"
+    "presets": [
+        "@babel/preset-env"
     ],
-"plugins":
-    [
-        [
-            "babel-plugin-transform-builtin-extend",
-                {
-                    "globals": ["Error", "Promise"]
-                }
-        ],
+    "plugins": [
         [
             "rewrite-require",
-                {
-                    "aliases": { "ice": "ice/src/es5"}
+            {
+                "aliases": {
+                    "ice": "ice/src/es5"
                 }
+            }
         ],
         [
-                "transform-async-to-generator"
+            "@babel/plugin-transform-async-to-generator"
         ]
     ]
 }
diff -Nru zeroc-ice-3.7.1/js/bin/HttpServer.js zeroc-ice-3.7.2/js/bin/HttpServer.js
--- zeroc-ice-3.7.1/js/bin/HttpServer.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/bin/HttpServer.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 var crypto    = require("crypto");
 var fs        = require("fs");
@@ -40,12 +35,6 @@
         ]
     };
 
-    var languages = [{value: "cpp", name: "C++"}, {value: "java", name: "Java"}]
-    if(process.platform == "win32")
-    {
-        languages.push({value: "csharp", name: "C#"});
-    }
-
     var libraries = ["/lib/Ice.js", "/lib/Ice.min.js",
                      "/lib/Glacier2.js", "/lib/Glacier2.min.js",
                      "/lib/IceStorm.js", "/lib/IceStorm.min.js",
@@ -55,11 +44,11 @@
                      "/lib/es5/IceStorm.js", "/lib/es5/IceStorm.min.js",
                      "/lib/es5/IceGrid.js", "/lib/es5/IceGrid.min.js"];
 
-    TestData.TestSuites = fs.readFileSync(path.join(__dirname, "..", "test", "Common", "TestSuites.json"), "utf8");
+    var commonPath = path.join(__dirname, "..", "test", "Common");
+    TestData.TestSuites = fs.readFileSync(path.join(commonPath, "TestSuites.json"), "utf8");
     var TestSuites = JSON.parse(TestData.TestSuites);
     TestData.tests = Object.keys(TestSuites);
-    var template = hogan.compile(fs.readFileSync(path.join(__dirname, "..", "test", "Common", "index.html"), "utf8"));
-    var controller = hogan.compile(fs.readFileSync(path.join(__dirname, "..", "test", "Common", "controller.html"), "utf8"));
+    var controller = hogan.compile(fs.readFileSync(path.join(commonPath, "controller.html"), "utf8"));
     var libraryMaps = libraries.map(
         function(f)
         {
@@ -73,132 +62,22 @@
 
     HttpServer.prototype.processRequest = function(req, res)
     {
-        var match = req.url.pathname.match("^\/test/(.*)/index\.html");
         var matchController = req.url.pathname.match("^\/test/(.*)/controller\.html");
-        if(match)
-        {
-            var es5 = match[1].indexOf("es5/") !== -1;
-            var m = es5 ? match[1].replace("es5/", "") : match[1];
-
-            // That is a test case
-            var testSuite = TestSuites[m];
-            if(testSuite === undefined)
-            {
-                res.writeHead(404);
-                res.end("404 Page Not Found");
-                console.log("HTTP/404 (Page Not Found)" + req.method + " " + req.url.pathname);
-            }
-            else
-            {
-                TestData.current = m;
-                if(req.url.query.next == "true")
-                {
-                    var testSuite = TestData.tests[0];
-                    var language = req.url.query.language !== undefined ? req.url.query.language : "cpp";
-                    var protocol = req.url.protocol;
-                    var i = TestData.tests.indexOf(TestData.current);
-                    var worker = req.url.query.worker == "true";
-
-                    if(i < TestData.tests.length - 1)
-                    {
-                        testSuite = TestData.tests[i + 1];
-                    }
-                    else if(!worker)
-                    {
-                        worker = true;
-                    }
-                    else if(protocol == "http")
-                    {
-                        protocol = "https";
-                    }
-                    else
-                    {
-                        var lgs = languages.map(function(o) { return o.value; });
-                        var j = lgs.indexOf(language);
-                        language = lgs[j == lgs.length - 1 ? 0 : j + 1];
-                        worker = false;
-                        protocol = "http";
-                    }
-
-                    if(es5)
-                    {
-                        testSuite = "es5/" + testSuite;
-                    }
-
-                    var location = url.format(
-                        {
-                            protocol: protocol,
-                            hostname: req.headers.host.split(":")[0],
-                            port: (protocol == "http" ? 8080 : 9090),
-                            pathname: ("/test/" + testSuite + "/index.html"),
-                            query:{loop: "true", language: language, worker: worker}
-                        });
-
-                    res.writeHead(302, {"Location": location});
-                    res.end();
-                    console.log("HTTP/302 (Redirect) -> " + location);
-                }
-                else
-                {
-                    if(req.url.query.worker != "true")
-                    {
-                        TestData.scripts = [];
-
-                        if(es5)
-                        {
-                            TestData.scripts =
-                            [
-                                "/node_modules/babel-polyfill/dist/polyfill.js",
-                                "/lib/es5/Ice.js",
-                                "/test/es5/Common/TestRunner.js",
-                                "/test/es5/Common/TestSuite.js",
-                                "/test/es5/Common/Controller.js"
-                            ].concat(testSuite.files);
-
-                            TestData.scripts = TestData.scripts.map(function(f)
-                                {
-                                    return f.replace("/lib/Glacier2.js", "/lib/es5/Glacier2.js");
-                                });
-                        }
-                        else
-                        {
-                            TestData.scripts =
-                                [
-                                    "/lib/Ice.js",
-                                    "/test/Common/TestRunner.js",
-                                    "/test/Common/TestSuite.js",
-                                    "/test/Common/Controller.js"
-                                ].concat(testSuite.files);
-                        }
-                    }
-                    else
-                    {
-                        TestData.scripts = es5 ? ["/test/es5/Common/TestSuite.js"] : ["/test/Common/TestSuite.js"];
-                    }
-                    TestData.languages = languages.slice();
-                    if(testSuite.files.indexOf("Server.js") >= 0)
-                    {
-                        TestData.languages.push({value: "js", name: "JavaScript"});
-                    }
-                    res.writeHead(200, {"Content-Type": "text/html"});
-                    res.end(template.render(TestData));
-                    console.log("HTTP/200 (Ok)" + req.method + " " + req.url.pathname);
-                }
-            }
-        }
-        else if(matchController)
+        if(matchController)
         {
             var es5 = matchController[1].indexOf("es5/") !== -1;
             var m = es5 ? matchController[1].replace("es5/", "") : matchController[1];
             var testpath = path.resolve(path.join(this._basePath, "test", matchController[1]))
             var worker = req.url.query.worker == "True";
             var scripts = es5 ? [
-                "/node_modules/babel-polyfill/dist/polyfill.js",
+                "/node_modules/@babel/polyfill/dist/polyfill.js",
                 "/lib/es5/Ice.js",
+                "/test/es5/Common/TestHelper.js",
                 "/test/es5/Common/Controller.js",
                 "/test/es5/Common/ControllerI.js",
             ] : [
                 "/lib/Ice.js",
+                "/test/Common/TestHelper.js",
                 "/test/Common/Controller.js",
                 "/test/Common/ControllerI.js",
             ];
@@ -223,13 +102,16 @@
             }
             else
             {
-                TestData.scripts = scripts.concat(fs.readdirSync(testpath).filter(function(f) { return path.extname(f) === ".js"; }))
+                TestData.scripts = scripts.concat(fs.readdirSync(testpath).filter(function(f)
+                                                                                  {
+                                                                                      return path.extname(f) === ".js";
+                                                                                  }));
             }
 
             if(worker)
             {
                 // Do not include babel polyfill when using workers, it is bundle with the controllerwoker
-                TestData.workerScripts = TestData.scripts.filter(script => script.indexOf("/babel-polyfill/") === -1);
+                TestData.workerScripts = TestData.scripts.filter(script => script.indexOf("/@babel/polyfill/") === -1);
             }
 
             res.writeHead(200, {"Content-Type": "text/html"});
@@ -258,7 +140,8 @@
             var iceLibMap = libraryMaps.indexOf(req.url.pathname) !== -1;
 
             var basePath;
-            function checkIceBinDist(dist) {
+            function checkIceBinDist(dist)
+            {
                 return dist == "js" || dist == "all"
             }
             var useBinDist = (process.env.ICE_BIN_DIST || "").split(" ").find(checkIceBinDist) !== undefined;
diff -Nru zeroc-ice-3.7.1/js/.eslintignore zeroc-ice-3.7.2/js/.eslintignore
--- zeroc-ice-3.7.1/js/.eslintignore	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/.eslintignore	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,7 @@
+es5
+lib
+assets
+gulp/bundle.js
+bin/HttpServer.js
+test/Ice/import/bundle.js
+test/typescript/**/*.js
diff -Nru zeroc-ice-3.7.1/js/.eslintrc.js zeroc-ice-3.7.2/js/.eslintrc.js
--- zeroc-ice-3.7.1/js/.eslintrc.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/.eslintrc.js	2019-02-05 18:03:04.000000000 +0000
@@ -2,7 +2,8 @@
     "env": {
         "browser": true,
         "es6": true,
-        "node": true
+        "node": true,
+        "worker": true
     },
     "extends": "eslint:recommended",
     "parserOptions": {
@@ -10,7 +11,7 @@
     },
     "rules": {
         "accessor-pairs": "error",
-        "array-bracket-newline": "error",
+        "array-bracket-newline": "off",
         "array-bracket-spacing": [
             "error",
             "never"
@@ -31,10 +32,7 @@
         ],
         "block-scoped-var": "error",
         "block-spacing": "error",
-        "brace-style": [
-            "error",
-            "allman"
-        ],
+        "brace-style": "off",
         "callback-return": "off",
         "camelcase": "off",
         "capitalized-comments": "off",
@@ -57,7 +55,7 @@
         "consistent-this": "error",
         "curly": "error",
         "default-case": "error",
-        "dot-location": "error",
+        "dot-location": ["error", "property"],
         "dot-notation": [
             "error",
             {
@@ -75,7 +73,7 @@
         "generator-star-spacing": "error",
         "getter-return": "error",
         "global-require": "error",
-        "guard-for-in": "error",
+        "guard-for-in": "off",
         "handle-callback-err": "error",
         "id-blacklist": "error",
         "id-length": "off",
@@ -87,10 +85,7 @@
         "jsx-quotes": "error",
         "key-spacing": "error",
         "line-comment-position": "off",
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
+        "linebreak-style": "off",
         "lines-around-comment": "error",
         "lines-around-directive": "error",
         "lines-between-class-members": [
@@ -104,11 +99,8 @@
         "max-params": "off",
         "max-statements": "off",
         "max-statements-per-line": "error",
-        "multiline-comment-style": [
-            "error",
-            "separate-lines"
-        ],
-        "new-cap": "error",
+        "multiline-comment-style": "off",
+        "new-cap": "off",
         "new-parens": "error",
         "newline-after-var": "off",
         "newline-before-return": "off",
@@ -119,7 +111,7 @@
         "no-bitwise": "off",
         "no-buffer-constructor": "error",
         "no-caller": "error",
-        "no-catch-shadow": "error",
+        "no-catch-shadow": "off",
         "no-confusing-arrow": "error",
         "no-console": "off",
         "no-continue": "off",
@@ -157,7 +149,7 @@
         "no-lonely-if": "error",
         "no-loop-func": "error",
         "no-magic-numbers": "off",
-        "no-mixed-operators": "error",
+        "no-mixed-operators": "off",
         "no-mixed-requires": "error",
         "no-multi-assign": "error",
         "no-multi-spaces": "error",
@@ -173,13 +165,13 @@
         "no-new-require": "error",
         "no-new-wrappers": "error",
         "no-octal-escape": "error",
-        "no-param-reassign": "error",
+        "no-param-reassign": "off",
         "no-path-concat": "error",
         "no-plusplus": "off",
         "no-process-env": "error",
         "no-process-exit": "error",
         "no-proto": "error",
-        "no-prototype-builtins": "error",
+        "no-prototype-builtins": "off",
         "no-restricted-globals": "error",
         "no-restricted-imports": "error",
         "no-restricted-modules": "error",
@@ -190,7 +182,7 @@
         "no-script-url": "error",
         "no-self-compare": "error",
         "no-sequences": "error",
-        "no-shadow": "error",
+        "no-shadow": "off",
         "no-shadow-restricted-names": "error",
         "no-spaced-func": "error",
         "no-sync": "error",
@@ -205,9 +197,12 @@
         "no-unmodified-loop-condition": "error",
         "no-unneeded-ternary": "error",
         "no-unused-expressions": "error",
-        "no-use-before-define": [
+        "no-use-before-define": "off",
+        "no-unused-vars":[
             "error",
-            "nofunc"
+            {
+                "args" : "none"
+            }
         ],
         "no-useless-call": "error",
         "no-useless-computed-key": "error",
@@ -215,16 +210,17 @@
         "no-useless-constructor": "error",
         "no-useless-rename": "error",
         "no-useless-return": "error",
+        "no-useless-escape": "error",
         "no-var": "error",
         "no-void": "error",
         "no-warning-comments": "off",
         "no-whitespace-before-property": "error",
         "no-with": "error",
         "nonblock-statement-body-position": "error",
-        "object-curly-newline": "error",
+        "object-curly-newline": "off",
         "object-curly-spacing": "error",
         "object-property-newline": "off",
-        "object-shorthand": "error",
+        "object-shorthand": ["error", "consistent"],
         "one-var": "off",
         "one-var-declaration-per-line": "error",
         "operator-assignment": "error",
@@ -239,7 +235,7 @@
         "prefer-destructuring": "off",
         "prefer-numeric-literals": "error",
         "prefer-promise-reject-errors": "error",
-        "prefer-reflect": "error",
+        "prefer-reflect": "off",
         "prefer-rest-params": "error",
         "prefer-spread": "error",
         "prefer-template": "off",
@@ -251,7 +247,7 @@
             "off",
             "double"
         ],
-        "radix": "error",
+        "radix": "off",
         "require-await": "error",
         "require-jsdoc": "off",
         "rest-spread-spacing": "error",
diff -Nru zeroc-ice-3.7.1/js/.gitignore zeroc-ice-3.7.2/js/.gitignore
--- zeroc-ice-3.7.1/js/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -6,6 +6,8 @@
 ICE_LICENSE
 LICENSE
 
+src/index.d.ts
+
 #
 # Babel generated files
 #
@@ -16,3 +18,10 @@
 src/es5/IceSSL
 src/es5/IceStorm
 test/es5
+
+#
+# Typescript test generated files
+#
+test/typescript/**/*.js
+test/typescript/**/*.d.ts
+test/typescript/**/*.js.map
diff -Nru zeroc-ice-3.7.1/js/gulp/bundle.js zeroc-ice-3.7.2/js/gulp/bundle.js
--- zeroc-ice-3.7.1/js/gulp/bundle.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/gulp/bundle.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-var gutil       = require("gulp-util");
-var PluginError = gutil.PluginError;
+var PluginError = require("plugin-error");
 var PLUGIN_NAME = "gulp-slice2js-bundle";
 var through     = require("through2");
 var fs          = require("fs");
 var path        = require("path");
 var sourcemap   = require('source-map');
+var Vinyl = require("vinyl");
 
 function rmfile(path)
 {
@@ -221,12 +216,16 @@
 
 var StringBuffer = function()
 {
-    this.buffer = new Buffer(0);
+    // Use new Buffer.alloc(string, encoding) if available, Buffer constructor are deprecated.
+    this.buffer = typeof(Buffer.alloc) === 'function' ? Buffer.alloc(0) : new Buffer(0);
 };
 
 StringBuffer.prototype.write = function(data)
 {
-    this.buffer = Buffer.concat([this.buffer, new Buffer(data, "utf8")]);
+    // Use new Buffer.from(string, encoding) if Buffer.alloc is avilable, Buffer constructors are deprecated.
+    // NOTE: we don't check for Buffer.from which already exists but only accepts array.
+    this.buffer = Buffer.concat([this.buffer,
+                    typeof(Buffer.alloc) === 'function' ? Buffer.from(data, "utf8") : new Buffer(data, "utf8")]);
 };
 
 function sourceMapRelativePath(file)
@@ -322,12 +321,14 @@
 
                 sb.write(preamble);
                 sb.write("    var root = typeof(window) !== \"undefined\" ? window : typeof(global) !== \"undefined\" ? global : typeof(self) !== \"undefined\" ? self : {};\n");
-                lineOffset += 3;
+                sb.write("    var ice = root.ice || {};\n");
+                lineOffset += 4;
                 args.modules.forEach(
                     function(m){
                         sb.write("    root." + m + " = root." + m + " || {};\n");
                         lineOffset++;
-
+                        sb.write("    ice." + m + " = root." + m + ";\n");
+                        lineOffset++;
                         if(m == "Ice")
                         {
                             sb.write("    Ice.Slice = Ice.Slice || {};\n");
@@ -462,14 +463,16 @@
                         lineOffset++;
                     });
 
-                sb.write(epilogue);
+                sb.write("    root.ice = ice;\n");
                 lineOffset++;
 
-                var target = new gutil.File(
+                sb.write(epilogue);
+                lineOffset++;
+                var target = new Vinyl(
                     {
                         cwd: "",
-                        base:"",
-                        path:path.basename(args.target),
+                        base: path.dirname(args.target),
+                        path: args.target,
                         contents:sb.buffer
                     });
                 target.sourceMap = JSON.parse(sourceMap.toString());
diff -Nru zeroc-ice-3.7.1/js/gulpfile.js zeroc-ice-3.7.2/js/gulpfile.js
--- zeroc-ice-3.7.1/js/gulpfile.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/gulpfile.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-var babel       = require("gulp-babel"),
-    bundle      = require("./gulp/bundle"),
-    concat      = require('gulp-concat'),
-    del         = require("del"),
-    extreplace  = require("gulp-ext-replace"),
-    fs          = require("fs"),
-    gulp        = require("gulp"),
-    gzip        = require('gulp-gzip'),
-    iceBuilder  = require('gulp-ice-builder'),
-    jshint      = require('gulp-jshint'),
-    cleancss    = require('gulp-clean-css'),
-    newer       = require('gulp-newer'),
-    open        = require("gulp-open"),
-    path        = require('path'),
-    paths       = require('vinyl-paths'),
-    pump        = require('pump'),
-    rollup      = require("rollup").rollup,
-    sourcemaps  = require('gulp-sourcemaps'),
-    spawn       = require("child_process").spawn,
-    uglify      = require('gulp-uglifyes');
+/* eslint no-sync: "off" */
+/* eslint no-process-env: "off" */
+/* eslint no-process-exit: "off" */
+
+const babel = require("gulp-babel");
+const bundle = require("./gulp/bundle");
+
+const concat = require('gulp-concat');
+const del = require("del");
+const extreplace = require("gulp-ext-replace");
+const fs = require("fs");
+const gulp = require("gulp");
+const gzip = require('gulp-gzip');
+const iceBuilder = require('gulp-ice-builder');
+const tsbundle = require("gulp-ice-builder").tsbundle;
+const newer = require('gulp-newer');
+const path = require('path');
+const paths = require('vinyl-paths');
+const pump = require('pump');
+const rollup = require('rollup');
+const sourcemaps = require('gulp-sourcemaps');
+const terser = require('gulp-terser');
+const tsc = require('gulp-typescript');
+const rename = require('gulp-rename');
 
-var sliceDir   = path.resolve(__dirname, '..', 'slice');
+const sliceDir = path.resolve(__dirname, '..', 'slice');
 
-var iceBinDist = (process.env.ICE_BIN_DIST || "").split(" ");
-var useBinDist = iceBinDist.find(function(v) { return v == "js" || v == "all"; }) !== undefined;
+const iceBinDist = (process.env.ICE_BIN_DIST || "").split(" ");
+const useBinDist = iceBinDist.find(v => v == "js" || v == "all") !== undefined;
 
 function parseArg(argv, key)
 {
-    for(var i = 0; i < argv.length; ++i)
+    for(let i = 0; i < argv.length; ++i)
     {
-        var e = argv[i];
+        const e = argv[i];
         if(e == key)
         {
             return argv[i + 1];
@@ -49,14 +48,13 @@
     }
 }
 
-var platform = parseArg(process.argv, "--cppPlatform") || process.env.CPP_PLATFORM;
-var configuration = parseArg(process.argv, "--cppConfiguration") || process.env.CPP_CONFIGURATION;
-var host = parseArg(process.argv, "--host") || "127.0.0.1";
+const platform = parseArg(process.argv, "--cppPlatform") || process.env.CPP_PLATFORM;
+const configuration = parseArg(process.argv, "--cppConfiguration") || process.env.CPP_CONFIGURATION;
 
 function slice2js(options)
 {
-    var defaults = {};
-    var opts = options || {};
+    const defaults = {};
+    const opts = options || {};
     if(!useBinDist)
     {
         if(process.platform == "win32")
@@ -74,7 +72,7 @@
             }
             defaults.iceToolsPath = path.resolve("../cpp/bin", platform, configuration);
         }
-        defaults.iceHome = path.resolve("..");
+        defaults.iceHome = path.resolve(__dirname, '..');
     }
     else if(process.env.ICE_HOME)
     {
@@ -82,196 +80,37 @@
     }
     defaults.include = opts.include || [];
     defaults.args = opts.args || [];
-    return iceBuilder.compile(defaults);
+    defaults.jsbundle = opts.jsbundle;
+    defaults.tsbundle = opts.tsbundle;
+    defaults.jsbundleFormat = opts.jsbundleFormat;
+    return iceBuilder(defaults);
 }
 
 //
-// Test tasks
-//
-var tests = [
-    "test/Ice/acm",
-    "test/Ice/adapterDeactivation",
-    "test/Ice/ami",
-    "test/Ice/binding",
-    "test/Ice/defaultValue",
-    "test/Ice/enums",
-    "test/Ice/exceptions",
-    "test/Ice/facets",
-    "test/Ice/hold",
-    "test/Ice/info",
-    "test/Ice/inheritance",
-    "test/Ice/location",
-    "test/Ice/objects",
-    "test/Ice/operations",
-    "test/Ice/optional",
-    "test/Ice/promise",
-    "test/Ice/properties",
-    "test/Ice/proxy",
-    "test/Ice/retry",
-    "test/Ice/servantLocator",
-    "test/Ice/slicing/exceptions",
-    "test/Ice/slicing/objects",
-    "test/Ice/timeout",
-    "test/Ice/number",
-    "test/Glacier2/router",
-    "test/Slice/escape",
-    "test/Slice/macros"
-];
-
-gulp.task("common:slice", [],
-    function(cb){
-        pump([
-            gulp.src(["../scripts/Controller.ice"]),
-            slice2js({dest: "test/Common"}),
-            gulp.dest("test/Common")], cb);
-    });
-
-gulp.task("common:slice-babel", ["common:slice"],
-    function(cb){
-        pump([
-            gulp.src(["test/Common/Controller.js",
-                      "test/Common/ControllerI.js",
-                      "test/Common/ControllerWorker.js",
-                      "test/Common/TestRunner.js",
-                      "test/Common/TestSuite.js",
-                      "test/Common/Worker.js"]),
-            babel({compact: false}),
-            gulp.dest("test/es5/Common")], cb);
-    });
-
-gulp.task("common:slice-es5-worker", ["common:slice-babel"],
-          function(cb){
-              pump([
-                  gulp.src(["node_modules/babel-polyfill/dist/polyfill.js",
-                            "test/es5/Common/Worker.js"]),
-                  concat("Worker.js"),
-                  gulp.dest("test/es5/Common/")
-              ], cb);
-          });
-
-gulp.task("common:slice-es5-controllerworker", ["common:slice-babel"],
-          function(cb){
-              pump([
-                  gulp.src(["node_modules/babel-polyfill/dist/polyfill.js",
-                            "test/es5/Common/ControllerWorker.js"]),
-                  concat("ControllerWorker.js"),
-                  gulp.dest("test/es5/Common/")
-              ], cb);
-          });
-
-gulp.task("common:clean", [],
-    function(){
-        del(["test/Common/Controller.js",
-             "test/Common/.depend",
-             "test/es5/Common/Controller.js",
-             "test/es5/Common/ControllerI.js",
-             "test/es5/Common/ControllerWorker.js",
-             "test/es5/Common/TestRunner.js",
-             "test/es5/Common/TestSuite.js",
-             "test/es5/Common/Worker.js"]);
-    });
-
-gulp.task("import:slice2js", [],
-    function(cb){
-        pump([
-            gulp.src(["test/Ice/import/Demo/Point.ice",
-                      "test/Ice/import/Demo/Circle.ice",
-                      "test/Ice/import/Demo/Square.ice",
-                      "test/Ice/import/Demo/Canvas.ice"]),
-            slice2js({ dest: "test/Ice/import/Demo", include:["test/Ice/import"]}),
-            gulp.dest("test/Ice/import/Demo")], cb);
-    });
-
-gulp.task("import:bundle", ["import:slice2js"],
-    function(){
-        return rollup({
-            entry: "test/Ice/import/main.js",
-            external: "ice"
-        }).then(function(bundle){
-            return bundle.write({
-                format: "cjs",
-                dest: "test/Ice/import/bundle.js"
-            });
-        });
-    });
-
-gulp.task("import:clean", [],
-    function() {
-        del(["test/Ice/import/Demo/Point.js",
-             "test/Ice/import/Demo/Circle.js",
-             "test/Ice/import/Demo/Square.js",
-             "test/Ice/import/Demo/Canvas.js",
-             "test/Ice/import/bundle.js"]);
-    });
-
-function testTask(name) { return name.replace(/\//g, "_"); }
-function testBabelTask(name) { return testTask(name) + "-babel"; }
-function testCleanDependTask(name) { return testTask(name) + "-depend:clean"; }
-function testCleanTask(name) { return testTask(name) + ":clean"; }
-function testBabelCleanTask(name) { return testCleanTask(name) + "-babel"; }
-
-tests.forEach(
-    function(name){
-        gulp.task(testTask(name), (useBinDist ? [] : ["ice-module"]),
-            function(cb){
-                pump([
-                    gulp.src(path.join(name, "*.ice")),
-                    slice2js({ include: [name], dest: name }),
-                    gulp.dest(name)], cb);
-            });
-
-        gulp.task(testBabelTask(name), [testTask(name)],
-            function(cb){
-                pump([
-                    gulp.src([path.join(name, "*.js")]),
-                    babel({compact: false}),
-                    gulp.dest(name.replace("test/", "test/es5/"))], cb);
-            });
-
-        gulp.task(testCleanDependTask(name), [],
-            function(cb){
-                pump([gulp.src(path.join(name, ".depend")), paths(del)], cb);
-            });
-
-        gulp.task(testCleanTask(name), [testCleanDependTask(name)],
-            function(cb){
-                pump([gulp.src(path.join(name, "*.ice")), extreplace(".js"), paths(del)], cb);
-            });
-
-        gulp.task(testBabelCleanTask(name), [testCleanTask(name)],
-            function(cb){
-                pump([gulp.src([path.join(name.replace("test/", "test/es5/"), "*.js")]), paths(del)], cb);
-            });
-    });
-
-gulp.task("test", tests.map(testBabelTask).concat(
-    ["common:slice-es5-worker", "common:slice-es5-controllerworker", "import:bundle"]));
-
-gulp.task("test:clean", tests.map(testBabelCleanTask).concat(["common:clean", "import:clean"]));
-
-//
 // Tasks to build IceJS Distribution
 //
-var root = path.resolve(path.join('__dirname', '..'));
-var libs = ["Ice", "Glacier2", "IceStorm", "IceGrid"];
+const root = path.resolve(__dirname);
+const libs = ["Ice", "Glacier2", "IceStorm", "IceGrid"];
 
-function generateTask(name){ return name.toLowerCase() + ":generate"; }
-function libTask(name){ return name.toLowerCase() + ":lib"; }
-function minLibTask(name){ return name.toLowerCase() + ":lib-min"; }
-function babelTask(name){ return name.toLowerCase() + ":babel"; }
-function babelLibTask(name){ return libTask(name) + "-babel";}
-function babelMinLibTask(name){ return libTask(name) + "-babel-min"; }
-
-function libFile(name) { return path.join(root, "lib", name + ".js"); }
-function libFileMin(name) { return path.join(root, "lib", name + ".min.js"); }
+const generateTask = name => name.toLowerCase() + ":generate";
+const libTask = name => name.toLowerCase() + ":lib";
+const minLibTask = name => name.toLowerCase() + ":lib-min";
+const babelTask = name => name.toLowerCase() + ":babel";
+const babelLibTask = name => libTask(name) + "-babel";
+const babelMinLibTask = name => libTask(name) + "-babel-min";
+const libDistTask = name => name.toLowerCase() + ":dist";
+
+const libFile = name => path.join(root, "lib", name + ".js");
+const libFileMin = name => path.join(root, "lib", name + ".min.js");
 
-function babelLibFile(name) { return path.join(root, "lib", "es5", name + ".js"); }
-function babelLibFileMin(name) { return path.join(root, "lib", "es5", name + ".min.js"); }
+const babelLibFile = name => path.join(root, "lib", "es5", name + ".js");
+const babelLibFileMin = name => path.join(root, "lib", "es5", name + ".min.js");
 
-function srcDir(name) { return "src/" + name; }
-function libCleanTask(lib) { return lib + ":clean"; }
+const srcDir = name => path.join(root, "src", name);
+const libCleanTask = lib => lib + ":clean";
 
-function libFiles(name){
+function libFiles(name)
+{
     return [
         path.join(root, "lib", name + ".js"),
         path.join(root, "lib", name + ".js.gz"),
@@ -284,7 +123,8 @@
         path.join(root, "lib", "es5", name + ".min.js.gz")];
 }
 
-function mapFiles(name){
+function mapFiles(name)
+{
     return [
         path.join(root, "lib", name + ".js.map"),
         path.join(root, "lib", name + ".js.map.gz"),
@@ -297,273 +137,439 @@
         path.join(root, "lib", "es5", name + ".min.js.map.gz")];
 }
 
-function libSources(lib, sources){
-    var srcs = sources.common || [];
-    if(sources.browser){
+function libSources(lib, sources)
+{
+    let srcs = sources.common || [];
+    if(sources.browser)
+    {
         srcs = sources.common.concat(sources.browser);
     }
 
-    srcs = srcs.map(function(f){
-            return path.join(srcDir(lib), f);
-        });
-
-    if(sources.slice){
-        srcs = srcs.concat(sources.slice.map(function(f){
-                return path.join(srcDir(lib), path.basename(f, ".ice") + ".js");
-            }));
+    srcs = srcs.map(f => path.join(srcDir(lib), f));
+
+    if(sources.slice)
+    {
+        srcs = srcs.concat(sources.slice.map(f => path.join(srcDir(lib), path.basename(f, ".ice") + ".js")));
     }
     return srcs;
 }
 
-function libGeneratedFiles(lib, sources){
-    return sources.slice.map(function(f)
-            {
-                return path.join(srcDir(lib), path.basename(f, ".ice") + ".js");
-            })
+function libGeneratedFiles(lib, sources)
+{
+    const tsSliceSources = sources.typescriptSlice || sources.slice;
+
+    return sources.slice.map(f => path.join(srcDir(lib), path.basename(f, ".ice") + ".js"))
+        .concat(tsSliceSources.map(f => path.join(srcDir(lib), path.basename(f, ".ice") + ".d.ts")))
         .concat(path.join("src", "es5", lib, "*.js"))
         .concat(libFiles(lib))
         .concat(mapFiles(lib))
         .concat([path.join(srcDir(lib), ".depend", "*")]);
 }
 
-function sliceFile(f){ return path.join(sliceDir, f); }
+const sliceFile = f => path.join(sliceDir, f);
+
+for(const lib of libs)
+{
+    const sources = JSON.parse(fs.readFileSync(path.join(srcDir(lib), "sources.json"), {encoding: "utf8"}));
+
+    gulp.task(generateTask(lib),
+              cb =>
+              {
+                  pump([gulp.src(sources.slice.map(sliceFile)),
+                        slice2js(
+                            {
+                                jsbundle: false,
+                                tsbundle: false,
+                                args: ["--typescript"]
+                            }),
+                        gulp.dest(srcDir(lib))], cb);
+              });
+
+    gulp.task(libTask(lib),
+              cb =>
+              {
+                  pump([gulp.src(libSources(lib, sources)),
+                        sourcemaps.init(),
+                        bundle(
+                            {
+                                srcDir: srcDir(lib),
+                                modules: sources.modules,
+                                target: libFile(lib)
+                            }),
+                        sourcemaps.write("../lib", {sourceRoot: "/src", addComment: false}),
+                        gulp.dest("lib"),
+                        gzip(),
+                        gulp.dest("lib")], cb);
+              });
+
+    gulp.task(minLibTask(lib),
+              cb =>
+              {
+                  pump([gulp.src(libFile(lib)),
+                        newer(libFileMin(lib)),
+                        sourcemaps.init({loadMaps: false}),
+                        terser(),
+                        extreplace(".min.js"),
+                        sourcemaps.write(".", {includeContent: false, addComment: false}),
+                        gulp.dest(path.join(root, "lib")),
+                        gzip(),
+                        gulp.dest(path.join(root, "lib"))], cb);
+              });
+
+    gulp.task(babelTask(lib),
+              cb =>
+              {
+                  pump([gulp.src(path.join(root, "src", lib, "*.js")),
+                        newer(path.join(root, "src", "es5", lib)),
+                        babel({compact: false}),
+                        gulp.dest(path.join(root, "src", "es5", lib))], cb);
+              });
+
+    gulp.task(babelLibTask(lib),
+              cb =>
+              {
+                  pump([gulp.src(libFile(lib)),
+                        newer(babelLibFile(lib)),
+                        sourcemaps.init(),
+                        babel({compact: false}),
+                        sourcemaps.write("."),
+                        gulp.dest(path.join(root, "lib", "es5")),
+                        gzip(),
+                        gulp.dest("lib/es5")], cb);
+              });
+
+    gulp.task(babelMinLibTask(lib),
+              cb =>
+              {
+                  pump([gulp.src(babelLibFile(lib)),
+                        newer(babelLibFileMin(lib)),
+                        terser(),
+                        extreplace(".min.js"),
+                        sourcemaps.write(".", {includeContent: false, addComment: false}),
+                        gulp.dest("lib/es5"),
+                        gzip(),
+                        gulp.dest("lib/es5")], cb);
+              });
+
+    gulp.task(libCleanTask(lib),
+              cb =>
+              {
+                  del(libGeneratedFiles(lib, sources));
+                  cb();
+              });
+
+    gulp.task(libDistTask(lib),
+              gulp.series(
+                  generateTask(lib),
+                  libTask(lib),
+                  gulp.parallel(babelTask(lib), babelLibTask(lib), minLibTask(lib)),
+                  babelMinLibTask(lib)));
+}
+
+gulp.task("ts:bundle",
+          cb =>
+          {
+              pump([gulp.src(libs.map(lib => path.join(root, "src", lib, "*.d.ts"))),
+                    tsbundle(),
+                    rename("index.d.ts"),
+                    gulp.dest("src")], cb);
+          });
+
+gulp.task("ts:bundle:clean", () => del("./src/index.d.ts"));
+
+if(useBinDist)
+{
+    gulp.task("ice:module", cb => cb());
+    gulp.task("ice:module:clean", cb => cb());
+    gulp.task("dist", cb => cb());
+    gulp.task("dist:clean", cb => cb());
+}
+else
+{
+    gulp.task("dist", gulp.series(gulp.parallel(libs.map(libDistTask)), "ts:bundle"));
+
+    gulp.task("dist:clean",
+              gulp.series(gulp.parallel(libs.map(libCleanTask).concat("ts:bundle:clean")),
+                          cb =>
+                          {
+                              const srcs = [gulp.src(path.join(root, "lib", "es5"), {allowEmpty: true})];
+                              for(const lib of libs)
+                              {
+                                  srcs.push(gulp.src(path.join(root, "src", "es5", lib), {allowEmpty: true}));
+                              }
+                              pump([...srcs, paths(del)], cb);
+                          }));
+
+    gulp.task("ice:module:package",
+              () => gulp.src(['package.json']).pipe(gulp.dest(path.join("node_modules", "ice"))));
+
+    gulp.task("ice:module",
+              gulp.series("ice:module:package",
+                          cb =>
+                          {
+                              pump([
+                                  gulp.src([path.join(root, 'src/**/*')]),
+                                  gulp.dest(path.join(root, "node_modules", "ice", "src"))], cb);
+                          }));
+
+    gulp.task("ice:module:clean", () => gulp.src(['node_modules/ice'], {allowEmpty: true}).pipe(paths(del)));
+}
+
+const tests = [
+    "test/Ice/acm",
+    "test/Ice/adapterDeactivation",
+    "test/Ice/ami",
+    "test/Ice/binding",
+    "test/Ice/defaultValue",
+    "test/Ice/enums",
+    "test/Ice/exceptions",
+    "test/Ice/facets",
+    "test/Ice/hold",
+    "test/Ice/info",
+    "test/Ice/inheritance",
+    "test/Ice/location",
+    "test/Ice/objects",
+    "test/Ice/operations",
+    "test/Ice/optional",
+    "test/Ice/promise",
+    "test/Ice/properties",
+    "test/Ice/proxy",
+    "test/Ice/retry",
+    "test/Ice/servantLocator",
+    "test/Ice/slicing/exceptions",
+    "test/Ice/slicing/objects",
+    "test/Ice/stream",
+    "test/Ice/timeout",
+    "test/Ice/number",
+    "test/Ice/scope",
+    "test/Glacier2/router",
+    "test/Slice/escape",
+    "test/Slice/macros"
+];
+
+gulp.task("test:common:generate",
+          cb =>
+          {
+              pump([gulp.src(["../scripts/Controller.ice"]),
+                    slice2js(),
+                    gulp.dest("test/Common")], cb);
+          });
 
-libs.forEach(
-    function(lib){
-        var sources = JSON.parse(fs.readFileSync(path.join(srcDir(lib), "sources.json"), {encoding: "utf8"}));
-
-        gulp.task(generateTask(lib),
-            function(cb){
-                pump([
-                    gulp.src(sources.slice.map(sliceFile)),
-                    slice2js({dest: srcDir(lib)}),
-                    gulp.dest(srcDir(lib))], cb);
-            });
-
-        gulp.task(libTask(lib), [generateTask(lib)],
-            function(cb){
-                pump([
-                    gulp.src(libSources(lib, sources)),
-                    sourcemaps.init(),
-                    bundle(
+gulp.task("test:common:babel",
+          cb =>
+          {
+              pump([gulp.src(["test/Common/Controller.js",
+                              "test/Common/ControllerI.js",
+                              "test/Common/ControllerWorker.js",
+                              "test/Common/TestHelper.js",
+                              "test/Common/run.js"]),
+                    babel({compact: false}),
+                    gulp.dest("test/es5/Common")], cb);
+          });
+
+gulp.task("test:common:controllerworker",
+          cb =>
+          {
+              pump([gulp.src(["node_modules/@babel/polyfill/dist/polyfill.js",
+                              "test/es5/Common/ControllerWorker.js"]),
+                    concat("ControllerWorker.js"),
+                    gulp.dest("test/es5/Common/")], cb);
+          });
+
+gulp.task("test:common:clean",
+          cb =>
+          {
+              del(["test/Common/Controller.js",
+                   "test/Common/.depend",
+                   "test/es5/Common/Controller.js",
+                   "test/es5/Common/ControllerI.js",
+                   "test/es5/Common/ControllerWorker.js",
+                   "test/es5/Common/TestHelper.js"]);
+              cb();
+          });
+
+gulp.task("test:import:generate",
+          cb =>
+          {
+              pump([gulp.src(["test/Ice/import/Demo/Point.ice",
+                              "test/Ice/import/Demo/Circle.ice",
+                              "test/Ice/import/Demo/Square.ice",
+                              "test/Ice/import/Demo/Canvas.ice"]),
+                    slice2js(
                         {
-                            srcDir: srcDir(lib),
-                            modules: sources.modules,
-                            target: libFile(lib)
+                            include: ["test/Ice/import"]
                         }),
-                    sourcemaps.write("../lib", {sourceRoot:"/src", addComment: false}),
-                    gulp.dest("lib"),
-                    gzip(),
-                    gulp.dest("lib")], cb);
-            });
-
-        gulp.task(minLibTask(lib), [libTask(lib)],
-            function(cb){
-                pump([
-                    gulp.src(libFile(lib)),
-                    newer(libFileMin(lib)),
-                    sourcemaps.init({loadMaps: false}),
-                    uglify({compress:false}),
-                    extreplace(".min.js"),
-                    sourcemaps.write(".", {includeContent: false, addComment: false}),
-                    gulp.dest("lib"),
-                    gzip(),
-                    gulp.dest("lib")], cb);
-            });
-
-        gulp.task(babelTask(lib), [generateTask(lib)],
-            function(cb){
-                pump([
-                    gulp.src(path.join("src", lib, "*.js")),
-                    newer(path.join("src", "es5", lib)),
-                    babel({compact:false}),
-                    gulp.dest(path.join("src", "es5", lib))], cb);
-            });
-
-        gulp.task(babelLibTask(lib), [libTask(lib)],
-            function(cb){
-                pump([
-                    gulp.src(libFile(lib)),
-                    newer(babelLibFile(lib)),
-                    sourcemaps.init(),
-                    babel({compact:false}),
-                    sourcemaps.write("."),
-                    gulp.dest("lib/es5"),
-                    gzip(),
-                    gulp.dest("lib/es5")], cb);
-            });
-
-        gulp.task(babelMinLibTask(lib), [babelLibTask(lib)],
-            function(cb){
-                pump([
-                    gulp.src(babelLibFile(lib)),
-                    newer(babelLibFileMin(lib)),
-                    uglify({compress:false}),
-                    extreplace(".min.js"),
-                    sourcemaps.write(".", {includeContent: false, addComment: false}),
-                    gulp.dest("lib/es5"),
-                    gzip(),
-                    gulp.dest("lib/es5")], cb);
-            });
-
-        gulp.task(libCleanTask(lib), [], function(){ del(libGeneratedFiles(lib, sources)); });
-    });
-
-gulp.task("dist", useBinDist ? [] :
-    libs.map(libTask).concat(libs.map(minLibTask))
-                     .concat(libs.map(babelMinLibTask))
-                     .concat(libs.map(babelTask)));
-gulp.task("dist:clean", libs.map(libCleanTask));
-
-function runTestsWithBrowser(url)
-{
-    require("./bin/HttpServer")();
-    var cmd = ["../scripts/Controller.py", "--endpoints", "ws -p 15002:wss -p 15003", "-d",
-               "--sprops=IceSSL.VerifyPeer=0"];
-    if(host)
-    {
-        cmd.push("--host");
-        cmd.push(host);
-    }
-    if(platform)
-    {
-        cmd.push("--platform=" + platform);
-    }
-    if(configuration)
-    {
-        cmd.push("--config=" + configuration);
-    }
+                    gulp.dest("test/Ice/import/Demo")], cb);
+          });
 
-    var i = process.argv.indexOf("--");
-    var argv = process.argv.filter(
-        function(element, index, argv)
-        {
-            return i !== -1 && index > i;
-        });
-    cmd = cmd.concat(argv);
+gulp.task("test:import:bundle",
+          () =>
+          {
+              const p = rollup.rollup(
+                  {
+                      input: "test/Ice/import/main.js",
+                      external: ["ice"]
+                  }).then(bundle => bundle.write(
+                      {
+                          file: "test/Ice/import/bundle.js",
+                          format: "cjs"
+                      }));
+              return p;
+          });
 
-    var p  = require("child_process").spawn("python", cmd, {stdio: "inherit"});
-    p.on("error", function(err)
-        {
-            if(err.message == "spawn python ENOENT")
-            {
-                console.log("Error: python is required in PATH to run tests");
-                process.exit(1);
-            }
-            else
-            {
-                throw err;
-            }
-        });
-    process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT",
-        function()
-        {
-            process.exit();
-        });
-    process.on("exit", function()
-        {
-            p.kill();
-        });
-    return gulp.src("").pipe(open({uri: url}));
-}
-
-gulp.task("test:browser", useBinDist ? ["test"] : ["build"],
-    function(url){
-        return runTestsWithBrowser("http://" + host +":8080/test/Ice/acm/index.html");
-    });
-
-gulp.task("test:browser-es5", useBinDist ? ["test"] : ["build"],
-    function(url){
-        return runTestsWithBrowser("http://" + host +":8080/test/es5/Ice/acm/index.html");
-    });
-
-gulp.task("test:node", (useBinDist ? ["test"] : ["build"]),
-    function(){
-        var args = ["allTests.py", "--all"];
-        if(platform)
-        {
-            args = args.concat(["--cpp-platform", platform]);
-        }
-        if(configuration)
-        {
-            args = args.concat(["--cpp-config", configuration]);
-        }
+gulp.task("test:import:clean",
+          cb =>
+          {
+              del(["test/Ice/import/Demo/Point.js",
+                   "test/Ice/import/Demo/Circle.js",
+                   "test/Ice/import/Demo/Square.js",
+                   "test/Ice/import/Demo/Canvas.js",
+                   "test/Ice/import/bundle.js"]);
+              cb();
+          });
 
-        var p = require("child_process").spawn("python", args, {stdio: "inherit"});
-        p.on("error",
-            function(err)
-            {
-                if(err.message == "spawn python ENOENT")
-                {
-                    console.log("Error: python is required in PATH to run tests");
-                    process.exit(1);
-                }
-                else
-                {
-                    throw err;
-                }
-            });
+const testTask = name => name.replace(/\//g, "_");
+const testBabelTask = name => testTask(name) + ":babel";
+const testCleanTask = name => testTask(name) + ":clean";
+const testBuildTask = name => testTask(name) + ":build";
 
-        process.on(process.platform == "win32" ? "SIGBREAK" : "SIGINT",
-            function()
-            {
-                process.exit();
-            });
-        process.on("exit", function()
-            {
-                p.kill();
-            });
-    });
-
-gulp.task("lint:html", ["build"],
-    function(cb){
-        pump([
-            gulp.src(["**/*.html",
-                      "!node_modules/**/*.html",
-                      "!test/**/index.html"]),
-            jshint.extract("auto"),
-            jshint(),
-            jshint.reporter('default')], cb);
-    });
-
-gulp.task("lint:js", ["build"],
-    function(cb){
-        pump([
-            gulp.src(["gulpfile.js",
-                      "gulp/**/*.js",
-                      "src/**/*.js",
-                      "src/**/browser/*.js",
-                      "test/**/*.js",
-                      "!src/es5/**/*.js",
-                      "!test/es5/**/**/*.js",
-                      "!**/Client.min.js"]),
-            jshint(),
-            jshint.reporter("default")], cb);
-    });
-
-var buildDepends = ["dist", "test"];
-var cleanDepends = ["test:clean", "common:clean"];
-
-if(!useBinDist)
-{
-    gulp.task("ice-module:package", ["dist"],
-        function(cb){
-            pump([gulp.src(['package.json']), gulp.dest(path.join("node_modules", "ice"))], cb);
-        });
-    gulp.task("ice-module", ["ice-module:package"],
-        function(cb){
-            pump([gulp.src(['src/**/*']), gulp.dest(path.join("node_modules", "ice", "src"))], cb);
-        });
-        buildDepends.push("ice-module");
-
-    gulp.task("ice-module:clean", [],
-        function(cb){
-            pump([gulp.src(['node_modules/ice']), paths(del)], cb);
-        });
-        cleanDepends.push("ice-module:clean");
-}
-
-gulp.task("lint", ["lint:js", "lint:html"]);
-gulp.task("build", buildDepends);
-gulp.task("clean", cleanDepends.concat(useBinDist ? [] : ["dist:clean"]));
-gulp.task("default", ["build"]);
+for(const name of tests)
+{
+    gulp.task(testTask(name),
+              cb =>
+              {
+                  const outdir = path.join(root, name);
+                  pump([gulp.src(path.join(outdir, "*.ice")),
+                        slice2js(
+                            {
+                                include: [outdir]
+                            }),
+                        gulp.dest(outdir)], cb);
+              });
+
+    gulp.task(testBabelTask(name),
+              cb =>
+              {
+                  const outdir = path.join(root, name.replace("test/", "test/es5/"));
+                  pump([gulp.src([path.join(root, name, "*.js")]),
+                        babel({compact: false}),
+                        gulp.dest(outdir)], cb);
+              });
+
+    gulp.task(testBuildTask(name), gulp.series(testTask(name), testBabelTask(name)));
+
+    gulp.task(testCleanTask(name),
+              cb =>
+              {
+                  pump([gulp.src(path.join(name, "*.ice")),
+                        extreplace(".js"),
+                        gulp.src(path.join(name, ".depend"), {allowEmpty: true}),
+                        gulp.src([path.join(name.replace("test/", "test/es5/"), "*.js")]),
+                        paths(del)], cb);
+              });
+}
+
+gulp.task("test",
+          gulp.series("test:common:generate", "test:common:babel", "test:common:controllerworker",
+                      "test:import:generate", "test:import:bundle",
+                      gulp.parallel(tests.map(testBuildTask))));
+
+gulp.task("test:clean",
+          gulp.series(
+              gulp.parallel("test:common:clean", "test:import:clean", tests.map(testCleanTask)),
+              cb =>
+              {
+                  pump([gulp.src(path.join(root, "test", "es5"), {allowEmpty: true}),
+                        paths(del)], cb);
+              }));
+
+//
+// TypeScript tests
+//
+const tstests = [
+    "test/typescript/Ice/acm",
+    "test/typescript/Ice/adapterDeactivation",
+    "test/typescript/Ice/ami",
+    "test/typescript/Ice/binding",
+    "test/typescript/Ice/defaultValue",
+    "test/typescript/Ice/enums",
+    "test/typescript/Ice/exceptions",
+    "test/typescript/Ice/facets",
+    "test/typescript/Ice/hold",
+    "test/typescript/Ice/info",
+    "test/typescript/Ice/inheritance",
+    "test/typescript/Ice/location",
+    "test/typescript/Ice/number",
+    "test/typescript/Ice/objects",
+    "test/typescript/Ice/operations",
+    "test/typescript/Ice/optional",
+    "test/typescript/Ice/properties",
+    "test/typescript/Ice/proxy",
+    "test/typescript/Ice/retry",
+    "test/typescript/Ice/scope",
+    "test/typescript/Ice/servantLocator",
+    "test/typescript/Ice/slicing/exceptions",
+    "test/typescript/Ice/slicing/objects",
+    "test/typescript/Ice/stream",
+    "test/typescript/Ice/timeout",
+    "test/typescript/Glacier2/router",
+    "test/typescript/Slice/macros"
+];
+
+const testTypeScriptSliceCompileJsTask = name => testTask(name) + ":ts:slice-compile-js";
+const testTypeScriptCompileTask = name => testTask(name) + ":ts:compile";
+const testTypeScriptBuildTask = name => testTask(name) + ":ts:build";
+const testTypeScriptCleanTask = name => testTask(name) + ":ts:clean";
+
+for(const name of tstests)
+{
+    gulp.task(testTypeScriptSliceCompileJsTask(name),
+              cb =>
+              {
+                  const outdir = path.join(root, name);
+                  pump([gulp.src(path.join(outdir, "*.ice")),
+                        slice2js(
+                            {
+                                include: [outdir],
+                                args: ["--typescript"],
+                                jsbundleFormat: "cjs"
+                            }),
+                        gulp.dest(outdir)], cb);
+              });
+
+    gulp.task(testTypeScriptCompileTask(name),
+              cb =>
+              {
+                  pump([gulp.src(path.join(root, name, "*.ts")),
+                        tsc(
+                            {
+                                lib: ["dom", "es2017"],
+                                target: "es2017",
+                                module: "commonjs",
+                                noImplicitAny: true
+                            }),
+                        gulp.dest(path.join(root, name))
+                       ], cb);
+              });
+
+    gulp.task(testTypeScriptBuildTask(name),
+              gulp.series(
+                  testTypeScriptSliceCompileJsTask(name),
+                  testTypeScriptCompileTask(name)));
+
+    gulp.task(testTypeScriptCleanTask(name),
+              cb =>
+              {
+                  pump([gulp.src([path.join(root, name, "**/*.js"),
+                                  path.join(root, name, "**/*.d.ts"),
+                                  path.join(root, name, "**/*.js.map")]),
+                        paths(del)], cb);
+              });
+}
+
+gulp.task("test:ts", gulp.series(tstests.map(testTypeScriptBuildTask)));
+gulp.task("test:ts:clean", gulp.parallel(tstests.map(testTypeScriptCleanTask)));
+
+gulp.task("build", gulp.series("dist", "ice:module", "test", "test:ts"));
+gulp.task("clean", gulp.series("dist:clean", "ice:module:clean", "test:clean", "test:ts:clean"));
+gulp.task("default", gulp.series("build"));
diff -Nru zeroc-ice-3.7.1/js/.jshintrc zeroc-ice-3.7.2/js/.jshintrc
--- zeroc-ice-3.7.1/js/.jshintrc	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/.jshintrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-{
-    "esversion": 6,
-    "node": true,
-    "undef": true,
-    "evil": true,
-    "elision": true,
-    "globals":
-    {
-        "WebSocket" : false,
-        "window": false,
-        "navigator": false,
-        "escape" : false,
-        "unescape": false
-    }
-}
diff -Nru zeroc-ice-3.7.1/js/.jshintrc_browser zeroc-ice-3.7.2/js/.jshintrc_browser
--- zeroc-ice-3.7.1/js/.jshintrc_browser	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/.jshintrc_browser	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-{
-  "extends" : ".jshintrc",
-  "browser" : true,
-  "jquery" : true,
-  "globals":
-  {
-    "Ice" : false,
-    "IceGrid" : false,
-    "IceMX" : false,
-    "IceSSL" : false,
-    "IceStorm" : false,
-    "Glacier2" : false
-  }
-}
diff -Nru zeroc-ice-3.7.1/js/Makefile zeroc-ice-3.7.2/js/Makefile
--- zeroc-ice-3.7.1/js/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 ifeq ($(NPM),)
 NPM = npm
diff -Nru zeroc-ice-3.7.1/js/package.json zeroc-ice-3.7.2/js/package.json
--- zeroc-ice-3.7.1/js/package.json	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/package.json	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,59 @@
 {
-    "name": "ice",
-    "version": "3.7.1",
-    "description": "Ice for JavaScript runtime",
-    "author": "Zeroc, Inc.",
-    "homepage": "https://zeroc.com",
-    "repository": "https://github.com/zeroc-ice/ice.git",
-    "license": "GPL-2.0",
-    "engines": {
-        "node": ">=0.10.0"
-    },
-    "keywords": [
-        "Ice",
-        "rpc"
-    ],
-    "main": "src/index.js",
-    "devDependencies": {
-        "babel-cli": "^6.26.0",
-        "babel-plugin-rewrite-require": "^1.14.5",
-        "babel-plugin-transform-async-to-generator": "^6.24.1",
-        "babel-plugin-transform-builtin-extend": "^1.1.2",
-        "babel-polyfill": "^6.26.0",
-        "babel-preset-es2015-script": "^1.1.0",
-        "del": "^2.2.2",
-        "esprima": "^3.1.3",
-        "gulp": "^3.9.1",
-        "gulp-babel": "^6.1.3",
-        "gulp-clean-css": "^3.9.3",
-        "gulp-concat": "^2.6.1",
-        "gulp-ext-replace": "^0.3.0",
-        "gulp-gzip": "^1.4.2",
-        "gulp-ice-builder": "^2.0.0",
-        "gulp-jshint": "^2.1.0",
-        "gulp-newer": "^1.4.0",
-        "gulp-open": "^2.1.0",
-        "gulp-sourcemaps": "^2.6.4",
-        "gulp-uglifyes": "^0.1.3",
-        "gulp-util": "^3.0.8",
-        "hogan.js": "^3.0.2",
-        "http-proxy": "^1.16.2",
-        "jshint": "^2.9.5",
-        "pump": "^1.0.3",
-        "regenerator": "^0.9.7",
-        "rollup": "^0.41.6",
-        "source-map": "^0.5.7",
-        "through2": "^2.0.3",
-        "vinyl-paths": "^2.1.0"
-    },
-    "scripts": {
-        "build": "gulp",
-        "dist": "gulp dist",
-        "clean": "gulp clean",
-        "test": "gulp test",
-        "lint": "gulp lint",
-        "test:browser": "gulp test:browser",
-        "test:browser-es5": "gulp test:browser-es5",
-        "test:node": "gulp test:node"
-    },
-    "dependencies": {}
+  "name": "ice",
+  "version": "3.7.2",
+  "description": "Ice for JavaScript runtime",
+  "author": "Zeroc, Inc.",
+  "homepage": "https://zeroc.com",
+  "repository": "https://github.com/zeroc-ice/ice.git",
+  "license": "GPL-2.0",
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "keywords": [
+    "Ice",
+    "rpc"
+  ],
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
+  "browserslist": "> 0.25%, not dead",
+  "devDependencies": {
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.2.2",
+    "@babel/plugin-transform-async-to-generator": "^7.2.0",
+    "@babel/polyfill": "^7.2.5",
+    "@babel/preset-env": "^7.2.3",
+    "babel-plugin-rewrite-require": "^1.14.5",
+    "del": "^3.0.0",
+    "esprima": "^4.0.1",
+    "gulp": "^4.0.0",
+    "gulp-babel": "^8.0.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-ext-replace": "^0.3.0",
+    "gulp-gzip": "^1.4.2",
+    "gulp-ice-builder": "^3.0.2",
+    "gulp-newer": "^1.4.0",
+    "gulp-rename": "^1.4.0",
+    "gulp-sourcemaps": "^2.6.4",
+    "gulp-terser": "^1.1.6",
+    "gulp-typescript": "^5.0.0",
+    "gulp-uglifyes": "^0.2.1",
+    "hogan.js": "^3.0.2",
+    "http-proxy": "^1.17.0",
+    "jshint": "^2.9.7",
+    "plugin-error": "^1.0.1",
+    "pump": "^3.0.0",
+    "rollup": "^1.0.1",
+    "source-map": "^0.7.3",
+    "through2": "^3.0.0",
+    "typescript": "^3.2.2",
+    "typescript-formatter": "^7.2.2",
+    "vinyl": "^2.2.0",
+    "vinyl-paths": "^2.1.0"
+  },
+  "scripts": {
+    "build": "gulp",
+    "dist": "gulp dist",
+    "clean": "gulp clean"
+  },
+  "dependencies": {}
 }
diff -Nru zeroc-ice-3.7.1/js/package-lock.json zeroc-ice-3.7.2/js/package-lock.json
--- zeroc-ice-3.7.1/js/package-lock.json	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/package-lock.json	2019-02-05 18:03:04.000000000 +0000
@@ -1,1016 +1,1466 @@
 {
   "name": "ice",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@gulp-sourcemaps/identity-map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz",
-      "integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=",
+    "@babel/cli": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.2.3.tgz",
+      "integrity": "sha512-bfna97nmJV6nDJhXNPeEfxyMjWnt6+IjUAaDPiYRTBlm8L41n8nvw6UAqUCbvpFfU246gHPxW7sfWwqtF4FcYA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.3",
+        "commander": "^2.8.1",
+        "convert-source-map": "^1.1.0",
+        "fs-readdir-recursive": "^1.1.0",
+        "glob": "^7.0.0",
+        "lodash": "^4.17.10",
+        "mkdirp": "^0.5.1",
+        "output-file-sync": "^2.0.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz",
+      "integrity": "sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.2.2",
+        "@babel/helpers": "^7.2.0",
+        "@babel/parser": "^7.2.2",
+        "@babel/template": "^7.2.2",
+        "@babel/traverse": "^7.2.2",
+        "@babel/types": "^7.2.2",
+        "convert-source-map": "^1.1.0",
+        "debug": "^4.1.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.10",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.2.tgz",
+          "integrity": "sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.2.2",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.10",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz",
+          "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
+          "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/parser": "^7.2.2",
+            "@babel/types": "^7.2.2"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
+          "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.2.2",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.0.0",
+            "@babel/parser": "^7.2.3",
+            "@babel/types": "^7.2.2",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.10"
+          }
+        },
+        "@babel/types": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz",
+          "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.10",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz",
+      "integrity": "sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==",
       "dev": true,
       "requires": {
-        "acorn": "5.0.3",
-        "css": "2.2.1",
-        "normalize-path": "2.1.1",
-        "source-map": "0.5.7",
-        "through2": "2.0.3"
+        "@babel/types": "^7.2.0",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.10",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
-          "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0=",
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
       }
     },
-    "@gulp-sourcemaps/map-sources": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
+      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
       "dev": true,
       "requires": {
-        "normalize-path": "2.1.1",
-        "through2": "2.0.3"
+        "@babel/types": "^7.0.0"
       }
     },
-    "abbrev": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-      "dev": true
-    },
-    "acorn": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-      "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-      "dev": true
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
+      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+    "@babel/helper-call-delegate": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz",
+      "integrity": "sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "@babel/helper-hoist-variables": "^7.0.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+    "@babel/helper-define-map": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz",
+      "integrity": "sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "lodash": "^4.17.10"
       }
     },
-    "ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
+      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true
-    },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-      "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
+    "@babel/helper-function-name": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "arrify": "1.0.1",
-        "micromatch": "2.3.11"
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
       "dev": true,
       "requires": {
-        "arr-flatten": "1.0.3"
+        "@babel/types": "^7.0.0"
       }
     },
-    "arr-flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz",
-      "integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
-    },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
-    },
-    "array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+    "@babel/helper-hoist-variables": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz",
+      "integrity": "sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "@babel/types": "^7.0.0"
       }
     },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz",
+      "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
     },
-    "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-      "dev": true
+    "@babel/helper-module-imports": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
+      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
     },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
+    "@babel/helper-module-transforms": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz",
+      "integrity": "sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.0.0",
+        "@babel/template": "^7.2.2",
+        "@babel/types": "^7.2.2",
+        "lodash": "^4.17.10"
+      },
+      "dependencies": {
+        "@babel/parser": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz",
+          "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
+          "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/parser": "^7.2.2",
+            "@babel/types": "^7.2.2"
+          }
+        },
+        "@babel/types": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz",
+          "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.10",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
     },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
+      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
     },
-    "ast-types": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-      "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
+    "@babel/helper-plugin-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
       "dev": true
     },
-    "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+    "@babel/helper-regex": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz",
+      "integrity": "sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "lodash": "^4.17.10"
+      }
     },
-    "atob": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-      "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
-      "dev": true
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
+      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
     },
-    "babel-cli": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
-      "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.26.0",
-        "babel-polyfill": "6.26.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "chokidar": "1.7.0",
-        "commander": "2.14.1",
-        "convert-source-map": "1.5.0",
-        "fs-readdir-recursive": "1.0.0",
-        "glob": "7.1.2",
-        "lodash": "4.17.4",
-        "output-file-sync": "1.1.2",
-        "path-is-absolute": "1.0.1",
-        "slash": "1.0.0",
-        "source-map": "0.5.7",
-        "v8flags": "2.1.1"
-      },
-      "dependencies": {
-        "babel-code-frame": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-          "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "esutils": "2.0.2",
-            "js-tokens": "3.0.2"
-          }
-        },
-        "babel-core": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-          "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
-          "dev": true,
-          "requires": {
-            "babel-code-frame": "6.26.0",
-            "babel-generator": "6.26.1",
-            "babel-helpers": "6.24.1",
-            "babel-messages": "6.23.0",
-            "babel-register": "6.26.0",
-            "babel-runtime": "6.26.0",
-            "babel-template": "6.26.0",
-            "babel-traverse": "6.26.0",
-            "babel-types": "6.26.0",
-            "babylon": "6.18.0",
-            "convert-source-map": "1.5.0",
-            "debug": "2.6.8",
-            "json5": "0.5.1",
-            "lodash": "4.17.4",
-            "minimatch": "3.0.4",
-            "path-is-absolute": "1.0.1",
-            "private": "0.1.7",
-            "slash": "1.0.0",
-            "source-map": "0.5.7"
-          }
-        },
-        "babel-generator": {
-          "version": "6.26.1",
-          "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-          "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-          "dev": true,
-          "requires": {
-            "babel-messages": "6.23.0",
-            "babel-runtime": "6.26.0",
-            "babel-types": "6.26.0",
-            "detect-indent": "4.0.0",
-            "jsesc": "1.3.0",
-            "lodash": "4.17.4",
-            "source-map": "0.5.7",
-            "trim-right": "1.0.1"
-          }
-        },
-        "babel-register": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-          "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-          "dev": true,
-          "requires": {
-            "babel-core": "6.26.0",
-            "babel-runtime": "6.26.0",
-            "core-js": "2.5.3",
-            "home-or-tmp": "2.0.0",
-            "lodash": "4.17.4",
-            "mkdirp": "0.5.1",
-            "source-map-support": "0.4.15"
+    "@babel/helper-replace-supers": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz",
+      "integrity": "sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.2.3",
+        "@babel/types": "^7.0.0"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.2.tgz",
+          "integrity": "sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.2.2",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.10",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
           },
           "dependencies": {
-            "core-js": {
-              "version": "2.5.3",
-              "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
-              "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
-              "dev": true
+            "@babel/types": {
+              "version": "7.2.2",
+              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz",
+              "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==",
+              "dev": true,
+              "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.10",
+                "to-fast-properties": "^2.0.0"
+              }
             }
           }
         },
-        "babel-runtime": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-          "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
-          "requires": {
-            "core-js": "2.4.1",
-            "regenerator-runtime": "0.11.1"
-          }
-        },
-        "babel-template": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-          "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-          "dev": true,
-          "requires": {
-            "babel-runtime": "6.26.0",
-            "babel-traverse": "6.26.0",
-            "babel-types": "6.26.0",
-            "babylon": "6.18.0",
-            "lodash": "4.17.4"
-          }
+        "@babel/parser": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz",
+          "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==",
+          "dev": true
         },
-        "babel-traverse": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-          "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+        "@babel/traverse": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
+          "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
           "dev": true,
           "requires": {
-            "babel-code-frame": "6.26.0",
-            "babel-messages": "6.23.0",
-            "babel-runtime": "6.26.0",
-            "babel-types": "6.26.0",
-            "babylon": "6.18.0",
-            "debug": "2.6.8",
-            "globals": "9.18.0",
-            "invariant": "2.2.2",
-            "lodash": "4.17.4"
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.2.2",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.0.0",
+            "@babel/parser": "^7.2.3",
+            "@babel/types": "^7.2.2",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.10"
+          },
+          "dependencies": {
+            "@babel/types": {
+              "version": "7.2.2",
+              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz",
+              "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==",
+              "dev": true,
+              "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.10",
+                "to-fast-properties": "^2.0.0"
+              }
+            }
           }
         },
-        "babel-types": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-          "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "babel-runtime": "6.26.0",
-            "esutils": "2.0.2",
-            "lodash": "4.17.4",
-            "to-fast-properties": "1.0.3"
+            "ms": "^2.1.1"
           }
         },
-        "babylon": {
-          "version": "6.18.0",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
-        },
-        "commander": {
-          "version": "2.14.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
-          "dev": true
-        },
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
         },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
       }
     },
-    "babel-code-frame": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-      "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
+    "@babel/helper-simple-access": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
+      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.1"
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "babel-core": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz",
-      "integrity": "sha1-jEKFZNzh4fQfszfsNPTDsCK1rYM=",
+    "@babel/helper-split-export-declaration": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
+      "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.22.0",
-        "babel-generator": "6.24.1",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1",
-        "babylon": "6.17.1",
-        "convert-source-map": "1.5.0",
-        "debug": "2.6.8",
-        "json5": "0.5.1",
-        "lodash": "4.17.4",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.7",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
+        "@babel/types": "^7.0.0"
       }
     },
-    "babel-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz",
-      "integrity": "sha1-5xX0hsWN7SVknYiJRNUqoHxdlJc=",
+    "@babel/helper-wrap-function": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
+      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
       "dev": true,
       "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.4",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.2.0"
       }
     },
-    "babel-helper-call-delegate": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+    "@babel/helpers": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.2.0.tgz",
+      "integrity": "sha512-Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A==",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1"
+        "@babel/template": "^7.1.2",
+        "@babel/traverse": "^7.1.5",
+        "@babel/types": "^7.2.0"
       }
     },
-    "babel-helper-define-map": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
-      "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=",
+    "@babel/highlight": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1",
-        "lodash": "4.17.4"
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
       }
     },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+    "@babel/parser": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz",
+      "integrity": "sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg==",
+      "dev": true
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
+      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
       }
     },
-    "babel-helper-hoist-variables": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-1L5mWLSvR76XYUQJXkd/EEQgjq8HHRP6lQuZTTg0VA4tTGPpGemmCdAfQIz1rzEuWAm+ecP8PyyEm30jC1eQCg==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
       }
     },
-    "babel-helper-optimise-call-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
       }
     },
-    "babel-helper-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
-      "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=",
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz",
+      "integrity": "sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1",
-        "lodash": "4.17.4"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0",
+        "regexpu-core": "^4.2.0"
       }
     },
-    "babel-helper-remap-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-helper-replace-supers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-check-es2015-constants": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-rewrite-require": {
-      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-rewrite-require/-/babel-plugin-rewrite-require-1.14.5.tgz",
-      "integrity": "sha1-NsoZACsUW74X+mmLaKiD4414ttk=",
-      "dev": true
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz",
+      "integrity": "sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
+      }
     },
-    "babel-plugin-syntax-async-functions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
     },
-    "babel-plugin-syntax-async-generators": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
-      "dev": true
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz",
+      "integrity": "sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.10"
+      }
     },
-    "babel-plugin-transform-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+    "@babel/plugin-transform-classes": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz",
+      "integrity": "sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==",
       "dev": true,
       "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-runtime": "6.23.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.1.0",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.0.0",
+        "globals": "^11.1.0"
       }
     },
-    "babel-plugin-transform-builtin-extend": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-builtin-extend/-/babel-plugin-transform-builtin-extend-1.1.2.tgz",
-      "integrity": "sha1-Xpb+z1i4+h7XTvytiEdbKvPJEW4=",
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz",
+      "integrity": "sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz",
+      "integrity": "sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0",
+        "regexpu-core": "^4.1.3"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz",
+      "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+    "@babel/plugin-transform-for-of": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz",
+      "integrity": "sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+    "@babel/plugin-transform-function-name": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz",
+      "integrity": "sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
-      "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=",
+    "@babel/plugin-transform-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1",
-        "lodash": "4.17.4"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-classes": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz",
+      "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "6.24.1",
-        "babel-helper-function-name": "6.24.1",
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz",
+      "integrity": "sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0"
       }
     },
-    "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz",
+      "integrity": "sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-hoist-variables": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-duplicate-keys": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
+      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-for-of": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+    "@babel/plugin-transform-new-target": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz",
+      "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+    "@babel/plugin-transform-object-super": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz",
+      "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.1.0"
       }
     },
-    "babel-plugin-transform-es2015-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+    "@babel/plugin-transform-parameters": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz",
+      "integrity": "sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-call-delegate": "^7.1.0",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-object-super": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz",
+      "integrity": "sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-runtime": "6.23.0"
+        "regenerator-transform": "^0.13.3"
       }
     },
-    "babel-plugin-transform-es2015-parameters": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "6.24.1",
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.24.1",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+    "@babel/plugin-transform-spread": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
+      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz",
+      "integrity": "sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz",
+      "integrity": "sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0",
+        "regexpu-core": "^4.1.3"
       }
     },
-    "babel-plugin-transform-es2015-unicode-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+    "@babel/polyfill": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz",
+      "integrity": "sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "regexpu-core": "2.0.0"
+        "core-js": "^2.5.7",
+        "regenerator-runtime": "^0.12.0"
       }
     },
-    "babel-plugin-transform-regenerator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz",
-      "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=",
+    "@babel/preset-env": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.3.tgz",
+      "integrity": "sha512-AuHzW7a9rbv5WXmvGaPX7wADxFkZIqKlbBh1dmZUQp4iwiPpkE/Qnrji6SC4UQCQzvWY/cpHET29eUhXS9cLPw==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "0.9.11"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.2.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.2.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.2.0",
+        "@babel/plugin-transform-classes": "^7.2.0",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.2.0",
+        "@babel/plugin-transform-dotall-regex": "^7.2.0",
+        "@babel/plugin-transform-duplicate-keys": "^7.2.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.2.0",
+        "@babel/plugin-transform-function-name": "^7.2.0",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.2.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.2.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.2.0",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-new-target": "^7.0.0",
+        "@babel/plugin-transform-object-super": "^7.2.0",
+        "@babel/plugin-transform-parameters": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.0.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.2.0",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.2.0",
+        "browserslist": "^4.3.4",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.3.0"
       }
     },
-    "babel-polyfill": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+    "@babel/template": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz",
+      "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "core-js": "2.5.3",
-        "regenerator-runtime": "0.10.5"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.1.2",
+        "@babel/types": "^7.1.2"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
+      "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.1.6",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.0.0",
+        "@babel/parser": "^7.1.6",
+        "@babel/types": "^7.1.6",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.10"
       },
       "dependencies": {
-        "babel-runtime": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-          "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+        "debug": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+          "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
           "dev": true,
           "requires": {
-            "core-js": "2.5.3",
-            "regenerator-runtime": "0.11.1"
-          },
-          "dependencies": {
-            "regenerator-runtime": {
-              "version": "0.11.1",
-              "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-              "dev": true
-            }
+            "ms": "^2.1.1"
           }
         },
-        "core-js": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
-          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.10",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@gulp-sourcemaps/identity-map": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
+      "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.0.3",
+        "css": "^2.2.1",
+        "normalize-path": "^2.1.1",
+        "source-map": "^0.6.0",
+        "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
+      }
+    },
+    "@gulp-sourcemaps/map-sources": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
+      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^2.0.1",
+        "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
+      }
+    },
+    "@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "10.12.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.12.tgz",
+      "integrity": "sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A==",
+      "dev": true
+    },
+    "@types/semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "^0.1.0"
+      }
+    },
+    "ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "dev": true,
+      "requires": {
+        "buffer-equal": "^1.0.0"
+      }
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "dev": true
+    },
+    "array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "dev": true,
+      "requires": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
           "dev": true
         }
       }
     },
-    "babel-preset-es2015-script": {
+    "array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "array-slice": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015-script/-/babel-preset-es2015-script-1.1.0.tgz",
-      "integrity": "sha1-c32jmRPctFAO5NsTLELNPPcQZOU=",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true
+    },
+    "array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "requires": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.24.1",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.24.1"
-      }
-    },
-    "babel-register": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-      "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "core-js": "2.4.1",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.4",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.15"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-      "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
-      "dev": true,
-      "requires": {
-        "core-js": "2.4.1",
-        "regenerator-runtime": "0.10.5"
-      }
-    },
-    "babel-template": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
-      "integrity": "sha1-BK5RTx+Ts6JTfyoPYKWkX7gwgzM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-traverse": "6.24.1",
-        "babel-types": "6.24.1",
-        "babylon": "6.17.1",
-        "lodash": "4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
-      "integrity": "sha1-qzZnP9NW+aCUhlnnszjV/q2zFpU=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.22.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1",
-        "babylon": "6.17.1",
-        "debug": "2.6.8",
-        "globals": "9.17.0",
-        "invariant": "2.2.2",
-        "lodash": "4.17.4"
-      }
-    },
-    "babel-types": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
-      "integrity": "sha1-oTaHncFbNga9oNkMH8dDBML/CXU=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "esutils": "2.0.2",
-        "lodash": "4.17.4",
-        "to-fast-properties": "1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
-      "integrity": "sha1-F/FP3fNhtpWYH+Z5OF5PHAHr2G8=",
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
       "dev": true
     },
-    "balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
-    "binary-extensions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
-      "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
+    "async-done": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.1.tgz",
+      "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^1.0.7",
+        "stream-exhaust": "^1.0.1"
+      },
+      "dependencies": {
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+          "dev": true
+        }
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "dev": true,
+      "requires": {
+        "async-done": "^1.2.2"
+      }
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "babel-plugin-rewrite-require": {
+      "version": "1.14.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-rewrite-require/-/babel-plugin-rewrite-require-1.14.5.tgz",
+      "integrity": "sha1-NsoZACsUW74X+mmLaKiD4414ttk=",
+      "dev": true
+    },
+    "bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "dev": true,
+      "requires": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "binary-extensions": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
+      "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
+      "dev": true
     },
     "brace-expansion": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-      "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "requires": {
-        "balanced-match": "0.4.2",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "browserslist": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.7.tgz",
+      "integrity": "sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==",
       "dev": true,
       "requires": {
-        "expand-range": "1.8.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
+        "caniuse-lite": "^1.0.30000925",
+        "electron-to-chromium": "^1.3.96",
+        "node-releases": "^1.1.3"
       }
     },
-    "buffer-shims": {
+    "buffer-equal": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
     "builtin-modules": {
@@ -1019,59 +1469,94 @@
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
-    "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
       "dev": true
     },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
       }
     },
+    "camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000926",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz",
+      "integrity": "sha512-diMkEvxfFw09SkbErCLmw/1Fx1ZZe9xfWm4aeA2PUffB48x1tfZeMsK5j4BW7zN7Y4PdqmPVVdG2eYjE5IRTag==",
+      "dev": true
+    },
     "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "2.2.1",
-        "escape-string-regexp": "1.0.5",
-        "has-ansi": "2.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "2.0.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "anymatch": "1.3.0",
-        "async-each": "1.0.1",
-        "glob-parent": "2.0.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
-      }
-    },
-    "clean-css": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
-      "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.2.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "lodash.debounce": "^4.0.8",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
       }
     },
     "cli": {
@@ -1081,13 +1566,24 @@
       "dev": true,
       "requires": {
         "exit": "0.1.2",
-        "glob": "7.1.2"
+        "glob": "^7.1.1"
+      }
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
     "clone-buffer": {
@@ -1097,88 +1593,121 @@
       "dev": true
     },
     "clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
       "dev": true
     },
     "cloneable-readable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-      "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
+      "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "process-nextick-args": "1.0.7",
-        "through2": "2.0.3"
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
       }
     },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
-    "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-      "dev": true
+    "collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "dev": true,
+      "requires": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
     },
-    "commander": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "graceful-readlink": "1.0.1"
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       }
     },
-    "commoner": {
-      "version": "0.10.8",
-      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
-      "integrity": "sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=",
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "requires": {
-        "commander": "2.9.0",
-        "detective": "4.5.0",
-        "glob": "5.0.15",
-        "graceful-fs": "4.1.11",
-        "iconv-lite": "0.4.17",
-        "mkdirp": "0.5.1",
-        "private": "0.1.7",
-        "q": "1.5.0",
-        "recast": "0.11.23"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
+        "color-name": "1.1.3"
       }
     },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+      "dev": true
+    },
+    "commandpost": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
+      "integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "dev": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
     "concat-with-sourcemaps": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz",
-      "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "console-browserify": {
@@ -1187,19 +1716,38 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "0.1.4"
+        "date-now": "^0.1.4"
       }
     },
     "convert-source-map": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
+    "copy-props": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "dev": true,
+      "requires": {
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
+      }
+    },
     "core-js": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz",
+      "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==",
       "dev": true
     },
     "core-util-is": {
@@ -1209,44 +1757,32 @@
       "dev": true
     },
     "css": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-      "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "source-map": "0.1.43",
-        "source-map-resolve": "0.3.1",
-        "urix": "0.1.0"
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
       },
       "dependencies": {
         "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "requires": {
-        "array-find-index": "1.0.2"
-      }
-    },
     "d": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.39"
+        "es5-ext": "^0.10.9"
       }
     },
     "date-now": {
@@ -1255,125 +1791,182 @@
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
       "dev": true
     },
-    "dateformat": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
-      "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=",
-      "dev": true
-    },
     "debug": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
     },
+    "debug-fabulous": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+      "dev": true,
+      "requires": {
+        "debug": "3.X",
+        "memoizee": "0.4.X",
+        "object-assign": "4.X"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
       "dev": true,
       "requires": {
-        "clone": "1.0.2"
+        "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+    "default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
       "dev": true
     },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "requires": {
-        "globby": "5.0.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.0",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.1"
+        "object-keys": "^1.0.12"
       }
     },
-    "deprecated": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
-      "dev": true
-    },
-    "detect-file": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz",
-      "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=",
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "fs-exists-sync": "0.1.0"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
       }
     },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+    "del": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
       }
     },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
     "detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
       "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
       "dev": true
     },
-    "detective": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz",
-      "integrity": "sha1-blqMaybmx6JUsca210kNmOyR7dE=",
-      "dev": true,
-      "requires": {
-        "acorn": "4.0.13",
-        "defined": "1.0.0"
-      }
-    },
     "dom-serializer": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dev": true,
       "requires": {
-        "domelementtype": "1.1.3",
-        "entities": "1.1.1"
+        "domelementtype": "~1.1.1",
+        "entities": "~1.1.1"
       },
       "dependencies": {
         "domelementtype": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
           "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
           "dev": true
         },
         "entities": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-          "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
           "dev": true
         }
       }
     },
     "domelementtype": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
     "domhandler": {
@@ -1382,7 +1975,7 @@
       "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
       "dev": true,
       "requires": {
-        "domelementtype": "1.3.0"
+        "domelementtype": "1"
       }
     },
     "domutils": {
@@ -1391,88 +1984,91 @@
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "requires": {
-        "dom-serializer": "0.1.0",
-        "domelementtype": "1.3.0"
+        "dom-serializer": "0",
+        "domelementtype": "1"
       }
     },
-    "duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
+      "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
       "dev": true,
       "requires": {
-        "readable-stream": "1.1.14"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
       }
     },
+    "editorconfig": {
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz",
+      "integrity": "sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^10.11.7",
+        "@types/semver": "^5.5.0",
+        "commander": "^2.19.0",
+        "lru-cache": "^4.1.3",
+        "semver": "^5.6.0",
+        "sigmund": "^1.0.1"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.96",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz",
+      "integrity": "sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==",
+      "dev": true
+    },
     "end-of-stream": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-      "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "1.3.3"
-      },
-      "dependencies": {
-        "once": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        }
+        "once": "^1.4.0"
       }
     },
     "entities": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
       "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
       "dev": true
     },
     "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
     "es5-ext": {
-      "version": "0.10.39",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz",
-      "integrity": "sha512-AlaXZhPHl0po/uxMx1tyrlt1O86M6D5iVaDH8UgLfgek4kXTX6vzsRfJQWC2Ku+aG8pkw1XWzh9eTkwfVrsD5g==",
+      "version": "0.10.46",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz",
+      "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "1"
       }
     },
     "es6-iterator": {
@@ -1481,9 +2077,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.39",
-        "es6-symbol": "3.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
       }
     },
     "es6-symbol": {
@@ -1492,8 +2088,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.39"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "es6-weak-map": {
@@ -1502,10 +2098,10 @@
       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.39",
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.14",
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
       }
     },
     "escape-string-regexp": {
@@ -1515,9 +2111,9 @@
       "dev": true
     },
     "esprima": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
     "esutils": {
@@ -1532,14 +2128,14 @@
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.39"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "eventemitter3": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
-      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
     "exit": {
@@ -1549,36 +2145,53 @@
       "dev": true
     },
     "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "is-posix-bracket": "0.1.1"
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "requires": {
-        "fill-range": "2.2.3"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "expand-tilde": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-      "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
     "extend-shallow": {
@@ -1587,8 +2200,8 @@
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "assign-symbols": "1.0.0",
-        "is-extendable": "1.0.1"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -1597,442 +2210,1007 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
     },
     "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
-        "is-extglob": "1.0.0"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
       }
     },
     "fancy-log": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-      "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "time-stamp": "1.1.0"
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
       }
     },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true
-    },
     "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "is-number": "2.1.0",
-        "isobject": "2.1.0",
-        "randomatic": "1.1.6",
-        "repeat-element": "1.1.2",
-        "repeat-string": "1.6.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
-    "find-index": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
-      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
-      "dev": true
-    },
     "find-up": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "dev": true,
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "findup-sync": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
-      "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
       "dev": true,
       "requires": {
-        "detect-file": "0.1.0",
-        "is-glob": "2.0.1",
-        "micromatch": "2.3.11",
-        "resolve-dir": "0.1.1"
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
       }
     },
     "fined": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz",
-      "integrity": "sha1-WyhCS3YNdZiWC374SA3/itNmDpc=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
+      "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
       "dev": true,
       "requires": {
-        "expand-tilde": "1.2.2",
-        "lodash.assignwith": "4.2.0",
-        "lodash.isempty": "4.4.0",
-        "lodash.isplainobject": "4.0.6",
-        "lodash.isstring": "4.0.1",
-        "lodash.pick": "4.4.0",
-        "parse-filepath": "1.0.1"
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
       }
     },
-    "first-chunk-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-      "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-      "dev": true
-    },
     "flagged-respawn": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz",
-      "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=",
-      "dev": true
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz",
+      "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=",
       "dev": true
     },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+    "flush-write-stream": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
+      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.4"
       }
     },
-    "fs-exists-sync": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-      "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=",
-      "dev": true
-    },
-    "fs-readdir-recursive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
-      "integrity": "sha1-jNF0XItPiinIyuw5JHaSG6GV9WA=",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "gaze": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-      "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
+    "follow-redirects": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
       "dev": true,
       "requires": {
-        "globule": "0.1.0"
+        "debug": "=3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "for-in": "^1.0.1"
       }
     },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
+        "map-cache": "^0.2.2"
       }
     },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+    "fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
       "dev": true,
       "requires": {
-        "is-glob": "2.0.1"
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
       }
     },
-    "glob-stream": {
-      "version": "3.1.18",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-      "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
+    "fs-readdir-recursive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "glob": "4.5.3",
-        "glob2base": "0.0.12",
-        "minimatch": "2.0.10",
-        "ordered-read-streams": "0.1.0",
-        "through2": "0.6.5",
-        "unique-stream": "1.0.0"
+        "nan": "^2.9.2",
+        "node-pre-gyp": "^0.10.0"
       },
       "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
         "glob": {
-          "version": "4.5.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.21",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "^2.1.0"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
           "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "2.0.10",
-            "once": "1.4.0"
+            "number-is-nan": "^1.0.0"
           }
         },
         "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^2.1.2",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.10.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.0",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.1.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
           "requires": {
-            "brace-expansion": "1.1.7"
+            "deep-extend": "^0.5.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
           }
         },
         "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "version": "2.3.6",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.0.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.2.4",
+            "minizlib": "^1.1.0",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true
         },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
+            "is-extglob": "^2.1.0"
           }
         }
       }
     },
-    "glob-watcher": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-      "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
+    "glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
       "dev": true,
       "requires": {
-        "gaze": "0.5.2"
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
       }
     },
-    "glob2base": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
+    "glob-watcher": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
+      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
       "dev": true,
       "requires": {
-        "find-index": "0.1.1"
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "object.defaults": "^1.1.0"
       }
     },
     "global-modules": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-      "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
-        "global-prefix": "0.1.5",
-        "is-windows": "0.2.0"
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
       }
     },
     "global-prefix": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-      "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.1",
-        "ini": "1.3.4",
-        "is-windows": "0.2.0",
-        "which": "1.2.14"
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
       }
     },
     "globals": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
-      "integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY=",
+      "version": "11.9.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
+      "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
       "dev": true
     },
     "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true,
-      "requires": {
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "globule": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-      "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
+      "version": "6.1.0",
+      "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
-        "glob": "3.1.21",
-        "lodash": "1.0.2",
-        "minimatch": "0.2.14"
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
       "dependencies": {
-        "glob": {
-          "version": "3.1.21",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "1.2.3",
-            "inherits": "1.0.2",
-            "minimatch": "0.2.14"
-          }
-        },
-        "graceful-fs": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
-          "dev": true
-        },
-        "inherits": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
-          "dev": true
-        },
-        "lodash": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-          "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
-        },
-        "minimatch": {
-          "version": "0.2.14",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "2.7.3",
-            "sigmund": "1.0.1"
-          }
         }
       }
     },
     "glogg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-      "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz",
+      "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
       "dev": true,
       "requires": {
-        "sparkles": "1.0.0"
+        "sparkles": "^1.0.0"
       }
     },
     "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
       "dev": true
     },
     "gulp": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
-      "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
-      "dev": true,
-      "requires": {
-        "archy": "1.0.0",
-        "chalk": "1.1.3",
-        "deprecated": "0.0.1",
-        "gulp-util": "3.0.8",
-        "interpret": "1.0.3",
-        "liftoff": "2.3.0",
-        "minimist": "1.2.0",
-        "orchestrator": "0.3.8",
-        "pretty-hrtime": "1.0.3",
-        "semver": "4.3.6",
-        "tildify": "1.2.0",
-        "v8flags": "2.1.1",
-        "vinyl-fs": "0.3.14"
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz",
+      "integrity": "sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=",
+      "dev": true,
+      "requires": {
+        "glob-watcher": "^5.0.0",
+        "gulp-cli": "^2.0.0",
+        "undertaker": "^1.0.0",
+        "vinyl-fs": "^3.0.0"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+        "gulp-cli": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz",
+          "integrity": "sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "archy": "^1.0.0",
+            "array-sort": "^1.0.0",
+            "color-support": "^1.1.3",
+            "concat-stream": "^1.6.0",
+            "copy-props": "^2.0.1",
+            "fancy-log": "^1.3.2",
+            "gulplog": "^1.0.0",
+            "interpret": "^1.1.0",
+            "isobject": "^3.0.1",
+            "liftoff": "^2.5.0",
+            "matchdep": "^2.0.0",
+            "mute-stdout": "^1.0.0",
+            "pretty-hrtime": "^1.0.0",
+            "replace-homedir": "^1.0.0",
+            "semver-greatest-satisfied-range": "^1.1.0",
+            "v8flags": "^3.0.1",
+            "yargs": "^7.1.0"
+          }
         }
       }
     },
     "gulp-babel": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-6.1.3.tgz",
-      "integrity": "sha512-tm15R3rt4gO59WXCuqrwf4QXJM9VIJC+0J2NPYSC6xZn+cZRD5y5RPGAiHaDxCJq7Rz5BDljlrk3cEjWADF+wQ==",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.24.1",
-        "object-assign": "4.1.1",
-        "plugin-error": "1.0.1",
-        "replace-ext": "0.0.1",
-        "through2": "2.0.3",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      }
-    },
-    "gulp-clean-css": {
-      "version": "3.9.3",
-      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.9.3.tgz",
-      "integrity": "sha512-mw5Qrio7W3rvswmVlZ7eaxOhBIp6zQMBFLgcHoi/xbOtaKT5zmElkHt8mvbRre7fMt5eLgppIkW+j9Cm+O/UqQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-8.0.0.tgz",
+      "integrity": "sha512-oomaIqDXxFkg7lbpBou/gnUkX51/Y/M2ZfSjL2hdqXTAlSWZcgZtd2o0cOH0r/eE8LWD0+Q/PsLsr2DKOoqToQ==",
       "dev": true,
       "requires": {
-        "clean-css": "4.1.11",
-        "plugin-error": "1.0.1",
-        "through2": "2.0.3",
-        "vinyl-sourcemaps-apply": "0.2.1"
+        "plugin-error": "^1.0.1",
+        "replace-ext": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl-sourcemaps-apply": "^0.2.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
       }
     },
     "gulp-concat": {
@@ -2041,36 +3219,19 @@
       "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
       "dev": true,
       "requires": {
-        "concat-with-sourcemaps": "1.0.4",
-        "through2": "2.0.3",
-        "vinyl": "2.0.2"
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
       },
       "dependencies": {
-        "clone-stats": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-          "dev": true
-        },
-        "replace-ext": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz",
-          "integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=",
-          "dev": true,
-          "requires": {
-            "clone": "1.0.2",
-            "clone-buffer": "1.0.0",
-            "clone-stats": "1.0.0",
-            "cloneable-readable": "1.0.0",
-            "is-stream": "1.1.0",
-            "remove-trailing-separator": "1.0.1",
-            "replace-ext": "1.0.0"
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
@@ -2081,7 +3242,19 @@
       "integrity": "sha1-/1xc/LklUNqpIyqPPrNe9Ty18mA=",
       "dev": true,
       "requires": {
-        "through2": "2.0.3"
+        "through2": "~2.0.1"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
       }
     },
     "gulp-gzip": {
@@ -2090,109 +3263,42 @@
       "integrity": "sha512-ZIxfkUwk2XmZPTT9pPHrHUQlZMyp9nPhg2sfoeN27mBGpi7OaHnOD+WCN41NXjfJQ69lV1nQ9LLm1hYxx4h3UQ==",
       "dev": true,
       "requires": {
-        "ansi-colors": "1.1.0",
-        "bytes": "3.0.0",
-        "fancy-log": "1.3.2",
-        "plugin-error": "1.0.1",
-        "stream-to-array": "2.3.0",
-        "through2": "2.0.3"
+        "ansi-colors": "^1.0.1",
+        "bytes": "^3.0.0",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^1.0.0",
+        "stream-to-array": "^2.3.0",
+        "through2": "^2.0.3"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-          "dev": true
-        },
-        "fancy-log": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz",
-          "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
-          "dev": true,
-          "requires": {
-            "ansi-gray": "0.1.1",
-            "color-support": "1.1.3",
-            "time-stamp": "1.1.0"
-          }
-        },
-        "stream-to-array": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz",
-          "integrity": "sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M=",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "any-promise": "1.3.0"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
     },
     "gulp-ice-builder": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-ice-builder/-/gulp-ice-builder-2.0.0.tgz",
-      "integrity": "sha512-5O930OkVAa2NDGZreR2geE0bytB4AWRu4bMVdpjTDNNfS50gT0vIdS9ug6rcRhynA1ca1mpORdFN/+173fpxEQ==",
-      "dev": true,
-      "requires": {
-        "gulp-util": "3.0.8",
-        "through2": "2.0.3"
-      }
-    },
-    "gulp-jshint": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.1.0.tgz",
-      "integrity": "sha512-sP3NK8Y/1e58O0PH9t6s7DAr/lKDSUbIY207oWSeufM6/VclB7jJrIBcPCsyhrFTCDUl9DauePbt6VqP2vPM5w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gulp-ice-builder/-/gulp-ice-builder-3.0.2.tgz",
+      "integrity": "sha512-afVNyD+45a/R3gA3WNVDDDnKw1sXUOf+h3MtyNNg8EE7gN48+nkUPq2ltl3e+BwFI9uZUVI4oiBIhuaqxvE5bw==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.4",
-        "minimatch": "3.0.4",
-        "plugin-error": "0.1.2",
-        "rcloader": "0.2.2",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "1.0.3",
-            "array-slice": "0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "dev": true,
-          "requires": {
-            "kind-of": "1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        },
-        "plugin-error": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-          "dev": true,
-          "requires": {
-            "ansi-cyan": "0.1.1",
-            "ansi-red": "0.1.1",
-            "arr-diff": "1.1.0",
-            "arr-union": "2.1.0",
-            "extend-shallow": "1.1.4"
-          }
-        }
+        "fancy-log": "^1.3.3",
+        "plugin-error": "^1.0.1",
+        "replace-ext": "^1.0.0",
+        "rollup": "^1.0.1",
+        "semver": "^5.6.0",
+        "stream-combiner": "^0.2.2",
+        "through2": "^3.0.0",
+        "typescript": "^3.2.2",
+        "typescript-formatter": "^7.2.2",
+        "vinyl": "^2.2.0"
       }
     },
     "gulp-newer": {
@@ -2201,9 +3307,9 @@
       "integrity": "sha512-h79fGO55S/P9eAADbLAP9aTtVYpLSR1ONj08VPaSdVVNVYhTS8p1CO1TW7kEMu+hC+sytmCqcUr5LesvZEtDoQ==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "kew": "0.7.0",
-        "plugin-error": "0.1.2"
+        "glob": "^7.0.3",
+        "kew": "^0.7.0",
+        "plugin-error": "^0.1.2"
       },
       "dependencies": {
         "arr-diff": {
@@ -2212,8 +3318,8 @@
           "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
           "dev": true,
           "requires": {
-            "arr-flatten": "1.0.3",
-            "array-slice": "0.2.3"
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
           }
         },
         "arr-union": {
@@ -2222,18 +3328,24 @@
           "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
           "dev": true
         },
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        },
         "extend-shallow": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
           "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
           "dev": true,
           "requires": {
-            "kind-of": "1.1.0"
+            "kind-of": "^1.1.0"
           }
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -2243,26 +3355,20 @@
           "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
           "dev": true,
           "requires": {
-            "ansi-cyan": "0.1.1",
-            "ansi-red": "0.1.1",
-            "arr-diff": "1.1.0",
-            "arr-union": "2.1.0",
-            "extend-shallow": "1.1.4"
+            "ansi-cyan": "^0.1.1",
+            "ansi-red": "^0.1.1",
+            "arr-diff": "^1.0.1",
+            "arr-union": "^2.0.1",
+            "extend-shallow": "^1.1.2"
           }
         }
       }
     },
-    "gulp-open": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-open/-/gulp-open-2.1.0.tgz",
-      "integrity": "sha512-JzFlG7szoFyjNtlo6f7JnkaNOm0ZaYKofSGvs+4YRI4G+oTknJDn8N14Ocau06yJA1eQoFSOQVHhVWqas1cnHA==",
-      "dev": true,
-      "requires": {
-        "colors": "1.1.2",
-        "open": "0.0.5",
-        "plugin-log": "0.1.0",
-        "through2": "2.0.3"
-      }
+    "gulp-rename": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
+      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==",
+      "dev": true
     },
     "gulp-sourcemaps": {
       "version": "2.6.4",
@@ -2270,125 +3376,113 @@
       "integrity": "sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=",
       "dev": true,
       "requires": {
-        "@gulp-sourcemaps/identity-map": "1.0.1",
-        "@gulp-sourcemaps/map-sources": "1.0.0",
-        "acorn": "5.4.1",
-        "convert-source-map": "1.5.0",
-        "css": "2.2.1",
-        "debug-fabulous": "1.0.0",
-        "detect-newline": "2.1.0",
-        "graceful-fs": "4.1.11",
-        "source-map": "0.6.1",
-        "strip-bom-string": "1.0.0",
-        "through2": "2.0.3"
+        "@gulp-sourcemaps/identity-map": "1.X",
+        "@gulp-sourcemaps/map-sources": "1.X",
+        "acorn": "5.X",
+        "convert-source-map": "1.X",
+        "css": "2.X",
+        "debug-fabulous": "1.X",
+        "detect-newline": "2.X",
+        "graceful-fs": "4.X",
+        "source-map": "~0.6.0",
+        "strip-bom-string": "1.X",
+        "through2": "2.X"
       },
       "dependencies": {
-        "acorn": {
-          "version": "5.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz",
-          "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
-        },
-        "debug-fabulous": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.0.0.tgz",
-          "integrity": "sha512-dsd50qQ1atDeurcxL7XOjPp4nZCGZzWIONDujDXzl1atSyC3hMbZD+v6440etw+Vt0Pr8ce4TQzHfX3KZM05Mw==",
+        }
+      }
+    },
+    "gulp-terser": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-1.1.6.tgz",
+      "integrity": "sha512-L+PgqJdj5fcn9BQIcpkHpz23lC/grr2JlOEj5Oegb/HasSASWrtDqML8yW6hwAr8DLv70u+HfeQe+vhVqCrOWw==",
+      "dev": true,
+      "requires": {
+        "plugin-error": "^1.0.1",
+        "terser": "^3.11.0",
+        "through2": "^3.0.0",
+        "vinyl-sourcemaps-apply": "^0.2.1"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
+          "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
           "dev": true,
           "requires": {
-            "debug": "3.1.0",
-            "memoizee": "0.4.11",
-            "object-assign": "4.1.1"
+            "readable-stream": "2 || 3",
+            "xtend": "~4.0.1"
           }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
         }
       }
     },
-    "gulp-uglifyes": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/gulp-uglifyes/-/gulp-uglifyes-0.1.3.tgz",
-      "integrity": "sha512-p6EzPCBbPo+joHp85NxNcT/aPuodfb+UIYTsEKB8PuxAPwbiqhr3HBrpARqvLyO5VYYjREynnT6Tr++0YLRSUQ==",
+    "gulp-typescript": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.0.tgz",
+      "integrity": "sha512-lMj2U+Ni6HyFaY2nr1sSQ6D014eHil5L1i52XWBaAQUR9UAUUp9btnm4yRBT2Jb8xhrwqmhMssZf/g2B7cinCA==",
       "dev": true,
       "requires": {
-        "gulp-util": "3.0.8",
-        "through2": "2.0.3",
-        "uglify-es": "3.3.9"
+        "ansi-colors": "^3.0.5",
+        "plugin-error": "^1.0.1",
+        "source-map": "^0.7.3",
+        "through2": "^3.0.0",
+        "vinyl": "^2.1.0",
+        "vinyl-fs": "^3.0.3"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.13.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+        "ansi-colors": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+          "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
           "dev": true
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "uglify-es": {
-          "version": "3.3.9",
-          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-          "dev": true,
-          "requires": {
-            "commander": "2.13.0",
-            "source-map": "0.6.1"
+        "through2": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
+          "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3",
+            "xtend": "~4.0.1"
           }
         }
       }
     },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "dev": true,
-      "requires": {
-        "array-differ": "1.0.0",
-        "array-uniq": "1.0.3",
-        "beeper": "1.1.1",
-        "chalk": "1.1.3",
-        "dateformat": "2.0.0",
-        "fancy-log": "1.3.0",
-        "gulplog": "1.0.0",
-        "has-gulplog": "0.1.0",
-        "lodash._reescape": "3.0.0",
-        "lodash._reevaluate": "3.0.0",
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.template": "3.6.2",
-        "minimist": "1.2.0",
-        "multipipe": "0.1.2",
-        "object-assign": "3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "2.0.3",
-        "vinyl": "0.5.3"
+    "gulp-uglifyes": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/gulp-uglifyes/-/gulp-uglifyes-0.2.1.tgz",
+      "integrity": "sha512-N2A47hGX4pK463/3E/tFuMCnTDHw2vXjHNBM6LCWmdFkJ50LF1vqCYi+71AtvT0DZxpEZN1EUMPbhOAwy/ohKw==",
+      "dev": true,
+      "requires": {
+        "plugin-error": "^1.0.1",
+        "through2": "^2.0.3",
+        "uglify-es": "^3.3.7"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
         }
       }
     },
@@ -2398,25 +3492,51 @@
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
       "requires": {
-        "glogg": "1.0.0"
+        "glogg": "^1.0.0"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "sparkles": "1.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "hogan.js": {
@@ -2431,48 +3551,38 @@
       "dependencies": {
         "mkdirp": {
           "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
           "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
           "dev": true
         }
       }
     },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
-      }
-    },
     "homedir-polyfill": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "1.0.0"
+        "parse-passwd": "^1.0.0"
       }
     },
     "hosted-git-info": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
-      "integrity": "sha1-AHa59GonBQbduq6lZJaJdGBhKmc=",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
       "dev": true
     },
     "htmlparser2": {
       "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+      "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
       "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
       "dev": true,
       "requires": {
-        "domelementtype": "1.3.0",
-        "domhandler": "2.3.0",
-        "domutils": "1.5.1",
-        "entities": "1.0.0",
-        "readable-stream": "1.1.14"
+        "domelementtype": "1",
+        "domhandler": "2.3",
+        "domutils": "1.5",
+        "entities": "1.0",
+        "readable-stream": "1.1"
       },
       "dependencies": {
         "isarray": {
@@ -2483,47 +3593,33 @@
         },
         "readable-stream": {
           "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
             "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "string_decoder": "~0.10.x"
           }
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         }
       }
     },
     "http-proxy": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
-      "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "1.2.0",
-        "requires-port": "1.0.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.17",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz",
-      "integrity": "sha1-T9qjs4rLwsAxsEXQ7c3+HsqxjI0=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "inflight": {
@@ -2532,8 +3628,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -2543,34 +3639,60 @@
       "dev": true
     },
     "ini": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
     "interpret": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
-      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
       "dev": true
     },
     "invariant": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "1.3.1"
+        "loose-envify": "^1.0.0"
       }
     },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
     "is-absolute": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
-      "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "requires": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      }
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "is-relative": "0.2.1",
-        "is-windows": "0.2.0"
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "is-arrayish": {
@@ -2584,39 +3706,62 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "binary-extensions": "1.8.0"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "is-builtin-module": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
-        "builtin-modules": "1.1.1"
+        "builtin-modules": "^1.0.0"
       }
     },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
     },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-primitive": "2.0.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
       }
     },
     "is-extendable": {
@@ -2626,36 +3771,53 @@
       "dev": true
     },
     "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "dev": true,
       "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "^2.1.1"
       }
     },
+    "is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "dev": true
+    },
     "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "is-path-cwd": {
@@ -2665,52 +3827,38 @@
       "dev": true
     },
     "is-path-in-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "1.0.0"
+        "is-path-inside": "^1.0.0"
       }
     },
     "is-path-inside": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "1.0.2"
+        "path-is-inside": "^1.0.1"
       }
     },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        }
+        "isobject": "^3.0.1"
       }
     },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
-    },
     "is-promise": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
@@ -2718,27 +3866,21 @@
       "dev": true
     },
     "is-relative": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
-      "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
-        "is-unc-path": "0.1.2"
+        "is-unc-path": "^1.0.0"
       }
     },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
-    },
     "is-unc-path": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
-      "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
-        "unc-path-regex": "0.1.2"
+        "unc-path-regex": "^0.1.2"
       }
     },
     "is-utf8": {
@@ -2747,10 +3889,16 @@
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
+    "is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "dev": true
+    },
     "is-windows": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-      "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
     "isarray": {
@@ -2766,323 +3914,216 @@
       "dev": true
     },
     "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "requires": {
-        "isarray": "1.0.0"
-      }
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "js-levenshtein": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz",
+      "integrity": "sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==",
+      "dev": true
     },
     "js-tokens": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
-      "integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
     "jsesc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
     "jshint": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz",
-      "integrity": "sha1-HnJSkVzmgbQIJ+4UJIxG006apiw=",
+      "version": "2.9.7",
+      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz",
+      "integrity": "sha512-Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==",
+      "dev": true,
+      "requires": {
+        "cli": "~1.0.0",
+        "console-browserify": "1.1.x",
+        "exit": "0.1.x",
+        "htmlparser2": "3.8.x",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2",
+        "shelljs": "0.3.x",
+        "strip-json-comments": "1.0.x"
+      }
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
       "dev": true,
       "requires": {
-        "cli": "1.0.1",
-        "console-browserify": "1.1.0",
-        "exit": "0.1.2",
-        "htmlparser2": "3.8.3",
-        "lodash": "3.7.0",
-        "minimatch": "3.0.4",
-        "shelljs": "0.3.0",
-        "strip-json-comments": "1.0.4"
+        "jsonify": "~0.0.0"
+      }
+    },
+    "json5": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
       },
       "dependencies": {
-        "lodash": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz",
-          "integrity": "sha1-Nni9irmVBXwHreg27S7wh9qBHUU=",
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
       }
     },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "just-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
       "dev": true
     },
     "kew": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
       "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
       "dev": true
     },
     "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "1.1.5"
-      }
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
     },
-    "liftoff": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
-      "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=",
+    "last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
       "dev": true,
       "requires": {
-        "extend": "3.0.1",
-        "findup-sync": "0.4.3",
-        "fined": "1.0.2",
-        "flagged-respawn": "0.3.2",
-        "lodash.isplainobject": "4.0.6",
-        "lodash.isstring": "4.0.1",
-        "lodash.mapvalues": "4.6.0",
-        "rechoir": "0.6.2",
-        "resolve": "1.3.3"
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
       }
     },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
-      },
-      "dependencies": {
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "0.2.1"
-          }
-        }
+        "readable-stream": "^2.0.5"
       }
     },
-    "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-      "dev": true
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
-    },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
-    "lodash.assignwith": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz",
-      "integrity": "sha1-EnqX8CrcQXUalU0ksN4X4QDgOOs=",
-      "dev": true
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "lodash._root": "3.0.1"
+        "invert-kv": "^1.0.0"
       }
     },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
-      "dev": true
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
-      "dev": true
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+    "lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
       "dev": true,
       "requires": {
-        "lodash._getnative": "3.9.1",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isarray": "3.0.4"
+        "flush-write-stream": "^1.0.2"
       }
     },
-    "lodash.mapvalues": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-      "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz",
-      "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=",
-      "dev": true
-    },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-      "dev": true
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+    "liftoff": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
+      "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
       "dev": true,
       "requires": {
-        "lodash._basecopy": "3.0.1",
-        "lodash._basetostring": "3.0.1",
-        "lodash._basevalues": "3.0.0",
-        "lodash._isiterateecall": "3.0.9",
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.escape": "3.2.0",
-        "lodash.keys": "3.1.2",
-        "lodash.restparam": "3.6.1",
-        "lodash.templatesettings": "3.1.1"
+        "extend": "^3.0.0",
+        "findup-sync": "^2.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
       }
     },
-    "lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.escape": "3.2.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
     "loose-envify": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "requires": {
-        "js-tokens": "3.0.1"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
-        "currently-unhandled": "0.4.1",
-        "signal-exit": "3.0.2"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
-    "lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
-      "dev": true
-    },
     "lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
       "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.39"
+        "es5-ext": "~0.10.2"
+      }
+    },
+    "make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
       }
     },
     "map-cache": {
@@ -3091,73 +4132,62 @@
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "dev": true,
+      "requires": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      }
     },
     "memoizee": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.11.tgz",
-      "integrity": "sha1-vemBdmPJ5A/bKk6hw2cpYIeujI8=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.39",
-        "es6-weak-map": "2.0.2",
-        "event-emitter": "0.3.5",
-        "is-promise": "2.1.0",
-        "lru-queue": "0.1.0",
-        "next-tick": "1.0.0",
-        "timers-ext": "0.1.2"
-      }
-    },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "requires": {
-        "camelcase-keys": "2.1.0",
-        "decamelize": "1.2.0",
-        "loud-rejection": "1.6.0",
-        "map-obj": "1.0.1",
-        "minimist": "1.2.0",
-        "normalize-package-data": "2.3.8",
-        "object-assign": "4.1.1",
-        "read-pkg-up": "1.0.1",
-        "redent": "1.0.0",
-        "trim-newlines": "1.0.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.45",
+        "es6-weak-map": "^2.0.2",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.1",
+        "lru-queue": "0.1",
+        "next-tick": "1",
+        "timers-ext": "^0.1.5"
       }
     },
     "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-      "dev": true,
-      "requires": {
-        "arr-diff": "2.0.0",
-        "array-unique": "0.2.1",
-        "braces": "1.8.5",
-        "expand-brackets": "0.1.5",
-        "extglob": "0.3.2",
-        "filename-regex": "2.0.1",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1",
-        "kind-of": "3.2.2",
-        "normalize-path": "2.1.1",
-        "object.omit": "2.0.1",
-        "parse-glob": "3.0.4",
-        "regex-cache": "0.4.3"
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       }
     },
     "minimatch": {
@@ -3166,18 +4196,39 @@
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "1.1.7"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
       "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "dev": true,
       "requires": {
@@ -3190,46 +4241,72 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+    "mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
+      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
       "dev": true,
-      "requires": {
-        "duplexer2": "0.0.2"
-      }
+      "optional": true
     },
-    "natives": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-      "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=",
-      "dev": true
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
     },
     "next-tick": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
+    "node-releases": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.3.tgz",
+      "integrity": "sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
     "nopt": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
       "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.0"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
-      "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "2.4.2",
-        "is-builtin-module": "1.0.0",
-        "semver": "4.3.6",
-        "validate-npm-package-license": "3.0.1"
+        "hosted-git-info": "^2.1.4",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-path": {
@@ -3238,7 +4315,16 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "1.0.1"
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "now-and-later": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.0.tgz",
+      "integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.2"
       }
     },
     "number-is-nan": {
@@ -3253,92 +4339,158 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "wrappy": "1.0.2"
+        "isobject": "^3.0.0"
       }
     },
-    "open": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
-      "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=",
-      "dev": true
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
     },
-    "orchestrator": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
-      "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
+    "object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
       "dev": true,
       "requires": {
-        "end-of-stream": "0.1.5",
-        "sequencify": "0.0.7",
-        "stream-consume": "0.1.0"
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
-    "ordered-read-streams": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-      "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
-      "dev": true
+    "object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+    "object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
     },
-    "output-file-sync": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
-      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1"
+        "wrappy": "1"
       }
     },
-    "parse-filepath": {
+    "ordered-read-streams": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz",
-      "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
       "dev": true,
       "requires": {
-        "is-absolute": "0.2.6",
-        "map-cache": "0.2.2",
-        "path-root": "0.1.1"
+        "readable-stream": "^2.0.1"
       }
     },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
+        "lcid": "^1.0.0"
+      }
+    },
+    "output-file-sync": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz",
+      "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "is-plain-obj": "^1.1.0",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
+    "parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
       }
     },
     "parse-json": {
@@ -3347,27 +4499,45 @@
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "1.3.1"
+        "error-ex": "^1.2.0"
       }
     },
+    "parse-node-version": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.0.tgz",
+      "integrity": "sha512-02GTVHD1u0nWc20n2G7WX/PgdhNFG04j5fi1OkaJzPWLTcf6vh6229Lta1wTmXG/7Dg42tCssgkccVt7qvd8Kg==",
+      "dev": true
+    },
     "parse-passwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
     "path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
       "dev": true,
       "requires": {
-        "pinkie-promise": "2.0.1"
+        "pinkie-promise": "^2.0.0"
       }
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
@@ -3378,9 +4548,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
     "path-root": {
@@ -3389,7 +4559,7 @@
       "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
       "dev": true,
       "requires": {
-        "path-root-regex": "0.1.2"
+        "path-root-regex": "^0.1.0"
       }
     },
     "path-root-regex": {
@@ -3404,15 +4574,23 @@
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
       "dev": true
     },
     "pinkie": {
@@ -3427,7 +4605,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "plugin-error": {
@@ -3436,129 +4614,72 @@
       "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
       "dev": true,
       "requires": {
-        "ansi-colors": "1.1.0",
-        "arr-diff": "4.0.0",
-        "arr-union": "3.1.0",
-        "extend-shallow": "3.0.2"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        }
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
       }
     },
-    "plugin-log": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/plugin-log/-/plugin-log-0.1.0.tgz",
-      "integrity": "sha1-hgSc9qsQgzOYqTHzaJy67nteEzM=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "dateformat": "1.0.12"
-      },
-      "dependencies": {
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "4.0.1",
-            "meow": "3.7.0"
-          }
-        }
-      }
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true
     },
     "pretty-hrtime": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
     "private": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
       "dev": true
     },
     "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
       "dev": true
     },
-    "pump": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
-      "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "1.4.1",
-        "once": "1.4.0"
-      },
-      "dependencies": {
-        "end-of-stream": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-          "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0"
-          }
-        }
-      }
-    },
-    "q": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
       "dev": true
     },
-    "randomatic": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz",
-      "integrity": "sha1-EQ3Kv/OX6dz/fAeJzMCkmt8exbs=",
-      "dev": true,
-      "requires": {
-        "is-number": "2.1.0",
-        "kind-of": "3.2.2"
-      }
-    },
-    "rcfinder": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz",
-      "integrity": "sha1-8+gPOH3fmugK4wpBADKWQuroERU=",
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
       "requires": {
-        "lodash.clonedeep": "4.5.0"
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
       }
     },
-    "rcloader": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.2.2.tgz",
-      "integrity": "sha1-WNIpi0YtC5v9ITPSoex0+9cFxxc=",
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "lodash.assign": "4.2.0",
-        "lodash.isobject": "3.0.2",
-        "lodash.merge": "4.6.0",
-        "rcfinder": "0.1.9"
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
       },
       "dependencies": {
-        "lodash.isobject": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
-          "dev": true
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
         }
       }
     },
@@ -3568,9 +4689,9 @@
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.3.8",
-        "path-type": "1.1.0"
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
       }
     },
     "read-pkg-up": {
@@ -3579,48 +4700,34 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
       }
     },
     "readable-stream": {
-      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-      "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
+      "version": "2.3.6",
+      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "dev": true,
       "requires": {
-        "buffer-shims": "1.0.0",
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "string_decoder": "1.0.1",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "readable-stream": "2.2.9",
-        "set-immediate-shim": "1.0.1"
-      }
-    },
-    "recast": {
-      "version": "0.11.23",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-      "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
-      "dev": true,
-      "requires": {
-        "ast-types": "0.9.6",
-        "esprima": "3.1.3",
-        "private": "0.1.7",
-        "source-map": "0.5.7"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       }
     },
     "rechoir": {
@@ -3629,125 +4736,129 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "1.3.3"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "requires": {
-        "indent-string": "2.1.0",
-        "strip-indent": "1.0.1"
+        "resolve": "^1.1.6"
       }
     },
     "regenerate": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
-      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
       "dev": true
     },
-    "regenerator": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.9.7.tgz",
-      "integrity": "sha1-4LpY673iO4lurHWue5O+JIPM+G8=",
+    "regenerate-unicode-properties": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz",
+      "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==",
       "dev": true,
       "requires": {
-        "babel-core": "6.24.1",
-        "commoner": "0.10.8",
-        "recast": "0.11.23",
-        "regenerator-preset": "0.9.6",
-        "regenerator-runtime": "0.10.5",
-        "through": "2.3.8"
-      }
-    },
-    "regenerator-preset": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/regenerator-preset/-/regenerator-preset-0.9.6.tgz",
-      "integrity": "sha1-UkdEXjYA+pXPszb5A95pafEpCUA=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-plugin-syntax-async-generators": "6.13.0",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.24.1",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "regenerator-transform": "0.9.11"
+        "regenerate": "^1.4.0"
       }
     },
     "regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+      "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==",
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.9.11",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz",
-      "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=",
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz",
+      "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.24.1",
-        "private": "0.1.7"
+        "private": "^0.1.6"
       }
     },
-    "regex-cache": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "0.1.3",
-        "is-primitive": "2.0.0"
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "regexpu-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz",
+      "integrity": "sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==",
       "dev": true,
       "requires": {
-        "regenerate": "1.3.2",
-        "regjsgen": "0.2.0",
-        "regjsparser": "0.1.5"
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^7.0.0",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.0.2"
       }
     },
     "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
       "dev": true
     },
     "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
       "dev": true,
       "requires": {
-        "jsesc": "0.5.0"
+        "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         }
       }
     },
+    "remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      }
+    },
+    "remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "dev": true,
+      "requires": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
+      }
+    },
     "remove-trailing-separator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz",
-      "integrity": "sha1-YV67lq9VlVLUv0BXyENtSGq2PMQ=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
       "dev": true
     },
     "repeat-element": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
       "dev": true
     },
     "repeat-string": {
@@ -3756,19 +4867,33 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+      "dev": true
+    },
+    "replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
       "dev": true,
       "requires": {
-        "is-finite": "1.0.2"
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
       }
     },
-    "replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
     "requires-port": {
@@ -3778,22 +4903,31 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
-      "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+      "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
       "dev": true,
       "requires": {
-        "path-parse": "1.0.5"
+        "path-parse": "^1.0.5"
       }
     },
     "resolve-dir": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-      "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "1.2.2",
-        "global-modules": "0.2.3"
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "dev": true,
+      "requires": {
+        "value-or-function": "^3.0.0"
       }
     },
     "resolve-url": {
@@ -3802,52 +4936,102 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
     "rimraf": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.0.5"
       }
     },
     "rollup": {
-      "version": "0.41.6",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.41.6.tgz",
-      "integrity": "sha1-4NBUl4d6OYwQTYFtJzOnGKepTio=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.0.1.tgz",
+      "integrity": "sha512-jf1EA9xJMx4hgEVdJQd8lVo2a0gbzY7fKM9kHZwQzcafYDapwLijd9G56Kxm2/RdEnQUEw9mSv8PyRWhsV0x2A==",
       "dev": true,
       "requires": {
-        "source-map-support": "0.4.15"
+        "@types/estree": "0.0.39",
+        "@types/node": "*",
+        "acorn": "^6.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz",
+          "integrity": "sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==",
+          "dev": true
+        }
       }
     },
     "safe-buffer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-      "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
     "semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
       "dev": true
     },
-    "sequencify": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
-      "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
+    "semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "dev": true,
+      "requires": {
+        "sver-compat": "^1.5.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true
     },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
     },
     "shelljs": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
       "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=",
       "dev": true
     },
@@ -3857,110 +5041,309 @@
       "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
       "dev": true
     },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
     "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
       "dev": true
     },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
     "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true
     },
     "source-map-resolve": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-      "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
       "requires": {
-        "atob": "1.1.3",
-        "resolve-url": "0.2.1",
-        "source-map-url": "0.3.0",
-        "urix": "0.1.0"
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "source-map-support": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
-      "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+      "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "source-map-url": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-      "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
     "sparkles": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-      "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
       "dev": true
     },
     "spdx-correct": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
-        "spdx-license-ids": "1.2.2"
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
-    "spdx-expression-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
       "dev": true
     },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
     "spdx-license-ids": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz",
+      "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==",
       "dev": true
     },
-    "stream-consume": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
-      "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
       "dev": true
     },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stream-combiner": {
+      "version": "0.2.2",
+      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
+      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
+      "dev": true,
+      "requires": {
+        "duplexer": "~0.1.1",
+        "through": "~2.3.4"
+      }
+    },
+    "stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "stream-to-array": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz",
+      "integrity": "sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M=",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.1.0"
+      }
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
     "string_decoder": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-      "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+      "version": "1.1.1",
+      "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.0.1"
+        "safe-buffer": "~5.1.0"
       }
     },
     "strip-ansi": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-      "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "first-chunk-stream": "1.0.0",
-        "is-utf8": "0.2.1"
+        "is-utf8": "^0.2.0"
       }
     },
     "strip-bom-string": {
@@ -3969,15 +5352,6 @@
       "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
       "dev": true
     },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "4.0.1"
-      }
-    },
     "strip-json-comments": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
@@ -3985,34 +5359,85 @@
       "dev": true
     },
     "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "terser": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.11.0.tgz",
+      "integrity": "sha512-5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.17.1",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.6"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
     "through2": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
+      "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
       "dev": true,
       "requires": {
-        "readable-stream": "2.2.9",
-        "xtend": "4.0.1"
+        "readable-stream": "2 || 3",
+        "xtend": "~4.0.1"
       }
     },
-    "tildify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
-      "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
+    "through2-filter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+      "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2"
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
       }
     },
     "time-stamp": {
@@ -4022,26 +5447,93 @@
       "dev": true
     },
     "timers-ext": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz",
-      "integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
+    "to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.39",
-        "next-tick": "1.0.0"
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
       }
     },
     "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "dev": true
     },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.3"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
+      }
     },
     "trim-right": {
       "version": "1.0.1",
@@ -4049,16 +5541,198 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
+      "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
+      "dev": true
+    },
+    "typescript-formatter": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
+      "integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
+      "dev": true,
+      "requires": {
+        "commandpost": "^1.0.0",
+        "editorconfig": "^0.15.0"
+      }
+    },
+    "uglify-es": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+      "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.13.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
       "dev": true
     },
+    "undertaker": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.0.tgz",
+      "integrity": "sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      }
+    },
+    "undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "dev": true
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz",
+      "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
     "unique-stream": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
+      "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
+      "dev": true,
+      "requires": {
+        "json-stable-stringify": "^1.0.0",
+        "through2-filter": "^2.0.0"
+      }
+    },
+    "unset-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-      "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
       "dev": true
     },
     "urix": {
@@ -4067,10 +5741,10 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
     "util-deprecate": {
@@ -4080,108 +5754,77 @@
       "dev": true
     },
     "v8flags": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz",
+      "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
       "dev": true,
       "requires": {
-        "user-home": "1.1.1"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "validate-npm-package-license": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
+    "value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "dev": true
+    },
     "vinyl": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
       "dev": true,
       "requires": {
-        "clone": "1.0.2",
-        "clone-stats": "0.0.1",
-        "replace-ext": "0.0.1"
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
       }
     },
     "vinyl-fs": {
-      "version": "0.3.14",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-      "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
-      "dev": true,
-      "requires": {
-        "defaults": "1.0.3",
-        "glob-stream": "3.1.18",
-        "glob-watcher": "0.0.6",
-        "graceful-fs": "3.0.11",
-        "mkdirp": "0.5.1",
-        "strip-bom": "1.0.0",
-        "through2": "0.6.5",
-        "vinyl": "0.4.6"
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
+      "requires": {
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
       },
       "dependencies": {
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-          "dev": true
-        },
-        "graceful-fs": {
-          "version": "3.0.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-          "dev": true,
-          "requires": {
-            "natives": "1.1.0"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
         "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
-          }
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-          "dev": true,
-          "requires": {
-            "clone": "0.2.0",
-            "clone-stats": "0.0.1"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
@@ -4192,7 +5835,34 @@
       "integrity": "sha1-AIIEN8ujgmLO+IAthA+T4zku5Es=",
       "dev": true,
       "requires": {
-        "through2": "2.0.3"
+        "through2": "^2.0.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
+      }
+    },
+    "vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "dev": true,
+      "requires": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
       }
     },
     "vinyl-sourcemaps-apply": {
@@ -4201,16 +5871,40 @@
       "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "^0.5.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "which": {
-      "version": "1.2.14",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
       }
     },
     "wrappy": {
@@ -4224,6 +5918,48 @@
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
       "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
       "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0"
+      }
     }
   }
 }
diff -Nru zeroc-ice-3.7.1/js/README.md zeroc-ice-3.7.2/js/README.md
--- zeroc-ice-3.7.1/js/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -82,7 +82,7 @@
 
 You can start the NodeJS tests with:
 ```
-npm run test:node
+python allTests.py
 ```
 
 If everything worked out, you should see lots of `ok` messages. In case of a
@@ -90,19 +90,21 @@
 
 You can start the browser tests with:
 ```
-npm run test:browser
+python allTests.py --browser Manual
 ```
 
-This opens the test page (http://127.0.0.1:8080) using the system's default
-browser. These tests require a web browser with ECMAScript 6 support, such as
-a recent version of Chrome, Firefox or Safari.
+Then open the test page (http://127.0.0.1:8080/start) using a web browser.
+These tests require a web browser with ECMAScript 6 support, such as
+a recent version of Chrome, Firefox, Microsoft Edge or Safari.
 
-If you are using another web browser, such as Microsoft Edge or Internet
-Explorer, you should use instead:
+If you are using another web browser, such as Internet Explorer, you should
+use instead:
 ```
-npm run test:browser-es5
+python allTests.py --browser Manual --es5
 ```
 
+Then open the test page (http://127.0.0.1:8080/es5/start)
+
 This runs a version of the test suite transpiled to ECMAScript 5 using [Babel][2].
 
 On macOS the first time you run the tests, you will be prompted for your
@@ -188,9 +190,9 @@
 npm pack
 ```
 
-This will generate the file `ice-3.7.1.tgz`, which can be installed by running:
+This will generate the file `ice-3.7.2.tgz`, which can be installed by running:
 ```
-npm install <path_to_file>/ice-3.7.1.tgz
+npm install ice-3.7.2.tgz
 ```
 
 To use Ice for JavaScript with a browser, copy the appropriate JavaScript
diff -Nru zeroc-ice-3.7.1/js/src/es5/index.js zeroc-ice-3.7.2/js/src/es5/index.js
--- zeroc-ice-3.7.1/js/src/es5/index.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/es5/index.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-require("babel-polyfill");
-module.exports.Ice      = require("./Ice/Ice").Ice;
-module.exports.IceMX    = require("./Ice/Ice").IceMX;
-module.exports.IceSSL   = require("./Ice/Ice").IceSSL;
+require("@babel/polyfill");
+module.exports.Ice = require("./Ice/Ice").Ice;
+module.exports.IceMX = require("./Ice/Ice").IceMX;
+module.exports.IceSSL = require("./Ice/Ice").IceSSL;
 module.exports.Glacier2 = require("./Glacier2/Glacier2").Glacier2;
-module.exports.IceGrid  = require("./IceGrid/IceGrid").IceGrid;
+module.exports.IceGrid = require("./IceGrid/IceGrid").IceGrid;
 module.exports.IceStorm = require("./IceStorm/IceStorm").IceStorm;
diff -Nru zeroc-ice-3.7.1/js/src/Glacier2/.gitignore zeroc-ice-3.7.2/js/src/Glacier2/.gitignore
--- zeroc-ice-3.7.1/js/src/Glacier2/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Glacier2/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,14 @@
 PermissionsVerifierF.js
+PermissionsVerifierF.d.ts
 PermissionsVerifier.js
+PermissionsVerifier.d.ts
 Router.js
+Router.d.ts
 RouterF.js
+RouterF.d.ts
 Session.js
+Session.d.ts
 SSLInfo.js
+SSLInfo.d.ts
 Metrics.js
+Metrics.d.ts
diff -Nru zeroc-ice-3.7.1/js/src/Glacier2/Glacier2.js zeroc-ice-3.7.2/js/src/Glacier2/Glacier2.js
--- zeroc-ice-3.7.1/js/src/Glacier2/Glacier2.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Glacier2/Glacier2.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-var _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry;
+const _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry;
 
 module.exports.Glacier2 = _ModuleRegistry.require(module,
     [
         "../Glacier2/PermissionsVerifier",
         "../Glacier2/Router",
         "../Glacier2/Session",
-        "../Glacier2/SSLInfo",
+        "../Glacier2/SSLInfo"
     ]).Glacier2;
diff -Nru zeroc-ice-3.7.1/js/src/Glacier2/sources.json zeroc-ice-3.7.2/js/src/Glacier2/sources.json
--- zeroc-ice-3.7.1/js/src/Glacier2/sources.json	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Glacier2/sources.json	2019-02-05 18:03:04.000000000 +0000
@@ -10,5 +10,5 @@
         "Glacier2/Session.ice",
         "Glacier2/SSLInfo.ice"],
     "common":[
-        "Glacier2/Glacier2.js"]
+        "Glacier2.js"]
 }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ACM.js zeroc-ice-3.7.2/js/src/Ice/ACM.js
--- zeroc-ice-3.7.1/js/src/Ice/ACM.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ACM.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module, ["../Ice/Debug", "../Ice/Connection"]);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Address.d.ts zeroc-ice-3.7.2/js/src/Ice/Address.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Address.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Address.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,17 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class Address
+        {
+            constructor(host:string, port:number);
+
+            host:string;
+            port:number;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Address.js zeroc-ice-3.7.2/js/src/Ice/Address.js
--- zeroc-ice-3.7.1/js/src/Ice/Address.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Address.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ArrayUtil.d.ts zeroc-ice-3.7.2/js/src/Ice/ArrayUtil.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/ArrayUtil.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ArrayUtil.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,16 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class ArrayUtil
+        {
+            static clone<T>(arr:T[]):T[];
+            static equals(lhs:any[]|Uint8Array, rhs:any[]|Uint8Array, valuesEqual?:(v1:any, v2:any)=>boolean):boolean;
+            static shuffle(arr:any[]):void;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ArrayUtil.js zeroc-ice-3.7.2/js/src/Ice/ArrayUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/ArrayUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ArrayUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 const _ModuleRegistry = Ice._ModuleRegistry;
@@ -29,7 +24,7 @@
     {
         return e1.equals(e2);
     }
-    else if(e1 instanceof Array)
+    else if(e1 instanceof Array || e1 instanceof Uint8Array)
     {
         return ArrayUtil.equals(e1, e2, eq);
     }
@@ -92,11 +87,13 @@
     let helper = null;
     Object.defineProperty(module, name,
         {
-            get: function()
+            get: () =>
                 {
                     if(helper === null)
                     {
-                        helper = Ice.StreamHelpers.generateSeqHelper(_ModuleRegistry.type(valueHelper), fixed, _ModuleRegistry.type(elementType));
+                        helper = Ice.StreamHelpers.generateSeqHelper(_ModuleRegistry.type(valueHelper),
+                                                                     fixed,
+                                                                     _ModuleRegistry.type(elementType));
                     }
                     return helper;
                 }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/AsyncResultBase.d.ts zeroc-ice-3.7.2/js/src/Ice/AsyncResultBase.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/AsyncResultBase.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/AsyncResultBase.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,19 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class AsyncResultBase<T> extends Promise<T>
+        {
+            constructor(communicator:Communicator, op:string, connection:Connection, proxy:ObjectPrx, adapter:ObjectAdapter);
+            readonly communicator:Communicator;
+            readonly connection:Connection;
+            readonly proxy:ObjectPrx;
+            readonly adapter:ObjectAdapter;
+            readonly operation:string;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/AsyncResultBase.js zeroc-ice-3.7.2/js/src/Ice/AsyncResultBase.js
--- zeroc-ice-3.7.1/js/src/Ice/AsyncResultBase.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/AsyncResultBase.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/Promise").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/AsyncResult.d.ts zeroc-ice-3.7.2/js/src/Ice/AsyncResult.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/AsyncResult.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/AsyncResult.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,20 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class AsyncResult<T> extends AsyncResultBase<T>
+        {
+            constructor(communicator:Communicator, operation:string, connection:Connection, proxy: ObjectPrx, adapter:ObjectAdapter,
+                        completed:(result:AsyncResult<T>) => void);
+            cancel():void;
+            isCompleted():boolean;
+            isSent():boolean;
+            throwLocalException():void;
+            sentSynchronously():boolean;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/AsyncResult.js zeroc-ice-3.7.2/js/src/Ice/AsyncResult.js
--- zeroc-ice-3.7.1/js/src/Ice/AsyncResult.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/AsyncResult.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/AsyncStatus.js zeroc-ice-3.7.2/js/src/Ice/AsyncStatus.js
--- zeroc-ice-3.7.1/js/src/Ice/AsyncStatus.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/AsyncStatus.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
-Ice.AsyncStatus = { Queued: 0, Sent: 1 };
+Ice.AsyncStatus = {Queued: 0, Sent: 1};
 module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Base64.js zeroc-ice-3.7.2/js/src/Ice/Base64.js
--- zeroc-ice-3.7.1/js/src/Ice/Base64.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Base64.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/Buffer").Ice;
 
-const Buffer = Ice.Buffer;
-
 const _codeA = "A".charCodeAt(0);
 const _codea = "a".charCodeAt(0);
 const _code0 = "0".charCodeAt(0);
@@ -170,7 +163,7 @@
         // Figure out how long the final sequence is going to be.
         const totalBytes = (newStr.length * 3 / 4) + 1;
 
-        const retval = new Buffer();
+        const retval = new Ice.Buffer();
         retval.resize(totalBytes);
 
         let by1;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/BatchRequestQueue.js zeroc-ice-3.7.2/js/src/Ice/BatchRequestQueue.js
--- zeroc-ice-3.7.1/js/src/Ice/BatchRequestQueue.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/BatchRequestQueue.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/browser/Debug.js zeroc-ice-3.7.2/js/src/Ice/browser/Debug.js
--- zeroc-ice-3.7.1/js/src/Ice/browser/Debug.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/browser/Debug.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module, ["../Ice/Class", "../Ice/Exception"]);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/browser/ModuleRegistry.js zeroc-ice-3.7.2/js/src/Ice/browser/ModuleRegistry.js
--- zeroc-ice-3.7.1/js/src/Ice/browser/ModuleRegistry.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/browser/ModuleRegistry.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 /* global
     self : false
 */
-const root = typeof(window) !== "undefined" ? window :
-             typeof(global) !== "undefined" ? global :
-             typeof(self) !== "undefined" ? self : {};
+const root = typeof window !== "undefined" ? window :
+             typeof global !== "undefined" ? global :
+             typeof self !== "undefined" ? self : {};
 /* global
     self : true
 */
@@ -25,7 +20,7 @@
         if(m === undefined)
         {
             m = {};
-            root[name] =  m;
+            root[name] = m;
         }
         return m;
     }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/browser/TimerUtil.js zeroc-ice-3.7.2/js/src/Ice/browser/TimerUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/browser/TimerUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/browser/TimerUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // jshint browser: true
@@ -15,11 +10,35 @@
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
+function isIE()
+{
+    return (navigator.userAgent.indexOf("MSIE") !== -1 || navigator.userAgent.match(/Trident.*rv:11\./));
+}
+
+function isEdge()
+{
+    return (/Edge/).test(navigator.userAgent);
+}
+
+function isWorker()
+{
+    return typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
+}
+
+const MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+let _nextId = 0;
+const nextId = function()
+{
+    if(_nextId == MAX_SAFE_INTEGER)
+    {
+        _nextId = 0;
+    }
+    return _nextId++;
+};
+const _timers = new Map();
+
 //
-// Create a timer object that uses the default browser methods. Note that we also
-// have to use apply with null as the first argument to workaround an issue where
-// IE doesn't like these functions to be called with an unknown object (it reports
-// an "Invalid calling object" error).
+// Create a timer object that uses the default browser methods.
 //
 function createTimerObject()
 {
@@ -27,47 +46,64 @@
     {
         static setTimeout(cb, ms)
         {
-            return setTimeout.apply(null, arguments);
+            return setTimeout(cb, ms);
         }
 
         static clearTimeout(id)
         {
-            return clearTimeout.apply(null, arguments);
+            return clearTimeout(id);
         }
 
-        static setInterval()
+        static setInterval(cb, ms)
         {
-            return setInterval.apply(null, arguments);
+            return setInterval(cb, ms);
         }
 
-        static clearInterval()
+        static clearInterval(id)
         {
-            return clearInterval.apply(null, arguments);
+            return clearInterval(id);
         }
     };
 
-    if(typeof(setImmediate) == "function")
+    //
+    // For Browsers that support setImmediate prefer that,
+    // otherwise implement it using MessageChannel
+    //
+    if(isEdge() || isIE())
     {
-        Timer.setImmediate = function()
+        Timer.setImmediate = function(cb)
         {
-            return setImmediate.apply(null, arguments);
+            setImmediate(cb);
         };
     }
     else
     {
-        Timer.setImmediate = function()
+        //
+        // Should be only call for workers
+        //
+        const channel = new MessageChannel();
+        channel.port1.onmessage = event =>
         {
-            return setTimeout.apply(null, arguments);
+            const id = event.data;
+            const cb = _timers.get(id);
+            if(cb !== undefined)
+            {
+                cb.call();
+                _timers.delete(id);
+            }
+        };
+
+        Timer.setImmediate = function(cb)
+        {
+            const id = nextId();
+            _timers.set(id, cb);
+            channel.port2.postMessage(id);
         };
     }
 
     return Timer;
 }
 
-const MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER  || 9007199254740991;
-
-const _timers = new Map();
-
 const _SetTimeoutType = 0;
 const _SetIntervalType = 1;
 const _SetImmediateType = 2;
@@ -76,16 +112,6 @@
 
 let worker;
 
-let _nextId = 0;
-const nextId = function()
-{
-    if(_nextId == MAX_SAFE_INTEGER)
-    {
-        _nextId = 0;
-    }
-    return _nextId++;
-};
-
 class Timer
 {
     static setTimeout(cb, ms)
@@ -186,16 +212,14 @@
     }.toString() + "());";
 };
 
-if(typeof navigator !== "undefined" &&
-   (navigator.userAgent.indexOf("MSIE") !== -1 ||
-    navigator.userAgent.match(/Trident.*rv:11\./)))
+if(isIE())
 {
     //
     // With IE always use the setInterval/setTimeout browser functions directly
     //
     Ice.Timer = createTimerObject();
 }
-else if(typeof WorkerGlobalScope !== 'undefined' && this instanceof WorkerGlobalScope)
+else if(isWorker())
 {
     //
     // If we are running in a worker don't spawn a separate worker for the timer
@@ -204,7 +228,7 @@
 }
 else if(worker === undefined)
 {
-    const url = URL.createObjectURL(new Blob([workerCode()], {type : 'text/javascript'}));
+    const url = URL.createObjectURL(new Blob([workerCode()], {type: 'text/javascript'}));
     worker = new Worker(url);
     worker.onmessage = Timer.onmessage;
     Ice.Timer = Timer;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/browser/WSTransceiver.js zeroc-ice-3.7.2/js/src/Ice/browser/WSTransceiver.js
--- zeroc-ice-3.7.1/js/src/Ice/browser/WSTransceiver.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/browser/WSTransceiver.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -52,7 +47,7 @@
     writeReadyTimeout()
     {
         const t = Math.round(this._writeReadyTimeout);
-        this._writeReadyTimeout +=  (this._writeReadyTimeout >= 5 ? 5 : 0.2);
+        this._writeReadyTimeout += (this._writeReadyTimeout >= 5 ? 5 : 0.2);
         return Math.min(t, 25);
     }
 
@@ -62,6 +57,7 @@
         this._bytesAvailableCallback = bytesAvailableCallback;
         this._bytesWrittenCallback = bytesWrittenCallback;
     }
+
     //
     // Returns SocketOperation.None when initialization is complete.
     //
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Buffer.js zeroc-ice-3.7.2/js/src/Ice/Buffer.js
--- zeroc-ice-3.7.1/js/src/Ice/Buffer.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Buffer.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/Long").Ice;
 const Long = Ice.Long;
@@ -14,10 +9,6 @@
 const bufferUnderflowExceptionMsg = "BufferUnderflowException";
 const indexOutOfBoundsExceptionMsg = "IndexOutOfBoundsException";
 
-//
-// Buffer implementation to be used by web browsers, it uses ArrayBuffer as
-// the store.
-//
 class Buffer
 {
     constructor(buffer)
@@ -26,14 +17,15 @@
         {
             this.b = buffer;
             this.v = new DataView(this.b);
+            this._limit = this.b.byteLength;
         }
         else
         {
             this.b = null; // ArrayBuffer
             this.v = null; // DataView
+            this._limit = 0;
         }
         this._position = 0;
-        this._limit = 0;
         this._shrinkCounter = 0;
     }
 
@@ -98,7 +90,7 @@
         {
             this._shrinkCounter = 0;
         }
-        this._limit = 0;
+        this._limit = this.capacity();
         this._position = 0;
     }
 
@@ -121,7 +113,7 @@
         }
         else if(n < this.capacity)
         {
-            this.b = this.b.slice(0, this.capacity);
+            this.b = this.b.slice(0, n);
             this.v = new DataView(this.b);
         }
     }
@@ -130,7 +122,7 @@
     {
         if(this._position === this._limit)
         {
-            throw new Error(bufferOverflowExceptionMsg);
+            throw new RangeError(bufferOverflowExceptionMsg);
         }
         this.v.setUint8(this._position, v);
         this._position++;
@@ -140,14 +132,14 @@
     {
         if(i >= this._limit)
         {
-            throw new Error(indexOutOfBoundsExceptionMsg);
+            throw new RangeError(indexOutOfBoundsExceptionMsg);
         }
         this.v.setUint8(i, v);
     }
 
     putArray(v)
     {
-        //Expects an Uint8Array
+        // Expects an Uint8Array
         if(!(v instanceof Uint8Array))
         {
             throw new TypeError('argument is not a Uint8Array');
@@ -156,7 +148,7 @@
         {
             if(this._position + v.length > this._limit)
             {
-                throw new Error(bufferOverflowExceptionMsg);
+                throw new RangeError(bufferOverflowExceptionMsg);
             }
             new Uint8Array(this.b, 0, this.b.byteLength).set(v, this._position);
             this._position += v.byteLength;
@@ -167,7 +159,7 @@
     {
         if(this._position + 2 > this._limit)
         {
-            throw new Error(bufferOverflowExceptionMsg);
+            throw new RangeError(bufferOverflowExceptionMsg);
         }
         this.v.setInt16(this._position, v, true);
         this._position += 2;
@@ -177,7 +169,7 @@
     {
         if(this._position + 4 > this._limit)
         {
-            throw new Error(bufferOverflowExceptionMsg);
+            throw new RangeError(bufferOverflowExceptionMsg);
         }
         this.v.setInt32(this._position, v, true);
         this._position += 4;
@@ -187,7 +179,7 @@
     {
         if(i + 4 > this._limit || i < 0)
         {
-            throw new Error(indexOutOfBoundsExceptionMsg);
+            throw new RangeError(indexOutOfBoundsExceptionMsg);
         }
         this.v.setInt32(i, v, true);
     }
@@ -196,7 +188,7 @@
     {
         if(this._position + 4 > this._limit)
         {
-            throw new Error(bufferOverflowExceptionMsg);
+            throw new RangeError(bufferOverflowExceptionMsg);
         }
         this.v.setFloat32(this._position, v, true);
         this._position += 4;
@@ -206,7 +198,7 @@
     {
         if(this._position + 8 > this._limit)
         {
-            throw new Error(bufferOverflowExceptionMsg);
+            throw new RangeError(bufferOverflowExceptionMsg);
         }
         this.v.setFloat64(this._position, v, true);
         this._position += 8;
@@ -216,7 +208,7 @@
     {
         if(this._position + 8 > this._limit)
         {
-            throw new Error(bufferOverflowExceptionMsg);
+            throw new RangeError(bufferOverflowExceptionMsg);
         }
         this.v.setInt32(this._position, v.low, true);
         this._position += 4;
@@ -240,7 +232,7 @@
     {
         if(this._position + sz > this._limit)
         {
-            throw new Error(bufferOverflowExceptionMsg);
+            throw new RangeError(bufferOverflowExceptionMsg);
         }
         for(let i = 0; i < sz; ++i)
         {
@@ -253,7 +245,7 @@
     {
         if(this._position >= this._limit)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
         const v = this.v.getUint8(this._position);
         this._position++;
@@ -264,7 +256,7 @@
     {
         if(i < 0 || i >= this._limit)
         {
-            throw new Error(indexOutOfBoundsExceptionMsg);
+            throw new RangeError(indexOutOfBoundsExceptionMsg);
         }
         return this.v.getUint8(i);
     }
@@ -273,7 +265,7 @@
     {
         if(this._position + length > this._limit)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
         const buffer = this.b.slice(this._position, this._position + length);
         this._position += length;
@@ -284,17 +276,18 @@
     {
         if(position + length > this._limit)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
-        length = length === undefined ? (this.b.byteLength - position) : length;
-        return new Uint8Array(this.b.slice(position, position + length));
+        return new Uint8Array(
+            this.b.slice(position, position + length === undefined ?
+                         (this.b.byteLength - position) : length));
     }
 
     getShort()
     {
         if(this._limit - this._position < 2)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
         const v = this.v.getInt16(this._position, true);
         this._position += 2;
@@ -305,7 +298,7 @@
     {
         if(this._limit - this._position < 4)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
         const v = this.v.getInt32(this._position, true);
         this._position += 4;
@@ -316,7 +309,7 @@
     {
         if(this._limit - this._position < 4)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
         const v = this.v.getFloat32(this._position, true);
         this._position += 4;
@@ -327,7 +320,7 @@
     {
         if(this._limit - this._position < 8)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
         const v = this.v.getFloat64(this._position, true);
         this._position += 8;
@@ -338,7 +331,7 @@
     {
         if(this._limit - this._position < 8)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
         const low = this.v.getUint32(this._position, true);
         this._position += 4;
@@ -352,7 +345,7 @@
     {
         if(this._position + length > this._limit)
         {
-            throw new Error(bufferUnderflowExceptionMsg);
+            throw new RangeError(bufferUnderflowExceptionMsg);
         }
 
         const data = new DataView(this.b, this._position, length);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/CommunicatorI.js zeroc-ice-3.7.2/js/src/Ice/CommunicatorI.js
--- zeroc-ice-3.7.1/js/src/Ice/CommunicatorI.js	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/CommunicatorI.js	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,217 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+const Ice = require("../Ice/ModuleRegistry").Ice;
+Ice._ModuleRegistry.require(module,
+    [
+        "../Ice/Instance",
+        "../Ice/Debug",
+        "../Ice/UUID",
+        "../Ice/AsyncResultBase",
+        "../Ice/LocalException"
+    ]);
+
+const Instance = Ice.Instance;
+const Debug = Ice.Debug;
+
+//
+// Ice.Communicator
+//
+class Communicator
+{
+    constructor(initData)
+    {
+        this._instance = new Instance(initData);
+    }
+
+    //
+    // Certain initialization tasks need to be completed after the
+    // constructor.
+    //
+    finishSetup(promise)
+    {
+        this._instance.finishSetup(this, promise);
+    }
+
+    destroy()
+    {
+        return this._instance.destroy();
+    }
+
+    shutdown()
+    {
+        try
+        {
+            return this._instance.objectAdapterFactory().shutdown();
+        }
+        catch(ex)
+        {
+            Debug.assert(ex instanceof Ice.CommunicatorDestroyedException);
+            return Ice.Promise.resolve();
+        }
+    }
+
+    waitForShutdown()
+    {
+        try
+        {
+            return this._instance.objectAdapterFactory().waitForShutdown();
+        }
+        catch(ex)
+        {
+            Debug.assert(ex instanceof Ice.CommunicatorDestroyedException);
+            return Ice.Promise.resolve();
+        }
+    }
+
+    isShutdown()
+    {
+        try
+        {
+            return this._instance.objectAdapterFactory().isShutdown();
+        }
+        catch(ex)
+        {
+            if(!(ex instanceof Ice.CommunicatorDestroyedException))
+            {
+                throw ex;
+            }
+            return true;
+        }
+    }
+
+    stringToProxy(s)
+    {
+        return this._instance.proxyFactory().stringToProxy(s);
+    }
+
+    proxyToString(proxy)
+    {
+        return this._instance.proxyFactory().proxyToString(proxy);
+    }
+
+    propertyToProxy(s)
+    {
+        return this._instance.proxyFactory().propertyToProxy(s);
+    }
+
+    proxyToProperty(proxy, prefix)
+    {
+        return this._instance.proxyFactory().proxyToProperty(proxy, prefix);
+    }
+
+    stringToIdentity(s)
+    {
+        return Ice.stringToIdentity(s);
+    }
+
+    identityToString(ident)
+    {
+        return Ice.identityToString(ident, this._instance.toStringMode());
+    }
+
+    createObjectAdapter(name)
+    {
+        const promise = new Ice.AsyncResultBase(this, "createObjectAdapter", this, null, null);
+        this._instance.objectAdapterFactory().createObjectAdapter(name, null, promise);
+        return promise;
+    }
+
+    createObjectAdapterWithEndpoints(name, endpoints)
+    {
+        if(name.length === 0)
+        {
+            name = Ice.generateUUID();
+        }
+
+        this.getProperties().setProperty(name + ".Endpoints", endpoints);
+        const promise = new Ice.AsyncResultBase(this, "createObjectAdapterWithEndpoints", this, null, null);
+        this._instance.objectAdapterFactory().createObjectAdapter(name, null, promise);
+        return promise;
+    }
+
+    createObjectAdapterWithRouter(name, router)
+    {
+        if(name.length === 0)
+        {
+            name = Ice.generateUUID();
+        }
+
+        const promise = new Ice.AsyncResultBase(this, "createObjectAdapterWithRouter", this, null, null);
+
+        //
+        // We set the proxy properties here, although we still use the proxy supplied.
+        //
+        this.proxyToProperty(router, name + ".Router").forEach((value, key) =>
+            {
+                this.getProperties().setProperty(key, value);
+            });
+
+        this._instance.objectAdapterFactory().createObjectAdapter(name, router, promise);
+        return promise;
+    }
+
+    addObjectFactory(factory, id)
+    {
+        this._instance.addObjectFactory(factory, id);
+    }
+
+    findObjectFactory(id)
+    {
+        return this._instance.findObjectFactory(id);
+    }
+
+    getValueFactoryManager()
+    {
+        return this._instance.initializationData().valueFactoryManager;
+    }
+
+    getImplicitContext()
+    {
+        return this._instance.getImplicitContext();
+    }
+
+    getProperties()
+    {
+        return this._instance.initializationData().properties;
+    }
+
+    getLogger()
+    {
+        return this._instance.initializationData().logger;
+    }
+
+    getDefaultRouter()
+    {
+        return this._instance.referenceFactory().getDefaultRouter();
+    }
+
+    setDefaultRouter(router)
+    {
+        this._instance.setDefaultRouter(router);
+    }
+
+    getDefaultLocator()
+    {
+        return this._instance.referenceFactory().getDefaultLocator();
+    }
+
+    setDefaultLocator(locator)
+    {
+        this._instance.setDefaultLocator(locator);
+    }
+
+    flushBatchRequests()
+    {
+        return this._instance.outgoingConnectionFactory().flushAsyncBatchRequests();
+    }
+
+    get instance()
+    {
+        return this._instance;
+    }
+}
+
+Ice.Communicator = Communicator;
+module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Communicator.js zeroc-ice-3.7.2/js/src/Ice/Communicator.js
--- zeroc-ice-3.7.1/js/src/Ice/Communicator.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Communicator.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,222 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-const Ice = require("../Ice/ModuleRegistry").Ice;
-Ice._ModuleRegistry.require(module,
-    [
-        "../Ice/Instance",
-        "../Ice/Debug",
-        "../Ice/UUID",
-        "../Ice/AsyncResultBase",
-        "../Ice/LocalException"
-    ]);
-
-const Instance = Ice.Instance;
-const Debug = Ice.Debug;
-
-//
-// Ice.Communicator
-//
-class Communicator
-{
-    constructor(initData)
-    {
-        this._instance = new Instance(initData);
-    }
-
-    //
-    // Certain initialization tasks need to be completed after the
-    // constructor.
-    //
-    finishSetup(promise)
-    {
-        this._instance.finishSetup(this, promise);
-    }
-
-    destroy()
-    {
-        return this._instance.destroy();
-    }
-
-    shutdown()
-    {
-        try
-        {
-            return this._instance.objectAdapterFactory().shutdown();
-        }
-        catch(ex)
-        {
-            Debug.assert(ex instanceof Ice.CommunicatorDestroyedException);
-            return Ice.Promise.resolve();
-        }
-    }
-
-    waitForShutdown()
-    {
-        try
-        {
-            return this._instance.objectAdapterFactory().waitForShutdown();
-        }
-        catch(ex)
-        {
-            Debug.assert(ex instanceof Ice.CommunicatorDestroyedException);
-            return Ice.Promise.resolve();
-        }
-    }
-
-    isShutdown()
-    {
-        try
-        {
-            return this._instance.objectAdapterFactory().isShutdown();
-        }
-        catch(ex)
-        {
-            if(!(ex instanceof Ice.CommunicatorDestroyedException))
-            {
-                throw ex;
-            }
-            return true;
-        }
-    }
-
-    stringToProxy(s)
-    {
-        return this._instance.proxyFactory().stringToProxy(s);
-    }
-
-    proxyToString(proxy)
-    {
-        return this._instance.proxyFactory().proxyToString(proxy);
-    }
-
-    propertyToProxy(s)
-    {
-        return this._instance.proxyFactory().propertyToProxy(s);
-    }
-
-    proxyToProperty(proxy, prefix)
-    {
-        return this._instance.proxyFactory().proxyToProperty(proxy, prefix);
-    }
-
-    stringToIdentity(s)
-    {
-        return Ice.stringToIdentity(s);
-    }
-
-    identityToString(ident)
-    {
-        return Ice.identityToString(ident, this._instance.toStringMode());
-    }
-
-    createObjectAdapter(name)
-    {
-        const promise = new Ice.AsyncResultBase(this, "createObjectAdapter", this, null, null);
-        this._instance.objectAdapterFactory().createObjectAdapter(name, null, promise);
-        return promise;
-    }
-
-    createObjectAdapterWithEndpoints(name, endpoints)
-    {
-        if(name.length === 0)
-        {
-            name = Ice.generateUUID();
-        }
-
-        this.getProperties().setProperty(name + ".Endpoints", endpoints);
-        const promise = new Ice.AsyncResultBase(this, "createObjectAdapterWithEndpoints", this, null, null);
-        this._instance.objectAdapterFactory().createObjectAdapter(name, null, promise);
-        return promise;
-    }
-
-    createObjectAdapterWithRouter(name, router)
-    {
-        if(name.length === 0)
-        {
-            name = Ice.generateUUID();
-        }
-
-        const promise = new Ice.AsyncResultBase(this, "createObjectAdapterWithRouter", this, null, null);
-
-        //
-        // We set the proxy properties here, although we still use the proxy supplied.
-        //
-        this.proxyToProperty(router, name + ".Router").forEach((value, key) =>
-            {
-                this.getProperties().setProperty(key, value);
-            });
-
-        this._instance.objectAdapterFactory().createObjectAdapter(name, router, promise);
-        return promise;
-    }
-
-    addObjectFactory(factory, id)
-    {
-        this._instance.addObjectFactory(factory, id);
-    }
-
-    findObjectFactory(id)
-    {
-        return this._instance.findObjectFactory(id);
-    }
-
-    getValueFactoryManager()
-    {
-        return this._instance.initializationData().valueFactoryManager;
-    }
-
-    getImplicitContext()
-    {
-        return this._instance.getImplicitContext();
-    }
-
-    getProperties()
-    {
-        return this._instance.initializationData().properties;
-    }
-
-    getLogger()
-    {
-        return this._instance.initializationData().logger;
-    }
-
-    getDefaultRouter()
-    {
-        return this._instance.referenceFactory().getDefaultRouter();
-    }
-
-    setDefaultRouter(router)
-    {
-        this._instance.setDefaultRouter(router);
-    }
-
-    getDefaultLocator()
-    {
-        return this._instance.referenceFactory().getDefaultLocator();
-    }
-
-    setDefaultLocator(locator)
-    {
-        this._instance.setDefaultLocator(locator);
-    }
-
-    flushBatchRequests()
-    {
-        return this._instance.outgoingConnectionFactory().flushAsyncBatchRequests();
-    }
-
-    get instance()
-    {
-        return this._instance;
-    }
-}
-
-Ice.Communicator = Communicator;
-module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/CompactIdRegistry.js zeroc-ice-3.7.2/js/src/Ice/CompactIdRegistry.js
--- zeroc-ice-3.7.1/js/src/Ice/CompactIdRegistry.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/CompactIdRegistry.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice.CompactIdRegistry = new Map();
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ConnectionI.js zeroc-ice-3.7.2/js/src/Ice/ConnectionI.js
--- zeroc-ice-3.7.1/js/src/Ice/ConnectionI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ConnectionI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -26,7 +21,7 @@
         "../Ice/Version",
         "../Ice/Exception",
         "../Ice/LocalException",
-        "../Ice/BatchRequestQueue",
+        "../Ice/BatchRequestQueue"
     ]);
 
 const AsyncStatus = Ice.AsyncStatus;
@@ -96,7 +91,7 @@
         this._readTimeoutId = 0;
         this._readTimeoutScheduled = false;
 
-        this._hasMoreData = { value: false };
+        this._hasMoreData = {value: false};
 
         this._warn = initData.properties.getPropertyAsInt("Ice.Warn.Connections") > 0;
         this._warnUdp = instance.initializationData().properties.getPropertyAsInt("Ice.Warn.Datagrams") > 0;
@@ -159,9 +154,9 @@
 
             this._startPromise = new Ice.Promise();
             this._transceiver.setCallbacks(
-                () => { this.message(SocketOperation.Write); }, // connected callback
-                () => { this.message(SocketOperation.Read); },  // read callback
-                () => { this.message(SocketOperation.Write); }  // write callback
+                () => this.message(SocketOperation.Write), // connected callback
+                () => this.message(SocketOperation.Read), // read callback
+                () => this.message(SocketOperation.Write) // write callback
             );
             this.initialize();
         }
@@ -213,6 +208,12 @@
                 this.setState(StateClosing, new Ice.CommunicatorDestroyedException());
                 break;
             }
+
+            default:
+            {
+                Debug.assert(false);
+                break;
+            }
         }
     }
 
@@ -322,7 +323,7 @@
         //
         if(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatAlways ||
            (acm.heartbeat != Ice.ACMHeartbeat.HeartbeatOff && this._writeStream.isEmpty() &&
-           now >= (this._acmLastActivity + acm.timeout / 4)))
+            now >= (this._acmLastActivity + (acm.timeout / 4))))
         {
             if(acm.heartbeat != Ice.ACMHeartbeat.HeartbeatOnDispatch || this._dispatchCount > 0)
             {
@@ -504,7 +505,7 @@
     {
         if(timeout !== undefined && timeout < 0)
         {
-            throw new Error("invalid negative ACM timeout value");
+            throw new RangeError("invalid negative ACM timeout value");
         }
         if(this._monitor === null || this._state >= StateClosed)
         {
@@ -903,7 +904,7 @@
 
         if(this._hasMoreData.value)
         {
-            Timer.setImmediate(() => { this.message(SocketOperation.Read); }); // Don't tie up the thread.
+            Timer.setImmediate(() => this.message(SocketOperation.Read)); // Don't tie up the thread.
         }
     }
 
@@ -1010,31 +1011,28 @@
                 this._instance.initializationData().logger.trace(traceLevels.networkCat, s.join(""));
             }
         }
-        else
+        else if(traceLevels.network >= 1)
         {
-            if(traceLevels.network >= 1)
-            {
-                const s = [];
-                s.push("closed ");
-                s.push(this._endpoint.protocol());
-                s.push(" connection\n");
-                s.push(this.toString());
-
-                //
-                // Trace the cause of unexpected connection closures
-                //
-                if(!(this._exception instanceof Ice.CloseConnectionException ||
-                     this._exception instanceof Ice.ConnectionManuallyClosedException ||
-                     this._exception instanceof Ice.ConnectionTimeoutException ||
-                     this._exception instanceof Ice.CommunicatorDestroyedException ||
-                     this._exception instanceof Ice.ObjectAdapterDeactivatedException))
-                {
-                    s.push("\n");
-                    s.push(this._exception.toString());
-                }
+            const s = [];
+            s.push("closed ");
+            s.push(this._endpoint.protocol());
+            s.push(" connection\n");
+            s.push(this.toString());
 
-                this._instance.initializationData().logger.trace(traceLevels.networkCat, s.join(""));
+            //
+            // Trace the cause of unexpected connection closures
+            //
+            if(!(this._exception instanceof Ice.CloseConnectionException ||
+                 this._exception instanceof Ice.ConnectionManuallyClosedException ||
+                 this._exception instanceof Ice.ConnectionTimeoutException ||
+                 this._exception instanceof Ice.CommunicatorDestroyedException ||
+                 this._exception instanceof Ice.ObjectAdapterDeactivatedException))
+            {
+                s.push("\n");
+                s.push(this._exception.toString());
             }
+
+            this._instance.initializationData().logger.trace(traceLevels.networkCat, s.join(""));
         }
 
         if(this._startPromise !== null)
@@ -1272,100 +1270,106 @@
         {
             switch(state)
             {
-            case StateNotInitialized:
-            {
-                Debug.assert(false);
-                break;
-            }
+                case StateNotInitialized:
+                {
+                    Debug.assert(false);
+                    break;
+                }
 
-            case StateNotValidated:
-            {
-                if(this._state !== StateNotInitialized)
+                case StateNotValidated:
                 {
-                    Debug.assert(this._state === StateClosed);
-                    return;
+                    if(this._state !== StateNotInitialized)
+                    {
+                        Debug.assert(this._state === StateClosed);
+                        return;
+                    }
+                    //
+                    // Register to receive validation message.
+                    //
+                    if(!this._endpoint.datagram() && !this._incoming)
+                    {
+                        //
+                        // Once validation is complete, a new connection starts out in the
+                        // Holding state. We only want to register the transceiver now if we
+                        // need to receive data in order to validate the connection.
+                        //
+                        this._transceiver.register();
+                    }
+                    break;
                 }
-                //
-                // Register to receive validation message.
-                //
-                if(!this._endpoint.datagram() && !this._incoming)
+
+                case StateActive:
                 {
                     //
-                    // Once validation is complete, a new connection starts out in the
-                    // Holding state. We only want to register the transceiver now if we
-                    // need to receive data in order to validate the connection.
+                    // Can only switch from holding or not validated to
+                    // active.
                     //
+                    if(this._state !== StateHolding && this._state !== StateNotValidated)
+                    {
+                        return;
+                    }
                     this._transceiver.register();
+                    break;
                 }
-                break;
-            }
 
-            case StateActive:
-            {
-                //
-                // Can only switch from holding or not validated to
-                // active.
-                //
-                if(this._state !== StateHolding && this._state !== StateNotValidated)
+                case StateHolding:
                 {
-                    return;
+                    //
+                    // Can only switch from active or not validated to
+                    // holding.
+                    //
+                    if(this._state !== StateActive && this._state !== StateNotValidated)
+                    {
+                        return;
+                    }
+                    if(this._state === StateActive)
+                    {
+                        this._transceiver.unregister();
+                    }
+                    break;
                 }
-                this._transceiver.register();
-                break;
-            }
 
-            case StateHolding:
-            {
-                //
-                // Can only switch from active or not validated to
-                // holding.
-                //
-                if(this._state !== StateActive && this._state !== StateNotValidated)
+                case StateClosing:
                 {
-                    return;
+                    //
+                    // Can't change back from closed.
+                    //
+                    if(this._state >= StateClosed)
+                    {
+                        return;
+                    }
+                    if(this._state === StateHolding)
+                    {
+                        // We need to continue to read in closing state.
+                        this._transceiver.register();
+                    }
+                    break;
                 }
-                if(this._state === StateActive)
+
+                case StateClosed:
                 {
+                    if(this._state === StateFinished)
+                    {
+                        return;
+                    }
+                    this._batchRequestQueue.destroy(this._exception);
                     this._transceiver.unregister();
+                    break;
                 }
-                break;
-            }
 
-            case StateClosing:
-            {
-                //
-                // Can't change back from closed.
-                //
-                if(this._state >= StateClosed)
-                {
-                    return;
-                }
-                if(this._state === StateHolding)
+                case StateFinished:
                 {
-                    // We need to continue to read in closing state.
-                    this._transceiver.register();
+                    Debug.assert(this._state === StateClosed);
+                    this._transceiver.close();
+                    this._communicator = null;
+                    break;
                 }
-                break;
-            }
 
-            case StateClosed:
-            {
-                if(this._state === StateFinished)
+                default:
                 {
-                    return;
+                    Debug.assert(false);
+                    break;
                 }
-                this._batchRequestQueue.destroy(this._exception);
-                this._transceiver.unregister();
-                break;
-            }
-
-            case StateFinished:
-            {
-                Debug.assert(this._state === StateClosed);
-                this._transceiver.close();
-                this._communicator = null;
-                break;
-            }
             }
         }
         catch(ex)
@@ -1567,7 +1571,7 @@
                     throw new Ice.ConnectionNotValidatedException();
                 }
                 this._readStream.readByte(); // Ignore compression status for validate connection.
-                if( this._readStream.readInt() !== Protocol.headerSize)
+                if(this._readStream.readInt() !== Protocol.headerSize)
                 {
                     throw new Ice.IllegalMessageSizeException();
                 }
@@ -1692,7 +1696,7 @@
         // If all the messages were sent and we are in the closing state, we schedule
         // the close timeout to wait for the peer to close the connection.
         //
-        if(this._state === StateClosing && _shutdownInitiated)
+        if(this._state === StateClosing && this._shutdownInitiated)
         {
             this.scheduleTimeout(SocketOperation.Read);
         }
@@ -1933,10 +1937,6 @@
             {
                 this.invokeException(ex, invokeNum);
             }
-            else if(ex instanceof Ice.ServantError)
-            {
-                // Ignore
-            }
             else
             {
                 //
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ConnectionRequestHandler.js zeroc-ice-3.7.2/js/src/Ice/ConnectionRequestHandler.js
--- zeroc-ice-3.7.1/js/src/Ice/ConnectionRequestHandler.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ConnectionRequestHandler.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ReferenceMode").Ice;
 const ReferenceMode = Ice.ReferenceMode;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ConnectRequestHandler.js zeroc-ice-3.7.2/js/src/Ice/ConnectRequestHandler.js
--- zeroc-ice-3.7.1/js/src/Ice/ConnectRequestHandler.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ConnectRequestHandler.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -15,7 +10,7 @@
         "../Ice/Debug",
         "../Ice/RetryException",
         "../Ice/ReferenceMode",
-        "../Ice/Exception",
+        "../Ice/Exception"
     ]);
 
 const AsyncStatus = Ice.AsyncStatus;
@@ -125,12 +120,14 @@
         const ri = this._reference.getRouterInfo();
         if(ri !== null)
         {
-                                                                                  //
-            ri.addProxy(this._proxy).then(() => this.flushRequests(),             // The proxy was added to the router
-                                                                                  // info, we're now ready to send the
-                                                                                  // queued requests.
-                                                                                  //
-                                          ex => this.setException(ex));
+            ri.addProxy(this._proxy).then(
+                //
+                // The proxy was added to the router
+                // info, we're now ready to send the
+                // queued requests.
+                //
+                () => this.flushRequests(),
+                ex => this.setException(ex));
             return; // The request handler will be initialized once addProxy completes.
         }
 
@@ -180,26 +177,23 @@
             Debug.assert(this._connection !== null);
             return true;
         }
-        else
+        else if(this._exception !== null)
         {
-            if(this._exception !== null)
-            {
-                if(this._connection !== null)
-                {
-                    //
-                    // Only throw if the connection didn't get established. If
-                    // it died after being established, we allow the caller to
-                    // retry the connection establishment by not throwing here
-                    // (the connection will throw RetryException).
-                    //
-                    return true;
-                }
-                throw this._exception;
-            }
-            else
+            if(this._connection !== null)
             {
-                return this._initialized;
+                //
+                // Only throw if the connection didn't get established. If
+                // it died after being established, we allow the caller to
+                // retry the connection establishment by not throwing here
+                // (the connection will throw RetryException).
+                //
+                return true;
             }
+            throw this._exception;
+        }
+        else
+        {
+            return this._initialized;
         }
     }
 
@@ -222,7 +216,6 @@
 
                         // Remove the request handler before retrying.
                         this._reference.getInstance().requestHandlerFactory().removeRequestHandler(this._reference, this);
-
                         request.retryException(ex.inner);
                     }
                     else
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Debug.d.ts zeroc-ice-3.7.2/js/src/Ice/Debug.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Debug.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Debug.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,14 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class Debug
+        {
+            static assert():void;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Debug.js zeroc-ice-3.7.2/js/src/Ice/Debug.js
--- zeroc-ice-3.7.1/js/src/Ice/Debug.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Debug.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+
+/* eslint no-sync: "off" */
+/* eslint no-process-exit: "off" */
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 const fs = require("fs");
diff -Nru zeroc-ice-3.7.1/js/src/Ice/DefaultsAndOverrides.js zeroc-ice-3.7.2/js/src/Ice/DefaultsAndOverrides.js
--- zeroc-ice-3.7.1/js/src/Ice/DefaultsAndOverrides.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/DefaultsAndOverrides.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/EndpointFactoryManager.js zeroc-ice-3.7.2/js/src/Ice/EndpointFactoryManager.js
--- zeroc-ice-3.7.1/js/src/Ice/EndpointFactoryManager.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/EndpointFactoryManager.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -96,7 +91,7 @@
                 throw new EndpointParseException("unrecognized argument `" + arr[0] + "' in endpoint `" + str + "'");
             }
 
-            for(let i = 0, length =  this._factories.length; i < length; ++i)
+            for(let i = 0, length = this._factories.length; i < length; ++i)
             {
                 if(this._factories[i].type() == ue.type())
                 {
diff -Nru zeroc-ice-3.7.1/js/src/Ice/EndpointI.js zeroc-ice-3.7.2/js/src/Ice/EndpointI.js
--- zeroc-ice-3.7.1/js/src/Ice/EndpointI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/EndpointI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/Endpoint").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/EnumBase.js zeroc-ice-3.7.2/js/src/Ice/EnumBase.js
--- zeroc-ice-3.7.1/js/src/Ice/EnumBase.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/EnumBase.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 //
@@ -91,10 +86,6 @@
 {
     const type = class extends EnumBase
     {
-        constructor(n, v)
-        {
-            super(n, v);
-        }
     };
 
     const enums = [];
@@ -121,9 +112,7 @@
         }
     }
 
-    Object.defineProperty(type, "minWireSize", {
-        get: function(){ return 1; }
-    });
+    Object.defineProperty(type, "minWireSize", {get: () => 1});
 
     type._write = function(os, v)
     {
@@ -136,10 +125,12 @@
             os.writeEnum(firstEnum);
         }
     };
+
     type._read = function(is)
     {
         return is.readEnum(type);
     };
+
     type._writeOpt = function(os, tag, v)
     {
         if(v !== undefined)
@@ -150,6 +141,7 @@
             }
         }
     };
+
     type._readOpt = function(is, tag)
     {
         return is.readOptionalEnum(tag, type);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Exception.d.ts zeroc-ice-3.7.2/js/src/Ice/Exception.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Exception.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Exception.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,64 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        /**
+         * Base class for all Ice exceptions.
+         */
+        abstract class Exception extends Error
+        {
+            /**
+             * Returns the name of this exception.
+             *
+             * @return The name of this exception.
+             *
+             * @deprecated ice_name() is deprecated, use ice_id() instead.
+             **/
+            ice_name():string;
+
+            /**
+             * Returns the type id of this exception.
+             *
+             * @return The type id of this exception.
+             **/
+            ice_id():string;
+
+            /**
+             * Returns a string representation of this exception.
+             *
+             * @return A string representation of this exception.
+             **/
+            toString():string;
+
+            ice_cause:string|Error;
+        }
+
+        /**
+         * Base class for all Ice run-time exceptions.
+         */
+        abstract class LocalException extends Exception {}
+
+        /**
+         * Base class for all Ice user exceptions.
+         */
+        abstract class UserException extends Exception
+        {
+            /**
+             * Obtains the sliced data associated with this instance.
+             * @return The sliced data if the exception has a preserved-slice base class and has been sliced during
+             * unmarshaling of the exception, nil otherwise.
+             */
+            ice_getSlicedData():SlicedData;
+
+            /**
+             * Obtains the Slice type ID of this exception.
+             * @return The fully-scoped type ID.
+             */
+            static ice_staticId():string;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Exception.js zeroc-ice-3.7.2/js/src/Ice/Exception.js
--- zeroc-ice-3.7.1/js/src/Ice/Exception.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Exception.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
@@ -51,17 +46,6 @@
     return s;
 };
 
-class ServantError extends Error
-{
-    constructor(cause)
-    {
-        super();
-        this.cause = cause;
-    }
-}
-
-Ice.ServantError = ServantError;
-
 //
 // Ice.Exception
 //
@@ -281,7 +265,7 @@
 const ice_getSlicedData = function()
 {
     return this._slicedData;
-}
+};
 
 Ice.Slice.PreservedUserException = function(ex)
 {
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ExUtil.js zeroc-ice-3.7.2/js/src/Ice/ExUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/ExUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ExUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/LocalException").Ice;
 
@@ -24,8 +19,8 @@
     throwUOE: function(expectedType, v)
     {
         const type = v.ice_id();
-        throw new UnexpectedObjectException("expected element of type `" + expectedType + "' but received '" +
-                                            type, type, expectedType);
+        throw new UnexpectedObjectException("expected element of type `" + expectedType + "' but received `" +
+                                            type + "'", type, expectedType);
     },
     throwMemoryLimitException: function(requested, maximum)
     {
diff -Nru zeroc-ice-3.7.1/js/src/Ice/FormatType.d.ts zeroc-ice-3.7.2/js/src/Ice/FormatType.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/FormatType.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/FormatType.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,24 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class FormatType
+        {
+            static readonly DefaultFormat:FormatType;
+            static readonly CompactFormat:FormatType;
+            static readonly SlicedFormat:FormatType;
+
+            static valueOf(value:number):FormatType;
+            equals(other:any):boolean;
+            hashCode():number;
+            toString():string;
+
+            readonly name:string;
+            readonly value:number;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/FormatType.js zeroc-ice-3.7.2/js/src/Ice/FormatType.js
--- zeroc-ice-3.7.1/js/src/Ice/FormatType.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/FormatType.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/EnumBase").Ice;
-Ice.FormatType  = Ice.Slice.defineEnum([['DefaultFormat', 0], ['CompactFormat',1], ['SlicedFormat',2]]);
+Ice.FormatType = Ice.Slice.defineEnum(
+    [
+        ['DefaultFormat', 0],
+        ['CompactFormat', 1],
+        ['SlicedFormat', 2]
+    ]);
 module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/.gitignore zeroc-ice-3.7.2/js/src/Ice/.gitignore
--- zeroc-ice-3.7.1/js/src/Ice/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,79 @@
 # Ignore generated files
+BuiltinSequences.d.ts
 BuiltinSequences.js
+Communicator.d.ts
+Communicator.js
+CommunicatorF.d.ts
+CommunicatorF.js
+Connection.d.ts
 Connection.js
+ConnectionF.d.ts
+ConnectionF.js
+ConnectionInfo.d.ts
 ConnectionInfo.js
+Current.d.ts
 Current.js
+Endpoint.d.ts
 Endpoint.js
+EndpointF.d.ts
+EndpointF.js
+EndpointInfo.d.ts
 EndpointInfo.js
+EndpointTypes.d.ts
 EndpointTypes.js
+FacetMap.d.ts
+FacetMap.js
+Identity.d.ts
 Identity.js
+ImplicitContext.d.ts
+ImplicitContext.js
+ImplicitContextF.d.ts
+ImplicitContextF.js
+InstrumentationF.d.ts
+InstrumentationF.js
+LocalException.d.ts
 LocalException.js
+Locator.d.ts
 Locator.js
+LocatorF.d.ts
+LocatorF.js
+Logger.d.ts
+Logger.js
+LoggerF.d.ts
+LoggerF.js
+Metrics.d.ts
 Metrics.js
+ObjectAdapter.d.ts
+ObjectAdapter.js
+ObjectAdapterF.d.ts
+ObjectAdapterF.js
+ObjectFactory.d.ts
+ObjectFactory.js
+PluginF.d.ts
+PluginF.js
+Process.d.ts
 Process.js
+ProcessF.d.ts
+ProcessF.js
+Properties.d.ts
+Properties.js
+PropertiesAdmin.d.ts
 PropertiesAdmin.js
+PropertiesF.d.ts
+PropertiesF.js
+RemoteLogger.d.ts
 RemoteLogger.js
+Router.d.ts
 Router.js
+RouterF.d.ts
+RouterF.js
+ServantLocator.d.ts
 ServantLocator.js
+ServantLocatorF.d.ts
+ServantLocatorF.js
+SliceChecksumDict.d.ts
 SliceChecksumDict.js
+ValueFactory.d.ts
+ValueFactory.js
+Version.d.ts
 Version.js
-ConnectionF.js
-EndpointF.js
-ObjectAdapterF.js
-ProcessF.js
diff -Nru zeroc-ice-3.7.1/js/src/Ice/HashMap.d.ts zeroc-ice-3.7.2/js/src/Ice/HashMap.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/HashMap.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/HashMap.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,39 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        type HashMapKey = number | string | boolean |
+            {
+                equals(other: any):boolean;
+                hashCode():number
+            };
+
+        class HashMap<Key extends HashMapKey, Value>
+        {
+            constructor();
+            constructor(other:HashMap<Key, Value>);
+            constructor(keyComparator: (k1:Key, k2:Key) => boolean,
+                        valueComparator?: (v1:Value, v2:Value) => boolean);
+
+            set(key:Key, value:Value):void;
+            get(key:Key):Value|undefined;
+            has(key:Key):boolean;
+            delete(key:Key):Value|undefined;
+            clear():void;
+            forEach(fn:(value:Value, key:Key)=>void, thisArg?:Object):void;
+
+            entries(): IterableIterator<[Key, Value]>;
+            keys(): IterableIterator<Key>;
+            values(): IterableIterator<Value>;
+
+            equals(other: HashMap<Key, Value>, valueComparator?: (v1:Value, v2:Value) => boolean): boolean;
+            merge(from: HashMap<Key, Value>):void;
+
+            readonly size:number;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/HashMap.js zeroc-ice-3.7.2/js/src/Ice/HashMap.js
--- zeroc-ice-3.7.1/js/src/Ice/HashMap.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/HashMap.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 const _ModuleRegistry = Ice._ModuleRegistry;
@@ -234,10 +229,15 @@
             return false;
         }
 
-        const eq = valuesEqual || ((v1, v2) =>
-            {
-                return this._valueComparator.call(this._valueComparator, v1, v2);
-            });
+        let eq;
+        if(valuesEqual)
+        {
+            eq = valuesEqual;
+        }
+        else
+        {
+            eq = (v1, v2) => this._valueComparator.call(this._valueComparator, v1, v2);
+        }
 
         for(let e = this._head; e !== null; e = e._next)
         {
@@ -264,44 +264,53 @@
         // Create a new table entry.
         //
         const e = Object.create(null, {
-            "key": {
+            key:
+            {
                 enumerable: true,
                 get: function() { return this._key; }
             },
-            "value": {
+            value:
+            {
                 enumerable: true,
                 get: function() { return this._value; }
             },
-            "next": {
+            next:
+            {
                 enumerable: true,
                 get: function() { return this._next; }
             },
-            "_key": {
+            _key:
+            {
                 enumerable: false,
                 writable: true,
                 value: key
             },
-            "_value": {
+            _value:
+            {
                 enumerable: false,
                 writable: true,
                 value: value
             },
-            "_prev": {
+            _prev:
+            {
                 enumerable: false,
                 writable: true,
                 value: null
             },
-            "_next": {
+            _next:
+            {
                 enumerable: false,
                 writable: true,
                 value: null
             },
-            "_nextInBucket": {
+            _nextInBucket:
+            {
                 enumerable: false,
                 writable: true,
                 value: null
             },
-            "_hash": {
+            _hash:
+            {
                 enumerable: false,
                 writable: true,
                 value: hash
@@ -366,9 +375,9 @@
 
     computeHash(v)
     {
-        if(v === 0 || v === -0)
+        if(v === 0)
         {
-            return {key:0, hash:0};
+            return {key: 0, hash: 0};
         }
 
         if(v === null)
@@ -376,25 +385,25 @@
             if(HashMap._null === null)
             {
                 const uuid = Ice.generateUUID();
-                HashMap._null = {key:uuid, hash:StringUtil.hashCode(uuid)};
+                HashMap._null = {key: uuid, hash: StringUtil.hashCode(uuid)};
             }
             return HashMap._null;
         }
 
         if(v === undefined)
         {
-            throw new Error("cannot compute hash for undefined value");
+            throw new RangeError("cannot compute hash for undefined value");
         }
 
-        if(typeof(v.hashCode) === "function")
+        if(typeof v.hashCode === "function")
         {
-            return {key:v, hash:v.hashCode()};
+            return {key: v, hash: v.hashCode()};
         }
 
-        const type = typeof(v);
+        const type = typeof v;
         if(type === "string" || v instanceof String)
         {
-            return {key:v, hash:StringUtil.hashCode(v)};
+            return {key: v, hash: StringUtil.hashCode(v)};
         }
         else if(type === "number" || v instanceof Number)
         {
@@ -403,18 +412,18 @@
                 if(HashMap._nan === null)
                 {
                     const uuid = Ice.generateUUID();
-                    HashMap._nan = {key:uuid, hash:StringUtil.hashCode(uuid)};
+                    HashMap._nan = {key: uuid, hash: StringUtil.hashCode(uuid)};
                 }
                 return HashMap._nan;
             }
-            return {key:v, hash:v.toFixed(0)};
+            return {key: v, hash: v.toFixed(0)};
         }
         else if(type === "boolean" || v instanceof Boolean)
         {
-            return {key:v, hash:v ? 1 : 0};
+            return {key: v, hash: v ? 1 : 0};
         }
 
-        throw new Error("cannot compute hash for value of type " + type);
+        throw new RangeError("cannot compute hash for value of type " + type);
     }
 
     keysEqual(k1, k2)
diff -Nru zeroc-ice-3.7.1/js/src/Ice/HashUtil.js zeroc-ice-3.7.2/js/src/Ice/HashUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/HashUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/HashUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/StringUtil").Ice;
 const StringUtil = Ice.StringUtil;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Holder.d.ts zeroc-ice-3.7.2/js/src/Ice/Holder.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Holder.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Holder.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,14 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class Holder<T>
+        {
+            value:T;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Ice.js zeroc-ice-3.7.2/js/src/Ice/Ice.js
--- zeroc-ice-3.7.1/js/src/Ice/Ice.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Ice.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry;
 
@@ -13,14 +8,17 @@
     [
         "../Ice/Initialize",
         "../Ice/Communicator",
+        "../Ice/CommunicatorI",
         "../Ice/HashMap",
         "../Ice/Object",
         "../Ice/Value",
         "../Ice/Long",
         "../Ice/Logger",
+        "../Ice/LoggerI",
         "../Ice/ObjectPrx",
         "../Ice/BatchRequestQueue",
         "../Ice/Properties",
+        "../Ice/PropertiesI",
         "../Ice/IdentityUtil",
         "../Ice/ProcessLogger",
         "../Ice/Protocol",
diff -Nru zeroc-ice-3.7.1/js/src/Ice/IdentityUtil.d.ts zeroc-ice-3.7.2/js/src/Ice/IdentityUtil.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/IdentityUtil.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/IdentityUtil.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,14 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        function stringToIdentity(s:string):Identity;
+        function identityToString(ident:Identity, toStringMode?:ToStringMode):string;
+        function proxyIdentityCompare(lhs:ObjectPrx, rhs:ObjectPrx):number;
+        function proxyIdentityAndFacetCompare(lhs:ObjectPrx, rhs:ObjectPrx):number;
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/IdentityUtil.js zeroc-ice-3.7.2/js/src/Ice/IdentityUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/IdentityUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/IdentityUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
-Ice._ModuleRegistry.require(module, [ "../Ice/StringUtil", "../Ice/Identity", "../Ice/LocalException"]);
+Ice._ModuleRegistry.require(module,
+                            [
+                                "../Ice/StringUtil",
+                                "../Ice/Identity",
+                                "../Ice/LocalException"
+                            ]);
 
 const StringUtil = Ice.StringUtil;
 const Identity = Ice.Identity;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ImplicitContextI.js zeroc-ice-3.7.2/js/src/Ice/ImplicitContextI.js
--- zeroc-ice-3.7.1/js/src/Ice/ImplicitContextI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ImplicitContextI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module, ["../Ice/LocalException", "../Ice/Current"]);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/IncomingAsync.js zeroc-ice-3.7.2/js/src/Ice/IncomingAsync.js
--- zeroc-ice-3.7.1/js/src/Ice/IncomingAsync.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/IncomingAsync.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -47,7 +42,7 @@
 
         this._servant = null;
         this._locator = null;
-        this._cookie = { value: null };
+        this._cookie = {value: null};
 
         this._os = null;
         this._is = null;
@@ -208,7 +203,7 @@
                 }
                 else
                 {
-                    Ice.StringSeqHelper.write(this._os, [ ex.facet ]);
+                    Ice.StringSeqHelper.write(this._os, [ex.facet]);
                 }
 
                 this._os.writeString(ex.operation);
@@ -320,7 +315,7 @@
                 this._os.writeInt(this._current.requestId);
                 this._os.writeByte(Protocol.replyUserException);
                 this._os.startEncapsulation(this._current.encoding, this._format);
-                this._os.writeUserException(ex);
+                this._os.writeException(ex);
                 this._os.endEncapsulation();
                 this._connection.sendResponse(this._os);
             }
@@ -342,7 +337,6 @@
                 this._os.writeBlob(Protocol.replyHdr);
                 this._os.writeInt(this._current.requestId);
                 this._os.writeByte(Protocol.replyUnknownException);
-                //this._os.writeString(ex.toString());
                 this._os.writeString(ex.toString() + (ex.stack ? "\n" + ex.stack : ""));
                 this._connection.sendResponse(this._os);
             }
@@ -350,11 +344,6 @@
             {
                 this._connection.sendNoResponse();
             }
-
-            if(!amd)
-            {
-                throw new Ice.ServantError(ex);
-            }
         }
 
         this._connection = null;
@@ -457,7 +446,8 @@
             const promise = this._servant._iceDispatch(this, this._current);
             if(promise !== null)
             {
-                promise.then(() => this.completed(null, true), (ex) => this.completed(ex, true));
+                promise.then(() => this.completed(null, true),
+                             ex => this.completed(ex, true));
                 return;
             }
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Initialize.d.ts zeroc-ice-3.7.2/js/src/Ice/Initialize.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Initialize.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Initialize.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,29 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class InitializationData
+        {
+            constructor();
+            clone():InitializationData;
+
+            properties:Properties;
+            logger:Logger;
+            valueFactoryManager:ValueFactoryManager;
+        }
+
+        function initialize(initData?:InitializationData):Communicator;
+        function initialize(args:string[], initData?:InitializationData):Communicator;
+
+        function createProperties(args?:string[], defaults?:Properties):Properties;
+
+        function currentProtocol():ProtocolVersion;
+        function currentEncoding():EncodingVersion;
+        function stringVersion():string;
+        function intVersion():number;
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Initialize.js zeroc-ice-3.7.2/js/src/Ice/Initialize.js
--- zeroc-ice-3.7.1/js/src/Ice/Initialize.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Initialize.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -21,20 +16,23 @@
 //
 // Ice.InitializationData
 //
-Ice.InitializationData = function()
+Ice.InitializationData = class
 {
-    this.properties = null;
-    this.logger = null;
-    this.valueFactoryManager = null;
-};
+    constructor()
+    {
+        this.properties = null;
+        this.logger = null;
+        this.valueFactoryManager = null;
+    }
 
-Ice.InitializationData.prototype.clone = function()
-{
-    const r = new Ice.InitializationData();
-    r.properties = this.properties;
-    r.logger = this.logger;
-    r.valueFactoryManager = this.valueFactoryManager;
-    return r;
+    clone()
+    {
+        const r = new Ice.InitializationData();
+        r.properties = this.properties;
+        r.logger = this.logger;
+        r.valueFactoryManager = this.valueFactoryManager;
+        return r;
+    }
 };
 
 //
@@ -105,12 +103,12 @@
 
 Ice.stringVersion = function()
 {
-    return "3.7.1"; // "A.B.C", with A=major, B=minor, C=patch
+    return "3.7.2"; // "A.B.C", with A=major, B=minor, C=patch
 };
 
 Ice.intVersion = function()
 {
-    return 30701; // AABBCC, with AA=major, BB=minor, CC=patch
+    return 30702; // AABBCC, with AA=major, BB=minor, CC=patch
 };
 
 module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Instance.js zeroc-ice-3.7.2/js/src/Ice/Instance.js
--- zeroc-ice-3.7.1/js/src/Ice/Instance.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Instance.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/IPEndpointI.js zeroc-ice-3.7.2/js/src/Ice/IPEndpointI.js
--- zeroc-ice-3.7.1/js/src/Ice/IPEndpointI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/IPEndpointI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/LocatorInfo.js zeroc-ice-3.7.2/js/src/Ice/LocatorInfo.js
--- zeroc-ice-3.7.1/js/src/Ice/LocatorInfo.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/LocatorInfo.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -95,7 +90,7 @@
 
         Debug.assert(ref.isIndirect());
         let endpoints = null;
-        const cached = { value: false };
+        const cached = {value: false};
         if(!ref.isWellKnown())
         {
             endpoints = this._table.getAdapterEndpoints(ref.getAdapterId(), ttl, cached);
@@ -168,7 +163,7 @@
         }
         else
         {
-            const r =  this._table.removeObjectReference(ref.getIdentity());
+            const r = this._table.removeObjectReference(ref.getIdentity());
             if(r !== null)
             {
                 if(!r.isIndirect())
@@ -323,18 +318,15 @@
                     this.trace("found endpoints for adapter in locator cache", ref, endpoints);
                 }
             }
+            else if(ref.isWellKnown())
+            {
+                this.trace("retrieved endpoints for well-known proxy from locator, adding to locator cache",
+                           ref, endpoints);
+            }
             else
             {
-                if(ref.isWellKnown())
-                {
-                    this.trace("retrieved endpoints for well-known proxy from locator, adding to locator cache",
-                               ref, endpoints);
-                }
-                else
-                {
-                    this.trace("retrieved endpoints for adapter from locator, adding to locator cache",
-                               ref, endpoints);
-                }
+                this.trace("retrieved endpoints for adapter from locator, adding to locator cache",
+                           ref, endpoints);
             }
         }
         else
diff -Nru zeroc-ice-3.7.1/js/src/Ice/LocatorManager.js zeroc-ice-3.7.2/js/src/Ice/LocatorManager.js
--- zeroc-ice-3.7.1/js/src/Ice/LocatorManager.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/LocatorManager.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/LocatorTable.js zeroc-ice-3.7.2/js/src/Ice/LocatorTable.js
--- zeroc-ice-3.7.1/js/src/Ice/LocatorTable.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/LocatorTable.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module, ["../Ice/HashMap", "../Ice/Debug", "../Ice/IdentityUtil"]);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/LoggerI.js zeroc-ice-3.7.2/js/src/Ice/LoggerI.js
--- zeroc-ice-3.7.1/js/src/Ice/LoggerI.js	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/LoggerI.js	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,97 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+const Ice = require("../Ice/ModuleRegistry").Ice;
+
+class Logger
+{
+    constructor(prefix)
+    {
+        if(prefix !== undefined && prefix.length > 0)
+        {
+            this._prefix = prefix + ": ";
+        }
+        else
+        {
+            this._prefix = "";
+        }
+
+        this._dateformat =
+        {
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric',
+            hour: 'numeric',
+            minute: 'numeric',
+            second: 'numeric',
+            hour12: false
+        };
+    }
+
+    print(message)
+    {
+        this.write(message, false);
+    }
+
+    trace(category, message)
+    {
+        const s = [];
+        s.push("-- ");
+        s.push(this.timestamp());
+        s.push(' ');
+        s.push(this._prefix);
+        s.push(category);
+        s.push(": ");
+        s.push(message);
+        this.write(s.join(""), true);
+    }
+
+    warning(message)
+    {
+        const s = [];
+        s.push("-! ");
+        s.push(this.timestamp());
+        s.push(' ');
+        s.push(this._prefix);
+        s.push("warning: ");
+        s.push(message);
+        this.write(s.join(""), true);
+    }
+
+    error(message)
+    {
+        const s = [];
+        s.push("!! ");
+        s.push(this.timestamp());
+        s.push(' ');
+        s.push(this._prefix);
+        s.push("error: ");
+        s.push(message);
+        this.write(s.join(""), true);
+    }
+
+    cloneWithPrefix(prefix)
+    {
+        return new Logger(prefix);
+    }
+
+    write(message, indent)
+    {
+        if(indent)
+        {
+            message = message.replace(/\n/g, "\n   ");
+        }
+
+        console.log(message);
+    }
+
+    timestamp()
+    {
+        const d = new Date();
+        return d.toLocaleString("en-US", this._dateformat) + "." + d.getMilliseconds();
+    }
+}
+
+Ice.Logger = Logger;
+module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Logger.js zeroc-ice-3.7.2/js/src/Ice/Logger.js
--- zeroc-ice-3.7.1/js/src/Ice/Logger.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Logger.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-const Ice = require("../Ice/ModuleRegistry").Ice;
-
-class Logger
-{
-    constructor(prefix)
-    {
-        if(prefix !== undefined && prefix.length > 0)
-        {
-            this._prefix = prefix + ": ";
-        }
-        else
-        {
-            this._prefix = "";
-        }
-
-        this._dateformat =
-        {
-            year: 'numeric',
-            month: 'numeric',
-            day: 'numeric',
-            hour: 'numeric',
-            minute: 'numeric',
-            second: 'numeric',
-            hour12: false
-        };
-    }
-
-    print(message)
-    {
-        this.write(message, false);
-    }
-
-    trace(category, message)
-    {
-        const s = [];
-        s.push("-- ");
-        s.push(this.timestamp());
-        s.push(' ');
-        s.push(this._prefix);
-        s.push(category);
-        s.push(": ");
-        s.push(message);
-        this.write(s.join(""), true);
-    }
-
-    warning(message)
-    {
-        const s = [];
-        s.push("-! ");
-        s.push(this.timestamp());
-        s.push(' ');
-        s.push(this._prefix);
-        s.push("warning: ");
-        s.push(message);
-        this.write(s.join(""), true);
-    }
-
-    error(message)
-    {
-        const s = [];
-        s.push("!! ");
-        s.push(this.timestamp());
-        s.push(' ');
-        s.push(this._prefix);
-        s.push("error: ");
-        s.push(message);
-        this.write(s.join(""), true);
-    }
-
-    cloneWithPrefix(prefix)
-    {
-        return new Logger(prefix);
-    }
-
-    write(message, indent)
-    {
-        if(indent)
-        {
-            message = message.replace(/\n/g, "\n   ");
-        }
-
-        console.log(message);
-    }
-
-    timestamp()
-    {
-        const d = new Date();
-        return d.toLocaleString("en-US", this._dateformat) + "." + d.getMilliseconds();
-    }
-}
-
-Ice.Logger = Logger;
-module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Long.d.ts zeroc-ice-3.7.2/js/src/Ice/Long.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Long.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Long.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,21 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class Long
+        {
+            constructor(high?:number, low?:number);
+            hashCode():number;
+            equals(rhs:Long):boolean;
+            toString():string;
+            toNumber():number;
+
+            low:number;
+            high:number;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Long.js zeroc-ice-3.7.2/js/src/Ice/Long.js
--- zeroc-ice-3.7.1/js/src/Ice/Long.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Long.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/MapUtil.d.ts zeroc-ice-3.7.2/js/src/Ice/MapUtil.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/MapUtil.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/MapUtil.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,14 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class MapUtil
+        {
+            static equals<K, V>(lhs:Map<K,V>, rhs:Map<K, V>):boolean;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/MapUtil.js zeroc-ice-3.7.2/js/src/Ice/MapUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/MapUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/MapUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ModuleRegistry.js zeroc-ice-3.7.2/js/src/Ice/ModuleRegistry.js
--- zeroc-ice-3.7.1/js/src/Ice/ModuleRegistry.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ModuleRegistry.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const modules = {};
 
@@ -13,11 +8,11 @@
 {
     static module(name)
     {
-        let m =  modules[name];
+        let m = modules[name];
         if(m === undefined)
         {
             m = {};
-            modules[name] =  m;
+            modules[name] = m;
         }
         return m;
     }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ObjectAdapterFactory.js zeroc-ice-3.7.2/js/src/Ice/ObjectAdapterFactory.js
--- zeroc-ice-3.7.1/js/src/Ice/ObjectAdapterFactory.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ObjectAdapterFactory.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ObjectAdapterI.js zeroc-ice-3.7.2/js/src/Ice/ObjectAdapterI.js
--- zeroc-ice-3.7.1/js/src/Ice/ObjectAdapterI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ObjectAdapterI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -73,11 +68,11 @@
 
 const StateUninitialized = 0; // Just constructed.
 const StateHeld = 1;
-//const StateWaitActivate = 2;
+// const StateWaitActivate = 2;
 const StateActive = 3;
-//const StateDeactivating = 4;
+// const StateDeactivating = 4;
 const StateDeactivated = 5;
-const StateDestroyed  = 6;
+const StateDestroyed = 6;
 
 //
 // Only for use by IceInternal.ObjectAdapterFactory
@@ -459,7 +454,11 @@
     refreshPublishedEndpoints()
     {
         this.checkForDeactivation();
-        return this.computePublishedEndpoints().then(endpoints => this._publishedEndpoints = endpoints);
+        return this.computePublishedEndpoints().then(
+            endpoints =>
+                {
+                    this._publishedEndpoints = endpoints;
+                });
     }
 
     getPublishedEndpoints()
@@ -488,7 +487,7 @@
     setAdapterOnConnection(connection)
     {
         this.checkForDeactivation();
-        connection.setAdapterAndServantManager(this, _servantManager);
+        connection.setAdapterAndServantManager(this, this._servantManager);
     }
 
     messageSizeMax()
@@ -546,21 +545,22 @@
         let p;
         if(this._routerInfo !== null)
         {
-            p = this._routerInfo.getServerEndpoints().then((endpts) =>
-            {
-                //
-                // Remove duplicate endpoints, so we have a list of unique endpoints.
-                //
-                const endpoints = [];
-                endpts.forEach(endpoint =>
-                {
-                    if(endpoints.findIndex(value => endpoint.equals(value)) === -1)
+            p = this._routerInfo.getServerEndpoints().then(
+                endpts =>
                     {
-                        endpoints.push(endpoint);
-                    }
-                });
-                return endpoints;
-            });
+                        //
+                        // Remove duplicate endpoints, so we have a list of unique endpoints.
+                        //
+                        const endpoints = [];
+                        endpts.forEach(endpoint =>
+                                       {
+                                           if(endpoints.findIndex(value => endpoint.equals(value)) === -1)
+                                           {
+                                               endpoints.push(endpoint);
+                                           }
+                                       });
+                        return endpoints;
+                    });
         }
         else
         {
@@ -609,7 +609,7 @@
                             }
                             else
                             {
-                                quote = s.indexOf('\"', ++quote);
+                                quote = s.indexOf("\"", ++quote);
                                 if(quote == -1)
                                 {
                                     break;
@@ -632,7 +632,7 @@
 
                 const es = s.substring(beg, end);
                 const endp = this._instance.endpointFactoryManager().create(es, false);
-                if(endp == null)
+                if(endp === null)
                 {
                     throw new Ice.EndpointParseException("invalid object adapter endpoint `" + s + "'");
                 }
@@ -642,28 +642,30 @@
             p = Ice.Promise.resolve(endpoints);
         }
 
-        return p.then((endpoints) =>
-        {
-            if(this._instance.traceLevels().network >= 1 && endpoints.length > 0)
-            {
-                const s = [];
-                s.push("published endpoints for object adapter `");
-                s.push(this._name);
-                s.push("':\n");
-                let first = true;
-                endpoints.forEach(endpoint =>
+        return p.then(
+            endpoints =>
                 {
-                    if(!first)
+                    if(this._instance.traceLevels().network >= 1 && endpoints.length > 0)
                     {
-                        s.push(":");
+                        const s = [];
+                        s.push("published endpoints for object adapter `");
+                        s.push(this._name);
+                        s.push("':\n");
+                        let first = true;
+                        endpoints.forEach(endpoint =>
+                                          {
+                                              if(!first)
+                                              {
+                                                  s.push(":");
+                                              }
+                                              s.push(endpoint.toString());
+                                              first = false;
+                                          });
+                        this._instance.initializationData().logger.trace(this._instance.traceLevels().networkCat,
+                                                                         s.toString());
                     }
-                    s.push(endpoint.toString());
-                    first = false;
+                    return endpoints;
                 });
-                this._instance.initializationData().logger.trace(this._instance.traceLevels().networkCat, s.toString());
-             }
-             return endpoints;
-        });
     }
 
     filterProperties(unknownProps)
@@ -684,7 +686,7 @@
 
         let noProps = true;
         const props = this._instance.initializationData().properties.getPropertiesForPrefix(prefix);
-        for(const [key, value] of props)
+        for(const key of props.keys())
         {
             let valid = false;
             for(let i = 0; i < _suffixes.length; ++i)
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Object.d.ts zeroc-ice-3.7.2/js/src/Ice/Object.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Object.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Object.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,48 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class Object
+        {
+            /**
+             * Tests whether this object supports a specific Slice interface.
+             * @param typeID The type ID of the Slice interface to test against.
+             * @param current The Current object for the invocation.
+             * @return True if this object has the interface specified by typeID
+             * or derives from the interface specified by typeID.
+             */
+            ice_isA(typeID:string, current?:Current):boolean|PromiseLike<boolean>;
+
+            /**
+             * Tests whether this object can be reached.
+             * @param current The Current object for the invocation.
+             */
+            ice_ping(current?:Current):void|PromiseLike<void>;
+
+            /**
+             * Returns the Slice type IDs of the interfaces supported by this object.
+             * @param current The Current object for the invocation.
+             * @return The Slice type IDs of the interfaces supported by this object, in base-to-derived
+             * order. The first element of the returned array is always "::Ice::Object".
+             */
+            ice_ids(current?:Current):string[]|PromiseLike<string[]>;
+
+            /**
+             * Returns the Slice type ID of the most-derived interface supported by this object.
+             * @param current The Current object for the invocation.
+             * @return The Slice type ID of the most-derived interface.
+             */
+            ice_id(current?:Current):string|PromiseLike<string>;
+
+            /**
+             * Obtains the Slice type ID of this type.
+             * @return The return value is always "::Ice::Object".
+             */
+            static ice_staticId():string;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Object.js zeroc-ice-3.7.2/js/src/Ice/Object.js
--- zeroc-ice-3.7.1/js/src/Ice/Object.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Object.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Ice.Object
@@ -21,8 +16,6 @@
         "../Ice/OptionalFormat"
     ]);
 
-const ids = ["::Ice::Object"];
-
 Ice.Object = class
 {
     ice_isA(s, current)
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ObjectPrx.d.ts zeroc-ice-3.7.2/js/src/Ice/ObjectPrx.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/ObjectPrx.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ObjectPrx.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,422 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class ObjectPrx
+        {
+            static ice_staticId():string;
+
+            /**
+             * Tests whether this object supports a specific Slice interface.
+             * @param typeId The type ID of the Slice interface to test against.
+             * @param context The context map for the invocation.
+             * @return The asynchronous result object for the invocation.
+             */
+            ice_isA(id:string, context?:Map<string, string>):AsyncResult<boolean>;
+
+            /**
+             * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy.
+             * @param context The context map for the invocation.
+             * @return The asynchronous result object for the invocation.
+             */
+            ice_id(context?:Map<string, string>):AsyncResult<string>;
+
+            /**
+             * Returns the Slice type IDs of the interfaces supported by the target object of this proxy.
+             * @param context The context map for the invocation.
+             * @return The asynchronous result object for the invocation.
+             */
+            ice_ids(context?:Map<string, string>):AsyncResult<string[]>;
+
+            /**
+             * Tests whether the target object of this proxy can be reached.
+             * @param context The context map for the invocation.
+             * @return The asynchronous result object for the invocation.
+             */
+            ice_ping(context?:Map<string, string>):AsyncResult<void>;
+
+            /**
+             * Obtains the communicator that created this proxy.
+             * @return The communicator that created this proxy.
+             */
+            ice_getCommunicator():Communicator;
+
+            /**
+             * Obtains a stringified version of this proxy.
+             * @return A stringified proxy.
+             */
+            ice_toString():string;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the identity.
+             * @param id The identity for the new proxy.
+             * @return A proxy with the new identity.
+             */
+            ice_identity(id:Identity):this;
+
+            /**
+             * Obtains the identity embedded in this proxy.
+             * @return The identity of the target object.
+             */
+            ice_getIdentity():Identity;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the adapter ID.
+             * @param id The adapter ID for the new proxy.
+             * @return A proxy with the new adapter ID.
+             */
+            ice_adapterId(id:string):this;
+
+            /**
+             * Obtains the adapter ID for this proxy.
+             * @return The adapter ID. If the proxy does not have an adapter ID, the return value is the empty string.
+             */
+            ice_getAdapterId():string;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the endpoints.
+             * @param endpoints The endpoints for the new proxy.
+             * @return A proxy with the new endpoints.
+             */
+            ice_endpoints(endpoints:Endpoint[]):this;
+
+            /**
+             * Obtains the endpoints used by this proxy.
+             * @return The endpoints used by this proxy.
+             */
+            ice_getEndpoints():Endpoint[];
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the endpoint selection policy.
+             * @param type The new endpoint selection policy.
+             * @return A proxy with the specified endpoint selection policy.
+             */
+            ice_endpointSelection(type:EndpointSelectionType):this;
+
+            /**
+             * Obtains the endpoint selection policy for this proxy (randomly or ordered).
+             * @return The endpoint selection policy.
+             */
+            ice_getEndpointSelection():EndpointSelectionType;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the per-proxy context.
+             * @param context The context for the new proxy.
+             * @return A proxy with the new per-proxy context.
+             */
+            ice_context(ctx:Map<string, string>):this;
+
+            /**
+             * Obtains the per-proxy context for this proxy.
+             * @return The per-proxy context.
+             */
+            ice_getContext():Map<string, string>;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the facet.
+             * @param facet The facet for the new proxy.
+             * @return A proxy with the new facet.
+             */
+            ice_facet(facet:string):this;
+
+            /**
+             * Obtains the facet for this proxy.
+             * @return The facet for this proxy. If the proxy uses the default facet, the return value is the empty string.
+             */
+            ice_getFacet():string;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, but uses twoway invocations.
+             * @return A proxy that uses twoway invocations.
+             */
+            ice_twoway():this;
+
+            /**
+             * Determines whether this proxy uses twoway invocations.
+             * @return True if this proxy uses twoway invocations, false otherwise.
+             */
+            ice_isTwoway():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, but uses oneway invocations.
+             * @return A proxy that uses oneway invocations.
+             */
+            ice_oneway():this;
+
+            /**
+             * Determines whether this proxy uses oneway invocations.
+             * @return True if this proxy uses oneway invocations, false otherwise.
+             */
+            ice_isOneway():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, but uses batch oneway invocations.
+             * @return A proxy that uses batch oneway invocations.
+             */
+            ice_batchOneway():this;
+
+            /**
+             * Determines whether this proxy uses batch oneway invocations.
+             * @return True if this proxy uses batch oneway invocations, false otherwise.
+             */
+            ice_isBatchOneway():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, but uses datagram invocations.
+             * @return A proxy that uses datagram invocations.
+             */
+            ice_datagram():this;
+
+            /**
+             * Determines whether this proxy uses datagram invocations.
+             * @return True if this proxy uses datagram invocations, false otherwise.
+             */
+            ice_isDatagram():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, but uses batch datagram invocations.
+             * @return A proxy that uses batch datagram invocations.
+             */
+            ice_batchDatagram():this;
+
+            /**
+             * Determines whether this proxy uses batch datagram invocations.
+             * @return True if this proxy uses batch datagram invocations, false otherwise.
+             */
+            ice_isBatchDatagram():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for how it selects endpoints.
+             * @param secure If true, only endpoints that use a secure transport are used by the new proxy.
+             * If false, the returned proxy uses both secure and insecure endpoints.
+             * @return A proxy with the specified security policy.
+             */
+            ice_secure(secure:boolean):this;
+
+            /**
+             * Obtains the encoding version used to marshal request parameters.
+             * @return The encoding version.
+             */
+            ice_getEncodingVersion():EncodingVersion;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the encoding used to marshal
+             * parameters.
+             * @param version The encoding version to use to marshal request parameters.
+             * @return A proxy with the specified encoding version.
+             */
+            ice_encodingVersion(encoding:EncodingVersion):this;
+
+            /**
+             * Determines whether this proxy uses only secure endpoints.
+             * @return True if this proxy communicates only via secure endpoints, false otherwise.
+             */
+            ice_isSecure():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for its endpoint selection policy.
+             * @param secure If true, the new proxy will use secure endpoints for invocations and only use
+             * insecure endpoints if an invocation cannot be made via secure endpoints. If false, the
+             * proxy prefers insecure endpoints to secure ones.
+             * @return A proxy with the specified selection policy.
+             */
+            ice_preferSecure(secure:boolean):this;
+
+            /**
+             * Determines whether this proxy prefers secure endpoints.
+             * @return True if the proxy always attempts to invoke via secure endpoints before it
+             * attempts to use insecure endpoints, false otherwise.
+             */
+            ice_isPreferSecure():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for its compression setting which
+             * overrides the compression setting from the proxy endpoints.
+             * @param b True enables compression for the new proxy, false disables compression.
+             * @return A proxy with the specified compression override setting.
+             */
+            ice_compress(compress:boolean):this;
+
+            /**
+             * Obtains the compression override setting of this proxy.
+             * @return The compression override setting. If nullopt is returned, no override is set. Otherwise, true
+             * if compression is enabled, false otherwise.
+             */
+            ice_getCompress():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for its connection timeout setting
+             * which overrides the timeot setting from the proxy endpoints.
+             * @param timeout The connection timeout override for the proxy (in milliseconds).
+             * @return A proxy with the specified timeout override.
+             */
+            ice_timeout(timeout:number):this;
+
+            /**
+             * Obtains the timeout override of this proxy.
+             * @return The timeout override. If nullopt is returned, no override is set. Otherwise, returns
+             * the timeout override value.
+             */
+            ice_getTimeout():number;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the router.
+             * @param router The router for the new proxy.
+             * @return A proxy with the specified router.
+             */
+            ice_router(router:RouterPrx):this;
+
+            /**
+             * Obtains the router for this proxy.
+             * @return The router for the proxy. If no router is configured for the proxy, the return value
+             * is nil.
+             */
+            ice_getRouter():RouterPrx;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the locator.
+             * @param locator The locator for the new proxy.
+             * @return A proxy with the specified locator.
+             */
+            ice_locator(locator:LocatorPrx):this;
+
+            /**
+             * Obtains the locator for this proxy.
+             * @return The locator for this proxy. If no locator is configured, the return value is nil.
+             */
+            ice_getLocator():LocatorPrx;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the locator cache timeout.
+             * @param timeout The new locator cache timeout (in seconds).
+             * @return A proxy with the new timeout.
+             */
+            ice_locatorCacheTimeout(timeout:number):this;
+
+            /**
+             * Obtains the locator cache timeout of this proxy.
+             * @return The locator cache timeout value (in seconds).
+             */
+            ice_getLocatorCacheTimeout():number;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for collocation optimization.
+             * @param b True if the new proxy enables collocation optimization, false otherwise.
+             * @return A proxy with the specified collocation optimization.
+             */
+            ice_collocationOptimized(b:boolean):this;
+
+            /**
+             * Determines whether this proxy uses collocation optimization.
+             * @return True if the proxy uses collocation optimization, false otherwise.
+             */
+            ice_isCollocationOptimized():boolean;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for the invocation timeout.
+             * @param timeout The new invocation timeout (in milliseconds).
+             * @return A proxy with the new timeout.
+             */
+            ice_invocationTimeout(timeout:number):this;
+
+            /**
+             * Obtains the invocation timeout of this proxy.
+             * @return The invocation timeout value (in milliseconds).
+             */
+            ice_getInvocationTimeout():number;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for its connection ID.
+             * @param id The connection ID for the new proxy. An empty string removes the
+             * connection ID.
+             * @return A proxy with the specified connection ID.
+             */
+            ice_connectionId(connectionId:string):this;
+
+            /**
+             * Obtains the connection ID of this proxy.
+             * @return The connection ID.
+             */
+            ice_getConnectionId():string;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except it's a fixed proxy bound
+             * the given connection.
+             * @param connection The fixed proxy connection.
+             * @return A fixed proxy bound to the given connection.
+             */
+            ice_fixed(conn:Connection):this;
+
+            /**
+             * Obtains the Connection for this proxy. If the proxy does not yet have an established connection,
+             * it first attempts to create a connection.
+             * @return The asynchronous result object for the invocation.
+             */
+            ice_getConnection():AsyncResult<Connection>;
+
+            /**
+             * Obtains the cached Connection for this proxy. If the proxy does not yet have an established
+             * connection, it does not attempt to create a connection.
+             * @return The cached connection for this proxy, or nil if the proxy does not have
+             * an established connection.
+             */
+            ice_getCachedConnection():Connection;
+
+            /**
+             * Obtains a proxy that is identical to this proxy, except for connection caching.
+             * @param cache True if the new proxy should cache connections, false otherwise.
+             * @return A proxy with the specified caching policy.
+             */
+            ice_connectionCached(cache:boolean):this;
+
+            /**
+             * Determines whether this proxy caches connections.
+             * @return True if this proxy caches connections, false otherwise.
+             */
+            ice_isConnectionCached():boolean;
+
+            /**
+             * Flushes any pending batched requests for this communicator. The call blocks until the flush is complete.
+             * @return The asynchronous result object for the invocation.
+             */
+            ice_flushBatchRequests():AsyncResult<void>;
+
+            /**
+             * Invokes an operation dynamically.
+             * @param operation The name of the operation to invoke.
+             * @param mode The operation mode (normal or idempotent).
+             * @param inParams An encapsulation containing the encoded in-parameters for the operation.
+             * @return The asynchronous result object for the invocation .
+             */
+            ice_invoke(operation:string, mode:OperationMode, inEncaps:Uint8Array):AsyncResult<[]>;
+
+            /**
+             * Compare two proxies for equality
+             * @param rhs The proxy to compare with this proxy
+             * @returns True if the passed proxy have the same reference than this proxy.
+             */
+            equals(rhs:any):boolean;
+
+            /**
+             * Downcasts a proxy without confirming the target object's type via a remote invocation.
+             * @param prx The target proxy.
+             * @return A proxy with the requested type.
+             */
+            static uncheckedCast(prx:ObjectPrx, facet?:string):ObjectPrx;
+
+            /**
+             * Downcasts a proxy after confirming the target object's type via a remote invocation.
+             * @param prx The target proxy.
+             * @param facet A facet name.
+             * @param context The context map for the invocation.
+             * @return A proxy with the requested type and facet, or nil if the target proxy is nil or the target
+             * object does not support the requested type.
+             */
+            static checkedCast(prx:ObjectPrx, facet?:string, contex?:Map<string, string>):AsyncResult<ObjectPrx>;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ObjectPrx.js zeroc-ice-3.7.2/js/src/Ice/ObjectPrx.js
--- zeroc-ice-3.7.1/js/src/Ice/ObjectPrx.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ObjectPrx.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -25,9 +20,7 @@
 
 const ArrayUtil = Ice.ArrayUtil;
 const AsyncResultBase = Ice.AsyncResultBase;
-const AsyncResult = Ice.AsyncResult;
 const Debug = Ice.Debug;
-const FormatType = Ice.FormatType;
 const OutgoingAsync = Ice.OutgoingAsync;
 const ProxyFlushBatch = Ice.ProxyFlushBatch;
 const ProxyGetConnection = Ice.ProxyGetConnection;
@@ -170,7 +163,7 @@
     {
         if(newTimeout < -1)
         {
-            throw new Error("invalid value passed to ice_locatorCacheTimeout: " + newTimeout);
+            throw new RangeError("invalid value passed to ice_locatorCacheTimeout: " + newTimeout);
         }
         if(newTimeout === this._reference.getLocatorCacheTimeout())
         {
@@ -191,7 +184,7 @@
     {
         if(newTimeout < 1 && newTimeout !== -1)
         {
-            throw new Error("invalid value passed to ice_invocationTimeout: " + newTimeout);
+            throw new RangeError("invalid value passed to ice_invocationTimeout: " + newTimeout);
         }
         if(newTimeout === this._reference.getInvocationTimeout())
         {
@@ -415,7 +408,7 @@
     {
         if(t < 1 && t !== -1)
         {
-            throw new Error("invalid value passed to ice_timeout: " + t);
+            throw new RangeError("invalid value passed to ice_timeout: " + t);
         }
         const ref = this._reference.changeTimeout(t);
         if(ref.equals(this._reference))
@@ -437,11 +430,11 @@
     {
         if(connection === null)
         {
-            throw new Error("invalid null connection passed to ice_fixed");
+            throw new RangeError("invalid null connection passed to ice_fixed");
         }
         if(!(connection instanceof Ice.ConnectionI))
         {
-            throw new Error("invalid connection passed to ice_fixed");
+            throw new RangeError("invalid connection passed to ice_fixed");
         }
         const ref = this._reference.changeConnection(connection);
         if(ref.equals(this._reference))
@@ -701,7 +694,7 @@
             else
             {
                 const ostr = r.startWriteParams(fmt);
-                marshalFn.call(null, ostr, args);
+                marshalFn(ostr, args);
                 r.endWriteParams();
             }
             r.invoke();
@@ -738,7 +731,6 @@
         catch(ex)
         {
             this.dispatchLocalException(r, ex);
-            return;
         }
     }
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/OpaqueEndpointI.js zeroc-ice-3.7.2/js/src/Ice/OpaqueEndpointI.js
--- zeroc-ice-3.7.1/js/src/Ice/OpaqueEndpointI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/OpaqueEndpointI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Operation.js zeroc-ice-3.7.2/js/src/Ice/Operation.js
--- zeroc-ice-3.7.1/js/src/Ice/Operation.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Operation.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 const _ModuleRegistry = Ice._ModuleRegistry;
@@ -31,13 +26,14 @@
     Ice.DoubleHelper,
     Ice.StringHelper,
     Ice.Value,
-    Ice.ObjectPrx
+    Ice.ObjectPrx,
+    Ice.Value
 ];
 
 function parseParam(p)
 {
     let type = p[0];
-    const t = typeof(type);
+    const t = typeof type;
     if(t === 'number')
     {
         type = builtinHelpers[p[0]];
@@ -48,9 +44,9 @@
     }
 
     return {
-        "type": type,
-        "isObject": (p[1] === true),
-        "tag": p[2] // Optional tag, which may not be present - an undefined tag means "not optional".
+        type: type,
+        isObject: (p[1] === true),
+        tag: p[2] // Optional tag, which may not be present - an undefined tag means "not optional".
     };
 }
 
@@ -181,23 +177,29 @@
         {
             if(p.isObject)
             {
-                is.readOptionalValue(p.tag, obj => params[p.pos + offset] = obj, p.type);
+                is.readOptionalValue(p.tag,
+                                     obj =>
+                                     {
+                                         params[p.pos + offset] = obj;
+                                     },
+                                     p.type);
             }
             else
             {
                 params[p.pos + offset] = p.type.readOptional(is, p.tag);
             }
         }
+        else if(p.isObject)
+        {
+            is.readValue(obj =>
+                         {
+                             params[p.pos + offset] = obj;
+                         },
+                         p.type);
+        }
         else
         {
-            if(p.isObject)
-            {
-                is.readValue(obj => params[p.pos + offset] = obj, p.type);
-            }
-            else
-            {
-                params[p.pos + offset] = p.type.read(is);
-            }
+            params[p.pos + offset] = p.type.read(is);
         }
     };
 
@@ -277,7 +279,7 @@
     // Check to make sure the servant implements the operation.
     //
     const method = servant[op.servantMethod];
-    if(method === undefined || typeof(method) !== "function")
+    if(method === undefined || typeof method !== "function")
     {
         throw new Ice.UnknownException("servant for identity " + current.adapter.getCommunicator().identityToString(current.id) +
                                        " does not define operation `" + op.servantMethod + "'");
@@ -492,10 +494,8 @@
 
     let op = null;
 
-    proxyType.prototype[method] = function()
+    proxyType.prototype[method] = function(...args)
     {
-        const args = arguments;
-
         //
         // Parse the operation data on the first invocation of a proxy method.
         //
@@ -524,7 +524,7 @@
                         {
                             if(!p.type.validate(v))
                             {
-                                throw new Ice.MarshalException("invalid value for argument " + (i + 1)  +
+                                throw new Ice.MarshalException("invalid value for argument " + (i + 1) +
                                                                " in operation `" + op.servantMethod + "'");
                             }
                         }
@@ -558,8 +558,8 @@
                 return results.length == 1 ? results[0] : results;
             };
         }
-        return  Ice.ObjectPrx._invoke(this, op.name, op.sendMode, op.format, ctx, marshalFn, unmarshalFn,
-                                       op.exceptions, Array.prototype.slice.call(args));
+        return Ice.ObjectPrx._invoke(this, op.name, op.sendMode, op.format, ctx, marshalFn, unmarshalFn,
+                                     op.exceptions, Array.prototype.slice.call(args));
     };
 }
 
@@ -578,7 +578,7 @@
         //
         const method = getServantMethod(classType, current.operation);
 
-        if(method === undefined || typeof(method) !== 'function')
+        if(method === undefined || typeof method !== 'function')
         {
             throw new Ice.OperationNotExistException(current.id, current.facet, current.operation);
         }
@@ -633,7 +633,7 @@
         }
 
         Object.defineProperty(proxyType, "_id", {
-            get: function(){ return ids[pos]; }
+            get: () => ids[pos]
         });
     }
 };
@@ -643,10 +643,10 @@
 //
 Slice.defineOperations(Ice.Object, Ice.ObjectPrx, ["::Ice::Object"], 0,
 {
-    "ice_ping": [, 1, 1, , , , , ],
-    "ice_isA": [, 1, 1, , [1], [[7]], , ],
-    "ice_id": [, 1, 1, , [7], , , ],
-    "ice_ids": [, 1, 1, , ["Ice.StringSeqHelper"], , , ]
+    ice_ping: [undefined, 1, 1, undefined, undefined, undefined, undefined, undefined],
+    ice_isA: [undefined, 1, 1, undefined, [1], [[7]], undefined, undefined],
+    ice_id: [undefined, 1, 1, undefined, [7], undefined, undefined, undefined],
+    ice_ids: [undefined, 1, 1, undefined, ["Ice.StringSeqHelper"], undefined, undefined, undefined]
 });
 
 module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/OptionalFormat.d.ts zeroc-ice-3.7.2/js/src/Ice/OptionalFormat.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/OptionalFormat.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/OptionalFormat.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,29 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class OptionalFormat
+        {
+            static readonly F1:OptionalFormat;
+            static readonly F2:OptionalFormat;
+            static readonly F4:OptionalFormat;
+            static readonly F8:OptionalFormat;
+            static readonly Size:OptionalFormat;
+            static readonly VSize:OptionalFormat;
+            static readonly FSize:OptionalFormat;
+            static readonly Class:OptionalFormat;
+
+            static valueOf(value:number):OptionalFormat;
+            equals(other:any):boolean;
+            hashCode():number;
+            toString():string;
+
+            readonly name:string;
+            readonly value:number;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/OptionalFormat.js zeroc-ice-3.7.2/js/src/Ice/OptionalFormat.js
--- zeroc-ice-3.7.1/js/src/Ice/OptionalFormat.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/OptionalFormat.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/EnumBase").Ice;
 Ice.OptionalFormat = Ice.Slice.defineEnum([['F1', 0], ['F2', 1], ['F4', 2], ['F8', 3], ['Size', 4], ['VSize', 5], ['FSize', 6], ['Class', 7]]);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/OutgoingAsync.js zeroc-ice-3.7.2/js/src/Ice/OutgoingAsync.js
--- zeroc-ice-3.7.1/js/src/Ice/OutgoingAsync.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/OutgoingAsync.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_FOR_ACTIONSCRIPT_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -124,7 +119,7 @@
             {
                 try
                 {
-                    this._sent  = false;
+                    this._sent = false;
                     this._handler = this._proxy._getRequestHandler();
                     if((this._handler.sendAsyncRequest(this) & AsyncStatus.Sent) > 0)
                     {
@@ -184,7 +179,7 @@
 
     handleException(ex)
     {
-        const interval = { value: 0 };
+        const interval = {value: 0};
         this._cnt = this._proxy._handleException(ex, this._handler, this._mode, this._sent, interval, this._cnt);
         return interval.value;
     }
@@ -232,7 +227,7 @@
         }
         else
         {
-            Ice.StringSeqHelper.write(this._os, [ facet ]);
+            Ice.StringSeqHelper.write(this._os, [facet]);
         }
 
         this._os.writeString(this._operation);
@@ -243,7 +238,7 @@
         {
             if(ctx !== null && !(ctx instanceof Map))
             {
-                throw new Error("illegal context value, expecting null or Map");
+                throw new RangeError("illegal context value, expecting null or Map");
             }
 
             //
@@ -525,11 +520,6 @@
 
 class ProxyGetConnection extends ProxyOutgoingAsyncBase
 {
-    constructor(prx, operation)
-    {
-        super(prx, operation);
-    }
-
     invokeRemote(connection, response)
     {
         this.markFinished(true, r => r.resolve(connection));
diff -Nru zeroc-ice-3.7.1/js/src/Ice/OutgoingConnectionFactory.js zeroc-ice-3.7.2/js/src/Ice/OutgoingConnectionFactory.js
--- zeroc-ice-3.7.1/js/src/Ice/OutgoingConnectionFactory.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/OutgoingConnectionFactory.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -202,14 +197,18 @@
     applyOverrides(endpts)
     {
         const defaultsAndOverrides = this._instance.defaultsAndOverrides();
-        return endpts.map(endpoint =>
-            {
-                //
-                // Modify endpoints with overrides.
-                //
-                return defaultsAndOverrides.overrideTimeout ?
-                    endpoint.changeTimeout(defaultsAndOverrides.overrideTimeoutValue) : endpoint;
-            });
+        return endpts.map(
+            endpoint =>
+                {
+                    if(defaultsAndOverrides.overrideTimeout)
+                    {
+                        return endpoint.changeTimeout(defaultsAndOverrides.overrideTimeoutValue);
+                    }
+                    else
+                    {
+                        return endpoint;
+                    }
+                });
     }
 
     findConnectionByEndpoint(endpoints)
@@ -410,12 +409,9 @@
                                     connectionCallbacks.push(cc);
                                 }
                             }
-                            else
+                            else if(callbacks.indexOf(cc) === -1)
                             {
-                                if(callbacks.indexOf(cc) === -1)
-                                {
-                                    callbacks.push(cc);
-                                }
+                                callbacks.push(cc);
                             }
                         });
                 }
@@ -465,12 +461,9 @@
                                     failedCallbacks.push(cc);
                                 }
                             }
-                            else
+                            else if(callbacks.indexOf(cc) === -1)
                             {
-                                if(callbacks.indexOf(cc) === -1)
-                                {
-                                    callbacks.push(cc);
-                                }
+                                callbacks.push(cc);
                             }
                         });
                 }
@@ -559,16 +552,13 @@
             {
                 s.push("\n");
             }
+            else if(hasMore)
+            {
+                s.push(", trying next endpoint\n");
+            }
             else
             {
-                if(hasMore)
-                {
-                    s.push(", trying next endpoint\n");
-                }
-                else
-                {
-                    s.push(" and no more endpoints to try\n");
-                }
+                s.push(" and no more endpoints to try\n");
             }
             s.push(ex.toString());
             this._instance.initializationData().logger.trace(traceLevels.networkCat, s.join(""));
@@ -586,16 +576,13 @@
             {
                 s.push("\n");
             }
+            else if(hasMore)
+            {
+                s.push(", trying next endpoint\n");
+            }
             else
             {
-                if(hasMore)
-                {
-                    s.push(", trying next endpoint\n");
-                }
-                else
-                {
-                    s.push(" and no more endpoints to try\n");
-                }
+                s.push(" and no more endpoints to try\n");
             }
             s.push(ex.toString());
             this._instance.initializationData().logger.trace(traceLevels.networkCat, s.join(""));
@@ -831,7 +818,7 @@
     nextEndpoint()
     {
 
-        const start = (connection) =>
+        const start = connection =>
             {
                 connection.start().then(
                     () =>
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ProcessLogger.js zeroc-ice-3.7.2/js/src/Ice/ProcessLogger.js
--- zeroc-ice-3.7.1/js/src/Ice/ProcessLogger.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ProcessLogger.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-const Ice = require("../Ice/Logger").Ice;
+const Ice = require("../Ice/LoggerI").Ice;
 const Logger = Ice.Logger;
 
 let processLogger = null;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Promise.d.ts zeroc-ice-3.7.2/js/src/Ice/Promise.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Promise.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Promise.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,23 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+export class P<T> extends Promise<T>
+{
+    constructor(executor?:(resolve:(value:T|PromiseLike<T>)=>void, reject:(reason:any)=>void) => void);
+    finally(callback:() => void | PromiseLike<void>): T | PromiseLike<T>;
+    delay(ms:number): P<T>;
+    resolve<T>(value?:T|PromiseLike<T>):void;
+    reject<T>(reason:any):void;
+    static delay(ms:number):P<void>;
+    static delay<T>(ms:number, value:T):P<T>;
+    static try<T>(cb:()=>T|PromiseLike<T>):P<T>;
+}
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        export {P as Promise};
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Promise.js zeroc-ice-3.7.2/js/src/Ice/Promise.js
--- zeroc-ice-3.7.1/js/src/Ice/Promise.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Promise.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/Timer").Ice;
 const Timer = Ice.Timer;
@@ -14,7 +9,8 @@
 {
     constructor(cb)
     {
-        let res, rej;
+        let res;
+        let rej;
         super((resolve, reject) =>
             {
                 res = resolve;
@@ -30,13 +26,6 @@
         this.reject = rej;
     }
 
-    finally(cb)
-    {
-        return this.then(
-            (value) => P.resolve(cb()).then(() => value),
-            (reason) => P.resolve(cb()).then(() => { throw reason; }));
-    }
-
     delay(ms)
     {
         return this.then(
diff -Nru zeroc-ice-3.7.1/js/src/Ice/PropertiesI.js zeroc-ice-3.7.2/js/src/Ice/PropertiesI.js
--- zeroc-ice-3.7.1/js/src/Ice/PropertiesI.js	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/PropertiesI.js	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,503 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+const Ice = require("../Ice/ModuleRegistry").Ice;
+Ice._ModuleRegistry.require(module,
+    [
+        "../Ice/StringUtil",
+        "../Ice/PropertyNames",
+        "../Ice/Debug",
+        "../Ice/ProcessLogger",
+        "../Ice/ProcessLogger",
+        "../Ice/LocalException"
+    ]);
+
+const StringUtil = Ice.StringUtil;
+const PropertyNames = Ice.PropertyNames;
+const Debug = Ice.Debug;
+const getProcessLogger = Ice.getProcessLogger;
+const InitializationException = Ice.InitializationException;
+
+const ParseStateKey = 0;
+const ParseStateValue = 1;
+//
+// Ice.Properties
+//
+class Properties
+{
+    constructor(args, defaults)
+    {
+        this._properties = new Map();
+
+        if(defaults !== undefined && defaults !== null)
+        {
+            //
+            // NOTE: we can't just do a shallow copy of the map as the map values
+            // would otherwise be shared between the two PropertiesI object.
+            //
+            for(const [key, property] of defaults._properties)
+            {
+                this._properties.set(key, {value: property.value, used: false});
+            }
+        }
+
+        if(args !== undefined && args !== null)
+        {
+            const v = this.parseIceCommandLineOptions(args);
+            args.length = 0;
+            for(let i = 0; i < v.length; ++i)
+            {
+                args.push(v[i]);
+            }
+        }
+    }
+
+    getProperty(key)
+    {
+        return this.getPropertyWithDefault(key, "");
+    }
+
+    getPropertyWithDefault(key, value)
+    {
+        const pv = this._properties.get(key);
+        if(pv !== undefined)
+        {
+            pv.used = true;
+            return pv.value;
+        }
+        else
+        {
+            return value;
+        }
+    }
+
+    getPropertyAsInt(key)
+    {
+        return this.getPropertyAsIntWithDefault(key, 0);
+    }
+
+    getPropertyAsIntWithDefault(key, value)
+    {
+        const pv = this._properties.get(key);
+        if(pv !== undefined)
+        {
+            pv.used = true;
+            return parseInt(pv.value);
+        }
+        else
+        {
+            return value;
+        }
+    }
+
+    getPropertyAsList(key)
+    {
+        return this.getPropertyAsListWithDefault(key, 0);
+    }
+
+    getPropertyAsListWithDefault(key, value)
+    {
+        if(value === undefined || value === null)
+        {
+            value = [];
+        }
+
+        const pv = this._properties.get(key);
+        if(pv !== undefined)
+        {
+            pv.used = true;
+
+            let result = StringUtil.splitString(pv.value, ", \t\r\n");
+            if(result === null)
+            {
+                getProcessLogger().warning("mismatched quotes in property " + key + "'s value, returning default value");
+                return value;
+            }
+            if(result.length === 0)
+            {
+                result = value;
+            }
+            return result;
+        }
+        else
+        {
+            return value;
+        }
+    }
+
+    getPropertiesForPrefix(prefix = "")
+    {
+        const result = new Map();
+        this._properties.forEach((property, key) =>
+            {
+                if(key.indexOf(prefix) === 0)
+                {
+                    property.used = true;
+                    result.set(key, property.value);
+                }
+            });
+        return result;
+    }
+
+    setProperty(key = "", value = "")
+    {
+        //
+        // Trim whitespace
+        //
+        if(key !== null)
+        {
+            key = key.trim();
+        }
+
+        //
+        // Check if the property is legal.
+        //
+        const logger = getProcessLogger();
+        if(key === null || key.length === 0)
+        {
+            throw new InitializationException("Attempt to set property with empty key");
+        }
+
+        let dotPos = key.indexOf(".");
+        if(dotPos !== -1)
+        {
+            const prefix = key.substr(0, dotPos);
+            for(let i = 0; i < PropertyNames.validProps.length; ++i)
+            {
+                let pattern = PropertyNames.validProps[i][0].pattern;
+                dotPos = pattern.indexOf(".");
+                //
+                // Each top level prefix describes a non-empty namespace. Having a string without a
+                // prefix followed by a dot is an error.
+                //
+                Debug.assert(dotPos != -1);
+                if(pattern.substring(0, dotPos - 1) != prefix)
+                {
+                    continue;
+                }
+
+                let found = false;
+                let mismatchCase = false;
+                let otherKey;
+                for(let j = 0; j < PropertyNames.validProps[i][j].length && !found; ++j)
+                {
+                    pattern = PropertyNames.validProps[i][j].pattern();
+                    let pComp = new RegExp(pattern);
+                    found = pComp.test(key);
+
+                    if(found && PropertyNames.validProps[i][j].deprecated)
+                    {
+                        logger.warning("deprecated property: " + key);
+                        if(PropertyNames.validProps[i][j].deprecatedBy !== null)
+                        {
+                            key = PropertyNames.validProps[i][j].deprecatedBy;
+                        }
+                    }
+
+                    if(found)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        pComp = new RegExp(pattern.toUpperCase());
+                        found = pComp.test(key.toUpperCase());
+                        if(found)
+                        {
+                            mismatchCase = true;
+                            otherKey = pattern.substr(2);
+                            otherKey = otherKey.substr(0, otherKey.length - 1);
+                            otherKey = otherKey.replace(/\\/g, "");
+                            break;
+                        }
+                    }
+                }
+
+                if(!found)
+                {
+                    logger.warning("unknown property: " + key);
+                }
+                else if(mismatchCase)
+                {
+                    logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
+                }
+            }
+        }
+
+        //
+        // Set or clear the property.
+        //
+        if(value !== null && value.length > 0)
+        {
+            const pv = this._properties.get(key);
+            if(pv !== undefined)
+            {
+                pv.value = value;
+            }
+            else
+            {
+                this._properties.set(key, {value: value, used: false});
+            }
+        }
+        else
+        {
+            this._properties.delete(key);
+        }
+    }
+
+    getCommandLineOptions()
+    {
+        const result = [];
+        this._properties.forEach((property, key) =>
+            {
+                result.push("--" + key + "=" + property.value);
+            });
+        return result;
+    }
+
+    parseCommandLineOptions(pfx, options)
+    {
+        if(pfx.length > 0 && pfx.charAt(pfx.length - 1) != ".")
+        {
+            pfx += ".";
+        }
+        pfx = "--" + pfx;
+
+        const result = [];
+
+        options.forEach(opt =>
+            {
+                if(opt.indexOf(pfx) === 0)
+                {
+                    if(opt.indexOf('=') === -1)
+                    {
+                        opt += "=1";
+                    }
+
+                    this.parseLine(opt.substring(2));
+                }
+                else
+                {
+                    result.push(opt);
+                }
+            });
+        return result;
+    }
+
+    parseIceCommandLineOptions(options)
+    {
+        let args = options.slice();
+        for(let i = 0; i < PropertyNames.clPropNames.length; ++i)
+        {
+            args = this.parseCommandLineOptions(PropertyNames.clPropNames[i], args);
+        }
+        return args;
+    }
+
+    parse(data)
+    {
+        data.match(/[^\r\n]+/g).forEach(line => this.parseLine(line));
+    }
+
+    parseLine(line)
+    {
+        let key = "";
+        let value = "";
+
+        let state = ParseStateKey;
+
+        let whitespace = "";
+        let escapedspace = "";
+        let finished = false;
+
+        for(let i = 0; i < line.length; ++i)
+        {
+            let c = line.charAt(i);
+            switch(state)
+            {
+                case ParseStateKey:
+                {
+                    switch(c)
+                    {
+                        case '\\':
+                            if(i < line.length - 1)
+                            {
+                                c = line.charAt(++i);
+                                switch(c)
+                                {
+                                    case '\\':
+                                    case '#':
+                                    case '=':
+                                        key += whitespace;
+                                        whitespace = "";
+                                        key += c;
+                                        break;
+
+                                    case ' ':
+                                        if(key.length !== 0)
+                                        {
+                                            whitespace += c;
+                                        }
+                                        break;
+
+                                    default:
+                                        key += whitespace;
+                                        whitespace = "";
+                                        key += '\\';
+                                        key += c;
+                                        break;
+                                }
+                            }
+                            else
+                            {
+                                key += whitespace;
+                                key += c;
+                            }
+                            break;
+
+                        case ' ':
+                        case '\t':
+                        case '\r':
+                        case '\n':
+                            if(key.length !== 0)
+                            {
+                                whitespace += c;
+                            }
+                            break;
+
+                        case '=':
+                            whitespace = "";
+                            state = ParseStateValue;
+                            break;
+
+                        case '#':
+                            finished = true;
+                            break;
+
+                        default:
+                            key += whitespace;
+                            whitespace = "";
+                            key += c;
+                            break;
+                    }
+                    break;
+                }
+
+                case ParseStateValue:
+                {
+                    switch(c)
+                    {
+                        case '\\':
+                            if(i < line.length - 1)
+                            {
+                                c = line.charAt(++i);
+                                switch(c)
+                                {
+                                    case '\\':
+                                    case '#':
+                                    case '=':
+                                        value += value.length === 0 ? escapedspace : whitespace;
+                                        whitespace = "";
+                                        escapedspace = "";
+                                        value += c;
+                                        break;
+
+                                    case ' ':
+                                        whitespace += c;
+                                        escapedspace += c;
+                                        break;
+
+                                    default:
+                                        value += value.length === 0 ? escapedspace : whitespace;
+                                        whitespace = "";
+                                        escapedspace = "";
+                                        value += '\\';
+                                        value += c;
+                                        break;
+                                }
+                            }
+                            else
+                            {
+                                value += value.length === 0 ? escapedspace : whitespace;
+                                value += c;
+                            }
+                            break;
+
+                        case ' ':
+                        case '\t':
+                        case '\r':
+                        case '\n':
+                            if(value.length !== 0)
+                            {
+                                whitespace += c;
+                            }
+                            break;
+
+                        case '#':
+                            finished = true;
+                            break;
+
+                        default:
+                            value += value.length === 0 ? escapedspace : whitespace;
+                            whitespace = "";
+                            escapedspace = "";
+                            value += c;
+                            break;
+                    }
+                    break;
+                }
+
+                default:
+                {
+                    Debug.assert(false);
+                    break;
+                }
+            }
+            if(finished)
+            {
+                break;
+            }
+        }
+        value += escapedspace;
+
+        if((state === ParseStateKey && key.length !== 0) ||
+           (state == ParseStateValue && key.length === 0))
+        {
+            getProcessLogger().warning("invalid config file entry: \"" + line + "\"");
+            return;
+        }
+        else if(key.length === 0)
+        {
+            return;
+        }
+
+        this.setProperty(key, value);
+    }
+
+    clone()
+    {
+        return new Properties(null, this);
+    }
+
+    getUnusedProperties()
+    {
+        const unused = [];
+        this._properties.forEach((property, key) =>
+            {
+                if(!property.used)
+                {
+                    unused.push(key);
+                }
+            });
+        return unused;
+    }
+
+    static createProperties(args, defaults)
+    {
+        return new Properties(args, defaults);
+    }
+}
+
+Ice.Properties = Properties;
+module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Properties.js zeroc-ice-3.7.2/js/src/Ice/Properties.js
--- zeroc-ice-3.7.1/js/src/Ice/Properties.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Properties.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,502 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-const Ice = require("../Ice/ModuleRegistry").Ice;
-Ice._ModuleRegistry.require(module,
-    [
-        "../Ice/StringUtil",
-        "../Ice/PropertyNames",
-        "../Ice/Debug",
-        "../Ice/ProcessLogger",
-        "../Ice/ProcessLogger",
-        "../Ice/LocalException"
-    ]);
-
-const StringUtil = Ice.StringUtil;
-const PropertyNames = Ice.PropertyNames;
-const Debug = Ice.Debug;
-const getProcessLogger = Ice.getProcessLogger;
-const InitializationException = Ice.InitializationException;
-
-const ParseStateKey = 0;
-const ParseStateValue = 1;
-//
-// Ice.Properties
-//
-class Properties
-{
-    constructor(args, defaults)
-    {
-        this._properties = new Map();
-
-        if(defaults !== undefined && defaults !== null)
-        {
-            //
-            // NOTE: we can't just do a shallow copy of the map as the map values
-            // would otherwise be shared between the two PropertiesI object.
-            //
-            for(const [key, property] of defaults._properties)
-            {
-                this._properties.set(key, { 'value': property.value, 'used': false });
-            }
-        }
-
-        if(args !== undefined && args !== null)
-        {
-            const v = this.parseIceCommandLineOptions(args);
-            args.length = 0;
-            for(let i = 0; i < v.length; ++i)
-            {
-                args.push(v[i]);
-            }
-        }
-    }
-
-    getProperty(key)
-    {
-        return this.getPropertyWithDefault(key, "");
-    }
-
-    getPropertyWithDefault(key, value)
-    {
-        const pv = this._properties.get(key);
-        if(pv !== undefined)
-        {
-            pv.used = true;
-            return pv.value;
-        }
-        else
-        {
-            return value;
-        }
-    }
-
-    getPropertyAsInt(key)
-    {
-        return this.getPropertyAsIntWithDefault(key, 0);
-    }
-
-    getPropertyAsIntWithDefault(key, value)
-    {
-        const pv = this._properties.get(key);
-        if(pv !== undefined)
-        {
-            pv.used = true;
-            return parseInt(pv.value);
-        }
-        else
-        {
-            return value;
-        }
-    }
-
-    getPropertyAsList(key)
-    {
-        return this.getPropertyAsListWithDefault(key, 0);
-    }
-
-    getPropertyAsListWithDefault(key, value)
-    {
-        if(value === undefined || value === null)
-        {
-            value = [];
-        }
-
-        const pv = this._properties.get(key);
-        if(pv !== undefined)
-        {
-            pv.used = true;
-
-            let result = StringUtil.splitString(pv.value, ", \t\r\n");
-            if(result === null)
-            {
-                getProcessLogger().warning("mismatched quotes in property " + key + "'s value, returning default value");
-                return value;
-            }
-            if(result.length === 0)
-            {
-                result = value;
-            }
-            return result;
-        }
-        else
-        {
-            return value;
-        }
-    }
-
-    getPropertiesForPrefix(prefix = "")
-    {
-        const result = new Map();
-        this._properties.forEach((property, key) =>
-            {
-                if(key.indexOf(prefix) === 0)
-                {
-                    property.used = true;
-                    result.set(key, property.value);
-                }
-            });
-        return result;
-    }
-
-    setProperty(key = "", value = "")
-    {
-        //
-        // Trim whitespace
-        //
-        if(key !== null)
-        {
-            key = key.trim();
-        }
-
-        //
-        // Check if the property is legal.
-        //
-        const logger = getProcessLogger();
-        if(key === null || key.length === 0)
-        {
-            throw new InitializationException("Attempt to set property with empty key");
-        }
-
-        let dotPos = key.indexOf(".");
-        if(dotPos !== -1)
-        {
-            const prefix = key.substr(0, dotPos);
-            for(let i = 0; i < PropertyNames.validProps.length; ++i)
-            {
-                let pattern = PropertyNames.validProps[i][0].pattern;
-                dotPos = pattern.indexOf(".");
-                //
-                // Each top level prefix describes a non-empty namespace. Having a string without a
-                // prefix followed by a dot is an error.
-                //
-                Debug.assert(dotPos != -1);
-                if(pattern.substring(0, dotPos - 1) != prefix)
-                {
-                    continue;
-                }
-
-                let found = false;
-                let mismatchCase = false;
-                let otherKey;
-                for(let j = 0; j < PropertyNames.validProps[i][j].length && !found; ++j)
-                {
-                    pattern = PropertyNames.validProps[i][j].pattern();
-                    let pComp = new RegExp(pattern);
-                    found = pComp.test(key);
-
-                    if(found && PropertyNames.validProps[i][j].deprecated)
-                    {
-                        logger.warning("deprecated property: " + key);
-                        if(PropertyNames.validProps[i][j].deprecatedBy !== null)
-                        {
-                            key = PropertyNames.validProps[i][j].deprecatedBy;
-                        }
-                    }
-
-                    if(found)
-                    {
-                        break;
-                    }
-                    else
-                    {
-                        pComp = new RegExp(pattern.toUpperCase());
-                        found = pComp.test(key.toUpperCase());
-                        if(found)
-                        {
-                            mismatchCase = true;
-                            otherKey = pattern.substr(2);
-                            otherKey = otherKey.substr(0, otherKey.length -1);
-                            otherKey = otherKey.replace(/\\/g, "");
-                            break;
-                        }
-                    }
-                }
-
-                if(!found)
-                {
-                    logger.warning("unknown property: " + key);
-                }
-                else if(mismatchCase)
-                {
-                    logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
-                }
-            }
-        }
-
-        //
-        // Set or clear the property.
-        //
-        if(value !== null && value.length > 0)
-        {
-            const pv = this._properties.get(key);
-            if(pv !== undefined)
-            {
-                pv.value = value;
-            }
-            else
-            {
-                this._properties.set(key, { 'value': value, 'used': false });
-            }
-        }
-        else
-        {
-            this._properties.delete(key);
-        }
-    }
-
-    getCommandLineOptions()
-    {
-        const result = [];
-        this._properties.forEach((property, key) =>
-            {
-                result.push("--" + key + "=" + property.value);
-            });
-        return result;
-    }
-
-    parseCommandLineOptions(pfx, options)
-    {
-        if(pfx.length > 0 && pfx.charAt(pfx.length - 1) != ".")
-        {
-            pfx += ".";
-        }
-        pfx = "--" + pfx;
-
-        const result = [];
-
-        options.forEach(opt =>
-            {
-                if(opt.indexOf(pfx) === 0)
-                {
-                    if(opt.indexOf('=') === -1)
-                    {
-                        opt += "=1";
-                    }
-
-                    this.parseLine(opt.substring(2));
-                }
-                else
-                {
-                    result.push(opt);
-                }
-            });
-        return result;
-    }
-
-    parseIceCommandLineOptions(options)
-    {
-        let args = options.slice();
-        for(let i = 0; i < PropertyNames.clPropNames.length; ++i)
-        {
-            args = this.parseCommandLineOptions(PropertyNames.clPropNames[i], args);
-        }
-        return args;
-    }
-
-    parse(data)
-    {
-        data.match(/[^\r\n]+/g).forEach(line => this.parseLine(line));
-    }
-
-    parseLine(line)
-    {
-        let key = "";
-        let value = "";
-
-        let state = ParseStateKey;
-
-        let whitespace = "";
-        let escapedspace = "";
-        let finished = false;
-
-        for(let i = 0; i < line.length; ++i)
-        {
-            let c = line.charAt(i);
-            switch(state)
-            {
-                case ParseStateKey:
-                {
-                    switch(c)
-                    {
-                        case '\\':
-                            if(i < line.length - 1)
-                            {
-                                c = line.charAt(++i);
-                                switch(c)
-                                {
-                                    case '\\':
-                                    case '#':
-                                    case '=':
-                                        key += whitespace;
-                                        whitespace = "";
-                                        key += c;
-                                        break;
-
-                                    case ' ':
-                                        if(key.length !== 0)
-                                        {
-                                            whitespace += c;
-                                        }
-                                        break;
-
-                                    default:
-                                        key += whitespace;
-                                        whitespace = "";
-                                        key += '\\';
-                                        key += c;
-                                        break;
-                                }
-                            }
-                            else
-                            {
-                                key += whitespace;
-                                key += c;
-                            }
-                            break;
-
-                        case ' ':
-                        case '\t':
-                        case '\r':
-                        case '\n':
-                            if(key.length !== 0)
-                            {
-                                whitespace += c;
-                            }
-                            break;
-
-                        case '=':
-                            whitespace = "";
-                            state = ParseStateValue;
-                            break;
-
-                        case '#':
-                            finished = true;
-                            break;
-
-                        default:
-                            key += whitespace;
-                            whitespace = "";
-                            key += c;
-                            break;
-                    }
-                    break;
-                }
-
-                case ParseStateValue:
-                {
-                    switch(c)
-                    {
-                        case '\\':
-                            if(i < line.length - 1)
-                            {
-                                c = line.charAt(++i);
-                                switch(c)
-                                {
-                                    case '\\':
-                                    case '#':
-                                    case '=':
-                                        value += value.length === 0 ? escapedspace : whitespace;
-                                        whitespace = "";
-                                        escapedspace = "";
-                                        value += c;
-                                        break;
-
-                                    case ' ':
-                                        whitespace += c;
-                                        escapedspace += c;
-                                        break;
-
-                                    default:
-                                        value += value.length === 0 ? escapedspace : whitespace;
-                                        whitespace = "";
-                                        escapedspace = "";
-                                        value += '\\';
-                                        value += c;
-                                        break;
-                                }
-                            }
-                            else
-                            {
-                                value += value.length === 0 ? escapedspace : whitespace;
-                                value += c;
-                            }
-                            break;
-
-                        case ' ':
-                        case '\t':
-                        case '\r':
-                        case '\n':
-                            if(value.length !== 0)
-                            {
-                                whitespace += c;
-                            }
-                            break;
-
-                        case '#':
-                            finished = true;
-                            break;
-
-                        default:
-                            value += value.length === 0 ? escapedspace : whitespace;
-                            whitespace = "";
-                            escapedspace = "";
-                            value += c;
-                            break;
-                    }
-                    break;
-                }
-            }
-            if(finished)
-            {
-                break;
-            }
-        }
-        value += escapedspace;
-
-        if((state === ParseStateKey && key.length !== 0) ||
-           (state == ParseStateValue && key.length === 0))
-        {
-            getProcessLogger().warning("invalid config file entry: \"" + line + "\"");
-            return;
-        }
-        else if(key.length === 0)
-        {
-            return;
-        }
-
-        this.setProperty(key, value);
-    }
-
-    clone()
-    {
-        return new Properties(null, this);
-    }
-
-    getUnusedProperties()
-    {
-        const unused = [];
-        this._properties.forEach((property, key) =>
-            {
-                if(!property.used)
-                {
-                    unused.push(key);
-                }
-            });
-        return unused;
-    }
-
-    static createProperties(args, defaults)
-    {
-        return new Properties(args, defaults);
-    }
-}
-
-Ice.Properties = Properties;
-module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Property.js zeroc-ice-3.7.2/js/src/Ice/Property.js
--- zeroc-ice-3.7.1/js/src/Ice/Property.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Property.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/PropertyNames.js zeroc-ice-3.7.2/js/src/Ice/PropertyNames.js
--- zeroc-ice-3.7.1/js/src/Ice/PropertyNames.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/PropertyNames.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,17 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 14 10:24:07 2018
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
+/* eslint comma-dangle: "off" */
+/* eslint array-bracket-newline: "off" */
+/* eslint no-useless-escape: "off" */
+
 const Ice = require("../Ice/Property").Ice;
 const PropertyNames = {};
 const Property = Ice.Property;
-/* jshint -W044*/
-
 PropertyNames.IceProps =
 [
     new Property("/^Ice\.ACM\.Client/", true, null),
@@ -184,6 +181,7 @@
     new Property("/^Ice\.TCP\.SndSize/", false, null),
     new Property("/^Ice\.UseApplicationClassLoader/", false, null),
     new Property("/^Ice\.UseSyslog/", false, null),
+    new Property("/^Ice\.UseSystemdJournal/", false, null),
     new Property("/^Ice\.Warn\.AMICallback/", false, null),
     new Property("/^Ice\.Warn\.Connections/", false, null),
     new Property("/^Ice\.Warn\.Datagrams/", false, null),
@@ -193,11 +191,9 @@
     new Property("/^Ice\.Warn\.UnusedProperties/", false, null),
     new Property("/^Ice\.CacheMessageBuffers/", false, null),
     new Property("/^Ice\.ThreadInterruptSafe/", false, null),
-    new Property("/^Ice\.Voip/", false, null),
+    new Property("/^Ice\.Voip/", true, null),
 ];
 
-/* jshint +W044*/
-
 PropertyNames.validProps =
 [
     PropertyNames.IceProps,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Protocol.d.ts zeroc-ice-3.7.2/js/src/Ice/Protocol.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Protocol.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Protocol.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,143 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        const Encoding_1_0:EncodingVersion;
+        const Encoding_1_1:EncodingVersion;
+
+        const Protocol_1_0:ProtocolVersion;
+
+        class Protocol
+        {
+            //
+            // Size of the Ice protocol header
+            //
+            // Magic number (4 bytes)
+            // Protocol version major (Byte)
+            // Protocol version minor (Byte)
+            // Encoding version major (Byte)
+            // Encoding version minor (Byte)
+            // Message type (Byte)
+            // Compression status (Byte)
+            // Message size (Int)
+            //
+            static readonly headerSize:number;
+
+            //
+            // The magic number at the front of each message ['I', 'c', 'e', 'P']
+            //
+            static readonly magic:Uint8Array;
+
+            //
+            // The current Ice protocol and encoding version
+            //
+            static readonly protocolMajor:number;
+            static readonly protocolMinor:number;
+            static readonly protocolEncodingMajor:number;
+            static readonly protocolEncodingMinor:number;
+
+            static readonly encodingMajor:number;
+            static readonly encodingMinor:number;
+
+            //
+            // The Ice protocol message types
+            //
+            static readonly requestMsg:number;
+            static readonly requestBatchMsg:number;
+            static readonly replyMsg:number;
+            static readonly validateConnectionMsg:number;
+            static readonly closeConnectionMsg:number;
+
+            //
+            // Reply status
+            //
+            static readonly replyOK:number;
+            static readonly replyUserException:number;
+            static readonly replyObjectNotExist:number;
+            static readonly replyFacetNotExist:number;
+            static readonly replyOperationNotExist:number;
+            static readonly replyUnknownLocalException:number;
+            static readonly replyUnknownUserException:number;
+            static readonly replyUnknownException:number;
+
+            static readonly requestHdr:Uint8Array;
+
+            static readonly requestBatchHdr:Uint8Array;
+
+            static readonly replyHdr:Uint8Array;
+
+            static readonly currentProtocol:ProtocolVersion;
+            static readonly currentProtocolEncoding:EncodingVersion;
+
+            static currentEncoding:EncodingVersion;
+
+            static checkSupportedProtocol(v:ProtocolVersion):void;
+            static checkSupportedProtocolEncoding(v:EncodingVersion):void;
+            static checkSupportedEncoding(version:EncodingVersion):void;
+
+            //
+            // Either return the given protocol if not compatible, or the greatest
+            // supported protocol otherwise.
+            //
+            static getCompatibleProtocol(version:ProtocolVersion):ProtocolVersion;
+
+            //
+            // Either return the given encoding if not compatible, or the greatest
+            // supported encoding otherwise.
+            //
+            static getCompatibleEncoding(version:EncodingVersion):EncodingVersion;
+
+            static isSupported(version:ProtocolVersion, supported:ProtocolVersion):boolean;
+            static isSupported(version:EncodingVersion, supported:EncodingVersion):boolean;
+
+            static readonly OPTIONAL_END_MARKER:number;
+            static readonly FLAG_HAS_TYPE_ID_STRING:number;
+            static readonly FLAG_HAS_TYPE_ID_INDEX:number;
+            static readonly FLAG_HAS_TYPE_ID_COMPACT:number;
+            static readonly FLAG_HAS_OPTIONAL_MEMBERS:number;
+            static readonly FLAG_HAS_INDIRECTION_TABLE:number;
+            static readonly FLAG_HAS_SLICE_SIZE:number;
+            static readonly FLAG_IS_LAST_SLICE:number;
+        }
+
+        /**
+        * Converts a string to a protocol version.
+        *
+        * @param version The string to convert.
+        *
+        * @return The converted protocol version.
+        **/
+        function stringToProtocolVersion(version:string):ProtocolVersion;
+
+        /**
+        * Converts a string to an encoding version.
+        *
+        * @param version The string to convert.
+        *
+        * @return The converted object identity.
+        **/
+        function stringToEncodingVersion(version:string):EncodingVersion;
+
+        /**
+        * Converts a protocol version to a string.
+        *
+        * @param v The protocol version to convert.
+        *
+        * @return The converted string.
+        **/
+        function protocolVersionToString(version:ProtocolVersion):string;
+
+        /**
+         * Converts an encoding version to a string.
+         *
+         * @param v The encoding version to convert.
+         *
+         * @return The converted string.
+         **/
+        function encodingVersionToString(version:EncodingVersion):string;
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ProtocolInstance.js zeroc-ice-3.7.2/js/src/Ice/ProtocolInstance.js
--- zeroc-ice-3.7.1/js/src/Ice/ProtocolInstance.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ProtocolInstance.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
-//
-// NOTE: the protocol instance class is a bit different from other
-// language mappinps since it also provides the secure property for
-// the tranport. Since we don't support SSL but still want to be able
-// to parse SSL endpoints, we simply re-use the TCP endpoint with a
-// different protocol instance to support SSL endpoints.
-//
-// If SSL endpoints attributes were to diverge from TCP endpoints or
-// if we want to support SSL, we'd have to change this and instead, do
-// like in other mappings: have a separate implementation for the SSL
-// endpoint and suppress the secure member of the protocol instance
-// class bellow.
-//
 class ProtocolInstance
 {
     constructor(instance, type, protocol, secure)
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Protocol.js zeroc-ice-3.7.2/js/src/Ice/Protocol.js
--- zeroc-ice-3.7.1/js/src/Ice/Protocol.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Protocol.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -40,10 +35,9 @@
 Protocol.headerSize = 14;
 
 //
-// The magic number at the front of each message
+// The magic number at the front of each message ['I', 'c', 'e', 'P']
 //
-//Protocol.magic = [ 0x49, 0x63, 0x65, 0x50 ];      // 'I', 'c', 'e', 'P'
-Protocol.magic = new Uint8Array([ 0x49, 0x63, 0x65, 0x50 ]);      // 'I', 'c', 'e', 'P'
+Protocol.magic = new Uint8Array([0x49, 0x63, 0x65, 0x50]);
 
 //
 // The current Ice protocol and encoding version
@@ -89,7 +83,7 @@
     Protocol.requestMsg,
     0, // Compression status.
     0, 0, 0, 0, // Message size (placeholder).
-    0, 0, 0, 0  // Request ID (placeholder).
+    0, 0, 0, 0 // Request ID (placeholder).
 ]);
 
 Protocol.requestBatchHdr = new Uint8Array([
@@ -104,7 +98,7 @@
     Protocol.requestBatchMsg,
     0, // Compression status.
     0, 0, 0, 0, // Message size (placeholder).
-    0, 0, 0, 0  // Number of requests in batch (placeholder).
+    0, 0, 0, 0 // Number of requests in batch (placeholder).
 ]);
 
 Protocol.replyHdr = new Uint8Array([
@@ -242,25 +236,25 @@
 };
 
 /**
-* Converts an encoding version to a string.
-*
-* @param v The encoding version to convert.
-*
-* @return The converted string.
-**/
+ * Converts an encoding version to a string.
+ *
+ * @param v The encoding version to convert.
+ *
+ * @return The converted string.
+ **/
 Ice.encodingVersionToString = function(v)
 {
     return majorMinorToString(v.major, v.minor);
 };
 
-Protocol.OPTIONAL_END_MARKER        = 0xFF;
-Protocol.FLAG_HAS_TYPE_ID_STRING    = (1<<0);
-Protocol.FLAG_HAS_TYPE_ID_INDEX     = (1<<1);
-Protocol.FLAG_HAS_TYPE_ID_COMPACT   = (1<<1 | 1<<0);
-Protocol.FLAG_HAS_OPTIONAL_MEMBERS  = (1<<2);
-Protocol.FLAG_HAS_INDIRECTION_TABLE = (1<<3);
-Protocol.FLAG_HAS_SLICE_SIZE        = (1<<4);
-Protocol.FLAG_IS_LAST_SLICE         = (1<<5);
+Protocol.OPTIONAL_END_MARKER = 0xFF;
+Protocol.FLAG_HAS_TYPE_ID_STRING = (1 << 0);
+Protocol.FLAG_HAS_TYPE_ID_INDEX = (1 << 1);
+Protocol.FLAG_HAS_TYPE_ID_COMPACT = (1 << 1 | 1 << 0);
+Protocol.FLAG_HAS_OPTIONAL_MEMBERS = (1 << 2);
+Protocol.FLAG_HAS_INDIRECTION_TABLE = (1 << 3);
+Protocol.FLAG_HAS_SLICE_SIZE = (1 << 4);
+Protocol.FLAG_IS_LAST_SLICE = (1 << 5);
 
 Ice.Protocol = Protocol;
 module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ProxyFactory.js zeroc-ice-3.7.2/js/src/Ice/ProxyFactory.js
--- zeroc-ice-3.7.1/js/src/Ice/ProxyFactory.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ProxyFactory.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -64,7 +59,7 @@
         }
         else
         {
-            this._retryIntervals = [ 0 ];
+            this._retryIntervals = [0];
         }
     }
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Reference.js zeroc-ice-3.7.2/js/src/Ice/Reference.js
--- zeroc-ice-3.7.1/js/src/Ice/Reference.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Reference.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -454,7 +449,7 @@
                             }
                             else
                             {
-                                quote = s.indexOf('\"', ++quote);
+                                quote = s.indexOf("\"", ++quote);
                                 if(quote == -1)
                                 {
                                     break;
@@ -1329,6 +1324,12 @@
                 s.push(" -D");
                 break;
             }
+
+            default:
+            {
+                Debug.assert(false);
+                break;
+            }
         }
 
         if(this._secure)
@@ -1634,6 +1635,12 @@
                 }
                 break;
             }
+
+            default:
+            {
+                Debug.assert(false);
+                break;
+            }
         }
 
         //
@@ -1992,8 +1999,8 @@
         properties.set(prefix + ".EndpointSelection",
                        this._endpointSelection === EndpointSelectionType.Random ? "Random" : "Ordered");
 
-        properties.set(prefix + ".LocatorCacheTimeout", "" + this._locatorCacheTimeout);
-        properties.set(prefix + ".InvocationTimeout", "" + this.getInvocationTimeout());
+        properties.set(prefix + ".LocatorCacheTimeout", String(this._locatorCacheTimeout));
+        properties.set(prefix + ".InvocationTimeout", String(this.getInvocationTimeout()));
 
         if(this._routerInfo !== null)
         {
@@ -2265,6 +2272,12 @@
                 endpoints = endpoints.filter(e => e.datagram());
                 break;
             }
+
+            default:
+            {
+                Debug.assert(false);
+                break;
+            }
         }
 
         //
@@ -2361,7 +2374,7 @@
             // connection for one of the endpoints.
             //
             const cb = new CreateConnectionCallback(this, endpoints, promise);
-            factory.create([ endpoints[0] ], true, this.getEndpointSelection()).then(
+            factory.create([endpoints[0]], true, this.getEndpointSelection()).then(
                 connection => cb.setConnection(connection)).catch(ex => cb.setException(ex));
         }
         return promise;
@@ -2410,9 +2423,9 @@
         }
 
         this.ref.getInstance().outgoingConnectionFactory().create(
-            [ this.endpoints[this.i] ],
+            [this.endpoints[this.i]],
             this.i != this.endpoints.length - 1,
-            this.ref.getEndpointSelection()).then(connection => this.setConnection(connection))
-                                            .catch(ex => this.setException(ex));
+            this.ref.getEndpointSelection()).then(
+                connection => this.setConnection(connection)).catch(ex => this.setException(ex));
     }
 }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ReferenceMode.js zeroc-ice-3.7.2/js/src/Ice/ReferenceMode.js
--- zeroc-ice-3.7.1/js/src/Ice/ReferenceMode.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ReferenceMode.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/RequestHandlerFactory.js zeroc-ice-3.7.2/js/src/Ice/RequestHandlerFactory.js
--- zeroc-ice-3.7.1/js/src/Ice/RequestHandlerFactory.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/RequestHandlerFactory.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
diff -Nru zeroc-ice-3.7.1/js/src/Ice/RetryException.js zeroc-ice-3.7.2/js/src/Ice/RetryException.js
--- zeroc-ice-3.7.1/js/src/Ice/RetryException.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/RetryException.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module, ["../Ice/Debug", "../Ice/LocalException"]);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/RetryQueue.js zeroc-ice-3.7.2/js/src/Ice/RetryQueue.js
--- zeroc-ice-3.7.1/js/src/Ice/RetryQueue.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/RetryQueue.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/LocalException").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/RouterInfo.js zeroc-ice-3.7.2/js/src/Ice/RouterInfo.js
--- zeroc-ice-3.7.1/js/src/Ice/RouterInfo.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/RouterInfo.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -79,7 +74,7 @@
         }
         else
         {
-            this._router.getClientProxy().then((result) =>
+            this._router.getClientProxy().then(result =>
                            this.setClientEndpoints(result[0],
                                                    result[1] !== undefined ? result[1] : true,
                                                    promise)).catch(promise.reject);
@@ -115,7 +110,7 @@
         }
         else
         {
-            return this._router.addProxies([ proxy ]).then(
+            return this._router.addProxies([proxy]).then(
                 evictedProxies =>
                 {
                     this.addAndEvictProxies(proxy, evictedProxies);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/RouterManager.js zeroc-ice-3.7.2/js/src/Ice/RouterManager.js
--- zeroc-ice-3.7.1/js/src/Ice/RouterManager.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/RouterManager.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module, ["../Ice/HashMap", "../Ice/RouterInfo", "../Ice/Router"]);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ServantManager.js zeroc-ice-3.7.2/js/src/Ice/ServantManager.js
--- zeroc-ice-3.7.1/js/src/Ice/ServantManager.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ServantManager.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -30,9 +25,12 @@
     {
         this._instance = instance;
         this._adapterName = adapterName;
-        this._servantMapMap = new HashMap(HashMap.compareEquals);       // Map<Ice.Identity, Map<String, Ice.Object> >
-        this._defaultServantMap = new Map();                            // Map<String, Ice.Object>
-        this._locatorMap = new Map();                                   // Map<String, Ice.ServantLocator>
+        // Map<Ice.Identity, Map<String, Ice.Object> >
+        this._servantMapMap = new HashMap(HashMap.compareEquals);
+        // Map<String, Ice.Object>
+        this._defaultServantMap = new Map();
+        // Map<String, Ice.ServantLocator>
+        this._locatorMap = new Map();
     }
 
     addServant(servant, ident, facet)
@@ -50,19 +48,16 @@
             m = new Map();
             this._servantMapMap.set(ident, m);
         }
-        else
+        else if(m.has(facet))
         {
-            if(m.has(facet))
+            const ex = new Ice.AlreadyRegisteredException();
+            ex.id = Ice.identityToString(ident, this._instance.toStringMode());
+            ex.kindOfObject = "servant";
+            if(facet.length > 0)
             {
-                const ex = new Ice.AlreadyRegisteredException();
-                ex.id = Ice.identityToString(ident, this._instance.toStringMode());
-                ex.kindOfObject = "servant";
-                if(facet.length > 0)
-                {
-                    ex.id += " -f " + StringUtil.escapeString(facet, "", this._instance.toStringMode());
-                }
-                throw ex;
+                ex.id += " -f " + StringUtil.escapeString(facet, "", this._instance.toStringMode());
             }
+            throw ex;
         }
 
         m.set(facet, servant);
@@ -153,14 +148,6 @@
 
     findServant(ident, facet)
     {
-        //
-        // This assert is not valid if the adapter dispatch incoming
-        // requests from bidir connections. This method might be called if
-        // requests are received over the bidir connection after the
-        // adapter was deactivated.
-        //
-        //Debug.assert(this._instance !== null); // Must not be called after destruction.
-
         if(facet === null)
         {
             facet = "";
@@ -207,14 +194,6 @@
 
     hasServant(ident)
     {
-        //
-        // This assert is not valid if the adapter dispatch incoming
-        // requests from bidir connections. This method might be called if
-        // requests are received over the bidir connection after the
-        // adapter was deactivated.
-        //
-        //Debug.assert(this._instance !== null); // Must not be called after destruction.
-
         const m = this._servantMapMap.get(ident);
         if(m === undefined)
         {
@@ -260,14 +239,6 @@
 
     findServantLocator(category)
     {
-        //
-        // This assert is not valid if the adapter dispatch incoming
-        // requests from bidir connections. This method might be called if
-        // requests are received over the bidir connection after the
-        // adapter was deactivated.
-        //
-        //Debug.assert(this._instance !== null); // Must not be called after destruction.
-
         const l = this._locatorMap.get(category);
         return l === undefined ? null : l;
     }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/SocketOperation.js zeroc-ice-3.7.2/js/src/Ice/SocketOperation.js
--- zeroc-ice-3.7.1/js/src/Ice/SocketOperation.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/SocketOperation.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice.SocketOperation =
diff -Nru zeroc-ice-3.7.1/js/src/Ice/sources.json zeroc-ice-3.7.2/js/src/Ice/sources.json
--- zeroc-ice-3.7.1/js/src/Ice/sources.json	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/sources.json	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,48 @@
 {
     "modules": [
         "Ice", "IceMX", "IceSSL"],
+
     "slice":[
         "Ice/BuiltinSequences.ice",
+        "Ice/Communicator.ice",
+        "Ice/CommunicatorF.ice",
         "Ice/Connection.ice",
         "Ice/ConnectionF.ice",
         "Ice/Current.ice",
         "Ice/Endpoint.ice",
         "Ice/EndpointF.ice",
         "Ice/EndpointTypes.ice",
+        "Ice/FacetMap.ice",
         "Ice/Identity.ice",
+        "Ice/ImplicitContext.ice",
+        "Ice/ImplicitContextF.ice",
+        "Ice/InstrumentationF.ice",
         "Ice/LocalException.ice",
         "Ice/Locator.ice",
+        "Ice/LocatorF.ice",
+        "Ice/Logger.ice",
+        "Ice/LoggerF.ice",
         "Ice/Metrics.ice",
+        "Ice/ObjectAdapter.ice",
         "Ice/ObjectAdapterF.ice",
+        "Ice/ObjectFactory.ice",
+        "Ice/PluginF.ice",
         "Ice/Process.ice",
         "Ice/ProcessF.ice",
+        "Ice/Properties.ice",
         "Ice/PropertiesAdmin.ice",
+        "Ice/PropertiesF.ice",
         "Ice/RemoteLogger.ice",
         "Ice/Router.ice",
+        "Ice/RouterF.ice",
+        "Ice/ServantLocator.ice",
+        "Ice/ServantLocatorF.ice",
         "Ice/SliceChecksumDict.ice",
+        "Ice/ValueFactory.ice",
         "Ice/Version.ice",
-        "IceSSL/EndpointInfo.ice",
-        "IceSSL/ConnectionInfo.ice"],
+        "IceSSL/ConnectionInfo.ice",
+        "IceSSL/EndpointInfo.ice"
+    ],
 
     "common": [
         "ACM.js",
@@ -35,29 +55,33 @@
         "BatchRequestQueue.js",
         "Buffer.js",
         "Communicator.js",
+        "CommunicatorI.js",
         "CompactIdRegistry.js",
+        "ConnectRequestHandler.js",
+        "ConnectionF.js",
         "ConnectionI.js",
         "ConnectionRequestHandler.js",
-        "ConnectRequestHandler.js",
         "DefaultsAndOverrides.js",
-        "EndpointI.js",
         "EndpointFactoryManager.js",
+        "EndpointI.js",
         "EnumBase.js",
-        "Exception.js",
         "ExUtil.js",
+        "Exception.js",
         "FormatType.js",
         "HashMap.js",
         "HashUtil.js",
+        "IPEndpointI.js",
         "IdentityUtil.js",
         "ImplicitContextI.js",
         "IncomingAsync.js",
         "Initialize.js",
         "Instance.js",
-        "IPEndpointI.js",
+        "InstrumentationF.js",
         "LocatorInfo.js",
         "LocatorManager.js",
         "LocatorTable.js",
         "Logger.js",
+        "LoggerI.js",
         "Long.js",
         "MapUtil.js",
         "Object.js",
@@ -69,9 +93,11 @@
         "OptionalFormat.js",
         "OutgoingAsync.js",
         "OutgoingConnectionFactory.js",
+        "PluginF.js",
         "ProcessLogger.js",
         "Promise.js",
         "Properties.js",
+        "PropertiesI.js",
         "Property.js",
         "PropertyNames.js",
         "Protocol.js",
@@ -96,23 +122,26 @@
         "ToStringMode.js",
         "TraceLevels.js",
         "TraceUtil.js",
-        "UnknownSlicedValue.js",
         "UUID.js",
+        "UnknownSlicedValue.js",
         "Value.js",
         "ValueFactoryManagerI.js",
         "WSEndpoint.js",
-        "WSEndpointFactory.js"],
+        "WSEndpointFactory.js"
+    ],
 
     "node":[
         "Debug.js",
         "Ice.js",
         "ModuleRegistry.js",
         "TcpTransceiver.js",
-        "TimerUtil.js"],
+        "TimerUtil.js"
+    ],
 
     "browser":[
         "browser/Debug.js",
         "browser/ModuleRegistry.js",
         "browser/TimerUtil.js",
-        "browser/WSTransceiver.js"]
+        "browser/WSTransceiver.js"
+    ]
 }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Stream.d.ts zeroc-ice-3.7.2/js/src/Ice/Stream.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Stream.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Stream.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,208 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        class ByteHelper
+        {
+            static validate(v:number):boolean;
+        }
+
+        class ShortHelper
+        {
+            static validate(v:number):boolean;
+        }
+
+        class IntHelper
+        {
+            static validate(v:number):boolean;
+        }
+
+        class FloatHelper
+        {
+            static validate(v:number):boolean;
+        }
+
+        class DoubleHelper
+        {
+            static validate(v:number):boolean;
+        }
+
+        class LongHelper
+        {
+            static validate(v:Long):boolean;
+        }
+
+        class InputStream
+        {
+            constructor();
+            constructor(buffer:Uint8Array);
+            constructor(communicator:Communicator);
+            constructor(communicator:Communicator, buffer:Uint8Array);
+            constructor(encoding:EncodingVersion);
+            constructor(encoding:EncodingVersion, buffer:Uint8Array);
+            constructor(communicator:Communicator, encoding:EncodingVersion);
+            constructor(communicator:Communicator, encoding:EncodingVersion, buffer:Uint8Array);
+
+            //
+            // This function allows this object to be reused, rather than reallocated.
+            //
+            reset():void;
+            clear():void;
+            swap(other:InputStream):void;
+            resetEncapsulation():void;
+            resize(sz:number):void;
+            startValue():void;
+            endValue(preserve:boolean):SlicedData;
+            startException():void;
+            endException(preserve:boolean):SlicedData;
+            startEncapsulation():EncodingVersion;
+            endEncapsulation():void;
+            skipEmptyEncapsulation():EncodingVersion;
+            readEncapsulation(encoding:EncodingVersion):Uint8Array;
+            getEncoding():EncodingVersion;
+            getEncapsulationSize():number;
+            skipEncapsulation():EncodingVersion;
+            startSlice():string; // Returns type ID of next slice
+            endSlice():void;
+            skipSlice():void;
+            readPendingValues():void;
+            readSize():number;
+            readAndCheckSeqSize(minSize:number):number;
+            readBlob(sz:number):Uint8Array;
+            readOptional(tag:number, expectedFormat:OptionalFormat):boolean;
+            readByte():number;
+            readByteSeq():Uint8Array;
+            readBool():boolean;
+            readShort():number;
+            readInt():number;
+            readLong():Ice.Long;
+            readFloat():number;
+            readDouble():number;
+            readString():string;
+
+            readProxy<T extends ObjectPrx>(type:new()=>T):T;
+            readOptionalProxy<T extends ObjectPrx>(tag:number, type:new()=>T):T|undefined;
+            readEnum<T>(type:new()=>T):T;
+            readOptionalEnum<T>(tag:number, type:new()=>T):T|undefined;
+            readValue<T extends Value>(cb:(value:T) => void, type:new()=>T):void;
+            readOptionalValue<T extends Value>(tag:number, cb:(value:T) => void, type:new()=>T):void;
+            throwException():void;
+            skip(size:number):void;
+            skipSize():void;
+            isEmpty():boolean;
+            expand(n:number):void;
+
+            //
+            // Sets the value factory manager to use when marshaling value instances. If the stream
+            // was initialized with a communicator, the communicator's value factory manager will
+            // be used by default.
+            //
+            valueFactoryManager:ValueFactoryManager;
+
+            //
+            // Sets the logger to use when logging trace messages. If the stream
+            // was initialized with a communicator, the communicator's logger will
+            // be used by default.
+            //
+            logger:Logger;
+
+            //
+            // Sets the compact ID resolver to use when unmarshaling value and exception
+            // instances. If the stream was initialized with a communicator, the communicator's
+            // resolver will be used by default.
+            //
+            compactIdResolver:(compactID:number) => string;
+
+            //
+            // Determines the behavior of the stream when extracting instances of Slice classes.
+            // A instance is "sliced" when a factory cannot be found for a Slice type ID.
+            // The stream's default behavior is to slice instances.
+            //
+            // If slicing is disabled and the stream encounters a Slice type ID
+            // during decoding for which no value factory is installed, it raises
+            // NoValueFactoryException.
+            //
+            sliceValues:boolean;
+
+            //
+            // Determines whether the stream logs messages about slicing instances of Slice values.
+            //
+            traceSlicing:boolean;
+
+            pos:number;
+
+            readonly size:number;
+            readonly buffer:Uint8Array;
+        }
+
+        class OutputStream
+        {
+            constructor(communicator?:Ice.Communicator, encoding?:EncodingVersion, buffer?:Uint8Array);
+
+            //
+            // This function allows this object to be reused, rather than reallocated.
+            //
+            reset():void;
+            clear():void;
+            finished():Uint8Array;
+            swap(other:OutputStream):void;
+            resetEncapsulation():void;
+            resize(sz:number):void;
+            prepareWrite():Uint8Array;
+            startValue(data:SlicedData):void;
+            endValue():void;
+            startException(data:SlicedData):void;
+            endException():void;
+            startEncapsulation():void;
+            startEncapsulation(encoding:EncodingVersion, format:FormatType):void;
+            endEncapsulation():void;
+            writeEmptyEncapsulation(encoding:EncodingVersion):void;
+            writeEncapsulation(buff:Uint8Array):void;
+            getEncoding():EncodingVersion;
+            startSlice(typeId:string, compactId:number, last:boolean):void;
+            endSlice():void;
+            writePendingValues():void;
+            writeSize(v:number):void;
+            startSize():number;
+            endSize(pos:number):void;
+            writeBlob(v:Uint8Array):void;
+            // Read/write format and tag for optionals
+            writeOptional(tag:number, format:OptionalFormat):void;
+            writeByte(v:number):void;
+            writeByteSeq(v:Uint8Array):void;
+            writeBool(v:boolean):void;
+            writeShort(v:number):void;
+            writeInt(v:number):void;
+            writeLong(v:Ice.Long):void;
+            writeFloat(v:number):void;
+            writeDouble(v:number):void;
+            writeString(v:string):void;
+            writeProxy(v:ObjectPrx):void;
+            writeOptionalProxy(tag:number, v?:ObjectPrx|undefined):void;
+
+            /// TODO use a base enum type
+            writeEnum(v:any):void;
+
+            writeValue(v:Ice.Value):void;
+            writeOptionalValue(tag:number, v?:Ice.Value|undefined):void;
+            writeException(e:UserException):void;
+            writeUserException(e:UserException):void;
+
+            isEmpty():boolean;
+
+            expand(n:number):void;
+
+            //
+            // Sets the encoding format for class and exception instances.
+            //
+            format:FormatType;
+            pos:number;
+            readonly size:number;
+            readonly buffer:Uint8Array;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/StreamHelpers.js zeroc-ice-3.7.2/js/src/Ice/StreamHelpers.js
--- zeroc-ice-3.7.1/js/src/Ice/StreamHelpers.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/StreamHelpers.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/OptionalFormat").Ice;
 
@@ -154,11 +149,10 @@
 
 // Speacialization optimized for ByteSeq
 const byteSeqHelper = new SequenceHelper();
-byteSeqHelper.write = function(os, v) { return os.writeByteSeq(v); };
-byteSeqHelper.read = function(is) { return is.readByteSeq(); };
-defineProperty(byteSeqHelper, "elementHelper", {
-    get: function(){ return Ice.ByteHelper; }
-});
+byteSeqHelper.write = (os, v) => os.writeByteSeq(v);
+byteSeqHelper.read = is => is.readByteSeq();
+
+defineProperty(byteSeqHelper, "elementHelper", {get: () => Ice.ByteHelper});
 StreamHelpers.VSizeContainer1OptHelper.call(byteSeqHelper);
 
 // Read method for value sequences
@@ -170,7 +164,10 @@
     const elementType = this.elementType;
     const readValueAtIndex = function(idx)
     {
-        is.readValue(obj => v[idx] = obj, elementType);
+        is.readValue(obj =>
+                     {
+                         v[idx] = obj;
+                     }, elementType);
     };
 
     for(let i = 0; i < sz; ++i)
@@ -204,15 +201,11 @@
         StreamHelpers.FSizeOptHelper.call(helper);
     }
 
-    defineProperty(helper, "elementHelper", {
-        get: function(){ return elementHelper; }
-    });
+    defineProperty(helper, "elementHelper", {get: () => elementHelper});
 
     if(elementHelper == Ice.ObjectHelper)
     {
-        defineProperty(helper, "elementType", {
-            get: function(){ return elementType; }
-        });
+        defineProperty(helper, "elementType", {get: () => elementType});
         helper.read = valueSequenceHelperRead;
     }
 
@@ -301,23 +294,28 @@
         StreamHelpers.FSizeOptHelper.call(helper);
     }
 
-    defineProperty(helper, "mapType", {
-        get: function(){ return mapType; }
-    });
-
-    defineProperty(helper, "keyHelper", {
-        get: function(){ return keyHelper; }
-    });
-
-    defineProperty(helper, "valueHelper", {
-        get: function(){ return valueHelper; }
-    });
+    defineProperty(helper,
+                   "mapType",
+                   {
+                       get: () => mapType
+                   });
+
+    defineProperty(helper, "keyHelper",
+                   {
+                       get: () => keyHelper
+                   });
+
+    defineProperty(helper, "valueHelper",
+                   {
+                       get: () => valueHelper
+                   });
 
     if(valueHelper == Ice.ObjectHelper)
     {
-        defineProperty(helper, "valueType", {
-            get: function(){ return valueType; }
-        });
+        defineProperty(helper, "valueType",
+                       {
+                           get: () => valueType
+                       });
 
         helper.read = valueDictionaryHelperRead;
     }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Stream.js zeroc-ice-3.7.2/js/src/Ice/Stream.js
--- zeroc-ice-3.7.1/js/src/Ice/Stream.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Stream.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 const _ModuleRegistry = Ice._ModuleRegistry;
@@ -163,7 +158,7 @@
         const obj = this._unmarshaledMap.get(index);
         if(obj !== undefined && obj !== null)
         {
-            cb.call(null, obj);
+            cb(obj);
             return;
         }
 
@@ -303,7 +298,7 @@
 
         if(index === 0)
         {
-            cb.call(null, null);
+            cb(null);
         }
         else
         {
@@ -384,7 +379,7 @@
         this._skipFirstSlice = true;
     }
 
-    endInstance(/*preserve*/)
+    endInstance(preserve)
     {
         //
         // Read the Ice::Object slice.
@@ -558,7 +553,7 @@
         {
             if(cb !== null)
             {
-                cb.call(null, null);
+                cb(null);
             }
         }
         else if(this._current !== null && (this._current.sliceFlags & Protocol.FLAG_HAS_INDIRECTION_TABLE) !== 0)
@@ -793,25 +788,19 @@
             Debug.assert(this._current.sliceSize >= 4);
             this._stream.skip(this._current.sliceSize - 4);
         }
+        else if(this._current.sliceType === SliceType.ValueSlice)
+        {
+            throw new Ice.NoValueFactoryException("no value factory found and compact format prevents slicing " +
+                                                  "(the sender should use the sliced format instead)",
+                                                  this._current.typeId);
+        }
+        else if(this._current.typeId.indexOf("::") === 0)
+        {
+            throw new Ice.UnknownUserException(this._current.typeId.substring(2));
+        }
         else
         {
-            if(this._current.sliceType === SliceType.ValueSlice)
-            {
-                throw new Ice.NoValueFactoryException("no value factory found and compact format prevents slicing " +
-                                                       "(the sender should use the sliced format instead)",
-                                                       this._current.typeId);
-            }
-            else
-            {
-                if(this._current.typeId.indexOf("::") === 0)
-                {
-                    throw new Ice.UnknownUserException(this._current.typeId.substring(2));
-                }
-                else
-                {
-                    throw new Ice.UnknownUserException(this._current.typeId);
-                }
-            }
+            throw new Ice.UnknownUserException(this._current.typeId);
         }
 
         //
@@ -998,7 +987,7 @@
 
         if(cb !== null)
         {
-            cb.call(null, v);
+            cb(v);
         }
 
         return index;
@@ -1067,7 +1056,7 @@
         // Instance attributes
         this.sliceType = null;
         this.skipFirstSlice = false;
-        this.slices = null;     // Preserved slices. Ice.SliceInfo[]
+        this.slices = null; // Preserved slices. Ice.SliceInfo[]
         this.indirectionTables = null; // int[][]
 
         // Slice attributes
@@ -1176,10 +1165,14 @@
                     {
                         args.buffer = arg;
                     }
-                    else if(arg.constructor === Array)
+                    else if(arg.constructor === ArrayBuffer)
                     {
                         args.bytes = arg;
                     }
+                    else if(arg.constructor === Uint8Array)
+                    {
+                        args.bytes = arg.buffer;
+                    }
                     else
                     {
                         throw new Ice.InitializationException("unknown argument to InputStream constructor");
@@ -1832,14 +1825,7 @@
     readValue(cb, T)
     {
         this.initEncaps();
-        //
-        // BUGFIX:
-        // With Chrome on Linux the invocation of readValue on the decoder sometimes
-        // calls InputStream.readValue with the decoder object as this param.
-        // Use call instead of directly invoking the method to workaround this bug.
-        //
-        this._encapsStack.decoder.readValue.call(
-            this._encapsStack.decoder,
+        this._encapsStack.decoder.readValue(
             cb === null ? null : obj =>
             {
                 if(obj !== null && !(obj instanceof T))
@@ -1923,29 +1909,50 @@
         switch(format)
         {
             case OptionalFormat.F1:
+            {
                 this.skip(1);
                 break;
+            }
             case OptionalFormat.F2:
+            {
                 this.skip(2);
                 break;
+            }
             case OptionalFormat.F4:
+            {
                 this.skip(4);
                 break;
+            }
             case OptionalFormat.F8:
+            {
                 this.skip(8);
                 break;
+            }
             case OptionalFormat.Size:
+            {
                 this.skipSize();
                 break;
+            }
             case OptionalFormat.VSize:
+            {
                 this.skip(this.readSize());
                 break;
+            }
             case OptionalFormat.FSize:
+            {
                 this.skip(this.readInt());
                 break;
+            }
             case OptionalFormat.Class:
+            {
                 this.readValue(null, Ice.Value);
                 break;
+            }
+            default:
+            {
+                Debug.assert(false);
+                break;
+            }
         }
     }
 
@@ -2027,8 +2034,7 @@
 
     createUserException(id)
     {
-        let userEx = null, Class;
-
+        let userEx = null;
         try
         {
             const typeId = id.length > 2 ? id.substr(2).replace(/::/g, ".") : "";
@@ -2261,7 +2267,7 @@
     {
         super(stream, encaps);
         this._sliceType = SliceType.NoSlice;
-        this._writeSlice = 0;        // Position of the slice data members
+        this._writeSlice = 0; // Position of the slice data members
         this._valueIdIndex = 0;
         this._toBeMarshaledMap = new Map(); // Map<Ice.Value, Integer>();
     }
@@ -2282,7 +2288,7 @@
         }
     }
 
-    writeUserException(v)
+    writeException(v)
     {
         Debug.assert(v !== null && v !== undefined);
         //
@@ -2487,7 +2493,7 @@
         return undefined;
     }
 
-    writeUserException(v)
+    writeException(v)
     {
         Debug.assert(v !== null && v !== undefined);
         v._write(this._stream);
@@ -2746,7 +2752,7 @@
 
         // Slice attributes
         this.sliceFlags = 0;
-        this.writeSlice = 0;    // Position of the slice data members
+        this.writeSlice = 0; // Position of the slice data members
         this.sliceFlagsPos = 0; // Position of the slice flags
         this.indirectionTable = null; // Ice.Value[]
         this.indirectionMap = null; // Map<Ice.Value, int>
@@ -3251,10 +3257,18 @@
         }
     }
 
-    writeUserException(e)
+    writeException(e)
     {
         this.initEncaps();
-        this._encapsStack.encoder.writeUserException(e);
+        this._encapsStack.encoder.writeException(e);
+    }
+
+    //
+    // Keep for compatibility with 3.7.0 remove with next major version
+    //
+    writeUserException(e)
+    {
+        this.WriteException(e);
     }
 
     writeOptImpl(tag, format)
@@ -3487,7 +3501,10 @@
     static read(is)
     {
         let o;
-        is.readValue(v => o = v, Ice.Value);
+        is.readValue(v =>
+                     {
+                         o = v;
+                     }, Ice.Value);
         return o;
     }
 
@@ -3499,7 +3516,10 @@
     static readOptional(is, tag)
     {
         let o;
-        is.readOptionalValue(tag, v => o = v, Ice.Value);
+        is.readOptionalValue(tag, v =>
+                             {
+                                 o = v;
+                             }, Ice.Value);
         return o;
     }
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/StringUtil.js zeroc-ice-3.7.2/js/src/Ice/StringUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/StringUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/StringUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/Debug").Ice;
 const Debug = Ice.Debug;
@@ -30,6 +25,7 @@
         }
         return -1;
     }
+
     //
     // Return the index of the first character in str which does
     // not appear in match, starting from start. Returns -1 if none is
@@ -48,6 +44,7 @@
         }
         return -1;
     }
+
     //
     // Add escape sequences (such as "\n", or "\123") to s
     //
@@ -60,7 +57,7 @@
             {
                 if(special.charCodeAt(i) < 32 || special.charCodeAt(i) > 126)
                 {
-                    throw new Error("special characters must be in ASCII range 32-126");
+                    throw new RangeError("special characters must be in ASCII range 32-126");
                 }
             }
         }
@@ -91,7 +88,7 @@
                     Debug.assert(toStringMode === Ice.ToStringMode.ASCII && c >= 0xD800 && c <= 0xDFFF);
                     if(i + 1 === s.length)
                     {
-                        throw new Error("High surrogate without low surrogate");
+                        throw new RangeError("High surrogate without low surrogate");
                     }
                     else
                     {
@@ -113,6 +110,7 @@
         }
         return result.join("");
     }
+
     //
     // Remove escape sequences added by escapeString. Throws Error
     // for an invalid input string.
@@ -131,7 +129,7 @@
             {
                 if(special.charCodeAt(i) < 32 || special.charCodeAt(i) > 126)
                 {
-                    throw new Error("special characters must be in ASCII range 32-126");
+                    throw new RangeError("special characters must be in ASCII range 32-126");
                 }
             }
         }
@@ -157,6 +155,7 @@
             return arr.join("");
         }
     }
+
     //
     // Split string helper; returns null for unmatched quotes
     //
@@ -220,6 +219,7 @@
 
         return v;
     }
+
     //
     // If a single or double quotation mark is found at the start position,
     // then the position of the matching closing quote is returned. If no
@@ -247,6 +247,7 @@
         }
         return 0; // Not quoted
     }
+
     static hashCode(s)
     {
         let hash = 0;
@@ -256,12 +257,13 @@
         }
         return hash;
     }
+
     static toInt(s)
     {
         const n = parseInt(s, 10);
         if(isNaN(n))
         {
-            throw new Error("conversion of `" + s + "' to int failed");
+            throw new RangeError("conversion of `" + s + "' to int failed");
         }
         return n;
     }
@@ -347,55 +349,52 @@
                 sb.push('\\');
                 sb.push(s);
             }
-            else
+            else if(c < 32 || c > 126)
             {
-                if(c < 32 || c > 126)
+                if(toStringMode === Ice.ToStringMode.Compat)
                 {
-                    if(toStringMode === Ice.ToStringMode.Compat)
-                    {
-                        //
-                        // When ToStringMode=Compat, c is a UTF-8 byte
-                        //
-                        Debug.assert(c < 256);
-                        sb.push('\\');
-                        const octal = c.toString(8);
-                        //
-                        // Add leading zeroes so that we avoid problems during
-                        // decoding. For example, consider the encoded string
-                        // \0013 (i.e., a character with value 1 followed by
-                        // the character '3'). If the leading zeroes were omitted,
-                        // the result would be incorrectly interpreted by the
-                        // decoder as a single character with value 11.
-                        //
-                        for(let j = octal.length; j < 3; j++)
-                        {
-                            sb.push('0');
-                        }
-                        sb.push(octal);
-                    }
-                    else if(c < 32 || c == 127 || toStringMode === Ice.ToStringMode.ASCII)
+                    //
+                    // When ToStringMode=Compat, c is a UTF-8 byte
+                    //
+                    Debug.assert(c < 256);
+                    sb.push('\\');
+                    const octal = c.toString(8);
+                    //
+                    // Add leading zeroes so that we avoid problems during
+                    // decoding. For example, consider the encoded string
+                    // \0013 (i.e., a character with value 1 followed by
+                    // the character '3'). If the leading zeroes were omitted,
+                    // the result would be incorrectly interpreted by the
+                    // decoder as a single character with value 11.
+                    //
+                    for(let j = octal.length; j < 3; j++)
+                    {
+                        sb.push('0');
+                    }
+                    sb.push(octal);
+                }
+                else if(c < 32 || c == 127 || toStringMode === Ice.ToStringMode.ASCII)
+                {
+                    // append \\unnnn
+                    sb.push("\\u");
+                    const hex = c.toString(16);
+                    for(let j = hex.length; j < 4; j++)
                     {
-                        // append \\unnnn
-                        sb.push("\\u");
-                        const hex = c.toString(16);
-                        for(let j = hex.length; j < 4; j++)
-                        {
-                            sb.push('0');
-                        }
-                        sb.push(hex);
-                    }
-                    else
-                    {
-                        // keep as is
-                        sb.push(s);
+                        sb.push('0');
                     }
+                    sb.push(hex);
                 }
                 else
                 {
-                    // printable ASCII character
+                    // keep as is
                     sb.push(s);
                 }
             }
+            else
+            {
+                // printable ASCII character
+                sb.push(s);
+            }
             break;
         }
     }
@@ -416,7 +415,7 @@
             msg = "first character";
         }
         msg += " has invalid ordinal value" + c;
-        throw new Error(msg);
+        throw new RangeError(msg);
     }
     return s.charAt(pos);
 }
@@ -528,11 +527,11 @@
                 }
                 if(size > 0)
                 {
-                    throw new Error("Invalid universal character name: too few hex digits");
+                    throw new RangeError("Invalid universal character name: too few hex digits");
                 }
                 if(codePoint >= 0xD800 && codePoint <= 0xDFFF)
                 {
-                    throw new Error("A universal character name cannot designate a surrogate");
+                    throw new RangeError("A universal character name cannot designate a surrogate");
                 }
                 if(inBMP || codePoint <= 0xFFFF)
                 {
@@ -589,7 +588,7 @@
                         }
                         if(size === 2)
                         {
-                            throw new Error("Invalid \\x escape sequence: no hex digit");
+                            throw new RangeError("Invalid \\x escape sequence: no hex digit");
                         }
                     }
                     else
@@ -607,7 +606,7 @@
                         }
                         if(val > 255)
                         {
-                            throw new Error("octal value \\" + val.toString(8) + " (" + val + ") is out of range");
+                            throw new RangeError("octal value \\" + val.toString(8) + " (" + val + ") is out of range");
                         }
                     }
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Struct.js zeroc-ice-3.7.2/js/src/Ice/Struct.js
--- zeroc-ice-3.7.1/js/src/Ice/Struct.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Struct.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -97,7 +92,7 @@
     }
     else
     {
-        const t = typeof(e);
+        const t = typeof e;
         if(e instanceof String || t == "string")
         {
             return Ice.HashUtil.addString(h, e);
diff -Nru zeroc-ice-3.7.1/js/src/Ice/TcpEndpointFactory.js zeroc-ice-3.7.2/js/src/Ice/TcpEndpointFactory.js
--- zeroc-ice-3.7.1/js/src/Ice/TcpEndpointFactory.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/TcpEndpointFactory.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/TcpEndpointI").Ice;
 const TcpEndpointI = Ice.TcpEndpointI;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/TcpEndpointI.js zeroc-ice-3.7.2/js/src/Ice/TcpEndpointI.js
--- zeroc-ice-3.7.1/js/src/Ice/TcpEndpointI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/TcpEndpointI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -24,7 +19,7 @@
 const Debug = Ice.Debug;
 const HashUtil = Ice.HashUtil;
 const StringUtil = Ice.StringUtil;
-const TcpTransceiver = typeof(Ice.TcpTransceiver) !== "undefined" ? Ice.TcpTransceiver : null;
+const TcpTransceiver = typeof Ice.TcpTransceiver !== "undefined" ? Ice.TcpTransceiver : null;
 
 class TcpEndpointI extends Ice.IPEndpointI
 {
diff -Nru zeroc-ice-3.7.1/js/src/Ice/TcpTransceiver.js zeroc-ice-3.7.2/js/src/Ice/TcpTransceiver.js
--- zeroc-ice-3.7.1/js/src/Ice/TcpTransceiver.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/TcpTransceiver.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const net = require("net");
 
@@ -29,6 +24,22 @@
 const StateProxyConnectRequestPending = 3;
 const StateConnected = 4;
 
+//
+// TODO: WORKAROUND: We can directly use Buffer.from once we drop
+// support for Node 4.x
+//
+let createBuffer = null;
+if(Buffer.from)
+{
+    createBuffer = Buffer.from;
+}
+else
+{
+    /* eslint-disable no-buffer-constructor */
+    createBuffer = data => new Buffer(data);
+    /* eslint-enable no-buffer-constructor */
+}
+
 class TcpTransceiver
 {
     constructor(instance)
@@ -45,6 +56,7 @@
         this._bytesAvailableCallback = bytesAvailableCallback;
         this._bytesWrittenCallback = bytesWrittenCallback;
     }
+
     //
     // Returns SocketOperation.None when initialization is complete.
     //
@@ -60,9 +72,12 @@
             if(this._state === StateNeedConnect)
             {
                 this._state = StateConnectPending;
-                this._fd = net.createConnection({port: this._addr.port,
-                                                 host: this._addr.host,
-                                                 localAddress: this._sourceAddr});
+                this._fd = net.createConnection(
+                    {
+                        port: this._addr.port,
+                        host: this._addr.host,
+                        localAddress: this._sourceAddr
+                    });
 
                 this._fd.on("connect", () => this.socketConnected());
                 this._fd.on("data", buf => this.socketBytesAvailable(buf));
@@ -160,6 +175,7 @@
             this._fd = null;
         }
     }
+
     //
     // Returns true if all of the data was flushed to the kernel buffer.
     //
@@ -183,17 +199,15 @@
             const slice = byteBuffer.b.slice(byteBuffer.position, byteBuffer.position + packetSize);
 
             let sync = true;
-            /*jshint -W083 */
-            sync = this._fd.write(new Buffer(slice), null, () =>
+            sync = this._fd.write(createBuffer(slice), null, () =>
                 {
                     if(!sync)
                     {
                         this._bytesWrittenCallback();
                     }
                 });
-            /*jshint +W083 */
 
-            byteBuffer.position = byteBuffer.position + packetSize;
+            byteBuffer.position += packetSize;
             if(!sync)
             {
                 return false; // Wait for callback to be called before sending more data.
@@ -235,7 +249,7 @@
                 avail = byteBuffer.remaining;
             }
 
-            this._readBuffers[0].copy(new Buffer(byteBuffer.b), byteBuffer.position, this._readPosition,
+            this._readBuffers[0].copy(createBuffer(byteBuffer.b), byteBuffer.position, this._readPosition,
                                       this._readPosition + avail);
 
             byteBuffer.position += avail;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Timer.js zeroc-ice-3.7.2/js/src/Ice/Timer.js
--- zeroc-ice-3.7.1/js/src/Ice/Timer.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Timer.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module, ["../Ice/LocalException", "../Ice/TimerUtil"]);
@@ -37,7 +32,7 @@
         }
         const token = this._tokenId++;
         const id = Timer.setTimeout(() => this.handleTimeout(token), delay);
-        this._tokens.set(token, { callback: callback, id: id, isInterval: false });
+        this._tokens.set(token, {callback: callback, id: id, isInterval: false});
         return token;
     }
 
@@ -49,7 +44,7 @@
         }
         const token = this._tokenId++;
         const id = Timer.setInterval(() => this.handleInterval(token), period);
-        this._tokens.set(token, { callback: callback, id: id, isInterval: true });
+        this._tokens.set(token, {callback: callback, id: id, isInterval: true});
         return token;
     }
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/TimerUtil.js zeroc-ice-3.7.2/js/src/Ice/TimerUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/TimerUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/TimerUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ToStringMode.js zeroc-ice-3.7.2/js/src/Ice/ToStringMode.js
--- zeroc-ice-3.7.1/js/src/Ice/ToStringMode.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ToStringMode.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/EnumBase").Ice;
-Ice.ToStringMode  = Ice.Slice.defineEnum([['Unicode', 0], ['ASCII',1], ['Compat',2]]);
+Ice.ToStringMode = Ice.Slice.defineEnum(
+    [
+        ['Unicode', 0],
+        ['ASCII', 1],
+        ['Compat', 2]
+    ]);
 module.exports.Ice = Ice;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/TraceLevels.js zeroc-ice-3.7.2/js/src/Ice/TraceLevels.js
--- zeroc-ice-3.7.1/js/src/Ice/TraceLevels.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/TraceLevels.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/TraceUtil.js zeroc-ice-3.7.2/js/src/Ice/TraceUtil.js
--- zeroc-ice-3.7.1/js/src/Ice/TraceUtil.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/TraceUtil.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 Ice._ModuleRegistry.require(module,
@@ -224,7 +219,7 @@
     {
         const key = stream.readString();
         const value = stream.readString();
-        s.push(key + '/'+ value);
+        s.push(key + '/' + value);
         if(sz > 0)
         {
             s.push(", ");
@@ -241,7 +236,7 @@
 
 function printHeader(s, stream)
 {
-    stream.readByte();  // Don't bother printing the magic number
+    stream.readByte(); // Don't bother printing the magic number
     stream.readByte();
     stream.readByte();
     stream.readByte();
@@ -348,7 +343,7 @@
     case Protocol.closeConnectionMsg:
         return "close connection";
     case Protocol.validateConnectionMsg:
-        return  "validate connection";
+        return "validate connection";
     default:
         return "unknown";
     }
@@ -469,7 +464,7 @@
                     }
                     else
                     {
-                        s = "" + n;
+                        s = String(n);
                     }
                     buf.push(s + " ");
                 }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/UnknownSlicedValue.d.ts zeroc-ice-3.7.2/js/src/Ice/UnknownSlicedValue.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/UnknownSlicedValue.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/UnknownSlicedValue.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,64 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        /**
+         * Encapsulates the details of a slice for an unknown class or exception type.
+         */
+        class SliceInfo
+        {
+            /**
+             * The Slice type ID for this slice.
+             */
+            typeId:string;
+
+            /**
+             * The Slice compact type ID for this slice.
+             */
+            compactId:number;
+
+            /**
+             * The encoded bytes for this slice, including the leading size integer.
+             */
+            bytes:Uint8Array;
+
+            /**
+             * The class instances referenced by this slice.
+             */
+            instances:Value[];
+
+            /**
+             * Whether or not the slice contains optional members.
+             */
+            hasOptionalMembers:boolean;
+
+            /**
+             * Whether or not this is the last slice.
+             */
+            isLastSlice:boolean;
+        }
+
+        /**
+         * Holds the slices of unknown types.
+         */
+        class SlicedData
+        {
+            /**
+             * The slices of unknown types.
+             */
+            slices:SliceInfo[];
+        }
+
+        class UnknownSlicedValue extends Ice.Value
+        {
+            constructor(unknownTypeId:string);
+
+            ice_getSlicedData():SlicedData;
+            ice_id():string;
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/UnknownSlicedValue.js zeroc-ice-3.7.2/js/src/Ice/UnknownSlicedValue.js
--- zeroc-ice-3.7.1/js/src/Ice/UnknownSlicedValue.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/UnknownSlicedValue.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/Value").Ice;
 
@@ -13,34 +8,34 @@
 {
     constructor()
     {
-        /**
-        * The Slice type ID for this slice.
-        **/
+        //
+        // The Slice type ID for this slice.
+        //
         this.typeId = "";
 
-        /**
-        * The Slice compact type ID for this slice.
-        **/
+        //
+        // The Slice compact type ID for this slice.
+        //
         this.compactId = -1;
 
-        /**
-        * The encoded bytes for this slice, including the leading size integer.
-        **/
+        //
+        // The encoded bytes for this slice, including the leading size integer.
+        //
         this.bytes = [];
 
-        /**
-        * The class instances referenced by this slice.
-        **/
+        //
+        // The class instances referenced by this slice.
+        //
         this.instances = [];
 
-        /**
-        * Whether or not the slice contains optional members.
-        **/
+        //
+        // Whether or not the slice contains optional members.
+        //
         this.hasOptionalMembers = false;
 
-        /**
-        * Whether or not this is the last slice.
-        **/
+        //
+        // Whether or not this is the last slice.
+        //
         this.isLastSlice = false;
     }
 }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/UUID.d.ts zeroc-ice-3.7.2/js/src/Ice/UUID.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/UUID.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/UUID.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,15 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        /**
+         * Generates a universally unique identifier (UUID).
+         * @return The UUID.
+         */
+        function generateUUID():string;
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/UUID.js zeroc-ice-3.7.2/js/src/Ice/UUID.js
--- zeroc-ice-3.7.1/js/src/Ice/UUID.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/UUID.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 function generateUUID()
 {
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Value.d.ts zeroc-ice-3.7.2/js/src/Ice/Value.d.ts
--- zeroc-ice-3.7.1/js/src/Ice/Value.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Value.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,51 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+declare module "ice"
+{
+    namespace Ice
+    {
+        /**
+         * The base class for instances of Slice classes.
+         */
+        class Value
+        {
+            /**
+             * The Ice run time invokes this method prior to marshaling an object's data members. This allows a subclass
+             * to override this method in order to validate its data members.
+             */
+            ice_preMarshal():void;
+
+            /**
+             * The Ice run time invokes this method vafter unmarshaling an object's data members. This allows a
+             * subclass to override this method in order to perform additional initialization.
+             */
+            ice_postUnmarshal():void;
+
+            /**
+             * Obtains the Slice type ID of the most-derived class supported by this object.
+             * @return The type ID.
+             */
+            ice_id():string;
+
+            /**
+             * Obtains the Slice type ID of this type.
+             * @return The return value is always "::Ice::Object".
+             */
+            static ice_staticId():string;
+
+            /**
+             * Obtains the sliced data associated with this instance.
+             * @return The sliced data if the value has a preserved-slice base class and has been sliced during
+             * unmarshaling of the value, nil otherwise.
+             */
+            ice_getSlicedData():SlicedData;
+        }
+
+        class InterfaceByValue extends Value
+        {
+            constructor(id:string);
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/src/Ice/ValueFactoryManagerI.js zeroc-ice-3.7.2/js/src/Ice/ValueFactoryManagerI.js
--- zeroc-ice-3.7.1/js/src/Ice/ValueFactoryManagerI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/ValueFactoryManagerI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/LocalException").Ice;
 
diff -Nru zeroc-ice-3.7.1/js/src/Ice/Value.js zeroc-ice-3.7.2/js/src/Ice/Value.js
--- zeroc-ice-3.7.1/js/src/Ice/Value.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/Value.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Ice.Value
@@ -63,15 +58,21 @@
 
     static read(is)
     {
-        const v = { value: null };
-        is.readValue(o => v.value = o, this);
+        const v = {value: null};
+        is.readValue(o =>
+                     {
+                         v.value = o;
+                     }, this);
         return v;
     }
 
     static readOptional(is, tag)
     {
-        const v = { value: undefined };
-        is.readOptionalValue(tag, o => v.value = o, this);
+        const v = {value: undefined};
+        is.readOptionalValue(tag, o =>
+                             {
+                                 v.value = o;
+                             }, this);
         return v;
     }
 };
@@ -123,7 +124,7 @@
     }
 
     os.startSlice(type.ice_staticId(),
-                  Object.prototype.hasOwnProperty.call(type, '_iceCompactId') ? type._iceCompactId : -1 ,
+                  Object.prototype.hasOwnProperty.call(type, '_iceCompactId') ? type._iceCompactId : -1,
                   Object.getPrototypeOf(type) === Ice.Value);
     if(type.prototype.hasOwnProperty('_iceWriteMemberImpl'))
     {
diff -Nru zeroc-ice-3.7.1/js/src/Ice/WSEndpointFactory.js zeroc-ice-3.7.2/js/src/Ice/WSEndpointFactory.js
--- zeroc-ice-3.7.1/js/src/Ice/WSEndpointFactory.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/WSEndpointFactory.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/WSEndpoint").Ice;
 const WSEndpoint = Ice.WSEndpoint;
 
-class WSEndpointFactory extends WSEndpoint
+class WSEndpointFactory
 {
     constructor(instance, delegate)
     {
-        super();
         this._instance = instance;
         this._delegate = delegate;
     }
diff -Nru zeroc-ice-3.7.1/js/src/Ice/WSEndpoint.js zeroc-ice-3.7.2/js/src/Ice/WSEndpoint.js
--- zeroc-ice-3.7.1/js/src/Ice/WSEndpoint.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/WSEndpoint.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 const Ice = require("../Ice/ModuleRegistry").Ice;
 
@@ -213,21 +208,11 @@
         }
         return true;
     }
-}
 
-if(typeof(Ice.WSTransceiver) !== "undefined")
-{
-    WSEndpoint.prototype.connectable = function()
-    {
-        return true;
-    };
-}
-else
-{
-    WSEndpoint.prototype.connectable = function()
+    connectable()
     {
-        return false;
-    };
+        return typeof Ice.WSTransceiver !== "undefined";
+    }
 }
 
 Ice.WSEndpoint = WSEndpoint;
diff -Nru zeroc-ice-3.7.1/js/src/Ice/WSTransceiver.js zeroc-ice-3.7.2/js/src/Ice/WSTransceiver.js
--- zeroc-ice-3.7.1/js/src/Ice/WSTransceiver.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/Ice/WSTransceiver.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // dummy WS transceiver for nodejs
diff -Nru zeroc-ice-3.7.1/js/src/IceGrid/.gitignore zeroc-ice-3.7.2/js/src/IceGrid/.gitignore
--- zeroc-ice-3.7.1/js/src/IceGrid/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/IceGrid/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,20 @@
 Admin.js
+Admin.d.ts
 Descriptor.js
+Descriptor.d.ts
 Exception.js
+Exception.d.ts
 FileParser.js
+FileParser.d.ts
 Locator.js
+Locator.d.ts
 Observer.js
+Observer.d.ts
 Query.js
+Query.d.ts
 Registry.js
+Registry.d.ts
 Session.js
+Session.d.ts
 UserAccountMapper.js
+UserAccountMapper.d.ts
diff -Nru zeroc-ice-3.7.1/js/src/IceGrid/IceGrid.js zeroc-ice-3.7.2/js/src/IceGrid/IceGrid.js
--- zeroc-ice-3.7.1/js/src/IceGrid/IceGrid.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/IceGrid/IceGrid.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-var _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry;
+const _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry;
 
 module.exports.IceGrid = _ModuleRegistry.require(module,
     [
diff -Nru zeroc-ice-3.7.1/js/src/IceGrid/index.d.ts zeroc-ice-3.7.2/js/src/IceGrid/index.d.ts
--- zeroc-ice-3.7.1/js/src/IceGrid/index.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/IceGrid/index.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,18 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+//
+// Ice version 3.7.1
+//
+
+/// <reference path="./Admin.d.ts"/>
+/// <reference path="./Descriptor.d.ts"/>
+/// <reference path="./Exception.d.ts"/>
+/// <reference path="./FileParser.d.ts"/>
+/// <reference path="./Registry.d.ts"/>
+/// <reference path="./Session.d.ts"/>
+/// <reference path="./UserAccountMapper.d.ts"/>
+
+export namespace IceGrid {}
+
+declare module "ice" {}
diff -Nru zeroc-ice-3.7.1/js/src/IceGrid/sources.json zeroc-ice-3.7.2/js/src/IceGrid/sources.json
--- zeroc-ice-3.7.1/js/src/IceGrid/sources.json	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/IceGrid/sources.json	2019-02-05 18:03:04.000000000 +0000
@@ -12,5 +12,5 @@
         "IceGrid/UserAccountMapper.ice"],
 
     "common":
-        ["IceGrid/IceGrid.js"]
+        ["IceGrid.js"]
 }
diff -Nru zeroc-ice-3.7.1/js/src/IceStorm/.gitignore zeroc-ice-3.7.2/js/src/IceStorm/.gitignore
--- zeroc-ice-3.7.1/js/src/IceStorm/.gitignore	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/IceStorm/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -1,2 +1,4 @@
 IceStorm.js
+IceStorm.d.ts
 Metrics.js
+Metrics.d.ts
diff -Nru zeroc-ice-3.7.1/js/src/index.js zeroc-ice-3.7.2/js/src/index.js
--- zeroc-ice-3.7.1/js/src/index.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/src/index.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-module.exports.Ice      = require("./Ice/Ice").Ice;
-module.exports.IceMX    = require("./Ice/Ice").IceMX;
-module.exports.IceSSL   = require("./Ice/Ice").IceSSL;
+module.exports.Ice = require("./Ice/Ice").Ice;
+module.exports.IceMX = require("./Ice/Ice").IceMX;
+module.exports.IceSSL = require("./Ice/Ice").IceSSL;
 module.exports.Glacier2 = require("./Glacier2/Glacier2").Glacier2;
-module.exports.IceGrid  = require("./IceGrid/IceGrid").IceGrid;
+module.exports.IceGrid = require("./IceGrid/IceGrid").IceGrid;
 module.exports.IceStorm = require("./IceStorm/IceStorm").IceStorm;
diff -Nru zeroc-ice-3.7.1/js/test/Common/controller.html zeroc-ice-3.7.2/js/test/Common/controller.html
--- zeroc-ice-3.7.1/js/test/Common/controller.html	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/controller.html	2019-02-05 18:03:04.000000000 +0000
@@ -33,7 +33,7 @@
             <h4><strong>ZeroC</strong></h4>
         </div>
         <div class="copyright">
-            <h6>Copyright &copy; 2003-2018 ZeroC, Inc. All rights reserved.</h6>
+            <h6>Copyright &copy; ZeroC, Inc. All rights reserved.</h6>
         </div>
     </div>
     {{#jsDeps}}
diff -Nru zeroc-ice-3.7.1/js/test/Common/ControllerI.d.ts zeroc-ice-3.7.2/js/test/Common/ControllerI.d.ts
--- zeroc-ice-3.7.1/js/test/Common/ControllerI.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/ControllerI.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,26 @@
+
+export class DOMElement
+{
+    val(value:string):string;
+    scrollTop():void;
+}
+
+export class Output
+{
+    constructor(output:DOMElement);
+    write(msg:string):void;
+    writeLine(msg:string):void;
+    get():string;
+    clear():void;
+}
+
+export default class ControllerHelper
+{
+    constructor(exe:string, output:Output);
+
+    serverReady(ex?:Error):void;
+    waitReady():PromiseLike<void>;
+
+    write(msg:string):void;
+    writeLine(msg:string):void;
+}
diff -Nru zeroc-ice-3.7.1/js/test/Common/ControllerI.js zeroc-ice-3.7.2/js/test/Common/ControllerI.js
--- zeroc-ice-3.7.1/js/test/Common/ControllerI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/ControllerI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
- /* global
-    _test : false,
-    _runServer : false,
-    Test : false,
-    WorkerGlobalScope : false,
-    _server: false,
-    _serveramd: false,
-    URI: false
-*/
+/* globals Ice, Test, URI, WorkerGlobalScope */
+/* eslint no-unused-vars: ["error", { "varsIgnorePattern": "isSafari|isChrome|isWorker|isWindows|runController" }] */
 
 function isSafari()
 {
-    return /^((?!chrome).)*safari/i.test(navigator.userAgent);
+    return (/^((?!chrome).)*safari/i).test(navigator.userAgent);
 }
 
 function isChrome()
@@ -33,7 +21,7 @@
 
 function isWorker()
 {
-    return typeof(WorkerGlobalScope) !== 'undefined' && this instanceof WorkerGlobalScope;
+    return typeof WorkerGlobalScope !== 'undefined' && this instanceof WorkerGlobalScope;
 }
 
 function isWindows()
@@ -61,32 +49,32 @@
 
 class ProcessI extends Test.Common.Process
 {
-    constructor(promise, output, ready)
+    constructor(promise, helper, output)
     {
         super();
         this._promise = promise;
+        this._helper = helper;
         this._output = output;
-        this._ready = ready;
     }
 
-    async waitReady(timeout, current)
+    async waitReady()
     {
-        if(this._ready)
-        {
-            await this._ready;
-        }
+        await this._helper.waitReady();
     }
 
-    async waitSuccess(timeout, current)
+    async waitSuccess()
     {
         try
         {
             await this._promise;
+            this._helper.serverReady();
             return 0;
         }
         catch(ex)
         {
             this._output.writeLine(`unexpected exception while running test: ${ex.toString()}`);
+            this._output.writeLine(ex.stack);
+            this._helper.serverReady(ex);
             return 1;
         }
     }
@@ -98,6 +86,51 @@
     }
 }
 
+class ControllerHelper
+{
+    constructor(exe, output)
+    {
+        if(exe === "Server" || exe === "ServerAMD")
+        {
+            this._serverReady = new Ice.Promise();
+        }
+        this._output = output;
+    }
+
+    serverReady(ex)
+    {
+        if(this._serverReady)
+        {
+            if(ex)
+            {
+                this._serverReady.reject(ex);
+            }
+            else
+            {
+                this._serverReady.resolve();
+            }
+        }
+    }
+
+    async waitReady()
+    {
+        if(this._serverReady)
+        {
+            await this._serverReady;
+        }
+    }
+
+    write(msg)
+    {
+        this._output.write(msg);
+    }
+
+    writeLine(msg)
+    {
+        this._output.writeLine(msg);
+    }
+}
+
 class ProcessControllerI extends Test.Common.BrowserProcessController
 {
     constructor(clientOutput, serverOutput, useWorker, scripts)
@@ -111,13 +144,11 @@
 
     start(testSuite, exe, args, current)
     {
-        let es5 = document.location.pathname.indexOf("/es5/") !== -1;
+        const es5 = document.location.pathname.indexOf("/es5/") !== -1;
         let promise;
-        let ready = null;
         let out;
         if(exe === "Server" || exe === "ServerAMD")
         {
-            ready = new Ice.Promise();
             out = this._serverOutput;
         }
         else
@@ -125,14 +156,15 @@
             out = this._clientOutput;
         }
         out.clear();
+        const helper = new ControllerHelper(exe, out);
 
         if(this._useWorker)
         {
-            let scripts = this._scripts;
+            const scripts = this._scripts;
             promise = new Promise(
                 (resolve, reject) =>
                     {
-                        let worker = new Worker(es5 ?
+                        const worker = new Worker(es5 ?
                                                 "/test/es5/Common/ControllerWorker.js" :
                                                 "/test/Common/ControllerWorker.js");
                         this._worker = worker;
@@ -140,60 +172,43 @@
                         {
                             if(e.data.type == "write")
                             {
-                                out.write(e.data.message);
+                                helper.write(e.data.message);
                             }
                             else if(e.data.type == "writeLine")
                             {
-                                out.writeLine(e.data.message);
+                                helper.writeLine(e.data.message);
                             }
-                            else if(e.data.type == "ready" && (exe === "Server" || exe === "ServerAMD"))
+                            else if(e.data.type == "ready")
                             {
-                                ready.resolve();
+                                helper.serverReady();
                             }
                             else if(e.data.type == "finished")
                             {
                                 if(e.data.exception)
                                 {
                                     reject(e.data.exception);
-                                    if(ready)
-                                    {
-                                        ready.reject(e.data.exception);
-                                    }
                                 }
                                 else
                                 {
                                     resolve();
-                                    if(ready)
-                                    {
-                                        ready.resolve();
-                                    }
                                 }
                                 worker.terminate();
                             }
                         };
-                        worker.postMessage({ scripts:scripts, exe:exe, args:args });
+                        worker.postMessage({scripts: scripts, exe: exe, args: args});
                     });
         }
         else
         {
-            let initData = new Ice.InitializationData();
-            initData.properties = Ice.createProperties(args);
-            if(exe === "Server" || exe === "ServerAMD")
-            {
-                initData.logger = new Logger(this._serverOutput);
-                let test = exe === "Server" ? _server : _serveramd;
-                promise = test(this._serverOutput, initData, ready, args);
-            }
-            else
-            {
-                initData.logger = new Logger(this._clientOutput);
-                promise = _test(this._clientOutput, initData, args);
-            }
+            const cls = Ice._require(exe)[exe];
+            const test = new cls();
+            test.setControllerHelper(helper);
+            promise = test.run(args);
         }
-        return Test.Common.ProcessPrx.uncheckedCast(current.adapter.addWithUUID(new ProcessI(promise, out, ready)));
+        return Test.Common.ProcessPrx.uncheckedCast(current.adapter.addWithUUID(new ProcessI(promise, helper, out)));
     }
 
-    getHost(protocol, ipv6, current)
+    getHost()
     {
         return "127.0.0.1";
     }
@@ -237,16 +252,16 @@
         }
     }
 
-    let out = new Output(clientOutput);
-    let serverOut = new Output(serverOutput);
+    const out = new Output(clientOutput);
+    const serverOut = new Output(serverOutput);
 
-    let uri = new URI(document.location.href);
-    let protocol = uri.protocol() === "http" ? "ws" : "wss";
-    let query = uri.search(true);
-    let port = query.port || 15002;
-    let worker = query.worker === "True";
+    const uri = new URI(document.location.href);
+    const protocol = uri.protocol() === "http" ? "ws" : "wss";
+    const query = uri.search(true);
+    const port = query.port || 15002;
+    const worker = query.worker === "True";
 
-    let initData = new Ice.InitializationData();
+    const initData = new Ice.InitializationData();
     initData.logger = new Logger(out);
     initData.properties = Ice.createProperties();
     initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
@@ -256,11 +271,11 @@
         try
         {
             await registry.ice_ping();
-            let connection = registry.ice_getCachedConnection();
+            const connection = registry.ice_getCachedConnection();
             connection.setAdapter(adapter);
             connection.setACM(5, Ice.ACMClose.CloseOff, Ice.ACMHeartbeat.HeartbeatAlways);
             connection.setCloseCallback(
-                connection => out.writeLine("connection with process controller registry closed"));
+                () => out.writeLine("connection with process controller registry closed"));
             await registry.setProcessController(Test.Common.ProcessControllerPrx.uncheckedCast(processController));
         }
         catch(ex)
@@ -280,11 +295,11 @@
     try
     {
         comm = Ice.initialize(initData);
-        let str = `Util/ProcessControllerRegistry:${protocol} -h ${document.location.hostname} -p ${port}`;
-        let registry = Test.Common.ProcessControllerRegistryPrx.uncheckedCast(comm.stringToProxy(str));
-        let adapter = await comm.createObjectAdapter("");
-        let ident = new Ice.Identity("ProcessController", "Browser");
-        let processController = adapter.add(new ProcessControllerI(out, serverOut, worker, scripts), ident);
+        const str = `Util/ProcessControllerRegistry:${protocol} -h ${document.location.hostname} -p ${port}`;
+        const registry = Test.Common.ProcessControllerRegistryPrx.uncheckedCast(comm.stringToProxy(str));
+        const adapter = await comm.createObjectAdapter("");
+        const ident = new Ice.Identity("ProcessController", "Browser");
+        const processController = adapter.add(new ProcessControllerI(out, serverOut, worker, scripts), ident);
         adapter.activate();
         registerProcessController(adapter, registry, processController);
     }
diff -Nru zeroc-ice-3.7.1/js/test/Common/ControllerWorker.js zeroc-ice-3.7.2/js/test/Common/ControllerWorker.js
--- zeroc-ice-3.7.1/js/test/Common/ControllerWorker.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/ControllerWorker.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,76 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-/* global
-    self : false,
-    runTest : false,
-    _server : false,
-    _serveramd : false,
-    _test : false
-*/
+/* global self, ControllerHelper, Ice */
 
 class Output
 {
     static write(message)
     {
-        self.postMessage({type:"write", message:message});
+        self.postMessage({type: "write", message: message});
     }
 
     static writeLine(message)
     {
-        self.postMessage({type:"writeLine", message:message});
+        self.postMessage({type: "writeLine", message: message});
     }
 }
 
-self.onmessage = async (e) =>
+self.onmessage = async e =>
     {
         try
         {
-            for(let script of e.data.scripts)
+            for(const script of e.data.scripts)
             {
                 self.importScripts(script);
             }
-
-            class Logger extends Ice.Logger
-            {
-                write(message, indent)
-                {
-                    if(indent)
-                    {
-                        message = message.replace(/\n/g, "\n   ");
-                    }
-                    Output.writeLine(message);
-                }
-            }
-
-            let promise;
-            let initData = new Ice.InitializationData();
-            initData.properties = Ice.createProperties(e.data.args);
-            initData.logger = new Logger();
-            if(e.data.exe === "Server" || e.data.exe === "ServerAMD")
-            {
-                let ready = new Ice.Promise();
-                let test = e.data.exe === "Server" ? _server : _serveramd;
-                promise = test(Output, initData, ready, e.data.args);
-                await ready;
-                self.postMessage({type:"ready"});
-            }
-            else
-            {
-                promise = _test(Output, initData, e.data.args);
-            }
-
+            const helper = new ControllerHelper(e.data.exe, Output);
+            const cls = Ice._require(e.data.exe)[e.data.exe];
+            const test = new cls();
+            test.setControllerHelper(helper);
+            const promise = test.run(e.data.args);
+            await helper.waitReady();
+            self.postMessage({type: "ready"});
             await promise;
-            self.postMessage({ type: "finished" });
+            self.postMessage({type: "finished"});
         }
         catch(ex)
         {
-            self.postMessage({ type: "finished", exception:ex.toString() });
+            self.postMessage({type: "finished", exception: ex.toString()});
         }
     };
diff -Nru zeroc-ice-3.7.1/js/test/Common/index.html zeroc-ice-3.7.2/js/test/Common/index.html
--- zeroc-ice-3.7.1/js/test/Common/index.html	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/index.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Test Suite | Ice for JavaScript</title>
-    <link rel="icon" type="image/x-icon" href="/assets/favicon.ico"/>
-    <link rel="stylesheet" type="text/css" href="/assets/common.css"/>
-    {{#cssDeps}}
-    <link rel="stylesheet" type="text/css" href="{{.}}"/>
-    {{/cssDeps}}
-  </head>
-  <body>
-    <div id="header">
-        <nav class="top-bar" data-topbar>
-            <ul class="title-area">
-                <li class="name">
-                    <h1><a href="#">Ice for JavaScript</a></h1>
-                </li>
-                <li class="toggle-topbar menu-icon"><a href="#">Menu</a></li>
-            </ul>
-            <section class="top-bar-section">
-                <!-- Right Nav Section -->
-                <ul class="right">
-                    <li class="divider"></li>
-                    <li><a href="#" id="viewReadme">Readme</a></li>
-                </ul>
-            </section>
-        </nav>
-        <ul class="breadcrumbs">
-            <li>Ice</li>
-            <li class="current"><a href="#">Test</a></li>
-        </ul>
-    </div>
-    <section role="main" id="body">
-        <div class="row">
-            <div class="large-12 medium-12 columns">
-                <form>
-                    <div class="row">
-                        <div class="small-3 columns">
-                            <label class="right inline">Test:</label>
-                        </div>
-                        <div class="small-9 columns">
-                            <select id="test">
-                                {{#tests}}
-                                    <option value="/test/{{.}}/index.html">{{.}}</option>
-                                {{/tests}}
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="small-3 columns">
-                            <label class="right inline">Server:</label>
-                        </div>
-                        <div class="small-9 columns">
-                            <select id="language">
-                                {{#languages}}
-                                <option value="{{value}}">{{name}}</option>
-                                {{/languages}}
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="small-3 columns">
-                            <label class="right inline">Protocol:</label>
-                        </div>
-                        <div class="small-9 columns">
-                            <select id="protocol">
-                                <option value="ws">WS</option>
-                                <option value="wss">WSS</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="small-3 columns">
-                            <label class="right inline" for="worker">Worker:</label>
-                        </div>
-                        <div class="small-9 columns">
-                            <input id="worker" type="checkbox"/>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="small-3 columns">
-                            <label class="right inline" for="loop">Loop:</label>
-                        </div>
-                        <div class="small-9 columns">
-                            <input id="loop" type="checkbox"/>
-                        </div>
-                    </div>
-                    <a href="#" class="button" id="run">Run</a>
-                    <textarea id="console" class="disabled" readonly></textarea>
-                </form>
-            </div>
-        </div>
-    </section>
-    <!-- Modal dialog to show the client README -->
-    <div id="readme-modal" class="reveal-modal" data-reveal>
-        <a class="close-reveal-modal">&#215;</a>
-        <h4>Test Suite Readme</h4>
-        <hr/>
-        <p>For instructions on how to run this test suite, please refer to the Ice for JavaScript
-            <a href="https://github.com/zeroc-ice/ice/blob/master/js/BuildInstructions.md#running-the-javascript-tests">Build Instructions</a>.</p>
-    </div>
-    <!-- Modal dialog with setup instructions -->
-    <div id="setup-modal" class="reveal-modal" data-reveal>
-        <h3>The Ice for JavaScript tests require a web server. Please follow these steps to run the test suite:</h3>
-        <hr/>
-        <ul>
-            <li>To run the browser tests, you will need to run the test HTTP server with the
-                test/Common/run.py script. This script requires Ice for Python and the IceWS transport.
-                Follow the instructions from your Ice distribution to setup the environment for
-                Ice for Python.<br/>
-                Run the following to start the HTTP server:
-                <pre>python test/Common/run.py</pre></li>
-            <li>Now you can run the test by navigating to <a class="go" href=""></a></li>
-        </ul>
-    </div>
-    <div id="footer" class="show-for-medium-up">
-        <div class="logo">
-            <h4><strong>ZeroC</strong></h4>
-        </div>
-        <div class="copyright">
-            <h6>Copyright &copy; 2003-2018 ZeroC, Inc. All rights reserved.</h6>
-        </div>
-    </div>
-    <!-- JavaScript dependencies and test files-->
-    {{#jsDeps}}
-    <script src="{{.}}"></script>
-    {{/jsDeps}}
-    <script src="/assets/common.js"></script>
-    {{#scripts}}
-    <script src="{{.}}"></script>
-    {{/scripts}}
-    <script type="text/javascript">
-      var current = "{{current}}";
-      var TestSuites = {{{TestSuites}}};
-    </script>
-  </body>
-</html>
diff -Nru zeroc-ice-3.7.1/js/test/Common/.jshintrc zeroc-ice-3.7.2/js/test/Common/.jshintrc
--- zeroc-ice-3.7.1/js/test/Common/.jshintrc	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/.jshintrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-{
-  "extends" : "../../.jshintrc_browser",
-  "globals" :
-  {
-    "runController" : false
-  }
-}
diff -Nru zeroc-ice-3.7.1/js/test/Common/run.js zeroc-ice-3.7.2/js/test/Common/run.js
--- zeroc-ice-3.7.1/js/test/Common/run.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/run.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,42 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-var es5 = process.argv[2] === "--es5";
-if(es5)
-{
-    process.argv.splice(2, 1);
-}
 
-var Ice = require(es5 ? "ice/src/es5" : "ice").Ice;
+require("ice");
 
-var write = function(msg)
+class ControllerHelper
 {
-    process.stdout.write(msg);
-};
-
-var writeLine = function(msg)
-{
-    this.write(msg + "\n");
-};
+    write(msg)
+    {
+        process.stdout.write(msg);
+    }
 
-var exception = function(ex)
-{
-    console.log(ex.toString());
-    if(ex.stack)
+    writeLine(msg)
     {
-        console.log(ex.stack);
+        process.stdout.write(msg + "\n");
     }
-    process.exit(1);
-};
 
-var id = new Ice.InitializationData();
-id.properties = Ice.createProperties(process.argv);
-var exe = process.argv[2];
-var test = module.require(exe);
-if(exe === "Server" || exe === "ServerAMD")
-{
-    var ready = new Ice.Promise();
-    test = exe === "Server" ? test._server : test._serveramd;
-    test({write: write, writeLine: writeLine}, id, ready, process.argv).catch(exception);
-    ready.then(() => console.log("server ready"));
-}
-else
-{
-    test._test({write: write, writeLine: writeLine}, id, process.argv).catch(exception);
+    serverReady()
+    {
+        console.log("server ready");
+    }
 }
+
+(async function()
+ {
+     try
+     {
+         const name = process.argv[2];
+         const cls = module.require(name)[name];
+         const test = new cls();
+         test.setControllerHelper(new ControllerHelper());
+         await test.run(process.argv);
+     }
+     catch(ex)
+     {
+         console.log(ex);
+         /* eslint-disable no-process-exit */
+         process.exit(1);
+         /* eslint-enable no-process-exit */
+     }
+ }());
diff -Nru zeroc-ice-3.7.1/js/test/Common/TestHelper.d.ts zeroc-ice-3.7.2/js/test/Common/TestHelper.d.ts
--- zeroc-ice-3.7.1/js/test/Common/TestHelper.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/TestHelper.d.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,29 @@
+import { Ice } from "ice";
+import ControllerHelper from "./ControllerI"
+
+export class TestHelper
+{
+    getTestEndpoint(protocol:string):string;
+    getTestEndpoint(num?:number, protocol?:string):string;
+    getTestEndpoint(properties:Ice.Properties, num?:number, protocol?:string):string;
+
+    getTestHost(properties:Ice.Properties):string;
+
+    getTestProtocol(properties:Ice.Properties):string;
+    getTestPort(num?:number):number;
+
+    createTestProperties(args?:string[]):[Ice.Properties, string[]];
+
+    initialize(initData:Ice.InitializationData):[Ice.Communicator, string[]];
+    initialize(args:Ice.Properties):[Ice.Communicator, string[]];
+    initialize(args:string[]):[Ice.Communicator, string[]];
+
+    communicator():Ice.Communicator;
+    shutdown():void;
+
+    getWriter():ControllerHelper;
+
+    setControllerHelper(controllerHelper:ControllerHelper):void;
+    serverReady():void;
+    static test(value:boolean, ex?:Error):void;
+}
diff -Nru zeroc-ice-3.7.1/js/test/Common/TestHelper.js zeroc-ice-3.7.2/js/test/Common/TestHelper.js
--- zeroc-ice-3.7.1/js/test/Common/TestHelper.js	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/TestHelper.js	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,198 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+(function(module, require, exports)
+{
+    const Ice = require("ice").Ice;
+    class TestHelper
+    {
+        getTestEndpoint(...args)
+        {
+            let properties;
+            let num;
+            let protocol = "";
+
+            if(args.length > 0)
+            {
+                if(typeof args[0] == "object")
+                {
+                    properties = args[0];
+                    if(args.length > 1)
+                    {
+                        num = args[1];
+                        if(args.length > 2)
+                        {
+                            protocol = args[2];
+                        }
+                    }
+                }
+                else if(typeof args[0] == "number")
+                {
+                    num = args[0];
+                    if(args.length > 1)
+                    {
+                        protocol = args[1];
+                    }
+                }
+                else
+                {
+                    protocol = args[0];
+                }
+            }
+
+            if(properties === undefined)
+            {
+                properties = this._communicator.getProperties();
+            }
+
+            if(num === undefined)
+            {
+                num = 0;
+            }
+
+            if(protocol == "")
+            {
+                protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default");
+            }
+
+            const port = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
+
+            return `${protocol} -p ${port}`;
+        }
+
+        getTestHost(properties)
+        {
+            if(properties === undefined)
+            {
+                properties = this._communicator.getProperties();
+            }
+            return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+        }
+
+        getTestProtocol(properties)
+        {
+            if(properties === undefined)
+            {
+                properties = this._communicator.getProperties();
+            }
+            return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+        }
+
+        getTestPort(...args)
+        {
+            let properties;
+            let num;
+            if(args.length > 1)
+            {
+                properties = args[0];
+                num = args[1];
+            }
+            else
+            {
+                num = args[0];
+            }
+
+            if(properties === undefined)
+            {
+                properties = this._communicator.getProperties();
+            }
+            return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num;
+        }
+
+        createTestProperties(args = [])
+        {
+            const properties = Ice.createProperties(args);
+            args = properties.parseCommandLineOptions("Test", args);
+            return [properties, args];
+        }
+
+        initialize(...args)
+        {
+            let initData;
+            if(args[0] instanceof Ice.InitializationData)
+            {
+                initData = args[0];
+            }
+            else
+            {
+                initData = new Ice.InitializationData();
+                if(args[0] instanceof Ice.Properties)
+                {
+                    initData.properties = args[0];
+                }
+                else
+                {
+                    [initData.properties, args[0]] = this.createTestProperties(args[0]);
+                }
+            }
+
+            const communicator = Ice.initialize(initData);
+            if(this._communicator === undefined)
+            {
+                this._communicator = communicator;
+            }
+            return [communicator, args[0]];
+        }
+
+        communicator()
+        {
+            return this._communicator;
+        }
+
+        shutdown()
+        {
+            if(this._communicator !== undefined)
+            {
+                this._communicator.shutdown();
+            }
+        }
+
+        getWriter()
+        {
+            return this.controllerHelper;
+        }
+
+        setControllerHelper(controllerHelper)
+        {
+            this.controllerHelper = controllerHelper;
+        }
+
+        serverReady()
+        {
+            this.controllerHelper.serverReady();
+        }
+
+        static test(value, ex)
+        {
+            if(!value)
+            {
+                let message = "test failed";
+                if(ex)
+                {
+                    message += "\n" + ex.toString();
+                }
+                throw new Error(message);
+            }
+        }
+
+        static isSafari()
+        {
+            return typeof navigator !== "undefined" &&
+                (/^((?!chrome).)*safari/i).test(navigator.userAgent);
+        }
+
+        static isIE()
+        {
+            return typeof navigator !== "undefined" &&
+                (navigator.userAgent.indexOf("MSIE") !== -1 || navigator.userAgent.match(/Trident.*rv:11\./));
+        }
+    }
+
+    exports.TestHelper = TestHelper;
+
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Common/TestRunner.js zeroc-ice-3.7.2/js/test/Common/TestRunner.js
--- zeroc-ice-3.7.1/js/test/Common/TestRunner.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/TestRunner.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,236 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
- /* global
-    _test : false,
-    _runServer : false,
-    _server: false,
-    Test : false,
-    WorkerGlobalScope: false
-*/
-
-function isSafari()
-{
-    return /^((?!chrome).)*safari/i.test(navigator.userAgent);
-}
-
-function isChrome()
-{
-    //
-    // We need to check for Edge browser as it might include Chrome in its user agent.
-    //
-    return navigator.userAgent.indexOf("Edge/") === -1 &&
-           navigator.userAgent.indexOf("Chrome/") !== -1;
-}
-
-function isWorker()
-{
-    return typeof(WorkerGlobalScope) !== 'undefined' && this instanceof WorkerGlobalScope;
-}
-
-function isWindows()
-{
-    return navigator.userAgent.indexOf("Windows") != -1;
-}
-
-async function runTest(testsuite, language, host, protocol, testcases, out)
-{
-    //
-    // This logger is setup to work with Web Workers and normal scripts using
-    // the received out object. With some browser like Safari using console.log
-    // method doesn't work when running inside a web worker.
-    //
-    class Logger
-    {
-        print(message)
-        {
-            out.writeLine(message, false);
-        }
-
-        trace(category, message)
-        {
-            const s = [];
-            const d = new Date();
-            s.push("-- ");
-            s.push(this.timestamp());
-            s.push(' ');
-            s.push(this._prefix);
-            s.push(category);
-            s.push(": ");
-            s.push(message);
-            out.writeLine(s.join(""), true);
-        }
-
-        warning(message)
-        {
-            const s = [];
-            const d = new Date();
-            s.push("-! ");
-            s.push(this.timestamp());
-            s.push(' ');
-            s.push(this._prefix);
-            s.push("warning: ");
-            s.push(message);
-            out.writeLine(s.join(""), true);
-        }
-
-        error(message)
-        {
-            const s = [];
-            const d = new Date();
-            s.push("!! ");
-            s.push(this.timestamp());
-            s.push(' ');
-            s.push(this._prefix);
-            s.push("error: ");
-            s.push(message);
-            out.writeLine(s.join(""), true);
-        }
-
-        getPrefix()
-        {
-            return "";
-        }
-
-        cloneWithPrefix(prefix)
-        {
-            return Logger;
-        }
-
-        timestamp()
-        {
-            const d = new Date();
-            return d.toLocaleString("en-US", this._dateformat) + "." + d.getMilliseconds();
-        }
-    }
-
-    let communicator;
-    try
-    {
-        let initData = new Ice.InitializationData();
-        let port = protocol == "ws" ? 15002 : 15003;
-        initData.logger = new Logger();
-        initData.properties = Ice.createProperties();
-        initData.properties.setProperty("Ice.Default.Host", host);
-        initData.properties.setProperty("Ice.Default.Protocol", protocol);
-        //initData.properties.setProperty("Ice.Trace.Protocol", "1");
-        //initData.properties.setProperty("Ice.Trace.Network", "3");
-
-        if(typeof(_runServer) === "undefined")
-        {
-            await _test(out, initData);
-        }
-        else
-        {
-            communicator = Ice.initialize();
-            let controller = Test.Common.ControllerPrx.uncheckedCast(
-                communicator.stringToProxy(`controller:${protocol} -h ${host} -p ${port}`));
-
-            testcases = testcases || [ { name: "client/server" } ];
-
-            async function run(testcase, client)
-            {
-                let serverTestCase;
-                try
-                {
-                    if(testcase.langs && testcase.langs.indexOf(language) == -1)
-                    {
-                        return;
-                    }
-
-                    out.writeLine(`[ running ${testcase.name} test]`);
-                    out.write("starting server side... ");
-                    serverTestCase = (language === "js") ?
-                        await controller.runTestCase("cpp", "Ice/echo", "server", "") :
-                        await controller.runTestCase("js", testsuite, testcase.name, language);
-
-                    serverTestCase = Test.Common.TestCasePrx.uncheckedCast(
-                        controller.ice_getCachedConnection().createProxy(serverTestCase.ice_getIdentity()));
-
-                    let config = new Test.Common.Config();
-                    config.protocol = protocol;
-                    await serverTestCase.startServerSide(config);
-                    out.writeLine("ok");
-
-                    let server;
-                    if(language === "js")
-                    {
-                        let id = initData.clone();
-                        if(testcase.args !== undefined)
-                        {
-                            id.properties = Ice.createProperties(testcase.args, initData.properties);
-                        }
-                        let ready = new Ice.Promise();
-                        server = _server(out, id, ready, testcase.args);
-                        await ready;
-                    }
-
-                    {
-                        let id = initData.clone();
-                        if(testcase.args !== undefined)
-                        {
-                            initData.properties = Ice.createProperties(testcase.args, id.properties);
-                        }
-                        await client(out, id, testcase.args);
-                    }
-
-                    if(server)
-                    {
-                        await server; // Wait for server to terminate
-                    }
-
-                    await serverTestCase.stopServerSide(true);
-                }
-                catch(ex)
-                {
-                    out.writeLine("failed! (" + ex + ")");
-                    throw ex;
-                }
-                finally
-                {
-                    if(serverTestCase)
-                    {
-                        await serverTestCase.destroy();
-                    }
-                }
-            }
-
-            for(let testcase of testcases)
-            {
-                await run(testcase, _test);
-            }
-        }
-    }
-    catch(ex)
-    {
-        out.writeLine("");
-        if(ex instanceof Test.Common.TestCaseFailedException)
-        {
-            out.writeLine("Server test case failed to start:\n");
-            out.writeLine(ex.output);
-        }
-        else
-        {
-            out.writeLine(ex.toString());
-            if(ex.stack)
-            {
-                out.writeLine(ex.stack);
-            }
-        }
-        return false
-    }
-    finally
-    {
-        if(communicator)
-        {
-            await communicator.destroy();
-        }
-    }
-    return true;
-}
diff -Nru zeroc-ice-3.7.1/js/test/Common/TestSuite.js zeroc-ice-3.7.2/js/test/Common/TestSuite.js
--- zeroc-ice-3.7.1/js/test/Common/TestSuite.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/TestSuite.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-/* global
-   _runEchoServerOptions : false,
-   _test : false,
-   Test : false,
-   URI : false,
-   current : false,
-   TestSuites : false,
-   runTest: false
-*/
-
-$(document).foundation();
-$(document).ready(
-    function()
-    {
-        const es5 = document.location.pathname.indexOf("/es5/") !== -1;
-        let worker;
-
-        $("#console").height(120);
-
-        class Output
-        {
-            static write(msg)
-            {
-                const text = $("#console").val();
-                $("#console").val(text + msg);
-            }
-
-            static writeLine(msg)
-            {
-                Output.write(msg + "\n");
-                $("#console").scrollTop($("#console").get(0).scrollHeight);
-            }
-        }
-
-        let query = new URI(document.location.href).search(true);
-
-        $("#language").val(query.language !== undefined ? query.language : "cpp");
-        $("#protocol").val(document.location.protocol == "http:" ? "ws" : "wss");
-        $("#test").val("/test/" + current + "/index.html");
-        $("#worker").prop("checked", query.worker == "true");
-        $("#loop").prop("checked", query.loop == "true");
-
-        function nextTest()
-        {
-            let path = $("#test").val();
-            if(document.location.pathname.indexOf("/es5/") !== -1 && path.indexOf("/es5/") === -1)
-            {
-                path = path.replace("/test/", "/test/es5/");
-            }
-
-            document.location.assign(new URI()
-                                     .host(document.location.host)
-                                     .pathname(path)
-                                     .search(
-                                         {
-                                             language: $("#language").val(),
-                                             worker: $("#worker").is(":checked"),
-                                             loop: $("#loop").is(":checked"),
-                                             next:"true"
-                                         }).toString());
-        }
-
-        function next(success)
-        {
-            if($("#loop").is(":checked"))
-            {
-                if(success)
-                {
-                    nextTest(success);
-                }
-            }
-            else if(query.loop == "true")
-            {
-                updateLocation();
-            }
-        }
-
-        function setRunning(running)
-        {
-            if(running)
-            {
-                $("#console").val("");
-                $("#run").addClass("disabled");
-                $("#test").prop("disabled", "disabled");
-                $("#protocol").prop("disabled", "disabled");
-                $("#language").prop("disabled", "disabled");
-                $("#worker").prop("disabled", "disabled");
-            }
-            else
-            {
-                $("#test").prop("disabled", false);
-                $("#protocol").prop("disabled", false);
-                $("#language").prop("disabled", false);
-                $("#worker").prop("disabled", false);
-                $("#run").removeClass("disabled");
-            }
-        }
-
-        function updateLocation()
-        {
-            let path = $("#test").val();
-            if(document.location.pathname.indexOf("/es5/") !== -1 && path.indexOf("/es5/") === -1)
-            {
-                path = path.replace("/test/", "/test/es5/");
-            }
-
-            document.location.assign(new URI()
-                                     .host(document.location.host)
-                                     .pathname(path)
-                                     .search(
-                                         {
-                                             language: $("#language").val(),
-                                             worker: $("#worker").is(":checked"),
-                                             loop: $("#loop").is(":checked")
-                                         }).toString());
-        }
-
-        $("#run").click((e) =>
-                        {
-                            if(!$(e.currentTarget).hasClass("disabled"))
-                            {
-                                setRunning(true);
-                                if($("#worker").is(":checked"))
-                                {
-                                    worker = new Worker(es5 ? "/test/es5/Common/Worker.js" : "/test/Common/Worker.js");
-                                    worker.onmessage = function(e)
-                                    {
-                                        if(e.data.type == "Write")
-                                        {
-                                            Output.write(e.data.message);
-                                        }
-                                        else if(e.data.type == "WriteLine")
-                                        {
-                                            Output.writeLine(e.data.message);
-                                        }
-                                        else if(e.data.type == "TestFinished")
-                                        {
-                                            worker.terminate();
-                                            setRunning(false);
-                                            next(e.data.success);
-                                        }
-                                    };
-
-                                    worker.postMessage(
-                                        {
-                                            type: "RunTest",
-                                            test:
-                                            {
-                                                name: current,
-                                                language: $("#language").val(),
-                                                defaultHost: document.location.hostname || "127.0.0.1",
-                                                protocol: $("#protocol").val(),
-                                                testcases: TestSuites[current].testcases,
-                                                files: TestSuites[current].files,
-                                                es5: document.location.pathname.indexOf("/es5/") !== -1
-                                            }
-                                        });
-
-                                    worker.onerror = function(e)
-                                    {
-                                        console.log(e);
-                                    };
-                                }
-                                else
-                                {
-                                    (async function()
-                                     {
-                                         let success;
-                                         try
-                                         {
-                                             success = await runTest(current,
-                                                                     $("#language").val(),
-                                                                     document.location.hostname || "127.0.0.1",
-                                                                     $("#protocol").val(),
-                                                                     TestSuites[current].testcases,
-                                                                     Output);
-                                         }
-                                         finally
-                                         {
-                                             setRunning(false);
-                                         }
-                                         next(success);
-                                     }());
-                                }
-                            }
-                            return false;
-                        });
-
-        $("#test").on("change", e =>
-                      {
-                          updateLocation();
-                          return false;
-                      });
-
-        $("#language").on("change", e =>
-                          {
-                              updateLocation();
-                              return false;
-                          });
-
-        $("#worker").on("change", e =>
-                        {
-                            updateLocation();
-                            return false;
-                        });
-
-        $("#protocol").on("change", e =>
-                          {
-                              let protocol = $(e.currentTarget).val();
-                              console.log(`protocol change: ${protocol}`);
-                              if((document.location.protocol == "http:" && protocol == "wss") ||
-                                 (document.location.protocol == "https:" && protocol == "ws"))
-                              {
-                                  document.location.assign(
-                                      new URI()
-                                          .protocol(protocol == "ws" ? "http" : "https")
-                                          .hostname(document.location.hostname)
-                                          .port(protocol == "ws" ? 8080 : 9090)
-                                          .search(
-                                              {
-                                                  language: $("#language").val(),
-                                                  worker: $("#worker").is(":checked")
-                                              }));
-                                  return false;
-                              }
-                          });
-
-        if($("#loop").is(":checked"))
-        {
-            $("#loop").prop("checked", true);
-            $("#run").click();
-        }
-    });
diff -Nru zeroc-ice-3.7.1/js/test/Common/TestSuites.json zeroc-ice-3.7.2/js/test/Common/TestSuites.json
--- zeroc-ice-3.7.1/js/test/Common/TestSuites.json	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/TestSuites.json	2019-02-05 18:03:04.000000000 +0000
@@ -120,6 +120,10 @@
     {
         "files": ["Test.js", "Client.js"]
     },
+    "Ice/scope":
+    {
+        "files": ["Test.js", "Client.js"]
+    },
     "Ice/servantLocator":
     {
         "files": ["Test.js", "Client.js", "TestI.js", "ServantLocatorI.js", "TestActivationI.js", "Server.js"],
@@ -166,6 +170,10 @@
     {
         "files": ["Client.js"]
     },
+    "Ice/stream":
+    {
+        "files": ["Test.js", "Client.js"]
+    },
     "Glacier2/router":
     {
         "files": ["/lib/Glacier2.js", "Callback.js", "Client.js"],
diff -Nru zeroc-ice-3.7.1/js/test/Common/Worker.js zeroc-ice-3.7.2/js/test/Common/Worker.js
--- zeroc-ice-3.7.1/js/test/Common/Worker.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Common/Worker.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-/* global
-    self : false,
-    runTest : false
-*/
-
-class Output
-{
-    static write(msg)
-    {
-        self.postMessage({type:"Write", message:msg});
-    }
-
-    static writeLine(msg)
-    {
-        self.postMessage({type:"WriteLine", message:msg});
-    }
-}
-
-self.onmessage = (e) =>
-{
-    try
-    {
-        let test = e.data.test;
-        if(test.es5)
-        {
-            self.importScripts("/lib/es5/Ice.js");
-            self.importScripts("/test/es5/Common/Controller.js");
-            test.files = test.files.map(file => file.replace("/lib/Glacier2.js", "/lib/es5/Glacier2.js"));
-            self.importScripts("/test/es5/Common/TestRunner.js");
-        }
-        else
-        {
-            self.importScripts("/lib/Ice.js");
-            self.importScripts("/test/Common/Controller.js");
-            self.importScripts("/test/Common/TestRunner.js");
-        }
-
-        for(let file of test.files)
-        {
-            if(file.indexOf("/") === -1)
-            {
-                self.importScripts(test.es5 ? `/test/es5/${test.name}/${file}` : `/test/${test.name}/${file}`);
-            }
-            else
-            {
-                self.importScripts(file);
-            }
-        }
-
-        runTest(test.name, test.language, test.defaultHost, test.protocol, test.testcases, Output).then(
-            result =>
-                {
-                    self.postMessage({type:"TestFinished", success:result});
-                },
-            ex =>
-                {
-                    Output.writeLine(ex.toString());
-                    self.postMessage({type:"TestFinished", success:false});
-                });
-    }
-    catch(ex)
-    {
-        Output.writeLine(ex.toString());
-        self.postMessage({type:"TestFinished", success:false});
-    }
-};
diff -Nru zeroc-ice-3.7.1/js/test/Glacier2/router/Callback.ice zeroc-ice-3.7.2/js/test/Glacier2/router/Callback.ice
--- zeroc-ice-3.7.1/js/test/Glacier2/router/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Glacier2/router/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Glacier2/router/Client.js zeroc-ice-3.7.2/js/test/Glacier2/router/Client.js
--- zeroc-ice-3.7.1/js/test/Glacier2/router/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Glacier2/router/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Glacier2 = require("ice").Glacier2;
     const Test = require("Callback").Test;
-
-    function test(value, ex)
-    {
-        if(!value)
-        {
-            let message = "test failed";
-            if(ex)
-            {
-                message += "\n" + ex.toString();
-            }
-            throw new Error(message);
-        }
-    }
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
     const CallbackPrx = Test.CallbackPrx;
     const CallbackReceiverPrx = Test.CallbackReceiverPrx;
@@ -60,286 +44,293 @@
         }
     }
 
-    async function allTests(out, communicator, shutdown)
+    class Client extends TestHelper
     {
-        out.write("testing stringToProxy for router... ");
-        let routerBase = communicator.stringToProxy("Glacier2/router:default -p 12060");
-        test(routerBase !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast for router... ");
-        let router = await Glacier2.RouterPrx.checkedCast(routerBase);
-        test(router !== null);
-        out.writeLine("ok");
-
-        out.write("installing router with communicator... ");
-        communicator.setDefaultRouter(router);
-        out.writeLine("ok");
-
-        out.write("getting the session timeout... ");
-        let timeout = await router.getSessionTimeout();
-        test(timeout.toNumber() === 30);
-        out.writeLine("ok");
-
-        out.write("testing stringToProxy for server object... ");
-        base = communicator.stringToProxy("c1/callback:default -p 12010");
-        out.writeLine("ok");
-
-        out.write("trying to ping server before session creation... ");
-        try
+        async allTests(shutdown)
         {
-            await base.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ConnectionLostException, ex);
-        }
-        out.writeLine("ok");
+            const out = this.getWriter();
+            const communicator = this.communicator();
 
-        out.write("trying to create session with wrong password... ");
-        try
-        {
-            await router.createSession("userid", "xxx");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Glacier2.PermissionDeniedException, ex);
-        }
-        out.writeLine("ok");
+            out.write("testing stringToProxy for router... ");
+            const routerBase = communicator.stringToProxy("Glacier2/router:" + this.getTestEndpoint(50));
+            test(routerBase !== null);
+            out.writeLine("ok");
 
-        out.write("trying to destroy non-existing session... ");
-        try
-        {
-            await router.destroySession();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Glacier2.SessionNotExistException, ex);
-        }
-        out.writeLine("ok");
+            out.write("testing checked cast for router... ");
+            const router = await Glacier2.RouterPrx.checkedCast(routerBase);
+            test(router !== null);
+            out.writeLine("ok");
 
-        out.write("creating session with correct password... ");
-        let session = await router.createSession("userid", "abc123");
-        out.writeLine("ok");
+            out.write("installing router with communicator... ");
+            communicator.setDefaultRouter(router);
+            out.writeLine("ok");
 
-        out.write("trying to create a second session... ");
-        try
-        {
-            await router.createSession("userid", "abc123");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Glacier2.CannotCreateSessionException, ex);
-        }
-        out.writeLine("ok");
+            out.write("getting the session timeout... ");
+            const timeout = await router.getSessionTimeout();
+            test(timeout.toNumber() === 30);
+            out.writeLine("ok");
 
-        out.write("pinging server after session creation... ");
-        await base.ice_ping();
-        out.writeLine("ok");
+            out.write("testing stringToProxy for server object... ");
+            const base = communicator.stringToProxy("c1/callback:" + this.getTestEndpoint());
+            out.writeLine("ok");
 
-        {
-            out.write("pinging object with client endpoint... ");
-            const baseC = communicator.stringToProxy("collocated:default -p 12060");
+            out.write("trying to ping server before session creation... ");
             try
             {
-                await baseC.ice_ping();
+                await base.ice_ping();
+                test(false);
             }
             catch(ex)
             {
+                test(ex instanceof Ice.ConnectionLostException, ex);
             }
             out.writeLine("ok");
-        }
 
-        out.write("testing checked cast for server object... ");
-        let twoway = await Test.CallbackPrx.checkedCast(base);
-        test(twoway !== null);
-        out.writeLine("ok");
-
-        out.write("creating and activating callback receiver adapter... ");
-        communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
-        let adapter = await communicator.createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
-        await adapter.activate();
-        out.writeLine("ok");
-
-        out.write("getting category from router... ");
-        let category = await router.getCategoryForClient();
-        out.writeLine("ok");
-
-        out.write("creating and adding callback receiver object... ");
-        callbackReceiverImpl = new CallbackReceiverI();
-        callbackReceiver = callbackReceiverImpl;
-
-        let callbackReceiverIdent = new Ice.Identity();
-        callbackReceiverIdent.name = "callbackReceiver";
-        callbackReceiverIdent.category = category;
-        twowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
-
-        let fakeCallbackReceiverIdent = new Ice.Identity();
-        fakeCallbackReceiverIdent.name = "callbackReceiver";
-        fakeCallbackReceiverIdent.category = "dummy";
-        fakeTwowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
-        out.writeLine("ok");
-
-        out.write("testing oneway callback... ");
-        oneway = CallbackPrx.uncheckedCast(twoway.ice_oneway());
-        onewayR = CallbackReceiverPrx.uncheckedCast(twowayR.ice_oneway());
-        let context = new Ice.Context();
-        context.set("_fwd", "o");
-        await oneway.initiateCallback(onewayR, context);
-        await callbackReceiverImpl.callbackOK();
-        out.writeLine("ok");
-
-        out.write("testing twoway callback... ");
-        context = new Ice.Context();
-        context.set("_fwd", "t");
-        await twoway.initiateCallback(twowayR, context);
-        await callbackReceiverImpl.callbackOK();
-        out.writeLine("ok");
-
-        out.write("ditto, but with user exception... ");
-        context = new Ice.Context();
-        context.set("_fwd", "t");
-        try
-        {
-            await twoway.initiateCallbackEx(twowayR, context);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.CallbackException, ex);
-            test(ex.someValue == 3.14);
-            test(ex.someString == "3.14");
-        }
+            out.write("trying to create session with wrong password... ");
+            try
+            {
+                await router.createSession("userid", "xxx");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Glacier2.PermissionDeniedException, ex);
+            }
+            out.writeLine("ok");
 
-        await callbackReceiverImpl.callbackOK();
-        out.writeLine("ok");
+            out.write("trying to destroy non-existing session... ");
+            try
+            {
+                await router.destroySession();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Glacier2.SessionNotExistException, ex);
+            }
+            out.writeLine("ok");
 
-        out.write("trying twoway callback with fake category... ");
-        context = new Ice.Context();
-        context.set("_fwd", "t");
-        try
-        {
-            await twoway.initiateCallback(fakeTwowayR, context);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ObjectNotExistException, ex);
-        }
-        out.writeLine("ok");
+            out.write("creating session with correct password... ");
+            await router.createSession("userid", "abc123");
+            out.writeLine("ok");
 
-        out.write("testing whether other allowed category is accepted... ");
-        context = new Ice.Context();
-        context.set("_fwd", "t");
-        let otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("c2/callback")));
-        await otherCategoryTwoway.initiateCallback(twowayR, context);
-        await callbackReceiverImpl.callbackOK();
-        out.writeLine("ok");
-
-        out.write("testing whether disallowed category gets rejected... ");
-        context = new Ice.Context();
-        context.set("_fwd", "t");
-        otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("c3/callback")));
-        try
-        {
-            await otherCategoryTwoway.initiateCallback(twowayR, context);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ObjectNotExistException, ex);
-        }
-        out.writeLine("ok");
+            out.write("trying to create a second session... ");
+            try
+            {
+                await router.createSession("userid", "abc123");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Glacier2.CannotCreateSessionException, ex);
+            }
+            out.writeLine("ok");
 
-        out.write("testing whether user-id as category is accepted... ");
-        context = new Ice.Context();
-        context.set("_fwd", "t");
-        otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("_userid/callback")));
-        await otherCategoryTwoway.initiateCallback(twowayR, context);
-        await callbackReceiverImpl.callbackOK();
-        out.writeLine("ok");
+            out.write("pinging server after session creation... ");
+            await base.ice_ping();
+            out.writeLine("ok");
 
-        if(shutdown)
-        {
-            out.write("testing server shutdown... ");
-            await twoway.shutdown();
+            {
+                out.write("pinging object with client endpoint... ");
+                const baseC = communicator.stringToProxy("collocated:" + this.getTestEndpoint(50));
+                try
+                {
+                    await baseC.ice_ping();
+                }
+                catch(ex)
+                {
+                }
+                out.writeLine("ok");
+            }
+
+            out.write("testing checked cast for server object... ");
+            const twoway = await Test.CallbackPrx.checkedCast(base);
+            test(twoway !== null);
             out.writeLine("ok");
-            // No ping, otherwise the router prints a warning message if it's
-            // started with --Ice.Warn.Connections.
-        }
 
-        out.write("destroying session... ");
-        await router.destroySession();
-        out.writeLine("ok");
+            out.write("creating and activating callback receiver adapter... ");
+            communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+            const adapter = await communicator.createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
+            await adapter.activate();
+            out.writeLine("ok");
 
-        out.write("trying to ping server after session destruction... ");
-        try
-        {
-            await base.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ConnectionLostException, ex);
-        }
-        out.writeLine("ok");
+            out.write("getting category from router... ");
+            const category = await router.getCategoryForClient();
+            out.writeLine("ok");
 
-        if(shutdown)
-        {
-            out.write("uninstalling router with communicator... ");
-            communicator.setDefaultRouter(null);
+            out.write("creating and adding callback receiver object... ");
+            const callbackReceiverImpl = new CallbackReceiverI();
+            const callbackReceiver = callbackReceiverImpl;
+
+            const callbackReceiverIdent = new Ice.Identity();
+            callbackReceiverIdent.name = "callbackReceiver";
+            callbackReceiverIdent.category = category;
+            const twowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
+
+            const fakeCallbackReceiverIdent = new Ice.Identity();
+            fakeCallbackReceiverIdent.name = "callbackReceiver";
+            fakeCallbackReceiverIdent.category = "dummy";
+            const fakeTwowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
             out.writeLine("ok");
 
-            out.write("testing stringToProxy for process object... ");
-            processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -p 12061");
+            out.write("testing oneway callback... ");
+            const oneway = CallbackPrx.uncheckedCast(twoway.ice_oneway());
+            const onewayR = CallbackReceiverPrx.uncheckedCast(twowayR.ice_oneway());
+            let context = new Ice.Context();
+            context.set("_fwd", "o");
+            await oneway.initiateCallback(onewayR, context);
+            await callbackReceiverImpl.callbackOK();
             out.writeLine("ok");
 
-            out.write("testing checked cast for admin object... ");
-            processPrx = await Ice.ProcessPrx.checkedCast(processBase);
-            test(processPrx !== null);
+            out.write("testing twoway callback... ");
+            context = new Ice.Context();
+            context.set("_fwd", "t");
+            await twoway.initiateCallback(twowayR, context);
+            await callbackReceiverImpl.callbackOK();
             out.writeLine("ok");
 
-            out.write("testing Glacier2 shutdown... ");
-            await processPrx.shutdown();
+            out.write("ditto, but with user exception... ");
+            context = new Ice.Context();
+            context.set("_fwd", "t");
             try
             {
-                await processPrx.ice_timeout(500).ice_ping();
+                await twoway.initiateCallbackEx(twowayR, context);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.LocalException, ex);
+                test(ex instanceof Test.CallbackException, ex);
+                test(ex.someValue == 3.14);
+                test(ex.someString == "3.14");
             }
+
+            await callbackReceiverImpl.callbackOK();
             out.writeLine("ok");
-        }
-    }
 
-    async function run(out, initData, args)
-    {
-        let communicator;
-        try
-        {
-            initData.properties.setProperty("Ice.Warn.Dispatch", "1");
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            communicator= Ice.initialize(initData);
-            await allTests(out, communicator, args.indexOf("--shutdown") > -1);
+            out.write("trying twoway callback with fake category... ");
+            context = new Ice.Context();
+            context.set("_fwd", "t");
+            try
+            {
+                await twoway.initiateCallback(fakeTwowayR, context);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ObjectNotExistException, ex);
+            }
+            out.writeLine("ok");
+
+            out.write("testing whether other allowed category is accepted... ");
+            context = new Ice.Context();
+            context.set("_fwd", "t");
+            let otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("c2/callback")));
+            await otherCategoryTwoway.initiateCallback(twowayR, context);
+            await callbackReceiverImpl.callbackOK();
+            out.writeLine("ok");
+
+            out.write("testing whether disallowed category gets rejected... ");
+            context = new Ice.Context();
+            context.set("_fwd", "t");
+            otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("c3/callback")));
+            try
+            {
+                await otherCategoryTwoway.initiateCallback(twowayR, context);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ObjectNotExistException, ex);
+            }
+            out.writeLine("ok");
+
+            out.write("testing whether user-id as category is accepted... ");
+            context = new Ice.Context();
+            context.set("_fwd", "t");
+            otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("_userid/callback")));
+            await otherCategoryTwoway.initiateCallback(twowayR, context);
+            await callbackReceiverImpl.callbackOK();
+            out.writeLine("ok");
+
+            if(shutdown)
+            {
+                out.write("testing server shutdown... ");
+                await twoway.shutdown();
+                out.writeLine("ok");
+                // No ping, otherwise the router prints a warning message if it's
+                // started with --Ice.Warn.Connections.
+            }
+
+            out.write("destroying session... ");
+            await router.destroySession();
+            out.writeLine("ok");
+
+            out.write("trying to ping server after session destruction... ");
+            try
+            {
+                await base.ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ConnectionLostException, ex);
+            }
+            out.writeLine("ok");
+
+            if(shutdown)
+            {
+                out.write("uninstalling router with communicator... ");
+                communicator.setDefaultRouter(null);
+                out.writeLine("ok");
+
+                out.write("testing stringToProxy for process object... ");
+                const processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + this.getTestEndpoint(51));
+                out.writeLine("ok");
+
+                out.write("testing checked cast for admin object... ");
+                const processPrx = await Ice.ProcessPrx.checkedCast(processBase);
+                test(processPrx !== null);
+                out.writeLine("ok");
+
+                out.write("testing Glacier2 shutdown... ");
+                await processPrx.shutdown();
+                try
+                {
+                    await processPrx.ice_timeout(500).ice_ping();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.LocalException, ex);
+                }
+                out.writeLine("ok");
+            }
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
+            {
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.Warn.Dispatch", "1");
+                properties.setProperty("Ice.Warn.Connections", "0");
+                [communicator] = this.initialize(properties);
+                await this.allTests(args.indexOf("--shutdown") > -1);
+            }
+            finally
             {
-                await communicator.shutdown();
+                if(communicator)
+                {
+                    await communicator.shutdown();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/acm/Client.js zeroc-ice-3.7.2/js/test/Ice/acm/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/acm/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/acm/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
+    const TestHelper = require("TestHelper").TestHelper;
     const Test = require("Test").Test;
-
-    function test(value)
-    {
-        if(!value)
-        {
-            throw new Error("test failed");
-        }
-    }
+    const test = TestHelper.test;
 
     class LoggerI
     {
@@ -89,18 +78,16 @@
             initData.properties.setProperty("Ice.ACM.Timeout", "2");
             if(this._clientACMTimeout >= 0)
             {
-                initData.properties.setProperty("Ice.ACM.Client.Timeout", "" + this._clientACMTimeout);
+                initData.properties.setProperty("Ice.ACM.Client.Timeout", String(this._clientACMTimeout));
             }
             if(this._clientACMClose >= 0)
             {
-                initData.properties.setProperty("Ice.ACM.Client.Close", "" + this._clientACMClose);
+                initData.properties.setProperty("Ice.ACM.Client.Close", String(this._clientACMClose));
             }
             if(this._clientACMHeartbeat >= 0)
             {
-                initData.properties.setProperty("Ice.ACM.Client.Heartbeat", "" + this._clientACMHeartbeat);
+                initData.properties.setProperty("Ice.ACM.Client.Heartbeat", String(this._clientACMHeartbeat));
             }
-            //initData.properties.setProperty("Ice.Trace.Protocol", "2");
-            //initData.properties.setProperty("Ice.Trace.Network", "2");
             this._communicator = Ice.initialize(initData);
 
             this._adapter = await this._com.createObjectAdapter(this._serverACMTimeout,
@@ -135,10 +122,12 @@
             {
                 let prx = await this._adapter.getTestIntf();
                 prx = Test.TestIntfPrx.uncheckedCast(this._communicator.stringToProxy(prx.toString()));
-                let con = await prx.ice_getConnection();
-                con.setCloseCallback(connection => this._closed = true);
+                const con = await prx.ice_getConnection();
+                con.setCloseCallback(connection =>
+                                     {
+                                         this._closed = true;
+                                     });
                 con.setHeartbeatCallback(connection => ++this._heartbeat);
-
                 await this.runTestCase(this._adapter, prx);
             }
             catch(ex)
@@ -354,7 +343,7 @@
         async runTestCase(adapter, proxy)
         {
             await Ice.Promise.delay(3000);
-            await this._heartbeat >= 3;
+            return this._heartbeat >= 3;
         }
     }
 
@@ -413,7 +402,7 @@
 
         async runTestCase(adapter, proxy)
         {
-            let con = proxy.ice_getCachedConnection();
+            const con = proxy.ice_getCachedConnection();
 
             try
             {
@@ -460,74 +449,78 @@
         }
     }
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        const ref = "communicator:default -p 12010";
-        const com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
-
-        const tests = [];
-        //
-        // Skip some tests with IE it opens too many connections and
-        // IE doesn't allow more than 6 connections.
-        //
-        if(typeof(navigator) !== "undefined" &&
-           ["MSIE", "Trident/7.0", "Edge/12", "Edge/13"].some(value => navigator.userAgent.indexOf(value) !== -1))
+        async allTests()
         {
-            tests.push(new HeartbeatOnIdleTest(com, out));
-            tests.push(new SetACMTest(com, out));
-        }
-        else
-        {
-            tests.push(new InvocationHeartbeatTest(com, out));
-            tests.push(new InvocationHeartbeatOnHoldTest(com, out));
-            tests.push(new InvocationNoHeartbeatTest(com, out));
-            tests.push(new InvocationHeartbeatCloseOnIdleTest(com, out));
+            const communicator = this.communicator();
+            const out = this.getWriter();
+            const ref = "communicator:" + this.getTestEndpoint();
+            const com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
-            tests.push(new CloseOnIdleTest(com, out));
-            tests.push(new CloseOnInvocationTest(com, out));
-            tests.push(new CloseOnIdleAndInvocationTest(com, out));
-            tests.push(new ForcefullCloseOnIdleAndInvocationTest(com, out));
+            const tests = [];
+            //
+            // Skip some tests with IE it opens too many connections and
+            // IE doesn't allow more than 6 connections.
+            //
+            if(typeof navigator !== "undefined" &&
+               ["MSIE", "Trident/7.0", "Edge/12", "Edge/13"].some(value => navigator.userAgent.indexOf(value) !== -1))
+            {
+                tests.push(new HeartbeatOnIdleTest(com, out));
+                tests.push(new SetACMTest(com, out));
+            }
+            else
+            {
+                tests.push(new InvocationHeartbeatTest(com, out));
+                tests.push(new InvocationHeartbeatOnHoldTest(com, out));
+                tests.push(new InvocationNoHeartbeatTest(com, out));
+                tests.push(new InvocationHeartbeatCloseOnIdleTest(com, out));
 
-            tests.push(new HeartbeatOnIdleTest(com, out));
-            tests.push(new HeartbeatAlwaysTest(com, out));
-            tests.push(new HeartbeatManualTest(com, out));
-            tests.push(new SetACMTest(com, out));
-        }
+                tests.push(new CloseOnIdleTest(com, out));
+                tests.push(new CloseOnInvocationTest(com, out));
+                tests.push(new CloseOnIdleAndInvocationTest(com, out));
+                tests.push(new ForcefullCloseOnIdleAndInvocationTest(com, out));
 
-        await Promise.all(tests.map(test => test.init()));
-        await Promise.all(tests.map(test => test.start()));
-        for(let test of tests)
-        {
-            test.join(out);
-        }
-        await Promise.all(tests.map(test => test.destroy()));
+                tests.push(new HeartbeatOnIdleTest(com, out));
+                tests.push(new HeartbeatAlwaysTest(com, out));
+                tests.push(new HeartbeatManualTest(com, out));
+                tests.push(new SetACMTest(com, out));
+            }
 
-        out.write("shutting down... ");
-        await com.shutdown();
-        out.writeLine("ok");
-    }
+            await Promise.all(tests.map(test => test.init()));
+            await Promise.all(tests.map(test => test.start()));
+            for(const test of tests)
+            {
+                test.join(out);
+            }
+            await Promise.all(tests.map(test => test.destroy()));
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
+            out.write("shutting down... ");
+            await com.shutdown();
+            out.writeLine("ok");
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator, args] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/acm/Test.ice zeroc-ice-3.7.2/js/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/adapterDeactivation/Client.js zeroc-ice-3.7.2/js/test/Ice/adapterDeactivation/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/adapterDeactivation/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/adapterDeactivation/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,257 +1,243 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
-    const IceSSL = require("ice").IceSSL;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(communicator, out)
+    class Client extends TestHelper
     {
-        class TestError extends Error
+        async allTests()
         {
-            constructor(message)
-            {
-                super(message);
-            }
-        }
+            const out = this.getWriter();
+            const communicator = this.communicator();
+
+            out.write("testing stringToProxy... ");
+            const ref = "test:" + this.getTestEndpoint();
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            const obj = await Test.TestIntfPrx.checkedCast(base);
+            test(obj !== null);
+            test(obj.equals(base));
+            out.writeLine("ok");
 
-        function test(value, ex)
-        {
-            if(!value)
             {
-                let message = "test failed";
-                if(ex)
+                out.write("creating/destroying/recreating object adapter... ");
+                communicator.getProperties().setProperty("TransientTestAdapter.AdapterId", "dummy");
+                let adapter = await communicator.createObjectAdapter("TransientTestAdapter");
+                try
                 {
-                    message += "\n" + ex.toString();
+                    await communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "");
+                    test(false);
                 }
-                throw new TestError(message);
-            }
-        }
-
-        let defaultProtocol = communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-
-        out.write("testing stringToProxy... ");
-        const ref = "test:default -p 12010";
-        const base = communicator.stringToProxy(ref);
-        test(base != null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        const obj = await Test.TestIntfPrx.checkedCast(base);
-        test(obj !== null);
-        test(obj.equals(base));
-        out.writeLine("ok");
+                catch(ex)
+                {
+                    test(ex instanceof Ice.AlreadyRegisteredException);
+                }
+                await adapter.destroy();
 
-        {
-            out.write("creating/destroying/recreating object adapter... ");
-            communicator.getProperties().setProperty("TransientTestAdapter.AdapterId", "dummy");
-            let adapter = await communicator.createObjectAdapter("TransientTestAdapter");
-            try
-            {
-                await communicator.createObjectAdapterWithEndpoints("TransientTestAdapter");
-                test(false);
+                //
+                // Use a different port than the first adapter to avoid an "address already in use" error.
+                //
+                adapter = await communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "");
+                await adapter.destroy();
+                out.writeLine("ok");
             }
-            catch(ex)
-            {
-                test(ex instanceof Ice.AlreadyRegisteredException);
-            }
-            await adapter.destroy();
 
-            //
-            // Use a different port than the first adapter to avoid an "address already in use" error.
-            //
-            adapter = await communicator.createObjectAdapterWithEndpoints("TransientTestAdapter");
-            await adapter.destroy();
+            out.write("creating/activating/deactivating object adapter in one operation... ");
+            await obj.transient();
             out.writeLine("ok");
-        }
 
-        out.write("creating/activating/deactivating object adapter in one operation... ");
-        await obj.transient();
-        out.writeLine("ok");
-
-        {
             out.write("testing connection closure... ");
-            for(i = 0; i < 10; ++i)
+            for(let i = 0; i < 10; ++i)
             {
-                let initData = new Ice.InitializationData();
+                const initData = new Ice.InitializationData();
                 initData.properties = communicator.getProperties().clone();
-                let comm = Ice.initialize(initData);
-                comm.stringToProxy("test:default -p 12010").ice_ping().catch(ex => {});
+                const comm = Ice.initialize(initData);
+                comm.stringToProxy("test:" + this.getTestEndpoint()).ice_ping().catch(ex => {});
                 await comm.destroy();
             }
             out.writeLine("ok");
-        }
-
-        out.write("testing object adapter published endpoints... ");
-        {
-            communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 30000");
-            let adapter = await communicator.createObjectAdapter("PAdapter");
-            test(adapter.getPublishedEndpoints().length === 1);
-            let endpt = adapter.getPublishedEndpoints()[0];
-            test(endpt.toString() == "tcp -h localhost -p 12345 -t 30000");
-            let prx =
-                communicator.stringToProxy("dummy:tcp -h localhost -p 12346 -t 20000:tcp -h localhost -p 12347 -t 10000");
-            adapter.setPublishedEndpoints(prx.ice_getEndpoints());
-            test(adapter.getPublishedEndpoints().length === 2);
-            let id = new Ice.Identity();
-            id.name = "dummy";
-            test(Ice.ArrayUtil.equals(adapter.createProxy(id).ice_getEndpoints(), prx.ice_getEndpoints()));
-            test(Ice.ArrayUtil.equals(adapter.getPublishedEndpoints(), prx.ice_getEndpoints()));
-            await adapter.refreshPublishedEndpoints();
-            test(adapter.getPublishedEndpoints().length === 1);
-            test(adapter.getPublishedEndpoints()[0].equals(endpt));
-            communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 20000");
-            await adapter.refreshPublishedEndpoints();
-            test(adapter.getPublishedEndpoints().length === 1);
-            test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 12345 -t 20000");
-            await adapter.destroy();
-            test(adapter.getPublishedEndpoints().length === 0);
-        }
-        out.writeLine("ok");
 
-        test(obj.ice_getConnection() != null)
-        {
-            out.write("testing object adapter with bi-dir connection... ");
-            const adapter = await communicator.createObjectAdapter("");
-            (await obj.ice_getConnection()).setAdapter(adapter);
-            (await obj.ice_getConnection()).setAdapter(null);
-            await adapter.deactivate();
-            try
+            out.write("testing object adapter published endpoints... ");
             {
-                (await obj.ice_getConnection()).setAdapter(adapter);
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.ObjectAdapterDeactivatedException);
+                communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 30000");
+                const adapter = await communicator.createObjectAdapter("PAdapter");
+                test(adapter.getPublishedEndpoints().length === 1);
+                const endpt = adapter.getPublishedEndpoints()[0];
+                test(endpt.toString() == "tcp -h localhost -p 12345 -t 30000");
+                const prx =
+                      communicator.stringToProxy("dummy:tcp -h localhost -p 12346 -t 20000:tcp -h localhost -p 12347 -t 10000");
+                adapter.setPublishedEndpoints(prx.ice_getEndpoints());
+                test(adapter.getPublishedEndpoints().length === 2);
+                const id = new Ice.Identity();
+                id.name = "dummy";
+                test(Ice.ArrayUtil.equals(adapter.createProxy(id).ice_getEndpoints(), prx.ice_getEndpoints()));
+                test(Ice.ArrayUtil.equals(adapter.getPublishedEndpoints(), prx.ice_getEndpoints()));
+                await adapter.refreshPublishedEndpoints();
+                test(adapter.getPublishedEndpoints().length === 1);
+                test(adapter.getPublishedEndpoints()[0].equals(endpt));
+                communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 20000");
+                await adapter.refreshPublishedEndpoints();
+                test(adapter.getPublishedEndpoints().length === 1);
+                test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 12345 -t 20000");
+                await adapter.destroy();
+                test(adapter.getPublishedEndpoints().length === 0);
             }
             out.writeLine("ok");
-        }
 
-        out.write("testing object adapter with router... ");
-        {
-            const routerId = new Ice.Identity();
-            routerId.name = "router";
-            let router = Ice.RouterPrx.uncheckedCast(base.ice_identity(routerId).ice_connectionId("rc"));
-            const adapter = await communicator.createObjectAdapterWithRouter("", router);
-            test(adapter.getPublishedEndpoints().length == 1);
-            test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 23456 -t 30000");
-            await adapter.refreshPublishedEndpoints();
-            test(adapter.getPublishedEndpoints().length == 1);
-            test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 23457 -t 30000");
-            try
-            {
-                adapter.setPublishedEndpoints(router.ice_getEndpoints());
-                test(false);
-            }
-            catch(ex)
+            test(obj.ice_getConnection() !== null);
             {
-                // Expected.
-                test(ex instanceof Error);
+                out.write("testing object adapter with bi-dir connection... ");
+                const adapter = await communicator.createObjectAdapter("");
+                (await obj.ice_getConnection()).setAdapter(adapter);
+                (await obj.ice_getConnection()).setAdapter(null);
+                await adapter.deactivate();
+                try
+                {
+                    (await obj.ice_getConnection()).setAdapter(adapter);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.ObjectAdapterDeactivatedException);
+                }
+                out.writeLine("ok");
             }
-            await adapter.destroy();
 
-            try
+            out.write("testing object adapter with router... ");
             {
-                routerId.name = "test";
-                router = Ice.RouterPrx.uncheckedCast(base.ice_identity(routerId));
-                await communicator.createObjectAdapterWithRouter("", router);
-                test(false);
+                const routerId = new Ice.Identity();
+                routerId.name = "router";
+                let router = Ice.RouterPrx.uncheckedCast(base.ice_identity(routerId).ice_connectionId("rc"));
+                const adapter = await communicator.createObjectAdapterWithRouter("", router);
+                test(adapter.getPublishedEndpoints().length == 1);
+                test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 23456 -t 30000");
+                await adapter.refreshPublishedEndpoints();
+                test(adapter.getPublishedEndpoints().length == 1);
+                test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 23457 -t 30000");
+                try
+                {
+                    adapter.setPublishedEndpoints(router.ice_getEndpoints());
+                    test(false);
+                }
+                catch(ex)
+                {
+                    // Expected.
+                    test(ex instanceof Error);
+                }
+                await adapter.destroy();
+
+                try
+                {
+                    routerId.name = "test";
+                    router = Ice.RouterPrx.uncheckedCast(base.ice_identity(routerId));
+                    await communicator.createObjectAdapterWithRouter("", router);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    // Expected: the "test" object doesn't implement Ice::Router!
+                    test(ex instanceof Ice.OperationNotExistException);
+                }
+
+                try
+                {
+                    router = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("router:" + this.getTestEndpoint(1)));
+                    await communicator.createObjectAdapterWithRouter("", router);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.ConnectFailedException);
+                }
             }
-            catch(ex)
+            out.writeLine("ok");
+
+            out.write("deactivating object adapter in the server... ");
+            await obj.deactivate();
+            out.writeLine("ok");
+
+            out.write("testing adapter states... ");
             {
-                // Expected: the "test" object doesn't implement Ice::Router!
-                test(ex instanceof Ice.OperationNotExistException);
+                const adpt = await communicator.createObjectAdapter("");
+                test(!adpt.isDeactivated());
+                await adpt.activate();
+                test(!adpt.isDeactivated());
+
+                let isHolding = false;
+                let p1 = adpt.waitForHold().then(() =>
+                                        {
+                                            isHolding = true;
+                                        });
+                test(!isHolding);
+                adpt.hold();
+                await adpt.waitForHold();
+                await p1;
+                test(isHolding);
+
+                isHolding = false;
+                p1 = adpt.waitForHold().then(() =>
+                                        {
+                                            isHolding = true;
+                                        });
+
+                let isDeactivated = false;
+                const p2 = adpt.waitForDeactivate().then(() =>
+                                              {
+                                                  isDeactivated = true;
+                                              });
+                test(!isDeactivated);
+                await adpt.deactivate();
+                await adpt.waitForDeactivate();
+                await Promise.all([p1, p2]);
+                test(isDeactivated && isHolding);
+                test(adpt.isDeactivated());
+                await adpt.destroy();
             }
+            out.writeLine("ok");
 
-          try
+            out.write("testing whether server is gone... ");
+            try
             {
-                router = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("router:default -p 12011"));
-                await communicator.createObjectAdapterWithRouter("", router);
-                test(false);
+                await obj.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+                throw new Error();
             }
             catch(ex)
             {
-                test(ex instanceof Ice.ConnectFailedException);
+                test(ex instanceof Ice.LocalException);
+                out.writeLine("ok");
             }
         }
-        out.writeLine("ok");
-
-        out.write("deactivating object adapter in the server... ");
-        await obj.deactivate();
-        out.writeLine("ok");
-
-        out.write("testing adapter states... ");
-        {
-            const adpt = await communicator.createObjectAdapter("");
-            test(!adpt.isDeactivated());
-            await adpt.activate();
-            test(!adpt.isDeactivated());
-
-            let isHolding = false;
-            adpt.waitForHold().then(() => { isHolding = true; });
-            test(!isHolding);
-            adpt.hold();
-            await adpt.waitForHold();
-            await Ice.Promise.delay(10); // Relinquish the thread to allow the continuation to execute.
-            test(isHolding);
-
-            isHolding = false;
-            adpt.waitForHold().then(() => isHolding = true);
-
-            let isDeactivated = false;
-            adpt.waitForDeactivate().then(() => isDeactivated = true);
-            test(!isDeactivated);
-            await adpt.deactivate();
-            await adpt.waitForDeactivate();
-            await Ice.Promise.delay(10); // Relinquish the thread to allow the continuation to execute.
-            test(isDeactivated && isHolding);
-            test(adpt.isDeactivated());
-            await adpt.destroy();
-        }
-        out.writeLine("ok");
 
-        out.write("testing whether server is gone... ");
-        try
+        async run(args)
         {
-            await obj.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
-            throw new RuntimeException();
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException);
-            out.writeLine("ok");
-        }
-    }
-
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(communicator, out);
-        }
-        finally
-        {
-            if(communicator)
+            let communicator;
+            try
+            {
+                [communicator, args] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/adapterDeactivation/Test.ice zeroc-ice-3.7.2/js/test/Ice/adapterDeactivation/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/adapterDeactivation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/adapterDeactivation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/ami/Client.js zeroc-ice-3.7.2/js/test/Ice/ami/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/ami/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/ami/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,82 +1,75 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(communicator, out)
+    class Client extends TestHelper
     {
-        function test(value)
+        async allTests()
         {
-            if(!value)
-            {
-                throw new Error("test failed");
-            }
-        }
+            const communicator = this.communicator();
+            const out = this.getWriter();
 
-        let sref = "test:default -p 12010";
-        let obj = communicator.stringToProxy(sref);
-        test(obj !== null);
-        let p = Test.TestIntfPrx.uncheckedCast(obj);
-
-        sref = "testController:default -p 12011";
-        obj = communicator.stringToProxy(sref);
-        test(obj != null);
-        let testController = Test.TestIntfControllerPrx.uncheckedCast(obj);
+            let sref = "test:" + this.getTestEndpoint();
+            let obj = communicator.stringToProxy(sref);
+            test(obj !== null);
+            const p = Test.TestIntfPrx.uncheckedCast(obj);
+
+            sref = "testController:" + this.getTestEndpoint(1);
+            obj = communicator.stringToProxy(sref);
+            test(obj !== null);
+            const testController = Test.TestIntfControllerPrx.uncheckedCast(obj);
 
-        out.write("testing batch requests with proxy... ");
-        {
-            let count = await p.opBatchCount();
-            test(count === 0);
-            let b1 = p.ice_batchOneway();
-            let bf = b1.opBatch();
-            test(bf.isCompleted());
-            test(!bf.isSent());
-            test(b1.opBatch());
-            await b1.ice_flushBatchRequests();
-            await p.waitForBatch(2);
-            await b1.ice_flushBatchRequests();
-        }
-        out.writeLine("ok");
+            out.write("testing batch requests with proxy... ");
+            {
+                const count = await p.opBatchCount();
+                test(count === 0);
+                const b1 = p.ice_batchOneway();
+                const bf = b1.opBatch();
+                test(bf.isCompleted());
+                test(!bf.isSent());
+                b1.opBatch();
+                await b1.ice_flushBatchRequests();
+                await p.waitForBatch(2);
+                await b1.ice_flushBatchRequests();
+            }
+            out.writeLine("ok");
 
-        out.write("testing batch requests with connection... ");
-        {
-            test(await p.opBatchCount() === 0);
-            let b1 = p.ice_batchOneway();
-            await b1.opBatch();
-            let bf = b1.opBatch();
-            test(bf.isCompleted());
-            await b1.ice_flushBatchRequests();
-            test(await p.waitForBatch(2));
-        }
+            out.write("testing batch requests with connection... ");
+            {
+                test(await p.opBatchCount() === 0);
+                const b1 = p.ice_batchOneway();
+                await b1.opBatch();
+                const bf = b1.opBatch();
+                test(bf.isCompleted());
+                await b1.ice_flushBatchRequests();
+                test(await p.waitForBatch(2));
+            }
 
-        if(await p.ice_getConnection() !== null)
-        {
-            test(await p.opBatchCount() == 0);
-            let b1 = p.ice_batchOneway();
-            await b1.opBatch();
-            await b1.ice_getConnection().then(conn => conn.close(Ice.ConnectionClose.GracefullyWithWait));
-            await b1.ice_flushBatchRequests();
-            test(await p.waitForBatch(1));
-        }
-        out.writeLine("ok");
+            if(await p.ice_getConnection() !== null)
+            {
+                test(await p.opBatchCount() == 0);
+                const b1 = p.ice_batchOneway();
+                await b1.opBatch();
+                await b1.ice_getConnection().then(conn => conn.close(Ice.ConnectionClose.GracefullyWithWait));
+                await b1.ice_flushBatchRequests();
+                test(await p.waitForBatch(1));
+            }
+            out.writeLine("ok");
 
-        out.write("testing batch requests with communicator... ");
-        {
+            out.write("testing batch requests with communicator... ");
             {
                 //
                 // Async task - 1 connection.
                 //
                 test(await p.opBatchCount() === 0);
-                let b1 = Test.TestIntfPrx.uncheckedCast(
+                const b1 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
                 await b1.opBatch();
                 await b1.opBatch();
@@ -90,7 +83,7 @@
                 // Async task exception - 1 connection.
                 //
                 test(await p.opBatchCount() === 0);
-                let b1 = Test.TestIntfPrx.uncheckedCast(
+                const b1 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
                 await b1.opBatch();
                 await b1.ice_getConnection().then(c => c.close(Ice.ConnectionClose.GracefullyWithWait));
@@ -104,9 +97,9 @@
                 // Async task - 2 connections.
                 //
                 test(await p.opBatchCount() === 0);
-                let b1 = Test.TestIntfPrx.uncheckedCast(
+                const b1 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
-                let b2 = Test.TestIntfPrx.uncheckedCast(
+                const b2 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_connectionId("2").ice_getConnection().then(
                         c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
 
@@ -128,9 +121,9 @@
                 // Exceptions should not be reported.
                 //
                 test(await p.opBatchCount() === 0);
-                let b1 = Test.TestIntfPrx.uncheckedCast(
+                const b1 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
-                let b2 = Test.TestIntfPrx.uncheckedCast(
+                const b2 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_connectionId("2").ice_getConnection().then(
                         c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
                 await b2.ice_getConnection(); // Ensure connection is established.
@@ -149,9 +142,9 @@
                 // The sent callback should be invoked even if all connections fail.
                 //
                 test(await p.opBatchCount() == 0);
-                let b1 = Test.TestIntfPrx.uncheckedCast(
+                const b1 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
-                let b2 = Test.TestIntfPrx.uncheckedCast(
+                const b2 = Test.TestIntfPrx.uncheckedCast(
                     await p.ice_connectionId("2").ice_getConnection().then(
                         c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
                 await b2.ice_getConnection(); // Ensure connection is established.
@@ -163,188 +156,187 @@
                 await communicator.flushBatchRequests();
                 test(await p.opBatchCount() === 0);
             }
-        }
-        out.writeLine("ok");
+            out.writeLine("ok");
 
-        out.write("testing AsyncResult operations... ");
-        {
-            await testController.holdAdapter();
-            let r1;
-            let r2;
-            try
+            out.write("testing AsyncResult operations... ");
             {
-                r1 = p.op();
-                let seq = new Uint8Array(100000);
-
-                while(true)
+                await testController.holdAdapter();
+                let r1;
+                let r2;
+                try
                 {
-                    r2 = p.opWithPayload(seq);
-                    if(r2.sentSynchronously())
+                    r1 = p.op();
+                    const seq = new Uint8Array(100000);
+                    while(true)
                     {
-                        await Ice.Promise.delay(0);
+                        r2 = p.opWithPayload(seq);
+                        if(r2.sentSynchronously())
+                        {
+                            await Ice.Promise.delay(0);
+                        }
+                        else
+                        {
+                            break;
+                        }
                     }
-                    else
+
+                    if(await p.ice_getConnection() !== null)
                     {
-                        break;
+                        test(r1.sentSynchronously() && r1.isSent() && !r1.isCompleted() ||
+                             !r1.sentSynchronously() && !r1.isCompleted());
+
+                        test(!r2.sentSynchronously() && !r2.isCompleted());
+
+                        test(!r1.isCompleted());
+                        test(!r2.isCompleted());
                     }
                 }
-
-                if(await p.ice_getConnection() !== null)
+                finally
                 {
-                    test(r1.sentSynchronously() && r1.isSent() && !r1.isCompleted() ||
-                         !r1.sentSynchronously() && !r1.isCompleted());
-
-                    test(!r2.sentSynchronously() && !r2.isCompleted());
-
-                    test(!r1.isCompleted());
-                    test(!r2.isCompleted());
+                    await testController.resumeAdapter();
                 }
-            }
-            finally
-            {
-                await testController.resumeAdapter();
-            }
 
-            await r1;
-            test(r1.isSent());
-            test(r1.isCompleted());
-
-            await r2;
-            test(r2.isSent());
-            test(r2.isCompleted());
-
-            test(r1.operation == "op");
-            test(r2.operation == "opWithPayload");
-
-            r = p.ice_ping();
-            test(r.operation === "ice_ping");
-            test(r.connection === null); // Expected
-            test(r.communicator == communicator);
-            test(r.proxy == p);
-
-            //
-            // Oneway
-            //
-            let p2 = p.ice_oneway();
-            r = p2.ice_ping();
-            test(r.operation === "ice_ping");
-            test(r.connection === null); // Expected
-            test(r.communicator == communicator);
-            test(r.proxy == p2);
-
-            //
-            // Batch request via proxy
-            //
-            p2 = p.ice_batchOneway();
-            p2.ice_ping();
-            r = p2.ice_flushBatchRequests();
-            test(r.operation === "ice_flushBatchRequests");
-            test(r.connection === null); // Expected
-            test(r.communicator == communicator);
-            test(r.proxy == p2);
-
-            let con = p.ice_getCachedConnection();
-            p2 = p.ice_batchOneway();
-            p2.ice_ping();
-            r = con.flushBatchRequests();
-            test(r.operation === "flushBatchRequests");
-            test(r.connection == con);
-            test(r.communicator == communicator);
-            test(r.proxy === null);
-
-            p2 = p.ice_batchOneway();
-            p2.ice_ping();
-            r = communicator.flushBatchRequests();
-            test(r.operation === "flushBatchRequests");
-            test(r.connection === null);
-            test(r.communicator == communicator);
-            test(r.proxy === null);
-        }
+                await r1;
+                test(r1.isSent());
+                test(r1.isCompleted());
+
+                await r2;
+                test(r2.isSent());
+                test(r2.isCompleted());
+
+                test(r1.operation == "op");
+                test(r2.operation == "opWithPayload");
+
+                let r = p.ice_ping();
+                test(r.operation === "ice_ping");
+                test(r.connection === null); // Expected
+                test(r.communicator == communicator);
+                test(r.proxy == p);
+
+                //
+                // Oneway
+                //
+                let p2 = p.ice_oneway();
+                r = p2.ice_ping();
+                test(r.operation === "ice_ping");
+                test(r.connection === null); // Expected
+                test(r.communicator == communicator);
+                test(r.proxy == p2);
+
+                //
+                // Batch request via proxy
+                //
+                p2 = p.ice_batchOneway();
+                p2.ice_ping();
+                r = p2.ice_flushBatchRequests();
+                test(r.operation === "ice_flushBatchRequests");
+                test(r.connection === null); // Expected
+                test(r.communicator == communicator);
+                test(r.proxy == p2);
+
+                const con = p.ice_getCachedConnection();
+                p2 = p.ice_batchOneway();
+                p2.ice_ping();
+                r = con.flushBatchRequests();
+                test(r.operation === "flushBatchRequests");
+                test(r.connection == con);
+                test(r.communicator == communicator);
+                test(r.proxy === null);
+
+                p2 = p.ice_batchOneway();
+                p2.ice_ping();
+                r = communicator.flushBatchRequests();
+                test(r.operation === "flushBatchRequests");
+                test(r.connection === null);
+                test(r.communicator == communicator);
+                test(r.proxy === null);
+            }
 
-        {
-            await testController.holdAdapter();
-            let seq = new Uint8Array(new Array(100000));
-            let r;
-            while(true)
             {
-                r = p.opWithPayload(seq);
-                if(r.sentSynchronously())
-                {
-                    await Ice.Promise.delay(0);
-                }
-                else
+                await testController.holdAdapter();
+                const seq = new Uint8Array(new Array(100000));
+                let r;
+                while(true)
                 {
-                    break;
+                    r = p.opWithPayload(seq);
+                    if(r.sentSynchronously())
+                    {
+                        await Ice.Promise.delay(0);
+                    }
+                    else
+                    {
+                        break;
+                    }
                 }
-            }
 
-            test(!r.isSent());
+                test(!r.isSent());
 
-            const r1 = p.ice_ping();
-            r1.then(
-                () => test(false),
-                (ex) => test(ex instanceof Ice.InvocationCanceledException));
-
-            const r2 = p.ice_id();
-            r2.then(
-                () => test(false),
-                (ex) => test(ex instanceof Ice.InvocationCanceledException));
+                const r1 = p.ice_ping();
+                r1.then(
+                    () => test(false),
+                    ex => test(ex instanceof Ice.InvocationCanceledException));
+
+                const r2 = p.ice_id();
+                r2.then(
+                    () => test(false),
+                    ex => test(ex instanceof Ice.InvocationCanceledException));
 
-            r1.cancel();
-            r2.cancel();
+                r1.cancel();
+                r2.cancel();
 
-            await testController.resumeAdapter();
-            await p.ice_ping();
+                await testController.resumeAdapter();
+                await p.ice_ping();
 
-            test(!r1.isSent() && r1.isCompleted());
-            test(!r2.isSent() && r2.isCompleted());
-        }
+                test(!r1.isSent() && r1.isCompleted());
+                test(!r2.isSent() && r2.isCompleted());
+            }
 
-        {
-            await testController.holdAdapter();
+            {
+                await testController.holdAdapter();
 
-            let r1 = p.op();
-            let r2 = p.ice_id();
+                const r1 = p.op();
+                const r2 = p.ice_id();
 
-            await p.ice_oneway().ice_ping();
+                await p.ice_oneway().ice_ping();
 
-            r1.cancel();
-            r1.then(
-                () => test(false),
-                (ex) => test(ex instanceof Ice.InvocationCanceledException));
+                r1.cancel();
+                r1.then(
+                    () => test(false),
+                    ex => test(ex instanceof Ice.InvocationCanceledException));
+
+                r2.cancel();
+                r2.then(
+                    () => test(false),
+                    ex => test(ex instanceof Ice.InvocationCanceledException));
 
-            r2.cancel();
-            r2.then(
-                () => test(false),
-                (ex) => test(ex instanceof Ice.InvocationCanceledException));
+                await testController.resumeAdapter();
+            }
+            out.writeLine("ok");
 
-            await testController.resumeAdapter();
+            await p.shutdown();
         }
-        out.writeLine("ok");
-
-        await p.shutdown();
-    }
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(communicator, out);
-        }
-        finally
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator, args] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/ami/Test.ice zeroc-ice-3.7.2/js/test/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/ami/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/binding/Client.js zeroc-ice-3.7.2/js/test/Ice/binding/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/binding/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/binding/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 /* global
     isSafari : false,
@@ -16,7 +11,9 @@
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const ArrayUtil = Ice.ArrayUtil;
+    const test = TestHelper.test;
 
     const isBrowser = (typeof window !== 'undefined' || typeof WorkerGlobalScope !== 'undefined');
     const isConnectionFailed = ex =>
@@ -24,58 +21,45 @@
           (isBrowser && ex instanceof Ice.ConnectFailedException) ||
           (ex instanceof Ice.ConnectTimeoutException);
 
-    async function allTests(out, initData)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests()
         {
-            if(!value)
+            async function createTestIntfPrx(adapters)
             {
-                let message = "test failed\n";
-                if(ex)
+                let endpoints = [];
+                let obj = null;
+                for(const adapter of adapters)
                 {
-                    message += ex.toString();
+                    obj = await adapter.getTestIntf();
+                    endpoints = endpoints.concat(obj.ice_getEndpoints());
                 }
-                throw new Error(message);
+                return Test.TestIntfPrx.uncheckedCast(obj.ice_endpoints(endpoints));
             }
-        }
 
-        async function createTestIntfPrx(adapters)
-        {
-            let endpoints = [];
-            let obj = null;
-            for(let adapter of adapters)
+            async function deactivate(communicator, adapters)
             {
-                obj = await adapter.getTestIntf();
-                endpoints = endpoints.concat(obj.ice_getEndpoints());
-            }
-            return Test.TestIntfPrx.uncheckedCast(obj.ice_endpoints(endpoints));
-        }
-
-        async function deactivate(communicator, adapters)
-        {
-            for(let adapter of adapters)
-            {
-                await communicator.deactivateObjectAdapter(adapter);
+                for(const adapter of adapters)
+                {
+                    await communicator.deactivateObjectAdapter(adapter);
+                }
             }
-        }
-
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
 
+            const out = this.getWriter();
+            let communicator = this.communicator();
+            const properties = communicator.getProperties().clone();
             out.write("testing stringToProxy... ");
-            ref = "communicator:default -p 12010";
-            com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+            const ref = "communicator:" + this.getTestEndpoint();
+            let com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
             test(com !== null);
             out.writeLine("ok");
 
             out.write("testing binding with single endpoint... ");
             {
-                let adapter = await com.createObjectAdapter("Adapter", "default");
+                const adapter = await com.createObjectAdapter("Adapter", "default");
 
-                let test1 = await adapter.getTestIntf();
-                let test2 = await adapter.getTestIntf();
+                const test1 = await adapter.getTestIntf();
+                const test2 = await adapter.getTestIntf();
                 test(await test1.ice_getConnection() === await test2.ice_getConnection());
 
                 await test1.ice_ping();
@@ -83,7 +67,7 @@
 
                 await com.deactivateObjectAdapter(adapter);
 
-                let test3 = Test.TestIntfPrx.uncheckedCast(test1);
+                const test3 = Test.TestIntfPrx.uncheckedCast(test1);
                 test(await test3.ice_getConnection() === await test1.ice_getConnection());
                 test(await test3.ice_getConnection() === await test2.ice_getConnection());
 
@@ -98,17 +82,20 @@
                 }
 
             }
-            out.writeLine("ok")
+            out.writeLine("ok");
 
             await communicator.destroy();
-            communicator = Ice.initialize(initData);
+            [communicator] = this.initialize(properties);
             com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             out.write("testing binding with multiple endpoints... ");
             {
-                let adapters = await Promise.all([com.createObjectAdapter("Adapter11", "default"),
-                                                  com.createObjectAdapter("Adapter12", "default"),
-                                                  com.createObjectAdapter("Adapter13", "default")]);
+                const adapters = await Promise.all(
+                    [
+                        com.createObjectAdapter("Adapter11", "default"),
+                        com.createObjectAdapter("Adapter12", "default"),
+                        com.createObjectAdapter("Adapter13", "default")
+                    ]);
 
                 //
                 // Ensure that when a connection is opened it's reused for new
@@ -117,24 +104,24 @@
                 let names = ["Adapter11", "Adapter12", "Adapter13"];
                 while(names.length > 0)
                 {
-                    let adpts = ArrayUtil.clone(adapters);
-                    let test1 = await createTestIntfPrx(adpts);
-                    ArrayUtil.shuffle(adpts)
-                    let test2 = await createTestIntfPrx(adpts);
-                    ArrayUtil.shuffle(adpts)
-                    let test3 = await createTestIntfPrx(adpts);
+                    const adpts = ArrayUtil.clone(adapters);
+                    const test1 = await createTestIntfPrx(adpts);
+                    ArrayUtil.shuffle(adpts);
+                    const test2 = await createTestIntfPrx(adpts);
+                    ArrayUtil.shuffle(adpts);
+                    const test3 = await createTestIntfPrx(adpts);
                     await test1.ice_ping();
                     test(await test1.ice_getConnection() == await test2.ice_getConnection());
                     test(await test2.ice_getConnection() == await test3.ice_getConnection());
 
-                    let name = await test1.getAdapterName();
-                    let index = names.indexOf(name);
+                    const name = await test1.getAdapterName();
+                    const index = names.indexOf(name);
                     if(index !== -1)
                     {
                         names.splice(index, 1);
                     }
 
-                    let conn = await test1.ice_getConnection();
+                    const conn = await test1.ice_getConnection();
                     await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                 }
                 //
@@ -142,23 +129,26 @@
                 // always send the request over the same connection.)
                 //
                 {
-                    for(let adpt of adapters)
+                    for(const adpt of adapters)
                     {
-                        let prx = await adpt.getTestIntf();
+                        const prx = await adpt.getTestIntf();
                         await prx.ice_ping();
                     }
 
-                    let t = await createTestIntfPrx(adapters);
-                    let name = await t.getAdapterName();
-                    let nRetry = 10;
+                    const t = await createTestIntfPrx(adapters);
+                    const name = await t.getAdapterName();
+                    const nRetry = 10;
+
                     let i;
+                    /* eslint-disable curly */
                     for(i = 0; i < nRetry && await t.getAdapterName() == name; i++);
+                    /* eslint-enable curly */
                     test(i == nRetry);
 
-                    for(let adpt of adapters)
+                    for(const adpt of adapters)
                     {
-                        let prx = await adpt.getTestIntf();
-                        let conn = await prx.ice_getConnection();
+                        const prx = await adpt.getTestIntf();
+                        const conn = await prx.ice_getConnection();
                         await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                     }
                 }
@@ -170,24 +160,24 @@
                 names = ["Adapter12", "Adapter13"];
                 while(names.length > 0)
                 {
-                    let adpts = ArrayUtil.clone(adapters);
+                    const adpts = ArrayUtil.clone(adapters);
 
-                    let test1 = await createTestIntfPrx(adpts);
+                    const test1 = await createTestIntfPrx(adpts);
                     ArrayUtil.shuffle(adpts);
-                    let test2 = await createTestIntfPrx(adpts);
+                    const test2 = await createTestIntfPrx(adpts);
                     ArrayUtil.shuffle(adpts);
-                    let test3 = await createTestIntfPrx(adpts);
+                    const test3 = await createTestIntfPrx(adpts);
 
                     test(await test1.ice_getConnection() == await test2.ice_getConnection());
                     test(await test2.ice_getConnection() == await test3.ice_getConnection());
 
-                    let name = await test1.getAdapterName();
-                    let index = names.indexOf(name);
+                    const name = await test1.getAdapterName();
+                    const index = names.indexOf(name);
                     if(index !== -1)
                     {
                         names.splice(index, 1);
                     }
-                    let conn = await test1.ice_getConnection();
+                    const conn = await test1.ice_getConnection();
                     await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                 }
                 //
@@ -195,7 +185,7 @@
                 // establish the connection to the remaining adapter.
                 //
                 await com.deactivateObjectAdapter(adapters[2]);
-                let obj = await createTestIntfPrx(adapters);
+                const obj = await createTestIntfPrx(adapters);
                 test(await obj.getAdapterName() == "Adapter12");
 
                 await deactivate(com, adapters);
@@ -203,7 +193,7 @@
             out.writeLine("ok");
 
             await communicator.destroy();
-            communicator = Ice.initialize(initData);
+            [communicator] = this.initialize(properties);
             com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             //
@@ -212,29 +202,30 @@
             // to be delayed on retry (network.websocket.delay-failed-reconnects=true by
             // default), so we prefer to also disable this test with Firefox.
             //
-            if(typeof(navigator) === "undefined" ||
+            if(typeof navigator === "undefined" ||
                ["MSIE", "Trident/7.0", "Firefox"].every(value => navigator.userAgent.indexOf(value) === -1))
             {
                 out.write("testing binding with multiple random endpoints... ");
 
-                let adapters = await Promise.all([
-                    com.createObjectAdapter("AdapterRandom11", "default"),
-                    com.createObjectAdapter("AdapterRandom12", "default"),
-                    com.createObjectAdapter("AdapterRandom13", "default"),
-                    com.createObjectAdapter("AdapterRandom14", "default"),
-                    com.createObjectAdapter("AdapterRandom15", "default")]);
+                const adapters = await Promise.all(
+                    [
+                        com.createObjectAdapter("AdapterRandom11", "default"),
+                        com.createObjectAdapter("AdapterRandom12", "default"),
+                        com.createObjectAdapter("AdapterRandom13", "default"),
+                        com.createObjectAdapter("AdapterRandom14", "default"),
+                        com.createObjectAdapter("AdapterRandom15", "default")
+                    ]);
 
                 let count = 20;
                 let adapterCount = adapters.length;
                 while(--count > 0)
                 {
-                    let proxies = [];
+                    const proxies = [];
                     if(count == 1)
                     {
                         await com.deactivateObjectAdapter(adapters[4]);
                         --adapterCount;
                     }
-                    proxies = new Array(!0);
 
                     for(let i = 0; i < proxies.length; ++i)
                     {
@@ -251,9 +242,13 @@
                     }
                     for(let i = 0; i < proxies.length; i++)
                     {
-                        proxies[i].getAdapterName().catch(ex => { /*ignore exception*/ });
+                        proxies[i].getAdapterName().catch(
+                            ex =>
+                                {
+                                    // ignore exception
+                                });
                     }
-                    for(let i = 0; i < proxies.Length; i++)
+                    for(let i = 0; i < proxies.length; i++)
                     {
                         try
                         {
@@ -264,7 +259,7 @@
                             test(ex instanceof Ice.LocalException, ex);
                         }
                     }
-                    let connections = [];
+                    const connections = [];
                     for(let i = 0; i < proxies.length; i++)
                     {
                         if(proxies[i].ice_getCachedConnection() !== null)
@@ -277,12 +272,12 @@
                     }
                     test(connections.length <= adapterCount);
 
-                    for(let a of adapters)
+                    for(const a of adapters)
                     {
                         try
                         {
-                            let prx = await a.getTestIntf();
-                            let conn = await prx.ice_getConnection();
+                            const prx = await a.getTestIntf();
+                            const conn = await prx.ice_getConnection();
                             await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                         }
                         catch(ex)
@@ -296,15 +291,17 @@
             }
 
             await communicator.destroy();
-            communicator = Ice.initialize(initData);
+            [communicator] = this.initialize(properties);
             com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             out.write("testing random endpoint selection... ");
             {
-                let adapters = await Promise.all([
-                    com.createObjectAdapter("Adapter21", "default"),
-                    com.createObjectAdapter("Adapter22", "default"),
-                    com.createObjectAdapter("Adapter23", "default")]);
+                const adapters = await Promise.all(
+                    [
+                        com.createObjectAdapter("Adapter21", "default"),
+                        com.createObjectAdapter("Adapter22", "default"),
+                        com.createObjectAdapter("Adapter23", "default")
+                    ]);
 
                 let obj = await createTestIntfPrx(adapters);
                 test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
@@ -312,27 +309,27 @@
                 let names = ["Adapter21", "Adapter22", "Adapter23"];
                 while(names.length > 0)
                 {
-                    let index = names.indexOf(await obj.getAdapterName());
+                    const index = names.indexOf(await obj.getAdapterName());
                     if(index !== -1)
                     {
                         names.splice(index, 1);
                     }
-                    let conn = await obj.ice_getConnection();
+                    const conn = await obj.ice_getConnection();
                     await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                 }
 
                 obj = Test.TestIntfPrx.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Random));
                 test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
 
-                names = ["Adapter21", "Adapter22", "Adapter23"]
+                names = ["Adapter21", "Adapter22", "Adapter23"];
                 while(names.length > 0)
                 {
-                    let index = names.indexOf(await obj.getAdapterName());
+                    const index = names.indexOf(await obj.getAdapterName());
                     if(index !== -1)
                     {
                         names.splice(index, 1);
                     }
-                    let conn = await obj.ice_getConnection();
+                    const conn = await obj.ice_getConnection();
                     await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                 }
 
@@ -341,26 +338,29 @@
             out.writeLine("ok");
 
             await communicator.destroy();
-            communicator = Ice.initialize(initData);
+            [communicator] = this.initialize(properties);
             com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             out.write("testing ordered endpoint selection... ");
             {
-                let adapters = await Promise.all([
-                    com.createObjectAdapter("Adapter31", "default"),
-                    com.createObjectAdapter("Adapter32", "default"),
-                    com.createObjectAdapter("Adapter33", "default")]);
+                let adapters = await Promise.all(
+                    [
+                        com.createObjectAdapter("Adapter31", "default"),
+                        com.createObjectAdapter("Adapter32", "default"),
+                        com.createObjectAdapter("Adapter33", "default")
+                    ]);
 
                 let obj = await createTestIntfPrx(adapters);
                 obj = Test.TestIntfPrx.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
                 test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
-                let nRetry = 3;
-                let i;
+                const nRetry = 3;
 
                 //
                 // Ensure that endpoints are tried in order by deactiving the adapters
                 // one after the other.
                 //
+                /* eslint-disable curly */
+                let i;
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter31"; i++);
                 test(i == nRetry);
                 await com.deactivateObjectAdapter(adapters[0]);
@@ -370,6 +370,7 @@
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter33"; i++);
                 test(i == nRetry);
                 await com.deactivateObjectAdapter(adapters[2]);
+                /* eslint-enable curly */
 
                 try
                 {
@@ -380,7 +381,7 @@
                     test(isConnectionFailed(ex), ex);
                 }
 
-                let endpoints = obj.ice_getEndpoints();
+                const endpoints = obj.ice_getEndpoints();
 
                 adapters = [];
 
@@ -388,6 +389,8 @@
                 // Now, re-activate the adapters with the same endpoints in the opposite
                 // order.
                 //
+
+                /* eslint-disable curly */
                 adapters.push(await com.createObjectAdapter("Adapter36", endpoints[2].toString()));
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter36"; i++);
                 test(i == nRetry);
@@ -401,21 +404,22 @@
                 adapters.push(await com.createObjectAdapter("Adapter34", endpoints[0].toString()));
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter34"; i++);
                 test(i == nRetry);
+                /* eslint-enable curly */
 
                 await deactivate(com, adapters);
             }
             out.writeLine("ok");
 
             await communicator.destroy();
-            communicator = Ice.initialize(initData);
+            [communicator] = this.initialize(properties);
             com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             out.write("testing per request binding with single endpoint... ");
             {
-                let adapter = await com.createObjectAdapter("Adapter41", "default");
+                const adapter = await com.createObjectAdapter("Adapter41", "default");
 
-                let test1 = Test.TestIntfPrx.uncheckedCast((await adapter.getTestIntf()).ice_connectionCached(false));
-                let test2 = Test.TestIntfPrx.uncheckedCast((await adapter.getTestIntf()).ice_connectionCached(false));
+                const test1 = Test.TestIntfPrx.uncheckedCast((await adapter.getTestIntf()).ice_connectionCached(false));
+                const test2 = Test.TestIntfPrx.uncheckedCast((await adapter.getTestIntf()).ice_connectionCached(false));
                 test(!test1.ice_isConnectionCached());
                 test(!test2.ice_isConnectionCached());
                 test(await test1.ice_getConnection() !== null && await test2.ice_getConnection() !== null);
@@ -425,7 +429,7 @@
 
                 await com.deactivateObjectAdapter(adapter);
 
-                let test3 = Test.TestIntfPrx.uncheckedCast(test1);
+                const test3 = Test.TestIntfPrx.uncheckedCast(test1);
                 try
                 {
                     test(await test3.ice_getConnection() == await test1.ice_getConnection());
@@ -439,17 +443,20 @@
             out.writeLine("ok");
 
             await communicator.destroy();
-            communicator = Ice.initialize(initData);
+            [communicator] = this.initialize(properties);
             com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             out.write("testing per request binding with multiple endpoints... ");
             {
-                let adapters = await Promise.all([
-                    com.createObjectAdapter("Adapter51", "default"),
-                    com.createObjectAdapter("Adapter52", "default"),
-                    com.createObjectAdapter("Adapter53", "default")]);
+                const adapters = await Promise.all(
+                    [
+                        com.createObjectAdapter("Adapter51", "default"),
+                        com.createObjectAdapter("Adapter52", "default"),
+                        com.createObjectAdapter("Adapter53", "default")
+                    ]);
 
-                let obj = Test.TestIntfPrx.uncheckedCast((await createTestIntfPrx(adapters)).ice_connectionCached(false));
+                const obj = Test.TestIntfPrx.uncheckedCast(
+                    (await createTestIntfPrx(adapters)).ice_connectionCached(false));
                 test(!obj.ice_isConnectionCached());
 
                 let names = ["Adapter51", "Adapter52", "Adapter53"];
@@ -484,7 +491,7 @@
             }
             out.writeLine("ok");
 
-            if(typeof(navigator) === "undefined" ||
+            if(typeof navigator === "undefined" ||
                ["Firefox", "MSIE", "Trident/7.0"].every(value => navigator.userAgent.indexOf(value) === -1))
             {
                 //
@@ -496,27 +503,31 @@
                 //
 
                 await communicator.destroy();
-                communicator = Ice.initialize(initData);
+                [communicator] = this.initialize(properties);
                 com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
                 out.write("testing per request binding and ordered endpoint selection... ");
-                let adapters = await Promise.all([
-                    com.createObjectAdapter("Adapter61", "default"),
-                    com.createObjectAdapter("Adapter62", "default"),
-                    com.createObjectAdapter("Adapter63", "default")]);
+                let adapters = await Promise.all(
+                    [
+                        com.createObjectAdapter("Adapter61", "default"),
+                        com.createObjectAdapter("Adapter62", "default"),
+                        com.createObjectAdapter("Adapter63", "default")
+                    ]);
 
                 let obj = await createTestIntfPrx(adapters);
                 obj = Test.TestIntfPrx.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
                 test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
                 obj = Test.TestIntfPrx.uncheckedCast(obj.ice_connectionCached(false));
                 test(!obj.ice_isConnectionCached());
-                let nRetry = 3;
+                const nRetry = 3;
                 let i;
 
                 //
                 // Ensure that endpoints are tried in order by deactiving the adapters
                 // one after the other.
                 //
+
+                /* eslint-disable curly */
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter61"; i++);
                 test(i == nRetry);
                 await com.deactivateObjectAdapter(adapters[0]);
@@ -526,6 +537,7 @@
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter63"; i++);
                 test(i == nRetry);
                 com.deactivateObjectAdapter(adapters[2]);
+                /* eslint-enable curly */
 
                 try
                 {
@@ -536,7 +548,7 @@
                     test(isConnectionFailed(ex), ex);
                 }
 
-                let endpoints = obj.ice_getEndpoints();
+                const endpoints = obj.ice_getEndpoints();
 
                 adapters = [];
 
@@ -544,6 +556,7 @@
                 // Now, re-activate the adapters with the same endpoints in the opposite
                 // order.
                 //
+                /* eslint-disable curly */
                 adapters.push(await com.createObjectAdapter("Adapter66", endpoints[2].toString()));
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter66"; i++);
                 test(i == nRetry);
@@ -553,40 +566,38 @@
                 adapters.push(await com.createObjectAdapter("Adapter64", endpoints[0].toString()));
                 for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter64"; i++);
                 test(i == nRetry);
-
+                /* eslint-enable curly */
                 await deactivate(com, adapters);
                 out.writeLine("ok");
             }
 
             await com.shutdown();
         }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
-            }
-        }
-    }
 
-    async function run(out, initData)
-    {
-        if(typeof(navigator) !== 'undefined' && isSafari() && isWorker())
+        async run(args)
         {
             let communicator;
             try
             {
-                communicator = Ice.initialize(initData);
-                //
-                // BUGFIX:
-                //
-                // With Safari 9.1 and WebWorkers, this test hangs in communicator destruction. The
-                // web socket send() method never returns for the sending of close connection message.
-                //
-                out.writeLine("Test not supported with Safari web workers.");
-                let obj = communicator.stringToProxy("communicator:default -p 12010");
-                let prx = await Test.RemoteCommunicatorPrx.uncheckedCast(obj);
-                await prx.shutdown();
+                const out = this.getWriter();
+                [communicator, args] = this.initialize(args);
+                if(typeof navigator !== 'undefined' && isSafari() && isWorker())
+                {
+                    //
+                    // BUGFIX:
+                    //
+                    // With Safari 9.1 and WebWorkers, this test hangs in communicator destruction. The
+                    // web socket send() method never returns for the sending of close connection message.
+                    //
+                    out.writeLine("Test not supported with Safari web workers.");
+                    const obj = communicator.stringToProxy("communicator:" + this.getTestEndpoint());
+                    const prx = await Test.RemoteCommunicatorPrx.uncheckedCast(obj);
+                    await prx.shutdown();
+                }
+                else
+                {
+                    await this.allTests();
+                }
             }
             finally
             {
@@ -596,15 +607,10 @@
                 }
             }
         }
-        else
-        {
-            await allTests(out, initData);
-        }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/binding/Test.ice zeroc-ice-3.7.2/js/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/defaultValue/Client.js zeroc-ice-3.7.2/js/test/Ice/defaultValue/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/defaultValue/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/defaultValue/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,204 +1,198 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function run(out, initData)
+    class Client extends TestHelper
     {
-        function test(value)
+        run()
         {
-            if(!value)
+            const out = this.getWriter();
+            out.write("testing default values... ");
             {
-                throw new Error("test failed");
+                const v = new Test.Struct1();
+                test(!v.boolFalse);
+                test(v.boolTrue);
+                test(v.b === 254);
+                test(v.s === 16000);
+                test(v.i === 3);
+                test(v.l.equals(new Ice.Long(0, 4)));
+                test(v.f === 5.1);
+                test(v.d === 6.2);
+                test(v.str === "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+                test(v.c1 === Test.Color.red);
+                test(v.c2 === Test.Color.green);
+                test(v.c3 === Test.Color.blue);
+                test(v.nc1 === Test.Nested.Color.red);
+                test(v.nc2 === Test.Nested.Color.green);
+                test(v.nc3 === Test.Nested.Color.blue);
+                test(v.noDefault === "");
+                test(v.zeroI === 0);
+                test(v.zeroL.equals(new Ice.Long(0, 0)));
+                test(v.zeroF === 0);
+                test(v.zeroDotF === 0);
+                test(v.zeroD === 0);
+                test(v.zeroDotD === 0);
             }
-        }
-
-        out.write("testing default values... ");
-        {
-            const v = new Test.Struct1();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b === 254);
-            test(v.s === 16000);
-            test(v.i === 3);
-            test(v.l.equals(new Ice.Long(0, 4)));
-            test(v.f === 5.1);
-            test(v.d === 6.2);
-            test(v.str === "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
-            test(v.c1 === Test.Color.red);
-            test(v.c2 === Test.Color.green);
-            test(v.c3 === Test.Color.blue);
-            test(v.nc1 === Test.Nested.Color.red);
-            test(v.nc2 === Test.Nested.Color.green);
-            test(v.nc3 === Test.Nested.Color.blue);
-            test(v.noDefault === "");
-            test(v.zeroI === 0);
-            test(v.zeroL.equals(new Ice.Long(0, 0)));
-            test(v.zeroF === 0);
-            test(v.zeroDotF === 0);
-            test(v.zeroD === 0);
-            test(v.zeroDotD === 0);
-        }
 
-        {
-            const v = new Test.Struct2();
-            test(v.boolTrue === Test.ConstBool);
-            test(v.b === Test.ConstByte);
-            test(v.s === Test.ConstShort);
-            test(v.i === Test.ConstInt);
-            test(v.l.equals(Test.ConstLong));
-            test(v.f === Test.ConstFloat);
-            test(v.d === Test.ConstDouble);
-            test(v.str ==  Test.ConstString);
-            test(v.c1 === Test.ConstColor1);
-            test(v.c2 === Test.ConstColor2);
-            test(v.c3 === Test.ConstColor3);
-            test(v.nc1 === Test.ConstNestedColor1);
-            test(v.nc2 === Test.ConstNestedColor2);
-            test(v.nc3 === Test.ConstNestedColor3);
-        }
+            {
+                const v = new Test.Struct2();
+                test(v.boolTrue === Test.ConstBool);
+                test(v.b === Test.ConstByte);
+                test(v.s === Test.ConstShort);
+                test(v.i === Test.ConstInt);
+                test(v.l.equals(Test.ConstLong));
+                test(v.f === Test.ConstFloat);
+                test(v.d === Test.ConstDouble);
+                test(v.str === Test.ConstString);
+                test(v.c1 === Test.ConstColor1);
+                test(v.c2 === Test.ConstColor2);
+                test(v.c3 === Test.ConstColor3);
+                test(v.nc1 === Test.ConstNestedColor1);
+                test(v.nc2 === Test.ConstNestedColor2);
+                test(v.nc3 === Test.ConstNestedColor3);
+            }
 
-        {
-            const v = new Test.Base();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b === 1);
-            test(v.s === 2);
-            test(v.i === 3);
-            test(v.l.equals(new Ice.Long(0, 4)));
-            test(v.f === 5.1);
-            test(v.d === 6.2);
-            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
-            test(v.noDefault === "");
-            test(v.zeroI === 0);
-            test(v.zeroL.equals(new Ice.Long(0, 0)));
-            test(v.zeroF === 0);
-            test(v.zeroDotF === 0);
-            test(v.zeroD === 0);
-            test(v.zeroDotD === 0);
-        }
+            {
+                const v = new Test.Base();
+                test(!v.boolFalse);
+                test(v.boolTrue);
+                test(v.b === 1);
+                test(v.s === 2);
+                test(v.i === 3);
+                test(v.l.equals(new Ice.Long(0, 4)));
+                test(v.f === 5.1);
+                test(v.d === 6.2);
+                test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+                test(v.noDefault === "");
+                test(v.zeroI === 0);
+                test(v.zeroL.equals(new Ice.Long(0, 0)));
+                test(v.zeroF === 0);
+                test(v.zeroDotF === 0);
+                test(v.zeroD === 0);
+                test(v.zeroDotD === 0);
+            }
 
-        {
-            const v = new Test.Derived();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b === 1);
-            test(v.s === 2);
-            test(v.i === 3);
-            test(v.l.equals(new Ice.Long(0, 4)));
-            test(v.f === 5.1);
-            test(v.d === 6.2);
-            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
-            test(v.c1 === Test.Color.red);
-            test(v.c2 === Test.Color.green);
-            test(v.c3 === Test.Color.blue);
-            test(v.nc1 === Test.Nested.Color.red);
-            test(v.nc2 === Test.Nested.Color.green);
-            test(v.nc3 === Test.Nested.Color.blue);
-            test(v.noDefault === "");
-            test(v.zeroI === 0);
-            test(v.zeroL.equals(new Ice.Long(0, 0)));
-            test(v.zeroF === 0);
-            test(v.zeroDotF === 0);
-            test(v.zeroD === 0);
-            test(v.zeroDotD === 0);
-        }
+            {
+                const v = new Test.Derived();
+                test(!v.boolFalse);
+                test(v.boolTrue);
+                test(v.b === 1);
+                test(v.s === 2);
+                test(v.i === 3);
+                test(v.l.equals(new Ice.Long(0, 4)));
+                test(v.f === 5.1);
+                test(v.d === 6.2);
+                test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+                test(v.c1 === Test.Color.red);
+                test(v.c2 === Test.Color.green);
+                test(v.c3 === Test.Color.blue);
+                test(v.nc1 === Test.Nested.Color.red);
+                test(v.nc2 === Test.Nested.Color.green);
+                test(v.nc3 === Test.Nested.Color.blue);
+                test(v.noDefault === "");
+                test(v.zeroI === 0);
+                test(v.zeroL.equals(new Ice.Long(0, 0)));
+                test(v.zeroF === 0);
+                test(v.zeroDotF === 0);
+                test(v.zeroD === 0);
+                test(v.zeroDotD === 0);
+            }
 
-        {
-            const v = new Test.BaseEx();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b === 1);
-            test(v.s === 2);
-            test(v.i === 3);
-            test(v.l.equals(new Ice.Long(0, 4)));
-            test(v.f === 5.1);
-            test(v.d === 6.2);
-            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
-            test(v.noDefault === "");
-            test(v.zeroI === 0);
-            test(v.zeroL.equals(new Ice.Long(0, 0)));
-            test(v.zeroF === 0);
-            test(v.zeroDotF === 0);
-            test(v.zeroD === 0);
-            test(v.zeroDotD === 0);
-        }
+            {
+                const v = new Test.BaseEx();
+                test(!v.boolFalse);
+                test(v.boolTrue);
+                test(v.b === 1);
+                test(v.s === 2);
+                test(v.i === 3);
+                test(v.l.equals(new Ice.Long(0, 4)));
+                test(v.f === 5.1);
+                test(v.d === 6.2);
+                test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+                test(v.noDefault === "");
+                test(v.zeroI === 0);
+                test(v.zeroL.equals(new Ice.Long(0, 0)));
+                test(v.zeroF === 0);
+                test(v.zeroDotF === 0);
+                test(v.zeroD === 0);
+                test(v.zeroDotD === 0);
+            }
 
-        {
-            const v = new Test.DerivedEx();
-            test(!v.boolFalse);
-            test(v.boolTrue);
-            test(v.b === 1);
-            test(v.s === 2);
-            test(v.i === 3);
-            test(v.l.equals(new Ice.Long(0, 4)));
-            test(v.f === 5.1);
-            test(v.d === 6.2);
-            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
-            test(v.noDefault === "");
-            test(v.c1 === Test.Color.red);
-            test(v.c2 === Test.Color.green);
-            test(v.c3 === Test.Color.blue);
-            test(v.nc1 === Test.Nested.Color.red);
-            test(v.nc2 === Test.Nested.Color.green);
-            test(v.nc3 === Test.Nested.Color.blue);
-            test(v.zeroI === 0);
-            test(v.zeroL.equals(new Ice.Long(0, 0)));
-            test(v.zeroF === 0);
-            test(v.zeroDotF === 0);
-            test(v.zeroD === 0);
-            test(v.zeroDotD === 0);
-        }
-        out.writeLine("ok");
+            {
+                const v = new Test.DerivedEx();
+                test(!v.boolFalse);
+                test(v.boolTrue);
+                test(v.b === 1);
+                test(v.s === 2);
+                test(v.i === 3);
+                test(v.l.equals(new Ice.Long(0, 4)));
+                test(v.f === 5.1);
+                test(v.d === 6.2);
+                test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+                test(v.noDefault === "");
+                test(v.c1 === Test.Color.red);
+                test(v.c2 === Test.Color.green);
+                test(v.c3 === Test.Color.blue);
+                test(v.nc1 === Test.Nested.Color.red);
+                test(v.nc2 === Test.Nested.Color.green);
+                test(v.nc3 === Test.Nested.Color.blue);
+                test(v.zeroI === 0);
+                test(v.zeroL.equals(new Ice.Long(0, 0)));
+                test(v.zeroF === 0);
+                test(v.zeroDotF === 0);
+                test(v.zeroD === 0);
+                test(v.zeroDotD === 0);
+            }
+            out.writeLine("ok");
 
-        out.write("testing default constructor... ");
-        {
-            const v2 = new Test.StructNoDefaults();
-            test(v2.bo === false);
-            test(v2.b === 0);
-            test(v2.s === 0);
-            test(v2.i === 0);
-            test(v2.l.equals(new Ice.Long(0, 0)));
-            test(v2.f === 0.0);
-            test(v2.d === 0.0);
-            test(v2.str === "");
-            test(v2.c1 == Test.Color.red);
-            test(v2.bs === null);
-            test(v2.is === null);
-            test(v2.st !== null && v2.st instanceof Test.InnerStruct);
-            test(v2.dict === null);
-        }
+            out.write("testing default constructor... ");
+            {
+                const v2 = new Test.StructNoDefaults();
+                test(v2.bo === false);
+                test(v2.b === 0);
+                test(v2.s === 0);
+                test(v2.i === 0);
+                test(v2.l.equals(new Ice.Long(0, 0)));
+                test(v2.f === 0.0);
+                test(v2.d === 0.0);
+                test(v2.str === "");
+                test(v2.c1 == Test.Color.red);
+                test(v2.bs === null);
+                test(v2.is === null);
+                test(v2.st !== null && v2.st instanceof Test.InnerStruct);
+                test(v2.dict === null);
+            }
 
-        {
-            const e = new Test.ExceptionNoDefaults();
-            test(e.str === "");
-            test(e.c1 == Test.Color.red);
-            test(e.bs === null);
-            test(e.st !== null && e.st instanceof Test.InnerStruct);
-            test(e.dict === null);
-        }
+            {
+                const e = new Test.ExceptionNoDefaults();
+                test(e.str === "");
+                test(e.c1 == Test.Color.red);
+                test(e.bs === null);
+                test(e.st !== null && e.st instanceof Test.InnerStruct);
+                test(e.dict === null);
+            }
 
-        {
-            const cl = new Test.ClassNoDefaults();
-            test(cl.str === "");
-            test(cl.c1 == Test.Color.red);
-            test(cl.bs === null);
-            test(cl.st !== null && cl.st instanceof Test.InnerStruct);
-            test(cl.dict === null);
+            {
+                const cl = new Test.ClassNoDefaults();
+                test(cl.str === "");
+                test(cl.c1 == Test.Color.red);
+                test(cl.bs === null);
+                test(cl.st !== null && cl.st instanceof Test.InnerStruct);
+                test(cl.dict === null);
+            }
+            out.writeLine("ok");
         }
-        out.writeLine("ok");
     }
-    exports._test = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/js/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/enums/Client.js zeroc-ice-3.7.2/js/test/Ice/enums/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/enums/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/enums/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,195 +1,189 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
-    const Ice = require("ice").Ice;
+    const TestHelper = require("TestHelper").TestHelper;
     const Test = require("Test").Test;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value)
+        async allTests()
         {
-            if(!value)
-            {
-                throw new Error("test failed");
-            }
-        }
+            const out = this.getWriter();
+            const communicator = this.communicator();
 
-        out.write("testing stringToProxy... ");
-        const ref = "test:default -p 12010";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let proxy = await Test.TestIntfPrx.checkedCast(base);
-        test(proxy !== null);
-        test(proxy.equals(base));
-        out.writeLine("ok");
-
-        out.write("testing enum values... ");
-        test(Test.ByteEnum.benum1.value === 0);
-        test(Test.ByteEnum.benum2.value === 1);
-        test(Test.ByteEnum.benum3.value === Test.ByteConst1);
-        test(Test.ByteEnum.benum4.value === Test.ByteConst1 + 1);
-        test(Test.ByteEnum.benum5.value === Test.ShortConst1);
-        test(Test.ByteEnum.benum6.value === Test.ShortConst1 + 1);
-        test(Test.ByteEnum.benum7.value === Test.IntConst1);
-        test(Test.ByteEnum.benum8.value === Test.IntConst1 + 1);
-        test(Test.ByteEnum.benum9.value === Test.LongConst1.low);
-        test(Test.ByteEnum.benum10.value === Test.LongConst1.low + 1);
-        test(Test.ByteEnum.benum11.value === Test.ByteConst2);
-
-        test(Test.ByteEnum.valueOf(0) === Test.ByteEnum.benum1);
-        test(Test.ByteEnum.valueOf(1) === Test.ByteEnum.benum2);
-        test(Test.ByteEnum.valueOf(Test.ByteConst1) === Test.ByteEnum.benum3);
-        test(Test.ByteEnum.valueOf(Test.ByteConst1+ 1) === Test.ByteEnum.benum4);
-        test(Test.ByteEnum.valueOf(Test.ShortConst1) === Test.ByteEnum.benum5);
-        test(Test.ByteEnum.valueOf(Test.ShortConst1 + 1) === Test.ByteEnum.benum6);
-        test(Test.ByteEnum.valueOf(Test.IntConst1) === Test.ByteEnum.benum7);
-        test(Test.ByteEnum.valueOf(Test.IntConst1 + 1) === Test.ByteEnum.benum8);
-        test(Test.ByteEnum.valueOf(Test.LongConst1.low) === Test.ByteEnum.benum9);
-        test(Test.ByteEnum.valueOf(Test.LongConst1.low + 1) === Test.ByteEnum.benum10);
-        test(Test.ByteEnum.valueOf(Test.ByteConst2) === Test.ByteEnum.benum11);
-
-        test(Test.ShortEnum.senum1.value === 3);
-        test(Test.ShortEnum.senum2.value === 4);
-        test(Test.ShortEnum.senum3.value === Test.ByteConst1);
-        test(Test.ShortEnum.senum4.value === Test.ByteConst1 + 1);
-        test(Test.ShortEnum.senum5.value === Test.ShortConst1);
-        test(Test.ShortEnum.senum6.value === Test.ShortConst1 + 1);
-        test(Test.ShortEnum.senum7.value === Test.IntConst1);
-        test(Test.ShortEnum.senum8.value === Test.IntConst1 + 1);
-        test(Test.ShortEnum.senum9.value === Test.LongConst1.low);
-        test(Test.ShortEnum.senum10.value === Test.LongConst1.low + 1);
-        test(Test.ShortEnum.senum11.value === Test.ShortConst2);
-
-        test(Test.ShortEnum.valueOf(3) === Test.ShortEnum.senum1);
-        test(Test.ShortEnum.valueOf(4) === Test.ShortEnum.senum2);
-        test(Test.ShortEnum.valueOf(Test.ByteConst1) === Test.ShortEnum.senum3);
-        test(Test.ShortEnum.valueOf(Test.ByteConst1 + 1) === Test.ShortEnum.senum4);
-        test(Test.ShortEnum.valueOf(Test.ShortConst1) === Test.ShortEnum.senum5);
-        test(Test.ShortEnum.valueOf(Test.ShortConst1 + 1) === Test.ShortEnum.senum6);
-        test(Test.ShortEnum.valueOf(Test.IntConst1) === Test.ShortEnum.senum7);
-        test(Test.ShortEnum.valueOf(Test.IntConst1 + 1) === Test.ShortEnum.senum8);
-        test(Test.ShortEnum.valueOf(Test.LongConst1.low) === Test.ShortEnum.senum9);
-        test(Test.ShortEnum.valueOf(Test.LongConst1.low + 1) === Test.ShortEnum.senum10);
-        test(Test.ShortEnum.valueOf(Test.ShortConst2) === Test.ShortEnum.senum11);
-
-        test(Test.IntEnum.ienum1.value === 0);
-        test(Test.IntEnum.ienum2.value === 1);
-        test(Test.IntEnum.ienum3.value === Test.ByteConst1);
-        test(Test.IntEnum.ienum4.value === Test.ByteConst1 + 1);
-        test(Test.IntEnum.ienum5.value === Test.ShortConst1);
-        test(Test.IntEnum.ienum6.value === Test.ShortConst1 + 1);
-        test(Test.IntEnum.ienum7.value === Test.IntConst1);
-        test(Test.IntEnum.ienum8.value === Test.IntConst1 + 1);
-        test(Test.IntEnum.ienum9.value === Test.LongConst1.low);
-        test(Test.IntEnum.ienum10.value === Test.LongConst1.low + 1);
-        test(Test.IntEnum.ienum11.value === Test.IntConst2);
-        test(Test.IntEnum.ienum12.value === Test.LongConst2.low);
-
-        test(Test.IntEnum.valueOf(0) === Test.IntEnum.ienum1);
-        test(Test.IntEnum.valueOf(1) === Test.IntEnum.ienum2);
-        test(Test.IntEnum.valueOf(Test.ByteConst1) === Test.IntEnum.ienum3);
-        test(Test.IntEnum.valueOf(Test.ByteConst1 + 1) === Test.IntEnum.ienum4);
-        test(Test.IntEnum.valueOf(Test.ShortConst1) === Test.IntEnum.ienum5);
-        test(Test.IntEnum.valueOf(Test.ShortConst1 + 1) === Test.IntEnum.ienum6);
-        test(Test.IntEnum.valueOf(Test.IntConst1) === Test.IntEnum.ienum7);
-        test(Test.IntEnum.valueOf(Test.IntConst1 + 1) === Test.IntEnum.ienum8);
-        test(Test.IntEnum.valueOf(Test.LongConst1.low) === Test.IntEnum.ienum9);
-        test(Test.IntEnum.valueOf(Test.LongConst1.low + 1) === Test.IntEnum.ienum10);
-        test(Test.IntEnum.valueOf(Test.IntConst2) === Test.IntEnum.ienum11);
-        test(Test.IntEnum.valueOf(Test.LongConst2.low) === Test.IntEnum.ienum12);
-
-        test(Test.SimpleEnum.red.value === 0);
-        test(Test.SimpleEnum.green.value === 1);
-        test(Test.SimpleEnum.blue.value === 2);
-
-        test(Test.SimpleEnum.valueOf(0) === Test.SimpleEnum.red);
-        test(Test.SimpleEnum.valueOf(1) === Test.SimpleEnum.green);
-        test(Test.SimpleEnum.valueOf(2) === Test.SimpleEnum.blue);
+            out.write("testing stringToProxy... ");
+            const ref = "test:" + this.getTestEndpoint();
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            const proxy = await Test.TestIntfPrx.checkedCast(base);
+            test(proxy !== null);
+            test(proxy.equals(base));
+            out.writeLine("ok");
+
+            out.write("testing enum values... ");
+            test(Test.ByteEnum.benum1.value === 0);
+            test(Test.ByteEnum.benum2.value === 1);
+            test(Test.ByteEnum.benum3.value === Test.ByteConst1);
+            test(Test.ByteEnum.benum4.value === Test.ByteConst1 + 1);
+            test(Test.ByteEnum.benum5.value === Test.ShortConst1);
+            test(Test.ByteEnum.benum6.value === Test.ShortConst1 + 1);
+            test(Test.ByteEnum.benum7.value === Test.IntConst1);
+            test(Test.ByteEnum.benum8.value === Test.IntConst1 + 1);
+            test(Test.ByteEnum.benum9.value === Test.LongConst1.low);
+            test(Test.ByteEnum.benum10.value === Test.LongConst1.low + 1);
+            test(Test.ByteEnum.benum11.value === Test.ByteConst2);
+
+            test(Test.ByteEnum.valueOf(0) === Test.ByteEnum.benum1);
+            test(Test.ByteEnum.valueOf(1) === Test.ByteEnum.benum2);
+            test(Test.ByteEnum.valueOf(Test.ByteConst1) === Test.ByteEnum.benum3);
+            test(Test.ByteEnum.valueOf(Test.ByteConst1 + 1) === Test.ByteEnum.benum4);
+            test(Test.ByteEnum.valueOf(Test.ShortConst1) === Test.ByteEnum.benum5);
+            test(Test.ByteEnum.valueOf(Test.ShortConst1 + 1) === Test.ByteEnum.benum6);
+            test(Test.ByteEnum.valueOf(Test.IntConst1) === Test.ByteEnum.benum7);
+            test(Test.ByteEnum.valueOf(Test.IntConst1 + 1) === Test.ByteEnum.benum8);
+            test(Test.ByteEnum.valueOf(Test.LongConst1.low) === Test.ByteEnum.benum9);
+            test(Test.ByteEnum.valueOf(Test.LongConst1.low + 1) === Test.ByteEnum.benum10);
+            test(Test.ByteEnum.valueOf(Test.ByteConst2) === Test.ByteEnum.benum11);
+
+            test(Test.ShortEnum.senum1.value === 3);
+            test(Test.ShortEnum.senum2.value === 4);
+            test(Test.ShortEnum.senum3.value === Test.ByteConst1);
+            test(Test.ShortEnum.senum4.value === Test.ByteConst1 + 1);
+            test(Test.ShortEnum.senum5.value === Test.ShortConst1);
+            test(Test.ShortEnum.senum6.value === Test.ShortConst1 + 1);
+            test(Test.ShortEnum.senum7.value === Test.IntConst1);
+            test(Test.ShortEnum.senum8.value === Test.IntConst1 + 1);
+            test(Test.ShortEnum.senum9.value === Test.LongConst1.low);
+            test(Test.ShortEnum.senum10.value === Test.LongConst1.low + 1);
+            test(Test.ShortEnum.senum11.value === Test.ShortConst2);
+
+            test(Test.ShortEnum.valueOf(3) === Test.ShortEnum.senum1);
+            test(Test.ShortEnum.valueOf(4) === Test.ShortEnum.senum2);
+            test(Test.ShortEnum.valueOf(Test.ByteConst1) === Test.ShortEnum.senum3);
+            test(Test.ShortEnum.valueOf(Test.ByteConst1 + 1) === Test.ShortEnum.senum4);
+            test(Test.ShortEnum.valueOf(Test.ShortConst1) === Test.ShortEnum.senum5);
+            test(Test.ShortEnum.valueOf(Test.ShortConst1 + 1) === Test.ShortEnum.senum6);
+            test(Test.ShortEnum.valueOf(Test.IntConst1) === Test.ShortEnum.senum7);
+            test(Test.ShortEnum.valueOf(Test.IntConst1 + 1) === Test.ShortEnum.senum8);
+            test(Test.ShortEnum.valueOf(Test.LongConst1.low) === Test.ShortEnum.senum9);
+            test(Test.ShortEnum.valueOf(Test.LongConst1.low + 1) === Test.ShortEnum.senum10);
+            test(Test.ShortEnum.valueOf(Test.ShortConst2) === Test.ShortEnum.senum11);
+
+            test(Test.IntEnum.ienum1.value === 0);
+            test(Test.IntEnum.ienum2.value === 1);
+            test(Test.IntEnum.ienum3.value === Test.ByteConst1);
+            test(Test.IntEnum.ienum4.value === Test.ByteConst1 + 1);
+            test(Test.IntEnum.ienum5.value === Test.ShortConst1);
+            test(Test.IntEnum.ienum6.value === Test.ShortConst1 + 1);
+            test(Test.IntEnum.ienum7.value === Test.IntConst1);
+            test(Test.IntEnum.ienum8.value === Test.IntConst1 + 1);
+            test(Test.IntEnum.ienum9.value === Test.LongConst1.low);
+            test(Test.IntEnum.ienum10.value === Test.LongConst1.low + 1);
+            test(Test.IntEnum.ienum11.value === Test.IntConst2);
+            test(Test.IntEnum.ienum12.value === Test.LongConst2.low);
+
+            test(Test.IntEnum.valueOf(0) === Test.IntEnum.ienum1);
+            test(Test.IntEnum.valueOf(1) === Test.IntEnum.ienum2);
+            test(Test.IntEnum.valueOf(Test.ByteConst1) === Test.IntEnum.ienum3);
+            test(Test.IntEnum.valueOf(Test.ByteConst1 + 1) === Test.IntEnum.ienum4);
+            test(Test.IntEnum.valueOf(Test.ShortConst1) === Test.IntEnum.ienum5);
+            test(Test.IntEnum.valueOf(Test.ShortConst1 + 1) === Test.IntEnum.ienum6);
+            test(Test.IntEnum.valueOf(Test.IntConst1) === Test.IntEnum.ienum7);
+            test(Test.IntEnum.valueOf(Test.IntConst1 + 1) === Test.IntEnum.ienum8);
+            test(Test.IntEnum.valueOf(Test.LongConst1.low) === Test.IntEnum.ienum9);
+            test(Test.IntEnum.valueOf(Test.LongConst1.low + 1) === Test.IntEnum.ienum10);
+            test(Test.IntEnum.valueOf(Test.IntConst2) === Test.IntEnum.ienum11);
+            test(Test.IntEnum.valueOf(Test.LongConst2.low) === Test.IntEnum.ienum12);
+
+            test(Test.SimpleEnum.red.value === 0);
+            test(Test.SimpleEnum.green.value === 1);
+            test(Test.SimpleEnum.blue.value === 2);
+
+            test(Test.SimpleEnum.valueOf(0) === Test.SimpleEnum.red);
+            test(Test.SimpleEnum.valueOf(1) === Test.SimpleEnum.green);
+            test(Test.SimpleEnum.valueOf(2) === Test.SimpleEnum.blue);
 
-        out.writeLine("ok");
+            out.writeLine("ok");
 
-        out.write("testing enum operations... ");
-        {
-            const [ret, b1] = await proxy.opByte(Test.ByteEnum.benum1);
-            test(ret === b1);
-            test(ret === Test.ByteEnum.benum1);
-        }
+            out.write("testing enum operations... ");
+            {
+                const [ret, b1] = await proxy.opByte(Test.ByteEnum.benum1);
+                test(ret === b1);
+                test(ret === Test.ByteEnum.benum1);
+            }
 
-        {
-            const [ret, b11] = await proxy.opByte(Test.ByteEnum.benum11);
-            test(ret === b11);
-            test(ret === Test.ByteEnum.benum11);
-        }
+            {
+                const [ret, b11] = await proxy.opByte(Test.ByteEnum.benum11);
+                test(ret === b11);
+                test(ret === Test.ByteEnum.benum11);
+            }
 
-        {
-            const [ret, s1] = await proxy.opShort(Test.ShortEnum.senum1);
-            test(ret === s1);
-            test(ret === Test.ShortEnum.senum1);
-        }
+            {
+                const [ret, s1] = await proxy.opShort(Test.ShortEnum.senum1);
+                test(ret === s1);
+                test(ret === Test.ShortEnum.senum1);
+            }
 
-        {
-            const [ret, s11] = await proxy.opShort(Test.ShortEnum.senum11);
-            test(ret === s11);
-            test(ret === Test.ShortEnum.senum11);
-        }
+            {
+                const [ret, s11] = await proxy.opShort(Test.ShortEnum.senum11);
+                test(ret === s11);
+                test(ret === Test.ShortEnum.senum11);
+            }
 
-        {
-            const [ret, i1] = await proxy.opInt(Test.IntEnum.ienum1);
-            test(ret === i1);
-            test(ret === Test.IntEnum.ienum1);
-        }
+            {
+                const [ret, i1] = await proxy.opInt(Test.IntEnum.ienum1);
+                test(ret === i1);
+                test(ret === Test.IntEnum.ienum1);
+            }
 
-        {
-            const [ret, i11] = await proxy.opInt(Test.IntEnum.ienum11);
-            test(ret === i11);
-            test(ret === Test.IntEnum.ienum11);
-        }
+            {
+                const [ret, i11] = await proxy.opInt(Test.IntEnum.ienum11);
+                test(ret === i11);
+                test(ret === Test.IntEnum.ienum11);
+            }
 
-        {
-            const [ret, i12] = await proxy.opInt(Test.IntEnum.ienum12);
-            test(ret === i12);
-            test(ret === Test.IntEnum.ienum12);
-        }
+            {
+                const [ret, i12] = await proxy.opInt(Test.IntEnum.ienum12);
+                test(ret === i12);
+                test(ret === Test.IntEnum.ienum12);
+            }
 
-        {
-            const [ret, g] = await proxy.opSimple(Test.SimpleEnum.green);
-            test(ret === g);
-            test(ret === Test.SimpleEnum.green);
+            {
+                const [ret, g] = await proxy.opSimple(Test.SimpleEnum.green);
+                test(ret === g);
+                test(ret === Test.SimpleEnum.green);
+            }
+            out.writeLine("ok");
+            await proxy.shutdown();
         }
-        out.writeLine("ok");
-        await proxy.shutdown();
-    }
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
-        }
-        finally
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
+            {
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/enums/Test.ice zeroc-ice-3.7.2/js/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/exceptions/AMDThrowerI.js zeroc-ice-3.7.2/js/test/Ice/exceptions/AMDThrowerI.js
--- zeroc-ice-3.7.1/js/test/Ice/exceptions/AMDThrowerI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/exceptions/AMDThrowerI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
-
-    function test(value)
-    {
-        if(!value)
-        {
-            throw new Error("test failed");
-        }
-    }
+    const test = require("TestHelper").TestHelper.test;
 
     class AMDThrowerI extends Test.Thrower
     {
-        async shutdown(current)
+        shutdown(current)
         {
             current.adapter.getCommunicator().shutdown();
         }
 
-        async supportsUndeclaredExceptions(current)
+        supportsUndeclaredExceptions(current)
         {
             return true;
         }
 
-        async supportsAssertException(current)
+        supportsAssertException(current)
         {
             return false;
         }
 
-        async throwAasA(a, current)
+        throwAasA(a, current)
         {
             throw new Test.A(a);
         }
 
-        async throwAorDasAorD(a, current)
+        throwAorDasAorD(a, current)
         {
             if(a > 0)
             {
@@ -59,7 +47,7 @@
             return this.throwBasB(a, b, current);
         }
 
-        async throwBasB(a, b, current)
+        throwBasB(a, b, current)
         {
             throw new Test.B(a, b);
         }
@@ -74,64 +62,63 @@
             return this.throwCasC(a, b, c, current);
         }
 
-        async throwCasC(a, b, c, current)
+        throwCasC(a, b, c, current)
         {
             throw new Test.C(a, b, c);
         }
 
-        async throwUndeclaredA(a, current)
+        throwUndeclaredA(a, current)
         {
             throw new Test.A(a);
         }
 
-        async throwUndeclaredB(a, b, current)
+        throwUndeclaredB(a, b, current)
         {
             throw new Test.B(a, b);
         }
 
-        async throwUndeclaredC(a, b, c, current)
+        throwUndeclaredC(a, b, c, current)
         {
             throw new Test.C(a, b, c);
         }
 
-        async throwLocalException(current)
+        throwLocalException(current)
         {
             throw new Ice.TimeoutException();
         }
 
-        async throwLocalExceptionIdempotent(current)
+        throwLocalExceptionIdempotent(current)
         {
             throw new Ice.TimeoutException();
         }
 
-        async throwNonIceException(current)
+        throwNonIceException(current)
         {
             throw new Error();
         }
 
-        async throwAssertException(current)
+        throwAssertException(current)
         {
             test(false);
         }
 
-        async throwMemoryLimitException(seq, current)
+        throwMemoryLimitException(seq, current)
         {
             return new Uint8Array(1024 * 20); // 20KB is over the configured 10KB message size max.
         }
 
-        async throwAfterResponse(current)
+        throwAfterResponse(current)
         {
-            //throw new Error();
         }
 
-        async throwAfterException(current)
+        throwAfterException(current)
         {
             throw new Test.A();
-            //throw new Error();
         }
     }
     exports.AMDThrowerI = AMDThrowerI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/exceptions/Client.js zeroc-ice-3.7.2/js/test/Ice/exceptions/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/exceptions/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/exceptions/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,505 +1,494 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator, Test)
+    class Client extends TestHelper
     {
-        class EmptyI extends Test.Empty
+        async allTests(Test)
         {
-        }
+            class EmptyI extends Test.Empty
+            {
+            }
 
-        class ServantLocatorI
-        {
-            locate(curr, cookie)
+            class ServantLocatorI
             {
-                return null;
+                locate(curr, cookie)
+                {
+                    return null;
+                }
+
+                finished(curr, servant, cookie)
+                {
+                }
+
+                deactivate(category)
+                {
+                }
             }
 
-            finished(curr, servant, cookie)
+            const out = this.getWriter();
+            const communicator = this.communicator();
+            out.write("testing object adapter registration exceptions... ");
+            try
+            {
+                await communicator.createObjectAdapter("TestAdapter0");
+                test(false);
+            }
+            catch(ex)
             {
+                test(ex instanceof Ice.InitializationException, ex); // Expected
             }
 
-            deactivate(category)
+            try
             {
+                await communicator.createObjectAdapterWithEndpoints("TestAdapter0", "default");
+                test(false);
             }
-        }
+            catch(ex)
+            {
+                test(ex instanceof Ice.FeatureNotSupportedException, ex); // Expected
+            }
+            out.writeLine("ok");
 
-        function test(value, ex)
-        {
-            if(!value)
+            out.write("testing servant registration exceptions... ");
             {
-                let message = "test failed";
-                if(ex)
+                const adapter = await communicator.createObjectAdapter("");
+                adapter.add(new EmptyI(), Ice.stringToIdentity("x"));
+                try
                 {
-                    message += "\n" + ex.toString();
+                    adapter.add(new EmptyI(), Ice.stringToIdentity("x"));
+                    test(false);
                 }
-                throw new Error(message);
+                catch(ex)
+                {
+                    test(ex instanceof Ice.AlreadyRegisteredException, ex);
+                }
+
+                try
+                {
+                    adapter.add(new EmptyI(), Ice.stringToIdentity(""));
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.IllegalIdentityException, ex);
+                    test(ex.id.name === "");
+                }
+
+                try
+                {
+                    adapter.add(null, Ice.stringToIdentity("x"));
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.IllegalServantException, ex);
+                }
+
+                adapter.remove(Ice.stringToIdentity("x"));
+                try
+                {
+                    adapter.remove(Ice.stringToIdentity("x"));
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.NotRegisteredException, ex);
+                }
+                await adapter.deactivate();
             }
-        }
+            out.writeLine("ok");
 
-        out.write("testing object adapter registration exceptions... ");
-        try
-        {
-            await communicator.createObjectAdapter("TestAdapter0");
-            test(false)
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.InitializationException, ex); // Expected
-        }
+            out.write("testing servant locator registration exceptions... ");
+            {
+                const adapter = await communicator.createObjectAdapter("");
+                adapter.addServantLocator(new ServantLocatorI(), "x");
+                try
+                {
+                    adapter.addServantLocator(new ServantLocatorI(), "x");
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.AlreadyRegisteredException, ex);
+                }
+                await adapter.deactivate();
+                out.writeLine("ok");
 
-        try
-        {
-            await communicator.createObjectAdapterWithEndpoints("TestAdapter0", "default");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.FeatureNotSupportedException, ex); // Expected
-        }
-        out.writeLine("ok");
+                out.write("testing value factory registration exception... ");
+                communicator.getValueFactoryManager().add(() => null, "::x");
+                try
+                {
+                    communicator.getValueFactoryManager().add(() => null, "::x");
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.AlreadyRegisteredException, ex);
+                }
+            }
+            out.writeLine("ok");
 
-        out.write("testing servant registration exceptions... ");
-        {
-            let adapter = await communicator.createObjectAdapter("");
-            adapter.add(new EmptyI(), Ice.stringToIdentity("x"));
+            out.write("testing stringToProxy... ");
+            const ref = "thrower:" + this.getTestEndpoint();
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            const thrower = await Test.ThrowerPrx.checkedCast(base);
+            test(thrower !== null);
+            test(thrower.equals(base));
+            out.writeLine("ok");
+
+            out.write("catching exact types... ");
             try
             {
-                adapter.add(new EmptyI(), Ice.stringToIdentity("x"));
+                await thrower.throwAasA(1);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.AlreadyRegisteredException, ex);
+                test(ex instanceof Test.A, ex);
+                test(ex.aMem === 1);
             }
 
             try
             {
-                adapter.add(new EmptyI(), Ice.stringToIdentity(""));
+                await thrower.throwAorDasAorD(1);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.IllegalIdentityException, ex);
-                test(ex.id.name === "");
+                test(ex instanceof Test.A, ex);
+                test(ex.aMem === 1);
             }
 
             try
             {
-                adapter.add(null, Ice.stringToIdentity("x"));
+                await thrower.throwAorDasAorD(-1);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.IllegalServantException, ex);
+                test(ex instanceof Test.D, ex);
+                test(ex.dMem === -1);
             }
 
-            adapter.remove(Ice.stringToIdentity("x"));
             try
             {
-                adapter.remove(Ice.stringToIdentity("x"));
+                await thrower.throwBasB(1, 2);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.NotRegisteredException, ex);
+                test(ex instanceof Test.B, ex);
+                test(ex.aMem == 1);
+                test(ex.bMem == 2);
             }
-            await adapter.deactivate();
-        }
-        out.writeLine("ok");
 
-        out.write("testing servant locator registration exceptions... ");
-        {
-            let adapter = await communicator.createObjectAdapter("");
-            adapter.addServantLocator(new ServantLocatorI(), "x");
             try
             {
-                adapter.addServantLocator(new ServantLocatorI(), "x");
+                await thrower.throwCasC(1, 2, 3);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.AlreadyRegisteredException, ex);
+                test(ex instanceof Test.C, ex);
+                test(ex.aMem == 1);
+                test(ex.bMem == 2);
+                test(ex.cMem == 3);
             }
-            await adapter.deactivate();
             out.writeLine("ok");
 
-            out.write("testing value factory registration exception... ");
-            communicator.getValueFactoryManager().add(() => null, "::x");
+            out.write("catching base types... ");
             try
             {
-                communicator.getValueFactoryManager().add(() => null, "::x");
+                await thrower.throwBasB(1, 2);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.AlreadyRegisteredException, ex);
+                test(ex instanceof Test.A, ex);
+                test(ex.aMem == 1);
             }
-        }
-        out.writeLine("ok");
-
-        out.write("testing stringToProxy... ");
-        let ref = "thrower:default -p 12010";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let thrower = await Test.ThrowerPrx.checkedCast(base);
-        test(thrower !== null);
-        test(thrower.equals(base));
-        out.writeLine("ok");
 
-        out.write("catching exact types... ");
-        try
-        {
-            await thrower.throwAasA(1);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.A, ex);
-            test(ex.aMem === 1);
-        }
-
-        try
-        {
-            await thrower.throwAorDasAorD(1);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.A, ex);
-            test(ex.aMem === 1);
-        }
-
-        try
-        {
-            await thrower.throwAorDasAorD(-1);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.D, ex);
-            test(ex.dMem === -1);
-        }
-
-        try
-        {
-            await thrower.throwBasB(1, 2);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.B, ex);
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-        }
-
-        try
-        {
-            await thrower.throwCasC(1, 2, 3);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.C, ex);
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-            test(ex.cMem == 3);
-        }
-        out.writeLine("ok");
-
-        out.write("catching base types... ");
-        try
-        {
-            await thrower.throwBasB(1, 2);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.A, ex);
-            test(ex.aMem == 1);
-        }
-
-        try
-        {
-            await thrower.throwCasC(1, 2, 3);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.B, ex);
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-        }
-        out.writeLine("ok");
-
-        out.write("catching derived types... ");
-        try
-        {
-            await thrower.throwBasA(1, 2);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.B, ex);
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-        }
-
-        try
-        {
-            await thrower.throwCasA(1, 2, 3);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.C, ex);
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-            test(ex.cMem == 3);
-        }
-
-        try
-        {
-            await thrower.throwCasB(1, 2, 3);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.C, ex);
-            test(ex.aMem == 1);
-            test(ex.bMem == 2);
-            test(ex.cMem == 3);
-        }
-        out.writeLine("ok");
-
-        if(await thrower.supportsUndeclaredExceptions())
-        {
-            out.write("catching unknown user exception... ");
             try
             {
-                await thrower.throwUndeclaredA(1);
+                await thrower.throwCasC(1, 2, 3);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.UnknownUserException, ex);
+                test(ex instanceof Test.B, ex);
+                test(ex.aMem == 1);
+                test(ex.bMem == 2);
             }
+            out.writeLine("ok");
 
+            out.write("catching derived types... ");
             try
             {
-                await thrower.throwUndeclaredB(1, 2);
+                await thrower.throwBasA(1, 2);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.UnknownUserException, ex);
+                test(ex instanceof Test.B, ex);
+                test(ex.aMem == 1);
+                test(ex.bMem == 2);
             }
 
             try
             {
-                await thrower.throwUndeclaredC(1, 2, 3);
+                await thrower.throwCasA(1, 2, 3);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.UnknownUserException, ex);
+                test(ex instanceof Test.C, ex);
+                test(ex.aMem == 1);
+                test(ex.bMem == 2);
+                test(ex.cMem == 3);
             }
-            out.writeLine("ok");
-        }
 
-        if(await thrower.supportsAssertException())
-        {
-            out.write("testing assert in the server... ");
             try
             {
-                await thrower.throwAssertException();
+                await thrower.throwCasB(1, 2, 3);
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.ConnectionLostException ||
-                     ex instanceof Ice.UnknownException, ex);
+                test(ex instanceof Test.C, ex);
+                test(ex.aMem == 1);
+                test(ex.bMem == 2);
+                test(ex.cMem == 3);
             }
             out.writeLine("ok");
-        }
 
-        out.write("testing memory limit marshal exception...");
-        try
-        {
-            await thrower.throwMemoryLimitException(null);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.MemoryLimitException, ex);
-        }
+            if(await thrower.supportsUndeclaredExceptions())
+            {
+                out.write("catching unknown user exception... ");
+                try
+                {
+                    await thrower.throwUndeclaredA(1);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownUserException, ex);
+                }
 
-        try
-        {
-            await thrower.throwMemoryLimitException(new Uint8Array(20 * 1024));
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex.toString().indexOf("ConnectionLostException") > 0, ex);
-        }
-        out.writeLine("ok");
+                try
+                {
+                    await thrower.throwUndeclaredB(1, 2);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownUserException, ex);
+                }
 
-        let retries = 10;
-        while(--retries > 0)
-        {
-            // The above test can cause a close connection between the echo server and
-            // bidir server, we need to wait until the bidir server has reopen the
-            // connection with the echo server.
+                try
+                {
+                    await thrower.throwUndeclaredC(1, 2, 3);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownUserException, ex);
+                }
+                out.writeLine("ok");
+            }
 
+            if(await thrower.supportsAssertException())
+            {
+                out.write("testing assert in the server... ");
+                try
+                {
+                    await thrower.throwAssertException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.ConnectionLostException ||
+                         ex instanceof Ice.UnknownException, ex);
+                }
+                out.writeLine("ok");
+            }
+
+            out.write("testing memory limit marshal exception...");
             try
             {
-                await thrower.ice_ping();
-                break;
+                await thrower.throwMemoryLimitException(null);
+                test(false);
             }
             catch(ex)
             {
-                if(ex instanceof Ice.ObjectNotExistException && retries > 0)
+                test(ex instanceof Ice.MemoryLimitException, ex);
+            }
+
+            try
+            {
+                await thrower.throwMemoryLimitException(new Uint8Array(20 * 1024));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex.toString().indexOf("ConnectionLostException") > 0, ex);
+            }
+            out.writeLine("ok");
+
+            let retries = 30;
+            while(--retries > 0)
+            {
+                // The above test can cause a close connection between the echo server and
+                // bidir server, we need to wait until the bidir server has reopen the
+                // connection with the echo server.
+
+                try
                 {
-                    await Ice.Promise.delay(20);
+                    await thrower.ice_ping();
+                    break;
                 }
-                else
+                catch(ex)
                 {
-                    throw ex;
+                    if(ex instanceof Ice.ObjectNotExistException && retries > 0)
+                    {
+                        await Ice.Promise.delay(20);
+                    }
+                    else
+                    {
+                        throw ex;
+                    }
                 }
             }
-        }
 
-        out.write("catching object not exist exception... ");
-        try
-        {
-            let thrower2 = Test.ThrowerPrx.uncheckedCast(
-                thrower.ice_identity(Ice.stringToIdentity("does not exist")));
-            await thrower2.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ObjectNotExistException, ex);
-            test(ex.id.equals(Ice.stringToIdentity("does not exist")));
-        }
-        out.writeLine("ok");
-
-        out.write("catching facet not exist exception... ");
-        try
-        {
-            let thrower2 = Test.ThrowerPrx.uncheckedCast(thrower, "no such facet");
-            await thrower2.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.FacetNotExistException, ex);
-            test(ex.facet == "no such facet");
-        }
-        out.writeLine("ok");
+            out.write("catching object not exist exception... ");
+            try
+            {
+                const thrower2 = Test.ThrowerPrx.uncheckedCast(
+                    thrower.ice_identity(Ice.stringToIdentity("does not exist")));
+                await thrower2.ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ObjectNotExistException, ex);
+                test(ex.id.equals(Ice.stringToIdentity("does not exist")));
+            }
+            out.writeLine("ok");
 
-        out.write("catching operation not exist exception... ");
-        try
-        {
-            let thrower2 = Test.WrongOperationPrx.uncheckedCast(thrower);
-            await thrower2.noSuchOperation();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.OperationNotExistException, ex);
-            test(ex.operation == "noSuchOperation");
-        }
-        out.writeLine("ok");
+            out.write("catching facet not exist exception... ");
+            try
+            {
+                const thrower2 = Test.ThrowerPrx.uncheckedCast(thrower, "no such facet");
+                await thrower2.ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.FacetNotExistException, ex);
+                test(ex.facet == "no such facet");
+            }
+            out.writeLine("ok");
 
-        out.write("catching unknown local exception... ");
-        try
-        {
-            await thrower.throwLocalException();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.UnknownLocalException, ex);
-        }
+            out.write("catching operation not exist exception... ");
+            try
+            {
+                const thrower2 = Test.WrongOperationPrx.uncheckedCast(thrower);
+                await thrower2.noSuchOperation();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.OperationNotExistException, ex);
+                test(ex.operation == "noSuchOperation");
+            }
+            out.writeLine("ok");
 
-        try
-        {
-            await thrower.throwLocalExceptionIdempotent();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.UnknownLocalException ||
-                 ex instanceof Ice.OperationNotExistException, ex);
-        }
-        out.writeLine("ok");
+            out.write("catching unknown local exception... ");
+            try
+            {
+                await thrower.throwLocalException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownLocalException, ex);
+            }
 
-        out.write("catching unknown non-Ice exception... ");
-        try
-        {
-            await thrower.throwNonIceException();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.UnknownException, ex);
-        }
-        out.writeLine("ok");
+            try
+            {
+                await thrower.throwLocalExceptionIdempotent();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownLocalException ||
+                     ex instanceof Ice.OperationNotExistException, ex);
+            }
+            out.writeLine("ok");
 
-        out.write("testing asynchronous exceptions... ");
-        await thrower.throwAfterResponse();
-        try
-        {
-            await thrower.throwAfterException();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.A, ex);
-        }
-        out.writeLine("ok");
+            out.write("catching unknown non-Ice exception... ");
+            try
+            {
+                await thrower.throwNonIceException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownException, ex);
+            }
+            out.writeLine("ok");
 
-        await thrower.shutdown();
-    }
+            out.write("testing asynchronous exceptions... ");
+            await thrower.throwAfterResponse();
+            try
+            {
+                await thrower.throwAfterException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.A, ex);
+            }
+            out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator
-        try
-        {
-            initData.properties.setProperty("Ice.MessageSizeMax", "10");
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            initData.properties.setProperty("Ice.PrintStackTraces", "1");
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator, Test);
+            await thrower.shutdown();
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
+            {
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.MessageSizeMax", "10");
+                properties.setProperty("Ice.Warn.Connections", "0");
+                properties.setProperty("Ice.PrintStackTraces", "1");
+                [communicator] = this.initialize(properties);
+                await this.allTests(Test);
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/exceptions/ServerAMD.js zeroc-ice-3.7.2/js/test/Ice/exceptions/ServerAMD.js
--- zeroc-ice-3.7.1/js/test/Ice/exceptions/ServerAMD.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/exceptions/ServerAMD.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,58 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const AMDThrowerI = require("AMDThrowerI").AMDThrowerI;
 
-    async function run(out, initData, ready)
+    class ServerAMD extends TestHelper
     {
-        initData.properties.setProperty("Ice.MessageSizeMax", "10");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.MessageSizeMax", "10");
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+                properties.setProperty("Ice.Warn.Connections", "0");
+                [communicator] = this.initialize(properties);
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.add(new AMDThrowerI(), Ice.stringToIdentity("thrower"));
                 await echo.setConnection();
-                let connection = echo.ice_getCachedConnection();
+                const connection = echo.ice_getCachedConnection();
                 connection.setCloseCallback(con => {
                     // Re-establish connection if it fails (necessary for MemoryLimitException test)
                     echo.setConnection().then(() => echo.ice_getCachedConnection().setAdapter(adapter));
                 });
                 connection.setAdapter(adapter);
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-    exports._serveramd = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.ServerAMD = ServerAMD;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/exceptions/Server.js zeroc-ice-3.7.2/js/test/Ice/exceptions/Server.js
--- zeroc-ice-3.7.1/js/test/Ice/exceptions/Server.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/exceptions/Server.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,65 +1,58 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const ThrowerI = require("ThrowerI").ThrowerI;
 
-    async function run(out, initData, ready)
+    class Server extends TestHelper
     {
-        initData.properties.setProperty("Ice.MessageSizeMax", "10");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.MessageSizeMax", "10");
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+                properties.setProperty("Ice.Warn.Connections", "0");
+                [communicator] = this.initialize(properties);
+
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.add(new ThrowerI(), Ice.stringToIdentity("thrower"));
                 await echo.setConnection();
-                let connection = echo.ice_getCachedConnection();
+                const connection = echo.ice_getCachedConnection();
                 connection.setCloseCallback(con => {
                     // Re-establish connection if it fails (necessary for MemoryLimitException test)
                     echo.setConnection().then(() => echo.ice_getCachedConnection().setAdapter(adapter));
                 });
                 connection.setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-    exports._server = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Server = Server;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/js/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/exceptions/ThrowerI.js zeroc-ice-3.7.2/js/test/Ice/exceptions/ThrowerI.js
--- zeroc-ice-3.7.1/js/test/Ice/exceptions/ThrowerI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/exceptions/ThrowerI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
-
-    function test(value)
-    {
-        if(!value)
-        {
-            throw new Error("test failed");
-        }
-    }
+    const test = require("TestHelper").TestHelper.test;
 
     class ThrowerI extends Test.Thrower
     {
@@ -135,7 +123,8 @@
         }
     }
     exports.ThrowerI = ThrowerI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/facets/Client.js zeroc-ice-3.7.2/js/test/Ice/facets/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/facets/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/facets/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,132 +1,127 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
+    const TestHelper = require("TestHelper").TestHelper;
     const Test = require("Test").Test;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value)
+        async allTests()
         {
-            if(!value)
-            {
-                throw new Error("test failed");
-            }
-        }
-
-        out.write("testing stringToProxy... ");
-        let ref = "d:default -p 12010";
-        let db = communicator.stringToProxy(ref);
-        test(db !== null);
-        out.writeLine("ok");
-
-        out.write("testing unchecked cast... ");
-        let prx = Ice.ObjectPrx.uncheckedCast(db);
-        test(prx.ice_getFacet().length === 0);
-        prx = Ice.ObjectPrx.uncheckedCast(db, "facetABCD");
-        test(prx.ice_getFacet() == "facetABCD");
-        let prx2 = Ice.ObjectPrx.uncheckedCast(prx);
-        test(prx2.ice_getFacet() == "facetABCD");
-        let prx3 = Ice.ObjectPrx.uncheckedCast(prx, "");
-        test(prx3.ice_getFacet().length === 0);
-        let d = Test.DPrx.uncheckedCast(db);
-        test(d.ice_getFacet().length === 0);
-        let df = Test.DPrx.uncheckedCast(db, "facetABCD");
-        test(df.ice_getFacet() == "facetABCD");
-        let df2 = Test.DPrx.uncheckedCast(df);
-        test(df2.ice_getFacet() == "facetABCD");
-        let df3 = Test.DPrx.uncheckedCast(df, "");
-        test(df3.ice_getFacet().length === 0);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        prx = await Ice.ObjectPrx.checkedCast(db);
-        test(prx.ice_getFacet().length === 0);
-        prx = await Ice.ObjectPrx.checkedCast(db, "facetABCD");
-        test(prx.ice_getFacet() == "facetABCD");
-        prx2 = await Ice.ObjectPrx.checkedCast(prx);
-        test(prx2.ice_getFacet() == "facetABCD");
-        prx3 = await Ice.ObjectPrx.checkedCast(prx, "");
-        test(prx3.ice_getFacet().length === 0);
-        d = await Test.DPrx.checkedCast(db);
-        test(d.ice_getFacet().length === 0);
-        df = await Test.DPrx.checkedCast(db, "facetABCD");
-        test(df.ice_getFacet() == "facetABCD");
-        df2 = await Test.DPrx.checkedCast(df);
-        test(df2.ice_getFacet() == "facetABCD");
-        def3 = await Test.DPrx.checkedCast(df, "");
-        test(df3.ice_getFacet().length === 0);
-        out.writeLine("ok");
-
-        out.write("testing non-facets A, B, C, and D... ");
-        d = await Test.DPrx.checkedCast(db);
-        test(d !== null);
-        test(d.equals(db));
-        test(await d.callA() == "A");
-        test(await d.callB() == "B");
-        test(await d.callC() == "C");
-        test(await d.callD() == "D");
-        out.writeLine("ok");
-
-        out.write("testing facets A, B, C, and D... ");
-        df = await Test.DPrx.checkedCast(d, "facetABCD");
-        test(df !== null);
-        test(await df.callA() == "A");
-        test(await df.callB() == "B");
-        test(await df.callC() == "C");
-        test(await df.callD() == "D");
-        out.writeLine("ok");
-
-        out.write("testing facets E and F... ");
-        let ff = await Test.FPrx.checkedCast(d, "facetEF");
-        test(await ff.callE() == "E");
-        test(await ff.callF() == "F");
-        out.writeLine("ok");
-
-        out.write("testing facet G... ");
-        let gf = await Test.GPrx.checkedCast(ff, "facetGH");
-        test(gf !== null);
-        test(await gf.callG() == "G");
-        out.writeLine("ok");
-
-        out.write("testing whether casting preserves the facet... ");
-        let hf = await Test.HPrx.checkedCast(gf);
-        test(hf !== null);
-        test(await hf.callG() == "G");
-        test(await hf.callH() == "H");
-        out.writeLine("ok");
+            const communicator = this.communicator();
+            const out = this.getWriter();
 
-        await gf.shutdown();
-    }
+            out.write("testing stringToProxy... ");
+            const ref = "d:" + this.getTestEndpoint();
+            const db = communicator.stringToProxy(ref);
+            test(db !== null);
+            out.writeLine("ok");
+
+            out.write("testing unchecked cast... ");
+            let prx = Ice.ObjectPrx.uncheckedCast(db);
+            test(prx.ice_getFacet().length === 0);
+            prx = Ice.ObjectPrx.uncheckedCast(db, "facetABCD");
+            test(prx.ice_getFacet() == "facetABCD");
+            let prx2 = Ice.ObjectPrx.uncheckedCast(prx);
+            test(prx2.ice_getFacet() == "facetABCD");
+            let prx3 = Ice.ObjectPrx.uncheckedCast(prx, "");
+            test(prx3.ice_getFacet().length === 0);
+            let d = Test.DPrx.uncheckedCast(db);
+            test(d.ice_getFacet().length === 0);
+            let df = Test.DPrx.uncheckedCast(db, "facetABCD");
+            test(df.ice_getFacet() == "facetABCD");
+            let df2 = Test.DPrx.uncheckedCast(df);
+            test(df2.ice_getFacet() == "facetABCD");
+            let df3 = Test.DPrx.uncheckedCast(df, "");
+            test(df3.ice_getFacet().length === 0);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            prx = await Ice.ObjectPrx.checkedCast(db);
+            test(prx.ice_getFacet().length === 0);
+            prx = await Ice.ObjectPrx.checkedCast(db, "facetABCD");
+            test(prx.ice_getFacet() == "facetABCD");
+            prx2 = await Ice.ObjectPrx.checkedCast(prx);
+            test(prx2.ice_getFacet() == "facetABCD");
+            prx3 = await Ice.ObjectPrx.checkedCast(prx, "");
+            test(prx3.ice_getFacet().length === 0);
+            d = await Test.DPrx.checkedCast(db);
+            test(d.ice_getFacet().length === 0);
+            df = await Test.DPrx.checkedCast(db, "facetABCD");
+            test(df.ice_getFacet() == "facetABCD");
+            df2 = await Test.DPrx.checkedCast(df);
+            test(df2.ice_getFacet() == "facetABCD");
+            df3 = await Test.DPrx.checkedCast(df, "");
+            test(df3.ice_getFacet().length === 0);
+            out.writeLine("ok");
+
+            out.write("testing non-facets A, B, C, and D... ");
+            d = await Test.DPrx.checkedCast(db);
+            test(d !== null);
+            test(d.equals(db));
+            test(await d.callA() == "A");
+            test(await d.callB() == "B");
+            test(await d.callC() == "C");
+            test(await d.callD() == "D");
+            out.writeLine("ok");
+
+            out.write("testing facets A, B, C, and D... ");
+            df = await Test.DPrx.checkedCast(d, "facetABCD");
+            test(df !== null);
+            test(await df.callA() == "A");
+            test(await df.callB() == "B");
+            test(await df.callC() == "C");
+            test(await df.callD() == "D");
+            out.writeLine("ok");
+
+            out.write("testing facets E and F... ");
+            const ff = await Test.FPrx.checkedCast(d, "facetEF");
+            test(await ff.callE() == "E");
+            test(await ff.callF() == "F");
+            out.writeLine("ok");
+
+            out.write("testing facet G... ");
+            const gf = await Test.GPrx.checkedCast(ff, "facetGH");
+            test(gf !== null);
+            test(await gf.callG() == "G");
+            out.writeLine("ok");
+
+            out.write("testing whether casting preserves the facet... ");
+            const hf = await Test.HPrx.checkedCast(gf);
+            test(hf !== null);
+            test(await hf.callG() == "G");
+            test(await hf.callH() == "H");
+            out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
+            await gf.shutdown();
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
+            {
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/facets/Server.js zeroc-ice-3.7.2/js/test/Ice/facets/Server.js
--- zeroc-ice-3.7.1/js/test/Ice/facets/Server.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/facets/Server.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,36 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const TestI = require("TestI");
+    const test = TestHelper.test;
 
     const DI = TestI.DI;
     const FI = TestI.FI;
     const HI = TestI.HI;
     const EmptyI = TestI.EmptyI;
 
-    function test(value)
-    {
-        if(!value)
-        {
-            throw new Error("test failed");
-        }
-    }
-
-    async function run(out, initData, ready)
+    class Server extends TestHelper
     {
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
+                [communicator] = this.initialize(args);
+                const out = this.getWriter();
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
 
                 out.write("testing facet registration exceptions... ");
                 let adapter = await communicator.createObjectAdapter("");
 
-                let obj = new EmptyI();
+                const obj = new EmptyI();
                 adapter.add(obj, Ice.stringToIdentity("d"));
                 adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD");
                 try
@@ -66,11 +56,11 @@
                 out.writeLine("ok");
 
                 out.write("testing removeAllFacets... ");
-                let obj1 = new EmptyI();
-                let obj2 = new EmptyI();
+                const obj1 = new EmptyI();
+                const obj2 = new EmptyI();
                 adapter.addFacet(obj1, Ice.stringToIdentity("id1"), "f1");
                 adapter.addFacet(obj2, Ice.stringToIdentity("id1"), "f2");
-                let obj3 = new EmptyI();
+                const obj3 = new EmptyI();
                 adapter.addFacet(obj1, Ice.stringToIdentity("id2"), "f1");
                 adapter.addFacet(obj2, Ice.stringToIdentity("id2"), "f2");
                 adapter.addFacet(obj3, Ice.stringToIdentity("id2"), "");
@@ -97,41 +87,35 @@
                 await adapter.deactivate();
                 adapter = await communicator.createObjectAdapter("");
 
-                let di = new DI();
+                const di = new DI();
                 adapter.add(di, Ice.stringToIdentity("d"));
                 adapter.addFacet(di, Ice.stringToIdentity("d"), "facetABCD");
-                let fi = new FI();
+                const fi = new FI();
                 adapter.addFacet(fi, Ice.stringToIdentity("d"), "facetEF");
-                let hi = new HI();
+                const hi = new HI();
                 adapter.addFacet(hi, Ice.stringToIdentity("d"), "facetGH");
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._server = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Server = Server;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/facets/Test.ice zeroc-ice-3.7.2/js/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/facets/TestI.js zeroc-ice-3.7.2/js/test/Ice/facets/TestI.js
--- zeroc-ice-3.7.1/js/test/Ice/facets/TestI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/facets/TestI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
-    const Ice = require("ice").Ice;
     const Test = require("Test").Test;
 
     class DI extends Test.D
@@ -74,7 +68,8 @@
     exports.EmptyI = EmptyI;
     exports.FI = FI;
     exports.HI = HI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/hold/Client.js zeroc-ice-3.7.2/js/test/Ice/hold/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/hold/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/hold/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,290 +1,284 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value)
-        {
-            if(!value)
-            {
-                throw new Error("test failed");
-            }
-        }
-
-        class Condition
+        async allTests()
         {
-            constructor(value)
+            class Condition
             {
-                this.value = value;
+                constructor(value)
+                {
+                    this.value = value;
+                }
             }
-        }
 
-        class SetCB
-        {
-            constructor(condition, expected)
+            class SetCB
             {
-                this.condition = condition;
-                this.expected = expected;
-            }
+                constructor(condition, expected)
+                {
+                    this.condition = condition;
+                    this.expected = expected;
+                }
 
-            response(value)
-            {
-                if(value != this.expected)
+                response(value)
                 {
-                    this.condition.value = value;
+                    if(value != this.expected)
+                    {
+                        this.condition.value = false;
+                    }
                 }
             }
-        }
 
-        const ref = "hold:default -p 12010";
-        const hold = await Test.HoldPrx.checkedCast(communicator.stringToProxy(ref));
-        test(hold !== null);
-        const holdOneway = Test.HoldPrx.uncheckedCast(hold.ice_oneway());
-
-        const refSerialized = "hold:default -p 12011";
-        const holdSerialized = await Test.HoldPrx.checkedCast(communicator.stringToProxy(refSerialized));
-        test(holdSerialized !== null);
-        const holdSerializedOneway = Test.HoldPrx.uncheckedCast(holdSerialized.ice_oneway());
+            const communicator = this.communicator();
+            const out = this.getWriter();
 
-        out.write("changing state between active and hold rapidly... ");
+            const ref = "hold:" + this.getTestEndpoint();
+            const hold = await Test.HoldPrx.checkedCast(communicator.stringToProxy(ref));
+            test(hold !== null);
+            const holdOneway = Test.HoldPrx.uncheckedCast(hold.ice_oneway());
+
+            const refSerialized = "hold:" + this.getTestEndpoint(1);
+            const holdSerialized = await Test.HoldPrx.checkedCast(communicator.stringToProxy(refSerialized));
+            test(holdSerialized !== null);
+            const holdSerializedOneway = Test.HoldPrx.uncheckedCast(holdSerialized.ice_oneway());
 
-        for(let i = 0; i < 100; ++i)
-        {
-            await hold.putOnHold(0);
-        }
-        for(let i = 0; i < 100; ++i)
-        {
-            await holdOneway.putOnHold(0);
-        }
-        for(let i = 0; i < 100; ++i)
-        {
-            await holdSerialized.putOnHold(0);
-        }
-        for(let i = 0; i < 1; ++i)
-        {
-            await holdSerializedOneway.putOnHold(0);
-        }
-        out.writeLine("ok");
+            out.write("changing state between active and hold rapidly... ");
 
-        out.write("testing without serialize mode... ");
-        {
-            const condition = new Condition(true);
-            let value = 0;
-            let result;
-            const results = [];
-            while(condition.value)
-            {
-                const cb = new SetCB(condition, value);
-                result = hold.set(++value, value < 500 ? Math.floor((Math.random() * 5)) : 0);
-                results.push(
-                    result.then(
-                        v =>
-                            {
-                                cb.response(v);
-                            },
-                        () =>
-                            {
-                                // Ignore exception
-                            }));
+            for(let i = 0; i < 100; ++i)
+            {
+                await hold.putOnHold(0);
+            }
+            for(let i = 0; i < 100; ++i)
+            {
+                await holdOneway.putOnHold(0);
+            }
+            for(let i = 0; i < 100; ++i)
+            {
+                await holdSerialized.putOnHold(0);
+            }
+            for(let i = 0; i < 1; ++i)
+            {
+                await holdSerializedOneway.putOnHold(0);
+            }
+            out.writeLine("ok");
 
-                if(value % 100 === 0)
+            out.write("testing without serialize mode... ");
+            {
+                const condition = new Condition(true);
+                let value = 0;
+                let result;
+                const results = [];
+                while(condition.value)
                 {
-                    while(true)
+                    const cb = new SetCB(condition, value);
+                    result = hold.set(++value, value < 500 ? Math.floor((Math.random() * 5)) : 0);
+                    results.push(
+                        result.then(
+                            v =>
+                                {
+                                    cb.response(v);
+                                },
+                            () =>
+                                {
+                                    // Ignore exception
+                                }));
+
+                    if(value % 100 === 0)
                     {
-                        if(result.isSent())
+                        while(true)
                         {
-                            break;
-                        }
-                        else if(result.isCompleted())
-                        {
-                            await result; // This should throw the failure if the call wasn't sent but done.
-                            test(result.isSent());
+                            if(result.isSent())
+                            {
+                                break;
+                            }
+                            else if(result.isCompleted())
+                            {
+                                await result; // This should throw the failure if the call wasn't sent but done.
+                                test(result.isSent());
+                            }
+                            await Ice.Promise.delay(10);
                         }
-                        await Ice.Promise.delay(10);
                     }
-                }
 
-                if(value > 10000)
+                    if(value > 10000)
+                    {
+                        // Don't continue, it's possible that out-of-order dispatch doesn't occur
+                        // after 100000 iterations and we don't want the test to last for too long
+                        // when this occurs.
+                        break;
+                    }
+                }
+                test(value > 10000 || !condition.value);
+                while(true)
                 {
-                    // Don't continue, it's possible that out-of-order dispatch doesn't occur
-                    // after 100000 iterations and we don't want the test to last for too long
-                    // when this occurs.
-                    break;
+                    if(result.isSent())
+                    {
+                        break;
+                    }
+                    else if(result.isCompleted())
+                    {
+                        await result; // This should throw the failure if the call wasn't sent but done.
+                        test(result.isSent());
+                    }
+                    await Ice.Promise.delay(10);
                 }
+                await Promise.all(results);
             }
-            test(value > 10000 || !condition.value);
-            while(true)
+            out.writeLine("ok");
+
+            out.write("testing with serialize mode... ");
             {
-                if(result.isSent())
-                {
-                    break;
-                }
-                else if(result.isCompleted())
+                const condition = new Condition(true);
+                let value = 0;
+                let result;
+                const results = [];
+                while(value < 3000 && condition.value)
                 {
-                    await result; // This should throw the failure if the call wasn't sent but done.
-                    test(result.isSent());
-                }
-                await Ice.Promise.delay(10);
-            }
-            await Promise.all(results);
-        }
-        out.writeLine("ok");
+                    const cb = new SetCB(condition, value);
+                    result = holdSerialized.set(++value, 0);
+                    results.push(
+                        result.then(
+                            v =>
+                                {
+                                    cb.response(v);
+                                },
+                            () =>
+                                {
+                                    // Ignore exceptions
+                                }));
 
-        out.write("testing with serialize mode... ");
-        {
-            const condition = new Condition(true);
-            let value = 0;
-            let result;
-            const results = [];
-            while(value < 3000 && condition.value)
-            {
-                const cb = new SetCB(condition, value);
-                result = holdSerialized.set(++value, 0);
-                results.push(
-                    result.then(
-                        v =>
+                    if(value % 100 === 0)
+                    {
+                        while(true)
+                        {
+                            if(result.isSent())
                             {
-                                cb.response(v);
-                            },
-                        () =>
+                                break;
+                            }
+                            else if(result.isCompleted())
                             {
-                                // Ignore exceptions
-                            }));
+                                await result; // This should throw the failure if the call wasn't sent but done.
+                                test(result.isSent());
+                            }
+                            await Ice.Promise.delay(10);
+                        }
+                    }
+                }
+                await result;
+                test(condition.value);
 
-                if(value % 100 === 0)
+                for(let i = 0; i < 10000; ++i)
                 {
-                    while(true)
+                    await holdSerializedOneway.setOneway(value + 1, value);
+                    ++value;
+                    if((i % 100) == 0)
                     {
-                        if(result.isSent())
-                        {
-                            break;
-                        }
-                        else if(result.isCompleted())
-                        {
-                            await result; // This should throw the failure if the call wasn't sent but done.
-                            test(result.isSent());
-                        }
-                        await Ice.Promise.delay(10);
+                        await holdSerializedOneway.putOnHold(1);
                     }
                 }
+                await Promise.all(results);
             }
-            await result;
-            test(condition.value);
+            out.writeLine("ok");
 
-            for(let i = 0; i < 10000; ++i)
+            out.write("testing serialization... ");
             {
-                await holdSerializedOneway.setOneway(value + 1, value);
-                ++value;
-                if((i % 100) == 0)
-                {
-                    await holdSerializedOneway.putOnHold(1);
-                }
-            }
-            await Promise.all(results);
-        }
-        out.writeLine("ok");
+                let value = 0;
+                let result;
+                const results = [];
+                await holdSerialized.set(value, 0);
 
-        out.write("testing serialization... ");
-        {
-            let value = 0;
-            let result;
-            const results = [];
-            await holdSerialized.set(value, 0);
-
-            for(let i = 0; i < 10000; ++i)
-            {
-                // Create a new proxy for each request
-                result = holdSerialized.ice_oneway().setOneway(value + 1, value);
-                results.push(result);
-                ++value;
-                if((i % 100) === 0)
+                for(let i = 0; i < 10000; ++i)
                 {
-                    while(true)
+                    // Create a new proxy for each request
+                    result = holdSerialized.ice_oneway().setOneway(value + 1, value);
+                    results.push(result);
+                    ++value;
+                    if((i % 100) === 0)
                     {
-                        if(result.isSent())
-                        {
-                            break;
-                        }
-                        else if(result.isCompleted())
+                        while(true)
                         {
-                            await result; // This should throw the failure if the call wasn't sent but done.
-                            test(result.isSent());
+                            if(result.isSent())
+                            {
+                                break;
+                            }
+                            else if(result.isCompleted())
+                            {
+                                await result; // This should throw the failure if the call wasn't sent but done.
+                                test(result.isSent());
+                            }
+                            await Ice.Promise.delay(10);
                         }
-                        await Ice.Promise.delay(10);
+                        await holdSerialized.ice_ping(); // Ensure everything's dispatched.
+                        const conn = await holdSerialized.ice_getConnection();
+                        await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                     }
-                    await holdSerialized.ice_ping(); // Ensure everything's dispatched.
-                    const conn = await holdSerialized.ice_getConnection();
-                    await conn.close(Ice.ConnectionClose.GracefullyWithWait);
                 }
+                await Promise.all(results);
             }
-            await Promise.all(results);
-        }
-        out.writeLine("ok");
+            out.writeLine("ok");
 
-        out.write("testing waitForHold... ");
-        await hold.waitForHold();
-        await hold.waitForHold();
-        for(let i = 0; i < 1000; ++i)
-        {
-            await holdOneway.ice_ping();
-            if((i % 20) == 0)
+            out.write("testing waitForHold... ");
+            await hold.waitForHold();
+            await hold.waitForHold();
+            for(let i = 0; i < 1000; ++i)
             {
-                await hold.putOnHold(0);
+                await holdOneway.ice_ping();
+                if((i % 20) == 0)
+                {
+                    await hold.putOnHold(0);
+                }
             }
+            await hold.putOnHold(-1);
+            await hold.ice_ping();
+            await hold.putOnHold(-1);
+            await hold.ice_ping();
+            out.writeLine("ok");
+
+            out.write("changing state to hold and shutting down server... ");
+            await hold.shutdown();
+            out.writeLine("ok");
         }
-        await hold.putOnHold(-1);
-        await hold.ice_ping();
-        await hold.putOnHold(-1);
-        await hold.ice_ping();
-        out.writeLine("ok");
-
-        out.write("changing state to hold and shutting down server... ");
-        await hold.shutdown();
-        out.writeLine("ok");
-    }
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
+        async run(args)
         {
-            //
-            // For this test, we want to disable retries.
-            //
-            initData.properties.setProperty("Ice.RetryIntervals", "-1");
-
-            //
-            // We don't want connection warnings because of the timeout
-            //
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
+            let communicator;
+            try
+            {
+                const [properties] = this.createTestProperties(args);
+                //
+                // For this test, we want to disable retries.
+                //
+                properties.setProperty("Ice.RetryIntervals", "-1");
 
-            initData.properties.setProperty("Ice.RetryIntervals", "-1");
+                //
+                // We don't want connection warnings because of the timeout
+                //
+                properties.setProperty("Ice.Warn.Connections", "0");
 
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
-        }
-        finally
-        {
-            if(communicator)
+                [communicator] = this.initialize(properties);
+                await this.allTests();
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/hold/Test.ice zeroc-ice-3.7.2/js/test/Ice/hold/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/hold/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/hold/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/import/Demo/Canvas.ice zeroc-ice-3.7.2/js/test/Ice/import/Demo/Canvas.ice
--- zeroc-ice-3.7.1/js/test/Ice/import/Demo/Canvas.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/import/Demo/Canvas.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,6 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
 
 [["js:es6-module"]]
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/import/Demo/Circle.ice zeroc-ice-3.7.2/js/test/Ice/import/Demo/Circle.ice
--- zeroc-ice-3.7.1/js/test/Ice/import/Demo/Circle.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/import/Demo/Circle.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,6 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
 
 [["js:es6-module"]]
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/import/Demo/Point.ice zeroc-ice-3.7.2/js/test/Ice/import/Demo/Point.ice
--- zeroc-ice-3.7.1/js/test/Ice/import/Demo/Point.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/import/Demo/Point.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,6 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
 
 [["js:es6-module"]]
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/import/Demo/Square.ice zeroc-ice-3.7.2/js/test/Ice/import/Demo/Square.ice
--- zeroc-ice-3.7.1/js/test/Ice/import/Demo/Square.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/import/Demo/Square.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,6 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
 
 [["js:es6-module"]]
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/import/.eslintrc.js zeroc-ice-3.7.2/js/test/Ice/import/.eslintrc.js
--- zeroc-ice-3.7.1/js/test/Ice/import/.eslintrc.js	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/import/.eslintrc.js	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,16 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true,
+        "node": true,
+        "worker": true
+    },
+    "extends": "../../../.eslintrc.js",
+    "parserOptions": {
+        "ecmaVersion": 8,
+        "sourceType": "module"
+    },
+    "rules": {
+        "sort-imports": "off"
+    }
+};
diff -Nru zeroc-ice-3.7.1/js/test/Ice/import/main.js zeroc-ice-3.7.2/js/test/Ice/import/main.js
--- zeroc-ice-3.7.1/js/test/Ice/import/main.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/import/main.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 import ice from "ice";
+
 const Ice = ice.Ice;
 
-import { Demo } from "./Demo/Point";
+import {Demo} from "./Demo/Point";
+import "./Demo/Canvas";
 import "./Demo/Circle";
 import "./Demo/Square";
-import "./Demo/Canvas";
 
 function test(value)
 {
@@ -24,16 +20,16 @@
 }
 
 console.log("testing import/export modules");
-let point = new Demo.gx.Point(10, 10);
+const point = new Demo.gx.Point(10, 10);
 test(point.x === 10);
 test(point.y === 10);
 
-let circle = new Demo.gx.Circle(new Demo.gx.Point(10, 10), 100);
+const circle = new Demo.gx.Circle(new Demo.gx.Point(10, 10), 100);
 test(circle.center.x == 10);
 test(circle.center.y == 10);
 test(circle.radius == 100);
 
-let square = new Demo.gx.Square(
+const square = new Demo.gx.Square(
     new Demo.gx.Point(0, 0),
     new Demo.gx.Point(10, 0),
     new Demo.gx.Point(10, 10),
@@ -51,11 +47,11 @@
 test(square.p4.x === 0);
 test(square.p4.y === 10);
 
-let communicator = Ice.initialize();
-let session = Demo.gx.SessionPrx.uncheckedCast(communicator.stringToProxy("demo:default -h 127.0.0.1"));
+const communicator = Ice.initialize();
+const session = Demo.gx.SessionPrx.uncheckedCast(communicator.stringToProxy("demo:default -h 127.0.0.1"));
 test(session !== undefined);
 
-let canvas = Demo.gx.CanvasPrx.uncheckedCast(communicator.stringToProxy("demo:default -h 127.0.0.1"));
+const canvas = Demo.gx.CanvasPrx.uncheckedCast(communicator.stringToProxy("demo:default -h 127.0.0.1"));
 test(canvas !== undefined);
 
 communicator.destroy().then(() => console.log("ok"));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/info/Client.js zeroc-ice-3.7.2/js/test/Ice/info/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/info/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/info/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
-    const IceSSL = require("ice").IceSSL;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
     function getTCPEndpointInfo(info)
     {
@@ -37,134 +33,124 @@
         return null;
     }
 
-    async function allTests(communicator, out)
+    class Client extends TestHelper
     {
-        function test(value)
+        async allTests()
         {
-            if(!value)
+            const out = this.getWriter();
+            const communicator = this.communicator();
+            const defaultHost = communicator.getProperties().getPropertyWithDefault("Ice.Default.Host");
+
+            out.write("testing proxy endpoint information... ");
+            const ref =
+                  "test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:opaque -e 1.8 -t 100 -v ABCD";
+            const p1 = communicator.stringToProxy(ref);
+
+            const endps = p1.ice_getEndpoints();
+            const endpoint = endps[0].getInfo();
+            const ipEndpoint = getTCPEndpointInfo(endpoint);
+            test(ipEndpoint.host == "tcphost");
+            test(ipEndpoint.port == 10000);
+            test(ipEndpoint.timeout == 1200);
+            test(ipEndpoint.sourceAddress == "10.10.10.10");
+            test(ipEndpoint.compress);
+            test(!ipEndpoint.datagram());
+            test(ipEndpoint.type() == Ice.TCPEndpointType && !ipEndpoint.secure() ||
+                 ipEndpoint.type() == Ice.WSEndpointType && !ipEndpoint.secure() ||
+                 ipEndpoint.type() == Ice.WSSEndpointType && ipEndpoint.secure());
+
+            test(ipEndpoint.type() == Ice.TCPEndpointType && endpoint instanceof Ice.TCPEndpointInfo ||
+                 ipEndpoint.type() == Ice.WSEndpointType && endpoint instanceof Ice.WSEndpointInfo ||
+                 ipEndpoint.type() == Ice.WSSEndpointType && endpoint instanceof Ice.WSEndpointInfo);
+
+            const opaqueEndpoint = endps[1].getInfo();
+            test(opaqueEndpoint.rawEncoding.equals(new Ice.EncodingVersion(1, 8)));
+            out.writeLine("ok");
+
+            out.write("testing connection endpoint information... ");
+            const base = communicator.stringToProxy("test:" + this.getTestEndpoint());
+            const testIntf = Test.TestIntfPrx.uncheckedCast(base);
+            const endpointPort = this.getTestPort(0);
+            let conn = await base.ice_getConnection();
+            let ipinfo = getTCPEndpointInfo(conn.getEndpoint().getInfo());
+            test(ipinfo.port == endpointPort);
+            test(!ipinfo.compress);
+            test(ipinfo.host == defaultHost);
+
+            let ctx = await testIntf.getEndpointInfoAsContext();
+            test(ctx.get("host") == ipinfo.host);
+            test(ctx.get("compress") == "false");
+            test(parseInt(ctx.get("port")) > 0);
+            out.writeLine("ok");
+
+            out.write("testing connection information... ");
+
+            conn = await base.ice_getConnection();
+            conn.setBufferSize(1024, 2048);
+
+            const info = conn.getInfo();
+            ipinfo = getTCPConnectionInfo(info);
+            test(!info.incoming);
+            test(info.adapterName.length === 0);
+            if(conn.type() != "ws" && conn.type() != "wss")
             {
-                throw new Error("test failed");
+                test(ipinfo.localPort > 0);
             }
-        }
-
-        const defaultHost = communicator.getProperties().getPropertyWithDefault("Ice.Default.Host");
+            test(ipinfo.remotePort == endpointPort);
+            if(defaultHost == "127.0.0.1")
+            {
+                test(ipinfo.remoteAddress == defaultHost);
+                if(conn.type() != "ws" && conn.type() != "wss")
+                {
+                    test(ipinfo.localAddress == defaultHost);
+                }
+            }
+            test(info.sndSize >= 2048);
+            ctx = await testIntf.getConnectionInfoAsContext();
 
-        out.write("testing proxy endpoint information... ");
-        const ref =
-              "test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:opaque -e 1.8 -t 100 -v ABCD";
-        const p1 = communicator.stringToProxy(ref);
-
-        let endps = p1.ice_getEndpoints();
-        let endpoint = endps[0].getInfo();
-        let ipEndpoint = getTCPEndpointInfo(endpoint);
-        test(ipEndpoint.host == "tcphost");
-        test(ipEndpoint.port == 10000);
-        test(ipEndpoint.timeout == 1200);
-        test(ipEndpoint.sourceAddress == "10.10.10.10");
-        test(ipEndpoint.compress);
-        test(!ipEndpoint.datagram());
-        test(ipEndpoint.type() == Ice.TCPEndpointType && !ipEndpoint.secure() ||
-             ipEndpoint.type() == Ice.WSEndpointType && !ipEndpoint.secure() ||
-             ipEndpoint.type() == Ice.WSSEndpointType && ipEndpoint.secure());
-
-        test(ipEndpoint.type() == Ice.TCPEndpointType && endpoint instanceof Ice.TCPEndpointInfo ||
-             ipEndpoint.type() == Ice.WSEndpointType && endpoint instanceof Ice.WSEndpointInfo ||
-             ipEndpoint.type() == Ice.WSSEndpointType && endpoint instanceof Ice.WSEndpointInfo);
-
-        let opaqueEndpoint = endps[1].getInfo();
-        test(opaqueEndpoint.rawEncoding.equals(new Ice.EncodingVersion(1, 8)));
-        out.writeLine("ok");
-
-        out.write("testing connection endpoint information... ");
-        let base = communicator.stringToProxy("test:default -p 12010");
-        let testIntf = Test.TestIntfPrx.uncheckedCast(base);
-
-        let conn = await base.ice_getConnection();
-        let ipinfo = getTCPEndpointInfo(conn.getEndpoint().getInfo());
-        test(ipinfo.port == 12010);
-        test(!ipinfo.compress);
-        test(ipinfo.host == defaultHost);
-
-        let ctx = await testIntf.getEndpointInfoAsContext();
-        test(ctx.get("host") == ipinfo.host);
-        test(ctx.get("compress") == "false");
-        test(parseInt(ctx.get("port")) > 0);
-        out.writeLine("ok");
-
-        out.write("testing connection information... ");
-
-        conn = await base.ice_getConnection();
-        conn.setBufferSize(1024, 2048);
-
-        info = conn.getInfo();
-        ipinfo = getTCPConnectionInfo(info);
-        test(!info.incoming);
-        test(info.adapterName.length === 0);
-        if(conn.type() != "ws" && conn.type() != "wss")
-        {
-            test(ipinfo.localPort > 0);
-        }
-        test(ipinfo.remotePort == 12010);
-        if(defaultHost == "127.0.0.1")
-        {
-            test(ipinfo.remoteAddress == defaultHost);
+            test(ctx.get("incoming") == "true");
+            test(ctx.get("adapterName") == "TestAdapter");
             if(conn.type() != "ws" && conn.type() != "wss")
             {
-                test(ipinfo.localAddress == defaultHost);
+                test(ctx.get("remoteAddress") == info.localAddress);
+                test(ctx.get("localAddress") == info.remoteAddress);
+                test(parseInt(ctx.get("remotePort")) === info.localPort);
+                test(parseInt(ctx.get("localPort")) === info.remotePort);
             }
-        }
-        //test(info.rcvSize >= 1024);
-        test(info.sndSize >= 2048);
-        ctx = await testIntf.getConnectionInfoAsContext();
-
-        test(ctx.get("incoming") == "true");
-        test(ctx.get("adapterName") == "TestAdapter");
-        if(conn.type() != "ws" && conn.type() != "wss")
-        {
-            test(ctx.get("remoteAddress") == info.localAddress);
-            test(ctx.get("localAddress") == info.remoteAddress);
-            test(parseInt(ctx.get("remotePort")) == info.localPort);
-            test(parseInt(ctx.get("localPort")) == info.remotePort);
-        }
 
-        if(conn.type() == "ws" || conn.type() == "wss")
-        {
-            //test(info.headers["Upgrade"] == "websocket");
-            //test(info.headers.get("Connection") == "Upgrade");
-            //test(info.headers.get("Sec-WebSocket-Protocol") == "ice.zeroc.com");
-            //test(info.headers.get("Sec-WebSocket-Accept") != null);
-
-            test(ctx.get("ws.Upgrade").toLowerCase() == "websocket");
-            test(ctx.get("ws.Connection").indexOf("Upgrade") >= 0);
-            test(ctx.get("ws.Sec-WebSocket-Protocol") == "ice.zeroc.com");
-            test(ctx.get("ws.Sec-WebSocket-Version") == "13");
-            test(ctx.get("ws.Sec-WebSocket-Key") !== null);
-        }
-        out.writeLine("ok");
-
-        await testIntf.shutdown();
-    }
+            if(conn.type() == "ws" || conn.type() == "wss")
+            {
+                test(ctx.get("ws.Upgrade").toLowerCase() == "websocket");
+                test(ctx.get("ws.Connection").indexOf("Upgrade") >= 0);
+                test(ctx.get("ws.Sec-WebSocket-Protocol") == "ice.zeroc.com");
+                test(ctx.get("ws.Sec-WebSocket-Version") == "13");
+                test(ctx.get("ws.Sec-WebSocket-Key") !== null);
+            }
+            out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(communicator, out);
+            await testIntf.shutdown();
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/info/Test.ice zeroc-ice-3.7.2/js/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/inheritance/Client.js zeroc-ice-3.7.2/js/test/Ice/inheritance/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/inheritance/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/inheritance/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,249 +1,238 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
-    const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value)
+        async allTests()
         {
-            if(!value)
-            {
-                throw new Error("test failed");
-            }
-        }
-
-        out.write("testing stringToProxy... ");
-        let ref = "initial:default -p 12010";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let initial = await Test.InitialPrx.checkedCast(base);
-        test(initial !== null);
-        test(initial.equals(base));
-        out.writeLine("ok");
-
-        out.write("getting proxies for class hierarchy... ");
-        let ca = await initial.caop();
-        let cb = await initial.cbop();
-        let cc = await initial.ccop();
-        let cd = await initial.cdop();
-        test(ca != cb);
-        test(ca != cc);
-        test(ca != cd);
-        test(cb != cc);
-        test(cb != cd);
-        test(cc != cd);
-        out.writeLine("ok");
-
-        out.write("getting proxies for interface hierarchy... ");
-        let ia = await initial.iaop();
-        let ib1 = await initial.ib1op();
-        let ib2 = await initial.ib2op();
-        let ic = await initial.icop();
-        test(ia != ib1);
-        test(ia != ib2);
-        test(ia != ic);
-        test(ib1 != ic);
-        test(ib2 != ic);
-        out.writeLine("ok");
-
-        out.write("invoking proxy operations on class hierarchy... ");
-        let cao;
-        let cbo;
-        let cco;
-
-        cao = await ca.caop(ca);
-        test(cao.equals(ca));
-        cao = await ca.caop(cb);
-        test(cao.equals(cb));
-        cao = await ca.caop(cc);
-        test(cao.equals(cc));
-        cao = await cb.caop(ca);
-        test(cao.equals(ca));
-        cao = await cb.caop(cb);
-        test(cao.equals(cb));
-        cao = await cb.caop(cc);
-        test(cao.equals(cc));
-        cao = await cc.caop(ca);
-        test(cao.equals(ca));
-        cao = await cc.caop(cb);
-        test(cao.equals(cb));
-        cao = await cc.caop(cc);
-        test(cao.equals(cc));
-
-        cao = await cb.cbop(cb);
-        test(cao.equals(cb));
-        cbo = await cb.cbop(cb);
-        test(cbo.equals(cb));
-        cao = await cb.cbop(cc);
-        test(cao.equals(cc));
-        cbo = await cb.cbop(cc);
-        test(cbo.equals(cc));
-        cao = await cc.cbop(cb);
-        test(cao.equals(cb));
-        cbo = await cc.cbop(cb);
-        test(cbo.equals(cb));
-        cao = await cc.cbop(cc);
-        test(cao.equals(cc));
-        cbo = await cc.cbop(cc);
-        test(cbo.equals(cc));
-
-        cao = await cc.ccop(cc);
-        test(cao.equals(cc));
-        cbo = await cc.ccop(cc);
-        test(cbo.equals(cc));
-        cco = await cc.ccop(cc);
-        test(cco.equals(cc));
-        out.writeLine("ok");
-
-        out.write("ditto, but for interface hierarchy... ");
-        let iao;
-        let ib1o;
-        let ib2o;
-        let ico;
-
-        iao = await ia.iaop(ia);
-        test(iao.equals(ia));
-        iao = await ia.iaop(ib1);
-        test(iao.equals(ib1));
-        iao = await ia.iaop(ib2);
-        test(iao.equals(ib2));
-        iao = await ia.iaop(ic);
-        test(iao.equals(ic));
-        iao = await ib1.iaop(ia);
-        test(iao.equals(ia));
-        iao = await ib1.iaop(ib1);
-        test(iao.equals(ib1));
-        iao = await ib1.iaop(ib2);
-        test(iao.equals(ib2));
-        iao = await ib1.iaop(ic);
-        test(iao.equals(ic));
-        iao = await ib2.iaop(ia);
-        test(iao.equals(ia));
-        iao = await ib2.iaop(ib1);
-        test(iao.equals(ib1));
-        iao = await ib2.iaop(ib2);
-        test(iao.equals(ib2));
-        iao = await ib2.iaop(ic);
-        test(iao.equals(ic));
-        iao = await ic.iaop(ia);
-        test(iao.equals(ia));
-        iao = await ic.iaop(ib1);
-        test(iao.equals(ib1));
-        iao = await ic.iaop(ib2);
-        test(iao.equals(ib2));
-        iao = await ic.iaop(ic);
-        test(iao.equals(ic));
-
-        iao = await ib1.ib1op(ib1);
-        test(iao.equals(ib1));
-        ib1o = await ib1.ib1op(ib1);
-        test(ib1o.equals(ib1));
-        iao = await ib1.ib1op(ic);
-        test(iao.equals(ic));
-        ib1o = await ib1.ib1op(ic);
-        test(ib1o.equals(ic));
-        iao = await ic.ib1op(ib1);
-        test(iao.equals(ib1));
-        ib1o = await ic.ib1op(ib1);
-        test(ib1o.equals(ib1));
-        iao = await ic.ib1op(ic);
-        test(iao.equals(ic));
-        ib1o = await ic.ib1op(ic);
-        test(ib1o.equals(ic));
-
-        iao = await ib2.ib2op(ib2);
-        test(iao.equals(ib2));
-        ib2o = await ib2.ib2op(ib2);
-        test(ib2o.equals(ib2));
-        iao = await ib2.ib2op(ic);
-        test(iao.equals(ic));
-        ib2o = await ib2.ib2op(ic);
-        test(ib2o.equals(ic));
-        iao = await ic.ib2op(ib2);
-        test(iao.equals(ib2));
-        ib2o = await ic.ib2op(ib2);
-        test(ib2o.equals(ib2));
-        iao = await ic.ib2op(ic);
-        test(iao.equals(ic));
-        ib2o = await ic.ib2op(ic);
-        test(ib2o.equals(ic));
-
-        iao = await ic.icop(ic);
-        test(iao.equals(ic));
-        ib1o = await ic.icop(ic);
-        test(ib1o.equals(ic));
-        ib2o = await ic.icop(ic);
-        test(ib2o.equals(ic));
-        ico = await ic.icop(ic);
-        test(ico.equals(ic));
-        out.writeLine("ok");
-
-        out.write("ditto, but for class implementing interfaces... ");
-        cao = await cd.caop(cd);
-        test(cao.equals(cd));
-        cbo = await cd.cbop(cd);
-        test(cbo.equals(cd));
-        cco = await cd.ccop(cd);
-        test(cco.equals(cd));
-
-        iao = await cd.iaop(cd);
-        test(iao.equals(cd));
-        ib1o = await cd.ib1op(cd);
-        test(ib1o.equals(cd));
-        ib2o = await cd.ib2op(cd);
-        test(ib2o.equals(cd));
-
-        cao = await cd.cdop(cd);
-        test(cao.equals(cd));
-        cbo = await cd.cdop(cd);
-        test(cbo.equals(cd));
-        cco = await cd.cdop(cd);
-        test(cco.equals(cd));
-
-        iao = await cd.cdop(cd);
-        test(iao.equals(cd));
-        ib1o = await cd.cdop(cd);
-        test(ib1o.equals(cd));
-        ib2o = await cd.cdop(cd);
-        test(ib2o.equals(cd));
-        out.writeLine("ok");
+            const communicator = this.communicator();
+            const out = this.getWriter();
 
-        await initial.shutdown();
-    };
+            out.write("testing stringToProxy... ");
+            const ref = "initial:" + this.getTestEndpoint();
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            const initial = await Test.InitialPrx.checkedCast(base);
+            test(initial !== null);
+            test(initial.equals(base));
+            out.writeLine("ok");
+
+            out.write("getting proxies for class hierarchy... ");
+            const ca = await initial.caop();
+            const cb = await initial.cbop();
+            const cc = await initial.ccop();
+            const cd = await initial.cdop();
+            test(ca != cb);
+            test(ca != cc);
+            test(ca != cd);
+            test(cb != cc);
+            test(cb != cd);
+            test(cc != cd);
+            out.writeLine("ok");
+
+            out.write("getting proxies for interface hierarchy... ");
+            const ia = await initial.iaop();
+            const ib1 = await initial.ib1op();
+            const ib2 = await initial.ib2op();
+            const ic = await initial.icop();
+            test(ia != ib1);
+            test(ia != ib2);
+            test(ia != ic);
+            test(ib1 != ic);
+            test(ib2 != ic);
+            out.writeLine("ok");
+
+            out.write("invoking proxy operations on class hierarchy... ");
+
+            let cao = await ca.caop(ca);
+            test(cao.equals(ca));
+            cao = await ca.caop(cb);
+            test(cao.equals(cb));
+            cao = await ca.caop(cc);
+            test(cao.equals(cc));
+            cao = await cb.caop(ca);
+            test(cao.equals(ca));
+            cao = await cb.caop(cb);
+            test(cao.equals(cb));
+            cao = await cb.caop(cc);
+            test(cao.equals(cc));
+            cao = await cc.caop(ca);
+            test(cao.equals(ca));
+            cao = await cc.caop(cb);
+            test(cao.equals(cb));
+            cao = await cc.caop(cc);
+            test(cao.equals(cc));
+
+            cao = await cb.cbop(cb);
+            test(cao.equals(cb));
+            let cbo = await cb.cbop(cb);
+            test(cbo.equals(cb));
+            cao = await cb.cbop(cc);
+            test(cao.equals(cc));
+            cbo = await cb.cbop(cc);
+            test(cbo.equals(cc));
+            cao = await cc.cbop(cb);
+            test(cao.equals(cb));
+            cbo = await cc.cbop(cb);
+            test(cbo.equals(cb));
+            cao = await cc.cbop(cc);
+            test(cao.equals(cc));
+            cbo = await cc.cbop(cc);
+            test(cbo.equals(cc));
+
+            cao = await cc.ccop(cc);
+            test(cao.equals(cc));
+            cbo = await cc.ccop(cc);
+            test(cbo.equals(cc));
+            let cco = await cc.ccop(cc);
+            test(cco.equals(cc));
+            out.writeLine("ok");
+
+            out.write("ditto, but for interface hierarchy... ");
+            let iao;
+            let ib1o;
+            let ib2o;
+
+            iao = await ia.iaop(ia);
+            test(iao.equals(ia));
+            iao = await ia.iaop(ib1);
+            test(iao.equals(ib1));
+            iao = await ia.iaop(ib2);
+            test(iao.equals(ib2));
+            iao = await ia.iaop(ic);
+            test(iao.equals(ic));
+            iao = await ib1.iaop(ia);
+            test(iao.equals(ia));
+            iao = await ib1.iaop(ib1);
+            test(iao.equals(ib1));
+            iao = await ib1.iaop(ib2);
+            test(iao.equals(ib2));
+            iao = await ib1.iaop(ic);
+            test(iao.equals(ic));
+            iao = await ib2.iaop(ia);
+            test(iao.equals(ia));
+            iao = await ib2.iaop(ib1);
+            test(iao.equals(ib1));
+            iao = await ib2.iaop(ib2);
+            test(iao.equals(ib2));
+            iao = await ib2.iaop(ic);
+            test(iao.equals(ic));
+            iao = await ic.iaop(ia);
+            test(iao.equals(ia));
+            iao = await ic.iaop(ib1);
+            test(iao.equals(ib1));
+            iao = await ic.iaop(ib2);
+            test(iao.equals(ib2));
+            iao = await ic.iaop(ic);
+            test(iao.equals(ic));
+
+            iao = await ib1.ib1op(ib1);
+            test(iao.equals(ib1));
+            ib1o = await ib1.ib1op(ib1);
+            test(ib1o.equals(ib1));
+            iao = await ib1.ib1op(ic);
+            test(iao.equals(ic));
+            ib1o = await ib1.ib1op(ic);
+            test(ib1o.equals(ic));
+            iao = await ic.ib1op(ib1);
+            test(iao.equals(ib1));
+            ib1o = await ic.ib1op(ib1);
+            test(ib1o.equals(ib1));
+            iao = await ic.ib1op(ic);
+            test(iao.equals(ic));
+            ib1o = await ic.ib1op(ic);
+            test(ib1o.equals(ic));
+
+            iao = await ib2.ib2op(ib2);
+            test(iao.equals(ib2));
+            ib2o = await ib2.ib2op(ib2);
+            test(ib2o.equals(ib2));
+            iao = await ib2.ib2op(ic);
+            test(iao.equals(ic));
+            ib2o = await ib2.ib2op(ic);
+            test(ib2o.equals(ic));
+            iao = await ic.ib2op(ib2);
+            test(iao.equals(ib2));
+            ib2o = await ic.ib2op(ib2);
+            test(ib2o.equals(ib2));
+            iao = await ic.ib2op(ic);
+            test(iao.equals(ic));
+            ib2o = await ic.ib2op(ic);
+            test(ib2o.equals(ic));
+
+            iao = await ic.icop(ic);
+            test(iao.equals(ic));
+            ib1o = await ic.icop(ic);
+            test(ib1o.equals(ic));
+            ib2o = await ic.icop(ic);
+            test(ib2o.equals(ic));
+            const ico = await ic.icop(ic);
+            test(ico.equals(ic));
+            out.writeLine("ok");
+
+            out.write("ditto, but for class implementing interfaces... ");
+            cao = await cd.caop(cd);
+            test(cao.equals(cd));
+            cbo = await cd.cbop(cd);
+            test(cbo.equals(cd));
+            cco = await cd.ccop(cd);
+            test(cco.equals(cd));
+
+            iao = await cd.iaop(cd);
+            test(iao.equals(cd));
+            ib1o = await cd.ib1op(cd);
+            test(ib1o.equals(cd));
+            ib2o = await cd.ib2op(cd);
+            test(ib2o.equals(cd));
+
+            cao = await cd.cdop(cd);
+            test(cao.equals(cd));
+            cbo = await cd.cdop(cd);
+            test(cbo.equals(cd));
+            cco = await cd.cdop(cd);
+            test(cco.equals(cd));
+
+            iao = await cd.cdop(cd);
+            test(iao.equals(cd));
+            ib1o = await cd.cdop(cd);
+            test(ib1o.equals(cd));
+            ib2o = await cd.cdop(cd);
+            test(ib2o.equals(cd));
+            out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
+            await initial.shutdown();
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/inheritance/InitialI.js zeroc-ice-3.7.2/js/test/Ice/inheritance/InitialI.js
--- zeroc-ice-3.7.1/js/test/Ice/inheritance/InitialI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/inheritance/InitialI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
-    const Ice = require("ice").Ice;
     const Test = require("Test").Test;
 
     class CAI extends Test.MA.CADisp
@@ -209,7 +203,8 @@
     }
 
     exports.InitialI = InitialI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/inheritance/Server.js zeroc-ice-3.7.2/js/test/Ice/inheritance/Server.js
--- zeroc-ice-3.7.1/js/test/Ice/inheritance/Server.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/inheritance/Server.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,49 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const InitialI = require("InitialI").InitialI;
 
-    async function run(out, initData, ready)
+    class Server extends TestHelper
     {
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
+                [communicator] = this.initialize(args);
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
                 const adapter = await communicator.createObjectAdapter("");
-                const base = communicator.stringToProxy("initial:default -p 12010");
+                const base = communicator.stringToProxy("initial:" + this.getTestEndpoint());
                 adapter.add(new InitialI(adapter, base), Ice.stringToIdentity("initial"));
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-    exports._server = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Server = Server;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/js/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/location/Client.js zeroc-ice-3.7.2/js/test/Ice/location/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/location/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/location/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,529 +1,520 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests()
         {
-            if(!value)
+            const communicator = this.communicator();
+            const out = this.getWriter();
+            let base = communicator.stringToProxy("ServerManager:" + this.getTestEndpoint());
+            const manager = Test.ServerManagerPrx.uncheckedCast(base);
+            test(manager !== null);
+
+            const locator = Test.TestLocatorPrx.uncheckedCast(communicator.getDefaultLocator());
+            test(locator !== null);
+
+            const registry = Test.TestLocatorRegistryPrx.uncheckedCast(await locator.getRegistry());
+            test(registry !== null);
+
+            out.write("testing stringToProxy... ");
+            base = communicator.stringToProxy("test @ TestAdapter");
+            const base2 = communicator.stringToProxy("test @ TestAdapter");
+            const base3 = communicator.stringToProxy("test");
+            const base4 = communicator.stringToProxy("ServerManager");
+            const base5 = communicator.stringToProxy("test2");
+            const base6 = communicator.stringToProxy("test @ ReplicatedAdapter");
+            out.writeLine("ok");
+
+            out.write("testing ice_locator and ice_getLocator... ");
+            test(Ice.proxyIdentityCompare(base.ice_getLocator(), communicator.getDefaultLocator()) === 0);
+            const anotherLocator = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("anotherLocator"));
+            base = base.ice_locator(anotherLocator);
+            test(Ice.proxyIdentityCompare(base.ice_getLocator(), anotherLocator) === 0);
+            communicator.setDefaultLocator(null);
+            base = communicator.stringToProxy("test @ TestAdapter");
+            test(base.ice_getLocator() === null);
+            base = base.ice_locator(anotherLocator);
+            test(Ice.proxyIdentityCompare(base.ice_getLocator(), anotherLocator) === 0);
+            communicator.setDefaultLocator(locator);
+            base = communicator.stringToProxy("test @ TestAdapter");
+            test(Ice.proxyIdentityCompare(base.ice_getLocator(), communicator.getDefaultLocator()) === 0);
+
+            //
+            // We also test ice_router/ice_getRouter (perhaps we should add a
+            // test/Ice/router test?)
+            //
+            test(base.ice_getRouter() === null);
+            const anotherRouter = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("anotherRouter"));
+            base = base.ice_router(anotherRouter);
+            test(Ice.proxyIdentityCompare(base.ice_getRouter(), anotherRouter) === 0);
+            const router = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("dummyrouter"));
+            communicator.setDefaultRouter(router);
+            base = communicator.stringToProxy("test @ TestAdapter");
+            test(Ice.proxyIdentityCompare(base.ice_getRouter(), communicator.getDefaultRouter()) === 0);
+            communicator.setDefaultRouter(null);
+            base = communicator.stringToProxy("test @ TestAdapter");
+            test(base.ice_getRouter() === null);
+            out.writeLine("ok");
+
+            out.write("starting server... ");
+            await manager.startServer();
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            let obj = await Test.TestIntfPrx.checkedCast(base);
+            test(obj !== null);
+
+            const obj2 = await Test.TestIntfPrx.checkedCast(base2);
+            test(obj2 !== null);
+
+            const obj3 = await Test.TestIntfPrx.checkedCast(base3);
+            test(obj3 !== null);
+
+            const obj4 = await Test.ServerManagerPrx.checkedCast(base4);
+            test(obj4 !== null);
+
+            const obj5 = await Test.TestIntfPrx.checkedCast(base5);
+            test(obj5 !== null);
+
+            const obj6 = await Test.TestIntfPrx.checkedCast(base6);
+            test(obj6 !== null);
+            out.writeLine("ok");
+
+            out.write("testing id@AdapterId indirect proxy... ");
+            await obj.shutdown();
+            await manager.startServer();
+            await obj2.ice_ping();
+            out.writeLine("ok");
+
+            out.write("testing id@ReplicaGroupId indirect proxy... ");
+            await obj.shutdown();
+            await manager.startServer();
+            await obj6.ice_ping();
+            out.writeLine("ok");
+
+            out.write("testing identity indirect proxy... ");
+            await obj.shutdown();
+            await manager.startServer();
+            await obj3.ice_ping();
+            await obj2.ice_ping();
+            await obj.shutdown();
+            await manager.startServer();
+            await obj2.ice_ping();
+            await obj3.ice_ping();
+            await obj.shutdown();
+            await manager.startServer();
+            await obj2.ice_ping();
+            await obj.shutdown();
+            await manager.startServer();
+            await obj3.ice_ping();
+            await obj.shutdown();
+            await manager.startServer();
+            await obj2.ice_ping();
+            await obj.shutdown();
+            await manager.startServer();
+            await obj5.ice_ping();
+            out.writeLine("ok");
+
+            out.write("testing proxy with unknown identity... ");
+            base = communicator.stringToProxy("unknown/unknown");
+            try
             {
-                let message = "test failed";
-                if(ex)
-                {
-                    message += "\n" + ex.toString();
-                }
-                throw new Error(message);
+                await base.ice_ping();
+                test(false);
             }
-        }
-
-        let manager = Test.ServerManagerPrx.uncheckedCast(communicator.stringToProxy("ServerManager:default -p 12010"));
-        test(manager !== null);
-
-        let locator = Test.TestLocatorPrx.uncheckedCast(communicator.getDefaultLocator());
-        test(locator !== null);
+            catch(ex)
+            {
+                test(ex instanceof Ice.NotRegisteredException, ex);
+                test(ex.kindOfObject == "object");
+                test(ex.id == "unknown/unknown");
+            }
+            out.writeLine("ok");
 
-        let registry = Test.TestLocatorRegistryPrx.uncheckedCast(await locator.getRegistry());
-        test(registry !== null);
+            out.write("testing proxy with unknown adapter... ");
+            base = communicator.stringToProxy("test @ TestAdapterUnknown");
+            try
+            {
+                await base.ice_ping();
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.NotRegisteredException, ex);
+                test(ex.kindOfObject == "object adapter");
+                test(ex.id == "TestAdapterUnknown");
+            }
+            out.writeLine("ok");
 
-        out.write("testing stringToProxy... ");
-        let base = communicator.stringToProxy("test @ TestAdapter");
-        let base2 = communicator.stringToProxy("test @ TestAdapter");
-        let base3 = communicator.stringToProxy("test");
-        let base4 = communicator.stringToProxy("ServerManager");
-        let base5 = communicator.stringToProxy("test2");
-        let base6 = communicator.stringToProxy("test @ ReplicatedAdapter");
-        out.writeLine("ok");
-
-        out.write("testing ice_locator and ice_getLocator... ");
-        test(Ice.proxyIdentityCompare(base.ice_getLocator(), communicator.getDefaultLocator()) === 0);
-        let anotherLocator = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("anotherLocator"));
-        base = base.ice_locator(anotherLocator);
-        test(Ice.proxyIdentityCompare(base.ice_getLocator(), anotherLocator) === 0);
-        communicator.setDefaultLocator(null);
-        base = communicator.stringToProxy("test @ TestAdapter");
-        test(base.ice_getLocator() === null);
-        base = base.ice_locator(anotherLocator);
-        test(Ice.proxyIdentityCompare(base.ice_getLocator(), anotherLocator) === 0);
-        communicator.setDefaultLocator(locator);
-        base = communicator.stringToProxy("test @ TestAdapter");
-        test(Ice.proxyIdentityCompare(base.ice_getLocator(), communicator.getDefaultLocator()) === 0);
-
-        //
-        // We also test ice_router/ice_getRouter (perhaps we should add a
-        // test/Ice/router test?)
-        //
-        test(base.ice_getRouter() === null);
-        anotherRouter = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("anotherRouter"));
-        base = base.ice_router(anotherRouter);
-        test(Ice.proxyIdentityCompare(base.ice_getRouter(), anotherRouter) === 0);
-        router = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("dummyrouter"));
-        communicator.setDefaultRouter(router);
-        base = communicator.stringToProxy("test @ TestAdapter");
-        test(Ice.proxyIdentityCompare(base.ice_getRouter(), communicator.getDefaultRouter()) === 0);
-        communicator.setDefaultRouter(null);
-        base = communicator.stringToProxy("test @ TestAdapter");
-        test(base.ice_getRouter() === null);
-        out.writeLine("ok");
-
-        out.write("starting server... ");
-        await manager.startServer();
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let obj = await Test.TestIntfPrx.checkedCast(base);
-        test(obj !== null);
-
-        let obj2 = await Test.TestIntfPrx.checkedCast(base2);
-        test(obj2 !== null);
-
-        let obj3 = await Test.TestIntfPrx.checkedCast(base3);
-        test(obj3 !== null);
-
-        let obj4 = await Test.ServerManagerPrx.checkedCast(base4);
-        test(obj4 !== null);
-
-        let obj5 = await Test.TestIntfPrx.checkedCast(base5);
-        test(obj5 !== null);
-
-        let obj6 = await Test.TestIntfPrx.checkedCast(base6);
-        test(obj6 !== null);
-        out.writeLine("ok");
-
-        out.write("testing id@AdapterId indirect proxy... ");
-        await obj.shutdown();
-        await manager.startServer();
-        await obj2.ice_ping();
-        out.writeLine("ok");
-
-        out.write("testing id@ReplicaGroupId indirect proxy... ");
-        await obj.shutdown();
-        await manager.startServer();
-        await obj6.ice_ping();
-        out.writeLine("ok");
-
-        out.write("testing identity indirect proxy... ");
-        await obj.shutdown();
-        await manager.startServer();
-        await obj3.ice_ping();
-        await obj2.ice_ping();
-        await obj.shutdown();
-        await manager.startServer();
-        await obj2.ice_ping();
-        await obj3.ice_ping();
-        await obj.shutdown();
-        await manager.startServer();
-        await obj2.ice_ping();
-        await obj.shutdown();
-        await manager.startServer();
-        await obj3.ice_ping();
-        await obj.shutdown();
-        await manager.startServer();
-        await obj2.ice_ping();
-        await obj.shutdown();
-        await manager.startServer();
-        await obj5.ice_ping();
-        out.writeLine("ok");
-
-        out.write("testing proxy with unknown identity... ");
-        base = communicator.stringToProxy("unknown/unknown");
-        try
-        {
-            await base.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.NotRegisteredException, ex);
-            test(ex.kindOfObject == "object");
-            test(ex.id == "unknown/unknown");
-        }
-        out.writeLine("ok");
+            out.write("testing locator cache timeout... ");
+            let count = await locator.getRequestCount();
+            const basencc = communicator.stringToProxy("test@TestAdapter").ice_connectionCached(false);
+            await basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+            test(++count == await locator.getRequestCount());
+            await basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+            test(++count == await locator.getRequestCount());
+            await basencc.ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+            test(count == await locator.getRequestCount());
+            await Ice.Promise.delay(1200); // 1200ms
+            await basencc.ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+            test(++count == await locator.getRequestCount());
 
-        out.write("testing proxy with unknown adapter... ");
-        base = communicator.stringToProxy("test @ TestAdapterUnknown");
-        try
-        {
-            await base.ice_ping();
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.NotRegisteredException, ex);
-            test(ex.kindOfObject == "object adapter");
-            test(ex.id == "TestAdapterUnknown");
-        }
-        out.writeLine("ok");
+            await communicator.stringToProxy("test").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+            count += 2;
+            test(count == await locator.getRequestCount());
+            await communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
+            test(count == await locator.getRequestCount());
+            await Ice.Promise.delay(1200); // 1200ms
+            await communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
+            count += 2;
+            test(count == await locator.getRequestCount());
 
-        out.write("testing locator cache timeout... ");
-        let count = await locator.getRequestCount();
-        await communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-        test(++count == await locator.getRequestCount());
-        await communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-        test(++count == await locator.getRequestCount());
-        await communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-        test(count == await locator.getRequestCount());
-        await Ice.Promise.delay(1200); // 1200ms
-        await communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-        test(++count == await locator.getRequestCount());
-
-        await communicator.stringToProxy("test").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-        count += 2;
-        test(count == await locator.getRequestCount());
-        await communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
-        test(count == await locator.getRequestCount());
-        await Ice.Promise.delay(1200); // 1200ms
-        await communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
-        count += 2;
-        test(count == await locator.getRequestCount());
-
-        await communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(-1).ice_ping();
-        test(count == await locator.getRequestCount());
-        await communicator.stringToProxy("test").ice_locatorCacheTimeout(-1).ice_ping();
-        test(count == await locator.getRequestCount());
-        await communicator.stringToProxy("test@TestAdapter").ice_ping();
-        test(count == await locator.getRequestCount());
-        await communicator.stringToProxy("test").ice_ping();
-        test(count == await locator.getRequestCount());
-
-        test(communicator.stringToProxy("test").ice_locatorCacheTimeout(99).ice_getLocatorCacheTimeout() === 99);
-        out.writeLine("ok");
-
-        out.write("testing proxy from server... ");
-        obj = await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("test@TestAdapter"));
-        let hello = await obj.getHello();
-        test(hello.ice_getAdapterId() == "TestAdapter");
-        await hello.sayHello();
-        hello = await obj.getReplicatedHello();
-        test(hello.ice_getAdapterId() == "ReplicatedAdapter");
-        await hello.sayHello();
-        out.writeLine("ok");
-
-        out.write("testing locator request queuing... ");
-        hello = await obj.getReplicatedHello();
-        hello = hello.ice_locatorCacheTimeout(0).ice_connectionCached(false);
-        count = await locator.getRequestCount();
-        await hello.ice_ping();
-        test(++count == await locator.getRequestCount());
+            await communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(-1).ice_ping();
+            test(count == await locator.getRequestCount());
+            await communicator.stringToProxy("test").ice_locatorCacheTimeout(-1).ice_ping();
+            test(count == await locator.getRequestCount());
+            await communicator.stringToProxy("test@TestAdapter").ice_ping();
+            test(count == await locator.getRequestCount());
+            await communicator.stringToProxy("test").ice_ping();
+            test(count == await locator.getRequestCount());
 
-        let results = [];
-        for(let i = 0; i < 1000; i++)
-        {
-            results.push(hello.sayHello().catch(
-                (ex) =>
-                    {
-                        test(false);
-                    }));
-        }
-        await Promise.all(results);
+            test(communicator.stringToProxy("test").ice_locatorCacheTimeout(99).ice_getLocatorCacheTimeout() === 99);
+            out.writeLine("ok");
 
-        results = [];
-        test(await locator.getRequestCount() > count &&
-             await locator.getRequestCount() < count + 999);
+            out.write("testing proxy from server... ");
+            obj = await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("test@TestAdapter"));
+            let hello = await obj.getHello();
+            test(hello.ice_getAdapterId() == "TestAdapter");
+            await hello.sayHello();
+            hello = await obj.getReplicatedHello();
+            test(hello.ice_getAdapterId() == "ReplicatedAdapter");
+            await hello.sayHello();
+            out.writeLine("ok");
+
+            out.write("testing locator request queuing... ");
+            hello = await obj.getReplicatedHello();
+            hello = hello.ice_locatorCacheTimeout(0).ice_connectionCached(false);
+            count = await locator.getRequestCount();
+            await hello.ice_ping();
+            test(++count == await locator.getRequestCount());
 
-        if(await locator.getRequestCount() > count + 800)
-        {
-            out.write("queuing = " + (await locator.getRequestCount() - count));
-        }
-        count = await locator.getRequestCount();
-        hello = hello.ice_adapterId("unknown");
-        for(let i = 0; i < 1000; i++)
-        {
-            results.push(hello.sayHello().then(
-                () =>
-                    {
-                        test(false);
-                    },
-                (ex) =>
-                    {
-                        test(ex instanceof Ice.NotRegisteredException, ex);
-                    }));
-        }
-        await Promise.all(results);
-        results = [];
-        // XXX:
-        // Take into account the retries.
-        test(await locator.getRequestCount() > count && await locator.getRequestCount() < count + 1999);
-        if(await locator.getRequestCount() > count + 800)
-        {
-            out.write("queuing = " + (await locator.getRequestCount() - count));
-        }
-        out.writeLine("ok");
+            let results = [];
+            for(let i = 0; i < 1000; i++)
+            {
+                results.push(hello.sayHello().catch(
+                    ex =>
+                        {
+                            test(false);
+                        }));
+            }
+            await Promise.all(results);
 
-        out.write("testing adapter locator cache... ");
-        try
-        {
-            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.NotRegisteredException, ex);
-            test(ex.kindOfObject == "object adapter");
-            test(ex.id == "TestAdapter3");
-        }
-        await registry.setAdapterDirectProxy("TestAdapter3", await locator.findAdapterById("TestAdapter"));
-        try
-        {
-            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            await registry.setAdapterDirectProxy("TestAdapter3", communicator.stringToProxy("dummy:default"));
-            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
+            results = [];
+            test(await locator.getRequestCount() > count &&
+                 await locator.getRequestCount() < count + 999);
 
-        try
-        {
-            await communicator.stringToProxy("test@TestAdapter3").ice_locatorCacheTimeout(0).ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException, ex);
-        }
-        try
-        {
-            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException, ex);
-        }
-        await registry.setAdapterDirectProxy("TestAdapter3", await locator.findAdapterById("TestAdapter"));
-        try
-        {
-            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
-
-        out.writeLine("ok");
+            if(await locator.getRequestCount() > count + 800)
+            {
+                out.write("queuing = " + (await locator.getRequestCount() - count));
+            }
+            count = await locator.getRequestCount();
+            hello = hello.ice_adapterId("unknown");
+            for(let i = 0; i < 1000; i++)
+            {
+                results.push(hello.sayHello().then(
+                    () =>
+                        {
+                            test(false);
+                        },
+                    ex =>
+                        {
+                            test(ex instanceof Ice.NotRegisteredException, ex);
+                        }));
+            }
+            await Promise.all(results);
+            results = [];
+            // XXX:
+            // Take into account the retries.
+            test(await locator.getRequestCount() > count && await locator.getRequestCount() < count + 1999);
+            if(await locator.getRequestCount() > count + 800)
+            {
+                out.write("queuing = " + (await locator.getRequestCount() - count));
+            }
+            out.writeLine("ok");
 
-        out.write("testing well-known object locator cache... ");
-        await registry.addObject(communicator.stringToProxy("test3@TestUnknown"));
-        try
-        {
-            await communicator.stringToProxy("test3").ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.NotRegisteredException, ex);
-            test(ex.kindOfObject == "object adapter");
-            test(ex.id == "TestUnknown");
-        }
-        await registry.addObject(communicator.stringToProxy("test3@TestAdapter4")); // Update
-        await registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:default"));
-        try
-        {
-            await communicator.stringToProxy("test3").ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException, ex);
-        }
+            out.write("testing adapter locator cache... ");
+            try
+            {
+                await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.NotRegisteredException, ex);
+                test(ex.kindOfObject == "object adapter");
+                test(ex.id == "TestAdapter3");
+            }
+            await registry.setAdapterDirectProxy("TestAdapter3", await locator.findAdapterById("TestAdapter"));
+            try
+            {
+                await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                await registry.setAdapterDirectProxy("TestAdapter3", communicator.stringToProxy("dummy:default"));
+                await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
 
-        await registry.setAdapterDirectProxy("TestAdapter4", await locator.findAdapterById("TestAdapter"));
-        try
-        {
-            await communicator.stringToProxy("test3").ice_ping();
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
+            try
+            {
+                await communicator.stringToProxy("test@TestAdapter3").ice_locatorCacheTimeout(0).ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.LocalException, ex);
+            }
+            try
+            {
+                await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.LocalException, ex);
+            }
+            await registry.setAdapterDirectProxy("TestAdapter3", await locator.findAdapterById("TestAdapter"));
+            try
+            {
+                await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
 
-        await registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:default"));
-        try
-        {
-            await communicator.stringToProxy("test3").ice_ping();
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
+            out.writeLine("ok");
 
-        try
-        {
-            await communicator.stringToProxy("test@TestAdapter4").ice_locatorCacheTimeout(0).ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException, ex);
-        }
+            out.write("testing well-known object locator cache... ");
+            await registry.addObject(communicator.stringToProxy("test3@TestUnknown"));
+            try
+            {
+                await communicator.stringToProxy("test3").ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.NotRegisteredException, ex);
+                test(ex.kindOfObject == "object adapter");
+                test(ex.id == "TestUnknown");
+            }
+            await registry.addObject(communicator.stringToProxy("test3@TestAdapter4")); // Update
+            await registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:default"));
+            try
+            {
+                await communicator.stringToProxy("test3").ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.LocalException, ex);
+            }
 
-        try
-        {
-            await communicator.stringToProxy("test@TestAdapter4").ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException);
-        }
+            await registry.setAdapterDirectProxy("TestAdapter4", await locator.findAdapterById("TestAdapter"));
+            try
+            {
+                await communicator.stringToProxy("test3").ice_ping();
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
 
-        try
-        {
-            await communicator.stringToProxy("test3").ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException, ex);
-        }
+            await registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:default"));
+            try
+            {
+                await communicator.stringToProxy("test3").ice_ping();
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
 
-        await registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
-        try
-        {
-            await communicator.stringToProxy("test3").ice_ping();
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
+            try
+            {
+                await communicator.stringToProxy("test@TestAdapter4").ice_locatorCacheTimeout(0).ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.LocalException, ex);
+            }
 
-        await registry.addObject(communicator.stringToProxy("test4"));
-        try
-        {
-            await communicator.stringToProxy("test4").ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.NoEndpointException, ex);
-        }
-        out.writeLine("ok");
+            try
+            {
+                await communicator.stringToProxy("test@TestAdapter4").ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.LocalException);
+            }
 
-        out.write("testing locator cache background updates... ");
-        {
-            let initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().clone();
-            initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
-            let ic = Ice.initialize(initData);
+            try
+            {
+                await communicator.stringToProxy("test3").ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.LocalException, ex);
+            }
 
-            await registry.setAdapterDirectProxy("TestAdapter5", await locator.findAdapterById("TestAdapter"));
             await registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
-
-            count = await locator.getRequestCount();
-            await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            await ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
-            count += 3;
-            test(count == await locator.getRequestCount());
-            await registry.setAdapterDirectProxy("TestAdapter5", null);
-            await registry.addObject(communicator.stringToProxy("test3:default"));
-            await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            await ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
-            test(count == await locator.getRequestCount());
-            await Ice.Promise.delay(1200);
-
-            // The following request should trigger the background
-            // updates but still use the cached endpoints and
-            // therefore succeed.
-            await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-            await ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-
             try
             {
-                while(true)
-                {
-                    await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    await Ice.Promise.delay(10);
-                }
+                await communicator.stringToProxy("test3").ice_ping();
             }
             catch(ex)
             {
-                // Expected to fail once they endpoints have been updated in the background.
-                test(ex instanceof Ice.LocalException, ex);
+                test(false, ex);
             }
+
+            await registry.addObject(communicator.stringToProxy("test4"));
             try
             {
-                while(true)
-                {
-                    await ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
-                    await Ice.Promise.delay(10);
-                }
+                await communicator.stringToProxy("test4").ice_ping();
+                test(false);
             }
             catch(ex)
             {
-                // Expected to fail once they endpoints have been updated in the background.
-                test(ex instanceof Ice.LocalException, ex);
+                test(ex instanceof Ice.NoEndpointException, ex);
             }
-            await ic.destroy();
-        }
-        out.writeLine("ok");
+            out.writeLine("ok");
 
-        out.write("testing proxy from server after shutdown... ");
-        hello = await obj.getReplicatedHello();
-        await obj.shutdown();
-        await manager.startServer();
-        await hello.sayHello();
-        out.writeLine("ok");
-
-        out.write("testing object migration... ");
-        hello = await Test.HelloPrx.checkedCast(communicator.stringToProxy("hello"));
-        await obj.migrateHello();
-        let conn = await hello.ice_getConnection();
-        await conn.close(Ice.ConnectionClose.GracefullyWithWait);
-        await hello.sayHello();
-        await obj.migrateHello();
-        await hello.sayHello();
-        await obj.migrateHello();
-        await hello.sayHello();
-        out.writeLine("ok");
-
-        out.write("testing locator encoding resolution... ");
-        hello = await Test.HelloPrx.checkedCast(communicator.stringToProxy("hello"));
-        count = await locator.getRequestCount();
-        await communicator.stringToProxy("test@TestAdapter").ice_encodingVersion(Ice.Encoding_1_1).ice_ping();
-        test(count == await locator.getRequestCount());
-        await communicator.stringToProxy("test@TestAdapter10").ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
-        test(++count == await locator.getRequestCount());
-        await communicator.stringToProxy("test -e 1.0@TestAdapter10-2").ice_ping();
-        test(++count == await locator.getRequestCount());
-        out.writeLine("ok");
-
-        out.write("shutdown server manager... ");
-        await manager.shutdown();
-        out.writeLine("ok");
-    }
+            out.write("testing locator cache background updates... ");
+            {
+                const initData = new Ice.InitializationData();
+                initData.properties = communicator.getProperties().clone();
+                initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
+                const ic = Ice.initialize(initData);
+
+                await registry.setAdapterDirectProxy("TestAdapter5", await locator.findAdapterById("TestAdapter"));
+                await registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+
+                count = await locator.getRequestCount();
+                await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                await ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+                count += 3;
+                test(count == await locator.getRequestCount());
+                await registry.setAdapterDirectProxy("TestAdapter5", null);
+                await registry.addObject(communicator.stringToProxy("test3:default"));
+                await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                await ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+                test(count == await locator.getRequestCount());
+                await Ice.Promise.delay(1200);
+
+                // The following request should trigger the background
+                // updates but still use the cached endpoints and
+                // therefore succeed.
+                await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                await ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            initData.properties.setProperty("Ice.Default.Locator", "locator:default -p 12010");
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
+                try
+                {
+                    while(true)
+                    {
+                        await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                        await Ice.Promise.delay(10);
+                    }
+                }
+                catch(ex)
+                {
+                    // Expected to fail once they endpoints have been updated in the background.
+                    test(ex instanceof Ice.LocalException, ex);
+                }
+                try
+                {
+                    while(true)
+                    {
+                        await ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                        await Ice.Promise.delay(10);
+                    }
+                }
+                catch(ex)
+                {
+                    // Expected to fail once they endpoints have been updated in the background.
+                    test(ex instanceof Ice.LocalException, ex);
+                }
+                await ic.destroy();
+            }
+            out.writeLine("ok");
+
+            out.write("testing proxy from server after shutdown... ");
+            hello = await obj.getReplicatedHello();
+            await obj.shutdown();
+            await manager.startServer();
+            await hello.sayHello();
+            out.writeLine("ok");
+
+            out.write("testing object migration... ");
+            hello = await Test.HelloPrx.checkedCast(communicator.stringToProxy("hello"));
+            await obj.migrateHello();
+            const conn = await hello.ice_getConnection();
+            await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+            await hello.sayHello();
+            await obj.migrateHello();
+            await hello.sayHello();
+            await obj.migrateHello();
+            await hello.sayHello();
+            out.writeLine("ok");
+
+            out.write("testing locator encoding resolution... ");
+            hello = await Test.HelloPrx.checkedCast(communicator.stringToProxy("hello"));
+            count = await locator.getRequestCount();
+            await communicator.stringToProxy("test@TestAdapter").ice_encodingVersion(Ice.Encoding_1_1).ice_ping();
+            test(count == await locator.getRequestCount());
+            await communicator.stringToProxy("test@TestAdapter10").ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+            test(++count == await locator.getRequestCount());
+            await communicator.stringToProxy("test -e 1.0@TestAdapter10-2").ice_ping();
+            test(++count == await locator.getRequestCount());
+            out.writeLine("ok");
+
+            out.write("shutdown server manager... ");
+            await manager.shutdown();
+            out.writeLine("ok");
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.Default.Locator", "locator:" + this.getTestEndpoint(properties));
+                [communicator] = this.initialize(properties);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/location/Test.ice zeroc-ice-3.7.2/js/test/Ice/location/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/location/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/number/Client.js zeroc-ice-3.7.2/js/test/Ice/number/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/number/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/number/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,100 +1,94 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    function test(value)
+    class Client extends TestHelper
     {
-        if(!value)
+        run(args)
         {
-            throw new Error("test failed");
+            const out = this.getWriter();
+            out.write("Testing Ice.Long... ");
+            //
+            // Test positive numbers
+            //
+            test(new Ice.Long(0x00000000, 0x00000000).toNumber() === 0); // 0
+            test(new Ice.Long(0x00000000, 0x00000001).toNumber() === 1); // 1
+            test(new Ice.Long(0x00000000, 0x00000400).toNumber() === 1024); // 1024
+            test(new Ice.Long(0x00000000, 0xFFFFFFFF).toNumber() === Math.pow(2, 32) - 1); // 2^32 - 1
+            test(new Ice.Long(0x00000001, 0x00000000).toNumber() === Math.pow(2, 32)); // 2^32
+            test(new Ice.Long(0x00000001, 0xFFFFFFFF).toNumber() === Math.pow(2, 33) - 1); // 2^33 - 1
+            test(new Ice.Long(0x001FFFFF, 0xFFFFFFFF).toNumber() === Math.pow(2, 53) - 1); // 2^53 - 1
+            test(new Ice.Long(0x00200000, 0x00000000).toNumber() === Number.POSITIVE_INFINITY); // 2^53
+
+            //
+            // Test negative numbers
+            //
+            test(new Ice.Long(0xFFFFFFFF, 0xFFFFFFFF).toNumber() === -1);
+            test(new Ice.Long(0xFFFFFFFF, 0xFFFFFFFE).toNumber() === -2);
+            test(new Ice.Long(0xFFFFFFFF, 0xFFFFFF9C).toNumber() === -100);
+
+            test(new Ice.Long(0xFFFFFFFF, 0x00000000).toNumber() === -Math.pow(2, 32)); // -(2^32)
+            test(new Ice.Long(0xFFFFFFFE, 0x00000000).toNumber() === -Math.pow(2, 33)); // -(2^33)
+            test(new Ice.Long(0xFFFFFFFE, 0x00000001).toNumber() === -(Math.pow(2, 33) - 1)); // -(2^33 - 1)
+            test(new Ice.Long(0xFFF00000, 0x00000000).toNumber() === -Math.pow(2, 52)); // -(2^52)
+            test(new Ice.Long(0xFFF00000, 0x00000001).toNumber() === -(Math.pow(2, 52) - 1)); // -(2^52 - 1)
+            test(new Ice.Long(0xFFE00000, 0x00000001).toNumber() === -(Math.pow(2, 53) - 1)); // -(2^53 - 1)
+            test(new Ice.Long(0xFFE00000, 0x00000000).toNumber() === Number.NEGATIVE_INFINITY); // -(2^53)
+
+            //
+            // Test conversion from positive number
+            //
+            test(new Ice.Long(0).toNumber() === 0); // 0
+            test(new Ice.Long(1).toNumber() === 1); // 1
+            test(new Ice.Long(1024).toNumber() === 1024); // 1024
+            test(new Ice.Long(Math.pow(2, 32) - 1).toNumber() === Math.pow(2, 32) - 1); // 2^32 - 1
+            test(new Ice.Long(Math.pow(2, 32)).toNumber() === Math.pow(2, 32)); // 2^32
+            test(new Ice.Long(Math.pow(2, 33) - 1).toNumber() === Math.pow(2, 33) - 1); // 2^33 - 1
+            test(new Ice.Long(Math.pow(2, 53) - 1).toNumber() === Math.pow(2, 53) - 1); // 2^53 - 1
+
+            test(Ice.LongHelper.validate(new Ice.Long(0))); // 0
+            test(Ice.LongHelper.validate(new Ice.Long(1))); // 1
+            test(Ice.LongHelper.validate(new Ice.Long(1024))); // 1024
+            test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 32) - 1))); // 2^32 - 1
+            test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 32)))); // 2^32
+            test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 33) - 1))); // 2^33 - 1
+            test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 53) - 1))); // 2^53 - 1
+
+            //
+            // Test conversion from negative number
+            //
+            test(new Ice.Long(-1).toNumber() === -1);
+            test(new Ice.Long(-2).toNumber() === -2);
+            test(new Ice.Long(-100).toNumber() === -100);
+
+            test(new Ice.Long(-Math.pow(2, 32)).toNumber() === -Math.pow(2, 32)); // -(2^32)
+            test(new Ice.Long(-Math.pow(2, 33)).toNumber() === -Math.pow(2, 33)); // -(2^33)
+            test(new Ice.Long(-Math.pow(2, 33) - 1).toNumber() === -Math.pow(2, 33) - 1); // -(2^33 - 1)
+            test(new Ice.Long(-Math.pow(2, 52)).toNumber() === -Math.pow(2, 52)); // -(2^52)
+            test(new Ice.Long(-Math.pow(2, 52) - 1).toNumber() === -Math.pow(2, 52) - 1); // -(2^52 - 1)
+
+            test(Ice.LongHelper.validate(new Ice.Long(-1)));
+            test(Ice.LongHelper.validate(new Ice.Long(-2)));
+            test(Ice.LongHelper.validate(new Ice.Long(-100)));
+            test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 32)))); // -(2^32)
+            test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 33)))); // -(2^33)
+            test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 33) - 1))); // -(2^33 - 1)
+            test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 52)))); // -(2^52)
+            test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 52) - 1))); // -(2^52 - 1)
+
+            out.writeLine("ok");
         }
     }
+    exports.Client = Client;
 
-    async function run(out)
-    {
-        out.write("Testing Ice.Long... ");
-        //
-        // Test positive numbers
-        //
-        test(new Ice.Long(0x00000000, 0x00000000).toNumber() === 0);                        // 0
-        test(new Ice.Long(0x00000000, 0x00000001).toNumber() === 1);                        // 1
-        test(new Ice.Long(0x00000000, 0x00000400).toNumber() === 1024);                     // 1024
-        test(new Ice.Long(0x00000000, 0xFFFFFFFF).toNumber() === Math.pow(2, 32) - 1);      // 2^32 - 1
-        test(new Ice.Long(0x00000001, 0x00000000).toNumber() === Math.pow(2, 32));          // 2^32
-        test(new Ice.Long(0x00000001, 0xFFFFFFFF).toNumber() === Math.pow(2, 33) - 1);      // 2^33 - 1
-        test(new Ice.Long(0x001FFFFF, 0xFFFFFFFF).toNumber() === Math.pow(2, 53) - 1);      // 2^53 - 1
-        test(new Ice.Long(0x00200000, 0x00000000).toNumber() === Number.POSITIVE_INFINITY); // 2^53
-
-        //
-        // Test negative numbers
-        //
-        test(new Ice.Long(0xFFFFFFFF, 0xFFFFFFFF).toNumber() === -1);
-        test(new Ice.Long(0xFFFFFFFF, 0xFFFFFFFE).toNumber() === -2);
-        test(new Ice.Long(0xFFFFFFFF, 0xFFFFFF9C).toNumber() === -100);
-
-        test(new Ice.Long(0xFFFFFFFF, 0x00000000).toNumber() === -Math.pow(2, 32));         // -(2^32)
-        test(new Ice.Long(0xFFFFFFFE, 0x00000000).toNumber() === -Math.pow(2, 33));         // -(2^33)
-        test(new Ice.Long(0xFFFFFFFE, 0x00000001).toNumber() === -(Math.pow(2, 33) - 1));   // -(2^33 - 1)
-        test(new Ice.Long(0xFFF00000, 0x00000000).toNumber() === -Math.pow(2, 52));         // -(2^52)
-        test(new Ice.Long(0xFFF00000, 0x00000001).toNumber() === -(Math.pow(2, 52) - 1));   // -(2^52 - 1)
-        test(new Ice.Long(0xFFE00000, 0x00000001).toNumber() === -(Math.pow(2, 53) - 1));   // -(2^53 - 1)
-        test(new Ice.Long(0xFFE00000, 0x00000000).toNumber() === Number.NEGATIVE_INFINITY); // -(2^53)
-
-        //
-        // Test conversion from positive number
-        //
-
-        test(new Ice.Long(0).toNumber() === 0);                                             // 0
-        test(new Ice.Long(1).toNumber() === 1);                                             // 1
-        test(new Ice.Long(1024).toNumber() === 1024);                                       // 1024
-        test(new Ice.Long(Math.pow(2, 32) - 1).toNumber() === Math.pow(2, 32) - 1);         // 2^32 - 1
-        test(new Ice.Long(Math.pow(2, 32)).toNumber() === Math.pow(2, 32));                 // 2^32
-        test(new Ice.Long(Math.pow(2, 33) - 1).toNumber() === Math.pow(2, 33) - 1);         // 2^33 - 1
-        test(new Ice.Long(Math.pow(2, 53) - 1).toNumber() === Math.pow(2, 53) - 1);         // 2^53 - 1
-
-        test(Ice.LongHelper.validate(new Ice.Long(0)));                                     // 0
-        test(Ice.LongHelper.validate(new Ice.Long(1)));                                     // 1
-        test(Ice.LongHelper.validate(new Ice.Long(1024)));                                  // 1024
-        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 32) - 1)));                   // 2^32 - 1
-        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 32))));                       // 2^32
-        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 33) - 1)));                    // 2^33 - 1
-        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 53) - 1)));                    // 2^53 - 1
-
-        //
-        // Test conversion from negative number
-        //
-        test(new Ice.Long(-1).toNumber() === -1);
-        test(new Ice.Long(-2).toNumber() === -2);
-        test(new Ice.Long(-100).toNumber() === -100);
-
-        test(new Ice.Long(-Math.pow(2, 32)).toNumber() === -Math.pow(2, 32));               // -(2^32)
-        test(new Ice.Long(-Math.pow(2, 33)).toNumber() === -Math.pow(2, 33));               // -(2^33)
-        test(new Ice.Long(-Math.pow(2, 33) - 1).toNumber() === -Math.pow(2, 33) - 1);       // -(2^33 - 1)
-        test(new Ice.Long(-Math.pow(2, 52)).toNumber() === -Math.pow(2, 52));               // -(2^52)
-        test(new Ice.Long(-Math.pow(2, 52) - 1).toNumber() === -Math.pow(2, 52) - 1);       // -(2^52 - 1)
-
-        test(Ice.LongHelper.validate(new Ice.Long(-1)));
-        test(Ice.LongHelper.validate(new Ice.Long(-2)));
-        test(Ice.LongHelper.validate(new Ice.Long(-100)));
-        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 32))));                      // -(2^32)
-        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 33))));                      // -(2^33)
-        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 33) - 1)));                  // -(2^33 - 1)
-        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 52))));                      // -(2^52)
-        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 52) - 1)));                  // -(2^52 - 1)
-
-        out.writeLine("ok");
-    }
-    exports._test = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/objects/Client.js zeroc-ice-3.7.2/js/test/Ice/objects/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/objects/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/objects/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
     class BI extends Test.B
     {
@@ -140,325 +137,358 @@
         }
     }
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests()
         {
-            if(!value)
+            const out = this.getWriter();
+            const communicator = this.communicator();
+
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::B");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::C");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::D");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::E");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::F");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::H");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::A");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::Sub::A");
+
+            communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
+
+            out.write("testing stringToProxy... ");
+            let ref = "initial:" + this.getTestEndpoint();
+            let base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            const initial = await Test.InitialPrx.checkedCast(base);
+            test(initial !== null);
+            test(initial.equals(base));
+            out.writeLine("ok");
+
+            out.write("getting B1... ");
+            let b1 = await initial.getB1();
+            test(b1 !== null);
+            out.writeLine("ok");
+
+            out.write("getting B2... ");
+            let b2 = await initial.getB2();
+            test(b2 !== null);
+            out.writeLine("ok");
+
+            out.write("getting C... ");
+            let c = await initial.getC();
+            test(c !== null);
+            out.writeLine("ok");
+
+            out.write("getting D... ");
+            let d = await initial.getD();
+            test(d !== null);
+            out.writeLine("ok");
+
+            out.write("checking consistency... ");
+            test(b1 !== b2);
+
+            test(b1.theB === b1);
+            test(b1.theC === null);
+            test(b1.theA instanceof Test.B);
+            test(b1.theA.theA === b1.theA);
+            test(b1.theA.theB === b1);
+            test(b1.theA.theC instanceof Test.C);
+            test(b1.theA.theC.theB === b1.theA);
+
+            test(b1.preMarshalInvoked);
+            test(b1.postUnmarshalInvoked);
+            test(b1.theA.preMarshalInvoked);
+            test(b1.theA.postUnmarshalInvoked);
+            test(b1.theA.theC.preMarshalInvoked);
+            test(b1.theA.theC.postUnmarshalInvoked);
+
+            // More tests possible for b2 and d, but I think this is already
+            // sufficient.
+            test(b2.theA === b2);
+            test(d.theC === null);
+            out.writeLine("ok");
+            out.write("getting B1, B2, C, and D all at once... ");
+
+            [b1, b2, c, d] = await initial.getAll();
+
+            test(b1);
+            test(b2);
+            test(c);
+            test(d);
+            out.writeLine("ok");
+
+            out.write("checking consistency... ");
+            test(b1 !== b2);
+            test(b1.theA === b2);
+            test(b1.theB === b1);
+            test(b1.theC === null);
+            test(b2.theA === b2);
+            test(b2.theB === b1);
+            test(b2.theC === c);
+            test(c.theB === b2);
+            test(d.theA === b1);
+            test(d.theB === b2);
+            test(d.theC === null);
+            test(d.preMarshalInvoked);
+            test(d.postUnmarshalInvoked);
+            test(d.theA.preMarshalInvoked);
+            test(d.theA.postUnmarshalInvoked);
+            test(d.theB.preMarshalInvoked);
+            test(d.theB.postUnmarshalInvoked);
+            test(d.theB.theC.preMarshalInvoked);
+            test(d.theB.theC.postUnmarshalInvoked);
+            out.writeLine("ok");
+
+            out.write("testing protected members... ");
+            const e = await initial.getE();
+            test(e.checkValues());
+
+            const f = await initial.getF();
+            test(f.checkValues());
+            test(f.e2.checkValues());
+            out.writeLine("ok");
+
+            out.write("getting I, J and H... ");
+            const i = await initial.getI();
+            test(i);
+            const j = await initial.getJ();
+            test(j);
+            const h = await initial.getH();
+            test(h);
+            out.writeLine("ok");
+
+            out.write("getting K...");
+            const k = await initial.getK();
+            test(k);
+            test(k.value.data == "l");
+            out.writeLine("ok");
+
+            out.write("test Value as parameter...");
             {
-                let message = "test failed";
-                if(ex)
-                {
-                    message += "\n" + ex.toString();
-                }
-                throw new Error(message);
+                let [v1, v2] = await initial.opValue(new Test.L("l"));
+                test(v1.data == "l");
+                test(v2.data == "l");
+
+                [v1, v2] = await initial.opValueSeq([new Test.L("l")]);
+                test(v1[0].data == "l");
+                test(v2[0].data == "l");
+
+                [v1, v2] = await initial.opValueMap(new Map([["l", new Test.L("l")]]));
+                test(v1.get("l").data == "l");
+                test(v2.get("l").data == "l");
             }
-        }
+            out.writeLine("ok");
+
+            out.write("getting D1... ");
+            const d1 = await initial.getD1(new Test.D1(new Test.A1("a1"),
+                                                       new Test.A1("a2"),
+                                                       new Test.A1("a3"),
+                                                       new Test.A1("a4")));
+
+            test(d1.a1.name == "a1");
+            test(d1.a2.name == "a2");
+            test(d1.a3.name == "a3");
+            test(d1.a4.name == "a4");
+            out.writeLine("ok");
+
+            out.write("throw EDerived... ");
+            try
+            {
+                await initial.throwEDerived();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.EDerived, ex);
+                test(ex.a1.name == "a1");
+                test(ex.a2.name == "a2");
+                test(ex.a3.name == "a3");
+                test(ex.a4.name == "a4");
+            }
+            out.writeLine("ok");
+
+            out.write("setting G... ");
+            try
+            {
+                await initial.setG(new Test.G(new Test.S("hello"), "g"));
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.OperationNotExistException, ex);
+            }
+            out.writeLine("ok");
 
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::B");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::C");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::D");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::E");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::F");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::H");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::A");
-        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::Sub::A");
-
-        communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
-
-        out.write("testing stringToProxy... ");
-        let ref = "initial:default -p 12010";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let initial = await Test.InitialPrx.checkedCast(base);
-        test(initial !== null);
-        test(initial.equals(base));
-        out.writeLine("ok");
-
-        out.write("getting B1... ");
-        let b1 = await initial.getB1();
-        test(b1 !== null);
-        out.writeLine("ok");
-
-        out.write("getting B2... ");
-        let b2 = await initial.getB2();
-        test(b2 !== null);
-        out.writeLine("ok");
-
-        out.write("getting C... ");
-        let c = await initial.getC();
-        test(c !== null);
-        out.writeLine("ok");
-
-        out.write("getting D... ");
-        let d = await initial.getD();
-        test(d !== null);
-        out.writeLine("ok");
-
-        out.write("checking consistency... ");
-        test(b1 !== b2);
-        //test(b1 != c);
-        //test(b1 != d);
-        //test(b2 != c);
-        //test(b2 != d);
-        //test(c != d);
-
-        test(b1.theB === b1);
-        test(b1.theC === null);
-        test(b1.theA instanceof Test.B);
-        test(b1.theA.theA === b1.theA);
-        test(b1.theA.theB === b1);
-        test(b1.theA.theC instanceof Test.C);
-        test(b1.theA.theC.theB === b1.theA);
-
-        test(b1.preMarshalInvoked);
-        test(b1.postUnmarshalInvoked);
-        test(b1.theA.preMarshalInvoked);
-        test(b1.theA.postUnmarshalInvoked);
-        test(b1.theA.theC.preMarshalInvoked);
-        test(b1.theA.theC.postUnmarshalInvoked);
-
-        // More tests possible for b2 and d, but I think this is already
-        // sufficient.
-        test(b2.theA === b2);
-        test(d.theC === null);
-        out.writeLine("ok");
-        out.write("getting B1, B2, C, and D all at once... ");
-
-        [b1, b2, c, d] = await initial.getAll();
-
-        test(b1);
-        test(b2);
-        test(c);
-        test(d);
-        out.writeLine("ok");
-
-        out.write("checking consistency... ");
-        test(b1 !== b2);
-        //test(b1 != c);
-        //test(b1 != d);
-        //test(b2 != c);
-        //test(b2 != d);
-        //test(c != d);
-        test(b1.theA === b2);
-        test(b1.theB === b1);
-        test(b1.theC === null);
-        test(b2.theA === b2);
-        test(b2.theB === b1);
-        test(b2.theC === c);
-        test(c.theB === b2);
-        test(d.theA === b1);
-        test(d.theB === b2);
-        test(d.theC === null);
-        test(d.preMarshalInvoked);
-        test(d.postUnmarshalInvoked);
-        test(d.theA.preMarshalInvoked);
-        test(d.theA.postUnmarshalInvoked);
-        test(d.theB.preMarshalInvoked);
-        test(d.theB.postUnmarshalInvoked);
-        test(d.theB.theC.preMarshalInvoked);
-        test(d.theB.theC.postUnmarshalInvoked);
-        out.writeLine("ok");
-
-        out.write("testing protected members... ");
-        let e = await initial.getE();
-        test(e.checkValues());
-
-        let f = await initial.getF();
-        test(f.checkValues());
-        test(f.e2.checkValues());
-        out.writeLine("ok");
-
-        out.write("getting I, J and H... ");
-        let i = await initial.getI();
-        test(i);
-        let j = await initial.getJ();
-        test(j);
-        let h = await initial.getH();
-        test(h);
-        out.writeLine("ok");
-
-        out.write("getting D1... ");
-        let d1 = await initial.getD1(new Test.D1(new Test.A1("a1"),
-                                                 new Test.A1("a2"),
-                                                 new Test.A1("a3"),
-                                                 new Test.A1("a4")));
-
-        test(d1.a1.name == "a1");
-        test(d1.a2.name == "a2");
-        test(d1.a3.name == "a3");
-        test(d1.a4.name == "a4");
-        out.writeLine("ok");
-
-        out.write("throw EDerived... ");
-        try
-        {
-            await initial.throwEDerived();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.EDerived, ex);
-            test(ex.a1.name == "a1");
-            test(ex.a2.name == "a2");
-            test(ex.a3.name == "a3");
-            test(ex.a4.name == "a4");
-        }
-        out.writeLine("ok");
-
-        out.write("setting G... ");
-        try
-        {
-            await initial.setG(new Test.G(new Test.S("hello"), "g"));
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.OperationNotExistException, ex);
-        }
-        out.writeLine("ok");
-
-        out.write("setting I... ");
-        await initial.setI(i);
-        await initial.setI(j);
-        await initial.setI(h);
-        out.writeLine("ok");
-
-        out.write("testing sequences... ");
-        let [retS, outS] = await initial.opBaseSeq([]);
-        [retS, outS] = await initial.opBaseSeq([new Test.Base(new Test.S(), "")]);
-        test(retS.length === 1 && outS.length === 1);
-        out.writeLine("ok");
-
-        out.write("testing recursive types... ");
-
-        let top = new Test.Recursive();
-        let p = top;
-        let depth = 0;
-
-        try
-        {
-            for(; depth <= 1000; ++depth)
-            {
-                p.v = new Test.Recursive();
-                p = p.v;
-                if((depth < 10 && (depth % 10) == 0) ||
-                   (depth < 1000 && (depth % 100) == 0) ||
-                   (depth < 10000 && (depth % 1000) == 0) ||
-                   (depth % 10000) == 0)
+            out.write("setting I... ");
+            await initial.setI(i);
+            await initial.setI(j);
+            await initial.setI(h);
+            out.writeLine("ok");
+
+            out.write("testing sequences... ");
+            let [retS, outS] = await initial.opBaseSeq([]);
+            [retS, outS] = await initial.opBaseSeq([new Test.Base(new Test.S(), "")]);
+            test(retS.length === 1 && outS.length === 1);
+            out.writeLine("ok");
+
+            out.write("testing recursive types... ");
+
+            const top = new Test.Recursive();
+            let p = top;
+            let depth = 0;
+
+            try
+            {
+                for(; depth <= 1000; ++depth)
                 {
-                    await initial.setRecursive(top);
+                    p.v = new Test.Recursive();
+                    p = p.v;
+                    if((depth < 10 && (depth % 10) == 0) ||
+                       (depth < 1000 && (depth % 100) == 0) ||
+                       (depth < 10000 && (depth % 1000) == 0) ||
+                       (depth % 10000) == 0)
+                    {
+                        await initial.setRecursive(top);
+                    }
                 }
+                test(!(await initial.supportsClassGraphDepthMax()));
             }
-            test(!(await initial.supportsClassGraphDepthMax()));
-        }
-        catch(ex)
-        {
-            test((ex instanceof Ice.UnknownLocalException) || // Expected marshal exception from the server (max class graph depth reached)
-                 (ex instanceof Ice.UnknownException) ||      // Expected stack overflow from the server (Java only)
-                 (ex instanceof Error), ex);                  // Expected, JavaScript stack overflow
-        }
-        await initial.setRecursive(new Test.Recursive());
-        out.writeLine("ok");
+            catch(ex)
+            {
+                //
+                // Ice.UnknownLocalException: Expected marshal exception from the server (max class graph depth reached)
+                // Ice.UnknownException: Expected stack overflow from the server (Java only)
+                // Error: Expected, JavaScript stack overflow
+                //
+                test((ex instanceof Ice.UnknownLocalException) ||
+                     (ex instanceof Ice.UnknownException) ||
+                     (ex instanceof Error), ex);
+            }
+            await initial.setRecursive(new Test.Recursive());
+            out.writeLine("ok");
 
-        out.write("testing compact ID... ");
-        test(await initial.getCompact() !== null);
-        out.writeLine("ok");
+            out.write("testing compact ID... ");
+            test(await initial.getCompact() !== null);
+            out.writeLine("ok");
+
+            out.write("testing marshaled results...");
+            b1 = await initial.getMB();
+            test(b1 !== null && b1.theB === b1);
+            b1 = await initial.getAMDMB();
+            test(b1 !== null && b1.theB === b1);
+            out.writeLine("ok");
+
+            out.write("testing UnexpectedObjectException... ");
+            ref = "uoet:" + this.getTestEndpoint();
+            base = communicator.stringToProxy(ref);
+            test(base !== null);
+
+            const uoet = Test.UnexpectedObjectExceptionTestPrx.uncheckedCast(base);
+            test(uoet !== null);
+            try
+            {
+                await uoet.op();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnexpectedObjectException, ex);
+                test(ex.type == "::Test::AlsoEmpty");
+                test(ex.expectedType == "::Test::Empty");
+            }
+            out.writeLine("ok");
+
+            out.write("testing inner modules... ");
+            let innerA = await initial.getInnerA();
+            test(innerA instanceof Test.Inner.A);
+            test(innerA.theA instanceof Test.B);
+            innerA = await initial.getInnerSubA();
+            test(innerA instanceof Test.Inner.Sub.A);
+            test(innerA.theA instanceof Test.Inner.A);
 
-        out.write("testing marshaled results...");
-        b1 = await initial.getMB();
-        test(b1 !== null && b1.theB === b1);
-        b1 = await initial.getAMDMB();
-        test(b1 !== null && b1.theB === b1);
-        out.writeLine("ok");
+            try
+            {
+                await initial.throwInnerEx();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.Inner.Ex, ex);
+                test(ex.reason == "Inner::Ex");
+            }
 
-        out.write("testing UnexpectedObjectException... ");
-        ref = "uoet:default -p 12010";
-        base = communicator.stringToProxy(ref);
-        test(base !== null);
+            try
+            {
+                await initial.throwInnerSubEx();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.Inner.Sub.Ex, ex);
+                test(ex.reason == "Inner::Sub::Ex");
+            }
+            out.writeLine("ok");
 
-        let uoet = Test.UnexpectedObjectExceptionTestPrx.uncheckedCast(base);
-        test(uoet !== null);
-        try
-        {
-            await uoet.op();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.UnexpectedObjectException, ex);
-            test(ex.type == "::Test::AlsoEmpty");
-            test(ex.expectedType == "::Test::Empty");
-        }
-        out.writeLine("ok");
+            out.write("testing getting ObjectFactory... ");
+            test(communicator.findObjectFactory("TestOF") !== null);
+            out.writeLine("ok");
 
-        out.write("testing inner modules... ");
-        let innerA = await initial.getInnerA();
-        test(innerA instanceof Test.Inner.A);
-        test(innerA.theA instanceof Test.B);
-        innerA = await initial.getInnerSubA();
-        test(innerA instanceof Test.Inner.Sub.A);
-        test(innerA.theA instanceof Test.Inner.A);
+            out.write("testing getting ObjectFactory as ValueFactory... ");
+            test(communicator.getValueFactoryManager().find("TestOF") !== null);
+            out.writeLine("ok");
 
-        try
-        {
-            await initial.throwInnerEx();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.Inner.Ex, ex);
-            test(ex.reason == "Inner::Ex");
-        }
+            out.write("testing class containing complex dictionary... ");
+            {
+                const m = new Test.M();
+                m.v = new Test.LMap();
+                const k1 = new Test.StructKey(1, "1");
+                m.v.set(k1, new Test.L("one"));
+                const k2 = new Test.StructKey(2, "2");
+                m.v.set(k2, new Test.L("two"));
+
+                const [m1, m2] = await initial.opM(m);
 
-        try
-        {
-            await initial.throwInnerSubEx();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.Inner.Sub.Ex, ex);
-            test(ex.reason == "Inner::Sub::Ex");
-        }
-        out.writeLine("ok");
+                test(m1.v.size == 2);
+                test(m2.v.size == 2);
 
-        out.write("testing getting ObjectFactory... ");
-        test(communicator.findObjectFactory("TestOF") !== null);
-        out.writeLine("ok");
+                test(m1.v.get(k1).data == "one");
+                test(m2.v.get(k1).data == "one");
 
-        out.write("testing getting ObjectFactory as ValueFactory... ");
-        test(communicator.getValueFactoryManager().find("TestOF") !== null);
-        out.writeLine("ok");
+                test(m1.v.get(k2).data == "two");
+                test(m2.v.get(k2).data == "two");
 
-        await initial.shutdown();
-    }
+            }
+            out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            communicator = await Ice.initialize(initData);
-            await allTests(out, communicator);
+            await initial.shutdown();
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.Warn.Connections", "0");
+                [communicator] = this.initialize(properties);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/objects/InitialI.js zeroc-ice-3.7.2/js/test/Ice/objects/InitialI.js
--- zeroc-ice-3.7.1/js/test/Ice/objects/InitialI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/objects/InitialI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICEthis._LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
@@ -254,6 +249,26 @@
             return new HI();
         }
 
+        getK(current)
+        {
+            return new Test.K(new Test.L("l"));
+        }
+
+        opValue(v1, current)
+        {
+            return [v1, v1];
+        }
+
+        opValueSeq(v1, current)
+        {
+            return [v1, v1];
+        }
+
+        opValueMap(v1, current)
+        {
+            return [v1, v1];
+        }
+
         getD1(d1, current)
         {
             return d1;
@@ -302,6 +317,11 @@
             throw new Test.Inner.Sub.Ex("Inner::Sub::Ex");
         }
 
+        opM(v1, current)
+        {
+            return [v1, v1];
+        }
+
         shutdown(current)
         {
             current.adapter.getCommunicator().shutdown();
@@ -309,7 +329,8 @@
     }
 
     exports.InitialI = InitialI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/objects/Server.js zeroc-ice-3.7.2/js/test/Ice/objects/Server.js
--- zeroc-ice-3.7.1/js/test/Ice/objects/Server.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/objects/Server.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const InitialI = require("InitialI").InitialI;
 
     class UnexpectedObjectExceptionTestI extends Test.UnexpectedObjectExceptionTest
@@ -21,49 +17,44 @@
         }
     }
 
-    async function run(out, initData, ready)
+    class Server extends TestHelper
     {
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+                properties.setProperty("Ice.Warn.Connections", "0");
+                [communicator] = this.initialize(properties);
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.add(new InitialI(communicator), Ice.stringToIdentity("initial"));
                 adapter.add(new UnexpectedObjectExceptionTestI(), Ice.stringToIdentity("uoet"));
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._server = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Server = Server;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/objects/Test.ice zeroc-ice-3.7.2/js/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -176,6 +171,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 interface Initial
 {
     void shutdown();
@@ -194,9 +215,15 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -213,6 +240,8 @@
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 class Empty
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/AMDMyDerivedClassI.js zeroc-ice-3.7.2/js/test/Ice/operations/AMDMyDerivedClassI.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/AMDMyDerivedClassI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/AMDMyDerivedClassI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
-
-    function test(value)
-    {
-        if(!value)
-        {
-            throw new Error("test failed");
-        }
-    }
+    const test = require("TestHelper").TestHelper.test;
 
     class AMDMyDerivedClassI extends Test.MyDerivedClass
     {
@@ -56,51 +44,51 @@
             return Ice.Object.prototype.ice_id.call(this, current);
         }
 
-        async shutdown(current)
+        shutdown(current)
         {
             current.adapter.getCommunicator().shutdown();
         }
 
-        async supportsCompress(current)
+        supportsCompress(current)
         {
             return false;
         }
 
-        async opVoid(current)
+        opVoid(current)
         {
             test(current.mode === Ice.OperationMode.Normal);
         }
 
-        async opBool(p1, p2, current)
+        opBool(p1, p2, current)
         {
             return [p2, p1];
         }
 
-        async opBoolS(p1, p2, current)
+        opBoolS(p1, p2, current)
         {
             const p3 = p1.concat(p2);
             return [p1.reverse(), p3];
         }
 
-        async opBoolSS(p1, p2, current)
+        opBoolSS(p1, p2, current)
         {
             const p3 = p1.concat(p2);
             return [p1.reverse(), p3];
         }
 
-        async opByte(p1, p2, current)
+        opByte(p1, p2, current)
         {
             return [p1, (p1 ^ p2) & 0xff];
         }
 
-        async opByteBoolD(p1, p2, current)
+        opByteBoolD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
             return [r, p1];
         }
 
-        async opByteS(p1, p2, current)
+        opByteS(p1, p2, current)
         {
             const p3 = new Uint8Array(p1.length);
             for(let i = 0; i < p1.length; i++)
@@ -120,39 +108,39 @@
             return [r, p3];
         }
 
-        async opByteSS(p1, p2, current)
+        opByteSS(p1, p2, current)
         {
             const r = p1.concat(p2);
             return [r, p1.reverse()];
         }
 
-        async opFloatDouble(p1, p2, current)
+        opFloatDouble(p1, p2, current)
         {
             return [p2, p1, p2];
         }
 
-        async opFloatDoubleS(p1, p2, current)
+        opFloatDoubleS(p1, p2, current)
         {
             const r = p2.concat(p1);
             const p4 = p2.reverse();
             return [r, p1, p4];
         }
 
-        async opFloatDoubleSS(p1, p2, current)
+        opFloatDoubleSS(p1, p2, current)
         {
             const r = p2.concat(p2);
             const p4 = p2.reverse();
             return [r, p1, p4];
         }
 
-        async opLongFloatD(p1, p2, current)
+        opLongFloatD(p1, p2, current)
         {
             const r = new Ice.HashMap(p1);
             p2.forEach((value, key) => r.set(key, value));
             return [r, p1];
         }
 
-        async opMyClass(p1, current)
+        opMyClass(p1, current)
         {
             const p2 = p1;
             const p3 = Test.MyClassPrx.uncheckedCast(
@@ -161,109 +149,109 @@
             return [r.ice_endpoints(this._endpoints), p2, p3.ice_endpoints(this._endpoints)];
         }
 
-        async opMyEnum(p1, current)
+        opMyEnum(p1, current)
         {
             return [Test.MyEnum.enum3, p1];
         }
 
-        async opShortIntD(p1, p2, current)
+        opShortIntD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
             return [r, p1];
         }
 
-        async opShortIntLong(p1, p2, p3, current)
+        opShortIntLong(p1, p2, p3, current)
         {
             return [p3, p1, p2, p3];
         }
 
-        async opShortIntLongS(p1, p2, p3, current)
+        opShortIntLongS(p1, p2, p3, current)
         {
             return [p3, p1, p2.reverse(), p3.concat(p3)];
         }
 
-        async opShortIntLongSS(p1, p2, p3, current)
+        opShortIntLongSS(p1, p2, p3, current)
         {
             return [p3, p1, p2.reverse(), p3.concat(p3)];
         }
 
-        async opString(p1, p2, current)
+        opString(p1, p2, current)
         {
             return [p1 + " " + p2, p2 + " " + p1];
         }
 
-        async opStringMyEnumD(p1, p2, current)
+        opStringMyEnumD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
             return [r, p1];
         }
 
-        async opMyEnumStringD(p1, p2, current)
+        opMyEnumStringD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
             return [r, p1];
         }
 
-        async opMyStructMyEnumD(p1, p2, current)
+        opMyStructMyEnumD(p1, p2, current)
         {
             const r = new Ice.HashMap(p1);
             p2.forEach((value, key) => r.set(key, value));
             return [r, p1];
         }
 
-        async opByteBoolDS(p1, p2, current)
+        opByteBoolDS(p1, p2, current)
         {
             const p3 = p2.concat(p1);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opShortIntDS(p1, p2, current)
+        opShortIntDS(p1, p2, current)
         {
             const p3 = p2.concat(p1);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opLongFloatDS(p1, p2, current)
+        opLongFloatDS(p1, p2, current)
         {
             const p3 = p2.concat(p1);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opStringStringDS(p1, p2, current)
+        opStringStringDS(p1, p2, current)
         {
             const p3 = p2.concat(p1);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opStringMyEnumDS(p1, p2, current)
+        opStringMyEnumDS(p1, p2, current)
         {
             const p3 = p2.concat(p1);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opMyEnumStringDS(p1, p2, current)
+        opMyEnumStringDS(p1, p2, current)
         {
             const p3 = p2.concat(p1);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opMyStructMyEnumDS(p1, p2, current)
+        opMyStructMyEnumDS(p1, p2, current)
         {
             const p3 = p2.concat(p1);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opByteByteSD(p1, p2, current)
+        opByteByteSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -271,7 +259,7 @@
             return [r, p3];
         }
 
-        async opBoolBoolSD(p1, p2, current)
+        opBoolBoolSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -279,7 +267,7 @@
             return [r, p3];
         }
 
-        async opShortShortSD(p1, p2, current)
+        opShortShortSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -287,7 +275,7 @@
             return [r, p3];
         }
 
-        async opIntIntSD(p1, p2, current)
+        opIntIntSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -295,7 +283,7 @@
             return [r, p3];
         }
 
-        async opLongLongSD(p1, p2, current)
+        opLongLongSD(p1, p2, current)
         {
             const r = new Ice.HashMap(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -303,7 +291,7 @@
             return [r, p3];
         }
 
-        async opStringFloatSD(p1, p2, current)
+        opStringFloatSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -311,7 +299,7 @@
             return [r, p3];
         }
 
-        async opStringDoubleSD(p1, p2, current)
+        opStringDoubleSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -319,7 +307,7 @@
             return [r, p3];
         }
 
-        async opStringStringSD(p1, p2, current)
+        opStringStringSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -327,7 +315,7 @@
             return [r, p3];
         }
 
-        async opMyEnumMyEnumSD(p1, p2, current)
+        opMyEnumMyEnumSD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
@@ -335,29 +323,29 @@
             return [r, p3];
         }
 
-        async opIntS(s, current)
+        opIntS(s, current)
         {
             return s.map(v => -v);
         }
 
-        async opByteSOneway(s, current)
+        opByteSOneway(s, current)
         {
             this._opByteSOnewayCount += 1;
         }
 
-        async opByteSOnewayCallCount(current)
+        opByteSOnewayCallCount(current)
         {
             const count = this._opByteSOnewayCount;
             this._opByteSOnewayCount = 0;
             return count;
         }
 
-        async opContext(current)
+        opContext(current)
         {
             return current.ctx;
         }
 
-        async opDoubleMarshaling(p1, p2, current)
+        opDoubleMarshaling(p1, p2, current)
         {
             const d = 1278312346.0 / 13.0;
             test(p1 === d);
@@ -367,126 +355,128 @@
             }
         }
 
-        async opStringS(p1, p2, current)
+        opStringS(p1, p2, current)
         {
             const p3 = p1.concat(p2);
             const r = p1.reverse();
             return [r, p3];
         }
 
-        async opStringSS(p1, p2, current)
+        opStringSS(p1, p2, current)
         {
             const p3 = p1.concat(p2);
             const r = p2.reverse();
             return [r, p3];
         }
 
-        async opStringSSS(p1, p2, current)
+        opStringSSS(p1, p2, current)
         {
             const p3 = p1.concat(p2);
             const r = p2.reverse();
             return [r, p3];
         }
 
-        async opStringStringD(p1, p2, current)
+        opStringStringD(p1, p2, current)
         {
             const r = new Map(p1);
             p2.forEach((value, key) => r.set(key, value));
             return [r, p1];
         }
 
-        async opStruct(p1, p2, current)
+        opStruct(p1, p2, current)
         {
             p1.s.s = "a new string";
             return [p2, p1];
         }
 
-        async opIdempotent(current)
+        opIdempotent(current)
         {
             test(current.mode === Ice.OperationMode.Idempotent);
         }
 
-        async opNonmutating(current)
+        opNonmutating(current)
         {
             test(current.mode === Ice.OperationMode.Nonmutating);
         }
 
-        async opDerived(current)
+        opDerived(current)
         {
         }
 
-        async opByte1(value, current)
+        opByte1(value, current)
         {
             return value;
         }
 
-        async opShort1(value, current)
+        opShort1(value, current)
         {
             return value;
         }
 
-        async opInt1(value, current)
+        opInt1(value, current)
         {
             return value;
         }
 
-        async opLong1(value, current)
+        opLong1(value, current)
         {
             return value;
         }
 
-        async opFloat1(value, current)
+        opFloat1(value, current)
         {
             return value;
         }
 
-        async opDouble1(value, current)
+        opDouble1(value, current)
         {
             return value;
         }
 
-        async opString1(value, current)
+        opString1(value, current)
         {
             return value;
         }
 
-        async opStringS1(value, current)
+        opStringS1(value, current)
         {
             return value;
         }
 
-        async opByteBoolD1(value, current)
+        opByteBoolD1(value, current)
         {
             return value;
         }
 
-        async opStringS2(value, current)
+        opStringS2(value, current)
         {
             return value;
         }
 
-        async opByteBoolD2(value, current)
+        opByteBoolD2(value, current)
         {
             return value;
         }
 
-        async opMyClass1(value, current)
+        opMyClass1(value, current)
         {
             return value;
         }
 
-        async opMyStruct1(value, current)
+        opMyStruct1(value, current)
         {
             return value;
         }
 
-        async opStringLiterals(current)
+        opStringLiterals(current)
         {
             return [
-                Test.s0, Test.s1, Test.s2, Test.s3, Test.s4, Test.s5, Test.s6, Test.s7, Test.s8, Test.s9, Test.s10,
+                Test.s0,
+                Test.s1, Test.s2, Test.s3, Test.s4, Test.s5, Test.s6, Test.s7, Test.s8, Test.s9, Test.s10,
                 Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10,
                 Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5,
-                Test.su0, Test.su1, Test.su2];
+                Test.su0, Test.su1, Test.su2
+            ];
         }
 
         opWStringLiterals(current)
@@ -494,39 +484,40 @@
             return this.opStringLiterals(current);
         }
 
-        async opMStruct1(current)
+        opMStruct1(current)
         {
             return new Test.Structure();
         }
 
-        async opMStruct2(p1, current)
+        opMStruct2(p1, current)
         {
             return [p1, p1];
         }
 
-        async opMSeq1(current)
+        opMSeq1(current)
         {
             return [];
         }
 
-        async opMSeq2(p1, current)
+        opMSeq2(p1, current)
         {
             return [p1, p1];
         }
 
-        async opMDict1(current)
+        opMDict1(current)
         {
             return new Map();
         }
 
-        async opMDict2(p1, current)
+        opMDict2(p1, current)
         {
             return [p1, p1];
         }
     }
 
     exports.AMDMyDerivedClassI = AMDMyDerivedClassI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/BatchOneways.js zeroc-ice-3.7.2/js/test/Ice/operations/BatchOneways.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/BatchOneways.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/BatchOneways.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
-    const Test = require("Test").Test;
+    const test = require("TestHelper").TestHelper.test;
 
     async function run(communicator, prx, Test, bidir)
     {
-        function test(value)
-        {
-            if(!value)
-            {
-                throw new Error("test failed");
-            }
-        }
-
-        let bs1 = new Uint8Array(10 * 1024);
+        const bs1 = new Uint8Array(10 * 1024);
         for(let i = 0; i < bs1.length; ++i)
         {
             bs1[i] = 0;
         }
 
-        let batch = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
+        const batch = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
         await batch.ice_flushBatchRequests();
 
         test(batch.ice_flushBatchRequests().isCompleted()); // Empty flush
@@ -47,10 +34,10 @@
             await Ice.Promise.delay(10);
         }
 
-        if(batch.ice_getConnection() != null)
+        if(batch.ice_getConnection() !== null)
         {
-            let batch1 = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
-            let batch2 = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
+            const batch1 = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
+            const batch2 = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
 
             batch1.ice_ping();
             batch2.ice_ping();
@@ -69,9 +56,9 @@
             batch2.ice_ping();
         }
 
-        let identity = new Ice.Identity();
+        const identity = new Ice.Identity();
         identity.name = "invalid";
-        let batch3 = batch.ice_identity(identity);
+        const batch3 = batch.ice_identity(identity);
         batch3.ice_ping();
         await batch3.ice_flushBatchRequests();
 
@@ -80,10 +67,10 @@
         batch.ice_ping();
         await batch.ice_flushBatchRequests();
         await batch.ice_ping();
-    };
-
-    exports.BatchOneways = { run: run };
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    }
+    exports.BatchOneways = {run: run};
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/Client.js zeroc-ice-3.7.2/js/test/Ice/operations/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,82 +1,82 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
-
+    const TestHelper = require("TestHelper").TestHelper;
     const Twoways = require("Twoways").Twoways;
     const Oneways = require("Oneways").Oneways;
     const BatchOneways = require("BatchOneways").BatchOneways;
 
-    async function allTests(out, communicator, Test, bidir)
+    class Client extends TestHelper
     {
-        out.write("testing twoway operations... ");
-        let ref = "test:default -p 12010";
-        let base = communicator.stringToProxy(ref);
-        let cl = await Test.MyClassPrx.checkedCast(base);
-        let derived = await Test.MyDerivedClassPrx.checkedCast(cl);
-
-        await Twoways.run(communicator, cl, Test, bidir);
-        await Twoways.run(communicator, derived, Test, bidir)
-        out.writeLine("ok");
-
-        out.write("testing oneway operations... ");
-        await Oneways.run(communicator, cl, Test, bidir);
-        out.writeLine("ok");
-
-        out.write("testing batch oneway operations... ");
-        await BatchOneways.run(communicator, cl, Test, bidir);
-        out.writeLine("ok");
-
-        out.write("testing server shutdown... ");
-        await cl.shutdown();
-        try
-        {
-            await cl.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
-            throw new Error("test failed");
-        }
-        catch(ex)
+        async allTests(Test, bidir)
         {
-            if(ex instanceof Ice.LocalException)
+            const out = this.getWriter();
+            const communicator = this.communicator();
+            out.write("testing twoway operations... ");
+            const ref = "test:" + this.getTestEndpoint();
+            const base = communicator.stringToProxy(ref);
+            const cl = await Test.MyClassPrx.checkedCast(base);
+            const derived = await Test.MyDerivedClassPrx.checkedCast(cl);
+
+            await Twoways.run(communicator, cl, Test, bidir, this);
+            await Twoways.run(communicator, derived, Test, bidir, this);
+            out.writeLine("ok");
+
+            out.write("testing oneway operations... ");
+            await Oneways.run(communicator, cl, Test, bidir);
+            out.writeLine("ok");
+
+            out.write("testing batch oneway operations... ");
+            await BatchOneways.run(communicator, cl, Test, bidir);
+            out.writeLine("ok");
+
+            out.write("testing server shutdown... ");
+            await cl.shutdown();
+            try
             {
-                out.writeLine("ok");
+                await cl.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+                throw new Error("test failed");
             }
-            else
+            catch(ex)
             {
-                throw ex;
+                if(ex instanceof Ice.LocalException)
+                {
+                    out.writeLine("ok");
+                }
+                else
+                {
+                    throw ex;
+                }
             }
         }
-    }
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
+        async run(args)
         {
-            initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator, Test, false);
-        }
-        finally
-        {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.BatchAutoFlushSize", "100");
+                [communicator] = this.initialize(properties);
+                await this.allTests(Test, false);
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/MyDerivedClassI.js zeroc-ice-3.7.2/js/test/Ice/operations/MyDerivedClassI.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/MyDerivedClassI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/MyDerivedClassI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
-
-    function test(value)
-    {
-        if(!value)
-        {
-            throw new Error("test failed");
-        }
-    }
+    const test = require("TestHelper").TestHelper.test;
 
     class MyDerivedClassI extends Test.MyDerivedClass
     {
@@ -486,7 +474,8 @@
                 Test.s0, Test.s1, Test.s2, Test.s3, Test.s4, Test.s5, Test.s6, Test.s7, Test.s8, Test.s9, Test.s10,
                 Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10,
                 Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5,
-                Test.su0, Test.su1, Test.su2];
+                Test.su0, Test.su1, Test.su2
+            ];
         }
 
         opWStringLiterals(current)
@@ -526,7 +515,8 @@
     }
 
     exports.MyDerivedClassI = MyDerivedClassI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/Oneways.js zeroc-ice-3.7.2/js/test/Ice/operations/Oneways.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/Oneways.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/Oneways.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
-    const Test = require("Test").Test;
+    const test = require("TestHelper").TestHelper.test;
 
     async function run(communicator, prx, Test, bidir)
     {
-        function test(value, ex)
-        {
-            if(!value)
-            {
-                let message = "test failed";
-                if(ex)
-                {
-                    message + "\n" + ex.toString();
-                }
-                throw new Error(message);
-            }
-        }
-
         prx = prx.ice_oneway();
         await prx.ice_ping();
 
@@ -64,10 +46,8 @@
         }
 
         await prx.opVoid();
-
         await prx.opIdempotent();
-
-        await prx.opNonmutating()
+        await prx.opNonmutating();
 
         try
         {
@@ -81,8 +61,9 @@
         }
     }
 
-    exports.Oneways = { run: run };
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Oneways = {run: run};
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/ServerAMD.js zeroc-ice-3.7.2/js/test/Ice/operations/ServerAMD.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/ServerAMD.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/ServerAMD.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,59 +1,50 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const AMDMyDerivedClassI = require("AMDMyDerivedClassI").AMDMyDerivedClassI;
 
-    async function run(out, initData, ready)
+    class ServerAMD extends TestHelper
     {
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.BatchAutoFlushSize", "100");
+                [communicator] = this.initialize(properties);
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.add(new AMDMyDerivedClassI(echo.ice_getEndpoints()), Ice.stringToIdentity("test"));
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._serveramd = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.ServerAMD = ServerAMD;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/Server.js zeroc-ice-3.7.2/js/test/Ice/operations/Server.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/Server.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/Server.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,59 +1,50 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const MyDerivedClassI = require("MyDerivedClassI").MyDerivedClassI;
 
-    async function run(out, initData, ready)
+    class Server extends TestHelper
     {
-        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.BatchAutoFlushSize", "100");
+                [communicator] = this.initialize(properties);
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.add(new MyDerivedClassI(echo.ice_getEndpoints()), Ice.stringToIdentity("test"));
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._server = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Server = Server;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/Test.ice zeroc-ice-3.7.2/js/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/operations/Twoways.js zeroc-ice-3.7.2/js/test/Ice/operations/Twoways.js
--- zeroc-ice-3.7.1/js/test/Ice/operations/Twoways.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/operations/Twoways.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,15 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
-    const Test = require("Test").Test;
+    const test = require("TestHelper").TestHelper.test;
 
-    async function run(communicator, prx, Test, bidir)
+    async function run(communicator, prx, Test, bidir, helper)
     {
-        function test(value, ex)
-        {
-            if(!value)
-            {
-                let message = "test failed";
-                if(ex)
-                {
-                    message += "\n" + ex.toString();
-                }
-                throw new Error(message);
-            }
-        }
-
-        let literals = await prx.opStringLiterals();
+        const literals = await prx.opStringLiterals();
 
         test(Test.s0 == "\\" &&
              Test.s0 == Test.sw0 &&
@@ -84,7 +66,7 @@
              Test.s10 == literals[10] &&
              Test.s10 == literals[21]);
 
-        test(Test.ss0 == "\'\"\?\\\u0007\b\f\n\r\t\v\u0006" &&
+        test(Test.ss0 == "'\"?\\\u0007\b\f\n\r\t\v\u0006" &&
              Test.ss0 == Test.ss1 &&
              Test.ss0 == Test.ss2 &&
              Test.ss0 == literals[22] &&
@@ -117,20 +99,20 @@
         await prx.opVoid();
 
         {
-            let [retval, p3] = await prx.opByte(0xff, 0x0f);
+            const [retval, p3] = await prx.opByte(0xff, 0x0f);
             test(p3 === 0xf0);
             test(retval === 0xff);
         }
 
         {
-            let [retval, p3] = await prx.opBool(true, false);
+            const [retval, p3] = await prx.opBool(true, false);
             test(p3);
             test(!retval);
         }
 
         {
-            let lo = new Ice.Long(0, 12);
-            let [retval, s, i, l] = await prx.opShortIntLong(10, 11, lo);
+            const lo = new Ice.Long(0, 12);
+            const [retval, s, i, l] = await prx.opShortIntLong(10, 11, lo);
 
             test(s === 10);
             test(i === 11);
@@ -139,7 +121,7 @@
         }
 
         {
-            let [retval, f, d] = await prx.opFloatDouble(3.14, 1.1E10);
+            const [retval, f, d] = await prx.opFloatDouble(3.14, 1.1E10);
             test((f - 3.14) <= 0.01);
             test(d == 1.1E10);
             test(retval == 1.1E10);
@@ -261,45 +243,45 @@
         await prx.opFloatDouble(Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY);
 
         {
-            let [retval, p3] = await prx.opString("hello", "world");
+            const [retval, p3] = await prx.opString("hello", "world");
             test(p3 === "world hello");
             test(retval === "hello world");
         }
 
         {
-            let [retval, p2] = await prx.opMyEnum(Test.MyEnum.enum2);
+            const [retval, p2] = await prx.opMyEnum(Test.MyEnum.enum2);
             test(p2 === Test.MyEnum.enum2);
             test(retval === Test.MyEnum.enum3);
         }
 
         {
             // Test null enum
-            let [retval, p2] = await prx.opMyEnum(null);
+            const [retval, p2] = await prx.opMyEnum(null);
             test(p2 === Test.MyEnum.enum1);
             test(retval === Test.MyEnum.enum3);
         }
 
         {
-             let [retval, p2, p3] = await prx.opMyClass(prx);
+             const [retval, p2, p3] = await prx.opMyClass(prx);
 
             test(p2.ice_getIdentity().equals(Ice.stringToIdentity("test")));
             test(p3.ice_getIdentity().equals(Ice.stringToIdentity("noSuchIdentity")));
             test(retval.ice_getIdentity().equals(Ice.stringToIdentity("test")));
+        }
 
-            si1 = new Test.Structure();
+        {
+            const si1 = new Test.Structure();
             si1.p = prx;
             si1.e = Test.MyEnum.enum3;
             si1.s = new Test.AnotherStruct();
             si1.s.s = "abc";
-            si2 = new Test.Structure();
+            const si2 = new Test.Structure();
             si2.p = null;
             si2.e = Test.MyEnum.enum2;
             si2.s = new Test.AnotherStruct();
             si2.s.s = "def";
-        }
 
-        {
-            let [retval, p3] = await prx.opStruct(si1, si2);;
+            const [retval, p3] = await prx.opStruct(si1, si2);
             test(retval.p === null);
             test(retval.e === Test.MyEnum.enum2);
             test(retval.s.s === "def");
@@ -309,9 +291,9 @@
         }
 
         {
-            let si1 = new Test.Structure();
+            const si1 = new Test.Structure();
             // Test null struct
-            let [retval, p3] = await prx.opStruct(si1, null);
+            const [retval, p3] = await prx.opStruct(si1, null);
 
             test(retval.p === null);
             test(retval.e === Test.MyEnum.enum1);
@@ -322,10 +304,10 @@
         }
 
         {
-            let bsi1 = new Uint8Array([ 0x01, 0x11, 0x12, 0x22 ]);
-            let bsi2 = new Uint8Array([ 0xf1, 0xf2, 0xf3, 0xf4 ]);
+            const bsi1 = new Uint8Array([0x01, 0x11, 0x12, 0x22]);
+            const bsi2 = new Uint8Array([0xf1, 0xf2, 0xf3, 0xf4]);
 
-            let [retval, p3] = await prx.opByteS(bsi1, bsi2);
+            const [retval, p3] = await prx.opByteS(bsi1, bsi2);
 
             test(p3.length === 4);
             test(p3[0] === 0x22);
@@ -344,9 +326,9 @@
         }
 
         {
-            let bsi1 = [ true, true, false ];
-            let bsi2 = [ false ];
-            let [retval, p3] = await prx.opBoolS(bsi1, bsi2);
+            const bsi1 = [true, true, false];
+            const bsi2 = [false];
+            const [retval, p3] = await prx.opBoolS(bsi1, bsi2);
 
             test(p3.length == 4);
             test(p3[0]);
@@ -360,13 +342,13 @@
         }
 
         {
-            let ssi = [ 1, 2, 3 ];
-            let isi = [ 5, 6, 7, 8 ];
-            let l1 = new Ice.Long(0, 10);
-            let l2 = new Ice.Long(0, 30);
-            let l3 = new Ice.Long(0, 20);
-            let lsi = [ l1, l2, l3 ];
-            let [retval, sso, iso, lso] = await prx.opShortIntLongS(ssi, isi, lsi);
+            const ssi = [1, 2, 3];
+            const isi = [5, 6, 7, 8];
+            const l1 = new Ice.Long(0, 10);
+            const l2 = new Ice.Long(0, 30);
+            const l3 = new Ice.Long(0, 20);
+            const lsi = [l1, l2, l3];
+            const [retval, sso, iso, lso] = await prx.opShortIntLongS(ssi, isi, lsi);
 
             test(sso.length === 3);
             test(sso[0] === 1);
@@ -391,9 +373,9 @@
         }
 
         {
-            let fsi = [ 3.14, 1.11 ];
-            let dsi = [ 1.1E10, 1.2E10, 1.3E10 ];
-            let [retval, fso, dso] = await prx.opFloatDoubleS(fsi, dsi);
+            const fsi = [3.14, 1.11];
+            const dsi = [1.1E10, 1.2E10, 1.3E10];
+            const [retval, fso, dso] = await prx.opFloatDoubleS(fsi, dsi);
 
             test(fso.length === 2);
             test((fso[0] - 3.14) <= 0.01);
@@ -411,9 +393,9 @@
         }
 
         {
-            let ssi1 = [ "abc", "de", "fghi" ];
-            let ssi2 = [ "xyz" ];
-            let [retval, sso] = await prx.opStringS(ssi1, ssi2);
+            const ssi1 = ["abc", "de", "fghi"];
+            const ssi2 = ["xyz"];
+            const [retval, sso] = await prx.opStringS(ssi1, ssi2);
 
             test(sso.length === 4);
             test(sso[0] === "abc");
@@ -427,17 +409,19 @@
         }
 
         {
-            let bsi1 =
+            const bsi1 =
                 [
-                    new Uint8Array([ 0x01, 0x11, 0x12 ]),
-                    new Uint8Array([ 0xff ])
+                    new Uint8Array([0x01, 0x11, 0x12]),
+                    new Uint8Array([0xff])
                 ];
-            let bsi2 =
+
+            const bsi2 =
                 [
-                    new Uint8Array([ 0x0e ]),
-                    new Uint8Array([ 0xf2, 0xf1 ])
+                    new Uint8Array([0x0e]),
+                    new Uint8Array([0xf2, 0xf1])
                 ];
-            let [retval, bso] = await prx.opByteSS(bsi1, bsi2);
+
+            const [retval, bso] = await prx.opByteSS(bsi1, bsi2);
 
             test(bso.length === 2);
             test(bso[0].length === 1);
@@ -461,18 +445,19 @@
         }
 
         {
-            let bsi1 =
+            const bsi1 =
                 [
-                    [ true ],
-                    [ false ],
-                    [ true, true ]
+                    [true],
+                    [false],
+                    [true, true]
                 ];
-            let bsi2 =
+
+            const bsi2 =
                 [
-                    [ false, false, true ]
+                    [false, false, true]
                 ];
 
-            let [retval, bso] = await prx.opBoolSS(bsi1, bsi2);
+            const [retval, bso] = await prx.opBoolSS(bsi1, bsi2);
 
             test(bso.length === 4);
             test(bso[0].length === 1);
@@ -497,25 +482,28 @@
         }
 
         {
-            let ssi =
+            const ssi =
                 [
-                    [ 1, 2, 5 ],
-                    [ 13 ],
-                    [ ]
+                    [1, 2, 5],
+                    [13],
+                    []
                 ];
-            let isi =
+
+            const isi =
                 [
-                    [ 24, 98 ],
-                    [ 42 ]
+                    [24, 98],
+                    [42]
                 ];
-            let l1 = new Ice.Long(0, 496);
-            let l2 = new Ice.Long(0, 1729);
-            let lsi =
+
+            const l1 = new Ice.Long(0, 496);
+            const l2 = new Ice.Long(0, 1729);
+
+            const lsi =
                 [
-                    [ l1, l2 ]
+                    [l1, l2]
                 ];
 
-            let [retval, sso, iso, lso] = await prx.opShortIntLongSS(ssi, isi, lsi);
+            const [retval, sso, iso, lso] = await prx.opShortIntLongSS(ssi, isi, lsi);
 
             test(retval.length === 1);
             test(retval[0].length === 2);
@@ -545,18 +533,19 @@
         }
 
         {
-            let fsi =
+            const fsi =
                 [
-                    [ 3.14 ],
-                    [ 1.11 ],
-                    [ ],
+                    [3.14],
+                    [1.11],
+                    []
                 ];
-            let dsi =
+
+            const dsi =
                 [
-                    [ 1.1E10, 1.2E10, 1.3E10 ]
+                    [1.1E10, 1.2E10, 1.3E10]
                 ];
 
-            let [retval, fso, dso] = await prx.opFloatDoubleSS(fsi, dsi);
+            const [retval, fso, dso] = await prx.opFloatDoubleSS(fsi, dsi);
 
             test(fso.length === 3);
             test(fso[0].length === 1);
@@ -581,20 +570,20 @@
         }
 
         {
-            let ssi1 =
+            const ssi1 =
                 [
-                    [ "abc" ],
-                    [ "de", "fghi" ]
+                    ["abc"],
+                    ["de", "fghi"]
                 ];
 
-            let ssi2 =
+            const ssi2 =
                 [
-                    [ ],
-                    [ ],
-                    [ "xyz" ]
+                    [],
+                    [],
+                    ["xyz"]
                 ];
-            let [retval, sso] = await prx.opStringSS(ssi1, ssi2);
 
+            const [retval, sso] = await prx.opStringSS(ssi1, ssi2);
             test(sso.length === 5);
             test(sso[0].length === 1);
             test(sso[0][0] === "abc");
@@ -613,7 +602,7 @@
         }
 
         {
-            let sssi1 =
+            const sssi1 =
                 [
                     [
                         ["abc", "de"],
@@ -624,7 +613,7 @@
                     ]
                 ];
 
-            let sssi2 =
+            const sssi2 =
                 [
                     [
                         ["", ""],
@@ -636,7 +625,7 @@
                     []
                 ];
 
-            let [retval, ssso] = await prx.opStringSSS(sssi1, sssi2);
+            const [retval, ssso] = await prx.opStringSSS(sssi1, sssi2);
 
             test(ssso.length === 5);
             test(ssso[0].length === 2);
@@ -673,17 +662,16 @@
         }
 
         {
-            let di1 = new Test.ByteBoolD();
+            const di1 = new Test.ByteBoolD();
             di1.set(10, true);
             di1.set(100, false);
 
-            let di2 = new Test.ByteBoolD();
+            const di2 = new Test.ByteBoolD();
             di2.set(10, true);
             di2.set(11, false);
             di2.set(101, true);
 
-            let [retval, p3] = await prx.opByteBoolD(di1, di2);
-
+            const [retval, p3] = await prx.opByteBoolD(di1, di2);
             test(Ice.MapUtil.equals(p3, di1));
             test(retval.size === 4);
             test(retval.get(10) === true);
@@ -693,17 +681,16 @@
         }
 
         {
-            let di1 = new Test.ShortIntD();
+            const di1 = new Test.ShortIntD();
             di1.set(110, -1);
             di1.set(1100, 123123);
 
-            let di2 = new Test.ShortIntD();
+            const di2 = new Test.ShortIntD();
             di2.set(110, -1);
             di2.set(111, -100);
             di2.set(1101, 0);
 
-            let [retval, p3] = await prx.opShortIntD(di1, di2);
-
+            const [retval, p3] = await prx.opShortIntD(di1, di2);
             test(Ice.MapUtil.equals(p3, di1));
             test(retval.size === 4);
             test(retval.get(110) === -1);
@@ -713,16 +700,16 @@
         }
 
         {
-            let di1 = new Test.LongFloatD();
+            const di1 = new Test.LongFloatD();
             di1.set(new Ice.Long(0, 999999110), -1.1);
             di1.set(new Ice.Long(0, 999999111), 123123.2);
 
-            let di2 = new Test.LongFloatD();
+            const di2 = new Test.LongFloatD();
             di2.set(new Ice.Long(0, 999999110), -1.1);
             di2.set(new Ice.Long(0, 999999120), -100.4);
             di2.set(new Ice.Long(0, 999999130), 0.5);
 
-            let [retval, p3] = await prx.opLongFloatD(di1, di2);
+            const [retval, p3] = await prx.opLongFloatD(di1, di2);
 
             test(p3.equals(di1, (v1, v2) => (Math.abs(v1) - Math.abs(v2)) <= 0.01));
             test(retval.size === 4);
@@ -733,17 +720,16 @@
         }
 
         {
-            let di1 = new Test.StringStringD();
+            const di1 = new Test.StringStringD();
             di1.set("foo", "abc -1.1");
             di1.set("bar", "abc 123123.2");
 
-            let di2 = new Test.StringStringD();
+            const di2 = new Test.StringStringD();
             di2.set("foo", "abc -1.1");
             di2.set("FOO", "abc -100.4");
             di2.set("BAR", "abc 0.5");
 
-            let [retval, p3] = await prx.opStringStringD(di1, di2);
-
+            const [retval, p3] = await prx.opStringStringD(di1, di2);
             test(Ice.MapUtil.equals(p3, di1));
             test(retval.size == 4);
             test(retval.get("foo") === "abc -1.1");
@@ -753,16 +739,16 @@
         }
 
         {
-            let di1 = new Test.StringMyEnumD();
+            const di1 = new Test.StringMyEnumD();
             di1.set("abc", Test.MyEnum.enum1);
             di1.set("", Test.MyEnum.enum2);
 
-            let di2 = new Test.StringMyEnumD();
+            const di2 = new Test.StringMyEnumD();
             di2.set("abc", Test.MyEnum.enum1);
             di2.set("qwerty", Test.MyEnum.enum3);
             di2.set("Hello!!", Test.MyEnum.enum2);
 
-            let [retval, p3] = await prx.opStringMyEnumD(di1, di2);
+            const [retval, p3] = await prx.opStringMyEnumD(di1, di2);
 
             test(Ice.MapUtil.equals(p3, di1));
             test(retval.size === 4);
@@ -773,14 +759,14 @@
         }
 
         {
-            let di1 = new Test.MyEnumStringD();
+            const di1 = new Test.MyEnumStringD();
             di1.set(Test.MyEnum.enum1, "abc");
 
-            let di2 = new Test.MyEnumStringD();
+            const di2 = new Test.MyEnumStringD();
             di2.set(Test.MyEnum.enum2, "Hello!!");
             di2.set(Test.MyEnum.enum3, "qwerty");
 
-            let [retval, p3] = await prx.opMyEnumStringD(di1, di2);
+            const [retval, p3] = await prx.opMyEnumStringD(di1, di2);
 
             test(Ice.MapUtil.equals(p3, di1));
             test(retval.size === 3);
@@ -790,19 +776,19 @@
         }
 
         {
-            let s11 = new Test.MyStruct(1, 1);
-            let s12 = new Test.MyStruct(1, 2);
-            let di1 = new Test.MyStructMyEnumD();
+            const s11 = new Test.MyStruct(1, 1);
+            const s12 = new Test.MyStruct(1, 2);
+            const di1 = new Test.MyStructMyEnumD();
             di1.set(s11, Test.MyEnum.enum1);
             di1.set(s12, Test.MyEnum.enum2);
-            let s22 = new Test.MyStruct(2, 2);
-            let s23 = new Test.MyStruct(2, 3);
-            let di2 = new Test.MyStructMyEnumD();
+            const s22 = new Test.MyStruct(2, 2);
+            const s23 = new Test.MyStruct(2, 3);
+            const di2 = new Test.MyStructMyEnumD();
             di2.set(s11, Test.MyEnum.enum1);
             di2.set(s22, Test.MyEnum.enum3);
             di2.set(s23, Test.MyEnum.enum2);
 
-            let [retval, p3] = await prx.opMyStructMyEnumD(di1, di2);
+            const [retval, p3] = await prx.opMyStructMyEnumD(di1, di2);
             test(p3.equals(di1));
 
             test(retval.size === 4);
@@ -813,19 +799,18 @@
         }
 
         {
-            let ds1 = new Test.ByteBoolD();
+            const ds1 = new Test.ByteBoolD();
             ds1.set(10, true);
             ds1.set(100, false);
-            let ds2 = new Test.ByteBoolD();
+            const ds2 = new Test.ByteBoolD();
             ds2.set(10, true);
             ds2.set(11, false);
             ds2.set(101, true);
-            let ds3 = new Test.ByteBoolD();
+            const ds3 = new Test.ByteBoolD();
             ds3.set(100, false);
             ds3.set(101, false);
 
-            let [retval, p3] = await prx.opByteBoolDS([ds1, ds2], [ds3]);
-
+            const [retval, p3] = await prx.opByteBoolDS([ds1, ds2], [ds3]);
             test(retval.length == 2);
             test(retval[0].size == 3);
             test(retval[0].get(10) === true);
@@ -848,18 +833,17 @@
         }
 
         {
-            let di1 = new Test.ShortIntD();
+            const di1 = new Test.ShortIntD();
             di1.set(110, -1);
             di1.set(1100, 123123);
-            let di2 = new Test.ShortIntD();
+            const di2 = new Test.ShortIntD();
             di2.set(110, -1);
             di2.set(111, -100);
             di2.set(1101, 0);
-            let di3 = new Test.ShortIntD();
+            const di3 = new Test.ShortIntD();
             di3.set(100, -1001);
 
-            let [retval, p3] = await prx.opShortIntDS([di1, di2], [di3]);
-
+            const [retval, p3] = await prx.opShortIntDS([di1, di2], [di3]);
             test(retval.length == 2);
             test(retval[0].size == 3);
             test(retval[0].get(110) === -1);
@@ -882,17 +866,17 @@
         }
 
         {
-            let di1 = new Test.LongFloatD();
+            const di1 = new Test.LongFloatD();
             di1.set(new Ice.Long(0, 999999110), -1.1);
             di1.set(new Ice.Long(0, 999999111), 123123.2);
-            let di2 = new Test.LongFloatD();
+            const di2 = new Test.LongFloatD();
             di2.set(new Ice.Long(0, 999999110), -1.1);
             di2.set(new Ice.Long(0, 999999120), -100.4);
             di2.set(new Ice.Long(0, 999999130), 0.5);
-            let di3 = new Test.LongFloatD();
+            const di3 = new Test.LongFloatD();
             di3.set(new Ice.Long(0, 999999140), 3.14);
 
-            let[retval, p3] = await prx.opLongFloatDS([di1, di2], [di3]);
+            const [retval, p3] = await prx.opLongFloatDS([di1, di2], [di3]);
             test(retval.length == 2);
             test(retval[0].size == 3);
             test(retval[0].get(new Ice.Long(0, 999999110)) - Math.abs(-1.1) <= 0.1);
@@ -915,18 +899,17 @@
         }
 
         {
-            let di1 = new Test.StringStringD();
+            const di1 = new Test.StringStringD();
             di1.set("foo", "abc -1.1");
             di1.set("bar", "abc 123123.2");
-            let di2 = new Test.StringStringD();
+            const di2 = new Test.StringStringD();
             di2.set("foo", "abc -1.1");
             di2.set("FOO", "abc -100.4");
             di2.set("BAR", "abc 0.5");
-            let di3 = new Test.StringStringD();
+            const di3 = new Test.StringStringD();
             di3.set("f00", "ABC -3.14");
 
-            let [retval, p3] = await prx.opStringStringDS([di1, di2], [di3]);
-
+            const [retval, p3] = await prx.opStringStringDS([di1, di2], [di3]);
             test(retval.length === 2);
             test(retval[0].size === 3);
             test(retval[0].get("foo") === "abc -1.1");
@@ -949,17 +932,17 @@
         }
 
         {
-            let di1 = new Test.StringMyEnumD();
+            const di1 = new Test.StringMyEnumD();
             di1.set("abc", Test.MyEnum.enum1);
             di1.set("", Test.MyEnum.enum2);
-            let di2 = new Test.StringMyEnumD();
+            const di2 = new Test.StringMyEnumD();
             di2.set("abc", Test.MyEnum.enum1);
             di2.set("qwerty", Test.MyEnum.enum3);
             di2.set("Hello!!", Test.MyEnum.enum2);
-            let di3 = new Test.StringMyEnumD();
+            const di3 = new Test.StringMyEnumD();
             di3.set("Goodbye", Test.MyEnum.enum1);
 
-            let [retval, p3] = await prx.opStringMyEnumDS([di1, di2], [di3]);
+            const [retval, p3] = await prx.opStringMyEnumDS([di1, di2], [di3]);
 
             test(retval.length == 2);
             test(retval[0].size == 3);
@@ -983,16 +966,15 @@
         }
 
         {
-            let di1 = new Test.MyEnumStringD();
+            const di1 = new Test.MyEnumStringD();
             di1.set(Test.MyEnum.enum1, "abc");
-            let di2 = new Test.MyEnumStringD();
+            const di2 = new Test.MyEnumStringD();
             di2.set(Test.MyEnum.enum2, "Hello!!");
             di2.set(Test.MyEnum.enum3, "qwerty");
-            let di3 = new Test.MyEnumStringD();
+            const di3 = new Test.MyEnumStringD();
             di3.set(Test.MyEnum.enum1, "Goodbye");
 
-            let [retval, p3] = await prx.opMyEnumStringDS([di1, di2], [di3]);
-
+            const [retval, p3] = await prx.opMyEnumStringDS([di1, di2], [di3]);
             test(retval.length == 2);
             test(retval[0].size == 2);
             test(retval[0].get(Test.MyEnum.enum2) === "Hello!!");
@@ -1011,24 +993,23 @@
         }
 
         {
-            let s11 = new Test.MyStruct(1, 1);
-            let s12 = new Test.MyStruct(1, 2);
-            let di1 = new Test.MyStructMyEnumD();
+            const s11 = new Test.MyStruct(1, 1);
+            const s12 = new Test.MyStruct(1, 2);
+            const di1 = new Test.MyStructMyEnumD();
             di1.set(s11, Test.MyEnum.enum1);
             di1.set(s12, Test.MyEnum.enum2);
 
-            let s22 = new Test.MyStruct(2, 2);
-            let s23 = new Test.MyStruct(2, 3);
-            let di2 = new Test.MyStructMyEnumD();
+            const s22 = new Test.MyStruct(2, 2);
+            const s23 = new Test.MyStruct(2, 3);
+            const di2 = new Test.MyStructMyEnumD();
             di2.set(s11, Test.MyEnum.enum1);
             di2.set(s22, Test.MyEnum.enum3);
             di2.set(s23, Test.MyEnum.enum2);
 
-            let di3 = new Test.MyStructMyEnumD();
+            const di3 = new Test.MyStructMyEnumD();
             di3.set(s23, Test.MyEnum.enum3);
 
-            let [retval, p3] = await prx.opMyStructMyEnumDS([di1, di2], [di3]);
-
+            const [retval, p3] = await prx.opMyStructMyEnumDS([di1, di2], [di3]);
             test(retval.length == 2);
             test(retval[0].size == 3);
             test(retval[0].get(s11) === Test.MyEnum.enum1);
@@ -1051,14 +1032,13 @@
         }
 
         {
-            let sdi1 = new Test.ByteByteSD();
+            const sdi1 = new Test.ByteByteSD();
             sdi1.set(0x01, new Uint8Array([0x01, 0x11]));
             sdi1.set(0x22, new Uint8Array([0x12]));
-            let sdi2 = new Test.ByteByteSD();
+            const sdi2 = new Test.ByteByteSD();
             sdi2.set(0xf1, new Uint8Array([0xf2, 0xf3]));
 
-            let [retval, p3] = await prx.opByteByteSD(sdi1, sdi2);
-
+            const [retval, p3] = await prx.opByteByteSD(sdi1, sdi2);
             test(p3.size == 1);
             test(p3.get(0xf1).length === 2);
             test(p3.get(0xf1)[0] === 0xf2);
@@ -1075,17 +1055,15 @@
         }
 
         {
-            let si1 = [true, false];
-            let si2 = [false, true, true];
-
-            let sdi1 = new Test.BoolBoolSD();
+            const si1 = [true, false];
+            const si2 = [false, true, true];
+            const sdi1 = new Test.BoolBoolSD();
             sdi1.set(false, si1);
             sdi1.set(true, si2);
-            let sdi2 = new Test.BoolBoolSD();
+            const sdi2 = new Test.BoolBoolSD();
             sdi2.set(false, si1);
 
-            let [retval, p3] = await prx.opBoolBoolSD(sdi1, sdi2);
-
+            const [retval, p3] = await prx.opBoolBoolSD(sdi1, sdi2);
             test(p3.size === 1);
             test(p3.get(false).length === 2);
             test(p3.get(false)[0] === true);
@@ -1101,19 +1079,18 @@
         }
 
         {
-            let sdi1 = new Test.ShortShortSD();
-            let sdi2 = new Test.ShortShortSD();
+            const sdi1 = new Test.ShortShortSD();
+            const sdi2 = new Test.ShortShortSD();
 
-            let si1 = [1, 2, 3];
-            let si2 = [4, 5];
-            let si3 = [6, 7];
+            const si1 = [1, 2, 3];
+            const si2 = [4, 5];
+            const si3 = [6, 7];
 
             sdi1.set(1, si1);
             sdi1.set(2, si2);
             sdi2.set(4, si3);
 
-            let [retval, p3] = await prx.opShortShortSD(sdi1, sdi2);
-
+            const [retval, p3] = await prx.opShortShortSD(sdi1, sdi2);
             test(p3.size === 1);
             test(p3.get(4).length === 2);
             test(p3.get(4)[0] === 6);
@@ -1132,19 +1109,18 @@
         }
 
         {
-            let sdi1 = new Test.IntIntSD();
-            let sdi2 = new Test.IntIntSD();
+            const sdi1 = new Test.IntIntSD();
+            const sdi2 = new Test.IntIntSD();
 
-            let si1 = [100, 200, 300];
-            let si2 = [400, 500];
-            let si3 = [600, 700];
+            const si1 = [100, 200, 300];
+            const si2 = [400, 500];
+            const si3 = [600, 700];
 
             sdi1.set(100, si1);
             sdi1.set(200, si2);
             sdi2.set(400, si3);
 
-            let [retval, p3] = await prx.opIntIntSD(sdi1, sdi2);
-
+            const [retval, p3] = await prx.opIntIntSD(sdi1, sdi2);
             test(p3.size === 1);
             test(p3.get(400).length === 2);
             test(p3.get(400)[0] === 600);
@@ -1163,19 +1139,18 @@
         }
 
         {
-            let sdi1 = new Test.LongLongSD();
-            let sdi2 = new Test.LongLongSD();
+            const sdi1 = new Test.LongLongSD();
+            const sdi2 = new Test.LongLongSD();
 
-            let si1 = [new Ice.Long(0, 999999110), new Ice.Long(0, 999999111), new Ice.Long(0, 999999110)];
-            let si2 = [new Ice.Long(0, 999999120), new Ice.Long(0, 999999130)];
-            let si3 = [new Ice.Long(0, 999999110), new Ice.Long(0, 999999120)];
+            const si1 = [new Ice.Long(0, 999999110), new Ice.Long(0, 999999111), new Ice.Long(0, 999999110)];
+            const si2 = [new Ice.Long(0, 999999120), new Ice.Long(0, 999999130)];
+            const si3 = [new Ice.Long(0, 999999110), new Ice.Long(0, 999999120)];
 
             sdi1.set(new Ice.Long(0, 999999990), si1);
             sdi1.set(new Ice.Long(0, 999999991), si2);
             sdi2.set(new Ice.Long(0, 999999992), si3);
 
-            let [retval, p3] = await prx.opLongLongSD(sdi1, sdi2);
-
+            const [retval, p3] = await prx.opLongLongSD(sdi1, sdi2);
             test(p3.size == 1);
             test(p3.get(new Ice.Long(0, 999999992)).length === 2);
             test(p3.get(new Ice.Long(0, 999999992))[0].equals(new Ice.Long(0, 999999110)));
@@ -1194,18 +1169,18 @@
         }
 
         {
-            let sdi1 = new Test.StringFloatSD();
-            let sdi2 = new Test.StringFloatSD();
+            const sdi1 = new Test.StringFloatSD();
+            const sdi2 = new Test.StringFloatSD();
 
-            let si1 = [-1.1, 123123.2, 100.0];
-            let si2 = [42.24, -1.61];
-            let si3 = [-3.14, 3.14];
+            const si1 = [-1.1, 123123.2, 100.0];
+            const si2 = [42.24, -1.61];
+            const si3 = [-3.14, 3.14];
 
             sdi1.set("abc", si1);
             sdi1.set("ABC", si2);
             sdi2.set("aBc", si3);
 
-            let [retval, p3] = await prx.opStringFloatSD(sdi1, sdi2);
+            const [retval, p3] = await prx.opStringFloatSD(sdi1, sdi2);
 
             test(p3.size === 1);
             test(p3.get("aBc").length === 2);
@@ -1225,24 +1200,24 @@
         }
 
         {
-            let sdi1 = new Test.StringDoubleSD();
-            let sdi2 = new Test.StringDoubleSD();
+            const sdi1 = new Test.StringDoubleSD();
+            const sdi2 = new Test.StringDoubleSD();
 
-            let si1 = [1.1E10, 1.2E10, 1.3E10];
-            let si2 = [1.4E10, 1.5E10];
-            let si3 = [1.6E10, 1.7E10];
+            const si1 = [1.1E10, 1.2E10, 1.3E10];
+            const si2 = [1.4E10, 1.5E10];
+            const si3 = [1.6E10, 1.7E10];
 
             sdi1.set("Hello!!", si1);
-            sdi1.set("Goodbye",  si2);
+            sdi1.set("Goodbye", si2);
             sdi2.set("", si3);
 
-            let [retval, p3] = await prx.opStringDoubleSD(sdi1, sdi2);
+            const [retval, p3] = await prx.opStringDoubleSD(sdi1, sdi2);
 
             test(p3.size === 1);
             test(p3.get("").length === 2);
             test(p3.get("")[0] === 1.6E10);
             test(p3.get("")[1] === 1.7E10);
-            test(retval.size=== 3);
+            test(retval.size === 3);
             test(retval.get("Hello!!").length === 3);
             test(retval.get("Hello!!")[0] === 1.1E10);
             test(retval.get("Hello!!")[1] === 1.2E10);
@@ -1250,27 +1225,27 @@
             test(retval.get("Goodbye").length === 2);
             test(retval.get("Goodbye")[0] === 1.4E10);
             test(retval.get("Goodbye")[1] === 1.5E10);
-            test(retval.get("").length=== 2);
+            test(retval.get("").length === 2);
             test(retval.get("")[0] === 1.6E10);
             test(retval.get("")[1] === 1.7E10);
         }
 
         {
-            let sdi1 = new Test.StringStringSD();
-            let sdi2 = new Test.StringStringSD();
+            const sdi1 = new Test.StringStringSD();
+            const sdi2 = new Test.StringStringSD();
 
-            let si1 = ["abc", "de", "fghi"];
-            let si2 = ["xyz", "or"];
-            let si3 = ["and", "xor"];
+            const si1 = ["abc", "de", "fghi"];
+            const si2 = ["xyz", "or"];
+            const si3 = ["and", "xor"];
 
             sdi1.set("abc", si1);
             sdi1.set("def", si2);
             sdi2.set("ghi", si3);
 
-            let [retval, p3] = await prx.opStringStringSD(sdi1, sdi2);
+            const [retval, p3] = await prx.opStringStringSD(sdi1, sdi2);
 
             test(p3.size === 1);
-            test(p3.get("ghi").length ===2);
+            test(p3.get("ghi").length === 2);
             test(p3.get("ghi")[0] === "and");
             test(p3.get("ghi")[1] === "xor");
             test(retval.size === 3);
@@ -1287,24 +1262,23 @@
         }
 
         {
-            let sdi1 = new Test.MyEnumMyEnumSD();
-            let sdi2 = new Test.MyEnumMyEnumSD();
+            const sdi1 = new Test.MyEnumMyEnumSD();
+            const sdi2 = new Test.MyEnumMyEnumSD();
 
-            let si1 = [Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2];
-            let si2 = [Test.MyEnum.enum1, Test.MyEnum.enum2];
-            let si3 = [Test.MyEnum.enum3, Test.MyEnum.enum3];
+            const si1 = [Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2];
+            const si2 = [Test.MyEnum.enum1, Test.MyEnum.enum2];
+            const si3 = [Test.MyEnum.enum3, Test.MyEnum.enum3];
 
             sdi1.set(Test.MyEnum.enum3, si1);
             sdi1.set(Test.MyEnum.enum2, si2);
             sdi2.set(Test.MyEnum.enum1, si3);
 
-            let [retval, p3] = await prx.opMyEnumMyEnumSD(sdi1, sdi2);
-
+            const [retval, p3] = await prx.opMyEnumMyEnumSD(sdi1, sdi2);
             test(p3.size == 1);
             test(p3.get(Test.MyEnum.enum1).length == 2);
             test(p3.get(Test.MyEnum.enum1)[0] == Test.MyEnum.enum3);
             test(p3.get(Test.MyEnum.enum1)[1] == Test.MyEnum.enum3);
-            test(retval.size== 3);
+            test(retval.size === 3);
             test(retval.get(Test.MyEnum.enum3).length == 3);
             test(retval.get(Test.MyEnum.enum3)[0] == Test.MyEnum.enum1);
             test(retval.get(Test.MyEnum.enum3)[1] == Test.MyEnum.enum1);
@@ -1318,17 +1292,17 @@
         }
 
         {
-            let lengths = [0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000];
+            const lengths = [0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000];
 
-            for(let l of lengths)
+            for(const l of lengths)
             {
-                let s = new Array(l);
+                const s = new Array(l);
                 for(let i = 0; i < l; ++i)
                 {
                     s[i] = i;
                 }
 
-                let r = await prx.opIntS(s);
+                const r = await prx.opIntS(s);
                 test(r.length == l);
                 for(let j = 0; j < r.length; ++j)
                 {
@@ -1338,24 +1312,24 @@
         }
 
         {
-            let ctx = new Ice.Context();
+            const ctx = new Ice.Context();
             ctx.set("one", "ONE");
             ctx.set("two", "TWO");
             ctx.set("three", "THREE");
             {
                 test(prx.ice_getContext().size === 0);
-                let r = await prx.opContext();
+                const r = await prx.opContext();
                 test(!Ice.MapUtil.equals(r, ctx));
             }
 
             {
-                let r = await prx.opContext(ctx);
+                const r = await prx.opContext(ctx);
                 test(prx.ice_getContext().size === 0);
                 test(Ice.MapUtil.equals(r, ctx));
             }
 
             {
-                let p2 = await Test.MyClassPrx.checkedCast(prx.ice_context(ctx));
+                const p2 = await Test.MyClassPrx.checkedCast(prx.ice_context(ctx));
                 test(Ice.MapUtil.equals(p2.ice_getContext(), ctx));
                 let r = await p2.opContext();
                 test(Ice.MapUtil.equals(r, ctx));
@@ -1369,38 +1343,37 @@
             //
             // Test implicit context propagation
             //
-
-            let initData = new Ice.InitializationData();
+            const initData = new Ice.InitializationData();
             initData.properties = communicator.getProperties().clone();
             initData.properties.setProperty("Ice.ImplicitContext", "Shared");
 
-            let ic = Ice.initialize(initData);
+            const ic = Ice.initialize(initData);
 
             let ctx = new Ice.Context();
             ctx.set("one", "ONE");
             ctx.set("two", "TWO");
             ctx.set("three", "THREE");
 
-            let p3 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010"));
+            let p3 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint()));
 
             ic.getImplicitContext().setContext(ctx);
             test(Ice.MapUtil.equals(ic.getImplicitContext().getContext(), ctx));
             test(Ice.MapUtil.equals(await p3.opContext(), ctx));
 
             test(ic.getImplicitContext().containsKey("zero") == false);
-            let r = ic.getImplicitContext().put("zero", "ZERO");
+            const r = ic.getImplicitContext().put("zero", "ZERO");
             test(r === undefined);
             test(ic.getImplicitContext().get("zero") == "ZERO");
 
             ctx = ic.getImplicitContext().getContext();
             test(Ice.MapUtil.equals(await p3.opContext(), ctx));
 
-            let prxContext = new Ice.Context();
+            const prxContext = new Ice.Context();
             prxContext.set("one", "UN");
             prxContext.set("four", "QUATRE");
 
-            let combined = new Ice.Context(prxContext);
-            for(let [key, value] of ctx)
+            const combined = new Ice.Context(prxContext);
+            for(const [key, value] of ctx)
             {
                 if(!combined.has(key))
                 {
@@ -1424,21 +1397,15 @@
         }
 
         {
-            let d = 1278312346.0 / 13.0;
-            let ds = [];
+            const d = 1278312346.0 / 13.0;
+            const ds = [];
             for(let i = 0; i < 5; i++)
             {
                 ds[i] = d;
             }
 
             await prx.opDoubleMarshaling(d, ds);
-        }
-
-        {
             await prx.opIdempotent();
-        }
-
-        {
             await prx.opNonmutating();
         }
 
@@ -1456,14 +1423,14 @@
             test((await prx.opStringS2(null)).length === 0);
             test((await prx.opByteBoolD2(null)).size === 0);
 
-            let d = Test.MyDerivedClassPrx.uncheckedCast(prx);
+            const d = Test.MyDerivedClassPrx.uncheckedCast(prx);
             let s = new Test.MyStruct1();
             s.tesT = "Test.MyStruct1.s";
             s.myClass = null;
             s.myStruct1 = "Test.MyStruct1.myStruct1";
             s = await d.opMyStruct1(s);
             test(s.tesT == "Test.MyStruct1.s");
-            test(s.myClass == null);
+            test(s.myClass === null);
             test(s.myStruct1 == "Test.MyStruct1.myStruct1");
             let c = new Test.MyClass1();
             c.tesT = "Test.MyClass1.testT";
@@ -1471,36 +1438,34 @@
             c.myClass1 = "Test.MyClass1.myClass1";
             c = await d.opMyClass1(c);
             test(c.tesT == "Test.MyClass1.testT");
-            test(c.myClass == null);
+            test(c.myClass === null);
             test(c.myClass1 == "Test.MyClass1.myClass1");
         }
 
         {
-            let p1 = await prx.opMStruct1();
+            const p1 = await prx.opMStruct1();
             p1.e = Test.MyEnum.enum3;
-            let [p2, p3] = await prx.opMStruct2(p1);
+            const [p2, p3] = await prx.opMStruct2(p1);
             test(p2.equals(p1) && p3.equals(p1));
         }
 
         {
             await prx.opMSeq1();
-
-            let p1 = ["test"];
-            let [p2, p3] = await prx.opMSeq2(p1);
+            const p1 = ["test"];
+            const [p2, p3] = await prx.opMSeq2(p1);
             test(Ice.ArrayUtil.equals(p2, p1) && Ice.ArrayUtil.equals(p3, p1));
         }
 
         {
             await prx.opMDict1();
-
-            let p1 = new Map();
+            const p1 = new Map();
             p1.set("test", "test");
-            let [p2, p3] = await prx.opMDict2(p1);
+            const [p2, p3] = await prx.opMDict2(p1);
             test(Ice.MapUtil.equals(p2, p1) && Ice.MapUtil.equals(p3, p1));
         }
 
         {
-            let ds = [];
+            const ds = [];
             for(let i = 0; i < 5; i++)
             {
                 ds[i] = 1278312346.0 / 13.0;
@@ -1509,8 +1474,9 @@
         }
     }
 
-    exports.Twoways = { run: run };
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Twoways = {run: run};
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/optional/AMDInitialI.js zeroc-ice-3.7.2/js/test/Ice/optional/AMDInitialI.js
--- zeroc-ice-3.7.1/js/test/Ice/optional/AMDInitialI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/optional/AMDInitialI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
-    const Ice = require("ice").Ice;
     const Test = require("Test").Test;
 
     class AMDInitialI extends Test.Initial
     {
-        async shutdown(current)
+        shutdown(current)
         {
             current.adapter.getCommunicator().shutdown();
         }
 
-        async pingPong(obj, current)
+        pingPong(obj, current)
         {
             return obj;
         }
 
-        async opOptionalException(a, b, o, current)
+        opOptionalException(a, b, o, current)
         {
-            let ex = new Test.OptionalException();
+            const ex = new Test.OptionalException();
             if(a !== undefined)
             {
                 ex.a = a;
@@ -46,9 +40,9 @@
             throw ex;
         }
 
-        async opDerivedException(a, b, o, current)
+        opDerivedException(a, b, o, current)
         {
-            let ex = new Test.DerivedException();
+            const ex = new Test.DerivedException();
             if(a !== undefined)
             {
                 ex.a = a;
@@ -74,9 +68,9 @@
             throw ex;
         }
 
-        async opRequiredException(a, b, o, current)
+        opRequiredException(a, b, o, current)
         {
-            let ex = new Test.RequiredException();
+            const ex = new Test.RequiredException();
             if(a !== undefined)
             {
                 ex.a = a;
@@ -98,251 +92,252 @@
             throw ex;
         }
 
-        async opByte(p1, current)
+        opByte(p1, current)
         {
             return [p1, p1];
         }
 
-        async opBool(p1, current)
+        opBool(p1, current)
         {
             return [p1, p1];
         }
 
-        async opShort(p1, current)
+        opShort(p1, current)
         {
             return [p1, p1];
         }
 
-        async opInt(p1, current)
+        opInt(p1, current)
         {
             return [p1, p1];
         }
 
-        async opLong(p1, current)
+        opLong(p1, current)
         {
             return [p1, p1];
         }
 
-        async opFloat(p1, current)
+        opFloat(p1, current)
         {
             return [p1, p1];
         }
 
-        async opDouble(p1, current)
+        opDouble(p1, current)
         {
             return [p1, p1];
         }
 
-        async opString(p1, current)
+        opString(p1, current)
         {
             return [p1, p1];
         }
 
-        async opMyEnum(p1, current)
+        opMyEnum(p1, current)
         {
             return [p1, p1];
         }
 
-        async opSmallStruct(p1, current)
+        opSmallStruct(p1, current)
         {
             return [p1, p1];
         }
 
-        async opFixedStruct(p1, current)
+        opFixedStruct(p1, current)
         {
             return [p1, p1];
         }
 
-        async opVarStruct(p1, current)
+        opVarStruct(p1, current)
         {
             return [p1, p1];
         }
 
-        async opOneOptional(p1, current)
+        opOneOptional(p1, current)
         {
             return [p1, p1];
         }
 
-        async opOneOptionalProxy(p1, current)
+        opOneOptionalProxy(p1, current)
         {
             return [p1, p1];
         }
 
-        async opByteSeq(p1, current)
+        opByteSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opBoolSeq(p1, current)
+        opBoolSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opShortSeq(p1, current)
+        opShortSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opIntSeq(p1, current)
+        opIntSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opLongSeq(p1, current)
+        opLongSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opFloatSeq(p1, current)
+        opFloatSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opDoubleSeq(p1, current)
+        opDoubleSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opStringSeq(p1, current)
+        opStringSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opSmallStructSeq(p1, current)
+        opSmallStructSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opSmallStructList(p1, current)
+        opSmallStructList(p1, current)
         {
             return [p1, p1];
         }
 
-        async opFixedStructSeq(p1, current)
+        opFixedStructSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opFixedStructList(p1, current)
+        opFixedStructList(p1, current)
         {
             return [p1, p1];
         }
 
-        async opVarStructSeq(p1, current)
+        opVarStructSeq(p1, current)
         {
             return [p1, p1];
         }
 
-        async opSerializable(p1, current)
+        opSerializable(p1, current)
         {
             return [p1, p1];
         }
 
-        async opIntIntDict(p1, current)
+        opIntIntDict(p1, current)
         {
             return [p1, p1];
         }
 
-        async opStringIntDict(p1, current)
+        opStringIntDict(p1, current)
         {
             return [p1, p1];
         }
 
-        async opIntOneOptionalDict(p1, current)
+        opIntOneOptionalDict(p1, current)
         {
             return [p1, p1];
         }
 
-        async opClassAndUnknownOptional(p, current)
+        opClassAndUnknownOptional(p, current)
         {
         }
 
-        async sendOptionalClass(req, current)
+        sendOptionalClass(req, current)
         {
         }
 
-        async returnOptionalClass(req, current)
+        returnOptionalClass(req, current)
         {
             return new Test.OneOptional(53);
         }
 
-        async opG(g, current)
+        opG(g, current)
         {
             return g;
         }
 
-        async opVoid(current)
+        opVoid(current)
         {
         }
 
-        async opMStruct1(current)
+        opMStruct1(current)
         {
             return new Test.SmallStruct();
         }
 
-        async opMStruct2(p1, current)
+        opMStruct2(p1, current)
         {
             return [p1, p1];
         }
 
-        async opMSeq1(current)
+        opMSeq1(current)
         {
             return [];
         }
 
-        async opMSeq2(p1, current)
+        opMSeq2(p1, current)
         {
             return [p1, p1];
         }
 
-        async opMDict1(current)
+        opMDict1(current)
         {
             return new Map();
         }
 
-        async opMDict2(p1, current)
+        opMDict2(p1, current)
         {
             return [p1, p1];
         }
 
-        async opMG1(current)
+        opMG1(current)
         {
             return new Test.G();
         }
 
-        async opMG2(p1, current)
+        opMG2(p1, current)
         {
             return [p1, p1];
         }
 
-        async supportsRequiredParams(current)
+        supportsRequiredParams(current)
         {
             return false;
         }
 
-        async supportsJavaSerializable(current)
+        supportsJavaSerializable(current)
         {
             return false;
         }
 
-        async supportsCsharpSerializable(current)
+        supportsCsharpSerializable(current)
         {
             return false;
         }
 
-        async supportsCppStringView(current)
+        supportsCppStringView(current)
         {
             return false;
         }
 
-        async supportsNullOptional(current)
+        supportsNullOptional(current)
         {
             return true;
         }
     }
 
     exports.AMDInitialI = AMDInitialI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/optional/Client.js zeroc-ice-3.7.2/js/test/Ice/optional/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/optional/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/optional/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,825 +1,808 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
     const ClientPrivate = require("ClientPrivate").Test;
 
     const ArrayUtil = Ice.ArrayUtil;
 
-    async function allTests(out, communicator, Test)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests(Test)
         {
-            if(!value)
+            const communicator = this.communicator();
+            const out = this.getWriter();
+            out.write("testing stringToProxy... ");
+            const ref = "initial:" + this.getTestEndpoint();
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            let oo1 = new Test.OneOptional();
+            oo1.a = 15;
+
+            out.write("testing checked cast... ");
+            const initial = await Test.InitialPrx.checkedCast(base);
+            test(initial !== null);
+            test(initial.equals(base));
+            out.writeLine("ok");
+
+            out.write("testing marshaling... ");
+
+            const oo4 = await initial.pingPong(new Test.OneOptional());
+            test(oo4.a === undefined);
+
+            const oo5 = await initial.pingPong(oo1);
+            test(oo5.a === oo1.a);
+
+            const mo4 = await initial.pingPong(new Test.MultiOptional());
+            test(mo4.a === undefined);
+            test(mo4.b === undefined);
+            test(mo4.c === undefined);
+            test(mo4.d === undefined);
+            test(mo4.e === undefined);
+            test(mo4.f === undefined);
+            test(mo4.g === undefined);
+            test(mo4.h === undefined);
+            test(mo4.i === undefined);
+            test(mo4.j === undefined);
+            test(mo4.k === undefined);
+            test(mo4.bs === undefined);
+            test(mo4.ss === undefined);
+            test(mo4.iid === undefined);
+            test(mo4.sid === undefined);
+            test(mo4.fs === undefined);
+            test(mo4.vs === undefined);
+
+            test(mo4.shs === undefined);
+            test(mo4.es === undefined);
+            test(mo4.fss === undefined);
+            test(mo4.vss === undefined);
+            test(mo4.oos === undefined);
+            test(mo4.oops === undefined);
+
+            test(mo4.ied === undefined);
+            test(mo4.ifsd === undefined);
+            test(mo4.ivsd === undefined);
+            test(mo4.iood === undefined);
+            test(mo4.ioopd === undefined);
+
+            test(mo4.bos === undefined);
+
+            test(mo4.ser === undefined);
+
+            const mo1 = new Test.MultiOptional();
+            mo1.a = 15;
+            mo1.b = true;
+            mo1.c = 19;
+            mo1.d = 78;
+            mo1.e = new Ice.Long(0, 99);
+            mo1.f = 5.5;
+            mo1.g = 1.0;
+            mo1.h = "test";
+            mo1.i = Test.MyEnum.MyEnumMember;
+            mo1.j = communicator.stringToProxy("test");
+            mo1.k = mo1;
+            mo1.bs = new Uint8Array([5]);
+            mo1.ss = ["test", "test2"];
+            mo1.iid = new Map();
+            mo1.iid.set(4, 3);
+            mo1.sid = new Map();
+            mo1.sid.set("test", 10);
+            mo1.fs = new Test.FixedStruct();
+            mo1.fs.m = 78;
+            mo1.vs = new Test.VarStruct();
+            mo1.vs.m = "hello";
+
+            mo1.shs = [1];
+            mo1.es = [Test.MyEnum.MyEnumMember, Test.MyEnum.MyEnumMember];
+            mo1.fss = [mo1.fs];
+            mo1.vss = [mo1.vs];
+            mo1.oos = [oo1];
+            mo1.oops = [communicator.stringToProxy("test")];
+
+            mo1.ied = new Map();
+            mo1.ied.set(4, Test.MyEnum.MyEnumMember);
+            mo1.ifsd = new Map();
+            mo1.ifsd.set(4, mo1.fs);
+            mo1.ivsd = new Map();
+            mo1.ivsd.set(5, mo1.vs);
+            mo1.iood = new Map();
+            mo1.iood.set(5, new Test.OneOptional(15));
+            mo1.ioopd = new Map();
+            mo1.ioopd.set(5, communicator.stringToProxy("test"));
+
+            mo1.bos = [false, true, false];
+
+            const mo5 = await initial.pingPong(mo1);
+
+            test(mo1.a == mo5.a);
+            test(mo1.b == mo5.b);
+            test(mo1.c == mo5.c);
+            test(mo1.d == mo5.d);
+            test(mo1.e.equals(mo5.e));
+            test(mo1.f == mo5.f);
+            test(mo1.g == mo5.g);
+            test(mo1.h == mo5.h);
+            test(mo1.i == mo5.i);
+            test(mo1.j.equals(mo5.j));
+            test(mo5.k == mo5);
+            test(ArrayUtil.equals(mo5.bs, mo1.bs));
+            test(ArrayUtil.equals(mo5.ss, mo1.ss));
+            test(mo5.iid.get(4) == 3);
+            test(mo5.sid.get("test") == 10);
+            test(mo5.fs.equals(mo1.fs));
+            test(mo5.vs.equals(mo1.vs));
+            test(ArrayUtil.equals(mo5.shs, mo1.shs));
+            test(mo5.es[0] == Test.MyEnum.MyEnumMember && mo5.es[1] == Test.MyEnum.MyEnumMember);
+            test(mo5.fss[0].equals(new Test.FixedStruct(78)));
+            test(mo5.vss[0].equals(new Test.VarStruct("hello")));
+            test(mo5.oos[0].a == 15);
+            test(mo5.oops[0].equals(communicator.stringToProxy("test")));
+
+            test(mo5.ied.get(4) == Test.MyEnum.MyEnumMember);
+            test(mo5.ifsd.get(4).equals(new Test.FixedStruct(78)));
+            test(mo5.ivsd.get(5).equals(new Test.VarStruct("hello")));
+            test(mo5.iood.get(5).a == 15);
+            test(mo5.ioopd.get(5).equals(communicator.stringToProxy("test")));
+
+            test(ArrayUtil.equals(mo5.bos, [false, true, false]));
+
+            // Clear the first half of the optional parameters
+            const mo6 = new Test.MultiOptional();
+            mo6.b = mo5.b;
+            mo6.d = mo5.d;
+            mo6.f = mo5.f;
+            mo6.h = mo5.h;
+            mo6.j = mo5.j;
+            mo6.bs = mo5.bs;
+            mo6.iid = mo5.iid;
+            mo6.fs = mo5.fs;
+            mo6.shs = mo5.shs;
+            mo6.fss = mo5.fss;
+            mo6.oos = mo5.oos;
+            mo6.ifsd = mo5.ifsd;
+            mo6.iood = mo5.iood;
+            mo6.bos = mo5.bos;
+
+            const mo7 = await initial.pingPong(mo6);
+            test(mo7.a === undefined);
+            test(mo7.b == mo1.b);
+            test(mo7.c === undefined);
+            test(mo7.d == mo1.d);
+            test(mo7.e === undefined);
+            test(mo7.f == mo1.f);
+            test(mo7.g === undefined);
+            test(mo7.h == mo1.h);
+            test(mo7.i === undefined);
+            test(mo7.j.equals(mo1.j));
+            test(mo7.k === undefined);
+            test(ArrayUtil.equals(mo7.bs, mo1.bs));
+            test(mo7.ss === undefined);
+            test(mo7.iid.get(4) == 3);
+            test(mo7.sid === undefined);
+            test(mo7.fs.equals(mo1.fs));
+            test(mo7.vs === undefined);
+            test(ArrayUtil.equals(mo7.shs, mo1.shs));
+            test(mo7.es === undefined);
+            test(mo7.fss[0].equals(new Test.FixedStruct(78)));
+            test(mo7.vss === undefined);
+            test(mo7.oos[0].a == 15);
+            test(mo7.oops === undefined);
+
+            test(mo7.ied === undefined);
+            test(mo7.ifsd.get(4).equals(new Test.FixedStruct(78)));
+            test(mo7.ivsd === undefined);
+            test(mo7.iood.get(5).a == 15);
+            test(mo7.ioopd === undefined);
+
+            test(ArrayUtil.equals(mo7.bos, [false, true, false]));
+
+            // Clear the second half of the optional parameters
+            const mo8 = new Test.MultiOptional();
+            mo8.a = mo1.a;
+            mo8.c = mo1.c;
+            mo8.e = mo1.e;
+            mo8.g = mo1.g;
+            mo8.i = mo1.i;
+            mo8.k = mo8;
+            mo8.ss = mo1.ss;
+            mo8.sid = mo1.sid;
+            mo8.vs = mo1.vs;
+
+            mo8.es = mo1.es;
+            mo8.vss = mo1.vss;
+            mo8.oops = mo1.oops;
+
+            mo8.ied = mo1.ied;
+            mo8.ivsd = mo1.ivsd;
+            mo8.ioopd = mo1.ioopd;
+
+            const mo9 = await initial.pingPong(mo8);
+
+            test(mo9.a == mo1.a);
+            test(mo9.b === undefined);
+            test(mo9.c == mo1.c);
+            test(mo9.d === undefined);
+            test(mo9.e.equals(mo1.e));
+            test(mo9.f === undefined);
+            test(mo9.g == mo1.g);
+            test(mo9.h === undefined);
+            test(mo9.i == mo1.i);
+            test(mo9.j === undefined);
+            test(mo9.k == mo9);
+            test(mo9.bs === undefined);
+            test(ArrayUtil.equals(mo9.ss, mo1.ss));
+            test(mo9.iid === undefined);
+            test(mo9.sid.get("test") == 10);
+            test(mo9.fs === undefined);
+            test(mo9.vs.equals(mo1.vs));
+
+            test(mo9.shs === undefined);
+            test(mo9.es[0] == Test.MyEnum.MyEnumMember && mo9.es[1] == Test.MyEnum.MyEnumMember);
+            test(mo9.fss === undefined);
+            test(mo9.vss[0].equals(new Test.VarStruct("hello")));
+            test(mo9.oos === undefined);
+            test(mo9.oops[0].equals(communicator.stringToProxy("test")));
+
+            test(mo9.ied.get(4) == Test.MyEnum.MyEnumMember);
+            test(mo9.ifsd === undefined);
+            test(mo9.ivsd.get(5).equals(new Test.VarStruct("hello")));
+            test(mo9.iood === undefined);
+            test(mo9.ioopd.get(5).equals(communicator.stringToProxy("test")));
+
+            test(mo9.bos === undefined);
+
+            //
+            // Use the 1.0 encoding with operations whose only class parameters are optional.
+            //
+            const initial2 = initial.ice_encodingVersion(Ice.Encoding_1_0);
+            const oo = new Test.OneOptional(53);
+
+            await initial.sendOptionalClass(true, oo);
+            await initial2.sendOptionalClass(true, oo);
+            oo1 = await initial.returnOptionalClass(true);
+            test(oo1 !== undefined && oo1.a == 53);
+            oo1 = await initial2.returnOptionalClass(true);
+            test(oo1 === undefined);
+
+            const recursive1 = [new Test.Recursive()];
+            const recursive2 = [new Test.Recursive()];
+            recursive1[0].value = recursive2;
+            const outer = new Test.Recursive();
+            outer.value = recursive1;
+            await initial.pingPong(outer);
+
+            let g = new Test.G();
+            g.gg1Opt = new Test.G1("gg1Opt");
+            g.gg2 = new Test.G2(new Ice.Long(0, 10));
+            g.gg2Opt = new Test.G2(new Ice.Long(0, 20));
+            g.gg1 = new Test.G1("gg1");
+
+            g = await initial.opG(g);
+
+            test(g.gg1Opt.a == "gg1Opt");
+            test(g.gg2.a.equals(new Ice.Long(0, 10)));
+            test(g.gg2Opt.a.equals(new Ice.Long(0, 20)));
+            test(g.gg1.a == "gg1");
+
+            const init2 = ClientPrivate.Initial2Prx.uncheckedCast(initial);
+            await init2.opVoid(5, "test");
+            out.writeLine("ok");
+
+            out.write("testing marshaling of large containers with fixed size elements... ");
+            let mc = new Test.MultiOptional();
+
+            mc.bs = new Uint8Array(1000);
+            mc.shs = new Array(300);
+
+            mc.fss = [];
+            for(let i = 0; i < 300; ++i)
             {
-                let message = "test failed";
-                if(ex)
-                {
-                    message += "\n" + ex.toString();
-                }
-                throw new Error(message);
+                mc.fss[i] = new Test.FixedStruct();
             }
-        }
-
-        out.write("testing stringToProxy... ");
-        let ref = "initial:default -p 12010";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        let oo1 = new Test.OneOptional();
-        oo1.a = 15;
-
-        out.write("testing checked cast... ");
-        let initial = await Test.InitialPrx.checkedCast(base);
-        test(initial !== null);
-        test(initial.equals(base));
-        out.writeLine("ok");
-
-        out.write("testing marshaling... ");
-
-        let oo4 = await initial.pingPong(new Test.OneOptional());
-        test(oo4.a === undefined);
-
-        let oo5 = await initial.pingPong(oo1);
-        test(oo5.a === oo1.a);
-
-        let mo4 = await initial.pingPong(new Test.MultiOptional());
-        test(mo4.a === undefined);
-        test(mo4.b === undefined);
-        test(mo4.c === undefined);
-        test(mo4.d === undefined);
-        test(mo4.e === undefined);
-        test(mo4.f === undefined);
-        test(mo4.g === undefined);
-        test(mo4.h === undefined);
-        test(mo4.i === undefined);
-        test(mo4.j === undefined);
-        test(mo4.k === undefined);
-        test(mo4.bs === undefined);
-        test(mo4.ss === undefined);
-        test(mo4.iid === undefined);
-        test(mo4.sid === undefined);
-        test(mo4.fs === undefined);
-        test(mo4.vs === undefined);
-
-        test(mo4.shs === undefined);
-        test(mo4.es === undefined);
-        test(mo4.fss === undefined);
-        test(mo4.vss === undefined);
-        test(mo4.oos === undefined);
-        test(mo4.oops === undefined);
-
-        test(mo4.ied === undefined);
-        test(mo4.ifsd === undefined);
-        test(mo4.ivsd === undefined);
-        test(mo4.iood === undefined);
-        test(mo4.ioopd === undefined);
-
-        test(mo4.bos === undefined);
-
-        test(mo4.ser === undefined);
-
-        mo1 = new Test.MultiOptional();
-        mo1.a = 15;
-        mo1.b = true;
-        mo1.c = 19;
-        mo1.d = 78;
-        mo1.e = new Ice.Long(0, 99);
-        mo1.f = 5.5;
-        mo1.g = 1.0;
-        mo1.h = "test";
-        mo1.i = Test.MyEnum.MyEnumMember;
-        mo1.j = communicator.stringToProxy("test");
-        mo1.k = mo1;
-        mo1.bs = new Uint8Array([5]);
-        mo1.ss = ["test", "test2"];
-        mo1.iid = new Map();
-        mo1.iid.set(4, 3);
-        mo1.sid = new Map();
-        mo1.sid.set("test", 10);
-        mo1.fs = new Test.FixedStruct();
-        mo1.fs.m = 78;
-        mo1.vs = new Test.VarStruct();
-        mo1.vs.m = "hello";
-
-        mo1.shs = [1];
-        mo1.es = [Test.MyEnum.MyEnumMember, Test.MyEnum.MyEnumMember];
-        mo1.fss = [mo1.fs];
-        mo1.vss = [mo1.vs];
-        mo1.oos = [oo1];
-        mo1.oops = [communicator.stringToProxy("test")];
-
-        mo1.ied = new Map();
-        mo1.ied.set(4, Test.MyEnum.MyEnumMember);
-        mo1.ifsd = new Map();
-        mo1.ifsd.set(4, mo1.fs);
-        mo1.ivsd = new Map();
-        mo1.ivsd.set(5, mo1.vs);
-        mo1.iood = new Map();
-        mo1.iood.set(5, new Test.OneOptional(15));
-        mo1.ioopd = new Map();
-        mo1.ioopd.set(5, communicator.stringToProxy("test"));
-
-        mo1.bos = [false, true, false];
-
-        let mo5 = await initial.pingPong(mo1);
-
-        test(mo1.a == mo5.a);
-        test(mo1.b == mo5.b);
-        test(mo1.c == mo5.c);
-        test(mo1.d == mo5.d);
-        test(mo1.e.equals(mo5.e));
-        test(mo1.f == mo5.f);
-        test(mo1.g == mo5.g);
-        test(mo1.h == mo5.h);
-        test(mo1.i == mo5.i);
-        test(mo1.j.equals(mo5.j));
-        test(mo5.k == mo5);
-        test(ArrayUtil.equals(mo5.bs, mo1.bs));
-        test(ArrayUtil.equals(mo5.ss, mo1.ss));
-        test(mo5.iid.get(4) == 3);
-        test(mo5.sid.get("test") == 10);
-        test(mo5.fs.equals(mo1.fs));
-        test(mo5.vs.equals(mo1.vs));
-        test(ArrayUtil.equals(mo5.shs, mo1.shs));
-        test(mo5.es[0] == Test.MyEnum.MyEnumMember && mo5.es[1] == Test.MyEnum.MyEnumMember);
-        test(mo5.fss[0].equals(new Test.FixedStruct(78)));
-        test(mo5.vss[0].equals(new Test.VarStruct("hello")));
-        test(mo5.oos[0].a == 15);
-        test(mo5.oops[0].equals(communicator.stringToProxy("test")));
-
-        test(mo5.ied.get(4) == Test.MyEnum.MyEnumMember);
-        test(mo5.ifsd.get(4).equals(new Test.FixedStruct(78)));
-        test(mo5.ivsd.get(5).equals(new Test.VarStruct("hello")));
-        test(mo5.iood.get(5).a == 15);
-        test(mo5.ioopd.get(5).equals(communicator.stringToProxy("test")));
-
-        test(ArrayUtil.equals(mo5.bos, [false, true, false]));
-
-        // Clear the first half of the optional parameters
-        mo6 = new Test.MultiOptional();
-        mo6.b = mo5.b;
-        mo6.d = mo5.d;
-        mo6.f = mo5.f;
-        mo6.h = mo5.h;
-        mo6.j = mo5.j;
-        mo6.bs = mo5.bs;
-        mo6.iid = mo5.iid;
-        mo6.fs = mo5.fs;
-        mo6.shs = mo5.shs;
-        mo6.fss = mo5.fss;
-        mo6.oos = mo5.oos;
-        mo6.ifsd = mo5.ifsd;
-        mo6.iood = mo5.iood;
-        mo6.bos = mo5.bos;
-
-        let mo7 = await initial.pingPong(mo6);
-
-        test(mo7.a === undefined);
-        test(mo7.b == mo1.b);
-        test(mo7.c === undefined );
-        test(mo7.d == mo1.d);
-        test(mo7.e === undefined);
-        test(mo7.f == mo1.f);
-        test(mo7.g === undefined);
-        test(mo7.h == mo1.h);
-        test(mo7.i === undefined);
-        test(mo7.j.equals(mo1.j));
-        test(mo7.k === undefined);
-        test(ArrayUtil.equals(mo7.bs, mo1.bs));
-        test(mo7.ss === undefined);
-        test(mo7.iid.get(4) == 3);
-        test(mo7.sid === undefined);
-        test(mo7.fs.equals(mo1.fs));
-        test(mo7.vs === undefined);
-        test(ArrayUtil.equals(mo7.shs, mo1.shs));
-        test(mo7.es === undefined);
-        test(mo7.fss[0].equals(new Test.FixedStruct(78)));
-        test(mo7.vss === undefined);
-        test(mo7.oos[0].a == 15);
-        test(mo7.oops === undefined);
-
-        test(mo7.ied === undefined);
-        test(mo7.ifsd.get(4).equals(new Test.FixedStruct(78)));
-        test(mo7.ivsd === undefined);
-        test(mo7.iood.get(5).a == 15);
-        test(mo7.ioopd === undefined);
-
-        test(ArrayUtil.equals(mo7.bos, [false, true, false]));
-
-        // Clear the second half of the optional parameters
-        mo8 = new Test.MultiOptional();
-        mo8.a = mo1.a;
-        mo8.c = mo1.c;
-        mo8.e = mo1.e;
-        mo8.g = mo1.g;
-        mo8.i = mo1.i;
-        mo8.k = mo8;
-        mo8.ss = mo1.ss;
-        mo8.sid = mo1.sid;
-        mo8.vs = mo1.vs;
-
-        mo8.es = mo1.es;
-        mo8.vss = mo1.vss;
-        mo8.oops = mo1.oops;
-
-        mo8.ied = mo1.ied;
-        mo8.ivsd = mo1.ivsd;
-        mo8.ioopd = mo1.ioopd;
-
-        let mo9 = await initial.pingPong(mo8);
-
-        test(mo9.a == mo1.a);
-        test(mo9.b === undefined);
-        test(mo9.c == mo1.c);
-        test(mo9.d === undefined);
-        test(mo9.e.equals(mo1.e));
-        test(mo9.f === undefined);
-        test(mo9.g == mo1.g);
-        test(mo9.h === undefined);
-        test(mo9.i == mo1.i);
-        test(mo9.j === undefined);
-        test(mo9.k == mo9);
-        test(mo9.bs === undefined);
-        test(ArrayUtil.equals(mo9.ss, mo1.ss));
-        test(mo9.iid === undefined);
-        test(mo9.sid.get("test") == 10);
-        test(mo9.fs === undefined);
-        test(mo9.vs.equals(mo1.vs));
-
-        test(mo9.shs === undefined);
-        test(mo9.es[0] == Test.MyEnum.MyEnumMember && mo9.es[1] == Test.MyEnum.MyEnumMember);
-        test(mo9.fss === undefined);
-        test(mo9.vss[0].equals(new Test.VarStruct("hello")));
-        test(mo9.oos === undefined);
-        test(mo9.oops[0].equals(communicator.stringToProxy("test")));
-
-        test(mo9.ied.get(4) == Test.MyEnum.MyEnumMember);
-        test(mo9.ifsd === undefined);
-        test(mo9.ivsd.get(5).equals(new Test.VarStruct("hello")));
-        test(mo9.iood === undefined);
-        test(mo9.ioopd.get(5).equals(communicator.stringToProxy("test")));
-
-        test(mo9.bos === undefined);
-
-        //
-        // Use the 1.0 encoding with operations whose only class parameters are optional.
-        //
-        let initial2 = initial.ice_encodingVersion(Ice.Encoding_1_0);
-        let oo = new Test.OneOptional(53);
-
-        await initial.sendOptionalClass(true, oo);
-        await initial2.sendOptionalClass(true, oo);
-        oo1 = await initial.returnOptionalClass(true)
-        test(oo1 !== undefined && oo1.a == 53);
-        oo1 = await initial2.returnOptionalClass(true);
-        test(oo1 === undefined);
-
-        let recursive1 = [new Test.Recursive()];
-        let recursive2 = [new Test.Recursive()];
-        recursive1[0].value = recursive2;
-        let outer = new Test.Recursive();
-        outer.value = recursive1;
-        await initial.pingPong(outer);
-
-        let g = new Test.G();
-        g.gg1Opt = new Test.G1("gg1Opt");
-        g.gg2 = new Test.G2(new Ice.Long(0, 10));
-        g.gg2Opt = new Test.G2(new Ice.Long(0, 20));
-        g.gg1 = new Test.G1("gg1");
-
-        g = await initial.opG(g);
-
-        test(g.gg1Opt.a == "gg1Opt");
-        test(g.gg2.a.equals(new Ice.Long(0, 10)));
-        test(g.gg2Opt.a.equals(new Ice.Long(0, 20)));
-        test(g.gg1.a == "gg1");
-
-        let init2 = ClientPrivate.Initial2Prx.uncheckedCast(initial);
-        await init2.opVoid(5, "test");
-        out.writeLine("ok");
 
-        out.write("testing marshaling of large containers with fixed size elements... ");
-        let mc = new Test.MultiOptional();
+            mc.ifsd = new Map();
+            for(let i = 0; i < 300; ++i)
+            {
+                mc.ifsd.set(i, new Test.FixedStruct());
+            }
+            mc = await initial.pingPong(mc);
 
-        mc.bs = new Uint8Array(1000);
-        mc.shs = new Array(300);
+            test(mc.bs.length == 1000);
+            test(mc.shs.length == 300);
+            test(mc.fss.length == 300);
+            test(mc.ifsd.size == 300);
+
+            out.writeLine("ok");
+
+            out.write("testing tag marshaling... ");
+            let b = await initial.pingPong(new Test.B());
+
+            test(b.ma === undefined);
+            test(b.mb === undefined);
+            test(b.mc === undefined);
+
+            b.ma = 10;
+            b.mb = 11;
+            b.mc = 12;
+            b.md = 13;
+
+            b = await initial.pingPong(b);
+
+            test(b.ma == 10);
+            test(b.mb == 11);
+            test(b.mc == 12);
+            test(b.md == 13);
+            out.writeLine("ok");
+
+            out.write("testing marshaling of objects with optional objects... ");
+            let f = new Test.F();
+            f.af = new Test.A();
+            f.ae = f.af;
+            f = await initial.pingPong(f);
+            test(f.ae === f.af);
+            out.writeLine("ok");
+
+            out.write("testing optional with default values... ");
+
+            let wd = await initial.pingPong(new Test.WD());
+            test(wd.a == 5);
+            test(wd.s == "test");
+            wd.a = undefined;
+            wd.s = undefined;
+            wd = await initial.pingPong(wd);
+
+            test(wd.a === undefined);
+            test(wd.s === undefined);
+            out.writeLine("ok");
+
+            out.write("testing optional parameters... ");
+            let [p1, p2] = await initial.opByte(); // same as initial.opByte(undefined);
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opByte(56);
+
+            test(p1 === 56);
+            test(p2 === 56);
+            [p1, p2] = await initial.opBool();
+
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opBool(true);
+            test(p1 === true);
+            test(p2 === true);
+            [p1, p2] = await initial.opShort();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opShort(56);
+            test(p1 === 56);
+            test(p2 === 56);
+            [p1, p2] = await initial.opInt();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opInt(56);
+            test(p1 === 56);
+            test(p2 === 56);
+            [p1, p2] = await initial.opLong();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opLong(new Ice.Long(0, 56));
+            test(p1.equals(new Ice.Long(0, 56)));
+            test(p2.equals(new Ice.Long(0, 56)));
+            [p1, p2] = await initial.opFloat();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opFloat(1.0);
+            test(p1 === 1.0);
+            test(p2 === 1.0);
+            [p1, p2] = await initial.opDouble();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opDouble(1.0);
+            test(p1 === 1.0);
+            test(p2 === 1.0);
+            [p1, p2] = await initial.opString();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opString("test");
+            test(p1 === "test");
+            test(p2 === "test");
+            [p1, p2] = await initial.opMyEnum();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opMyEnum(Test.MyEnum.MyEnumMember);
+            test(p1 === Test.MyEnum.MyEnumMember);
+            test(p2 === Test.MyEnum.MyEnumMember);
+            [p1, p2] = await initial.opMyEnum(null); // Test null enum
+            test(p1 === Test.MyEnum.MyEnumMember);
+            test(p2 === Test.MyEnum.MyEnumMember);
+            [p1, p2] = await initial.opSmallStruct();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opSmallStruct(new Test.SmallStruct(56));
+            test(p1.equals(new Test.SmallStruct(56)));
+            test(p2.equals(new Test.SmallStruct(56)));
+            [p1, p2] = await initial.opSmallStruct(null); // Test null struct
+            test(p1.equals(new Test.SmallStruct(0)));
+            test(p2.equals(new Test.SmallStruct(0)));
+            [p1, p2] = await initial.opFixedStruct();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opFixedStruct(new Test.FixedStruct(56));
+            test(p1.equals(new Test.FixedStruct(56)));
+            test(p2.equals(new Test.FixedStruct(56)));
+            [p1, p2] = await initial.opVarStruct();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opVarStruct(new Test.VarStruct("test"));
+            test(p1.equals(new Test.VarStruct("test")));
+            test(p2.equals(new Test.VarStruct("test")));
+            [p1, p2] = await initial.opOneOptional();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            if(await initial.supportsNullOptional())
+            {
 
-        mc.fss = [];
-        for(let i = 0; i < 300; ++i)
-        {
-            mc.fss[i] = new Test.FixedStruct();
-        }
+                [p1, p2] = await initial.opOneOptional(null);
+                test(p1 === null);
+                test(p2 === null);
+            }
+            [p1, p2] = await initial.opOneOptional(new Test.OneOptional(58));
+            test(p1 === p2);
+            test(p2.a === 58);
+            [p1, p2] = await initial.opOneOptionalProxy();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opOneOptionalProxy(communicator.stringToProxy("test"));
+            test(p1.equals(communicator.stringToProxy("test")));
+            test(p2.equals(communicator.stringToProxy("test")));
+            [p1, p2] = await initial.opByteSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
 
-        mc.ifsd = new Map();
-        for(let i = 0; i < 300; ++i)
-        {
-            mc.ifsd.set(i, new Test.FixedStruct());
-        }
-        mc = await  initial.pingPong(mc);
+            let data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 56;
+            }
+            [p1, p2] = await initial.opByteSeq(new Uint8Array(data));
 
-        test(mc.bs.length == 1000);
-        test(mc.shs.length == 300);
-        test(mc.fss.length == 300);
-        test(mc.ifsd.size == 300);
-
-        out.writeLine("ok");
-
-        out.write("testing tag marshaling... ");
-        b = await initial.pingPong(new Test.B());
-
-        test(b.ma === undefined);
-        test(b.mb === undefined);
-        test(b.mc === undefined);
-
-        b.ma = 10;
-        b.mb = 11;
-        b.mc = 12;
-        b.md = 13;
-
-        b = await initial.pingPong(b);
-
-        test(b.ma == 10);
-        test(b.mb == 11);
-        test(b.mc == 12);
-        test(b.md == 13);
-        out.writeLine("ok");
-
-        out.write("testing marshaling of objects with optional objects... ");
-        let f = new Test.F();
-        f.af = new Test.A();
-        f.ae = f.af;
-        f = await initial.pingPong(f);
-        test(f.ae === f.af);
-        out.writeLine("ok");
-
-        out.write("testing optional with default values... ");
-
-        let wd = await initial.pingPong(new Test.WD());
-        test(wd.a == 5);
-        test(wd.s == "test");
-        wd.a = undefined;
-        wd.s = undefined;
-        wd = await initial.pingPong(wd);
-
-        test(wd.a === undefined);
-        test(wd.s === undefined);
-        out.writeLine("ok");
-
-        out.write("testing optional parameters... ");
-        let [p1, p2] = await initial.opByte(); // same as initial.opByte(undefined);
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opByte(56);
-
-        test(p1 === 56);
-        test(p2 === 56);
-        [p1, p2] = await initial.opBool();
-
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opBool(true);
-        test(p1 === true);
-        test(p2 === true);
-        [p1, p2] = await initial.opShort();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opShort(56);
-        test(p1 === 56);
-        test(p2 === 56);
-        [p1, p2] = await initial.opInt();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opInt(56);
-        test(p1 === 56);
-        test(p2 === 56);
-        [p1, p2] = await initial.opLong();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opLong(new Ice.Long(0, 56));
-        test(p1.equals(new Ice.Long(0, 56)));
-        test(p2.equals(new Ice.Long(0, 56)));
-        [p1, p2] = await initial.opFloat();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opFloat(1.0);
-        test(p1 === 1.0);
-        test(p2 === 1.0);
-        [p1, p2] = await initial.opDouble();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opDouble(1.0);
-        test(p1 === 1.0);
-        test(p2 === 1.0);
-        [p1, p2] = await initial.opString();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opString("test");
-        test(p1 === "test");
-        test(p2 === "test");
-        [p1, p2] = await initial.opMyEnum();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opMyEnum(Test.MyEnum.MyEnumMember);
-        test(p1 === Test.MyEnum.MyEnumMember);
-        test(p2 === Test.MyEnum.MyEnumMember);
-        [p1, p2] = await initial.opMyEnum(null); // Test null enum
-        test(p1 === Test.MyEnum.MyEnumMember);
-        test(p2 === Test.MyEnum.MyEnumMember);
-        [p1, p2] = await initial.opSmallStruct();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opSmallStruct(new Test.SmallStruct(56));
-        test(p1.equals(new Test.SmallStruct(56)));
-        test(p2.equals(new Test.SmallStruct(56)));
-        [p1, p2] = await initial.opSmallStruct(null); // Test null struct
-        test(p1.equals(new Test.SmallStruct(0)));
-        test(p2.equals(new Test.SmallStruct(0)));
-        [p1, p2] = await initial.opFixedStruct();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opFixedStruct(new Test.FixedStruct(56));
-        test(p1.equals(new Test.FixedStruct(56)));
-        test(p2.equals(new Test.FixedStruct(56)));
-        [p1, p2] = await initial.opVarStruct();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opVarStruct(new Test.VarStruct("test"));
-        test(p1.equals(new Test.VarStruct("test")));
-        test(p2.equals(new Test.VarStruct("test")));
-        [p1, p2] = await initial.opOneOptional();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        if(await initial.supportsNullOptional())
-        {
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 56);
+                test(p2[i] === 56);
+            }
+            [p1, p2] = await initial.opBoolSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
 
-            [p1, p2] = await initial.opOneOptional(null);
-            test(p1 === null);
-            test(p2 === null);
-        }
-        [p1, p2] = await initial.opOneOptional(new Test.OneOptional(58));
-        test(p1 === p2);
-        test(p2.a === 58);
-        [p1, p2] = await initial.opOneOptionalProxy();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        [p1, p2] = await initial.opOneOptionalProxy(communicator.stringToProxy("test"));
-        test(p1.equals(communicator.stringToProxy("test")));
-        test(p2.equals(communicator.stringToProxy("test")));
-        [p1, p2] = await initial.opByteSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = true;
+            }
+            [p1, p2] = await initial.opBoolSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === true);
+                test(p2[i] === true);
+            }
+            [p1, p2] = await initial.opShortSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
 
-        let data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = 56;
-        }
-        [p1, p2] = await initial.opByteSeq(new Uint8Array(data));
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 56;
+            }
+            [p1, p2] = await initial.opShortSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 56);
+                test(p2[i] === 56);
+            }
+            [p1, p2] = await initial.opIntSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
 
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i] === 56);
-            test(p2[i] === 56);
-        }
-        [p1, p2] = await initial.opBoolSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 56;
+            }
+            [p1, p2] = await initial.opIntSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 56);
+                test(p2[i] === 56);
+            }
+            [p1, p2] = await initial.opLongSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Ice.Long(0, 56);
+            }
+            [p1, p2] = await initial.opLongSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Ice.Long(0, 56)));
+                test(p2[i].equals(new Ice.Long(0, 56)));
+            }
+            [p1, p2] = await initial.opFloatSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 1.0;
+            }
+            [p1, p2] = await initial.opFloatSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 1.0);
+                test(p2[i] === 1.0);
+            }
+            [p1, p2] = await initial.opDoubleSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 1.0;
+            }
+            [p1, p2] = await initial.opDoubleSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 1.0);
+                test(p2[i] === 1.0);
+            }
+            [p1, p2] = await initial.opStringSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = "test1";
+            }
+            [p1, p2] = await initial.opStringSeq(data);
 
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = true;
-        }
-        [p1, p2] = await initial.opBoolSeq(data);
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i] === true);
-            test(p2[i] === true);
-        }
-        [p1, p2] = await initial.opShortSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] == "test1");
+                test(p2[i] == "test1");
+            }
+            [p1, p2] = await initial.opSmallStructSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Test.SmallStruct();
+            }
+            [p1, p2] = await initial.opSmallStructSeq(data);
 
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = 56;
-        }
-        [p1, p2] = await initial.opShortSeq(data);
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i] === 56);
-            test(p2[i] === 56);
-        }
-        [p1, p2] = await initial.opIntSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Test.SmallStruct()));
+                test(p2[i].equals(new Test.SmallStruct()));
+            }
 
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = 56;
-        }
-        [p1, p2] = await initial.opIntSeq(data);
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i] === 56);
-            test(p2[i] === 56);
-        }
-        [p1, p2] = await initial.opLongSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = new Ice.Long(0, 56);
-        }
-        [p1, p2] = await initial.opLongSeq(data);
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i].equals(new Ice.Long(0, 56)));
-            test(p2[i].equals(new Ice.Long(0, 56)));
-        }
-        [p1, p2] = await initial.opFloatSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = 1.0;
-        }
-        [p1, p2] = await initial.opFloatSeq(data);
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i] === 1.0);
-            test(p2[i] === 1.0);
-        }
-        [p1, p2] = await initial.opDoubleSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = 1.0;
-        }
-        [p1, p2] = await initial.opDoubleSeq(data);
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i] === 1.0);
-            test(p2[i] === 1.0);
-        }
-        [p1, p2] = await initial.opStringSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = "test1";
-        }
-        [p1, p2] = await initial.opStringSeq(data);
+            [p1, p2] = await initial.opFixedStructSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Test.FixedStruct();
+            }
+            [p1, p2] = await initial.opFixedStructSeq(data);
 
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i] == "test1");
-            test(p2[i] == "test1");
-        }
-        [p1, p2] = await initial.opSmallStructSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = new Test.SmallStruct();
-        }
-        [p1, p2] = await initial.opSmallStructSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Test.FixedStruct()));
+                test(p2[i].equals(new Test.FixedStruct()));
+            }
+            [p1, p2] = await initial.opVarStructSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Test.VarStruct("");
+            }
+            [p1, p2] = await initial.opVarStructSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Test.VarStruct("")));
+                test(p2[i].equals(new Test.VarStruct("")));
+            }
+            [p1, p2] = await initial.opIntIntDict();
 
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i].equals(new Test.SmallStruct()));
-            test(p2[i].equals(new Test.SmallStruct()));
-        }
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = new Map();
+            data.set(1, 2);
+            data.set(2, 3);
+            [p1, p2] = await initial.opIntIntDict(data);
+            test(Ice.MapUtil.equals(p1, p2));
+            [p1, p2] = await initial.opStringIntDict();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = new Map();
+            data.set("1", 1);
+            data.set("2", 2);
+            [p1, p2] = await initial.opStringIntDict(data);
+            test(Ice.MapUtil.equals(p1, p2));
+            [p1, p2] = await initial.opIntOneOptionalDict();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            data = new Map();
+            data.set(1, new Test.OneOptional(58));
+            data.set(2, new Test.OneOptional(59));
+            [p1, p2] = await initial.opIntOneOptionalDict(data);
+            test(p1.get(1).a === 58 && p2.get(2).a === 59);
+            out.writeLine("ok");
 
-        [p1, p2] = await initial.opFixedStructSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = new Test.FixedStruct();
-        }
-        [p1, p2] = await initial.opFixedStructSeq(data);
+            out.write("testing exception optionals... ");
 
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i].equals(new Test.FixedStruct()));
-            test(p2[i].equals(new Test.FixedStruct()));
-        }
-        [p1, p2] = await initial.opVarStructSeq();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = [];
-        for(let i = 0; i < 100; ++i)
-        {
-            data[i] = new Test.VarStruct("");
-        }
-        [p1, p2] = await initial.opVarStructSeq(data);
-        test(p1.length === 100);
-        test(p2.length === 100);
-        for(let i = 0; i < 100; ++i)
-        {
-            test(p1[i].equals(new Test.VarStruct("")));
-            test(p2[i].equals(new Test.VarStruct("")));
-        }
-        [p1, p2] = await initial.opIntIntDict();
+            try
+            {
+                await initial.opOptionalException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.OptionalException, ex);
+                test(ex.a === undefined);
+                test(ex.b === undefined);
+                test(ex.o === undefined);
+            }
 
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = new Map();
-        data.set(1, 2);
-        data.set(2, 3);
-        [p1, p2] = await initial.opIntIntDict(data);
-        test(Ice.MapUtil.equals(p1, p2));
-        [p1, p2] = await initial.opStringIntDict();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = new Map();
-        data.set("1", 1);
-        data.set("2", 2);
-        [p1, p2] = await initial.opStringIntDict(data);
-        test(Ice.MapUtil.equals(p1, p2));
-        [p1, p2] = await initial.opIntOneOptionalDict();
-        test(p1 === undefined);
-        test(p2 === undefined);
-        data = new Map();
-        data.set(1, new Test.OneOptional(58));
-        data.set(2, new Test.OneOptional(59));
-        [p1, p2] = await initial.opIntOneOptionalDict(data);
-        test(p1.get(1).a === 58 && p2.get(2).a === 59);
-        out.writeLine("ok");
+            try
+            {
+                await initial.opOptionalException(30, "test", new Test.OneOptional(53));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.OptionalException, ex);
+                test(ex.a === 30);
+                test(ex.b == "test");
+                test(ex.o.a == 53);
+            }
 
-        out.write("testing exception optionals... ");
+            try
+            {
+                await initial.opDerivedException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.DerivedException, ex);
+                test(ex.a === undefined);
+                test(ex.b === undefined);
+                test(ex.o === undefined);
+                test(ex.ss === undefined);
+                test(ex.o2 === undefined);
+            }
 
-        try
-        {
-            await initial.opOptionalException();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.OptionalException, ex);
-            test(ex.a === undefined);
-            test(ex.b === undefined);
-            test(ex.o === undefined);
-        }
+            try
+            {
+                await initial.opDerivedException(30, "test2", new Test.OneOptional(53));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.DerivedException, ex);
+                test(ex.a === 30);
+                test(ex.b == "test2");
+                test(ex.o.a === 53);
+                test(ex.ss == "test2");
+                test(ex.o2.a === 53);
+            }
 
-        try
-        {
-            await initial.opOptionalException(30, "test", new Test.OneOptional(53));
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.OptionalException, ex);
-            test(ex.a === 30);
-            test(ex.b == "test");
-            test(ex.o.a == 53);
-        }
+            out.writeLine("ok");
 
-        try
-        {
-            await initial.opDerivedException();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.DerivedException, ex);
-            test(ex.a === undefined);
-            test(ex.b === undefined);
-            test(ex.o === undefined);
-            test(ex.ss === undefined);
-            test(ex.o2 === undefined);
-        }
+            out.write("testing optionals with marshaled results... ");
 
-        try
-        {
-            await initial.opDerivedException(30, "test2", new Test.OneOptional(53));
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.DerivedException, ex);
-            test(ex.a === 30);
-            test(ex.b == "test2");
-            test(ex.o.a === 53);
-            test(ex.ss == "test2");
-            test(ex.o2.a === 53);
-        }
+            test(await initial.opMStruct1() !== undefined);
+            test(await initial.opMDict1() !== undefined);
+            test(await initial.opMSeq1() !== undefined);
+            test(await initial.opMG1() !== undefined);
 
-        out.writeLine("ok");
+            {
+                let [p3, p2] = await initial.opMStruct2();
+                test(p3 === undefined && p2 == undefined);
 
-        out.write("testing optionals with marshaled results... ");
+                const p1 = new Test.SmallStruct();
+                [p3, p2] = await initial.opMStruct2(p1);
+                test(p2.equals(p1) && p3.equals(p1));
+            }
 
-        test(await initial.opMStruct1() !== undefined);
-        test(await initial.opMDict1() !== undefined);
-        test(await initial.opMSeq1() !== undefined);
-        test(await initial.opMG1() !== undefined);
+            {
+                let [p3, p2] = await initial.opMSeq2();
+                test(p2 === undefined && p3 === undefined);
 
-        {
-            let p1, p2, p3;
-            [p3, p2] = await initial.opMStruct2();
-            test(p3 === undefined && p2 == undefined);
-
-            p1 = new Test.SmallStruct();
-            [p3, p2] = await initial.opMStruct2(p1);
-            test(p2.equals(p1) && p3.equals(p1));
-        }
+                const p1 = ["hello"];
+                [p3, p2] = await initial.opMSeq2(p1);
+                test(ArrayUtil.equals(p2, p1) && ArrayUtil.equals(p3, p1));
+            }
 
-        {
-            let p1, p2, p3;
-            [p3, p2] = await initial.opMSeq2();
-            test(p2 === undefined && p3 === undefined);
-
-            p1 = ["hello"];
-            [p3, p2] = await initial.opMSeq2(p1);
-            test(ArrayUtil.equals(p2, p1) && ArrayUtil.equals(p3, p1));
-        }
+            {
+                let [p3, p2] = await initial.opMDict2();
+                test(p2 === undefined && p3 === undefined);
 
-        {
-            let p1, p2, p3;
-            [p3, p2] = await initial.opMDict2();
-            test(p2 === undefined && p3 === undefined);
-
-            p1 = new Map();
-            p1.set("test", 54);
-            [p3, p2] = await initial.opMDict2(p1);
-            test(Ice.MapUtil.equals(p2, p1) && Ice.MapUtil.equals(p3, p1));
-        }
-        {
-            let p1, p2, p3;
-            [p3, p2] = await initial.opMG2();
-            test(p2 === undefined && p3 === undefined);
-
-            p1 = new Test.G();
-            [p3, p2] = await initial.opMG2(p1);
-            test(p3 !== undefined && p2 !== undefined && p3 === p2);
-        }
+                const p1 = new Map();
+                p1.set("test", 54);
+                [p3, p2] = await initial.opMDict2(p1);
+                test(Ice.MapUtil.equals(p2, p1) && Ice.MapUtil.equals(p3, p1));
+            }
+            {
+                let [p3, p2] = await initial.opMG2();
+                test(p2 === undefined && p3 === undefined);
 
-        out.writeLine("ok");
+                const p1 = new Test.G();
+                [p3, p2] = await initial.opMG2(p1);
+                test(p3 !== undefined && p2 !== undefined && p3 === p2);
+            }
 
-        await initial.shutdown();
-    }
+            out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator, Test);
+            await initial.shutdown();
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator] = this.initialize(args);
+                await this.allTests(Test);
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/optional/ClientPrivate.ice zeroc-ice-3.7.2/js/test/Ice/optional/ClientPrivate.ice
--- zeroc-ice-3.7.1/js/test/Ice/optional/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/optional/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/optional/InitialI.js zeroc-ice-3.7.2/js/test/Ice/optional/InitialI.js
--- zeroc-ice-3.7.1/js/test/Ice/optional/InitialI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/optional/InitialI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
-    const Ice = require("ice").Ice;
     const Test = require("Test").Test;
 
     class InitialI extends Test.Initial
@@ -341,7 +335,8 @@
         }
     }
     exports.InitialI = InitialI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/optional/ServerAMD.js zeroc-ice-3.7.2/js/test/Ice/optional/ServerAMD.js
--- zeroc-ice-3.7.1/js/test/Ice/optional/ServerAMD.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/optional/ServerAMD.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,48 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const AMDInitialI = require("AMDInitialI").AMDInitialI;
 
-    async function run(out, initData, ready)
+    class ServerAMD extends TestHelper
     {
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                [communicator] = this.initialize(args);
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.add(new AMDInitialI(), Ice.stringToIdentity("initial"));
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._serveramd = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.ServerAMD = ServerAMD;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/optional/Server.js zeroc-ice-3.7.2/js/test/Ice/optional/Server.js
--- zeroc-ice-3.7.1/js/test/Ice/optional/Server.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/optional/Server.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,58 +1,48 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const InitialI = require("InitialI").InitialI;
 
-    async function run(out, initData, ready)
+    class Server extends TestHelper
     {
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                [communicator] = this.initialize(args);
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.add(new InitialI(), Ice.stringToIdentity("initial"));
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._server = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Server = Server;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/optional/Test.ice zeroc-ice-3.7.2/js/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/properties/Client.js zeroc-ice-3.7.2/js/test/Ice/properties/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/properties/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/properties/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,96 +1,111 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+
+/* eslint-env jquery */
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    function test(value)
+    class Client extends TestHelper
     {
-        if(!value)
+        async allTests(args)
         {
-            throw new Error("test failed");
+            const out = this.getWriter();
+            out.write("testing configuration file escapes... ");
+            const props = new Map();
+            props.set("Foo\tBar", "3");
+            props.set("Foo\\tBar", "4");
+            props.set("Escape\\ Space", "2");
+            props.set("Prop1", "1");
+            props.set("Prop2", "2");
+            props.set("Prop3", "3");
+            props.set("My Prop1", "1");
+            props.set("My Prop2", "2");
+            props.set("My.Prop1", "a property");
+            props.set("My.Prop2", "a     property");
+            props.set("My.Prop3", "  a     property  ");
+            props.set("My.Prop4", "  a     property  ");
+            props.set("My.Prop5", "a \\ property");
+            props.set("foo=bar", "1");
+            props.set("foo#bar", "2");
+            props.set("foo bar", "3");
+            props.set("A", "1");
+            props.set("B", "2 3 4");
+            props.set("C", "5=#6");
+            props.set("AServer", "\\\\server\\dir");
+            props.set("BServer", "\\server\\dir");
+
+            const properties = Ice.createProperties();
+            /* eslint-disable no-sync */
+            if(typeof require("fs").readFileSync == "function")
+            {
+                const path = require("path");
+                //
+                // We are runing with NodeJS we load the properties file from the file system.
+                //
+                properties.parse(require("fs").readFileSync(path.join(args[3], "config", "escapes.cfg"),
+                                                            {encoding: "utf8"}));
+                for(const [key, value] of props)
+                {
+                    test(properties.getProperty(key) == value);
+                }
+            }
+            /* eslint-enable no-sync */
+            else if(typeof window !== 'undefined')
+            {
+                //
+                // Skiped when running in a worker, we don't load JQuery in the workers
+                //
+
+                //
+                // We are runing in a web browser load the properties file from the web server.
+                //
+                await new Promise(
+                    (resolve, reject) =>
+                        {
+                            //
+                            // Use text data type to avoid problems interpreting the data.
+                            //
+                            $.ajax({url: "config/escapes.cfg", dataType: "text"}).done(
+                                data =>
+                                    {
+                                        properties.parse(data);
+                                        for(const [key, value] of props)
+                                        {
+                                            test(properties.getProperty(key) == value);
+                                        }
+                                        resolve();
+                                    }).fail(reject);
+                        });
+            }
+            out.writeLine("ok");
         }
-    }
 
-    async function run(out, initData, args)
-    {
-        out.write("testing configuration file escapes... ");
-        const props = new Map();
-        props.set("Foo\tBar", "3");
-        props.set("Foo\\tBar", "4");
-        props.set("Escape\\ Space", "2");
-        props.set("Prop1", "1");
-        props.set("Prop2", "2");
-        props.set("Prop3", "3");
-        props.set("My Prop1", "1");
-        props.set("My Prop2", "2");
-        props.set("My.Prop1", "a property");
-        props.set("My.Prop2", "a     property");
-        props.set("My.Prop3", "  a     property  ");
-        props.set("My.Prop4", "  a     property  ");
-        props.set("My.Prop5", "a \\ property");
-        props.set("foo=bar", "1");
-        props.set("foo#bar", "2");
-        props.set("foo bar", "3");
-        props.set("A", "1");
-        props.set("B", "2 3 4");
-        props.set("C", "5=#6");
-        props.set("AServer", "\\\\server\\dir");
-        props.set("BServer", "\\server\\dir");
-
-        let properties = Ice.createProperties();
-        if(typeof(require("fs").readFileSync) == "function")
+        async run(args)
         {
-            //
-            // We are runing with NodeJS we load the properties file from the file system.
-            //
-            properties.parse(require("fs").readFileSync(args[3] + "/config/escapes.cfg", {encoding: "utf8"}));
-            for(let [key, value] of props)
+            let communicator;
+            try
             {
-                test(properties.getProperty(key) == value);
+                [communicator, args] = this.initialize(args);
+                await this.allTests(args);
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
-        else if(typeof window !== 'undefined')
-        {
-            //
-            //Skiped when running in a worker, we don't load JQuery in the workers
-            //
-
-            //
-            // We are runing in a web browser load the properties file from the web server.
-            //
-            await new Promise(
-                (resolve, reject) =>
-                    {
-                        /*jshint jquery: true */
-
-                        //
-                        // Use text data type to avoid problems interpreting the data.
-                        //
-                        $.ajax({url: "config/escapes.cfg", dataType: "text"}).done(
-                            data =>
-                                {
-                                    properties.parse(data);
-                                    for(let [key, value] of props)
-                                    {
-                                            test(properties.getProperty(key) == value);
-                                    }
-                                    resolve();
-                                }).fail(reject);
-                    });
-        }
-        out.writeLine("ok");
     }
+    exports.Client = Client;
 
-    exports._test = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/proxy/Client.js zeroc-ice-3.7.2/js/test/Ice/proxy/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/proxy/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/proxy/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,1204 +1,1172 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
-    const IceSSL = require("ice").IceSSL;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(communicator, out)
+    class Client extends TestHelper
     {
-        class TestError extends Error
+        async allTests()
         {
-            constructor(message)
+            class TestError extends Error
             {
-                super(message);
             }
-        }
 
-        function test(value, ex)
-        {
-            if(!value)
-            {
-                let message = "test failed";
-                if(ex)
-                {
-                    message += "\n" + ex.toString();
-                }
-                throw new TestError(message);
-            }
-        }
+            const communicator = this.communicator();
+            const out = this.getWriter();
 
-        let defaultProtocol = communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+            const defaultProtocol = communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp");
 
-        out.write("testing stringToProxy... ");
-        ref = "test:default -p 12010";
-        base = communicator.stringToProxy(ref);
-        test(base !== null);
-
-        b1 = communicator.stringToProxy("test");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getAdapterId().length === 0 && b1.ice_getFacet().length === 0);
-        b1 = communicator.stringToProxy("test ");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet().length === 0);
-        b1 = communicator.stringToProxy(" test ");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet().length === 0);
-        b1 = communicator.stringToProxy(" test");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet().length === 0);
-        b1 = communicator.stringToProxy("'test -f facet'");
-        test(b1.ice_getIdentity().name === "test -f facet" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet().length === 0);
+            out.write("testing stringToProxy... ");
+            const ref = "test:" + this.getTestEndpoint();
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+
+            let b1 = communicator.stringToProxy("test");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getAdapterId().length === 0 && b1.ice_getFacet().length === 0);
+            b1 = communicator.stringToProxy("test ");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet().length === 0);
+            b1 = communicator.stringToProxy(" test ");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet().length === 0);
+            b1 = communicator.stringToProxy(" test");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet().length === 0);
+            b1 = communicator.stringToProxy("'test -f facet'");
+            test(b1.ice_getIdentity().name === "test -f facet" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet().length === 0);
 
-        try
-        {
-            b1 = communicator.stringToProxy("\"test -f facet'");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ProxyParseException, ex);
-        }
+            try
+            {
+                b1 = communicator.stringToProxy("\"test -f facet'");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ProxyParseException, ex);
+            }
 
-        b1 = communicator.stringToProxy("\"test -f facet\"");
-        test(b1.ice_getIdentity().name === "test -f facet" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet().length === 0);
-        b1 = communicator.stringToProxy("\"test -f facet@test\"");
-        test(b1.ice_getIdentity().name === "test -f facet@test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet().length === 0);
-        b1 = communicator.stringToProxy("\"test -f facet@test @test\"");
-        test(b1.ice_getIdentity().name === "test -f facet@test @test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet().length === 0);
+            b1 = communicator.stringToProxy("\"test -f facet\"");
+            test(b1.ice_getIdentity().name === "test -f facet" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet().length === 0);
+            b1 = communicator.stringToProxy("\"test -f facet@test\"");
+            test(b1.ice_getIdentity().name === "test -f facet@test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet().length === 0);
+            b1 = communicator.stringToProxy("\"test -f facet@test @test\"");
+            test(b1.ice_getIdentity().name === "test -f facet@test @test" &&
+                 b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet().length === 0);
 
-        try
-        {
-            b1 = communicator.stringToProxy("test test");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ProxyParseException, ex);
-        }
+            try
+            {
+                b1 = communicator.stringToProxy("test test");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ProxyParseException, ex);
+            }
 
-        b1 = communicator.stringToProxy("test\\040test");
-        test(b1.ice_getIdentity().name === "test test" && b1.ice_getIdentity().category.length === 0);
+            b1 = communicator.stringToProxy("test\\040test");
+            test(b1.ice_getIdentity().name === "test test" && b1.ice_getIdentity().category.length === 0);
 
-        try
-        {
-            b1 = communicator.stringToProxy("test\\777");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.IdentityParseException, ex);
-        }
+            try
+            {
+                b1 = communicator.stringToProxy("test\\777");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.IdentityParseException, ex);
+            }
 
-        b1 = communicator.stringToProxy("test\\40test");
-        test(b1.ice_getIdentity().name === "test test");
+            b1 = communicator.stringToProxy("test\\40test");
+            test(b1.ice_getIdentity().name === "test test");
 
-        // Test some octal and hex corner cases.
-        b1 = communicator.stringToProxy("test\\4test");
-        test(b1.ice_getIdentity().name === "test\x04test");
-        b1 = communicator.stringToProxy("test\\04test");
-        test(b1.ice_getIdentity().name === "test\x04test");
-        b1 = communicator.stringToProxy("test\\004test");
-        test(b1.ice_getIdentity().name === "test\x04test");
-        b1 = communicator.stringToProxy("test\\1114test");
-        test(b1.ice_getIdentity().name === "test\x494test");
-
-        b1 = communicator.stringToProxy("test\\b\\f\\n\\r\\t\\'\\\"\\\\test");
-        test(b1.ice_getIdentity().name === "test\b\f\n\r\t\'\"\\test" &&
-             b1.ice_getIdentity().category.length === 0);
-
-        b1 = communicator.stringToProxy("category/test");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
-             b1.ice_getAdapterId().length === 0);
-
-        b1 = communicator.stringToProxy("");
-        test(b1 === null);
-        b1 = communicator.stringToProxy("\"\"");
-        test(b1 === null);
-        try
-        {
-            b1 = communicator.stringToProxy("\"\" test"); // Invalid trailing characters.
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ProxyParseException, ex);
-        }
+            // Test some octal and hex corner cases.
+            b1 = communicator.stringToProxy("test\\4test");
+            test(b1.ice_getIdentity().name === "test\x04test");
+            b1 = communicator.stringToProxy("test\\04test");
+            test(b1.ice_getIdentity().name === "test\x04test");
+            b1 = communicator.stringToProxy("test\\004test");
+            test(b1.ice_getIdentity().name === "test\x04test");
+            b1 = communicator.stringToProxy("test\\1114test");
+            test(b1.ice_getIdentity().name === "test\x494test");
+
+            b1 = communicator.stringToProxy("test\\b\\f\\n\\r\\t\\'\\\"\\\\test");
+            test(b1.ice_getIdentity().name === "test\b\f\n\r\t'\"\\test" &&
+                 b1.ice_getIdentity().category.length === 0);
+
+            b1 = communicator.stringToProxy("category/test");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                 b1.ice_getAdapterId().length === 0);
+
+            b1 = communicator.stringToProxy("");
+            test(b1 === null);
+            b1 = communicator.stringToProxy("\"\"");
+            test(b1 === null);
+            try
+            {
+                b1 = communicator.stringToProxy("\"\" test"); // Invalid trailing characters.
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ProxyParseException, ex);
+            }
 
-        try
-        {
-            b1 = communicator.stringToProxy("test:"); // Missing endpoint.
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            try
+            {
+                b1 = communicator.stringToProxy("test:"); // Missing endpoint.
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-        b1 = communicator.stringToProxy("test@adapter");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getAdapterId() === "adapter");
-        try
-        {
-            b1 = communicator.stringToProxy("id@adapter test");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ProxyParseException, ex);
-        }
+            b1 = communicator.stringToProxy("test@adapter");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getAdapterId() === "adapter");
+            try
+            {
+                b1 = communicator.stringToProxy("id@adapter test");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ProxyParseException, ex);
+            }
 
-        b1 = communicator.stringToProxy("category/test@adapter");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
-             b1.ice_getAdapterId() === "adapter");
-        b1 = communicator.stringToProxy("category/test@adapter:" + defaultProtocol);
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
-             b1.ice_getAdapterId() === "adapter:" + defaultProtocol);
-        b1 = communicator.stringToProxy("'category 1/test'@adapter");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category 1" &&
-             b1.ice_getAdapterId() === "adapter");
-        b1 = communicator.stringToProxy("'category/test 1'@adapter");
-        test(b1.ice_getIdentity().name === "test 1" && b1.ice_getIdentity().category === "category" &&
-             b1.ice_getAdapterId() === "adapter");
-        b1 = communicator.stringToProxy("'category/test'@'adapter 1'");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
-             b1.ice_getAdapterId() === "adapter 1");
-        b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@adapter");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category /test@foo" &&
-             b1.ice_getAdapterId() === "adapter");
-        b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@\"adapter:" + defaultProtocol + "\"");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category /test@foo" &&
-             b1.ice_getAdapterId() === "adapter:" + defaultProtocol);
-
-        b1 = communicator.stringToProxy("id -f facet");
-        test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet");
-        b1 = communicator.stringToProxy("id -f 'facet x'");
-        test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet x");
-        b1 = communicator.stringToProxy("id -f \"facet x\"");
-        test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet x");
+            b1 = communicator.stringToProxy("category/test@adapter");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                 b1.ice_getAdapterId() === "adapter");
+            b1 = communicator.stringToProxy("category/test@adapter:" + defaultProtocol);
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                 b1.ice_getAdapterId() === "adapter:" + defaultProtocol);
+            b1 = communicator.stringToProxy("'category 1/test'@adapter");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category 1" &&
+                 b1.ice_getAdapterId() === "adapter");
+            b1 = communicator.stringToProxy("'category/test 1'@adapter");
+            test(b1.ice_getIdentity().name === "test 1" && b1.ice_getIdentity().category === "category" &&
+                 b1.ice_getAdapterId() === "adapter");
+            b1 = communicator.stringToProxy("'category/test'@'adapter 1'");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                 b1.ice_getAdapterId() === "adapter 1");
+            b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@adapter");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category /test@foo" &&
+                 b1.ice_getAdapterId() === "adapter");
+            b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@\"adapter:" + defaultProtocol + "\"");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category /test@foo" &&
+                 b1.ice_getAdapterId() === "adapter:" + defaultProtocol);
+
+            b1 = communicator.stringToProxy("id -f facet");
+            test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet");
+            b1 = communicator.stringToProxy("id -f 'facet x'");
+            test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet x");
+            b1 = communicator.stringToProxy("id -f \"facet x\"");
+            test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet x");
 
-        try
-        {
-            b1 = communicator.stringToProxy("id -f \"facet x");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ProxyParseException, ex);
-        }
+            try
+            {
+                b1 = communicator.stringToProxy("id -f \"facet x");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ProxyParseException, ex);
+            }
 
-        try
-        {
-            b1 = communicator.stringToProxy("id -f \'facet x");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ProxyParseException, ex);
-        }
+            try
+            {
+                b1 = communicator.stringToProxy("id -f 'facet x");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ProxyParseException, ex);
+            }
 
-        b1 = communicator.stringToProxy("test -f facet:" + defaultProtocol);
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet" && b1.ice_getAdapterId().length === 0);
-        b1 = communicator.stringToProxy("test -f \"facet:" + defaultProtocol + "\"");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet:" + defaultProtocol && b1.ice_getAdapterId().length === 0);
-        b1 = communicator.stringToProxy("test -f facet@test");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet" && b1.ice_getAdapterId() === "test");
-        b1 = communicator.stringToProxy("test -f 'facet@test'");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet@test" && b1.ice_getAdapterId().length === 0);
-        b1 = communicator.stringToProxy("test -f 'facet@test'@test");
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getFacet() === "facet@test" && b1.ice_getAdapterId() === "test");
+            b1 = communicator.stringToProxy("test -f facet:" + defaultProtocol);
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet" && b1.ice_getAdapterId().length === 0);
+            b1 = communicator.stringToProxy("test -f \"facet:" + defaultProtocol + "\"");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet:" + defaultProtocol && b1.ice_getAdapterId().length === 0);
+            b1 = communicator.stringToProxy("test -f facet@test");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet" && b1.ice_getAdapterId() === "test");
+            b1 = communicator.stringToProxy("test -f 'facet@test'");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet@test" && b1.ice_getAdapterId().length === 0);
+            b1 = communicator.stringToProxy("test -f 'facet@test'@test");
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getFacet() === "facet@test" && b1.ice_getAdapterId() === "test");
 
-        try
-        {
-            b1 = communicator.stringToProxy("test -f facet@test @test");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ProxyParseException, ex);
-        }
-        b1 = communicator.stringToProxy("test");
-        test(b1.ice_isTwoway());
-        b1 = communicator.stringToProxy("test -t");
-        test(b1.ice_isTwoway());
-        b1 = communicator.stringToProxy("test -o");
-        test(b1.ice_isOneway());
-        b1 = communicator.stringToProxy("test -O");
-        test(b1.ice_isBatchOneway());
-        b1 = communicator.stringToProxy("test -d");
-        test(b1.ice_isDatagram());
-        b1 = communicator.stringToProxy("test -D");
-        test(b1.ice_isBatchDatagram());
-        b1 = communicator.stringToProxy("test");
-        test(!b1.ice_isSecure());
-        b1 = communicator.stringToProxy("test -s");
-        test(b1.ice_isSecure());
-
-        test(b1.ice_getEncodingVersion().equals(Ice.currentEncoding()));
-
-        b1 = communicator.stringToProxy("test -e 1.0");
-        test(b1.ice_getEncodingVersion().major === 1 && b1.ice_getEncodingVersion().minor === 0);
-
-        b1 = communicator.stringToProxy("test -e 6z.5");
-        test(b1.ice_getEncodingVersion().major === 6 && b1.ice_getEncodingVersion().minor === 5);
+            try
+            {
+                b1 = communicator.stringToProxy("test -f facet@test @test");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ProxyParseException, ex);
+            }
+            b1 = communicator.stringToProxy("test");
+            test(b1.ice_isTwoway());
+            b1 = communicator.stringToProxy("test -t");
+            test(b1.ice_isTwoway());
+            b1 = communicator.stringToProxy("test -o");
+            test(b1.ice_isOneway());
+            b1 = communicator.stringToProxy("test -O");
+            test(b1.ice_isBatchOneway());
+            b1 = communicator.stringToProxy("test -d");
+            test(b1.ice_isDatagram());
+            b1 = communicator.stringToProxy("test -D");
+            test(b1.ice_isBatchDatagram());
+            b1 = communicator.stringToProxy("test");
+            test(!b1.ice_isSecure());
+            b1 = communicator.stringToProxy("test -s");
+            test(b1.ice_isSecure());
+
+            test(b1.ice_getEncodingVersion().equals(Ice.currentEncoding()));
+
+            b1 = communicator.stringToProxy("test -e 1.0");
+            test(b1.ice_getEncodingVersion().major === 1 && b1.ice_getEncodingVersion().minor === 0);
 
-        b1 = communicator.stringToProxy("test -p 1.0 -e 1.0");
-        test(b1.toString() === "test -t -e 1.0");
+            b1 = communicator.stringToProxy("test -e 6z.5");
+            test(b1.ice_getEncodingVersion().major === 6 && b1.ice_getEncodingVersion().minor === 5);
 
-        b1 = communicator.stringToProxy("test -p 6.5 -e 1.0");
-        test(b1.toString() === "test -t -p 6.5 -e 1.0");
+            b1 = communicator.stringToProxy("test -p 1.0 -e 1.0");
+            test(b1.toString() === "test -t -e 1.0");
 
-        try
-        {
-            b1 = communicator.stringToProxy("test:" + defaultProtocol + "@adapterId");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            b1 = communicator.stringToProxy("test -p 6.5 -e 1.0");
+            test(b1.toString() === "test -t -p 6.5 -e 1.0");
 
-        // This is an unknown endpoint warning, not a parse exception.
-        //
-        //try
-        //{
-        //   b1 = communicator.stringToProxy("test -f the:facet:tcp");
-        //   test(false);
-        //}
-        //catch(ex:Ice.EndpointParseException)
-        //{
-        //}
-        try
-        {
-            b1 = communicator.stringToProxy("test::" + defaultProtocol);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            try
+            {
+                b1 = communicator.stringToProxy("test:" + defaultProtocol + "@adapterId");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-        //
-        // Test for bug ICE-5543: escaped escapes in stringToIdentity
-        //
-
-        let id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\");
-        let id2 = Ice.stringToIdentity(Ice.identityToString(id));
-        test(id.equals(id2));
-
-        id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\");
-        id2 = Ice.stringToIdentity(Ice.identityToString(id));
-        test(id.equals(id2));
-
-        id = new Ice.Identity("/test", "cat/");
-        let idStr = Ice.identityToString(id);
-        test(idStr === "cat\\//\\/test");
-        id2 = Ice.stringToIdentity(idStr);
-        test(id.equals(id2));
-
-        // Input string with various pitfalls
-        // id = Ice.stringToIdentity("\\342\\x82\\254\\60\\x9\\60\\");
-        // test(id.name === "€0\t0\\" && id.category.isEmpty());
+            try
+            {
+                b1 = communicator.stringToProxy("test::" + defaultProtocol);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-        try
-        {
-            // Illegal character < 32
-            id = Ice.stringToIdentity("xx\x01FooBar");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.IdentityParseException);
-        }
+            //
+            // Test for bug ICE-5543: escaped escapes in stringToIdentity
+            //
 
-        try
-        {
-            // Illegal surrogate
-            id = Ice.stringToIdentity("xx\\ud911");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.IdentityParseException, ex);
-        }
+            let id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\");
+            let id2 = Ice.stringToIdentity(Ice.identityToString(id));
+            test(id.equals(id2));
+
+            id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\");
+            id2 = Ice.stringToIdentity(Ice.identityToString(id));
+            test(id.equals(id2));
+
+            id = new Ice.Identity("/test", "cat/");
+            let idStr = Ice.identityToString(id);
+            test(idStr === "cat\\//\\/test");
+            id2 = Ice.stringToIdentity(idStr);
+            test(id.equals(id2));
+
+            // Input string with various pitfalls
+            // id = Ice.stringToIdentity("\\342\\x82\\254\\60\\x9\\60\\");
+            // test(id.name === "€0\t0\\" && id.category.isEmpty());
 
-        // Testing bytes 127 (\x7F) and €
-        id = new Ice.Identity("test", "\x7F€");
+            try
+            {
+                // Illegal character < 32
+                id = Ice.stringToIdentity("xx\x01FooBar");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.IdentityParseException);
+            }
 
-        idStr = Ice.identityToString(id, Ice.ToStringMode.Unicode);
-        test(idStr === "\\u007f€/test");
-        id2 = Ice.stringToIdentity(idStr);
-        test(id.equals(id2));
-        test(Ice.identityToString(id) === idStr);
-
-        idStr = Ice.identityToString(id, Ice.ToStringMode.ASCII);
-        test(idStr === "\\u007f\\u20ac/test");
-        id2 = Ice.stringToIdentity(idStr);
-        test(id.equals(id2));
-
-        idStr = Ice.identityToString(id, Ice.ToStringMode.Compat);
-        test(idStr === "\\177\\342\\202\\254/test");
-        id2 = Ice.stringToIdentity(idStr);
-        test(id.equals(id2));
-
-        id2 = Ice.stringToIdentity(communicator.identityToString(id));
-        test(id.equals(id2));
-
-        // More unicode characters
-
-        id = new Ice.Identity("banana \x0e-\ud83c\udf4c\u20ac\u00a2\u0024", "greek \ud800\udd6a");
-
-        idStr = Ice.identityToString(id, Ice.ToStringMode.Unicode);
-        test(idStr === "greek \ud800\udd6a/banana \\u000e-\ud83c\udf4c\u20ac\u00a2$");
-        id2 = Ice.stringToIdentity(idStr);
-        test(id.equals(id2));
-
-        idStr = Ice.identityToString(id, Ice.ToStringMode.ASCII);
-        test(idStr === "greek \\U0001016a/banana \\u000e-\\U0001f34c\\u20ac\\u00a2$");
-        id2 = Ice.stringToIdentity(idStr);
-        test(id.equals(id2));
-
-        idStr = Ice.identityToString(id, Ice.ToStringMode.Compat);
-        test(idStr === "greek \\360\\220\\205\\252/banana \\016-\\360\\237\\215\\214\\342\\202\\254\\302\\242$");
-        id2 = Ice.stringToIdentity(idStr);
-        test(id.equals(id2));
-
-        out.writeLine("ok");
-
-        out.write("testing propertyToProxy... ");
-        let prop = communicator.getProperties();
-        let propertyPrefix = "Foo.Proxy";
-        prop.setProperty(propertyPrefix, "test:default -p 12010");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
-             b1.ice_getAdapterId().length === 0 && b1.ice_getFacet().length === 0);
-
-        let property = propertyPrefix + ".Locator";
-        test(b1.ice_getLocator() === null);
-        prop.setProperty(property, "locator:default -p 10000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocator() !== null && b1.ice_getLocator().ice_getIdentity().name === "locator");
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".LocatorCacheTimeout";
-        test(b1.ice_getLocatorCacheTimeout() === -1);
-        prop.setProperty(property, "1");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocatorCacheTimeout() === 1);
-        prop.setProperty(property, "");
-
-        // Now retest with an indirect proxy.
-        prop.setProperty(propertyPrefix, "test");
-        property = propertyPrefix + ".Locator";
-        prop.setProperty(property, "locator:default -p 10000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocator() !== null && b1.ice_getLocator().ice_getIdentity().name === "locator");
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".LocatorCacheTimeout";
-        test(b1.ice_getLocatorCacheTimeout() === -1);
-        prop.setProperty(property, "1");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getLocatorCacheTimeout() === 1);
-        prop.setProperty(property, "");
-
-        // This cannot be tested so easily because the property is cached
-        // on communicator initialization.
-        //
-        //prop.setProperty("Ice.Default.LocatorCacheTimeout", "60");
-        //b1 = communicator.propertyToProxy(propertyPrefix);
-        //test(b1.ice_getLocatorCacheTimeout() === 60);
-        //prop.setProperty("Ice.Default.LocatorCacheTimeout", "");
-
-        prop.setProperty(propertyPrefix, "test:default -p 12010");
-
-        property = propertyPrefix + ".Router";
-        test(b1.ice_getRouter() === null);
-        prop.setProperty(property, "router:default -p 10000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getRouter() !== null && b1.ice_getRouter().ice_getIdentity().name === "router");
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".PreferSecure";
-        test(!b1.ice_isPreferSecure());
-        prop.setProperty(property, "1");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_isPreferSecure());
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".ConnectionCached";
-        test(b1.ice_isConnectionCached());
-        prop.setProperty(property, "0");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(!b1.ice_isConnectionCached());
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".InvocationTimeout";
-        test(b1.ice_getInvocationTimeout() == -1);
-        prop.setProperty(property, "1000");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getInvocationTimeout() == 1000);
-        prop.setProperty(property, "");
-
-        property = propertyPrefix + ".EndpointSelection";
-        test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Random);
-        prop.setProperty(property, "Random");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Random);
-        prop.setProperty(property, "Ordered");
-        b1 = communicator.propertyToProxy(propertyPrefix);
-        test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Ordered);
-        prop.setProperty(property, "");
-
-        out.writeLine("ok");
-
-        out.write("testing proxyToProperty... ");
-
-        b1 = communicator.stringToProxy("test");
-        b1 = b1.ice_connectionCached(true);
-        b1 = b1.ice_preferSecure(false);
-        b1 = b1.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
-        b1 = b1.ice_locatorCacheTimeout(100);
-        b1 = b1.ice_invocationTimeout(1234);
-        b1 = b1.ice_encodingVersion(new Ice.EncodingVersion(1, 0));
-
-        let router = communicator.stringToProxy("router");
-        router = router.ice_connectionCached(true);
-        router = router.ice_preferSecure(true);
-        router = router.ice_endpointSelection(Ice.EndpointSelectionType.Random);
-        router = router.ice_locatorCacheTimeout(200);
-        router = router.ice_invocationTimeout(1500);
-
-        let locator = communicator.stringToProxy("locator");
-        locator = locator.ice_connectionCached(false);
-        locator = locator.ice_preferSecure(true);
-        locator = locator.ice_endpointSelection(Ice.EndpointSelectionType.Random);
-        locator = locator.ice_locatorCacheTimeout(300);
-        locator = locator.ice_invocationTimeout(1500);
-
-        locator = locator.ice_router(Ice.RouterPrx.uncheckedCast(router));
-        b1 = b1.ice_locator(Ice.LocatorPrx.uncheckedCast(locator));
-
-        let proxyProps = communicator.proxyToProperty(b1, "Test");
-        test(proxyProps.size === 21);
-        test(proxyProps.get("Test") === "test -t -e 1.0");
-        test(proxyProps.get("Test.CollocationOptimized") === "0");
-        test(proxyProps.get("Test.ConnectionCached") === "1");
-        test(proxyProps.get("Test.PreferSecure") === "0");
-        test(proxyProps.get("Test.EndpointSelection") === "Ordered");
-        test(proxyProps.get("Test.LocatorCacheTimeout") === "100");
-        test(proxyProps.get("Test.InvocationTimeout") === "1234");
-
-        test(proxyProps.get("Test.Locator") === "locator -t -e " +
-             Ice.encodingVersionToString(Ice.currentEncoding()));
-        test(proxyProps.get("Test.Locator.CollocationOptimized") === "0");
-        test(proxyProps.get("Test.Locator.ConnectionCached") === "0");
-        test(proxyProps.get("Test.Locator.PreferSecure") === "1");
-        test(proxyProps.get("Test.Locator.EndpointSelection") === "Random");
-        test(proxyProps.get("Test.Locator.LocatorCacheTimeout") === "300");
-        test(proxyProps.get("Test.Locator.InvocationTimeout") === "1500");
-
-        test(proxyProps.get("Test.Locator.Router") === "router -t -e " +
-             Ice.encodingVersionToString(Ice.currentEncoding()));
-        test(proxyProps.get("Test.Locator.Router.CollocationOptimized") === "0");
-        test(proxyProps.get("Test.Locator.Router.ConnectionCached") === "1");
-        test(proxyProps.get("Test.Locator.Router.PreferSecure") === "1");
-        test(proxyProps.get("Test.Locator.Router.EndpointSelection") === "Random");
-        test(proxyProps.get("Test.Locator.Router.LocatorCacheTimeout") === "200");
-        test(proxyProps.get("Test.Locator.Router.InvocationTimeout") === "1500");
-
-        out.writeLine("ok");
-
-        out.write("testing ice_getCommunicator... ");
-        test(base.ice_getCommunicator() === communicator);
-        out.writeLine("ok");
-
-        out.write("testing proxy methods... ");
-        test(communicator.identityToString(
-            base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other");
-        test(Ice.identityToString(
-            base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other");
-        test(base.ice_facet("facet").ice_getFacet() === "facet");
-        test(base.ice_adapterId("id").ice_getAdapterId() === "id");
-        test(base.ice_twoway().ice_isTwoway());
-        test(base.ice_oneway().ice_isOneway());
-        test(base.ice_batchOneway().ice_isBatchOneway());
-        test(base.ice_datagram().ice_isDatagram());
-        test(base.ice_batchDatagram().ice_isBatchDatagram());
-        test(base.ice_secure(true).ice_isSecure());
-        test(!base.ice_secure(false).ice_isSecure());
-        test(base.ice_preferSecure(true).ice_isPreferSecure());
-        test(!base.ice_preferSecure(false).ice_isPreferSecure());
-        test(base.ice_encodingVersion(Ice.Encoding_1_0).ice_getEncodingVersion().equals(Ice.Encoding_1_0));
-        test(base.ice_encodingVersion(Ice.Encoding_1_1).ice_getEncodingVersion().equals(Ice.Encoding_1_1));
-        test(!base.ice_encodingVersion(Ice.Encoding_1_0).ice_getEncodingVersion().equals(Ice.Encoding_1_1));
+            try
+            {
+                // Illegal surrogate
+                id = Ice.stringToIdentity("xx\\ud911");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.IdentityParseException, ex);
+            }
 
-        try
-        {
-            base.ice_timeout(0);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(!(ex instanceof TestError), ex);
-        }
+            // Testing bytes 127 (\x7F) and €
+            id = new Ice.Identity("test", "\x7F€");
 
-        try
-        {
-            base.ice_timeout(-1);
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
+            idStr = Ice.identityToString(id, Ice.ToStringMode.Unicode);
+            test(idStr === "\\u007f€/test");
+            id2 = Ice.stringToIdentity(idStr);
+            test(id.equals(id2));
+            test(Ice.identityToString(id) === idStr);
+
+            idStr = Ice.identityToString(id, Ice.ToStringMode.ASCII);
+            test(idStr === "\\u007f\\u20ac/test");
+            id2 = Ice.stringToIdentity(idStr);
+            test(id.equals(id2));
+
+            idStr = Ice.identityToString(id, Ice.ToStringMode.Compat);
+            test(idStr === "\\177\\342\\202\\254/test");
+            id2 = Ice.stringToIdentity(idStr);
+            test(id.equals(id2));
+
+            id2 = Ice.stringToIdentity(communicator.identityToString(id));
+            test(id.equals(id2));
+
+            // More unicode characters
+
+            id = new Ice.Identity("banana \x0e-\ud83c\udf4c\u20ac\u00a2\u0024", "greek \ud800\udd6a");
+
+            idStr = Ice.identityToString(id, Ice.ToStringMode.Unicode);
+            test(idStr === "greek \ud800\udd6a/banana \\u000e-\ud83c\udf4c\u20ac\u00a2$");
+            id2 = Ice.stringToIdentity(idStr);
+            test(id.equals(id2));
+
+            idStr = Ice.identityToString(id, Ice.ToStringMode.ASCII);
+            test(idStr === "greek \\U0001016a/banana \\u000e-\\U0001f34c\\u20ac\\u00a2$");
+            id2 = Ice.stringToIdentity(idStr);
+            test(id.equals(id2));
+
+            idStr = Ice.identityToString(id, Ice.ToStringMode.Compat);
+            test(idStr === "greek \\360\\220\\205\\252/banana \\016-\\360\\237\\215\\214\\342\\202\\254\\302\\242$");
+            id2 = Ice.stringToIdentity(idStr);
+            test(id.equals(id2));
 
-        try
-        {
-            base.ice_timeout(-2);
-            test(false, ex);
-        }
-        catch(ex)
-        {
-            test(!(ex instanceof TestError), ex);
-        }
+            out.writeLine("ok");
 
-        try
-        {
-            base.ice_invocationTimeout(0);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(!(ex instanceof TestError), ex);
-        }
+            out.write("testing propertyToProxy... ");
+            const prop = communicator.getProperties();
+            const propertyPrefix = "Foo.Proxy";
+            prop.setProperty(propertyPrefix, "test:" + this.getTestEndpoint());
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                 b1.ice_getAdapterId().length === 0 && b1.ice_getFacet().length === 0);
+
+            let property = propertyPrefix + ".Locator";
+            test(b1.ice_getLocator() === null);
+            prop.setProperty(property, "locator:default -p 10000");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getLocator() !== null && b1.ice_getLocator().ice_getIdentity().name === "locator");
+            prop.setProperty(property, "");
+
+            property = propertyPrefix + ".LocatorCacheTimeout";
+            test(b1.ice_getLocatorCacheTimeout() === -1);
+            prop.setProperty(property, "1");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getLocatorCacheTimeout() === 1);
+            prop.setProperty(property, "");
+
+            // Now retest with an indirect proxy.
+            prop.setProperty(propertyPrefix, "test");
+            property = propertyPrefix + ".Locator";
+            prop.setProperty(property, "locator:default -p 10000");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getLocator() !== null && b1.ice_getLocator().ice_getIdentity().name === "locator");
+            prop.setProperty(property, "");
+
+            property = propertyPrefix + ".LocatorCacheTimeout";
+            test(b1.ice_getLocatorCacheTimeout() === -1);
+            prop.setProperty(property, "1");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getLocatorCacheTimeout() === 1);
+            prop.setProperty(property, "");
+
+            prop.setProperty(propertyPrefix, "test:" + this.getTestEndpoint());
+
+            property = propertyPrefix + ".Router";
+            test(b1.ice_getRouter() === null);
+            prop.setProperty(property, "router:default -p 10000");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getRouter() !== null && b1.ice_getRouter().ice_getIdentity().name === "router");
+            prop.setProperty(property, "");
+
+            property = propertyPrefix + ".PreferSecure";
+            test(!b1.ice_isPreferSecure());
+            prop.setProperty(property, "1");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_isPreferSecure());
+            prop.setProperty(property, "");
+
+            property = propertyPrefix + ".ConnectionCached";
+            test(b1.ice_isConnectionCached());
+            prop.setProperty(property, "0");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(!b1.ice_isConnectionCached());
+            prop.setProperty(property, "");
+
+            property = propertyPrefix + ".InvocationTimeout";
+            test(b1.ice_getInvocationTimeout() == -1);
+            prop.setProperty(property, "1000");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getInvocationTimeout() == 1000);
+            prop.setProperty(property, "");
+
+            property = propertyPrefix + ".EndpointSelection";
+            test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Random);
+            prop.setProperty(property, "Random");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Random);
+            prop.setProperty(property, "Ordered");
+            b1 = communicator.propertyToProxy(propertyPrefix);
+            test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Ordered);
+            prop.setProperty(property, "");
 
-        try
-        {
-            base.ice_invocationTimeout(-1);
-        }
-        catch(ex)
-        {
-            test(false);
-        }
+            out.writeLine("ok");
 
-        try
-        {
-            base.ice_invocationTimeout(-2);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(!(ex instanceof TestError), ex);
-        }
+            out.write("testing proxyToProperty... ");
 
-        try
-        {
-            base.ice_locatorCacheTimeout(0);
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
+            b1 = communicator.stringToProxy("test");
+            b1 = b1.ice_connectionCached(true);
+            b1 = b1.ice_preferSecure(false);
+            b1 = b1.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
+            b1 = b1.ice_locatorCacheTimeout(100);
+            b1 = b1.ice_invocationTimeout(1234);
+            b1 = b1.ice_encodingVersion(new Ice.EncodingVersion(1, 0));
+
+            let router = communicator.stringToProxy("router");
+            router = router.ice_connectionCached(true);
+            router = router.ice_preferSecure(true);
+            router = router.ice_endpointSelection(Ice.EndpointSelectionType.Random);
+            router = router.ice_locatorCacheTimeout(200);
+            router = router.ice_invocationTimeout(1500);
+
+            let locator = communicator.stringToProxy("locator");
+            locator = locator.ice_connectionCached(false);
+            locator = locator.ice_preferSecure(true);
+            locator = locator.ice_endpointSelection(Ice.EndpointSelectionType.Random);
+            locator = locator.ice_locatorCacheTimeout(300);
+            locator = locator.ice_invocationTimeout(1500);
+
+            locator = locator.ice_router(Ice.RouterPrx.uncheckedCast(router));
+            b1 = b1.ice_locator(Ice.LocatorPrx.uncheckedCast(locator));
+
+            const proxyProps = communicator.proxyToProperty(b1, "Test");
+            test(proxyProps.size === 21);
+            test(proxyProps.get("Test") === "test -t -e 1.0");
+            test(proxyProps.get("Test.CollocationOptimized") === "0");
+            test(proxyProps.get("Test.ConnectionCached") === "1");
+            test(proxyProps.get("Test.PreferSecure") === "0");
+            test(proxyProps.get("Test.EndpointSelection") === "Ordered");
+            test(proxyProps.get("Test.LocatorCacheTimeout") === "100");
+            test(proxyProps.get("Test.InvocationTimeout") === "1234");
+
+            test(proxyProps.get("Test.Locator") === "locator -t -e " +
+                 Ice.encodingVersionToString(Ice.currentEncoding()));
+            test(proxyProps.get("Test.Locator.CollocationOptimized") === "0");
+            test(proxyProps.get("Test.Locator.ConnectionCached") === "0");
+            test(proxyProps.get("Test.Locator.PreferSecure") === "1");
+            test(proxyProps.get("Test.Locator.EndpointSelection") === "Random");
+            test(proxyProps.get("Test.Locator.LocatorCacheTimeout") === "300");
+            test(proxyProps.get("Test.Locator.InvocationTimeout") === "1500");
+
+            test(proxyProps.get("Test.Locator.Router") === "router -t -e " +
+                 Ice.encodingVersionToString(Ice.currentEncoding()));
+            test(proxyProps.get("Test.Locator.Router.CollocationOptimized") === "0");
+            test(proxyProps.get("Test.Locator.Router.ConnectionCached") === "1");
+            test(proxyProps.get("Test.Locator.Router.PreferSecure") === "1");
+            test(proxyProps.get("Test.Locator.Router.EndpointSelection") === "Random");
+            test(proxyProps.get("Test.Locator.Router.LocatorCacheTimeout") === "200");
+            test(proxyProps.get("Test.Locator.Router.InvocationTimeout") === "1500");
 
-        try
-        {
-            base.ice_locatorCacheTimeout(-1);
-        }
-        catch(ex)
-        {
-            test(false, ex);
-        }
+            out.writeLine("ok");
 
-        try
-        {
-            base.ice_locatorCacheTimeout(-2);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(!(ex instanceof TestError), ex);
-        }
+            out.write("testing ice_getCommunicator... ");
+            test(base.ice_getCommunicator() === communicator);
+            out.writeLine("ok");
 
-        out.writeLine("ok");
+            out.write("testing proxy methods... ");
+            test(communicator.identityToString(
+                base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other");
+            test(Ice.identityToString(
+                base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other");
+            test(base.ice_facet("facet").ice_getFacet() === "facet");
+            test(base.ice_adapterId("id").ice_getAdapterId() === "id");
+            test(base.ice_twoway().ice_isTwoway());
+            test(base.ice_oneway().ice_isOneway());
+            test(base.ice_batchOneway().ice_isBatchOneway());
+            test(base.ice_datagram().ice_isDatagram());
+            test(base.ice_batchDatagram().ice_isBatchDatagram());
+            test(base.ice_secure(true).ice_isSecure());
+            test(!base.ice_secure(false).ice_isSecure());
+            test(base.ice_preferSecure(true).ice_isPreferSecure());
+            test(!base.ice_preferSecure(false).ice_isPreferSecure());
+            test(base.ice_encodingVersion(Ice.Encoding_1_0).ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+            test(base.ice_encodingVersion(Ice.Encoding_1_1).ice_getEncodingVersion().equals(Ice.Encoding_1_1));
+            test(!base.ice_encodingVersion(Ice.Encoding_1_0).ice_getEncodingVersion().equals(Ice.Encoding_1_1));
 
-        out.write("testing proxy comparison... ");
+            try
+            {
+                base.ice_timeout(0);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(!(ex instanceof TestError), ex);
+            }
 
-        test(communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo")));
-        test(!communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo2")));
+            try
+            {
+                base.ice_timeout(-1);
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
 
-        let compObj = communicator.stringToProxy("foo");
+            try
+            {
+                base.ice_timeout(-2);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(!(ex instanceof TestError), ex);
+            }
 
-        test(compObj.ice_facet("facet").equals(compObj.ice_facet("facet")));
-        test(!compObj.ice_facet("facet").equals(compObj.ice_facet("facet1")));
-
-        test(compObj.ice_oneway().equals(compObj.ice_oneway()));
-        test(!compObj.ice_oneway().equals(compObj.ice_twoway()));
-
-        test(compObj.ice_secure(true).equals(compObj.ice_secure(true)));
-        test(!compObj.ice_secure(false).equals(compObj.ice_secure(true)));
-
-        test(compObj.ice_connectionCached(true).equals(compObj.ice_connectionCached(true)));
-        test(!compObj.ice_connectionCached(false).equals(compObj.ice_connectionCached(true)));
-
-        test(compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
-            compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random)));
-        test(!compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
-            compObj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered)));
-
-        test(compObj.ice_connectionId("id2").equals(compObj.ice_connectionId("id2")));
-        test(!compObj.ice_connectionId("id1").equals(compObj.ice_connectionId("id2")));
-
-        test(compObj.ice_connectionId("id1").ice_getConnectionId() === "id1");
-        test(compObj.ice_connectionId("id2").ice_getConnectionId() === "id2");
-
-        // Proxy doesn't support ice_compress
-        //test(compObj.ice_compress(true).equals(compObj.ice_compress(true)));
-        //test(!compObj.ice_compress(false).equals(compObj.ice_compress(true)));
-
-        test(compObj.ice_timeout(20).equals(compObj.ice_timeout(20)));
-        test(!compObj.ice_timeout(10).equals(compObj.ice_timeout(20)));
-
-        test(compObj.ice_getTimeout() === undefined);
-        test(compObj.ice_timeout(10).ice_getTimeout() == 10);
-        test(compObj.ice_timeout(20).ice_getTimeout() == 20);
-
-        let loc1 = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("loc1:default -p 10000"));
-        let loc2 = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("loc2:default -p 10000"));
-        test(compObj.ice_locator(null).equals(compObj.ice_locator(null)));
-        test(compObj.ice_locator(loc1).equals(compObj.ice_locator(loc1)));
-        test(!compObj.ice_locator(loc1).equals(compObj.ice_locator(null)));
-        test(!compObj.ice_locator(null).equals(compObj.ice_locator(loc2)));
-        test(!compObj.ice_locator(loc1).equals(compObj.ice_locator(loc2)));
-
-        let rtr1 = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("rtr1:default -p 10000"));
-        let rtr2 = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("rtr2:default -p 10000"));
-        test(compObj.ice_router(null).equals(compObj.ice_router(null)));
-        test(compObj.ice_router(rtr1).equals(compObj.ice_router(rtr1)));
-        test(!compObj.ice_router(rtr1).equals(compObj.ice_router(null)));
-        test(!compObj.ice_router(null).equals(compObj.ice_router(rtr2)));
-        test(!compObj.ice_router(rtr1).equals(compObj.ice_router(rtr2)));
-
-        let ctx1 = new Map();
-        ctx1.set("ctx1", "v1");
-        let ctx2 = new Map();
-        ctx2.set("ctx2", "v2");
-        test(compObj.ice_context(null).equals(compObj.ice_context(null)));
-        test(compObj.ice_context(ctx1).equals(compObj.ice_context(ctx1)));
-        test(!compObj.ice_context(ctx1).equals(compObj.ice_context(null)));
-        test(!compObj.ice_context(null).equals(compObj.ice_context(ctx2)));
-        test(!compObj.ice_context(ctx1).equals(compObj.ice_context(ctx2)));
-
-        test(compObj.ice_preferSecure(true).equals(compObj.ice_preferSecure(true)));
-        test(!compObj.ice_preferSecure(true).equals(compObj.ice_preferSecure(false)));
-
-        let compObj1 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10000");
-        let compObj2 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10001");
-        test(!compObj1.equals(compObj2));
-
-        compObj1 = communicator.stringToProxy("foo@MyAdapter1");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter2");
-        test(!compObj1.equals(compObj2));
-
-        test(compObj1.ice_locatorCacheTimeout(20).equals(compObj1.ice_locatorCacheTimeout(20)));
-        test(!compObj1.ice_locatorCacheTimeout(10).equals(compObj1.ice_locatorCacheTimeout(20)));
-
-        test(compObj1.ice_invocationTimeout(20).equals(compObj1.ice_invocationTimeout(20)));
-        test(!compObj1.ice_invocationTimeout(10).equals(compObj1.ice_invocationTimeout(20)));
-
-        compObj1 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 1000");
-        compObj2 = communicator.stringToProxy("foo@MyAdapter1");
-        test(!compObj1.equals(compObj2));
-
-        let endpts1 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10000").ice_getEndpoints();
-        let endpts2 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10001").ice_getEndpoints();
-        test(!endpts1[0].equals(endpts2[0]));
-        test(endpts1[0].equals(communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10000").ice_getEndpoints()[0]));
+            try
+            {
+                base.ice_invocationTimeout(0);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(!(ex instanceof TestError), ex);
+            }
 
-        test(compObj1.ice_encodingVersion(Ice.Encoding_1_0).equals(compObj1.ice_encodingVersion(Ice.Encoding_1_0)));
-        test(!compObj1.ice_encodingVersion(Ice.Encoding_1_0).equals(compObj1.ice_encodingVersion(Ice.Encoding_1_1)));
+            try
+            {
+                base.ice_invocationTimeout(-1);
+            }
+            catch(ex)
+            {
+                test(false);
+            }
 
-        let baseConnection = await base.ice_getConnection();
-        if(baseConnection !== null)
-        {
-            let baseConnection2 = await base.ice_connectionId("base2").ice_getConnection();
-            compObj1 = compObj1.ice_fixed(baseConnection);
-            compObj2 = compObj2.ice_fixed(baseConnection2);
-            test(!compObj1.equals(compObj2));
-        }
-        out.writeLine("ok");
+            try
+            {
+                base.ice_invocationTimeout(-2);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(!(ex instanceof TestError), ex);
+            }
 
-        out.write("testing checked cast... ");
-        let cl = await Test.MyClassPrx.checkedCast(base);
-        test(cl !== null);
-        let derived = await Test.MyDerivedClassPrx.checkedCast(cl);
-        test(derived !== null);
-        test(cl.equals(base));
-        test(derived.equals(base));
-        test(cl.equals(derived));
-        out.writeLine("ok");
-
-        out.write("testing checked cast with context... ");
-        let c = await cl.getContext();
-        test(c == null || c.size == 0);
-        c = new Map();
-        c.set("one", "hello");
-        c.set("two", "world");
-        clc = await Test.MyClassPrx.checkedCast(base, undefined, c);
-        let c2 = await clc.getContext();
-        test(Ice.MapUtil.equals(c, c2))
-        out.writeLine("ok");
+            try
+            {
+                base.ice_locatorCacheTimeout(0);
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
 
-        out.write("testing ice_fixed... ");
-        {
-            const connection = await cl.ice_getConnection();
-            if(connection != null)
+            try
             {
-                await cl.ice_fixed(connection).getContext();
-                test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
-                test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet");
-                test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
-                const ctx = new Map();
-                ctx.set("one", "hello");
-                ctx.set("two", "world");
-                test(cl.ice_fixed(connection).ice_getContext().size == 0);
-                test(cl.ice_context(ctx).ice_fixed(connection).ice_getContext().size == 2);
-                test(cl.ice_fixed(connection).ice_getInvocationTimeout() == -1);
-                test(cl.ice_invocationTimeout(10).ice_fixed(connection).ice_getInvocationTimeout() == 10);
-                test(await cl.ice_fixed(connection).ice_getConnection() == connection);
-                test(await cl.ice_fixed(connection).ice_fixed(connection).ice_getConnection() == connection);
-                test(cl.ice_fixed(connection).ice_getTimeout() === undefined);
-                const fixedConnection = await cl.ice_connectionId("ice_fixed").ice_getConnection();
-                test(await cl.ice_fixed(connection).ice_fixed(fixedConnection).ice_getConnection() == fixedConnection);
-                try
-                {
-                    await cl.ice_secure(!connection.getEndpoint().getInfo().secure()).ice_fixed(connection).ice_ping();
-                }
-                catch(ex)
-                {
-                    test(ex instanceof Ice.NoEndpointException);
-                }
-                try
-                {
-                    await cl.ice_datagram().ice_fixed(connection).ice_ping();
-                }
-                catch(ex)
-                {
-                    test(ex instanceof Ice.NoEndpointException);
-                }
+                base.ice_locatorCacheTimeout(-1);
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
 
+            try
+            {
+                base.ice_locatorCacheTimeout(-2);
+                test(false);
             }
-            else
+            catch(ex)
             {
-                try
-                {
-                    cl.ice_fixed(connection);
-                    test(false);
-                }
-                catch(ex)
-                {
-                    // Expected with null connection.
-                }
+                test(!(ex instanceof TestError), ex);
             }
-        }
-        out.writeLine("ok");
 
-        out.write("testing encoding versioning... ");
+            out.writeLine("ok");
 
-        let ref20 = "test -e 2.0:default -p 12010";
-        let cl20 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
-        try
-        {
-            await cl20.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.UnsupportedEncodingException, ex);
-        }
+            out.write("testing proxy comparison... ");
 
-        let ref10 = "test -e 1.0:default -p 12010";
-        let cl10 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
+            test(communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo")));
+            test(!communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo2")));
 
-        await cl10.ice_ping();
-        await cl10.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
-        await cl.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
-
-        // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-        // call will use the 1.1 encoding
-        let ref13 = "test -e 1.3:default -p 12010";
-        let cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
-        await cl13.ice_ping();
-
-        // TODO port ice_invoke test
-        out.writeLine("ok");
-
-        out.write("testing protocol versioning... ");
-        ref20 = "test -p 2.0:default -p 12010";
-        cl20 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
-        try
-        {
-            await cl20.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            // Server 2.0 proxy doesn't support 1.0 version.
-            test(ex instanceof Ice.UnsupportedProtocolException, ex);
-        }
+            const compObj = communicator.stringToProxy("foo");
 
-        ref10 = "test -p 1.0:default -p 12010";
-        cl10 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
-        await cl10.ice_ping();
-
-        // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
-        // call will use the 1.1 protocol
-        ref13 = "test -p 1.3:default -p 12010";
-        cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
-        await cl13.ice_ping();
-        out.writeLine("ok");
+            test(compObj.ice_facet("facet").equals(compObj.ice_facet("facet")));
+            test(!compObj.ice_facet("facet").equals(compObj.ice_facet("facet1")));
+
+            test(compObj.ice_oneway().equals(compObj.ice_oneway()));
+            test(!compObj.ice_oneway().equals(compObj.ice_twoway()));
+
+            test(compObj.ice_secure(true).equals(compObj.ice_secure(true)));
+            test(!compObj.ice_secure(false).equals(compObj.ice_secure(true)));
+
+            test(compObj.ice_connectionCached(true).equals(compObj.ice_connectionCached(true)));
+            test(!compObj.ice_connectionCached(false).equals(compObj.ice_connectionCached(true)));
+
+            test(compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
+                compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random)));
+            test(!compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
+                compObj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered)));
+
+            test(compObj.ice_connectionId("id2").equals(compObj.ice_connectionId("id2")));
+            test(!compObj.ice_connectionId("id1").equals(compObj.ice_connectionId("id2")));
+
+            test(compObj.ice_connectionId("id1").ice_getConnectionId() === "id1");
+            test(compObj.ice_connectionId("id2").ice_getConnectionId() === "id2");
+
+            test(compObj.ice_timeout(20).equals(compObj.ice_timeout(20)));
+            test(!compObj.ice_timeout(10).equals(compObj.ice_timeout(20)));
+
+            test(compObj.ice_getTimeout() === undefined);
+            test(compObj.ice_timeout(10).ice_getTimeout() == 10);
+            test(compObj.ice_timeout(20).ice_getTimeout() == 20);
+
+            const loc1 = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("loc1:default -p 10000"));
+            const loc2 = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("loc2:default -p 10000"));
+            test(compObj.ice_locator(null).equals(compObj.ice_locator(null)));
+            test(compObj.ice_locator(loc1).equals(compObj.ice_locator(loc1)));
+            test(!compObj.ice_locator(loc1).equals(compObj.ice_locator(null)));
+            test(!compObj.ice_locator(null).equals(compObj.ice_locator(loc2)));
+            test(!compObj.ice_locator(loc1).equals(compObj.ice_locator(loc2)));
+
+            const rtr1 = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("rtr1:default -p 10000"));
+            const rtr2 = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("rtr2:default -p 10000"));
+            test(compObj.ice_router(null).equals(compObj.ice_router(null)));
+            test(compObj.ice_router(rtr1).equals(compObj.ice_router(rtr1)));
+            test(!compObj.ice_router(rtr1).equals(compObj.ice_router(null)));
+            test(!compObj.ice_router(null).equals(compObj.ice_router(rtr2)));
+            test(!compObj.ice_router(rtr1).equals(compObj.ice_router(rtr2)));
+
+            const ctx1 = new Map();
+            ctx1.set("ctx1", "v1");
+            const ctx2 = new Map();
+            ctx2.set("ctx2", "v2");
+            test(compObj.ice_context(null).equals(compObj.ice_context(null)));
+            test(compObj.ice_context(ctx1).equals(compObj.ice_context(ctx1)));
+            test(!compObj.ice_context(ctx1).equals(compObj.ice_context(null)));
+            test(!compObj.ice_context(null).equals(compObj.ice_context(ctx2)));
+            test(!compObj.ice_context(ctx1).equals(compObj.ice_context(ctx2)));
 
-        out.write("testing opaque endpoints... ");
+            test(compObj.ice_preferSecure(true).equals(compObj.ice_preferSecure(true)));
+            test(!compObj.ice_preferSecure(true).equals(compObj.ice_preferSecure(false)));
 
-        try
-        {
-            // Invalid -x option
-            communicator.stringToProxy("id:opaque -t 99 -v abc -x abc");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            let compObj1 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10000");
+            let compObj2 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10001");
+            test(!compObj1.equals(compObj2));
 
-        try
-        {
-            // Missing -t and -v
-            communicator.stringToProxy("id:opaque");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            compObj1 = communicator.stringToProxy("foo@MyAdapter1");
+            compObj2 = communicator.stringToProxy("foo@MyAdapter2");
+            test(!compObj1.equals(compObj2));
 
-        try
-        {
-            // Repeated -t
-            communicator.stringToProxy("id:opaque -t 1 -t 1 -v abc");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            test(compObj1.ice_locatorCacheTimeout(20).equals(compObj1.ice_locatorCacheTimeout(20)));
+            test(!compObj1.ice_locatorCacheTimeout(10).equals(compObj1.ice_locatorCacheTimeout(20)));
 
-        try
-        {
-            // Repeated -v
-            communicator.stringToProxy("id:opaque -t 1 -v abc -v abc");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            test(compObj1.ice_invocationTimeout(20).equals(compObj1.ice_invocationTimeout(20)));
+            test(!compObj1.ice_invocationTimeout(10).equals(compObj1.ice_invocationTimeout(20)));
 
-        try
-        {
-            // Missing -t
-            communicator.stringToProxy("id:opaque -v abc");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            compObj1 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 1000");
+            compObj2 = communicator.stringToProxy("foo@MyAdapter1");
+            test(!compObj1.equals(compObj2));
 
-        try
-        {
-            // Missing -v
-            communicator.stringToProxy("id:opaque -t 1");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            const endpts1 =
+                  communicator.stringToProxy(`foo:${defaultProtocol} -h 127.0.0.1 -p 10000`).ice_getEndpoints();
+            const endpts2 =
+                  communicator.stringToProxy(`foo:${defaultProtocol} -h 127.0.0.1 -p 10001`).ice_getEndpoints();
+            test(!endpts1[0].equals(endpts2[0]));
+            test(endpts1[0].equals(
+                communicator.stringToProxy(`foo:${defaultProtocol} -h 127.0.0.1 -p 10000`).ice_getEndpoints()[0]));
+
+            test(compObj1.ice_encodingVersion(Ice.Encoding_1_0).equals(compObj1.ice_encodingVersion(Ice.Encoding_1_0)));
+            test(!compObj1.ice_encodingVersion(Ice.Encoding_1_0).equals(
+                compObj1.ice_encodingVersion(Ice.Encoding_1_1)));
 
-        try
-        {
-            // Missing arg for -t
-            communicator.stringToProxy("id:opaque -t -v abc");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            const baseConnection = await base.ice_getConnection();
+            if(baseConnection !== null)
+            {
+                const baseConnection2 = await base.ice_connectionId("base2").ice_getConnection();
+                compObj1 = compObj1.ice_fixed(baseConnection);
+                compObj2 = compObj2.ice_fixed(baseConnection2);
+                test(!compObj1.equals(compObj2));
+            }
+            out.writeLine("ok");
 
-        try
-        {
-            // Missing arg for -v
-            communicator.stringToProxy("id:opaque -t 1 -v");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            out.write("testing checked cast... ");
+            const cl = await Test.MyClassPrx.checkedCast(base);
+            test(cl !== null);
+            let derived = await Test.MyDerivedClassPrx.checkedCast(cl);
+            test(derived !== null);
+            test(cl.equals(base));
+            test(derived.equals(base));
+            test(cl.equals(derived));
+            out.writeLine("ok");
 
-        try
-        {
-            // Not a number for -t
-            communicator.stringToProxy("id:opaque -t x -v abc");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            out.write("testing checked cast with context... ");
+            let c = await cl.getContext();
+            test(c === null || c.size == 0);
+            c = new Map();
+            c.set("one", "hello");
+            c.set("two", "world");
+            const clc = await Test.MyClassPrx.checkedCast(base, undefined, c);
+            const c2 = await clc.getContext();
+            test(Ice.MapUtil.equals(c, c2));
+            out.writeLine("ok");
 
-        try
-        {
-            // < 0 for -t
-            communicator.stringToProxy("id:opaque -t -1 -v abc");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+            out.write("testing ice_fixed... ");
+            {
+                const connection = await cl.ice_getConnection();
+                if(connection !== null)
+                {
+                    await cl.ice_fixed(connection).getContext();
+                    test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
+                    test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet");
+                    test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
+                    const ctx = new Map();
+                    ctx.set("one", "hello");
+                    ctx.set("two", "world");
+                    test(cl.ice_fixed(connection).ice_getContext().size == 0);
+                    test(cl.ice_context(ctx).ice_fixed(connection).ice_getContext().size == 2);
+                    test(cl.ice_fixed(connection).ice_getInvocationTimeout() == -1);
+                    test(cl.ice_invocationTimeout(10).ice_fixed(connection).ice_getInvocationTimeout() == 10);
+                    test(await cl.ice_fixed(connection).ice_getConnection() == connection);
+                    test(await cl.ice_fixed(connection).ice_fixed(connection).ice_getConnection() == connection);
+                    test(cl.ice_fixed(connection).ice_getTimeout() === undefined);
+                    const fixedConnection = await cl.ice_connectionId("ice_fixed").ice_getConnection();
+                    test(await cl.ice_fixed(connection).ice_fixed(fixedConnection).ice_getConnection() ==
+                         fixedConnection);
+                    try
+                    {
+                        await cl.ice_secure(!connection.getEndpoint().getInfo().secure()).ice_fixed(connection).ice_ping();
+                    }
+                    catch(ex)
+                    {
+                        test(ex instanceof Ice.NoEndpointException);
+                    }
+                    try
+                    {
+                        await cl.ice_datagram().ice_fixed(connection).ice_ping();
+                    }
+                    catch(ex)
+                    {
+                        test(ex instanceof Ice.NoEndpointException);
+                    }
 
-        try
-        {
-            // Invalid char for -v
-            communicator.stringToProxy("id:opaque -t 99 -v x?c");
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.EndpointParseException, ex);
-        }
+                }
+                else
+                {
+                    try
+                    {
+                        cl.ice_fixed(connection);
+                        test(false);
+                    }
+                    catch(ex)
+                    {
+                        // Expected with null connection.
+                    }
+                }
+            }
+            out.writeLine("ok");
 
-        // Legal TCP endpoint expressed as opaque endpoint
-        let p1 = communicator.stringToProxy("test -e 1.1:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
-        let pstr = communicator.proxyToString(p1);
-        test(pstr === "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+            out.write("testing encoding versioning... ");
 
-        // Legal WS endpoint expressed as opaque endpoint
-        p1 = communicator.stringToProxy("test -e 1.1:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=");
-        pstr = communicator.proxyToString(p1);
-        test(pstr === "test -t -e 1.1:ws -h 127.0.0.1 -p 12010 -t 10000");
+            let ref20 = "test -e 2.0:" + this.getTestEndpoint();
+            let cl20 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
+            try
+            {
+                await cl20.ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnsupportedEncodingException, ex);
+            }
 
-        // Opaque endpoint encoded with 1.1 encoding.
+            let ref10 = "test -e 1.0:" + this.getTestEndpoint();
+            let cl10 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
 
-        let p2 = communicator.stringToProxy("test:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
-        test(communicator.proxyToString(p2) === "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+            await cl10.ice_ping();
+            await cl10.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+            await cl.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+
+            // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
+            // call will use the 1.1 encoding
+            let ref13 = "test -e 1.3:" + this.getTestEndpoint();
+            let cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
+            await cl13.ice_ping();
 
-        p2 = communicator.stringToProxy("test:opaque -e 1.1 -t 4 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=");
-        test(communicator.proxyToString(p2) === "test -t -e 1.1:ws -h 127.0.0.1 -p 12010 -t 10000");
+            // TODO port ice_invoke test
+            out.writeLine("ok");
 
-        if(communicator.getProperties().getPropertyAsInt("Ice.IPv6") === 0)
-        {
-            let ref = "test:default -p 12010";
-            let base = communicator.stringToProxy(ref);
+            out.write("testing protocol versioning... ");
+            ref20 = "test -p 2.0:" + this.getTestEndpoint();
+            cl20 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
+            try
+            {
+                await cl20.ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                // Server 2.0 proxy doesn't support 1.0 version.
+                test(ex instanceof Ice.UnsupportedProtocolException, ex);
+            }
 
-            let ssl = communicator.getProperties().getProperty("Ice.Default.Protocol") === "ssl";
-            /* TODO: p1 contains 127.0.0.1 - OK to invoke?
-               if(!ssl)
-               {
-               p1.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
-               }
-            */
+            ref10 = "test -p 1.0:" + this.getTestEndpoint();
+            cl10 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
+            await cl10.ice_ping();
+
+            // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
+            // call will use the 1.1 protocol
+            ref13 = "test -p 1.3:" + this.getTestEndpoint();
+            cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
+            await cl13.ice_ping();
+            out.writeLine("ok");
 
-            // Two legal TCP endpoints expressed as opaque endpoints
-            p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMusuAAAQJwAAAA==");
-            pstr = communicator.proxyToString(p1);
-            test(pstr === "test -t -e 1.0:tcp -h 127.0.0.1 -p 12010 -t 10000:tcp -h 127.0.0.2 -p 12011 -t 10000");
+            out.write("testing opaque endpoints... ");
 
-            p1 = communicator.stringToProxy("test -e 1.0:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAAA=");
-            pstr = communicator.proxyToString(p1);
-            test(pstr === "test -t -e 1.0:ws -h 127.0.0.1 -p 12010 -t 10000:ws -h 127.0.0.2 -p 12011 -t 10000");
+            try
+            {
+                // Invalid -x option
+                communicator.stringToProxy("id:opaque -t 99 -v abc -x abc");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-            //
-            // Test that an SSL endpoint and a nonsense endpoint get
-            // written back out as an opaque endpoint.
-            //
-            p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 2 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch");
-            pstr = communicator.proxyToString(p1);
-            test(pstr === "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch");
+            try
+            {
+                // Missing -t and -v
+                communicator.stringToProxy("id:opaque");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-            //
-            // Try to invoke on the SSL endpoint to verify that we get a
-            // NoEndpointException (or ConnectFailedException when
-            // running with SSL).
-            //
             try
             {
-                await p1.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+                // Repeated -t
+                communicator.stringToProxy("id:opaque -t 1 -t 1 -v abc");
                 test(false);
             }
             catch(ex)
             {
-                if(ex instanceof Ice.NoEndpointException)
-                {
-                    test(!ssl);
-                }
-                else if(ex instanceof Ice.ConnectFailedException)
-                {
-                    test(ssl);
-                }
-                else
-                {
-                    throw ex;
-                }
+                test(ex instanceof Ice.EndpointParseException, ex);
             }
-            //
-            // Test that the proxy with an SSL endpoint and a nonsense
-            // endpoint (which the server doesn't understand either) can
-            // be sent over the wire and returned by the server without
-            // losing the opaque endpoints.
-            //
-            derived = Test.MyDerivedClassPrx.uncheckedCast(communicator.stringToProxy("test -e 1.0:default -p 12010"));
-            p2 = await derived.echo(p1);
 
-            pstr = communicator.proxyToString(p2);
-            test(pstr === "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch");
+            try
+            {
+                // Repeated -v
+                communicator.stringToProxy("id:opaque -t 1 -v abc -v abc");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-            let p = communicator.stringToProxy("test:default -p 12010");
-            if(defaultProtocol === "tcp")
+            try
             {
-                test(p.ice_getEndpoints()[0].getInfo() instanceof Ice.TCPEndpointInfo);
+                // Missing -t
+                communicator.stringToProxy("id:opaque -v abc");
+                test(false);
             }
-            else if(defaultProtocol === "ws" || defaultProtocol === "wss")
+            catch(ex)
             {
-                test(p.ice_getEndpoints()[0].getInfo() instanceof Ice.WSEndpointInfo);
+                test(ex instanceof Ice.EndpointParseException, ex);
             }
 
-            let con = await p.ice_getConnection();
-            if(defaultProtocol === "tcp")
+            try
             {
-                test(con.getInfo() instanceof Ice.TCPConnectionInfo);
+                // Missing -v
+                communicator.stringToProxy("id:opaque -t 1");
+                test(false);
             }
-            else if(defaultProtocol === "ws" || defaultProtocol === "wss")
+            catch(ex)
             {
-                test(con.getInfo() instanceof Ice.WSConnectionInfo);
+                test(ex instanceof Ice.EndpointParseException, ex);
             }
 
-            //
-            // Ensure that non connectable endpoints are skipped.
-            //
-            p = (typeof window === 'undefined' && typeof WorkerGlobalScope === 'undefined') ?
-                communicator.stringToProxy("test:ws -p 12010:default -p 12010") :
-                communicator.stringToProxy("test:tcp -p 12010:default -p 12010");
+            try
+            {
+                // Missing arg for -t
+                communicator.stringToProxy("id:opaque -t -v abc");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-            p = p.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
-            await p.ice_ping();
+            try
+            {
+                // Missing arg for -v
+                communicator.stringToProxy("id:opaque -t 1 -v");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-            out.writeLine("ok");
+            try
+            {
+                // Not a number for -t
+                communicator.stringToProxy("id:opaque -t x -v abc");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-            out.write("testing proxyToString... ");
-            b1 = communicator.stringToProxy(ref);
-            b2 = communicator.stringToProxy(communicator.proxyToString(b1));
-            test(b1.equals(b2));
-
-            con = await b1.ice_getConnection();
-            b2 = con.createProxy(Ice.stringToIdentity("fixed"));
-            str = communicator.proxyToString(b2);
-            test(b2.toString() === str);
-            str2 = b1.ice_identity(b2.ice_getIdentity()).ice_secure(b2.ice_isSecure()).toString();
-
-            // Verify that the stringified fixed proxy is the same as a regular stringified proxy
-            // but without endpoints
-            test(str2.startsWith(str));
-            test(str2.charAt(str.length) === ':');
+            try
+            {
+                // < 0 for -t
+                communicator.stringToProxy("id:opaque -t -1 -v abc");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
 
-            out.writeLine("ok");
+            try
+            {
+                // Invalid char for -v
+                communicator.stringToProxy("id:opaque -t 99 -v x?c");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.EndpointParseException, ex);
+            }
+
+            // Legal TCP endpoint expressed as opaque endpoint
+            let p1 = communicator.stringToProxy("test -e 1.1:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+            let pstr = communicator.proxyToString(p1);
+            test(pstr === "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+
+            // Legal WS endpoint expressed as opaque endpoint
+            p1 = communicator.stringToProxy("test -e 1.1:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=");
+            pstr = communicator.proxyToString(p1);
+            test(pstr === "test -t -e 1.1:ws -h 127.0.0.1 -p 12010 -t 10000");
+
+            // Opaque endpoint encoded with 1.1 encoding.
+
+            let p2 = communicator.stringToProxy("test:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+            test(communicator.proxyToString(p2) === "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+
+            p2 = communicator.stringToProxy("test:opaque -e 1.1 -t 4 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=");
+            test(communicator.proxyToString(p2) === "test -t -e 1.1:ws -h 127.0.0.1 -p 12010 -t 10000");
 
-            if(defaultProtocol === "ws" || defaultProtocol === "wss")
+            if(communicator.getProperties().getPropertyAsInt("Ice.IPv6") === 0)
             {
-                out.write("testing ping invalid WS proxies... ");
+                const ref = "test:" + this.getTestEndpoint();
+
+                const ssl = communicator.getProperties().getProperty("Ice.Default.Protocol") === "ssl";
+                // TODO: p1 contains 127.0.0.1 - OK to invoke?
+                //   if(!ssl)
+                //   {
+                //       p1.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
+                //   }
+
+                // Two legal TCP endpoints expressed as opaque endpoints
+                p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMusuAAAQJwAAAA==");
+                pstr = communicator.proxyToString(p1);
+                test(pstr === "test -t -e 1.0:tcp -h 127.0.0.1 -p 12010 -t 10000:tcp -h 127.0.0.2 -p 12011 -t 10000");
+
+                p1 = communicator.stringToProxy("test -e 1.0:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAAA=");
+                pstr = communicator.proxyToString(p1);
+                test(pstr === "test -t -e 1.0:ws -h 127.0.0.1 -p 12010 -t 10000:ws -h 127.0.0.2 -p 12011 -t 10000");
+
+                //
+                // Test that an SSL endpoint and a nonsense endpoint get
+                // written back out as an opaque endpoint.
+                //
+                p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 2 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch");
+                pstr = communicator.proxyToString(p1);
+                test(pstr === "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch");
+
                 //
-                // Invocation in a WS or WSS proxy that has not hostname set
-                // will fail creating the WebSocket object.
+                // Try to invoke on the SSL endpoint to verify that we get a
+                // NoEndpointException (or ConnectFailedException when
+                // running with SSL).
                 //
-                const communicator2 = Ice.initialize();
-                const invalid = communicator2.stringToProxy("test:default -p 12010");
                 try
                 {
-                    await invalid.ice_ping();
+                    await p1.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
                     test(false);
                 }
                 catch(ex)
                 {
-                    // expected
+                    if(ex instanceof Ice.NoEndpointException)
+                    {
+                        test(!ssl);
+                    }
+                    else if(ex instanceof Ice.ConnectFailedException)
+                    {
+                        test(ssl);
+                    }
+                    else
+                    {
+                        throw ex;
+                    }
                 }
-                finally
+                //
+                // Test that the proxy with an SSL endpoint and a nonsense
+                // endpoint (which the server doesn't understand either) can
+                // be sent over the wire and returned by the server without
+                // losing the opaque endpoints.
+                //
+                derived = Test.MyDerivedClassPrx.uncheckedCast(
+                    communicator.stringToProxy("test -e 1.0:" + this.getTestEndpoint()));
+                p2 = await derived.echo(p1);
+
+                pstr = communicator.proxyToString(p2);
+                test(pstr === "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch");
+
+                let p = communicator.stringToProxy("test:" + this.getTestEndpoint());
+                if(defaultProtocol === "tcp")
+                {
+                    test(p.ice_getEndpoints()[0].getInfo() instanceof Ice.TCPEndpointInfo);
+                }
+                else if(defaultProtocol === "ws" || defaultProtocol === "wss")
                 {
-                    await communicator2.destroy();
+                    test(p.ice_getEndpoints()[0].getInfo() instanceof Ice.WSEndpointInfo);
                 }
+
+                let con = await p.ice_getConnection();
+                if(defaultProtocol === "tcp")
+                {
+                    test(con.getInfo() instanceof Ice.TCPConnectionInfo);
+                }
+                else if(defaultProtocol === "ws" || defaultProtocol === "wss")
+                {
+                    test(con.getInfo() instanceof Ice.WSConnectionInfo);
+                }
+
+                //
+                // Ensure that non connectable endpoints are skipped.
+                //
+                p = (typeof window === 'undefined' && typeof WorkerGlobalScope === 'undefined') ?
+                    communicator.stringToProxy("test:" + this.getTestEndpoint("ws") + ":" + this.getTestEndpoint()) :
+                    communicator.stringToProxy("test:" + this.getTestEndpoint("tcp") + ":" + this.getTestEndpoint());
+
+                p = p.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
+                await p.ice_ping();
+
                 out.writeLine("ok");
-            }
 
-            out.write("testing communicator shutdown/destroy... ");
-            {
-                const c = Ice.initialize();
-                c.shutdown();
-                test(c.isShutdown());
-                await c.waitForShutdown();
-                await c.destroy();
-                c.shutdown();
-                test(c.isShutdown());
-                await c.waitForShutdown();
-                await c.destroy();
-            }
-            out.writeLine("ok");
+                out.write("testing proxyToString... ");
+                b1 = communicator.stringToProxy(ref);
+                let b2 = communicator.stringToProxy(communicator.proxyToString(b1));
+                test(b1.equals(b2));
+
+                con = await b1.ice_getConnection();
+                b2 = con.createProxy(Ice.stringToIdentity("fixed"));
+                const str = communicator.proxyToString(b2);
+                test(b2.toString() === str);
+                const str2 = b1.ice_identity(b2.ice_getIdentity()).ice_secure(b2.ice_isSecure()).toString();
+
+                // Verify that the stringified fixed proxy is the same as a regular stringified proxy
+                // but without endpoints
+                test(str2.startsWith(str));
+                test(str2.charAt(str.length) === ':');
 
-            derived = Test.MyDerivedClassPrx.uncheckedCast(communicator.stringToProxy("test:default -p 12010"));
-            await derived.shutdown();
-        }
-    }
+                out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(communicator, out);
+                if(defaultProtocol === "ws" || defaultProtocol === "wss")
+                {
+                    out.write("testing ping invalid WS proxies... ");
+                    //
+                    // Invocation in a WS or WSS proxy that has not hostname set
+                    // will fail creating the WebSocket object.
+                    //
+                    const communicator2 = Ice.initialize();
+                    const invalid = communicator2.stringToProxy("test:" + this.getTestEndpoint());
+                    try
+                    {
+                        await invalid.ice_ping();
+                        test(false);
+                    }
+                    catch(ex)
+                    {
+                        // expected
+                    }
+                    finally
+                    {
+                        await communicator2.destroy();
+                    }
+                    out.writeLine("ok");
+                }
+
+                out.write("testing communicator shutdown/destroy... ");
+                {
+                    const c = Ice.initialize();
+                    c.shutdown();
+                    test(c.isShutdown());
+                    await c.waitForShutdown();
+                    await c.destroy();
+                    c.shutdown();
+                    test(c.isShutdown());
+                    await c.waitForShutdown();
+                    await c.destroy();
+                }
+                out.writeLine("ok");
+
+                derived = Test.MyDerivedClassPrx.uncheckedCast(
+                    communicator.stringToProxy("test:" + this.getTestEndpoint()));
+                await derived.shutdown();
+            }
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/js/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/retry/Client.js zeroc-ice-3.7.2/js/test/Ice/retry/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/retry/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/retry/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,157 +1,146 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator, communicator2)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests(communicator, communicator2)
         {
-            if(!value)
+            const out = this.getWriter();
+            out.write("testing stringToProxy... ");
+            const ref = "retry:" + this.getTestEndpoint();
+            const base1 = communicator.stringToProxy(ref);
+            test(base1 !== null);
+            const base2 = communicator.stringToProxy(ref);
+            test(base2 !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            const retry1 = await Test.RetryPrx.checkedCast(base1);
+            test(retry1 !== null);
+            test(retry1.equals(base1));
+            let retry2 = await Test.RetryPrx.checkedCast(base2);
+            test(retry2 !== null);
+            test(retry2.equals(base2));
+            out.writeLine("ok");
+
+            out.write("calling regular operation with first proxy... ");
+            await retry1.op(false);
+            out.writeLine("ok");
+
+            out.write("calling operation to kill connection with second proxy... ");
+            try
+            {
+                await retry2.op(true);
+                test(false);
+            }
+            catch(ex)
             {
-                let message = "test failed";
-                if(ex)
+                if(typeof window === 'undefined' && typeof WorkerGlobalScope === 'undefined') // Nodejs
                 {
-                    message += "\n" + ex.toString();
+                    test(ex instanceof Ice.ConnectionLostException, ex);
                 }
-                throw new Error(message);
+                else // Browser
+                {
+                    test(ex instanceof Ice.SocketException, ex);
+                }
+                out.writeLine("ok");
             }
-        }
 
-        out.write("testing stringToProxy... ");
-        let ref = "retry:default -p 12010";
-        let base1 = communicator.stringToProxy(ref);
-        test(base1 !== null);
-        let base2 = communicator.stringToProxy(ref);
-        test(base2 !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let retry1 = await Test.RetryPrx.checkedCast(base1);
-        test(retry1 !== null);
-        test(retry1.equals(base1));
-        let retry2 = await Test.RetryPrx.checkedCast(base2);
-        test(retry2 !== null);
-        test(retry2.equals(base2));
-        out.writeLine("ok");
-
-        out.write("calling regular operation with first proxy... ");
-        await retry1.op(false);
-        out.writeLine("ok");
+            out.write("calling regular operation with first proxy again... ");
+            await retry1.op(false);
+            out.writeLine("ok");
 
-        out.write("calling operation to kill connection with second proxy... ");
-        try
-        {
-            await retry2.op(true);
-            test(false);
-        }
-        catch(ex)
-        {
-            if(typeof(window) === 'undefined' && typeof(WorkerGlobalScope) === 'undefined') // Nodejs
+            out.write("testing idempotent operation... ");
+            const count = await retry1.opIdempotent(4);
+            test(count === 4);
+            out.writeLine("ok");
+
+            out.write("testing non-idempotent operation... ");
+            try
             {
-                test(ex instanceof Ice.ConnectionLostException, ex);
+                await retry1.opNotIdempotent();
+                test(false);
             }
-            else // Browser
+            catch(ex)
             {
-                test(ex instanceof Ice.SocketException, ex);
+                test(ex instanceof Ice.LocalException, ex);
             }
             out.writeLine("ok");
-        }
 
-        out.write("calling regular operation with first proxy again... ");
-        await retry1.op(false);
-        out.writeLine("ok");
-
-        out.write("testing idempotent operation... ");
-        let count = await retry1.opIdempotent(4);
-        test(count === 4);
-        out.writeLine("ok");
+            out.write("testing invocation timeout and retries... ");
+            retry2 = Test.RetryPrx.uncheckedCast(communicator2.stringToProxy(retry1.toString()));
+            try
+            {
+                await retry2.ice_invocationTimeout(500).opIdempotent(4);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.InvocationTimeoutException, ex);
+            }
 
-        out.write("testing non-idempotent operation... ");
-        try
-        {
-            await retry1.opNotIdempotent();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.LocalException, ex);
-        }
-        out.writeLine("ok");
+            await retry2.opIdempotent(-1);
+            out.writeLine("ok");
 
-        out.write("testing invocation timeout and retries... ");
-        retry2 = Test.RetryPrx.uncheckedCast(communicator2.stringToProxy(retry1.toString()));
-        try
-        {
-            await retry2.ice_invocationTimeout(500).opIdempotent(4);
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.InvocationTimeoutException, ex);
+            await retry1.shutdown();
         }
 
-        await retry2.opIdempotent(-1);
-        out.writeLine("ok");
-
-        await retry1.shutdown();
-    }
-
-    async function run(out, initData)
-    {
-        let communicator;
-        let communicator2;
-        try
+        async run(args)
         {
-            //
-            // For this test, we want to disable retries.
-            //
-            initData.properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
-
-            //
-            // We don't want connection warnings because of the timeout
-            //
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            communicator = Ice.initialize(initData);
-
-            //
-            // Configure a second communicator for the invocation timeout
-            // + retry test, we need to configure a large retry interval
-            // to avoid time-sensitive failures.
-            //
-            let initData2 = new Ice.InitializationData();
-            initData2.properties = communicator.getProperties().clone();
-            initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000");
-            communicator2 = Ice.initialize(initData2);
-
-            await allTests(out, communicator, communicator2);
-        }
-        finally
-        {
-            if(communicator2)
+            let communicator;
+            let communicator2;
+            try
             {
-                await communicator2.destroy();
-            }
+                let [properties] = this.createTestProperties(args);
 
-            if(communicator)
+                //
+                // For this test, we want to disable retries.
+                //
+                properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
+
+                //
+                // We don't want connection warnings because of the timeout
+                //
+                properties.setProperty("Ice.Warn.Connections", "0");
+
+                [communicator] = this.initialize(properties);
+
+                //
+                // Configure a second communicator for the invocation timeout
+                // + retry test, we need to configure a large retry interval
+                // to avoid time-sensitive failures.
+                //
+                properties = communicator.getProperties().clone();
+                properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+                [communicator2] = this.initialize(properties);
+
+                await this.allTests(communicator, communicator2);
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator2)
+                {
+                    await communicator2.destroy();
+                }
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/retry/Test.ice zeroc-ice-3.7.2/js/test/Ice/retry/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/retry/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/retry/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/scope/Client.js zeroc-ice-3.7.2/js/test/Ice/scope/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/scope/Client.js	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/scope/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,187 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+(function(module, require, exports)
+{
+    const Test = require("Test").Test;
+    const Inner = require("Test").Inner;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
+
+    class Client extends TestHelper
+    {
+        async allTests()
+        {
+            const out = this.getWriter();
+            const communicator = this.communicator();
+
+            out.write("test same Slice type name in different scopes... ");
+
+            {
+                const i1 = await Test.IPrx.checkedCast(communicator.stringToProxy("i1:" + this.getTestEndpoint()));
+                const s1 = new Test.S(0);
+
+                const [s2, s3] = await i1.opS(s1);
+                test(s2.equals(s1));
+                test(s3.equals(s1));
+
+                const [sseq2, sseq3] = await i1.opSSeq([s1]);
+                test(sseq2[0].equals(s1));
+                test(sseq3[0].equals(s1));
+
+                const smap1 = new Map([["a", s1]]);
+                const [smap2, smap3] = await i1.opSMap(smap1);
+                test(smap2.get("a").equals(s1));
+                test(smap3.get("a").equals(s1));
+
+                const c1 = new Test.C(s1);
+
+                const [c2, c3] = await i1.opC(c1);
+                test(c2.s.equals(s1));
+                test(c3.s.equals(s1));
+
+                const [cseq2, cseq3] = await i1.opCSeq([c1]);
+                test(cseq2[0].s.equals(s1));
+                test(cseq3[0].s.equals(s1));
+
+                const cmap1 = new Map([["a", c1]]);
+                const [cmap2, cmap3] = await i1.opCMap(cmap1);
+                test(cmap2.get("a").s.equals(s1));
+                test(cmap3.get("a").s.equals(s1));
+            }
+
+            {
+                const i2 = await Test.Inner.Inner2.IPrx.checkedCast(
+                    communicator.stringToProxy("i2:" + this.getTestEndpoint()));
+                const s1 = new Test.Inner.Inner2.S(0);
+
+                const [s2, s3] = await i2.opS(s1);
+                test(s2.equals(s1));
+                test(s3.equals(s1));
+
+                const [sseq2, sseq3] = await i2.opSSeq([s1]);
+                test(sseq2[0].equals(s1));
+                test(sseq3[0].equals(s1));
+
+                const smap1 = new Map([["a", s1]]);
+                const [smap2, smap3] = await i2.opSMap(smap1);
+                test(smap2.get("a").equals(s1));
+                test(smap3.get("a").equals(s1));
+
+                const c1 = new Test.Inner.Inner2.C(s1);
+
+                const [c2, c3] = await i2.opC(c1);
+                test(c2.s.equals(s1));
+                test(c3.s.equals(s1));
+
+                const [cseq2, cseq3] = await i2.opCSeq([c1]);
+                test(cseq2[0].s.equals(s1));
+                test(cseq3[0].s.equals(s1));
+
+                const cmap1 = new Map([["a", c1]]);
+                const [cmap2, cmap3] = await i2.opCMap(cmap1);
+                test(cmap2.get("a").s.equals(s1));
+                test(cmap3.get("a").s.equals(s1));
+            }
+
+            {
+                const i3 = await Test.Inner.IPrx.checkedCast(
+                    communicator.stringToProxy("i3:" + this.getTestEndpoint()));
+                const s1 = new Test.Inner.Inner2.S(0);
+
+                const [s2, s3] = await i3.opS(s1);
+                test(s2.equals(s1));
+                test(s3.equals(s1));
+
+                const [sseq2, sseq3] = await i3.opSSeq([s1]);
+                test(sseq2[0].equals(s1));
+                test(sseq3[0].equals(s1));
+
+                const smap1 = new Map([["a", s1]]);
+                const [smap2, smap3] = await i3.opSMap(smap1);
+                test(smap2.get("a").equals(s1));
+                test(smap3.get("a").equals(s1));
+
+                const c1 = new Test.Inner.Inner2.C(s1);
+
+                const [c2, c3] = await i3.opC(c1);
+                test(c2.s.equals(s1));
+                test(c3.s.equals(s1));
+
+                const [cseq2, cseq3] = await i3.opCSeq([c1]);
+                test(cseq2[0].s.equals(s1));
+                test(cseq3[0].s.equals(s1));
+
+                const cmap1 = new Map([["a", c1]]);
+                const [cmap2, cmap3] = await i3.opCMap(cmap1);
+                test(cmap2.get("a").s.equals(s1));
+                test(cmap3.get("a").s.equals(s1));
+            }
+
+            {
+                const i4 = await Inner.Test.Inner2.IPrx.checkedCast(
+                    communicator.stringToProxy("i4:" + this.getTestEndpoint()));
+                const s1 = new Test.S(0);
+
+                const [s2, s3] = await i4.opS(s1);
+                test(s2.equals(s1));
+                test(s3.equals(s1));
+
+                const [sseq2, sseq3] = await i4.opSSeq([s1]);
+                test(sseq2[0].equals(s1));
+                test(sseq3[0].equals(s1));
+
+                const smap1 = new Map([["a", s1]]);
+                const [smap2, smap3] = await i4.opSMap(smap1);
+                test(smap2.get("a").equals(s1));
+                test(smap3.get("a").equals(s1));
+
+                const c1 = new Test.C(s1);
+
+                const [c2, c3] = await i4.opC(c1);
+                test(c2.s.equals(s1));
+                test(c3.s.equals(s1));
+
+                const [cseq2, cseq3] = await i4.opCSeq([c1]);
+                test(cseq2[0].s.equals(s1));
+                test(cseq3[0].s.equals(s1));
+
+                const cmap1 = new Map([["a", c1]]);
+                const [cmap2, cmap3] = await i4.opCMap(cmap1);
+                test(cmap2.get("a").s.equals(s1));
+                test(cmap3.get("a").s.equals(s1));
+            }
+
+            {
+                const i1 = await Test.IPrx.checkedCast(communicator.stringToProxy("i1:" + this.getTestEndpoint()));
+                await i1.shutdown();
+            }
+
+            out.writeLine("ok");
+        }
+
+        async run(args)
+        {
+            let communicator;
+            try
+            {
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
+            }
+        }
+    }
+    exports.Client = Client;
+
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/scope/.gitignore zeroc-ice-3.7.2/js/test/Ice/scope/.gitignore
--- zeroc-ice-3.7.1/js/test/Ice/scope/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/scope/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,2 @@
+Test.js
+index.html
diff -Nru zeroc-ice-3.7.1/js/test/Ice/scope/Test.ice zeroc-ice-3.7.2/js/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,136 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq s1, out CSeq s2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/Ice/servantLocator/Client.js zeroc-ice-3.7.2/js/test/Ice/servantLocator/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/servantLocator/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/servantLocator/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,322 +1,313 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(communicator, out)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests()
         {
-            if(!value)
+            async function testExceptions(obj)
             {
-                let message = "test failed";
-                if(ex)
+                try
                 {
-                    message += "\n" + ex.toString();
+                    await obj.requestFailedException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.ObjectNotExistException, ex);
+                    test(ex.id.equals(obj.ice_getIdentity()));
+                    test(ex.facet == obj.ice_getFacet());
+                    test(ex.operation == "requestFailedException");
                 }
-                throw new Error(message);
-            }
-        }
 
-        async function testExceptions(obj)
-        {
-            try
-            {
-                await obj.requestFailedException();
-                test(false)
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.ObjectNotExistException, ex);
-                test(ex.id.equals(obj.ice_getIdentity()));
-                test(ex.facet == obj.ice_getFacet());
-                test(ex.operation == "requestFailedException");
-            }
+                try
+                {
+                    await obj.unknownUserException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownUserException, ex);
+                    test(ex.unknown == "reason");
+                }
 
-            try
-            {
-                await obj.unknownUserException();
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.UnknownUserException, ex);
-                test(ex.unknown == "reason");
-            }
+                try
+                {
+                    await obj.unknownLocalException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownLocalException, ex);
+                    test(ex.unknown == "reason");
+                }
 
-            try
-            {
-                await obj.unknownLocalException();
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.UnknownLocalException, ex);
-                test(ex.unknown == "reason");
-            }
+                try
+                {
+                    await obj.unknownException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownException, ex);
+                    test(ex.unknown == "reason");
+                }
 
-            try
-            {
-                await obj.unknownException();
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.UnknownException, ex);
-                test(ex.unknown == "reason");
+                try
+                {
+                    await obj.userException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test((ex instanceof Ice.OperationNotExistException) ||
+                         (ex instanceof Ice.UnknownUserException &&
+                          ex.unknown == "::Test::TestIntfUserException"), ex);
+                }
+
+                try
+                {
+                    await obj.localException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownLocalException, ex);
+                    test(ex.unknown.indexOf("Ice::SocketException") >= 0 ||
+                         ex.unknown.indexOf("Ice.SocketException") >= 0);
+                }
+
+                try
+                {
+                    await obj.jsException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test((ex instanceof Ice.OperationNotExistException) ||
+                         (ex instanceof Ice.UnknownException || ex.unknown.indexOf("") >= 0), ex);
+                }
+
+                try
+                {
+                    await obj.unknownExceptionWithServantException();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownException, ex);
+                    test(ex.unknown == "reason");
+                }
+
+                try
+                {
+                    await obj.impossibleException(false);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownUserException, ex);
+                }
+
+                try
+                {
+                    await obj.impossibleException(true);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnknownUserException, ex);
+                }
+
+                try
+                {
+                    await obj.intfUserException(false);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Test.TestImpossibleException, ex);
+                }
+
+                try
+                {
+                    await obj.intfUserException(true);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Test.TestImpossibleException, ex);
+                }
             }
 
+            const out = this.getWriter();
+            const communicator = this.communicator();
+            out.write("testing stringToProxy... ");
+            const ref = "asm:" + this.getTestEndpoint();
+            let base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            let obj = await Test.TestIntfPrx.checkedCast(base);
+            test(obj !== null);
+            test(obj.equals(base));
+            out.writeLine("ok");
+
+            out.write("testing ice_ids... ");
             try
             {
-                await obj.userException();
+                const o = communicator.stringToProxy("category/locate:" + this.getTestEndpoint());
+                await o.ice_ids();
                 test(false);
             }
             catch(ex)
             {
-                test((ex instanceof Ice.OperationNotExistException) ||
-                     (ex instanceof Ice.UnknownUserException &&
-                      ex.unknown == "::Test::TestIntfUserException"), ex);
+                test(ex instanceof Ice.UnknownUserException && ex.unknown == "::Test::TestIntfUserException", ex);
             }
 
             try
             {
-                await obj.localException();
+                const o = communicator.stringToProxy("category/finished:" + this.getTestEndpoint());
+                await o.ice_ids();
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.UnknownLocalException, ex);
-                test(ex.unknown.indexOf("Ice::SocketException") >= 0 ||
-                     ex.unknown.indexOf("Ice.SocketException") >= 0);
+                test(ex instanceof Ice.UnknownUserException && ex.unknown == "::Test::TestIntfUserException", ex);
             }
+            out.writeLine("ok");
+
+            out.write("testing servant locator... ");
+            base = communicator.stringToProxy("category/locate:" + this.getTestEndpoint());
+            obj = await Test.TestIntfPrx.checkedCast(base);
 
             try
             {
-                await obj.jsException();
+                await Test.TestIntfPrx.checkedCast(
+                    communicator.stringToProxy("category/unknown:" + this.getTestEndpoint()));
                 test(false);
             }
             catch(ex)
             {
-                test((ex instanceof Ice.OperationNotExistException) ||
-                     (ex instanceof Ice.UnknownException || ex.unknown.indexOf("") >= 0), ex);
+                test(ex instanceof Ice.ObjectNotExistException, ex);
             }
+            out.writeLine("ok");
 
+            out.write("testing default servant locator... ");
+            base = communicator.stringToProxy("anothercat/locate:" + this.getTestEndpoint());
+            obj = await Test.TestIntfPrx.checkedCast(base);
+            base = communicator.stringToProxy("locate:" + this.getTestEndpoint());
+            obj = await Test.TestIntfPrx.checkedCast(base);
             try
             {
-                await obj.unknownExceptionWithServantException();
+                await Test.TestIntfPrx.checkedCast(
+                    communicator.stringToProxy("anothercat/unknown:" + this.getTestEndpoint()));
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.UnknownException, ex);
-                test(ex.unknown == "reason");
+                test(ex instanceof Ice.ObjectNotExistException, ex);
             }
 
             try
             {
-                await obj.impossibleException(false);
+                await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:" + this.getTestEndpoint()));
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.UnknownUserException, ex);
+                test(ex instanceof Ice.ObjectNotExistException, ex);
             }
+            out.writeLine("ok");
+
+            out.write("testing locate exceptions... ");
+            base = communicator.stringToProxy("category/locate:" + this.getTestEndpoint());
+            obj = await Test.TestIntfPrx.checkedCast(base);
+            await testExceptions(obj);
+            out.writeLine("ok");
+
+            out.write("testing finished exceptions... ");
+            base = communicator.stringToProxy("category/finished:" + this.getTestEndpoint());
+            obj = await Test.TestIntfPrx.checkedCast(base);
+            await testExceptions(obj);
 
             try
             {
-                await obj.impossibleException(true);
+                //
+                // Only call these for category/finished.
+                //
+                await obj.asyncResponse();
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.UnknownUserException, ex);
+                test(ex instanceof Test.TestImpossibleException, ex); // Called by finished().
             }
 
             try
             {
-                await obj.intfUserException(false);
+                await obj.asyncException();
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Test.TestImpossibleException, ex);
+                test(ex instanceof Test.TestImpossibleException, ex); // Called by finished().
             }
+            out.writeLine("ok");
 
+            out.write("testing servant locator removal... ");
+            base = communicator.stringToProxy("test/activation:" + this.getTestEndpoint());
+            const activation = await Test.TestActivationPrx.checkedCast(base);
+            await activation.activateServantLocator(false);
             try
             {
-                await obj.intfUserException(true);
+                await obj.ice_ping();
                 test(false);
             }
             catch(ex)
             {
-                test(ex instanceof Test.TestImpossibleException, ex);
+                test(ex instanceof Ice.ObjectNotExistException, ex);
             }
-        }
-
-        out.write("testing stringToProxy... ");
-        let ref = "asm:default -p 12010";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let obj = await Test.TestIntfPrx.checkedCast(base);
-        test(obj != null);
-        test(obj.equals(base));
-        out.writeLine("ok");
-
-        out.write("testing ice_ids... ");
-        try
-        {
-            let o = communicator.stringToProxy("category/locate:default -p 12010");
-            await o.ice_ids();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.UnknownUserException && ex.unknown == "::Test::TestIntfUserException", ex)
-        }
-
-        try
-        {
-            let o = communicator.stringToProxy("category/finished:default -p 12010");
-            await o.ice_ids();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.UnknownUserException && ex.unknown == "::Test::TestIntfUserException", ex);
-        }
-        out.writeLine("ok");
-
-        out.write("testing servant locator... ");
-        base = communicator.stringToProxy("category/locate:default -p 12010");
-        obj = await Test.TestIntfPrx.checkedCast(base);
-
-        try
-        {
-            await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010"));
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ObjectNotExistException, ex);
-        }
-        out.writeLine("ok");
+            out.writeLine("ok");
 
-        out.write("testing default servant locator... ");
-        base = communicator.stringToProxy("anothercat/locate:default -p 12010");
-        obj = await Test.TestIntfPrx.checkedCast(base);
-        base = communicator.stringToProxy("locate:default -p 12010");
-        obj = await Test.TestIntfPrx.checkedCast(base);
-        try
-        {
-            await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010"));
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ObjectNotExistException, ex);
-        }
-
-        try
-        {
-            await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:default -p 12010"));
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ObjectNotExistException, ex);
-        }
-        out.writeLine("ok");
-
-        out.write("testing locate exceptions... ");
-        base = communicator.stringToProxy("category/locate:default -p 12010");
-        obj = await Test.TestIntfPrx.checkedCast(base);
-        await testExceptions(obj);
-        out.writeLine("ok");
-
-        out.write("testing finished exceptions... ");
-        base = communicator.stringToProxy("category/finished:default -p 12010");
-        obj = await Test.TestIntfPrx.checkedCast(base);
-        await testExceptions(obj);
-
-        try
-        {
-            //
-            // Only call these for category/finished.
-            //
-            await obj.asyncResponse();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.TestImpossibleException, ex); // Called by finished().
-        }
-
-        try
-        {
-            await obj.asyncException();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.TestImpossibleException, ex); // Called by finished().
-        }
-        out.writeLine("ok");
-
-        out.write("testing servant locator removal... ");
-        base = communicator.stringToProxy("test/activation:default -p 12010");
-        activation = await Test.TestActivationPrx.checkedCast(base);
-        await activation.activateServantLocator(false);
-        try
-        {
+            out.write("testing servant locator addition... ");
+            await activation.activateServantLocator(true);
             await obj.ice_ping();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.ObjectNotExistException, ex);
-        }
-        out.writeLine("ok");
-
-        out.write("testing servant locator addition... ");
-        await activation.activateServantLocator(true);
-        await obj.ice_ping();
-        out.writeLine("ok");
-
-        await obj.shutdown();
-    }
+            out.writeLine("ok");
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(communicator, out);
+            await obj.shutdown();
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/servantLocator/ServantLocatorI.js zeroc-ice-3.7.2/js/test/Ice/servantLocator/ServantLocatorI.js
--- zeroc-ice-3.7.1/js/test/Ice/servantLocator/ServantLocatorI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/servantLocator/ServantLocatorI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
     const TestI = require("TestI").TestI;
+    const test = require("TestHelper").TestHelper.test;
 
     class MyError
     {
     }
 
-    function test(value)
-    {
-        if(!value)
-        {
-            throw new Error("test failed");
-        }
-    }
-
     class CookieI
     {
         message()
@@ -78,7 +66,7 @@
             test(this._requestId == current.requestId);
             this._requestId = -1;
 
-            test(current.id.category == this._category  || this._category.length == 0);
+            test(current.id.category == this._category || this._category.length == 0);
             test(current.id.name == "locate" || current.id.name == "finished");
 
             if(current.id.name == "finished")
@@ -153,7 +141,8 @@
     }
 
     exports.ServantLocatorI = ServantLocatorI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/servantLocator/Server.js zeroc-ice-3.7.2/js/test/Ice/servantLocator/Server.js
--- zeroc-ice-3.7.1/js/test/Ice/servantLocator/Server.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/servantLocator/Server.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,59 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
     const TestI = require("TestI").TestI;
     const TestActivationI = require("TestActivationI").TestActivationI;
     const ServantLocatorI = require("ServantLocatorI").ServantLocatorI;
 
-    async function run(out, initData, ready)
+    class Server extends TestHelper
     {
-        initData.properties.setProperty("Ice.MessageSizeMax", "10");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        let communicator;
-        try
+        async run(args)
         {
+            let communicator;
             let echo;
             try
             {
-                communicator = Ice.initialize(initData);
-                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:default -p 12010"));
-                let adapter = await communicator.createObjectAdapter("");
+                const [properties] = this.createTestProperties(args);
+                properties.setProperty("Ice.MessageSizeMax", "10");
+                properties.setProperty("Ice.Warn.Dispatch", "0");
+                properties.setProperty("Ice.Warn.Connections", "0");
+                [communicator] = this.initialize(properties);
+
+                echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+                const adapter = await communicator.createObjectAdapter("");
                 adapter.addServantLocator(new ServantLocatorI("category"), "category");
                 adapter.addServantLocator(new ServantLocatorI(""), "");
                 adapter.add(new TestI(), Ice.stringToIdentity("asm"));
                 adapter.add(new TestActivationI(), Ice.stringToIdentity("test/activation"));
                 await echo.setConnection();
                 echo.ice_getCachedConnection().setAdapter(adapter);
-                ready.resolve();
+                this.serverReady();
                 await communicator.waitForShutdown();
             }
-            catch(ex)
-            {
-                ready.reject(ex);
-            }
             finally
             {
                 if(echo)
                 {
                     await echo.shutdown();
                 }
-            }
-        }
-        finally
-        {
-            if(communicator)
-            {
-                await communicator.destroy();
+
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Server = Server;
 
-    exports._server = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/servantLocator/TestActivationI.js zeroc-ice-3.7.2/js/test/Ice/servantLocator/TestActivationI.js
--- zeroc-ice-3.7.1/js/test/Ice/servantLocator/TestActivationI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/servantLocator/TestActivationI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
-    const Ice = require("ice").Ice;
     const Test = require("Test").Test;
     const ServantLocatorI = require("ServantLocatorI").ServantLocatorI;
 
@@ -33,7 +27,8 @@
     }
 
     exports.TestActivationI = TestActivationI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/servantLocator/Test.ice zeroc-ice-3.7.2/js/test/Ice/servantLocator/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/servantLocator/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/servantLocator/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/servantLocator/TestI.js zeroc-ice-3.7.2/js/test/Ice/servantLocator/TestI.js
--- zeroc-ice-3.7.1/js/test/Ice/servantLocator/TestI.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/servantLocator/TestI.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
@@ -38,7 +33,7 @@
         {
         }
 
-        javaException(current)
+        jsException(current)
         {
         }
 
@@ -51,7 +46,7 @@
         {
             if(throwEx)
             {
-                throw new TestImpossibleException();
+                throw new Test.TestImpossibleException();
             }
 
             //
@@ -65,7 +60,7 @@
         {
             if(throwEx)
             {
-                throw new TestIntfUserException();
+                throw new Test.TestIntfUserException();
             }
 
             //
@@ -92,7 +87,8 @@
     }
 
     exports.TestI = TestI;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/slicing/exceptions/Client.js zeroc-ice-3.7.2/js/test/Ice/slicing/exceptions/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/slicing/exceptions/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/slicing/exceptions/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,341 +1,331 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
-    const ArrayUtil = Ice.ArrayUtil;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests()
         {
-            if(!value)
-            {
-                let message = "test failed";
-                if(ex)
-                {
-                    message += "\n" + ex.toString();
-                }
-                throw new Error(message);
-            }
-        }
+            const out = this.getWriter();
+            const communicator = this.communicator();
 
-        out.write("testing stringToProxy... ");
-        let ref = "Test:default -p 12010 -t 10000";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let prx = await Test.TestIntfPrx.checkedCast(base);
-        test(prx !== null);
-        test(prx.equals(base));
-        out.writeLine("ok");
+            out.write("testing stringToProxy... ");
+            const ref = "Test:" + this.getTestEndpoint() + " -t 10000";
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
+
+            out.write("testing checked cast... ");
+            const prx = await Test.TestIntfPrx.checkedCast(base);
+            test(prx !== null);
+            test(prx.equals(base));
+            out.writeLine("ok");
 
-        out.write("base... ");
-        try
-        {
-            await prx.baseAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.Base, ex);
-            test(ex.b == "Base.b");
-            test(ex.ice_id() == "::Test::Base");
-        }
-        out.writeLine("ok");
-
-        out.write("slicing of unknown derived... ");
-        try
-        {
-            await prx.unknownDerivedAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.Base, ex);
-            test(ex.b == "UnknownDerived.b");
-            test(ex.ice_id() == "::Test::Base");
-        }
-        out.writeLine("ok");
+            out.write("base... ");
+            try
+            {
+                await prx.baseAsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.Base, ex);
+                test(ex.b == "Base.b");
+                test(ex.ice_id() == "::Test::Base");
+            }
+            out.writeLine("ok");
 
-        out.write("non-slicing of known derived as base... ");
-        try
-        {
-            await prx.knownDerivedAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownDerived, ex);
-            test(ex.b == "KnownDerived.b");
-            test(ex.kd == "KnownDerived.kd");
-            test(ex.ice_id() == "::Test::KnownDerived");
-        }
-        out.writeLine("ok");
+            out.write("slicing of unknown derived... ");
+            try
+            {
+                await prx.unknownDerivedAsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.Base, ex);
+                test(ex.b == "UnknownDerived.b");
+                test(ex.ice_id() == "::Test::Base");
+            }
+            out.writeLine("ok");
 
-        out.write("non-slicing of known derived as derived... ");
-        try
-        {
-            await prx.knownDerivedAsKnownDerived();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownDerived, ex);
-            test(ex.b == "KnownDerived.b");
-            test(ex.kd == "KnownDerived.kd");
-            test(ex.ice_id() == "::Test::KnownDerived");
-        }
-        out.writeLine("ok");
+            out.write("non-slicing of known derived as base... ");
+            try
+            {
+                await prx.knownDerivedAsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownDerived, ex);
+                test(ex.b == "KnownDerived.b");
+                test(ex.kd == "KnownDerived.kd");
+                test(ex.ice_id() == "::Test::KnownDerived");
+            }
+            out.writeLine("ok");
 
-        out.write("slicing of unknown intermediate as base... ");
-        try
-        {
-            await prx.unknownIntermediateAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.Base, ex);
-            test(ex.b == "UnknownIntermediate.b");
-            test(ex.ice_id() == "::Test::Base");
-        }
-        out.writeLine("ok");
+            out.write("non-slicing of known derived as derived... ");
+            try
+            {
+                await prx.knownDerivedAsKnownDerived();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownDerived, ex);
+                test(ex.b == "KnownDerived.b");
+                test(ex.kd == "KnownDerived.kd");
+                test(ex.ice_id() == "::Test::KnownDerived");
+            }
+            out.writeLine("ok");
 
-        out.write("slicing of known intermediate as base... ");
-        try
-        {
-            await prx.knownIntermediateAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownIntermediate, ex);
-            test(ex.b == "KnownIntermediate.b");
-            test(ex.ki == "KnownIntermediate.ki");
-            test(ex.ice_id() == "::Test::KnownIntermediate");
-        }
-        out.writeLine("ok");
+            out.write("slicing of unknown intermediate as base... ");
+            try
+            {
+                await prx.unknownIntermediateAsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.Base, ex);
+                test(ex.b == "UnknownIntermediate.b");
+                test(ex.ice_id() == "::Test::Base");
+            }
+            out.writeLine("ok");
 
-        out.write("slicing of known most derived as base... ");
-        try
-        {
-            await  prx.knownMostDerivedAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownMostDerived, ex);
-            test(ex.b == "KnownMostDerived.b");
-            test(ex.ki == "KnownMostDerived.ki");
-            test(ex.kmd == "KnownMostDerived.kmd");
-            test(ex.ice_id() == "::Test::KnownMostDerived");
-        }
-        out.writeLine("ok");
+            out.write("slicing of known intermediate as base... ");
+            try
+            {
+                await prx.knownIntermediateAsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownIntermediate, ex);
+                test(ex.b == "KnownIntermediate.b");
+                test(ex.ki == "KnownIntermediate.ki");
+                test(ex.ice_id() == "::Test::KnownIntermediate");
+            }
+            out.writeLine("ok");
 
-        out.write("non-slicing of known intermediate as intermediate... ");
-        try
-        {
-            await  prx.knownIntermediateAsKnownIntermediate();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownIntermediate, ex);
-            test(ex.b == "KnownIntermediate.b");
-            test(ex.ki == "KnownIntermediate.ki");
-            test(ex.ice_id() == "::Test::KnownIntermediate");
-        }
-        out.writeLine("ok");
+            out.write("slicing of known most derived as base... ");
+            try
+            {
+                await prx.knownMostDerivedAsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownMostDerived, ex);
+                test(ex.b == "KnownMostDerived.b");
+                test(ex.ki == "KnownMostDerived.ki");
+                test(ex.kmd == "KnownMostDerived.kmd");
+                test(ex.ice_id() == "::Test::KnownMostDerived");
+            }
+            out.writeLine("ok");
 
-        out.write("non-slicing of known most derived as intermediate... ");
-        try
-        {
-            await prx.knownMostDerivedAsKnownIntermediate();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownMostDerived, ex);
-            test(ex.b == "KnownMostDerived.b");
-            test(ex.ki == "KnownMostDerived.ki");
-            test(ex.kmd == "KnownMostDerived.kmd");
-            test(ex.ice_id() == "::Test::KnownMostDerived");
-        }
-        out.writeLine("ok");
+            out.write("non-slicing of known intermediate as intermediate... ");
+            try
+            {
+                await prx.knownIntermediateAsKnownIntermediate();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownIntermediate, ex);
+                test(ex.b == "KnownIntermediate.b");
+                test(ex.ki == "KnownIntermediate.ki");
+                test(ex.ice_id() == "::Test::KnownIntermediate");
+            }
+            out.writeLine("ok");
 
-        out.write("non-slicing of known most derived as most derived... ");
-        try
-        {
-            await prx.knownMostDerivedAsKnownMostDerived();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownMostDerived, ex);
-            test(ex.b == "KnownMostDerived.b");
-            test(ex.ki == "KnownMostDerived.ki");
-            test(ex.kmd == "KnownMostDerived.kmd");
-            test(ex.ice_id() == "::Test::KnownMostDerived");
-        }
-        out.writeLine("ok");
+            out.write("non-slicing of known most derived as intermediate... ");
+            try
+            {
+                await prx.knownMostDerivedAsKnownIntermediate();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownMostDerived, ex);
+                test(ex.b == "KnownMostDerived.b");
+                test(ex.ki == "KnownMostDerived.ki");
+                test(ex.kmd == "KnownMostDerived.kmd");
+                test(ex.ice_id() == "::Test::KnownMostDerived");
+            }
+            out.writeLine("ok");
 
-        out.write("slicing of unknown most derived, known intermediate as base... ");
-        try
-        {
-            await prx.unknownMostDerived1AsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownIntermediate, ex);
-            test(ex.b == "UnknownMostDerived1.b");
-            test(ex.ki == "UnknownMostDerived1.ki");
-            test(ex.ice_id() == "::Test::KnownIntermediate");
-        }
-        out.writeLine("ok");
+            out.write("non-slicing of known most derived as most derived... ");
+            try
+            {
+                await prx.knownMostDerivedAsKnownMostDerived();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownMostDerived, ex);
+                test(ex.b == "KnownMostDerived.b");
+                test(ex.ki == "KnownMostDerived.ki");
+                test(ex.kmd == "KnownMostDerived.kmd");
+                test(ex.ice_id() == "::Test::KnownMostDerived");
+            }
+            out.writeLine("ok");
 
-        out.write("slicing of unknown most derived, known intermediate as intermediate... ");
-        try
-        {
-            await prx.unknownMostDerived1AsKnownIntermediate();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownIntermediate, ex);
-            test(ex.b == "UnknownMostDerived1.b");
-            test(ex.ki == "UnknownMostDerived1.ki");
-            test(ex.ice_id() == "::Test::KnownIntermediate");
-        }
-        out.writeLine("ok");
+            out.write("slicing of unknown most derived, known intermediate as base... ");
+            try
+            {
+                await prx.unknownMostDerived1AsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownIntermediate, ex);
+                test(ex.b == "UnknownMostDerived1.b");
+                test(ex.ki == "UnknownMostDerived1.ki");
+                test(ex.ice_id() == "::Test::KnownIntermediate");
+            }
+            out.writeLine("ok");
 
-        out.write("slicing of unknown most derived, unknown intermediate thrown as base... ");
-        try
-        {
-            await prx.unknownMostDerived2AsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.Base, ex);
-            test(ex.b == "UnknownMostDerived2.b");
-            test(ex.ice_id() == "::Test::Base");
-        }
-        out.writeLine("ok");
+            out.write("slicing of unknown most derived, known intermediate as intermediate... ");
+            try
+            {
+                await prx.unknownMostDerived1AsKnownIntermediate();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownIntermediate, ex);
+                test(ex.b == "UnknownMostDerived1.b");
+                test(ex.ki == "UnknownMostDerived1.ki");
+                test(ex.ice_id() == "::Test::KnownIntermediate");
+            }
+            out.writeLine("ok");
 
-        out.write("unknown most derived in compact format... ");
-        try
-        {
-            await prx.unknownMostDerived2AsBaseCompact();
-            test(false);
-        }
-        catch(ex)
-        {
-            if(ex instanceof Test.Base)
+            out.write("slicing of unknown most derived, unknown intermediate thrown as base... ");
+            try
             {
-                //
-                // For the 1.0 encoding, the unknown exception is sliced to Base.
-                //
-                test(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+                await prx.unknownMostDerived2AsBase();
+                test(false);
             }
-            else if(ex instanceof Ice.UnknownUserException)
+            catch(ex)
             {
-                //
-                // An UnknownUserException is raised for the compact format because the
-                // most-derived type is unknown and the exception cannot be sliced.
-                //
-                test(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+                test(ex instanceof Test.Base, ex);
+                test(ex.b == "UnknownMostDerived2.b");
+                test(ex.ice_id() == "::Test::Base");
             }
-            else if(ex instanceof Ice.OperationNotExistException)
+            out.writeLine("ok");
+
+            out.write("unknown most derived in compact format... ");
+            try
             {
+                await prx.unknownMostDerived2AsBaseCompact();
+                test(false);
             }
-            else
+            catch(ex)
             {
-                test(false, ex);
+                if(ex instanceof Test.Base)
+                {
+                    //
+                    // For the 1.0 encoding, the unknown exception is sliced to Base.
+                    //
+                    test(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+                }
+                else if(ex instanceof Ice.UnknownUserException)
+                {
+                    //
+                    // An UnknownUserException is raised for the compact format because the
+                    // most-derived type is unknown and the exception cannot be sliced.
+                    //
+                    test(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+                }
+                else if(ex instanceof Ice.OperationNotExistException)
+                {
+                    // Ignore
+                }
+                else
+                {
+                    test(false, ex);
+                }
             }
-        }
-        out.writeLine("ok");
+            out.writeLine("ok");
 
-        out.write("preserved exceptions...")
-        try
-        {
-            await prx.unknownPreservedAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.Base, ex);
-            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+            out.write("preserved exceptions...");
+            try
             {
-                test(ex.ice_getSlicedData() === null);
+                await prx.unknownPreservedAsBase();
+                test(false);
             }
-            else
+            catch(ex)
             {
-                let slicedData = ex.ice_getSlicedData();
-                test(slicedData !== null);
-                test(slicedData.slices.length == 2);
-                test(slicedData.slices[1].typeId == "::Test::SPreserved1");
-                test(slicedData.slices[0].typeId == "::Test::SPreserved2");
+                test(ex instanceof Test.Base, ex);
+                if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+                {
+                    test(ex.ice_getSlicedData() === null);
+                }
+                else
+                {
+                    const slicedData = ex.ice_getSlicedData();
+                    test(slicedData !== null);
+                    test(slicedData.slices.length == 2);
+                    test(slicedData.slices[1].typeId == "::Test::SPreserved1");
+                    test(slicedData.slices[0].typeId == "::Test::SPreserved2");
+                }
             }
-        }
 
-        try
-        {
-            await prx.unknownPreservedAsKnownPreserved();
-            test(false)
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.KnownPreserved, ex);
-            test(ex.kp == "preserved");
-            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
-            {
-                test(ex.ice_getSlicedData() === null);
-            }
-            else
-            {
-                let slicedData = ex.ice_getSlicedData();
-                test(slicedData !== null);
-                test(slicedData.slices.length == 2);
-                test(slicedData.slices[1].typeId == "::Test::SPreserved1");
-                test(slicedData.slices[0].typeId == "::Test::SPreserved2");
+            try
+            {
+                await prx.unknownPreservedAsKnownPreserved();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.KnownPreserved, ex);
+                test(ex.kp == "preserved");
+                if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+                {
+                    test(ex.ice_getSlicedData() === null);
+                }
+                else
+                {
+                    const slicedData = ex.ice_getSlicedData();
+                    test(slicedData !== null);
+                    test(slicedData.slices.length == 2);
+                    test(slicedData.slices[1].typeId == "::Test::SPreserved1");
+                    test(slicedData.slices[0].typeId == "::Test::SPreserved2");
+                }
             }
+            out.writeLine("ok");
+            await prx.shutdown();
         }
-        out.writeLine("ok");
-        await prx.shutdown();
-    }
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
-        }
-        finally
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
             {
-                await communicator.destroy();
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/slicing/exceptions/Test.ice zeroc-ice-3.7.2/js/test/Ice/slicing/exceptions/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/slicing/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/slicing/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/slicing/objects/Client.js zeroc-ice-3.7.2/js/test/Ice/slicing/objects/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/slicing/objects/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/slicing/objects/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,625 +1,610 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
-    const ArrayUtil = Ice.ArrayUtil;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        class PreservedI extends Test.Preserved
+        async allTests()
         {
-            constructor()
+            class PreservedI extends Test.Preserved
             {
-                super();
-                ++PreservedI.counter;
+                constructor()
+                {
+                    super();
+                    ++PreservedI.counter;
+                }
             }
-        }
 
-        function PreservedFactoryI(id)
-        {
-            return id === Test.Preserved.ice_staticId() ?  new PreservedI() : null;
-        }
-
-        function test(value, ex)
-        {
-            if(!value)
+            function PreservedFactoryI(id)
             {
-                let message = "test failed";
-                if(ex)
-                {
-                    message += "\n" + ex.toString();
-                }
-                throw new Error(message);
+                return id === Test.Preserved.ice_staticId() ? new PreservedI() : null;
             }
-        }
 
-        out.write("testing stringToProxy... ");
-        let ref = "Test:default -p 12010 -t 10000";
-        let base = communicator.stringToProxy(ref);
-        test(base !== null);
-        out.writeLine("ok");
-
-        out.write("testing checked cast... ");
-        let prx = await Test.TestIntfPrx.checkedCast(base);
-        test(prx !== null);
-        test(prx.equals(base));
-        out.writeLine("ok");
+            const out = this.getWriter();
+            const communicator = this.communicator();
 
-        out.write("base as Object... ");
-        {
-            let sb = await prx.SBaseAsObject();
-            test(sb !== null);
-            test(sb.ice_id() == "::Test::SBase");
-            test(sb.sb == "SBase.sb");
-        }
-        out.writeLine("ok");
+            out.write("testing stringToProxy... ");
+            const ref = "Test:" + this.getTestEndpoint() + " -t 10000";
+            const base = communicator.stringToProxy(ref);
+            test(base !== null);
+            out.writeLine("ok");
 
-        out.write("base as base... ");
-        {
-            let sb = await prx.SBaseAsSBase();
-            test(sb.sb == "SBase.sb");
-        }
-        out.writeLine("ok");
+            out.write("testing checked cast... ");
+            const prx = await Test.TestIntfPrx.checkedCast(base);
+            test(prx !== null);
+            test(prx.equals(base));
+            out.writeLine("ok");
 
-        out.write("base with known derived as base... ");
-        {
-            let sb = await prx.SBSKnownDerivedAsSBase();
-            test(sb !== null);
-            test(sb.sb == "SBSKnownDerived.sb");
-            test(sb.sbskd == "SBSKnownDerived.sbskd");
-        }
-        out.writeLine("ok");
+            out.write("base as Object... ");
+            {
+                const sb = await prx.SBaseAsObject();
+                test(sb !== null);
+                test(sb.ice_id() == "::Test::SBase");
+                test(sb.sb == "SBase.sb");
+            }
+            out.writeLine("ok");
 
-        out.write("base with known derived as known derived... ");
-        {
-            let sb = await prx.SBSKnownDerivedAsSBSKnownDerived();
-            test(sb.sbskd == "SBSKnownDerived.sbskd");
-        }
-        out.writeLine("ok");
+            out.write("base as base... ");
+            {
+                const sb = await prx.SBaseAsSBase();
+                test(sb.sb == "SBase.sb");
+            }
+            out.writeLine("ok");
 
-        out.write("base with unknown derived as base... ");
-        {
-            let sb = await prx.SBSUnknownDerivedAsSBase();
-            test(sb.sb == "SBSUnknownDerived.sb");
-        }
+            out.write("base with known derived as base... ");
+            {
+                const sb = await prx.SBSKnownDerivedAsSBase();
+                test(sb !== null);
+                test(sb.sb == "SBSKnownDerived.sb");
+                test(sb.sbskd == "SBSKnownDerived.sbskd");
+            }
+            out.writeLine("ok");
 
-        if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
-        {
-            try
+            out.write("base with known derived as known derived... ");
             {
-                let sb = await prx.SBSUnknownDerivedAsSBaseCompact();
+                const sb = await prx.SBSKnownDerivedAsSBSKnownDerived();
+                test(sb.sbskd == "SBSKnownDerived.sbskd");
+            }
+            out.writeLine("ok");
+
+            out.write("base with unknown derived as base... ");
+            {
+                const sb = await prx.SBSUnknownDerivedAsSBase();
                 test(sb.sb == "SBSUnknownDerived.sb");
             }
-            catch(ex)
+
+            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
             {
-                test(ex instanceof Ice.OperationNotExistException, ex);
+                try
+                {
+                    const sb = await prx.SBSUnknownDerivedAsSBaseCompact();
+                    test(sb.sb == "SBSUnknownDerived.sb");
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.OperationNotExistException, ex);
+                }
             }
-        }
-        else
-        {
+            else
+            {
+                try
+                {
+                    await prx.SBSUnknownDerivedAsSBaseCompact();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.OperationNotExistException ||
+                         ex instanceof Ice.NoValueFactoryException, ex);
+                }
+            }
+            out.writeLine("ok");
+
+            out.write("unknown with Object as Object... ");
             try
             {
-                await prx.SBSUnknownDerivedAsSBaseCompact();
-                test(false);
+                const obj = await prx.SUnknownAsObject();
+                test(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+                test(obj instanceof Ice.UnknownSlicedValue);
+                test(obj.ice_id() == "::Test::SUnknown");
+                test(obj.ice_getSlicedData() !== null);
+                await prx.checkSUnknown(obj);
             }
             catch(ex)
             {
-                test(ex instanceof Ice.OperationNotExistException ||
-                     ex instanceof Ice.NoValueFactoryException, ex);
+                test(ex instanceof Ice.NoValueFactoryException, ex);
+                test(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
             }
-        }
-        out.writeLine("ok");
-
-        out.write("unknown with Object as Object... ");
-        try
-        {
-            let obj = await prx.SUnknownAsObject();
-            test(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
-            test(obj instanceof Ice.UnknownSlicedValue);
-            test(obj.ice_id() == "::Test::SUnknown");
-            test(obj.ice_getSlicedData() !== null);
-            await prx.checkSUnknown(obj);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Ice.NoValueFactoryException, ex);
-            test(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
-        }
-        out.writeLine("ok");
-
-        out.write("one-element cycle... ");
-        {
-            let b = await prx.oneElementCycle();
-            test(b !== null);
-            test(b.ice_id() == "::Test::B");
-            test(b.sb == "B1.sb");
-            test(b.pb === b);
-        }
-        out.writeLine("ok");
-
-        out.write("two-element cycle... ");
-        {
-            let b1 = await prx.twoElementCycle();
-            test(b1 !== null);
-            test(b1.ice_id() == "::Test::B");
-            test(b1.sb == "B1.sb");
-
-            let b2 = b1.pb;
-            test(b2 !== null);
-            test(b2.ice_id() == "::Test::B");
-            test(b2.sb == "B2.sb");
-            test(b2.pb == b1);
-        }
-        out.writeLine("ok");
-
-        out.write("known derived pointer slicing as derived... ");
-        {
-            let d1 = await prx.D1AsD1();
-
-            test(d1 !== null);
-            test(d1.ice_id() == "::Test::D1");
-            test(d1.sb == "D1.sb");
-            test(d1.pb !== null);
-            test(d1.pb !== d1);
-
-            let b2 = d1.pb;
-            test(b2 !== null);
-            test(b2.ice_id() == "::Test::B");
-            test(b2.sb == "D2.sb");
-            test(b2.pb === d1);
-        }
-        out.writeLine("ok");
-
-        out.write("unknown derived pointer slicing as base... ");
-        {
-            let b2 = await prx.D2AsB();
-
-            test(b2 !== null);
-            test(b2.ice_id() == "::Test::B");
-            test(b2.sb == "D2.sb");
-            test(b2.pb !== null);
-            test(b2.pb !== b2);
-
-            let b1 = b2.pb;
-            test(b1 !== null);
-            test(b1.ice_id() == "::Test::D1");
-            test(b1.sb == "D1.sb");
-            test(b1.pb == b2);
-            test(b1.sd1 == "D1.sd1");
-            test(b1.pd1 === b2);
-        }
-        out.writeLine("ok");
-
-        out.write("param ptr slicing with known first... ");
-        {
-            let [b1, b2] = await prx.paramTest1();
-            test(b1 !== null);
-            test(b1.ice_id() == "::Test::D1");
-            test(b1.sb == "D1.sb");
-            test(b1.pb == b2);
-            test(b1 !== null);
-            test(b1.sd1 == "D1.sd1");
-            test(b1.pd1 === b2);
-
-            test(b2 !== null);
-            test(b2.ice_id() == "::Test::B");    // No factory, must be sliced
-            test(b2.sb == "D2.sb");
-            test(b2.pb === b1);
-        }
-        out.writeLine("ok");
-
-        out.write("param ptr slicing with unknown first... ");
-        {
-            let [b2, b1] = await prx.paramTest2();
-            test(b1 !== null);
-            test(b1.ice_id() == "::Test::D1");
-            test(b1.sb == "D1.sb");
-            test(b1.pb === b2);
-            test(b1 !== null);
-            test(b1.sd1 == "D1.sd1");
-            test(b1.pd1 == b2);
-
-            test(b2 !== null);
-            test(b2.ice_id() == "::Test::B");    // No factory, must be sliced
-            test(b2.sb == "D2.sb");
-            test(b2.pb == b1);
-        }
-        out.writeLine("ok");
-
-        out.write("return value identity with known first... ");
-        {
-            let [ret, p1, p2] = await prx.returnTest1();
-            test(ret === p1);
-        }
-        out.writeLine("ok");
-
-        out.write("return value identity with unknown first... ");
-        {
-            let[ret, p1, p2] = await prx.returnTest2();
-            test(ret == p1);
-        }
-        out.writeLine("ok");
-
-        out.write("return value identity for input params known first... ");
-        {
-            let d1 = new Test.D1();
-            d1.sb = "D1.sb";
-            d1.sd1 = "D1.sd1";
-            let d3 = new Test.D3();
-            d3.pb = d1;
-            d3.sb = "D3.sb";
-            d3.sd3 = "D3.sd3";
-            d3.pd3 = d1;
-            d1.pb = d3;
-            d1.pd1 = d3;
-
-            let b1 = await prx.returnTest3(d1, d3);
-            test(b1 !== null);
-            test(b1.sb == "D1.sb");
-            test(b1.ice_id() == "::Test::D1");
-            let p1 = b1;
-            test(p1 !== null);
-            test(p1.sd1 == "D1.sd1");
-            test(p1.pd1 == b1.pb);
-
-            let b2 = b1.pb;
-            test(b2 !== null);
-            test(b2.sb == "D3.sb");
-            test(b2.ice_id() == "::Test::B");  // Sliced by server
-            test(b2.pb == b1);
-
-            test(!(b2 instanceof Test.D3));
-            test(b1 !== d1);
-            test(b1 !== d3);
-            test(b2 !== d1);
-            test(b2 !== d3);
-        }
-        out.writeLine("ok");
-
-        out.write("return value identity for input params unknown first... ");
-        {
-            let d1 = new Test.D1();
-            d1.sb = "D1.sb";
-            d1.sd1 = "D1.sd1";
-            let d3 = new Test.D3();
-            d3.pb = d1;
-            d3.sb = "D3.sb";
-            d3.sd3 = "D3.sd3";
-            d3.pd3 = d1;
-            d1.pb = d3;
-            d1.pd1 = d3;
-
-            let b1 = await prx.returnTest3(d3, d1);
-
-            test(b1 !== null);
-            test(b1.sb == "D3.sb");
-            test(b1.ice_id() == "::Test::B");  // Sliced by server
-            test(!(b1 instanceof Test.D3));
-
-            let b2 = b1.pb;
-            test(b2 !== null);
-            test(b2.sb == "D1.sb");
-            test(b2.ice_id() == "::Test::D1");
-            test(b2.pb == b1);
-
-            let p3 = b2;
-            test(p3 !== null);
-            test(p3.sd1 == "D1.sd1");
-            test(p3.pd1 === b1);
-
-            test(b1 !== d1);
-            test(b1 !== d3);
-            test(b2 !== d1);
-            test(b2 !== d3);
-        }
-        out.writeLine("ok");
+            out.writeLine("ok");
 
-        out.write("remainder unmarshaling (3 instances)... ");
-        {
-            let [ret, p1, p2] = await prx.paramTest3();
-            test(p1 !== null);
-            test(p1.sb == "D2.sb (p1 1)");
-            test(p1.pb === null);
-            test(p1.ice_id() == "::Test::B");
-
-            test(p2 !== null);
-            test(p2.sb == "D2.sb (p2 1)");
-            test(p2.pb === null);
-            test(p2.ice_id() == "::Test::B");
-
-            test(ret !== null);
-            test(ret.sb == "D1.sb (p2 2)");
-            test(ret.pb === null);
-            test(ret.ice_id() == "::Test::D1");
-        }
-        out.writeLine("ok");
+            out.write("one-element cycle... ");
+            {
+                const b = await prx.oneElementCycle();
+                test(b !== null);
+                test(b.ice_id() == "::Test::B");
+                test(b.sb == "B1.sb");
+                test(b.pb === b);
+            }
+            out.writeLine("ok");
+
+            out.write("two-element cycle... ");
+            {
+                const b1 = await prx.twoElementCycle();
+                test(b1 !== null);
+                test(b1.ice_id() == "::Test::B");
+                test(b1.sb == "B1.sb");
+
+                const b2 = b1.pb;
+                test(b2 !== null);
+                test(b2.ice_id() == "::Test::B");
+                test(b2.sb == "B2.sb");
+                test(b2.pb == b1);
+            }
+            out.writeLine("ok");
+
+            out.write("known derived pointer slicing as derived... ");
+            {
+                const d1 = await prx.D1AsD1();
+
+                test(d1 !== null);
+                test(d1.ice_id() == "::Test::D1");
+                test(d1.sb == "D1.sb");
+                test(d1.pb !== null);
+                test(d1.pb !== d1);
+
+                const b2 = d1.pb;
+                test(b2 !== null);
+                test(b2.ice_id() == "::Test::B");
+                test(b2.sb == "D2.sb");
+                test(b2.pb === d1);
+            }
+            out.writeLine("ok");
+
+            out.write("unknown derived pointer slicing as base... ");
+            {
+                const b2 = await prx.D2AsB();
+
+                test(b2 !== null);
+                test(b2.ice_id() == "::Test::B");
+                test(b2.sb == "D2.sb");
+                test(b2.pb !== null);
+                test(b2.pb !== b2);
+
+                const b1 = b2.pb;
+                test(b1 !== null);
+                test(b1.ice_id() == "::Test::D1");
+                test(b1.sb == "D1.sb");
+                test(b1.pb == b2);
+                test(b1.sd1 == "D1.sd1");
+                test(b1.pd1 === b2);
+            }
+            out.writeLine("ok");
+
+            out.write("param ptr slicing with known first... ");
+            {
+                const [b1, b2] = await prx.paramTest1();
+                test(b1 !== null);
+                test(b1.ice_id() == "::Test::D1");
+                test(b1.sb == "D1.sb");
+                test(b1.pb == b2);
+                test(b1 !== null);
+                test(b1.sd1 == "D1.sd1");
+                test(b1.pd1 === b2);
+
+                test(b2 !== null);
+                test(b2.ice_id() == "::Test::B"); // No factory, must be sliced
+                test(b2.sb == "D2.sb");
+                test(b2.pb === b1);
+            }
+            out.writeLine("ok");
+
+            out.write("param ptr slicing with unknown first... ");
+            {
+                const [b2, b1] = await prx.paramTest2();
+                test(b1 !== null);
+                test(b1.ice_id() == "::Test::D1");
+                test(b1.sb == "D1.sb");
+                test(b1.pb === b2);
+                test(b1 !== null);
+                test(b1.sd1 == "D1.sd1");
+                test(b1.pd1 == b2);
+
+                test(b2 !== null);
+                test(b2.ice_id() == "::Test::B"); // No factory, must be sliced
+                test(b2.sb == "D2.sb");
+                test(b2.pb == b1);
+            }
+            out.writeLine("ok");
+
+            out.write("return value identity with known first... ");
+            {
+                const [ret, p1] = await prx.returnTest1();
+                test(ret === p1);
+            }
+            out.writeLine("ok");
+
+            out.write("return value identity with unknown first... ");
+            {
+                const [ret, p1] = await prx.returnTest2();
+                test(ret == p1);
+            }
+            out.writeLine("ok");
+
+            out.write("return value identity for input params known first... ");
+            {
+                const d1 = new Test.D1();
+                d1.sb = "D1.sb";
+                d1.sd1 = "D1.sd1";
+                const d3 = new Test.D3();
+                d3.pb = d1;
+                d3.sb = "D3.sb";
+                d3.sd3 = "D3.sd3";
+                d3.pd3 = d1;
+                d1.pb = d3;
+                d1.pd1 = d3;
+
+                const b1 = await prx.returnTest3(d1, d3);
+                test(b1 !== null);
+                test(b1.sb == "D1.sb");
+                test(b1.ice_id() == "::Test::D1");
+                const p1 = b1;
+                test(p1 !== null);
+                test(p1.sd1 == "D1.sd1");
+                test(p1.pd1 == b1.pb);
+
+                const b2 = b1.pb;
+                test(b2 !== null);
+                test(b2.sb == "D3.sb");
+                test(b2.ice_id() == "::Test::B"); // Sliced by server
+                test(b2.pb == b1);
+
+                test(!(b2 instanceof Test.D3));
+                test(b1 !== d1);
+                test(b1 !== d3);
+                test(b2 !== d1);
+                test(b2 !== d3);
+            }
+            out.writeLine("ok");
+
+            out.write("return value identity for input params unknown first... ");
+            {
+                const d1 = new Test.D1();
+                d1.sb = "D1.sb";
+                d1.sd1 = "D1.sd1";
+                const d3 = new Test.D3();
+                d3.pb = d1;
+                d3.sb = "D3.sb";
+                d3.sd3 = "D3.sd3";
+                d3.pd3 = d1;
+                d1.pb = d3;
+                d1.pd1 = d3;
+
+                const b1 = await prx.returnTest3(d3, d1);
+
+                test(b1 !== null);
+                test(b1.sb == "D3.sb");
+                test(b1.ice_id() == "::Test::B"); // Sliced by server
+                test(!(b1 instanceof Test.D3));
+
+                const b2 = b1.pb;
+                test(b2 !== null);
+                test(b2.sb == "D1.sb");
+                test(b2.ice_id() == "::Test::D1");
+                test(b2.pb == b1);
+
+                const p3 = b2;
+                test(p3 !== null);
+                test(p3.sd1 == "D1.sd1");
+                test(p3.pd1 === b1);
+
+                test(b1 !== d1);
+                test(b1 !== d3);
+                test(b2 !== d1);
+                test(b2 !== d3);
+            }
+            out.writeLine("ok");
+
+            out.write("remainder unmarshaling (3 instances)... ");
+            {
+                const [ret, p1, p2] = await prx.paramTest3();
+                test(p1 !== null);
+                test(p1.sb == "D2.sb (p1 1)");
+                test(p1.pb === null);
+                test(p1.ice_id() == "::Test::B");
+
+                test(p2 !== null);
+                test(p2.sb == "D2.sb (p2 1)");
+                test(p2.pb === null);
+                test(p2.ice_id() == "::Test::B");
+
+                test(ret !== null);
+                test(ret.sb == "D1.sb (p2 2)");
+                test(ret.pb === null);
+                test(ret.ice_id() == "::Test::D1");
+            }
+            out.writeLine("ok");
 
-        out.write("remainder unmarshaling (4 instances)... ");
-        {
-            let [ret, b] = await prx.paramTest4();
-            test(b !== null);
-            test(b.sb == "D4.sb (1)");
-            test(b.pb === null);
-            test(b.ice_id() == "::Test::B");
-
-            test(ret !== null);
-            test(ret.sb == "B.sb (2)");
-            test(ret.pb === null);
-            test(ret.ice_id() == "::Test::B");
-        }
-        out.writeLine("ok");
+            out.write("remainder unmarshaling (4 instances)... ");
+            {
+                const [ret, b] = await prx.paramTest4();
+                test(b !== null);
+                test(b.sb == "D4.sb (1)");
+                test(b.pb === null);
+                test(b.ice_id() == "::Test::B");
+
+                test(ret !== null);
+                test(ret.sb == "B.sb (2)");
+                test(ret.pb === null);
+                test(ret.ice_id() == "::Test::B");
+            }
+            out.writeLine("ok");
+
+            out.write("param ptr slicing, instance marshaled in unknown derived as base... ");
+            {
+                const b1 = new Test.B();
+                b1.sb = "B.sb(1)";
+                b1.pb = b1;
+
+                const d3 = new Test.D3();
+                d3.sb = "D3.sb";
+                d3.pb = d3;
+                d3.sd3 = "D3.sd3";
+                d3.pd3 = b1;
+
+                const b2 = new Test.B();
+                b2.sb = "B.sb(2)";
+                b2.pb = b1;
+
+                const ret = await prx.returnTest3(d3, b2);
+                test(ret !== null);
+                test(ret.ice_id() == "::Test::B");
+                test(ret.sb == "D3.sb");
+                test(ret.pb === ret);
+            }
+            out.writeLine("ok");
+
+            out.write("param ptr slicing, instance marshaled in unknown derived as derived... ");
+            {
+                const d11 = new Test.D1();
+                d11.sb = "D1.sb(1)";
+                d11.pb = d11;
+                d11.sd1 = "D1.sd1(1)";
+
+                const d3 = new Test.D3();
+                d3.sb = "D3.sb";
+                d3.pb = d3;
+                d3.sd3 = "D3.sd3";
+                d3.pd3 = d11;
+
+                const d12 = new Test.D1();
+                d12.sb = "D1.sb(2)";
+                d12.pb = d12;
+                d12.sd1 = "D1.sd1(2)";
+                d12.pd1 = d11;
+
+                const ret = await prx.returnTest3(d3, d12);
+                test(ret !== null);
+                test(ret.ice_id() == "::Test::B");
+                test(ret.sb == "D3.sb");
+                test(ret.pb === ret);
+            }
+            out.writeLine("ok");
+
+            out.write("sequence slicing... ");
+            {
+                let ss1b = new Test.B();
+                ss1b.sb = "B.sb";
+                ss1b.pb = ss1b;
+
+                let ss1d1 = new Test.D1();
+                ss1d1.sb = "D1.sb";
+                ss1d1.sd1 = "D1.sd1";
+                ss1d1.pb = ss1b;
+
+                let ss1d3 = new Test.D3();
+                ss1d3.sb = "D3.sb";
+                ss1d3.sd3 = "D3.sd3";
+                ss1d3.pb = ss1b;
+
+                let ss2b = new Test.B();
+                ss2b.sb = "B.sb";
+                ss2b.pb = ss1b;
+
+                let ss2d1 = new Test.D1();
+                ss2d1.sb = "D1.sb";
+                ss2d1.sd1 = "D1.sd1";
+                ss2d1.pb = ss2b;
+
+                let ss2d3 = new Test.D3();
+                ss2d3.sb = "D3.sb";
+                ss2d3.sd3 = "D3.sd3";
+                ss2d3.pb = ss2b;
+
+                ss1d1.pd1 = ss2b;
+                ss1d3.pd3 = ss2d1;
+
+                ss2d1.pd1 = ss1d3;
+                ss2d3.pd3 = ss1d1;
+
+                const ss1 = new Test.SS1();
+                ss1.s = [];
+                ss1.s[0] = ss1b;
+                ss1.s[1] = ss1d1;
+                ss1.s[2] = ss1d3;
+
+                const ss2 = new Test.SS2();
+                ss2.s = [];
+                ss2.s[0] = ss2b;
+                ss2.s[1] = ss2d1;
+                ss2.s[2] = ss2d3;
+
+                const ss = await prx.sequenceTest(ss1, ss2);
+
+                test(ss.c1 !== null);
+                ss1b = ss.c1.s[0];
+                ss1d1 = ss.c1.s[1];
+                test(ss.c2 !== null);
+                ss1d3 = ss.c1.s[2];
+
+                test(ss.c2 !== null);
+                ss2b = ss.c2.s[0];
+                ss2d1 = ss.c2.s[1];
+                ss2d3 = ss.c2.s[2];
+
+                test(ss1b.pb === ss1b);
+                test(ss1d1.pb === ss1b);
+                test(ss1d3.pb === ss1b);
+
+                test(ss2b.pb === ss1b);
+                test(ss2d1.pb === ss2b);
+                test(ss2d3.pb === ss2b);
+
+                test(ss1b.ice_id() == "::Test::B");
+                test(ss1d1.ice_id() == "::Test::D1");
+                test(ss1d3.ice_id() == "::Test::B");
+
+                test(ss2b.ice_id() == "::Test::B");
+                test(ss2d1.ice_id() == "::Test::D1");
+                test(ss2d3.ice_id() == "::Test::B");
+            }
+            out.writeLine("ok");
 
-        out.write("param ptr slicing, instance marshaled in unknown derived as base... ");
-        {
-            let b1 = new Test.B();
-            b1.sb = "B.sb(1)";
-            b1.pb = b1;
-
-            let d3 = new Test.D3();
-            d3.sb = "D3.sb";
-            d3.pb = d3;
-            d3.sd3 = "D3.sd3";
-            d3.pd3 = b1;
-
-            let b2 = new Test.B();
-            b2.sb = "B.sb(2)";
-            b2.pb = b1;
-
-            let ret = await prx.returnTest3(d3, b2);
-
-            test(ret !== null);
-            test(ret.ice_id() == "::Test::B");
-            test(ret.sb == "D3.sb");
-            test(ret.pb === ret);
-        }
-        out.writeLine("ok");
+            out.write("dictionary slicing... ");
+            {
+                const bin = new Map();
+                for(let i = 0; i < 10; ++i)
+                {
+                    const s = `D1.${i}`;
+                    const d1 = new Test.D1();
+                    d1.sb = s;
+                    d1.pb = d1;
+                    d1.sd1 = s;
+                    bin.set(i, d1);
+                }
 
-        out.write("param ptr slicing, instance marshaled in unknown derived as derived... ");
-        {
-            let d11 = new Test.D1();
-            d11.sb = "D1.sb(1)";
-            d11.pb = d11;
-            d11.sd1 = "D1.sd1(1)";
-
-            let d3 = new Test.D3();
-            d3.sb = "D3.sb";
-            d3.pb = d3;
-            d3.sd3 = "D3.sd3";
-            d3.pd3 = d11;
-
-            let d12 = new Test.D1();
-            d12.sb = "D1.sb(2)";
-            d12.pb = d12;
-            d12.sd1 = "D1.sd1(2)";
-            d12.pd1 = d11;
-
-            let ret = await prx.returnTest3(d3, d12);
-
-            test(ret !== null);
-            test(ret.ice_id() == "::Test::B");
-            test(ret.sb == "D3.sb");
-            test(ret.pb === ret);
-        }
-        out.writeLine("ok");
+                const [ret, boutH] = await prx.dictionaryTest(bin);
+                test(boutH.size === 10);
+                for(let i = 0; i < 10; ++i)
+                {
+                    const b = boutH.get(i * 10);
+                    test(b !== null);
+                    const s = `D1.${i}`;
+                    test(b.sb == s);
+                    test(b.pb !== null);
+                    test(b.pb !== b);
+                    test(b.pb.sb == s);
+                    test(b.pb.pb == b.pb);
+                }
 
-        out.write("sequence slicing... ");
-        {
-            let ss1b = new Test.B();
-            ss1b.sb = "B.sb";
-            ss1b.pb = ss1b;
-
-            let ss1d1 = new Test.D1();
-            ss1d1.sb = "D1.sb";
-            ss1d1.sd1 = "D1.sd1";
-            ss1d1.pb = ss1b;
-
-            let ss1d3 = new Test.D3();
-            ss1d3.sb = "D3.sb";
-            ss1d3.sd3 = "D3.sd3";
-            ss1d3.pb = ss1b;
-
-            let ss2b = new Test.B();
-            ss2b.sb = "B.sb";
-            ss2b.pb = ss1b;
-
-            let ss2d1 = new Test.D1();
-            ss2d1.sb = "D1.sb";
-            ss2d1.sd1 = "D1.sd1";
-            ss2d1.pb = ss2b;
-
-            let ss2d3 = new Test.D3();
-            ss2d3.sb = "D3.sb";
-            ss2d3.sd3 = "D3.sd3";
-            ss2d3.pb = ss2b;
-
-            ss1d1.pd1 = ss2b;
-            ss1d3.pd3 = ss2d1;
-
-            ss2d1.pd1 = ss1d3;
-            ss2d3.pd3 = ss1d1;
-
-            let ss1 = new Test.SS1();
-            ss1.s = [];
-            ss1.s[0] = ss1b;
-            ss1.s[1] = ss1d1;
-            ss1.s[2] = ss1d3;
-
-            let ss2 = new Test.SS2();
-            ss2.s = [];
-            ss2.s[0] = ss2b;
-            ss2.s[1] = ss2d1;
-            ss2.s[2] = ss2d3;
-
-            let ss = await prx.sequenceTest(ss1, ss2);
-
-            test(ss.c1 !== null);
-            ss1b = ss.c1.s[0];
-            ss1d1 = ss.c1.s[1];
-            test(ss.c2 !== null);
-            ss1d3 = ss.c1.s[2];
-
-            test(ss.c2 !== null);
-            ss2b = ss.c2.s[0];
-            ss2d1 = ss.c2.s[1];
-            ss2d3 = ss.c2.s[2];
-
-            test(ss1b.pb === ss1b);
-            test(ss1d1.pb === ss1b);
-            test(ss1d3.pb === ss1b);
-
-            test(ss2b.pb === ss1b);
-            test(ss2d1.pb === ss2b);
-            test(ss2d3.pb === ss2b);
-
-            test(ss1b.ice_id() == "::Test::B");
-            test(ss1d1.ice_id() == "::Test::D1");
-            test(ss1d3.ice_id() == "::Test::B");
-
-            test(ss2b.ice_id() == "::Test::B");
-            test(ss2d1.ice_id() == "::Test::D1");
-            test(ss2d3.ice_id() == "::Test::B");
-        }
-        out.writeLine("ok");
+                test(ret.size === 10);
+                for(let i = 0; i < 10; ++i)
+                {
+                    const b = ret.get(i * 20);
+                    test(b !== null);
+                    const s = "D1." + (i * 20);
+                    test(b.sb == s);
+                    test(b.pb === (i === 0 ? null : ret.get((i - 1) * 20)));
+                    test(b.sd1 == s);
+                    test(b.pd1 === b);
+                }
+            }
+            out.writeLine("ok");
 
-        out.write("dictionary slicing... ");
-        {
-            let bin = new Map();
-            for(let i = 0; i < 10; ++i)
+            out.write("base exception thrown as base exception... ");
+            try
             {
-                let s = `D1.${i}`;
-                let d1 = new Test.D1();
-                d1.sb = s;
-                d1.pb = d1;
-                d1.sd1 = s;
-                bin.set(i, d1);
-            }
-
-            let [ret, boutH] = await prx.dictionaryTest(bin);
-            test(boutH.size === 10);
-            for(let i = 0; i < 10; ++i)
+                await prx.throwBaseAsBase();
+                test(false);
+            }
+            catch(ex)
             {
-                let b = boutH.get(i * 10);
-                test(b !== null);
-                let s = `D1.${i}`;
-                test(b.sb == s);
-                test(b.pb !== null);
-                test(b.pb !== b);
-                test(b.pb.sb == s);
-                test(b.pb.pb == b.pb);
+                test(ex instanceof Test.BaseException, ex);
+                test(ex.ice_id() == "::Test::BaseException");
+                test(ex.sbe == "sbe");
+                test(ex.pb !== null);
+                test(ex.pb.sb == "sb");
+                test(ex.pb.pb == ex.pb);
             }
+            out.writeLine("ok");
 
-            test(ret.size === 10);
-            for(let i = 0; i < 10; ++i)
+            out.write("derived exception thrown as base exception... ");
+            try
             {
-                let b = ret.get(i * 20);
-                test(b !== null);
-                let s = "D1." + (i * 20);
-                test(b.sb == s);
-                test(b.pb === (i === 0 ? null : ret.get((i - 1) * 20)));
-                test(b.sd1 == s);
-                test(b.pd1 === b);
+                await prx.throwDerivedAsBase();
+                test(false);
             }
-        }
-        out.writeLine("ok");
-
-        out.write("base exception thrown as base exception... ");
-        try
-        {
-            await prx.throwBaseAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.BaseException, ex);
-            test(ex.ice_id() == "::Test::BaseException");
-            test(ex.sbe == "sbe");
-            test(ex.pb !== null);
-            test(ex.pb.sb == "sb");
-            test(ex.pb.pb == ex.pb);
-        }
-        out.writeLine("ok");
-
-        out.write("derived exception thrown as base exception... ");
-        try
-        {
-            await prx.throwDerivedAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.DerivedException, ex);
-            test(ex.ice_id() == "::Test::DerivedException");
-            test(ex.sbe == "sbe");
-            test(ex.pb !== null);
-            test(ex.pb.sb == "sb1");
-            test(ex.pb.pb === ex.pb);
-            test(ex.sde == "sde1");
-            test(ex.pd1 !== null);
-            test(ex.pd1.sb == "sb2");
-            test(ex.pd1.pb === ex.pd1);
-            test(ex.pd1.sd1 == "sd2");
-            test(ex.pd1.pd1 === ex.pd1);
-        }
-        out.writeLine("ok");
+            catch(ex)
+            {
+                test(ex instanceof Test.DerivedException, ex);
+                test(ex.ice_id() == "::Test::DerivedException");
+                test(ex.sbe == "sbe");
+                test(ex.pb !== null);
+                test(ex.pb.sb == "sb1");
+                test(ex.pb.pb === ex.pb);
+                test(ex.sde == "sde1");
+                test(ex.pd1 !== null);
+                test(ex.pd1.sb == "sb2");
+                test(ex.pd1.pb === ex.pd1);
+                test(ex.pd1.sd1 == "sd2");
+                test(ex.pd1.pd1 === ex.pd1);
+            }
+            out.writeLine("ok");
 
-        out.write("derived exception thrown as derived exception... ");
-        try
-        {
-            await prx.throwDerivedAsDerived();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.DerivedException, ex);
-            test(ex.ice_id() == "::Test::DerivedException");
-            test(ex.sbe == "sbe");
-            test(ex.pb !== null);
-            test(ex.pb.sb == "sb1");
-            test(ex.pb.pb == ex.pb);
-            test(ex.sde == "sde1");
-            test(ex.pd1 !== null);
-            test(ex.pd1.sb == "sb2");
-            test(ex.pd1.pb === ex.pd1);
-            test(ex.pd1.sd1 == "sd2");
-            test(ex.pd1.pd1 === ex.pd1);
-        }
-        out.writeLine("ok");
+            out.write("derived exception thrown as derived exception... ");
+            try
+            {
+                await prx.throwDerivedAsDerived();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.DerivedException, ex);
+                test(ex.ice_id() == "::Test::DerivedException");
+                test(ex.sbe == "sbe");
+                test(ex.pb !== null);
+                test(ex.pb.sb == "sb1");
+                test(ex.pb.pb == ex.pb);
+                test(ex.sde == "sde1");
+                test(ex.pd1 !== null);
+                test(ex.pd1.sb == "sb2");
+                test(ex.pd1.pb === ex.pd1);
+                test(ex.pd1.sd1 == "sd2");
+                test(ex.pd1.pd1 === ex.pd1);
+            }
+            out.writeLine("ok");
 
-        out.write("unknown derived exception thrown as base exception... ");
-        try
-        {
-            await prx.throwUnknownDerivedAsBase();
-            test(false);
-        }
-        catch(ex)
-        {
-            test(ex instanceof Test.BaseException, ex);
-            test(ex.ice_id() == "::Test::BaseException");
-            test(ex.sbe == "sbe");
-            test(ex.pb !== null);
-            test(ex.pb.sb == "sb d2");
-            test(ex.pb.pb == ex.pb);
-        }
-        out.writeLine("ok");
+            out.write("unknown derived exception thrown as base exception... ");
+            try
+            {
+                await prx.throwUnknownDerivedAsBase();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.BaseException, ex);
+                test(ex.ice_id() == "::Test::BaseException");
+                test(ex.sbe == "sbe");
+                test(ex.pb !== null);
+                test(ex.pb.sb == "sb d2");
+                test(ex.pb.pb == ex.pb);
+            }
+            out.writeLine("ok");
 
-        out.write("forward-declared class... ");
-        {
-            let f = await prx.useForward();
-            test(f !== null);
-        }
-        out.writeLine("ok");
+            out.write("forward-declared class... ");
+            {
+                const f = await prx.useForward();
+                test(f !== null);
+            }
+            out.writeLine("ok");
 
-        out.write("preserved classes... ");
-        {
+            out.write("preserved classes... ");
             //
             // Register a factory in order to substitute our own subclass of Preserved. This provides
             // an easy way to determine how many unmarshaled instances currently exist.
@@ -633,12 +618,12 @@
                 //
                 // Server knows the most-derived class PDerived.
                 //
-                let pd = new Test.PDerived();
+                const pd = new Test.PDerived();
                 pd.pi = 3;
                 pd.ps = "preserved";
                 pd.pb = pd;
 
-                let p2 = await prx.exchangePBase(pd);
+                const p2 = await prx.exchangePBase(pd);
 
                 test(p2.pi === 3);
                 test(p2.ps == "preserved");
@@ -649,11 +634,11 @@
                 //
                 // Server only knows the base (non-preserved) type, so the object is sliced.
                 //
-                let pu = new Test.PCUnknown();
+                const pu = new Test.PCUnknown();
                 pu.pi = 3;
                 pu.pu = "preserved";
 
-                let r = await prx.exchangePBase(pu);
+                const r = await prx.exchangePBase(pu);
 
                 test(!(r instanceof Test.PCUnknown));
                 test(r.pi == 3);
@@ -664,12 +649,11 @@
                 // Server only knows the intermediate type Preserved. The object will be sliced to
                 // Preserved for the 1.0 encoding; otherwise it should be returned intact.
                 //
-                let pcd = new Test.PCDerived();
+                const pcd = new Test.PCDerived();
                 pcd.pi = 3;
-                pcd.pbs = [ pcd ];
-
-                let r = await prx.exchangePBase(pcd);
+                pcd.pbs = [pcd];
 
+                const r = await prx.exchangePBase(pcd);
                 if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
                 {
                     test(!(r instanceof Test.PCDerived));
@@ -687,12 +671,11 @@
                 // Server only knows the intermediate type Preserved. The object will be sliced to
                 // Preserved for the 1.0 encoding; otherwise it should be returned intact.
                 //
-                let pcd = new Test.CompactPCDerived();
+                const pcd = new Test.CompactPCDerived();
                 pcd.pi = 3;
-                pcd.pbs = [ pcd ];
-
-                let r = await prx.exchangePBase(pcd);
+                pcd.pbs = [pcd];
 
+                const r = await prx.exchangePBase(pcd);
                 if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
                 {
                     test(!(r instanceof Test.CompactPCDerived));
@@ -700,7 +683,7 @@
                 }
                 else
                 {
-                    p2 = r;
+                    const p2 = r;
                     test(p2.pi === 3);
                     test(p2.pbs[0] === p2);
                 }
@@ -711,7 +694,7 @@
                 // Send an object that will have multiple preserved slices in the server.
                 // The object will be sliced to Preserved for the 1.0 encoding.
                 //
-                let pcd = new Test.PCDerived3();
+                const pcd = new Test.PCDerived3();
                 pcd.pi = 3;
 
                 //
@@ -720,17 +703,16 @@
                 pcd.pbs = new Array(300);
                 for(let i = 0; i < 300; ++i)
                 {
-                    let p2 = new Test.PCDerived2();
+                    const p2 = new Test.PCDerived2();
                     p2.pi = i;
-                    p2.pbs = [ null ]; // Nil reference. This slice should not have an indirection table.
+                    p2.pbs = [null]; // Nil reference. This slice should not have an indirection table.
                     p2.pcd2 = i;
                     pcd.pbs[i] = p2;
                 }
                 pcd.pcd2 = pcd.pi;
                 pcd.pcd3 = pcd.pbs[10];
 
-                let r = await prx.exchangePBase(pcd);
-
+                const r = await prx.exchangePBase(pcd);
                 if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
                 {
                     test(!(r instanceof Test.PCDerived3));
@@ -739,11 +721,11 @@
                 }
                 else
                 {
-                    let p3 = r;
+                    const p3 = r;
                     test(p3.pi === 3);
                     for(let i = 0; i < 300; ++i)
                     {
-                        let p2 = p3.pbs[i];
+                        const p2 = p3.pbs[i];
                         test(p2.pi === i);
                         test(p2.pbs.length === 1);
                         test(p2.pbs[0] === null);
@@ -760,12 +742,12 @@
                 // The preserved slices should be excluded for the 1.0 encoding, otherwise
                 // they should be included.
                 //
-                let p = await prx.PBSUnknownAsPreserved();
-                await  prx.checkPBSUnknown(p);
+                const p = await prx.PBSUnknownAsPreserved();
+                await prx.checkPBSUnknown(p);
 
                 if(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
                 {
-                    let slicedData = p.ice_getSlicedData();
+                    const slicedData = p.ice_getSlicedData();
                     test(slicedData !== null);
                     test(slicedData.slices.length === 1);
                     test(slicedData.slices[0].typeId == "::Test::PSUnknown");
@@ -776,31 +758,31 @@
                     test(p.ice_getSlicedData() === null);
                 }
             }
+            out.writeLine("ok");
+            await prx.shutdown();
         }
-        out.writeLine("ok");
-        await prx.shutdown();
-    }
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
-        }
-        finally
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
+            {
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/slicing/objects/Test.ice zeroc-ice-3.7.2/js/test/Ice/slicing/objects/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/slicing/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/slicing/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Ice/stream/Client.js zeroc-ice-3.7.2/js/test/Ice/stream/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/stream/Client.js	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/stream/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,638 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+/* eslint-env jquery */
+
+(function(module, require, exports)
+{
+    const Ice = require("ice").Ice;
+    const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
+
+    class Client extends TestHelper
+    {
+        allTests()
+        {
+            const communicator = this.communicator();
+            const out = this.getWriter();
+
+            class MyInterfaceI extends Ice.InterfaceByValue
+            {
+                constructor()
+                {
+                    super(Test.MyInterface.ice_staticId());
+                }
+            }
+            communicator.getValueFactoryManager().add(id => new MyInterfaceI(), Test.MyInterface.ice_staticId());
+
+            let inS = null;
+            let outS = null;
+
+            out.write("testing primitive types... ");
+
+            {
+                const data = new Uint8Array();
+                inS = new Ice.InputStream(communicator, data);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.startEncapsulation();
+                outS.writeBool(true);
+                outS.endEncapsulation();
+                const data = outS.finished();
+
+                inS = new Ice.InputStream(communicator, data);
+                inS.startEncapsulation();
+                test(inS.readBool());
+                inS.endEncapsulation();
+
+                inS = new Ice.InputStream(communicator, data);
+                inS.startEncapsulation();
+                test(inS.readBool());
+                inS.endEncapsulation();
+            }
+
+            {
+                const data = new Uint8Array();
+                inS = new Ice.InputStream(communicator, data);
+                try
+                {
+                    inS.readBool();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.UnmarshalOutOfBoundsException);
+                }
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeBool(true);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readBool());
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeByte(1);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readByte() == 1);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeShort(2);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readShort() == 2);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeInt(3);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readInt() == 3);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeLong(new Ice.Long(4));
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readLong().toNumber() == 4);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeFloat(5.0);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readFloat() == 5.0);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeDouble(6.0);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readDouble() == 6.0);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeString("hello world");
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                test(inS.readString() == "hello world");
+            }
+
+            out.writeLine("ok");
+
+            out.write("testing constructed types... ");
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                outS.writeEnum(Test.MyEnum.enum3);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const e = inS.readEnum(Test.MyEnum);
+                test(e == Test.MyEnum.enum3);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                const s = new Test.SmallStruct();
+                s.bo = true;
+                s.by = 1;
+                s.sh = 2;
+                s.i = 3;
+                s.l = new Ice.Long(4);
+                s.f = 5.0;
+                s.d = 6.0;
+                s.str = "7";
+                s.e = Test.MyEnum.enum2;
+                s.p = Test.MyInterfacePrx.uncheckedCast(communicator.stringToProxy("test:default"));
+                Test.SmallStruct.write(outS, s);
+                const data = outS.finished();
+                const s2 = Test.SmallStruct.read(new Ice.InputStream(communicator, data));
+                test(s2.equals(s));
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                const o = new Test.OptionalClass();
+                o.bo = true;
+                o.by = 5;
+                o.sh = 4;
+                o.i = 3;
+                outS.writeValue(o);
+                outS.writePendingValues();
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                let o2;
+                inS.readValue(obj =>
+                              {
+                                  o2 = obj;
+                              },
+                              Test.OptionalClass);
+                inS.readPendingValues();
+
+                test(o2.bo == o.bo);
+                test(o2.by == o.by);
+                if(communicator.getProperties().getProperty("Ice.Default.EncodingVersion") == "1.0")
+                {
+                    test(o2.sh === undefined);
+                    test(o2.i === undefined);
+                }
+                else
+                {
+                    test(o2.sh == o.sh);
+                    test(o2.i == o.i);
+                }
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator, Ice.Encoding_1_0);
+                const o = new Test.OptionalClass();
+                o.bo = true;
+                o.by = 5;
+                o.sh = 4;
+                o.i = 3;
+                outS.writeValue(o);
+                outS.writePendingValues();
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, Ice.Encoding_1_0, data);
+                let o2;
+                inS.readValue(obj =>
+                              {
+                                  o2 = obj;
+                              },
+                              Test.OptionalClass);
+                inS.readPendingValues();
+                test(o2.bo == o.bo);
+                test(o2.by == o.by);
+                test(o2.sh === undefined);
+                test(o2.i === undefined);
+            }
+
+            {
+                const arr = [true, false, true, false];
+                outS = new Ice.OutputStream(communicator);
+                Ice.BoolSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.BoolSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr, arr2));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.BoolSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.BoolSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = new Uint8Array([0x01, 0x11, 0x12, 0x22]);
+                outS = new Ice.OutputStream(communicator);
+                Ice.ByteSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.ByteSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.ByteSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.ByteSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = [0x01, 0x11, 0x12, 0x22];
+                outS = new Ice.OutputStream(communicator);
+                Ice.ShortSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.ShortSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.ShortSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.ShortSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = [0x01, 0x11, 0x12, 0x22];
+                outS = new Ice.OutputStream(communicator);
+                Ice.IntSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.IntSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.IntSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.IntSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = [new Ice.Long(0x01), new Ice.Long(0x11), new Ice.Long(0x12), new Ice.Long(0x22)];
+                outS = new Ice.OutputStream(communicator);
+                Ice.LongSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.LongSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.LongSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.LongSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = [1, 2, 3, 4];
+                outS = new Ice.OutputStream(communicator);
+                Ice.FloatSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.FloatSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.FloatSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.FloatSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = [1, 2, 3, 4];
+                outS = new Ice.OutputStream(communicator);
+                Ice.DoubleSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.DoubleSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.DoubleSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.DoubleSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = ["string1", "string2", "string3", "string4"];
+                outS = new Ice.OutputStream(communicator);
+                Ice.StringSeqHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Ice.StringSeqHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.StringSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.StringSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            {
+                const arr = [Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1, Test.MyEnum.enum2];
+                outS = new Ice.OutputStream(communicator);
+                Test.MyEnumSHelper.write(outS, arr);
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Test.MyEnumSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2, arr));
+
+                const arrS = [arr, [], arr];
+                outS = new Ice.OutputStream(communicator);
+                Test.MyEnumSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.MyEnumSSHelper.read(inS);
+                test(Ice.ArrayUtil.equals(arr2S, arrS));
+            }
+
+            const smallStructArray = [];
+            for(let i = 0; i < 3; ++i)
+            {
+                const s = new Test.SmallStruct();
+                s.bo = true;
+                s.by = 1;
+                s.sh = 2;
+                s.i = 3;
+                s.l = new Ice.Long(4);
+                s.f = 5.0;
+                s.d = 6.0;
+                s.str = "7";
+                s.e = Test.MyEnum.enum2;
+                s.p = Test.MyInterfacePrx.uncheckedCast(communicator.stringToProxy("test:default"));
+                smallStructArray[i] = s;
+            }
+
+            const myClassArray = [];
+            for(let i = 0; i < 4; ++i)
+            {
+                const c = new Test.MyClass();
+                myClassArray[i] = c;
+                c.c = myClassArray[i];
+                c.o = myClassArray[i];
+                c.s = new Test.SmallStruct();
+                c.s.e = Test.MyEnum.enum2;
+                c.seq1 = [true, false, true, false];
+                c.seq2 = new Uint8Array([1, 2, 3, 4]);
+                c.seq3 = [1, 2, 3, 4];
+                c.seq4 = [1, 2, 3, 4];
+                c.seq5 = [new Ice.Long(1), new Ice.Long(2), new Ice.Long(3), new Ice.Long(4)];
+                c.seq6 = [1, 2, 3, 4];
+                c.seq7 = [1, 2, 3, 4];
+                c.seq8 = ["string1", "string2", "string3", "string4"];
+                c.seq9 = [Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1];
+                c.seq10 = [null, null, null, null]; // null elements.
+                c.d = new Test.StringMyClassD();
+                c.d.set("hi", myClassArray[i]);
+            }
+
+            const myInterfaceArray = [];
+            for(let i = 0; i < 4; ++i)
+            {
+                myInterfaceArray[i] = new Ice.InterfaceByValue("::Test::MyInterface");
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                Test.MyClassSHelper.write(outS, myClassArray);
+                outS.writePendingValues();
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Test.MyClassSHelper.read(inS);
+                inS.readPendingValues();
+                test(arr2.length == myClassArray.length);
+                for(let i = 0; i < arr2.length; ++i)
+                {
+                    test(arr2[i] !== null);
+                    test(arr2[i].c == arr2[i]);
+                    test(arr2[i].o == arr2[i]);
+                    test(arr2[i].s.e == Test.MyEnum.enum2);
+                    test(Ice.ArrayUtil.equals(arr2[i].seq1, myClassArray[i].seq1));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq2, myClassArray[i].seq2));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq3, myClassArray[i].seq3));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq4, myClassArray[i].seq4));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq5, myClassArray[i].seq5));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq6, myClassArray[i].seq6));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq7, myClassArray[i].seq7));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq8, myClassArray[i].seq8));
+                    test(Ice.ArrayUtil.equals(arr2[i].seq9, myClassArray[i].seq9));
+                    test(arr2[i].d.get("hi") == arr2[i]);
+                }
+                const arrS = [myClassArray, [], myClassArray];
+                outS = new Ice.OutputStream(communicator);
+                Test.MyClassSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.MyClassSSHelper.read(inS);
+                test(arr2S.length == arrS.length);
+                test(arr2S[0].length == arrS[0].length);
+                test(arr2S[1].length == arrS[1].length);
+                test(arr2S[2].length == arrS[2].length);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                Test.MyInterfaceSHelper.write(outS, myInterfaceArray);
+                outS.writePendingValues();
+                let data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2 = Test.MyInterfaceSHelper.read(inS);
+                inS.readPendingValues();
+                test(arr2.length == myInterfaceArray.length);
+                const arrS = [myInterfaceArray, [], myInterfaceArray];
+                outS = new Ice.OutputStream(communicator);
+                Test.MyInterfaceSSHelper.write(outS, arrS);
+                data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const arr2S = Test.MyInterfaceSSHelper.read(inS);
+                test(arr2S.length == arrS.length);
+                test(arr2S[0].length == arrS[0].length);
+                test(arr2S[1].length == arrS[1].length);
+                test(arr2S[2].length == arrS[2].length);
+            }
+
+            {
+                outS = new Ice.OutputStream(communicator);
+                const ex = new Test.MyException();
+
+                const c = new Test.MyClass();
+                c.c = c;
+                c.o = c;
+                c.s = new Test.SmallStruct();
+                c.s.e = Test.MyEnum.enum2;
+                c.seq1 = [true, false, true, false];
+                c.seq2 = new Uint8Array([1, 2, 3, 4]);
+                c.seq3 = [1, 2, 3, 4];
+                c.seq4 = [1, 2, 3, 4];
+                c.seq5 = [new Ice.Long(1), new Ice.Long(2), new Ice.Long(3), new Ice.Long(4)];
+                c.seq6 = [1, 2, 3, 4];
+                c.seq7 = [1, 2, 3, 4];
+                c.seq8 = ["string1", "string2", "string3", "string4"];
+                c.seq9 = [Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1];
+                c.seq10 = [null, null, null, null]; // null elements.
+                c.d = new Test.StringMyClassD();
+                c.d.set("hi", c);
+
+                ex.c = c;
+
+                outS.writeException(ex);
+                const data = outS.finished();
+
+                inS = new Ice.InputStream(communicator, data);
+                try
+                {
+                    inS.throwException();
+                    test(false);
+                }
+                catch(ex1)
+                {
+                    test(ex1 instanceof Test.MyException);
+                    test(ex1.c.s.e == c.s.e);
+                    test(Ice.ArrayUtil.equals(ex1.c.seq1, c.seq1));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq2, c.seq2));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq3, c.seq3));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq4, c.seq4));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq5, c.seq5));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq6, c.seq6));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq7, c.seq7));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq8, c.seq8));
+                    test(Ice.ArrayUtil.equals(ex1.c.seq9, c.seq9));
+                }
+            }
+
+            {
+                const dict = new Test.ByteBoolD();
+                dict.set(4, true);
+                dict.set(1, false);
+                outS = new Ice.OutputStream(communicator);
+                Test.ByteBoolDHelper.write(outS, dict);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const dict2 = Test.ByteBoolDHelper.read(inS);
+                test(Ice.MapUtil.equals(dict2, dict));
+            }
+
+            {
+                const dict = new Test.ShortIntD();
+                dict.set(1, 9);
+                dict.set(4, 8);
+                outS = new Ice.OutputStream(communicator);
+                Test.ShortIntDHelper.write(outS, dict);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const dict2 = Test.ShortIntDHelper.read(inS);
+                test(Ice.MapUtil.equals(dict2, dict));
+            }
+
+            {
+                const dict = new Test.LongFloatD();
+                dict.set(new Ice.Long(123809828), 0.5);
+                dict.set(new Ice.Long(123809829), 0.6);
+                outS = new Ice.OutputStream(communicator);
+                Test.LongFloatDHelper.write(outS, dict);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const dict2 = Test.LongFloatDHelper.read(inS);
+                test(dict2.size == 2);
+                test(dict2.get(new Ice.Long(123809828)) == 0.5);
+                test(Math.abs(dict2.get(new Ice.Long(123809829)) - 0.6) <= 0.001);
+            }
+
+            {
+                const dict = new Test.StringStringD();
+                dict.set("key1", "value1");
+                dict.set("key2", "value2");
+                outS = new Ice.OutputStream(communicator);
+                Test.StringStringDHelper.write(outS, dict);
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const dict2 = Test.StringStringDHelper.read(inS);
+                test(Ice.MapUtil.equals(dict2, dict));
+            }
+
+            {
+                const dict = new Test.StringMyClassD();
+                let c = new Test.MyClass();
+                c.s = new Test.SmallStruct();
+                c.s.e = Test.MyEnum.enum2;
+                dict.set("key1", c);
+                c = new Test.MyClass();
+                c.s = new Test.SmallStruct();
+                c.s.e = Test.MyEnum.enum3;
+                dict.set("key2", c);
+                outS = new Ice.OutputStream(communicator);
+                Test.StringMyClassDHelper.write(outS, dict);
+                outS.writePendingValues();
+                const data = outS.finished();
+                inS = new Ice.InputStream(communicator, data);
+                const dict2 = Test.StringMyClassDHelper.read(inS);
+                inS.readPendingValues();
+                test(dict2.size == dict.size);
+                test(dict2.get("key1").s.e == Test.MyEnum.enum2);
+                test(dict2.get("key2").s.e == Test.MyEnum.enum3);
+            }
+            out.writeLine("ok");
+        }
+
+        async run(args)
+        {
+            let communicator;
+            try
+            {
+                [communicator] = this.initialize(args);
+                this.allTests();
+            }
+            finally
+            {
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
+            }
+        }
+    }
+    exports.Client = Client;
+
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/stream/.gitignore zeroc-ice-3.7.2/js/test/Ice/stream/.gitignore
--- zeroc-ice-3.7.1/js/test/Ice/stream/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/stream/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,2 @@
+Test.js
+index.html
diff -Nru zeroc-ice-3.7.1/js/test/Ice/stream/Test.ice zeroc-ice-3.7.2/js/test/Ice/stream/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/stream/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/stream/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,98 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+//
+// Suppress invalid metadata warnings
+//
+[["suppress-warning:invalid-metadata, deprecated"]]
+
+#include <Ice/BuiltinSequences.ice>
+
+module Test
+{
+
+enum MyEnum
+{
+    enum1,
+    enum2,
+    enum3
+}
+
+class MyClass;
+interface MyInterface;
+
+struct SmallStruct
+{
+    bool bo;
+    byte by;
+    short sh;
+    int i;
+    long l;
+    float f;
+    double d;
+    string str;
+    MyEnum e;
+    MyInterface* p;
+}
+
+class OptionalClass
+{
+    bool bo;
+    byte by;
+    optional(1) short sh;
+    optional(2) int i;
+}
+
+sequence<MyEnum> MyEnumS;
+sequence<MyClass> MyClassS;
+sequence<MyInterface> MyInterfaceS;
+
+sequence<Ice::BoolSeq> BoolSS;
+sequence<Ice::ByteSeq> ByteSS;
+sequence<Ice::ShortSeq> ShortSS;
+sequence<Ice::IntSeq> IntSS;
+sequence<Ice::LongSeq> LongSS;
+sequence<Ice::FloatSeq> FloatSS;
+sequence<Ice::DoubleSeq> DoubleSS;
+sequence<Ice::StringSeq> StringSS;
+sequence<MyEnumS> MyEnumSS;
+sequence<MyClassS> MyClassSS;
+sequence<MyInterfaceS> MyInterfaceSS;
+
+dictionary<byte, bool> ByteBoolD;
+dictionary<short, int> ShortIntD;
+dictionary<long, float> LongFloatD;
+dictionary<string, string> StringStringD;
+dictionary<string, MyClass> StringMyClassD;
+
+class MyClass
+{
+    MyClass c;
+    Object o;
+    SmallStruct s;
+    Ice::BoolSeq seq1;
+    Ice::ByteSeq seq2;
+    Ice::ShortSeq seq3;
+    Ice::IntSeq seq4;
+    Ice::LongSeq seq5;
+    Ice::FloatSeq seq6;
+    Ice::DoubleSeq seq7;
+    Ice::StringSeq seq8;
+    MyEnumS seq9;
+    MyClassS seq10;
+    StringMyClassD d;
+}
+
+exception MyException
+{
+    MyClass c;
+}
+
+interface MyInterface
+{
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/Ice/timeout/Client.js zeroc-ice-3.7.2/js/test/Ice/timeout/Client.js
--- zeroc-ice-3.7.1/js/test/Ice/timeout/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/timeout/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,391 +1,416 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    async function allTests(out, communicator)
+    class Client extends TestHelper
     {
-        function test(value, ex)
+        async allTests()
         {
-            if(!value)
+            async function connect(prx)
             {
-                let error = "test failed";
-                if(ex)
+                let nRetry = 10;
+                while(--nRetry > 0)
                 {
-                    error += "\n" + ex.toString();
+                    try
+                    {
+                        await prx.ice_getConnection();
+                        break;
+                    }
+                    catch(ex)
+                    {
+                        // Can sporadically occur with slow machines
+                        test(ex instanceof Ice.ConnectTimeoutException ||
+                             ex instanceof Ice.ConnectFailedException, ex);
+                    }
+                    await Ice.Promise.delay(100);
                 }
-                throw new Error(error);
+                return prx.ice_getConnection();
             }
-        }
 
-        async function connect(prx)
-        {
-            let nRetry = 10;
-            while(--nRetry > 0)
+            const communicator = this.communicator();
+            const out = this.getWriter();
+
+            const ref = "timeout:" + this.getTestEndpoint();
+            const obj = communicator.stringToProxy(ref);
+            test(obj !== null);
+
+            let mult = 1;
+            if(["ssl", "wss"].includes(
+                communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp")))
+            {
+                mult = 4;
+            }
+
+            const timeout = await Test.TimeoutPrx.checkedCast(obj);
+            test(timeout !== null);
+
+            const controller = Test.ControllerPrx.uncheckedCast(
+                communicator.stringToProxy("controller:" + this.getTestEndpoint(1)));
+            test(controller !== null);
+
+            out.write("testing connect timeout... ");
             {
+                const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(100 * mult));
+                await controller.holdAdapter(-1);
                 try
                 {
-                    await prx.ice_getConnection();
-                    break;
+                    await to.op(); // Expect ConnectTimeoutException.
+                    test(false);
                 }
                 catch(ex)
                 {
-                    // Can sporadically occur with slow machines
-                    test(ex instanceof Ice.ConnectTimeoutException ||
-                         ex instanceof Ice.ConnectFailedException, ex);
+                    test(ex instanceof Ice.ConnectTimeoutException, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
                 }
-                await Ice.Promise.delay(100);
+                await timeout.op(); // Ensure adapter is active.
             }
-            return prx.ice_getConnection();
-        }
-
-        const ref = "timeout:default -p 12010";
-        const obj = communicator.stringToProxy(ref);
-        test(obj !== null);
-
-        let mult = 1;
-        if(["ssl", "wss"].includes(communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp")))
-        {
-            mult = 4;
-        }
-
-        const timeout = await Test.TimeoutPrx.checkedCast(obj);
-        test(timeout !== null);
 
-        const controller = Test.ControllerPrx.uncheckedCast(communicator.stringToProxy("controller:default -p 12011"));
-        test(controller !== null);
-
-        out.write("testing connect timeout... ");
-        {
-            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(100 * mult));
-            await controller.holdAdapter(-1);
-            try
             {
-                await to.op(); // Expect ConnectTimeoutException.
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.ConnectTimeoutException, ex);
+                const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(-1));
+                await controller.holdAdapter(100 * mult);
+                await to.ice_getConnection();
+                try
+                {
+                    await to.op(); // Expect success.
+                }
+                catch(ex)
+                {
+                    test(false, ex);
+                }
             }
-            await controller.resumeAdapter();
-            await timeout.op(); // Ensure adapter is active.
-        }
+            out.writeLine("ok");
 
-        {
-            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(1000 * mult));
-            await controller.holdAdapter(200 * mult);
-            await to.ice_getConnection();
-            try
+            const seq = new Uint8Array(10000000);
+            out.write("testing connection timeout... ");
             {
-                await to.op(); // Expect success.
-            }
-            catch(ex)
-            {
-                test(false, ex);
+                const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(250 * mult));
+                await connect(to);
+                await controller.holdAdapter(-1);
+                try
+                {
+                    await to.sendData(seq); // Expect TimeoutException
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.TimeoutException, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
+                }
+                await timeout.op(); // Ensure adapter is active.
             }
-        }
-        out.writeLine("ok");
 
-        const seq = new Uint8Array(10000000);
-        out.write("testing connection timeout... ");
-        {
-            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(250 * mult));
-            await connect(to);
-            await controller.holdAdapter(-1);
-            try
-            {
-                await to.sendData(seq); // Expect TimeoutException
-                test(false);
-            }
-            catch(ex)
             {
-                test(ex instanceof Ice.TimeoutException, ex);
+                // NOTE: 30s timeout is necessary for Firefox/IE on Windows
+                const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(30000 * mult));
+                await controller.holdAdapter(200 * mult);
+                try
+                {
+                    await to.sendData(new Uint8Array(5 * 1024)); // Expect success.
+                }
+                catch(ex)
+                {
+                    test(false, ex);
+                }
             }
-            await controller.resumeAdapter();
-            await timeout.op(); // Ensure adapter is active.
-        }
+            out.writeLine("ok");
 
-        {
-            // NOTE: 30s timeout is necessary for Firefox/IE on Windows
-            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(30000 * mult));
-            await controller.holdAdapter(200 * mult);
-            try
-            {
-                await to.sendData(new Uint8Array(5 * 1024)); // Expect success.
-            }
-            catch(ex)
+            out.write("testing invocation timeout... ");
             {
-                test(false, ex);
-            }
-        }
-        out.writeLine("ok");
-
-        out.write("testing invocation timeout... ");
-        {
-            const connection = await obj.ice_getConnection();
-            let to = Test.TimeoutPrx.uncheckedCast(obj.ice_invocationTimeout(100));
-            test(connection == await to.ice_getConnection());
+                const connection = await obj.ice_getConnection();
+                let to = Test.TimeoutPrx.uncheckedCast(obj.ice_invocationTimeout(100));
+                test(connection == await to.ice_getConnection());
 
-            try
-            {
-                await to.sleep(500);
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.InvocationTimeoutException, ex);
-            }
-            await obj.ice_ping();
-            to = await Test.TimeoutPrx.checkedCast(obj.ice_invocationTimeout(1000));
-            test(connection === await obj.ice_getConnection());
+                try
+                {
+                    await to.sleep(500);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.InvocationTimeoutException, ex);
+                }
+                await obj.ice_ping();
+                to = await Test.TimeoutPrx.checkedCast(obj.ice_invocationTimeout(1000));
+                test(connection === await obj.ice_getConnection());
 
-            try
-            {
-                await to.sleep(100);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.InvocationTimeoutException, ex);
+                try
+                {
+                    await to.sleep(100);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.InvocationTimeoutException, ex);
+                }
             }
-        }
-        out.writeLine("ok");
-
-        // Small delay is useful for IE which doesn't like too many connection failures in a row
-        await Ice.Promise.delay(500);
+            out.writeLine("ok");
 
-        out.write("testing close timeout... ");
-        {
-            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(500));
-            const connection = await connect(to);
-            await controller.holdAdapter(-1);
-            await connection.close(Ice.ConnectionClose.GracefullyWithWait);
+            // Small delay is useful for IE which doesn't like too many connection failures in a row
+            await Ice.Promise.delay(500);
 
-            try
+            out.write("testing close timeout... ");
             {
-                connection.getInfo(); // getInfo() doesn't throw in the closing state
-            }
-            catch(ex)
-            {
-                test(false, ex);
-            }
+                const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(500));
+                const connection = await connect(to);
+                await controller.holdAdapter(-1);
+                await connection.close(Ice.ConnectionClose.GracefullyWithWait);
 
-            while(true)
-            {
                 try
                 {
-                    connection.getInfo();
-                    await Ice.Promise.delay(10);
+                    connection.getInfo(); // getInfo() doesn't throw in the closing state
+                    while(true)
+                    {
+                        try
+                        {
+                            connection.getInfo();
+                            await Ice.Promise.delay(10);
+                        }
+                        catch(ex)
+                        {
+                            test(ex instanceof Ice.ConnectionManuallyClosedException, ex); // Expected
+                            test(ex.graceful);
+                            break;
+                        }
+                    }
                 }
                 catch(ex)
                 {
-                    test(ex instanceof Ice.ConnectionManuallyClosedException, ex); // Expected
-                    test(ex.graceful);
-                    break;
+                    test(false, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
                 }
+                await timeout.op();
             }
-            await controller.resumeAdapter();
-            await timeout.op();
-        }
-        out.writeLine("ok");
-
-        // Small delay is useful for IE which doesn't like too many connection failures in a row
-        await Ice.Promise.delay(500);
+            out.writeLine("ok");
 
-        out.write("testing timeout overrides... ");
-        {
-            //
-            // Test Ice.Override.Timeout. This property overrides all
-            // endpoint timeouts.
-            //
-            const initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().clone();
-            if(mult === 1)
-            {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
-                initData.properties.setProperty("Ice.Override.Timeout", "100");
-            }
-            else
-            {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "5000");
-                initData.properties.setProperty("Ice.Override.Timeout", "2000");
-            }
-            const comm = Ice.initialize(initData);
-            let to = Test.TimeoutPrx.uncheckedCast(comm.stringToProxy(ref));
-            await connect(to);
-            await controller.holdAdapter(-1);
+            // Small delay is useful for IE which doesn't like too many connection failures in a row
+            await Ice.Promise.delay(500);
 
-            try
-            {
-                await to.sendData(seq); // Expect TimeoutException.
-                test(false);
-            }
-            catch(ex)
+            out.write("testing timeout overrides... ");
             {
-                test(ex instanceof Ice.TimeoutException, ex);
-            }
+                //
+                // Test Ice.Override.Timeout. This property overrides all
+                // endpoint timeouts.
+                //
+                const initData = new Ice.InitializationData();
+                initData.properties = communicator.getProperties().clone();
+                if(mult === 1)
+                {
+                    initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+                    initData.properties.setProperty("Ice.Override.Timeout", "100");
+                }
+                else
+                {
+                    initData.properties.setProperty("Ice.Override.ConnectTimeout", "5000");
+                    initData.properties.setProperty("Ice.Override.Timeout", "2000");
+                }
+                const comm = Ice.initialize(initData);
+                let to = Test.TimeoutPrx.uncheckedCast(comm.stringToProxy(ref));
+                await connect(to);
+                await controller.holdAdapter(-1);
 
-            await controller.resumeAdapter();
-            await timeout.op();
-            //
-            // Calling ice_timeout() should have no effect.
-            //
-            to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
-            await connect(to);
-            await controller.holdAdapter(-1);
-            try
-            {
-                await to.sendData(seq); // Expect TimeoutException.
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.TimeoutException, ex);
+                try
+                {
+                    await to.sendData(seq); // Expect TimeoutException.
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.TimeoutException, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
+                }
+                await timeout.op();
+                //
+                // Calling ice_timeout() should have no effect.
+                //
+                to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
+                await connect(to);
+                await controller.holdAdapter(-1);
+                try
+                {
+                    await to.sendData(seq); // Expect TimeoutException.
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.TimeoutException, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
+                }
+                await timeout.op();
+                await comm.destroy();
             }
-            await controller.resumeAdapter();
-            await timeout.op();
-            await comm.destroy();
-        }
 
-        // Small delay is useful for IE which doesn't like too many connection failures in a row
-        await Ice.Promise.delay(500);
+            // Small delay is useful for IE which doesn't like too many connection failures in a row
+            await Ice.Promise.delay(500);
 
-        {
-            //
-            // Test Ice.Override.ConnectTimeout.
-            //
-            const initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().clone();
-            if(mult === 1)
-            {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
-            }
-            else
-            {
-                initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
-            }
-            const comm = Ice.initialize(initData);
-            let to = Test.TimeoutPrx.uncheckedCast(comm.stringToProxy(ref));
-            await controller.holdAdapter(-1);
-
-            try
             {
-                await to.op();
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.ConnectTimeoutException, ex);
-            }
+                //
+                // Test Ice.Override.ConnectTimeout.
+                //
+                const initData = new Ice.InitializationData();
+                initData.properties = communicator.getProperties().clone();
+                if(mult === 1)
+                {
+                    initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+                }
+                else
+                {
+                    initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
+                }
+                const comm = Ice.initialize(initData);
+                let to = Test.TimeoutPrx.uncheckedCast(comm.stringToProxy(ref));
+                await controller.holdAdapter(-1);
 
-            await controller.resumeAdapter();
-            await timeout.op();
-            await controller.holdAdapter(-1);
+                try
+                {
+                    await to.op();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.ConnectTimeoutException, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
+                }
+                await timeout.op();
+                await controller.holdAdapter(-1);
 
-            //
-            // Calling ice_timeout() should have no effect on the connect timeout.
-            //
-            to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
+                //
+                // Calling ice_timeout() should have no effect on the connect timeout.
+                //
+                to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
 
-            try
-            {
-                await to.op();
-                test(false);
-            }
-            catch(ex)
-            {
-                test(ex instanceof Ice.ConnectTimeoutException, ex);
-            }
-            await controller.resumeAdapter();
-            await timeout.op(); // Ensure adapter is active
-
-            //
-            // Verify that timeout set via ice_timeout() is still used for requests.
-            //
-            to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(100 * mult));
-            await connect(to); // Force connection.
-            await controller.holdAdapter(-1);
+                try
+                {
+                    await to.op();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.ConnectTimeoutException, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
+                }
+                await timeout.op(); // Ensure adapter is active
 
-            try
-            {
-                await to.sendData(seq);
-                test(false);
+                //
+                // Verify that timeout set via ice_timeout() is still used for requests.
+                //
+                to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(100 * mult));
+                await connect(to); // Force connection.
+                await controller.holdAdapter(-1);
+
+                try
+                {
+                    await to.sendData(seq);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.TimeoutException, ex);
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
+                }
+                await timeout.op();
+                await comm.destroy();
             }
-            catch(ex)
+
+            // Small delay is useful for IE which doesn't like too many connection failures in a row
+            await Ice.Promise.delay(500);
             {
-                test(ex instanceof Ice.TimeoutException, ex);
+                //
+                // Test Ice.Override.CloseTimeout.
+                //
+                const initData = new Ice.InitializationData();
+                initData.properties = communicator.getProperties().clone();
+                initData.properties.setProperty("Ice.Override.CloseTimeout", "100");
+                const comm = Ice.initialize(initData);
+                await comm.stringToProxy(ref).ice_getConnection();
+
+                await controller.holdAdapter(-1);
+
+                const start = Date.now();
+                await comm.destroy();
+                const end = Date.now();
+                try
+                {
+                    //
+                    // setTimeout can be unpredictable slow in Safari and IE when the process
+                    // enter background, we increase the expected time that destroy can takes
+                    // for these browsers.
+                    //
+                    const t = (TestHelper.isSafari() || TestHelper.isIE()) ? 30000 : mult * 2000;
+                    test(end - start < t,
+                         new Error(`destroy take ${end - start} ms, expected less than ${t} ms`));
+                }
+                finally
+                {
+                    await controller.resumeAdapter();
+                }
+                out.writeLine("ok");
+                await controller.shutdown();
             }
-            await controller.resumeAdapter();
-            await timeout.op();
-            await comm.destroy();
         }
 
-        // Small delay is useful for IE which doesn't like too many connection failures in a row
-        await Ice.Promise.delay(500);
-
+        async run(args)
         {
-            //
-            // Test Ice.Override.CloseTimeout.
-            //
-            const initData = new Ice.InitializationData();
-            initData.properties = communicator.getProperties().clone();
-            initData.properties.setProperty("Ice.Override.CloseTimeout", "100");
-            const comm = Ice.initialize(initData);
-            await comm.stringToProxy(ref).ice_getConnection();
-
-            await controller.holdAdapter(-1);
-
-            const start = Date.now();
-            await comm.destroy();
-            const end = Date.now();
-            test(end - start < 1000);
-            await controller.resumeAdapter();
-            out.writeLine("ok");
-            await controller.shutdown();
-        }
-    }
-
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            //
-            // For this test, we want to disable retries.
-            //
-            initData.properties.setProperty("Ice.RetryIntervals", "-1");
-
-            //
-            // We don't want connection warnings because of the timeout
-            //
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
+            let communicator;
+            try
+            {
+                const [properties] = this.createTestProperties(args);
+                //
+                // For this test, we want to disable retries.
+                //
+                properties.setProperty("Ice.RetryIntervals", "-1");
 
-            initData.properties.setProperty("Ice.PrintStackTraces", "1");
+                //
+                // We don't want connection warnings because of the timeout
+                //
+                properties.setProperty("Ice.Warn.Connections", "0");
+                properties.setProperty("Ice.PrintStackTraces", "1");
 
-            communicator = Ice.initialize(initData);
-            await allTests(out, communicator);
-        }
-        finally
-        {
-            if(communicator)
+                [communicator] = this.initialize(properties);
+                await this.allTests();
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
+    exports.Client = Client;
 
-    exports._test = run;
-    exports._runServer = true;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/js/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/js/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/js/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/js/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 
diff -Nru zeroc-ice-3.7.1/js/test/Slice/escape/Client.js zeroc-ice-3.7.2/js/test/Slice/escape/Client.js
--- zeroc-ice-3.7.1/js/test/Slice/escape/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Slice/escape/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,35 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
+    const TestHelper = require("TestHelper").TestHelper;
     const _await = require("Key")._await;
+    const test = TestHelper.test;
 
-    function test(value)
+    class Client extends TestHelper
     {
-        if(!value)
+        async allTests()
         {
-            throw new Error("test failed");
-        }
-    };
+            const communicator = this.communicator();
+            const out = this.getWriter();
 
-    async function run(out, initData)
-    {
-        let communicator;
-        try
-        {
-            communicator = Ice.initialize(initData);
             out.write("testing enums... ");
 
             test(_await._var.base !== 0);
             out.writeLine("ok");
 
             out.write("testing structs... ");
-            let s = new _await._break(10);
+            const s = new _await._break(10);
             test(s._while == 10);
             out.writeLine("ok");
 
             out.write("testing proxies... ");
 
             let p = _await.casePrx.uncheckedCast(
-                communicator.stringToProxy("hello:tcp -h 127.0.0.1 -p 12010").ice_timeout(100));
+                communicator.stringToProxy("hello:" + this.getTestEndpoint()).ice_timeout(100));
             test(p);
 
             try
@@ -53,7 +43,7 @@
             }
 
             p = _await.typeofPrx.uncheckedCast(
-                communicator.stringToProxy("hello:tcp -h 127.0.0.1 -p 12010").ice_timeout(100));
+                communicator.stringToProxy("hello:" + this.getTestEndpoint()).ice_timeout(100));
             test(p);
 
             try
@@ -69,7 +59,7 @@
 
             out.write("testing classes... ");
 
-            let d = new _await._delete(10, null, 10);
+            const d = new _await._delete(10, null, 10);
             test(d._if === 10);
             test(d._else === null);
             test(d._export === 10);
@@ -90,17 +80,27 @@
             test(p._null instanceof _await.explicitPrx);
             out.writeLine("ok");
         }
-        finally
+
+        async run(args)
         {
-            if(communicator)
+            let communicator;
+            try
+            {
+                [communicator] = this.initialize(args);
+                await this.allTests();
+            }
+            finally
             {
-                await communicator.destroy();
+                if(communicator)
+                {
+                    await communicator.destroy();
+                }
             }
         }
     }
-
-    exports._test = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Slice/escape/Key.ice zeroc-ice-3.7.2/js/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/js/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/js/test/Slice/macros/Client.js zeroc-ice-3.7.2/js/test/Slice/macros/Client.js
--- zeroc-ice-3.7.1/js/test/Slice/macros/Client.js	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Slice/macros/Client.js	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,44 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
     const Test = require("Test").Test;
+    const TestHelper = require("TestHelper").TestHelper;
+    const test = TestHelper.test;
 
-    function test(value)
+    class Client extends TestHelper
     {
-        if(!value)
+        allTests()
         {
-            throw new Error("test failed");
-        }
-    };
-
-    async function run(out)
-    {
-        out.write("testing Slice predefined macros... ");
-
-        let d = new Test._Default();
-        test(d.x == 10);
-        test(d.y == 10);
+            const out = this.getWriter();
+            out.write("testing Slice predefined macros... ");
 
-        let nd = new Test.NoDefault();
-        test(nd.x != 10);
-        test(nd.y != 10);
+            const d = new Test._Default();
+            test(d.x == 10);
+            test(d.y == 10);
+
+            const nd = new Test.NoDefault();
+            test(nd.x != 10);
+            test(nd.y != 10);
+
+            const c = new Test.JsOnly();
+            test(c.lang == "js");
+            test(c.version == Ice.intVersion());
 
-        let c = new Test.JsOnly();
-        test(c.lang == "js");
-        test(c.version == Ice.intVersion());
+            out.writeLine("ok");
+        }
 
-        out.writeLine("ok");
+        run(args)
+        {
+            this.allTests();
+        }
     }
-
-    exports._test = run;
-}
-(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require,
- typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this));
+    exports.Client = Client;
+}(typeof global !== "undefined" && typeof global.process !== "undefined" ? module : undefined,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? require :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,
+  typeof global !== "undefined" && typeof global.process !== "undefined" ? exports :
+  (typeof WorkerGlobalScope !== "undefined" && self instanceof WorkerGlobalScope) ? self : window));
diff -Nru zeroc-ice-3.7.1/js/test/Slice/macros/Test.ice zeroc-ice-3.7.2/js/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/js/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This macro sets the default value only when compiling with slice2js.
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Glacier2/router/Callback.ice zeroc-ice-3.7.2/js/test/typescript/Glacier2/router/Callback.ice
--- zeroc-ice-3.7.1/js/test/typescript/Glacier2/router/Callback.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Glacier2/router/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,36 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+exception CallbackException
+{
+    double someValue;
+    string someString;
+}
+
+interface CallbackReceiver
+{
+    void callback();
+
+    void callbackEx()
+        throws CallbackException;
+}
+
+interface Callback
+{
+    void initiateCallback(CallbackReceiver* proxy);
+
+    void initiateCallbackEx(CallbackReceiver* proxy)
+        throws CallbackException;
+
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Glacier2/router/Client.ts zeroc-ice-3.7.2/js/test/typescript/Glacier2/router/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Glacier2/router/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Glacier2/router/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,329 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice, Glacier2} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+const CallbackPrx = Test.CallbackPrx;
+const CallbackReceiverPrx = Test.CallbackReceiverPrx;
+
+export class CallbackReceiverI extends Test.CallbackReceiver
+{
+    constructor()
+    {
+        super();
+        this._callback = false;
+        this._p = new Ice.Promise();
+    }
+
+    callback(current:Ice.Current):void
+    {
+        test(!this._callback);
+        this._p.resolve();
+    }
+
+    callbackEx(current:Ice.Current):void
+    {
+        this.callback(current);
+        throw new Test.CallbackException(3.14, "3.14");
+    }
+
+    callbackOK():PromiseLike<void>
+    {
+        return this._p.then(() =>
+                            {
+                                this._callback = false;
+                                this._p = new Ice.Promise();
+                            });
+    }
+
+    _p:Ice.Promise<void>;
+    _callback:boolean;
+}
+
+export class Client extends TestHelper
+{
+    async allTests(shutdown:boolean)
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+
+        out.write("testing stringToProxy for router... ");
+        const routerBase = communicator.stringToProxy("Glacier2/router:" + this.getTestEndpoint(50));
+        test(routerBase !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast for router... ");
+        const router = await Glacier2.RouterPrx.checkedCast(routerBase);
+        test(router !== null);
+        out.writeLine("ok");
+
+        out.write("installing router with communicator... ");
+        communicator.setDefaultRouter(router);
+        out.writeLine("ok");
+
+        out.write("getting the session timeout... ");
+        const timeout = await router.getSessionTimeout();
+        test(timeout.toNumber() === 30);
+        out.writeLine("ok");
+
+        out.write("testing stringToProxy for server object... ");
+        const base = communicator.stringToProxy("c1/callback:" + this.getTestEndpoint());
+        out.writeLine("ok");
+
+        out.write("trying to ping server before session creation... ");
+        try
+        {
+            await base.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ConnectionLostException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("trying to create session with wrong password... ");
+        try
+        {
+            await router.createSession("userid", "xxx");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Glacier2.PermissionDeniedException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("trying to destroy non-existing session... ");
+        try
+        {
+            await router.destroySession();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Glacier2.SessionNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("creating session with correct password... ");
+        await router.createSession("userid", "abc123");
+        out.writeLine("ok");
+
+        out.write("trying to create a second session... ");
+        try
+        {
+            await router.createSession("userid", "abc123");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Glacier2.CannotCreateSessionException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("pinging server after session creation... ");
+        await base.ice_ping();
+        out.writeLine("ok");
+
+        {
+            out.write("pinging object with client endpoint... ");
+            const baseC = communicator.stringToProxy("collocated:" + this.getTestEndpoint(50));
+            try
+            {
+                await baseC.ice_ping();
+            }
+            catch(ex)
+            {
+            }
+            out.writeLine("ok");
+        }
+
+        out.write("testing checked cast for server object... ");
+        const twoway = await Test.CallbackPrx.checkedCast(base);
+        test(twoway !== null);
+        out.writeLine("ok");
+
+        out.write("creating and activating callback receiver adapter... ");
+        communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0");
+        const adapter = await communicator.createObjectAdapterWithRouter("CallbackReceiverAdapter", router);
+        await adapter.activate();
+        out.writeLine("ok");
+
+        out.write("getting category from router... ");
+        const category = await router.getCategoryForClient();
+        out.writeLine("ok");
+
+        out.write("creating and adding callback receiver object... ");
+        const callbackReceiverImpl = new CallbackReceiverI();
+        const callbackReceiver = callbackReceiverImpl;
+
+        const callbackReceiverIdent = new Ice.Identity();
+        callbackReceiverIdent.name = "callbackReceiver";
+        callbackReceiverIdent.category = category;
+        const twowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, callbackReceiverIdent));
+
+        const fakeCallbackReceiverIdent = new Ice.Identity();
+        fakeCallbackReceiverIdent.name = "callbackReceiver";
+        fakeCallbackReceiverIdent.category = "dummy";
+        const fakeTwowayR = CallbackReceiverPrx.uncheckedCast(adapter.add(callbackReceiver, fakeCallbackReceiverIdent));
+        out.writeLine("ok");
+
+        out.write("testing oneway callback... ");
+        const oneway = CallbackPrx.uncheckedCast(twoway.ice_oneway());
+        const onewayR = CallbackReceiverPrx.uncheckedCast(twowayR.ice_oneway());
+        let context = new Ice.Context();
+        context.set("_fwd", "o");
+        await oneway.initiateCallback(onewayR, context);
+        await callbackReceiverImpl.callbackOK();
+        out.writeLine("ok");
+
+        out.write("testing twoway callback... ");
+        context = new Ice.Context();
+        context.set("_fwd", "t");
+        await twoway.initiateCallback(twowayR, context);
+        await callbackReceiverImpl.callbackOK();
+        out.writeLine("ok");
+
+        out.write("ditto, but with user exception... ");
+        context = new Ice.Context();
+        context.set("_fwd", "t");
+        try
+        {
+            await twoway.initiateCallbackEx(twowayR, context);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.CallbackException, ex);
+            test(ex.someValue == 3.14);
+            test(ex.someString == "3.14");
+        }
+
+        await callbackReceiverImpl.callbackOK();
+        out.writeLine("ok");
+
+        out.write("trying twoway callback with fake category... ");
+        context = new Ice.Context();
+        context.set("_fwd", "t");
+        try
+        {
+            await twoway.initiateCallback(fakeTwowayR, context);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ObjectNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing whether other allowed category is accepted... ");
+        context = new Ice.Context();
+        context.set("_fwd", "t");
+        let otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("c2/callback")));
+        await otherCategoryTwoway.initiateCallback(twowayR, context);
+        await callbackReceiverImpl.callbackOK();
+        out.writeLine("ok");
+
+        out.write("testing whether disallowed category gets rejected... ");
+        context = new Ice.Context();
+        context.set("_fwd", "t");
+        otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("c3/callback")));
+        try
+        {
+            await otherCategoryTwoway.initiateCallback(twowayR, context);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ObjectNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing whether user-id as category is accepted... ");
+        context = new Ice.Context();
+        context.set("_fwd", "t");
+        otherCategoryTwoway = CallbackPrx.uncheckedCast(twoway.ice_identity(Ice.stringToIdentity("_userid/callback")));
+        await otherCategoryTwoway.initiateCallback(twowayR, context);
+        await callbackReceiverImpl.callbackOK();
+        out.writeLine("ok");
+
+        if(shutdown)
+        {
+            out.write("testing server shutdown... ");
+            await twoway.shutdown();
+            out.writeLine("ok");
+            // No ping, otherwise the router prints a warning message if it's
+            // started with --Ice.Warn.Connections.
+        }
+
+        out.write("destroying session... ");
+        await router.destroySession();
+        out.writeLine("ok");
+
+        out.write("trying to ping server after session destruction... ");
+        try
+        {
+            await base.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ConnectionLostException, ex);
+        }
+        out.writeLine("ok");
+
+        if(shutdown)
+        {
+            out.write("uninstalling router with communicator... ");
+            communicator.setDefaultRouter(null);
+            out.writeLine("ok");
+
+            out.write("testing stringToProxy for process object... ");
+            const processBase = communicator.stringToProxy("Glacier2/admin -f Process:" + this.getTestEndpoint(51));
+            out.writeLine("ok");
+
+            out.write("testing checked cast for admin object... ");
+            const processPrx = await Ice.ProcessPrx.checkedCast(processBase);
+            test(processPrx !== null);
+            out.writeLine("ok");
+
+            out.write("testing Glacier2 shutdown... ");
+            await processPrx.shutdown();
+            try
+            {
+                await processPrx.ice_timeout(500).ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.LocalException, ex);
+            }
+            out.writeLine("ok");
+        }
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.Warn.Dispatch", "1");
+            properties.setProperty("Ice.Warn.Connections", "0");
+            [communicator] = this.initialize(properties);
+            await this.allTests(args.indexOf("--shutdown") > -1);
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/acm/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/acm/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/acm/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/acm/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,548 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+
+const test = TestHelper.test;
+
+interface Output
+{
+    writeLine(data:string):void;
+    write(data:string):void;
+}
+
+class LoggerI implements Ice.Logger
+{
+    constructor(out:Output)
+    {
+        this._messages = [];
+        this._out = out;
+    }
+
+    print(msg:string):void
+    {
+        this._messages.push(msg);
+    }
+
+    trace(category:string, message:string):void
+    {
+        this._messages.push("[" + category + "] " + message);
+    }
+
+    warning(message:string):void
+    {
+        this._messages.push("warning: " + message);
+    }
+
+    error(message:string):void
+    {
+        this._messages.push("error: " + message);
+    }
+
+    cloneWithPrefix(prefix:string):Ice.Logger
+    {
+        return this;
+    }
+
+    getPrefix():string
+    {
+        return "";
+    }
+
+    dump():void
+    {
+        this._messages.forEach(message => this._out.writeLine(message));
+        this._messages = [];
+    }
+
+    _messages:Array<string>;
+    _out:Output;
+}
+
+abstract class TestCase
+{
+    constructor(name:string, com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        this._name = name;
+        this._com = com;
+        this._logger = new LoggerI(out);
+        this._msg = null;
+
+        this._clientACMTimeout = -1;
+        this._clientACMClose = -1;
+        this._clientACMHeartbeat = -1;
+
+        this._serverACMTimeout = -1;
+        this._serverACMClose = -1;
+        this._serverACMHeartbeat = -1;
+
+        this._heartbeat = 0;
+        this._closed = false;
+    }
+
+    async init()
+    {
+        const initData = new Ice.InitializationData();
+        initData.properties = this._com.ice_getCommunicator().getProperties().clone();
+        initData.logger = this._logger;
+        initData.properties.setProperty("Ice.ACM.Timeout", "2");
+        if(this._clientACMTimeout >= 0)
+        {
+            initData.properties.setProperty("Ice.ACM.Client.Timeout", String(this._clientACMTimeout));
+        }
+        if(this._clientACMClose >= 0)
+        {
+            initData.properties.setProperty("Ice.ACM.Client.Close", String(this._clientACMClose));
+        }
+        if(this._clientACMHeartbeat >= 0)
+        {
+            initData.properties.setProperty("Ice.ACM.Client.Heartbeat", String(this._clientACMHeartbeat));
+        }
+        this._communicator = Ice.initialize(initData);
+
+        this._adapter = await this._com.createObjectAdapter(this._serverACMTimeout,
+                                                            this._serverACMClose,
+                                                            this._serverACMHeartbeat);
+    }
+
+    async destroy()
+    {
+        await this._adapter.deactivate();
+        await this._communicator.destroy();
+    }
+
+    join(out:Output)
+    {
+        this._logger.dump();
+        out.write("testing " + this._name + "... ");
+        if(this._msg === null)
+        {
+            out.writeLine("ok");
+        }
+        else
+        {
+            out.writeLine("failed! " + this._msg);
+            test(false);
+        }
+    }
+
+    async start()
+    {
+        try
+        {
+            let prx = await this._adapter.getTestIntf();
+            prx = Test.TestIntfPrx.uncheckedCast(this._communicator.stringToProxy(prx.toString()));
+            const con = await prx.ice_getConnection();
+            con.setCloseCallback(connection =>
+                                    {
+                                        this._closed = true;
+                                    });
+            con.setHeartbeatCallback(connection => ++this._heartbeat);
+            await this.runTestCase(this._adapter, prx);
+        }
+        catch(ex)
+        {
+            this._msg = "unexpected exception:\n" + ex.toString() + "\n" + ex.stack;
+        }
+    }
+
+    async waitForClosed()
+    {
+        const now = Date.now();
+        while(!this._closed)
+        {
+            await Ice.Promise.delay(100);
+            if(Date.now() - now >= 2000)
+            {
+                test(false); // Waited for more than 2s for close, something's wrong.
+            }
+        }
+    }
+
+    abstract runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx):void;
+
+    setClientACM(timeout:number, close:number, heartbeat:number)
+    {
+        this._clientACMTimeout = timeout;
+        this._clientACMClose = close;
+        this._clientACMHeartbeat = heartbeat;
+    }
+
+    setServerACM(timeout:number, close:number, heartbeat:number)
+    {
+        this._serverACMTimeout = timeout;
+        this._serverACMClose = close;
+        this._serverACMHeartbeat = heartbeat;
+    }
+
+    _name:string;
+    _com:Test.RemoteCommunicatorPrx;
+    _adapter:Test.RemoteObjectAdapterPrx;
+    _logger:LoggerI;
+    _msg:string;
+
+    _clientACMTimeout:number;
+    _clientACMClose:number;
+    _clientACMHeartbeat:number;
+
+    _serverACMTimeout:number;
+    _serverACMClose:number;
+    _serverACMHeartbeat:number;
+
+    _heartbeat:number;
+    _closed:boolean;
+
+    _communicator:Ice.Communicator;
+}
+
+class InvocationHeartbeatTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("invocation heartbeat", com, out);
+        this.setServerACM(1, -1, -1); // Faster ACM to make sure we receive enough ACM heartbeats
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        await proxy.sleep(4);
+        test(this._heartbeat >= 4);
+    }
+}
+
+class InvocationHeartbeatOnHoldTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("invocation with heartbeat on hold", com, out);
+        // Use default ACM configuration.
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        // When the OA is put on hold, connections shouldn't
+        // send heartbeats, the invocation should therefore
+        // fail.
+        try
+        {
+            await proxy.sleepAndHold(10);
+            test(false);
+        }
+        catch(ex)
+        {
+            await adapter.activate();
+            await proxy.interruptSleep();
+            await this.waitForClosed();
+        }
+    }
+}
+
+class InvocationNoHeartbeatTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("invocation with no heartbeat", com, out);
+        this.setServerACM(2, 2, 0); // Disable heartbeat on invocations
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        // Heartbeats are disabled on the server, the
+        // invocation should fail since heartbeats are
+        // expected.
+        try
+        {
+            await proxy.sleep(10);
+            test(false);
+        }
+        catch(ex)
+        {
+            await proxy.interruptSleep();
+            await this.waitForClosed();
+            test(this._heartbeat === 0);
+        }
+    }
+}
+
+class InvocationHeartbeatCloseOnIdleTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("invocation with no heartbeat and close on idle", com, out);
+        this.setClientACM(1, 1, 0); // Only close on idle.
+        this.setServerACM(1, 2, 0); // Disable heartbeat on invocations
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        // No close on invocation, the call should succeed this
+        // time.
+        await proxy.sleep(3);
+        test(this._heartbeat === 0);
+        test(!this._closed);
+    }
+}
+
+class CloseOnIdleTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("close on idle", com, out);
+        this.setClientACM(1, 1, 0); // Only close on idle
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        await Ice.Promise.delay(3000);
+        await this.waitForClosed();
+        test(this._heartbeat === 0);
+    }
+}
+
+class CloseOnInvocationTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("close on invocation", com, out);
+        this.setClientACM(1, 2, 0); // Only close on invocation
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        await Ice.Promise.delay(3000);
+        test(this._heartbeat === 0);
+        test(!this._closed);
+    }
+}
+
+class CloseOnIdleAndInvocationTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("close on idle and invocation", com, out);
+        this.setClientACM(1, 3, 0); // Only close on idle and invocation
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        //
+        // Put the adapter on hold. The server will not respond to
+        // the graceful close. This allows to test whether or not
+        // the close is graceful or forceful.
+        //
+        await adapter.hold();
+        await Ice.Promise.delay(3000);
+        test(this._heartbeat === 0);
+        test(!this._closed); // Not closed yet because of graceful close.
+        await adapter.activate();
+        await Ice.Promise.delay(1000);
+        await this.waitForClosed(); // Connection should be closed this time.
+    }
+}
+
+class ForcefullCloseOnIdleAndInvocationTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("forcefull close on idle and invocation", com, out);
+        this.setClientACM(1, 4, 0); // Only close on idle and invocation
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        await adapter.hold();
+        await Ice.Promise.delay(3000);
+        await this.waitForClosed();
+
+        test(this._heartbeat === 0);
+    }
+}
+
+class HeartbeatOnIdleTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("heartbeat on idle", com, out);
+        this.setServerACM(1, -1, 2); // Enable server heartbeats.
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        await Ice.Promise.delay(3000);
+        return this._heartbeat >= 3;
+    }
+}
+
+class HeartbeatAlwaysTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("heartbeat always", com, out);
+        this.setServerACM(1, -1, 3); // Enable server heartbeats.
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        for(let i = 0; i < 10; i++)
+        {
+            await proxy.ice_ping();
+            await Ice.Promise.delay(300);
+        }
+
+        test(this._heartbeat >= 3);
+    }
+}
+
+class HeartbeatManualTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output)
+    {
+        super("manual heartbeats", com, out);
+        //
+        // Disable heartbeats.
+        //
+        this.setClientACM(10, -1, 0);
+        this.setServerACM(10, -1, 0);
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        await proxy.startHeartbeatCount();
+        const con = await proxy.ice_getConnection();
+        await con.heartbeat();
+        await con.heartbeat();
+        await con.heartbeat();
+        await con.heartbeat();
+        await con.heartbeat();
+        await proxy.waitForHeartbeatCount(5);
+    }
+}
+
+class SetACMTest extends TestCase
+{
+    constructor(com:Test.RemoteCommunicatorPrx, out:Output )
+    {
+        super("setACM/getACM", com, out);
+        this.setClientACM(15, 4, 0);
+    }
+
+    async runTestCase(adapter:Test.RemoteObjectAdapterPrx, proxy:Test.TestIntfPrx)
+    {
+        const con = proxy.ice_getCachedConnection();
+
+        try
+        {
+            con.setACM(-19, undefined, undefined);
+            test(false);
+        }
+        catch(ex)
+        {
+        }
+
+        let acm = con.getACM();
+        test(acm.timeout === 15);
+        test(acm.close === Ice.ACMClose.CloseOnIdleForceful);
+        test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatOff);
+
+        con.setACM(undefined, undefined, undefined);
+        acm = con.getACM();
+        test(acm.timeout === 15);
+        test(acm.close === Ice.ACMClose.CloseOnIdleForceful);
+        test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatOff);
+
+        con.setACM(1, Ice.ACMClose.CloseOnInvocationAndIdle, Ice.ACMHeartbeat.HeartbeatAlways);
+        acm = con.getACM();
+        test(acm.timeout === 1);
+        test(acm.close === Ice.ACMClose.CloseOnInvocationAndIdle);
+        test(acm.heartbeat === Ice.ACMHeartbeat.HeartbeatAlways);
+
+        await proxy.startHeartbeatCount();
+        await proxy.waitForHeartbeatCount(2);
+
+        await new Promise(
+            (resolve, reject) =>
+                {
+                    con.setCloseCallback(() => resolve());
+                    con.close(Ice.ConnectionClose.Gracefully);
+                });
+
+        await new Promise(
+            (resolve, reject) =>
+                {
+                    con.setCloseCallback(() => resolve());
+                });
+        con.setHeartbeatCallback(c => test(false));
+    }
+}
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const communicator = this.communicator();
+        const out = this.getWriter();
+        const ref = "communicator:" + this.getTestEndpoint();
+        const com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+        const tests = [];
+        //
+        // Skip some tests with IE it opens too many connections and
+        // IE doesn't allow more than 6 connections.
+        //
+        if(typeof navigator !== "undefined" &&
+            ["MSIE", "Trident/7.0", "Edge/12", "Edge/13"].some(value => navigator.userAgent.indexOf(value) !== -1))
+        {
+            tests.push(new HeartbeatOnIdleTest(com, out));
+            tests.push(new SetACMTest(com, out));
+        }
+        else
+        {
+            tests.push(new InvocationHeartbeatTest(com, out));
+            tests.push(new InvocationHeartbeatOnHoldTest(com, out));
+            tests.push(new InvocationNoHeartbeatTest(com, out));
+            tests.push(new InvocationHeartbeatCloseOnIdleTest(com, out));
+
+            tests.push(new CloseOnIdleTest(com, out));
+            tests.push(new CloseOnInvocationTest(com, out));
+            tests.push(new CloseOnIdleAndInvocationTest(com, out));
+            tests.push(new ForcefullCloseOnIdleAndInvocationTest(com, out));
+
+            tests.push(new HeartbeatOnIdleTest(com, out));
+            tests.push(new HeartbeatAlwaysTest(com, out));
+            tests.push(new HeartbeatManualTest(com, out));
+            tests.push(new SetACMTest(com, out));
+        }
+
+        await Promise.all(tests.map(test => test.init()));
+        await Promise.all(tests.map(test => test.start()));
+        for(const test of tests)
+        {
+            test.join(out);
+        }
+        await Promise.all(tests.map(test => test.destroy()));
+
+        out.write("shutting down... ");
+        await com.shutdown();
+        out.writeLine("ok");
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator, args] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/acm/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/acm/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface TestIntf
+{
+    void sleep(int seconds);
+    void sleepAndHold(int seconds);
+    void interruptSleep();
+    void startHeartbeatCount();
+    void waitForHeartbeatCount(int count);
+}
+
+interface RemoteObjectAdapter
+{
+    TestIntf* getTestIntf();
+    void activate();
+    void hold();
+    void deactivate();
+}
+
+interface RemoteCommunicator
+{
+    RemoteObjectAdapter* createObjectAdapter(int acmTimeout, int close, int heartbeat);
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/adapterDeactivation/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/adapterDeactivation/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/adapterDeactivation/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/adapterDeactivation/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,233 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+
+        out.write("testing stringToProxy... ");
+        const ref = "test:" + this.getTestEndpoint();
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const obj = await Test.TestIntfPrx.checkedCast(base);
+        test(obj !== null);
+        test(obj.equals(base));
+        out.writeLine("ok");
+
+        {
+            out.write("creating/destroying/recreating object adapter... ");
+            communicator.getProperties().setProperty("TransientTestAdapter.AdapterId", "dummy");
+            let adapter = await communicator.createObjectAdapter("TransientTestAdapter");
+            try
+            {
+                await communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.AlreadyRegisteredException);
+            }
+            await adapter.destroy();
+
+            //
+            // Use a different port than the first adapter to avoid an "address already in use" error.
+            //
+            adapter = await communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "");
+            await adapter.destroy();
+            out.writeLine("ok");
+        }
+
+        out.write("creating/activating/deactivating object adapter in one operation... ");
+        await obj.transient();
+        out.writeLine("ok");
+
+        out.write("testing connection closure... ");
+        for(let i = 0; i < 10; ++i)
+        {
+            const initData = new Ice.InitializationData();
+            initData.properties = communicator.getProperties().clone();
+            const comm = Ice.initialize(initData);
+            comm.stringToProxy("test:" + this.getTestEndpoint()).ice_ping().catch(ex => {});
+            await comm.destroy();
+        }
+        out.writeLine("ok");
+
+        out.write("testing object adapter published endpoints... ");
+        {
+            communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 30000");
+            const adapter = await communicator.createObjectAdapter("PAdapter");
+            test(adapter.getPublishedEndpoints().length === 1);
+            const endpt = adapter.getPublishedEndpoints()[0];
+            test(endpt.toString() == "tcp -h localhost -p 12345 -t 30000");
+            const prx =
+                    communicator.stringToProxy("dummy:tcp -h localhost -p 12346 -t 20000:tcp -h localhost -p 12347 -t 10000");
+            adapter.setPublishedEndpoints(prx.ice_getEndpoints());
+            test(adapter.getPublishedEndpoints().length === 2);
+            const id = new Ice.Identity("dummy");
+            test(Ice.ArrayUtil.equals(adapter.createProxy(id).ice_getEndpoints(), prx.ice_getEndpoints()));
+            test(Ice.ArrayUtil.equals(adapter.getPublishedEndpoints(), prx.ice_getEndpoints()));
+            await adapter.refreshPublishedEndpoints();
+            test(adapter.getPublishedEndpoints().length === 1);
+            test(adapter.getPublishedEndpoints()[0].equals(endpt));
+            communicator.getProperties().setProperty("PAdapter.PublishedEndpoints", "tcp -h localhost -p 12345 -t 20000");
+            await adapter.refreshPublishedEndpoints();
+            test(adapter.getPublishedEndpoints().length === 1);
+            test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 12345 -t 20000");
+            await adapter.destroy();
+            test(adapter.getPublishedEndpoints().length === 0);
+        }
+        out.writeLine("ok");
+
+        test(obj.ice_getConnection() !== null);
+        {
+            out.write("testing object adapter with bi-dir connection... ");
+            const adapter = await communicator.createObjectAdapter("");
+            (await obj.ice_getConnection()).setAdapter(adapter);
+            (await obj.ice_getConnection()).setAdapter(null);
+            await adapter.deactivate();
+            try
+            {
+                (await obj.ice_getConnection()).setAdapter(adapter);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ObjectAdapterDeactivatedException);
+            }
+            out.writeLine("ok");
+        }
+
+        out.write("testing object adapter with router... ");
+        {
+            const routerId = new Ice.Identity();
+            routerId.name = "router";
+            let router = Ice.RouterPrx.uncheckedCast(base.ice_identity(routerId).ice_connectionId("rc"));
+            const adapter = await communicator.createObjectAdapterWithRouter("", router);
+            test(adapter.getPublishedEndpoints().length == 1);
+            test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 23456 -t 30000");
+            await adapter.refreshPublishedEndpoints();
+            test(adapter.getPublishedEndpoints().length == 1);
+            test(adapter.getPublishedEndpoints()[0].toString() == "tcp -h localhost -p 23457 -t 30000");
+            try
+            {
+                adapter.setPublishedEndpoints(router.ice_getEndpoints());
+                test(false);
+            }
+            catch(ex)
+            {
+                // Expected.
+                test(ex instanceof Error);
+            }
+            await adapter.destroy();
+
+            try
+            {
+                routerId.name = "test";
+                router = Ice.RouterPrx.uncheckedCast(base.ice_identity(routerId));
+                await communicator.createObjectAdapterWithRouter("", router);
+                test(false);
+            }
+            catch(ex)
+            {
+                // Expected: the "test" object doesn't implement Ice::Router!
+                test(ex instanceof Ice.OperationNotExistException);
+            }
+
+            try
+            {
+                router = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("router:" + this.getTestEndpoint(1)));
+                await communicator.createObjectAdapterWithRouter("", router);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ConnectFailedException);
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("deactivating object adapter in the server... ");
+        await obj.deactivate();
+        out.writeLine("ok");
+
+        out.write("testing adapter states... ");
+        {
+            const adpt = await communicator.createObjectAdapter("");
+            test(!adpt.isDeactivated());
+            await adpt.activate();
+            test(!adpt.isDeactivated());
+
+            let isHolding = false;
+            adpt.waitForHold().then(() =>
+                                    {
+                                        isHolding = true;
+                                    });
+            test(!isHolding);
+            adpt.hold();
+            await adpt.waitForHold();
+            await Ice.Promise.delay(10); // Relinquish the thread to allow the continuation to execute.
+            test(isHolding);
+
+            isHolding = false;
+            adpt.waitForHold().then(() =>
+                                    {
+                                        isHolding = true;
+                                    });
+
+            let isDeactivated = false;
+            adpt.waitForDeactivate().then(() =>
+                                            {
+                                                isDeactivated = true;
+                                            });
+            test(!isDeactivated);
+            await adpt.deactivate();
+            await adpt.waitForDeactivate();
+            await Ice.Promise.delay(10); // Relinquish the thread to allow the continuation to execute.
+            test(isDeactivated && isHolding);
+            test(adpt.isDeactivated());
+            await adpt.destroy();
+        }
+        out.writeLine("ok");
+
+        out.write("testing whether server is gone... ");
+        try
+        {
+            await obj.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+            throw new Error();
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException);
+            out.writeLine("ok");
+        }
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator, args] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/adapterDeactivation/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/adapterDeactivation/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/adapterDeactivation/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/adapterDeactivation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,24 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface TestIntf
+{
+    void transient();
+
+    void deactivate();
+}
+
+local class Cookie
+{
+    ["cpp:const"] string message();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/ami/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/ami/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/ami/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/ami/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,339 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const communicator = this.communicator();
+        const out = this.getWriter();
+
+        let sref = "test:" + this.getTestEndpoint();
+        let obj = communicator.stringToProxy(sref);
+        test(obj !== null);
+        const p = Test.TestIntfPrx.uncheckedCast(obj);
+
+        sref = "testController:" + this.getTestEndpoint(1);
+        obj = communicator.stringToProxy(sref);
+        test(obj !== null);
+        const testController = Test.TestIntfControllerPrx.uncheckedCast(obj);
+
+        out.write("testing batch requests with proxy... ");
+        {
+            const count = await p.opBatchCount();
+            test(count === 0);
+            const b1 = p.ice_batchOneway();
+            const bf = b1.opBatch();
+            test(bf.isCompleted());
+            test(!bf.isSent());
+            b1.opBatch();
+            await b1.ice_flushBatchRequests();
+            await p.waitForBatch(2);
+            await b1.ice_flushBatchRequests();
+        }
+        out.writeLine("ok");
+
+        out.write("testing batch requests with connection... ");
+        {
+            test(await p.opBatchCount() === 0);
+            const b1 = p.ice_batchOneway();
+            await b1.opBatch();
+            const bf = b1.opBatch();
+            test(bf.isCompleted());
+            await b1.ice_flushBatchRequests();
+            test(await p.waitForBatch(2));
+        }
+
+        if(await p.ice_getConnection() !== null)
+        {
+            test(await p.opBatchCount() == 0);
+            const b1 = p.ice_batchOneway();
+            await b1.opBatch();
+            await b1.ice_getConnection().then(conn => conn.close(Ice.ConnectionClose.GracefullyWithWait));
+            await b1.ice_flushBatchRequests();
+            test(await p.waitForBatch(1));
+        }
+        out.writeLine("ok");
+
+        out.write("testing batch requests with communicator... ");
+        {
+            //
+            // Async task - 1 connection.
+            //
+            test(await p.opBatchCount() === 0);
+            const b1 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+            await b1.opBatch();
+            await b1.opBatch();
+
+            await communicator.flushBatchRequests(Ice.CompressBatch.No);
+            test(await p.waitForBatch(2));
+        }
+
+        {
+            //
+            // Async task exception - 1 connection.
+            //
+            test(await p.opBatchCount() === 0);
+            const b1 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+            await b1.opBatch();
+            await b1.ice_getConnection().then(c => c.close(Ice.ConnectionClose.GracefullyWithWait));
+
+            await communicator.flushBatchRequests(Ice.CompressBatch.No);
+            test(await p.opBatchCount() == 0);
+        }
+
+        {
+            //
+            // Async task - 2 connections.
+            //
+            test(await p.opBatchCount() === 0);
+            const b1 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+            const b2 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_connectionId("2").ice_getConnection().then(
+                    c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+
+            await b2.ice_getConnection(); // Ensure connection is established.
+            await b1.opBatch();
+            await b1.opBatch();
+            await b2.opBatch();
+            await b2.opBatch();
+
+            await communicator.flushBatchRequests(Ice.CompressBatch.No);
+            test(await p.waitForBatch(4));
+        }
+
+        {
+            //
+            // AsyncResult exception - 2 connections - 1 failure.
+            //
+            // All connections should be flushed even if there are failures on some connections.
+            // Exceptions should not be reported.
+            //
+            test(await p.opBatchCount() === 0);
+            const b1 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+            const b2 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_connectionId("2").ice_getConnection().then(
+                    c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+            await b2.ice_getConnection(); // Ensure connection is established.
+            await b1.opBatch();
+            await b2.opBatch();
+            await b1.ice_getConnection().then(c => c.close(Ice.ConnectionClose.GracefullyWithWait));
+
+            await communicator.flushBatchRequests(Ice.CompressBatch.No);
+            test(await p.waitForBatch(1));
+        }
+
+        {
+            //
+            // Async task exception - 2 connections - 2 failures.
+            //
+            // The sent callback should be invoked even if all connections fail.
+            //
+            test(await p.opBatchCount() == 0);
+            const b1 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_getConnection().then(c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+            const b2 = Test.TestIntfPrx.uncheckedCast(
+                await p.ice_connectionId("2").ice_getConnection().then(
+                    c => c.createProxy(p.ice_getIdentity()).ice_batchOneway()));
+            await b2.ice_getConnection(); // Ensure connection is established.
+            await b1.opBatch();
+            await b2.opBatch();
+            await b1.ice_getConnection().then(c => c.close(Ice.ConnectionClose.GracefullyWithWait));
+            await b2.ice_getConnection().then(c => c.close(Ice.ConnectionClose.GracefullyWithWait));
+
+            await communicator.flushBatchRequests(Ice.CompressBatch.No);
+            test(await p.opBatchCount() === 0);
+        }
+        out.writeLine("ok");
+
+        out.write("testing AsyncResult operations... ");
+        {
+            await testController.holdAdapter();
+            let r1:Ice.AsyncResult<void>;
+            let r2:Ice.AsyncResult<void>;
+            try
+            {
+                r1 = p.op();
+                const seq = new Uint8Array(100000);
+                while(true)
+                {
+                    r2 = p.opWithPayload(seq);
+                    if(r2.sentSynchronously())
+                    {
+                        await Ice.Promise.delay(0);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                if(await p.ice_getConnection() !== null)
+                {
+                    test(r1.sentSynchronously() && r1.isSent() && !r1.isCompleted() ||
+                            !r1.sentSynchronously() && !r1.isCompleted());
+
+                    test(!r2.sentSynchronously() && !r2.isCompleted());
+
+                    test(!r1.isCompleted());
+                    test(!r2.isCompleted());
+                }
+            }
+            finally
+            {
+                await testController.resumeAdapter();
+            }
+
+            await r1;
+            test(r1.isSent());
+            test(r1.isCompleted());
+
+            await r2;
+            test(r2.isSent());
+            test(r2.isCompleted());
+
+            test(r1.operation == "op");
+            test(r2.operation == "opWithPayload");
+
+            let r = p.ice_ping();
+            test(r.operation === "ice_ping");
+            test(r.connection === null); // Expected
+            test(r.communicator == communicator);
+            test(r.proxy == p);
+
+            //
+            // Oneway
+            //
+            let p2 = p.ice_oneway();
+            r = p2.ice_ping();
+            test(r.operation === "ice_ping");
+            test(r.connection === null); // Expected
+            test(r.communicator == communicator);
+            test(r.proxy == p2);
+
+            //
+            // Batch request via proxy
+            //
+            p2 = p.ice_batchOneway();
+            p2.ice_ping();
+            {
+                let r2 = p2.ice_flushBatchRequests();
+                test(r2.operation === "ice_flushBatchRequests");
+                test(r2.connection === null); // Expected
+                test(r2.communicator == communicator);
+                test(r2.proxy == p2);
+            }
+
+            const con = p.ice_getCachedConnection();
+            p2 = p.ice_batchOneway();
+            p2.ice_ping();
+            {
+                let r2 = con.flushBatchRequests(Ice.CompressBatch.No);
+                test(r2.operation === "flushBatchRequests");
+                test(r2.connection == con);
+                test(r2.communicator == communicator);
+                test(r2.proxy === null);
+            }
+
+            p2 = p.ice_batchOneway();
+            p2.ice_ping();
+            {
+                let r2 = communicator.flushBatchRequests(Ice.CompressBatch.No);
+                test(r2.operation === "flushBatchRequests");
+                test(r2.connection === null);
+                test(r2.communicator == communicator);
+                test(r2.proxy === null);
+            }
+        }
+
+        {
+            await testController.holdAdapter();
+            const seq = new Uint8Array(new Array(100000));
+            let r;
+            while(true)
+            {
+                r = p.opWithPayload(seq);
+                if(r.sentSynchronously())
+                {
+                    await Ice.Promise.delay(0);
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            test(!r.isSent());
+
+            const r1 = p.ice_ping();
+            r1.then(
+                () => test(false),
+                ex => test(ex instanceof Ice.InvocationCanceledException));
+
+            const r2 = p.ice_id();
+            r2.then(
+                () => test(false),
+                ex => test(ex instanceof Ice.InvocationCanceledException));
+
+            r1.cancel();
+            r2.cancel();
+
+            await testController.resumeAdapter();
+            await p.ice_ping();
+
+            test(!r1.isSent() && r1.isCompleted());
+            test(!r2.isSent() && r2.isCompleted());
+        }
+
+        {
+            await testController.holdAdapter();
+
+            const r1 = p.op();
+            const r2 = p.ice_id();
+
+            await p.ice_oneway().ice_ping();
+
+            r1.cancel();
+            r1.then(
+                () => test(false),
+                ex => test(ex instanceof Ice.InvocationCanceledException));
+
+            r2.cancel();
+            r2.then(
+                () => test(false),
+                ex => test(ex instanceof Ice.InvocationCanceledException));
+
+            await testController.resumeAdapter();
+        }
+        out.writeLine("ok");
+
+        await p.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator, args] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/ami/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/ami/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,59 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Ice/BuiltinSequences.ice>
+#include <Ice/Identity.ice>
+
+[["js:es6-module"]]
+
+module Test
+{
+
+exception TestIntfException
+{
+}
+
+enum CloseMode
+{
+    Forcefully,
+    Gracefully,
+    GracefullyWithWait
+}
+
+interface PingReply
+{
+    void reply();
+}
+
+interface TestIntf
+{
+    void op();
+    void opWithPayload(Ice::ByteSeq seq);
+    int opWithResult();
+    void opWithUE()
+        throws TestIntfException;
+    void opBatch();
+    int opBatchCount();
+    bool waitForBatch(int count);
+    void close(CloseMode mode);
+    void sleep(int ms);
+    ["amd"] void startDispatch();
+    void finishDispatch();
+    void shutdown();
+
+    bool supportsAMD();
+    bool supportsFunctionalTests();
+
+    void pingBidDir(Ice::Identity id);
+}
+
+interface TestIntfController
+{
+    void holdAdapter();
+    void resumeAdapter();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/binding/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/binding/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/binding/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/binding/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,576 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+const isConnectionFailed = (ex:Error) =>
+        (ex instanceof Ice.ConnectionRefusedException) ||
+        (ex instanceof Ice.ConnectTimeoutException);
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        async function createTestIntfPrx(adapters:Test.RemoteObjectAdapterPrx[])
+        {
+            let endpoints:Ice.Endpoint[] = [];
+            let obj = null;
+            for(const adapter of adapters)
+            {
+                obj = await adapter.getTestIntf();
+                endpoints = endpoints.concat(obj.ice_getEndpoints());
+            }
+            return Test.TestIntfPrx.uncheckedCast(obj.ice_endpoints(endpoints));
+        }
+
+        async function deactivate(communicator:Test.RemoteCommunicatorPrx,
+                                  adapters:Test.RemoteObjectAdapterPrx[])
+        {
+            for(const adapter of adapters)
+            {
+                await communicator.deactivateObjectAdapter(adapter);
+            }
+        }
+
+        const out = this.getWriter();
+        let communicator = this.communicator();
+        const properties = communicator.getProperties().clone();
+        out.write("testing stringToProxy... ");
+        const ref = "communicator:" + this.getTestEndpoint();
+        let com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+        test(com !== null);
+        out.writeLine("ok");
+
+        out.write("testing binding with single endpoint... ");
+        {
+            const adapter = await com.createObjectAdapter("Adapter", "default");
+
+            const test1 = await adapter.getTestIntf();
+            const test2 = await adapter.getTestIntf();
+            test(await test1.ice_getConnection() === await test2.ice_getConnection());
+
+            await test1.ice_ping();
+            await test2.ice_ping();
+
+            await com.deactivateObjectAdapter(adapter);
+
+            const test3 = Test.TestIntfPrx.uncheckedCast(test1);
+            test(await test3.ice_getConnection() === await test1.ice_getConnection());
+            test(await test3.ice_getConnection() === await test2.ice_getConnection());
+
+            try
+            {
+                await test3.ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(isConnectionFailed(ex), ex);
+            }
+
+        }
+        out.writeLine("ok");
+
+        await communicator.destroy();
+        [communicator] = this.initialize(properties);
+        com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+        out.write("testing binding with multiple endpoints... ");
+        {
+            const adapters = await Promise.all(
+                [
+                    com.createObjectAdapter("Adapter11", "default"),
+                    com.createObjectAdapter("Adapter12", "default"),
+                    com.createObjectAdapter("Adapter13", "default")
+                ]);
+
+            //
+            // Ensure that when a connection is opened it's reused for new
+            // proxies and that all endpoints are eventually tried.
+            //
+            let names = ["Adapter11", "Adapter12", "Adapter13"];
+            while(names.length > 0)
+            {
+                const adpts = Ice.ArrayUtil.clone(adapters);
+                const test1 = await createTestIntfPrx(adpts);
+                Ice.ArrayUtil.shuffle(adpts);
+                const test2 = await createTestIntfPrx(adpts);
+                Ice.ArrayUtil.shuffle(adpts);
+                const test3 = await createTestIntfPrx(adpts);
+                await test1.ice_ping();
+                test(await test1.ice_getConnection() == await test2.ice_getConnection());
+                test(await test2.ice_getConnection() == await test3.ice_getConnection());
+
+                const name = await test1.getAdapterName();
+                const index = names.indexOf(name);
+                if(index !== -1)
+                {
+                    names.splice(index, 1);
+                }
+
+                const conn = await test1.ice_getConnection();
+                await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+            }
+            //
+            // Ensure that the proxy correctly caches the connection (we
+            // always send the request over the same connection.)
+            //
+            {
+                for(const adpt of adapters)
+                {
+                    const prx = await adpt.getTestIntf();
+                    await prx.ice_ping();
+                }
+
+                const t = await createTestIntfPrx(adapters);
+                const name = await t.getAdapterName();
+                const nRetry = 10;
+
+                let i;
+                /* eslint-disable curly */
+                for(i = 0; i < nRetry && await t.getAdapterName() == name; i++);
+                /* eslint-enable curly */
+                test(i == nRetry);
+
+                for(const adpt of adapters)
+                {
+                    const prx = await adpt.getTestIntf();
+                    const conn = await prx.ice_getConnection();
+                    await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+                }
+            }
+            //
+            // Deactivate an adapter and ensure that we can still
+            // establish the connection to the remaining adapters.
+            //
+            await com.deactivateObjectAdapter(adapters[0]);
+            names = ["Adapter12", "Adapter13"];
+            while(names.length > 0)
+            {
+                const adpts = Ice.ArrayUtil.clone(adapters);
+
+                const test1 = await createTestIntfPrx(adpts);
+                Ice.ArrayUtil.shuffle(adpts);
+                const test2 = await createTestIntfPrx(adpts);
+                Ice.ArrayUtil.shuffle(adpts);
+                const test3 = await createTestIntfPrx(adpts);
+
+                test(await test1.ice_getConnection() == await test2.ice_getConnection());
+                test(await test2.ice_getConnection() == await test3.ice_getConnection());
+
+                const name = await test1.getAdapterName();
+                const index = names.indexOf(name);
+                if(index !== -1)
+                {
+                    names.splice(index, 1);
+                }
+                const conn = await test1.ice_getConnection();
+                await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+            }
+            //
+            // Deactivate an adapter and ensure that we can still
+            // establish the connection to the remaining adapter.
+            //
+            await com.deactivateObjectAdapter(adapters[2]);
+            const obj = await createTestIntfPrx(adapters);
+            test(await obj.getAdapterName() == "Adapter12");
+
+            await deactivate(com, adapters);
+        }
+        out.writeLine("ok");
+
+        await communicator.destroy();
+        [communicator] = this.initialize(properties);
+        com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+        out.write("testing binding with multiple random endpoints... ");
+
+        const adapters = await Promise.all(
+            [
+                com.createObjectAdapter("AdapterRandom11", "default"),
+                com.createObjectAdapter("AdapterRandom12", "default"),
+                com.createObjectAdapter("AdapterRandom13", "default"),
+                com.createObjectAdapter("AdapterRandom14", "default"),
+                com.createObjectAdapter("AdapterRandom15", "default")
+            ]);
+
+        let count = 20;
+        let adapterCount = adapters.length;
+        while(--count > 0)
+        {
+            let proxies:Test.TestIntfPrx[] = [];
+            if(count == 1)
+            {
+                await com.deactivateObjectAdapter(adapters[4]);
+                --adapterCount;
+            }
+
+            for(let i = 0; i < proxies.length; ++i)
+            {
+                let adpts = new Array(Math.floor(Math.random() * adapters.length));
+                if(adpts.length == 0)
+                {
+                    adpts = new Array(1);
+                }
+                for(let j = 0; j < adpts.length; ++j)
+                {
+                    adpts[j] = adapters[Math.floor(Math.random() * adapters.length)];
+                }
+                proxies[i] = await createTestIntfPrx(Ice.ArrayUtil.clone(adpts));
+            }
+
+            for(let i = 0; i < proxies.length; i++)
+            {
+                proxies[i].getAdapterName().catch(
+                    ex =>
+                        {
+                            // ignore exception
+                        });
+            }
+            for(let i = 0; i < proxies.length; i++)
+            {
+                try
+                {
+                    await proxies[i].ice_ping();
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.LocalException, ex);
+                }
+            }
+            const connections = [];
+            for(let i = 0; i < proxies.length; i++)
+            {
+                if(proxies[i].ice_getCachedConnection() !== null)
+                {
+                    if(connections.indexOf(proxies[i].ice_getCachedConnection()) === -1)
+                    {
+                        connections.push(proxies[i].ice_getCachedConnection());
+                    }
+                }
+            }
+            test(connections.length <= adapterCount);
+
+            for(const a of adapters)
+            {
+                try
+                {
+                    const prx = await a.getTestIntf();
+                    const conn = await prx.ice_getConnection();
+                    await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+                }
+                catch(ex)
+                {
+                    // Expected if adapter is down.
+                    test(ex instanceof Ice.LocalException, ex);
+                }
+            }
+        }
+        out.writeLine("ok");
+
+        await communicator.destroy();
+        [communicator] = this.initialize(properties);
+        com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+        out.write("testing random endpoint selection... ");
+        {
+            const adapters = await Promise.all(
+                [
+                    com.createObjectAdapter("Adapter21", "default"),
+                    com.createObjectAdapter("Adapter22", "default"),
+                    com.createObjectAdapter("Adapter23", "default")
+                ]);
+
+            let obj = await createTestIntfPrx(adapters);
+            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
+
+            let names = ["Adapter21", "Adapter22", "Adapter23"];
+            while(names.length > 0)
+            {
+                const index = names.indexOf(await obj.getAdapterName());
+                if(index !== -1)
+                {
+                    names.splice(index, 1);
+                }
+                const conn = await obj.ice_getConnection();
+                await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+            }
+
+            obj = Test.TestIntfPrx.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Random));
+            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Random);
+
+            names = ["Adapter21", "Adapter22", "Adapter23"];
+            while(names.length > 0)
+            {
+                const index = names.indexOf(await obj.getAdapterName());
+                if(index !== -1)
+                {
+                    names.splice(index, 1);
+                }
+                const conn = await obj.ice_getConnection();
+                await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+            }
+
+            await deactivate(com, adapters);
+        }
+        out.writeLine("ok");
+
+        await communicator.destroy();
+        [communicator] = this.initialize(properties);
+        com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+        out.write("testing ordered endpoint selection... ");
+        {
+            let adapters:Test.RemoteObjectAdapterPrx[] = await Promise.all(
+                [
+                    com.createObjectAdapter("Adapter31", "default"),
+                    com.createObjectAdapter("Adapter32", "default"),
+                    com.createObjectAdapter("Adapter33", "default")
+                ]);
+
+            let obj = await createTestIntfPrx(adapters);
+            obj = Test.TestIntfPrx.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
+            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
+            const nRetry = 3;
+
+            //
+            // Ensure that endpoints are tried in order by deactiving the adapters
+            // one after the other.
+            //
+            /* eslint-disable curly */
+            let i;
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter31"; i++);
+            test(i == nRetry);
+            await com.deactivateObjectAdapter(adapters[0]);
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter32"; i++);
+            test(i == nRetry);
+            await com.deactivateObjectAdapter(adapters[1]);
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter33"; i++);
+            test(i == nRetry);
+            await com.deactivateObjectAdapter(adapters[2]);
+            /* eslint-enable curly */
+
+            try
+            {
+                await obj.getAdapterName();
+            }
+            catch(ex)
+            {
+                test(isConnectionFailed(ex), ex);
+            }
+
+            const endpoints = obj.ice_getEndpoints();
+
+            adapters = [];
+
+            //
+            // Now, re-activate the adapters with the same endpoints in the opposite
+            // order.
+            //
+
+            /* eslint-disable curly */
+            adapters.push(await com.createObjectAdapter("Adapter36", endpoints[2].toString()));
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter36"; i++);
+            test(i == nRetry);
+            let conn = await obj.ice_getConnection();
+            await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+            adapters.push(await com.createObjectAdapter("Adapter35", endpoints[1].toString()));
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter35"; i++);
+            test(i == nRetry);
+            conn = await obj.ice_getConnection();
+            await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+            adapters.push(await com.createObjectAdapter("Adapter34", endpoints[0].toString()));
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter34"; i++);
+            test(i == nRetry);
+            /* eslint-enable curly */
+
+            await deactivate(com, adapters);
+        }
+        out.writeLine("ok");
+
+        await communicator.destroy();
+        [communicator] = this.initialize(properties);
+        com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+        out.write("testing per request binding with single endpoint... ");
+        {
+            const adapter = await com.createObjectAdapter("Adapter41", "default");
+
+            const test1 = Test.TestIntfPrx.uncheckedCast((await adapter.getTestIntf()).ice_connectionCached(false));
+            const test2 = Test.TestIntfPrx.uncheckedCast((await adapter.getTestIntf()).ice_connectionCached(false));
+            test(!test1.ice_isConnectionCached());
+            test(!test2.ice_isConnectionCached());
+            test(await test1.ice_getConnection() !== null && await test2.ice_getConnection() !== null);
+            test(await test1.ice_getConnection() == await test2.ice_getConnection());
+
+            await test1.ice_ping();
+
+            await com.deactivateObjectAdapter(adapter);
+
+            const test3 = Test.TestIntfPrx.uncheckedCast(test1);
+            try
+            {
+                test(await test3.ice_getConnection() == await test1.ice_getConnection());
+                test(false);
+            }
+            catch(ex)
+            {
+                test(isConnectionFailed(ex), ex);
+            }
+        }
+        out.writeLine("ok");
+
+        await communicator.destroy();
+        [communicator] = this.initialize(properties);
+        com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+        out.write("testing per request binding with multiple endpoints... ");
+        {
+            const adapters = await Promise.all(
+                [
+                    com.createObjectAdapter("Adapter51", "default"),
+                    com.createObjectAdapter("Adapter52", "default"),
+                    com.createObjectAdapter("Adapter53", "default")
+                ]);
+
+            const obj = Test.TestIntfPrx.uncheckedCast(
+                (await createTestIntfPrx(adapters)).ice_connectionCached(false));
+            test(!obj.ice_isConnectionCached());
+
+            let names = ["Adapter51", "Adapter52", "Adapter53"];
+            while(names.length > 0)
+            {
+                const name = await obj.getAdapterName();
+                const index = names.indexOf(name);
+                if(index !== -1)
+                {
+                    names.splice(index, 1);
+                }
+            }
+
+            await com.deactivateObjectAdapter(adapters[0]);
+
+            names = ["Adapter52", "Adapter53"];
+            while(names.length > 0)
+            {
+                const name = await obj.getAdapterName();
+                const index = names.indexOf(name);
+                if(index !== -1)
+                {
+                    names.splice(index, 1);
+                }
+            }
+
+            await com.deactivateObjectAdapter(adapters[2]);
+
+            test(await obj.getAdapterName() == "Adapter52");
+
+            await deactivate(com, adapters);
+        }
+        out.writeLine("ok");
+
+        if(typeof navigator === "undefined" ||
+            ["Firefox", "MSIE", "Trident/7.0"].every(value => navigator.userAgent.indexOf(value) === -1))
+        {
+            //
+            // Firefox adds a delay on websocket failed reconnects that causes this test to take too
+            // much time to complete.
+            //
+            // You can set network.websocket.delay-failed-reconnects to false in Firefox about:config
+            // to disable this behaviour
+            //
+
+            await communicator.destroy();
+            [communicator] = this.initialize(properties);
+            com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
+
+            out.write("testing per request binding and ordered endpoint selection... ");
+            let adapters:Test.RemoteObjectAdapterPrx[] = await Promise.all(
+                [
+                    com.createObjectAdapter("Adapter61", "default"),
+                    com.createObjectAdapter("Adapter62", "default"),
+                    com.createObjectAdapter("Adapter63", "default")
+                ]);
+
+            let obj = await createTestIntfPrx(adapters);
+            obj = Test.TestIntfPrx.uncheckedCast(obj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered));
+            test(obj.ice_getEndpointSelection() == Ice.EndpointSelectionType.Ordered);
+            obj = Test.TestIntfPrx.uncheckedCast(obj.ice_connectionCached(false));
+            test(!obj.ice_isConnectionCached());
+            const nRetry = 3;
+            let i;
+
+            //
+            // Ensure that endpoints are tried in order by deactiving the adapters
+            // one after the other.
+            //
+
+            /* eslint-disable curly */
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter61"; i++);
+            test(i == nRetry);
+            await com.deactivateObjectAdapter(adapters[0]);
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter62"; i++);
+            test(i == nRetry);
+            await com.deactivateObjectAdapter(adapters[1]);
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter63"; i++);
+            test(i == nRetry);
+            com.deactivateObjectAdapter(adapters[2]);
+            /* eslint-enable curly */
+
+            try
+            {
+                await obj.getAdapterName();
+            }
+            catch(ex)
+            {
+                test(isConnectionFailed(ex), ex);
+            }
+
+            const endpoints = obj.ice_getEndpoints();
+
+            adapters = [];
+
+            //
+            // Now, re-activate the adapters with the same endpoints in the opposite
+            // order.
+            //
+            /* eslint-disable curly */
+            adapters.push(await com.createObjectAdapter("Adapter66", endpoints[2].toString()));
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter66"; i++);
+            test(i == nRetry);
+            adapters.push(await com.createObjectAdapter("Adapter65", endpoints[1].toString()));
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter65"; i++);
+            test(i == nRetry);
+            adapters.push(await com.createObjectAdapter("Adapter64", endpoints[0].toString()));
+            for(i = 0; i < nRetry && await obj.getAdapterName() == "Adapter64"; i++);
+            test(i == nRetry);
+            /* eslint-enable curly */
+            await deactivate(com, adapters);
+            out.writeLine("ok");
+        }
+
+        await com.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            const out = this.getWriter();
+            [communicator, args] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/binding/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/binding/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,33 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface TestIntf
+{
+    string getAdapterName();
+}
+
+interface RemoteObjectAdapter
+{
+    TestIntf* getTestIntf();
+
+    void deactivate();
+}
+
+interface RemoteCommunicator
+{
+    RemoteObjectAdapter* createObjectAdapter(string name, string endpoints);
+
+    void deactivateObjectAdapter(RemoteObjectAdapter* adapter);
+
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/defaultValue/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/defaultValue/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/defaultValue/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/defaultValue/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,190 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    run()
+    {
+        const out = this.getWriter();
+        out.write("testing default values... ");
+        {
+            const v = new Test.Struct1();
+            test(!v.boolFalse);
+            test(v.boolTrue);
+            test(v.b === 254);
+            test(v.s === 16000);
+            test(v.i === 3);
+            test(v.l.equals(new Ice.Long(0, 4)));
+            test(v.f === 5.1);
+            test(v.d === 6.2);
+            test(v.str === "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+            test(v.c1 === Test.Color.red);
+            test(v.c2 === Test.Color.green);
+            test(v.c3 === Test.Color.blue);
+            test(v.nc1 === Test.Nested.Color.red);
+            test(v.nc2 === Test.Nested.Color.green);
+            test(v.nc3 === Test.Nested.Color.blue);
+            test(v.noDefault === "");
+            test(v.zeroI === 0);
+            test(v.zeroL.equals(new Ice.Long(0, 0)));
+            test(v.zeroF === 0);
+            test(v.zeroDotF === 0);
+            test(v.zeroD === 0);
+            test(v.zeroDotD === 0);
+        }
+
+        {
+            const v = new Test.Struct2();
+            test(v.boolTrue === Test.ConstBool);
+            test(v.b === Test.ConstByte);
+            test(v.s === Test.ConstShort);
+            test(v.i === Test.ConstInt);
+            test(v.l.equals(Test.ConstLong));
+            test(v.f === Test.ConstFloat);
+            test(v.d === Test.ConstDouble);
+            test(v.str === Test.ConstString);
+            test(v.c1 === Test.ConstColor1);
+            test(v.c2 === Test.ConstColor2);
+            test(v.c3 === Test.ConstColor3);
+            test(v.nc1 === Test.ConstNestedColor1);
+            test(v.nc2 === Test.ConstNestedColor2);
+            test(v.nc3 === Test.ConstNestedColor3);
+        }
+
+        {
+            const v = new Test.Base();
+            test(!v.boolFalse);
+            test(v.boolTrue);
+            test(v.b === 1);
+            test(v.s === 2);
+            test(v.i === 3);
+            test(v.l.equals(new Ice.Long(0, 4)));
+            test(v.f === 5.1);
+            test(v.d === 6.2);
+            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+            test(v.noDefault === "");
+            test(v.zeroI === 0);
+            test(v.zeroL.equals(new Ice.Long(0, 0)));
+            test(v.zeroF === 0);
+            test(v.zeroDotF === 0);
+            test(v.zeroD === 0);
+            test(v.zeroDotD === 0);
+        }
+
+        {
+            const v = new Test.Derived();
+            test(!v.boolFalse);
+            test(v.boolTrue);
+            test(v.b === 1);
+            test(v.s === 2);
+            test(v.i === 3);
+            test(v.l.equals(new Ice.Long(0, 4)));
+            test(v.f === 5.1);
+            test(v.d === 6.2);
+            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+            test(v.c1 === Test.Color.red);
+            test(v.c2 === Test.Color.green);
+            test(v.c3 === Test.Color.blue);
+            test(v.nc1 === Test.Nested.Color.red);
+            test(v.nc2 === Test.Nested.Color.green);
+            test(v.nc3 === Test.Nested.Color.blue);
+            test(v.noDefault === "");
+            test(v.zeroI === 0);
+            test(v.zeroL.equals(new Ice.Long(0, 0)));
+            test(v.zeroF === 0);
+            test(v.zeroDotF === 0);
+            test(v.zeroD === 0);
+            test(v.zeroDotD === 0);
+        }
+
+        {
+            const v = new Test.BaseEx();
+            test(!v.boolFalse);
+            test(v.boolTrue);
+            test(v.b === 1);
+            test(v.s === 2);
+            test(v.i === 3);
+            test(v.l.equals(new Ice.Long(0, 4)));
+            test(v.f === 5.1);
+            test(v.d === 6.2);
+            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+            test(v.noDefault === "");
+            test(v.zeroI === 0);
+            test(v.zeroL.equals(new Ice.Long(0, 0)));
+            test(v.zeroF === 0);
+            test(v.zeroDotF === 0);
+            test(v.zeroD === 0);
+            test(v.zeroDotD === 0);
+        }
+
+        {
+            const v = new Test.DerivedEx();
+            test(!v.boolFalse);
+            test(v.boolTrue);
+            test(v.b === 1);
+            test(v.s === 2);
+            test(v.i === 3);
+            test(v.l.equals(new Ice.Long(0, 4)));
+            test(v.f === 5.1);
+            test(v.d === 6.2);
+            test(v.str == "foo \\ \"bar\n \r\n\t\u000b\f\u0007\b?");
+            test(v.noDefault === "");
+            test(v.c1 === Test.Color.red);
+            test(v.c2 === Test.Color.green);
+            test(v.c3 === Test.Color.blue);
+            test(v.nc1 === Test.Nested.Color.red);
+            test(v.nc2 === Test.Nested.Color.green);
+            test(v.nc3 === Test.Nested.Color.blue);
+            test(v.zeroI === 0);
+            test(v.zeroL.equals(new Ice.Long(0, 0)));
+            test(v.zeroF === 0);
+            test(v.zeroDotF === 0);
+            test(v.zeroD === 0);
+            test(v.zeroDotD === 0);
+        }
+        out.writeLine("ok");
+
+        out.write("testing default constructor... ");
+        {
+            const v2 = new Test.StructNoDefaults();
+            test(v2.bo === false);
+            test(v2.b === 0);
+            test(v2.s === 0);
+            test(v2.i === 0);
+            test(v2.l.equals(new Ice.Long(0, 0)));
+            test(v2.f === 0.0);
+            test(v2.d === 0.0);
+            test(v2.str === "");
+            test(v2.c1 == Test.Color.red);
+            test(v2.bs === null);
+            test(v2.is === null);
+            test(v2.st !== null && v2.st instanceof Test.InnerStruct);
+            test(v2.dict === null);
+        }
+
+        {
+            const e = new Test.ExceptionNoDefaults();
+            test(e.str === "");
+            test(e.c1 == Test.Color.red);
+            test(e.bs === null);
+            test(e.st !== null && e.st instanceof Test.InnerStruct);
+            test(e.dict === null);
+        }
+
+        {
+            const cl = new Test.ClassNoDefaults();
+            test(cl.str === "");
+            test(cl.c1 == Test.Color.red);
+            test(cl.bs === null);
+            test(cl.st !== null && cl.st instanceof Test.InnerStruct);
+            test(cl.dict === null);
+        }
+        out.writeLine("ok");
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/defaultValue/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,231 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["suppress-warning:deprecated", "js:es6-module"]] // For enumerator references
+
+module Test
+{
+
+enum Color { red, green, blue }
+
+module Nested
+{
+
+enum Color { red, green, blue }
+
+}
+
+struct Struct1
+{
+    bool boolFalse = false;
+    bool boolTrue = true;
+    byte b = 254;
+    short s = 16000;
+    int i = 3;
+    long l = 4;
+    float f = 5.1;
+    double d = 6.2;
+    string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?";
+    Color c1 = ::Test::Color::red;
+    Color c2 = Test::green;
+    Color c3 = blue;
+    Nested::Color nc1 = Test::Nested::Color::red;
+    Nested::Color nc2 = Nested::green;
+    Nested::Color nc3 = blue;
+    string noDefault;
+    int zeroI = 0;
+    long zeroL = 0;
+    float zeroF = 0;
+    float zeroDotF = 0.0;
+    double zeroD = 0;
+    double zeroDotD = 0;
+}
+
+const bool ConstBool = true;
+const byte ConstByte = 254;
+const short ConstShort = 16000;
+const int ConstInt = 3;
+const long ConstLong = 4;
+const float ConstFloat = 5.1;
+const double ConstDouble = 6.2;
+const string ConstString = "foo \\ \"bar\n \r\n\t\v\f\a\b\?";
+const Color ConstColor1 = ::Test::Color::red;
+const Color ConstColor2 = Test::green;
+const Color ConstColor3 = blue;
+const Nested::Color ConstNestedColor1 = Test::Nested::Color::red;
+const Nested::Color ConstNestedColor2 = Test::Nested::green;
+const Nested::Color ConstNestedColor3 = blue;
+const int ConstZeroI = 0;
+const long ConstZeroL = 0;
+const float ConstZeroF = 0;
+const float ConstZeroDotF = 0.0;
+const double ConstZeroD = 0;
+const double ConstZeroDotD = 0;
+
+struct Struct2
+{
+    bool boolTrue = ConstBool;
+    byte b = ConstByte;
+    short s = ConstShort;
+    int i = ConstInt;
+    long l = ConstLong;
+    float f = ConstFloat;
+    double d = ConstDouble;
+    string str = ConstString;
+    Color c1 = ConstColor1;
+    Color c2 = ConstColor2;
+    Color c3 = ConstColor3;
+    Nested::Color nc1 = ConstNestedColor1;
+    Nested::Color nc2 = ConstNestedColor2;
+    Nested::Color nc3 = ConstNestedColor3;
+    int zeroI = ConstZeroI;
+    long zeroL = ConstZeroL;
+    float zeroF = ConstZeroF;
+    float zeroDotF = ConstZeroDotF;
+    double zeroD = ConstZeroD;
+    double zeroDotD = ConstZeroDotD;
+}
+
+["cpp:class"]
+struct Struct3
+{
+    bool boolFalse = false;
+    bool boolTrue = true;
+    byte b = 1;
+    short s = 2;
+    int i = 3;
+    long l = 4;
+    float f = 5.1;
+    double d = 6.2;
+    string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?";
+    Color c1 = ::Test::Color::red;
+    Color c2 = Test::green;
+    Color c3 = blue;
+    Nested::Color nc1 = ::Test::Nested::Color::red;
+    Nested::Color nc2 = Nested::green;
+    Nested::Color nc3 = blue;
+    string noDefault;
+    int zeroI = 0;
+    long zeroL = 0;
+    float zeroF = 0;
+    float zeroDotF = 0.0;
+    double zeroD = 0;
+    double zeroDotD = 0;
+}
+
+class Base
+{
+    bool boolFalse = false;
+    bool boolTrue = true;
+    byte b = 1;
+    short s = 2;
+    int i = 3;
+    long l = 4;
+    float f = 5.1;
+    double d = 6.2;
+    string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?";
+    string noDefault;
+    int zeroI = 0;
+    long zeroL = 0;
+    float zeroF = 0;
+    float zeroDotF = 0.0;
+    double zeroD = 0;
+    double zeroDotD = 0;
+}
+
+class Derived extends Base
+{
+    Color c1 = ::Test::Color::red;
+    Color c2 = Test::green;
+    Color c3 = blue;
+    Nested::Color nc1 = ::Test::Nested::Color::red;
+    Nested::Color nc2 = Nested::green;
+    Nested::Color nc3 = blue;
+}
+
+exception BaseEx
+{
+    bool boolFalse = false;
+    bool boolTrue = true;
+    byte b = 1;
+    short s = 2;
+    int i = 3;
+    long l = 4;
+    float f = 5.1;
+    double d = 6.2;
+    string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\?";
+    string noDefault;
+    int zeroI = 0;
+    long zeroL = 0;
+    float zeroF = 0;
+    float zeroDotF = 0.0;
+    double zeroD = 0;
+    double zeroDotD = 0;
+}
+
+exception DerivedEx extends BaseEx
+{
+    Color c1 = ConstColor1;
+    Color c2 = ConstColor2;
+    Color c3 = ConstColor3;
+    Nested::Color nc1 = ConstNestedColor1;
+    Nested::Color nc2 = ConstNestedColor2;
+    Nested::Color nc3 = ConstNestedColor3;
+}
+
+sequence<byte> ByteSeq;
+sequence<int> IntSeq;
+dictionary<int, string> IntStringDict;
+
+struct InnerStruct
+{
+    int a;
+}
+
+struct StructNoDefaults
+{
+    bool bo;
+    byte b;
+    short s;
+    int i;
+    long l;
+    float f;
+    double d;
+    string str;
+    Color c1;
+    ByteSeq bs;
+    IntSeq is;
+    InnerStruct st;
+    IntStringDict dict;
+}
+
+exception ExceptionNoDefaultsBase
+{
+    string str;
+    Color c1;
+    ByteSeq bs;
+}
+
+exception ExceptionNoDefaults extends ExceptionNoDefaultsBase
+{
+    InnerStruct st;
+    IntStringDict dict;
+}
+
+class ClassNoDefaultsBase
+{
+    string str;
+    Color c1;
+    ByteSeq bs;
+}
+
+class ClassNoDefaults extends ClassNoDefaultsBase
+{
+    InnerStruct st;
+    IntStringDict dict;
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/enums/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/enums/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/enums/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/enums/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,182 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+
+        out.write("testing stringToProxy... ");
+        const ref = "test:" + this.getTestEndpoint();
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const proxy = await Test.TestIntfPrx.checkedCast(base);
+        test(proxy !== null);
+        test(proxy.equals(base));
+        out.writeLine("ok");
+
+        out.write("testing enum values... ");
+        test(Test.ByteEnum.benum1.value === 0);
+        test(Test.ByteEnum.benum2.value === 1);
+        test(Test.ByteEnum.benum3.value === Test.ByteConst1);
+        test(Test.ByteEnum.benum4.value === Test.ByteConst1 + 1);
+        test(Test.ByteEnum.benum5.value === Test.ShortConst1);
+        test(Test.ByteEnum.benum6.value === Test.ShortConst1 + 1);
+        test(Test.ByteEnum.benum7.value === Test.IntConst1);
+        test(Test.ByteEnum.benum8.value === Test.IntConst1 + 1);
+        test(Test.ByteEnum.benum9.value === Test.LongConst1.low);
+        test(Test.ByteEnum.benum10.value === Test.LongConst1.low + 1);
+        test(Test.ByteEnum.benum11.value === Test.ByteConst2);
+
+        test(Test.ByteEnum.valueOf(0) === Test.ByteEnum.benum1);
+        test(Test.ByteEnum.valueOf(1) === Test.ByteEnum.benum2);
+        test(Test.ByteEnum.valueOf(Test.ByteConst1) === Test.ByteEnum.benum3);
+        test(Test.ByteEnum.valueOf(Test.ByteConst1 + 1) === Test.ByteEnum.benum4);
+        test(Test.ByteEnum.valueOf(Test.ShortConst1) === Test.ByteEnum.benum5);
+        test(Test.ByteEnum.valueOf(Test.ShortConst1 + 1) === Test.ByteEnum.benum6);
+        test(Test.ByteEnum.valueOf(Test.IntConst1) === Test.ByteEnum.benum7);
+        test(Test.ByteEnum.valueOf(Test.IntConst1 + 1) === Test.ByteEnum.benum8);
+        test(Test.ByteEnum.valueOf(Test.LongConst1.low) === Test.ByteEnum.benum9);
+        test(Test.ByteEnum.valueOf(Test.LongConst1.low + 1) === Test.ByteEnum.benum10);
+        test(Test.ByteEnum.valueOf(Test.ByteConst2) === Test.ByteEnum.benum11);
+
+        test(Test.ShortEnum.senum1.value === 3);
+        test(Test.ShortEnum.senum2.value === 4);
+        test(Test.ShortEnum.senum3.value === Test.ByteConst1);
+        test(Test.ShortEnum.senum4.value === Test.ByteConst1 + 1);
+        test(Test.ShortEnum.senum5.value === Test.ShortConst1);
+        test(Test.ShortEnum.senum6.value === Test.ShortConst1 + 1);
+        test(Test.ShortEnum.senum7.value === Test.IntConst1);
+        test(Test.ShortEnum.senum8.value === Test.IntConst1 + 1);
+        test(Test.ShortEnum.senum9.value === Test.LongConst1.low);
+        test(Test.ShortEnum.senum10.value === Test.LongConst1.low + 1);
+        test(Test.ShortEnum.senum11.value === Test.ShortConst2);
+
+        test(Test.ShortEnum.valueOf(3) === Test.ShortEnum.senum1);
+        test(Test.ShortEnum.valueOf(4) === Test.ShortEnum.senum2);
+        test(Test.ShortEnum.valueOf(Test.ByteConst1) === Test.ShortEnum.senum3);
+        test(Test.ShortEnum.valueOf(Test.ByteConst1 + 1) === Test.ShortEnum.senum4);
+        test(Test.ShortEnum.valueOf(Test.ShortConst1) === Test.ShortEnum.senum5);
+        test(Test.ShortEnum.valueOf(Test.ShortConst1 + 1) === Test.ShortEnum.senum6);
+        test(Test.ShortEnum.valueOf(Test.IntConst1) === Test.ShortEnum.senum7);
+        test(Test.ShortEnum.valueOf(Test.IntConst1 + 1) === Test.ShortEnum.senum8);
+        test(Test.ShortEnum.valueOf(Test.LongConst1.low) === Test.ShortEnum.senum9);
+        test(Test.ShortEnum.valueOf(Test.LongConst1.low + 1) === Test.ShortEnum.senum10);
+        test(Test.ShortEnum.valueOf(Test.ShortConst2) === Test.ShortEnum.senum11);
+
+        test(Test.IntEnum.ienum1.value === 0);
+        test(Test.IntEnum.ienum2.value === 1);
+        test(Test.IntEnum.ienum3.value === Test.ByteConst1);
+        test(Test.IntEnum.ienum4.value === Test.ByteConst1 + 1);
+        test(Test.IntEnum.ienum5.value === Test.ShortConst1);
+        test(Test.IntEnum.ienum6.value === Test.ShortConst1 + 1);
+        test(Test.IntEnum.ienum7.value === Test.IntConst1);
+        test(Test.IntEnum.ienum8.value === Test.IntConst1 + 1);
+        test(Test.IntEnum.ienum9.value === Test.LongConst1.low);
+        test(Test.IntEnum.ienum10.value === Test.LongConst1.low + 1);
+        test(Test.IntEnum.ienum11.value === Test.IntConst2);
+        test(Test.IntEnum.ienum12.value === Test.LongConst2.low);
+
+        test(Test.IntEnum.valueOf(0) === Test.IntEnum.ienum1);
+        test(Test.IntEnum.valueOf(1) === Test.IntEnum.ienum2);
+        test(Test.IntEnum.valueOf(Test.ByteConst1) === Test.IntEnum.ienum3);
+        test(Test.IntEnum.valueOf(Test.ByteConst1 + 1) === Test.IntEnum.ienum4);
+        test(Test.IntEnum.valueOf(Test.ShortConst1) === Test.IntEnum.ienum5);
+        test(Test.IntEnum.valueOf(Test.ShortConst1 + 1) === Test.IntEnum.ienum6);
+        test(Test.IntEnum.valueOf(Test.IntConst1) === Test.IntEnum.ienum7);
+        test(Test.IntEnum.valueOf(Test.IntConst1 + 1) === Test.IntEnum.ienum8);
+        test(Test.IntEnum.valueOf(Test.LongConst1.low) === Test.IntEnum.ienum9);
+        test(Test.IntEnum.valueOf(Test.LongConst1.low + 1) === Test.IntEnum.ienum10);
+        test(Test.IntEnum.valueOf(Test.IntConst2) === Test.IntEnum.ienum11);
+        test(Test.IntEnum.valueOf(Test.LongConst2.low) === Test.IntEnum.ienum12);
+
+        test(Test.SimpleEnum.red.value === 0);
+        test(Test.SimpleEnum.green.value === 1);
+        test(Test.SimpleEnum.blue.value === 2);
+
+        test(Test.SimpleEnum.valueOf(0) === Test.SimpleEnum.red);
+        test(Test.SimpleEnum.valueOf(1) === Test.SimpleEnum.green);
+        test(Test.SimpleEnum.valueOf(2) === Test.SimpleEnum.blue);
+
+        out.writeLine("ok");
+
+        out.write("testing enum operations... ");
+        {
+            const [ret, b1] = await proxy.opByte(Test.ByteEnum.benum1);
+            test(ret === b1);
+            test(ret === Test.ByteEnum.benum1);
+        }
+
+        {
+            const [ret, b11] = await proxy.opByte(Test.ByteEnum.benum11);
+            test(ret === b11);
+            test(ret === Test.ByteEnum.benum11);
+        }
+
+        {
+            const [ret, s1] = await proxy.opShort(Test.ShortEnum.senum1);
+            test(ret === s1);
+            test(ret === Test.ShortEnum.senum1);
+        }
+
+        {
+            const [ret, s11] = await proxy.opShort(Test.ShortEnum.senum11);
+            test(ret === s11);
+            test(ret === Test.ShortEnum.senum11);
+        }
+
+        {
+            const [ret, i1] = await proxy.opInt(Test.IntEnum.ienum1);
+            test(ret === i1);
+            test(ret === Test.IntEnum.ienum1);
+        }
+
+        {
+            const [ret, i11] = await proxy.opInt(Test.IntEnum.ienum11);
+            test(ret === i11);
+            test(ret === Test.IntEnum.ienum11);
+        }
+
+        {
+            const [ret, i12] = await proxy.opInt(Test.IntEnum.ienum12);
+            test(ret === i12);
+            test(ret === Test.IntEnum.ienum12);
+        }
+
+        {
+            const [ret, g] = await proxy.opSimple(Test.SimpleEnum.green);
+            test(ret === g);
+            test(ret === Test.SimpleEnum.green);
+        }
+        out.writeLine("ok");
+        await proxy.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/enums/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/enums/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,85 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+const byte ByteConst1 = 10;
+const short ShortConst1 = 20;
+const int IntConst1 = 30;
+const long LongConst1 = 40;
+
+const byte ByteConst2 = 126;
+const short ShortConst2 = 32766;
+const int IntConst2 = 2147483647;
+const long LongConst2 = 2147483646;
+
+enum ByteEnum
+{
+    benum1,
+    benum2,
+    benum3 = ByteConst1,
+    benum4,
+    benum5 = ShortConst1,
+    benum6,
+    benum7 = IntConst1,
+    benum8,
+    benum9 = LongConst1,
+    benum10,
+    benum11 = ByteConst2
+}
+
+enum ShortEnum
+{
+    senum1 = 3,
+    senum2,
+    senum3 = ByteConst1,
+    senum4,
+    senum5 = ShortConst1,
+    senum6,
+    senum7 = IntConst1,
+    senum8,
+    senum9 = LongConst1,
+    senum10,
+    senum11 = ShortConst2
+}
+
+enum IntEnum
+{
+    ienum1,
+    ienum2,
+    ienum3 = ByteConst1,
+    ienum4,
+    ienum5 = ShortConst1,
+    ienum6,
+    ienum7 = IntConst1,
+    ienum8,
+    ienum9 = LongConst1,
+    ienum10,
+    ienum11 = IntConst2,
+    ienum12 = LongConst2
+}
+
+enum SimpleEnum
+{
+    red,
+    green,
+    blue
+}
+
+interface TestIntf
+{
+    ByteEnum opByte(ByteEnum b1, out ByteEnum b2);
+    ShortEnum opShort(ShortEnum s1, out ShortEnum s2);
+    IntEnum opInt(IntEnum i1, out IntEnum i2);
+    SimpleEnum opSimple(SimpleEnum s1, out SimpleEnum s2);
+
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/AMDThrowerI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/AMDThrowerI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/AMDThrowerI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/AMDThrowerI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,117 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class AMDThrowerI extends Test.Thrower
+{
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    supportsUndeclaredExceptions(current:Ice.Current):boolean
+    {
+        return true;
+    }
+
+    supportsAssertException(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    throwAasA(a:number, current:Ice.Current):void
+    {
+        throw new Test.A(a);
+    }
+
+    throwAorDasAorD(a:number, current:Ice.Current):void
+    {
+        if(a > 0)
+        {
+            throw new Test.A(a);
+        }
+        else
+        {
+            throw new Test.D(a);
+        }
+    }
+
+    throwBasA(a:number, b:number, current:Ice.Current):void
+    {
+        return this.throwBasB(a, b, current);
+    }
+
+    throwBasB(a:number, b:number, current:Ice.Current):void
+    {
+        throw new Test.B(a, b);
+    }
+
+    throwCasA(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        return this.throwCasC(a, b, c, current);
+    }
+
+    throwCasB(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        return this.throwCasC(a, b, c, current);
+    }
+
+    throwCasC(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        throw new Test.C(a, b, c);
+    }
+
+    throwUndeclaredA(a:number, current:Ice.Current):void
+    {
+        throw new Test.A(a);
+    }
+
+    throwUndeclaredB(a:number, b:number, current:Ice.Current):void
+    {
+        throw new Test.B(a, b);
+    }
+
+    throwUndeclaredC(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        throw new Test.C(a, b, c);
+    }
+
+    throwLocalException(current:Ice.Current):void
+    {
+        throw new Ice.TimeoutException();
+    }
+
+    throwLocalExceptionIdempotent(current:Ice.Current):void
+    {
+        throw new Ice.TimeoutException();
+    }
+
+    throwNonIceException(current:Ice.Current):void
+    {
+        throw new Error();
+    }
+
+    throwAssertException(current:Ice.Current):void
+    {
+        test(false);
+    }
+
+    throwMemoryLimitException(seq:Uint8Array, current:Ice.Current):PromiseLike<Uint8Array>
+    {
+        return Promise.resolve(new Uint8Array(1024 * 20)); // 20KB is over the configured 10KB message size max.
+    }
+
+    throwAfterResponse(current:Ice.Current):void
+    {
+    }
+
+    throwAfterException(current:Ice.Current):void
+    {
+        throw new Test.A();
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,486 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        class EmptyI extends Test.Empty
+        {
+        }
+
+        class ServantLocatorI
+        {
+            locate(curr:Ice.Current, cookie:Object):Ice.Object
+            {
+                return null;
+            }
+
+            finished(curr:Ice.Current, servant:Ice.Object, cookie:Object):void
+            {
+            }
+
+            deactivate(category:string):void
+            {
+            }
+        }
+
+        const out = this.getWriter();
+        const communicator = this.communicator();
+        out.write("testing object adapter registration exceptions... ");
+        try
+        {
+            await communicator.createObjectAdapter("TestAdapter0");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.InitializationException, ex); // Expected
+        }
+
+        try
+        {
+            await communicator.createObjectAdapterWithEndpoints("TestAdapter0", "default");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.FeatureNotSupportedException, ex); // Expected
+        }
+        out.writeLine("ok");
+
+        out.write("testing servant registration exceptions... ");
+        {
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new EmptyI(), Ice.stringToIdentity("x"));
+            try
+            {
+                adapter.add(new EmptyI(), Ice.stringToIdentity("x"));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.AlreadyRegisteredException, ex);
+            }
+
+            try
+            {
+                adapter.add(new EmptyI(), Ice.stringToIdentity(""));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.IllegalIdentityException, ex);
+                test(ex.id.name === "");
+            }
+
+            try
+            {
+                adapter.add(null, Ice.stringToIdentity("x"));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.IllegalServantException, ex);
+            }
+
+            adapter.remove(Ice.stringToIdentity("x"));
+            try
+            {
+                adapter.remove(Ice.stringToIdentity("x"));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.NotRegisteredException, ex);
+            }
+            await adapter.deactivate();
+        }
+        out.writeLine("ok");
+
+        out.write("testing servant locator registration exceptions... ");
+        {
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.addServantLocator(new ServantLocatorI(), "x");
+            try
+            {
+                adapter.addServantLocator(new ServantLocatorI(), "x");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.AlreadyRegisteredException, ex);
+            }
+            await adapter.deactivate();
+            out.writeLine("ok");
+
+            out.write("testing value factory registration exception... ");
+            communicator.getValueFactoryManager().add(() => null, "::x");
+            try
+            {
+                communicator.getValueFactoryManager().add(() => null, "::x");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.AlreadyRegisteredException, ex);
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("testing stringToProxy... ");
+        const ref = "thrower:" + this.getTestEndpoint();
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const thrower = await Test.ThrowerPrx.checkedCast(base);
+        test(thrower !== null);
+        test(thrower.equals(base));
+        out.writeLine("ok");
+
+        out.write("catching exact types... ");
+        try
+        {
+            await thrower.throwAasA(1);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.A, ex);
+            test(ex.aMem === 1);
+        }
+
+        try
+        {
+            await thrower.throwAorDasAorD(1);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.A, ex);
+            test(ex.aMem === 1);
+        }
+
+        try
+        {
+            await thrower.throwAorDasAorD(-1);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.D, ex);
+            test(ex.dMem === -1);
+        }
+
+        try
+        {
+            await thrower.throwBasB(1, 2);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.B, ex);
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+        }
+
+        try
+        {
+            await thrower.throwCasC(1, 2, 3);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.C, ex);
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+            test(ex.cMem == 3);
+        }
+        out.writeLine("ok");
+
+        out.write("catching base types... ");
+        try
+        {
+            await thrower.throwBasB(1, 2);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.A, ex);
+            test(ex.aMem == 1);
+        }
+
+        try
+        {
+            await thrower.throwCasC(1, 2, 3);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.B, ex);
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+        }
+        out.writeLine("ok");
+
+        out.write("catching derived types... ");
+        try
+        {
+            await thrower.throwBasA(1, 2);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.B, ex);
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+        }
+
+        try
+        {
+            await thrower.throwCasA(1, 2, 3);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.C, ex);
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+            test(ex.cMem == 3);
+        }
+
+        try
+        {
+            await thrower.throwCasB(1, 2, 3);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.C, ex);
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+            test(ex.cMem == 3);
+        }
+        out.writeLine("ok");
+
+        if(await thrower.supportsUndeclaredExceptions())
+        {
+            out.write("catching unknown user exception... ");
+            try
+            {
+                await thrower.throwUndeclaredA(1);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownUserException, ex);
+            }
+
+            try
+            {
+                await thrower.throwUndeclaredB(1, 2);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownUserException, ex);
+            }
+
+            try
+            {
+                await thrower.throwUndeclaredC(1, 2, 3);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownUserException, ex);
+            }
+            out.writeLine("ok");
+        }
+
+        if(await thrower.supportsAssertException())
+        {
+            out.write("testing assert in the server... ");
+            try
+            {
+                await thrower.throwAssertException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ConnectionLostException ||
+                        ex instanceof Ice.UnknownException, ex);
+            }
+            out.writeLine("ok");
+        }
+
+        out.write("testing memory limit marshal exception...");
+        try
+        {
+            await thrower.throwMemoryLimitException(null);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.MemoryLimitException, ex);
+        }
+
+        try
+        {
+            await thrower.throwMemoryLimitException(new Uint8Array(20 * 1024));
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex.toString().indexOf("ConnectionLostException") > 0, ex);
+        }
+        out.writeLine("ok");
+
+        let retries = 10;
+        while(--retries > 0)
+        {
+            // The above test can cause a close connection between the echo server and
+            // bidir server, we need to wait until the bidir server has reopen the
+            // connection with the echo server.
+
+            try
+            {
+                await thrower.ice_ping();
+                break;
+            }
+            catch(ex)
+            {
+                if(ex instanceof Ice.ObjectNotExistException && retries > 0)
+                {
+                    await Ice.Promise.delay(20);
+                }
+                else
+                {
+                    throw ex;
+                }
+            }
+        }
+
+        out.write("catching object not exist exception... ");
+        try
+        {
+            const thrower2 = Test.ThrowerPrx.uncheckedCast(
+                thrower.ice_identity(Ice.stringToIdentity("does not exist")));
+            await thrower2.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ObjectNotExistException, ex);
+            test(ex.id.equals(Ice.stringToIdentity("does not exist")));
+        }
+        out.writeLine("ok");
+
+        out.write("catching facet not exist exception... ");
+        try
+        {
+            const thrower2 = Test.ThrowerPrx.uncheckedCast(thrower, "no such facet");
+            await thrower2.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.FacetNotExistException, ex);
+            test(ex.facet == "no such facet");
+        }
+        out.writeLine("ok");
+
+        out.write("catching operation not exist exception... ");
+        try
+        {
+            const thrower2 = Test.WrongOperationPrx.uncheckedCast(thrower);
+            await thrower2.noSuchOperation();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.OperationNotExistException, ex);
+            test(ex.operation == "noSuchOperation");
+        }
+        out.writeLine("ok");
+
+        out.write("catching unknown local exception... ");
+        try
+        {
+            await thrower.throwLocalException();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.UnknownLocalException, ex);
+        }
+
+        try
+        {
+            await thrower.throwLocalExceptionIdempotent();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.UnknownLocalException ||
+                    ex instanceof Ice.OperationNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("catching unknown non-Ice exception... ");
+        try
+        {
+            await thrower.throwNonIceException();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.UnknownException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing asynchronous exceptions... ");
+        await thrower.throwAfterResponse();
+        try
+        {
+            await thrower.throwAfterException();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.A, ex);
+        }
+        out.writeLine("ok");
+
+        await thrower.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.MessageSizeMax", "10");
+            properties.setProperty("Ice.Warn.Connections", "0");
+            properties.setProperty("Ice.PrintStackTraces", "1");
+            [communicator] = this.initialize(properties);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/ServerAMD.ts zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/ServerAMD.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/ServerAMD.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/ServerAMD.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,50 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+import {AMDThrowerI} from "./AMDThrowerI";
+
+export class ServerAMD extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.MessageSizeMax", "10");
+            properties.setProperty("Ice.Warn.Dispatch", "0");
+            properties.setProperty("Ice.Warn.Connections", "0");
+            [communicator] = this.initialize(properties);
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new AMDThrowerI(), Ice.stringToIdentity("thrower"));
+            await echo.setConnection();
+            const connection = echo.ice_getCachedConnection();
+            connection.setCloseCallback(con => {
+                // Re-establish connection if it fails (necessary for MemoryLimitException test)
+                echo.setConnection().then(() => echo.ice_getCachedConnection().setAdapter(adapter));
+            });
+            connection.setAdapter(adapter);
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/Server.ts zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/Server.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/Server.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/Server.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,52 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+import {ThrowerI} from "./ThrowerI";
+
+const test = TestHelper.test;
+
+export class Server extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.MessageSizeMax", "10");
+            properties.setProperty("Ice.Warn.Dispatch", "0");
+            properties.setProperty("Ice.Warn.Connections", "0");
+            [communicator] = this.initialize(properties);
+
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new ThrowerI(), Ice.stringToIdentity("thrower"));
+            await echo.setConnection();
+            const connection = echo.ice_getCachedConnection();
+            connection.setCloseCallback(con => {
+                // Re-establish connection if it fails (necessary for MemoryLimitException test)
+                echo.setConnection().then(() => echo.ice_getCachedConnection().setAdapter(adapter));
+            });
+            connection.setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,81 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Ice/BuiltinSequences.ice>
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface Empty
+{
+}
+
+interface Thrower;
+
+exception A
+{
+    int aMem;
+}
+
+exception B extends A
+{
+    int bMem;
+}
+
+exception C extends B
+{
+    int cMem;
+}
+
+exception D
+{
+    int dMem;
+}
+
+interface Thrower
+{
+    void shutdown();
+    bool supportsUndeclaredExceptions();
+    bool supportsAssertException();
+
+    void throwAasA(int a) throws A;
+    void throwAorDasAorD(int a) throws A, D;
+    void throwBasA(int a, int b) throws A;
+    void throwCasA(int a, int b, int c) throws A;
+    void throwBasB(int a, int b) throws B;
+    void throwCasB(int a, int b, int c) throws B;
+    void throwCasC(int a, int b, int c) throws C;
+
+    void throwUndeclaredA(int a);
+    void throwUndeclaredB(int a, int b);
+    void throwUndeclaredC(int a, int b, int c);
+    void throwLocalException();
+    void throwNonIceException();
+    void throwAssertException();
+    Ice::ByteSeq throwMemoryLimitException(Ice::ByteSeq seq);
+
+    idempotent void throwLocalExceptionIdempotent();
+
+    void throwAfterResponse();
+    void throwAfterException() throws A;
+}
+
+interface WrongOperation
+{
+    void noSuchOperation();
+}
+
+interface Echo
+{
+    void setConnection();
+    void startBatch();
+    void flushBatch();
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/ThrowerI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/ThrowerI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/exceptions/ThrowerI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/exceptions/ThrowerI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,123 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class ThrowerI extends Test.Thrower
+{
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    supportsUndeclaredExceptions(current:Ice.Current):boolean
+    {
+        return true;
+    }
+
+    supportsAssertException(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    throwAasA(a:number, current:Ice.Current):void
+    {
+        throw new Test.A(a);
+    }
+
+    throwAorDasAorD(a:number, current:Ice.Current):void
+    {
+        if(a > 0)
+        {
+            throw new Test.A(a);
+        }
+        else
+        {
+            throw new Test.D(a);
+        }
+    }
+
+    throwBasA(a:number, b:number, current:Ice.Current):void
+    {
+        this.throwBasB(a, b, current);
+    }
+
+    throwBasB(a:number, b:number, current:Ice.Current):void
+    {
+        throw new Test.B(a, b);
+    }
+
+    throwCasA(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        this.throwCasC(a, b, c, current);
+    }
+
+    throwCasB(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        this.throwCasC(a, b, c, current);
+    }
+
+    throwCasC(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        throw new Test.C(a, b, c);
+    }
+
+    throwUndeclaredA(a:number, current:Ice.Current):void
+    {
+        throw new Test.A(a);
+    }
+
+    throwUndeclaredB(a:number, b:number, current:Ice.Current):void
+    {
+        throw new Test.B(a, b);
+    }
+
+    throwUndeclaredC(a:number, b:number, c:number, current:Ice.Current):void
+    {
+        throw new Test.C(a, b, c);
+    }
+
+    throwLocalException(current:Ice.Current):void
+    {
+        throw new Ice.TimeoutException();
+    }
+
+    throwLocalExceptionIdempotent(current:Ice.Current):void
+    {
+        throw new Ice.TimeoutException();
+    }
+
+    throwNonIceException(current:Ice.Current):void
+    {
+        throw new Error();
+    }
+
+    throwAssertException(current:Ice.Current):void
+    {
+        test(false);
+    }
+
+    throwMemoryLimitException(seq:Uint8Array, current:Ice.Current):Uint8Array
+    {
+        return new Uint8Array(1024 * 20); // 20KB is over the configured 10KB message size max.
+    }
+
+    throwAfterResponse(current:Ice.Current):void
+    {
+        //
+        // Only relevant for AMD.
+        //
+    }
+
+    throwAfterException(current:Ice.Current):void
+    {
+        //
+        // Only relevant for AMD.
+        //
+        throw new Test.A();
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/facets/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/facets/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/facets/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/facets/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,118 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const communicator = this.communicator();
+        const out = this.getWriter();
+
+        out.write("testing stringToProxy... ");
+        const ref = "d:" + this.getTestEndpoint();
+        const db = communicator.stringToProxy(ref);
+        test(db !== null);
+        out.writeLine("ok");
+
+        out.write("testing unchecked cast... ");
+        let prx = Ice.ObjectPrx.uncheckedCast(db);
+        test(prx.ice_getFacet().length === 0);
+        prx = Ice.ObjectPrx.uncheckedCast(db, "facetABCD");
+        test(prx.ice_getFacet() == "facetABCD");
+        let prx2 = Ice.ObjectPrx.uncheckedCast(prx);
+        test(prx2.ice_getFacet() == "facetABCD");
+        let prx3 = Ice.ObjectPrx.uncheckedCast(prx, "");
+        test(prx3.ice_getFacet().length === 0);
+        let d = Test.DPrx.uncheckedCast(db);
+        test(d.ice_getFacet().length === 0);
+        let df = Test.DPrx.uncheckedCast(db, "facetABCD");
+        test(df.ice_getFacet() == "facetABCD");
+        let df2 = Test.DPrx.uncheckedCast(df);
+        test(df2.ice_getFacet() == "facetABCD");
+        let df3 = Test.DPrx.uncheckedCast(df, "");
+        test(df3.ice_getFacet().length === 0);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        prx = await Ice.ObjectPrx.checkedCast(db);
+        test(prx.ice_getFacet().length === 0);
+        prx = await Ice.ObjectPrx.checkedCast(db, "facetABCD");
+        test(prx.ice_getFacet() == "facetABCD");
+        prx2 = await Ice.ObjectPrx.checkedCast(prx);
+        test(prx2.ice_getFacet() == "facetABCD");
+        prx3 = await Ice.ObjectPrx.checkedCast(prx, "");
+        test(prx3.ice_getFacet().length === 0);
+        d = await Test.DPrx.checkedCast(db);
+        test(d.ice_getFacet().length === 0);
+        df = await Test.DPrx.checkedCast(db, "facetABCD");
+        test(df.ice_getFacet() == "facetABCD");
+        df2 = await Test.DPrx.checkedCast(df);
+        test(df2.ice_getFacet() == "facetABCD");
+        df3 = await Test.DPrx.checkedCast(df, "");
+        test(df3.ice_getFacet().length === 0);
+        out.writeLine("ok");
+
+        out.write("testing non-facets A, B, C, and D... ");
+        d = await Test.DPrx.checkedCast(db);
+        test(d !== null);
+        test(d.equals(db));
+        test(await d.callA() == "A");
+        test(await d.callB() == "B");
+        test(await d.callC() == "C");
+        test(await d.callD() == "D");
+        out.writeLine("ok");
+
+        out.write("testing facets A, B, C, and D... ");
+        df = await Test.DPrx.checkedCast(d, "facetABCD");
+        test(df !== null);
+        test(await df.callA() == "A");
+        test(await df.callB() == "B");
+        test(await df.callC() == "C");
+        test(await df.callD() == "D");
+        out.writeLine("ok");
+
+        out.write("testing facets E and F... ");
+        const ff = await Test.FPrx.checkedCast(d, "facetEF");
+        test(await ff.callE() == "E");
+        test(await ff.callF() == "F");
+        out.writeLine("ok");
+
+        out.write("testing facet G... ");
+        const gf = await Test.GPrx.checkedCast(ff, "facetGH");
+        test(gf !== null);
+        test(await gf.callG() == "G");
+        out.writeLine("ok");
+
+        out.write("testing whether casting preserves the facet... ");
+        const hf = await Test.HPrx.checkedCast(gf);
+        test(hf !== null);
+        test(await hf.callG() == "G");
+        test(await hf.callH() == "H");
+        out.writeLine("ok");
+
+        await gf.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/facets/Server.ts zeroc-ice-3.7.2/js/test/typescript/Ice/facets/Server.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/facets/Server.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/facets/Server.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,109 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+import {DI, FI, HI, EmptyI} from "./TestI"
+
+const test = TestHelper.test;
+
+export class Server extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo;
+        try
+        {
+            [communicator] = this.initialize(args);
+            const out = this.getWriter();
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+
+            out.write("testing facet registration exceptions... ");
+            let adapter = await communicator.createObjectAdapter("");
+
+            const obj = new EmptyI();
+            adapter.add(obj, Ice.stringToIdentity("d"));
+            adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD");
+            try
+            {
+                adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.AlreadyRegisteredException);
+            }
+
+            adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD");
+            try
+            {
+                adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD");
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.NotRegisteredException);
+            }
+            out.writeLine("ok");
+
+            out.write("testing removeAllFacets... ");
+            const obj1 = new EmptyI();
+            const obj2 = new EmptyI();
+            adapter.addFacet(obj1, Ice.stringToIdentity("id1"), "f1");
+            adapter.addFacet(obj2, Ice.stringToIdentity("id1"), "f2");
+            const obj3 = new EmptyI();
+            adapter.addFacet(obj1, Ice.stringToIdentity("id2"), "f1");
+            adapter.addFacet(obj2, Ice.stringToIdentity("id2"), "f2");
+            adapter.addFacet(obj3, Ice.stringToIdentity("id2"), "");
+            let fm = adapter.removeAllFacets(Ice.stringToIdentity("id1"));
+            test(fm.size === 2);
+            test(fm.get("f1") === obj1);
+            test(fm.get("f2") === obj2);
+            try
+            {
+                adapter.removeAllFacets(Ice.stringToIdentity("id1"));
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.NotRegisteredException);
+            }
+            fm = adapter.removeAllFacets(Ice.stringToIdentity("id2"));
+            test(fm.size == 3);
+            test(fm.get("f1") === obj1);
+            test(fm.get("f2") === obj2);
+            test(fm.get("") === obj3);
+            out.writeLine("ok");
+
+            await adapter.deactivate();
+            adapter = await communicator.createObjectAdapter("");
+
+            const di = new DI();
+            adapter.add(di, Ice.stringToIdentity("d"));
+            adapter.addFacet(di, Ice.stringToIdentity("d"), "facetABCD");
+            const fi = new FI();
+            adapter.addFacet(fi, Ice.stringToIdentity("d"), "facetEF");
+            const hi = new HI();
+            adapter.addFacet(hi, Ice.stringToIdentity("d"), "facetGH");
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/facets/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/facets/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,65 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface Empty
+{
+}
+
+interface A
+{
+    string callA();
+}
+
+interface B extends A
+{
+    string callB();
+}
+
+interface C extends A
+{
+    string callC();
+}
+
+interface D extends B, C
+{
+    string callD();
+}
+
+interface E
+{
+    string callE();
+}
+
+interface F extends E
+{
+    string callF();
+}
+
+interface G
+{
+    void shutdown();
+    string callG();
+}
+
+interface H extends G
+{
+    string callH();
+}
+
+interface Echo
+{
+    void setConnection();
+    void startBatch();
+    void flushBatch();
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/facets/TestI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/facets/TestI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/facets/TestI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/facets/TestI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,67 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class DI extends Test.D
+{
+    callA(current:Ice.Current):string
+    {
+        return "A";
+    }
+
+    callB(current:Ice.Current):string
+    {
+        return "B";
+    }
+
+    callC(current:Ice.Current):string
+    {
+        return "C";
+    }
+
+    callD(current:Ice.Current):string
+    {
+        return "D";
+    }
+}
+
+export class EmptyI extends Test.Empty
+{
+}
+
+export class FI extends Test.F
+{
+    callE(current:Ice.Current):string
+    {
+        return "E";
+    }
+
+    callF(current:Ice.Current):string
+    {
+        return "F";
+    }
+}
+
+export class HI extends Test.H
+{
+    callG(current:Ice.Current):string
+    {
+        return "G";
+    }
+
+    callH(current:Ice.Current):string
+    {
+        return "H";
+    }
+
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/hold/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/hold/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/hold/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/hold/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,280 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        class Condition
+        {
+            constructor(value:boolean)
+            {
+                this.value = value;
+            }
+
+            value:boolean;
+        }
+
+        class SetCB
+        {
+            constructor(condition:Condition, expected:number)
+            {
+                this.condition = condition;
+                this.expected = expected;
+            }
+
+            response(value:number)
+            {
+                if(value != this.expected)
+                {
+                    this.condition.value = false;
+                }
+            }
+            condition:Condition;
+            expected:number;
+        }
+
+        const communicator = this.communicator();
+        const out = this.getWriter();
+
+        const ref = "hold:" + this.getTestEndpoint();
+        const hold = await Test.HoldPrx.checkedCast(communicator.stringToProxy(ref));
+        test(hold !== null);
+        const holdOneway = Test.HoldPrx.uncheckedCast(hold.ice_oneway());
+
+        const refSerialized = "hold:" + this.getTestEndpoint(1);
+        const holdSerialized = await Test.HoldPrx.checkedCast(communicator.stringToProxy(refSerialized));
+        test(holdSerialized !== null);
+        const holdSerializedOneway = Test.HoldPrx.uncheckedCast(holdSerialized.ice_oneway());
+
+        out.write("changing state between active and hold rapidly... ");
+
+        for(let i = 0; i < 100; ++i)
+        {
+            await hold.putOnHold(0);
+        }
+        for(let i = 0; i < 100; ++i)
+        {
+            await holdOneway.putOnHold(0);
+        }
+        for(let i = 0; i < 100; ++i)
+        {
+            await holdSerialized.putOnHold(0);
+        }
+        for(let i = 0; i < 1; ++i)
+        {
+            await holdSerializedOneway.putOnHold(0);
+        }
+        out.writeLine("ok");
+
+        out.write("testing without serialize mode... ");
+        {
+            const condition = new Condition(true);
+            let value = 0;
+            let result;
+            const results = [];
+            while(condition.value)
+            {
+                const cb = new SetCB(condition, value);
+                result = hold.set(++value, value < 500 ? Math.floor((Math.random() * 5)) : 0);
+                results.push(
+                    result.then(
+                        v =>
+                            {
+                                cb.response(v);
+                            },
+                        () =>
+                            {
+                                // Ignore exception
+                            }));
+
+                if(value % 100 === 0)
+                {
+                    while(true)
+                    {
+                        if(result.isSent())
+                        {
+                            break;
+                        }
+                        else if(result.isCompleted())
+                        {
+                            await result; // This should throw the failure if the call wasn't sent but done.
+                            test(result.isSent());
+                        }
+                        await Ice.Promise.delay(10);
+                    }
+                }
+
+                if(value > 10000)
+                {
+                    // Don't continue, it's possible that out-of-order dispatch doesn't occur
+                    // after 100000 iterations and we don't want the test to last for too long
+                    // when this occurs.
+                    break;
+                }
+            }
+            test(value > 10000 || !condition.value);
+            while(true)
+            {
+                if(result.isSent())
+                {
+                    break;
+                }
+                else if(result.isCompleted())
+                {
+                    await result; // This should throw the failure if the call wasn't sent but done.
+                    test(result.isSent());
+                }
+                await Ice.Promise.delay(10);
+            }
+            await Promise.all(results);
+        }
+        out.writeLine("ok");
+
+        out.write("testing with serialize mode... ");
+        {
+            const condition = new Condition(true);
+            let value = 0;
+            let result;
+            const results = [];
+            while(value < 3000 && condition.value)
+            {
+                const cb = new SetCB(condition, value);
+                result = holdSerialized.set(++value, 0);
+                results.push(
+                    result.then(
+                        v =>
+                            {
+                                cb.response(v);
+                            },
+                        () =>
+                            {
+                                // Ignore exceptions
+                            }));
+
+                if(value % 100 === 0)
+                {
+                    while(true)
+                    {
+                        if(result.isSent())
+                        {
+                            break;
+                        }
+                        else if(result.isCompleted())
+                        {
+                            await result; // This should throw the failure if the call wasn't sent but done.
+                            test(result.isSent());
+                        }
+                        await Ice.Promise.delay(10);
+                    }
+                }
+            }
+            await result;
+            test(condition.value);
+
+            for(let i = 0; i < 10000; ++i)
+            {
+                await holdSerializedOneway.setOneway(value + 1, value);
+                ++value;
+                if((i % 100) == 0)
+                {
+                    await holdSerializedOneway.putOnHold(1);
+                }
+            }
+            await Promise.all(results);
+        }
+        out.writeLine("ok");
+
+        out.write("testing serialization... ");
+        {
+            let value = 0;
+            let result;
+            const results = [];
+            await holdSerialized.set(value, 0);
+
+            for(let i = 0; i < 10000; ++i)
+            {
+                // Create a new proxy for each request
+                result = holdSerialized.ice_oneway().setOneway(value + 1, value);
+                results.push(result);
+                ++value;
+                if((i % 100) === 0)
+                {
+                    while(true)
+                    {
+                        if(result.isSent())
+                        {
+                            break;
+                        }
+                        else if(result.isCompleted())
+                        {
+                            await result; // This should throw the failure if the call wasn't sent but done.
+                            test(result.isSent());
+                        }
+                        await Ice.Promise.delay(10);
+                    }
+                    await holdSerialized.ice_ping(); // Ensure everything's dispatched.
+                    const conn = await holdSerialized.ice_getConnection();
+                    await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+                }
+            }
+            await Promise.all(results);
+        }
+        out.writeLine("ok");
+
+        out.write("testing waitForHold... ");
+        await hold.waitForHold();
+        await hold.waitForHold();
+        for(let i = 0; i < 1000; ++i)
+        {
+            await holdOneway.ice_ping();
+            if((i % 20) == 0)
+            {
+                await hold.putOnHold(0);
+            }
+        }
+        await hold.putOnHold(-1);
+        await hold.ice_ping();
+        await hold.putOnHold(-1);
+        await hold.ice_ping();
+        out.writeLine("ok");
+
+        out.write("changing state to hold and shutting down server... ");
+        await hold.shutdown();
+        out.writeLine("ok");
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            //
+            // For this test, we want to disable retries.
+            //
+            properties.setProperty("Ice.RetryIntervals", "-1");
+
+            //
+            // We don't want connection warnings because of the timeout
+            //
+            properties.setProperty("Ice.Warn.Connections", "0");
+
+            [communicator] = this.initialize(properties);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/hold/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/hold/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/hold/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/hold/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,21 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface Hold
+{
+    void putOnHold(int seconds);
+    void waitForHold();
+    void setOneway(int value, int expected);
+    int set(int value, int delay);
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/info/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/info/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/info/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/info/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,156 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+function getTCPEndpointInfo(info:Ice.EndpointInfo)
+{
+    for(let p = info; p; p = p.underlying)
+    {
+        if(p instanceof Ice.TCPEndpointInfo)
+        {
+            return p;
+        }
+    }
+    return null;
+}
+
+function getTCPConnectionInfo(info:Ice.ConnectionInfo)
+{
+    for(let p = info; p; p = p.underlying)
+    {
+        if(p instanceof Ice.TCPConnectionInfo)
+        {
+            return p;
+        }
+    }
+    return null;
+}
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+        const defaultHost = communicator.getProperties().getProperty("Ice.Default.Host");
+
+        out.write("testing proxy endpoint information... ");
+        {
+            const ref =
+                    "test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:opaque -e 1.8 -t 100 -v ABCD";
+            const p1 = communicator.stringToProxy(ref);
+
+            const endps = p1.ice_getEndpoints();
+            const endpoint = endps[0].getInfo();
+            const ipEndpoint = getTCPEndpointInfo(endpoint);
+            test(ipEndpoint.host == "tcphost");
+            test(ipEndpoint.port == 10000);
+            test(ipEndpoint.timeout == 1200);
+            test(ipEndpoint.sourceAddress == "10.10.10.10");
+            test(ipEndpoint.compress);
+            test(!ipEndpoint.datagram());
+            test(ipEndpoint.type() == Ice.TCPEndpointType && !ipEndpoint.secure() ||
+                    ipEndpoint.type() == Ice.WSEndpointType && !ipEndpoint.secure() ||
+                    ipEndpoint.type() == Ice.WSSEndpointType && ipEndpoint.secure());
+
+            test(ipEndpoint.type() == Ice.TCPEndpointType && endpoint instanceof Ice.TCPEndpointInfo ||
+                    ipEndpoint.type() == Ice.WSEndpointType && endpoint instanceof Ice.WSEndpointInfo ||
+                    ipEndpoint.type() == Ice.WSSEndpointType && endpoint instanceof Ice.WSEndpointInfo);
+
+            const opaqueEndpoint = endps[1].getInfo() as Ice.OpaqueEndpointInfo;
+            test(opaqueEndpoint.rawEncoding.equals(new Ice.EncodingVersion(1, 8)));
+        }
+        out.writeLine("ok");
+
+        const base = communicator.stringToProxy("test:" + this.getTestEndpoint());
+        const testIntf = Test.TestIntfPrx.uncheckedCast(base);
+
+        out.write("testing connection endpoint information... ");
+        {
+            const endpointPort = this.getTestPort(0);
+            let conn = await base.ice_getConnection();
+            let ipinfo = getTCPEndpointInfo(conn.getEndpoint().getInfo());
+            test(ipinfo.port == endpointPort);
+            test(!ipinfo.compress);
+            test(ipinfo.host == defaultHost);
+
+            let ctx = await testIntf.getEndpointInfoAsContext();
+            test(ctx.get("host") == ipinfo.host);
+            test(ctx.get("compress") == "false");
+            test(parseInt(ctx.get("port")) > 0);
+        }
+        out.writeLine("ok");
+
+        out.write("testing connection information... ");
+        {
+            const endpointPort = this.getTestPort(0);
+            let conn = await base.ice_getConnection();
+            conn = await base.ice_getConnection();
+            conn.setBufferSize(1024, 2048);
+
+            const info:Ice.ConnectionInfo = conn.getInfo();
+            let ipinfo:Ice.TCPConnectionInfo = getTCPConnectionInfo(info);
+            test(!info.incoming);
+            test(info.adapterName.length === 0);
+            if(conn.type() != "ws" && conn.type() != "wss")
+            {
+                test(ipinfo.localPort > 0);
+            }
+            test(ipinfo.remotePort == endpointPort);
+            if(defaultHost == "127.0.0.1")
+            {
+                test(ipinfo.remoteAddress == defaultHost);
+                if(conn.type() != "ws" && conn.type() != "wss")
+                {
+                    test(ipinfo.localAddress == defaultHost);
+                }
+            }
+            test(ipinfo.sndSize >= 2048);
+            const ctx:Map<string, string> = await testIntf.getConnectionInfoAsContext();
+
+            test(ctx.get("incoming") == "true");
+            test(ctx.get("adapterName") == "TestAdapter");
+            if(conn.type() != "ws" && conn.type() != "wss")
+            {
+                test(ctx.get("remoteAddress") == ipinfo.localAddress);
+                test(ctx.get("localAddress") == ipinfo.remoteAddress);
+                test(parseInt(ctx.get("remotePort")) === ipinfo.localPort);
+                test(parseInt(ctx.get("localPort")) === ipinfo.remotePort);
+            }
+
+            if(conn.type() == "ws" || conn.type() == "wss")
+            {
+                test(ctx.get("ws.Upgrade").toLowerCase() == "websocket");
+                test(ctx.get("ws.Connection").indexOf("Upgrade") >= 0);
+                test(ctx.get("ws.Sec-WebSocket-Protocol") == "ice.zeroc.com");
+                test(ctx.get("ws.Sec-WebSocket-Version") == "13");
+                test(ctx.get("ws.Sec-WebSocket-Key") !== null);
+            }
+        }
+        out.writeLine("ok");
+
+        await testIntf.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/info/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/info/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/info/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,23 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Ice/Current.ice>
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface TestIntf
+{
+    void shutdown();
+
+    Ice::Context getEndpointInfoAsContext();
+
+    Ice::Context getConnectionInfoAsContext();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,231 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+import {TestHelper} from "../../../Common/TestHelper"
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const communicator = this.communicator();
+        const out = this.getWriter();
+
+        out.write("testing stringToProxy... ");
+        const ref = "initial:" + this.getTestEndpoint();
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const initial = await Test.InitialPrx.checkedCast(base);
+        test(initial !== null);
+        test(initial.equals(base));
+        out.writeLine("ok");
+
+        out.write("getting proxies for class hierarchy... ");
+        const ca = await initial.caop();
+        const cb = await initial.cbop();
+        const cc = await initial.ccop();
+        const cd = await initial.cdop();
+        test(ca != cb);
+        test(ca != cc);
+        test(ca != cd);
+        test(cb != cc);
+        test(cb != cd);
+        test(cc != cd);
+        out.writeLine("ok");
+
+        out.write("getting proxies for interface hierarchy... ");
+        const ia = await initial.iaop();
+        const ib1 = await initial.ib1op();
+        const ib2 = await initial.ib2op();
+        const ic = await initial.icop();
+        test(ia != ib1);
+        test(ia != ib2);
+        test(ia != ic);
+        test(ib1 != ic);
+        test(ib2 != ic);
+        out.writeLine("ok");
+
+        out.write("invoking proxy operations on class hierarchy... ");
+
+        let cao = await ca.caop(ca);
+        test(cao.equals(ca));
+        cao = await ca.caop(cb);
+        test(cao.equals(cb));
+        cao = await ca.caop(cc);
+        test(cao.equals(cc));
+        cao = await cb.caop(ca);
+        test(cao.equals(ca));
+        cao = await cb.caop(cb);
+        test(cao.equals(cb));
+        cao = await cb.caop(cc);
+        test(cao.equals(cc));
+        cao = await cc.caop(ca);
+        test(cao.equals(ca));
+        cao = await cc.caop(cb);
+        test(cao.equals(cb));
+        cao = await cc.caop(cc);
+        test(cao.equals(cc));
+
+        cao = await cb.cbop(cb);
+        test(cao.equals(cb));
+        let cbo = await cb.cbop(cb);
+        test(cbo.equals(cb));
+        cao = await cb.cbop(cc);
+        test(cao.equals(cc));
+        cbo = await cb.cbop(cc);
+        test(cbo.equals(cc));
+        cao = await cc.cbop(cb);
+        test(cao.equals(cb));
+        cbo = await cc.cbop(cb);
+        test(cbo.equals(cb));
+        cao = await cc.cbop(cc);
+        test(cao.equals(cc));
+        cbo = await cc.cbop(cc);
+        test(cbo.equals(cc));
+
+        cao = await cc.ccop(cc);
+        test(cao.equals(cc));
+        cbo = await cc.ccop(cc);
+        test(cbo.equals(cc));
+        let cco = await cc.ccop(cc);
+        test(cco.equals(cc));
+        out.writeLine("ok");
+
+        out.write("ditto, but for interface hierarchy... ");
+        let iao;
+        let ib1o;
+        let ib2o;
+
+        iao = await ia.iaop(ia);
+        test(iao.equals(ia));
+        iao = await ia.iaop(ib1);
+        test(iao.equals(ib1));
+        iao = await ia.iaop(ib2);
+        test(iao.equals(ib2));
+        iao = await ia.iaop(ic);
+        test(iao.equals(ic));
+        iao = await ib1.iaop(ia);
+        test(iao.equals(ia));
+        iao = await ib1.iaop(ib1);
+        test(iao.equals(ib1));
+        iao = await ib1.iaop(ib2);
+        test(iao.equals(ib2));
+        iao = await ib1.iaop(ic);
+        test(iao.equals(ic));
+        iao = await ib2.iaop(ia);
+        test(iao.equals(ia));
+        iao = await ib2.iaop(ib1);
+        test(iao.equals(ib1));
+        iao = await ib2.iaop(ib2);
+        test(iao.equals(ib2));
+        iao = await ib2.iaop(ic);
+        test(iao.equals(ic));
+        iao = await ic.iaop(ia);
+        test(iao.equals(ia));
+        iao = await ic.iaop(ib1);
+        test(iao.equals(ib1));
+        iao = await ic.iaop(ib2);
+        test(iao.equals(ib2));
+        iao = await ic.iaop(ic);
+        test(iao.equals(ic));
+
+        iao = await ib1.ib1op(ib1);
+        test(iao.equals(ib1));
+        ib1o = await ib1.ib1op(ib1);
+        test(ib1o.equals(ib1));
+        iao = await ib1.ib1op(ic);
+        test(iao.equals(ic));
+        ib1o = await ib1.ib1op(ic);
+        test(ib1o.equals(ic));
+        iao = await ic.ib1op(ib1);
+        test(iao.equals(ib1));
+        ib1o = await ic.ib1op(ib1);
+        test(ib1o.equals(ib1));
+        iao = await ic.ib1op(ic);
+        test(iao.equals(ic));
+        ib1o = await ic.ib1op(ic);
+        test(ib1o.equals(ic));
+
+        iao = await ib2.ib2op(ib2);
+        test(iao.equals(ib2));
+        ib2o = await ib2.ib2op(ib2);
+        test(ib2o.equals(ib2));
+        iao = await ib2.ib2op(ic);
+        test(iao.equals(ic));
+        ib2o = await ib2.ib2op(ic);
+        test(ib2o.equals(ic));
+        iao = await ic.ib2op(ib2);
+        test(iao.equals(ib2));
+        ib2o = await ic.ib2op(ib2);
+        test(ib2o.equals(ib2));
+        iao = await ic.ib2op(ic);
+        test(iao.equals(ic));
+        ib2o = await ic.ib2op(ic);
+        test(ib2o.equals(ic));
+
+        iao = await ic.icop(ic);
+        test(iao.equals(ic));
+        ib1o = await ic.icop(ic);
+        test(ib1o.equals(ic));
+        ib2o = await ic.icop(ic);
+        test(ib2o.equals(ic));
+        const ico = await ic.icop(ic);
+        test(ico.equals(ic));
+        out.writeLine("ok");
+
+        out.write("ditto, but for class implementing interfaces... ");
+        cao = await cd.caop(cd);
+        test(cao.equals(cd));
+        cbo = await cd.cbop(cd);
+        test(cbo.equals(cd));
+        cco = await cd.ccop(cd);
+        test(cco.equals(cd));
+
+        iao = await cd.iaop(cd);
+        test(iao.equals(cd));
+        ib1o = await cd.ib1op(cd);
+        test(ib1o.equals(cd));
+        ib2o = await cd.ib2op(cd);
+        test(ib2o.equals(cd));
+
+        cao = await cd.cdop(cd);
+        test(cao.equals(cd));
+        cbo = await cd.cdop(cd);
+        test(cbo.equals(cd));
+        cco = await cd.cdop(cd);
+        test(cco.equals(cd));
+
+        iao = await cd.cdop(cd);
+        test(iao.equals(cd));
+        ib1o = await cd.cdop(cd);
+        test(ib1o.equals(cd));
+        ib2o = await cd.cdop(cd);
+        test(ib2o.equals(cd));
+        out.writeLine("ok");
+
+        await initial.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/InitialI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/InitialI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/InitialI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/InitialI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,211 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+
+export class CAI extends Test.MA.CADisp
+{
+    caop(p:Test.MA.CAPrx, current:Ice.Current):Test.MA.CAPrx
+    {
+        return p;
+    }
+}
+
+export class CBI extends Test.MB.CBDisp
+{
+    caop(p:Test.MA.CAPrx, current:Ice.Current):Test.MA.CAPrx
+    {
+        return p;
+    }
+
+    cbop(p:Test.MB.CBPrx, current:Ice.Current):Test.MB.CBPrx
+    {
+        return p;
+    }
+}
+
+export class CCI extends Test.MA.CCDisp
+{
+    caop(p:Test.MA.CAPrx, current:Ice.Current):Test.MA.CAPrx
+    {
+        return p;
+    }
+
+    cbop(p:Test.MB.CBPrx, current:Ice.Current):Test.MB.CBPrx
+    {
+        return p;
+    }
+
+    ccop(p:Test.MA.CCPrx, current:Ice.Current):Test.MA.CCPrx
+    {
+        return p;
+    }
+}
+
+export class CDI extends Test.MA.CDDisp
+{
+    caop(p:Test.MA.CAPrx, current:Ice.Current)
+    {
+        return p;
+    }
+
+    ccop(p:Test.MA.CCPrx, current:Ice.Current):Test.MA.CCPrx
+    {
+        return p;
+    }
+
+    cdop(p:Test.MA.CDPrx, current:Ice.Current):Test.MA.CDPrx
+    {
+        return p;
+    }
+
+    iaop(p:Test.MA.IAPrx, current:Ice.Current):Test.MA.IAPrx
+    {
+        return p;
+    }
+
+    cbop(p:Test.MB.CBPrx, current:Ice.Current):Test.MB.CBPrx
+    {
+        return p;
+    }
+
+    ib1op(p:Test.MB.IB1Prx, current:Ice.Current):Test.MB.IB1Prx
+    {
+        return p;
+    }
+
+    ib2op(p:Test.MB.IB2Prx, current:Ice.Current):Test.MB.IB2Prx
+    {
+        return p;
+    }
+}
+
+export class IAI extends Test.MA.IA
+{
+    iaop(p:Test.MA.IAPrx, current:Ice.Current):Test.MA.IAPrx
+    {
+        return p;
+    }
+}
+
+export class IB1I extends Test.MB.IB1
+{
+    iaop(p:Test.MA.IAPrx, current:Ice.Current):Test.MA.IAPrx
+    {
+        return p;
+    }
+
+    ib1op(p:Test.MB.IB1Prx, current:Ice.Current):Test.MB.IB1Prx
+    {
+        return p;
+    }
+}
+
+export class IB2I extends Test.MB.IB2
+{
+    iaop(p:Test.MA.IAPrx, current:Ice.Current):Test.MA.IAPrx
+    {
+        return p;
+    }
+
+    ib2op(p:Test.MB.IB2Prx, current:Ice.Current):Test.MB.IB2Prx
+    {
+        return p;
+    }
+}
+
+export class ICI extends Test.MA.IC
+{
+    iaop(p:Test.MA.IAPrx, current:Ice.Current):Test.MA.IAPrx
+    {
+        return p;
+    }
+
+    icop(p:Test.MA.ICPrx, current:Ice.Current):Test.MA.ICPrx
+    {
+        return p;
+    }
+
+    ib1op(p:Test.MB.IB1Prx, current:Ice.Current):Test.MB.IB1Prx
+    {
+        return p;
+    }
+
+    ib2op(p:Test.MB.IB2Prx, current:Ice.Current):Test.MB.IB2Prx
+    {
+        return p;
+    }
+}
+
+export class InitialI extends Test.Initial
+{
+    constructor(adapter:Ice.ObjectAdapter, obj:Ice.ObjectPrx)
+    {
+        super();
+        const endpts = obj.ice_getEndpoints();
+        this._ca = Test.MA.CAPrx.uncheckedCast(adapter.addWithUUID(new CAI()).ice_endpoints(endpts));
+        this._cb = Test.MB.CBPrx.uncheckedCast(adapter.addWithUUID(new CBI()).ice_endpoints(endpts));
+        this._cc = Test.MA.CCPrx.uncheckedCast(adapter.addWithUUID(new CCI()).ice_endpoints(endpts));
+        this._cd = Test.MA.CDPrx.uncheckedCast(adapter.addWithUUID(new CDI()).ice_endpoints(endpts));
+        this._ia = Test.MA.IAPrx.uncheckedCast(adapter.addWithUUID(new IAI()).ice_endpoints(endpts));
+        this._ib1 = Test.MB.IB1Prx.uncheckedCast(adapter.addWithUUID(new IB1I()).ice_endpoints(endpts));
+        this._ib2 = Test.MB.IB2Prx.uncheckedCast(adapter.addWithUUID(new IB2I()).ice_endpoints(endpts));
+        this._ic = Test.MA.ICPrx.uncheckedCast(adapter.addWithUUID(new ICI()).ice_endpoints(endpts));
+    }
+
+    caop(current:Ice.Current):Test.MA.CAPrx
+    {
+        return this._ca;
+    }
+
+    cbop(current:Ice.Current):Test.MB.CBPrx
+    {
+        return this._cb;
+    }
+
+    ccop(current:Ice.Current):Test.MA.CCPrx
+    {
+        return this._cc;
+    }
+
+    cdop(current:Ice.Current):Test.MA.CDPrx
+    {
+        return this._cd;
+    }
+
+    iaop(current:Ice.Current):Test.MA.IAPrx
+    {
+        return this._ia;
+    }
+
+    ib1op(current:Ice.Current):Test.MB.IB1Prx
+    {
+        return this._ib1;
+    }
+
+    ib2op(current:Ice.Current):Test.MB.IB2Prx
+    {
+        return this._ib2;
+    }
+
+    icop(current:Ice.Current):Test.MA.ICPrx
+    {
+        return this._ic;
+    }
+
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    _ca:Test.MA.CAPrx;
+    _cb:Test.MB.CBPrx;
+    _cc:Test.MA.CCPrx;
+    _cd:Test.MA.CDPrx;
+    _ia:Test.MA.IAPrx;
+    _ib1:Test.MB.IB1Prx;
+    _ib2:Test.MB.IB2Prx;
+    _ic:Test.MA.ICPrx;
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/Server.ts zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/Server.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/Server.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/Server.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,41 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import {InitialI} from "./InitialI";
+
+export class Server extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            [communicator] = this.initialize(args);
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter:Ice.ObjectAdapter = await communicator.createObjectAdapter("");
+            const base:Ice.ObjectPrx = communicator.stringToProxy("initial:" + this.getTestEndpoint());
+            adapter.add(new InitialI(adapter, base), Ice.stringToIdentity("initial"));
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/inheritance/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,238 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["suppress-warning:deprecated", "js:es6-module"]] // For classes with operations
+
+module Test
+{
+
+module MA
+{
+
+interface IA
+{
+    IA* iaop(IA* p);
+}
+
+class CA
+{
+    CA* caop(CA* p);
+}
+
+}
+
+module MB
+{
+
+interface IB1 extends MA::IA
+{
+    IB1* ib1op(IB1* p);
+}
+
+interface IB2 extends MA::IA
+{
+    IB2* ib2op(IB2* p);
+}
+
+class CB extends MA::CA
+{
+    CB* cbop(CB* p);
+}
+
+}
+
+module MA
+{
+
+interface IC extends MB::IB1, MB::IB2
+{
+    IC* icop(IC* p);
+}
+
+class CC extends MB::CB
+{
+    CC* ccop(CC* p);
+}
+
+class CD extends CC implements MB::IB1, MB::IB2
+{
+    CD* cdop(CD* p);
+}
+
+}
+
+interface Initial
+{
+    void shutdown();
+    MA::CA* caop();
+    MB::CB* cbop();
+    MA::CC* ccop();
+    MA::CD* cdop();
+    MA::IA* iaop();
+    MB::IB1* ib1op();
+    MB::IB2* ib2op();
+    MA::IC* icop();
+}
+
+module MC
+{
+
+class A
+{
+    int aA;
+}
+
+class B extends A
+{
+    int bB;
+}
+
+class C extends B
+{
+    int cC;
+}
+
+class D extends C
+{
+    int dD;
+}
+
+}
+
+module MD
+{
+
+class A
+{
+    int aA;
+}
+
+class B extends A
+{
+    int bB;
+}
+
+class C extends B
+{
+    int cC;
+}
+
+class D extends C
+{
+    int dD;
+}
+
+}
+
+module ME
+{
+
+class A
+{
+    int aA;
+}
+
+class B extends A
+{
+    int bB;
+}
+
+class C extends B
+{
+    int cC;
+}
+
+class D extends C
+{
+    int dD;
+}
+
+}
+
+module MF
+{
+
+class A
+{
+    int aA;
+}
+
+class B extends A
+{
+    int bB;
+}
+
+class C extends B
+{
+    int cC;
+}
+
+class D extends C
+{
+    int dD;
+}
+
+}
+
+module MG
+{
+
+class A
+{
+    int aA;
+}
+
+class B extends A
+{
+    int bB;
+}
+
+class C extends B
+{
+    int cC;
+}
+
+class D extends C
+{
+    int dD;
+}
+
+}
+
+module MH
+{
+
+class A
+{
+    int aA;
+}
+
+class B extends A
+{
+    int bB;
+}
+
+class C extends B
+{
+    int cC;
+}
+
+class D extends C
+{
+    int dD;
+}
+
+}
+
+interface Echo
+{
+    void setConnection();
+    void startBatch();
+    void flushBatch();
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/location/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/location/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/location/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/location/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,513 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const communicator = this.communicator();
+        const out = this.getWriter();
+        let base = communicator.stringToProxy("ServerManager:" + this.getTestEndpoint());
+        const manager = Test.ServerManagerPrx.uncheckedCast(base);
+        test(manager !== null);
+
+        const locator = Test.TestLocatorPrx.uncheckedCast(communicator.getDefaultLocator());
+        test(locator !== null);
+
+        const registry = Test.TestLocatorRegistryPrx.uncheckedCast(await locator.getRegistry());
+        test(registry !== null);
+
+        out.write("testing stringToProxy... ");
+        base = communicator.stringToProxy("test @ TestAdapter");
+        const base2 = communicator.stringToProxy("test @ TestAdapter");
+        const base3 = communicator.stringToProxy("test");
+        const base4 = communicator.stringToProxy("ServerManager");
+        const base5 = communicator.stringToProxy("test2");
+        const base6 = communicator.stringToProxy("test @ ReplicatedAdapter");
+        out.writeLine("ok");
+
+        out.write("testing ice_locator and ice_getLocator... ");
+        test(Ice.proxyIdentityCompare(base.ice_getLocator(), communicator.getDefaultLocator()) === 0);
+        const anotherLocator = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("anotherLocator"));
+        base = base.ice_locator(anotherLocator);
+        test(Ice.proxyIdentityCompare(base.ice_getLocator(), anotherLocator) === 0);
+        communicator.setDefaultLocator(null);
+        base = communicator.stringToProxy("test @ TestAdapter");
+        test(base.ice_getLocator() === null);
+        base = base.ice_locator(anotherLocator);
+        test(Ice.proxyIdentityCompare(base.ice_getLocator(), anotherLocator) === 0);
+        communicator.setDefaultLocator(locator);
+        base = communicator.stringToProxy("test @ TestAdapter");
+        test(Ice.proxyIdentityCompare(base.ice_getLocator(), communicator.getDefaultLocator()) === 0);
+
+        //
+        // We also test ice_router/ice_getRouter (perhaps we should add a
+        // test/Ice/router test?)
+        //
+        test(base.ice_getRouter() === null);
+        const anotherRouter = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("anotherRouter"));
+        base = base.ice_router(anotherRouter);
+        test(Ice.proxyIdentityCompare(base.ice_getRouter(), anotherRouter) === 0);
+        const router = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("dummyrouter"));
+        communicator.setDefaultRouter(router);
+        base = communicator.stringToProxy("test @ TestAdapter");
+        test(Ice.proxyIdentityCompare(base.ice_getRouter(), communicator.getDefaultRouter()) === 0);
+        communicator.setDefaultRouter(null);
+        base = communicator.stringToProxy("test @ TestAdapter");
+        test(base.ice_getRouter() === null);
+        out.writeLine("ok");
+
+        out.write("starting server... ");
+        await manager.startServer();
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        let obj = await Test.TestIntfPrx.checkedCast(base);
+        test(obj !== null);
+
+        const obj2 = await Test.TestIntfPrx.checkedCast(base2);
+        test(obj2 !== null);
+
+        const obj3 = await Test.TestIntfPrx.checkedCast(base3);
+        test(obj3 !== null);
+
+        const obj4 = await Test.ServerManagerPrx.checkedCast(base4);
+        test(obj4 !== null);
+
+        const obj5 = await Test.TestIntfPrx.checkedCast(base5);
+        test(obj5 !== null);
+
+        const obj6 = await Test.TestIntfPrx.checkedCast(base6);
+        test(obj6 !== null);
+        out.writeLine("ok");
+
+        out.write("testing id@AdapterId indirect proxy... ");
+        await obj.shutdown();
+        await manager.startServer();
+        await obj2.ice_ping();
+        out.writeLine("ok");
+
+        out.write("testing id@ReplicaGroupId indirect proxy... ");
+        await obj.shutdown();
+        await manager.startServer();
+        await obj6.ice_ping();
+        out.writeLine("ok");
+
+        out.write("testing identity indirect proxy... ");
+        await obj.shutdown();
+        await manager.startServer();
+        await obj3.ice_ping();
+        await obj2.ice_ping();
+        await obj.shutdown();
+        await manager.startServer();
+        await obj2.ice_ping();
+        await obj3.ice_ping();
+        await obj.shutdown();
+        await manager.startServer();
+        await obj2.ice_ping();
+        await obj.shutdown();
+        await manager.startServer();
+        await obj3.ice_ping();
+        await obj.shutdown();
+        await manager.startServer();
+        await obj2.ice_ping();
+        await obj.shutdown();
+        await manager.startServer();
+        await obj5.ice_ping();
+        out.writeLine("ok");
+
+        out.write("testing proxy with unknown identity... ");
+        base = communicator.stringToProxy("unknown/unknown");
+        try
+        {
+            await base.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.NotRegisteredException, ex);
+            test(ex.kindOfObject == "object");
+            test(ex.id == "unknown/unknown");
+        }
+        out.writeLine("ok");
+
+        out.write("testing proxy with unknown adapter... ");
+        base = communicator.stringToProxy("test @ TestAdapterUnknown");
+        try
+        {
+            await base.ice_ping();
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.NotRegisteredException, ex);
+            test(ex.kindOfObject == "object adapter");
+            test(ex.id == "TestAdapterUnknown");
+        }
+        out.writeLine("ok");
+
+        out.write("testing locator cache timeout... ");
+        let count = await locator.getRequestCount();
+        const basencc = communicator.stringToProxy("test@TestAdapter").ice_connectionCached(false);
+        await basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+        test(++count == await locator.getRequestCount());
+        await basencc.ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+        test(++count == await locator.getRequestCount());
+        await basencc.ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+        test(count == await locator.getRequestCount());
+        await Ice.Promise.delay(1200); // 1200ms
+        await basencc.ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+        test(++count == await locator.getRequestCount());
+
+        await communicator.stringToProxy("test").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+        count += 2;
+        test(count == await locator.getRequestCount());
+        await communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
+        test(count == await locator.getRequestCount());
+        await Ice.Promise.delay(1200); // 1200ms
+        await communicator.stringToProxy("test").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout
+        count += 2;
+        test(count == await locator.getRequestCount());
+
+        await communicator.stringToProxy("test@TestAdapter").ice_locatorCacheTimeout(-1).ice_ping();
+        test(count == await locator.getRequestCount());
+        await communicator.stringToProxy("test").ice_locatorCacheTimeout(-1).ice_ping();
+        test(count == await locator.getRequestCount());
+        await communicator.stringToProxy("test@TestAdapter").ice_ping();
+        test(count == await locator.getRequestCount());
+        await communicator.stringToProxy("test").ice_ping();
+        test(count == await locator.getRequestCount());
+
+        test(communicator.stringToProxy("test").ice_locatorCacheTimeout(99).ice_getLocatorCacheTimeout() === 99);
+        out.writeLine("ok");
+
+        out.write("testing proxy from server... ");
+        obj = await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("test@TestAdapter"));
+        let hello = await obj.getHello();
+        test(hello.ice_getAdapterId() == "TestAdapter");
+        await hello.sayHello();
+        hello = await obj.getReplicatedHello();
+        test(hello.ice_getAdapterId() == "ReplicatedAdapter");
+        await hello.sayHello();
+        out.writeLine("ok");
+
+        out.write("testing locator request queuing... ");
+        hello = await obj.getReplicatedHello();
+        hello = hello.ice_locatorCacheTimeout(0).ice_connectionCached(false);
+        count = await locator.getRequestCount();
+        await hello.ice_ping();
+        test(++count == await locator.getRequestCount());
+
+        let results = [];
+        for(let i = 0; i < 1000; i++)
+        {
+            results.push(hello.sayHello().catch(
+                ex =>
+                    {
+                        test(false);
+                    }));
+        }
+        await Promise.all(results);
+
+        results = [];
+        test(await locator.getRequestCount() > count &&
+                await locator.getRequestCount() < count + 999);
+
+        if(await locator.getRequestCount() > count + 800)
+        {
+            out.write("queuing = " + (await locator.getRequestCount() - count));
+        }
+        count = await locator.getRequestCount();
+        hello = hello.ice_adapterId("unknown");
+        for(let i = 0; i < 1000; i++)
+        {
+            results.push(hello.sayHello().then(
+                () =>
+                    {
+                        test(false);
+                    },
+                ex =>
+                    {
+                        test(ex instanceof Ice.NotRegisteredException, ex);
+                    }));
+        }
+        await Promise.all(results);
+        results = [];
+        // XXX:
+        // Take into account the retries.
+        test(await locator.getRequestCount() > count && await locator.getRequestCount() < count + 1999);
+        if(await locator.getRequestCount() > count + 800)
+        {
+            out.write("queuing = " + (await locator.getRequestCount() - count));
+        }
+        out.writeLine("ok");
+
+        out.write("testing adapter locator cache... ");
+        try
+        {
+            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.NotRegisteredException, ex);
+            test(ex.kindOfObject == "object adapter");
+            test(ex.id == "TestAdapter3");
+        }
+        await registry.setAdapterDirectProxy("TestAdapter3", await locator.findAdapterById("TestAdapter"));
+        try
+        {
+            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+            await registry.setAdapterDirectProxy("TestAdapter3", communicator.stringToProxy("dummy:default"));
+            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        try
+        {
+            await communicator.stringToProxy("test@TestAdapter3").ice_locatorCacheTimeout(0).ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException, ex);
+        }
+        try
+        {
+            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException, ex);
+        }
+        await registry.setAdapterDirectProxy("TestAdapter3", await locator.findAdapterById("TestAdapter"));
+        try
+        {
+            await communicator.stringToProxy("test@TestAdapter3").ice_ping();
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        out.writeLine("ok");
+
+        out.write("testing well-known object locator cache... ");
+        await registry.addObject(communicator.stringToProxy("test3@TestUnknown"));
+        try
+        {
+            await communicator.stringToProxy("test3").ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.NotRegisteredException, ex);
+            test(ex.kindOfObject == "object adapter");
+            test(ex.id == "TestUnknown");
+        }
+        await registry.addObject(communicator.stringToProxy("test3@TestAdapter4")); // Update
+        await registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:default"));
+        try
+        {
+            await communicator.stringToProxy("test3").ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException, ex);
+        }
+
+        await registry.setAdapterDirectProxy("TestAdapter4", await locator.findAdapterById("TestAdapter"));
+        try
+        {
+            await communicator.stringToProxy("test3").ice_ping();
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        await registry.setAdapterDirectProxy("TestAdapter4", communicator.stringToProxy("dummy:default"));
+        try
+        {
+            await communicator.stringToProxy("test3").ice_ping();
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        try
+        {
+            await communicator.stringToProxy("test@TestAdapter4").ice_locatorCacheTimeout(0).ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException, ex);
+        }
+
+        try
+        {
+            await communicator.stringToProxy("test@TestAdapter4").ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException);
+        }
+
+        try
+        {
+            await communicator.stringToProxy("test3").ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException, ex);
+        }
+
+        await registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+        try
+        {
+            await communicator.stringToProxy("test3").ice_ping();
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        await registry.addObject(communicator.stringToProxy("test4"));
+        try
+        {
+            await communicator.stringToProxy("test4").ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.NoEndpointException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing locator cache background updates... ");
+        {
+            const initData = new Ice.InitializationData();
+            initData.properties = communicator.getProperties().clone();
+            initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1");
+            const ic = Ice.initialize(initData);
+
+            await registry.setAdapterDirectProxy("TestAdapter5", await locator.findAdapterById("TestAdapter"));
+            await registry.addObject(communicator.stringToProxy("test3@TestAdapter"));
+
+            count = await locator.getRequestCount();
+            await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+            await ic.stringToProxy("test3").ice_locatorCacheTimeout(0).ice_ping(); // No locator cache.
+            count += 3;
+            test(count == await locator.getRequestCount());
+            await registry.setAdapterDirectProxy("TestAdapter5", null);
+            await registry.addObject(communicator.stringToProxy("test3:default"));
+            await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+            await ic.stringToProxy("test3").ice_locatorCacheTimeout(10).ice_ping(); // 10s timeout.
+            test(count == await locator.getRequestCount());
+            await Ice.Promise.delay(1200);
+
+            // The following request should trigger the background
+            // updates but still use the cached endpoints and
+            // therefore succeed.
+            await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+            await ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+
+            try
+            {
+                while(true)
+                {
+                    await ic.stringToProxy("test@TestAdapter5").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                    await Ice.Promise.delay(10);
+                }
+            }
+            catch(ex)
+            {
+                // Expected to fail once they endpoints have been updated in the background.
+                test(ex instanceof Ice.LocalException, ex);
+            }
+            try
+            {
+                while(true)
+                {
+                    await ic.stringToProxy("test3").ice_locatorCacheTimeout(1).ice_ping(); // 1s timeout.
+                    await Ice.Promise.delay(10);
+                }
+            }
+            catch(ex)
+            {
+                // Expected to fail once they endpoints have been updated in the background.
+                test(ex instanceof Ice.LocalException, ex);
+            }
+            await ic.destroy();
+        }
+        out.writeLine("ok");
+
+        out.write("testing proxy from server after shutdown... ");
+        hello = await obj.getReplicatedHello();
+        await obj.shutdown();
+        await manager.startServer();
+        await hello.sayHello();
+        out.writeLine("ok");
+
+        out.write("testing object migration... ");
+        hello = await Test.HelloPrx.checkedCast(communicator.stringToProxy("hello"));
+        await obj.migrateHello();
+        const conn = await hello.ice_getConnection();
+        await conn.close(Ice.ConnectionClose.GracefullyWithWait);
+        await hello.sayHello();
+        await obj.migrateHello();
+        await hello.sayHello();
+        await obj.migrateHello();
+        await hello.sayHello();
+        out.writeLine("ok");
+
+        out.write("testing locator encoding resolution... ");
+        hello = await Test.HelloPrx.checkedCast(communicator.stringToProxy("hello"));
+        count = await locator.getRequestCount();
+        await communicator.stringToProxy("test@TestAdapter").ice_encodingVersion(Ice.Encoding_1_1).ice_ping();
+        test(count == await locator.getRequestCount());
+        await communicator.stringToProxy("test@TestAdapter10").ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+        test(++count == await locator.getRequestCount());
+        await communicator.stringToProxy("test -e 1.0@TestAdapter10-2").ice_ping();
+        test(++count == await locator.getRequestCount());
+        out.writeLine("ok");
+
+        out.write("shutdown server manager... ");
+        await manager.shutdown();
+        out.writeLine("ok");
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            let properties:Ice.Properties;
+            [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.Default.Locator", "locator:" + this.getTestEndpoint(properties));
+            [communicator] = this.initialize(properties);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/location/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/location/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/location/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,52 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Ice/Locator.ice>
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface TestLocatorRegistry extends ::Ice::LocatorRegistry
+{
+    //
+    // Allow remote addition of objects to the locator registry.
+    //
+    void addObject(Object* obj);
+}
+
+interface TestLocator extends ::Ice::Locator
+{
+    //
+    // Returns the number of request on the locator interface.
+    //
+    idempotent int getRequestCount();
+}
+
+interface ServerManager
+{
+    void startServer();
+    void shutdown();
+}
+
+interface Hello
+{
+    void sayHello();
+}
+
+interface TestIntf
+{
+    void shutdown();
+
+    Hello* getHello();
+
+    Hello* getReplicatedHello();
+
+    void migrateHello();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/number/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/number/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/number/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/number/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,86 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    run(args:string[])
+    {
+        const out = this.getWriter();
+        out.write("Testing Ice.Long... ");
+        //
+        // Test positive numbers
+        //
+        test(new Ice.Long(0x00000000, 0x00000000).toNumber() === 0); // 0
+        test(new Ice.Long(0x00000000, 0x00000001).toNumber() === 1); // 1
+        test(new Ice.Long(0x00000000, 0x00000400).toNumber() === 1024); // 1024
+        test(new Ice.Long(0x00000000, 0xFFFFFFFF).toNumber() === Math.pow(2, 32) - 1); // 2^32 - 1
+        test(new Ice.Long(0x00000001, 0x00000000).toNumber() === Math.pow(2, 32)); // 2^32
+        test(new Ice.Long(0x00000001, 0xFFFFFFFF).toNumber() === Math.pow(2, 33) - 1); // 2^33 - 1
+        test(new Ice.Long(0x001FFFFF, 0xFFFFFFFF).toNumber() === Math.pow(2, 53) - 1); // 2^53 - 1
+        test(new Ice.Long(0x00200000, 0x00000000).toNumber() === Number.POSITIVE_INFINITY); // 2^53
+
+        //
+        // Test negative numbers
+        //
+        test(new Ice.Long(0xFFFFFFFF, 0xFFFFFFFF).toNumber() === -1);
+        test(new Ice.Long(0xFFFFFFFF, 0xFFFFFFFE).toNumber() === -2);
+        test(new Ice.Long(0xFFFFFFFF, 0xFFFFFF9C).toNumber() === -100);
+
+        test(new Ice.Long(0xFFFFFFFF, 0x00000000).toNumber() === -Math.pow(2, 32)); // -(2^32)
+        test(new Ice.Long(0xFFFFFFFE, 0x00000000).toNumber() === -Math.pow(2, 33)); // -(2^33)
+        test(new Ice.Long(0xFFFFFFFE, 0x00000001).toNumber() === -(Math.pow(2, 33) - 1)); // -(2^33 - 1)
+        test(new Ice.Long(0xFFF00000, 0x00000000).toNumber() === -Math.pow(2, 52)); // -(2^52)
+        test(new Ice.Long(0xFFF00000, 0x00000001).toNumber() === -(Math.pow(2, 52) - 1)); // -(2^52 - 1)
+        test(new Ice.Long(0xFFE00000, 0x00000001).toNumber() === -(Math.pow(2, 53) - 1)); // -(2^53 - 1)
+        test(new Ice.Long(0xFFE00000, 0x00000000).toNumber() === Number.NEGATIVE_INFINITY); // -(2^53)
+
+        //
+        // Test conversion from positive number
+        //
+        test(new Ice.Long(0).toNumber() === 0); // 0
+        test(new Ice.Long(1).toNumber() === 1); // 1
+        test(new Ice.Long(1024).toNumber() === 1024); // 1024
+        test(new Ice.Long(Math.pow(2, 32) - 1).toNumber() === Math.pow(2, 32) - 1); // 2^32 - 1
+        test(new Ice.Long(Math.pow(2, 32)).toNumber() === Math.pow(2, 32)); // 2^32
+        test(new Ice.Long(Math.pow(2, 33) - 1).toNumber() === Math.pow(2, 33) - 1); // 2^33 - 1
+        test(new Ice.Long(Math.pow(2, 53) - 1).toNumber() === Math.pow(2, 53) - 1); // 2^53 - 1
+
+        test(Ice.LongHelper.validate(new Ice.Long(0))); // 0
+        test(Ice.LongHelper.validate(new Ice.Long(1))); // 1
+        test(Ice.LongHelper.validate(new Ice.Long(1024))); // 1024
+        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 32) - 1))); // 2^32 - 1
+        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 32)))); // 2^32
+        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 33) - 1))); // 2^33 - 1
+        test(Ice.LongHelper.validate(new Ice.Long(Math.pow(2, 53) - 1))); // 2^53 - 1
+
+        //
+        // Test conversion from negative number
+        //
+        test(new Ice.Long(-1).toNumber() === -1);
+        test(new Ice.Long(-2).toNumber() === -2);
+        test(new Ice.Long(-100).toNumber() === -100);
+
+        test(new Ice.Long(-Math.pow(2, 32)).toNumber() === -Math.pow(2, 32)); // -(2^32)
+        test(new Ice.Long(-Math.pow(2, 33)).toNumber() === -Math.pow(2, 33)); // -(2^33)
+        test(new Ice.Long(-Math.pow(2, 33) - 1).toNumber() === -Math.pow(2, 33) - 1); // -(2^33 - 1)
+        test(new Ice.Long(-Math.pow(2, 52)).toNumber() === -Math.pow(2, 52)); // -(2^52)
+        test(new Ice.Long(-Math.pow(2, 52) - 1).toNumber() === -Math.pow(2, 52) - 1); // -(2^52 - 1)
+
+        test(Ice.LongHelper.validate(new Ice.Long(-1)));
+        test(Ice.LongHelper.validate(new Ice.Long(-2)));
+        test(Ice.LongHelper.validate(new Ice.Long(-100)));
+        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 32)))); // -(2^32)
+        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 33)))); // -(2^33)
+        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 33) - 1))); // -(2^33 - 1)
+        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 52)))); // -(2^52)
+        test(Ice.LongHelper.validate(new Ice.Long(-Math.pow(2, 52) - 1))); // -(2^52 - 1)
+
+        out.writeLine("ok");
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/objects/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/objects/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/objects/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/objects/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,475 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class BI extends Test.B
+{
+    ice_preMarshal():void
+    {
+        this.preMarshalInvoked = true;
+    }
+
+    ice_postUnmarshal():void
+    {
+        this.postUnmarshalInvoked = true;
+    }
+}
+
+export class CI extends Test.C
+{
+    ice_preMarshal():void
+    {
+        this.preMarshalInvoked = true;
+    }
+
+    ice_postUnmarshal():void
+    {
+        this.postUnmarshalInvoked = true;
+    }
+}
+
+export class DI extends Test.D
+{
+    ice_preMarshal():void
+    {
+        this.preMarshalInvoked = true;
+    }
+
+    ice_postUnmarshal():void
+    {
+        this.postUnmarshalInvoked = true;
+    }
+}
+
+export class EI extends Test.E
+{
+    constructor()
+    {
+        super(1, "hello");
+    }
+
+    checkValues():boolean
+    {
+        return this.i == 1 && this.s == "hello";
+    }
+}
+
+class FI extends Test.F
+{
+    constructor(e?:Test.E)
+    {
+        super(e, e);
+    }
+
+    checkValues():boolean
+    {
+        return this.e1 !== null && this.e1 === this.e2;
+    }
+}
+
+class HI extends Test.H
+{
+}
+
+class II extends Ice.InterfaceByValue
+{
+    constructor()
+    {
+        super(Test.I.ice_staticId());
+    }
+}
+
+class JI extends Ice.InterfaceByValue
+{
+    constructor()
+    {
+        super(Test.J.ice_staticId());
+    }
+}
+
+function MyValueFactory(type:string):Ice.Value
+{
+    switch(type)
+    {
+        case "::Test::B":
+            return new BI();
+        case "::Test::C":
+            return new CI();
+        case "::Test::D":
+            return new DI();
+        case "::Test::E":
+            return new EI();
+        case "::Test::F":
+            return new FI();
+        case "::Test::I":
+            return new II();
+        case "::Test::J":
+            return new JI();
+        case "::Test::H":
+            return new HI();
+        case "::Test::Inner::A":
+            return new Test.Inner.A();
+        case "::Test::Inner::Sub::A":
+            return new Test.Inner.Sub.A();
+        default:
+            break;
+    }
+    return null;
+}
+
+class MyObjectFactory implements Ice.ObjectFactory
+{
+
+    create(type:string):Ice.Value
+    {
+        return null;
+    }
+
+    destroy()
+    {
+    }
+}
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::B");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::C");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::D");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::E");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::F");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::H");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::A");
+        communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::Sub::A");
+
+        communicator.addObjectFactory(new MyObjectFactory(), "TestOF");
+
+        out.write("testing stringToProxy... ");
+        let ref = "initial:" + this.getTestEndpoint();
+        let base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const initial = await Test.InitialPrx.checkedCast(base);
+        test(initial !== null);
+        test(initial.equals(base));
+        out.writeLine("ok");
+
+        out.write("getting B1... ");
+        let b1 = await initial.getB1();
+        test(b1 !== null);
+        out.writeLine("ok");
+
+        out.write("getting B2... ");
+        let b2 = await initial.getB2();
+        test(b2 !== null);
+        out.writeLine("ok");
+
+        out.write("getting C... ");
+        let c = await initial.getC();
+        test(c !== null);
+        out.writeLine("ok");
+
+        out.write("getting D... ");
+        let d = await initial.getD();
+        test(d !== null);
+        out.writeLine("ok");
+
+        out.write("checking consistency... ");
+        test(b1 !== b2);
+
+        test(b1.theB === b1);
+        test(b1.theC === null);
+        test(b1.theA instanceof Test.B);
+        test((b1.theA as Test.B).theA === b1.theA);
+        test(b1.theA.theB === b1);
+        test(b1.theA.theC instanceof Test.C);
+        test(b1.theA.theC.theB === b1.theA);
+
+        test(b1.preMarshalInvoked);
+        test(b1.postUnmarshalInvoked);
+        test(b1.theA.preMarshalInvoked);
+        test(b1.theA.postUnmarshalInvoked);
+        test(b1.theA.theC.preMarshalInvoked);
+        test(b1.theA.theC.postUnmarshalInvoked);
+
+        // More tests possible for b2 and d, but I think this is already
+        // sufficient.
+        test(b2.theA === b2);
+        test(d.theC === null);
+        out.writeLine("ok");
+        out.write("getting B1, B2, C, and D all at once... ");
+
+        [b1, b2, c, d] = await initial.getAll();
+
+        test(b1 !== null);
+        test(b2 !== null);
+        test(c !== null);
+        test(d !== null);
+        out.writeLine("ok");
+
+        out.write("checking consistency... ");
+        test(b1 !== b2);
+        test(b1.theA === b2);
+        test(b1.theB === b1);
+        test(b1.theC === null);
+        test(b2.theA === b2);
+        test(b2.theB === b1);
+        test(b2.theC === c);
+        test(c.theB === b2);
+        test(d.theA === b1);
+        test(d.theB === b2);
+        test(d.theC === null);
+        test(d.preMarshalInvoked);
+        test(d.postUnmarshalInvoked);
+        test(d.theA.preMarshalInvoked);
+        test(d.theA.postUnmarshalInvoked);
+        test(d.theB.preMarshalInvoked);
+        test(d.theB.postUnmarshalInvoked);
+        test(d.theB.theC.preMarshalInvoked);
+        test(d.theB.theC.postUnmarshalInvoked);
+        out.writeLine("ok");
+
+        out.write("testing protected members... ");
+        const e = await initial.getE() as EI;
+        test(e.checkValues());
+
+        const f = await initial.getF() as FI;
+        test(f.checkValues());
+        test((f.e2 as EI).checkValues());
+        out.writeLine("ok");
+
+        out.write("getting I, J and H... ");
+        const i = await initial.getI();
+        test(i !== null);
+        const j = await initial.getJ();
+        test(j !== null);
+        const h = await initial.getH();
+        test(h !== null);
+        out.writeLine("ok");
+
+        out.write("getting K...");
+        const k = await initial.getK();
+        test(k !== null);
+        test((k.value as Test.L).data == "l");
+        out.writeLine("ok");
+
+        out.write("test Value as parameter...");
+        {
+            {
+                let [v1, v2] = await initial.opValue(new Test.L("l"));
+                test((v1 as Test.L).data == "l");
+                test((v2 as Test.L).data == "l");
+            }
+
+            {
+                let [v1, v2] = await initial.opValueSeq([new Test.L("l")]);
+                test((v1[0] as Test.L).data == "l");
+                test((v2[0] as Test.L).data == "l");
+            }
+
+            {
+                let [v1, v2] = await initial.opValueMap(new Map([["l", new Test.L("l")]]));
+                test((v1.get("l") as Test.L).data == "l");
+                test((v2.get("l") as Test.L).data == "l");
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("getting D1... ");
+        const d1 = await initial.getD1(new Test.D1(new Test.A1("a1"),
+                                                    new Test.A1("a2"),
+                                                    new Test.A1("a3"),
+                                                    new Test.A1("a4")));
+
+        test(d1.a1.name == "a1");
+        test(d1.a2.name == "a2");
+        test(d1.a3.name == "a3");
+        test(d1.a4.name == "a4");
+        out.writeLine("ok");
+
+        out.write("throw EDerived... ");
+        try
+        {
+            await initial.throwEDerived();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.EDerived, ex);
+            test(ex.a1.name == "a1");
+            test(ex.a2.name == "a2");
+            test(ex.a3.name == "a3");
+            test(ex.a4.name == "a4");
+        }
+        out.writeLine("ok");
+
+        out.write("setting G... ");
+        try
+        {
+            await initial.setG(new Test.G(new Test.S("hello"), "g"));
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.OperationNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("setting I... ");
+        await initial.setI(i);
+        await initial.setI(j);
+        await initial.setI(h);
+        out.writeLine("ok");
+
+        out.write("testing sequences... ");
+        let [retS, outS] = await initial.opBaseSeq([]);
+        [retS, outS] = await initial.opBaseSeq([new Test.Base(new Test.S(), "")]);
+        test(retS.length === 1 && outS.length === 1);
+        out.writeLine("ok");
+
+        out.write("testing recursive types... ");
+
+        const top = new Test.Recursive();
+        let p = top;
+        let depth = 0;
+
+        try
+        {
+            for(; depth <= 1000; ++depth)
+            {
+                p.v = new Test.Recursive();
+                p = p.v;
+                if((depth < 10 && (depth % 10) == 0) ||
+                    (depth < 1000 && (depth % 100) == 0) ||
+                    (depth < 10000 && (depth % 1000) == 0) ||
+                    (depth % 10000) == 0)
+                {
+                    await initial.setRecursive(top);
+                }
+            }
+            test(!(await initial.supportsClassGraphDepthMax()));
+        }
+        catch(ex)
+        {
+            //
+            // Ice.UnknownLocalException: Expected marshal exception from the server (max class graph depth reached)
+            // Ice.UnknownException: Expected stack overflow from the server (Java only)
+            // Error: Expected, JavaScript stack overflow
+            //
+            test((ex instanceof Ice.UnknownLocalException) ||
+                    (ex instanceof Ice.UnknownException) ||
+                    (ex instanceof Error), ex);
+        }
+        await initial.setRecursive(new Test.Recursive());
+        out.writeLine("ok");
+
+        out.write("testing compact ID... ");
+        test(await initial.getCompact() !== null);
+        out.writeLine("ok");
+
+        out.write("testing marshaled results...");
+        b1 = await initial.getMB();
+        test(b1 !== null && b1.theB === b1);
+        b1 = await initial.getAMDMB();
+        test(b1 !== null && b1.theB === b1);
+        out.writeLine("ok");
+
+        out.write("testing UnexpectedObjectException... ");
+        ref = "uoet:" + this.getTestEndpoint();
+        base = communicator.stringToProxy(ref);
+        test(base !== null);
+
+        const uoet = Test.UnexpectedObjectExceptionTestPrx.uncheckedCast(base);
+        test(uoet !== null);
+        try
+        {
+            await uoet.op();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.UnexpectedObjectException, ex);
+            test(ex.type == "::Test::AlsoEmpty");
+            test(ex.expectedType == "::Test::Empty");
+        }
+        out.writeLine("ok");
+
+        out.write("testing inner modules... ");
+        {
+            let innerA = await initial.getInnerA();
+            test(innerA instanceof Test.Inner.A);
+            test(innerA.theA instanceof Test.B);
+        }
+
+        {
+            let innerA = await initial.getInnerSubA();
+            test(innerA instanceof Test.Inner.Sub.A);
+            test(innerA.theA instanceof Test.Inner.A);
+        }
+
+        try
+        {
+            await initial.throwInnerEx();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.Inner.Ex, ex);
+            test(ex.reason == "Inner::Ex");
+        }
+
+        try
+        {
+            await initial.throwInnerSubEx();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.Inner.Sub.Ex, ex);
+            test(ex.reason == "Inner::Sub::Ex");
+        }
+        out.writeLine("ok");
+
+        out.write("testing getting ObjectFactory... ");
+        test(communicator.findObjectFactory("TestOF") !== null);
+        out.writeLine("ok");
+
+        out.write("testing getting ObjectFactory as ValueFactory... ");
+        test(communicator.getValueFactoryManager().find("TestOF") !== null);
+        out.writeLine("ok");
+
+        await initial.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.Warn.Connections", "0");
+            [communicator] = this.initialize(properties);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/objects/InitialI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/objects/InitialI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/objects/InitialI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/objects/InitialI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,329 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated"
+
+export class BI extends Test.B
+{
+    ice_preMarshal():void
+    {
+        this.preMarshalInvoked = true;
+    }
+
+    ice_postUnmarshal():void
+    {
+        this.postUnmarshalInvoked = true;
+    }
+}
+
+export class CI extends Test.C
+{
+    ice_preMarshal():void
+    {
+        this.preMarshalInvoked = true;
+    }
+
+    ice_postUnmarshal():void
+    {
+        this.postUnmarshalInvoked = true;
+    }
+}
+
+export class DI extends Test.D
+{
+    ice_preMarshal():void
+    {
+        this.preMarshalInvoked = true;
+    }
+
+    ice_postUnmarshal():void
+    {
+        this.postUnmarshalInvoked = true;
+    }
+}
+
+export class EI extends Test.E
+{
+    constructor()
+    {
+        super(1, "hello");
+    }
+
+    checkValues():boolean
+    {
+        return this.i == 1 && this.s == "hello";
+    }
+}
+
+export class FI extends Test.F
+{
+    constructor(e?:Test.E)
+    {
+        super(e, e);
+    }
+
+    checkValues():boolean
+    {
+        return this.e1 !== null && this.e1 === this.e2;
+    }
+}
+
+export class HI extends Test.H
+{
+}
+
+export class II extends Ice.InterfaceByValue
+{
+    constructor()
+    {
+        super(Test.I.ice_staticId());
+    }
+}
+
+export class JI extends Ice.InterfaceByValue
+{
+    constructor()
+    {
+        super(Test.J.ice_staticId());
+    }
+}
+
+export function MyValueFactory(type:string):Ice.Value
+{
+    switch(type)
+    {
+        case "::Test::B":
+            return new BI();
+        case "::Test::C":
+            return new CI();
+        case "::Test::D":
+            return new DI();
+        case "::Test::E":
+            return new EI();
+        case "::Test::F":
+            return new FI();
+        case "::Test::I":
+            return new II();
+        case "::Test::J":
+            return new JI();
+        case "::Test::H":
+            return new HI();
+        case "::Test::Inner::A":
+            return new Test.Inner.A();
+        case "::Test::Inner::Sub::A":
+            return new Test.Inner.Sub.A();
+        default:
+            break;
+    }
+    return null;
+}
+
+export class InitialI extends Test.Initial
+{
+    constructor(communicator:Ice.Communicator)
+    {
+        super();
+        if(communicator !== undefined)
+        {
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::B");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::C");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::D");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::E");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::F");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::I");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::J");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::H");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::A");
+            communicator.getValueFactoryManager().add(MyValueFactory, "::Test::Inner::Sub::A");
+        }
+
+        this._b1 = new BI();
+        this._b2 = new BI();
+        this._c = new CI();
+        this._d = new DI();
+        this._e = new EI();
+        this._f = new FI(this._e);
+
+        this._b1.theA = this._b2; // Cyclic reference to another B
+        this._b1.theB = this._b1; // Self reference.
+        this._b1.theC = null; // Null reference.
+
+        this._b2.theA = this._b2; // Self reference, using base.
+        this._b2.theB = this._b1; // Cyclic reference to another B
+        this._b2.theC = this._c; // Cyclic reference to a C.
+
+        this._c.theB = this._b2; // Cyclic reference to a B.
+
+        this._d.theA = this._b1; // Reference to a B.
+        this._d.theB = this._b2; // Reference to a B.
+        this._d.theC = null; // Reference to a C.
+    }
+
+    getAll(current:Ice.Current):[Test.B, Test.B, Test.C, Test.D]
+    {
+        this._b1.preMarshalInvoked = false;
+        this._b2.preMarshalInvoked = false;
+        this._c.preMarshalInvoked = false;
+        this._d.preMarshalInvoked = false;
+        return [this._b1, this._b2, this._c, this._d];
+    }
+
+    getB1(current:Ice.Current):Test.B
+    {
+        this._b1.preMarshalInvoked = false;
+        this._b2.preMarshalInvoked = false;
+        this._c.preMarshalInvoked = false;
+        return this._b1;
+    }
+
+    getB2(current:Ice.Current):Test.B
+    {
+        this._b1.preMarshalInvoked = false;
+        this._b2.preMarshalInvoked = false;
+        this._c.preMarshalInvoked = false;
+        return this._b2;
+    }
+
+    getC(current:Ice.Current):Test.C
+    {
+        this._b1.preMarshalInvoked = false;
+        this._b2.preMarshalInvoked = false;
+        this._c.preMarshalInvoked = false;
+        return this._c;
+    }
+
+    getD(current:Ice.Current):Test.D
+    {
+        this._b1.preMarshalInvoked = false;
+        this._b2.preMarshalInvoked = false;
+        this._c.preMarshalInvoked = false;
+        this._d.preMarshalInvoked = false;
+        return this._d;
+    }
+
+    getE(current:Ice.Current):Test.E
+    {
+        return this._e;
+    }
+
+    getF(current:Ice.Current):Test.F
+    {
+        return this._f;
+    }
+
+    setRecursive(r:Test.Recursive, current:Ice.Current):void
+    {
+    }
+
+    supportsClassGraphDepthMax(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    getMB(current:Ice.Current):Test.B
+    {
+        return this._b1;
+    }
+
+    getAMDMB(current:Ice.Current):PromiseLike<Test.B>
+    {
+        return Promise.resolve(this._b1);
+    }
+
+    getI(current:Ice.Current):Ice.Value
+    {
+        return new II();
+    }
+
+    getJ(current:Ice.Current):Ice.Value
+    {
+        return new JI();
+    }
+
+    getH(current:Ice.Current):Ice.Value
+    {
+        return new HI();
+    }
+
+    getK(current:Ice.Current)
+    {
+        return new Test.K(new Test.L("l"));
+    }
+
+    opValue(v1:Ice.Value, current:Ice.Current):[Ice.Value, Ice.Value]
+    {
+        return [v1, v1];
+    }
+
+    opValueSeq(v1:Ice.Value[], current:Ice.Current):[Ice.Value[], Ice.Value[]]
+    {
+        return [v1, v1];
+    }
+
+    opValueMap(v1:Map<string, Ice.Value>, current:Ice.Current):[Map<string, Ice.Value>, Map<string, Ice.Value>]
+    {
+        return [v1, v1];
+    }
+
+    getD1(d1:Test.D1, current:Ice.Current):Test.D1
+    {
+        return d1;
+    }
+
+    throwEDerived(current:Ice.Current)
+    {
+        throw new Test.EDerived(new Test.A1("a1"), new Test.A1("a2"), new Test.A1("a3"), new Test.A1("a4"));
+    }
+
+    setG(theG:Test.G, current:Ice.Current):void
+    {
+    }
+
+    setI(theI:Ice.Value, current:Ice.Current):void
+    {
+    }
+
+    opBaseSeq(inS:Test.BaseSeq, current:Ice.Current):[Test.BaseSeq, Test.BaseSeq]
+    {
+        return [inS, inS];
+    }
+
+    getCompact(current:Ice.Current):Test.Compact
+    {
+        return new Test.CompactExt();
+    }
+
+    getInnerA(current:Ice.Current):Test.Inner.A
+    {
+        return new Test.Inner.A(this._b1);
+    }
+
+    getInnerSubA(current:Ice.Current):Test.Inner.Sub.A
+    {
+        return new Test.Inner.Sub.A(new Test.Inner.A(this._b1));
+    }
+
+    throwInnerEx(current:Ice.Current):void
+    {
+        throw new Test.Inner.Ex("Inner::Ex");
+    }
+
+    throwInnerSubEx(current:Ice.Current):void
+    {
+        throw new Test.Inner.Sub.Ex("Inner::Sub::Ex");
+    }
+
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    _b1:BI;
+    _b2:BI;
+    _c:CI;
+    _d:DI;
+    _e:EI;
+    _f:FI;
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/objects/Server.ts zeroc-ice-3.7.2/js/test/typescript/Ice/objects/Server.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/objects/Server.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/objects/Server.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,54 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import {InitialI} from "./InitialI";
+
+const test = TestHelper.test;
+
+class UnexpectedObjectExceptionTestI extends Test.UnexpectedObjectExceptionTest
+{
+    op(current:Ice.Current):Test.Empty
+    {
+        return new Test.AlsoEmpty();
+    }
+}
+
+export class Server extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.Warn.Dispatch", "0");
+            properties.setProperty("Ice.Warn.Connections", "0");
+            [communicator] = this.initialize(properties);
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new InitialI(communicator), Ice.stringToIdentity("initial"));
+            adapter.add(new UnexpectedObjectExceptionTestI(), Ice.stringToIdentity("uoet"));
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/objects/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/objects/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,291 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["suppress-warning:deprecated", "js:es6-module"]] // For classes with operations
+
+module Test
+{
+
+struct S
+{
+    string str;
+}
+
+class Base
+{
+    S theS;
+    string str;
+}
+
+class AbstractBase extends Base
+{
+    void op();
+}
+
+class B;
+class C;
+
+class A
+{
+    B theB;
+    C theC;
+
+    bool preMarshalInvoked;
+    bool postUnmarshalInvoked;
+}
+
+class B extends A
+{
+    A theA;
+}
+
+class C
+{
+    B theB;
+
+    bool preMarshalInvoked;
+    bool postUnmarshalInvoked;
+}
+
+class D
+{
+    A theA;
+    B theB;
+    C theC;
+
+    bool preMarshalInvoked;
+    bool postUnmarshalInvoked;
+}
+
+["protected"] class E
+{
+    int i;
+    string s;
+}
+
+class F
+{
+    ["protected"] E e1;
+    E e2;
+}
+
+// Exercise empty class with non-empty base
+class G extends Base
+{
+}
+
+interface I
+{
+    void doI();
+}
+
+interface J extends I
+{
+    void doJ();
+}
+
+class H implements I
+{
+    void doH();
+    void doH2();
+}
+
+sequence<Base> BaseSeq;
+
+class CompactExt;
+
+class Compact(1)
+{
+}
+
+const int CompactExtId = 789;
+
+class CompactExt(CompactExtId) extends Compact
+{
+}
+
+class A1
+{
+    string name;
+}
+
+class B1
+{
+    A1 a1;
+    A1 a2;
+}
+
+class D1 extends B1
+{
+    A1 a3;
+    A1 a4;
+}
+
+exception EBase
+{
+    A1 a1;
+    A1 a2;
+}
+
+exception EDerived extends EBase
+{
+    A1 a3;
+    A1 a4;
+}
+
+module Inner
+{
+
+class A
+{
+    ::Test::A theA;
+}
+
+exception Ex
+{
+    string reason;
+}
+
+module Sub
+{
+
+class A
+{
+    ::Test::Inner::A theA;
+}
+
+exception Ex
+{
+    string reason;
+}
+
+}
+
+}
+
+class Recursive
+{
+    Recursive v;
+}
+
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+interface Initial
+{
+    void shutdown();
+    B getB1();
+    B getB2();
+    C getC();
+    D getD();
+    E getE();
+    F getF();
+
+    void setRecursive(Recursive p);
+    bool supportsClassGraphDepthMax();
+
+    ["marshaled-result"] B getMB();
+    ["amd", "marshaled-result"] B getAMDMB();
+
+    void getAll(out B b1, out B b2, out C theC, out D theD);
+
+    I getH();
+    I getI();
+    I getJ();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
+
+    D1 getD1(D1 d1);
+    void throwEDerived() throws EDerived;
+
+    void setG(G theG);
+    void setI(I theI);
+
+    BaseSeq opBaseSeq(BaseSeq inSeq, out BaseSeq outSeq);
+
+    Compact getCompact();
+
+    Inner::A getInnerA();
+    Inner::Sub::A getInnerSubA();
+
+    void throwInnerEx() throws Inner::Ex;
+    void throwInnerSubEx() throws Inner::Sub::Ex;
+}
+
+class Empty
+{
+}
+
+class AlsoEmpty
+{
+}
+
+interface UnexpectedObjectExceptionTest
+{
+    Empty op();
+}
+
+//
+// Remaining definitions are here to ensure that the generated code compiles.
+//
+
+class COneMember
+{
+    Empty e;
+}
+
+class CTwoMembers
+{
+    Empty e1;
+    Empty e2;
+}
+
+exception EOneMember
+{
+    Empty e;
+}
+
+exception ETwoMembers
+{
+    Empty e1;
+    Empty e2;
+}
+
+struct SOneMember
+{
+    Empty e;
+}
+
+struct STwoMembers
+{
+    Empty e1;
+    Empty e2;
+}
+
+dictionary<int, COneMember> DOneMember;
+dictionary<int, CTwoMembers> DTwoMembers;
+
+interface Echo
+{
+    void setConnection();
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,533 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class AMDMyDerivedClassI extends Test.MyDerivedClass
+{
+    //
+    // Override the Object "pseudo" operations to verify the operation mode.
+    //
+    constructor(endpoints:Ice.Endpoint[])
+    {
+        super();
+        this._opByteSOnewayCount = 0;
+        this._endpoints = endpoints;
+    }
+
+    ice_isA(id:string, current:Ice.Current):boolean
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        return Ice.Object.prototype.ice_isA.call(this, id, current);
+    }
+
+    ice_ping(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        Ice.Object.prototype.ice_ping.call(this, current);
+    }
+
+    ice_ids(current:Ice.Current):Ice.StringSeq
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        return Ice.Object.prototype.ice_ids.call(this, current);
+    }
+
+    ice_id(current:Ice.Current):string
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        return Ice.Object.prototype.ice_id.call(this, current);
+    }
+
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    supportsCompress(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    opVoid(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Normal);
+    }
+
+    opBool(p1:boolean, p2:boolean, current:Ice.Current):[boolean, boolean]
+    {
+        return [p2, p1];
+    }
+
+    opBoolS(p1:Test.BoolS, p2:Test.BoolS, current:Ice.Current):[Test.BoolS, Test.BoolS]
+    {
+        const p3 = p1.concat(p2);
+        return [p1.reverse(), p3];
+    }
+
+    opBoolSS(p1:Test.BoolSS, p2:Test.BoolSS, current:Ice.Current):[Test.BoolSS, Test.BoolSS]
+    {
+        const p3 = p1.concat(p2);
+        return [p1.reverse(), p3];
+    }
+
+    opByte(p1:number, p2:number, current:Ice.Current):[number, number]
+    {
+        return [p1, (p1 ^ p2) & 0xff];
+    }
+
+    opByteBoolD(p1:Test.ByteBoolD, p2:Test.ByteBoolD, current:Ice.Current):[Test.ByteBoolD, Test.ByteBoolD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opByteS(p1:Test.ByteS, p2:Test.ByteS, current:Ice.Current):[Test.ByteS, Test.ByteS]
+    {
+        const p3 = new Uint8Array(p1.length);
+        for(let i = 0; i < p1.length; i++)
+        {
+            p3[i] = p1[p1.length - (i + 1)];
+        }
+
+        const r = new Uint8Array(p1.length + p2.length);
+        for(let i = 0; i < p1.length; ++i)
+        {
+            r[i] = p1[i];
+        }
+        for(let i = 0; i < p2.length; ++i)
+        {
+            r[i + p1.length] = p2[i];
+        }
+        return [r, p3];
+    }
+
+    opByteSS(p1:Test.ByteSS, p2:Test.ByteSS, current:Ice.Current):[Test.ByteSS, Test.ByteSS]
+    {
+        const r = p1.concat(p2);
+        return [r, p1.reverse()];
+    }
+
+    opFloatDouble(p1:number, p2:number, current:Ice.Current):[number, number, number]
+    {
+        return [p2, p1, p2];
+    }
+
+    opFloatDoubleS(p1:Test.FloatS, p2:Test.DoubleS, current:Ice.Current):
+        [Test.DoubleS, Test.FloatS, Test.DoubleS]
+    {
+        const r = p2.concat(p1);
+        const p4 = p2.reverse();
+        return [r, p1, p4];
+    }
+
+    opFloatDoubleSS(p1:Test.FloatSS, p2:Test.DoubleSS, current:Ice.Current):
+        [Test.DoubleSS, Test.FloatSS, Test.DoubleSS]
+    {
+        const r = p2.concat(p2);
+        const p4 = p2.reverse();
+        return [r, p1, p4];
+    }
+
+    opLongFloatD(p1:Test.LongFloatD, p2:Test.LongFloatD, current:Ice.Current):[Test.LongFloatD, Test.LongFloatD]
+    {
+        const r = new Ice.HashMap(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opMyClass(p1:Test.MyClassPrx, current:Ice.Current):[Test.MyClassPrx, Test.MyClassPrx, Test.MyClassPrx]
+    {
+        const p2 = p1;
+        const p3 = Test.MyClassPrx.uncheckedCast(
+            current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity")));
+        const r = Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id));
+        return [r.ice_endpoints(this._endpoints), p2, p3.ice_endpoints(this._endpoints)];
+    }
+
+    opMyEnum(p1:Test.MyEnum, current:Ice.Current):[Test.MyEnum, Test.MyEnum]
+    {
+        return [Test.MyEnum.enum3, p1];
+    }
+
+    opShortIntD(p1:Test.ShortIntD, p2:Test.ShortIntD, current:Ice.Current):[Test.ShortIntD, Test.ShortIntD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opShortIntLong(p1:number, p2:number, p3:Ice.Long, current:Ice.Current):
+        [Ice.Long, number, number, Ice.Long]
+    {
+        return [p3, p1, p2, p3];
+    }
+
+    opShortIntLongS(p1:Test.ShortS, p2:Test.IntS, p3:Test.LongS, current:Ice.Current):
+        [Test.LongS, Test.ShortS, Test.IntS, Test.LongS]
+    {
+        return [p3, p1, p2.reverse(), p3.concat(p3)];
+    }
+
+    opShortIntLongSS(p1:Test.ShortSS, p2:Test.IntSS, p3:Test.LongSS, current:Ice.Current):
+        [Test.LongSS, Test.ShortSS, Test.IntSS, Test.LongSS]
+    {
+        return [p3, p1, p2.reverse(), p3.concat(p3)];
+    }
+
+    opString(p1:string, p2:string, current:Ice.Current):[string, string]
+    {
+        return [p1 + " " + p2, p2 + " " + p1];
+    }
+
+    opStringMyEnumD(p1:Test.StringMyEnumD,
+                    p2:Test.StringMyEnumD, current:Ice.Current):[Test.StringMyEnumD, Test.StringMyEnumD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opMyEnumStringD(p1:Test.MyEnumStringD,
+                    p2:Test.MyEnumStringD, current:Ice.Current):[Test.MyEnumStringD, Test.MyEnumStringD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opMyStructMyEnumD(p1:Test.MyStructMyEnumD,
+                      p2:Test.MyStructMyEnumD, current:Ice.Current):[Test.MyStructMyEnumD, Test.MyStructMyEnumD]
+    {
+        const r = new Ice.HashMap(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opByteBoolDS(p1:Test.ByteBoolDS, p2:Test.ByteBoolDS, current:Ice.Current):[Test.ByteBoolDS, Test.ByteBoolDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opShortIntDS(p1:Test.ShortIntDS, p2:Test.ShortIntDS, current:Ice.Current):[Test.ShortIntDS, Test.ShortIntDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opLongFloatDS(p1:Test.LongFloatDS, p2:Test.LongFloatDS, current:Ice.Current):[Test.LongFloatDS, Test.LongFloatDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opStringStringDS(p1:Test.StringStringDS,
+                     p2:Test.StringStringDS, current:Ice.Current):[Test.StringStringDS, Test.StringStringDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opStringMyEnumDS(p1:Test.StringMyEnumDS,
+                     p2:Test.StringMyEnumDS, current:Ice.Current):[Test.StringMyEnumDS, Test.StringMyEnumDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opMyEnumStringDS(p1:Test.MyEnumStringDS,
+                     p2:Test.MyEnumStringDS, current:Ice.Current):[Test.MyEnumStringDS, Test.MyEnumStringDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opMyStructMyEnumDS(p1:Test.MyStructMyEnumDS,
+                       p2:Test.MyStructMyEnumDS, current:Ice.Current):[Test.MyStructMyEnumDS, Test.MyStructMyEnumDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opByteByteSD(p1:Test.ByteByteSD, p2:Test.ByteByteSD, current:Ice.Current):[Test.ByteByteSD, Test.ByteByteSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opBoolBoolSD(p1:Test.BoolBoolSD, p2:Test.BoolBoolSD, current:Ice.Current):[Test.BoolBoolSD, Test.BoolBoolSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opShortShortSD(p1:Test.ShortShortSD, p2:Test.ShortShortSD, current:Ice.Current):[Test.ShortShortSD, Test.ShortShortSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opIntIntSD(p1:Test.IntIntSD, p2:Test.IntIntSD, current:Ice.Current):[Test.IntIntSD, Test.IntIntSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opLongLongSD(p1:Test.LongLongSD, p2:Test.LongLongSD, current:Ice.Current):[Test.LongLongSD, Test.LongLongSD]
+    {
+        const r = new Ice.HashMap(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Ice.HashMap(p2);
+        return [r, p3];
+    }
+
+    opStringFloatSD(p1:Test.StringFloatSD,
+                    p2:Test.StringFloatSD, current:Ice.Current):[Test.StringFloatSD, Test.StringFloatSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opStringDoubleSD(p1:Test.StringDoubleSD,
+                     p2:Test.StringDoubleSD, current:Ice.Current):[Test.StringDoubleSD, Test.StringDoubleSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opStringStringSD(p1:Test.StringStringSD,
+                     p2:Test.StringStringSD, current:Ice.Current):[Test.StringStringSD, Test.StringStringSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opMyEnumMyEnumSD(p1:Test.MyEnumMyEnumSD,
+                     p2:Test.MyEnumMyEnumSD, current:Ice.Current):[Test.MyEnumMyEnumSD, Test.MyEnumMyEnumSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opIntS(s:Test.IntS, current:Ice.Current):Test.IntS
+    {
+        return s.map(v => -v);
+    }
+
+    opByteSOneway(s:Test.ByteS, current:Ice.Current):void
+    {
+        this._opByteSOnewayCount += 1;
+    }
+
+    opByteSOnewayCallCount(current:Ice.Current):number
+    {
+        const count = this._opByteSOnewayCount;
+        this._opByteSOnewayCount = 0;
+        return count;
+    }
+
+    opContext(current:Ice.Current):Ice.Context
+    {
+        return current.ctx;
+    }
+
+    opDoubleMarshaling(p1:number, p2:Test.DoubleS, current:Ice.Current):void
+    {
+        const d = 1278312346.0 / 13.0;
+        test(p1 === d);
+        for(let i = 0; i < p2.length; ++i)
+        {
+            test(p2[i] === d);
+        }
+    }
+
+    opStringS(p1:Test.StringS, p2:Test.StringS, current:Ice.Current):[Test.StringS, Test.StringS]
+    {
+        const p3 = p1.concat(p2);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opStringSS(p1:Test.StringSS, p2:Test.StringSS, current:Ice.Current):[Test.StringSS, Test.StringSS]
+    {
+        const p3 = p1.concat(p2);
+        const r = p2.reverse();
+        return [r, p3];
+    }
+
+    opStringSSS(p1:Test.StringSSS, p2:Test.StringSSS, current:Ice.Current):[Test.StringSSS, Test.StringSSS]
+    {
+        const p3 = p1.concat(p2);
+        const r = p2.reverse();
+        return [r, p3];
+    }
+
+    opStringStringD(p1:Test.StringStringD, p2:Test.StringStringD, current:Ice.Current):[Test.StringStringD, Test.StringStringD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opStruct(p1:Test.Structure, p2:Test.Structure, current:Ice.Current):[Test.Structure, Test.Structure]
+    {
+        p1.s.s = "a new string";
+        return [p2, p1];
+    }
+
+    opIdempotent(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Idempotent);
+    }
+
+    opNonmutating(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+    }
+
+    opDerived(current:Ice.Current):void
+    {
+    }
+
+    opByte1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opShort1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opInt1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opLong1(value:Ice.Long, current:Ice.Current):Ice.Long
+    {
+        return value;
+    }
+
+    opFloat1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opDouble1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opString1(value:string, current:Ice.Current):string
+    {
+        return value;
+    }
+
+    opStringS1(value:Test.StringS, current:Ice.Current):Test.StringS
+    {
+        return value;
+    }
+
+    opByteBoolD1(value:Test.ByteBoolD, current:Ice.Current):Test.ByteBoolD
+    {
+        return value;
+    }
+
+    opStringS2(value:Test.StringS, current:Ice.Current):Test.StringS
+    {
+        return value;
+    }
+
+    opByteBoolD2(value:Test.ByteBoolD, current:Ice.Current):Test.ByteBoolD
+    {
+        return value;
+    }
+
+    opMyClass1(value:Test.MyClass1, current:Ice.Current):Test.MyClass1
+    {
+        return value;
+    }
+
+    opMyStruct1(value:Test.MyStruct1, current:Ice.Current):Test.MyStruct1
+    {
+        return value;
+    }
+
+    opStringLiterals(current:Ice.Current):Test.StringS
+    {
+        return [
+            Test.s0, Test.s1, Test.s2, Test.s3, Test.s4, Test.s5, Test.s6, Test.s7, Test.s8, Test.s9, Test.s10,
+            Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10,
+            Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5,
+            Test.su0, Test.su1, Test.su2
+        ];
+    }
+
+    opWStringLiterals(current:Ice.Current):Test.WStringS
+    {
+        return this.opStringLiterals(current);
+    }
+
+    opMStruct1(current:Ice.Current):Test.Structure
+    {
+        return new Test.Structure();
+    }
+
+    opMStruct2(p1:Test.Structure, current:Ice.Current):[Test.Structure, Test.Structure]
+    {
+        return [p1, p1];
+    }
+
+    opMSeq1(current:Ice.Current):Test.StringS
+    {
+        return [];
+    }
+
+    opMSeq2(p1:Test.StringS, current:Ice.Current):[Test.StringS, Test.StringS]
+    {
+        return [p1, p1];
+    }
+
+    opMDict1(current:Ice.Current):Test.StringStringD
+    {
+        return new Map();
+    }
+
+    opMDict2(p1:Test.StringStringD, current:Ice.Current):[Test.StringStringD, Test.StringStringD]
+    {
+        return [p1, p1];
+    }
+
+    _opByteSOnewayCount:number;
+    _endpoints:Ice.Endpoint[];
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/BatchOneways.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/BatchOneways.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/BatchOneways.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/BatchOneways.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,70 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+const test = TestHelper.test;
+
+export async function run(communicator:Ice.Communicator, prx:Test.MyClassPrx, bidir:boolean)
+{
+    const bs1 = new Uint8Array(10 * 1024);
+    for(let i = 0; i < bs1.length; ++i)
+    {
+        bs1[i] = 0;
+    }
+
+    const batch = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
+    await batch.ice_flushBatchRequests();
+
+    test(batch.ice_flushBatchRequests().isCompleted()); // Empty flush
+    test(batch.ice_flushBatchRequests().isSent()); // Empty flush
+    test(batch.ice_flushBatchRequests().sentSynchronously()); // Empty flush
+
+    for(let i = 0; i < 30; ++i)
+    {
+        await batch.opByteSOneway(bs1);
+    }
+
+    let count = 0;
+    while(count < 27) // 3 * 9 requests auto-flushed.
+    {
+        count += await prx.opByteSOnewayCallCount();
+        await Ice.Promise.delay(10);
+    }
+
+    if(batch.ice_getConnection() !== null)
+    {
+        const batch1 = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
+        const batch2 = Test.MyClassPrx.uncheckedCast(prx.ice_batchOneway());
+
+        batch1.ice_ping();
+        batch2.ice_ping();
+        await batch1.ice_flushBatchRequests();
+        await batch1.ice_getConnection().then(c => c.close(Ice.ConnectionClose.GracefullyWithWait));
+        batch1.ice_ping();
+        batch2.ice_ping();
+
+        await batch1.ice_getConnection();
+        await batch2.ice_getConnection();
+
+        batch1.ice_ping();
+        await batch1.ice_getConnection().then(c => c.close(Ice.ConnectionClose.GracefullyWithWait));
+
+        batch1.ice_ping();
+        batch2.ice_ping();
+    }
+
+    const identity = new Ice.Identity();
+    identity.name = "invalid";
+    const batch3 = batch.ice_identity(identity);
+    batch3.ice_ping();
+    await batch3.ice_flushBatchRequests();
+
+    // Make sure that a bogus batch request doesn't cause troubles to other ones.
+    batch3.ice_ping();
+    batch.ice_ping();
+    await batch.ice_flushBatchRequests();
+    await batch.ice_ping();
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,74 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import * as Twoways from "./Twoways";
+import * as Oneways from "./Oneways";
+import * as BatchOneways from "./BatchOneways";
+
+export class Client extends TestHelper
+{
+    async allTests(bidir:boolean)
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+        out.write("testing twoway operations... ");
+        const ref = "test:" + this.getTestEndpoint();
+        const base = communicator.stringToProxy(ref);
+        const cl = await Test.MyClassPrx.checkedCast(base);
+        const derived = await Test.MyDerivedClassPrx.checkedCast(cl);
+
+        await Twoways.run(communicator, cl, bidir, this);
+        await Twoways.run(communicator, derived, bidir, this);
+        out.writeLine("ok");
+
+        out.write("testing oneway operations... ");
+        await Oneways.run(communicator, cl, bidir);
+        out.writeLine("ok");
+
+        out.write("testing batch oneway operations... ");
+        await BatchOneways.run(communicator, cl, bidir);
+        out.writeLine("ok");
+
+        out.write("testing server shutdown... ");
+        await cl.shutdown();
+        try
+        {
+            await cl.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
+            throw new Error("test failed");
+        }
+        catch(ex)
+        {
+            if(ex instanceof Ice.LocalException)
+            {
+                out.writeLine("ok");
+            }
+            else
+            {
+                throw ex;
+            }
+        }
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.BatchAutoFlushSize", "100");
+            [communicator] = this.initialize(properties);
+            await this.allTests(false);
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/MyDerivedClassI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/MyDerivedClassI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/MyDerivedClassI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/MyDerivedClassI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,532 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+import {Ice} from "ice";;
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+const test = TestHelper.test;
+
+export class MyDerivedClassI extends Test.MyDerivedClass
+{
+    //
+    // Override the Object "pseudo" operations to verify the operation mode.
+    //
+    constructor(endpoints:Ice.Endpoint[])
+    {
+        super();
+        this._opByteSOnewayCount = 0;
+        this._endpoints = endpoints;
+    }
+
+    ice_isA(id:string, current:Ice.Current):boolean
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        return Ice.Object.prototype.ice_isA.call(this, id, current);
+    }
+
+    ice_ping(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        Ice.Object.prototype.ice_ping.call(this, current);
+    }
+
+    ice_ids(current:Ice.Current):Ice.StringSeq
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        return Ice.Object.prototype.ice_ids.call(this, current);
+    }
+
+    ice_id(current:Ice.Current):string
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+        return Ice.Object.prototype.ice_id.call(this, current);
+    }
+
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    supportsCompress(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    opVoid(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Normal);
+    }
+
+    opBool(p1:boolean, p2:boolean, current:Ice.Current):[boolean, boolean]
+    {
+        return [p2, p1];
+    }
+
+    opBoolS(p1:Test.BoolS, p2:Test.BoolS, current:Ice.Current):[Test.BoolS, Test.BoolS]
+    {
+        const p3 = p1.concat(p2);
+        return [p1.reverse(), p3];
+    }
+
+    opBoolSS(p1:Test.BoolSS, p2:Test.BoolSS, current:Ice.Current):[Test.BoolSS, Test.BoolSS]
+    {
+        const p3 = p1.concat(p2);
+        return [p1.reverse(), p3];
+    }
+
+    opByte(p1:number, p2:number, current:Ice.Current):[number, number]
+    {
+        return [p1, (p1 ^ p2) & 0xff];
+    }
+
+    opByteBoolD(p1:Test.ByteBoolD, p2:Test.ByteBoolD, current:Ice.Current):[Test.ByteBoolD, Test.ByteBoolD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opByteS(p1:Test.ByteS, p2:Test.ByteS, current:Ice.Current):[Test.ByteS, Test.ByteS]
+    {
+        const p3 = new Uint8Array(p1.length);
+        for(let i = 0; i < p1.length; i++)
+        {
+            p3[i] = p1[p1.length - (i + 1)];
+        }
+
+        const r = new Uint8Array(p1.length + p2.length);
+        for(let i = 0; i < p1.length; ++i)
+        {
+            r[i] = p1[i];
+        }
+        for(let i = 0; i < p2.length; ++i)
+        {
+            r[i + p1.length] = p2[i];
+        }
+        return [r, p3];
+    }
+
+    opByteSS(p1:Test.ByteSS, p2:Test.ByteSS, current:Ice.Current):[Test.ByteSS, Test.ByteSS]
+    {
+        const r = p1.concat(p2);
+        return [r, p1.reverse()];
+    }
+
+    opFloatDouble(p1:number, p2:number, current:Ice.Current):[number, number, number]
+    {
+        return [p2, p1, p2];
+    }
+
+    opFloatDoubleS(p1:Test.FloatS, p2:Test.DoubleS, current:Ice.Current):
+        [Test.DoubleS, Test.FloatS, Test.DoubleS]
+    {
+        const r = p2.concat(p1);
+        const p4 = p2.reverse();
+        return [r, p1, p4];
+    }
+
+    opFloatDoubleSS(p1:Test.FloatSS, p2:Test.DoubleSS, current:Ice.Current):
+        [Test.DoubleSS, Test.FloatSS, Test.DoubleSS]
+    {
+        const r = p2.concat(p2);
+        const p4 = p2.reverse();
+        return [r, p1, p4];
+    }
+
+    opLongFloatD(p1:Test.LongFloatD, p2:Test.LongFloatD, current:Ice.Current):[Test.LongFloatD, Test.LongFloatD]
+    {
+        const r = new Ice.HashMap(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opMyClass(p1:Test.MyClassPrx, current:Ice.Current):[Test.MyClassPrx, Test.MyClassPrx, Test.MyClassPrx]
+    {
+        const p2 = p1;
+        const p3 = Test.MyClassPrx.uncheckedCast(
+            current.adapter.createProxy(Ice.stringToIdentity("noSuchIdentity")));
+        const r = Test.MyClassPrx.uncheckedCast(current.adapter.createProxy(current.id));
+        return [r.ice_endpoints(this._endpoints), p2, p3.ice_endpoints(this._endpoints)];
+    }
+
+    opMyEnum(p1:Test.MyEnum, current:Ice.Current):[Test.MyEnum, Test.MyEnum]
+    {
+        return [Test.MyEnum.enum3, p1];
+    }
+
+    opShortIntD(p1:Test.ShortIntD, p2:Test.ShortIntD, current:Ice.Current):[Test.ShortIntD, Test.ShortIntD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opShortIntLong(p1:number, p2:number, p3:Ice.Long, current:Ice.Current):
+        [Ice.Long, number, number, Ice.Long]
+    {
+        return [p3, p1, p2, p3];
+    }
+
+    opShortIntLongS(p1:Test.ShortS, p2:Test.IntS, p3:Test.LongS, current:Ice.Current):
+        [Test.LongS, Test.ShortS, Test.IntS, Test.LongS]
+    {
+        return [p3, p1, p2.reverse(), p3.concat(p3)];
+    }
+
+    opShortIntLongSS(p1:Test.ShortSS, p2:Test.IntSS, p3:Test.LongSS, current:Ice.Current):
+        [Test.LongSS, Test.ShortSS, Test.IntSS, Test.LongSS]
+    {
+        return [p3, p1, p2.reverse(), p3.concat(p3)];
+    }
+
+    opString(p1:string, p2:string, current:Ice.Current):[string, string]
+    {
+        return [p1 + " " + p2, p2 + " " + p1];
+    }
+
+    opStringMyEnumD(p1:Test.StringMyEnumD,
+                    p2:Test.StringMyEnumD, current:Ice.Current):[Test.StringMyEnumD, Test.StringMyEnumD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opMyEnumStringD(p1:Test.MyEnumStringD,
+                    p2:Test.MyEnumStringD, current:Ice.Current):[Test.MyEnumStringD, Test.MyEnumStringD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opMyStructMyEnumD(p1:Test.MyStructMyEnumD,
+                      p2:Test.MyStructMyEnumD, current:Ice.Current):[Test.MyStructMyEnumD, Test.MyStructMyEnumD]
+    {
+        const r = new Ice.HashMap(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opByteBoolDS(p1:Test.ByteBoolDS, p2:Test.ByteBoolDS, current:Ice.Current):[Test.ByteBoolDS, Test.ByteBoolDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opShortIntDS(p1:Test.ShortIntDS, p2:Test.ShortIntDS, current:Ice.Current):[Test.ShortIntDS, Test.ShortIntDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opLongFloatDS(p1:Test.LongFloatDS, p2:Test.LongFloatDS, current:Ice.Current):[Test.LongFloatDS, Test.LongFloatDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opStringStringDS(p1:Test.StringStringDS,
+                     p2:Test.StringStringDS, current:Ice.Current):[Test.StringStringDS, Test.StringStringDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opStringMyEnumDS(p1:Test.StringMyEnumDS,
+                     p2:Test.StringMyEnumDS, current:Ice.Current):[Test.StringMyEnumDS, Test.StringMyEnumDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opMyEnumStringDS(p1:Test.MyEnumStringDS,
+                     p2:Test.MyEnumStringDS, current:Ice.Current):[Test.MyEnumStringDS, Test.MyEnumStringDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opMyStructMyEnumDS(p1:Test.MyStructMyEnumDS,
+                       p2:Test.MyStructMyEnumDS, current:Ice.Current):[Test.MyStructMyEnumDS, Test.MyStructMyEnumDS]
+    {
+        const p3 = p2.concat(p1);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opByteByteSD(p1:Test.ByteByteSD, p2:Test.ByteByteSD, current:Ice.Current):[Test.ByteByteSD, Test.ByteByteSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opBoolBoolSD(p1:Test.BoolBoolSD, p2:Test.BoolBoolSD, current:Ice.Current):[Test.BoolBoolSD, Test.BoolBoolSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opShortShortSD(p1:Test.ShortShortSD, p2:Test.ShortShortSD, current:Ice.Current):[Test.ShortShortSD, Test.ShortShortSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opIntIntSD(p1:Test.IntIntSD, p2:Test.IntIntSD, current:Ice.Current):[Test.IntIntSD, Test.IntIntSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opLongLongSD(p1:Test.LongLongSD, p2:Test.LongLongSD, current:Ice.Current):[Test.LongLongSD, Test.LongLongSD]
+    {
+        const r = new Ice.HashMap(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Ice.HashMap(p2);
+        return [r, p3];
+    }
+
+    opStringFloatSD(p1:Test.StringFloatSD,
+                    p2:Test.StringFloatSD, current:Ice.Current):[Test.StringFloatSD, Test.StringFloatSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opStringDoubleSD(p1:Test.StringDoubleSD,
+                     p2:Test.StringDoubleSD, current:Ice.Current):[Test.StringDoubleSD, Test.StringDoubleSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opStringStringSD(p1:Test.StringStringSD,
+                     p2:Test.StringStringSD, current:Ice.Current):[Test.StringStringSD, Test.StringStringSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opMyEnumMyEnumSD(p1:Test.MyEnumMyEnumSD,
+                     p2:Test.MyEnumMyEnumSD, current:Ice.Current):[Test.MyEnumMyEnumSD, Test.MyEnumMyEnumSD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        const p3 = new Map(p2);
+        return [r, p3];
+    }
+
+    opIntS(s:Test.IntS, current:Ice.Current):Test.IntS
+    {
+        return s.map(v => -v);
+    }
+
+    opByteSOneway(s:Test.ByteS, current:Ice.Current):void
+    {
+        this._opByteSOnewayCount += 1;
+    }
+
+    opByteSOnewayCallCount(current:Ice.Current):number
+    {
+        const count = this._opByteSOnewayCount;
+        this._opByteSOnewayCount = 0;
+        return count;
+    }
+
+    opContext(current:Ice.Current):Ice.Context
+    {
+        return current.ctx;
+    }
+
+    opDoubleMarshaling(p1:number, p2:Test.DoubleS, current:Ice.Current):void
+    {
+        const d = 1278312346.0 / 13.0;
+        test(p1 === d);
+        for(let i = 0; i < p2.length; ++i)
+        {
+            test(p2[i] === d);
+        }
+    }
+
+    opStringS(p1:Test.StringS, p2:Test.StringS, current:Ice.Current):[Test.StringS, Test.StringS]
+    {
+        const p3 = p1.concat(p2);
+        const r = p1.reverse();
+        return [r, p3];
+    }
+
+    opStringSS(p1:Test.StringSS, p2:Test.StringSS, current:Ice.Current):[Test.StringSS, Test.StringSS]
+    {
+        const p3 = p1.concat(p2);
+        const r = p2.reverse();
+        return [r, p3];
+    }
+
+    opStringSSS(p1:Test.StringSSS, p2:Test.StringSSS, current:Ice.Current):[Test.StringSSS, Test.StringSSS]
+    {
+        const p3 = p1.concat(p2);
+        const r = p2.reverse();
+        return [r, p3];
+    }
+
+    opStringStringD(p1:Test.StringStringD, p2:Test.StringStringD, current:Ice.Current):[Test.StringStringD, Test.StringStringD]
+    {
+        const r = new Map(p1);
+        p2.forEach((value, key) => r.set(key, value));
+        return [r, p1];
+    }
+
+    opStruct(p1:Test.Structure, p2:Test.Structure, current:Ice.Current):[Test.Structure, Test.Structure]
+    {
+        p1.s.s = "a new string";
+        return [p2, p1];
+    }
+
+    opIdempotent(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Idempotent);
+    }
+
+    opNonmutating(current:Ice.Current):void
+    {
+        test(current.mode === Ice.OperationMode.Nonmutating);
+    }
+
+    opDerived(current:Ice.Current):void
+    {
+    }
+
+    opByte1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opShort1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opInt1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opLong1(value:Ice.Long, current:Ice.Current):Ice.Long
+    {
+        return value;
+    }
+
+    opFloat1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opDouble1(value:number, current:Ice.Current):number
+    {
+        return value;
+    }
+
+    opString1(value:string, current:Ice.Current):string
+    {
+        return value;
+    }
+
+    opStringS1(value:Test.StringS, current:Ice.Current):Test.StringS
+    {
+        return value;
+    }
+
+    opByteBoolD1(value:Test.ByteBoolD, current:Ice.Current):Test.ByteBoolD
+    {
+        return value;
+    }
+
+    opStringS2(value:Test.StringS, current:Ice.Current):Test.StringS
+    {
+        return value;
+    }
+
+    opByteBoolD2(value:Test.ByteBoolD, current:Ice.Current):Test.ByteBoolD
+    {
+        return value;
+    }
+
+    opMyClass1(value:Test.MyClass1, current:Ice.Current):Test.MyClass1
+    {
+        return value;
+    }
+
+    opMyStruct1(value:Test.MyStruct1, current:Ice.Current):Test.MyStruct1
+    {
+        return value;
+    }
+
+    opStringLiterals(current:Ice.Current):Test.StringS
+    {
+        return [
+            Test.s0, Test.s1, Test.s2, Test.s3, Test.s4, Test.s5, Test.s6, Test.s7, Test.s8, Test.s9, Test.s10,
+            Test.sw0, Test.sw1, Test.sw2, Test.sw3, Test.sw4, Test.sw5, Test.sw6, Test.sw7, Test.sw8, Test.sw9, Test.sw10,
+            Test.ss0, Test.ss1, Test.ss2, Test.ss3, Test.ss4, Test.ss5,
+            Test.su0, Test.su1, Test.su2
+        ];
+    }
+
+    opWStringLiterals(current:Ice.Current):Test.WStringS
+    {
+        return this.opStringLiterals(current);
+    }
+
+    opMStruct1(current:Ice.Current):Test.Structure
+    {
+        return new Test.Structure();
+    }
+
+    opMStruct2(p1:Test.Structure, current:Ice.Current):[Test.Structure, Test.Structure]
+    {
+        return [p1, p1];
+    }
+
+    opMSeq1(current:Ice.Current):Test.StringS
+    {
+        return [];
+    }
+
+    opMSeq2(p1:Test.StringS, current:Ice.Current):[Test.StringS, Test.StringS]
+    {
+        return [p1, p1];
+    }
+
+    opMDict1(current:Ice.Current):Test.StringStringD
+    {
+        return new Map();
+    }
+
+    opMDict2(p1:Test.StringStringD, current:Ice.Current):[Test.StringStringD, Test.StringStringD]
+    {
+        return [p1, p1];
+    }
+
+    _opByteSOnewayCount:number;
+    _endpoints:Ice.Endpoint[];
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Oneways.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Oneways.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Oneways.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Oneways.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,63 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export async function run(communicator:Ice.Communicator, prx:Test.MyClassPrx, bidir:boolean)
+{
+    prx = prx.ice_oneway();
+    await prx.ice_ping();
+
+    try
+    {
+        await prx.ice_isA(Test.MyClass.ice_staticId());
+        test(false);
+    }
+    catch(ex)
+    {
+        // Expected: twoway proxy required
+        test(ex instanceof Ice.TwowayOnlyException, ex);
+    }
+
+    try
+    {
+        await prx.ice_id();
+        test(false);
+    }
+    catch(ex)
+    {
+        // Expected: twoway proxy required
+        test(ex instanceof Ice.TwowayOnlyException, ex);
+    }
+
+    try
+    {
+        await prx.ice_ids();
+        test(false);
+    }
+    catch(ex)
+    {
+        // Expected: twoway proxy required
+        test(ex instanceof Ice.TwowayOnlyException, ex);
+    }
+
+    await prx.opVoid();
+    await prx.opIdempotent();
+    await prx.opNonmutating();
+
+    try
+    {
+        await prx.opByte(0xff, 0x0f);
+        test(false);
+    }
+    catch(ex)
+    {
+        // Expected: twoway proxy required
+        test(ex instanceof Ice.TwowayOnlyException, ex);
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/ServerAMD.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/ServerAMD.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/ServerAMD.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/ServerAMD.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,42 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import {AMDMyDerivedClassI} from "./AMDMyDerivedClassI";
+
+export class ServerAMD extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.BatchAutoFlushSize", "100");
+            [communicator] = this.initialize(properties);
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new AMDMyDerivedClassI(echo.ice_getEndpoints()), Ice.stringToIdentity("test"));
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Server.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Server.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Server.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Server.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,42 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import {MyDerivedClassI} from "./MyDerivedClassI";
+
+export class Server extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.BatchAutoFlushSize", "100");
+            [communicator] = this.initialize(properties);
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new MyDerivedClassI(echo.ice_getEndpoints()), Ice.stringToIdentity("test"));
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,376 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Ice/Current.ice>
+
+[["js:es6-module"]]
+
+module Test
+{
+
+enum MyEnum
+{
+    enum1,
+    enum2,
+    enum3
+}
+
+interface MyClass;
+
+struct AnotherStruct
+{
+    string s;
+}
+
+struct Structure
+{
+    MyClass* p;
+    MyEnum e;
+    AnotherStruct s;
+}
+
+sequence<byte> ByteS;
+sequence<bool> BoolS;
+sequence<short> ShortS;
+sequence<int> IntS;
+sequence<long> LongS;
+sequence<float> FloatS;
+sequence<double> DoubleS;
+sequence<string> StringS;
+sequence<["cpp:type:wstring"]string> WStringS;
+sequence<MyEnum> MyEnumS;
+sequence<MyClass*> MyClassS;
+
+sequence<ByteS> ByteSS;
+sequence<BoolS> BoolSS;
+sequence<ShortS> ShortSS;
+sequence<IntS> IntSS;
+sequence<LongS> LongSS;
+sequence<FloatS> FloatSS;
+sequence<DoubleS> DoubleSS;
+sequence<StringS> StringSS;
+sequence<MyEnumS> MyEnumSS;
+sequence<MyClassS> MyClassSS;
+
+sequence<StringSS> StringSSS;
+
+struct MyStruct
+{
+    int i;
+    int j;
+}
+
+dictionary<byte, bool> ByteBoolD;
+dictionary<short, int> ShortIntD;
+dictionary<long, float> LongFloatD;
+dictionary<string, string> StringStringD;
+dictionary<string, MyEnum> StringMyEnumD;
+dictionary<MyEnum, string> MyEnumStringD;
+dictionary<MyStruct, MyEnum> MyStructMyEnumD;
+
+sequence<ByteBoolD> ByteBoolDS;
+sequence<ShortIntD> ShortIntDS;
+sequence<LongFloatD> LongFloatDS;
+sequence<StringStringD> StringStringDS;
+sequence<StringMyEnumD> StringMyEnumDS;
+sequence<MyEnumStringD> MyEnumStringDS;
+sequence<MyStructMyEnumD> MyStructMyEnumDS;
+
+dictionary<byte, ByteS> ByteByteSD;
+dictionary<bool, BoolS> BoolBoolSD;
+dictionary<short, ShortS> ShortShortSD;
+dictionary<int, IntS> IntIntSD;
+dictionary<long, LongS> LongLongSD;
+dictionary<string, FloatS> StringFloatSD;
+dictionary<string, DoubleS> StringDoubleSD;
+dictionary<string, StringS> StringStringSD;
+dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
+
+interface MyClass
+{
+    void shutdown();
+
+    bool supportsCompress();
+
+    void opVoid();
+
+    byte opByte(byte p1, byte p2,
+                out byte p3);
+
+    bool opBool(bool p1, bool p2,
+                out bool p3);
+
+    long opShortIntLong(short p1, int p2, long p3,
+                        out short p4, out int p5, out long p6);
+
+    double opFloatDouble(float p1, double p2,
+                         out float p3, out double p4);
+
+    string opString(string p1, string p2,
+                    out string p3);
+
+    MyEnum opMyEnum(MyEnum p1, out MyEnum p2);
+
+    MyClass* opMyClass(MyClass* p1, out MyClass* p2, out MyClass* p3);
+
+    Structure opStruct(Structure p1, Structure p2,
+                       out Structure p3);
+
+    ByteS opByteS(ByteS p1, ByteS p2,
+                  out ByteS p3);
+
+    BoolS opBoolS(BoolS p1, BoolS p2,
+                  out BoolS p3);
+
+    LongS opShortIntLongS(Test::ShortS p1, IntS p2, LongS p3,
+                          out ::Test::ShortS p4, out IntS p5, out LongS p6);
+
+    DoubleS opFloatDoubleS(FloatS p1, DoubleS p2,
+                           out FloatS p3, out DoubleS p4);
+
+    StringS opStringS(StringS p1, StringS p2,
+                      out StringS p3);
+
+    ByteSS opByteSS(ByteSS p1, ByteSS p2,
+                    out ByteSS p3);
+
+    BoolSS opBoolSS(BoolSS p1, BoolSS p2,
+                    out BoolSS p3);
+
+    LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3,
+                            out ShortSS p4, out IntSS p5, out LongSS p6);
+
+    DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2,
+                             out FloatSS p3, out DoubleSS p4);
+
+    StringSS opStringSS(StringSS p1, StringSS p2,
+                        out StringSS p3);
+
+    StringSSS opStringSSS(StringSSS p1, StringSSS p2,
+                          out StringSSS p3);
+
+    ByteBoolD opByteBoolD(ByteBoolD p1, ByteBoolD p2,
+                          out ByteBoolD p3);
+
+    ShortIntD opShortIntD(ShortIntD p1, ShortIntD p2,
+                          out ShortIntD p3);
+
+    LongFloatD opLongFloatD(LongFloatD p1, LongFloatD p2,
+                            out LongFloatD p3);
+
+    StringStringD opStringStringD(StringStringD p1, StringStringD p2,
+                                  out StringStringD p3);
+
+    StringMyEnumD opStringMyEnumD(StringMyEnumD p1, StringMyEnumD p2,
+                                  out StringMyEnumD p3);
+
+    MyEnumStringD opMyEnumStringD(MyEnumStringD p1, MyEnumStringD p2,
+                                  out MyEnumStringD p3);
+
+    MyStructMyEnumD opMyStructMyEnumD(MyStructMyEnumD p1, MyStructMyEnumD p2,
+                                      out MyStructMyEnumD p3);
+
+    ByteBoolDS opByteBoolDS(ByteBoolDS p1, ByteBoolDS p2,
+                            out ByteBoolDS p3);
+
+    ShortIntDS opShortIntDS(ShortIntDS p1, ShortIntDS p2,
+                            out ShortIntDS p3);
+
+    LongFloatDS opLongFloatDS(LongFloatDS p1, LongFloatDS p2,
+                              out LongFloatDS p3);
+
+    StringStringDS opStringStringDS(StringStringDS p1, StringStringDS p2,
+                                    out StringStringDS p3);
+
+    StringMyEnumDS opStringMyEnumDS(StringMyEnumDS p1, StringMyEnumDS p2,
+                                    out StringMyEnumDS p3);
+
+    MyEnumStringDS opMyEnumStringDS(MyEnumStringDS p1, MyEnumStringDS p2,
+                                    out MyEnumStringDS p3);
+
+    MyStructMyEnumDS opMyStructMyEnumDS(MyStructMyEnumDS p1, MyStructMyEnumDS p2,
+                                        out MyStructMyEnumDS p3);
+
+    ByteByteSD opByteByteSD(ByteByteSD p1, ByteByteSD p2,
+                            out ByteByteSD p3);
+
+    BoolBoolSD opBoolBoolSD(BoolBoolSD p1, BoolBoolSD p2,
+                            out BoolBoolSD p3);
+
+    ShortShortSD opShortShortSD(ShortShortSD p1, ShortShortSD p2,
+                                out ShortShortSD p3);
+
+    IntIntSD opIntIntSD(IntIntSD p1, IntIntSD p2,
+                        out IntIntSD p3);
+
+    LongLongSD opLongLongSD(LongLongSD p1, LongLongSD p2,
+                            out LongLongSD p3);
+
+    StringFloatSD opStringFloatSD(StringFloatSD p1, StringFloatSD p2,
+                                  out StringFloatSD p3);
+
+    StringDoubleSD opStringDoubleSD(StringDoubleSD p1, StringDoubleSD p2,
+                                    out StringDoubleSD p3);
+
+    StringStringSD opStringStringSD(StringStringSD p1, StringStringSD p2,
+                                    out StringStringSD p3);
+
+    MyEnumMyEnumSD opMyEnumMyEnumSD(MyEnumMyEnumSD p1, MyEnumMyEnumSD p2,
+                                    out MyEnumMyEnumSD p3);
+
+    IntS opIntS(IntS s);
+
+    void opByteSOneway(ByteS s);
+    int opByteSOnewayCallCount();
+
+    Ice::Context opContext();
+
+    void opDoubleMarshaling(double p1, DoubleS p2);
+
+    idempotent void opIdempotent();
+
+    ["nonmutating"] idempotent void opNonmutating();
+
+    byte opByte1(byte opByte1);
+    short opShort1(short opShort1);
+    int opInt1(int opInt1);
+    long opLong1(long opLong1);
+    float opFloat1(float opFloat1);
+    double opDouble1(double opDouble1);
+    string opString1(string opString1);
+    StringS opStringS1(StringS opStringS1);
+    ByteBoolD opByteBoolD1(ByteBoolD opByteBoolD1);
+    StringS opStringS2(StringS stringS);
+    ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
+
+    StringS opStringLiterals();
+    WStringS opWStringLiterals();
+
+    ["marshaled-result"] Structure opMStruct1();
+    ["marshaled-result"] Structure opMStruct2(Structure p1, out Structure p2);
+
+    ["marshaled-result"] StringS opMSeq1();
+    ["marshaled-result"] StringS opMSeq2(StringS p1, out StringS p2);
+
+    ["marshaled-result"] StringStringD opMDict1();
+    ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2);
+}
+
+struct MyStruct1
+{
+    string tesT; // Same name as the enclosing module
+    MyClass* myClass; // Same name as an already defined class
+    string myStruct1; // Same name as the enclosing struct
+}
+
+class MyClass1
+{
+    string tesT; // Same name as the enclosing module
+    MyClass* myClass; // Same name as an already defined class
+    string myClass1; // Same name as the enclosing class
+}
+
+interface MyDerivedClass extends MyClass
+{
+    void opDerived();
+    MyClass1 opMyClass1(MyClass1 opMyClass1);
+    MyStruct1 opMyStruct1(MyStruct1 opMyStruct1);
+}
+
+interface Echo
+{
+    void setConnection();
+    void startBatch();
+    void flushBatch();
+    void shutdown();
+
+bool supportsCompress();
+}
+
+//
+// String literals
+//
+
+const string s0 = "\u005c";                           // backslash
+const string s1 = "\u0041";                           // A
+const string s2 = "\u0049\u0063\u0065";               // Ice
+const string s3 = "\u004121";                         // A21
+const string s4 = "\\u0041 \\U00000041";              // \\u0041 \\U00000041
+const string s5 = "\u00FF";                           // ÿ
+const string s6 = "\u03FF";                           // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
+const string s7 = "\u05F0";                           // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
+const string s8 = "\U00010000";                       // LINEAR B SYLLABLE B008 A (U+10000)
+const string s9 = "\U0001F34C";                       // BANANA (U+1F34C)
+const string s10 = "\u0DA7";                          // Sinhala Letter Alpapraana Ttayanna
+
+const string sw0 = "\U0000005c";                      // backslash
+const string sw1 = "\U00000041";                      // A
+const string sw2 = "\U00000049\U00000063\U00000065";  // Ice
+const string sw3 = "\U0000004121";                    // A21
+const string sw4 = "\\u0041 \\U00000041";             // \\u0041 \\U00000041
+const string sw5 = "\U000000FF";                      // ÿ
+const string sw6 = "\U000003FF";                      // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
+const string sw7 = "\U000005F0";                      // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
+const string sw8 = "\U00010000";                      // LINEAR B SYLLABLE B008 A (U+10000)
+const string sw9 = "\U0001F34C";                      // BANANA (U+1F34C)
+const string sw10 = "\U00000DA7";                     // Sinhala Letter Alpapraana Ttayanna
+
+/**
+\'      single quote    byte 0x27 in ASCII encoding
+\"      double quote    byte 0x22 in ASCII encoding
+\?      question mark   byte 0x3f in ASCII encoding
+\\      backslash       byte 0x5c in ASCII encoding
+\a      audible bell    byte 0x07 in ASCII encoding
+\b      backspace       byte 0x08 in ASCII encoding
+\f      form feed - new page    byte 0x0c in ASCII encoding
+\n      line feed - new line    byte 0x0a in ASCII encoding
+\r      carriage return byte 0x0d in ASCII encoding
+\t      horizontal tab  byte 0x09 in ASCII encoding
+\v      vertical tab    byte 0x0b in ASCII encoding
+**/
+
+const string ss0 = "\'\"\?\\\a\b\f\n\r\t\v\6";
+const string ss1 = "\u0027\u0022\u003f\u005c\u0007\u0008\u000c\u000a\u000d\u0009\u000b\u0006";
+const string ss2 = "\U00000027\U00000022\U0000003f\U0000005c\U00000007\U00000008\U0000000c\U0000000a\U0000000d\U00000009\U0000000b\U00000006";
+
+const string ss3 = "\\\\U\\u\\"; /* \\U\u\  */
+const string ss4 = "\\\u0041\\"; /* \A\     */
+const string ss5 = "\\u0041\\";  /* \u0041\ */
+
+//
+// Ĩ - Unicode Character 'LATIN CAPITAL LETTER I WITH TILDE' (U+0128)
+// Ÿ - Unicode Character 'LATIN CAPITAL LETTER Y WITH DIAERESIS' (U+0178)
+// ÿ - Unicode Character 'LATIN SMALL LETTER Y WITH DIAERESIS' (U+00FF)
+// Ā - Unicode Character 'LATIN CAPITAL LETTER A WITH MACRON' (U+0100)
+// ἀ - Unicode Character 'GREEK SMALL LETTER ALPHA WITH PSILI' (U+1F00)
+// 𐆔 - Unicode Character 'ROMAN DIMIDIA SEXTULA SIGN' (U+10194)
+// 𐅪 - Unicode Character 'GREEK ACROPHONIC THESPIAN ONE HUNDRED' (U+1016A)
+// 𐆘 - Unicode Character 'ROMAN SESTERTIUS SIGN' (U+10198)
+// 🍀 - Unicode Character 'FOUR LEAF CLOVER' (U+1F340)
+// 🍁 - Unicode Character 'MAPLE LEAF' (U+1F341)
+// 🍂 - Unicode Character 'FALLEN LEAF' (U+1F342)
+// 🍃 - Unicode Character 'LEAF FLUTTERING IN WIND' (U+1F343)
+//
+const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
+const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
+const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
+
+}
+
+module Test2
+{
+
+/**
+ *
+ * Makes sure that proxy operations are correctly generated when extending an interface from
+ * a different module (ICE-7639).
+ *
+ **/
+interface MyDerivedClass extends Test::MyClass
+{
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Twoways.ts zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Twoways.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/operations/Twoways.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/operations/Twoways.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,1475 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+const test = TestHelper.test;
+
+export async function run(communicator:Ice.Communicator, prx:Test.MyClassPrx, bidir:boolean, helper:TestHelper)
+{
+    const literals = await prx.opStringLiterals();
+
+    test(Test.s0 == "\\" &&
+            Test.s0 == Test.sw0 &&
+            Test.s0 == literals[0] &&
+            Test.s0 == literals[11]);
+
+    test(Test.s1 == "A" &&
+            Test.s1 == Test.sw1 &&
+            Test.s1 == literals[1] &&
+            Test.s1 == literals[12]);
+
+    test(Test.s2 == "Ice" &&
+            Test.s2 == Test.sw2 &&
+            Test.s2 == literals[2] &&
+            Test.s2 == literals[13]);
+
+    test(Test.s3 == "A21" &&
+            Test.s3 == Test.sw3 &&
+            Test.s3 == literals[3] &&
+            Test.s3 == literals[14]);
+
+    test(Test.s4 == "\\u0041 \\U00000041" &&
+            Test.s4 == Test.sw4 &&
+            Test.s4 == literals[4] &&
+            Test.s4 == literals[15]);
+
+    test(Test.s5 == "\u00FF" &&
+            Test.s5 == Test.sw5 &&
+            Test.s5 == literals[5] &&
+            Test.s5 == literals[16]);
+
+    test(Test.s6 == "\u03FF" &&
+            Test.s6 == Test.sw6 &&
+            Test.s6 == literals[6] &&
+            Test.s6 == literals[17]);
+
+    test(Test.s7 == "\u05F0" &&
+            Test.s7 == Test.sw7 &&
+            Test.s7 == literals[7] &&
+            Test.s7 == literals[18]);
+
+    test(Test.s8 == "\uD800\uDC00" &&
+            Test.s8 == Test.sw8 &&
+            Test.s8 == literals[8] &&
+            Test.s8 == literals[19]);
+
+    test(Test.s9 == "\uD83C\uDF4C" &&
+            Test.s9 == Test.sw9 &&
+            Test.s9 == literals[9] &&
+            Test.s9 == literals[20]);
+
+    test(Test.s10 == "\u0DA7" &&
+            Test.s10 == Test.sw10 &&
+            Test.s10 == literals[10] &&
+            Test.s10 == literals[21]);
+
+    test(Test.ss0 == "'\"?\\\u0007\b\f\n\r\t\v\u0006" &&
+            Test.ss0 == Test.ss1 &&
+            Test.ss0 == Test.ss2 &&
+            Test.ss0 == literals[22] &&
+            Test.ss0 == literals[23] &&
+            Test.ss0 == literals[24]);
+
+    test(Test.ss3 == "\\\\U\\u\\" &&
+            Test.ss3 == literals[25]);
+
+    test(Test.ss4 == "\\A\\" &&
+            Test.ss4 == literals[26]);
+
+    test(Test.ss5 == "\\u0041\\" &&
+            Test.ss5 == literals[27]);
+
+    test(Test.su0 == Test.su1 &&
+            Test.su0 == Test.su2 &&
+            Test.su0 == literals[28] &&
+            Test.su0 == literals[29] &&
+            Test.su0 == literals[30]);
+
+    await prx.ice_ping();
+
+    test(await prx.ice_isA(Test.MyClass.ice_staticId()));
+
+    test((await prx.ice_id()) === Test.MyDerivedClass.ice_staticId());
+
+    test((await prx.ice_ids()).length === 3);
+
+    await prx.opVoid();
+
+    {
+        const [retval, p3] = await prx.opByte(0xff, 0x0f);
+        test(p3 === 0xf0);
+        test(retval === 0xff);
+    }
+
+    {
+        const [retval, p3] = await prx.opBool(true, false);
+        test(p3);
+        test(!retval);
+    }
+
+    {
+        const lo = new Ice.Long(0, 12);
+        const [retval, s, i, l] = await prx.opShortIntLong(10, 11, lo);
+
+        test(s === 10);
+        test(i === 11);
+        test(l.equals(lo));
+        test(retval.equals(lo));
+    }
+
+    {
+        const [retval, f, d] = await prx.opFloatDouble(3.14, 1.1E10);
+        test((f - 3.14) <= 0.01);
+        test(d == 1.1E10);
+        test(retval == 1.1E10);
+    }
+
+    try
+    {
+        await prx.opByte(0xffff, 0xff0f);
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(-32768 - 1, 0, new Ice.Long(0));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(32767 + 1, 0, new Ice.Long(0));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(0, -2147483648 - 1, new Ice.Long(0));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(0, 2147483647 + 1, new Ice.Long(0));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(0, 0, new Ice.Long(0, 0xFFFFFFFF + 1));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof RangeError, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(0, 0, new Ice.Long(0xFFFFFFFF + 1, 0));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof RangeError, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(0, 0, new Ice.Long(0, -1));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof RangeError, ex);
+    }
+
+    try
+    {
+        await prx.opShortIntLong(Number.NaN, 0, new Ice.Long(0, 0));
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    try
+    {
+        await prx.opFloatDouble(Number.MAX_VALUE, 0);
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    try
+    {
+        await prx.opFloatDouble(-Number.MAX_VALUE, 0);
+        test(false);
+    }
+    catch(ex)
+    {
+        test(ex instanceof Ice.MarshalException, ex);
+    }
+
+    await prx.opFloatDouble(Number.NaN, Number.NaN);
+    await prx.opFloatDouble(-Number.NaN, -Number.NaN);
+    await prx.opFloatDouble(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY);
+    await prx.opFloatDouble(Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY);
+
+    {
+        const [retval, p3] = await prx.opString("hello", "world");
+        test(p3 === "world hello");
+        test(retval === "hello world");
+    }
+
+    {
+        const [retval, p2] = await prx.opMyEnum(Test.MyEnum.enum2);
+        test(p2 === Test.MyEnum.enum2);
+        test(retval === Test.MyEnum.enum3);
+    }
+
+    {
+        // Test null enum
+        const [retval, p2] = await prx.opMyEnum(null);
+        test(p2 === Test.MyEnum.enum1);
+        test(retval === Test.MyEnum.enum3);
+    }
+
+    {
+            const [retval, p2, p3] = await prx.opMyClass(prx);
+
+        test(p2.ice_getIdentity().equals(Ice.stringToIdentity("test")));
+        test(p3.ice_getIdentity().equals(Ice.stringToIdentity("noSuchIdentity")));
+        test(retval.ice_getIdentity().equals(Ice.stringToIdentity("test")));
+    }
+
+    {
+        const si1 = new Test.Structure();
+        si1.p = prx;
+        si1.e = Test.MyEnum.enum3;
+        si1.s = new Test.AnotherStruct();
+        si1.s.s = "abc";
+        const si2 = new Test.Structure();
+        si2.p = null;
+        si2.e = Test.MyEnum.enum2;
+        si2.s = new Test.AnotherStruct();
+        si2.s.s = "def";
+
+        const [retval, p3] = await prx.opStruct(si1, si2);
+        test(retval.p === null);
+        test(retval.e === Test.MyEnum.enum2);
+        test(retval.s.s === "def");
+        test(p3.p !== null);
+        test(p3.e === Test.MyEnum.enum3);
+        test(p3.s.s === "a new string");
+    }
+
+    {
+        const si1 = new Test.Structure();
+        // Test null struct
+        const [retval, p3] = await prx.opStruct(si1, null);
+
+        test(retval.p === null);
+        test(retval.e === Test.MyEnum.enum1);
+        test(retval.s.s === "");
+        test(p3.p === null);
+        test(p3.e === Test.MyEnum.enum1);
+        test(p3.s.s === "a new string");
+    }
+
+    {
+        const bsi1 = new Uint8Array([0x01, 0x11, 0x12, 0x22]);
+        const bsi2 = new Uint8Array([0xf1, 0xf2, 0xf3, 0xf4]);
+
+        const [retval, p3] = await prx.opByteS(bsi1, bsi2);
+
+        test(p3.length === 4);
+        test(p3[0] === 0x22);
+        test(p3[1] === 0x12);
+        test(p3[2] === 0x11);
+        test(p3[3] === 0x01);
+        test(retval.length === 8);
+        test(retval[0] === 0x01);
+        test(retval[1] === 0x11);
+        test(retval[2] === 0x12);
+        test(retval[3] === 0x22);
+        test(retval[4] === 0xf1);
+        test(retval[5] === 0xf2);
+        test(retval[6] === 0xf3);
+        test(retval[7] === 0xf4);
+    }
+
+    {
+        const bsi1 = [true, true, false];
+        const bsi2 = [false];
+        const [retval, p3] = await prx.opBoolS(bsi1, bsi2);
+
+        test(p3.length == 4);
+        test(p3[0]);
+        test(p3[1]);
+        test(!p3[2]);
+        test(!p3[3]);
+        test(retval.length == 3);
+        test(!retval[0]);
+        test(retval[1]);
+        test(retval[2]);
+    }
+
+    {
+        const ssi = [1, 2, 3];
+        const isi = [5, 6, 7, 8];
+        const l1 = new Ice.Long(0, 10);
+        const l2 = new Ice.Long(0, 30);
+        const l3 = new Ice.Long(0, 20);
+        const lsi = [l1, l2, l3];
+        const [retval, sso, iso, lso] = await prx.opShortIntLongS(ssi, isi, lsi);
+
+        test(sso.length === 3);
+        test(sso[0] === 1);
+        test(sso[1] === 2);
+        test(sso[2] === 3);
+        test(iso.length === 4);
+        test(iso[0] === 8);
+        test(iso[1] === 7);
+        test(iso[2] === 6);
+        test(iso[3] === 5);
+        test(lso.length === 6);
+        test(lso[0].equals(l1));
+        test(lso[1].equals(l2));
+        test(lso[2].equals(l3));
+        test(lso[3].equals(l1));
+        test(lso[4].equals(l2));
+        test(lso[5].equals(l3));
+        test(retval.length === 3);
+        test(retval[0].equals(l1));
+        test(retval[1].equals(l2));
+        test(retval[2].equals(l3));
+    }
+
+    {
+        const fsi = [3.14, 1.11];
+        const dsi = [1.1E10, 1.2E10, 1.3E10];
+        const [retval, fso, dso] = await prx.opFloatDoubleS(fsi, dsi);
+
+        test(fso.length === 2);
+        test((fso[0] - 3.14) <= 0.01);
+        test((fso[1] - 1.11) <= 0.01);
+        test(dso.length === 3);
+        test(dso[0] === 1.3E10);
+        test(dso[1] === 1.2E10);
+        test(dso[2] === 1.1E10);
+        test(retval.length === 5);
+        test(retval[0] === 1.1E10);
+        test(retval[1] === 1.2E10);
+        test(retval[2] === 1.3E10);
+        test((retval[3] - 3.14) <= 0.01);
+        test((retval[4] - 1.11) <= 0.01);
+    }
+
+    {
+        const ssi1 = ["abc", "de", "fghi"];
+        const ssi2 = ["xyz"];
+        const [retval, sso] = await prx.opStringS(ssi1, ssi2);
+
+        test(sso.length === 4);
+        test(sso[0] === "abc");
+        test(sso[1] === "de");
+        test(sso[2] === "fghi");
+        test(sso[3] === "xyz");
+        test(retval.length === 3);
+        test(retval[0] === "fghi");
+        test(retval[1] === "de");
+        test(retval[2] === "abc");
+    }
+
+    {
+        const bsi1 =
+            [
+                new Uint8Array([0x01, 0x11, 0x12]),
+                new Uint8Array([0xff])
+            ];
+
+        const bsi2 =
+            [
+                new Uint8Array([0x0e]),
+                new Uint8Array([0xf2, 0xf1])
+            ];
+
+        const [retval, bso] = await prx.opByteSS(bsi1, bsi2);
+
+        test(bso.length === 2);
+        test(bso[0].length === 1);
+        test(bso[0][0] === 0xff);
+        test(bso[1].length === 3);
+        test(bso[1][0] === 0x01);
+        test(bso[1][1] === 0x11);
+        test(bso[1][2] === 0x12);
+        test(retval.length === 4);
+        test(retval[0].length === 3);
+        test(retval[0][0] === 0x01);
+        test(retval[0][1] === 0x11);
+        test(retval[0][2] === 0x12);
+        test(retval[1].length === 1);
+        test(retval[1][0] === 0xff);
+        test(retval[2].length === 1);
+        test(retval[2][0] === 0x0e);
+        test(retval[3].length === 2);
+        test(retval[3][0] === 0xf2);
+        test(retval[3][1] === 0xf1);
+    }
+
+    {
+        const bsi1 =
+            [
+                [true],
+                [false],
+                [true, true]
+            ];
+
+        const bsi2 =
+            [
+                [false, false, true]
+            ];
+
+        const [retval, bso] = await prx.opBoolSS(bsi1, bsi2);
+
+        test(bso.length === 4);
+        test(bso[0].length === 1);
+        test(bso[0][0]);
+        test(bso[1].length === 1);
+        test(!bso[1][0]);
+        test(bso[2].length === 2);
+        test(bso[2][0]);
+        test(bso[2][1]);
+        test(bso[3].length === 3);
+        test(!bso[3][0]);
+        test(!bso[3][1]);
+        test(bso[3][2]);
+        test(retval.length === 3);
+        test(retval[0].length === 2);
+        test(retval[0][0]);
+        test(retval[0][1]);
+        test(retval[1].length === 1);
+        test(!retval[1][0]);
+        test(retval[2].length === 1);
+        test(retval[2][0]);
+    }
+
+    {
+        const ssi =
+            [
+                [1, 2, 5],
+                [13],
+                []
+            ];
+
+        const isi =
+            [
+                [24, 98],
+                [42]
+            ];
+
+        const l1 = new Ice.Long(0, 496);
+        const l2 = new Ice.Long(0, 1729);
+
+        const lsi =
+            [
+                [l1, l2]
+            ];
+
+        const [retval, sso, iso, lso] = await prx.opShortIntLongSS(ssi, isi, lsi);
+
+        test(retval.length === 1);
+        test(retval[0].length === 2);
+        test(retval[0][0].equals(l1));
+        test(retval[0][1].equals(l2));
+        test(sso.length === 3);
+        test(sso[0].length === 3);
+        test(sso[0][0] === 1);
+        test(sso[0][1] === 2);
+        test(sso[0][2] === 5);
+        test(sso[1].length === 1);
+        test(sso[1][0] === 13);
+        test(sso[2].length === 0);
+        test(iso.length === 2);
+        test(iso[0].length === 1);
+        test(iso[0][0] === 42);
+        test(iso[1].length === 2);
+        test(iso[1][0] === 24);
+        test(iso[1][1] === 98);
+        test(lso.length === 2);
+        test(lso[0].length === 2);
+        test(lso[0][0].equals(l1));
+        test(lso[0][1].equals(l2));
+        test(lso[1].length === 2);
+        test(lso[1][0].equals(l1));
+        test(lso[1][1].equals(l2));
+    }
+
+    {
+        const fsi =
+            [
+                [3.14],
+                [1.11],
+                []
+            ];
+
+        const dsi =
+            [
+                [1.1E10, 1.2E10, 1.3E10]
+            ];
+
+        const [retval, fso, dso] = await prx.opFloatDoubleSS(fsi, dsi);
+
+        test(fso.length === 3);
+        test(fso[0].length === 1);
+        test((fso[0][0] - 3.14) <= 0.01);
+        test(fso[1].length === 1);
+        test((fso[1][0] - 1.11) <= 0.01);
+        test(fso[2].length === 0);
+        test(dso.length === 1);
+        test(dso[0].length === 3);
+        test(dso[0][0] === 1.1E10);
+        test(dso[0][1] === 1.2E10);
+        test(dso[0][2] === 1.3E10);
+        test(retval.length === 2);
+        test(retval[0].length === 3);
+        test(retval[0][0] === 1.1E10);
+        test(retval[0][1] === 1.2E10);
+        test(retval[0][2] === 1.3E10);
+        test(retval[1].length === 3);
+        test(retval[1][0] === 1.1E10);
+        test(retval[1][1] === 1.2E10);
+        test(retval[1][2] === 1.3E10);
+    }
+
+    {
+        const ssi1 =
+            [
+                ["abc"],
+                ["de", "fghi"]
+            ];
+
+        const ssi2 =
+            [
+                [],
+                [],
+                ["xyz"]
+            ];
+
+        const [retval, sso] = await prx.opStringSS(ssi1, ssi2);
+        test(sso.length === 5);
+        test(sso[0].length === 1);
+        test(sso[0][0] === "abc");
+        test(sso[1].length === 2);
+        test(sso[1][0] === "de");
+        test(sso[1][1] === "fghi");
+        test(sso[2].length === 0);
+        test(sso[3].length === 0);
+        test(sso[4].length === 1);
+        test(sso[4][0] === "xyz");
+        test(retval.length === 3);
+        test(retval[0].length === 1);
+        test(retval[0][0] === "xyz");
+        test(retval[1].length === 0);
+        test(retval[2].length === 0);
+    }
+
+    {
+        const sssi1 =
+            [
+                [
+                    ["abc", "de"],
+                    ["xyz"]
+                ],
+                [
+                    ["hello"]
+                ]
+            ];
+
+        const sssi2 =
+            [
+                [
+                    ["", ""],
+                    ["abcd"]
+                ],
+                [
+                    [""]
+                ],
+                []
+            ];
+
+        const [retval, ssso] = await prx.opStringSSS(sssi1, sssi2);
+
+        test(ssso.length === 5);
+        test(ssso[0].length === 2);
+        test(ssso[0][0].length === 2);
+        test(ssso[0][1].length === 1);
+        test(ssso[1].length === 1);
+        test(ssso[1][0].length === 1);
+        test(ssso[2].length === 2);
+        test(ssso[2][0].length === 2);
+        test(ssso[2][1].length === 1);
+        test(ssso[3].length === 1);
+        test(ssso[3][0].length === 1);
+        test(ssso[4].length === 0);
+        test(ssso[0][0][0] === "abc");
+        test(ssso[0][0][1] === "de");
+        test(ssso[0][1][0] === "xyz");
+        test(ssso[1][0][0] === "hello");
+        test(ssso[2][0][0] === "");
+        test(ssso[2][0][1] === "");
+        test(ssso[2][1][0] === "abcd");
+        test(ssso[3][0][0] === "");
+
+        test(retval.length === 3);
+        test(retval[0].length === 0);
+        test(retval[1].length === 1);
+        test(retval[1][0].length === 1);
+        test(retval[2].length === 2);
+        test(retval[2][0].length === 2);
+        test(retval[2][1].length === 1);
+        test(retval[1][0][0] === "");
+        test(retval[2][0][0] === "");
+        test(retval[2][0][1] === "");
+        test(retval[2][1][0] === "abcd");
+    }
+
+    {
+        const di1 = new Test.ByteBoolD();
+        di1.set(10, true);
+        di1.set(100, false);
+
+        const di2 = new Test.ByteBoolD();
+        di2.set(10, true);
+        di2.set(11, false);
+        di2.set(101, true);
+
+        const [retval, p3] = await prx.opByteBoolD(di1, di2);
+        test(Ice.MapUtil.equals(p3, di1));
+        test(retval.size === 4);
+        test(retval.get(10) === true);
+        test(retval.get(11) === false);
+        test(retval.get(100) === false);
+        test(retval.get(101) === true);
+    }
+
+    {
+        const di1 = new Test.ShortIntD();
+        di1.set(110, -1);
+        di1.set(1100, 123123);
+
+        const di2 = new Test.ShortIntD();
+        di2.set(110, -1);
+        di2.set(111, -100);
+        di2.set(1101, 0);
+
+        const [retval, p3] = await prx.opShortIntD(di1, di2);
+        test(Ice.MapUtil.equals(p3, di1));
+        test(retval.size === 4);
+        test(retval.get(110) === -1);
+        test(retval.get(111) === -100);
+        test(retval.get(1100) === 123123);
+        test(retval.get(1101) === 0);
+    }
+
+    {
+        const di1 = new Test.LongFloatD();
+        di1.set(new Ice.Long(0, 999999110), -1.1);
+        di1.set(new Ice.Long(0, 999999111), 123123.2);
+
+        const di2 = new Test.LongFloatD();
+        di2.set(new Ice.Long(0, 999999110), -1.1);
+        di2.set(new Ice.Long(0, 999999120), -100.4);
+        di2.set(new Ice.Long(0, 999999130), 0.5);
+
+        const [retval, p3] = await prx.opLongFloatD(di1, di2);
+
+        test(p3.equals(di1, (v1, v2) => (Math.abs(v1) - Math.abs(v2)) <= 0.01));
+        test(retval.size === 4);
+        test(Math.abs(retval.get(new Ice.Long(0, 999999110))) - Math.abs(-1.1) <= 0.01);
+        test(Math.abs(retval.get(new Ice.Long(0, 999999120))) - Math.abs(-100.4) <= 0.01);
+        test(retval.get(new Ice.Long(0, 999999111)) - 123123.2 <= 0.01);
+        test(retval.get(new Ice.Long(0, 999999130)) - 0.5 <= 0.01);
+    }
+
+    {
+        const di1 = new Test.StringStringD();
+        di1.set("foo", "abc -1.1");
+        di1.set("bar", "abc 123123.2");
+
+        const di2 = new Test.StringStringD();
+        di2.set("foo", "abc -1.1");
+        di2.set("FOO", "abc -100.4");
+        di2.set("BAR", "abc 0.5");
+
+        const [retval, p3] = await prx.opStringStringD(di1, di2);
+        test(Ice.MapUtil.equals(p3, di1));
+        test(retval.size == 4);
+        test(retval.get("foo") === "abc -1.1");
+        test(retval.get("FOO") === "abc -100.4");
+        test(retval.get("bar") === "abc 123123.2");
+        test(retval.get("BAR") === "abc 0.5");
+    }
+
+    {
+        const di1 = new Test.StringMyEnumD();
+        di1.set("abc", Test.MyEnum.enum1);
+        di1.set("", Test.MyEnum.enum2);
+
+        const di2 = new Test.StringMyEnumD();
+        di2.set("abc", Test.MyEnum.enum1);
+        di2.set("qwerty", Test.MyEnum.enum3);
+        di2.set("Hello!!", Test.MyEnum.enum2);
+
+        const [retval, p3] = await prx.opStringMyEnumD(di1, di2);
+
+        test(Ice.MapUtil.equals(p3, di1));
+        test(retval.size === 4);
+        test(retval.get("abc") === Test.MyEnum.enum1);
+        test(retval.get("qwerty") === Test.MyEnum.enum3);
+        test(retval.get("") === Test.MyEnum.enum2);
+        test(retval.get("Hello!!") === Test.MyEnum.enum2);
+    }
+
+    {
+        const di1 = new Test.MyEnumStringD();
+        di1.set(Test.MyEnum.enum1, "abc");
+
+        const di2 = new Test.MyEnumStringD();
+        di2.set(Test.MyEnum.enum2, "Hello!!");
+        di2.set(Test.MyEnum.enum3, "qwerty");
+
+        const [retval, p3] = await prx.opMyEnumStringD(di1, di2);
+
+        test(Ice.MapUtil.equals(p3, di1));
+        test(retval.size === 3);
+        test(retval.get(Test.MyEnum.enum1) === "abc");
+        test(retval.get(Test.MyEnum.enum2) === "Hello!!");
+        test(retval.get(Test.MyEnum.enum3) === "qwerty");
+    }
+
+    {
+        const s11 = new Test.MyStruct(1, 1);
+        const s12 = new Test.MyStruct(1, 2);
+        const di1 = new Test.MyStructMyEnumD();
+        di1.set(s11, Test.MyEnum.enum1);
+        di1.set(s12, Test.MyEnum.enum2);
+        const s22 = new Test.MyStruct(2, 2);
+        const s23 = new Test.MyStruct(2, 3);
+        const di2 = new Test.MyStructMyEnumD();
+        di2.set(s11, Test.MyEnum.enum1);
+        di2.set(s22, Test.MyEnum.enum3);
+        di2.set(s23, Test.MyEnum.enum2);
+
+        const [retval, p3] = await prx.opMyStructMyEnumD(di1, di2);
+        test(p3.equals(di1));
+
+        test(retval.size === 4);
+        test(retval.get(s11) === Test.MyEnum.enum1);
+        test(retval.get(s12) === Test.MyEnum.enum2);
+        test(retval.get(s22) === Test.MyEnum.enum3);
+        test(retval.get(s23) === Test.MyEnum.enum2);
+    }
+
+    {
+        const ds1 = new Test.ByteBoolD();
+        ds1.set(10, true);
+        ds1.set(100, false);
+        const ds2 = new Test.ByteBoolD();
+        ds2.set(10, true);
+        ds2.set(11, false);
+        ds2.set(101, true);
+        const ds3 = new Test.ByteBoolD();
+        ds3.set(100, false);
+        ds3.set(101, false);
+
+        const [retval, p3] = await prx.opByteBoolDS([ds1, ds2], [ds3]);
+        test(retval.length == 2);
+        test(retval[0].size == 3);
+        test(retval[0].get(10) === true);
+        test(retval[0].get(11) === false);
+        test(retval[0].get(101) === true);
+        test(retval[1].size === 2);
+        test(retval[1].get(10) === true);
+        test(retval[1].get(100) === false);
+        test(p3.length == 3);
+        test(p3[0].size == 2);
+        test(p3[0].get(100) === false);
+        test(p3[0].get(101) === false);
+        test(p3[1].size == 2);
+        test(p3[1].get(10) === true);
+        test(p3[1].get(100) === false);
+        test(p3[2].size == 3);
+        test(p3[2].get(10) === true);
+        test(p3[2].get(11) === false);
+        test(p3[2].get(101) === true);
+    }
+
+    {
+        const di1 = new Test.ShortIntD();
+        di1.set(110, -1);
+        di1.set(1100, 123123);
+        const di2 = new Test.ShortIntD();
+        di2.set(110, -1);
+        di2.set(111, -100);
+        di2.set(1101, 0);
+        const di3 = new Test.ShortIntD();
+        di3.set(100, -1001);
+
+        const [retval, p3] = await prx.opShortIntDS([di1, di2], [di3]);
+        test(retval.length == 2);
+        test(retval[0].size == 3);
+        test(retval[0].get(110) === -1);
+        test(retval[0].get(111) === -100);
+        test(retval[0].get(1101) === 0);
+        test(retval[1].size === 2);
+        test(retval[1].get(110) === -1);
+        test(retval[1].get(1100) === 123123);
+
+        test(p3.length === 3);
+        test(p3[0].size === 1);
+        test(p3[0].get(100) === -1001);
+        test(p3[1].size === 2);
+        test(p3[1].get(110) === -1);
+        test(p3[1].get(1100) === 123123);
+        test(p3[2].size === 3);
+        test(p3[2].get(110) === -1);
+        test(p3[2].get(111) === -100);
+        test(p3[2].get(1101) === 0);
+    }
+
+    {
+        const di1 = new Test.LongFloatD();
+        di1.set(new Ice.Long(0, 999999110), -1.1);
+        di1.set(new Ice.Long(0, 999999111), 123123.2);
+        const di2 = new Test.LongFloatD();
+        di2.set(new Ice.Long(0, 999999110), -1.1);
+        di2.set(new Ice.Long(0, 999999120), -100.4);
+        di2.set(new Ice.Long(0, 999999130), 0.5);
+        const di3 = new Test.LongFloatD();
+        di3.set(new Ice.Long(0, 999999140), 3.14);
+
+        const [retval, p3] = await prx.opLongFloatDS([di1, di2], [di3]);
+        test(retval.length == 2);
+        test(retval[0].size == 3);
+        test(retval[0].get(new Ice.Long(0, 999999110)) - Math.abs(-1.1) <= 0.1);
+        test(retval[0].get(new Ice.Long(0, 999999120)) - Math.abs(-100.4) <= 0.1);
+        test(retval[0].get(new Ice.Long(0, 999999130)) - 0.5 <= 0.1);
+        test(retval[1].size == 2);
+        test(retval[1].get(new Ice.Long(0, 999999110)) - Math.abs(-1.1) <= 0.1);
+        test(retval[1].get(new Ice.Long(0, 999999111)) - 123123.2 <= 0.1);
+
+        test(p3.length == 3);
+        test(p3[0].size == 1);
+        test(p3[0].get(new Ice.Long(0, 999999140)) - 3.14 <= 0.1);
+        test(p3[1].size == 2);
+        test(p3[1].get(new Ice.Long(0, 999999110)) - Math.abs(-1.1) <= 0.1);
+        test(p3[1].get(new Ice.Long(0, 999999111)) - 123123.2 <= 0.1);
+        test(p3[2].size == 3);
+        test(p3[2].get(new Ice.Long(0, 999999110)) - Math.abs(-1.1) <= 0.1);
+        test(p3[2].get(new Ice.Long(0, 999999120)) - Math.abs(-100.4) <= 0.1);
+        test(p3[2].get(new Ice.Long(0, 999999130)) - 0.5 <= 0.1);
+    }
+
+    {
+        const di1 = new Test.StringStringD();
+        di1.set("foo", "abc -1.1");
+        di1.set("bar", "abc 123123.2");
+        const di2 = new Test.StringStringD();
+        di2.set("foo", "abc -1.1");
+        di2.set("FOO", "abc -100.4");
+        di2.set("BAR", "abc 0.5");
+        const di3 = new Test.StringStringD();
+        di3.set("f00", "ABC -3.14");
+
+        const [retval, p3] = await prx.opStringStringDS([di1, di2], [di3]);
+        test(retval.length === 2);
+        test(retval[0].size === 3);
+        test(retval[0].get("foo") === "abc -1.1");
+        test(retval[0].get("FOO") === "abc -100.4");
+        test(retval[0].get("BAR") === "abc 0.5");
+        test(retval[1].size === 2);
+        test(retval[1].get("foo") === "abc -1.1");
+        test(retval[1].get("bar") === "abc 123123.2");
+
+        test(p3.length === 3);
+        test(p3[0].size === 1);
+        test(p3[0].get("f00") === "ABC -3.14");
+        test(p3[1].size === 2);
+        test(p3[1].get("foo") === "abc -1.1");
+        test(p3[1].get("bar") === "abc 123123.2");
+        test(p3[2].size === 3);
+        test(p3[2].get("foo") === "abc -1.1");
+        test(p3[2].get("FOO") === "abc -100.4");
+        test(p3[2].get("BAR") === "abc 0.5");
+    }
+
+    {
+        const di1 = new Test.StringMyEnumD();
+        di1.set("abc", Test.MyEnum.enum1);
+        di1.set("", Test.MyEnum.enum2);
+        const di2 = new Test.StringMyEnumD();
+        di2.set("abc", Test.MyEnum.enum1);
+        di2.set("qwerty", Test.MyEnum.enum3);
+        di2.set("Hello!!", Test.MyEnum.enum2);
+        const di3 = new Test.StringMyEnumD();
+        di3.set("Goodbye", Test.MyEnum.enum1);
+
+        const [retval, p3] = await prx.opStringMyEnumDS([di1, di2], [di3]);
+
+        test(retval.length == 2);
+        test(retval[0].size == 3);
+        test(retval[0].get("abc") == Test.MyEnum.enum1);
+        test(retval[0].get("qwerty") == Test.MyEnum.enum3);
+        test(retval[0].get("Hello!!") == Test.MyEnum.enum2);
+        test(retval[1].size == 2);
+        test(retval[1].get("abc") == Test.MyEnum.enum1);
+        test(retval[1].get("") == Test.MyEnum.enum2);
+
+        test(p3.length == 3);
+        test(p3[0].size == 1);
+        test(p3[0].get("Goodbye") == Test.MyEnum.enum1);
+        test(p3[1].size == 2);
+        test(p3[1].get("abc") == Test.MyEnum.enum1);
+        test(p3[1].get("") == Test.MyEnum.enum2);
+        test(p3[2].size == 3);
+        test(p3[2].get("abc") == Test.MyEnum.enum1);
+        test(p3[2].get("qwerty") == Test.MyEnum.enum3);
+        test(p3[2].get("Hello!!") == Test.MyEnum.enum2);
+    }
+
+    {
+        const di1 = new Test.MyEnumStringD();
+        di1.set(Test.MyEnum.enum1, "abc");
+        const di2 = new Test.MyEnumStringD();
+        di2.set(Test.MyEnum.enum2, "Hello!!");
+        di2.set(Test.MyEnum.enum3, "qwerty");
+        const di3 = new Test.MyEnumStringD();
+        di3.set(Test.MyEnum.enum1, "Goodbye");
+
+        const [retval, p3] = await prx.opMyEnumStringDS([di1, di2], [di3]);
+        test(retval.length == 2);
+        test(retval[0].size == 2);
+        test(retval[0].get(Test.MyEnum.enum2) === "Hello!!");
+        test(retval[0].get(Test.MyEnum.enum3) === "qwerty");
+        test(retval[1].size == 1);
+        test(retval[1].get(Test.MyEnum.enum1) === "abc");
+
+        test(p3.length == 3);
+        test(p3[0].size == 1);
+        test(p3[0].get(Test.MyEnum.enum1) === "Goodbye");
+        test(p3[1].size == 1);
+        test(p3[1].get(Test.MyEnum.enum1) === "abc");
+        test(p3[2].size == 2);
+        test(p3[2].get(Test.MyEnum.enum2) === "Hello!!");
+        test(p3[2].get(Test.MyEnum.enum3) === "qwerty");
+    }
+
+    {
+        const s11 = new Test.MyStruct(1, 1);
+        const s12 = new Test.MyStruct(1, 2);
+        const di1 = new Test.MyStructMyEnumD();
+        di1.set(s11, Test.MyEnum.enum1);
+        di1.set(s12, Test.MyEnum.enum2);
+
+        const s22 = new Test.MyStruct(2, 2);
+        const s23 = new Test.MyStruct(2, 3);
+        const di2 = new Test.MyStructMyEnumD();
+        di2.set(s11, Test.MyEnum.enum1);
+        di2.set(s22, Test.MyEnum.enum3);
+        di2.set(s23, Test.MyEnum.enum2);
+
+        const di3 = new Test.MyStructMyEnumD();
+        di3.set(s23, Test.MyEnum.enum3);
+
+        const [retval, p3] = await prx.opMyStructMyEnumDS([di1, di2], [di3]);
+        test(retval.length == 2);
+        test(retval[0].size == 3);
+        test(retval[0].get(s11) === Test.MyEnum.enum1);
+        test(retval[0].get(s22) === Test.MyEnum.enum3);
+        test(retval[0].get(s23) === Test.MyEnum.enum2);
+        test(retval[1].size == 2);
+        test(retval[1].get(s11) === Test.MyEnum.enum1);
+        test(retval[1].get(s12) === Test.MyEnum.enum2);
+
+        test(p3.length == 3);
+        test(p3[0].size == 1);
+        test(p3[0].get(s23) === Test.MyEnum.enum3);
+        test(p3[1].size == 2);
+        test(p3[1].get(s11) === Test.MyEnum.enum1);
+        test(p3[1].get(s12) === Test.MyEnum.enum2);
+        test(p3[2].size == 3);
+        test(p3[2].get(s11) === Test.MyEnum.enum1);
+        test(p3[2].get(s22) === Test.MyEnum.enum3);
+        test(p3[2].get(s23) === Test.MyEnum.enum2);
+    }
+
+    {
+        const sdi1 = new Test.ByteByteSD();
+        sdi1.set(0x01, new Uint8Array([0x01, 0x11]));
+        sdi1.set(0x22, new Uint8Array([0x12]));
+        const sdi2 = new Test.ByteByteSD();
+        sdi2.set(0xf1, new Uint8Array([0xf2, 0xf3]));
+
+        const [retval, p3] = await prx.opByteByteSD(sdi1, sdi2);
+        test(p3.size == 1);
+        test(p3.get(0xf1).length === 2);
+        test(p3.get(0xf1)[0] === 0xf2);
+        test(p3.get(0xf1)[1] === 0xf3);
+        test(retval.size === 3);
+        test(retval.get(0x01).length === 2);
+        test(retval.get(0x01)[0] === 0x01);
+        test(retval.get(0x01)[1] === 0x11);
+        test(retval.get(0x22).length === 1);
+        test(retval.get(0x22)[0] === 0x12);
+        test(retval.get(0xf1).length === 2);
+        test(retval.get(0xf1)[0] === 0xf2);
+        test(retval.get(0xf1)[1] === 0xf3);
+    }
+
+    {
+        const si1 = [true, false];
+        const si2 = [false, true, true];
+        const sdi1 = new Test.BoolBoolSD();
+        sdi1.set(false, si1);
+        sdi1.set(true, si2);
+        const sdi2 = new Test.BoolBoolSD();
+        sdi2.set(false, si1);
+
+        const [retval, p3] = await prx.opBoolBoolSD(sdi1, sdi2);
+        test(p3.size === 1);
+        test(p3.get(false).length === 2);
+        test(p3.get(false)[0] === true);
+        test(p3.get(false)[1] === false);
+        test(retval.size === 2);
+        test(retval.get(false).length === 2);
+        test(retval.get(false)[0] === true);
+        test(retval.get(false)[1] === false);
+        test(retval.get(true).length === 3);
+        test(retval.get(true)[0] === false);
+        test(retval.get(true)[1] === true);
+        test(retval.get(true)[2] === true);
+    }
+
+    {
+        const sdi1 = new Test.ShortShortSD();
+        const sdi2 = new Test.ShortShortSD();
+
+        const si1 = [1, 2, 3];
+        const si2 = [4, 5];
+        const si3 = [6, 7];
+
+        sdi1.set(1, si1);
+        sdi1.set(2, si2);
+        sdi2.set(4, si3);
+
+        const [retval, p3] = await prx.opShortShortSD(sdi1, sdi2);
+        test(p3.size === 1);
+        test(p3.get(4).length === 2);
+        test(p3.get(4)[0] === 6);
+        test(p3.get(4)[1] === 7);
+        test(retval.size === 3);
+        test(retval.get(1).length === 3);
+        test(retval.get(1)[0] === 1);
+        test(retval.get(1)[1] === 2);
+        test(retval.get(1)[2] === 3);
+        test(retval.get(2).length === 2);
+        test(retval.get(2)[0] === 4);
+        test(retval.get(2)[1] === 5);
+        test(retval.get(4).length === 2);
+        test(retval.get(4)[0] === 6);
+        test(retval.get(4)[1] === 7);
+    }
+
+    {
+        const sdi1 = new Test.IntIntSD();
+        const sdi2 = new Test.IntIntSD();
+
+        const si1 = [100, 200, 300];
+        const si2 = [400, 500];
+        const si3 = [600, 700];
+
+        sdi1.set(100, si1);
+        sdi1.set(200, si2);
+        sdi2.set(400, si3);
+
+        const [retval, p3] = await prx.opIntIntSD(sdi1, sdi2);
+        test(p3.size === 1);
+        test(p3.get(400).length === 2);
+        test(p3.get(400)[0] === 600);
+        test(p3.get(400)[1] === 700);
+        test(retval.size === 3);
+        test(retval.get(100).length === 3);
+        test(retval.get(100)[0] === 100);
+        test(retval.get(100)[1] === 200);
+        test(retval.get(100)[2] === 300);
+        test(retval.get(200).length === 2);
+        test(retval.get(200)[0] === 400);
+        test(retval.get(200)[1] === 500);
+        test(retval.get(400).length === 2);
+        test(retval.get(400)[0] === 600);
+        test(retval.get(400)[1] === 700);
+    }
+
+    {
+        const sdi1 = new Test.LongLongSD();
+        const sdi2 = new Test.LongLongSD();
+
+        const si1 = [new Ice.Long(0, 999999110), new Ice.Long(0, 999999111), new Ice.Long(0, 999999110)];
+        const si2 = [new Ice.Long(0, 999999120), new Ice.Long(0, 999999130)];
+        const si3 = [new Ice.Long(0, 999999110), new Ice.Long(0, 999999120)];
+
+        sdi1.set(new Ice.Long(0, 999999990), si1);
+        sdi1.set(new Ice.Long(0, 999999991), si2);
+        sdi2.set(new Ice.Long(0, 999999992), si3);
+
+        const [retval, p3] = await prx.opLongLongSD(sdi1, sdi2);
+        test(p3.size == 1);
+        test(p3.get(new Ice.Long(0, 999999992)).length === 2);
+        test(p3.get(new Ice.Long(0, 999999992))[0].equals(new Ice.Long(0, 999999110)));
+        test(p3.get(new Ice.Long(0, 999999992))[1].equals(new Ice.Long(0, 999999120)));
+        test(retval.size == 3);
+        test(retval.get(new Ice.Long(0, 999999990)).length === 3);
+        test(retval.get(new Ice.Long(0, 999999990))[0].equals(new Ice.Long(0, 999999110)));
+        test(retval.get(new Ice.Long(0, 999999990))[1].equals(new Ice.Long(0, 999999111)));
+        test(retval.get(new Ice.Long(0, 999999990))[2].equals(new Ice.Long(0, 999999110)));
+        test(retval.get(new Ice.Long(0, 999999991)).length === 2);
+        test(retval.get(new Ice.Long(0, 999999991))[0].equals(new Ice.Long(0, 999999120)));
+        test(retval.get(new Ice.Long(0, 999999991))[1].equals(new Ice.Long(0, 999999130)));
+        test(retval.get(new Ice.Long(0, 999999992)).length === 2);
+        test(retval.get(new Ice.Long(0, 999999992))[0].equals(new Ice.Long(0, 999999110)));
+        test(retval.get(new Ice.Long(0, 999999992))[1].equals(new Ice.Long(0, 999999120)));
+    }
+
+    {
+        const sdi1 = new Test.StringFloatSD();
+        const sdi2 = new Test.StringFloatSD();
+
+        const si1 = [-1.1, 123123.2, 100.0];
+        const si2 = [42.24, -1.61];
+        const si3 = [-3.14, 3.14];
+
+        sdi1.set("abc", si1);
+        sdi1.set("ABC", si2);
+        sdi2.set("aBc", si3);
+
+        const [retval, p3] = await prx.opStringFloatSD(sdi1, sdi2);
+
+        test(p3.size === 1);
+        test(p3.get("aBc").length === 2);
+        test(p3.get("aBc")[0] - Math.abs(3.14) <= 0.1);
+        test(p3.get("aBc")[1] - 3.14 <= 0.1);
+        test(retval.size === 3);
+        test(retval.get("abc").length === 3);
+        test(retval.get("abc")[0] - Math.abs(1.1) <= 0.1);
+        test(retval.get("abc")[1] - 123123.2 <= 0.1);
+        test(retval.get("abc")[2] - 100.0 <= 0.1);
+        test(retval.get("ABC").length === 2);
+        test(retval.get("ABC")[0] - 42.24 <= 0.1);
+        test(retval.get("ABC")[1] - Math.abs(1.61) <= 0.1);
+        test(retval.get("aBc").length === 2);
+        test(retval.get("aBc")[0] - Math.abs(3.14) <= 0.1);
+        test(retval.get("aBc")[1] - 3.14 <= 0.1);
+    }
+
+    {
+        const sdi1 = new Test.StringDoubleSD();
+        const sdi2 = new Test.StringDoubleSD();
+
+        const si1 = [1.1E10, 1.2E10, 1.3E10];
+        const si2 = [1.4E10, 1.5E10];
+        const si3 = [1.6E10, 1.7E10];
+
+        sdi1.set("Hello!!", si1);
+        sdi1.set("Goodbye", si2);
+        sdi2.set("", si3);
+
+        const [retval, p3] = await prx.opStringDoubleSD(sdi1, sdi2);
+
+        test(p3.size === 1);
+        test(p3.get("").length === 2);
+        test(p3.get("")[0] === 1.6E10);
+        test(p3.get("")[1] === 1.7E10);
+        test(retval.size === 3);
+        test(retval.get("Hello!!").length === 3);
+        test(retval.get("Hello!!")[0] === 1.1E10);
+        test(retval.get("Hello!!")[1] === 1.2E10);
+        test(retval.get("Hello!!")[2] === 1.3E10);
+        test(retval.get("Goodbye").length === 2);
+        test(retval.get("Goodbye")[0] === 1.4E10);
+        test(retval.get("Goodbye")[1] === 1.5E10);
+        test(retval.get("").length === 2);
+        test(retval.get("")[0] === 1.6E10);
+        test(retval.get("")[1] === 1.7E10);
+    }
+
+    {
+        const sdi1 = new Test.StringStringSD();
+        const sdi2 = new Test.StringStringSD();
+
+        const si1 = ["abc", "de", "fghi"];
+        const si2 = ["xyz", "or"];
+        const si3 = ["and", "xor"];
+
+        sdi1.set("abc", si1);
+        sdi1.set("def", si2);
+        sdi2.set("ghi", si3);
+
+        const [retval, p3] = await prx.opStringStringSD(sdi1, sdi2);
+
+        test(p3.size === 1);
+        test(p3.get("ghi").length === 2);
+        test(p3.get("ghi")[0] === "and");
+        test(p3.get("ghi")[1] === "xor");
+        test(retval.size === 3);
+        test(retval.get("abc").length === 3);
+        test(retval.get("abc")[0] === "abc");
+        test(retval.get("abc")[1] === "de");
+        test(retval.get("abc")[2] === "fghi");
+        test(retval.get("def").length === 2);
+        test(retval.get("def")[0] === "xyz");
+        test(retval.get("def")[1] === "or");
+        test(retval.get("ghi").length === 2);
+        test(retval.get("ghi")[0] === "and");
+        test(retval.get("ghi")[1] === "xor");
+    }
+
+    {
+        const sdi1 = new Test.MyEnumMyEnumSD();
+        const sdi2 = new Test.MyEnumMyEnumSD();
+
+        const si1 = [Test.MyEnum.enum1, Test.MyEnum.enum1, Test.MyEnum.enum2];
+        const si2 = [Test.MyEnum.enum1, Test.MyEnum.enum2];
+        const si3 = [Test.MyEnum.enum3, Test.MyEnum.enum3];
+
+        sdi1.set(Test.MyEnum.enum3, si1);
+        sdi1.set(Test.MyEnum.enum2, si2);
+        sdi2.set(Test.MyEnum.enum1, si3);
+
+        const [retval, p3] = await prx.opMyEnumMyEnumSD(sdi1, sdi2);
+        test(p3.size == 1);
+        test(p3.get(Test.MyEnum.enum1).length == 2);
+        test(p3.get(Test.MyEnum.enum1)[0] == Test.MyEnum.enum3);
+        test(p3.get(Test.MyEnum.enum1)[1] == Test.MyEnum.enum3);
+        test(retval.size === 3);
+        test(retval.get(Test.MyEnum.enum3).length == 3);
+        test(retval.get(Test.MyEnum.enum3)[0] == Test.MyEnum.enum1);
+        test(retval.get(Test.MyEnum.enum3)[1] == Test.MyEnum.enum1);
+        test(retval.get(Test.MyEnum.enum3)[2] == Test.MyEnum.enum2);
+        test(retval.get(Test.MyEnum.enum2).length == 2);
+        test(retval.get(Test.MyEnum.enum2)[0] == Test.MyEnum.enum1);
+        test(retval.get(Test.MyEnum.enum2)[1] == Test.MyEnum.enum2);
+        test(retval.get(Test.MyEnum.enum1).length == 2);
+        test(retval.get(Test.MyEnum.enum1)[0] == Test.MyEnum.enum3);
+        test(retval.get(Test.MyEnum.enum1)[1] == Test.MyEnum.enum3);
+    }
+
+    {
+        const lengths = [0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000];
+
+        for(const l of lengths)
+        {
+            const s = new Array(l);
+            for(let i = 0; i < l; ++i)
+            {
+                s[i] = i;
+            }
+
+            const r = await prx.opIntS(s);
+            test(r.length == l);
+            for(let j = 0; j < r.length; ++j)
+            {
+                test(r[j] == -j);
+            }
+        }
+    }
+
+    {
+        const ctx = new Ice.Context();
+        ctx.set("one", "ONE");
+        ctx.set("two", "TWO");
+        ctx.set("three", "THREE");
+        {
+            test(prx.ice_getContext().size === 0);
+            const r = await prx.opContext();
+            test(!Ice.MapUtil.equals(r, ctx));
+        }
+
+        {
+            const r = await prx.opContext(ctx);
+            test(prx.ice_getContext().size === 0);
+            test(Ice.MapUtil.equals(r, ctx));
+        }
+
+        {
+            const p2 = await Test.MyClassPrx.checkedCast(prx.ice_context(ctx));
+            test(Ice.MapUtil.equals(p2.ice_getContext(), ctx));
+            let r = await p2.opContext();
+            test(Ice.MapUtil.equals(r, ctx));
+            r = await p2.opContext(ctx);
+            test(Ice.MapUtil.equals(r, ctx));
+        }
+    }
+
+    if(!bidir)
+    {
+        //
+        // Test implicit context propagation
+        //
+        const initData = new Ice.InitializationData();
+        initData.properties = communicator.getProperties().clone();
+        initData.properties.setProperty("Ice.ImplicitContext", "Shared");
+
+        const ic = Ice.initialize(initData);
+
+        let ctx = new Ice.Context();
+        ctx.set("one", "ONE");
+        ctx.set("two", "TWO");
+        ctx.set("three", "THREE");
+
+        let p3 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:" + helper.getTestEndpoint()));
+
+        ic.getImplicitContext().setContext(ctx);
+        test(Ice.MapUtil.equals(ic.getImplicitContext().getContext(), ctx));
+        test(Ice.MapUtil.equals(await p3.opContext(), ctx));
+
+        test(ic.getImplicitContext().containsKey("zero") == false);
+        const r = ic.getImplicitContext().put("zero", "ZERO");
+        test(r === undefined);
+        test(ic.getImplicitContext().get("zero") == "ZERO");
+
+        ctx = ic.getImplicitContext().getContext();
+        test(Ice.MapUtil.equals(await p3.opContext(), ctx));
+
+        const prxContext = new Ice.Context();
+        prxContext.set("one", "UN");
+        prxContext.set("four", "QUATRE");
+
+        const combined = new Ice.Context(prxContext);
+        for(const [key, value] of ctx)
+        {
+            if(!combined.has(key))
+            {
+                combined.set(key, value);
+            }
+        }
+
+        test(combined.get("one") == "UN");
+
+        p3 = Test.MyClassPrx.uncheckedCast(p3.ice_context(prxContext));
+
+        ic.getImplicitContext().setContext(null);
+        test(Ice.MapUtil.equals(await p3.opContext(), prxContext));
+
+        ic.getImplicitContext().setContext(ctx);
+        test(Ice.MapUtil.equals(await p3.opContext(), combined));
+
+        test(ic.getImplicitContext().remove("one") == "ONE");
+
+        await ic.destroy();
+    }
+
+    {
+        const d = 1278312346.0 / 13.0;
+        const ds = [];
+        for(let i = 0; i < 5; i++)
+        {
+            ds[i] = d;
+        }
+
+        await prx.opDoubleMarshaling(d, ds);
+        await prx.opIdempotent();
+        await prx.opNonmutating();
+    }
+
+    {
+
+        test(await prx.opByte1(0xFF) == 0xFF);
+        test(await prx.opShort1(0x7FFF) == 0x7FFF);
+        test(await prx.opInt1(0x7FFFFFFF) == 0x7FFFFFFF);
+        test((await prx.opLong1(new Ice.Long(0x7FFFFFFF, 0xFFFFFFFF))).equals(new Ice.Long(0x7FFFFFFF, 0xFFFFFFFF)));
+        test(await prx.opFloat1(1.0) == 1.0);
+        test(await prx.opDouble1(1.0) == 1.0);
+        test(await prx.opString1("opString1") == "opString1");
+        test((await prx.opStringS1(null)).length === 0);
+        test((await prx.opByteBoolD1(null)).size === 0);
+        test((await prx.opStringS2(null)).length === 0);
+        test((await prx.opByteBoolD2(null)).size === 0);
+
+        const d = Test.MyDerivedClassPrx.uncheckedCast(prx);
+        let s = new Test.MyStruct1();
+        s.tesT = "Test.MyStruct1.s";
+        s.myClass = null;
+        s.myStruct1 = "Test.MyStruct1.myStruct1";
+        s = await d.opMyStruct1(s);
+        test(s.tesT == "Test.MyStruct1.s");
+        test(s.myClass === null);
+        test(s.myStruct1 == "Test.MyStruct1.myStruct1");
+        let c = new Test.MyClass1();
+        c.tesT = "Test.MyClass1.testT";
+        c.myClass = null;
+        c.myClass1 = "Test.MyClass1.myClass1";
+        c = await d.opMyClass1(c);
+        test(c.tesT == "Test.MyClass1.testT");
+        test(c.myClass === null);
+        test(c.myClass1 == "Test.MyClass1.myClass1");
+    }
+
+    {
+        const p1 = await prx.opMStruct1();
+        p1.e = Test.MyEnum.enum3;
+        const [p2, p3] = await prx.opMStruct2(p1);
+        test(p2.equals(p1) && p3.equals(p1));
+    }
+
+    {
+        await prx.opMSeq1();
+        const p1 = ["test"];
+        const [p2, p3] = await prx.opMSeq2(p1);
+        test(Ice.ArrayUtil.equals(p2, p1) && Ice.ArrayUtil.equals(p3, p1));
+    }
+
+    {
+        await prx.opMDict1();
+        const p1 = new Map();
+        p1.set("test", "test");
+        const [p2, p3] = await prx.opMDict2(p1);
+        test(Ice.MapUtil.equals(p2, p1) && Ice.MapUtil.equals(p3, p1));
+    }
+
+    {
+        const ds = [];
+        for(let i = 0; i < 5; i++)
+        {
+            ds[i] = 1278312346.0 / 13.0;
+        }
+        await prx.opDoubleMarshaling(1278312346.0 / 13.0, ds);
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/optional/AMDInitialI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/optional/AMDInitialI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/optional/AMDInitialI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/optional/AMDInitialI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,335 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+
+export class AMDInitialI extends Test.Initial
+{
+    shutdown(current:Ice.Current)
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    pingPong(obj:Ice.Value, current:Ice.Current):Ice.Value
+    {
+        return obj;
+    }
+
+    opOptionalException(a:number, b:string, o:Test.OneOptional, current:Ice.Current):void
+    {
+        const ex = new Test.OptionalException();
+        if(a !== undefined)
+        {
+            ex.a = a;
+        }
+        else
+        {
+            ex.a = undefined; // The member "a" has a default value.
+        }
+        if(b !== undefined)
+        {
+            ex.b = b;
+        }
+        if(o !== undefined)
+        {
+            ex.o = o;
+        }
+        throw ex;
+    }
+
+    opDerivedException(a:number, b:string, o:Test.OneOptional, current:Ice.Current):void
+    {
+        const ex = new Test.DerivedException();
+        if(a !== undefined)
+        {
+            ex.a = a;
+        }
+        else
+        {
+            ex.a = undefined; // The member "a" has a default value.
+        }
+        if(b !== undefined)
+        {
+            ex.b = b;
+            ex.ss = b;
+        }
+        else
+        {
+            ex.ss = undefined; // The member "ss" has a default value.
+        }
+        if(o !== undefined)
+        {
+            ex.o = o;
+            ex.o2 = o;
+        }
+        throw ex;
+    }
+
+    opRequiredException(a:number, b:string, o:Test.OneOptional, current:Ice.Current):void
+    {
+        const ex = new Test.RequiredException();
+        if(a !== undefined)
+        {
+            ex.a = a;
+        }
+        else
+        {
+            ex.a = undefined; // The member "a" has a default value.
+        }
+        if(b !== undefined)
+        {
+            ex.b = b;
+            ex.ss = b;
+        }
+        if(o !== undefined)
+        {
+            ex.o = o;
+            ex.o2 = o;
+        }
+        throw ex;
+    }
+
+    opByte(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opBool(p1:boolean, current:Ice.Current):[boolean, boolean]
+    {
+        return [p1, p1];
+    }
+
+    opShort(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opInt(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opLong(p1:Ice.Long, current:Ice.Current):[Ice.Long, Ice.Long]
+    {
+        return [p1, p1];
+    }
+
+    opFloat(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opDouble(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opString(p1:string, current:Ice.Current):[string, string]
+    {
+        return [p1, p1];
+    }
+
+    opMyEnum(p1:Test.MyEnum, current:Ice.Current):[Test.MyEnum, Test.MyEnum]
+    {
+        return [p1, p1];
+    }
+
+    opSmallStruct(p1:Test.SmallStruct, current:Ice.Current):[Test.SmallStruct, Test.SmallStruct]
+    {
+        return [p1, p1];
+    }
+
+    opFixedStruct(p1:Test.FixedStruct, current:Ice.Current):[Test.FixedStruct, Test.FixedStruct]
+    {
+        return [p1, p1];
+    }
+
+    opVarStruct(p1:Test.VarStruct, current:Ice.Current):[Test.VarStruct, Test.VarStruct]
+    {
+        return [p1, p1];
+    }
+
+    opOneOptional(p1:Test.OneOptional, current:Ice.Current):[Test.OneOptional, Test.OneOptional]
+    {
+        return [p1, p1];
+    }
+
+    opOneOptionalProxy(p1:Ice.ObjectPrx, current:Ice.Current):[Ice.ObjectPrx, Ice.ObjectPrx]
+    {
+        return [p1, p1];
+    }
+
+    opByteSeq(p1:Test.ByteSeq, current:Ice.Current):[Test.ByteSeq, Test.ByteSeq]
+    {
+        return [p1, p1];
+    }
+
+    opBoolSeq(p1:Test.BoolSeq, current:Ice.Current):[Test.BoolSeq, Test.BoolSeq]
+    {
+        return [p1, p1];
+    }
+
+    opShortSeq(p1:Test.ShortSeq, current:Ice.Current):[Test.ShortSeq, Test.ShortSeq]
+    {
+        return [p1, p1];
+    }
+
+    opIntSeq(p1:Test.IntSeq, current:Ice.Current):[Test.IntSeq, Test.IntSeq]
+    {
+        return [p1, p1];
+    }
+
+    opLongSeq(p1:Test.LongSeq, current:Ice.Current):[Test.LongSeq, Test.LongSeq]
+    {
+        return [p1, p1];
+    }
+
+    opFloatSeq(p1:Test.FloatSeq, current:Ice.Current):[Test.FloatSeq, Test.FloatSeq]
+    {
+        return [p1, p1];
+    }
+
+    opDoubleSeq(p1:Test.DoubleSeq, current:Ice.Current):[Test.DoubleSeq, Test.DoubleSeq]
+    {
+        return [p1, p1];
+    }
+
+    opStringSeq(p1:Test.StringSeq, current:Ice.Current):[Test.StringSeq, Test.StringSeq]
+    {
+        return [p1, p1];
+    }
+
+    opSmallStructSeq(p1:Test.SmallStructSeq, current:Ice.Current):[Test.SmallStructSeq, Test.SmallStructSeq]
+    {
+        return [p1, p1];
+    }
+
+    opSmallStructList(p1:Test.SmallStructList, current:Ice.Current):[Test.SmallStructList, Test.SmallStructList]
+    {
+        return [p1, p1];
+    }
+
+    opFixedStructSeq(p1:Test.FixedStructSeq, current:Ice.Current):[Test.FixedStructSeq, Test.FixedStructSeq]
+    {
+        return [p1, p1];
+    }
+
+    opFixedStructList(p1:Test.FixedStructList, current:Ice.Current):[Test.FixedStructList, Test.FixedStructList]
+    {
+        return [p1, p1];
+    }
+
+    opVarStructSeq(p1:Test.VarStructSeq, current:Ice.Current):[Test.VarStructSeq, Test.VarStructSeq]
+    {
+        return [p1, p1];
+    }
+
+    opSerializable(p1:Test.Serializable, current:Ice.Current):[Test.Serializable, Test.Serializable]
+    {
+        return [p1, p1];
+    }
+
+    opIntIntDict(p1:Test.IntIntDict, current:Ice.Current):[Test.IntIntDict, Test.IntIntDict]
+    {
+        return [p1, p1];
+    }
+
+    opStringIntDict(p1:Test.StringIntDict, current:Ice.Current):[Test.StringIntDict, Test.StringIntDict]
+    {
+        return [p1, p1];
+    }
+
+    opIntOneOptionalDict(p1:Test.IntOneOptionalDict, current:Ice.Current):[Test.IntOneOptionalDict, Test.IntOneOptionalDict]
+    {
+        return [p1, p1];
+    }
+
+    opClassAndUnknownOptional(p:Test.A, current:Ice.Current):void
+    {
+    }
+
+    sendOptionalClass(req:boolean, one:Test.OneOptional, current:Ice.Current):void
+    {
+    }
+
+    returnOptionalClass(req:boolean, current:Ice.Current):Test.OneOptional
+    {
+        return new Test.OneOptional(53);
+    }
+
+    opG(g:Test.G, current:Ice.Current):Test.G
+    {
+        return g;
+    }
+
+    opVoid(current:Ice.Current):void
+    {
+    }
+
+    opMStruct1(current:Ice.Current):Test.SmallStruct
+    {
+        return new Test.SmallStruct();
+    }
+
+    opMStruct2(p1:Test.SmallStruct, current:Ice.Current):[Test.SmallStruct, Test.SmallStruct]
+    {
+        return [p1, p1];
+    }
+
+    opMSeq1(current:Ice.Current):Test.StringSeq
+    {
+        return [];
+    }
+
+    opMSeq2(p1:Test.StringSeq, current:Ice.Current):[Test.StringSeq, Test.StringSeq]
+    {
+        return [p1, p1];
+    }
+
+    opMDict1(current:Ice.Current):Test.StringIntDict
+    {
+        return new Map();
+    }
+
+    opMDict2(p1:Test.StringIntDict, current:Ice.Current):[Test.StringIntDict, Test.StringIntDict]
+    {
+        return [p1, p1];
+    }
+
+    opMG1(current:Ice.Current):Test.G
+    {
+        return new Test.G();
+    }
+
+    opMG2(p1:Test.G, current:Ice.Current):[Test.G, Test.G]
+    {
+        return [p1, p1];
+    }
+
+    supportsRequiredParams(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsJavaSerializable(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsCsharpSerializable(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsCppStringView(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsNullOptional(current:Ice.Current):boolean
+    {
+        return true;
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/optional/ClientPrivate.ice zeroc-ice-3.7.2/js/test/typescript/Ice/optional/ClientPrivate.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/optional/ClientPrivate.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/optional/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Test.ice>
+
+[["js:es6-module"]]
+
+module Test
+{
+
+//
+// The server doesn't know this class.
+//
+// We don't define it in JavaScript to allow the cross tests to work when running
+// only the JavaScript server within the browser (which loads ClientPrivate.js for
+// the server as well)
+//
+// class D extends B
+// {
+//     string ds;
+//     optional(990) StringSeq seq;
+//     optional(1000) A ao;
+// }
+
+//
+// This class is a hack that allows us to invoke the opClassAndUnknownOptional operation
+// on the server and pass an optional argument. This isn't necessary in other language
+// mappings where the public stream API is available.
+//
+interface Initial2
+{
+    void opClassAndUnknownOptional(A p, optional(1) Object o);
+
+    void opVoid(optional(1) int a, optional(2) string v);
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/optional/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/optional/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/optional/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/optional/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,878 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+const ArrayUtil = Ice.ArrayUtil;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const communicator = this.communicator();
+        const out = this.getWriter();
+        out.write("testing stringToProxy... ");
+        const ref = "initial:" + this.getTestEndpoint();
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        let oo1 = new Test.OneOptional();
+        oo1.a = 15;
+
+        out.write("testing checked cast... ");
+        const initial = await Test.InitialPrx.checkedCast(base);
+        test(initial !== null);
+        test(initial.equals(base));
+        out.writeLine("ok");
+
+        out.write("testing marshaling... ");
+
+        const oo4 = await initial.pingPong(new Test.OneOptional()) as Test.OneOptional;
+        test(oo4.a === undefined);
+
+        const oo5 = await initial.pingPong(oo1) as Test.OneOptional;
+        test(oo5.a === oo1.a);
+
+        const mo4 = await initial.pingPong(new Test.MultiOptional()) as Test.MultiOptional;
+        test(mo4.a === undefined);
+        test(mo4.b === undefined);
+        test(mo4.c === undefined);
+        test(mo4.d === undefined);
+        test(mo4.e === undefined);
+        test(mo4.f === undefined);
+        test(mo4.g === undefined);
+        test(mo4.h === undefined);
+        test(mo4.i === undefined);
+        test(mo4.j === undefined);
+        test(mo4.k === undefined);
+        test(mo4.bs === undefined);
+        test(mo4.ss === undefined);
+        test(mo4.iid === undefined);
+        test(mo4.sid === undefined);
+        test(mo4.fs === undefined);
+        test(mo4.vs === undefined);
+
+        test(mo4.shs === undefined);
+        test(mo4.es === undefined);
+        test(mo4.fss === undefined);
+        test(mo4.vss === undefined);
+        test(mo4.oos === undefined);
+        test(mo4.oops === undefined);
+
+        test(mo4.ied === undefined);
+        test(mo4.ifsd === undefined);
+        test(mo4.ivsd === undefined);
+        test(mo4.iood === undefined);
+        test(mo4.ioopd === undefined);
+
+        test(mo4.bos === undefined);
+
+        test(mo4.ser === undefined);
+
+        const mo1 = new Test.MultiOptional();
+        mo1.a = 15;
+        mo1.b = true;
+        mo1.c = 19;
+        mo1.d = 78;
+        mo1.e = new Ice.Long(0, 99);
+        mo1.f = 5.5;
+        mo1.g = 1.0;
+        mo1.h = "test";
+        mo1.i = Test.MyEnum.MyEnumMember;
+        mo1.j = communicator.stringToProxy("test");
+        mo1.k = mo1;
+        mo1.bs = new Uint8Array([5]);
+        mo1.ss = ["test", "test2"];
+        mo1.iid = new Map();
+        mo1.iid.set(4, 3);
+        mo1.sid = new Map();
+        mo1.sid.set("test", 10);
+        mo1.fs = new Test.FixedStruct();
+        mo1.fs.m = 78;
+        mo1.vs = new Test.VarStruct();
+        mo1.vs.m = "hello";
+
+        mo1.shs = [1];
+        mo1.es = [Test.MyEnum.MyEnumMember, Test.MyEnum.MyEnumMember];
+        mo1.fss = [mo1.fs];
+        mo1.vss = [mo1.vs];
+        mo1.oos = [oo1];
+        mo1.oops = [communicator.stringToProxy("test")];
+
+        mo1.ied = new Map();
+        mo1.ied.set(4, Test.MyEnum.MyEnumMember);
+        mo1.ifsd = new Map();
+        mo1.ifsd.set(4, mo1.fs);
+        mo1.ivsd = new Map();
+        mo1.ivsd.set(5, mo1.vs);
+        mo1.iood = new Map();
+        mo1.iood.set(5, new Test.OneOptional(15));
+        mo1.ioopd = new Map();
+        mo1.ioopd.set(5, communicator.stringToProxy("test"));
+
+        mo1.bos = [false, true, false];
+
+        const mo5 = await initial.pingPong(mo1) as Test.MultiOptional;
+
+        test(mo1.a == mo5.a);
+        test(mo1.b == mo5.b);
+        test(mo1.c == mo5.c);
+        test(mo1.d == mo5.d);
+        test(mo1.e.equals(mo5.e));
+        test(mo1.f == mo5.f);
+        test(mo1.g == mo5.g);
+        test(mo1.h == mo5.h);
+        test(mo1.i == mo5.i);
+        test(mo1.j.equals(mo5.j));
+        test(mo5.k == mo5);
+        test(ArrayUtil.equals(mo5.bs, mo1.bs));
+        test(ArrayUtil.equals(mo5.ss, mo1.ss));
+        test(mo5.iid.get(4) == 3);
+        test(mo5.sid.get("test") == 10);
+        test(mo5.fs.equals(mo1.fs));
+        test(mo5.vs.equals(mo1.vs));
+        test(ArrayUtil.equals(mo5.shs, mo1.shs));
+        test(mo5.es[0] == Test.MyEnum.MyEnumMember && mo5.es[1] == Test.MyEnum.MyEnumMember);
+        test(mo5.fss[0].equals(new Test.FixedStruct(78)));
+        test(mo5.vss[0].equals(new Test.VarStruct("hello")));
+        test(mo5.oos[0].a == 15);
+        test(mo5.oops[0].equals(communicator.stringToProxy("test")));
+
+        test(mo5.ied.get(4) == Test.MyEnum.MyEnumMember);
+        test(mo5.ifsd.get(4).equals(new Test.FixedStruct(78)));
+        test(mo5.ivsd.get(5).equals(new Test.VarStruct("hello")));
+        test(mo5.iood.get(5).a == 15);
+        test(mo5.ioopd.get(5).equals(communicator.stringToProxy("test")));
+
+        test(ArrayUtil.equals(mo5.bos, [false, true, false]));
+
+        // Clear the first half of the optional parameters
+        const mo6 = new Test.MultiOptional();
+        mo6.b = mo5.b;
+        mo6.d = mo5.d;
+        mo6.f = mo5.f;
+        mo6.h = mo5.h;
+        mo6.j = mo5.j;
+        mo6.bs = mo5.bs;
+        mo6.iid = mo5.iid;
+        mo6.fs = mo5.fs;
+        mo6.shs = mo5.shs;
+        mo6.fss = mo5.fss;
+        mo6.oos = mo5.oos;
+        mo6.ifsd = mo5.ifsd;
+        mo6.iood = mo5.iood;
+        mo6.bos = mo5.bos;
+
+        const mo7 = await initial.pingPong(mo6) as Test.MultiOptional;
+        test(mo7.a === undefined);
+        test(mo7.b == mo1.b);
+        test(mo7.c === undefined);
+        test(mo7.d == mo1.d);
+        test(mo7.e === undefined);
+        test(mo7.f == mo1.f);
+        test(mo7.g === undefined);
+        test(mo7.h == mo1.h);
+        test(mo7.i === undefined);
+        test(mo7.j.equals(mo1.j));
+        test(mo7.k === undefined);
+        test(ArrayUtil.equals(mo7.bs, mo1.bs));
+        test(mo7.ss === undefined);
+        test(mo7.iid.get(4) == 3);
+        test(mo7.sid === undefined);
+        test(mo7.fs.equals(mo1.fs));
+        test(mo7.vs === undefined);
+        test(ArrayUtil.equals(mo7.shs, mo1.shs));
+        test(mo7.es === undefined);
+        test(mo7.fss[0].equals(new Test.FixedStruct(78)));
+        test(mo7.vss === undefined);
+        test(mo7.oos[0].a == 15);
+        test(mo7.oops === undefined);
+
+        test(mo7.ied === undefined);
+        test(mo7.ifsd.get(4).equals(new Test.FixedStruct(78)));
+        test(mo7.ivsd === undefined);
+        test(mo7.iood.get(5).a == 15);
+        test(mo7.ioopd === undefined);
+
+        test(ArrayUtil.equals(mo7.bos, [false, true, false]));
+
+        // Clear the second half of the optional parameters
+        const mo8 = new Test.MultiOptional();
+        mo8.a = mo1.a;
+        mo8.c = mo1.c;
+        mo8.e = mo1.e;
+        mo8.g = mo1.g;
+        mo8.i = mo1.i;
+        mo8.k = mo8;
+        mo8.ss = mo1.ss;
+        mo8.sid = mo1.sid;
+        mo8.vs = mo1.vs;
+
+        mo8.es = mo1.es;
+        mo8.vss = mo1.vss;
+        mo8.oops = mo1.oops;
+
+        mo8.ied = mo1.ied;
+        mo8.ivsd = mo1.ivsd;
+        mo8.ioopd = mo1.ioopd;
+
+        const mo9 = await initial.pingPong(mo8) as Test.MultiOptional;
+
+        test(mo9.a == mo1.a);
+        test(mo9.b === undefined);
+        test(mo9.c == mo1.c);
+        test(mo9.d === undefined);
+        test(mo9.e.equals(mo1.e));
+        test(mo9.f === undefined);
+        test(mo9.g == mo1.g);
+        test(mo9.h === undefined);
+        test(mo9.i == mo1.i);
+        test(mo9.j === undefined);
+        test(mo9.k == mo9);
+        test(mo9.bs === undefined);
+        test(ArrayUtil.equals(mo9.ss, mo1.ss));
+        test(mo9.iid === undefined);
+        test(mo9.sid.get("test") == 10);
+        test(mo9.fs === undefined);
+        test(mo9.vs.equals(mo1.vs));
+
+        test(mo9.shs === undefined);
+        test(mo9.es[0] == Test.MyEnum.MyEnumMember && mo9.es[1] == Test.MyEnum.MyEnumMember);
+        test(mo9.fss === undefined);
+        test(mo9.vss[0].equals(new Test.VarStruct("hello")));
+        test(mo9.oos === undefined);
+        test(mo9.oops[0].equals(communicator.stringToProxy("test")));
+
+        test(mo9.ied.get(4) == Test.MyEnum.MyEnumMember);
+        test(mo9.ifsd === undefined);
+        test(mo9.ivsd.get(5).equals(new Test.VarStruct("hello")));
+        test(mo9.iood === undefined);
+        test(mo9.ioopd.get(5).equals(communicator.stringToProxy("test")));
+
+        test(mo9.bos === undefined);
+
+        //
+        // Use the 1.0 encoding with operations whose only class parameters are optional.
+        //
+        const initial2 = initial.ice_encodingVersion(Ice.Encoding_1_0);
+        const oo = new Test.OneOptional(53);
+
+        await initial.sendOptionalClass(true, oo);
+        await initial2.sendOptionalClass(true, oo);
+        oo1 = await initial.returnOptionalClass(true);
+        test(oo1 !== undefined && oo1.a == 53);
+        oo1 = await initial2.returnOptionalClass(true);
+        test(oo1 === undefined);
+
+        const recursive1 = [new Test.Recursive()];
+        const recursive2 = [new Test.Recursive()];
+        recursive1[0].value = recursive2;
+        const outer = new Test.Recursive();
+        outer.value = recursive1;
+        await initial.pingPong(outer);
+
+        let g = new Test.G();
+        g.gg1Opt = new Test.G1("gg1Opt");
+        g.gg2 = new Test.G2(new Ice.Long(0, 10));
+        g.gg2Opt = new Test.G2(new Ice.Long(0, 20));
+        g.gg1 = new Test.G1("gg1");
+
+        g = await initial.opG(g);
+
+        test(g.gg1Opt.a == "gg1Opt");
+        test(g.gg2.a.equals(new Ice.Long(0, 10)));
+        test(g.gg2Opt.a.equals(new Ice.Long(0, 20)));
+        test(g.gg1.a == "gg1");
+
+        const init2 = Test.Initial2Prx.uncheckedCast(initial);
+        await init2.opVoid(5, "test");
+        out.writeLine("ok");
+
+        out.write("testing marshaling of large containers with fixed size elements... ");
+        let mc = new Test.MultiOptional();
+
+        mc.bs = new Uint8Array(1000);
+        mc.shs = new Array(300);
+
+        mc.fss = [];
+        for(let i = 0; i < 300; ++i)
+        {
+            mc.fss[i] = new Test.FixedStruct();
+        }
+
+        mc.ifsd = new Map();
+        for(let i = 0; i < 300; ++i)
+        {
+            mc.ifsd.set(i, new Test.FixedStruct());
+        }
+        mc = await initial.pingPong(mc) as Test.MultiOptional;
+
+        test(mc.bs.length == 1000);
+        test(mc.shs.length == 300);
+        test(mc.fss.length == 300);
+        test(mc.ifsd.size == 300);
+
+        out.writeLine("ok");
+
+        out.write("testing tag marshaling... ");
+        let b = await initial.pingPong(new Test.B()) as Test.B;
+
+        test(b.ma === undefined);
+        test(b.mb === undefined);
+        test(b.mc === undefined);
+
+        b.ma = 10;
+        b.mb = 11;
+        b.mc = 12;
+        b.md = 13;
+
+        b = await initial.pingPong(b) as Test.B;
+
+        test(b.ma == 10);
+        test(b.mb == 11);
+        test(b.mc == 12);
+        test(b.md == 13);
+        out.writeLine("ok");
+
+        out.write("testing marshaling of objects with optional objects... ");
+        let f = new Test.F();
+        f.af = new Test.A();
+        f.ae = f.af;
+        f = await initial.pingPong(f) as Test.F;
+        test(f.ae === f.af);
+        out.writeLine("ok");
+
+        out.write("testing optional with default values... ");
+
+        let wd = await initial.pingPong(new Test.WD()) as Test.WD;
+        test(wd.a == 5);
+        test(wd.s == "test");
+        wd.a = undefined;
+        wd.s = undefined;
+        wd = await initial.pingPong(wd) as Test.WD;
+
+        test(wd.a === undefined);
+        test(wd.s === undefined);
+        out.writeLine("ok");
+
+        out.write("testing optional parameters... ");
+        {
+            let [p1, p2] = await initial.opByte(); // same as initial.opByte(undefined);
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opByte(56);
+            test(p1 === 56);
+            test(p2 === 56);
+        }
+
+        {
+            let [p1, p2] = await initial.opBool();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opBool(true);
+            test(p1 === true);
+            test(p2 === true);
+        }
+
+        {
+            let [p1, p2] = await initial.opShort();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opShort(56);
+            test(p1 === 56);
+            test(p2 === 56);
+        }
+
+        {
+            let [p1, p2] = await initial.opInt();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opInt(56);
+            test(p1 === 56);
+            test(p2 === 56);
+        }
+
+        {
+            let [p1, p2] = await initial.opLong();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opLong(new Ice.Long(0, 56));
+            test(p1.equals(new Ice.Long(0, 56)));
+            test(p2.equals(new Ice.Long(0, 56)));
+        }
+
+        {
+            let [p1, p2] = await initial.opFloat();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opFloat(1.0);
+            test(p1 === 1.0);
+            test(p2 === 1.0);
+        }
+
+        {
+            let [p1, p2] = await initial.opDouble();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opDouble(1.0);
+            test(p1 === 1.0);
+            test(p2 === 1.0);
+        }
+
+        {
+            let [p1, p2] = await initial.opString();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opString("test");
+            test(p1 === "test");
+            test(p2 === "test");
+        }
+
+        {
+            let [p1, p2] = await initial.opMyEnum();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opMyEnum(Test.MyEnum.MyEnumMember);
+            test(p1 === Test.MyEnum.MyEnumMember);
+            test(p2 === Test.MyEnum.MyEnumMember);
+            [p1, p2] = await initial.opMyEnum(null); // Test null enum
+            test(p1 === Test.MyEnum.MyEnumMember);
+            test(p2 === Test.MyEnum.MyEnumMember);
+        }
+
+        {
+            let [p1, p2] = await initial.opSmallStruct();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opSmallStruct(new Test.SmallStruct(56));
+            test(p1.equals(new Test.SmallStruct(56)));
+            test(p2.equals(new Test.SmallStruct(56)));
+            [p1, p2] = await initial.opSmallStruct(null); // Test null struct
+            test(p1.equals(new Test.SmallStruct(0)));
+            test(p2.equals(new Test.SmallStruct(0)));
+        }
+
+        {
+            let [p1, p2] = await initial.opFixedStruct();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opFixedStruct(new Test.FixedStruct(56));
+            test(p1.equals(new Test.FixedStruct(56)));
+            test(p2.equals(new Test.FixedStruct(56)));
+        }
+
+        {
+            let [p1, p2] = await initial.opVarStruct();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opVarStruct(new Test.VarStruct("test"));
+            test(p1.equals(new Test.VarStruct("test")));
+            test(p2.equals(new Test.VarStruct("test")));
+        }
+
+        {
+            let [p1, p2] = await initial.opOneOptional();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            if(await initial.supportsNullOptional())
+            {
+
+                [p1, p2] = await initial.opOneOptional(null);
+                test(p1 === null);
+                test(p2 === null);
+            }
+            [p1, p2] = await initial.opOneOptional(new Test.OneOptional(58));
+            test(p1 === p2);
+            test(p2.a === 58);
+        }
+
+        {
+            let [p1, p2] = await initial.opOneOptionalProxy();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            [p1, p2] = await initial.opOneOptionalProxy(communicator.stringToProxy("test"));
+            test(p1.equals(communicator.stringToProxy("test")));
+            test(p2.equals(communicator.stringToProxy("test")));
+        }
+
+        {
+            let [p1, p2] = await initial.opByteSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+
+            let data:number[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 56;
+            }
+            [p1, p2] = await initial.opByteSeq(new Uint8Array(data));
+
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 56);
+                test(p2[i] === 56);
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opBoolSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+
+            let data:boolean[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = true;
+            }
+            [p1, p2] = await initial.opBoolSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === true);
+                test(p2[i] === true);
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opShortSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+
+            let data:number[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 56;
+            }
+            [p1, p2] = await initial.opShortSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 56);
+                test(p2[i] === 56);
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opIntSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+
+            let data:number[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 56;
+            }
+            [p1, p2] = await initial.opIntSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 56);
+                test(p2[i] === 56);
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opLongSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data:Ice.Long[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Ice.Long(0, 56);
+            }
+            [p1, p2] = await initial.opLongSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Ice.Long(0, 56)));
+                test(p2[i].equals(new Ice.Long(0, 56)));
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opFloatSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data:number[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 1.0;
+            }
+            [p1, p2] = await initial.opFloatSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 1.0);
+                test(p2[i] === 1.0);
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opDoubleSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data:number[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = 1.0;
+            }
+            [p1, p2] = await initial.opDoubleSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] === 1.0);
+                test(p2[i] === 1.0);
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opStringSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data:string[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = "test1";
+            }
+            [p1, p2] = await initial.opStringSeq(data);
+
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i] == "test1");
+                test(p2[i] == "test1");
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opSmallStructSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data:Test.SmallStruct[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Test.SmallStruct();
+            }
+            [p1, p2] = await initial.opSmallStructSeq(data);
+
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Test.SmallStruct()));
+                test(p2[i].equals(new Test.SmallStruct()));
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opFixedStructSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data:Test.FixedStruct[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Test.FixedStruct();
+            }
+            [p1, p2] = await initial.opFixedStructSeq(data);
+
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Test.FixedStruct()));
+                test(p2[i].equals(new Test.FixedStruct()));
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opVarStructSeq();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data:Test.VarStruct[] = [];
+            for(let i = 0; i < 100; ++i)
+            {
+                data[i] = new Test.VarStruct("");
+            }
+            [p1, p2] = await initial.opVarStructSeq(data);
+            test(p1.length === 100);
+            test(p2.length === 100);
+            for(let i = 0; i < 100; ++i)
+            {
+                test(p1[i].equals(new Test.VarStruct("")));
+                test(p2[i].equals(new Test.VarStruct("")));
+            }
+        }
+
+        {
+            let [p1, p2] = await initial.opIntIntDict();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data = new Test.IntIntDict();
+            data.set(1, 2);
+            data.set(2, 3);
+            [p1, p2] = await initial.opIntIntDict(data);
+            test(Ice.MapUtil.equals(p1, p2));
+        }
+
+        {
+            let [p1, p2] = await initial.opStringIntDict();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data = new Test.StringIntDict();
+            data.set("1", 1);
+            data.set("2", 2);
+            [p1, p2] = await initial.opStringIntDict(data);
+            test(Ice.MapUtil.equals(p1, p2));
+        }
+
+        {
+            let [p1, p2] = await initial.opIntOneOptionalDict();
+            test(p1 === undefined);
+            test(p2 === undefined);
+            let data = new Test.IntOneOptionalDict();
+            data.set(1, new Test.OneOptional(58));
+            data.set(2, new Test.OneOptional(59));
+            [p1, p2] = await initial.opIntOneOptionalDict(data);
+            test(p1.get(1).a === 58 && p2.get(2).a === 59);
+        }
+        out.writeLine("ok");
+
+        out.write("testing exception optionals... ");
+
+        try
+        {
+            await initial.opOptionalException();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.OptionalException, ex);
+            test(ex.a === undefined);
+            test(ex.b === undefined);
+            test(ex.o === undefined);
+        }
+
+        try
+        {
+            await initial.opOptionalException(30, "test", new Test.OneOptional(53));
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.OptionalException, ex);
+            test(ex.a === 30);
+            test(ex.b == "test");
+            test(ex.o.a == 53);
+        }
+
+        try
+        {
+            await initial.opDerivedException();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.DerivedException, ex);
+            test(ex.a === undefined);
+            test(ex.b === undefined);
+            test(ex.o === undefined);
+            test(ex.ss === undefined);
+            test(ex.o2 === undefined);
+        }
+
+        try
+        {
+            await initial.opDerivedException(30, "test2", new Test.OneOptional(53));
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.DerivedException, ex);
+            test(ex.a === 30);
+            test(ex.b == "test2");
+            test(ex.o.a === 53);
+            test(ex.ss == "test2");
+            test(ex.o2.a === 53);
+        }
+
+        out.writeLine("ok");
+
+        out.write("testing optionals with marshaled results... ");
+
+        test(await initial.opMStruct1() !== undefined);
+        test(await initial.opMDict1() !== undefined);
+        test(await initial.opMSeq1() !== undefined);
+        test(await initial.opMG1() !== undefined);
+
+        {
+            let [p3, p2] = await initial.opMStruct2();
+            test(p3 === undefined && p2 == undefined);
+
+            const p1 = new Test.SmallStruct();
+            [p3, p2] = await initial.opMStruct2(p1);
+            test(p2.equals(p1) && p3.equals(p1));
+        }
+
+        {
+            let [p3, p2] = await initial.opMSeq2();
+            test(p2 === undefined && p3 === undefined);
+
+            const p1 = ["hello"];
+            [p3, p2] = await initial.opMSeq2(p1);
+            test(ArrayUtil.equals(p2, p1) && ArrayUtil.equals(p3, p1));
+        }
+
+        {
+            let [p3, p2] = await initial.opMDict2();
+            test(p2 === undefined && p3 === undefined);
+
+            const p1 = new Map();
+            p1.set("test", 54);
+            [p3, p2] = await initial.opMDict2(p1);
+            test(Ice.MapUtil.equals(p2, p1) && Ice.MapUtil.equals(p3, p1));
+        }
+        {
+            let [p3, p2] = await initial.opMG2();
+            test(p2 === undefined && p3 === undefined);
+
+            const p1 = new Test.G();
+            [p3, p2] = await initial.opMG2(p1);
+            test(p3 !== undefined && p2 !== undefined && p3 === p2);
+        }
+
+        out.writeLine("ok");
+
+        await initial.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/optional/InitialI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/optional/InitialI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/optional/InitialI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/optional/InitialI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,335 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+
+export class InitialI extends Test.Initial
+{
+    shutdown(current:Ice.Current)
+    {
+        current.adapter.getCommunicator().shutdown();
+    }
+
+    pingPong(obj:Ice.Value, current:Ice.Current):Ice.Value
+    {
+        return obj;
+    }
+
+    opOptionalException(a:number, b:string, o:Test.OneOptional, current:Ice.Current):void
+    {
+        const ex = new Test.OptionalException();
+        if(a !== undefined)
+        {
+            ex.a = a;
+        }
+        else
+        {
+            ex.a = undefined; // The member "a" has a default value.
+        }
+        if(b !== undefined)
+        {
+            ex.b = b;
+        }
+        if(o !== undefined)
+        {
+            ex.o = o;
+        }
+        throw ex;
+    }
+
+    opDerivedException(a:number, b:string, o:Test.OneOptional, current:Ice.Current):void
+    {
+        const ex = new Test.DerivedException();
+        if(a !== undefined)
+        {
+            ex.a = a;
+        }
+        else
+        {
+            ex.a = undefined; // The member "a" has a default value.
+        }
+        if(b !== undefined)
+        {
+            ex.b = b;
+            ex.ss = b;
+        }
+        else
+        {
+            ex.ss = undefined; // The member "ss" has a default value.
+        }
+        if(o !== undefined)
+        {
+            ex.o = o;
+            ex.o2 = o;
+        }
+        throw ex;
+    }
+
+    opRequiredException(a:number, b:string, o:Test.OneOptional, current:Ice.Current):void
+    {
+        const ex = new Test.RequiredException();
+        if(a !== undefined)
+        {
+            ex.a = a;
+        }
+        else
+        {
+            ex.a = undefined; // The member "a" has a default value.
+        }
+        if(b !== undefined)
+        {
+            ex.b = b;
+            ex.ss = b;
+        }
+        if(o !== undefined)
+        {
+            ex.o = o;
+            ex.o2 = o;
+        }
+        throw ex;
+    }
+
+    opByte(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opBool(p1:boolean, current:Ice.Current):[boolean, boolean]
+    {
+        return [p1, p1];
+    }
+
+    opShort(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opInt(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opLong(p1:Ice.Long, current:Ice.Current):[Ice.Long, Ice.Long]
+    {
+        return [p1, p1];
+    }
+
+    opFloat(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opDouble(p1:number, current:Ice.Current):[number, number]
+    {
+        return [p1, p1];
+    }
+
+    opString(p1:string, current:Ice.Current):[string, string]
+    {
+        return [p1, p1];
+    }
+
+    opMyEnum(p1:Test.MyEnum, current:Ice.Current):[Test.MyEnum, Test.MyEnum]
+    {
+        return [p1, p1];
+    }
+
+    opSmallStruct(p1:Test.SmallStruct, current:Ice.Current):[Test.SmallStruct, Test.SmallStruct]
+    {
+        return [p1, p1];
+    }
+
+    opFixedStruct(p1:Test.FixedStruct, current:Ice.Current):[Test.FixedStruct, Test.FixedStruct]
+    {
+        return [p1, p1];
+    }
+
+    opVarStruct(p1:Test.VarStruct, current:Ice.Current):[Test.VarStruct, Test.VarStruct]
+    {
+        return [p1, p1];
+    }
+
+    opOneOptional(p1:Test.OneOptional, current:Ice.Current):[Test.OneOptional, Test.OneOptional]
+    {
+        return [p1, p1];
+    }
+
+    opOneOptionalProxy(p1:Ice.ObjectPrx, current:Ice.Current):[Ice.ObjectPrx, Ice.ObjectPrx]
+    {
+        return [p1, p1];
+    }
+
+    opByteSeq(p1:Test.ByteSeq, current:Ice.Current):[Test.ByteSeq, Test.ByteSeq]
+    {
+        return [p1, p1];
+    }
+
+    opBoolSeq(p1:Test.BoolSeq, current:Ice.Current):[Test.BoolSeq, Test.BoolSeq]
+    {
+        return [p1, p1];
+    }
+
+    opShortSeq(p1:Test.ShortSeq, current:Ice.Current):[Test.ShortSeq, Test.ShortSeq]
+    {
+        return [p1, p1];
+    }
+
+    opIntSeq(p1:Test.IntSeq, current:Ice.Current):[Test.IntSeq, Test.IntSeq]
+    {
+        return [p1, p1];
+    }
+
+    opLongSeq(p1:Test.LongSeq, current:Ice.Current):[Test.LongSeq, Test.LongSeq]
+    {
+        return [p1, p1];
+    }
+
+    opFloatSeq(p1:Test.FloatSeq, current:Ice.Current):[Test.FloatSeq, Test.FloatSeq]
+    {
+        return [p1, p1];
+    }
+
+    opDoubleSeq(p1:Test.DoubleSeq, current:Ice.Current):[Test.DoubleSeq, Test.DoubleSeq]
+    {
+        return [p1, p1];
+    }
+
+    opStringSeq(p1:Test.StringSeq, current:Ice.Current):[Test.StringSeq, Test.StringSeq]
+    {
+        return [p1, p1];
+    }
+
+    opSmallStructSeq(p1:Test.SmallStructSeq, current:Ice.Current):[Test.SmallStructSeq, Test.SmallStructSeq]
+    {
+        return [p1, p1];
+    }
+
+    opSmallStructList(p1:Test.SmallStructList, current:Ice.Current):[Test.SmallStructList, Test.SmallStructList]
+    {
+        return [p1, p1];
+    }
+
+    opFixedStructSeq(p1:Test.FixedStructSeq, current:Ice.Current):[Test.FixedStructSeq, Test.FixedStructSeq]
+    {
+        return [p1, p1];
+    }
+
+    opFixedStructList(p1:Test.FixedStructList, current:Ice.Current):[Test.FixedStructList, Test.FixedStructList]
+    {
+        return [p1, p1];
+    }
+
+    opVarStructSeq(p1:Test.VarStructSeq, current:Ice.Current):[Test.VarStructSeq, Test.VarStructSeq]
+    {
+        return [p1, p1];
+    }
+
+    opSerializable(p1:Test.Serializable, current:Ice.Current):[Test.Serializable, Test.Serializable]
+    {
+        return [p1, p1];
+    }
+
+    opIntIntDict(p1:Test.IntIntDict, current:Ice.Current):[Test.IntIntDict, Test.IntIntDict]
+    {
+        return [p1, p1];
+    }
+
+    opStringIntDict(p1:Test.StringIntDict, current:Ice.Current):[Test.StringIntDict, Test.StringIntDict]
+    {
+        return [p1, p1];
+    }
+
+    opIntOneOptionalDict(p1:Test.IntOneOptionalDict, current:Ice.Current):[Test.IntOneOptionalDict, Test.IntOneOptionalDict]
+    {
+        return [p1, p1];
+    }
+
+    opClassAndUnknownOptional(p:Test.A, current:Ice.Current):void
+    {
+    }
+
+    sendOptionalClass(req:boolean, one:Test.OneOptional, current:Ice.Current):void
+    {
+    }
+
+    returnOptionalClass(req:boolean, current:Ice.Current):Test.OneOptional
+    {
+        return new Test.OneOptional(53);
+    }
+
+    opG(g:Test.G, current:Ice.Current):Test.G
+    {
+        return g;
+    }
+
+    opVoid(current:Ice.Current):void
+    {
+    }
+
+    opMStruct1(current:Ice.Current):Test.SmallStruct
+    {
+        return new Test.SmallStruct();
+    }
+
+    opMStruct2(p1:Test.SmallStruct, current:Ice.Current):[Test.SmallStruct, Test.SmallStruct]
+    {
+        return [p1, p1];
+    }
+
+    opMSeq1(current:Ice.Current):Test.StringSeq
+    {
+        return [];
+    }
+
+    opMSeq2(p1:Test.StringSeq, current:Ice.Current):[Test.StringSeq, Test.StringSeq]
+    {
+        return [p1, p1];
+    }
+
+    opMDict1(current:Ice.Current):Test.StringIntDict
+    {
+        return new Map();
+    }
+
+    opMDict2(p1:Test.StringIntDict, current:Ice.Current):[Test.StringIntDict, Test.StringIntDict]
+    {
+        return [p1, p1];
+    }
+
+    opMG1(current:Ice.Current):Test.G
+    {
+        return new Test.G();
+    }
+
+    opMG2(p1:Test.G, current:Ice.Current):[Test.G, Test.G]
+    {
+        return [p1, p1];
+    }
+
+    supportsRequiredParams(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsJavaSerializable(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsCsharpSerializable(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsCppStringView(current:Ice.Current):boolean
+    {
+        return false;
+    }
+
+    supportsNullOptional(current:Ice.Current):boolean
+    {
+        return true;
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/optional/ServerAMD.ts zeroc-ice-3.7.2/js/test/typescript/Ice/optional/ServerAMD.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/optional/ServerAMD.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/optional/ServerAMD.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import {AMDInitialI} from "./AMDInitialI";
+
+export class ServerAMD extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            [communicator] = this.initialize(args);
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new AMDInitialI(), Ice.stringToIdentity("initial"));
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/optional/Server.ts zeroc-ice-3.7.2/js/test/typescript/Ice/optional/Server.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/optional/Server.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/optional/Server.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import {InitialI} from "./InitialI";
+
+export class Server extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            [communicator] = this.initialize(args);
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.add(new InitialI(), Ice.stringToIdentity("initial"));
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await communicator.waitForShutdown();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/optional/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/optional/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,319 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["suppress-warning:deprecated", "js:es6-module"]]
+
+module Test
+{
+
+class OneOptional
+{
+    optional(1) int a;
+}
+
+enum MyEnum
+{
+    MyEnumMember
+}
+
+struct SmallStruct
+{
+    byte m;
+}
+
+struct FixedStruct
+{
+    int m;
+}
+
+struct VarStruct
+{
+    string m;
+}
+
+struct ClassVarStruct
+{
+    int a;
+}
+
+sequence<byte> ByteSeq;
+sequence<bool> BoolSeq;
+sequence<short> ShortSeq;
+sequence<int> IntSeq;
+sequence<long> LongSeq;
+sequence<float> FloatSeq;
+sequence<double> DoubleSeq;
+sequence<string> StringSeq;
+sequence<MyEnum> MyEnumSeq;
+sequence<SmallStruct> SmallStructSeq;
+sequence<SmallStruct> SmallStructList;
+sequence<FixedStruct> FixedStructSeq;
+sequence<FixedStruct> FixedStructList;
+sequence<VarStruct> VarStructSeq;
+sequence<OneOptional> OneOptionalSeq;
+sequence<OneOptional*> OneOptionalPrxSeq;
+
+sequence<byte> Serializable;
+
+dictionary<int, int> IntIntDict;
+dictionary<string, int> StringIntDict;
+dictionary<int, MyEnum> IntEnumDict;
+dictionary<int, FixedStruct> IntFixedStructDict;
+dictionary<int, VarStruct> IntVarStructDict;
+dictionary<int, OneOptional> IntOneOptionalDict;
+dictionary<int, OneOptional*> IntOneOptionalPrxDict;
+
+class MultiOptional
+{
+    optional(1) byte a;
+    optional(2) bool b;
+    optional(3) short c;
+    optional(4) int d;
+    optional(5) long e;
+    optional(6) float f;
+    optional(7) double g;
+    optional(8) string h;
+    optional(9) MyEnum i;
+    optional(10) MultiOptional* j;
+    optional(11) MultiOptional k;
+    optional(12) ByteSeq bs;
+    optional(13) StringSeq ss;
+    optional(14) IntIntDict iid;
+    optional(15) StringIntDict sid;
+    optional(16) FixedStruct fs;
+    optional(17) VarStruct vs;
+
+    optional(18) ShortSeq shs;
+    optional(19) MyEnumSeq es;
+    optional(20) FixedStructSeq fss;
+    optional(21) VarStructSeq vss;
+    optional(22) OneOptionalSeq oos;
+    optional(23) OneOptionalPrxSeq oops;
+
+    optional(24) IntEnumDict ied;
+    optional(25) IntFixedStructDict ifsd;
+    optional(26) IntVarStructDict ivsd;
+    optional(27) IntOneOptionalDict iood;
+    optional(28) IntOneOptionalPrxDict ioopd;
+
+    optional(29) BoolSeq bos;
+
+    optional(30) Serializable ser;
+}
+
+class A
+{
+    int requiredA;
+    optional(1) int ma;
+    optional(50) int mb;
+    optional(500) int mc;
+}
+
+["preserve-slice"]
+class B extends A
+{
+    int requiredB;
+    optional(10) int md;
+}
+
+class C extends B
+{
+    string ss;
+    optional(890) string ms;
+}
+
+class WD
+{
+    optional(1) int a = 5;
+    optional(2) string s = "test";
+}
+
+exception OptionalException
+{
+    bool req = false;
+    optional(1) int a = 5;
+    optional(2) string b;
+    optional(50) OneOptional o;
+}
+
+exception DerivedException extends OptionalException
+{
+    optional(600) string ss = "test";
+    optional(601) OneOptional o2;
+}
+
+exception RequiredException extends OptionalException
+{
+    string ss = "test";
+    OneOptional o2;
+}
+
+class OptionalWithCustom
+{
+    optional(1) SmallStructList l;
+    ["protected"] optional(2) SmallStructList lp;
+    optional(3) ClassVarStruct s;
+}
+
+class E
+{
+    A ae;
+}
+
+class F extends E
+{
+    optional(1) A af;
+}
+
+class G1
+{
+    string a;
+}
+
+class G2
+{
+    long a;
+}
+
+class G
+{
+    optional(1) G1 gg1Opt;
+    G2 gg2;
+    optional(0) G2 gg2Opt;
+    G1 gg1;
+}
+
+class Recursive;
+sequence<Recursive> RecursiveSeq;
+
+class Recursive
+{
+    optional(0) RecursiveSeq value;
+}
+
+interface Initial
+{
+    void shutdown();
+
+    Object pingPong(Object o);
+
+    void opOptionalException(optional(1) int a, optional(2) string b, optional(3) OneOptional o)
+        throws OptionalException;
+
+    void opDerivedException(optional(1) int a, optional(2) string b, optional(3) OneOptional o)
+        throws OptionalException;
+
+    void opRequiredException(optional(1) int a, optional(2) string b, optional(3) OneOptional o)
+        throws OptionalException;
+
+    optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3);
+
+    optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3);
+
+    optional(1) short opShort(optional(2) short p1, out optional(3) short p3);
+
+    optional(1) int opInt(optional(2) int p1, out optional(3) int p3);
+
+    optional(3) long opLong(optional(1) long p1, out optional(2) long p3);
+
+    optional(1) float opFloat(optional(2) float p1, out optional(3) float p3);
+
+    optional(1) double opDouble(optional(2) double p1, out optional(3) double p3);
+
+    optional(1) string opString(optional(2) string p1, out optional(3) string p3);
+
+    optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3);
+
+    optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3);
+
+    optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3);
+
+    optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3);
+
+    optional(1) OneOptional opOneOptional(optional(2) OneOptional p1, out optional(3) OneOptional p3);
+
+    optional(1) OneOptional* opOneOptionalProxy(optional(2) OneOptional* p1, out optional(3) OneOptional* p3);
+
+    optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3);
+
+    optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3);
+
+    optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3);
+
+    optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3);
+
+    optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3);
+
+    optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3);
+
+    optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3);
+
+    optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3);
+
+    optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3);
+
+    optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, out optional(3) SmallStructList p3);
+
+    optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3);
+
+    optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, out optional(3) FixedStructList p3);
+
+    optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3);
+
+    optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3);
+
+    optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3);
+
+    optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, out optional(3) StringIntDict p3);
+
+    optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1,
+                                                        out optional(3) IntOneOptionalDict p3);
+
+    void opClassAndUnknownOptional(A p);
+
+    void sendOptionalClass(bool req, optional(1) OneOptional o);
+
+    void returnOptionalClass(bool req, out optional(1) OneOptional o);
+
+    G opG(G g);
+
+    void opVoid();
+
+    ["marshaled-result"] optional(1) SmallStruct opMStruct1();
+    ["marshaled-result"] optional(1) SmallStruct opMStruct2(optional(2) SmallStruct p1,
+                                                            out optional(3)SmallStruct p2);
+
+    ["marshaled-result"] optional(1) StringSeq opMSeq1();
+    ["marshaled-result"] optional(1) StringSeq opMSeq2(optional(2) StringSeq p1,
+                                                       out optional(3) StringSeq p2);
+
+    ["marshaled-result"] optional(1) StringIntDict opMDict1();
+    ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1,
+                                                            out optional(3) StringIntDict p2);
+
+    ["marshaled-result"] optional(1) G opMG1();
+    ["marshaled-result"] optional(1) G opMG2(optional(2) G p1, out optional(3) G p2);
+
+    bool supportsRequiredParams();
+
+    bool supportsJavaSerializable();
+
+    bool supportsCsharpSerializable();
+
+    bool supportsCppStringView();
+
+    bool supportsNullOptional();
+}
+
+interface Echo
+{
+    void setConnection();
+    void startBatch();
+    void flushBatch();
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/proxy/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/proxy/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/proxy/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/proxy/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,1163 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        class TestError extends Error
+        {
+        }
+
+        const communicator = this.communicator();
+        const out = this.getWriter();
+
+        const defaultProtocol = communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+
+        out.write("testing stringToProxy... ");
+        const ref = "test:" + this.getTestEndpoint();
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+
+        let b1 = communicator.stringToProxy("test");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getAdapterId().length === 0 && b1.ice_getFacet().length === 0);
+        b1 = communicator.stringToProxy("test ");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet().length === 0);
+        b1 = communicator.stringToProxy(" test ");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet().length === 0);
+        b1 = communicator.stringToProxy(" test");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet().length === 0);
+        b1 = communicator.stringToProxy("'test -f facet'");
+        test(b1.ice_getIdentity().name === "test -f facet" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet().length === 0);
+
+        try
+        {
+            b1 = communicator.stringToProxy("\"test -f facet'");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ProxyParseException, ex);
+        }
+
+        b1 = communicator.stringToProxy("\"test -f facet\"");
+        test(b1.ice_getIdentity().name === "test -f facet" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet().length === 0);
+        b1 = communicator.stringToProxy("\"test -f facet@test\"");
+        test(b1.ice_getIdentity().name === "test -f facet@test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet().length === 0);
+        b1 = communicator.stringToProxy("\"test -f facet@test @test\"");
+        test(b1.ice_getIdentity().name === "test -f facet@test @test" &&
+                b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet().length === 0);
+
+        try
+        {
+            b1 = communicator.stringToProxy("test test");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ProxyParseException, ex);
+        }
+
+        b1 = communicator.stringToProxy("test\\040test");
+        test(b1.ice_getIdentity().name === "test test" && b1.ice_getIdentity().category.length === 0);
+
+        try
+        {
+            b1 = communicator.stringToProxy("test\\777");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.IdentityParseException, ex);
+        }
+
+        b1 = communicator.stringToProxy("test\\40test");
+        test(b1.ice_getIdentity().name === "test test");
+
+        // Test some octal and hex corner cases.
+        b1 = communicator.stringToProxy("test\\4test");
+        test(b1.ice_getIdentity().name === "test\x04test");
+        b1 = communicator.stringToProxy("test\\04test");
+        test(b1.ice_getIdentity().name === "test\x04test");
+        b1 = communicator.stringToProxy("test\\004test");
+        test(b1.ice_getIdentity().name === "test\x04test");
+        b1 = communicator.stringToProxy("test\\1114test");
+        test(b1.ice_getIdentity().name === "test\x494test");
+
+        b1 = communicator.stringToProxy("test\\b\\f\\n\\r\\t\\'\\\"\\\\test");
+        test(b1.ice_getIdentity().name === "test\b\f\n\r\t'\"\\test" &&
+                b1.ice_getIdentity().category.length === 0);
+
+        b1 = communicator.stringToProxy("category/test");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                b1.ice_getAdapterId().length === 0);
+
+        b1 = communicator.stringToProxy("");
+        test(b1 === null);
+        b1 = communicator.stringToProxy("\"\"");
+        test(b1 === null);
+        try
+        {
+            b1 = communicator.stringToProxy("\"\" test"); // Invalid trailing characters.
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ProxyParseException, ex);
+        }
+
+        try
+        {
+            b1 = communicator.stringToProxy("test:"); // Missing endpoint.
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        b1 = communicator.stringToProxy("test@adapter");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getAdapterId() === "adapter");
+        try
+        {
+            b1 = communicator.stringToProxy("id@adapter test");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ProxyParseException, ex);
+        }
+
+        b1 = communicator.stringToProxy("category/test@adapter");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                b1.ice_getAdapterId() === "adapter");
+        b1 = communicator.stringToProxy("category/test@adapter:" + defaultProtocol);
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                b1.ice_getAdapterId() === "adapter:" + defaultProtocol);
+        b1 = communicator.stringToProxy("'category 1/test'@adapter");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category 1" &&
+                b1.ice_getAdapterId() === "adapter");
+        b1 = communicator.stringToProxy("'category/test 1'@adapter");
+        test(b1.ice_getIdentity().name === "test 1" && b1.ice_getIdentity().category === "category" &&
+                b1.ice_getAdapterId() === "adapter");
+        b1 = communicator.stringToProxy("'category/test'@'adapter 1'");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category" &&
+                b1.ice_getAdapterId() === "adapter 1");
+        b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@adapter");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category /test@foo" &&
+                b1.ice_getAdapterId() === "adapter");
+        b1 = communicator.stringToProxy("\"category \\/test@foo/test\"@\"adapter:" + defaultProtocol + "\"");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category === "category /test@foo" &&
+                b1.ice_getAdapterId() === "adapter:" + defaultProtocol);
+
+        b1 = communicator.stringToProxy("id -f facet");
+        test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet");
+        b1 = communicator.stringToProxy("id -f 'facet x'");
+        test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet x");
+        b1 = communicator.stringToProxy("id -f \"facet x\"");
+        test(b1.ice_getIdentity().name === "id" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet x");
+
+        try
+        {
+            b1 = communicator.stringToProxy("id -f \"facet x");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ProxyParseException, ex);
+        }
+
+        try
+        {
+            b1 = communicator.stringToProxy("id -f 'facet x");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ProxyParseException, ex);
+        }
+
+        b1 = communicator.stringToProxy("test -f facet:" + defaultProtocol);
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet" && b1.ice_getAdapterId().length === 0);
+        b1 = communicator.stringToProxy("test -f \"facet:" + defaultProtocol + "\"");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet:" + defaultProtocol && b1.ice_getAdapterId().length === 0);
+        b1 = communicator.stringToProxy("test -f facet@test");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet" && b1.ice_getAdapterId() === "test");
+        b1 = communicator.stringToProxy("test -f 'facet@test'");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet@test" && b1.ice_getAdapterId().length === 0);
+        b1 = communicator.stringToProxy("test -f 'facet@test'@test");
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getFacet() === "facet@test" && b1.ice_getAdapterId() === "test");
+
+        try
+        {
+            b1 = communicator.stringToProxy("test -f facet@test @test");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ProxyParseException, ex);
+        }
+        b1 = communicator.stringToProxy("test");
+        test(b1.ice_isTwoway());
+        b1 = communicator.stringToProxy("test -t");
+        test(b1.ice_isTwoway());
+        b1 = communicator.stringToProxy("test -o");
+        test(b1.ice_isOneway());
+        b1 = communicator.stringToProxy("test -O");
+        test(b1.ice_isBatchOneway());
+        b1 = communicator.stringToProxy("test -d");
+        test(b1.ice_isDatagram());
+        b1 = communicator.stringToProxy("test -D");
+        test(b1.ice_isBatchDatagram());
+        b1 = communicator.stringToProxy("test");
+        test(!b1.ice_isSecure());
+        b1 = communicator.stringToProxy("test -s");
+        test(b1.ice_isSecure());
+
+        test(b1.ice_getEncodingVersion().equals(Ice.currentEncoding()));
+
+        b1 = communicator.stringToProxy("test -e 1.0");
+        test(b1.ice_getEncodingVersion().major === 1 && b1.ice_getEncodingVersion().minor === 0);
+
+        b1 = communicator.stringToProxy("test -e 6z.5");
+        test(b1.ice_getEncodingVersion().major === 6 && b1.ice_getEncodingVersion().minor === 5);
+
+        b1 = communicator.stringToProxy("test -p 1.0 -e 1.0");
+        test(b1.toString() === "test -t -e 1.0");
+
+        b1 = communicator.stringToProxy("test -p 6.5 -e 1.0");
+        test(b1.toString() === "test -t -p 6.5 -e 1.0");
+
+        try
+        {
+            b1 = communicator.stringToProxy("test:" + defaultProtocol + "@adapterId");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            b1 = communicator.stringToProxy("test::" + defaultProtocol);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        //
+        // Test for bug ICE-5543: escaped escapes in stringToIdentity
+        //
+
+        let id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\");
+        let id2 = Ice.stringToIdentity(Ice.identityToString(id));
+        test(id.equals(id2));
+
+        id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\");
+        id2 = Ice.stringToIdentity(Ice.identityToString(id));
+        test(id.equals(id2));
+
+        id = new Ice.Identity("/test", "cat/");
+        let idStr = Ice.identityToString(id);
+        test(idStr === "cat\\//\\/test");
+        id2 = Ice.stringToIdentity(idStr);
+        test(id.equals(id2));
+
+        // Input string with various pitfalls
+        // id = Ice.stringToIdentity("\\342\\x82\\254\\60\\x9\\60\\");
+        // test(id.name === "€0\t0\\" && id.category.isEmpty());
+
+        try
+        {
+            // Illegal character < 32
+            id = Ice.stringToIdentity("xx\x01FooBar");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.IdentityParseException);
+        }
+
+        try
+        {
+            // Illegal surrogate
+            id = Ice.stringToIdentity("xx\\ud911");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.IdentityParseException, ex);
+        }
+
+        // Testing bytes 127 (\x7F) and €
+        id = new Ice.Identity("test", "\x7F€");
+
+        idStr = Ice.identityToString(id, Ice.ToStringMode.Unicode);
+        test(idStr === "\\u007f€/test");
+        id2 = Ice.stringToIdentity(idStr);
+        test(id.equals(id2));
+        test(Ice.identityToString(id) === idStr);
+
+        idStr = Ice.identityToString(id, Ice.ToStringMode.ASCII);
+        test(idStr === "\\u007f\\u20ac/test");
+        id2 = Ice.stringToIdentity(idStr);
+        test(id.equals(id2));
+
+        idStr = Ice.identityToString(id, Ice.ToStringMode.Compat);
+        test(idStr === "\\177\\342\\202\\254/test");
+        id2 = Ice.stringToIdentity(idStr);
+        test(id.equals(id2));
+
+        id2 = Ice.stringToIdentity(communicator.identityToString(id));
+        test(id.equals(id2));
+
+        // More unicode characters
+
+        id = new Ice.Identity("banana \x0e-\ud83c\udf4c\u20ac\u00a2\u0024", "greek \ud800\udd6a");
+
+        idStr = Ice.identityToString(id, Ice.ToStringMode.Unicode);
+        test(idStr === "greek \ud800\udd6a/banana \\u000e-\ud83c\udf4c\u20ac\u00a2$");
+        id2 = Ice.stringToIdentity(idStr);
+        test(id.equals(id2));
+
+        idStr = Ice.identityToString(id, Ice.ToStringMode.ASCII);
+        test(idStr === "greek \\U0001016a/banana \\u000e-\\U0001f34c\\u20ac\\u00a2$");
+        id2 = Ice.stringToIdentity(idStr);
+        test(id.equals(id2));
+
+        idStr = Ice.identityToString(id, Ice.ToStringMode.Compat);
+        test(idStr === "greek \\360\\220\\205\\252/banana \\016-\\360\\237\\215\\214\\342\\202\\254\\302\\242$");
+        id2 = Ice.stringToIdentity(idStr);
+        test(id.equals(id2));
+
+        out.writeLine("ok");
+
+        out.write("testing propertyToProxy... ");
+        const prop = communicator.getProperties();
+        const propertyPrefix = "Foo.Proxy";
+        prop.setProperty(propertyPrefix, "test:" + this.getTestEndpoint());
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getIdentity().name === "test" && b1.ice_getIdentity().category.length === 0 &&
+                b1.ice_getAdapterId().length === 0 && b1.ice_getFacet().length === 0);
+
+        let property = propertyPrefix + ".Locator";
+        test(b1.ice_getLocator() === null);
+        prop.setProperty(property, "locator:default -p 10000");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getLocator() !== null && b1.ice_getLocator().ice_getIdentity().name === "locator");
+        prop.setProperty(property, "");
+
+        property = propertyPrefix + ".LocatorCacheTimeout";
+        test(b1.ice_getLocatorCacheTimeout() === -1);
+        prop.setProperty(property, "1");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getLocatorCacheTimeout() === 1);
+        prop.setProperty(property, "");
+
+        // Now retest with an indirect proxy.
+        prop.setProperty(propertyPrefix, "test");
+        property = propertyPrefix + ".Locator";
+        prop.setProperty(property, "locator:default -p 10000");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getLocator() !== null && b1.ice_getLocator().ice_getIdentity().name === "locator");
+        prop.setProperty(property, "");
+
+        property = propertyPrefix + ".LocatorCacheTimeout";
+        test(b1.ice_getLocatorCacheTimeout() === -1);
+        prop.setProperty(property, "1");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getLocatorCacheTimeout() === 1);
+        prop.setProperty(property, "");
+
+        prop.setProperty(propertyPrefix, "test:" + this.getTestEndpoint());
+
+        property = propertyPrefix + ".Router";
+        test(b1.ice_getRouter() === null);
+        prop.setProperty(property, "router:default -p 10000");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getRouter() !== null && b1.ice_getRouter().ice_getIdentity().name === "router");
+        prop.setProperty(property, "");
+
+        property = propertyPrefix + ".PreferSecure";
+        test(!b1.ice_isPreferSecure());
+        prop.setProperty(property, "1");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_isPreferSecure());
+        prop.setProperty(property, "");
+
+        property = propertyPrefix + ".ConnectionCached";
+        test(b1.ice_isConnectionCached());
+        prop.setProperty(property, "0");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(!b1.ice_isConnectionCached());
+        prop.setProperty(property, "");
+
+        property = propertyPrefix + ".InvocationTimeout";
+        test(b1.ice_getInvocationTimeout() == -1);
+        prop.setProperty(property, "1000");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getInvocationTimeout() == 1000);
+        prop.setProperty(property, "");
+
+        property = propertyPrefix + ".EndpointSelection";
+        test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Random);
+        prop.setProperty(property, "Random");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Random);
+        prop.setProperty(property, "Ordered");
+        b1 = communicator.propertyToProxy(propertyPrefix);
+        test(b1.ice_getEndpointSelection() === Ice.EndpointSelectionType.Ordered);
+        prop.setProperty(property, "");
+
+        out.writeLine("ok");
+
+        out.write("testing proxyToProperty... ");
+
+        b1 = communicator.stringToProxy("test");
+        b1 = b1.ice_connectionCached(true);
+        b1 = b1.ice_preferSecure(false);
+        b1 = b1.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
+        b1 = b1.ice_locatorCacheTimeout(100);
+        b1 = b1.ice_invocationTimeout(1234);
+        b1 = b1.ice_encodingVersion(new Ice.EncodingVersion(1, 0));
+
+        let router = communicator.stringToProxy("router");
+        router = router.ice_connectionCached(true);
+        router = router.ice_preferSecure(true);
+        router = router.ice_endpointSelection(Ice.EndpointSelectionType.Random);
+        router = router.ice_locatorCacheTimeout(200);
+        router = router.ice_invocationTimeout(1500);
+
+        let locator = communicator.stringToProxy("locator");
+        locator = locator.ice_connectionCached(false);
+        locator = locator.ice_preferSecure(true);
+        locator = locator.ice_endpointSelection(Ice.EndpointSelectionType.Random);
+        locator = locator.ice_locatorCacheTimeout(300);
+        locator = locator.ice_invocationTimeout(1500);
+
+        locator = locator.ice_router(Ice.RouterPrx.uncheckedCast(router));
+        b1 = b1.ice_locator(Ice.LocatorPrx.uncheckedCast(locator));
+
+        const proxyProps = communicator.proxyToProperty(b1, "Test");
+        test(proxyProps.size === 21);
+        test(proxyProps.get("Test") === "test -t -e 1.0");
+        test(proxyProps.get("Test.CollocationOptimized") === "0");
+        test(proxyProps.get("Test.ConnectionCached") === "1");
+        test(proxyProps.get("Test.PreferSecure") === "0");
+        test(proxyProps.get("Test.EndpointSelection") === "Ordered");
+        test(proxyProps.get("Test.LocatorCacheTimeout") === "100");
+        test(proxyProps.get("Test.InvocationTimeout") === "1234");
+
+        test(proxyProps.get("Test.Locator") === "locator -t -e " +
+                Ice.encodingVersionToString(Ice.currentEncoding()));
+        test(proxyProps.get("Test.Locator.CollocationOptimized") === "0");
+        test(proxyProps.get("Test.Locator.ConnectionCached") === "0");
+        test(proxyProps.get("Test.Locator.PreferSecure") === "1");
+        test(proxyProps.get("Test.Locator.EndpointSelection") === "Random");
+        test(proxyProps.get("Test.Locator.LocatorCacheTimeout") === "300");
+        test(proxyProps.get("Test.Locator.InvocationTimeout") === "1500");
+
+        test(proxyProps.get("Test.Locator.Router") === "router -t -e " +
+                Ice.encodingVersionToString(Ice.currentEncoding()));
+        test(proxyProps.get("Test.Locator.Router.CollocationOptimized") === "0");
+        test(proxyProps.get("Test.Locator.Router.ConnectionCached") === "1");
+        test(proxyProps.get("Test.Locator.Router.PreferSecure") === "1");
+        test(proxyProps.get("Test.Locator.Router.EndpointSelection") === "Random");
+        test(proxyProps.get("Test.Locator.Router.LocatorCacheTimeout") === "200");
+        test(proxyProps.get("Test.Locator.Router.InvocationTimeout") === "1500");
+
+        out.writeLine("ok");
+
+        out.write("testing ice_getCommunicator... ");
+        test(base.ice_getCommunicator() === communicator);
+        out.writeLine("ok");
+
+        out.write("testing proxy methods... ");
+        test(communicator.identityToString(
+            base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other");
+        test(Ice.identityToString(
+            base.ice_identity(Ice.stringToIdentity("other")).ice_getIdentity()) === "other");
+        test(base.ice_facet("facet").ice_getFacet() === "facet");
+        test(base.ice_adapterId("id").ice_getAdapterId() === "id");
+        test(base.ice_twoway().ice_isTwoway());
+        test(base.ice_oneway().ice_isOneway());
+        test(base.ice_batchOneway().ice_isBatchOneway());
+        test(base.ice_datagram().ice_isDatagram());
+        test(base.ice_batchDatagram().ice_isBatchDatagram());
+        test(base.ice_secure(true).ice_isSecure());
+        test(!base.ice_secure(false).ice_isSecure());
+        test(base.ice_preferSecure(true).ice_isPreferSecure());
+        test(!base.ice_preferSecure(false).ice_isPreferSecure());
+        test(base.ice_encodingVersion(Ice.Encoding_1_0).ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+        test(base.ice_encodingVersion(Ice.Encoding_1_1).ice_getEncodingVersion().equals(Ice.Encoding_1_1));
+        test(!base.ice_encodingVersion(Ice.Encoding_1_0).ice_getEncodingVersion().equals(Ice.Encoding_1_1));
+
+        try
+        {
+            base.ice_timeout(0);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(!(ex instanceof TestError), ex);
+        }
+
+        try
+        {
+            base.ice_timeout(-1);
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        try
+        {
+            base.ice_timeout(-2);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(!(ex instanceof TestError), ex);
+        }
+
+        try
+        {
+            base.ice_invocationTimeout(0);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(!(ex instanceof TestError), ex);
+        }
+
+        try
+        {
+            base.ice_invocationTimeout(-1);
+        }
+        catch(ex)
+        {
+            test(false);
+        }
+
+        try
+        {
+            base.ice_invocationTimeout(-2);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(!(ex instanceof TestError), ex);
+        }
+
+        try
+        {
+            base.ice_locatorCacheTimeout(0);
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        try
+        {
+            base.ice_locatorCacheTimeout(-1);
+        }
+        catch(ex)
+        {
+            test(false, ex);
+        }
+
+        try
+        {
+            base.ice_locatorCacheTimeout(-2);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(!(ex instanceof TestError), ex);
+        }
+
+        out.writeLine("ok");
+
+        out.write("testing proxy comparison... ");
+
+        test(communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo")));
+        test(!communicator.stringToProxy("foo").equals(communicator.stringToProxy("foo2")));
+
+        const compObj = communicator.stringToProxy("foo");
+
+        test(compObj.ice_facet("facet").equals(compObj.ice_facet("facet")));
+        test(!compObj.ice_facet("facet").equals(compObj.ice_facet("facet1")));
+
+        test(compObj.ice_oneway().equals(compObj.ice_oneway()));
+        test(!compObj.ice_oneway().equals(compObj.ice_twoway()));
+
+        test(compObj.ice_secure(true).equals(compObj.ice_secure(true)));
+        test(!compObj.ice_secure(false).equals(compObj.ice_secure(true)));
+
+        test(compObj.ice_connectionCached(true).equals(compObj.ice_connectionCached(true)));
+        test(!compObj.ice_connectionCached(false).equals(compObj.ice_connectionCached(true)));
+
+        test(compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
+            compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random)));
+        test(!compObj.ice_endpointSelection(Ice.EndpointSelectionType.Random).equals(
+            compObj.ice_endpointSelection(Ice.EndpointSelectionType.Ordered)));
+
+        test(compObj.ice_connectionId("id2").equals(compObj.ice_connectionId("id2")));
+        test(!compObj.ice_connectionId("id1").equals(compObj.ice_connectionId("id2")));
+
+        test(compObj.ice_connectionId("id1").ice_getConnectionId() === "id1");
+        test(compObj.ice_connectionId("id2").ice_getConnectionId() === "id2");
+
+        test(compObj.ice_timeout(20).equals(compObj.ice_timeout(20)));
+        test(!compObj.ice_timeout(10).equals(compObj.ice_timeout(20)));
+
+        test(compObj.ice_getTimeout() === undefined);
+        test(compObj.ice_timeout(10).ice_getTimeout() == 10);
+        test(compObj.ice_timeout(20).ice_getTimeout() == 20);
+
+        const loc1 = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("loc1:default -p 10000"));
+        const loc2 = Ice.LocatorPrx.uncheckedCast(communicator.stringToProxy("loc2:default -p 10000"));
+        test(compObj.ice_locator(null).equals(compObj.ice_locator(null)));
+        test(compObj.ice_locator(loc1).equals(compObj.ice_locator(loc1)));
+        test(!compObj.ice_locator(loc1).equals(compObj.ice_locator(null)));
+        test(!compObj.ice_locator(null).equals(compObj.ice_locator(loc2)));
+        test(!compObj.ice_locator(loc1).equals(compObj.ice_locator(loc2)));
+
+        const rtr1 = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("rtr1:default -p 10000"));
+        const rtr2 = Ice.RouterPrx.uncheckedCast(communicator.stringToProxy("rtr2:default -p 10000"));
+        test(compObj.ice_router(null).equals(compObj.ice_router(null)));
+        test(compObj.ice_router(rtr1).equals(compObj.ice_router(rtr1)));
+        test(!compObj.ice_router(rtr1).equals(compObj.ice_router(null)));
+        test(!compObj.ice_router(null).equals(compObj.ice_router(rtr2)));
+        test(!compObj.ice_router(rtr1).equals(compObj.ice_router(rtr2)));
+
+        const ctx1 = new Map();
+        ctx1.set("ctx1", "v1");
+        const ctx2 = new Map();
+        ctx2.set("ctx2", "v2");
+        test(compObj.ice_context(null).equals(compObj.ice_context(null)));
+        test(compObj.ice_context(ctx1).equals(compObj.ice_context(ctx1)));
+        test(!compObj.ice_context(ctx1).equals(compObj.ice_context(null)));
+        test(!compObj.ice_context(null).equals(compObj.ice_context(ctx2)));
+        test(!compObj.ice_context(ctx1).equals(compObj.ice_context(ctx2)));
+
+        test(compObj.ice_preferSecure(true).equals(compObj.ice_preferSecure(true)));
+        test(!compObj.ice_preferSecure(true).equals(compObj.ice_preferSecure(false)));
+
+        let compObj1 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10000");
+        let compObj2 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 10001");
+        test(!compObj1.equals(compObj2));
+
+        compObj1 = communicator.stringToProxy("foo@MyAdapter1");
+        compObj2 = communicator.stringToProxy("foo@MyAdapter2");
+        test(!compObj1.equals(compObj2));
+
+        test(compObj1.ice_locatorCacheTimeout(20).equals(compObj1.ice_locatorCacheTimeout(20)));
+        test(!compObj1.ice_locatorCacheTimeout(10).equals(compObj1.ice_locatorCacheTimeout(20)));
+
+        test(compObj1.ice_invocationTimeout(20).equals(compObj1.ice_invocationTimeout(20)));
+        test(!compObj1.ice_invocationTimeout(10).equals(compObj1.ice_invocationTimeout(20)));
+
+        compObj1 = communicator.stringToProxy("foo:" + defaultProtocol + " -h 127.0.0.1 -p 1000");
+        compObj2 = communicator.stringToProxy("foo@MyAdapter1");
+        test(!compObj1.equals(compObj2));
+
+        const endpts1 =
+                communicator.stringToProxy(`foo:${defaultProtocol} -h 127.0.0.1 -p 10000`).ice_getEndpoints();
+        const endpts2 =
+                communicator.stringToProxy(`foo:${defaultProtocol} -h 127.0.0.1 -p 10001`).ice_getEndpoints();
+        test(!endpts1[0].equals(endpts2[0]));
+        test(endpts1[0].equals(
+            communicator.stringToProxy(`foo:${defaultProtocol} -h 127.0.0.1 -p 10000`).ice_getEndpoints()[0]));
+
+        test(compObj1.ice_encodingVersion(Ice.Encoding_1_0).equals(compObj1.ice_encodingVersion(Ice.Encoding_1_0)));
+        test(!compObj1.ice_encodingVersion(Ice.Encoding_1_0).equals(
+            compObj1.ice_encodingVersion(Ice.Encoding_1_1)));
+
+        const baseConnection = await base.ice_getConnection();
+        if(baseConnection !== null)
+        {
+            const baseConnection2 = await base.ice_connectionId("base2").ice_getConnection();
+            compObj1 = compObj1.ice_fixed(baseConnection);
+            compObj2 = compObj2.ice_fixed(baseConnection2);
+            test(!compObj1.equals(compObj2));
+        }
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const cl = await Test.MyClassPrx.checkedCast(base);
+        test(cl !== null);
+        let derived = await Test.MyDerivedClassPrx.checkedCast(cl);
+        test(derived !== null);
+        test(cl.equals(base));
+        test(derived.equals(base));
+        test(cl.equals(derived));
+        out.writeLine("ok");
+
+        out.write("testing checked cast with context... ");
+        let c = await cl.getContext();
+        test(c === null || c.size == 0);
+        c = new Map();
+        c.set("one", "hello");
+        c.set("two", "world");
+        const clc = await Test.MyClassPrx.checkedCast(base, undefined, c);
+        const c2 = await clc.getContext();
+        test(Ice.MapUtil.equals(c, c2));
+        out.writeLine("ok");
+
+        out.write("testing ice_fixed... ");
+        {
+            const connection = await cl.ice_getConnection();
+            if(connection !== null)
+            {
+                await cl.ice_fixed(connection).getContext();
+                test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
+                test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet");
+                test(cl.ice_oneway().ice_fixed(connection).ice_isOneway());
+                const ctx = new Map();
+                ctx.set("one", "hello");
+                ctx.set("two", "world");
+                test(cl.ice_fixed(connection).ice_getContext().size == 0);
+                test(cl.ice_context(ctx).ice_fixed(connection).ice_getContext().size == 2);
+                test(cl.ice_fixed(connection).ice_getInvocationTimeout() == -1);
+                test(cl.ice_invocationTimeout(10).ice_fixed(connection).ice_getInvocationTimeout() == 10);
+                test(await cl.ice_fixed(connection).ice_getConnection() == connection);
+                test(await cl.ice_fixed(connection).ice_fixed(connection).ice_getConnection() == connection);
+                test(cl.ice_fixed(connection).ice_getTimeout() === undefined);
+                const fixedConnection = await cl.ice_connectionId("ice_fixed").ice_getConnection();
+                test(await cl.ice_fixed(connection).ice_fixed(fixedConnection).ice_getConnection() ==
+                        fixedConnection);
+                try
+                {
+                    await cl.ice_secure(!connection.getEndpoint().getInfo().secure()).ice_fixed(connection).ice_ping();
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.NoEndpointException);
+                }
+                try
+                {
+                    await cl.ice_datagram().ice_fixed(connection).ice_ping();
+                }
+                catch(ex)
+                {
+                    test(ex instanceof Ice.NoEndpointException);
+                }
+
+            }
+            else
+            {
+                try
+                {
+                    cl.ice_fixed(connection);
+                    test(false);
+                }
+                catch(ex)
+                {
+                    // Expected with null connection.
+                }
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("testing encoding versioning... ");
+
+        let ref20 = "test -e 2.0:" + this.getTestEndpoint();
+        let cl20 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
+        try
+        {
+            await cl20.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.UnsupportedEncodingException, ex);
+        }
+
+        let ref10 = "test -e 1.0:" + this.getTestEndpoint();
+        let cl10 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
+
+        await cl10.ice_ping();
+        await cl10.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+        await cl.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+
+        // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
+        // call will use the 1.1 encoding
+        let ref13 = "test -e 1.3:" + this.getTestEndpoint();
+        let cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
+        await cl13.ice_ping();
+
+        // TODO port ice_invoke test
+        out.writeLine("ok");
+
+        out.write("testing protocol versioning... ");
+        ref20 = "test -p 2.0:" + this.getTestEndpoint();
+        cl20 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
+        try
+        {
+            await cl20.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            // Server 2.0 proxy doesn't support 1.0 version.
+            test(ex instanceof Ice.UnsupportedProtocolException, ex);
+        }
+
+        ref10 = "test -p 1.0:" + this.getTestEndpoint();
+        cl10 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10));
+        await cl10.ice_ping();
+
+        // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
+        // call will use the 1.1 protocol
+        ref13 = "test -p 1.3:" + this.getTestEndpoint();
+        cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13));
+        await cl13.ice_ping();
+        out.writeLine("ok");
+
+        out.write("testing opaque endpoints... ");
+
+        try
+        {
+            // Invalid -x option
+            communicator.stringToProxy("id:opaque -t 99 -v abc -x abc");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Missing -t and -v
+            communicator.stringToProxy("id:opaque");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Repeated -t
+            communicator.stringToProxy("id:opaque -t 1 -t 1 -v abc");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Repeated -v
+            communicator.stringToProxy("id:opaque -t 1 -v abc -v abc");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Missing -t
+            communicator.stringToProxy("id:opaque -v abc");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Missing -v
+            communicator.stringToProxy("id:opaque -t 1");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Missing arg for -t
+            communicator.stringToProxy("id:opaque -t -v abc");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Missing arg for -v
+            communicator.stringToProxy("id:opaque -t 1 -v");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Not a number for -t
+            communicator.stringToProxy("id:opaque -t x -v abc");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // < 0 for -t
+            communicator.stringToProxy("id:opaque -t -1 -v abc");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        try
+        {
+            // Invalid char for -v
+            communicator.stringToProxy("id:opaque -t 99 -v x?c");
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.EndpointParseException, ex);
+        }
+
+        // Legal TCP endpoint expressed as opaque endpoint
+        let p1 = communicator.stringToProxy("test -e 1.1:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+        let pstr = communicator.proxyToString(p1);
+        test(pstr === "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+
+        // Legal WS endpoint expressed as opaque endpoint
+        p1 = communicator.stringToProxy("test -e 1.1:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=");
+        pstr = communicator.proxyToString(p1);
+        test(pstr === "test -t -e 1.1:ws -h 127.0.0.1 -p 12010 -t 10000");
+
+        // Opaque endpoint encoded with 1.1 encoding.
+
+        let p2 = communicator.stringToProxy("test:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+        test(communicator.proxyToString(p2) === "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
+
+        p2 = communicator.stringToProxy("test:opaque -e 1.1 -t 4 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=");
+        test(communicator.proxyToString(p2) === "test -t -e 1.1:ws -h 127.0.0.1 -p 12010 -t 10000");
+
+        if(communicator.getProperties().getPropertyAsInt("Ice.IPv6") === 0)
+        {
+            const ref = "test:" + this.getTestEndpoint();
+
+            const ssl = communicator.getProperties().getProperty("Ice.Default.Protocol") === "ssl";
+            // TODO: p1 contains 127.0.0.1 - OK to invoke?
+            //   if(!ssl)
+            //   {
+            //       p1.ice_encodingVersion(Ice.Util.Encoding_1_0).ice_ping();
+            //   }
+
+            // Two legal TCP endpoints expressed as opaque endpoints
+            p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMusuAAAQJwAAAA==");
+            pstr = communicator.proxyToString(p1);
+            test(pstr === "test -t -e 1.0:tcp -h 127.0.0.1 -p 12010 -t 10000:tcp -h 127.0.0.2 -p 12011 -t 10000");
+
+            p1 = communicator.stringToProxy("test -e 1.0:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAAA=:opaque -t 4 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAAA=");
+            pstr = communicator.proxyToString(p1);
+            test(pstr === "test -t -e 1.0:ws -h 127.0.0.1 -p 12010 -t 10000:ws -h 127.0.0.2 -p 12011 -t 10000");
+
+            //
+            // Test that an SSL endpoint and a nonsense endpoint get
+            // written back out as an opaque endpoint.
+            //
+            p1 = communicator.stringToProxy("test -e 1.0:opaque -e 1.0 -t 2 -v CTEyNy4wLjAuMREnAAD/////AA==:opaque -t 99 -e 1.0 -v abch");
+            pstr = communicator.proxyToString(p1);
+            test(pstr === "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch");
+
+            //
+            // Try to invoke on the SSL endpoint to verify that we get a
+            // NoEndpointException (or ConnectFailedException when
+            // running with SSL).
+            //
+            try
+            {
+                await p1.ice_encodingVersion(Ice.Encoding_1_0).ice_ping();
+                test(false);
+            }
+            catch(ex)
+            {
+                if(ex instanceof Ice.NoEndpointException)
+                {
+                    test(!ssl);
+                }
+                else if(ex instanceof Ice.ConnectFailedException)
+                {
+                    test(ssl);
+                }
+                else
+                {
+                    throw ex;
+                }
+            }
+            //
+            // Test that the proxy with an SSL endpoint and a nonsense
+            // endpoint (which the server doesn't understand either) can
+            // be sent over the wire and returned by the server without
+            // losing the opaque endpoints.
+            //
+            derived = Test.MyDerivedClassPrx.uncheckedCast(
+                communicator.stringToProxy("test -e 1.0:" + this.getTestEndpoint()));
+            p2 = await derived.echo(p1);
+
+            pstr = communicator.proxyToString(p2);
+            test(pstr === "test -t -e 1.0:ssl -h 127.0.0.1 -p 10001 -t infinite:opaque -t 99 -e 1.0 -v abch");
+
+            let p = communicator.stringToProxy("test:" + this.getTestEndpoint());
+            if(defaultProtocol === "tcp")
+            {
+                test(p.ice_getEndpoints()[0].getInfo() instanceof Ice.TCPEndpointInfo);
+            }
+            else if(defaultProtocol === "ws" || defaultProtocol === "wss")
+            {
+                test(p.ice_getEndpoints()[0].getInfo() instanceof Ice.WSEndpointInfo);
+            }
+
+            let con = await p.ice_getConnection();
+            if(defaultProtocol === "tcp")
+            {
+                test(con.getInfo() instanceof Ice.TCPConnectionInfo);
+            }
+            else if(defaultProtocol === "ws" || defaultProtocol === "wss")
+            {
+                test(con.getInfo() instanceof Ice.WSConnectionInfo);
+            }
+
+            //
+            // Ensure that non connectable endpoints are skipped.
+            //
+            p = communicator.stringToProxy("test:" + this.getTestEndpoint("ws") + ":" + this.getTestEndpoint());
+
+            p = p.ice_endpointSelection(Ice.EndpointSelectionType.Ordered);
+            await p.ice_ping();
+
+            out.writeLine("ok");
+
+            out.write("testing proxyToString... ");
+            b1 = communicator.stringToProxy(ref);
+            let b2 = communicator.stringToProxy(communicator.proxyToString(b1));
+            test(b1.equals(b2));
+
+            con = await b1.ice_getConnection();
+            b2 = con.createProxy(Ice.stringToIdentity("fixed"));
+            const str = communicator.proxyToString(b2);
+            test(b2.toString() === str);
+            const str2 = b1.ice_identity(b2.ice_getIdentity()).ice_secure(b2.ice_isSecure()).toString();
+
+            // Verify that the stringified fixed proxy is the same as a regular stringified proxy
+            // but without endpoints
+            test(str2.startsWith(str));
+            test(str2.charAt(str.length) === ':');
+
+            out.writeLine("ok");
+
+            if(defaultProtocol === "ws" || defaultProtocol === "wss")
+            {
+                out.write("testing ping invalid WS proxies... ");
+                //
+                // Invocation in a WS or WSS proxy that has not hostname set
+                // will fail creating the WebSocket object.
+                //
+                const communicator2 = Ice.initialize();
+                const invalid = communicator2.stringToProxy("test:" + this.getTestEndpoint());
+                try
+                {
+                    await invalid.ice_ping();
+                    test(false);
+                }
+                catch(ex)
+                {
+                    // expected
+                }
+                finally
+                {
+                    await communicator2.destroy();
+                }
+                out.writeLine("ok");
+            }
+
+            out.write("testing communicator shutdown/destroy... ");
+            {
+                const c = Ice.initialize();
+                c.shutdown();
+                test(c.isShutdown());
+                await c.waitForShutdown();
+                await c.destroy();
+                c.shutdown();
+                test(c.isShutdown());
+                await c.waitForShutdown();
+                await c.destroy();
+            }
+            out.writeLine("ok");
+
+            derived = Test.MyDerivedClassPrx.uncheckedCast(
+                communicator.stringToProxy("test:" + this.getTestEndpoint()));
+            await derived.shutdown();
+        }
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/proxy/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/proxy/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,26 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+#include <Ice/Current.ice>
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface MyClass
+{
+    void shutdown();
+
+    Ice::Context getContext();
+}
+
+interface MyDerivedClass extends MyClass
+{
+    Object* echo(Object* obj);
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/retry/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/retry/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/retry/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/retry/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,132 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests(communicator:Ice.Communicator, communicator2:Ice.Communicator)
+    {
+        const out = this.getWriter();
+        out.write("testing stringToProxy... ");
+        const ref = "retry:" + this.getTestEndpoint();
+        const base1 = communicator.stringToProxy(ref);
+        test(base1 !== null);
+        const base2 = communicator.stringToProxy(ref);
+        test(base2 !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const retry1 = await Test.RetryPrx.checkedCast(base1);
+        test(retry1 !== null);
+        test(retry1.equals(base1));
+        let retry2 = await Test.RetryPrx.checkedCast(base2);
+        test(retry2 !== null);
+        test(retry2.equals(base2));
+        out.writeLine("ok");
+
+        out.write("calling regular operation with first proxy... ");
+        await retry1.op(false);
+        out.writeLine("ok");
+
+        out.write("calling operation to kill connection with second proxy... ");
+        try
+        {
+            await retry2.op(true);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ConnectionLostException, ex);
+            out.writeLine("ok");
+        }
+
+        out.write("calling regular operation with first proxy again... ");
+        await retry1.op(false);
+        out.writeLine("ok");
+
+        out.write("testing idempotent operation... ");
+        const count = await retry1.opIdempotent(4);
+        test(count === 4);
+        out.writeLine("ok");
+
+        out.write("testing non-idempotent operation... ");
+        try
+        {
+            await retry1.opNotIdempotent();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.LocalException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing invocation timeout and retries... ");
+        retry2 = Test.RetryPrx.uncheckedCast(communicator2.stringToProxy(retry1.toString()));
+        try
+        {
+            await retry2.ice_invocationTimeout(500).opIdempotent(4);
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.InvocationTimeoutException, ex);
+        }
+
+        await retry2.opIdempotent(-1);
+        out.writeLine("ok");
+
+        await retry1.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let communicator2:Ice.Communicator;
+        try
+        {
+            let [properties] = this.createTestProperties(args);
+
+            //
+            // For this test, we want to disable retries.
+            //
+            properties.setProperty("Ice.RetryIntervals", "0 1 10 1");
+
+            //
+            // We don't want connection warnings because of the timeout
+            //
+            properties.setProperty("Ice.Warn.Connections", "0");
+
+            [communicator] = this.initialize(properties);
+
+            //
+            // Configure a second communicator for the invocation timeout
+            // + retry test, we need to configure a large retry interval
+            // to avoid time-sensitive failures.
+            //
+            properties = communicator.getProperties().clone();
+            properties.setProperty("Ice.RetryIntervals", "0 1 10000");
+            [communicator2] = this.initialize(properties);
+
+            await this.allTests(communicator, communicator2);
+        }
+        finally
+        {
+            if(communicator2)
+            {
+                await communicator2.destroy();
+            }
+
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/retry/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/retry/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/retry/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/retry/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,23 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+interface Retry
+{
+    void op(bool kill);
+
+    idempotent int opIdempotent(int c);
+    void opNotIdempotent();
+    void opSystemException();
+
+    idempotent void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/scope/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/scope/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/scope/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/scope/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,180 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test, Inner} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+
+        out.write("test same Slice type name in different scopes... ");
+
+        {
+            const i1 = await Test.IPrx.checkedCast(communicator.stringToProxy("i1:" + this.getTestEndpoint()));
+            const s1 = new Test.S(0);
+
+            const [s2, s3] = await i1.opS(s1);
+            test(s2.equals(s1));
+            test(s3.equals(s1));
+
+            const [sseq2, sseq3] = await i1.opSSeq([s1]);
+            test(sseq2[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            const smap1 = new Map([["a", s1]]);
+            const [smap2, smap3] = await i1.opSMap(smap1);
+            test(smap2.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            const c1 = new Test.C(s1);
+
+            const [c2, c3] = await i1.opC(c1);
+            test(c2.s.equals(s1));
+            test(c3.s.equals(s1));
+
+            const [cseq2, cseq3] = await i1.opCSeq([c1]);
+            test(cseq2[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            const cmap1 = new Map([["a", c1]]);
+            const [cmap2, cmap3] = await i1.opCMap(cmap1);
+            test(cmap2.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            const i2 = await Test.Inner.Inner2.IPrx.checkedCast(
+                communicator.stringToProxy("i2:" + this.getTestEndpoint()));
+            const s1 = new Test.Inner.Inner2.S(0);
+
+            const [s2, s3] = await i2.opS(s1);
+            test(s2.equals(s1));
+            test(s3.equals(s1));
+
+            const [sseq2, sseq3] = await i2.opSSeq([s1]);
+            test(sseq2[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            const smap1 = new Map([["a", s1]]);
+            const [smap2, smap3] = await i2.opSMap(smap1);
+            test(smap2.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            const c1 = new Test.Inner.Inner2.C(s1);
+
+            const [c2, c3] = await i2.opC(c1);
+            test(c2.s.equals(s1));
+            test(c3.s.equals(s1));
+
+            const [cseq2, cseq3] = await i2.opCSeq([c1]);
+            test(cseq2[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            const cmap1 = new Map([["a", c1]]);
+            const [cmap2, cmap3] = await i2.opCMap(cmap1);
+            test(cmap2.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            const i3 = await Test.Inner.IPrx.checkedCast(
+                communicator.stringToProxy("i3:" + this.getTestEndpoint()));
+            const s1 = new Test.Inner.Inner2.S(0);
+
+            const [s2, s3] = await i3.opS(s1);
+            test(s2.equals(s1));
+            test(s3.equals(s1));
+
+            const [sseq2, sseq3] = await i3.opSSeq([s1]);
+            test(sseq2[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            const smap1 = new Map([["a", s1]]);
+            const [smap2, smap3] = await i3.opSMap(smap1);
+            test(smap2.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            const c1 = new Test.Inner.Inner2.C(s1);
+
+            const [c2, c3] = await i3.opC(c1);
+            test(c2.s.equals(s1));
+            test(c3.s.equals(s1));
+
+            const [cseq2, cseq3] = await i3.opCSeq([c1]);
+            test(cseq2[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            const cmap1 = new Map([["a", c1]]);
+            const [cmap2, cmap3] = await i3.opCMap(cmap1);
+            test(cmap2.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            const i4 = await Inner.Test.Inner2.IPrx.checkedCast(
+                communicator.stringToProxy("i4:" + this.getTestEndpoint()));
+            const s1 = new Test.S(0);
+
+            const [s2, s3] = await i4.opS(s1);
+            test(s2.equals(s1));
+            test(s3.equals(s1));
+
+            const [sseq2, sseq3] = await i4.opSSeq([s1]);
+            test(sseq2[0].equals(s1));
+            test(sseq3[0].equals(s1));
+
+            const smap1 = new Map([["a", s1]]);
+            const [smap2, smap3] = await i4.opSMap(smap1);
+            test(smap2.get("a").equals(s1));
+            test(smap3.get("a").equals(s1));
+
+            const c1 = new Test.C(s1);
+
+            const [c2, c3] = await i4.opC(c1);
+            test(c2.s.equals(s1));
+            test(c3.s.equals(s1));
+
+            const [cseq2, cseq3] = await i4.opCSeq([c1]);
+            test(cseq2[0].s.equals(s1));
+            test(cseq3[0].s.equals(s1));
+
+            const cmap1 = new Map([["a", c1]]);
+            const [cmap2, cmap3] = await i4.opCMap(cmap1);
+            test(cmap2.get("a").s.equals(s1));
+            test(cmap3.get("a").s.equals(s1));
+        }
+
+        {
+            const i1 = await Test.IPrx.checkedCast(communicator.stringToProxy("i1:" + this.getTestEndpoint()));
+            await i1.shutdown();
+        }
+
+        out.writeLine("ok");
+    }
+
+    async run(args:string[])
+    {
+        let x;
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/scope/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,138 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq s1, out CSeq s2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,307 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        async function testExceptions(obj:Test.TestIntfPrx)
+        {
+            try
+            {
+                await obj.requestFailedException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ObjectNotExistException, ex);
+                test(ex.id.equals(obj.ice_getIdentity()));
+                test(ex.facet == obj.ice_getFacet());
+                test(ex.operation == "requestFailedException");
+            }
+
+            try
+            {
+                await obj.unknownUserException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownUserException, ex);
+                test(ex.unknown == "reason");
+            }
+
+            try
+            {
+                await obj.unknownLocalException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownLocalException, ex);
+                test(ex.unknown == "reason");
+            }
+
+            try
+            {
+                await obj.unknownException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownException, ex);
+                test(ex.unknown == "reason");
+            }
+
+            try
+            {
+                await obj.userException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test((ex instanceof Ice.OperationNotExistException) ||
+                        (ex instanceof Ice.UnknownUserException &&
+                        ex.unknown == "::Test::TestIntfUserException"), ex);
+            }
+
+            try
+            {
+                await obj.localException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownLocalException, ex);
+                test(ex.unknown.indexOf("Ice::SocketException") >= 0 ||
+                        ex.unknown.indexOf("Ice.SocketException") >= 0);
+            }
+
+            try
+            {
+                await obj.jsException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test((ex instanceof Ice.OperationNotExistException) ||
+                        (ex instanceof Ice.UnknownException || ex.unknown.indexOf("") >= 0), ex);
+            }
+
+            try
+            {
+                await obj.unknownExceptionWithServantException();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownException, ex);
+                test(ex.unknown == "reason");
+            }
+
+            try
+            {
+                await obj.impossibleException(false);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownUserException, ex);
+            }
+
+            try
+            {
+                await obj.impossibleException(true);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnknownUserException, ex);
+            }
+
+            try
+            {
+                await obj.intfUserException(false);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.TestImpossibleException, ex);
+            }
+
+            try
+            {
+                await obj.intfUserException(true);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Test.TestImpossibleException, ex);
+            }
+        }
+
+        const out = this.getWriter();
+        const communicator = this.communicator();
+        out.write("testing stringToProxy... ");
+        const ref = "asm:" + this.getTestEndpoint();
+        let base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        let obj = await Test.TestIntfPrx.checkedCast(base);
+        test(obj !== null);
+        test(obj.equals(base));
+        out.writeLine("ok");
+
+        out.write("testing ice_ids... ");
+        try
+        {
+            const o = communicator.stringToProxy("category/locate:" + this.getTestEndpoint());
+            await o.ice_ids();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.UnknownUserException && ex.unknown == "::Test::TestIntfUserException", ex);
+        }
+
+        try
+        {
+            const o = communicator.stringToProxy("category/finished:" + this.getTestEndpoint());
+            await o.ice_ids();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.UnknownUserException && ex.unknown == "::Test::TestIntfUserException", ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing servant locator... ");
+        base = communicator.stringToProxy("category/locate:" + this.getTestEndpoint());
+        obj = await Test.TestIntfPrx.checkedCast(base);
+
+        try
+        {
+            await Test.TestIntfPrx.checkedCast(
+                communicator.stringToProxy("category/unknown:" + this.getTestEndpoint()));
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ObjectNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing default servant locator... ");
+        base = communicator.stringToProxy("anothercat/locate:" + this.getTestEndpoint());
+        obj = await Test.TestIntfPrx.checkedCast(base);
+        base = communicator.stringToProxy("locate:" + this.getTestEndpoint());
+        obj = await Test.TestIntfPrx.checkedCast(base);
+        try
+        {
+            await Test.TestIntfPrx.checkedCast(
+                communicator.stringToProxy("anothercat/unknown:" + this.getTestEndpoint()));
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ObjectNotExistException, ex);
+        }
+
+        try
+        {
+            await Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:" + this.getTestEndpoint()));
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ObjectNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing locate exceptions... ");
+        base = communicator.stringToProxy("category/locate:" + this.getTestEndpoint());
+        obj = await Test.TestIntfPrx.checkedCast(base);
+        await testExceptions(obj);
+        out.writeLine("ok");
+
+        out.write("testing finished exceptions... ");
+        base = communicator.stringToProxy("category/finished:" + this.getTestEndpoint());
+        obj = await Test.TestIntfPrx.checkedCast(base);
+        await testExceptions(obj);
+
+        try
+        {
+            //
+            // Only call these for category/finished.
+            //
+            await obj.asyncResponse();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.TestImpossibleException, ex); // Called by finished().
+        }
+
+        try
+        {
+            await obj.asyncException();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.TestImpossibleException, ex); // Called by finished().
+        }
+        out.writeLine("ok");
+
+        out.write("testing servant locator removal... ");
+        base = communicator.stringToProxy("test/activation:" + this.getTestEndpoint());
+        const activation = await Test.TestActivationPrx.checkedCast(base);
+        await activation.activateServantLocator(false);
+        try
+        {
+            await obj.ice_ping();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.ObjectNotExistException, ex);
+        }
+        out.writeLine("ok");
+
+        out.write("testing servant locator addition... ");
+        await activation.activateServantLocator(true);
+        await obj.ice_ping();
+        out.writeLine("ok");
+
+        out.write("shuting down server...")
+        await obj.shutdown();
+        out.writeLine("ok");
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,145 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestI} from "./TestI";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+class MyError
+{
+}
+
+class CookieI
+{
+    message()
+    {
+        return "blahblah";
+    }
+}
+
+export class ServantLocatorI implements Ice.ServantLocator
+{
+    constructor(category:string)
+    {
+        this._category = category;
+        this._deactivated = false;
+        this._requestId = -1;
+    }
+
+    locate(current:Ice.Current, cookie:Ice.Holder<Object>):Ice.Object
+    {
+        test(!this._deactivated);
+
+        test(current.id.category == this._category || this._category.length == 0);
+
+        if(current.id.name == "unknown")
+        {
+            return null;
+        }
+
+        test(current.id.name == "locate" || current.id.name == "finished");
+        if(current.id.name == "locate")
+        {
+            this.exception(current);
+        }
+
+        //
+        // Ensure locate() is only called once per request.
+        //
+        test(this._requestId == -1);
+        this._requestId = current.requestId;
+        cookie.value = new CookieI();
+        return new TestI();
+    }
+
+    finished(current:Ice.Current, servant:Ice.Object, cookie:Object):void
+    {
+        test(!this._deactivated);
+
+        //
+        // Ensure finished() is only called once per request.
+        //
+        test(this._requestId == current.requestId);
+        this._requestId = -1;
+
+        test(current.id.category == this._category || this._category.length == 0);
+        test(current.id.name == "locate" || current.id.name == "finished");
+
+        if(current.id.name == "finished")
+        {
+            this.exception(current);
+        }
+
+        test((cookie as CookieI).message() == "blahblah");
+    }
+
+    deactivate(category:string):void
+    {
+        test(!this._deactivated);
+        this._deactivated = true;
+    }
+
+    exception(current:Ice.Current):void
+    {
+        if(current.operation == "ice_ids")
+        {
+            throw new Test.TestIntfUserException();
+        }
+        else if(current.operation == "requestFailedException")
+        {
+            throw new Ice.ObjectNotExistException();
+        }
+        else if(current.operation == "unknownUserException")
+        {
+            throw new Ice.UnknownUserException("reason");
+        }
+        else if(current.operation == "unknownLocalException")
+        {
+            throw new Ice.UnknownLocalException("reason");
+        }
+        else if(current.operation == "unknownException")
+        {
+            throw new Ice.UnknownException("reason");
+        }
+        else if(current.operation == "userException")
+        {
+            throw new Test.TestIntfUserException();
+        }
+        else if(current.operation == "localException")
+        {
+            throw new Ice.SocketException(0);
+        }
+        else if(current.operation == "jsException")
+        {
+            throw new MyError();
+        }
+        else if(current.operation == "unknownExceptionWithServantException")
+        {
+            throw new Ice.UnknownException("reason");
+        }
+        else if(current.operation == "impossibleException")
+        {
+            throw new Test.TestIntfUserException(); // Yes, it really is meant to be TestIntfUserException.
+        }
+        else if(current.operation == "intfUserException")
+        {
+            throw new Test.TestImpossibleException(); // Yes, it really is meant to be TestImpossibleException.
+        }
+        else if(current.operation == "asyncResponse")
+        {
+            throw new Test.TestImpossibleException();
+        }
+        else if(current.operation == "asyncException")
+        {
+            throw new Test.TestImpossibleException();
+        }
+    }
+
+    _category:string;
+    _deactivated:boolean;
+    _requestId:number;
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/Server.ts zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/Server.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/Server.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/Server.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,47 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+import {TestI} from "./TestI";
+import {TestActivationI} from "./TestActivationI";
+import {ServantLocatorI} from "./ServantLocatorI";
+
+export class Server extends TestHelper
+{
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        let echo:Test.EchoPrx;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            properties.setProperty("Ice.Warn.Dispatch", "0");
+            [communicator] = this.initialize(properties);
+
+            echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint()));
+            const adapter = await communicator.createObjectAdapter("");
+            adapter.addServantLocator(new ServantLocatorI("category"), "category");
+            adapter.addServantLocator(new ServantLocatorI(""), "");
+            adapter.add(new TestI(), Ice.stringToIdentity("asm"));
+            adapter.add(new TestActivationI(), Ice.stringToIdentity("test/activation"));
+            await echo.setConnection();
+            echo.ice_getCachedConnection().setAdapter(adapter);
+            this.serverReady();
+            await adapter.waitForDeactivate();
+        }
+        finally
+        {
+            if(echo)
+            {
+                await echo.shutdown();
+            }
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/TestActivationI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/TestActivationI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/TestActivationI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/TestActivationI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,26 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {ServantLocatorI} from "./ServantLocatorI";
+
+export class TestActivationI extends Test.TestActivation
+{
+    activateServantLocator(activate:boolean, current:Ice.Current):void
+    {
+        if(activate)
+        {
+            current.adapter.addServantLocator(new ServantLocatorI(""), "");
+            current.adapter.addServantLocator(new ServantLocatorI("category"), "category");
+        }
+        else
+        {
+            let locator = current.adapter.removeServantLocator("");
+            locator.deactivate("");
+            locator = current.adapter.removeServantLocator("category");
+            locator.deactivate("category");
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,59 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+exception TestIntfUserException
+{
+}
+
+exception TestImpossibleException
+{
+}
+
+interface TestIntf
+{
+    void requestFailedException();
+    void unknownUserException();
+    void unknownLocalException();
+    void unknownException();
+    void localException();
+    void userException();
+    void jsException();
+
+    void unknownExceptionWithServantException();
+
+    string impossibleException(bool throw) throws TestImpossibleException;
+    string intfUserException(bool throw) throws TestIntfUserException, TestImpossibleException;
+
+    void asyncResponse() throws TestIntfUserException, TestImpossibleException;
+    void asyncException() throws TestIntfUserException, TestImpossibleException;
+
+    void shutdown();
+}
+
+interface TestActivation
+{
+    void activateServantLocator(bool activate);
+}
+
+local class Cookie
+{
+    ["cpp:const"] string message();
+}
+
+interface Echo
+{
+    void setConnection();
+    void startBatch();
+    void flushBatch();
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/TestI.ts zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/TestI.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/servantLocator/TestI.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/servantLocator/TestI.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,90 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+
+export class TestI extends Test.TestIntf
+{
+    requestFailedException(current:Ice.Current):void
+    {
+    }
+
+    unknownUserException(current:Ice.Current):void
+    {
+    }
+
+    unknownLocalException(current:Ice.Current):void
+    {
+    }
+
+    unknownException(current:Ice.Current):void
+    {
+    }
+
+    localException(current:Ice.Current):void
+    {
+    }
+
+    userException(current:Ice.Current):void
+    {
+    }
+
+    jsException(current:Ice.Current):void
+    {
+        throw new Error();
+    }
+
+    javaException(current:Ice.Current):void
+    {
+    }
+
+    unknownExceptionWithServantException(current:Ice.Current):void
+    {
+        throw new Ice.ObjectNotExistException();
+    }
+
+    impossibleException(throwEx:boolean, current:Ice.Current):string
+    {
+        if(throwEx)
+        {
+            throw new Test.TestImpossibleException();
+        }
+
+        //
+        // Return a value so we can be sure that the stream position
+        // is reset correctly if finished() throws.
+        //
+        return "Hello";
+    }
+
+    intfUserException(throwEx:boolean, current:Ice.Current):string
+    {
+        if(throwEx)
+        {
+            throw new Test.TestIntfUserException();
+        }
+
+        //
+        // Return a value so we can be sure that the stream position
+        // is reset correctly if finished() throws.
+        //
+        return "Hello";
+    }
+
+    asyncResponse(current:Ice.Current):void
+    {
+        throw new Ice.ObjectNotExistException();
+    }
+
+    asyncException(current:Ice.Current):void
+    {
+        throw new Ice.ObjectNotExistException();
+    }
+
+    shutdown(current:Ice.Current):void
+    {
+        current.adapter.deactivate();
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/exceptions/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/exceptions/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/exceptions/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/exceptions/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,323 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        const out = this.getWriter();
+        const communicator = this.communicator();
+
+        out.write("testing stringToProxy... ");
+        const ref = "Test:" + this.getTestEndpoint() + " -t 10000";
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const prx = await Test.TestIntfPrx.checkedCast(base);
+        test(prx !== null);
+        test(prx.equals(base));
+        out.writeLine("ok");
+
+        out.write("base... ");
+        try
+        {
+            await prx.baseAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.Base, ex);
+            test(ex.b == "Base.b");
+            test(ex.ice_id() == "::Test::Base");
+        }
+        out.writeLine("ok");
+
+        out.write("slicing of unknown derived... ");
+        try
+        {
+            await prx.unknownDerivedAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.Base, ex);
+            test(ex.b == "UnknownDerived.b");
+            test(ex.ice_id() == "::Test::Base");
+        }
+        out.writeLine("ok");
+
+        out.write("non-slicing of known derived as base... ");
+        try
+        {
+            await prx.knownDerivedAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownDerived, ex);
+            test(ex.b == "KnownDerived.b");
+            test(ex.kd == "KnownDerived.kd");
+            test(ex.ice_id() == "::Test::KnownDerived");
+        }
+        out.writeLine("ok");
+
+        out.write("non-slicing of known derived as derived... ");
+        try
+        {
+            await prx.knownDerivedAsKnownDerived();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownDerived, ex);
+            test(ex.b == "KnownDerived.b");
+            test(ex.kd == "KnownDerived.kd");
+            test(ex.ice_id() == "::Test::KnownDerived");
+        }
+        out.writeLine("ok");
+
+        out.write("slicing of unknown intermediate as base... ");
+        try
+        {
+            await prx.unknownIntermediateAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.Base, ex);
+            test(ex.b == "UnknownIntermediate.b");
+            test(ex.ice_id() == "::Test::Base");
+        }
+        out.writeLine("ok");
+
+        out.write("slicing of known intermediate as base... ");
+        try
+        {
+            await prx.knownIntermediateAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownIntermediate, ex);
+            test(ex.b == "KnownIntermediate.b");
+            test(ex.ki == "KnownIntermediate.ki");
+            test(ex.ice_id() == "::Test::KnownIntermediate");
+        }
+        out.writeLine("ok");
+
+        out.write("slicing of known most derived as base... ");
+        try
+        {
+            await prx.knownMostDerivedAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownMostDerived, ex);
+            test(ex.b == "KnownMostDerived.b");
+            test(ex.ki == "KnownMostDerived.ki");
+            test(ex.kmd == "KnownMostDerived.kmd");
+            test(ex.ice_id() == "::Test::KnownMostDerived");
+        }
+        out.writeLine("ok");
+
+        out.write("non-slicing of known intermediate as intermediate... ");
+        try
+        {
+            await prx.knownIntermediateAsKnownIntermediate();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownIntermediate, ex);
+            test(ex.b == "KnownIntermediate.b");
+            test(ex.ki == "KnownIntermediate.ki");
+            test(ex.ice_id() == "::Test::KnownIntermediate");
+        }
+        out.writeLine("ok");
+
+        out.write("non-slicing of known most derived as intermediate... ");
+        try
+        {
+            await prx.knownMostDerivedAsKnownIntermediate();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownMostDerived, ex);
+            test(ex.b == "KnownMostDerived.b");
+            test(ex.ki == "KnownMostDerived.ki");
+            test(ex.kmd == "KnownMostDerived.kmd");
+            test(ex.ice_id() == "::Test::KnownMostDerived");
+        }
+        out.writeLine("ok");
+
+        out.write("non-slicing of known most derived as most derived... ");
+        try
+        {
+            await prx.knownMostDerivedAsKnownMostDerived();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownMostDerived, ex);
+            test(ex.b == "KnownMostDerived.b");
+            test(ex.ki == "KnownMostDerived.ki");
+            test(ex.kmd == "KnownMostDerived.kmd");
+            test(ex.ice_id() == "::Test::KnownMostDerived");
+        }
+        out.writeLine("ok");
+
+        out.write("slicing of unknown most derived, known intermediate as base... ");
+        try
+        {
+            await prx.unknownMostDerived1AsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownIntermediate, ex);
+            test(ex.b == "UnknownMostDerived1.b");
+            test(ex.ki == "UnknownMostDerived1.ki");
+            test(ex.ice_id() == "::Test::KnownIntermediate");
+        }
+        out.writeLine("ok");
+
+        out.write("slicing of unknown most derived, known intermediate as intermediate... ");
+        try
+        {
+            await prx.unknownMostDerived1AsKnownIntermediate();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownIntermediate, ex);
+            test(ex.b == "UnknownMostDerived1.b");
+            test(ex.ki == "UnknownMostDerived1.ki");
+            test(ex.ice_id() == "::Test::KnownIntermediate");
+        }
+        out.writeLine("ok");
+
+        out.write("slicing of unknown most derived, unknown intermediate thrown as base... ");
+        try
+        {
+            await prx.unknownMostDerived2AsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.Base, ex);
+            test(ex.b == "UnknownMostDerived2.b");
+            test(ex.ice_id() == "::Test::Base");
+        }
+        out.writeLine("ok");
+
+        out.write("unknown most derived in compact format... ");
+        try
+        {
+            await prx.unknownMostDerived2AsBaseCompact();
+            test(false);
+        }
+        catch(ex)
+        {
+            if(ex instanceof Test.Base)
+            {
+                //
+                // For the 1.0 encoding, the unknown exception is sliced to Base.
+                //
+                test(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+            }
+            else if(ex instanceof Ice.UnknownUserException)
+            {
+                //
+                // An UnknownUserException is raised for the compact format because the
+                // most-derived type is unknown and the exception cannot be sliced.
+                //
+                test(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+            }
+            else if(ex instanceof Ice.OperationNotExistException)
+            {
+                // Ignore
+            }
+            else
+            {
+                test(false, ex);
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("preserved exceptions...");
+        try
+        {
+            await prx.unknownPreservedAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.Base, ex);
+            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+            {
+                test(ex.ice_getSlicedData() === null);
+            }
+            else
+            {
+                const slicedData = ex.ice_getSlicedData();
+                test(slicedData !== null);
+                test(slicedData.slices.length == 2);
+                test(slicedData.slices[1].typeId == "::Test::SPreserved1");
+                test(slicedData.slices[0].typeId == "::Test::SPreserved2");
+            }
+        }
+
+        try
+        {
+            await prx.unknownPreservedAsKnownPreserved();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.KnownPreserved, ex);
+            test(ex.kp == "preserved");
+            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+            {
+                test(ex.ice_getSlicedData() === null);
+            }
+            else
+            {
+                const slicedData = ex.ice_getSlicedData();
+                test(slicedData !== null);
+                test(slicedData.slices.length == 2);
+                test(slicedData.slices[1].typeId == "::Test::SPreserved1");
+                test(slicedData.slices[0].typeId == "::Test::SPreserved2");
+            }
+        }
+        out.writeLine("ok");
+        await prx.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/exceptions/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/exceptions/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/exceptions/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,95 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+exception Base
+{
+    string b;
+}
+
+exception KnownDerived extends Base
+{
+    string kd;
+}
+
+exception KnownIntermediate extends Base
+{
+    string ki;
+}
+
+exception KnownMostDerived extends KnownIntermediate
+{
+    string kmd;
+}
+
+["preserve-slice"]
+exception KnownPreserved extends Base
+{
+    string kp;
+}
+
+exception KnownPreservedDerived extends KnownPreserved
+{
+    string kpd;
+}
+
+["preserve-slice"]
+class BaseClass
+{
+    string bc;
+}
+
+["format:sliced"]
+interface Relay
+{
+    void knownPreservedAsBase() throws Base;
+    void knownPreservedAsKnownPreserved() throws KnownPreserved;
+
+    void unknownPreservedAsBase() throws Base;
+    void unknownPreservedAsKnownPreserved() throws KnownPreserved;
+}
+
+["format:sliced"]
+interface TestIntf
+{
+    void baseAsBase() throws Base;
+    void unknownDerivedAsBase() throws Base;
+    void knownDerivedAsBase() throws Base;
+    void knownDerivedAsKnownDerived() throws KnownDerived;
+
+    void unknownIntermediateAsBase() throws Base;
+    void knownIntermediateAsBase() throws Base;
+    void knownMostDerivedAsBase() throws Base;
+    void knownIntermediateAsKnownIntermediate() throws KnownIntermediate;
+    void knownMostDerivedAsKnownIntermediate() throws KnownIntermediate;
+    void knownMostDerivedAsKnownMostDerived() throws KnownMostDerived;
+
+    void unknownMostDerived1AsBase() throws Base;
+    void unknownMostDerived1AsKnownIntermediate() throws KnownIntermediate;
+    void unknownMostDerived2AsBase() throws Base;
+
+    ["format:compact"] void unknownMostDerived2AsBaseCompact() throws Base;
+
+    void knownPreservedAsBase() throws Base;
+    void knownPreservedAsKnownPreserved() throws KnownPreserved;
+
+    void relayKnownPreservedAsBase(Relay* r) throws Base;
+    void relayKnownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved;
+
+    void unknownPreservedAsBase() throws Base;
+    void unknownPreservedAsKnownPreserved() throws KnownPreserved;
+
+    void relayUnknownPreservedAsBase(Relay* r) throws Base;
+    void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved;
+
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/objects/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/objects/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/objects/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/objects/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,788 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        class PreservedI extends Test.Preserved
+        {
+            constructor()
+            {
+                super();
+                ++PreservedI.counter;
+            }
+
+            static counter:number;
+        }
+
+        function PreservedFactoryI(id:string)
+        {
+            return id === Test.Preserved.ice_staticId() ? new PreservedI() : null;
+        }
+
+        const out = this.getWriter();
+        const communicator = this.communicator();
+
+        out.write("testing stringToProxy... ");
+        const ref = "Test:" + this.getTestEndpoint() + " -t 10000";
+        const base = communicator.stringToProxy(ref);
+        test(base !== null);
+        out.writeLine("ok");
+
+        out.write("testing checked cast... ");
+        const prx = await Test.TestIntfPrx.checkedCast(base);
+        test(prx !== null);
+        test(prx.equals(base));
+        out.writeLine("ok");
+
+        out.write("base as Object... ");
+        {
+            const sb = await prx.SBaseAsObject() as Test.SBase;
+            test(sb !== null);
+            test(sb.ice_id() == "::Test::SBase");
+            test(sb.sb == "SBase.sb");
+        }
+        out.writeLine("ok");
+
+        out.write("base as base... ");
+        {
+            const sb = await prx.SBaseAsSBase();
+            test(sb.sb == "SBase.sb");
+        }
+        out.writeLine("ok");
+
+        out.write("base with known derived as base... ");
+        {
+            const sb = await prx.SBSKnownDerivedAsSBase() as Test.SBSKnownDerived;
+            test(sb !== null);
+            test(sb.sb == "SBSKnownDerived.sb");
+            test(sb.sbskd == "SBSKnownDerived.sbskd");
+        }
+        out.writeLine("ok");
+
+        out.write("base with known derived as known derived... ");
+        {
+            const sb = await prx.SBSKnownDerivedAsSBSKnownDerived();
+            test(sb.sbskd == "SBSKnownDerived.sbskd");
+        }
+        out.writeLine("ok");
+
+        out.write("base with unknown derived as base... ");
+        {
+            const sb = await prx.SBSUnknownDerivedAsSBase();
+            test(sb.sb == "SBSUnknownDerived.sb");
+        }
+
+        if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+        {
+            try
+            {
+                const sb = await prx.SBSUnknownDerivedAsSBaseCompact();
+                test(sb.sb == "SBSUnknownDerived.sb");
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.OperationNotExistException, ex);
+            }
+        }
+        else
+        {
+            try
+            {
+                await prx.SBSUnknownDerivedAsSBaseCompact();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.OperationNotExistException ||
+                     ex instanceof Ice.NoValueFactoryException, ex);
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("unknown with Object as Object... ");
+        try
+        {
+            const obj = await prx.SUnknownAsObject();
+            test(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+            test(obj instanceof Ice.UnknownSlicedValue);
+            test(obj.ice_id() == "::Test::SUnknown");
+            test(obj.ice_getSlicedData() !== null);
+            await prx.checkSUnknown(obj);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Ice.NoValueFactoryException, ex);
+            test(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0));
+        }
+        out.writeLine("ok");
+
+        out.write("one-element cycle... ");
+        {
+            const b = await prx.oneElementCycle();
+            test(b !== null);
+            test(b.ice_id() == "::Test::B");
+            test(b.sb == "B1.sb");
+            test(b.pb === b);
+        }
+        out.writeLine("ok");
+
+        out.write("two-element cycle... ");
+        {
+            const b1 = await prx.twoElementCycle();
+            test(b1 !== null);
+            test(b1.ice_id() == "::Test::B");
+            test(b1.sb == "B1.sb");
+
+            const b2 = b1.pb;
+            test(b2 !== null);
+            test(b2.ice_id() == "::Test::B");
+            test(b2.sb == "B2.sb");
+            test(b2.pb == b1);
+        }
+        out.writeLine("ok");
+
+        out.write("known derived pointer slicing as derived... ");
+        {
+            const d1 = await prx.D1AsD1();
+
+            test(d1 !== null);
+            test(d1.ice_id() == "::Test::D1");
+            test(d1.sb == "D1.sb");
+            test(d1.pb !== null);
+            test(d1.pb !== d1);
+
+            const b2 = d1.pb;
+            test(b2 !== null);
+            test(b2.ice_id() == "::Test::B");
+            test(b2.sb == "D2.sb");
+            test(b2.pb === d1);
+        }
+        out.writeLine("ok");
+
+        out.write("unknown derived pointer slicing as base... ");
+        {
+            const b2 = await prx.D2AsB() as Test.B;
+
+            test(b2 !== null);
+            test(b2.ice_id() == "::Test::B");
+            test(b2.sb == "D2.sb");
+            test(b2.pb !== null);
+            test(b2.pb !== b2);
+
+            const b1 = b2.pb;
+            test(b1 !== null);
+            test(b1.ice_id() == "::Test::D1");
+            test(b1.sb == "D1.sb");
+            test(b1.pb == b2);
+            const d1 = b1 as Test.D1;
+            test(d1.sd1 == "D1.sd1");
+            test(d1.pd1 === b2);
+        }
+        out.writeLine("ok");
+
+        out.write("param ptr slicing with known first... ");
+        {
+            const [b1, b2] = await prx.paramTest1();
+            test(b1 !== null);
+            test(b1.ice_id() == "::Test::D1");
+            test(b1.sb == "D1.sb");
+            test(b1.pb == b2);
+            test(b1 !== null);
+            const d1:Test.D1 = b1 as Test.D1;
+            test(d1.sd1 == "D1.sd1");
+            test(d1.pd1 === b2);
+
+            test(b2 !== null);
+            test(b2.ice_id() == "::Test::B"); // No factory, must be sliced
+            test(b2.sb == "D2.sb");
+            test(b2.pb === b1);
+        }
+        out.writeLine("ok");
+
+        out.write("param ptr slicing with unknown first... ");
+        {
+            const [b2, b1] = await prx.paramTest2();
+            test(b1 !== null);
+            test(b1.ice_id() == "::Test::D1");
+            test(b1.sb == "D1.sb");
+            test(b1.pb === b2);
+            test(b1 !== null);
+            const d1:Test.D1 = b1 as Test.D1;
+            test(d1.sd1 == "D1.sd1");
+            test(d1.pd1 == b2);
+
+            test(b2 !== null);
+            test(b2.ice_id() == "::Test::B"); // No factory, must be sliced
+            test(b2.sb == "D2.sb");
+            test(b2.pb == b1);
+        }
+        out.writeLine("ok");
+
+        out.write("return value identity with known first... ");
+        {
+            const [ret, p1] = await prx.returnTest1();
+            test(ret === p1);
+        }
+        out.writeLine("ok");
+
+        out.write("return value identity with unknown first... ");
+        {
+            const [ret, p1] = await prx.returnTest2();
+            test(ret == p1);
+        }
+        out.writeLine("ok");
+
+        out.write("return value identity for input params known first... ");
+        {
+            const d1 = new Test.D1();
+            d1.sb = "D1.sb";
+            d1.sd1 = "D1.sd1";
+            const d3 = new Test.D3();
+            d3.pb = d1;
+            d3.sb = "D3.sb";
+            d3.sd3 = "D3.sd3";
+            d3.pd3 = d1;
+            d1.pb = d3;
+            d1.pd1 = d3;
+
+            const b1 = await prx.returnTest3(d1, d3);
+            test(b1 !== null);
+            test(b1.sb == "D1.sb");
+            test(b1.ice_id() == "::Test::D1");
+            const p1 = b1 as Test.D1;
+            test(p1 !== null);
+            test(p1.sd1 == "D1.sd1");
+            test(p1.pd1 == b1.pb);
+
+            const b2 = b1.pb;
+            test(b2 !== null);
+            test(b2.sb == "D3.sb");
+            test(b2.ice_id() == "::Test::B"); // Sliced by server
+            test(b2.pb == b1);
+
+            test(!(b2 instanceof Test.D3));
+            test(b1 !== d1);
+            test(b1 !== d3);
+            test(b2 !== d1);
+            test(b2 !== d3);
+        }
+        out.writeLine("ok");
+
+        out.write("return value identity for input params unknown first... ");
+        {
+            const d1 = new Test.D1();
+            d1.sb = "D1.sb";
+            d1.sd1 = "D1.sd1";
+            const d3 = new Test.D3();
+            d3.pb = d1;
+            d3.sb = "D3.sb";
+            d3.sd3 = "D3.sd3";
+            d3.pd3 = d1;
+            d1.pb = d3;
+            d1.pd1 = d3;
+
+            const b1 = await prx.returnTest3(d3, d1);
+
+            test(b1 !== null);
+            test(b1.sb == "D3.sb");
+            test(b1.ice_id() == "::Test::B"); // Sliced by server
+            test(!(b1 instanceof Test.D3));
+
+            const b2 = b1.pb;
+            test(b2 !== null);
+            test(b2.sb == "D1.sb");
+            test(b2.ice_id() == "::Test::D1");
+            test(b2.pb == b1);
+
+            const p3:Test.D1 = b2 as Test.D1;
+            test(p3 !== null);
+            test(p3.sd1 == "D1.sd1");
+            test(p3.pd1 === b1);
+
+            test(b1 !== d1);
+            test(b1 !== d3);
+            test(b2 !== d1);
+            test(b2 !== d3);
+        }
+        out.writeLine("ok");
+
+        out.write("remainder unmarshaling (3 instances)... ");
+        {
+            const [ret, p1, p2] = await prx.paramTest3();
+            test(p1 !== null);
+            test(p1.sb == "D2.sb (p1 1)");
+            test(p1.pb === null);
+            test(p1.ice_id() == "::Test::B");
+
+            test(p2 !== null);
+            test(p2.sb == "D2.sb (p2 1)");
+            test(p2.pb === null);
+            test(p2.ice_id() == "::Test::B");
+
+            test(ret !== null);
+            test(ret.sb == "D1.sb (p2 2)");
+            test(ret.pb === null);
+            test(ret.ice_id() == "::Test::D1");
+        }
+        out.writeLine("ok");
+
+        out.write("remainder unmarshaling (4 instances)... ");
+        {
+            const [ret, b] = await prx.paramTest4();
+            test(b !== null);
+            test(b.sb == "D4.sb (1)");
+            test(b.pb === null);
+            test(b.ice_id() == "::Test::B");
+
+            test(ret !== null);
+            test(ret.sb == "B.sb (2)");
+            test(ret.pb === null);
+            test(ret.ice_id() == "::Test::B");
+        }
+        out.writeLine("ok");
+
+        out.write("param ptr slicing, instance marshaled in unknown derived as base... ");
+        {
+            const b1 = new Test.B();
+            b1.sb = "B.sb(1)";
+            b1.pb = b1;
+
+            const d3 = new Test.D3();
+            d3.sb = "D3.sb";
+            d3.pb = d3;
+            d3.sd3 = "D3.sd3";
+            d3.pd3 = b1;
+
+            const b2 = new Test.B();
+            b2.sb = "B.sb(2)";
+            b2.pb = b1;
+
+            const ret = await prx.returnTest3(d3, b2);
+            test(ret !== null);
+            test(ret.ice_id() == "::Test::B");
+            test(ret.sb == "D3.sb");
+            test(ret.pb === ret);
+        }
+        out.writeLine("ok");
+
+        out.write("param ptr slicing, instance marshaled in unknown derived as derived... ");
+        {
+            const d11 = new Test.D1();
+            d11.sb = "D1.sb(1)";
+            d11.pb = d11;
+            d11.sd1 = "D1.sd1(1)";
+
+            const d3 = new Test.D3();
+            d3.sb = "D3.sb";
+            d3.pb = d3;
+            d3.sd3 = "D3.sd3";
+            d3.pd3 = d11;
+
+            const d12 = new Test.D1();
+            d12.sb = "D1.sb(2)";
+            d12.pb = d12;
+            d12.sd1 = "D1.sd1(2)";
+            d12.pd1 = d11;
+
+            const ret = await prx.returnTest3(d3, d12);
+            test(ret !== null);
+            test(ret.ice_id() == "::Test::B");
+            test(ret.sb == "D3.sb");
+            test(ret.pb === ret);
+        }
+        out.writeLine("ok");
+
+        out.write("sequence slicing... ");
+        {
+            let ss1b = new Test.B();
+            ss1b.sb = "B.sb";
+            ss1b.pb = ss1b;
+
+            let ss1d1 = new Test.D1();
+            ss1d1.sb = "D1.sb";
+            ss1d1.sd1 = "D1.sd1";
+            ss1d1.pb = ss1b;
+
+            let ss1d3 = new Test.D3();
+            ss1d3.sb = "D3.sb";
+            ss1d3.sd3 = "D3.sd3";
+            ss1d3.pb = ss1b;
+
+            let ss2b = new Test.B();
+            ss2b.sb = "B.sb";
+            ss2b.pb = ss1b;
+
+            let ss2d1 = new Test.D1();
+            ss2d1.sb = "D1.sb";
+            ss2d1.sd1 = "D1.sd1";
+            ss2d1.pb = ss2b;
+
+            let ss2d3 = new Test.D3();
+            ss2d3.sb = "D3.sb";
+            ss2d3.sd3 = "D3.sd3";
+            ss2d3.pb = ss2b;
+
+            ss1d1.pd1 = ss2b;
+            ss1d3.pd3 = ss2d1;
+
+            ss2d1.pd1 = ss1d3;
+            ss2d3.pd3 = ss1d1;
+
+            const ss1 = new Test.SS1();
+            ss1.s = [];
+            ss1.s[0] = ss1b;
+            ss1.s[1] = ss1d1;
+            ss1.s[2] = ss1d3;
+
+            const ss2 = new Test.SS2();
+            ss2.s = [];
+            ss2.s[0] = ss2b;
+            ss2.s[1] = ss2d1;
+            ss2.s[2] = ss2d3;
+
+            const ss = await prx.sequenceTest(ss1, ss2);
+
+            test(ss.c1 !== null);
+            const ss1b2 = ss.c1.s[0];
+            const ss1d2 = ss.c1.s[1];
+            test(ss.c2 !== null);
+            const ss1d4 = ss.c1.s[2];
+
+            test(ss.c2 !== null);
+            const ss2b2 = ss.c2.s[0];
+            const ss2d2 = ss.c2.s[1];
+            const ss2d4 = ss.c2.s[2];
+
+            test(ss1b2.pb == ss1b2);
+            test(ss1d2.pb == ss1b2);
+            test(ss1d4.pb == ss1b2);
+
+            test(ss2b2.pb == ss1b2);
+            test(ss2d2.pb == ss2b2);
+            test(ss2d4.pb == ss2b2);
+
+            test(ss1b2.ice_id() == "::Test::B");
+            test(ss1d2.ice_id() == "::Test::D1");
+            test(ss1d4.ice_id() == "::Test::B");
+
+            test(ss2b2.ice_id() == "::Test::B");
+            test(ss2d2.ice_id() == "::Test::D1");
+            test(ss2d4.ice_id() == "::Test::B");
+        }
+        out.writeLine("ok");
+
+        out.write("dictionary slicing... ");
+        {
+            const bin = new Map();
+            for(let i = 0; i < 10; ++i)
+            {
+                const s = `D1.${i}`;
+                const d1 = new Test.D1();
+                d1.sb = s;
+                d1.pb = d1;
+                d1.sd1 = s;
+                bin.set(i, d1);
+            }
+
+            const [ret, boutH] = await prx.dictionaryTest(bin);
+            test(boutH.size === 10);
+            for(let i = 0; i < 10; ++i)
+            {
+                const b = boutH.get(i * 10);
+                test(b !== null);
+                const s = `D1.${i}`;
+                test(b.sb == s);
+                test(b.pb !== null);
+                test(b.pb !== b);
+                test(b.pb.sb == s);
+                test(b.pb.pb == b.pb);
+            }
+
+            test(ret.size === 10);
+            for(let i = 0; i < 10; ++i)
+            {
+                const b = ret.get(i * 20);
+                test(b !== null);
+                const s = "D1." + (i * 20);
+                test(b.sb == s);
+                test(b.pb === (i === 0 ? null : ret.get((i - 1) * 20)));
+                const d1 = b as Test.D1;
+                test(d1 != null);
+                test(d1.sd1 == s);
+                test(d1.pd1 === b);
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("base exception thrown as base exception... ");
+        try
+        {
+            await prx.throwBaseAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.BaseException, ex);
+            test(ex.ice_id() == "::Test::BaseException");
+            test(ex.sbe == "sbe");
+            test(ex.pb !== null);
+            test(ex.pb.sb == "sb");
+            test(ex.pb.pb == ex.pb);
+        }
+        out.writeLine("ok");
+
+        out.write("derived exception thrown as base exception... ");
+        try
+        {
+            await prx.throwDerivedAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.DerivedException, ex);
+            test(ex.ice_id() == "::Test::DerivedException");
+            test(ex.sbe == "sbe");
+            test(ex.pb !== null);
+            test(ex.pb.sb == "sb1");
+            test(ex.pb.pb === ex.pb);
+            test(ex.sde == "sde1");
+            test(ex.pd1 !== null);
+            test(ex.pd1.sb == "sb2");
+            test(ex.pd1.pb === ex.pd1);
+            test(ex.pd1.sd1 == "sd2");
+            test(ex.pd1.pd1 === ex.pd1);
+        }
+        out.writeLine("ok");
+
+        out.write("derived exception thrown as derived exception... ");
+        try
+        {
+            await prx.throwDerivedAsDerived();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.DerivedException, ex);
+            test(ex.ice_id() == "::Test::DerivedException");
+            test(ex.sbe == "sbe");
+            test(ex.pb !== null);
+            test(ex.pb.sb == "sb1");
+            test(ex.pb.pb == ex.pb);
+            test(ex.sde == "sde1");
+            test(ex.pd1 !== null);
+            test(ex.pd1.sb == "sb2");
+            test(ex.pd1.pb === ex.pd1);
+            test(ex.pd1.sd1 == "sd2");
+            test(ex.pd1.pd1 === ex.pd1);
+        }
+        out.writeLine("ok");
+
+        out.write("unknown derived exception thrown as base exception... ");
+        try
+        {
+            await prx.throwUnknownDerivedAsBase();
+            test(false);
+        }
+        catch(ex)
+        {
+            test(ex instanceof Test.BaseException, ex);
+            test(ex.ice_id() == "::Test::BaseException");
+            test(ex.sbe == "sbe");
+            test(ex.pb !== null);
+            test(ex.pb.sb == "sb d2");
+            test(ex.pb.pb == ex.pb);
+        }
+        out.writeLine("ok");
+
+        out.write("forward-declared class... ");
+        {
+            const f = await prx.useForward();
+            test(f !== null);
+        }
+        out.writeLine("ok");
+
+        out.write("preserved classes... ");
+        //
+        // Register a factory in order to substitute our own subclass of Preserved. This provides
+        // an easy way to determine how many unmarshaled instances currently exist.
+        //
+        // TODO: We have to install this now (even though it's not necessary yet), because otherwise
+        // the Ice run time will install its own internal factory for Preserved upon receiving the
+        // first instance.
+        //
+        communicator.getValueFactoryManager().add(PreservedFactoryI, Test.Preserved.ice_staticId());
+        {
+            //
+            // Server knows the most-derived class PDerived.
+            //
+            const pd = new Test.PDerived();
+            pd.pi = 3;
+            pd.ps = "preserved";
+            pd.pb = pd;
+
+            const p2 = await prx.exchangePBase(pd) as Test.PDerived;
+
+            test(p2.pi === 3);
+            test(p2.ps == "preserved");
+            test(p2.pb === p2);
+        }
+
+        {
+            //
+            // Server only knows the base (non-preserved) type, so the object is sliced.
+            //
+            const pu = new Test.PCUnknown();
+            pu.pi = 3;
+            pu.pu = "preserved";
+
+            const r = await prx.exchangePBase(pu);
+
+            test(!(r instanceof Test.PCUnknown));
+            test(r.pi == 3);
+        }
+
+        {
+            //
+            // Server only knows the intermediate type Preserved. The object will be sliced to
+            // Preserved for the 1.0 encoding; otherwise it should be returned intact.
+            //
+            const pcd = new Test.PCDerived();
+            pcd.pi = 3;
+            pcd.pbs = [pcd];
+
+            const r = await prx.exchangePBase(pcd);
+            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+            {
+                test(!(r instanceof Test.PCDerived));
+                test(r.pi === 3);
+            }
+            else
+            {
+                const p2 = r as Test.PCDerived;
+                test(p2.pi === 3);
+                test(p2.pbs[0] === r);
+            }
+        }
+
+        {
+            //
+            // Server only knows the intermediate type Preserved. The object will be sliced to
+            // Preserved for the 1.0 encoding; otherwise it should be returned intact.
+            //
+            const pcd = new Test.CompactPCDerived();
+            pcd.pi = 3;
+            pcd.pbs = [pcd];
+
+            const r = await prx.exchangePBase(pcd);
+            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+            {
+                test(!(r instanceof Test.CompactPCDerived));
+                test(r.pi === 3);
+            }
+            else
+            {
+                const p2 = r as Test.PCDerived;
+                test(p2.pi === 3);
+                test(p2.pbs[0] === p2);
+            }
+        }
+
+        {
+            //
+            // Send an object that will have multiple preserved slices in the server.
+            // The object will be sliced to Preserved for the 1.0 encoding.
+            //
+            const pcd = new Test.PCDerived3();
+            pcd.pi = 3;
+
+            //
+            // Sending more than 254 objects exercises the encoding for object ids.
+            //
+            pcd.pbs = new Array(300);
+            for(let i = 0; i < 300; ++i)
+            {
+                const p2 = new Test.PCDerived2();
+                p2.pi = i;
+                p2.pbs = [null]; // Nil reference. This slice should not have an indirection table.
+                p2.pcd2 = i;
+                pcd.pbs[i] = p2;
+            }
+            pcd.pcd2 = pcd.pi;
+            pcd.pcd3 = pcd.pbs[10];
+
+            const r = await prx.exchangePBase(pcd);
+            if(prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+            {
+                test(!(r instanceof Test.PCDerived3));
+                test(r instanceof Test.Preserved);
+                test(r.pi === 3);
+            }
+            else
+            {
+                const p3 = r as Test.PCDerived3;
+                test(p3.pi === 3);
+                for(let i = 0; i < 300; ++i)
+                {
+                    const p2 = p3.pbs[i] as Test.PCDerived2;
+                    test(p2.pi === i);
+                    test(p2.pbs.length === 1);
+                    test(p2.pbs[0] === null);
+                    test(p2.pcd2 === i);
+                }
+                test(p3.pcd2 === p3.pi);
+                test(p3.pcd3 === p3.pbs[10]);
+            }
+        }
+
+        {
+            //
+            // Obtain an object with preserved slices and send it back to the server.
+            // The preserved slices should be excluded for the 1.0 encoding, otherwise
+            // they should be included.
+            //
+            const p = await prx.PBSUnknownAsPreserved();
+            await prx.checkPBSUnknown(p);
+
+            if(!prx.ice_getEncodingVersion().equals(Ice.Encoding_1_0))
+            {
+                const slicedData = p.ice_getSlicedData();
+                test(slicedData !== null);
+                test(slicedData.slices.length === 1);
+                test(slicedData.slices[0].typeId == "::Test::PSUnknown");
+                await prx.ice_encodingVersion(Ice.Encoding_1_0).checkPBSUnknown(p);
+            }
+            else
+            {
+                test(p.ice_getSlicedData() === null);
+            }
+        }
+        out.writeLine("ok");
+        await prx.shutdown();
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/objects/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/objects/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/slicing/objects/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/slicing/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,211 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+//
+// Duplicate types from Test.ice. We cannot use #include since
+// that will use the types from the same prefix.
+//
+
+class SBase
+{
+    string sb;
+}
+
+class SBSKnownDerived extends SBase
+{
+    string sbskd;
+}
+
+class B
+{
+    string sb;
+    B pb;
+}
+
+class D1 extends B
+{
+    string sd1;
+    B pd1;
+}
+
+sequence<B> BSeq;
+
+class SS1
+{
+    BSeq s;
+}
+
+class SS2
+{
+    BSeq s;
+}
+
+struct SS3
+{
+    SS1 c1;
+    SS2 c2;
+}
+
+dictionary<int, B> BDict;
+
+exception BaseException
+{
+    string sbe;
+    B pb;
+}
+
+exception DerivedException extends BaseException
+{
+    string sde;
+    D1 pd1;
+}
+
+class Forward;
+
+class PBase
+{
+    int pi;
+}
+
+sequence<PBase> PBaseSeq;
+
+["preserve-slice"]
+class Preserved extends PBase
+{
+    string ps;
+}
+
+class PDerived extends Preserved
+{
+    PBase pb;
+}
+
+class CompactPDerived(56) extends Preserved
+{
+    PBase pb;
+}
+
+["preserve-slice"]
+class PNode
+{
+    PNode next;
+}
+
+["preserve-slice"]
+exception PreservedException
+{
+}
+
+["format:sliced"]
+interface TestIntf
+{
+    Object SBaseAsObject();
+    SBase SBaseAsSBase();
+    SBase SBSKnownDerivedAsSBase();
+    SBSKnownDerived SBSKnownDerivedAsSBSKnownDerived();
+
+    SBase SBSUnknownDerivedAsSBase();
+
+    ["format:compact"] SBase SBSUnknownDerivedAsSBaseCompact();
+
+    Object SUnknownAsObject();
+    void checkSUnknown(Object o);
+
+    B oneElementCycle();
+    B twoElementCycle();
+    B D1AsB();
+    D1 D1AsD1();
+    B D2AsB();
+
+    void paramTest1(out B p1, out B p2);
+    void paramTest2(out B p2, out B p1);
+    B paramTest3(out B p1, out B p2);
+    B paramTest4(out B p);
+
+    B returnTest1(out B p1, out B p2);
+    B returnTest2(out B p2, out B p1);
+    B returnTest3(B p1, B p2);
+
+    SS3 sequenceTest(SS1 p1, SS2 p2);
+
+    BDict dictionaryTest(BDict bin, out BDict bout);
+
+    PBase exchangePBase(PBase pb);
+
+    Preserved PBSUnknownAsPreserved();
+    void checkPBSUnknown(Preserved p);
+
+    ["amd"] Preserved PBSUnknownAsPreservedWithGraph();
+    void checkPBSUnknownWithGraph(Preserved p);
+
+    ["amd"] Preserved PBSUnknown2AsPreservedWithGraph();
+    void checkPBSUnknown2WithGraph(Preserved p);
+
+    PNode exchangePNode(PNode pn);
+
+    void throwBaseAsBase() throws BaseException;
+    void throwDerivedAsBase() throws BaseException;
+    void throwDerivedAsDerived() throws DerivedException;
+    void throwUnknownDerivedAsBase() throws BaseException;
+    ["amd"] void throwPreservedException() throws PreservedException;
+
+    void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */
+
+    void shutdown();
+}
+
+//
+// Types private to the client.
+//
+
+class D3 extends B
+{
+    string sd3;
+    B pd3;
+}
+
+["preserve-slice"]
+class PCUnknown extends PBase
+{
+    string pu;
+}
+
+class PCDerived extends PDerived
+{
+    PBaseSeq pbs;
+}
+
+class PCDerived2 extends PCDerived
+{
+    int pcd2;
+}
+
+class PCDerived3 extends PCDerived2
+{
+    Object pcd3;
+}
+
+class CompactPCDerived(57) extends CompactPDerived
+{
+    PBaseSeq pbs;
+}
+
+class Hidden
+{
+    Forward f;
+}
+
+class Forward
+{
+    Hidden h;
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/stream/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/stream/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/stream/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/stream/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,628 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    allTests()
+    {
+        const communicator = this.communicator();
+        const out = this.getWriter();
+
+        class MyInterfaceI extends Ice.InterfaceByValue
+        {
+            constructor()
+            {
+                super(Test.MyInterface.ice_staticId());
+            }
+        }
+        communicator.getValueFactoryManager().add(id => new MyInterfaceI(), Test.MyInterface.ice_staticId());
+
+        let inS:Ice.InputStream = null;
+        let outS:Ice.OutputStream = null;
+
+        out.write("testing primitive types... ");
+
+        {
+            const data = new Uint8Array(0);
+            inS = new Ice.InputStream(communicator, data);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.startEncapsulation();
+            outS.writeBool(true);
+            outS.endEncapsulation();
+            const data = outS.finished();
+
+            inS = new Ice.InputStream(communicator, data);
+            inS.startEncapsulation();
+            test(inS.readBool());
+            inS.endEncapsulation();
+
+            inS = new Ice.InputStream(communicator, data);
+            inS.startEncapsulation();
+            test(inS.readBool());
+            inS.endEncapsulation();
+        }
+
+        {
+            const data = new Uint8Array(0);
+            inS = new Ice.InputStream(communicator, data);
+            try
+            {
+                inS.readBool();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.UnmarshalOutOfBoundsException);
+            }
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeBool(true);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readBool());
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeByte(1);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readByte() == 1);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeShort(2);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readShort() == 2);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeInt(3);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readInt() == 3);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeLong(new Ice.Long(4));
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readLong().toNumber() == 4);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeFloat(5.0);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readFloat() == 5.0);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeDouble(6.0);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readDouble() == 6.0);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeString("hello world");
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            test(inS.readString() == "hello world");
+        }
+
+        out.writeLine("ok");
+
+        out.write("testing constructed types... ");
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            outS.writeEnum(Test.MyEnum.enum3);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const e:Test.MyEnum = inS.readEnum(Test.MyEnum);
+            test(e == Test.MyEnum.enum3);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            const s = new Test.SmallStruct();
+            s.bo = true;
+            s.by = 1;
+            s.sh = 2;
+            s.i = 3;
+            s.l = new Ice.Long(4);
+            s.f = 5.0;
+            s.d = 6.0;
+            s.str = "7";
+            s.e = Test.MyEnum.enum2;
+            s.p = Test.MyInterfacePrx.uncheckedCast(communicator.stringToProxy("test:default"));
+            Test.SmallStruct.write(outS, s);
+            const data = outS.finished();
+            const s2 = Test.SmallStruct.read(new Ice.InputStream(communicator, data));
+            test(s2.equals(s));
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            const o = new Test.OptionalClass();
+            o.bo = true;
+            o.by = 5;
+            o.sh = 4;
+            o.i = 3;
+            outS.writeValue(o);
+            outS.writePendingValues();
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            let o2:Test.OptionalClass;
+            inS.readValue((obj:Test.OptionalClass) =>
+                            {
+                                o2 = obj;
+                            },
+                            Test.OptionalClass);
+            inS.readPendingValues();
+
+            test(o2.bo == o.bo);
+            test(o2.by == o.by);
+            if(communicator.getProperties().getProperty("Ice.Default.EncodingVersion") == "1.0")
+            {
+                test(o2.sh === undefined);
+                test(o2.i === undefined);
+            }
+            else
+            {
+                test(o2.sh == o.sh);
+                test(o2.i == o.i);
+            }
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator, Ice.Encoding_1_0);
+            const o = new Test.OptionalClass();
+            o.bo = true;
+            o.by = 5;
+            o.sh = 4;
+            o.i = 3;
+            outS.writeValue(o);
+            outS.writePendingValues();
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, Ice.Encoding_1_0, data);
+            let o2:Test.OptionalClass;
+            inS.readValue((obj:Test.OptionalClass) =>
+                            {
+                                o2 = obj;
+                            },
+                            Test.OptionalClass);
+            inS.readPendingValues();
+            test(o2.bo == o.bo);
+            test(o2.by == o.by);
+            test(o2.sh === undefined);
+            test(o2.i === undefined);
+        }
+
+        {
+            const arr = [true, false, true, false];
+            outS = new Ice.OutputStream(communicator);
+            Ice.BoolSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.BoolSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr, arr2));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.BoolSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.BoolSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = new Uint8Array([0x01, 0x11, 0x12, 0x22]);
+            outS = new Ice.OutputStream(communicator);
+            Ice.ByteSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.ByteSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS:Uint8Array[] = [arr, new Uint8Array(0), arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.ByteSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.ByteSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = [0x01, 0x11, 0x12, 0x22];
+            outS = new Ice.OutputStream(communicator);
+            Ice.ShortSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.ShortSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.ShortSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.ShortSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = [0x01, 0x11, 0x12, 0x22];
+            outS = new Ice.OutputStream(communicator);
+            Ice.IntSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.IntSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.IntSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.IntSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = [new Ice.Long(0x01), new Ice.Long(0x11), new Ice.Long(0x12), new Ice.Long(0x22)];
+            outS = new Ice.OutputStream(communicator);
+            Ice.LongSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.LongSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.LongSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.LongSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = [1, 2, 3, 4];
+            outS = new Ice.OutputStream(communicator);
+            Ice.FloatSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.FloatSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.FloatSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.FloatSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = [1, 2, 3, 4];
+            outS = new Ice.OutputStream(communicator);
+            Ice.DoubleSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.DoubleSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.DoubleSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.DoubleSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = ["string1", "string2", "string3", "string4"];
+            outS = new Ice.OutputStream(communicator);
+            Ice.StringSeqHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Ice.StringSeqHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.StringSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.StringSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        {
+            const arr = [Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1, Test.MyEnum.enum2];
+            outS = new Ice.OutputStream(communicator);
+            Test.MyEnumSHelper.write(outS, arr);
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Test.MyEnumSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2, arr));
+
+            const arrS = [arr, [], arr];
+            outS = new Ice.OutputStream(communicator);
+            Test.MyEnumSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.MyEnumSSHelper.read(inS);
+            test(Ice.ArrayUtil.equals(arr2S, arrS));
+        }
+
+        const smallStructArray = [];
+        for(let i = 0; i < 3; ++i)
+        {
+            const s = new Test.SmallStruct();
+            s.bo = true;
+            s.by = 1;
+            s.sh = 2;
+            s.i = 3;
+            s.l = new Ice.Long(4);
+            s.f = 5.0;
+            s.d = 6.0;
+            s.str = "7";
+            s.e = Test.MyEnum.enum2;
+            s.p = Test.MyInterfacePrx.uncheckedCast(communicator.stringToProxy("test:default"));
+            smallStructArray[i] = s;
+        }
+
+        const myClassArray = [];
+        for(let i = 0; i < 4; ++i)
+        {
+            const c = new Test.MyClass();
+            myClassArray[i] = c;
+            c.c = myClassArray[i];
+            c.o = myClassArray[i];
+            c.s = new Test.SmallStruct();
+            c.s.e = Test.MyEnum.enum2;
+            c.seq1 = [true, false, true, false];
+            c.seq2 = new Uint8Array([1, 2, 3, 4]);
+            c.seq3 = [1, 2, 3, 4];
+            c.seq4 = [1, 2, 3, 4];
+            c.seq5 = [new Ice.Long(1), new Ice.Long(2), new Ice.Long(3), new Ice.Long(4)];
+            c.seq6 = [1, 2, 3, 4];
+            c.seq7 = [1, 2, 3, 4];
+            c.seq8 = ["string1", "string2", "string3", "string4"];
+            c.seq9 = [Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1];
+            c.seq10 = [null, null, null, null]; // null elements.
+            c.d = new Test.StringMyClassD();
+            c.d.set("hi", myClassArray[i]);
+        }
+
+        const myInterfaceArray = [];
+        for(let i = 0; i < 4; ++i)
+        {
+            myInterfaceArray[i] = new Ice.InterfaceByValue("::Test::MyInterface");
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            Test.MyClassSHelper.write(outS, myClassArray);
+            outS.writePendingValues();
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Test.MyClassSHelper.read(inS);
+            inS.readPendingValues();
+            test(arr2.length == myClassArray.length);
+            for(let i = 0; i < arr2.length; ++i)
+            {
+                test(arr2[i] !== null);
+                test(arr2[i].c == arr2[i]);
+                test(arr2[i].o == arr2[i]);
+                test(arr2[i].s.e == Test.MyEnum.enum2);
+                test(Ice.ArrayUtil.equals(arr2[i].seq1, myClassArray[i].seq1));
+                test(Ice.ArrayUtil.equals(arr2[i].seq2, myClassArray[i].seq2));
+                test(Ice.ArrayUtil.equals(arr2[i].seq3, myClassArray[i].seq3));
+                test(Ice.ArrayUtil.equals(arr2[i].seq4, myClassArray[i].seq4));
+                test(Ice.ArrayUtil.equals(arr2[i].seq5, myClassArray[i].seq5));
+                test(Ice.ArrayUtil.equals(arr2[i].seq6, myClassArray[i].seq6));
+                test(Ice.ArrayUtil.equals(arr2[i].seq7, myClassArray[i].seq7));
+                test(Ice.ArrayUtil.equals(arr2[i].seq8, myClassArray[i].seq8));
+                test(Ice.ArrayUtil.equals(arr2[i].seq9, myClassArray[i].seq9));
+                test(arr2[i].d.get("hi") == arr2[i]);
+            }
+            const arrS = [myClassArray, [], myClassArray];
+            outS = new Ice.OutputStream(communicator);
+            Test.MyClassSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.MyClassSSHelper.read(inS);
+            test(arr2S.length == arrS.length);
+            test(arr2S[0].length == arrS[0].length);
+            test(arr2S[1].length == arrS[1].length);
+            test(arr2S[2].length == arrS[2].length);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            Test.MyInterfaceSHelper.write(outS, myInterfaceArray);
+            outS.writePendingValues();
+            let data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2 = Test.MyInterfaceSHelper.read(inS);
+            inS.readPendingValues();
+            test(arr2.length == myInterfaceArray.length);
+            const arrS = [myInterfaceArray, [], myInterfaceArray];
+            outS = new Ice.OutputStream(communicator);
+            Test.MyInterfaceSSHelper.write(outS, arrS);
+            data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const arr2S = Test.MyInterfaceSSHelper.read(inS);
+            test(arr2S.length == arrS.length);
+            test(arr2S[0].length == arrS[0].length);
+            test(arr2S[1].length == arrS[1].length);
+            test(arr2S[2].length == arrS[2].length);
+        }
+
+        {
+            outS = new Ice.OutputStream(communicator);
+            const ex = new Test.MyException();
+
+            const c = new Test.MyClass();
+            c.c = c;
+            c.o = c;
+            c.s = new Test.SmallStruct();
+            c.s.e = Test.MyEnum.enum2;
+            c.seq1 = [true, false, true, false];
+            c.seq2 = new Uint8Array([1, 2, 3, 4]);
+            c.seq3 = [1, 2, 3, 4];
+            c.seq4 = [1, 2, 3, 4];
+            c.seq5 = [new Ice.Long(1), new Ice.Long(2), new Ice.Long(3), new Ice.Long(4)];
+            c.seq6 = [1, 2, 3, 4];
+            c.seq7 = [1, 2, 3, 4];
+            c.seq8 = ["string1", "string2", "string3", "string4"];
+            c.seq9 = [Test.MyEnum.enum3, Test.MyEnum.enum2, Test.MyEnum.enum1];
+            c.seq10 = [null, null, null, null]; // null elements.
+            c.d = new Test.StringMyClassD();
+            c.d.set("hi", c);
+
+            ex.c = c;
+
+            outS.writeException(ex);
+            const data = outS.finished();
+
+            inS = new Ice.InputStream(communicator, data);
+            try
+            {
+                inS.throwException();
+                test(false);
+            }
+            catch(ex1)
+            {
+                test(ex1 instanceof Test.MyException);
+                test(ex1.c.s.e == c.s.e);
+                test(Ice.ArrayUtil.equals(ex1.c.seq1, c.seq1));
+                test(Ice.ArrayUtil.equals(ex1.c.seq2, c.seq2));
+                test(Ice.ArrayUtil.equals(ex1.c.seq3, c.seq3));
+                test(Ice.ArrayUtil.equals(ex1.c.seq4, c.seq4));
+                test(Ice.ArrayUtil.equals(ex1.c.seq5, c.seq5));
+                test(Ice.ArrayUtil.equals(ex1.c.seq6, c.seq6));
+                test(Ice.ArrayUtil.equals(ex1.c.seq7, c.seq7));
+                test(Ice.ArrayUtil.equals(ex1.c.seq8, c.seq8));
+                test(Ice.ArrayUtil.equals(ex1.c.seq9, c.seq9));
+            }
+        }
+
+        {
+            const dict = new Test.ByteBoolD();
+            dict.set(4, true);
+            dict.set(1, false);
+            outS = new Ice.OutputStream(communicator);
+            Test.ByteBoolDHelper.write(outS, dict);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const dict2 = Test.ByteBoolDHelper.read(inS);
+            test(Ice.MapUtil.equals(dict2, dict));
+        }
+
+        {
+            const dict = new Test.ShortIntD();
+            dict.set(1, 9);
+            dict.set(4, 8);
+            outS = new Ice.OutputStream(communicator);
+            Test.ShortIntDHelper.write(outS, dict);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const dict2 = Test.ShortIntDHelper.read(inS);
+            test(Ice.MapUtil.equals(dict2, dict));
+        }
+
+        {
+            const dict = new Test.LongFloatD();
+            dict.set(new Ice.Long(123809828), 0.5);
+            dict.set(new Ice.Long(123809829), 0.6);
+            outS = new Ice.OutputStream(communicator);
+            Test.LongFloatDHelper.write(outS, dict);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const dict2 = Test.LongFloatDHelper.read(inS);
+            test(dict2.size == 2);
+            test(dict2.get(new Ice.Long(123809828)) == 0.5);
+            test(Math.abs(dict2.get(new Ice.Long(123809829)) - 0.6) <= 0.001);
+        }
+
+        {
+            const dict = new Test.StringStringD();
+            dict.set("key1", "value1");
+            dict.set("key2", "value2");
+            outS = new Ice.OutputStream(communicator);
+            Test.StringStringDHelper.write(outS, dict);
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const dict2 = Test.StringStringDHelper.read(inS);
+            test(Ice.MapUtil.equals(dict2, dict));
+        }
+
+        {
+            const dict = new Test.StringMyClassD();
+            let c = new Test.MyClass();
+            c.s = new Test.SmallStruct();
+            c.s.e = Test.MyEnum.enum2;
+            dict.set("key1", c);
+            c = new Test.MyClass();
+            c.s = new Test.SmallStruct();
+            c.s.e = Test.MyEnum.enum3;
+            dict.set("key2", c);
+            outS = new Ice.OutputStream(communicator);
+            Test.StringMyClassDHelper.write(outS, dict);
+            outS.writePendingValues();
+            const data = outS.finished();
+            inS = new Ice.InputStream(communicator, data);
+            const dict2 = Test.StringMyClassDHelper.read(inS);
+            inS.readPendingValues();
+            test(dict2.size == dict.size);
+            test(dict2.get("key1").s.e == Test.MyEnum.enum2);
+            test(dict2.get("key2").s.e == Test.MyEnum.enum3);
+        }
+        out.writeLine("ok");
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            [communicator] = this.initialize(args);
+            this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/stream/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/stream/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/stream/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/stream/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,98 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+//
+// Suppress invalid metadata warnings
+//
+[["suppress-warning:invalid-metadata, deprecated", "js:es6-module"]]
+
+#include <Ice/BuiltinSequences.ice>
+
+module Test
+{
+
+enum MyEnum
+{
+    enum1,
+    enum2,
+    enum3
+}
+
+class MyClass;
+interface MyInterface;
+
+struct SmallStruct
+{
+    bool bo;
+    byte by;
+    short sh;
+    int i;
+    long l;
+    float f;
+    double d;
+    string str;
+    MyEnum e;
+    MyInterface* p;
+}
+
+class OptionalClass
+{
+    bool bo;
+    byte by;
+    optional(1) short sh;
+    optional(2) int i;
+}
+
+sequence<MyEnum> MyEnumS;
+sequence<MyClass> MyClassS;
+sequence<MyInterface> MyInterfaceS;
+
+sequence<Ice::BoolSeq> BoolSS;
+sequence<Ice::ByteSeq> ByteSS;
+sequence<Ice::ShortSeq> ShortSS;
+sequence<Ice::IntSeq> IntSS;
+sequence<Ice::LongSeq> LongSS;
+sequence<Ice::FloatSeq> FloatSS;
+sequence<Ice::DoubleSeq> DoubleSS;
+sequence<Ice::StringSeq> StringSS;
+sequence<MyEnumS> MyEnumSS;
+sequence<MyClassS> MyClassSS;
+sequence<MyInterfaceS> MyInterfaceSS;
+
+dictionary<byte, bool> ByteBoolD;
+dictionary<short, int> ShortIntD;
+dictionary<long, float> LongFloatD;
+dictionary<string, string> StringStringD;
+dictionary<string, MyClass> StringMyClassD;
+
+class MyClass
+{
+    MyClass c;
+    Object o;
+    SmallStruct s;
+    Ice::BoolSeq seq1;
+    Ice::ByteSeq seq2;
+    Ice::ShortSeq seq3;
+    Ice::IntSeq seq4;
+    Ice::LongSeq seq5;
+    Ice::FloatSeq seq6;
+    Ice::DoubleSeq seq7;
+    Ice::StringSeq seq8;
+    MyEnumS seq9;
+    MyClassS seq10;
+    StringMyClassD d;
+}
+
+exception MyException
+{
+    MyClass c;
+}
+
+interface MyInterface
+{
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/timeout/Client.ts zeroc-ice-3.7.2/js/test/typescript/Ice/timeout/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Ice/timeout/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/timeout/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,400 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    async allTests()
+    {
+        async function connect(prx:Test.TimeoutPrx)
+        {
+            let nRetry = 10;
+            while(--nRetry > 0)
+            {
+                try
+                {
+                    await prx.ice_getConnection();
+                    break;
+                }
+                catch(ex)
+                {
+                    // Can sporadically occur with slow machines
+                    test(ex instanceof Ice.ConnectTimeoutException ||
+                            ex instanceof Ice.ConnectFailedException, ex);
+                }
+                await Ice.Promise.delay(100);
+            }
+            return prx.ice_getConnection();
+        }
+
+        const communicator = this.communicator();
+        const out = this.getWriter();
+
+        const ref = "timeout:" + this.getTestEndpoint();
+        const obj = communicator.stringToProxy(ref);
+        test(obj !== null);
+
+        let mult = 1;
+        if(["ssl", "wss"].includes(
+            communicator.getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp")))
+        {
+            mult = 4;
+        }
+
+        const timeout = await Test.TimeoutPrx.checkedCast(obj);
+        test(timeout !== null);
+
+        const controller = Test.ControllerPrx.uncheckedCast(
+            communicator.stringToProxy("controller:" + this.getTestEndpoint(1)));
+        test(controller !== null);
+
+        out.write("testing connect timeout... ");
+        {
+            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(100 * mult));
+            await controller.holdAdapter(-1);
+            try
+            {
+                await to.op(); // Expect ConnectTimeoutException.
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ConnectTimeoutException, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op(); // Ensure adapter is active.
+        }
+
+        {
+            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(-1));
+            await controller.holdAdapter(100 * mult);
+            await to.ice_getConnection();
+            try
+            {
+                await to.op(); // Expect success.
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
+        }
+        out.writeLine("ok");
+
+        const seq = new Uint8Array(10000000);
+        out.write("testing connection timeout... ");
+        {
+            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(250 * mult));
+            await connect(to);
+            await controller.holdAdapter(-1);
+            try
+            {
+                await to.sendData(seq); // Expect TimeoutException
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.TimeoutException, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op(); // Ensure adapter is active.
+        }
+
+        {
+            // NOTE: 30s timeout is necessary for Firefox/IE on Windows
+            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(30000 * mult));
+            await controller.holdAdapter(200 * mult);
+            try
+            {
+                await to.sendData(new Uint8Array(5 * 1024)); // Expect success.
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
+        }
+        out.writeLine("ok");
+
+        out.write("testing invocation timeout... ");
+        {
+            const connection = await obj.ice_getConnection();
+            let to = Test.TimeoutPrx.uncheckedCast(obj.ice_invocationTimeout(100));
+            test(connection == await to.ice_getConnection());
+
+            try
+            {
+                await to.sleep(500);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.InvocationTimeoutException, ex);
+            }
+            await obj.ice_ping();
+            to = await Test.TimeoutPrx.checkedCast(obj.ice_invocationTimeout(1000));
+            test(connection === await obj.ice_getConnection());
+
+            try
+            {
+                await to.sleep(100);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.InvocationTimeoutException, ex);
+            }
+        }
+        out.writeLine("ok");
+
+        // Small delay is useful for IE which doesn't like too many connection failures in a row
+        await Ice.Promise.delay(500);
+
+        out.write("testing close timeout... ");
+        {
+            const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(500));
+            const connection = await connect(to);
+            await controller.holdAdapter(-1);
+            await connection.close(Ice.ConnectionClose.GracefullyWithWait);
+
+            try
+            {
+                connection.getInfo(); // getInfo() doesn't throw in the closing state
+                while(true)
+                {
+                    try
+                    {
+                        connection.getInfo();
+                        await Ice.Promise.delay(10);
+                    }
+                    catch(ex)
+                    {
+                        test(ex instanceof Ice.ConnectionManuallyClosedException, ex); // Expected
+                        test(ex.graceful);
+                        break;
+                    }
+                }
+            }
+            catch(ex)
+            {
+                test(false, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op();
+        }
+        out.writeLine("ok");
+
+        // Small delay is useful for IE which doesn't like too many connection failures in a row
+        await Ice.Promise.delay(500);
+
+        out.write("testing timeout overrides... ");
+        {
+            //
+            // Test Ice.Override.Timeout. This property overrides all
+            // endpoint timeouts.
+            //
+            const initData = new Ice.InitializationData();
+            initData.properties = communicator.getProperties().clone();
+            if(mult === 1)
+            {
+                initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+                initData.properties.setProperty("Ice.Override.Timeout", "100");
+            }
+            else
+            {
+                initData.properties.setProperty("Ice.Override.ConnectTimeout", "5000");
+                initData.properties.setProperty("Ice.Override.Timeout", "2000");
+            }
+            const comm = Ice.initialize(initData);
+            let to = Test.TimeoutPrx.uncheckedCast(comm.stringToProxy(ref));
+            await connect(to);
+            await controller.holdAdapter(-1);
+
+            try
+            {
+                await to.sendData(seq); // Expect TimeoutException.
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.TimeoutException, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op();
+            //
+            // Calling ice_timeout() should have no effect.
+            //
+            to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
+            await connect(to);
+            await controller.holdAdapter(-1);
+            try
+            {
+                await to.sendData(seq); // Expect TimeoutException.
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.TimeoutException, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op();
+            await comm.destroy();
+        }
+
+        // Small delay is useful for IE which doesn't like too many connection failures in a row
+        await Ice.Promise.delay(500);
+        {
+            //
+            // Test Ice.Override.ConnectTimeout.
+            //
+            const initData = new Ice.InitializationData();
+            initData.properties = communicator.getProperties().clone();
+            if(mult === 1)
+            {
+                initData.properties.setProperty("Ice.Override.ConnectTimeout", "250");
+            }
+            else
+            {
+                initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000");
+            }
+            const comm = Ice.initialize(initData);
+            let to = Test.TimeoutPrx.uncheckedCast(comm.stringToProxy(ref));
+            await controller.holdAdapter(-1);
+
+            try
+            {
+                await to.op();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ConnectTimeoutException, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op();
+            await controller.holdAdapter(-1);
+
+            //
+            // Calling ice_timeout() should have no effect on the connect timeout.
+            //
+            to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(1000 * mult));
+
+            try
+            {
+                await to.op();
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.ConnectTimeoutException, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op(); // Ensure adapter is active
+
+            //
+            // Verify that timeout set via ice_timeout() is still used for requests.
+            //
+            to = Test.TimeoutPrx.uncheckedCast(to.ice_timeout(100 * mult));
+            await connect(to); // Force connection.
+            await controller.holdAdapter(-1);
+
+            try
+            {
+                await to.sendData(seq);
+                test(false);
+            }
+            catch(ex)
+            {
+                test(ex instanceof Ice.TimeoutException, ex);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            await timeout.op();
+            await comm.destroy();
+        }
+
+        // Small delay is useful for IE which doesn't like too many connection failures in a row
+        await Ice.Promise.delay(500);
+        {
+            //
+            // Test Ice.Override.CloseTimeout.
+            //
+            const initData = new Ice.InitializationData();
+            initData.properties = communicator.getProperties().clone();
+            initData.properties.setProperty("Ice.Override.CloseTimeout", "100");
+            const comm = Ice.initialize(initData);
+            await comm.stringToProxy(ref).ice_getConnection();
+
+            await controller.holdAdapter(-1);
+
+            const start = Date.now();
+            await comm.destroy();
+            const end = Date.now();
+            try
+            {
+                test(end - start < mult * 2000);
+            }
+            finally
+            {
+                await controller.resumeAdapter();
+            }
+            out.writeLine("ok");
+            await controller.shutdown();
+        }
+    }
+
+    async run(args:string[])
+    {
+        let communicator:Ice.Communicator;
+        try
+        {
+            const [properties] = this.createTestProperties(args);
+            //
+            // For this test, we want to disable retries.
+            //
+            properties.setProperty("Ice.RetryIntervals", "-1");
+
+            //
+            // We don't want connection warnings because of the timeout
+            //
+            properties.setProperty("Ice.Warn.Connections", "0");
+            properties.setProperty("Ice.PrintStackTraces", "1");
+
+            [communicator] = this.initialize(properties);
+            await this.allTests();
+        }
+        finally
+        {
+            if(communicator)
+            {
+                await communicator.destroy();
+            }
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Ice/timeout/Test.ice zeroc-ice-3.7.2/js/test/typescript/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Ice/timeout/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,28 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+[["js:es6-module"]]
+
+module Test
+{
+
+sequence<byte> ByteSeq;
+
+interface Timeout
+{
+    void op();
+    void sendData(ByteSeq seq);
+    void sleep(int to);
+}
+
+interface Controller
+{
+    void holdAdapter(int to);
+    void resumeAdapter();
+    void shutdown();
+}
+
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Slice/macros/Client.ts zeroc-ice-3.7.2/js/test/typescript/Slice/macros/Client.ts
--- zeroc-ice-3.7.1/js/test/typescript/Slice/macros/Client.ts	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Slice/macros/Client.ts	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,37 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+import {Ice} from "ice";
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
+const test = TestHelper.test;
+
+export class Client extends TestHelper
+{
+    allTests()
+    {
+        const out = this.getWriter();
+        out.write("testing Slice predefined macros... ");
+
+        const d = new Test._Default();
+        test(d.x == 10);
+        test(d.y == 10);
+
+        const nd = new Test.NoDefault();
+        test(nd.x != 10);
+        test(nd.y != 10);
+
+        const c = new Test.JsOnly();
+        test(c.lang == "js");
+        test(c.version == Ice.intVersion());
+
+        out.writeLine("ok");
+    }
+
+    run(args:string[])
+    {
+        this.allTests();
+    }
+}
diff -Nru zeroc-ice-3.7.1/js/test/typescript/Slice/macros/Test.ice zeroc-ice-3.7.2/js/test/typescript/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/js/test/typescript/Slice/macros/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/js/test/typescript/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,51 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+//
+// This macro sets the default value only when compiling with slice2js.
+//
+#ifdef __SLICE2JS__
+#   define DEFAULT(X) = X
+#else
+#   define DEFAULT(X) /**/
+#endif
+
+//
+// This macro sets the default value only when not compiling with slice2js.
+//
+#ifndef __SLICE2JS__
+#   define NODEFAULT(X) = X
+#else
+#   define NODEFAULT(X) /**/
+#endif
+
+[["js:es6-module"]]
+
+module Test
+{
+
+class Default
+{
+    int x DEFAULT(10);
+    int y DEFAULT(10);
+}
+
+class NoDefault
+{
+    int x NODEFAULT(10);
+    int y NODEFAULT(10);
+}
+
+//
+// This class is only defined when compiling with slice2js.
+//
+#ifdef __SLICE2JS__
+class JsOnly
+{
+    string lang DEFAULT("js");
+    int version DEFAULT(ICE_VERSION);
+}
+#endif
+
+}
diff -Nru zeroc-ice-3.7.1/Makefile zeroc-ice-3.7.2/Makefile
--- zeroc-ice-3.7.1/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 top_srcdir := .
 
diff -Nru zeroc-ice-3.7.1/man/man1/slice2html.1 zeroc-ice-3.7.2/man/man1/slice2html.1
--- zeroc-ice-3.7.1/man/man1/slice2html.1	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/man/man1/slice2html.1	2019-02-05 18:03:04.000000000 +0000
@@ -17,6 +17,11 @@
 .br
 https://doc.zeroc.com/display/Ice37/Generating+Slice+Documentation
 
+slice2html is deprecated, Doxygen is now the preferred way to generate
+Slice API reference, see:
+.br
+https://doc.zeroc.com/api/ice/3.7/slice/
+
 .SH OPTIONS
 
 .TP
diff -Nru zeroc-ice-3.7.1/matlab/allTests.py zeroc-ice-3.7.2/matlab/allTests.py
--- zeroc-ice-3.7.1/matlab/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Communicator.m zeroc-ice-3.7.2/matlab/lib/+Ice/Communicator.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Communicator.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Communicator.m	2019-02-05 18:03:04.000000000 +0000
@@ -28,7 +28,7 @@
     %   flushBatchRequestsAsync - Flush any pending batch requests for this
     %     communicator.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = Communicator(impl, initData)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/ConnectionInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/ConnectionInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/ConnectionInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/ConnectionInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,7 @@
     %     connection.
     %   connectionId (char) - The connection id.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = ConnectionInfo(underlying, incoming, adapterName, connectionId)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Connection.m zeroc-ice-3.7.2/matlab/lib/+Ice/Connection.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Connection.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Connection.m	2019-02-05 18:03:04.000000000 +0000
@@ -26,7 +26,7 @@
     %   throwException - Throw an exception indicating the reason for
     %     connection closure.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = Connection(impl, communicator)
@@ -253,8 +253,8 @@
                                               info.remotePort, info.rcvSize, info.sndSize);
 
                 case 'ssl'
-                    r = Ice.IPConnectionInfo(underlying, info.incoming, info.adapterName, info.connectionId, ...
-                                             info.localAddress, info.localPort, info.remoteAddress, info.remotePort);
+                    r = IceSSL.ConnectionInfo(underlying, info.incoming, info.adapterName, info.connectionId, ...
+                                             info.cipher, info.certs, info.verified);
 
                 case 'udp'
                     r = Ice.UDPConnectionInfo(underlying, info.incoming, info.adapterName, info.connectionId, ...
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/createProperties.m zeroc-ice-3.7.2/matlab/lib/+Ice/createProperties.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/createProperties.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/createProperties.m	2019-02-05 18:03:04.000000000 +0000
@@ -24,7 +24,7 @@
     %   remArgs (cell array of char) - Contains the remaining command-line arguments
     %     that were not used to set properties.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     if length(varargin) >= 1 && ~isempty(varargin{1})
         args = varargin{1};
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/currentEncoding.m zeroc-ice-3.7.2/matlab/lib/+Ice/currentEncoding.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/currentEncoding.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/currentEncoding.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Returns (Ice.EncodingVersion) - The Ice encoding version.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     r = IceInternal.Util.callWithResult('Ice_currentEncoding');
 end
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/currentProtocolEncoding.m zeroc-ice-3.7.2/matlab/lib/+Ice/currentProtocolEncoding.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/currentProtocolEncoding.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/currentProtocolEncoding.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Returns (Ice.EncodingVersion) - The encoding version for the Ice protocol.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     r = IceInternal.Util.callWithResult('Ice_currentProtocolEncoding');
 end
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/currentProtocol.m zeroc-ice-3.7.2/matlab/lib/+Ice/currentProtocol.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/currentProtocol.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/currentProtocol.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Returns (Ice.ProtocolVersion) - The supported Ice protocol version.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     r = IceInternal.Util.callWithResult('Ice_currentProtocol');
 end
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/encodingVersionToString.m zeroc-ice-3.7.2/matlab/lib/+Ice/encodingVersionToString.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/encodingVersionToString.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/encodingVersionToString.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     %
     % Returns (char) - The encoding version as a string.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     if ~isa(v, 'Ice.EncodingVersion')
         throw(MException('Ice:ArgumentException', 'expecting an Ice.EncodingVersion'));
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/EndpointInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/EndpointInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/EndpointInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/EndpointInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -15,7 +15,7 @@
     %   compress (logical) - Specifies whether or not compression should be
     %     used if available when using this endpoint.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = EndpointInfo(type, datagram, secure, underlying, timeout, compress)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Endpoint.m zeroc-ice-3.7.2/matlab/lib/+Ice/Endpoint.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Endpoint.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Endpoint.m	2019-02-05 18:03:04.000000000 +0000
@@ -7,7 +7,7 @@
     %   toString - Return a string representation of the endpoint.
     %   getInfo - Returns the endpoint information.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = Endpoint(impl)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Exception.m zeroc-ice-3.7.2/matlab/lib/+Ice/Exception.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Exception.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Exception.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Base class for Ice local and system exceptions.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods(Abstract)
         ice_id(obj)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/FormatType.m zeroc-ice-3.7.2/matlab/lib/+Ice/FormatType.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/FormatType.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/FormatType.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % This enumeration describes the possible formats for classes and exceptions.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     enumeration
         % DefaultFormat   Indicates that no preference was specified.
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Future.m zeroc-ice-3.7.2/matlab/lib/+Ice/Future.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Future.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Future.m	2019-02-05 18:03:04.000000000 +0000
@@ -19,7 +19,7 @@
     %   Read - True if fetchOutputs has already been called.
     %   State - The current state of the future.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     properties(SetAccess=private)
         % ID - A unique identifier for this object.
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/identityToString.m zeroc-ice-3.7.2/matlab/lib/+Ice/identityToString.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/identityToString.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/identityToString.m	2019-02-05 18:03:04.000000000 +0000
@@ -8,7 +8,7 @@
     %
     % Returns (char) - The string representation of the object identity.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     if length(varargin) == 1
         mode = varargin{1};
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/ImplicitContext.m zeroc-ice-3.7.2/matlab/lib/+Ice/ImplicitContext.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/ImplicitContext.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/ImplicitContext.m	2019-02-05 18:03:04.000000000 +0000
@@ -33,7 +33,7 @@
     %   put - Create or update a key/value entry in the underlying context.
     %   remove - Remove the entry for the given key in the underlying context.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = ImplicitContext(impl)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/InitializationData.m zeroc-ice-3.7.2/matlab/lib/+Ice/InitializationData.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/InitializationData.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/InitializationData.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     % InitializationData Properties:
     %   properties_ - The properties for the communicator.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function r = clone(obj)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/initialize.m zeroc-ice-3.7.2/matlab/lib/+Ice/initialize.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/initialize.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/initialize.m	2019-02-05 18:03:04.000000000 +0000
@@ -20,7 +20,7 @@
     %   args (cell array of char) - Contains the remaining command-line arguments
     %     that were not used to set properties.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     if length(varargin) > 2
         throw(MException('Ice:ArgumentException', 'too many arguments to Ice.initialize'));
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/InputStream.m zeroc-ice-3.7.2/matlab/lib/+Ice/InputStream.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/InputStream.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/InputStream.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Unmarshals Slice types.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = InputStream(communicator, encoding, buf)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/InterfaceByValue.m zeroc-ice-3.7.2/matlab/lib/+Ice/InterfaceByValue.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/InterfaceByValue.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/InterfaceByValue.m	2019-02-05 18:03:04.000000000 +0000
@@ -5,7 +5,7 @@
     % interfaces by value. The constructor expects the Slice type ID of
     % the interface.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = InterfaceByValue(id)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/intVersion.m zeroc-ice-3.7.2/matlab/lib/+Ice/intVersion.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/intVersion.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/intVersion.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     %
     % Returns (int32) - The Ice version.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     v = libpointer('int32Ptr', 0);
     IceInternal.Util.call('Ice_intVersion', v);
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/IPConnectionInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/IPConnectionInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/IPConnectionInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/IPConnectionInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -9,7 +9,7 @@
     %   remoteAddress - The remote address.
     %   remotePort - The remote port.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, ...
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/IPEndpointInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/IPEndpointInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/IPEndpointInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/IPEndpointInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -8,7 +8,7 @@
     %   port - The port number.
     %   sourceAddress - The source IP address.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = IPEndpointInfo(type, datagram, secure, underlying, timeout, compress, host, port, sourceAddress)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/LocalException.m zeroc-ice-3.7.2/matlab/lib/+Ice/LocalException.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/LocalException.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/LocalException.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Base class for all Ice run-time exceptions.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = LocalException(id, msg)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Logger.m zeroc-ice-3.7.2/matlab/lib/+Ice/Logger.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Logger.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Logger.m	2019-02-05 18:03:04.000000000 +0000
@@ -11,7 +11,7 @@
     %   getPrefix - Return this logger's prefix.
     %   cloneWithPrefix - Returns a clone of the logger with a new prefix.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = Logger(impl)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/ObjectPrx.m zeroc-ice-3.7.2/matlab/lib/+Ice/ObjectPrx.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/ObjectPrx.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/ObjectPrx.m	2019-02-05 18:03:04.000000000 +0000
@@ -110,7 +110,7 @@
     %   ice_flushBatchRequestsAsync - Flushes any pending batched
     %     requests for this communicator.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = ObjectPrx(communicator, encoding, impl, bytes)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/OpaqueEndpointInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/OpaqueEndpointInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/OpaqueEndpointInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/OpaqueEndpointInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -8,7 +8,7 @@
     %     or encode the rawBytes).
     %   rawBytes - The raw encoding of the opaque endpoint.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = OpaqueEndpointInfo(type, underlying, timeout, compress, rawEncoding, rawBytes)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/OptionalFormat.m zeroc-ice-3.7.2/matlab/lib/+Ice/OptionalFormat.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/OptionalFormat.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/OptionalFormat.m	2019-02-05 18:03:04.000000000 +0000
@@ -7,7 +7,7 @@
     % format describes how the data is encoded and how it can be skipped by the
     % unmarshaling code if the optional is not known to the receiver.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     enumeration
         F1 (0)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/OutputStream.m zeroc-ice-3.7.2/matlab/lib/+Ice/OutputStream.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/OutputStream.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/OutputStream.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Marshals Slice types.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = OutputStream(communicator, encoding)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Properties.m zeroc-ice-3.7.2/matlab/lib/+Ice/Properties.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Properties.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Properties.m	2019-02-05 18:03:04.000000000 +0000
@@ -25,7 +25,7 @@
     %   load - Load properties from a file.
     %   clone - Create a copy of this property set.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = Properties(impl)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/protocolVersionToString.m zeroc-ice-3.7.2/matlab/lib/+Ice/protocolVersionToString.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/protocolVersionToString.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/protocolVersionToString.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     %
     % Returns (char) - The protocol version as a string.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     if ~isa(v, 'Ice.ProtocolVersion')
         throw(MException('Ice:ArgumentException', 'expecting an Ice.ProtocolVersion'));
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/proxyIdentityAndFacetCompare.m zeroc-ice-3.7.2/matlab/lib/+Ice/proxyIdentityAndFacetCompare.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/proxyIdentityAndFacetCompare.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/proxyIdentityAndFacetCompare.m	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,7 @@
     %   the identity and facet in rhs; 0 if the identities and facets compare
     %   equal; 1, otherwise.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     if isempty(lhs) && isempty(rhs)
         r = 0;
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/proxyIdentityCompare.m zeroc-ice-3.7.2/matlab/lib/+Ice/proxyIdentityCompare.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/proxyIdentityCompare.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/proxyIdentityCompare.m	2019-02-05 18:03:04.000000000 +0000
@@ -8,7 +8,7 @@
     % Returns (int32) - -1 if the identity in lhs compares less than the
     %   identity in rhs; 0 if the identities compare equal; 1, otherwise.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     if isempty(lhs) && isempty(rhs)
         r = 0;
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/SlicedData.m zeroc-ice-3.7.2/matlab/lib/+Ice/SlicedData.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/SlicedData.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/SlicedData.m	2019-02-05 18:03:04.000000000 +0000
@@ -7,7 +7,7 @@
     %   slices - The details of each slice, in order of most-derived to
     %     least-derived.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     properties(SetAccess=private)
         % The details of each slice, in order of most-derived to least-derived.
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/SliceInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/SliceInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/SliceInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/SliceInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -13,7 +13,7 @@
     %   hasOptionalMembers - Whether or not the slice contains optional members.
     %   isLastSlice - Whether or not this is the last slice.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     properties
         %
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/stringToEncodingVersion.m zeroc-ice-3.7.2/matlab/lib/+Ice/stringToEncodingVersion.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/stringToEncodingVersion.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/stringToEncodingVersion.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     %
     % Returns (Ice.EncodingVersion) - The converted encoding version.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     tokens = regexp(s, '^([0-9]+)\.([0-9]+)$', 'tokens');
     if isempty(tokens)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/stringToIdentity.m zeroc-ice-3.7.2/matlab/lib/+Ice/stringToIdentity.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/stringToIdentity.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/stringToIdentity.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     %
     % Returns (Ice.Identity) - The converted object identity.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     r = IceInternal.Util.callWithResult('Ice_stringToIdentity', s);
 end
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/stringToProtocolVersion.m zeroc-ice-3.7.2/matlab/lib/+Ice/stringToProtocolVersion.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/stringToProtocolVersion.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/stringToProtocolVersion.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     %
     % Returns (Ice.ProtocolVersion) - The converted protocol version.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     tokens = regexp(s, '^([0-9]+)\.([0-9]+)$', 'tokens');
     if isempty(tokens)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/stringVersion.m zeroc-ice-3.7.2/matlab/lib/+Ice/stringVersion.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/stringVersion.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/stringVersion.m	2019-02-05 18:03:04.000000000 +0000
@@ -5,7 +5,7 @@
     %
     % Returns (char) - The Ice version.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     r = IceInternal.Util.callWithResult('Ice_stringVersion');
 end
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/TCPConnectionInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/TCPConnectionInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/TCPConnectionInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/TCPConnectionInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -7,7 +7,7 @@
     %   rcvSize - The connection buffer receive size.
     %   sndSize - The connection buffer send size.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = TCPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, ...
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/TCPEndpointInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/TCPEndpointInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/TCPEndpointInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/TCPEndpointInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Provides access to a TCP endpoint information.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = TCPEndpointInfo(type, secure, underlying, timeout, compress, host, port, sourceAddress)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/UDPConnectionInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/UDPConnectionInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/UDPConnectionInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/UDPConnectionInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -9,7 +9,7 @@
     %   rcvSize - The connection buffer receive size.
     %   sndSize - The connection buffer send size.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = UDPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, ...
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/UDPEndpointInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/UDPEndpointInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/UDPEndpointInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/UDPEndpointInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -7,7 +7,7 @@
     %   mcastInterface - The multicast interface.
     %   mcastTtl - The multicast time-to-live (or hops).
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = UDPEndpointInfo(type, underlying, timeout, compress, host, port, sourceAddress, ...
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/UnknownSlicedValue.m zeroc-ice-3.7.2/matlab/lib/+Ice/UnknownSlicedValue.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/UnknownSlicedValue.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/UnknownSlicedValue.m	2019-02-05 18:03:04.000000000 +0000
@@ -8,7 +8,7 @@
     %   ice_getSlicedData - Obtain the SlicedData object that encapsulates
     %     the value's marshaled state.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = UnknownSlicedValue(unknownTypeId)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Unset.m zeroc-ice-3.7.2/matlab/lib/+Ice/Unset.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Unset.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Unset.m	2019-02-05 18:03:04.000000000 +0000
@@ -2,7 +2,7 @@
     % Unset - This function returns a singleton instance that we use as a
     %   sentinel value to indicate an unset optional value.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     r = IceInternal.UnsetI.getInstance();
 end
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/UserException.m zeroc-ice-3.7.2/matlab/lib/+Ice/UserException.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/UserException.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/UserException.m	2019-02-05 18:03:04.000000000 +0000
@@ -7,7 +7,7 @@
     %   ice_getSlicedData - Obtain the SlicedData object that contains the
     %     marshaled state of any slices for unknown exception types.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = UserException(id, msg)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/Value.m zeroc-ice-3.7.2/matlab/lib/+Ice/Value.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/Value.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/Value.m	2019-02-05 18:03:04.000000000 +0000
@@ -11,7 +11,7 @@
     %   ice_getSlicedData - Returns the sliced data if the value has a
     %     preserved-slice base class and has been sliced during unmarshaling.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = Value()
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/WSConnectionInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/WSConnectionInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/WSConnectionInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/WSConnectionInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     % WSConnectionInfo Properties:
     %   headers - The headers from the HTTP upgrade request.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = WSConnectionInfo(underlying, incoming, adapterName, connectionId, headers)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+Ice/WSEndpointInfo.m zeroc-ice-3.7.2/matlab/lib/+Ice/WSEndpointInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+Ice/WSEndpointInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+Ice/WSEndpointInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -6,7 +6,7 @@
     % WSEndpointInfo Properties:
     %   resource - The URI configured with the endpoint.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = WSEndpointInfo(type, secure, underlying, timeout, compress, resource)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/Buffer.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/Buffer.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/Buffer.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/Buffer.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef Buffer < matlab.mixin.Copyable
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/CellArrayHandle.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/CellArrayHandle.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/CellArrayHandle.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/CellArrayHandle.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CellArrayHandle < handle
     properties
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/ClassResolver.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/ClassResolver.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/ClassResolver.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/ClassResolver.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef ClassResolver < handle
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder10.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder10.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder10.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder10.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef EncapsDecoder10 < IceInternal.EncapsDecoder
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder11_InstanceData.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder11_InstanceData.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder11_InstanceData.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder11_InstanceData.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef EncapsDecoder11_InstanceData < handle
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder11.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder11.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder11.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder11.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef EncapsDecoder11 < IceInternal.EncapsDecoder
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsDecoder.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsDecoder.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef (Abstract) EncapsDecoder < handle
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder10.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder10.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder10.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder10.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef EncapsEncoder10 < IceInternal.EncapsEncoder
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder11_InstanceData.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder11_InstanceData.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder11_InstanceData.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder11_InstanceData.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef EncapsEncoder11_InstanceData < handle
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder11.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder11.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder11.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder11.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef EncapsEncoder11 < IceInternal.EncapsEncoder
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/EncapsEncoder.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/EncapsEncoder.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef (Abstract) EncapsEncoder < handle
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/IndirectPatchEntry.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/IndirectPatchEntry.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/IndirectPatchEntry.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/IndirectPatchEntry.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef IndirectPatchEntry < handle
     properties
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/PatchList.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/PatchList.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/PatchList.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/PatchList.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef PatchList < handle
     properties
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/Protocol.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/Protocol.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/Protocol.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/Protocol.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef Protocol
     properties(Constant)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/ReadEncaps.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/ReadEncaps.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/ReadEncaps.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/ReadEncaps.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef ReadEncaps < handle
     properties
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/SliceType.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/SliceType.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/SliceType.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/SliceType.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef SliceType
     enumeration
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/UnsetI.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/UnsetI.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/UnsetI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/UnsetI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 %
 % Singleton used to indicate an unset optional value.
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/Util.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/Util.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/Util.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/Util.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef Util
     methods(Static)
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/ValueFactoryManagerI.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/ValueFactoryManagerI.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/ValueFactoryManagerI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/ValueFactoryManagerI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef ValueFactoryManagerI < Ice.ValueFactoryManager
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/ValueHolder.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/ValueHolder.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/ValueHolder.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/ValueHolder.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef ValueHolder < handle
     properties
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/WrapperObject.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/WrapperObject.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/WrapperObject.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/WrapperObject.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef (Abstract) WrapperObject < handle
     methods
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceInternal/WriteEncaps.m zeroc-ice-3.7.2/matlab/lib/+IceInternal/WriteEncaps.m
--- zeroc-ice-3.7.1/matlab/lib/+IceInternal/WriteEncaps.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceInternal/WriteEncaps.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef WriteEncaps < handle
     properties
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceSSL/ConnectionInfo.m zeroc-ice-3.7.2/matlab/lib/+IceSSL/ConnectionInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+IceSSL/ConnectionInfo.m	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceSSL/ConnectionInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,41 @@
+classdef ConnectionInfo < Ice.ConnectionInfo
+    % ConnectionInfo   Summary of ConnectionInfo
+    %
+    % Provides access to the connection detaisl of an SSL connection.
+    %
+    % ConnectionInfo Properties:
+    %   cipher - The negotiated cipher suite.
+    %   certs - The certificate chain.
+    %   verified - The certificate chain verification status.
+
+    % Copyright (c) ZeroC, Inc. All rights reserved.
+
+    methods
+        function obj = ConnectionInfo(underlying, incoming, adapterName, connectionId, cipher, ...
+                                      certs, verified)
+            if nargin == 0
+                underlying = [];
+                incoming = false;
+                adapterName = '';
+                connectionId = '';
+                cipher = '';
+                certs = [];
+                verified = false;
+            end
+            obj = obj@Ice.ConnectionInfo(underlying, incoming, adapterName, connectionId);
+            obj.cipher = cipher;
+            obj.certs = certs;
+            obj.verified = verified;
+        end
+    end
+    properties(SetAccess=private)
+        % cipher - The negotiated cipher suite.
+        cipher char
+
+        % certs - The certificate chain.
+        certs
+
+        % verified - The certificate chain verification status.
+        verified logical
+    end
+end
diff -Nru zeroc-ice-3.7.1/matlab/lib/+IceSSL/EndpointInfo.m zeroc-ice-3.7.2/matlab/lib/+IceSSL/EndpointInfo.m
--- zeroc-ice-3.7.1/matlab/lib/+IceSSL/EndpointInfo.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/+IceSSL/EndpointInfo.m	2019-02-05 18:03:04.000000000 +0000
@@ -3,7 +3,7 @@
     %
     % Provides access to a TCP endpoint information.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     methods
         function obj = EndpointInfo(type, secure, underlying, timeout, compress)
diff -Nru zeroc-ice-3.7.1/matlab/lib/slice2matlab.m zeroc-ice-3.7.2/matlab/lib/slice2matlab.m
--- zeroc-ice-3.7.1/matlab/lib/slice2matlab.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/lib/slice2matlab.m	2019-02-05 18:03:04.000000000 +0000
@@ -14,7 +14,7 @@
     %
     %   status - The Slice-to-MATLAB compiler exit status code.
 
-    % Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+    % Copyright (c) ZeroC, Inc. All rights reserved.
 
     function path = findFile(candidates, baseDir, type)
         path = '';
diff -Nru zeroc-ice-3.7.1/matlab/msbuild/addFolderToPath.m zeroc-ice-3.7.2/matlab/msbuild/addFolderToPath.m
--- zeroc-ice-3.7.1/matlab/msbuild/addFolderToPath.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/msbuild/addFolderToPath.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,7 @@
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
+
 function addFolderToPath(f)
   addpath(f);
   savepath();
diff -Nru zeroc-ice-3.7.1/matlab/msbuild/buildToolbox.m zeroc-ice-3.7.2/matlab/msbuild/buildToolbox.m
--- zeroc-ice-3.7.1/matlab/msbuild/buildToolbox.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/msbuild/buildToolbox.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,7 @@
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
+
 function buildToolbox(iceVersion)
   rootDir = fileparts(mfilename('fullpath'));
   packageDir = fullfile(rootDir, 'toolbox');
@@ -10,7 +14,7 @@
     fprintf(f, '%% Version %s (R%s) %s\r\n', iceVersion, version('-release'), date);
     fprintf(f, '%%\r\n');
     fprintf(f, ['%% Please refer to the '...
-                '<a href="https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes">Ice Release Notes</a> '...
+                '<a href="https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes">Ice Release Notes</a> '...
                 'for more information\r\n']);
     fclose(f);
     matlab.addons.toolbox.packageToolbox(projectFile, sprintf('ice-%s-R%s.mltbx', iceVersion, version('-release')))
diff -Nru zeroc-ice-3.7.1/matlab/msbuild/doc/overview.html zeroc-ice-3.7.2/matlab/msbuild/doc/overview.html
--- zeroc-ice-3.7.1/matlab/msbuild/doc/overview.html	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/msbuild/doc/overview.html	2019-02-05 18:03:04.000000000 +0000
@@ -10,7 +10,7 @@
     <div itemprop="content">
       <h2 id="descrip">Release Notes</h2>
       <p>For details on the Ice for MATLAB toolbox release, please refer to the
-        <a href="https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes">Release Notes</a>.</p>
+        <a href="https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes">Release Notes</a>.</p>
       <h2 id="descrip">Manual</h2>
       <p>You can read the Ice for MATLAB documentation in the
         <a href="https://doc.zeroc.com/display/Rel/Ice+3.7+Manual">Ice Manual</a>.</p>
diff -Nru zeroc-ice-3.7.1/matlab/msbuild/ice.proj zeroc-ice-3.7.2/matlab/msbuild/ice.proj
--- zeroc-ice-3.7.1/matlab/msbuild/ice.proj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/msbuild/ice.proj	2019-02-05 18:03:04.000000000 +0000
@@ -114,7 +114,7 @@
         <WriteFileWithReplacements InputFile="$(MSBuildThisFileDirectory)toolbox.template.prj"
                                    OutputFile="$(MSBuildThisFileDirectory)toolbox.prj"
                                    Tokens="@RootDir@;@MatlabHome@;@IceVersion@;@MatlabVersion@"
-                                   Replacements="$(RootDir);$(MatlabHome);3.7.1;$(MatlabVersion)"/>
+                                   Replacements="$(RootDir);$(MatlabHome);3.7.2;$(MatlabVersion)"/>
         <WriteFileWithReplacements InputFile="$(MSBuildThisFileDirectory)info.template.xml"
                                    OutputFile="$(MSBuildThisFileDirectory)toolbox\info.xml"
                                    Tokens="@MatlabVersion@"
@@ -123,7 +123,7 @@
                  Properties="Configuration=$(Configuration);Platform=x64" />
         <Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');addFolderToPath '$(ToolboxDir)\ice'&quot;"
               WorkingDirectory="$(MSBuildThisFileDirectory)"/>
-        <Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');buildToolbox '3.7.1'&quot;"
+        <Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');buildToolbox '3.7.2'&quot;"
               WorkingDirectory="$(MSBuildThisFileDirectory)"/>
         <Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');removeFolderFromPath '$(ToolboxDir)\ice'&quot;"
               WorkingDirectory="$(MSBuildThisFileDirectory)"/>
diff -Nru zeroc-ice-3.7.1/matlab/msbuild/ice.toolbox.targets zeroc-ice-3.7.2/matlab/msbuild/ice.toolbox.targets
--- zeroc-ice-3.7.1/matlab/msbuild/ice.toolbox.targets	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/msbuild/ice.toolbox.targets	2019-02-05 18:03:04.000000000 +0000
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ICE_BIN_DIST)' == 'cpp'">
-    <CppToolsDir>$(MSBuildThisFileDirectory)packages\zeroc.ice.v140.3.7.1\tools</CppToolsDir>
+    <CppToolsDir>$(MSBuildThisFileDirectory)packages\zeroc.ice.v140.3.7.2\tools</CppToolsDir>
   </PropertyGroup>
 
   <!-- Dynamic libraries and import libraries -->
diff -Nru zeroc-ice-3.7.1/matlab/msbuild/removeFolderFromPath.m zeroc-ice-3.7.2/matlab/msbuild/removeFolderFromPath.m
--- zeroc-ice-3.7.1/matlab/msbuild/removeFolderFromPath.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/msbuild/removeFolderFromPath.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,3 +1,7 @@
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
+
 function removeFolderFromPath(p)
   rmpath(p);
   savepath();
diff -Nru zeroc-ice-3.7.1/matlab/msbuild/toolbox.template.prj zeroc-ice-3.7.2/matlab/msbuild/toolbox.template.prj
--- zeroc-ice-3.7.1/matlab/msbuild/toolbox.template.prj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/msbuild/toolbox.template.prj	2019-02-05 18:03:04.000000000 +0000
@@ -11,7 +11,7 @@
     <param.company>ZeroC, Inc.</param.company>
     <param.summary>Ice @IceVersion@ for MATLAB @MatlabVersion@</param.summary>
     <param.description>Ice is a comprehensive RPC framework with support for MATLAB, C++, .NET, Java, Python and more. Please refer to the Ice Release Notes for more information:
-  https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes</param.description>
+  https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</param.description>
     <param.screenshot>${PROJECT_ROOT}\zeroc_logo-64x64.png</param.screenshot>
     <param.version>@IceVersion@</param.version>
     <param.output>${PROJECT_ROOT}\ice.mltbx</param.output>
diff -Nru zeroc-ice-3.7.1/matlab/src/Communicator.cpp zeroc-ice-3.7.2/matlab/src/Communicator.cpp
--- zeroc-ice-3.7.1/matlab/src/Communicator.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Communicator.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Communicator.h>
 #include <Ice/Proxy.h>
@@ -31,14 +26,7 @@
 mxArray*
 Ice_Communicator_destroy(void* self)
 {
-    try
-    {
-        deref<Ice::Communicator>(self)->destroy();
-    }
-    catch(const std::exception& ex)
-    {
-        return convertException(ex);
-    }
+    deref<Ice::Communicator>(self)->destroy();
     return 0;
 }
 
@@ -101,7 +89,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -140,7 +127,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -156,7 +142,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
diff -Nru zeroc-ice-3.7.1/matlab/src/Connection.cpp zeroc-ice-3.7.2/matlab/src/Connection.cpp
--- zeroc-ice-3.7.1/matlab/src/Connection.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Connection.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,9 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
+#include <IceSSL/IceSSL.h>
 #include "ice.h"
 #include "Future.h"
 #include "Util.h"
@@ -34,6 +30,9 @@
     McastAddress,
     McastPort,
     Headers,
+    Cipher,
+    Certs,
+    Verified,
     NumFields // Number of fields in structure, must be last
 };
 
@@ -52,7 +51,10 @@
     "sndSize",
     "mcastAddress",
     "mcastPort",
-    "headers"
+    "headers",
+    "cipher",
+    "certs",
+    "verified"
 };
 
 mxArray*
@@ -112,12 +114,14 @@
         mxSetFieldByNumber(r, 0, Field::Headers, createStringMap(wsInfo->headers));
     }
 
-    /* TODO: If we link with IceSSL
-    if(dynamic_pointer_cast<IceSSL::ConnectionInfo>(info))
+    shared_ptr<IceSSL::ConnectionInfo> sslInfo = dynamic_pointer_cast<IceSSL::ConnectionInfo>(info);
+    if(sslInfo)
     {
         type = "ssl";
+        mxSetFieldByNumber(r, 0, Field::Cipher, createStringFromUTF8(sslInfo->cipher));
+        mxSetFieldByNumber(r, 0, Field::Certs, createCertificateList(sslInfo->certs));
+        mxSetFieldByNumber(r, 0, Field::Verified, createBool(sslInfo->verified));
     }
-    */
 
     mxSetFieldByNumber(r, 0, Field::Type, createStringFromUTF8(type));
 
@@ -148,7 +152,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -363,7 +366,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -377,7 +379,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -391,7 +392,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -405,7 +405,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
diff -Nru zeroc-ice-3.7.1/matlab/src/Endpoint.cpp zeroc-ice-3.7.2/matlab/src/Endpoint.cpp
--- zeroc-ice-3.7.1/matlab/src/Endpoint.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Endpoint.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <IceSSL/IceSSL.h>
diff -Nru zeroc-ice-3.7.1/matlab/src/Future.cpp zeroc-ice-3.7.2/matlab/src/Future.cpp
--- zeroc-ice-3.7.1/matlab/src/Future.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Future.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "ice.h"
 #include "Future.h"
diff -Nru zeroc-ice-3.7.1/matlab/src/Future.h zeroc-ice-3.7.2/matlab/src/Future.h
--- zeroc-ice-3.7.1/matlab/src/Future.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Future.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 
diff -Nru zeroc-ice-3.7.1/matlab/src/ice.h zeroc-ice-3.7.2/matlab/src/ice.h
--- zeroc-ice-3.7.1/matlab/src/ice.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/ice.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_MATLAB_API
 #   if defined(ICE_MATLAB_API_EXPORTS)
diff -Nru zeroc-ice-3.7.1/matlab/src/ImplicitContext.cpp zeroc-ice-3.7.2/matlab/src/ImplicitContext.cpp
--- zeroc-ice-3.7.1/matlab/src/ImplicitContext.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/ImplicitContext.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include "ice.h"
 #include <Ice/ImplicitContext.h>
@@ -35,7 +30,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -65,7 +59,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -79,7 +72,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -95,7 +87,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -110,7 +101,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 }
diff -Nru zeroc-ice-3.7.1/matlab/src/Init.cpp zeroc-ice-3.7.2/matlab/src/Init.cpp
--- zeroc-ice-3.7.1/matlab/src/Init.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Init.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include <Ice/RegisterPlugins.h>
@@ -66,7 +61,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -80,7 +74,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -97,7 +90,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -135,7 +127,7 @@
 // This function exists so that mex may be used to compile the library. It is not otherwise needed.
 //
 void
-mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
+mexFunction(int /*nlhs*/, mxArray * /*plhs*/[], int /*nrhs*/, const mxArray* /*prhs*/[])
 {
 }
 
diff -Nru zeroc-ice-3.7.1/matlab/src/Logger.cpp zeroc-ice-3.7.2/matlab/src/Logger.cpp
--- zeroc-ice-3.7.1/matlab/src/Logger.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Logger.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Logger.h>
 #include "ice.h"
@@ -91,7 +86,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
diff -Nru zeroc-ice-3.7.1/matlab/src/msbuild/ice/ice.vcxproj zeroc-ice-3.7.2/matlab/src/msbuild/ice/ice.vcxproj
--- zeroc-ice-3.7.1/matlab/src/msbuild/ice/ice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/msbuild/ice/ice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" />
+  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -81,13 +81,13 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" />
+    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" />
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\cpp\msbuild\ice.sign.targets" />
   <PropertyGroup>
     <DebugExtension Condition="'$(Configuration)' == 'Debug'">d</DebugExtension>
     <IceBinPath Condition="'$(ICE_BIN_DIST)' == ''">..\..\..\..\cpp\bin\$(Platform)\$(Configuration)</IceBinPath>
-    <IceBinPath Condition="'$(ICE_BIN_DIST)' != ''">..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\bin\$(Platform)\$(Configuration)</IceBinPath>
+    <IceBinPath Condition="'$(ICE_BIN_DIST)' != ''">..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\bin\$(Platform)\$(Configuration)</IceBinPath>
   </PropertyGroup>
   <Target Name="AfterClean">
     <Delete Files="$(OutDir)\bzip2$(DebugExtension).dll" />
@@ -110,7 +110,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
   </Target>
 </Project>
diff -Nru zeroc-ice-3.7.1/matlab/src/msbuild/icethunk/icethunk.vcxproj zeroc-ice-3.7.2/matlab/src/msbuild/icethunk/icethunk.vcxproj
--- zeroc-ice-3.7.1/matlab/src/msbuild/icethunk/icethunk.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/msbuild/icethunk/icethunk.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -39,12 +39,14 @@
     <ClCompile>
       <PreprocessorDefinitions>MX_COMPAT_32;MATLAB_MEX_FILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;$(MatlabHome)\extern\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>MX_COMPAT_32;MATLAB_MEX_FILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;$(MatlabHome)\extern\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -60,7 +62,7 @@
   </ImportGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\cpp\msbuild\ice.sign.targets" />
   <Target Name="MatlabHome" BeforeTargets="PrepareForBuild">
-    <Error Text="Cannot detect a valid MATLAB installation" Condition="!Exists('$(MatlabHome)')"/>
+    <Error Text="Cannot detect a valid MATLAB installation" Condition="!Exists('$(MatlabHome)')" />
   </Target>
   <Target Name="MATLABPrototype" BeforeTargets="CLCompile">
     <MakeDir Directories="$(Platform)\$(Configuration)" />
@@ -73,4 +75,4 @@
     <Delete Files="$(Platform)\$(Configuration)\iceproto.m" />
     <Delete Files="$(Platform)\$(Configuration)\icethunk.c" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/matlab/src/ObjectPrx.cpp zeroc-ice-3.7.2/matlab/src/ObjectPrx.cpp
--- zeroc-ice-3.7.1/matlab/src/ObjectPrx.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/ObjectPrx.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Ice.h>
 #include "ice.h"
@@ -71,8 +66,8 @@
 }
 
 void
-InvocationFuture::finished(const std::shared_ptr<Ice::Communicator>& communicator,
-                           const Ice::EncodingVersion& encoding, bool b, pair<const Ice::Byte*, const Ice::Byte*> p)
+InvocationFuture::finished(const std::shared_ptr<Ice::Communicator>& /*communicator*/,
+                           const Ice::EncodingVersion& /*encoding*/, bool b, pair<const Ice::Byte*, const Ice::Byte*> p)
 {
     lock_guard<mutex> lock(_mutex);
     _ok = b;
@@ -191,7 +186,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -258,7 +252,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -541,14 +534,14 @@
 }
 
 mxArray*
-Ice_ObjectPrx_ice_createEndpointList(void* self, unsigned int num, void** r)
+Ice_ObjectPrx_ice_createEndpointList(void* /*self*/, unsigned int num, void** r)
 {
     *r = new vector<shared_ptr<Ice::Endpoint>>(num);
     return 0;
 }
 
 mxArray*
-Ice_ObjectPrx_ice_setEndpoint(void* self, void* arr, unsigned int idx, void* e)
+Ice_ObjectPrx_ice_setEndpoint(void* /*self*/, void* arr, unsigned int idx, void* e)
 {
     //
     // arr must hold a pointer returned by createEndpointList.
@@ -693,7 +686,6 @@
     {
         return convertException(ex);
     }
-    return 0;
 }
 
 mxArray*
diff -Nru zeroc-ice-3.7.1/matlab/src/Properties.cpp zeroc-ice-3.7.2/matlab/src/Properties.cpp
--- zeroc-ice-3.7.1/matlab/src/Properties.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Properties.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Properties.h>
 #include <Ice/Initialize.h>
@@ -42,7 +37,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -63,7 +57,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -77,7 +70,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -120,7 +112,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -137,7 +128,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -152,7 +142,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -181,7 +170,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -198,7 +186,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
@@ -215,7 +202,6 @@
     {
         return createResultException(convertException(ex));
     }
-    return 0;
 }
 
 mxArray*
diff -Nru zeroc-ice-3.7.1/matlab/src/Util.cpp zeroc-ice-3.7.2/matlab/src/Util.cpp
--- zeroc-ice-3.7.1/matlab/src/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/LocalException.h>
 #include <iostream>
@@ -241,10 +236,10 @@
         auto keys = mxCreateCellArray(2, dims);
         auto values = mxCreateCellArray(2, dims);
         int idx = 0;
-        for(auto p = m.begin(); p != m.end(); ++p)
+        for(auto p : m)
         {
-            mxSetCell(keys, idx, createStringFromUTF8(p->first));
-            mxSetCell(values, idx, createStringFromUTF8(p->second));
+            mxSetCell(keys, idx, createStringFromUTF8(p.first));
+            mxSetCell(values, idx, createStringFromUTF8(p.second));
             idx++;
         }
         mxArray* params[2];
@@ -429,6 +424,10 @@
         {
             params[idx++] = createIdentity(e.id);
         }
+        catch(const Ice::IllegalServantException& e)
+        {
+            params[idx++] = createStringFromUTF8(e.reason);
+        }
         catch(const Ice::RequestFailedException& e)
         {
             params[idx++] = createIdentity(e.id);
@@ -449,8 +448,14 @@
             params[idx++] = mxCreateDoubleScalar(e.error);
             params[idx++] = createStringFromUTF8(e.host);
         }
+        catch(const Ice::BadMagicException& e)
+        {
+            params[idx++] = createStringFromUTF8(e.reason);
+            params[idx++] = createByteList(e.badMagic);
+        }
         catch(const Ice::UnsupportedProtocolException& e)
         {
+            params[idx++] = createStringFromUTF8(e.reason);
             params[idx++] = createProtocolVersion(e.bad);
             params[idx++] = createProtocolVersion(e.supported);
         }
@@ -460,10 +465,6 @@
             params[idx++] = createEncodingVersion(e.bad);
             params[idx++] = createEncodingVersion(e.supported);
         }
-        catch(const Ice::ConnectionManuallyClosedException& e)
-        {
-            params[idx++] = mxCreateLogicalScalar(e.graceful ? 1 : 0);
-        }
         catch(const Ice::NoValueFactoryException& e)
         {
             params[idx++] = createStringFromUTF8(e.reason);
@@ -479,6 +480,10 @@
         {
             params[idx++] = createStringFromUTF8(e.reason);
         }
+        catch(const Ice::ConnectionManuallyClosedException& e)
+        {
+            params[idx++] = mxCreateLogicalScalar(e.graceful ? 1 : 0);
+        }
         catch(const Ice::FeatureNotSupportedException& e)
         {
             params[idx++] = createStringFromUTF8(e.unsupportedFeature);
@@ -487,10 +492,6 @@
         {
             params[idx++] = createStringFromUTF8(e.reason);
         }
-        catch(const Ice::IllegalServantException& e)
-        {
-            params[idx++] = createStringFromUTF8(e.reason);
-        }
         catch(const Ice::LocalException&)
         {
             //
@@ -558,13 +559,13 @@
 }
 
 mxArray*
-IceMatlab::createStringList(const vector<string>& v)
+IceMatlab::createStringList(const vector<string>& strings)
 {
-    auto r = mxCreateCellMatrix(1, static_cast<int>(v.size()));
+    auto r = mxCreateCellMatrix(1, static_cast<int>(strings.size()));
     mwIndex i = 0;
-    for(auto p = v.begin(); p != v.end(); ++p, ++i)
+    for(auto s : strings)
     {
-        mxSetCell(r, i, createStringFromUTF8(*p));
+        mxSetCell(r, i++, createStringFromUTF8(s));
     }
     return r;
 }
@@ -597,6 +598,30 @@
     return r;
 }
 
+mxArray*
+IceMatlab::createByteList(const vector<Ice::Byte>& bytes)
+{
+    auto r = mxCreateCellMatrix(1, static_cast<int>(bytes.size()));
+    mwIndex i = 0;
+    for(auto byte : bytes)
+    {
+        mxSetCell(r, i++, createByte(byte));
+    }
+    return r;
+}
+
+mxArray*
+IceMatlab::createCertificateList(const vector<IceSSL::CertificatePtr>& certs)
+{
+    auto r = mxCreateCellMatrix(1, static_cast<int>(certs.size()));
+    mwIndex i = 0;
+    for(auto cert : certs)
+    {
+        mxSetCell(r, i++, createStringFromUTF8(cert->encode()));
+    }
+    return r;
+}
+
 namespace
 {
 
diff -Nru zeroc-ice-3.7.1/matlab/src/Util.h zeroc-ice-3.7.2/matlab/src/Util.h
--- zeroc-ice-3.7.1/matlab/src/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/src/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Identity.h>
 #include <Ice/Version.h>
+#include <IceSSL/IceSSL.h>
 #include <mex.h>
 
 typedef struct mxArray_tag mxArray; // Forward declaration to avoid importing mex.h here
@@ -43,6 +39,8 @@
 mxArray* createStringList(const std::vector<std::string>&);
 void getStringList(mxArray*, std::vector<std::string>&);
 mxArray* createByteArray(const Ice::Byte*, const Ice::Byte*);
+mxArray* createByteList(const std::vector<Ice::Byte>&);
+mxArray* createCertificateList(const std::vector<IceSSL::CertificatePtr>&);
 
 std::string idToClass(const std::string&);
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/acm/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/acm/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/acm/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/acm/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,15 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function allTests(app)
+        function allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
-            ref = 'communicator:default -p 12010';
+            ref = ['communicator:', helper.getTestEndpoint()];
             com = RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             AllTests.testSetACM(communicator, com);
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/acm/client.m zeroc-ice-3.7.2/matlab/test/Ice/acm/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/acm/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/acm/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,13 +8,13 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    initData.properties_.setProperty('Ice.Warn.Connections', '0');
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    properties = helper.createTestProperties(args);
+    properties.setProperty('Ice.Warn.Connections', '0');
+    communicator = helper.initialize(properties);
     cleanup = onCleanup(@() communicator.destroy());
 
-    app = TestApp(communicator);
-    AllTests.allTests(app);
+    AllTests.allTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/acm/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/ami/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/ami/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/ami/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/ami/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,21 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
-            sref = ['test:', app.getTestEndpoint(0)];
+            sref = ['test:', helper.getTestEndpoint()];
             obj = communicator.stringToProxy(sref);
             assert(~isempty(obj));
 
             p = TestIntfPrx.uncheckedCast(obj);
 
-            sref = ['testController:', app.getTestEndpoint(1)];
+            sref = ['testController:', helper.getTestEndpoint(1)];
             obj = communicator.stringToProxy(sref);
             assert(~isempty(obj));
 
@@ -96,8 +89,7 @@
             % Check that CommunicatorDestroyedException is raised directly.
             %
             if ~isempty(p.ice_getConnection())
-                initData = app.cloneInitData();
-                ic = Ice.initialize(initData);
+                ic = helper.initialize(communicator.getProperties().clone());
                 o = ic.stringToProxy(p.ice_toString());
                 p2 = TestIntfPrx.checkedCast(o);
                 ic.destroy();
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/ami/client.m zeroc-ice-3.7.2/matlab/test/Ice/ami/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/ami/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/ami/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,19 +8,18 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    initData.properties_.setProperty('Ice.Warn.AMICallback', '0');
-    initData.properties_.setProperty('Ice.Warn.Connections', '0');
+    helper = TestHelper();
+    properties = helper.createTestProperties(args);
+    properties.setProperty('Ice.Warn.AMICallback', '0');
+    properties.setProperty('Ice.Warn.Connections', '0');
     %
     % Limit the send buffer size, this test relies on the socket
     % send() blocking after sending a given amount of data.
     %
-    initData.properties_.setProperty('Ice.TCP.SndSize', '50000');
-    communicator = Ice.initialize(initData);
+    properties.setProperty('Ice.TCP.SndSize', '50000');
+    communicator = helper.initialize(properties);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    AllTests.allTests(app);
+    AllTests.allTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/ami/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/ami/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -57,7 +52,7 @@
     float opFloat(float f);
     double opDouble(double d);
 
-    void pingBiDir(Ice::Identity id);
+    void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/binding/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/binding/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/binding/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/binding/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
@@ -34,12 +27,12 @@
             end
         end
 
-        function r = allTests(app)
+        function allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
-            ref = ['communicator:', app.getTestEndpoint(0)];
+            ref = ['communicator:', helper.getTestEndpoint()];
             rcom = RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
 
             fprintf('testing binding with single endpoint... ');
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/binding/client.m zeroc-ice-3.7.2/matlab/test/Ice/binding/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/binding/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/binding/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    AllTests.allTests(app);
+    AllTests.allTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/binding/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/defaultValue/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/defaultValue/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/defaultValue/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/defaultValue/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,13 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function allTests(app)
+        function allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing default values... ');
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/defaultValue/client.m zeroc-ice-3.7.2/matlab/test/Ice/defaultValue/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/defaultValue/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/defaultValue/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    AllTests.allTests(app);
+    AllTests.allTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/enums/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/enums/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/enums/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/enums/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,15 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
-            ref = ['test:', app.getTestEndpoint(0)];
+            ref = ['test:', helper.getTestEndpoint()];
             obj = communicator.stringToProxy(ref);
             assert(~isempty(obj));
             proxy = TestIntfPrx.checkedCast(obj);
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/enums/client.m zeroc-ice-3.7.2/matlab/test/Ice/enums/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/enums/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/enums/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    test = AllTests.allTests(app);
+    test = AllTests.allTests(helper);
     test.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/enums/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/exceptions/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/exceptions/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/exceptions/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/exceptions/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,13 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing value factory registration exception... ');
             of = @(id) [];
@@ -28,7 +21,7 @@
             fprintf('ok\n');
 
             fprintf('testing stringToProxy... ');
-            ref = ['thrower:', app.getTestEndpoint(0, '')];
+            ref = ['thrower:', helper.getTestEndpoint()];
             base = communicator.stringToProxy(ref);
             assert(~isempty(base));
             fprintf('ok\n');
@@ -241,7 +234,7 @@
 
                 try
                     thrower2 = ThrowerPrx.uncheckedCast(...
-                        communicator.stringToProxy(['thrower:', app.getTestEndpoint(1, '')]));
+                        communicator.stringToProxy(['thrower:', helper.getTestEndpoint(1)]));
                     try
                         thrower2.throwMemoryLimitException(zeros(1, 2 * 1024 * 1024)); % 2MB (no limits)
                     catch ex
@@ -250,7 +243,7 @@
                         end
                     end
                     thrower3 = ThrowerPrx.uncheckedCast(...
-                        communicator.stringToProxy(['thrower:', app.getTestEndpoint(2, '')]));
+                        communicator.stringToProxy(['thrower:', helper.getTestEndpoint(2)]));
                     try
                         thrower3.throwMemoryLimitException(zeros(1, 1024)); % 1KB limit
                         assert(false);
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/exceptions/client.m zeroc-ice-3.7.2/matlab/test/Ice/exceptions/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/exceptions/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/exceptions/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,14 +8,14 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    initData.properties_.setProperty('Ice.Warn.Connections', '0');
-    initData.properties_.setProperty('Ice.MessageSizeMax', '10'); % 10KB max
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    properties = helper.createTestProperties(args);
+    properties.setProperty('Ice.Warn.Connections', '0');
+    properties.setProperty('Ice.MessageSizeMax', '10'); % 10KB max
+    communicator = helper.initialize(properties);
     cleanup = onCleanup(@() communicator.destroy());
 
-    app = TestApp(communicator);
-    thrower = AllTests.allTests(app);
+    thrower = AllTests.allTests(helper);
     thrower.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/facets/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/facets/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/facets/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/facets/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,13 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing Ice.Admin.Facets property... ');
             assert(length(communicator.getProperties().getPropertyAsList('Ice.Admin.Facets')) == 0);
@@ -39,7 +32,7 @@
             fprintf('ok\n');
 
             fprintf('testing stringToProxy... ');
-            ref = ['d:', app.getTestEndpoint(0)];
+            ref = ['d:', helper.getTestEndpoint()];
             db = communicator.stringToProxy(ref);
             assert(~isempty(db));
             fprintf('ok\n');
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/facets/client.m zeroc-ice-3.7.2/matlab/test/Ice/facets/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/facets/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/facets/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    g = AllTests.allTests(app);
+    g = AllTests.allTests(helper);
     g.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/facets/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/info/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/info/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/info/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/info/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,13 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function allTests(app)
+        function allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing proxy endpoint information... ');
 
@@ -61,11 +54,10 @@
 
             fprintf('ok\n');
 
-            base = communicator.stringToProxy(['test:', app.getTestEndpoint(0), ':', ...
-                                              app.getTestEndpoint(0, 'udp')]);
+            base = communicator.stringToProxy(['test:', helper.getTestEndpoint(), ':', helper.getTestEndpoint('udp')]);
             testIntf = TestIntfPrx.checkedCast(base);
 
-            endpointPort = app.getTestPort(0);
+            endpointPort = helper.getTestPort();
 
             defaultHost = communicator.getProperties().getProperty('Ice.Default.Host');
             fprintf('test connection endpoint information... ');
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/info/client.m zeroc-ice-3.7.2/matlab/test/Ice/info/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/info/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/info/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    AllTests.allTests(app);
+    AllTests.allTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/info/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/inheritance/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/inheritance/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/inheritance/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/inheritance/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,17 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing stringToProxy... ');
 
-            ref = ['initial:', app.getTestEndpoint(0)];
+            ref = ['initial:', helper.getTestEndpoint()];
             base = communicator.stringToProxy(ref);
             assert(~isempty(base));
             fprintf('ok\n');
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/inheritance/client.m zeroc-ice-3.7.2/matlab/test/Ice/inheritance/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/inheritance/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/inheritance/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    initial = AllTests.allTests(app);
+    initial = AllTests.allTests(helper);
     initial.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/objects/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,14 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
-            ref = ['initial:', app.getTestEndpoint(0)];
+            communicator = helper.communicator();
+            ref = ['initial:', helper.getTestEndpoint()];
             base = communicator.stringToProxy(ref);
             initial = InitialPrx.checkedCast(base);
 
@@ -113,6 +106,27 @@
             assert(~isempty(h) && isa(h, 'Test.H'));
             fprintf('ok\n');
 
+            fprintf('getting K... ');
+            k = initial.getK();
+            assert(~isempty(k));
+            assert(isa(k.value, 'Test.L'));
+            assert(strcmp(k.value.data, 'l'));
+            fprintf('ok\n');
+
+            fprintf('testing Value as parameter... ');
+            [v2, v3] = initial.opValue(L('l'));
+            assert(strcmp(v2.data, 'l'));
+            assert(strcmp(v3.data, 'l'));
+            [v2, v3] = initial.opValueSeq({L('l')});
+            assert(strcmp(v2{1}.data, 'l'));
+            assert(strcmp(v3{1}.data, 'l'));
+            d = containers.Map('KeyType', 'char', 'ValueType', 'any');
+            d('l') = L('l');
+            [v2, v3] = initial.opValueMap(d);
+            assert(strcmp(v2('l').data, 'l'));
+            assert(strcmp(v3('l').data, 'l'));
+            fprintf('ok\n');
+
             fprintf('getting D1... ');
             d1 = D1(A1('a1'), A1('a2'), A1('a3'), A1('a4'));
             d1 = initial.getD1(d1);
@@ -219,7 +233,7 @@
             fprintf('ok\n');
 
             fprintf('testing UnexpectedObjectException... ');
-            ref = ['uoet:', app.getTestEndpoint(0)];
+            ref = ['uoet:', helper.getTestEndpoint()];
             base = communicator.stringToProxy(ref);
             assert(~isempty(base));
             uoet = UnexpectedObjectExceptionTestPrx.uncheckedCast(base);
@@ -237,6 +251,26 @@
             end
             fprintf('ok\n');
 
+            fprintf('testing class containing complex dictionary... ');
+            m = M();
+            m.v(1).key = StructKey(1, '1');
+            m.v(1).value = L('one');
+
+            m.v(2).key = StructKey(2, '2');
+            m.v(2).value = L('two');
+
+            [m1, m2] = initial.opM(m);
+
+            assert(length(m1.v) == 2);
+            assert(length(m2.v) == 2);
+
+            assert(strcmp(m1.v(1).value.data, 'one'));
+            assert(strcmp(m1.v(2).value.data, 'two'));
+
+            assert(strcmp(m2.v(1).value.data, 'one'));
+            assert(strcmp(m2.v(2).value.data, 'two'));
+
+            fprintf('ok\n');
             r = initial;
         end
     end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/BI.m zeroc-ice-3.7.2/matlab/test/Ice/objects/BI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/BI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/BI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef BI < Test.B
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB1I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB1I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB1I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB1I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB1I < LocalTest.CB1
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB2I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB2I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB2I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB2I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB2I < LocalTest.CB2
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB3I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB3I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB3I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB3I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB3I < LocalTest.CB3
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB4I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB4I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB4I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB4I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB4I < LocalTest.CB4
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB5I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB5I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB5I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB5I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB5I < LocalTest.CB5
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB6I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB6I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB6I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB6I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB6I < LocalTest.CB6
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB7I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB7I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB7I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB7I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB7I < LocalTest.CB7
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CB8I.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CB8I.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CB8I.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CB8I.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CB8I < LocalTest.CB8
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/CI.m zeroc-ice-3.7.2/matlab/test/Ice/objects/CI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/CI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/CI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef CI < Test.C
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/client.m zeroc-ice-3.7.2/matlab/test/Ice/objects/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,13 +8,12 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    initData.properties_.setProperty('Ice.Warn.Connections', '0');
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    properties = helper.createTestProperties(args);
+    properties.setProperty('Ice.Warn.Connections', '0');
+    communicator = helper.initialize(properties);
     cleanup = onCleanup(@() communicator.destroy());
 
-    app = TestApp(communicator);
-
     %
     % Remote tests
     %
@@ -35,7 +27,7 @@
     vfm.add(@(id) JI(), Test.JPrx.ice_staticId());
     vfm.add(@(id) HI(), Test.H.ice_staticId());
 
-    initial = AllTests.allTests(app);
+    initial = AllTests.allTests(helper);
     initial.shutdown();
 
     %
@@ -49,7 +41,7 @@
     vfm.add(@(id) CB6I(), LocalTest.CB6.ice_staticId());
     vfm.add(@(id) CB7I(), LocalTest.CB7.ice_staticId());
     vfm.add(@(id) CB8I(), LocalTest.CB8.ice_staticId());
-    LocalTests.localTests(app);
+    LocalTests.localTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/DI.m zeroc-ice-3.7.2/matlab/test/Ice/objects/DI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/DI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/DI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef DI < Test.D
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/EI.m zeroc-ice-3.7.2/matlab/test/Ice/objects/EI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/EI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/EI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef EI < Test.E
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/FI.m zeroc-ice-3.7.2/matlab/test/Ice/objects/FI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/FI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/FI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef FI < Test.F
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/HI.m zeroc-ice-3.7.2/matlab/test/Ice/objects/HI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/HI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/HI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef HI < Test.H
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/II.m zeroc-ice-3.7.2/matlab/test/Ice/objects/II.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/II.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/II.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef II < Ice.InterfaceByValue
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/JI.m zeroc-ice-3.7.2/matlab/test/Ice/objects/JI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/JI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/JI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef JI < Ice.InterfaceByValue
     methods
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/LocalTest.ice zeroc-ice-3.7.2/matlab/test/Ice/objects/LocalTest.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/LocalTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/LocalTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/LocalTests.m zeroc-ice-3.7.2/matlab/test/Ice/objects/LocalTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/LocalTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/LocalTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,16 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 %
 % These tests exercise some corner cases of the mapping.
 %
 classdef LocalTests
     methods(Static)
-        function localTests(app)
+        function localTests(helper)
             import LocalTest.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
             props = communicator.getProperties();
 
             fprintf('testing class members locally... ');
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/objects/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -172,6 +167,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 interface Initial
 {
     void shutdown();
@@ -190,9 +211,15 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -209,6 +236,8 @@
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 class Empty
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/operations/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,52 +1,45 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
-            ref = ['test:', app.getTestEndpoint(0)];
+            communicator = helper.communicator();
+            ref = ['test:', helper.getTestEndpoint()];
             base = communicator.stringToProxy(ref);
             cl = MyClassPrx.checkedCast(base);
             derived = MyDerivedClassPrx.checkedCast(cl);
 
             fprintf('testing twoway operations... ');
-            Twoways.twoways(app, cl);
-            Twoways.twoways(app, derived);
+            Twoways.twoways(helper, cl);
+            Twoways.twoways(helper, derived);
             derived.opDerived();
             fprintf('ok\n');
 
             fprintf('testing oneway operations... ');
-            Oneways.oneways(app, cl);
+            Oneways.oneways(cl);
             fprintf('ok\n');
 
             fprintf('testing twoway operations with AMI... ');
-            TwowaysAMI.twowaysAMI(app, cl);
-            TwowaysAMI.twowaysAMI(app, derived);
+            TwowaysAMI.twowaysAMI(helper, cl);
+            TwowaysAMI.twowaysAMI(helper, derived);
             fprintf('ok\n');
 
             fprintf('testing oneway operations with AMI... ');
-            OnewaysAMI.onewaysAMI(app, cl);
+            OnewaysAMI.onewaysAMI(cl);
             fprintf('ok\n');
 
             fprintf('testing batch oneway operations... ');
-            BatchOneways.batchOneways(app, cl);
-            BatchOneways.batchOneways(app, derived);
+            BatchOneways.batchOneways(helper, cl);
+            BatchOneways.batchOneways(helper, derived);
             fprintf('ok\n');
 
             fprintf('testing batch AMI oneway operations... ');
-            BatchOnewaysAMI.batchOneways(app, cl);
-            BatchOnewaysAMI.batchOneways(app, derived);
+            BatchOnewaysAMI.batchOneways(cl);
+            BatchOnewaysAMI.batchOneways(derived);
             fprintf('ok\n');
 
             r = cl;
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/BatchOnewaysAMI.m zeroc-ice-3.7.2/matlab/test/Ice/operations/BatchOnewaysAMI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/BatchOnewaysAMI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/BatchOnewaysAMI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,10 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef BatchOnewaysAMI
     methods(Static)
-        function batchOneways(app, p)
-            communicator = app.communicator();
-            properties = communicator.getProperties();
+        function batchOneways(p)
             bs1 = zeros(1, 10  * 1024);
 
             batch = p.ice_batchOneway();
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/BatchOneways.m zeroc-ice-3.7.2/matlab/test/Ice/operations/BatchOneways.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/BatchOneways.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/BatchOneways.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,13 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef BatchOneways
     methods(Static)
-        function batchOneways(app, p)
+        function batchOneways(helper, p)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
             properties = communicator.getProperties();
             bs1 = zeros(1, 10  * 1024);
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/client.m zeroc-ice-3.7.2/matlab/test/Ice/operations/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,17 +8,15 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    initData.properties_.setProperty('Ice.ThreadPool.Client.Size', '2');
-    initData.properties_.setProperty('Ice.ThreadPool.Client.SizeWarn', '0');
-    initData.properties_.setProperty('Ice.BatchAutoFlushSize', '100');
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    properties = helper.createTestProperties(args);
+    properties.setProperty('Ice.ThreadPool.Client.Size', '2');
+    properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0');
+    properties.setProperty('Ice.BatchAutoFlushSize', '100');
+    communicator = helper.initialize(properties);
     cleanup = onCleanup(@() communicator.destroy());
 
-    app = TestApp(communicator);
-
-    myClass = AllTests.allTests(app);
-
+    myClass = AllTests.allTests(helper);
     fprintf('testing server shutdown... ');
     myClass.shutdown();
     try
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/OnewaysAMI.m zeroc-ice-3.7.2/matlab/test/Ice/operations/OnewaysAMI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/OnewaysAMI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/OnewaysAMI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,10 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef OnewaysAMI
     methods(Static)
-        function onewaysAMI(app, p)
+        function onewaysAMI(p)
             import Test.*;
 
             p = p.ice_oneway();
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/Oneways.m zeroc-ice-3.7.2/matlab/test/Ice/operations/Oneways.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/Oneways.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/Oneways.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,10 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef Oneways
     methods(Static)
-        function oneways(app, p)
+        function oneways(p)
             p = p.ice_oneway();
 
             p.ice_ping();
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/TwowaysAMI.m zeroc-ice-3.7.2/matlab/test/Ice/operations/TwowaysAMI.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/TwowaysAMI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/TwowaysAMI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,12 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef TwowaysAMI
     methods(Static)
-        function twowaysAMI(app, p)
+        function twowaysAMI(helper, p)
             import Test.*;
 
-            communicator = app.communicator();
-
             call(p, 'ice_ping');
 
             b = call(p, 'ice_isA', MyClassPrx.ice_staticId());
@@ -1151,17 +1142,17 @@
             %
             impls = {'Shared', 'PerThread'};
             for i = 1:2
-                initData = app.cloneInitData();
-                initData.properties_.setProperty('Ice.ImplicitContext', impls{i});
+                properties = helper.communicator().getProperties().clone();
+                properties.setProperty('Ice.ImplicitContext', impls{i});
 
-                ic = Ice.initialize(initData);
+                ic = helper.initialize(properties);
 
                 ctx = containers.Map('KeyType', 'char', 'ValueType', 'char');
                 ctx('one') = 'ONE';
                 ctx('two') = 'TWO';
                 ctx('three') = 'THREE';
 
-                p3 = MyClassPrx.uncheckedCast(ic.stringToProxy(['test:', app.getTestEndpoint(0)]));
+                p3 = MyClassPrx.uncheckedCast(ic.stringToProxy(['test:', helper.getTestEndpoint()]));
 
                 ic.getImplicitContext().setContext(ctx);
                 assert(isequal(ic.getImplicitContext().getContext(), ctx));
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/operations/Twoways.m zeroc-ice-3.7.2/matlab/test/Ice/operations/Twoways.m
--- zeroc-ice-3.7.1/matlab/test/Ice/operations/Twoways.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/operations/Twoways.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,12 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef Twoways
     methods(Static)
-        function twoways(app, p)
+        function twoways(helper, p)
             import Test.*;
 
-            communicator = app.communicator();
-
             literals = p.opStringLiterals();
 
             assert(strcmp(s0.value, sprintf('\\')) && ...
@@ -1310,17 +1301,17 @@
             %
             impls = {'Shared', 'PerThread'};
             for i = 1:2
-                initData = app.cloneInitData();
-                initData.properties_.setProperty('Ice.ImplicitContext', impls{i});
+                properties = helper.communicator().getProperties().clone();
+                properties.setProperty('Ice.ImplicitContext', impls{i});
 
-                ic = Ice.initialize(initData);
+                ic = helper.initialize(properties);
 
                 ctx = containers.Map('KeyType', 'char', 'ValueType', 'char');
                 ctx('one') = 'ONE';
                 ctx('two') = 'TWO';
                 ctx('three') = 'THREE';
 
-                p3 = MyClassPrx.uncheckedCast(ic.stringToProxy(['test:', app.getTestEndpoint(0)]));
+                p3 = MyClassPrx.uncheckedCast(ic.stringToProxy(['test:', helper.getTestEndpoint()]));
 
                 ic.getImplicitContext().setContext(ctx);
                 assert(isequal(ic.getImplicitContext().getContext(), ctx));
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/optional/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/optional/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/optional/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/optional/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,15 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
-            ref = ['initial:', app.getTestEndpoint(0)];
+            ref = ['initial:', helper.getTestEndpoint()];
             base = communicator.stringToProxy(ref);
             initial = InitialPrx.checkedCast(base);
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/optional/client.m zeroc-ice-3.7.2/matlab/test/Ice/optional/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/optional/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/optional/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    initial = AllTests.allTests(app);
+    initial = AllTests.allTests(helper);
     initial.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/optional/ClientPrivate.ice zeroc-ice-3.7.2/matlab/test/Ice/optional/ClientPrivate.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/optional/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/optional/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/optional/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/proxy/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/proxy/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/proxy/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/proxy/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,13 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing stringToProxy... ');
 
@@ -26,7 +19,7 @@
             p = communicator.propertyToProxy('bogus');
             assert(isempty(p));
 
-            ref = 'test:default -p 12010';
+            ref = ['test:', helper.getTestEndpoint()];
             base = communicator.stringToProxy(ref);
             assert(~isempty(base));
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/proxy/client.m zeroc-ice-3.7.2/matlab/test/Ice/proxy/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/proxy/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/proxy/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,11 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
 
-    app = TestApp(communicator);
-    myClass = AllTests.allTests(app);
+    myClass = AllTests.allTests(helper);
     myClass.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/slicing/exceptions/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/slicing/exceptions/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/slicing/exceptions/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/slicing/exceptions/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,16 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing stringToProxy... ');
-            ref = ['Test:', app.getTestEndpoint(0), ' -t 10000'];
+            ref = ['Test:', helper.getTestEndpoint(), ' -t 10000'];
             base = communicator.stringToProxy(ref);
             assert(~isempty(base));
             fprintf('ok\n');
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/slicing/exceptions/client.m zeroc-ice-3.7.2/matlab/test/Ice/slicing/exceptions/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/slicing/exceptions/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/slicing/exceptions/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    test = AllTests.allTests(app);
+    test = AllTests.allTests(helper);
     test.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/slicing/exceptions/ClientPrivate.ice zeroc-ice-3.7.2/matlab/test/Ice/slicing/exceptions/ClientPrivate.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/slicing/exceptions/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/slicing/exceptions/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,16 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function r = allTests(app)
+        function r = allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
             fprintf('testing stringToProxy... ');
-            ref = ['Test:', app.getTestEndpoint(0), ' -t 10000'];
+            ref = ['Test:', helper.getTestEndpoint(),' -t 10000'];
             base = communicator.stringToProxy(ref);
             assert(~isempty(base));
             fprintf('ok\n');
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/client.m zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    test = AllTests.allTests(app);
+    test = AllTests.allTests(helper);
     test.shutdown();
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/Counter.m zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/Counter.m
--- zeroc-ice-3.7.1/matlab/test/Ice/slicing/objects/Counter.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/slicing/objects/Counter.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef Counter < handle
     properties
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/timeout/AllTests.m zeroc-ice-3.7.2/matlab/test/Ice/timeout/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Ice/timeout/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/timeout/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
@@ -28,19 +21,20 @@
             end
             r = prx.ice_getConnection(); % Establish connection
         end
-        function allTests(app)
+        function allTests(helper)
             import Test.*;
 
-            communicator = app.communicator();
+            communicator = helper.communicator();
 
-            sref = ['timeout:', app.getTestEndpoint(0)];
+            sref = ['timeout:', helper.getTestEndpoint()];
             obj = communicator.stringToProxy(sref);
             assert(~isempty(obj));
 
             timeout = TimeoutPrx.checkedCast(obj);
             assert(~isempty(timeout));
 
-            controller = ControllerPrx.checkedCast(communicator.stringToProxy(['controller:', app.getTestEndpoint(1)]));
+            controller = ControllerPrx.checkedCast(...
+                communicator.stringToProxy(['controller:', helper.getTestEndpoint(1)]));
             assert(~isempty(controller));
 
             fprintf('testing connect timeout... ');
@@ -63,7 +57,7 @@
             %
             % Expect success.
             %
-            to = timeout.ice_timeout(2000);
+            to = timeout.ice_timeout(-1);
             controller.holdAdapter(100);
             try
                 to.op();
@@ -240,10 +234,10 @@
             % Test Ice.Override.Timeout. This property overrides all
             % endpoint timeouts.
             %
-            initData = app.cloneInitData();
-            initData.properties_.setProperty('Ice.Override.ConnectTimeout', '250');
-            initData.properties_.setProperty('Ice.Override.Timeout', '100');
-            comm = Ice.initialize(initData);
+            properties = helper.communicator().getProperties().clone();
+            properties.setProperty('Ice.Override.ConnectTimeout', '250');
+            properties.setProperty('Ice.Override.Timeout', '100');
+            comm = helper.initialize(properties);
             to = TimeoutPrx.uncheckedCast(comm.stringToProxy(sref));
             AllTests.connect(to);
             controller.holdAdapter(-1);
@@ -277,10 +271,10 @@
             %
             % Test Ice.Override.ConnectTimeout.
             %
-            initData = app.cloneInitData();
-            initData.properties_.setProperty('Ice.Override.ConnectTimeout', '250');
+            properties = helper.communicator().getProperties().clone();
+            properties.setProperty('Ice.Override.ConnectTimeout', '250');
 
-            comm = Ice.initialize(initData);
+            comm = helper.initialize(properties);
             to = TimeoutPrx.uncheckedCast(comm.stringToProxy(sref));
             controller.holdAdapter(-1);
             try
@@ -328,14 +322,14 @@
             %
             % Test Ice.Override.CloseTimeout.
             %
-            initData = app.cloneInitData();
-            initData.properties_.setProperty('Ice.Override.CloseTimeout', '100');
-            comm = Ice.initialize(initData);
+            properties = helper.communicator().getProperties().clone();
+            properties.setProperty('Ice.Override.CloseTimeout', '100');
+            comm = helper.initialize(properties);
             comm.stringToProxy(sref).ice_getConnection();
             controller.holdAdapter(-1);
             tic();
             comm.destroy();
-            assert(toc() < .7);
+            assert(toc() < 1.0);
             controller.resumeAdapter();
             timeout.op(); % Ensure adapter is active.
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/timeout/client.m zeroc-ice-3.7.2/matlab/test/Ice/timeout/client.m
--- zeroc-ice-3.7.1/matlab/test/Ice/timeout/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/timeout/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,29 +8,29 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
+    helper = TestHelper();
+    properties = helper.createTestProperties(args);
 
     %
     % For this test, we want to disable retries.
     %
-    initData.properties_.setProperty('Ice.RetryIntervals', '-1');
+    properties.setProperty('Ice.RetryIntervals', '-1');
 
     %
     % This test kills connections, so we don't want warnings.
     %
-    initData.properties_.setProperty('Ice.Warn.Connections', '0');
+    properties.setProperty('Ice.Warn.Connections', '0');
 
     %
     % Limit the send buffer size, this test relies on the socket
     % send() blocking after sending a given amount of data.
     %
-    initData.properties_.setProperty('Ice.TCP.SndSize', '50000');
+    properties.setProperty('Ice.TCP.SndSize', '50000');
 
-    communicator = Ice.initialize(initData);
+    communicator = helper.initialize(properties);
     cleanup = onCleanup(@() communicator.destroy());
 
-    app = TestApp(communicator);
-    AllTests.allTests(app);
+    AllTests.allTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/matlab/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/matlab/test/lib/runTest.m zeroc-ice-3.7.2/matlab/test/lib/runTest.m
--- zeroc-ice-3.7.1/matlab/test/lib/runTest.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/lib/runTest.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,7 +1,7 @@
 %
-% This function runs a MATLAB test client. The first argument must the path name of the test directory. All
-% other arguments are passed to the test client.
+% Copyright (c) ZeroC, Inc. All rights reserved.
 %
+
 function runTest(varargin)
     if length(varargin) == 0
         fprintf('testdir argument required\n');
diff -Nru zeroc-ice-3.7.1/matlab/test/lib/TestApp.m zeroc-ice-3.7.2/matlab/test/lib/TestApp.m
--- zeroc-ice-3.7.1/matlab/test/lib/TestApp.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/lib/TestApp.m	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
-
-classdef TestApp < handle
-    methods(Static)
-        function [initData, extraArgs] = createInitData(appName, args)
-            initData = Ice.InitializationData();
-            a = [appName, args]; % Insert appName as the first argument -- this becomes the value of Ice.ProgramName.
-            [initData.properties_, extraArgs] = Ice.createProperties(a);
-            extraArgs = initData.properties_.parseCommandLineOptions('Test', extraArgs);
-        end
-    end
-    methods
-        function obj = TestApp(communicator)
-            obj.communicator_ = communicator;
-            obj.properties_ = communicator.getProperties();
-            obj.appName_ = obj.properties_.getProperty('Ice.ProgramName');
-        end
-        function r = appName(obj)
-            r = obj.appName_;
-        end
-        function r = communicator(obj)
-            r = obj.communicator_;
-        end
-        function initData = cloneInitData(obj)
-            initData = Ice.InitializationData();
-            initData.properties_ = obj.properties_.clone();
-        end
-        function r = getTestEndpoint(obj, num, prot)
-            if nargin == 2
-                prot = '';
-            end
-            r = TestApp.getTestEndpointWithProperties(obj.properties_, num, prot);
-        end
-        function r = getTestHost(obj)
-            r = TestApp.getTestHostWithProperties(obj.properties_);
-        end
-        function r = getTestProtocol(obj)
-            r = TestApp.getTestProtocolWithProperties(obj.properties_);
-        end
-        function r = getTestPort(obj, num)
-            r = TestApp.getTestPortWithProperties(obj.properties_, num);
-        end
-    end
-    methods(Static, Access=private)
-        function r = getTestEndpointWithProperties(props, num, prot)
-            if length(prot) == 0
-                prot = props.getPropertyWithDefault('Ice.Default.Protocol', 'default');
-            end
-
-            basePort = props.getPropertyAsIntWithDefault('Test.BasePort', 12010);
-
-            r = sprintf('%s -p %d', prot, basePort + num);
-        end
-        function r = getTestHostWithProperties(props)
-            r = props.getPropertyWithDefault('Ice.Default.Host', '127.0.0.1');
-        end
-        function r = getTestProtocolWithProperties(props)
-            r = props.getPropertyWithDefault('Ice.Default.Protocol', 'tcp');
-        end
-        function r = getTestPortWithProperties(props, num)
-            r = props.getPropertyAsIntWithDefault('Test.BasePort', 12010) + num;
-        end
-    end
-    properties(Access=private)
-        appName_
-        communicator_
-        properties_
-    end
-end
diff -Nru zeroc-ice-3.7.1/matlab/test/lib/TestHelper.m zeroc-ice-3.7.2/matlab/test/lib/TestHelper.m
--- zeroc-ice-3.7.1/matlab/test/lib/TestHelper.m	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/lib/TestHelper.m	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,133 @@
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
+
+classdef TestHelper < handle
+    methods
+        function obj = TestHelper()
+            obj.communicator_ = {};
+        end
+
+        function endpoint = getTestEndpoint(obj, varargin)
+            num = 0;
+            protocol = '';
+
+            nargs = length(varargin);
+            if nargs == 0
+                properties = obj.communicator_.getProperties();
+            else
+                if isa(varargin{1}, 'Ice.Properties')
+                    properties = varargin{1};
+                    if nargs > 1
+                        if isnumeric(varargin{2})
+                            num = varargin{2};
+                            if nargs > 2
+                                protocol = varargin{3};
+                            end
+                        else
+                            protocol = varargin{2};
+                        end
+                    end
+                else
+                    properties = obj.communicator_.getProperties();
+                    if isnumeric(varargin{1})
+                        num = varargin{1};
+                        if nargs > 1
+                            protocol = varargin{2};
+                        end
+                    else
+                        protocol = varargin{1};
+                    end
+                end
+            end
+
+            if length(protocol) == 0
+                protocol = properties.getPropertyWithDefault('Ice.Default.Protocol', 'default');
+            end
+            port = properties.getPropertyAsIntWithDefault('Test.BasePort', 12010) + num;
+            endpoint = sprintf('%s -p %d', protocol, port);
+        end
+
+        function host = getTestHost(obj, varargin)
+            nargs = length(varargin);
+            if nargs == 0
+                properties = obj.communicator_.getProperties();
+            else
+                properties = varargin{1};
+            end
+            host = properties.getPropertyWithDefault('Ice.Default.Host', '127.0.0.1');
+        end
+
+        function host = getTestProtocol(obj, varargin)
+            nargs = length(varargin);
+            if nargs == 0
+                properties = obj.communicator_.getProperties();
+            else
+                properties = varargin{1};
+            end
+            host = properties.getPropertyWithDefault('Ice.Default.Protocol', 'tcp');
+        end
+
+        function port = getTestPort(obj, varargin)
+            nargs = length(varargin);
+            num = 0;
+            if nargs == 0
+                properties = obj.communicator_.getProperties();
+            else
+                if isa(varargin{1}, 'Ice.Properties')
+                    properties = varargin{1};
+                    if nargs > 1
+                        num = varargin{2};
+                    end
+                else
+                    num = varargin{1};
+                end
+            end
+            port = properties.getPropertyAsIntWithDefault('Test.BasePort', 12010) + num;
+        end
+
+        function [properties, args] = createTestProperties(~, varargin)
+            nargs = length(varargin);
+            if nargs == 0
+                args = {};
+            else
+                args = varargin{1};
+            end
+            [properties, args] = Ice.createProperties(args);
+            args = properties.parseCommandLineOptions('Test', args);
+        end
+
+        function communicator = initialize(obj, varargin)
+            nargs = length(varargin);
+            if nargs > 0
+                if isa(varargin{1}, 'Ice.InitializationData')
+                    initData = varargin{1};
+                else
+                    initData = Ice.InitializationData();
+                    if isa(varargin{1}, 'Ice.Properties')
+                        initData.properties_ = varargin{1};
+                    else
+                        initData.properties_ = obj.createTestProperties(varargin{1});
+                    end
+                end
+            end
+            communicator = Ice.initialize(initData);
+            if(isempty(obj.communicator_))
+                obj.communicator_ = communicator;
+            end
+        end
+
+        function communicator = communicator(obj)
+            communicator = obj.communicator_;
+        end
+
+        function shutdown(obj)
+            if(~isempty(obj.communicator_))
+                obj.communicator_.shutdown();
+            end
+        end
+    end
+    properties(Access=private)
+        communicator_ = {};
+    end
+end
diff -Nru zeroc-ice-3.7.1/matlab/test/Slice/escape/AllTests.m zeroc-ice-3.7.2/matlab/test/Slice/escape/AllTests.m
--- zeroc-ice-3.7.1/matlab/test/Slice/escape/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Slice/escape/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,11 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 classdef AllTests
     methods(Static)
-        function allTests(app)
-            communicator = app.communicator();
+        function allTests(helper)
+            communicator = helper.communicator();
 
             fprintf('testing enum... ');
 
diff -Nru zeroc-ice-3.7.1/matlab/test/Slice/escape/client.m zeroc-ice-3.7.2/matlab/test/Slice/escape/client.m
--- zeroc-ice-3.7.1/matlab/test/Slice/escape/client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Slice/escape/client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,13 +1,6 @@
-%{
-**********************************************************************
-
-Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-
-This copy of Ice is licensed to you under the terms described in the
-ICE_LICENSE file included in this distribution.
-
-**********************************************************************
-%}
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
 
 function client(args)
     addpath('generated');
@@ -15,12 +8,10 @@
         loadlibrary('ice', @iceproto)
     end
 
-    initData = TestApp.createInitData('client', args);
-    communicator = Ice.initialize(initData);
+    helper = TestHelper();
+    communicator = helper.initialize(args);
     cleanup = onCleanup(@() communicator.destroy());
-
-    app = TestApp(communicator);
-    AllTests.allTests(app);
+    AllTests.allTests(helper);
 
     clear('classes'); % Avoids conflicts with tests that define the same symbols.
 end
diff -Nru zeroc-ice-3.7.1/matlab/test/Slice/escape/Test.ice zeroc-ice-3.7.2/matlab/test/Slice/escape/Test.ice
--- zeroc-ice-3.7.1/matlab/test/Slice/escape/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/matlab/test/Slice/escape/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/allTests.py zeroc-ice-3.7.2/objective-c/allTests.py
--- zeroc-ice-3.7.1/objective-c/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/objective-c/config/Make.rules zeroc-ice-3.7.2/objective-c/config/Make.rules
--- zeroc-ice-3.7.1/objective-c/config/Make.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/config/Make.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # ----------------------------------------------------------------------
 # Don't change anything below this line!
diff -Nru zeroc-ice-3.7.1/objective-c/config/Make.xcodesdk.rules zeroc-ice-3.7.2/objective-c/config/Make.xcodesdk.rules
--- zeroc-ice-3.7.1/objective-c/config/Make.xcodesdk.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/config/Make.xcodesdk.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 include $(top_srcdir)/config/Make.xcodesdk.rules
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Glacier2/Glacier2.h zeroc-ice-3.7.2/objective-c/include/objc/Glacier2/Glacier2.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Glacier2/Glacier2.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Glacier2/Glacier2.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Glacier2/Metrics.h>
 #import <objc/Glacier2/PermissionsVerifier.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Glacier2.h zeroc-ice-3.7.2/objective-c/include/objc/Glacier2.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Glacier2.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Glacier2.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Glacier2/Glacier2.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Config.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Config.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Some import files we need almost everywhere
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/DispatchInterceptor.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/DispatchInterceptor.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/DispatchInterceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/DispatchInterceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Object.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Exception.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Exception.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Exception.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Exception.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Format.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Format.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Format.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Format.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 typedef enum
 {
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Ice.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Ice.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Ice.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Ice.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Communicator.h>
 #import <objc/Ice/Connection.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Initialize.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Initialize.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Initialize.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Initialize.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/LocalObject.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/LocalObject.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/LocalObject.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/LocalObject.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/NativePropertiesAdmin.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/NativePropertiesAdmin.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/NativePropertiesAdmin.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/NativePropertiesAdmin.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 #import <objc/Ice/PropertiesAdmin.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/ObjectFactory.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/ObjectFactory.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/ObjectFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/ObjectFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Object.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Object.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Object.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Object.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Proxy.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Proxy.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Proxy.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Proxy.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/SlicedData.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/SlicedData.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/SlicedData.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/SlicedData.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in
-// the ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/Stream.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/Stream.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/Stream.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/Stream.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 #import <objc/Ice/Format.h> // for ICEFormatType
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice/ValueFactory.h zeroc-ice-3.7.2/objective-c/include/objc/Ice/ValueFactory.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice/ValueFactory.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice/ValueFactory.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Config.h>
 #import <objc/Ice/Object.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/IceGrid/IceGrid.h zeroc-ice-3.7.2/objective-c/include/objc/IceGrid/IceGrid.h
--- zeroc-ice-3.7.1/objective-c/include/objc/IceGrid/IceGrid.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/IceGrid/IceGrid.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceGrid/Admin.h>
 #import <objc/IceGrid/Exception.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/IceGrid.h zeroc-ice-3.7.2/objective-c/include/objc/IceGrid.h
--- zeroc-ice-3.7.1/objective-c/include/objc/IceGrid.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/IceGrid.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceGrid/IceGrid.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/Ice.h zeroc-ice-3.7.2/objective-c/include/objc/Ice.h
--- zeroc-ice-3.7.1/objective-c/include/objc/Ice.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/Ice.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/IceIAP/IceIAP.h zeroc-ice-3.7.2/objective-c/include/objc/IceIAP/IceIAP.h
--- zeroc-ice-3.7.1/objective-c/include/objc/IceIAP/IceIAP.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/IceIAP/IceIAP.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceIAP/EndpointInfo.h>
 #import <objc/IceIAP/ConnectionInfo.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/IceIAP.h zeroc-ice-3.7.2/objective-c/include/objc/IceIAP.h
--- zeroc-ice-3.7.1/objective-c/include/objc/IceIAP.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/IceIAP.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceIAP/IceIAP.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/IceSSL/IceSSL.h zeroc-ice-3.7.2/objective-c/include/objc/IceSSL/IceSSL.h
--- zeroc-ice-3.7.1/objective-c/include/objc/IceSSL/IceSSL.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/IceSSL/IceSSL.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceSSL/EndpointInfo.h>
 #import <objc/IceSSL/ConnectionInfo.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/IceSSL.h zeroc-ice-3.7.2/objective-c/include/objc/IceSSL.h
--- zeroc-ice-3.7.1/objective-c/include/objc/IceSSL.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/IceSSL.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceSSL/IceSSL.h>
diff -Nru zeroc-ice-3.7.1/objective-c/include/objc/IceStorm.h zeroc-ice-3.7.2/objective-c/include/objc/IceStorm.h
--- zeroc-ice-3.7.1/objective-c/include/objc/IceStorm.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/include/objc/IceStorm.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceStorm/IceStorm.h>
diff -Nru zeroc-ice-3.7.1/objective-c/Makefile zeroc-ice-3.7.2/objective-c/Makefile
--- zeroc-ice-3.7.1/objective-c/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 top_srcdir      := ..
-lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
+lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST))))))
 
 include $(top_srcdir)/config/Make.rules
 include $(lang_srcdir)/config/Make.rules
diff -Nru zeroc-ice-3.7.1/objective-c/README.md zeroc-ice-3.7.2/objective-c/README.md
--- zeroc-ice-3.7.1/objective-c/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -131,6 +131,6 @@
  All the test clients and servers run on the iOS device, not on your Mac
  computer.
 
-[1]: https://doc.zeroc.com/display/Rel/Using+the+macOS+Binary+Distribution+for+Ice+3.7.1
-[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.1
+[1]: https://doc.zeroc.com/display/Rel/Using+the+macOS+Binary+Distribution+for+Ice+3.7.2
+[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2
 [3]: https://en.wikipedia.org/wiki/Automatic_Reference_Counting
diff -Nru zeroc-ice-3.7.1/objective-c/src/Glacier2/Makefile.mk zeroc-ice-3.7.2/objective-c/src/Glacier2/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/src/Glacier2/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Glacier2/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries            = Glacier2ObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/BatchRequestInterceptorI.h zeroc-ice-3.7.2/objective-c/src/Ice/BatchRequestInterceptorI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/BatchRequestInterceptorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/BatchRequestInterceptorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Initialize.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/BatchRequestInterceptor.mm zeroc-ice-3.7.2/objective-c/src/Ice/BatchRequestInterceptor.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/BatchRequestInterceptor.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/BatchRequestInterceptor.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <BatchRequestInterceptorI.h>
 #import <Util.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/CommunicatorI.h zeroc-ice-3.7.2/objective-c/src/Ice/CommunicatorI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/CommunicatorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/CommunicatorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Communicator.h>
 #import <objc/Ice/LocalObject.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/CommunicatorI.mm zeroc-ice-3.7.2/objective-c/src/Ice/CommunicatorI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/CommunicatorI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/CommunicatorI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <CommunicatorI.h>
 #import <PropertiesI.h>
@@ -255,7 +250,7 @@
     return nil; // Keep the compiler happy.
 }
 
--(id<ICEObjectAdapter>) createObjectAdapter:(NSString*)name;
+-(id<ICEObjectAdapter>) createObjectAdapter:(NSString*)name
 {
     NSException* nsex = nil;
     try
@@ -273,7 +268,7 @@
     return nil; // Keep the compiler happy.
 }
 
--(id<ICEObjectAdapter>) createObjectAdapterWithEndpoints:(NSString*)name endpoints:(NSString*)endpoints;
+-(id<ICEObjectAdapter>) createObjectAdapterWithEndpoints:(NSString*)name endpoints:(NSString*)endpoints
 {
     NSException* nsex = nil;
     try
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ConnectionI.h zeroc-ice-3.7.2/objective-c/src/Ice/ConnectionI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/ConnectionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ConnectionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Connection.h>
 #import <objc/Ice/LocalObject.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ConnectionI.mm zeroc-ice-3.7.2/objective-c/src/Ice/ConnectionI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/ConnectionI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ConnectionI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you  the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ConnectionI.h>
 #import <EndpointI.h>
@@ -45,7 +40,7 @@
 
 @implementation ICEConnectionInfo (ICEInternal)
 
-+(id) checkedConnectionInfoWithConnectionInfo:(Ice::ConnectionInfo*)connectionInfo
++(id) checkedConnectionInfoWithConnectionInfo:(Ice::ConnectionInfo*)__unused connectionInfo
 {
     assert(false);
     return nil;
@@ -99,7 +94,7 @@
     return [[ICEConnectionInfo alloc] initWithConnectionInfo:info];
 }
 
--(id) initWithConnectionInfo:(Ice::ConnectionInfo*)connectionInfo;
+-(id) initWithConnectionInfo:(Ice::ConnectionInfo*)connectionInfo
 {
     self = [super initWithCxxObject:connectionInfo];
     if(self != nil)
@@ -194,7 +189,7 @@
     }
 
     void
-    closed(const Ice::ConnectionPtr& connection)
+    closed(const Ice::ConnectionPtr&)
     {
         NSException* ex = nil;
         @autoreleasepool
@@ -237,7 +232,7 @@
     }
 
     void
-    heartbeat(const Ice::ConnectionPtr& connection)
+    heartbeat(const Ice::ConnectionPtr&)
     {
         NSException* ex = nil;
         @autoreleasepool
@@ -373,7 +368,7 @@
                    CONNECTION->end_flushBatchRequests(r);
                }, result);
 }
--(void) setCloseCallback:(ICECloseCallback)callback;
+-(void) setCloseCallback:(ICECloseCallback)callback
 {
     CONNECTION->setCloseCallback(new CloseCallbackI(self, callback));
 }
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/CurrentI.h zeroc-ice-3.7.2/objective-c/src/Ice/CurrentI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/CurrentI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/CurrentI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Current.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/CurrentI.mm zeroc-ice-3.7.2/objective-c/src/Ice/CurrentI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/CurrentI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/CurrentI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <CurrentI.h>
 #import <VersionI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/DispatcherI.h zeroc-ice-3.7.2/objective-c/src/Ice/DispatcherI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/DispatcherI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/DispatcherI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Initialize.h>
 #import <objc/Ice/Connection.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Dispatcher.mm zeroc-ice-3.7.2/objective-c/src/Ice/Dispatcher.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/Dispatcher.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Dispatcher.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <DispatcherI.h>
 #import <Util.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/DispatchInterceptor.m zeroc-ice-3.7.2/objective-c/src/Ice/DispatchInterceptor.m
--- zeroc-ice-3.7.1/objective-c/src/Ice/DispatchInterceptor.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/DispatchInterceptor.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/DispatchInterceptor.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/EndpointI.h zeroc-ice-3.7.2/objective-c/src/Ice/EndpointI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/EndpointI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/EndpointI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in
-// the ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Endpoint.h>
 #import <objc/Ice/LocalObject.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/EndpointI.mm zeroc-ice-3.7.2/objective-c/src/Ice/EndpointI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/EndpointI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/EndpointI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in
-// the ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <EndpointI.h>
 #import <Util.h>
@@ -45,7 +40,7 @@
 
 @implementation ICEEndpointInfo(ICEInternal)
 
-+(id) checkedEndpointInfoWithEndpointInfo:(Ice::EndpointInfo*)endpointInfo
++(id) checkedEndpointInfoWithEndpointInfo:(Ice::EndpointInfo*)__unused endpointInfo
 {
     assert(false);
     return nil;
@@ -104,7 +99,7 @@
     return [[ICEEndpointInfo alloc] initWithEndpointInfo:info];
 }
 
--(id) initWithEndpointInfo:(Ice::EndpointInfo*)endpointInfo;
+-(id) initWithEndpointInfo:(Ice::EndpointInfo*)endpointInfo
 {
     self = [super initWithCxxObject:endpointInfo];
     if(self)
@@ -122,12 +117,12 @@
     return ENDPOINTINFO->type();
 }
 
--(BOOL) datagram;
+-(BOOL) datagram
 {
     return ENDPOINTINFO->datagram();
 }
 
--(BOOL) secure;
+-(BOOL) secure
 {
     return ENDPOINTINFO->secure();
 }
@@ -135,7 +130,7 @@
 
 @implementation ICEIPEndpointInfo(ICEInternal)
 
--(id) initWithIPEndpointInfo:(Ice::IPEndpointInfo*)ipEndpointInfo;
+-(id) initWithIPEndpointInfo:(Ice::IPEndpointInfo*)ipEndpointInfo
 {
     self = [super initWithEndpointInfo:ipEndpointInfo];
     if(self)
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ExceptionI.h zeroc-ice-3.7.2/objective-c/src/Ice/ExceptionI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/ExceptionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ExceptionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Exception.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Exception.mm zeroc-ice-3.7.2/objective-c/src/Ice/Exception.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/Exception.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Exception.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ExceptionI.h>
 #import <IdentityI.h>
@@ -40,18 +35,18 @@
     return nil;
 }
 
--(id) initWithCoder:(NSCoder*)decoder
+-(id) initWithCoder:(NSCoder*)__unused decoder
 {
     [NSException raise:NSInvalidArchiveOperationException format:@"ICEExceptions do not support NSCoding"];
     return nil;
 }
 
--(void) encodeWithCoder:(NSCoder*)coder
+-(void) encodeWithCoder:(NSCoder*)__unused coder
 {
     [NSException raise:NSInvalidArchiveOperationException format:@"ICEExceptions do not support NSCoding"];
 }
 
--(id) copyWithZone:(NSZone *)zone
+-(id) copyWithZone:(NSZone*)__unused zone
 {
     NSAssert(false, @"copyWithZone: must be overriden");
     return nil;
@@ -188,7 +183,7 @@
     [os endException];
 }
 
--(void) iceWriteImpl:(id<ICEOutputStream>)os
+-(void) iceWriteImpl:(id<ICEOutputStream>)__unused os
 {
     NSAssert(NO, @"iceWriteImpl requires override");
 }
@@ -200,7 +195,7 @@
     [is endException:NO];
 }
 
--(void) iceReadImpl:(id<ICEInputStream>)is
+-(void) iceReadImpl:(id<ICEInputStream>)__unused is
 {
     NSAssert(NO, @"iceReadImpl requires override");
 }
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/IdentityI.h zeroc-ice-3.7.2/objective-c/src/Ice/IdentityI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/IdentityI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/IdentityI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Identity.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/IdentityI.mm zeroc-ice-3.7.2/objective-c/src/Ice/IdentityI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/IdentityI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/IdentityI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <IdentityI.h>
 #import <Util.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ImplicitContextI.h zeroc-ice-3.7.2/objective-c/src/Ice/ImplicitContextI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/ImplicitContextI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ImplicitContextI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/ImplicitContext.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ImplicitContextI.mm zeroc-ice-3.7.2/objective-c/src/Ice/ImplicitContextI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/ImplicitContextI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ImplicitContextI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ImplicitContextI.h>
 #import <Util.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/InitializeI.h zeroc-ice-3.7.2/objective-c/src/Ice/InitializeI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/InitializeI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/InitializeI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Initialize.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Initialize.mm zeroc-ice-3.7.2/objective-c/src/Ice/Initialize.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/Initialize.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Initialize.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <InitializeI.h>
 #import <PropertiesI.h>
@@ -166,7 +161,6 @@
 {
     Ice::InitializationData data;
     data.properties = [(ICEProperties*)properties properties];
-    data.logger = [ICELogger loggerWithLogger:logger];
     if(batchRequestInterceptor)
     {
         data.batchRequestInterceptor = [ICEBatchRequestInterceptor
@@ -191,7 +185,7 @@
 
 -(id) init:(id<ICEProperties>)props logger:(id<ICELogger>)log
                                 dispatcher:(void(^)(id<ICEDispatcherCall>, id<ICEConnection>))d
-                   batchRequestInterceptor:(void(^)(id<ICEBatchRequest>, int, int))i;
+                   batchRequestInterceptor:(void(^)(id<ICEBatchRequest>, int, int))i
 {
     self = [super init];
     if(!self)
@@ -205,7 +199,7 @@
     return self;
 }
 
-+(id) initializationData;
++(id) initializationData
 {
    ICEInitializationData *s = [[ICEInitializationData alloc] init];
    [s autorelease];
@@ -214,7 +208,7 @@
 
 +(id) initializationData:(id<ICEProperties>)p logger:(id<ICELogger>)l
                                           dispatcher:(void(^)(id<ICEDispatcherCall>, id<ICEConnection>))d
-                             batchRequestInterceptor:(void(^)(id<ICEBatchRequest>, int, int))i;
+                             batchRequestInterceptor:(void(^)(id<ICEBatchRequest>, int, int))i
 {
    return [[((ICEInitializationData *)[ICEInitializationData alloc]) init:p logger:l dispatcher:d
             batchRequestInterceptor:i] autorelease];
@@ -231,7 +225,7 @@
     return copy;
 }
 
--(NSUInteger) hash;
+-(NSUInteger) hash
 {
     NSUInteger h = 0;
     h = (h << 5 ^ [properties hash]);
@@ -242,7 +236,7 @@
     return h;
 }
 
--(BOOL) isEqual:(id)anObject;
+-(BOOL) isEqual:(id)anObject
 {
     if(self == anObject)
     {
@@ -326,7 +320,7 @@
     return YES;
 }
 
--(void) dealloc;
+-(void) dealloc
 {
     [properties release];
     [logger release];
@@ -417,6 +411,17 @@
             data.properties = createProperties(*argc, argv, data.properties);
         }
 
+        //
+        // If no logger is specified, install a default logger unless Ice.UseSyslog
+        // or Ice.LogFile is configured
+        //
+        if(!data.logger && data.properties->getPropertyAsInt("Ice.UseSyslog") <= 0 &&
+           data.properties->getProperty("Ice.LogFile").empty())
+        {
+            id<ICELogger> logger = initData ? initData.logger : nil;
+            data.logger = [ICELogger loggerWithLogger:logger];
+        }
+
         Ice::CommunicatorPtr communicator;
         if(argc != nil && argv != nil)
         {
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/LocalObjectI.h zeroc-ice-3.7.2/objective-c/src/Ice/LocalObjectI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/LocalObjectI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/LocalObjectI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/LocalObject.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/LocalObject.mm zeroc-ice-3.7.2/objective-c/src/Ice/LocalObject.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/LocalObject.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/LocalObject.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <LocalObjectI.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/LoggerI.h zeroc-ice-3.7.2/objective-c/src/Ice/LoggerI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/LoggerI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/LoggerI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Logger.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/LoggerI.mm zeroc-ice-3.7.2/objective-c/src/Ice/LoggerI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/LoggerI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/LoggerI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <LoggerI.h>
 #import <Util.h>
@@ -20,153 +15,153 @@
 {
 public:
 
-// We must explicitely CFRetain/CFRelease so that the garbage
-// collector does not trash the logger.
-LoggerWrapperI(id<ICELogger> logger) : _logger(logger)
-{
-    CFRetain(_logger);
-}
+    // We must explicitely CFRetain/CFRelease so that the garbage
+    // collector does not trash the logger.
+    LoggerWrapperI(id<ICELogger> logger) : _logger(logger)
+    {
+        CFRetain(_logger);
+    }
 
-virtual ~LoggerWrapperI()
-{
-    CFRelease(_logger);
-}
+    virtual ~LoggerWrapperI()
+    {
+        CFRelease(_logger);
+    }
 
-virtual void
-print(const std::string& msg)
-{
-    NSException* ex = nil;
-    @autoreleasepool
+    virtual void
+    print(const std::string& msg)
     {
-        NSString* s = toNSString(msg);
-        @try
-        {
-            [_logger print:s];
-        }
-        @catch(id e)
+        NSException* ex = nil;
+        @autoreleasepool
         {
-            ex = [e retain];
+            NSString* s = toNSString(msg);
+            @try
+            {
+                [_logger print:s];
+            }
+            @catch(id e)
+            {
+                ex = [e retain];
+            }
+            @finally
+            {
+                [s release];
+            }
         }
-        @finally
+        if(ex != nil)
         {
-            [s release];
+            rethrowCxxException(ex, true); // True = release the exception.
         }
     }
-    if(ex != nil)
-    {
-        rethrowCxxException(ex, true); // True = release the exception.
-    }
-}
 
-virtual void
-trace(const std::string& category, const std::string& msg)
-{
-    NSException* ex = nil;
-    @autoreleasepool
+    virtual void
+    trace(const std::string& category, const std::string& msg)
     {
-        NSString* s1 = toNSString(category);
-        NSString* s2 = toNSString(msg);
-        @try
+        NSException* ex = nil;
+        @autoreleasepool
         {
-            [_logger trace:s1 message:s2];
+            NSString* s1 = toNSString(category);
+            NSString* s2 = toNSString(msg);
+            @try
+            {
+                [_logger trace:s1 message:s2];
+            }
+            @catch(id e)
+            {
+                ex = [e retain];
+            }
+            @finally
+            {
+                [s1 release];
+                [s2 release];
+            }
         }
-        @catch(id e)
+        if(ex != nil)
         {
-            ex = [e retain];
+            rethrowCxxException(ex, true); // True = release the exception.
         }
-        @finally
-        {
-            [s1 release];
-            [s2 release];
-        }
-    }
-    if(ex != nil)
-    {
-        rethrowCxxException(ex, true); // True = release the exception.
     }
-}
 
-virtual void
-warning(const std::string& msg)
-{
-    NSException* ex = nil;
-    @autoreleasepool
+    virtual void
+    warning(const std::string& msg)
     {
-        NSString* s = toNSString(msg);
-        @try
-        {
-            [_logger warning:s];
-        }
-        @catch(id e)
+        NSException* ex = nil;
+        @autoreleasepool
         {
-            ex = [e retain];
+            NSString* s = toNSString(msg);
+            @try
+            {
+                [_logger warning:s];
+            }
+            @catch(id e)
+            {
+                ex = [e retain];
+            }
+            @finally
+            {
+                [s release];
+            }
         }
-        @finally
+        if(ex != nil)
         {
-            [s release];
+            rethrowCxxException(ex, true); // True = release the exception.
         }
     }
-    if(ex != nil)
+
+    virtual void
+    error(const std::string& msg)
     {
-        rethrowCxxException(ex, true); // True = release the exception.
+        NSException* ex = nil;
+        @autoreleasepool
+        {
+            NSString* s = toNSString(msg);
+            @try
+            {
+                [_logger error:s];
+            }
+            @catch(id e)
+            {
+                ex = [e retain];
+            }
+            @finally
+            {
+                [s release];
+            }
+        }
+        if(ex != nil)
+        {
+            rethrowCxxException(ex, true); // True = release the exception.
+        }
     }
-}
 
-virtual void
-error(const std::string& msg)
-{
-    NSException* ex = nil;
-    @autoreleasepool
+    virtual Ice::LoggerPtr
+    cloneWithPrefix(const std::string& prefix)
     {
-        NSString* s = toNSString(msg);
+        NSString* s = toNSString(prefix);
         @try
         {
-            [_logger error:s];
-        }
-        @catch(id e)
-        {
-            ex = [e retain];
+            return [ICELogger loggerWithLogger:[_logger cloneWithPrefix:s]];
         }
         @finally
         {
             [s release];
         }
     }
-    if(ex != nil)
-    {
-        rethrowCxxException(ex, true); // True = release the exception.
-    }
-}
 
-virtual Ice::LoggerPtr
-cloneWithPrefix(const std::string& prefix)
-{
-    NSString* s = toNSString(prefix);
-    @try
+    virtual std::string
+    getPrefix()
     {
-        return [ICELogger loggerWithLogger:[_logger cloneWithPrefix:s]];
+        return fromNSString([_logger getPrefix]);
     }
-    @finally
+
+    id<ICELogger>
+    getLogger()
     {
-        [s release];
+        return _logger;
     }
-}
-
-virtual std::string
-getPrefix()
-{
-    return fromNSString([_logger getPrefix]);
-}
-
-id<ICELogger>
-getLogger()
-{
-    return _logger;
-}
 
 private:
 
-id<ICELogger> _logger;
+    id<ICELogger> _logger;
 
 };
 typedef IceUtil::Handle<LoggerWrapperI> LoggerWrapperIPtr;
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Makefile.mk zeroc-ice-3.7.2/objective-c/src/Ice/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/src/Ice/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    = IceObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ObjectAdapterI.h zeroc-ice-3.7.2/objective-c/src/Ice/ObjectAdapterI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/ObjectAdapterI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ObjectAdapterI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/ObjectAdapter.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ObjectAdapterI.mm zeroc-ice-3.7.2/objective-c/src/Ice/ObjectAdapterI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/ObjectAdapterI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ObjectAdapterI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ObjectAdapterI.h>
 #import <CommunicatorI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ObjectI.h zeroc-ice-3.7.2/objective-c/src/Ice/ObjectI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/ObjectI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ObjectI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Object.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Object.mm zeroc-ice-3.7.2/objective-c/src/Ice/Object.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/Object.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Object.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ObjectI.h>
 #import <StreamI.h>
@@ -337,26 +332,26 @@
 {
     return nil;
 }
--(BOOL) ice_isA:(NSString*)typeId current:(ICECurrent*)current
+-(BOOL) ice_isA:(NSString*)__unused typeId current:(ICECurrent*)__unused current
 {
     NSAssert(NO, @"ice_isA requires override");
     return nil;
 }
--(void) ice_ping:(ICECurrent*)current
+-(void) ice_ping:(ICECurrent*)__unused current
 {
     NSAssert(NO, @"ice_ping requires override");
 }
--(NSString*) ice_id:(ICECurrent*)current
+-(NSString*) ice_id:(ICECurrent*)__unused current
 {
     NSAssert(NO, @"ice_id requires override");
     return nil;
 }
--(NSArray*) ice_ids:(ICECurrent*)current
+-(NSArray*) ice_ids:(ICECurrent*)__unused current
 {
     NSAssert(NO, @"ice_ids requires override");
     return nil;
 }
--(void) ice_dispatch:(id<ICERequest>)request;
+-(void) ice_dispatch:(id<ICERequest>)__unused request
 {
     NSAssert(NO, @"ice_dispatch requires override");
 }
@@ -372,11 +367,11 @@
     *idx = 0;
     return ICEObject_ids;
 }
--(void) iceWrite:(id<ICEOutputStream>)os
+-(void) iceWrite:(id<ICEOutputStream>)__unused os
 {
     NSAssert(NO, @"iceWrite requires override");
 }
--(void) iceRead:(id<ICEInputStream>)is
+-(void) iceRead:(id<ICEInputStream>)__unused is
 {
     NSAssert(NO, @"iceRead requires override");
 }
@@ -435,24 +430,24 @@
     return [[[self alloc] initWithDelegate:delegate] autorelease];
 }
 
--(BOOL) ice_isA:(NSString*)typeId current:(ICECurrent*)current
+-(BOOL) ice_isA:(NSString*)typeId current:(ICECurrent*)__unused current
 {
     int count, index;
     NSString*const* staticIds = [[self class] iceStaticIds:&count idIndex:&index];
     return ICEInternalLookupString(staticIds, count, typeId) >= 0;
 }
 
--(void) ice_ping:(ICECurrent*)current
+-(void) ice_ping:(ICECurrent*)__unused current
 {
     // Nothing to do.
 }
 
--(NSString*) ice_id:(ICECurrent*)current
+-(NSString*) ice_id:(ICECurrent*)__unused current
 {
     return [[self class] ice_staticId];
 }
 
--(NSArray*) ice_ids:(ICECurrent*)current
+-(NSArray*) ice_ids:(ICECurrent*)__unused current
 {
     int count, index;
     NSString*const* staticIds = [[self class] iceStaticIds:&count idIndex:&index];
@@ -543,12 +538,12 @@
     [is endValue:NO];
 }
 
--(void) iceWriteImpl:(id<ICEOutputStream>)os
+-(void) iceWriteImpl:(id<ICEOutputStream>)__unused os
 {
     NSAssert(NO, @"iceWriteImpl requires override");
 }
 
--(void) iceReadImpl:(id<ICEInputStream>)is
+-(void) iceReadImpl:(id<ICEInputStream>)__unused is
 {
     NSAssert(NO, @"iceReadImpl requires override");
 }
@@ -652,7 +647,7 @@
         }
     }
 }
--(BOOL) ice_isA:(NSString*)typeId current:(ICECurrent*)current
+-(BOOL) ice_isA:(NSString*)typeId current:(ICECurrent*)__unused current
 {
     NSException* nsex = nil;
     try
@@ -665,7 +660,7 @@
     }
     @throw nsex;
 }
--(void) ice_ping:(ICECurrent*)current
+-(void) ice_ping:(ICECurrent*)__unused current
 {
     NSException* nsex = nil;
     try
@@ -678,7 +673,7 @@
     }
     @throw nsex;
 }
--(NSString*) ice_id:(ICECurrent*)current
+-(NSString*) ice_id:(ICECurrent*)__unused current
 {
     NSException* nsex = nil;
     try
@@ -691,7 +686,7 @@
     }
     @throw nsex;
 }
--(NSArray*) ice_ids:(ICECurrent*)current
+-(NSArray*) ice_ids:(ICECurrent*)__unused current
 {
     NSException* nsex = nil;
     try
@@ -704,7 +699,7 @@
     }
     @throw nsex;
 }
--(void) ice_dispatch:(id<ICERequest>)request
+-(void) ice_dispatch:(id<ICERequest>)__unused request
 {
     @throw [ICEFeatureNotSupportedException featureNotSupportedException:__FILE__ line:__LINE__];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/PropertiesI.h zeroc-ice-3.7.2/objective-c/src/Ice/PropertiesI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/PropertiesI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/PropertiesI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Properties.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/PropertiesI.mm zeroc-ice-3.7.2/objective-c/src/Ice/PropertiesI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/PropertiesI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/PropertiesI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <PropertiesI.h>
 #import <Util.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ProxyI.h zeroc-ice-3.7.2/objective-c/src/Ice/ProxyI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/ProxyI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ProxyI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Proxy.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Proxy.mm zeroc-ice-3.7.2/objective-c/src/Ice/Proxy.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/Proxy.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Proxy.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ProxyI.h>
 #import <Util.h>
@@ -186,7 +181,7 @@
 @implementation ICEAsyncResult
 -(ICEAsyncResult*) initWithAsyncResult:(const Ice::AsyncResultPtr&)arg
                                operation:(NSString*)op
-                                   proxy:(id<ICEObjectPrx>)p;
+                                   proxy:(id<ICEObjectPrx>)p
 {
     self = [super init];
     if(!self)
@@ -875,7 +870,7 @@
     }
 }
 
--(id) copyWithZone:(NSZone *)zone
+-(id) copyWithZone:(NSZone *)__unused zone
 {
     return [self retain];
 }
@@ -1489,7 +1484,7 @@
     return [ICEEncodingVersion encodingVersionWithEncodingVersion:OBJECTPRX->ice_getEncodingVersion()];
 }
 
--(id) ice_encodingVersion:(ICEEncodingVersion*)encoding;
+-(id) ice_encodingVersion:(ICEEncodingVersion*)encoding
 {
     return [[self class] iceObjectPrxWithObjectPrx:OBJECTPRX->ice_encodingVersion([encoding encodingVersion])];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Request.h zeroc-ice-3.7.2/objective-c/src/Ice/Request.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/Request.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Request.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Object.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Request.m zeroc-ice-3.7.2/objective-c/src/Ice/Request.m
--- zeroc-ice-3.7.1/objective-c/src/Ice/Request.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Request.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <Request.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/SlicedDataI.h zeroc-ice-3.7.2/objective-c/src/Ice/SlicedDataI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/SlicedDataI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/SlicedDataI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in
-// the ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/SlicedData.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/SlicedData.mm zeroc-ice-3.7.2/objective-c/src/Ice/SlicedData.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/SlicedData.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/SlicedData.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in
-// the ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <SlicedDataI.h>
 #import <Util.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/StreamI.h zeroc-ice-3.7.2/objective-c/src/Ice/StreamI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/StreamI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/StreamI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Stream.h>
 #import <objc/Ice/LocalObject.h>
@@ -24,8 +19,8 @@
     NSData* data_;
 }
 +(Ice::Object*)createObjectReader:(ICEObject*)obj;
--initWithCxxCommunicator:(Ice::Communicator*)com data:(const std::pair<const Byte*, const Byte*>&)data;
--initWithCommunicator:(id<ICECommunicator>)com data:(NSData*)data encoding:(ICEEncodingVersion*)e;
+-(id)initWithCxxCommunicator:(Ice::Communicator*)com data:(const std::pair<const Byte*, const Byte*>&)data;
+-(id)initWithCommunicator:(id<ICECommunicator>)com data:(NSData*)data encoding:(ICEEncodingVersion*)e;
 -(Ice::InputStream*) is;
 @end
 
@@ -35,8 +30,8 @@
     Ice::OutputStream stream_;
     std::map<ICEObject*, Ice::ObjectPtr>* objectWriters_;
 }
--initWithCxxCommunicator:(Ice::Communicator*)communicator;
--initWithCxxStream:(Ice::OutputStream*)stream;
--initWithCommunicator:(id<ICECommunicator>)com encoding:(ICEEncodingVersion*)e;
+-(id)initWithCxxCommunicator:(Ice::Communicator*)communicator;
+-(id)initWithCxxStream:(Ice::OutputStream*)stream;
+-(id)initWithCommunicator:(id<ICECommunicator>)com encoding:(ICEEncodingVersion*)e;
 -(Ice::OutputStream*) os;
 @end
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Stream.mm zeroc-ice-3.7.2/objective-c/src/Ice/Stream.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/Stream.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Stream.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <StreamI.h>
 #import <CommunicatorI.h>
@@ -352,7 +347,7 @@
 {
     ICENone = [[ICEInternalNone alloc] init];
 }
--(id) copyWithZone:(NSZone *)zone
+-(id) copyWithZone:(NSZone *)__unused zone
 {
     return self;
 }
@@ -2255,7 +2250,7 @@
     return nil; // Keep the compiler happy.
 }
 
--(void) reset:(BOOL)clearBuffer
+-(void) reset:(BOOL)__unused clearBuffer
 {
     NSException* nsex = nil;
     try
@@ -2332,7 +2327,7 @@
 @end
 
 @implementation ICEStreamHelper
-+(id) readRetained:(id<ICEInputStream>)stream
++(id) readRetained:(id<ICEInputStream>)__unused stream
 {
     NSAssert(NO, @"requires override");
     return nil;
@@ -2341,11 +2336,11 @@
 {
     return [[self readRetained:stream] autorelease];
 }
-+(void) write:(id)obj stream:(id<ICEOutputStream>)stream
++(void) write:(id)__unused obj stream:(id<ICEOutputStream>)__unused stream
 {
     NSAssert(NO, @"requires override");
 }
-+(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag
++(id) readOptionalRetained:(id<ICEInputStream>)__unused stream tag:(ICEInt)__unused tag
 {
     NSAssert(NO, @"requires override");
     return nil;
@@ -2355,7 +2350,7 @@
     return [[self readOptionalRetained:stream tag:tag] autorelease];
     return nil;
 }
-+(void) writeOptional:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag
++(void) writeOptional:(id)__unused obj stream:(id<ICEOutputStream>)__unused stream tag:(ICEInt)__unused tag
 {
     NSAssert(NO, @"requires override");
 }
@@ -2927,12 +2922,12 @@
 @end
 
 @implementation ICEDataSequenceHelper
-+(id) readRetained:(id<ICEInputStream>)stream
++(id) readRetained:(id<ICEInputStream>)__unused stream
 {
     NSAssert(NO, @"readRetained requires override");
     return nil;
 }
-+(void) write:(id)obj stream:(id<ICEOutputStream>)stream
++(void) write:(id)__unused obj stream:(id<ICEOutputStream>)__unused stream
 {
     NSAssert(NO, @"write requires override");
 }
@@ -3216,13 +3211,13 @@
 @end
 
 @implementation ICEObjectDictionaryHelper
-+(id) readRetained:(id<ICEInputStream>)stream
++(id) readRetained:(id<ICEInputStream>)__unused stream
 {
     NSAssert(NO, @"ICEObjectDictionaryHelper readRetained requires override");
     return nil;
 }
 
-+(void) write:(id)obj stream:(id<ICEOutputStream>)stream
++(void) write:(id)__unused obj stream:(id<ICEOutputStream>)__unused stream
 {
     NSAssert(NO, @"ICEObjectDictionaryHelper write requires override");
 }
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Util.h zeroc-ice-3.7.2/objective-c/src/Ice/Util.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <Foundation/NSException.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/Util.mm zeroc-ice-3.7.2/objective-c/src/Ice/Util.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/Util.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/Util.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <Util.h>
 #import <ExceptionI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ValueFactoryI.h zeroc-ice-3.7.2/objective-c/src/Ice/ValueFactoryI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/ValueFactoryI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ValueFactoryI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/ValueFactory.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/ValueFactoryI.mm zeroc-ice-3.7.2/objective-c/src/Ice/ValueFactoryI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/ValueFactoryI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/ValueFactoryI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/ObjectFactory.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/VersionI.h zeroc-ice-3.7.2/objective-c/src/Ice/VersionI.h
--- zeroc-ice-3.7.1/objective-c/src/Ice/VersionI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/VersionI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice/Version.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/Ice/VersionI.mm zeroc-ice-3.7.2/objective-c/src/Ice/VersionI.mm
--- zeroc-ice-3.7.1/objective-c/src/Ice/VersionI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/Ice/VersionI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <VersionI.h>
 #import <Util.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceGrid/Makefile.mk zeroc-ice-3.7.2/objective-c/src/IceGrid/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/src/IceGrid/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceGrid/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries            = IceGridObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceIAP/ConnectionInfoI.mm zeroc-ice-3.7.2/objective-c/src/IceIAP/ConnectionInfoI.mm
--- zeroc-ice-3.7.1/objective-c/src/IceIAP/ConnectionInfoI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceIAP/ConnectionInfoI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceIAP/ConnectionInfo.h>
 #import <ConnectionI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceIAP/EndpointInfoI.mm zeroc-ice-3.7.2/objective-c/src/IceIAP/EndpointInfoI.mm
--- zeroc-ice-3.7.1/objective-c/src/IceIAP/EndpointInfoI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceIAP/EndpointInfoI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceIAP/EndpointInfo.h>
 #import <EndpointI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceIAP/Makefile.mk zeroc-ice-3.7.2/objective-c/src/IceIAP/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/src/IceIAP/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceIAP/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries            = IceIAPObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceSSL/ConnectionInfoI.mm zeroc-ice-3.7.2/objective-c/src/IceSSL/ConnectionInfoI.mm
--- zeroc-ice-3.7.1/objective-c/src/IceSSL/ConnectionInfoI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceSSL/ConnectionInfoI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceSSL/ConnectionInfo.h>
 #import <ConnectionI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceSSL/EndpointInfoI.mm zeroc-ice-3.7.2/objective-c/src/IceSSL/EndpointInfoI.mm
--- zeroc-ice-3.7.1/objective-c/src/IceSSL/EndpointInfoI.mm	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceSSL/EndpointInfoI.mm	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/IceSSL/EndpointInfo.h>
 #import <EndpointI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceSSL/Makefile.mk zeroc-ice-3.7.2/objective-c/src/IceSSL/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/src/IceSSL/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceSSL/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries            = IceSSLObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/src/IceStorm/Makefile.mk zeroc-ice-3.7.2/objective-c/src/IceStorm/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/src/IceStorm/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/src/IceStorm/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries            = IceStormObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Common/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Common/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Common/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Common/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    = TestCommonObjC
 $(project)_caninstall   = no
diff -Nru zeroc-ice-3.7.1/objective-c/test/Common/TestCommon.m zeroc-ice-3.7.2/objective-c/test/Common/TestCommon.m
--- zeroc-ice-3.7.1/objective-c/test/Common/TestCommon.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Common/TestCommon.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_API_EXPORTS
 #   define TEST_API_EXPORTS
@@ -30,6 +25,7 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSObject.h>
 #import <Foundation/NSThread.h>
+#import <Foundation/NSLock.h>
 
 #include <objc/Ice.h>
 
@@ -39,6 +35,7 @@
 static SEL outputSelector;
 static id<ICECommunicator> communicator = nil;
 static NSString* protocol;
+static NSLock* mutex = nil;
 
 static BOOL sliced;
 static BOOL encoding10;
@@ -160,10 +157,25 @@
 #if TARGET_OS_IPHONE
 
 void
-TestCommonInit(id target, SEL output)
+TestCommonSetOutput(id target, SEL output)
 {
-    outputTarget = target;
-    outputSelector = output;
+    if(mutex == nil)
+    {
+        mutex = [NSLock new];
+    }
+    [mutex lock];
+    if(target != nil)
+    {
+        outputTarget = ICE_RETAIN(target);
+        outputSelector = output;
+    }
+    else
+    {
+        ICE_RELEASE(outputTarget);
+        outputTarget = nil;
+        outputSelector = nil;
+    }
+    [mutex unlock];
 }
 
 void
@@ -206,7 +218,13 @@
                                                                                       encoding:NSUTF8StringEncoding]
                                                          arguments:va]);
     va_end(va);
-    [outputTarget performSelectorOnMainThread:outputSelector withObject:s waitUntilDone:NO];
+
+    [mutex lock];
+    if(outputTarget != nil)
+    {
+        [outputTarget performSelectorOnMainThread:outputSelector withObject:s waitUntilDone:NO];
+    }
+    [mutex unlock];
 }
 
 void
@@ -235,7 +253,7 @@
 }
 
 void
-serverReady(id<ICECommunicator> c)
+serverReady(id<ICECommunicator>__unused c)
 {
 }
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/acm/ACMTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/acm/ACMTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/acm/ACMTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/acm/ACMTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/acm/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/acm/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/acm/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/acm/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -59,7 +54,7 @@
     }
     [_cond unlock];
 }
--(void) trace:(NSString*)category message:(NSString*)message
+-(void) trace:(NSString*)__unused category message:(NSString*)message
 {
     [_cond lock];
     [_messages addObject:message];
@@ -93,13 +88,13 @@
 {
     return [@"" mutableCopy];
 }
--(id<ICELogger>) cloneWithPrefix:(NSString*)prefix
+-(id<ICELogger>) cloneWithPrefix:(NSString*)__unused prefix
 {
     return self;
 }
 -(void) dump
 {
-    for(int i = 0; i < _messages.count; ++i)
+    for(size_t i = 0; i < _messages.count; ++i)
     {
         tprintf([_messages[i] UTF8String]);
     }
@@ -264,14 +259,14 @@
 
     @try
     {
-        [[proxy ice_getConnection] setCloseCallback:^(id<ICEConnection> connection)
+        [[proxy ice_getConnection] setCloseCallback:^(id<ICEConnection> __unused connection)
         {
             [self->_cond lock];
             self->_closed = YES;
             [self->_cond signal];
             [self->_cond unlock];
         }];
-        [[proxy ice_getConnection] setHeartbeatCallback:^(id<ICEConnection> connection)
+        [[proxy ice_getConnection] setHeartbeatCallback:^(id<ICEConnection> __unused connection)
         {
             [self->_cond lock];
             ++self->_heartbeat;
@@ -292,7 +287,7 @@
     return nil; // To keep compiler happy
 }
 
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)__unused proxy
 {
     NSAssert(NO, @"Subclasses need to overwrite this method");
 }
@@ -393,7 +388,7 @@
 {
       return @"invocation heartbeat";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)proxy
 {
     [proxy sleep:4];
 
@@ -456,7 +451,7 @@
 {
       return @"invocation with no heartbeat";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)proxy
 {
     @try
     {
@@ -503,7 +498,7 @@
 {
       return @"invocation with no heartbeat and close on idle";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)proxy
 {
     // No close on invocation, the call should succeed this time.
     [proxy sleep:3];
@@ -538,7 +533,7 @@
 {
       return @"close on idle";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)__unused proxy
 {
     [_cond lock];
     [_cond waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:3]]; // Idle for 3 seconds
@@ -575,7 +570,7 @@
 {
       return @"close on invocation";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)__unused proxy
 {
     [_cond lock];
     [_cond waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:3]]; // Idle for 3 seconds
@@ -611,7 +606,7 @@
 {
       return @"close on idle and invocation";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)__unused proxy
 {
     //
     // Put the adapter on hold. The server will not respond to
@@ -661,7 +656,7 @@
 {
       return @"forceful close on idle and invocation";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)__unused proxy
 {
     [adapter hold];
 
@@ -700,7 +695,7 @@
 {
       return @"heartbeat on idle";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)__unused proxy
 {
     [_cond lock];
     [_cond waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:3]];
@@ -735,7 +730,7 @@
 {
       return @"heartbeat always";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)proxy
 {
     for(int i = 0; i < 10; ++i)
     {
@@ -779,7 +774,7 @@
 {
       return @"manual heartbeats";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)__unused proxy
 {
     [proxy startHeartbeatCount];
     id<ICEConnection> con = [proxy ice_getConnection];
@@ -809,7 +804,7 @@
 {
       return @"setACM/getACM";
 }
--(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)adapter proxy:(id<TestACMTestIntfPrx>)proxy
+-(void) runTestCase:(id<TestACMRemoteObjectAdapterPrx>)__unused adapter proxy:(id<TestACMTestIntfPrx>)proxy
 {
     @try
     {
@@ -869,19 +864,19 @@
     [tests addObject:[HeartbeatManualTest testCase:com]];
     [tests addObject:[SetACMTest testCase:com]];
 
-    for(int i = 0; i < tests.count; ++i)
+    for(size_t i = 0; i < tests.count; ++i)
     {
         [tests[i] initialize];
     }
-    for(int i = 0; i < tests.count; ++i)
+    for(size_t i = 0; i < tests.count; ++i)
     {
         [tests[i] start];
     }
-    for(int i = 0; i < tests.count; ++i)
+    for(size_t i = 0; i < tests.count; ++i)
     {
         [tests[i] join];
     }
-    for(int i = 0; i < tests.count; ++i)
+    for(size_t i = 0; i < tests.count; ++i)
     {
         [tests[i] destroy];
     }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/acm/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/acm/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/acm/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/acm/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/acm/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/acm/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/acm/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/acm/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <acm/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/acm/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/acm/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/acm/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/acm/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <ACMTest.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/acm/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/acm/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/acm/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/acm/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <acm/TestI.h>
 
@@ -28,7 +23,7 @@
     [super dealloc];
 }
 #endif
--(void) heartbeat:(id<ICEConnection>)c
+-(void) heartbeat:(id<ICEConnection>)__unused connection
 {
     [_cond lock];
     ++_count;
@@ -115,19 +110,19 @@
 }
 #endif
 
--(id<TestACMTestIntfPrx>) getTestIntf:(ICECurrent*)current
+-(id<TestACMTestIntfPrx>) getTestIntf:(ICECurrent*)__unused current
 {
     return _testIntf;
 }
--(void) activate:(ICECurrent*)current
+-(void) activate:(ICECurrent*)__unused current
 {
     [_adapter activate];
 }
--(void) hold:(ICECurrent*)current
+-(void) hold:(ICECurrent*)__unused current
 {
     [_adapter hold];
 }
--(void) deactivate:(ICECurrent*)current
+-(void) deactivate:(ICECurrent*)__unused current
 {
     @try
     {
@@ -158,7 +153,7 @@
     [super dealloc];
 }
 #endif
--(void) sleep:(ICEInt)delay current:(ICECurrent*)current
+-(void) sleep:(ICEInt)delay current:(ICECurrent*)__unused current
 {
     [_cond lock];
     @try
@@ -183,13 +178,13 @@
         [_cond unlock];
     }
 }
--(void) interruptSleep:(ICECurrent*)current
+-(void) interruptSleep:(ICECurrent*)__unused current
 {
     [_cond lock];
     [_cond signal];
     [_cond unlock];
 }
--(void) startHeartbeatCount:(ICECurrent*)current
+-(void) startHeartbeatCount:(ICECurrent*) current
 {
     ACMConnectionCallbackI* callback = [ACMConnectionCallbackI new];
     _callback = callback;
@@ -198,7 +193,7 @@
         [callback heartbeat:c];
     }];
 }
--(void) waitForHeartbeatCount:(int)count current:(ICECurrent*)current
+-(void) waitForHeartbeatCount:(int)count current:(ICECurrent*)__unused current
 {
     [_callback waitForCount:count];
     ICE_RELEASE(_callback);
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <adapterDeactivation/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <adapterDeactivation/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <AdapterDeactivationTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/adapterDeactivation/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/adapterDeactivation/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <adapterDeactivation/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/admin/AdminTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/admin/AdminTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/admin/AdminTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/admin/AdminTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/admin/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/admin/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/admin/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/admin/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -127,7 +122,7 @@
     [super dealloc];
 }
 #endif
--(void) init:(NSString*)prefix logMessages:(ICEMutableLogMessageSeq*)logMessages current:(ICECurrent*)current
+-(void) init:(NSString*)prefix logMessages:(ICEMutableLogMessageSeq*)logMessages current:(ICECurrent*)__unused current
 {
     [_cond lock];
     @try
@@ -142,7 +137,7 @@
         [_cond unlock];
     }
 }
--(void) log:(ICELogMessage*)logMessage current:(ICECurrent*)current
+-(void) log:(ICELogMessage*)logMessage current:(ICECurrent*)__unused current
 {
     [_cond lock];
     @try
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/admin/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/admin/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/admin/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/admin/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/admin/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/admin/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/admin/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/admin/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = $(test-client-sources) TestI.m
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/admin/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/admin/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/admin/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/admin/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <admin/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/admin/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/admin/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/admin/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/admin/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <AdminTest.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/admin/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/admin/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/admin/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/admin/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <admin/TestI.h>
 
@@ -16,23 +11,23 @@
 @end
 
 @implementation NullLogger
--(void) print:(NSString*)message
+-(void) print:(NSString*)__unused message
 {
 }
--(void) trace:(NSString*)category message:(NSString*)message
+-(void) trace:(NSString*)__unused category message:(NSString*)__unused message
 {
 }
--(void) warning:(NSString*)message
+-(void) warning:(NSString*)__unused message
 {
 }
--(void) error:(NSString*)message
+-(void) error:(NSString*)__unused message
 {
 }
 -(NSMutableString*) getPrefix
 {
     return ICE_AUTORELEASE([@"NullLogger" mutableCopy]);
 }
--(id<ICELogger>) cloneWithPrefix:(NSString*)prefix
+-(id<ICELogger>) cloneWithPrefix:(NSString*)__unused prefix
 {
     return self;
 }
@@ -57,12 +52,12 @@
     [super dealloc];
 }
 #endif
--(id<ICEObjectPrx>) getAdmin:(ICECurrent*)current
+-(id<ICEObjectPrx>) getAdmin:(ICECurrent*)__unused current
 {
     return [_communicator getAdmin];
 }
 
--(ICEPropertyDict*) getChanges:(ICECurrent*)current
+-(ICEPropertyDict*) getChanges:(ICECurrent*)__unused current
 {
     [_cond lock];
     @try
@@ -86,27 +81,27 @@
         [_cond unlock];
     }
 }
--(void) print:(NSString*)message current:(ICECurrent*)current
+-(void) print:(NSString*)message current:(ICECurrent*)__unused current
 {
     [[_communicator getLogger] print:message];
 }
--(void) trace:(NSString*)category message:(NSString*)message current:(ICECurrent*)current
+-(void) trace:(NSString*)category message:(NSString*)message current:(ICECurrent*)__unused current
 {
     [[_communicator getLogger] trace:category message:message];
 }
--(void) warning:(NSString*)message current:(ICECurrent*)current
+-(void) warning:(NSString*)message current:(ICECurrent*)__unused current
 {
     [[_communicator getLogger] warning:message];
 }
--(void) error:(NSString*)message current:(ICECurrent*)current
+-(void) error:(NSString*)message current:(ICECurrent*)__unused current
 {
     [[_communicator getLogger] error:message];
 }
--(void) shutdown:(ICECurrent*)current
+-(void) shutdown:(ICECurrent*)__unused current
 {
     [_communicator shutdown];
 }
--(void) waitForShutdown:(ICECurrent*)current
+-(void) waitForShutdown:(ICECurrent*)__unused current
 {
     //
     // Note that we are executing in a thread of the *main* communicator,
@@ -114,7 +109,7 @@
     //
     [_communicator waitForShutdown];
 }
--(void) destroy:(ICECurrent*)current
+-(void) destroy:(ICECurrent*)__unused current
 {
     [_communicator destroy];
 }
@@ -187,7 +182,7 @@
 @end
 
 @implementation TestAdminTestFacetI
--(void) op:(ICECurrent*)current
+-(void) op:(ICECurrent*)__unused current
 {
 }
 @end
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/ami/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/ami/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/ami/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/ami/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -13,6 +8,23 @@
 
 #import <Foundation/Foundation.h>
 
+@interface TestAMIPingReplyI : TestAMIPingReply<TestAMIPingReply>
+{
+    BOOL _received;
+}
+@end
+
+@implementation TestAMIPingReplyI
+-(void) reply:(ICECurrent*)__unused current
+{
+    _received = YES;
+}
+-(BOOL) checkReceived
+{
+    return _received;
+}
+@end
+
 @interface TestAMICallback : NSObject
 {
     BOOL called;
@@ -150,7 +162,7 @@
     {
         TestAMICallback* cb = [TestAMICallback create];
         ICEContext* ctx = [NSDictionary dictionary];
-        void (^exCB)(ICEException*) = ^(ICEException* ex)
+        void (^exCB)(ICEException*) = ^(ICEException* __unused ex)
             {
                 test(NO);
             };
@@ -324,7 +336,7 @@
             [cb called];
         };
 
-        void (^isACB)(BOOL) = ICE_AUTORELEASE([ ^(BOOL ret) { test(NO); } copy ]);
+        void (^isACB)(BOOL) = ICE_AUTORELEASE([ ^(BOOL __unused ret) { test(NO); } copy ]);
         [i begin_ice_isA:@"dummy" response:isACB exception:exCB];
         [cb check];
         [i begin_ice_isA:@"dummy" context:ctx response:isACB exception:exCB];
@@ -336,13 +348,13 @@
         [i begin_ice_ping:ctx response:pingCB exception:exCB];
         [cb check];
 
-        void (^idCB)(NSString*) = ICE_AUTORELEASE([ ^(NSString* ret) { test(NO); } copy ]);
+        void (^idCB)(NSString*) = ICE_AUTORELEASE([ ^(NSString* __unused ret) { test(NO); } copy ]);
         [i begin_ice_id:idCB exception:exCB];
         [cb check];
         [i begin_ice_id:ctx response:idCB exception:exCB];
         [cb check];
 
-        void (^idsCB)(NSArray*) = ICE_AUTORELEASE([ ^(NSArray* ret) { test(NO); } copy ]);
+        void (^idsCB)(NSArray*) = ICE_AUTORELEASE([ ^(NSArray* __unused ret) { test(NO); } copy ]);
         [i begin_ice_ids:idsCB exception:exCB];
         [cb check];
         [i begin_ice_ids:ctx response:idsCB exception:exCB];
@@ -350,7 +362,7 @@
 
         if(!collocated)
         {
-            void (^conCB)(id<ICEConnection>) = ICE_AUTORELEASE([ ^(id<ICEConnection> ret) { test(NO); } copy ]);
+            void (^conCB)(id<ICEConnection>) = ICE_AUTORELEASE([ ^(id<ICEConnection> __unused ret) { test(NO); } copy ]);
             [i begin_ice_getConnection:conCB exception:exCB];
             [cb check];
         }
@@ -363,7 +375,7 @@
 
         @try
         {
-            [p begin_opWithResult:nil exception:^(ICEException* ex) { test(NO); }];
+            [p begin_opWithResult:nil exception:^(ICEException* __unused ex) { test(NO); }];
             test(NO);
         }
         @catch(NSException* ex)
@@ -377,11 +389,11 @@
     {
         TestAMICallback* cb = [TestAMICallback create];
         ICEContext* ctx = [NSDictionary dictionary];
-        void (^exCB)(ICEException*) = ^(ICEException* ex) {
+        void (^exCB)(ICEException*) = ^(ICEException* __unused ex) {
             test(NO);
         };
 
-        void (^sentCB)(BOOL) = ^(BOOL ss) { [cb called]; };
+        void (^sentCB)(BOOL) = ^(BOOL __unused ss) { [cb called]; };
 
         [p begin_ice_isA:@"test" response:nil exception:exCB sent:sentCB];
         [cb check];
@@ -417,19 +429,19 @@
         {
             @try
             {
-                TestAMICallback* cb = [TestAMICallback create];
+                TestAMICallback* cb2 = [TestAMICallback create];
                 while(true)
                 {
                     if(![[p begin_opWithPayload:seq response:nil exception:exCB sent:
-                                ^(BOOL ss) {
-                                   [cb called];
+                                ^(BOOL __unused ss) {
+                                   [cb2 called];
                                }] sentSynchronously])
                     {
-                        [cbs addObject:cb];
+                        [cbs addObject:cb2];
                         break;
                     }
-                    [cbs addObject:cb];
-                    cb = [TestAMICallback create];
+                    [cbs addObject:cb2];
+                    cb2 = [TestAMICallback create];
                 }
             }
             @catch(NSException* ex)
@@ -438,9 +450,9 @@
                 @throw ex;
             }
             [testController resumeAdapter];
-            for(TestAMICallback* cb in cbs)
+            for(TestAMICallback* cb2 in cbs)
             {
-                [cb check];
+                [cb2 check];
             }
         }
     }
@@ -509,7 +521,7 @@
                 }
             };
 
-        void (^exCB)(ICEException*) = ^(ICEException* ex)
+        void (^exCB)(ICEException*) = ^(ICEException* __unused ex)
             {
                 test(NO);
             };
@@ -518,8 +530,8 @@
         for(i = 0; i < 3; ++i)
         {
             void (^throwResponse)(void) = ^{ thrower(i); };
-            void (^throwEx)(ICEException*) = ^(ICEException* ex){ thrower(i); };
-            void (^throwSent)(BOOL) = ^(BOOL b){ thrower(i); };
+            void (^throwEx)(ICEException*) = ^(ICEException* __unused ex){ thrower(i); };
+            void (^throwSent)(BOOL) = ^(BOOL __unused b){ thrower(i); };
 
             [p begin_ice_ping:throwResponse exception:exCB];
             [cb check];
@@ -552,8 +564,8 @@
             test(![br isSent]);
             [b1 opBatch];
             TestAMICallback* cb = [TestAMICallback create];
-            id<ICEAsyncResult> r = [b1 begin_ice_flushBatchRequests:^(ICEException* ex) { test(NO); }
-                                                               sent:^(BOOL sentSynchronously) { [cb called]; }];
+            id<ICEAsyncResult> r = [b1 begin_ice_flushBatchRequests:^(ICEException* __unused ex) { test(NO); }
+                                                               sent:^(BOOL __unused sentSynchronously) { [cb called]; }];
             [cb check];
             test([r isSent]);
             test([r isCompleted]);
@@ -588,11 +600,11 @@
                 [b1 opBatch];
                 TestAMICallback* cb = [TestAMICallback create];
                 id<ICEAsyncResult> r = [[b1 ice_getConnection] begin_flushBatchRequests:ICECompressBatchBasedOnProxy
-                                            exception:^(ICEException* ex)
+                                            exception:^(ICEException* __unused ex)
                                                       {
                                                           test(NO);
                                                       }
-                                                 sent:^(BOOL sentSynchronously) { [cb called]; }];
+                                                 sent:^(BOOL __unused sentSynchronously) { [cb called]; }];
             [cb check];
                 test([r isSent]);
                 test([r isCompleted]);
@@ -609,8 +621,8 @@
                 [[b1 ice_getConnection] close:ICEConnectionCloseGracefullyWithWait];
                 TestAMICallback* cb = [TestAMICallback create];
                 id<ICEAsyncResult> r = [[b1 ice_getConnection] begin_flushBatchRequests:ICECompressBatchBasedOnProxy
-                                                        exception:^(ICEException* ex) { [cb called]; }
-                                                        sent:^(BOOL sentSynchronously) { test(NO); }];
+                                                        exception:^(ICEException* __unused ex) { [cb called]; }
+                                                        sent:^(BOOL __unused sentSynchronously) { test(NO); }];
                 [cb check];
                 test(![r isSent]);
                 test([r isCompleted]);
@@ -630,8 +642,8 @@
                 [b1 opBatch];
                 TestAMICallback* cb = [TestAMICallback create];
                 id<ICEAsyncResult> r = [communicator begin_flushBatchRequests:ICECompressBatchBasedOnProxy
-                                                           exception:^(ICEException* ex) { test(NO); }
-                                                                sent:^(BOOL sentSynchronously) { [cb called]; }];
+                                                           exception:^(ICEException* __unused ex) { test(NO); }
+                                                                sent:^(BOOL __unused sentSynchronously) { [cb called]; }];
                 [cb check];
                 test([r isSent]);
                 test([r isCompleted]);
@@ -648,8 +660,8 @@
                 [[b1 ice_getConnection] close:ICEConnectionCloseGracefullyWithWait];
                 TestAMICallback* cb = [TestAMICallback create];
                 id<ICEAsyncResult> r = [communicator begin_flushBatchRequests:ICECompressBatchBasedOnProxy
-                                                                 exception:^(ICEException* ex) { test(NO); }
-                                                                      sent:^(BOOL sentSynchronously) { [cb called]; }];
+                                                                 exception:^(ICEException* __unused ex) { test(NO); }
+                                                                      sent:^(BOOL __unused sentSynchronously) { [cb called]; }];
                 [cb check];
                 test([r isSent]);
                 test([r isCompleted]);
@@ -848,5 +860,19 @@
 
     tprintf("ok\n");
 
+    if([p ice_getConnection])
+    {
+        tprintf("testing bidir... ");
+        id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@""];
+        TestAMIPingReplyI* replyI = [TestAMIPingReplyI pingReply];
+        id<TestAMIPingReplyPrx> reply = [TestAMIPingReplyPrx uncheckedCast:[adapter addWithUUID:replyI]];
+        [adapter activate];
+
+        [[p ice_getConnection] setAdapter:adapter];
+        [p pingBiDir:reply];
+        test([replyI checkReceived]);
+        [adapter destroy];
+        tprintf("ok\n");
+    }
     [p shutdown];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/ami/AMITest.ice zeroc-ice-3.7.2/objective-c/test/Ice/ami/AMITest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/ami/AMITest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/ami/AMITest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -52,7 +47,7 @@
     bool supportsAMD();
     bool supportsFunctionalTests();
 
-    void pingBiDir(Ice::Identity id);
+    void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/ami/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/ami/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/ami/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/ami/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/ami/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/ami/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/ami/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/ami/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <ami/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/ami/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/ami/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/ami/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/ami/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <ami/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/ami/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/ami/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/ami/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/ami/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <AMITest.h>
 #import <Foundation/Foundation.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/ami/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/ami/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/ami/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/ami/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 
@@ -32,17 +27,17 @@
 }
 #endif
 
--(void) op:(ICECurrent*)current
+-(void) op:(ICECurrent*)__unused current
 {
 }
--(void) opWithPayload:(ICEMutableByteSeq*)data current:(ICECurrent*)current
+-(void) opWithPayload:(ICEMutableByteSeq*)__unused data current:(ICECurrent*)__unused current
 {
 }
--(int) opWithResult:(ICECurrent*)current
+-(int) opWithResult:(ICECurrent*)__unused current
 {
     return 15;
 }
--(void) opWithUE:(ICECurrent*)current
+-(void) opWithUE:(ICECurrent*)__unused current
 {
     @throw [TestAMITestIntfException testIntfException];
 }
@@ -51,14 +46,14 @@
 {
     [[current.adapter getCommunicator] shutdown];
 }
--(void) opBatch:(ICECurrent *)current
+-(void) opBatch:(ICECurrent *)__unused current
 {
     [_cond lock];
     ++_batchCount;
     [_cond signal];
     [_cond unlock];
 }
--(ICEInt) opBatchCount:(ICECurrent *)current
+-(ICEInt) opBatchCount:(ICECurrent *)__unused current
 {
     [_cond lock];
     @try
@@ -71,7 +66,7 @@
     }
     return 0;
 }
--(BOOL) waitForBatch:(ICEInt)count current:(ICECurrent *)current
+-(BOOL) waitForBatch:(ICEInt)count current:(ICECurrent *)__unused current
 {
     [_cond lock];
     @try
@@ -94,7 +89,7 @@
 {
     [current.con close:(ICEConnectionClose)mode];
 }
--(void) sleep:(ICEInt)delay current:(ICECurrent *)current
+-(void) sleep:(ICEInt)delay current:(ICECurrent *)__unused current
 {
     [_cond lock];
     @try
@@ -106,7 +101,7 @@
         [_cond unlock];
     }
 }
--(void) startDispatch:(ICECurrent*)current
+-(void) startDispatch:(ICECurrent*)__unused current
 {
     [_cond lock];
     _dispatching = YES;
@@ -122,30 +117,32 @@
         [_cond unlock];
     }
 }
--(void) finishDispatch:(ICECurrent*)current
+-(void) finishDispatch:(ICECurrent*)__unused current
 {
     [_cond lock];
     _dispatching = NO;
     [_cond signal];
     [_cond unlock];
 }
--(BOOL) supportsAMD:(ICECurrent *)current
+-(BOOL) supportsAMD:(ICECurrent *)__unused current
 {
     return NO;
 }
--(BOOL) supportsFunctionalTests:(ICECurrent *)current
+-(BOOL) supportsFunctionalTests:(ICECurrent *)__unused current
 {
     return NO;
 }
 
--(void) pingBiDir:(ICEIdentity*)id_ current:(ICECurrent *)current
+-(void) pingBiDir:(id<TestAMIPingReplyPrx>)reply current:(ICECurrent *)current
 {
-    [[TestAMIPingReplyPrx uncheckedCast:[current.con createProxy:id_]] reply];
+    reply = [reply ice_fixed:current.con];
+    id<ICEAsyncResult> result = [reply begin_reply];
+    [reply end_reply:result];
 }
 @end
 
 @implementation TestAMITestOuterInnerTestIntfI
--(int) op:(ICEInt)i j:(ICEInt*)j current:(ICECurrent*)current
+-(int) op:(ICEInt)i j:(ICEInt*)j current:(ICECurrent*)__unused current
 {
     *j = i;
     return i;
@@ -163,11 +160,11 @@
     _adapter = adapter;
     return self;
 }
--(void) holdAdapter:(ICECurrent*)current
+-(void) holdAdapter:(ICECurrent*)__unused current
 {
     [_adapter hold];
 }
--(void) resumeAdapter:(ICECurrent*)current
+-(void) resumeAdapter:(ICECurrent*)__unused current
 {
     [_adapter activate];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/binding/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/binding/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/binding/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/binding/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -98,7 +93,7 @@
     int length = 0;
     NSString* s = [proxy ice_toString];
     int index;
-    for(index = 0; index < [s length]; ++index)
+    for(index = 0; index < (int)[s length]; ++index)
     {
         unichar c = [s characterAtIndex:index];
         if(c == '"')
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/binding/BindingTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/binding/BindingTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/binding/BindingTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/binding/BindingTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/binding/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/binding/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/binding/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/binding/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/binding/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/binding/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/binding/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/binding/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <binding/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/binding/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/binding/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/binding/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/binding/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <BindingTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/binding/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/binding/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/binding/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/binding/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <binding/TestI.h>
@@ -32,7 +27,7 @@
     return [TestBindingRemoteObjectAdapterPrx uncheckedCast:[current.adapter addWithUUID:remote]];
 }
 
--(void) deactivateObjectAdapter:(id<TestBindingRemoteObjectAdapterPrx>)adapter current:(ICECurrent*)current
+-(void) deactivateObjectAdapter:(id<TestBindingRemoteObjectAdapterPrx>)adapter current:(ICECurrent*)__unused current
 {
     [adapter deactivate]; // Collocated call
 }
@@ -68,12 +63,12 @@
 }
 #endif
 
--(id<TestBindingTestIntfPrx>) getTestIntf:(ICECurrent*)current
+-(id<TestBindingTestIntfPrx>) getTestIntf:(ICECurrent*)__unused current
 {
     return testIntf_;
 }
 
--(void) deactivate:(ICECurrent*)current
+-(void) deactivate:(ICECurrent*)__unused current
 {
     @try
     {
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -96,7 +91,7 @@
     for(NSString* name in stringArray)
     {
         [identity setName:name];
-        id<TestDefaultServantMyObjectPrx> prx = [TestDefaultServantMyObjectPrx uncheckedCast:[oa createProxy:identity]];
+        prx = [TestDefaultServantMyObjectPrx uncheckedCast:[oa createProxy:identity]];
 
         @try
         {
@@ -130,7 +125,7 @@
     for(NSString* name in stringArray)
     {
         [identity setName:name];
-        id<TestDefaultServantMyObjectPrx> prx = [TestDefaultServantMyObjectPrx uncheckedCast:[oa createProxy:identity]];
+        prx = [TestDefaultServantMyObjectPrx uncheckedCast:[oa createProxy:identity]];
         [prx ice_ping];
         test([[prx getName] isEqualToString:name]);
     }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/DefaultServantTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/DefaultServantTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/DefaultServantTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = DefaultServantTest.ice Client.m TestI.m
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <DefaultServantTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultServant/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultServant/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <defaultServant/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultValue/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/defaultValue/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultValue/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultValue/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultValue/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/defaultValue/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultValue/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultValue/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -24,7 +19,7 @@
 #endif
 
 int
-main(int argc, char* argv[])
+main(int __unused argc, char* __unused argv[])
 {
 #ifdef ICE_STATIC_LIBS
     ICEregisterIceSSL(YES);
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/defaultValue/DefaultValueTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/defaultValue/DefaultValueTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/defaultValue/DefaultValueTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -46,7 +41,7 @@
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultClientProperties(&argc, argv);
             dispatch_queue_t queue = dispatch_queue_create("Dispatcher", DISPATCH_QUEUE_SERIAL);
-            initData.dispatcher = ^(id<ICEDispatcherCall> call, id<ICEConnection> con) {
+            initData.dispatcher = ^(id<ICEDispatcherCall> call, id<ICEConnection> __unused con) {
                 dispatch_sync(queue, ^ { [call run]; });
             };
 #if TARGET_OS_IPHONE
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <dispatcher/TestI.h>
@@ -63,7 +58,7 @@
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
             dispatch_queue_t queue = dispatch_queue_create("Dispatcher", DISPATCH_QUEUE_SERIAL);
-            initData.dispatcher = ^(id<ICEDispatcherCall> call, id<ICEConnection> con) {
+            initData.dispatcher = ^(id<ICEDispatcherCall> call, id<ICEConnection> __unused con) {
                 dispatch_sync(queue, ^ { [call run]; });
             };
 #if TARGET_OS_IPHONE
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/DispatcherTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/DispatcherTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/DispatcherTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/DispatcherTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <dispatcher/TestI.h>
@@ -64,7 +59,7 @@
             ICEInitializationData* initData = [ICEInitializationData initializationData];
             initData.properties = defaultServerProperties(&argc, argv);
             dispatch_queue_t queue = dispatch_queue_create("Dispatcher", DISPATCH_QUEUE_SERIAL);
-            initData.dispatcher = ^(id<ICEDispatcherCall> call, id<ICEConnection> con) {
+            initData.dispatcher = ^(id<ICEDispatcherCall> call, id<ICEConnection> __unused con) {
                 dispatch_sync(queue, ^ { [call run]; });
             };
 #if TARGET_OS_IPHONE
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <DispatcherTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/dispatcher/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/dispatcher/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <dispatcher/TestI.h>
@@ -13,14 +8,14 @@
 #import <Foundation/NSThread.h>
 
 @implementation TestDispatcherTestIntfI
--(void) op:(ICECurrent*)current
+-(void) op:(ICECurrent*)__unused current
 {
 }
--(void) sleep:(ICEInt)to current:(ICECurrent*)current
+-(void) sleep:(ICEInt)to current:(ICECurrent*)__unused current
 {
     [NSThread sleepForTimeInterval:to / 1000.0];
 }
--(void) opWithPayload:(ICEMutableByteSeq*)data current:(ICECurrent*)current
+-(void) opWithPayload:(ICEMutableByteSeq*)__unused data current:(ICECurrent*)__unused current
 {
 }
 -(void) shutdown:(ICECurrent*)current
@@ -40,11 +35,11 @@
     _adapter = adapter;
     return self;
 }
--(void) holdAdapter:(ICECurrent*)current
+-(void) holdAdapter:(ICECurrent*)__unused current
 {
     [_adapter hold];
 }
--(void) resumeAdapter:(ICECurrent*)current
+-(void) resumeAdapter:(ICECurrent*)__unused current
 {
     [_adapter activate];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/enums/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/enums/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/enums/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/enums/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/enums/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/enums/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/enums/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/enums/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/enums/EnumTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/enums/EnumTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/enums/EnumTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/enums/EnumTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/enums/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/enums/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/enums/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/enums/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <enums/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/enums/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/enums/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/enums/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/enums/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <EnumTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/enums/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/enums/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/enums/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/enums/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <enums/TestI.h>
@@ -18,49 +13,49 @@
     [[[current adapter] getCommunicator] shutdown];
 }
 
--(TestEnumByteEnum) opByte:(TestEnumByteEnum)b1 b2:(TestEnumByteEnum*)b2 current:(ICECurrent*)current
+-(TestEnumByteEnum) opByte:(TestEnumByteEnum)b1 b2:(TestEnumByteEnum*)b2 current:(ICECurrent*)__unused current
 {
     *b2 = b1;
     return b1;
 }
 
--(TestEnumShortEnum) opShort:(TestEnumShortEnum)s1 s2:(TestEnumShortEnum*)s2 current:(ICECurrent*)current
+-(TestEnumShortEnum) opShort:(TestEnumShortEnum)s1 s2:(TestEnumShortEnum*)s2 current:(ICECurrent*)__unused current
 {
     *s2 = s1;
     return s1;
 }
 
--(TestEnumIntEnum) opInt:(TestEnumIntEnum)i1 i2:(TestEnumIntEnum*)i2 current:(ICECurrent*)current
+-(TestEnumIntEnum) opInt:(TestEnumIntEnum)i1 i2:(TestEnumIntEnum*)i2 current:(ICECurrent*)__unused current
 {
     *i2 = i1;
     return i1;
 }
 
--(TestEnumSimpleEnum) opSimple:(TestEnumSimpleEnum)s1 s2:(TestEnumSimpleEnum*)s2 current:(ICECurrent*)current
+-(TestEnumSimpleEnum) opSimple:(TestEnumSimpleEnum)s1 s2:(TestEnumSimpleEnum*)s2 current:(ICECurrent*)__unused current
 {
     *s2 = s1;
     return s1;
 }
 
--(TestEnumByteEnumSeq*) opByteSeq:(TestEnumByteEnumSeq*)b1 b2:(TestEnumByteEnumSeq**)b2 current:(ICECurrent*)current
+-(TestEnumByteEnumSeq*) opByteSeq:(TestEnumByteEnumSeq*)b1 b2:(TestEnumByteEnumSeq**)b2 current:(ICECurrent*)__unused current
 {
     *b2 = b1;
     return b1;
 }
 
--(TestEnumShortEnumSeq*) opShortSeq:(TestEnumShortEnumSeq*)s1 s2:(TestEnumShortEnumSeq**)s2 current:(ICECurrent*)current
+-(TestEnumShortEnumSeq*) opShortSeq:(TestEnumShortEnumSeq*)s1 s2:(TestEnumShortEnumSeq**)s2 current:(ICECurrent*)__unused current
 {
     *s2 = s1;
     return s1;
 }
 
--(TestEnumIntEnumSeq*) opIntSeq:(TestEnumIntEnumSeq*)i1 i2:(TestEnumIntEnumSeq**)i2 current:(ICECurrent*)current
+-(TestEnumIntEnumSeq*) opIntSeq:(TestEnumIntEnumSeq*)i1 i2:(TestEnumIntEnumSeq**)i2 current:(ICECurrent*)__unused current
 {
     *i2 = i1;
     return i1;
 }
 
--(TestEnumSimpleEnumSeq*) opSimpleSeq:(TestEnumSimpleEnumSeq*)s1 s2:(TestEnumSimpleEnumSeq**)s2 current:(ICECurrent*)current
+-(TestEnumSimpleEnumSeq*) opSimpleSeq:(TestEnumSimpleEnumSeq*)s1 s2:(TestEnumSimpleEnumSeq**)s2 current:(ICECurrent*)__unused current
 {
     *s2 = s1;
     return s1;
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <exceptions/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/ExceptionsTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/ExceptionsTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/ExceptionsTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/ExceptionsTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <exceptions/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ExceptionsTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/exceptions/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/exceptions/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 
@@ -35,22 +30,22 @@
     [[current.adapter getCommunicator] shutdown];
 }
 
--(BOOL) supportsUndeclaredExceptions:(ICECurrent*)current
+-(BOOL) supportsUndeclaredExceptions:(ICECurrent*)__unused current
 {
     return YES;
 }
 
--(BOOL) supportsAssertException:(ICECurrent*)current
+-(BOOL) supportsAssertException:(ICECurrent*)__unused current
 {
     return NO;
 }
 
--(void) throwAasA:(ICEInt)a current:(ICECurrent*)current
+-(void) throwAasA:(ICEInt)a current:(ICECurrent*)__unused current
 {
     @throw [TestExceptionsA a:a];
 }
 
--(void) throwAorDasAorD:(ICEInt)a current:(ICECurrent*)current
+-(void) throwAorDasAorD:(ICEInt)a current:(ICECurrent*)__unused current
 {
     if(a > 0)
     {
@@ -62,57 +57,57 @@
     }
 }
 
--(void) throwBasA:(ICEInt)a b:(ICEInt)b current:(ICECurrent*)current
+-(void) throwBasA:(ICEInt)a b:(ICEInt)b current:(ICECurrent*)__unused current
 {
     [self throwBasB:a b:b current:current];
 }
 
--(void) throwCasA:(ICEInt)a b:(ICEInt)b c:(ICEInt) c current:(ICECurrent*)current
+-(void) throwCasA:(ICEInt)a b:(ICEInt)b c:(ICEInt) c current:(ICECurrent*)__unused current
 {
     [self throwCasC:a b:b c:c current:current];
 }
 
--(void) throwBasB:(ICEInt)a b:(ICEInt)b current:(ICECurrent*)current
+-(void) throwBasB:(ICEInt)a b:(ICEInt)b current:(ICECurrent*)__unused current
 {
     @throw [TestExceptionsB b:a bMem:b];
 }
 
--(void) throwCasB:(ICEInt)a b:(ICEInt)b c:(ICEInt)c current:(ICECurrent*)current
+-(void) throwCasB:(ICEInt)a b:(ICEInt)b c:(ICEInt)c current:(ICECurrent*)__unused current
 {
     [self throwCasC:a b:b c:c current:current];
 }
 
--(void) throwCasC:(ICEInt)a b:(ICEInt)b c:(ICEInt)c current:(ICECurrent*)current
+-(void) throwCasC:(ICEInt)a b:(ICEInt)b c:(ICEInt)c current:(ICECurrent*)__unused current
 {
     @throw [TestExceptionsC c:a bMem:b cMem:c];
 }
 
--(void) throwModA:(ICEInt)a a2:(ICEInt)a2 current:(ICECurrent*)current
+-(void) throwModA:(ICEInt)a a2:(ICEInt)a2 current:(ICECurrent*)__unused current
 {
     @throw [TestExceptionsModA a:a a2Mem:a2];
 }
 
--(void) throwUndeclaredA:(ICEInt)a current:(ICECurrent*)current
+-(void) throwUndeclaredA:(ICEInt)a current:(ICECurrent*)__unused current
 {
     @throw [TestExceptionsA a:a];
 }
 
--(void) throwUndeclaredB:(ICEInt)a b:(ICEInt)b current:(ICECurrent*)current
+-(void) throwUndeclaredB:(ICEInt)a b:(ICEInt)b current:(ICECurrent*)__unused current
 {
     @throw [TestExceptionsB b:a bMem:b];
 }
 
--(void) throwUndeclaredC:(ICEInt)a b:(ICEInt)b c:(ICEInt)c current:(ICECurrent*)current
+-(void) throwUndeclaredC:(ICEInt)a b:(ICEInt)b c:(ICEInt)c current:(ICECurrent*)__unused current
 {
     @throw [TestExceptionsC c:a bMem:b cMem:c];
 }
 
--(void) throwLocalException:(ICECurrent*)current
+-(void) throwLocalException:(ICECurrent*)__unused current
 {
     @throw [ICETimeoutException timeoutException:__FILE__ line:__LINE__];
 }
 
--(ICEByteSeq*) throwMemoryLimitException:(ICEMutableByteSeq*)bs current:(ICECurrent*)current
+-(ICEByteSeq*) throwMemoryLimitException:(ICEMutableByteSeq*)__unused bs current:(ICECurrent*)__unused current
 {
     int limit = 20 * 1024;
     ICEMutableByteSeq *r = [NSMutableData dataWithLength:limit];
@@ -124,25 +119,25 @@
     return r;
 }
 
--(void) throwNonIceException:(ICECurrent*)current
+-(void) throwNonIceException:(ICECurrent*)__unused current
 {
     @throw ICE_AUTORELEASE([[FooException alloc] init]);
 }
 
--(void) throwAssertException:(ICECurrent*)current
+-(void) throwAssertException:(ICECurrent*)__unused current
 {
     // Not supported.
 }
 
--(void) throwLocalExceptionIdempotent:(ICECurrent*)current
+-(void) throwLocalExceptionIdempotent:(ICECurrent*)__unused current
 {
     @throw [ICETimeoutException timeoutException:__FILE__ line:__LINE__];
 }
--(void) throwAfterResponse:(ICECurrent*)current
+-(void) throwAfterResponse:(ICECurrent*)__unused current
 {
     // Only relevant for AMD
 }
--(void) throwAfterException:(ICECurrent*)current
+-(void) throwAfterException:(ICECurrent*)__unused current
 {
     // Only relevant for AMD
     @throw [TestExceptionsA a:12345];
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/facets/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/facets/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/facets/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/facets/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/facets/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/facets/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/facets/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/facets/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/facets/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/facets/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/facets/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/facets/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <facets/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/facets/FacetsTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/facets/FacetsTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/facets/FacetsTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/facets/FacetsTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/facets/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/facets/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/facets/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/facets/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <facets/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/facets/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/facets/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/facets/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/facets/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <FacetsTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/facets/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/facets/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/facets/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/facets/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,76 +1,71 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <facets/TestI.h>
 
 @implementation TestFacetsAI
--(NSString*) callA:(ICECurrent*)current
+-(NSString*) callA:(ICECurrent*)__unused current
 {
     return @"A";
 }
 @end
 
 @implementation TestFacetsBI
--(NSString*) callA:(ICECurrent*)current
+-(NSString*) callA:(ICECurrent*)__unused current
 {
     return @"A";
 }
--(NSString*) callB:(ICECurrent*)current
+-(NSString*) callB:(ICECurrent*)__unused current
 {
     return @"B";
 }
 @end
 
 @implementation TestFacetsCI
--(NSString*) callA:(ICECurrent*)current
+-(NSString*) callA:(ICECurrent*)__unused current
 {
     return @"A";
 }
--(NSString*) callC:(ICECurrent*)current
+-(NSString*) callC:(ICECurrent*)__unused current
 {
     return @"C";
 }
 @end
 
 @implementation TestFacetsDI
--(NSString*) callA:(ICECurrent*)current
+-(NSString*) callA:(ICECurrent*)__unused current
 {
     return @"A";
 }
--(NSString*) callB:(ICECurrent*)current
+-(NSString*) callB:(ICECurrent*)__unused current
 {
     return @"B";
 }
--(NSString*) callC:(ICECurrent*)current
+-(NSString*) callC:(ICECurrent*)__unused current
 {
     return @"C";
 }
--(NSString*) callD:(ICECurrent*)current
+-(NSString*) callD:(ICECurrent*)__unused current
 {
     return @"D";
 }
 @end
 
 @implementation TestFacetsEI
--(NSString*) callE:(ICECurrent*)current
+-(NSString*) callE:(ICECurrent*)__unused current
 {
     return @"E";
 }
 @end
 
 @implementation TestFacetsFI
--(NSString*) callE:(ICECurrent*)current
+-(NSString*) callE:(ICECurrent*)__unused current
 {
     return @"E";
 }
--(NSString*) callF:(ICECurrent*)current
+-(NSString*) callF:(ICECurrent*)__unused current
 {
     return @"F";
 }
@@ -81,7 +76,7 @@
 {
     [[current.adapter getCommunicator] shutdown];
 }
--(NSString*) callG:(ICECurrent*)current
+-(NSString*) callG:(ICECurrent*)__unused current
 {
     return @"G";
 }
@@ -92,11 +87,11 @@
 {
     [[current.adapter getCommunicator] shutdown];
 }
--(NSString*) callG:(ICECurrent*)current
+-(NSString*) callG:(ICECurrent*)__unused current
 {
     return @"G";
 }
--(NSString*) callH:(ICECurrent*)current
+-(NSString*) callH:(ICECurrent*)__unused current
 {
     return @"H";
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -66,7 +61,7 @@
     [self called];
 }
 
--(void) pidException:(ICEException*)ex
+-(void) pidException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -79,7 +74,7 @@
     [self called];
 }
 
--(void) shutdownException:(ICEException*)ex
+-(void) shutdownException:(ICEException*)__unused ex
 {
     test(NO);
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <faultTolerance/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <FaultToleranceTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/faultTolerance/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/faultTolerance/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <faultTolerance/TestI.h>
@@ -18,17 +13,17 @@
     [[current.adapter getCommunicator] shutdown];
 }
 
--(void) abort:(ICECurrent*)current
+-(void) abort:(ICECurrent*)__unused current
 {
     exit(0);
 }
 
--(void) idempotentAbort:(ICECurrent*)current
+-(void) idempotentAbort:(ICECurrent*)__unused current
 {
     exit(0);
 }
 
--(ICEInt) pid:(ICECurrent*)current
+-(ICEInt) pid:(ICECurrent*)__unused current
 {
     return getpid();
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hash/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/hash/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/hash/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hash/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hash/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/hash/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/hash/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hash/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -24,7 +19,7 @@
 #endif
 
 int
-main(int argc, char* argv[])
+main(int __unused argc, char* __unused argv[])
 {
 #ifdef ICE_STATIC_LIBS
     ICEregisterIceSSL(YES);
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hash/HashTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/hash/HashTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/hash/HashTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hash/HashTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hold/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/hold/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/hold/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hold/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -123,20 +118,19 @@
     tprintf("ok\n");
 
     tprintf("changing state between active and hold rapidly... ");
-    int i;
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         [hold putOnHold:0];
     }
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         [[hold ice_oneway] putOnHold:0];
     }
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         [holdSerialized putOnHold:0];
     }
-    for(i = 0; i < 100; ++i)
+    for(int i = 0; i < 100; ++i)
     {
         [[holdSerialized ice_oneway] putOnHold:0];
     }
@@ -151,7 +145,7 @@
         {
             cb = ICE_AUTORELEASE([[AMICheckSetValue alloc] init:cond expected:value]);
             if([hold begin_set:++value delay:(random() % 5 + 1) response:^(ICEInt r) { [cb ice_response:r]; }
-                     exception:^(ICEException* ex) { [cb ice_exception:ex]; } sent:^(BOOL ss) { [cb ice_sent]; }])
+                     exception:^(ICEException* ex) { [cb ice_exception:ex]; } sent:^(BOOL __unused ss) { [cb ice_sent]; }])
             {
                 cb = 0;
             }
@@ -185,7 +179,7 @@
         {
             cb = ICE_AUTORELEASE([[AMICheckSetValue alloc] init:cond expected:value]);
             if([holdSerialized begin_set:++value delay:0 response:^(ICEInt r) { [cb ice_response:r]; }
-                     exception:^(ICEException* ex) { [cb ice_exception:ex]; } sent:^(BOOL ss) { [cb ice_sent]; }])
+                     exception:^(ICEException* ex) { [cb ice_exception:ex]; } sent:^(BOOL __unused ss) { [cb ice_sent]; }])
             {
                 cb = 0;
             }
@@ -204,11 +198,10 @@
             cb = 0;
         }
         test([cond value]);
-        int i;
 #if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
-        for(i = 0; i < 400; ++i)
+        for(int i = 0; i < 400; ++i)
 #else
-        for(i = 0; i < 20000; ++i)
+        for(int i = 0; i < 20000; ++i)
 #endif
         {
             [[holdSerialized ice_oneway] setOneway:(value + 1) expected:value];
@@ -225,7 +218,7 @@
     {
         [hold waitForHold];
         [hold waitForHold];
-        for(i = 0; i < 1000; ++i)
+        for(int i = 0; i < 1000; ++i)
         {
             [[hold ice_oneway] ice_ping];
             if((i % 20) == 0)
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hold/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/hold/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/hold/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hold/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hold/HoldTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/hold/HoldTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/hold/HoldTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hold/HoldTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hold/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/hold/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/hold/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hold/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <hold/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hold/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/hold/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/hold/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hold/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <HoldTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/hold/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/hold/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/hold/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/hold/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <hold/TestI.h>
@@ -111,7 +106,7 @@
         } timeout:0];
 }
 
--(ICEInt) set:(ICEInt)value delay:(ICEInt)delay current:(ICECurrent*)current
+-(ICEInt) set:(ICEInt)value delay:(ICEInt)delay current:(ICECurrent*)__unused current
 {
     [NSThread sleepForTimeInterval:delay / 1000.0];
     @synchronized(self)
@@ -123,7 +118,7 @@
     return 0;
 }
 
--(void) setOneway:(ICEInt)value expected:(ICEInt)expected current:(ICECurrent*)current
+-(void) setOneway:(ICEInt)value expected:(ICEInt)expected current:(ICECurrent*)__unused current
 {
     @synchronized(self)
     {
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/info/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/info/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/info/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/info/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <objc/IceSSL.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/info/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/info/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/info/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/info/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution..
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/info/InfoTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/info/InfoTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/info/InfoTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/info/InfoTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/info/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/info/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/info/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/info/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_dependencies = IceSSLObjC IceObjC TestCommonObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/info/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/info/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/info/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/info/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <info/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/info/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/info/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/info/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/info/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <InfoTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/info/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/info/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/info/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/info/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <objc/IceSSL.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <inheritance/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/InheritanceTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/InheritanceTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/InheritanceTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/InheritanceTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <inheritance/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <InheritanceTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/inheritance/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/inheritance/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,122 +1,117 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <inheritance/TestI.h>
 
 @implementation CAI
--(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 @end
 
 @implementation CBI
--(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBCBPrx>) cbop:(id<TestInheritanceMBCBPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBCBPrx>) cbop:(id<TestInheritanceMBCBPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 @end
 
 @implementation CCI
--(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBCBPrx>) cbop:(id<TestInheritanceMBCBPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBCBPrx>) cbop:(id<TestInheritanceMBCBPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMACCPrx>) ccop:(id<TestInheritanceMACCPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMACCPrx>) ccop:(id<TestInheritanceMACCPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 @end
 
 @implementation IAI
--(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 @end
 
 @implementation IB1I
--(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBIB1Prx>) ib1op:(id<TestInheritanceMBIB1Prx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBIB1Prx>) ib1op:(id<TestInheritanceMBIB1Prx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 @end
 
 @implementation IB2I
--(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBIB2Prx>) ib2op:(id<TestInheritanceMBIB2Prx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBIB2Prx>) ib2op:(id<TestInheritanceMBIB2Prx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 @end
 
 @implementation ICI
--(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBIB1Prx>) ib1op:(id<TestInheritanceMBIB1Prx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBIB1Prx>) ib1op:(id<TestInheritanceMBIB1Prx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBIB2Prx>) ib2op:(id<TestInheritanceMBIB2Prx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBIB2Prx>) ib2op:(id<TestInheritanceMBIB2Prx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMAICPrx>) icop:(id<TestInheritanceMAICPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMAICPrx>) icop:(id<TestInheritanceMAICPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 @end
 
 @implementation CDI
--(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMACAPrx>) caop:(id<TestInheritanceMACAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBCBPrx>) cbop:(id<TestInheritanceMBCBPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBCBPrx>) cbop:(id<TestInheritanceMBCBPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMACCPrx>) ccop:(id<TestInheritanceMACCPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMACCPrx>) ccop:(id<TestInheritanceMACCPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMACDPrx>) cdop:(id<TestInheritanceMACDPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMACDPrx>) cdop:(id<TestInheritanceMACDPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMAIAPrx>) iaop:(id<TestInheritanceMAIAPrx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBIB1Prx>) ib1op:(id<TestInheritanceMBIB1Prx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBIB1Prx>) ib1op:(id<TestInheritanceMBIB1Prx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
--(id<TestInheritanceMBIB2Prx>) ib2op:(id<TestInheritanceMBIB2Prx>)p current:(ICECurrent*)current
+-(id<TestInheritanceMBIB2Prx>) ib2op:(id<TestInheritanceMBIB2Prx>)p current:(ICECurrent*)__unused current
 {
     return p;
 }
@@ -146,42 +141,42 @@
     [[current.adapter getCommunicator] shutdown];
 }
 
--(id<TestInheritanceMACAPrx>) caop:(ICECurrent*)current
+-(id<TestInheritanceMACAPrx>) caop:(ICECurrent*)__unused current
 {
     return ca_;
 }
 
--(id<TestInheritanceMBCBPrx>) cbop:(ICECurrent*)current
+-(id<TestInheritanceMBCBPrx>) cbop:(ICECurrent*)__unused current
 {
     return cb_;
 }
 
--(id<TestInheritanceMACCPrx>) ccop:(ICECurrent*)current
+-(id<TestInheritanceMACCPrx>) ccop:(ICECurrent*)__unused current
 {
     return cc_;
 }
 
--(id<TestInheritanceMACDPrx>) cdop:(ICECurrent*)current
+-(id<TestInheritanceMACDPrx>) cdop:(ICECurrent*)__unused current
 {
     return cd_;
 }
 
--(id<TestInheritanceMAIAPrx>) iaop:(ICECurrent*)current
+-(id<TestInheritanceMAIAPrx>) iaop:(ICECurrent*)__unused current
 {
     return ia_;
 }
 
--(id<TestInheritanceMBIB1Prx>) ib1op:(ICECurrent*)current
+-(id<TestInheritanceMBIB1Prx>) ib1op:(ICECurrent*)__unused current
 {
     return ib1_;
 }
 
--(id<TestInheritanceMBIB2Prx>) ib2op:(ICECurrent*)current
+-(id<TestInheritanceMBIB2Prx>) ib2op:(ICECurrent*)__unused current
 {
     return ib2_;
 }
 
--(id<TestInheritanceMAICPrx>) icop:(ICECurrent*)current
+-(id<TestInheritanceMAICPrx>) icop:(ICECurrent*)__unused current
 {
     return ic_;
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/InterceptorI.h zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/InterceptorI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/InterceptorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/InterceptorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/InterceptorI.m zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/InterceptorI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/InterceptorI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/InterceptorI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <interceptor/InterceptorI.h>
 #import <InterceptorTest.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/InterceptorTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/InterceptorTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/InterceptorTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/InterceptorTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = InterceptorTest.ice Client.m InterceptorI.m MyObjectI.m
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/MyObjectI.h zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/MyObjectI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/MyObjectI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/MyObjectI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <InterceptorTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/MyObjectI.m zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/MyObjectI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/interceptor/MyObjectI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/interceptor/MyObjectI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <interceptor/MyObjectI.h>
 #import <TestCommon.h>
 
 @implementation TestInterceptorMyObjectI
--(int) add:(int)x y:(int)y current:(ICECurrent*)current
+-(int) add:(int)x y:(int)y current:(ICECurrent*)__unused current
 {
     return x + y;
 }
@@ -28,17 +23,17 @@
     return x + y;
 }
 
--(int) badAdd:(int)x y:(int)y current:(ICECurrent*)current
+-(int) badAdd:(int)__unused x y:(int)__unused y current:(ICECurrent*)__unused current
 {
     @throw [TestInterceptorInvalidInputException invalidInputException];
 }
 
--(int) notExistAdd:(int)x y:(int)y current:(ICECurrent*)current
+-(int) notExistAdd:(int)__unused x y:(int)__unused y current:(ICECurrent*)__unused current
 {
     @throw [ICEObjectNotExistException objectNotExistException:__FILE__ line:__LINE__];
 }
 
--(int) badSystemAdd:(int)x y:(int)y current:(ICECurrent*)current
+-(int) badSystemAdd:(int)__unused x y:(int)__unused y current:(ICECurrent*)__unused current
 {
     @throw [ICEInitializationException initializationException:__FILE__ line:__LINE__ reason:@"testing"];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/invoke/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/invoke/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/invoke/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/invoke/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -233,8 +228,8 @@
 
         TestInvokeCallback* cb = [[TestInvokeCallback alloc] initWithCommunicator:communicator];
         [cl begin_ice_invoke:@"opString" mode:ICENormal inEncaps:inEncaps
-            response:^(BOOL ok, NSMutableData* outEncaps) { [cb opString:ok outEncaps:outEncaps]; }
-            exception:^(ICEException* ex) { test(NO); }];
+            response:^(BOOL ok, NSMutableData* outEncapsP) { [cb opString:ok outEncaps:outEncapsP]; }
+            exception:^(ICEException* __unused ex) { test(NO); }];
         [cb check];
         ICE_RELEASE(cb);
     }
@@ -271,7 +266,7 @@
         TestInvokeCallback* cb = [[TestInvokeCallback alloc] initWithCommunicator:communicator];
         [cl begin_ice_invoke:@"opException" mode:ICENormal inEncaps:inEncaps
             response:^(BOOL ok, NSMutableData* outP) { [cb opException:ok outEncaps:outP]; }
-            exception:^(ICEException* ex) { test(NO); }];
+            exception:^(ICEException* __unused ex) { test(NO); }];
         [cb check];
         ICE_RELEASE(cb);
     }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/invoke/BlobjectI.h zeroc-ice-3.7.2/objective-c/test/Ice/invoke/BlobjectI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/invoke/BlobjectI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/invoke/BlobjectI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <InvokeTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/invoke/BlobjectI.m zeroc-ice-3.7.2/objective-c/test/Ice/invoke/BlobjectI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/invoke/BlobjectI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/invoke/BlobjectI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <invoke/BlobjectI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/invoke/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/invoke/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/invoke/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/invoke/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/invoke/InvokeTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/invoke/InvokeTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/invoke/InvokeTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/invoke/InvokeTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/invoke/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/invoke/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/invoke/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/invoke/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_sources  = InvokeTest.ice Server.m BlobjectI.m
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/invoke/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/invoke/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/invoke/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/invoke/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <invoke/BlobjectI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/location/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -17,7 +12,7 @@
 @end
 
 @implementation DummyHelloI
--(void) sayHello:(ICECurrent*)current
+-(void) sayHello:(ICECurrent*)__unused current
 {
     // Do nothing, this is just a dummy servant.
 }
@@ -255,15 +250,17 @@
 
     tprintf("testing locator cache timeout... ");
 
+    id<ICEObjectPrx> basencc = [[communicator stringToProxy:@"test@TestAdapter"] ice_connectionCached:NO];
+
     int count = [locator getRequestCount];
-    [[[communicator stringToProxy:@"test@TestAdapter"] ice_locatorCacheTimeout:0] ice_ping]; // No locator cache.
+    [[basencc ice_locatorCacheTimeout:0] ice_ping]; // No locator cache.
     test(++count == [locator getRequestCount]);
-    [[[communicator stringToProxy:@"test@TestAdapter"] ice_locatorCacheTimeout:0] ice_ping]; // No locator cache.
+    [[basencc ice_locatorCacheTimeout:0] ice_ping]; // No locator cache.
     test(++count == [locator getRequestCount]);
-    [[[communicator stringToProxy:@"test@TestAdapter"] ice_locatorCacheTimeout:1] ice_ping]; // 1s timeout.
+    [[basencc ice_locatorCacheTimeout:1] ice_ping]; // 1s timeout.
     test(count == [locator getRequestCount]);
     [NSThread sleepForTimeInterval:1.2];
-    [[[communicator stringToProxy:@"test@TestAdapter"] ice_locatorCacheTimeout:1] ice_ping]; // 1s timeout.
+    [[basencc ice_locatorCacheTimeout:1] ice_ping]; // 1s timeout.
     test(++count == [locator getRequestCount]);
 
     [[[communicator stringToProxy:@"test"] ice_locatorCacheTimeout:0] ice_ping]; // No locator cache.
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/location/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/LocationTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/location/LocationTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/LocationTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/LocationTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/location/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_sources  = LocationTest.ice ServerLocator.m Server.m TestI.m
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/ServerLocator.h zeroc-ice-3.7.2/objective-c/test/Ice/location/ServerLocator.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/ServerLocator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/ServerLocator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <LocationTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/ServerLocator.m zeroc-ice-3.7.2/objective-c/test/Ice/location/ServerLocator.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/ServerLocator.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/ServerLocator.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <location/ServerLocator.h>
@@ -32,7 +27,7 @@
 }
 #endif
 
--(void) setAdapterDirectProxy:(NSMutableString *)adapter proxy:(id<ICEObjectPrx>)proxy current:(ICECurrent *)current
+-(void) setAdapterDirectProxy:(NSMutableString *)adapter proxy:(id<ICEObjectPrx>)proxy current:(ICECurrent *)__unused current
 {
     if(proxy == nil)
     {
@@ -46,7 +41,7 @@
 -(void) setReplicatedAdapterDirectProxy:(NSMutableString *)adapterId
                          replicaGroupId:(NSMutableString *)replicaGroupId
                                       p:(id<ICEObjectPrx>)p
-                                current:(ICECurrent *)current
+                                current:(ICECurrent *)__unused current
 {
     if(p == nil)
     {
@@ -59,10 +54,10 @@
         [adapters_ setObject:p forKey:replicaGroupId];
     }
 }
--(void) setServerProcessProxy:(NSMutableString *)id_ proxy:(id<ICEProcessPrx>)proxy current:(ICECurrent *)current
+-(void) setServerProcessProxy:(NSMutableString *)__unused id_ proxy:(id<ICEProcessPrx>)__unused proxy current:(ICECurrent *)__unused current
 {
 }
--(void) addObject:(id<ICEObjectPrx>)object current:(ICECurrent*)current
+-(void) addObject:(id<ICEObjectPrx>)object current:(ICECurrent*)__unused current
 {
     [self addObject:object];
 }
@@ -103,7 +98,7 @@
     requestCount_ = 0;
     return self;
 }
--(id<ICEObjectPrx>) findObjectById:(ICEIdentity *)id_ current:(ICECurrent *)current
+-(id<ICEObjectPrx>) findObjectById:(ICEIdentity *)id_ current:(ICECurrent *)__unused current
 {
     ++requestCount_;
     return [registry_ getObject:id_];
@@ -118,11 +113,11 @@
     }
     return [registry_ getAdapter:id_];
 }
--(id<ICELocatorRegistryPrx>) getRegistry:(ICECurrent *)current
+-(id<ICELocatorRegistryPrx>) getRegistry:(ICECurrent *)__unused current
 {
     return registryPrx_;
 }
--(int) getRequestCount:(ICECurrent*)current
+-(int) getRequestCount:(ICECurrent*)__unused current
 {
     return requestCount_;
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/location/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <location/ServerLocator.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/location/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <LocationTest.h>
 #import <location/ServerLocator.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/location/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/location/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/location/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/location/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <location/TestI.h>
@@ -43,7 +38,7 @@
 {
     return [NSString stringWithFormat:@"default -p %d", 12010 + port];
 }
--(void) startServer:(ICECurrent*)current
+-(void) startServer:(ICECurrent*)__unused current
 {
     for(id<ICECommunicator> c in communicators_)
     {
@@ -157,22 +152,22 @@
 }
 #endif
 
--(void) shutdown:(ICECurrent*)current
+-(void) shutdown:(ICECurrent*)__unused current
 {
     [[adapter1_ getCommunicator] shutdown];
 }
 
--(id<TestLocationHelloPrx>) getHello:(ICECurrent*)current
+-(id<TestLocationHelloPrx>) getHello:(ICECurrent*)__unused current
 {
     return [TestLocationHelloPrx uncheckedCast:[adapter1_ createIndirectProxy:[ICEUtil stringToIdentity:@"hello"]]];
 }
 
--(id<TestLocationHelloPrx>) getReplicatedHello:(ICECurrent*)current
+-(id<TestLocationHelloPrx>) getReplicatedHello:(ICECurrent*)__unused current
 {
     return [TestLocationHelloPrx uncheckedCast:[adapter1_ createProxy:[ICEUtil stringToIdentity:@"hello"]]];
 }
 
--(void) migrateHello:(ICECurrent*)current
+-(void) migrateHello:(ICECurrent*)__unused current
 {
     ICEIdentity* ident = [ICEUtil stringToIdentity:@"hello"];
     @try
@@ -187,7 +182,7 @@
 @end
 
 @implementation HelloI
--(void) sayHello:(ICECurrent*)current
+-(void) sayHello:(ICECurrent*)__unused current
 {
 }
 @end
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/metrics/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/metrics/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/metrics/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/metrics/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -53,7 +48,7 @@
     [cond unlock];
 }
 
--(void) updated:(ICEMutablePropertyDict*)properties
+-(void) updated:(ICEMutablePropertyDict*)__unused properties
 {
     [cond lock];
     updated = YES;
@@ -118,7 +113,7 @@
     [cond unlock];
 }
 
--(void) exception:(ICEException*)exception
+-(void) exception:(ICEException*)__unused exception
 {
     [self response];
 }
@@ -262,12 +257,12 @@
 {
     ICEMutablePropertyDict* props = [p getPropertiesForPrefix:@"IceMX.Metrics"];
     ICEPropertyDict* cprops = ICE_AUTORELEASE([props copy]);
-    [cprops enumerateKeysAndObjectsUsingBlock: ^(id key, id obj, BOOL *stop)
+    [cprops enumerateKeysAndObjectsUsingBlock: ^(id key, id __unused obj, BOOL* __unused stop)
         {
             [props setObject:@"" forKey:key];
         }];
 
-    [orig enumerateKeysAndObjectsUsingBlock: ^(id key, id obj, BOOL *stop)
+    [orig enumerateKeysAndObjectsUsingBlock: ^(id key, id obj, BOOL* __unused stop)
         {
             [props setObject:obj forKey:key];
         }];
@@ -293,12 +288,12 @@
 {
     ICEMutablePropertyDict* props = [p getPropertiesForPrefix:@"IceMX.Metrics"];
     ICEPropertyDict* sprops = ICE_AUTORELEASE([props copy]);
-    [sprops enumerateKeysAndObjectsUsingBlock: ^(id key, id obj, BOOL *stop)
+    [sprops enumerateKeysAndObjectsUsingBlock: ^(id key, id __unused obj, BOOL* __unused stop)
         {
             [props setObject:@"" forKey:key];
         }];
 
-    [orig enumerateKeysAndObjectsUsingBlock: ^(id key, id obj, BOOL *stop)
+    [orig enumerateKeysAndObjectsUsingBlock: ^(id key, id __unused obj, BOOL* __unused stop)
         {
             [props setObject:obj forKey:key];
         }];
@@ -566,9 +561,9 @@
     sm2 = getServerConnectionMetrics(serverMetrics, sm1.sentBytes + replySz);
 
     // 4 is for the seq variable size
-    test(cm2.sentBytes - cm1.sentBytes == requestSz + [bs length] + 4);
+    test(cm2.sentBytes - cm1.sentBytes == requestSz + (ICELong)[bs length] + 4);
     test(cm2.receivedBytes - cm1.receivedBytes == replySz);
-    test(sm2.receivedBytes - sm1.receivedBytes == requestSz + [bs length] + 4);
+    test(sm2.receivedBytes - sm1.receivedBytes == requestSz + (ICELong)[bs length] + 4);
     test(sm2.sentBytes - sm1.sentBytes == replySz);
 
     cm1 = cm2;
@@ -582,9 +577,9 @@
     sm2 = getServerConnectionMetrics(serverMetrics, sm1.sentBytes + replySz);
 
     // 4 is for the seq variable size
-    test(cm2.sentBytes - cm1.sentBytes == requestSz + [bs length] + 4);
+    test(cm2.sentBytes - cm1.sentBytes == requestSz + (ICELong)[bs length] + 4);
     test(cm2.receivedBytes - cm1.receivedBytes == replySz);
-    test(sm2.receivedBytes - sm1.receivedBytes == requestSz + [bs length] + 4);
+    test(sm2.receivedBytes - sm1.receivedBytes == requestSz + (ICELong)[bs length] + 4);
     test(sm2.sentBytes - sm1.sentBytes == replySz);
 
     [props setObject:@"state" forKey:@"IceMX.Metrics.View.Map.Connection.GroupBy"];
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/metrics/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/metrics/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/metrics/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/metrics/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/metrics/MetricsTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/metrics/MetricsTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/metrics/MetricsTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/metrics/MetricsTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/metrics/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/metrics/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/metrics/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/metrics/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <metrics/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/metrics/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/metrics/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/metrics/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/metrics/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <MetricsTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/metrics/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/metrics/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/metrics/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/metrics/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <metrics/TestI.h>
@@ -18,7 +13,7 @@
     return self;
 }
 
--(void) op:(ICECurrent*)current
+-(void) op:(ICECurrent*)__unused current
 {
 }
 
@@ -27,27 +22,27 @@
     [current.con close:ICEConnectionCloseForcefully];
 }
 
--(void) opWithUserException:(ICECurrent*)current
+-(void) opWithUserException:(ICECurrent*)__unused current
 {
     @throw [TestMetricsUserEx userEx];
 }
 
--(void) opWithRequestFailedException:(ICECurrent*)current
+-(void) opWithRequestFailedException:(ICECurrent*)__unused current
 {
     @throw [ICEObjectNotExistException objectNotExistException:__FILE__ line:__LINE__];
 }
 
--(void) opWithLocalException:(ICECurrent*)current
+-(void) opWithLocalException:(ICECurrent*)__unused current
 {
     @throw [ICESyscallException syscallException:__FILE__ line:__LINE__];
 }
 
--(void) opWithUnknownException:(ICECurrent*)current
+-(void) opWithUnknownException:(ICECurrent*)__unused current
 {
     @throw @"TEST";
 }
 
--(void) opByteS:(ICEByteSeq*)bs current:(ICECurrent*)current
+-(void) opByteS:(ICEByteSeq*)__unused bs current:(ICECurrent*)__unused current
 {
 }
 
@@ -81,13 +76,13 @@
 }
 #endif
 
--(void) hold:(ICECurrent*)current
+-(void) hold:(ICECurrent*)__unused current
 {
     [adapter hold];
     [adapter waitForHold];
 }
 
--(void) resume:(ICECurrent*)current
+-(void) resume:(ICECurrent*)__unused current
 {
     [adapter activate];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/objects/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -52,17 +47,17 @@
 }
 
 @interface TestObjectsAbstractBaseI : TestObjectsAbstractBase<TestObjectsAbstractBase>
--(void) op:(ICECurrent *)current;
+-(void) op:(ICECurrent *)__unused current;
 @end
 
 @implementation TestObjectsAbstractBaseI
--(void) op:(ICECurrent *)current;
+-(void) op:(ICECurrent *)__unused current
 {
 }
 @end
 
 id<TestObjectsInitialPrx>
-objectsAllTests(id<ICECommunicator> communicator, BOOL collocated)
+objectsAllTests(id<ICECommunicator> communicator, BOOL __unused collocated)
 {
     tprintf("testing stringToProxy... ");
     NSString* ref = @"initial:default -p 12010";
@@ -247,6 +242,42 @@
     }
     tprintf("ok\n");
 
+    tprintf("getting K... ");
+    {
+        TestObjectsK* k = (TestObjectsK*)[initial getK];
+        TestObjectsL* l = (TestObjectsL*)k.value;
+        test([l.data isEqualToString:@"l"]);
+    }
+    tprintf("ok\n");
+
+    tprintf("testing Value as parameter... ");
+    {
+        TestObjectsL* v1 = [[TestObjectsL alloc] init:@"l"];
+        ICEObject* v2;
+        TestObjectsL* v3 = (TestObjectsL*)[initial opValue:v1 v2:&v2];
+        test([v3.data isEqualToString:@"l"]);
+        test([((TestObjectsL*)v2).data isEqualToString:@"l"]);
+    }
+
+    {
+        TestObjectsL* l = [[TestObjectsL alloc] init:@"l"];
+        NSArray* v1 = @[l];
+        NSMutableArray* v2;
+        NSArray* v3 = [initial opValueSeq:v1 v2:&v2];
+        test([((TestObjectsL*)v3[0]).data isEqualToString:@"l"]);
+        test([((TestObjectsL*)v2[0]).data isEqualToString:@"l"]);
+    }
+
+    {
+        TestObjectsL* l = [[TestObjectsL alloc] init:@"l"];
+        NSDictionary* v1 = @{@"l" : l};
+        NSMutableDictionary* v2;
+        NSDictionary* v3 = [initial opValueMap:v1 v2:&v2];
+        test([((TestObjectsL*)v3[@"l"]).data isEqualToString:@"l"]);
+        test([((TestObjectsL*)v2[@"l"]).data isEqualToString:@"l"]);
+    }
+    tprintf("ok\n");
+
     tprintf("setting I... ");
     [initial setI:i];
     [initial setI:j];
@@ -443,8 +474,8 @@
         TestObjectsMutableBasePrxSeq* seq = [TestObjectsMutableBasePrxSeq array];
 
         [seq addObject:[NSNull null]];
-        NSString* ref = @"base:default -p 12010";
-        id<ICEObjectPrx> base = [communicator stringToProxy:ref];
+        ref = @"base:default -p 12010";
+        base = [communicator stringToProxy:ref];
         id<TestObjectsBasePrx> b = [TestObjectsBasePrx uncheckedCast:base];
         [seq addObject:b];
 
@@ -507,7 +538,7 @@
         TestObjectsMutableObjectPrxDict* dict = [TestObjectsMutableObjectPrxDict dictionary];
 
         [dict setObject:[NSNull null] forKey:@"zero"];
-        NSString* ref = @"object:default -p 12010";
+        ref = @"object:default -p 12010";
         id<ICEObjectPrx> o = [communicator stringToProxy:ref];
         [dict setObject:o forKey:@"one"];
 
@@ -570,8 +601,8 @@
         TestObjectsMutableBasePrxDict* dict = [TestObjectsMutableBasePrxDict dictionary];
 
         [dict setObject:[NSNull null] forKey:@"zero"];
-        NSString* ref = @"base:default -p 12010";
-        id<ICEObjectPrx> base = [communicator stringToProxy:ref];
+        ref = @"base:default -p 12010";
+        base = [communicator stringToProxy:ref];
         id<TestObjectsBasePrx> b = [TestObjectsBasePrx uncheckedCast:base];
         [dict setObject:b forKey:@"one"];
 
@@ -604,14 +635,14 @@
 
     @try
     {
-        NSString* ref = @"test:default -p 12010";
-        id<TestObjectsTestIntfPrx> p = [TestObjectsTestIntfPrx checkedCast:[communicator stringToProxy:ref]];
+        ref = @"test:default -p 12010";
+        id<TestObjectsTestIntfPrx> q = [TestObjectsTestIntfPrx checkedCast:[communicator stringToProxy:ref]];
 
         {
                tprintf("testing getting ObjectFactory registration... ");
-               TestObjectsBase *base = [p opDerived];
-               test(base);
-               test([[base ice_id] isEqualToString:@"::Test::Derived"]);
+               TestObjectsBase *base2 = [q opDerived];
+               test(base2);
+               test([[base2 ice_id] isEqualToString:@"::Test::Derived"]);
                tprintf("ok\n");
         }
 
@@ -619,7 +650,7 @@
             tprintf("testing getting ExceptionFactory registration... ");
             @try
             {
-                [p throwDerived];
+                [q throwDerived];
                 test(NO);
             }
             @catch(TestObjectsBaseEx* ex)
@@ -634,5 +665,28 @@
         // cross-test server does not implement this object
     }
 
+    {
+        tprintf("testing class containing a complex dictionary... ");
+        TestObjectsMutableLMap* v = [TestObjectsMutableLMap dictionary];
+        TestObjectsStructKey* k1 = [[TestObjectsStructKey alloc] init:1 s:@"1"];
+        [v setObject:[[TestObjectsL alloc] init:@"one"] forKey:k1];
+        TestObjectsStructKey* k2 = [[TestObjectsStructKey alloc] init:2 s:@"2"];
+        [v setObject:[[TestObjectsL alloc] init:@"two"] forKey:k2];
+        TestObjectsM* m = [[TestObjectsM alloc] init:v];
+
+        TestObjectsM* m1;
+        TestObjectsM* m2 = [initial opM:m v2:&m1];
+        test([m1.v count] == 2);
+        test([m2.v count] == 2);
+
+        test([((TestObjectsL*)[m1.v objectForKey:k1]).data isEqualToString:@"one"]);
+        test([((TestObjectsL*)[m1.v objectForKey:k2]).data isEqualToString:@"two"]);
+
+        test([((TestObjectsL*)[m2.v objectForKey:k1]).data isEqualToString:@"one"]);
+        test([((TestObjectsL*)[m2.v objectForKey:k2]).data isEqualToString:@"two"]);
+
+        tprintf("ok\n");
+    }
+
     return initial;
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/objects/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -70,7 +65,7 @@
 
 @implementation ClientMyObjectFactory
 
--(ICEObject*) create:(NSString*)type
+-(ICEObject*) create:(NSString*)__unused type
 {
     return nil;
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/objects/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -66,7 +61,7 @@
 
 @implementation CollocatedMyObjectFactory
 
--(ICEObject*) create:(NSString*)type
+-(ICEObject*) create:(NSString*)__unused type
 {
     return nil;
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/objects/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_sliceflags              := -I$(test)
 $(test)_client_sources          = Client.m ObjectsTest.ice ObjectsDerived.ice ObjectsDerivedEx.ice TestI.m AllTests.m
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/ObjectsDerivedEx.ice zeroc-ice-3.7.2/objective-c/test/Ice/objects/ObjectsDerivedEx.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/ObjectsDerivedEx.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/ObjectsDerivedEx.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/ObjectsDerived.ice zeroc-ice-3.7.2/objective-c/test/Ice/objects/ObjectsDerived.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/ObjectsDerived.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/ObjectsDerived.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/ObjectsTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/objects/ObjectsTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/ObjectsTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/ObjectsTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -187,6 +182,32 @@
     Recursive v;
 }
 
+class L
+{
+    string data;
+}
+
+class K
+{
+    Object value;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 class Initial
 {
     void shutdown();
@@ -205,9 +226,14 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -237,6 +263,7 @@
     ObjectPrxDict getObjectPrxDict(ObjectPrxDict d);
     BaseDict getBaseDict(BaseDict d);
     BasePrxDict getBasePrxDict(BasePrxDict d);
+    M opM(M v1, out M v2);
 }
 
 interface TestIntf
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/objects/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/objects/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ObjectsTest.h>
 
@@ -71,6 +66,7 @@
 -(TestObjectsObjectPrxDict *) getObjectPrxDict:(TestObjectsMutableObjectPrxDict *)d current:(ICECurrent *)current;
 -(TestObjectsBaseDict *) getBaseDict:(TestObjectsMutableBaseDict *)d current:(ICECurrent *)current;
 -(TestObjectsBasePrxDict *) getBasePrxDict:(TestObjectsMutableBasePrxDict *)d current:(ICECurrent *)current;
+ -(TestObjectsM *) opM:(TestObjectsM *)v1 v2:(TestObjectsM **)v2 current:(ICECurrent *)current;
 @end
 
 @interface UnexpectedObjectExceptionTestI : ICEBlobject<ICEBlobject>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/objects/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <objects/TestI.h>
@@ -63,7 +58,7 @@
     }
     return self;
 }
--(BOOL) checkValues:(ICECurrent*)current
+-(BOOL) checkValues:(ICECurrent*)__unused current
 {
     return e1 && e1 == e2;
 }
@@ -128,7 +123,7 @@
 }
 #endif
 
--(void) shutdown:(ICECurrent*)current
+-(void) shutdown:(ICECurrent*)__unused current
 {
     _b1.theA = nil; // Break cyclic reference.
     _b1.theB = nil; // Break cyclic reference.
@@ -145,7 +140,7 @@
     [[current.adapter getCommunicator] shutdown];
 }
 
--(TestObjectsB*) getB1:(ICECurrent*)current
+-(TestObjectsB*) getB1:(ICECurrent*)__unused current
 {
     _b1.preMarshalInvoked = NO;
     _b2.preMarshalInvoked = NO;
@@ -153,7 +148,7 @@
     return _b1;
 }
 
--(TestObjectsB*) getB2:(ICECurrent*)current
+-(TestObjectsB*) getB2:(ICECurrent*)__unused current
 {
     _b1.preMarshalInvoked = NO;
     _b2.preMarshalInvoked = NO;
@@ -161,7 +156,7 @@
     return _b2;
 }
 
--(TestObjectsC*) getC:(ICECurrent*)current
+-(TestObjectsC*) getC:(ICECurrent*)__unused current
 {
     _b1.preMarshalInvoked = NO;
     _b2.preMarshalInvoked = NO;
@@ -169,7 +164,7 @@
     return _c;
 }
 
--(TestObjectsD*) getD:(ICECurrent*)current
+-(TestObjectsD*) getD:(ICECurrent*)__unused current
 {
     _b1.preMarshalInvoked = NO;
     _b2.preMarshalInvoked = NO;
@@ -178,36 +173,36 @@
     return _d;
 }
 
--(TestObjectsE*) getE:(ICECurrent*)current
+-(TestObjectsE*) getE:(ICECurrent*)__unused current
 {
     return _e;
 }
 
--(TestObjectsF*) getF:(ICECurrent*)current
+-(TestObjectsF*) getF:(ICECurrent*)__unused current
 {
     return _f;
 }
 
--(void) setRecursive:(TestObjectsRecursive*)recursive current:(ICECurrent*)current
+-(void) setRecursive:(TestObjectsRecursive*)__unused recursive current:(ICECurrent*)__unused current
 {
 }
 
--(BOOL) supportsClassGraphDepthMax:(ICECurrent*)current
+-(BOOL) supportsClassGraphDepthMax:(ICECurrent*)__unused current
 {
     return YES;
 }
 
--(TestObjectsB*) getMB:(ICECurrent*)current
+-(TestObjectsB*) getMB:(ICECurrent*)__unused current
 {
     return _b1;
 }
 
--(TestObjectsB*) getAMDMB:(ICECurrent*)current
+-(TestObjectsB*) getAMDMB:(ICECurrent*)__unused current
 {
     return _b1;
 }
 
--(void) getAll:(TestObjectsB **)b1 b2:(TestObjectsB **)b2 theC:(TestObjectsC **)theC theD:(TestObjectsD **)theD current:(ICECurrent *)current;
+-(void) getAll:(TestObjectsB **)b1 b2:(TestObjectsB **)b2 theC:(TestObjectsC **)theC theD:(TestObjectsD **)theD current:(ICECurrent *)__unused current
 {
     _b1.preMarshalInvoked = NO;
     _b2.preMarshalInvoked = NO;
@@ -219,27 +214,50 @@
     *theD = _d;
 }
 
--(TestObjectsI*) getI:(ICECurrent*)current
+-(TestObjectsI*) getI:(ICECurrent*)__unused current
 {
     return [TestObjectsI i];
 }
 
--(TestObjectsI*) getJ:(ICECurrent*)current
+-(TestObjectsI*) getJ:(ICECurrent*)__unused current
 {
     return (TestObjectsI*)[TestObjectsJ j];
 }
 
--(TestObjectsI*) getH:(ICECurrent*)current
+-(TestObjectsI*) getH:(ICECurrent*)__unused current
 {
     return (TestObjectsI*)[TestObjectsH h];
 }
 
--(TestObjectsI*) getD1:(TestObjectsI*)d1 current:(ICECurrent*)current
+-(ICEObject*) getK:(ICECurrent*)__unused current
+{
+    return [[TestObjectsK alloc] init:[[TestObjectsL alloc] init:@"l"]];
+}
+
+-(ICEObject*) opValue:(ICEObject*)v1 v2:(ICEObject**)v2 current:(ICECurrent*)__unused current
+{
+    *v2 = v1;
+    return v1;
+}
+
+-(TestObjectsValueSeq*) opValueSeq:(TestObjectsMutableValueSeq*)v1 v2:(TestObjectsValueSeq**)v2 current:(ICECurrent*)__unused current
+{
+    *v2 = v1;
+    return v1;
+}
+
+-(TestObjectsValueMap*) opValueMap:(TestObjectsMutableValueMap*)v1 v2:(TestObjectsValueMap**)v2 current:(ICECurrent*)__unused current
+{
+    *v2 = v1;
+    return v1;
+}
+
+-(TestObjectsI*) getD1:(TestObjectsI*)d1 current:(ICECurrent*)__unused current
 {
     return d1;
 }
 
--(void) throwEDerived:(ICECurrent*)current
+-(void) throwEDerived:(ICECurrent*)__unused current
 {
     @throw [TestObjectsEDerived eDerived:[TestObjectsA1 a1:@"a1"]
                                       a2:[TestObjectsA1 a1:@"a2"]
@@ -248,88 +266,94 @@
 }
 
 -(TestObjectsBaseSeq*) opBaseSeq:(TestObjectsMutableBaseSeq*)inSeq outSeq:(TestObjectsBaseSeq**)outSeq
-                         current:(ICECurrent*)current
+                         current:(ICECurrent*)__unused current
 {
     *outSeq = inSeq;
     return inSeq;
 }
 
--(TestObjectsCompact*) getCompact:(ICECurrent*)current
+-(TestObjectsCompact*) getCompact:(ICECurrent*)__unused current
 {
     return (TestObjectsCompact*)[TestObjectsCompactExt compactExt];
 }
 
--(TestInnerA*) getInnerA:(ICECurrent *)current
+-(TestInnerA*) getInnerA:(ICECurrent *)__unused current
 {
     return [TestInnerA a:_b1];
 }
 
--(TestInnerSubA*) getInnerSubA:(ICECurrent *)current
+-(TestInnerSubA*) getInnerSubA:(ICECurrent *)__unused current
 {
     return [TestInnerSubA a:[TestInnerA a:_b1]];
 }
 
--(void) throwInnerEx:(ICECurrent *)current
+-(void) throwInnerEx:(ICECurrent *)__unused current
 {
     @throw [TestInnerEx ex:@"Inner::Ex"];
 }
 
--(void) throwInnerSubEx:(ICECurrent *)current
+-(void) throwInnerSubEx:(ICECurrent *)__unused current
 {
     @throw [TestInnerSubEx ex:@"Inner::Sub::Ex"];
 }
 
--(void) setG:(TestObjectsG*)g current:(ICECurrent*)current
+-(void) setG:(TestObjectsG*)__unused g current:(ICECurrent*)__unused current
 {
 }
 
--(void) setI:(TestObjectsI*)i current:(ICECurrent*)current
+-(void) setI:(TestObjectsI*)__unused i current:(ICECurrent*)__unused current
 {
 }
 
--(TestObjectsObjectSeq *) getObjectSeq:(TestObjectsMutableObjectSeq *)s current:(ICECurrent*)current
+-(TestObjectsObjectSeq *) getObjectSeq:(TestObjectsMutableObjectSeq *)s current:(ICECurrent*)__unused current
 {
     return s;
 }
 
--(TestObjectsObjectPrxSeq *) getObjectPrxSeq:(TestObjectsMutableObjectPrxSeq *)s current:(ICECurrent*)current
+-(TestObjectsObjectPrxSeq *) getObjectPrxSeq:(TestObjectsMutableObjectPrxSeq *)s current:(ICECurrent*)__unused current
 {
     return s;
 }
 
--(TestObjectsBaseSeq *) getBaseSeq:(TestObjectsMutableBaseSeq *)s current:(ICECurrent*)current
+-(TestObjectsBaseSeq *) getBaseSeq:(TestObjectsMutableBaseSeq *)s current:(ICECurrent*)__unused current
 {
     return s;
 }
 
--(TestObjectsBasePrxSeq *) getBasePrxSeq:(TestObjectsMutableBasePrxSeq *)s current:(ICECurrent*)current
+-(TestObjectsBasePrxSeq *) getBasePrxSeq:(TestObjectsMutableBasePrxSeq *)s current:(ICECurrent*)__unused current
 {
     return s;
 }
 
--(TestObjectsObjectDict *) getObjectDict:(TestObjectsMutableObjectDict *)d current:(ICECurrent*)current
+-(TestObjectsObjectDict *) getObjectDict:(TestObjectsMutableObjectDict *)d current:(ICECurrent*)__unused current
 {
     return d;
 }
 
--(TestObjectsObjectPrxDict *) getObjectPrxDict:(TestObjectsMutableObjectPrxDict *)d current:(ICECurrent*)current
+-(TestObjectsObjectPrxDict *) getObjectPrxDict:(TestObjectsMutableObjectPrxDict *)d current:(ICECurrent*)__unused current
 {
     return d;
 }
 
--(TestObjectsBaseDict *) getBaseDict:(TestObjectsMutableBaseDict *)d current:(ICECurrent*)current
+-(TestObjectsBaseDict *) getBaseDict:(TestObjectsMutableBaseDict *)d current:(ICECurrent*)__unused current
 {
     return d;
 }
 
--(TestObjectsBasePrxDict *) getBasePrxDict:(TestObjectsMutableBasePrxDict *)d current:(ICECurrent*)current
+-(TestObjectsBasePrxDict *) getBasePrxDict:(TestObjectsMutableBasePrxDict *)d current:(ICECurrent*)__unused current
 {
     return d;
 }
+
+-(TestObjectsM *) opM:(TestObjectsM *)v1 v2:(TestObjectsM **)v2 current:(ICECurrent *)__unused current
+{
+    *v2 = v1;
+    return v1;
+}
 @end
 
 @implementation UnexpectedObjectExceptionTestI
--(BOOL)ice_invoke:(NSData*)inEncaps outEncaps:(NSMutableData**)outEncaps current:(ICECurrent*)current
+-(BOOL)ice_invoke:(NSData*)__unused inEncaps outEncaps:(NSMutableData**)outEncaps current:(ICECurrent*)current
 {
     id<ICECommunicator> communicator = [current.adapter getCommunicator];
     id<ICEOutputStream> o = [ICEUtil createOutputStream:communicator];
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/objects/TestIntfI.m zeroc-ice-3.7.2/objective-c/test/Ice/objects/TestIntfI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/objects/TestIntfI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/objects/TestIntfI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <objects/TestI.h>
@@ -13,7 +8,7 @@
 #import <ObjectsDerivedEx.h>
 
 @implementation TestObjectsTestIntfI
--(TestObjectsBase*) opDerived:(ICECurrent *)current
+-(TestObjectsBase*) opDerived:(ICECurrent *)__unused current
 {
    TestObjectsDerived *d = ICE_AUTORELEASE([[TestObjectsDerived alloc] init]);
    d.theS.str = @"S.str";
@@ -22,7 +17,7 @@
    return d;
 }
 
--(void) throwDerived:(ICECurrent *)current
+-(void) throwDerived:(ICECurrent *)__unused current
 {
    @throw [TestObjectsDerivedEx derivedEx:@"reason"];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/BatchOnewaysAMI.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/BatchOnewaysAMI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/BatchOnewaysAMI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/BatchOnewaysAMI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/BatchOneways.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/BatchOneways.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/BatchOneways.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/BatchOneways.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -84,17 +79,17 @@
         __block int _size = 0;
         __block int _lastRequestSize = 0;
         __block BOOL _enqueue = NO;
-        initData.batchRequestInterceptor = ^(id<ICEBatchRequest> request, int count, int size)
+        initData.batchRequestInterceptor = ^(id<ICEBatchRequest> request, int countP, int size)
             {
                 test([[request getOperation] isEqualToString:@"opByteSOneway"] ||
                      [[request getOperation] isEqualToString:@"ice_ping"]);
                 test([[request getProxy] ice_isBatchOneway]);
 
-                if(count > 0)
+                if(countP > 0)
                 {
                     test(_lastRequestSize + _size == size);
                 }
-                _count = count;
+                _count = countP;
                 _size = size;
 
                 if(_size + [request getSize] > 25000)
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <operations/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/operations/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = $(test-client-sources) \
                           Twoways.m \
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/OnewaysAMI.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/OnewaysAMI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/OnewaysAMI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/OnewaysAMI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -68,7 +63,7 @@
 {
     [self called];
 }
--(void) opVoidException:(ICEException*)ex
+-(void) opVoidException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -85,7 +80,7 @@
 {
     test(NO);
 }
--(void) opByteEx:(ICEException*)ex
+-(void) opByteEx:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -97,7 +92,7 @@
 @end
 
 void
-onewaysAMI(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> proxy)
+onewaysAMI(id<ICECommunicator> __unused communicator, id<TestOperationsMyClassPrx> proxy)
 {
     id<TestOperationsMyClassPrx> p = [TestOperationsMyClassPrx uncheckedCast:[proxy ice_oneway]];
 
@@ -110,7 +105,7 @@
         OnewayAMICallback* cb = [OnewayAMICallback create];
         @try
         {
-            [p begin_opByte:0 p2:0 response:^(ICEByte r, ICEByte p3) { [cb opByteExResponse]; } exception:^(ICEException* ex) { [cb opByteExException:ex]; }];
+            [p begin_opByte:0 p2:0 response:^(ICEByte __unused r, ICEByte __unused p3) { [cb opByteExResponse]; } exception:^(ICEException* ex) { [cb opByteExException:ex]; }];
             [cb check];
         }
         @catch(NSException* ex)
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/Oneways.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/Oneways.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/Oneways.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/Oneways.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
 #import <OperationsTest.h>
 
 void
-oneways(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> proxy)
+oneways(id<ICECommunicator>__unused communicator, id<TestOperationsMyClassPrx> proxy)
 {
     id<TestOperationsMyClassPrx> p = [TestOperationsMyClassPrx uncheckedCast:[proxy ice_oneway]];
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/OperationsTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/operations/OperationsTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/OperationsTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/OperationsTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <operations/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/operations/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <OperationsTest.h>
 #import <Foundation/Foundation.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 
@@ -33,21 +28,21 @@
 }
 #endif
 
--(void) opVoid:(ICECurrent*)current
+-(void) opVoid:(ICECurrent*)__unused current
 {
 }
 
--(void) opDerived:(ICECurrent*)current
+-(void) opDerived:(ICECurrent*)__unused current
 {
 }
 
--(ICEByte) opByte:(ICEByte)p1 p2:(ICEByte)p2 p3:(ICEByte *)p3 current:(ICECurrent *)current
+-(ICEByte) opByte:(ICEByte)p1 p2:(ICEByte)p2 p3:(ICEByte *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1 ^ p2;
     return p1;
 }
 
--(BOOL) opBool:(BOOL)p1 p2:(BOOL)p2 p3:(BOOL *)p3 current:(ICECurrent*)current
+-(BOOL) opBool:(BOOL)p1 p2:(BOOL)p2 p3:(BOOL *)p3 current:(ICECurrent*)__unused current
 {
     *p3 = p1;
     return p2;
@@ -55,7 +50,7 @@
 
 -(ICELong) opShortIntLong:(ICEShort)p1 p2:(ICEInt)p2 p3:(ICELong)p3
                        p4:(ICEShort *)p4 p5:(ICEInt *)p5 p6:(ICELong *)p6
-                  current:(ICECurrent *)current
+                  current:(ICECurrent *)__unused current
 {
     *p4 = p1;
     *p5 = p2;
@@ -64,14 +59,14 @@
 }
 
 -(ICEDouble) opFloatDouble:(ICEFloat)p1 p2:(ICEDouble)p2 p3:(ICEFloat *)p3 p4:(ICEDouble *)p4
-                   current:(ICECurrent *)current
+                   current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     *p4 = p2;
     return p2;
 }
 
--(NSString *) opString:(NSMutableString *)p1 p2:(NSMutableString *)p2 p3:(NSString **)p3 current:(ICECurrent *)current
+-(NSString *) opString:(NSMutableString *)p1 p2:(NSMutableString *)p2 p3:(NSString **)p3 current:(ICECurrent *)__unused current
 {
     NSMutableString *sout = [NSMutableString stringWithCapacity:([p2 length] + 1 + [p1 length])];
     [sout appendString:p2];
@@ -86,14 +81,14 @@
     return ret;
 }
 
--(TestOperationsMyEnum) opMyEnum:(TestOperationsMyEnum)p1 p2:(TestOperationsMyEnum *)p2 current:(ICECurrent *)current
+-(TestOperationsMyEnum) opMyEnum:(TestOperationsMyEnum)p1 p2:(TestOperationsMyEnum *)p2 current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return TestOperationsenum3;
 }
 
 -(id<TestOperationsMyClassPrx>) opMyClass:(id<TestOperationsMyClassPrx>)p1 p2:(id<TestOperationsMyClassPrx> *)p2 p3:(id<TestOperationsMyClassPrx> *)p3
-                        current:(ICECurrent *)current
+                        current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     *p3 = [TestOperationsMyClassPrx uncheckedCast:[current.adapter
@@ -102,7 +97,7 @@
 }
 
 -(TestOperationsStructure *) opStruct:(TestOperationsStructure *)p1 p2:(TestOperationsStructure *)p2 p3:(TestOperationsStructure **)p3
-                            current:(ICECurrent *)current;
+                            current:(ICECurrent *)__unused current
 {
     *p3 = ICE_AUTORELEASE([p1 copy]);
     (*p3).s.s = @"a new string";
@@ -110,13 +105,13 @@
 }
 
 -(TestOperationsByteS *) opByteS:(TestOperationsMutableByteS *)p1 p2:(TestOperationsMutableByteS *)p2 p3:(TestOperationsByteS **)p3
-                       current:(ICECurrent *)current
+                       current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableByteS dataWithLength:[p1 length]];
     ICEByte *target = (ICEByte *)[*p3 bytes];
     ICEByte *src = (ICEByte *)[p1 bytes] + [p1 length];
     int i;
-    for(i = 0; i != [p1 length]; ++i)
+    for(i = 0; i != (int)[p1 length]; ++i)
     {
         *target++ = *--src;
     }
@@ -126,7 +121,7 @@
 }
 
 -(TestOperationsBoolS *) opBoolS:(TestOperationsMutableBoolS *)p1 p2:(TestOperationsMutableBoolS *)p2 p3:(TestOperationsBoolS **)p3
-                       current:(ICECurrent *)current
+                       current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableBoolS dataWithData:p1];
     [(TestOperationsMutableBoolS *)*p3 appendData:p2];
@@ -135,7 +130,7 @@
     BOOL *target = (BOOL *)[r bytes];
     BOOL *src = (BOOL *)([p1 bytes] + [p1 length]);
     int i;
-    for(i = 0; i != [p1 length]; ++i)
+    for(i = 0; i != (int)[p1 length]; ++i)
     {
         *target++ = *--src;
     }
@@ -144,14 +139,14 @@
 
 -(TestOperationsLongS *) opShortIntLongS:(TestOperationsMutableShortS *)p1 p2:(TestOperationsMutableIntS *)p2 p3:(TestOperationsMutableLongS *)p3
                                p4:(TestOperationsShortS **)p4 p5:(TestOperationsIntS **)p5 p6:(TestOperationsLongS **)p6
-                               current:(ICECurrent *)current
+                               current:(ICECurrent *)__unused current
 {
     *p4 = [TestOperationsMutableShortS dataWithData:p1];
     *p5 = [TestOperationsMutableIntS dataWithLength:[p2 length]];
     ICEInt *target = (ICEInt *)[*p5 bytes];
     ICEInt *src = (ICEInt *)([p2 bytes] + [p2 length]);
     int i;
-    for(i = 0; i != [p2 length] / sizeof(ICEInt); ++i)
+    for(i = 0; i != (int)[p2 length] / sizeof(ICEInt); ++i)
     {
         *target++ = *--src;
     }
@@ -161,14 +156,13 @@
 }
 
 -(TestOperationsDoubleS *) opFloatDoubleS:(TestOperationsMutableFloatS *)p1 p2:(TestOperationsMutableDoubleS *)p2
-                                p3:(TestOperationsFloatS **)p3 p4:(TestOperationsDoubleS **)p4 current:(ICECurrent *)current
+                                p3:(TestOperationsFloatS **)p3 p4:(TestOperationsDoubleS **)p4 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableFloatS dataWithData:p1];
     *p4 = [TestOperationsMutableDoubleS dataWithLength:[p2 length]];
     ICEDouble *target = (ICEDouble *)[*p4 bytes];
     ICEDouble *src = (ICEDouble *)([p2 bytes] + [p2 length]);
-    int i;
-    for(i = 0; i != [p2 length] / sizeof(ICEDouble); ++i)
+    for(size_t i = 0; i != [p2 length] / sizeof(ICEDouble); ++i)
     {
         *target++ = *--src;
     }
@@ -176,12 +170,12 @@
                                                          + ([p1 length] / sizeof(ICEFloat) * sizeof(ICEDouble)))];
     ICEDouble *rp = (ICEDouble *)[r bytes];
     ICEDouble *p2p = (ICEDouble *)[p2 bytes];
-    for(i = 0; i < [p2 length] / sizeof(ICEDouble); ++i)
+    for(size_t i = 0; i < [p2 length] / sizeof(ICEDouble); ++i)
     {
         *rp++ = *p2p++;
     }
     ICEFloat *bp1 = (ICEFloat *)[p1 bytes];
-    for(i = 0; i < [p1 length] / sizeof(ICEFloat); ++i)
+    for(size_t i = 0; i < [p1 length] / sizeof(ICEFloat); ++i)
     {
         *rp++ = bp1[i];
     }
@@ -189,7 +183,7 @@
 }
 
 -(TestOperationsStringS *) opStringS:(TestOperationsMutableStringS *)p1 p2:(TestOperationsMutableStringS *)p2
-                           p3:(TestOperationsStringS **)p3 current:(ICECurrent *)current
+                           p3:(TestOperationsStringS **)p3 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringS arrayWithArray:p1];
     [(TestOperationsMutableStringS *)*p3 addObjectsFromArray:p2];
@@ -203,13 +197,12 @@
 }
 
 -(TestOperationsMyEnumS *) opMyEnumS:(TestOperationsMutableMyEnumS *)p1 p2:(TestOperationsMutableMyEnumS *)p2
-                           p3:(TestOperationsMyEnumS **)p3 current:(ICECurrent *)current
+                           p3:(TestOperationsMyEnumS **)p3 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableMyEnumS dataWithLength:[p1 length]];
     TestOperationsMyEnum *target = (TestOperationsMyEnum *)[*p3 bytes];
     TestOperationsMyEnum *src = (TestOperationsMyEnum *)([p1 bytes] + [p1 length]);
-    int i;
-    for(i = 0; i != [p1 length] / sizeof(TestOperationsMyEnum); ++i)
+    for(size_t i = 0; i != [p1 length] / sizeof(TestOperationsMyEnum); ++i)
     {
         *target++ = *--src;
     }
@@ -219,7 +212,7 @@
 }
 
 -(TestOperationsMyClassS *) opMyClassS:(TestOperationsMutableMyClassS *)p1 p2:(TestOperationsMutableMyClassS *)p2
-                          p3:(TestOperationsMyClassS **)p3 current:(ICECurrent *)current
+                          p3:(TestOperationsMyClassS **)p3 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableMyClassS arrayWithArray:p1];
     [(TestOperationsMutableMyClassS *)*p3 addObjectsFromArray:p2];
@@ -233,7 +226,7 @@
 }
 
 -(TestOperationsByteSS *) opByteSS:(TestOperationsMutableByteSS *)p1 p2:(TestOperationsMutableByteSS *)p2 p3:(TestOperationsByteSS * *)p3
-                         current:(ICECurrent *)current
+                         current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableByteSS array];
     NSEnumerator *enumerator = [p1 reverseObjectEnumerator];
@@ -248,7 +241,7 @@
 }
 
 -(TestOperationsBoolSS *) opBoolSS:(TestOperationsMutableBoolSS *)p1 p2:(TestOperationsMutableBoolSS *)p2 p3:(TestOperationsBoolSS * *)p3
-                         current:(ICECurrent *)current
+                         current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableBoolSS arrayWithArray:p1];
     [(TestOperationsMutableBoolSS *)*p3 addObjectsFromArray:p2];
@@ -264,7 +257,7 @@
 
 -(TestOperationsLongSS *) opShortIntLongSS:(TestOperationsMutableShortSS *)p1 p2:(TestOperationsMutableIntSS *)p2 p3:(TestOperationsMutableLongSS *)p3
                                  p4:(TestOperationsShortSS **)p4 p5:(TestOperationsIntSS **)p5 p6:(TestOperationsLongSS **)p6
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p4 = [TestOperationsShortSS arrayWithArray:p1];
     *p5 = [TestOperationsMutableIntSS array];
@@ -279,7 +272,7 @@
 }
 
 -(TestOperationsDoubleSS *) opFloatDoubleSS:(TestOperationsMutableFloatSS *)p1 p2:(TestOperationsMutableDoubleSS *)p2
-                                  p3:(TestOperationsFloatSS **)p3 p4:(TestOperationsDoubleSS **)p4 current:(ICECurrent *)current
+                                  p3:(TestOperationsFloatSS **)p3 p4:(TestOperationsDoubleSS **)p4 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsFloatSS arrayWithArray:p1];
     *p4 = [TestOperationsMutableDoubleSS array];
@@ -294,7 +287,7 @@
 }
 
 -(TestOperationsStringSS *) opStringSS:(TestOperationsMutableStringSS *)p1 p2:(TestOperationsMutableStringSS *)p2 p3:(TestOperationsStringSS **)p3
-                             current:(ICECurrent *)current
+                             current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringSS arrayWithArray:p1];
     [(TestOperationsMutableStringSS *)*p3 addObjectsFromArray:p2];
@@ -308,7 +301,7 @@
 }
 
 -(TestOperationsStringSSS *) opStringSSS:(TestOperationsMutableStringSSS *)p1 p2:(TestOperationsMutableStringSSS *)p2 p3:(TestOperationsStringSSS **)p3
-                               current:(ICECurrent *)current
+                               current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringSSS arrayWithArray:p1];
     [(TestOperationsMutableStringSSS *)*p3 addObjectsFromArray:p2];
@@ -322,7 +315,7 @@
 }
 
 -(TestOperationsByteBoolD *) opByteBoolD:(TestOperationsMutableByteBoolD *)p1 p2:(TestOperationsMutableByteBoolD *)p2 p3:(TestOperationsByteBoolD **)p3
-                               current:(ICECurrent *)current
+                               current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableByteBoolD dictionaryWithDictionary:p1];
     TestOperationsMutableByteBoolD *r = [TestOperationsMutableByteBoolD dictionaryWithDictionary:p1];
@@ -331,7 +324,7 @@
 }
 
 -(TestOperationsShortIntD *) opShortIntD:(TestOperationsMutableShortIntD *)p1 p2:(TestOperationsMutableShortIntD *)p2 p3:(TestOperationsShortIntD **)p3
-                               current:(ICECurrent *)current
+                               current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableShortIntD dictionaryWithDictionary:p1];
     TestOperationsMutableShortIntD *r = [TestOperationsMutableShortIntD dictionaryWithDictionary:p1];
@@ -340,7 +333,7 @@
 }
 
 -(TestOperationsLongFloatD *) opLongFloatD:(TestOperationsMutableLongFloatD *)p1 p2:(TestOperationsMutableLongFloatD *)p2 p3:(TestOperationsLongFloatD **)p3
-                               current:(ICECurrent *)current
+                               current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableLongFloatD dictionaryWithDictionary:p1];
     TestOperationsMutableLongFloatD *r = [TestOperationsMutableLongFloatD dictionaryWithDictionary:p1];
@@ -349,7 +342,7 @@
 }
 
 -(TestOperationsStringStringD *) opStringStringD:(TestOperationsMutableStringStringD *)p1 p2:(TestOperationsMutableStringStringD *)p2
-                                       p3:(TestOperationsStringStringD **)p3 current:(ICECurrent *)current
+                                       p3:(TestOperationsStringStringD **)p3 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringStringD dictionaryWithDictionary:p1];
     TestOperationsMutableStringStringD *r = [TestOperationsMutableStringStringD dictionaryWithDictionary:p1];
@@ -359,7 +352,7 @@
 
 -(TestOperationsStringMyEnumD *) opStringMyEnumD:(TestOperationsMutableStringMyEnumD *)p1
                                               p2:(TestOperationsMutableStringMyEnumD *)p2
-                                              p3:(TestOperationsStringMyEnumD **)p3 current:(ICECurrent *)current
+                                              p3:(TestOperationsStringMyEnumD **)p3 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringMyEnumD dictionaryWithDictionary:p1];
     TestOperationsMutableStringMyEnumD *r = [TestOperationsMutableStringMyEnumD dictionaryWithDictionary:p1];
@@ -370,7 +363,7 @@
 -(TestOperationsMyEnumStringD *) opMyEnumStringD:(TestOperationsMyEnumStringD*)p1
                                               p2:(TestOperationsMyEnumStringD*)p2
                                               p3:(TestOperationsMyEnumStringD**)p3
-                                         current:(ICECurrent*)current
+                                         current:(ICECurrent*)__unused current
 {
     *p3 = [TestOperationsMutableMyEnumStringD dictionaryWithDictionary:p1];
     TestOperationsMutableMyEnumStringD *r = [TestOperationsMutableMyEnumStringD dictionaryWithDictionary:p1];
@@ -381,7 +374,7 @@
 -(TestOperationsMyStructMyEnumD *) opMyStructMyEnumD:(TestOperationsMyStructMyEnumD*)p1
                                                   p2:(TestOperationsMyStructMyEnumD*)p2
                                                   p3:(TestOperationsMyStructMyEnumD**)p3
-                                             current:(ICECurrent*)current
+                                             current:(ICECurrent*)__unused current
 {
     *p3 = [TestOperationsMutableMyStructMyEnumD dictionaryWithDictionary:p1];
     TestOperationsMutableMyStructMyEnumD *r = [TestOperationsMutableMyStructMyEnumD dictionaryWithDictionary:p1];
@@ -392,7 +385,7 @@
 -(TestOperationsByteBoolDS*) opByteBoolDS:(TestOperationsMutableByteBoolDS*)p1
                              p2:(TestOperationsMutableByteBoolDS*)p2
                              p3:(TestOperationsByteBoolDS**)p3
-                             current:(ICECurrent *)current
+                             current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableByteBoolDS arrayWithArray:p2];
     [(TestOperationsMutableByteBoolDS *)*p3 addObjectsFromArray:p1];
@@ -408,7 +401,7 @@
 -(TestOperationsShortIntDS*) opShortIntDS:(TestOperationsMutableShortIntDS*)p1
                              p2:(TestOperationsMutableShortIntDS*)p2
                              p3:(TestOperationsShortIntDS**)p3
-                             current:(ICECurrent *)current
+                             current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableShortIntDS arrayWithArray:p2];
     [(TestOperationsMutableShortIntDS *)*p3 addObjectsFromArray:p1];
@@ -424,7 +417,7 @@
 -(TestOperationsLongFloatDS*) opLongFloatDS:(TestOperationsMutableLongFloatDS*)p1
                               p2:(TestOperationsMutableLongFloatDS*)p2
                               p3:(TestOperationsLongFloatDS**)p3
-                              current:(ICECurrent *)current
+                              current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableLongFloatDS arrayWithArray:p2];
     [(TestOperationsMutableLongFloatDS *)*p3 addObjectsFromArray:p1];
@@ -440,7 +433,7 @@
 -(TestOperationsStringStringDS*) opStringStringDS:(TestOperationsMutableStringStringDS*)p1
                                  p2:(TestOperationsMutableStringStringDS*)p2
                                  p3:(TestOperationsStringStringDS**)p3
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringStringDS arrayWithArray:p2];
     [(TestOperationsMutableStringStringDS *)*p3 addObjectsFromArray:p1];
@@ -456,7 +449,7 @@
 -(TestOperationsStringMyEnumDS*) opStringMyEnumDS:(TestOperationsMutableStringMyEnumDS*)p1
                                  p2:(TestOperationsMutableStringMyEnumDS*)p2
                                  p3:(TestOperationsStringMyEnumDS**)p3
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringMyEnumDS arrayWithArray:p2];
     [(TestOperationsMutableStringMyEnumDS *)*p3 addObjectsFromArray:p1];
@@ -472,7 +465,7 @@
 -(TestOperationsMyEnumStringDS*) opMyEnumStringDS:(TestOperationsMutableMyEnumStringDS*)p1
                                  p2:(TestOperationsMutableMyEnumStringDS*)p2
                                  p3:(TestOperationsMyEnumStringDS**)p3
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableMyEnumStringDS arrayWithArray:p2];
     [(TestOperationsMutableMyEnumStringDS *)*p3 addObjectsFromArray:p1];
@@ -488,7 +481,7 @@
 -(TestOperationsMyStructMyEnumDS*) opMyStructMyEnumDS:(TestOperationsMutableMyStructMyEnumDS*)p1
                                    p2:(TestOperationsMutableMyStructMyEnumDS*)p2
                                    p3:(TestOperationsMyStructMyEnumDS**)p3
-                                   current:(ICECurrent *)current
+                                   current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableMyStructMyEnumDS arrayWithArray:p2];
     [(TestOperationsMutableMyStructMyEnumDS *)*p3 addObjectsFromArray:p1];
@@ -504,7 +497,7 @@
 -(TestOperationsByteByteSD*) opByteByteSD:(TestOperationsMutableByteByteSD*)p1
                              p2:(TestOperationsMutableByteByteSD*)p2
                              p3:(TestOperationsByteByteSD**)p3
-                             current:(ICECurrent *)current
+                             current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableByteByteSD dictionaryWithDictionary:p2];
     TestOperationsMutableByteByteSD *r = [TestOperationsMutableByteByteSD dictionaryWithDictionary:p1];
@@ -515,7 +508,7 @@
 -(TestOperationsBoolBoolSD*) opBoolBoolSD:(TestOperationsMutableBoolBoolSD*)p1
                              p2:(TestOperationsMutableBoolBoolSD*)p2
                              p3:(TestOperationsBoolBoolSD**)p3
-                             current:(ICECurrent *)current
+                             current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableBoolBoolSD dictionaryWithDictionary:p2];
     TestOperationsMutableBoolBoolSD *r = [TestOperationsMutableBoolBoolSD dictionaryWithDictionary:p1];
@@ -526,7 +519,7 @@
 -(TestOperationsShortShortSD*) opShortShortSD:(TestOperationsMutableShortShortSD*)p1
                                p2:(TestOperationsMutableShortShortSD*)p2
                                p3:(TestOperationsShortShortSD**)p3
-                               current:(ICECurrent *)current
+                               current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableShortShortSD dictionaryWithDictionary:p2];
     TestOperationsMutableShortShortSD *r = [TestOperationsMutableShortShortSD dictionaryWithDictionary:p1];
@@ -537,7 +530,7 @@
 -(TestOperationsIntIntSD*) opIntIntSD:(TestOperationsMutableIntIntSD*)p1
                            p2:(TestOperationsMutableIntIntSD*)p2
                            p3:(TestOperationsIntIntSD**)p3
-                           current:(ICECurrent *)current
+                           current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableIntIntSD dictionaryWithDictionary:p2];
     TestOperationsMutableIntIntSD *r = [TestOperationsMutableIntIntSD dictionaryWithDictionary:p1];
@@ -548,7 +541,7 @@
 -(TestOperationsLongLongSD*) opLongLongSD:(TestOperationsMutableLongLongSD*)p1
                              p2:(TestOperationsMutableLongLongSD*)p2
                              p3:(TestOperationsLongLongSD**)p3
-                             current:(ICECurrent *)current
+                             current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableLongLongSD dictionaryWithDictionary:p2];
     TestOperationsMutableLongLongSD *r = [TestOperationsMutableLongLongSD dictionaryWithDictionary:p1];
@@ -559,7 +552,7 @@
 -(TestOperationsStringFloatSD*) opStringFloatSD:(TestOperationsMutableStringFloatSD*)p1
                                 p2:(TestOperationsMutableStringFloatSD*)p2
                                 p3:(TestOperationsStringFloatSD**)p3
-                                current:(ICECurrent *)current
+                                current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringFloatSD dictionaryWithDictionary:p2];
     TestOperationsMutableStringFloatSD *r = [TestOperationsMutableStringFloatSD dictionaryWithDictionary:p1];
@@ -570,7 +563,7 @@
 -(TestOperationsStringDoubleSD*) opStringDoubleSD:(TestOperationsMutableStringDoubleSD*)p1
                                  p2:(TestOperationsMutableStringDoubleSD*)p2
                                  p3:(TestOperationsStringDoubleSD**)p3
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringDoubleSD dictionaryWithDictionary:p2];
     TestOperationsMutableStringDoubleSD *r = [TestOperationsMutableStringDoubleSD dictionaryWithDictionary:p1];
@@ -581,7 +574,7 @@
 -(TestOperationsStringStringSD*) opStringStringSD:(TestOperationsMutableStringStringSD*)p1
                                  p2:(TestOperationsMutableStringStringSD*)p2
                                  p3:(TestOperationsStringStringSD**)p3
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableStringStringSD dictionaryWithDictionary:p2];
     TestOperationsMutableStringStringSD *r = [TestOperationsMutableStringStringSD dictionaryWithDictionary:p1];
@@ -592,7 +585,7 @@
 -(TestOperationsMyEnumMyEnumSD*) opMyEnumMyEnumSD:(TestOperationsMutableMyEnumMyEnumSD*)p1
                                  p2:(TestOperationsMutableMyEnumMyEnumSD*)p2
                                  p3:(TestOperationsMyEnumMyEnumSD**)p3
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p3 = [TestOperationsMutableMyEnumMyEnumSD dictionaryWithDictionary:p2];
     TestOperationsMutableMyEnumMyEnumSD *r = [TestOperationsMutableMyEnumMyEnumSD dictionaryWithDictionary:p1];
@@ -600,7 +593,7 @@
     return r;
 }
 
--(TestOperationsIntS *) opIntS:(TestOperationsMutableIntS *)p1 current:(ICECurrent *)current
+-(TestOperationsIntS *) opIntS:(TestOperationsMutableIntS *)p1 current:(ICECurrent *)__unused current
 {
     NSUInteger count = [p1 length] / sizeof(ICEInt);
     TestOperationsMutableIntS *r = [TestOperationsMutableIntS dataWithLength:[p1 length]];
@@ -613,14 +606,14 @@
     return r;
 }
 
--(void) opByteSOneway:(TestOperationsMutableByteS *)p1 current:(ICECurrent *)current
+-(void) opByteSOneway:(TestOperationsMutableByteS *)__unused p1 current:(ICECurrent *)__unused current
 {
     [_cond lock];
     ++_opByteSOnewayCallCount;
     [_cond unlock];
 }
 
--(ICEInt) opByteSOnewayCallCount:(ICECurrent *)current
+-(ICEInt) opByteSOnewayCallCount:(ICECurrent *)__unused current
 {
     [_cond lock];
     ICEInt count = _opByteSOnewayCallCount;
@@ -635,89 +628,88 @@
     }
 }
 
--(ICEContext *) opContext:(ICECurrent *)current
+-(ICEContext *) opContext:(ICECurrent *)__unused current
 {
     return current.ctx;
 }
 
--(void) opDoubleMarshaling:(ICEDouble)p1 p2:(TestOperationsMutableDoubleS *)p2 current:(ICECurrent *)current
+-(void) opDoubleMarshaling:(ICEDouble)p1 p2:(TestOperationsMutableDoubleS *)p2 current:(ICECurrent *)__unused current
 {
     ICEDouble d = 1278312346.0 / 13.0;
     test(p1 == d);
     const ICEDouble *p = [p2 bytes];
-    int i;
-    for(i = 0; i < [p2 length] / sizeof(ICEDouble); ++i)
+    for(size_t i = 0; i < [p2 length] / sizeof(ICEDouble); ++i)
     {
         test(p[i] == d);
     }
 }
 
--(void) opIdempotent:(ICECurrent*)current
+-(void) opIdempotent:(ICECurrent*)__unused current
 {
     test([current mode] == ICEIdempotent);
 }
 
--(void) opNonmutating:(ICECurrent*)current
+-(void) opNonmutating:(ICECurrent*)__unused current
 {
     test([current mode] == ICENonmutating);
 }
 
--(ICEByte) opByte1:(ICEByte)p current:(ICECurrent*)current
+-(ICEByte) opByte1:(ICEByte)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(ICEShort) opShort1:(ICEShort)p current:(ICECurrent*)current
+-(ICEShort) opShort1:(ICEShort)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(ICEInt) opInt1:(ICEInt)p current:(ICECurrent*)current
+-(ICEInt) opInt1:(ICEInt)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(ICELong) opLong1:(ICELong)p current:(ICECurrent*)current
+-(ICELong) opLong1:(ICELong)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(ICEFloat) opFloat1:(ICEFloat)p current:(ICECurrent*)current
+-(ICEFloat) opFloat1:(ICEFloat)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(ICEDouble) opDouble1:(ICEDouble)p current:(ICECurrent*)current
+-(ICEDouble) opDouble1:(ICEDouble)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(NSString*) opString1:(NSString*)p current:(ICECurrent*)current
+-(NSString*) opString1:(NSString*)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(TestOperationsStringS*) opStringS1:(TestOperationsStringS*)p current:(ICECurrent*)current
+-(TestOperationsStringS*) opStringS1:(TestOperationsStringS*)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(TestOperationsByteBoolD*) opByteBoolD1:(TestOperationsByteBoolD*)p current:(ICECurrent*)current
+-(TestOperationsByteBoolD*) opByteBoolD1:(TestOperationsByteBoolD*)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(TestOperationsStringS*) opStringS2:(TestOperationsStringS*)p current:(ICECurrent*)current
+-(TestOperationsStringS*) opStringS2:(TestOperationsStringS*)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(TestOperationsByteBoolD*) opByteBoolD2:(TestOperationsByteBoolD*)p current:(ICECurrent*)current
+-(TestOperationsByteBoolD*) opByteBoolD2:(TestOperationsByteBoolD*)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(TestOperationsStringS *) opStringLiterals:(ICECurrent *)current
+-(TestOperationsStringS *) opStringLiterals:(ICECurrent *)__unused current
 {
     TestOperationsStringS *s = [NSArray arrayWithObjects:TestOperationss0,
                                                          TestOperationss1,
@@ -757,79 +749,79 @@
     return s;
 }
 
--(TestOperationsStringS *) opWStringLiterals:(ICECurrent *)current
+-(TestOperationsStringS *) opWStringLiterals:(ICECurrent *)__unused current
 {
     return [self opStringLiterals:current];
 }
 
--(TestOperationsStructure*) opMStruct1:(ICECurrent *)current
+-(TestOperationsStructure*) opMStruct1:(ICECurrent *)__unused current
 {
     return [TestOperationsStructure structure];
 }
 -(TestOperationsStructure*) opMStruct2:(TestOperationsStructure*)p1 p2:(TestOperationsStructure**)p2
-                               current:(ICECurrent *)current
+                               current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return p1;
 }
 
--(TestOperationsStringS*) opMSeq1:(ICECurrent *)current
+-(TestOperationsStringS*) opMSeq1:(ICECurrent *)__unused current
 {
     return [TestOperationsStringS array];
 }
 
 -(TestOperationsStringS*) opMSeq2:(TestOperationsMutableStringS*)p1 p2:(TestOperationsStringS**)p2
-                          current:(ICECurrent *)current
+                          current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return p1;
 }
 
--(TestOperationsStringStringD*) opMDict1:(ICECurrent *)current
+-(TestOperationsStringStringD*) opMDict1:(ICECurrent *)__unused current
 {
     return [TestOperationsStringStringD dictionary];
 }
 
 -(TestOperationsStringStringD*) opMDict2:(TestOperationsMutableStringStringD*)p1 p2:(TestOperationsStringStringD**)p2
-                                 current:(ICECurrent *)current
+                                 current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return p1;
 }
 
--(TestOperationsMyClass1*) opMyClass1:(TestOperationsMyClass1*)p current:(ICECurrent*)current
+-(TestOperationsMyClass1*) opMyClass1:(TestOperationsMyClass1*)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(TestOperationsMyStruct1*) opMyStruct1:(TestOperationsMyStruct1*)p current:(ICECurrent*)current
+-(TestOperationsMyStruct1*) opMyStruct1:(TestOperationsMyStruct1*)p current:(ICECurrent*)__unused current
 {
     return p;
 }
 
--(TestOperationsStringS *) getNSNullStringSeq:(ICECurrent *)current
+-(TestOperationsStringS *) getNSNullStringSeq:(ICECurrent *)__unused current
 {
     return [NSArray arrayWithObjects:@"first", [NSNull null], nil];
 }
 
--(TestOperationsMyClassS *) getNSNullASeq:(ICECurrent *)current
+-(TestOperationsMyClassS *) getNSNullASeq:(ICECurrent *)__unused current
 {
     return [NSArray arrayWithObjects:[TestOperationsA a:99], [NSNull null], nil];
 }
 
--(TestOperationsStructS *) getNSNullStructSeq:(ICECurrent *)current
+-(TestOperationsStructS *) getNSNullStructSeq:(ICECurrent *)__unused current
 {
     TestOperationsStructure *s = [TestOperationsStructure structure:nil e:TestOperationsenum2 s:[TestOperationsAnotherStruct anotherStruct:@"Hello"]];
     return [NSArray arrayWithObjects:s, [NSNull null], nil];
 }
 
--(TestOperationsStringSS *) getNSNullStringSeqSeq:(ICECurrent *)current
+-(TestOperationsStringSS *) getNSNullStringSeqSeq:(ICECurrent *)__unused current
 {
     TestOperationsStringSS *s = [NSArray arrayWithObjects:@"first", nil];
     return [NSArray arrayWithObjects:s, [NSNull null], nil];
 }
 
--(TestOperationsStringStringD *) getNSNullStringStringDict:(ICECurrent *)current
+-(TestOperationsStringStringD *) getNSNullStringStringDict:(ICECurrent *)__unused current
 {
     TestOperationsMutableStringStringD *d = [TestOperationsMutableStringStringD dictionary];
     [d setObject:@"ONE" forKey:@"one"];
@@ -837,27 +829,27 @@
     return d;
 }
 
--(void) putNSNullStringStringDict:(TestOperationsMutableStringStringD *)d current:(ICECurrent *)current
+-(void) putNSNullStringStringDict:(TestOperationsMutableStringStringD *)__unused d current:(ICECurrent *)__unused current
 {
     // Nothing to do because this tests that an exception is thrown on the client side.
 }
 
--(void) putNSNullShortIntDict:(TestOperationsMutableShortIntD *)d current:(ICECurrent *)current
+-(void) putNSNullShortIntDict:(TestOperationsMutableShortIntD *)__unused d current:(ICECurrent *)__unused current
 {
     // Nothing to do because this tests that an exception is thrown on the client side.
 }
 
--(void) putNSNullStringMyEnumDict:(TestOperationsMutableStringMyEnumD *)d current:(ICECurrent *)current
+-(void) putNSNullStringMyEnumDict:(TestOperationsMutableStringMyEnumD *)__unused d current:(ICECurrent *)__unused current
 {
     // Nothing to do because this tests that an exception is thrown on the client side.
 }
 
--(void) shutdown:(ICECurrent*)current
+-(void) shutdown:(ICECurrent*)__unused current
 {
     [[current.adapter getCommunicator] shutdown];
 }
 
--(BOOL) supportsCompress:(ICECurrent*)current
+-(BOOL) supportsCompress:(ICECurrent*)__unused current
 {
     return YES;
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/TwowaysAMI.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/TwowaysAMI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/TwowaysAMI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/TwowaysAMI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -83,24 +78,24 @@
 {
     [self called];
 }
--(void) opVoidException:(ICEException*)ex
+-(void) opVoidException:(ICEException*)__unused ex
 {
     test(NO);
 }
--(void) opByteExResponse:(ICEByte)ret p3:(ICEByte)p3
+-(void) opByteExResponse:(ICEByte)__unused ret p3:(ICEByte)__unused p3
 {
     test(NO);
 }
--(void) opByteExException:(ICEException*)ex
+-(void) opByteExException:(ICEException*)__unused ex
 {
     test([ex isKindOfClass:[ICENoEndpointException class]]);
     [self called];
 }
--(void) opByteResponse:(ICEByte)ret p3:(ICEByte)p3
+-(void) opByteResponse:(ICEByte)__unused ret p3:(ICEByte)__unused p3
 {
     [self called];
 }
--(void) opByteException:(ICEException*)ex
+-(void) opByteException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -110,7 +105,7 @@
     test(!r);
     [self called];
 }
--(void) opBoolException:(ICEException*)ex
+-(void) opBoolException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -122,7 +117,7 @@
     test(r == 12);
     [self called];
 }
--(void) opShortIntLongException:(ICEException*)ex
+-(void) opShortIntLongException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -133,7 +128,7 @@
     test(r == 1.1E10);
     [self called];
 }
--(void) opFloatDoubleException:(ICEException*)ex
+-(void) opFloatDoubleException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -144,7 +139,7 @@
     [self called];
 }
 
--(void) opStringException:(ICEException*)ex
+-(void) opStringException:(ICEException*)__unused ex
 {
     test(NO);
 };
@@ -156,7 +151,7 @@
     [self called];
 }
 
--(void) opMyEnumException:(ICEException*)ex
+-(void) opMyEnumException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -183,7 +178,7 @@
     [self called];
 }
 
--(void) opMyClassException:(ICEException*)ex
+-(void) opMyClassException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -204,7 +199,7 @@
     [self called];
 }
 
--(void) opStructException:(ICEException*)ex
+-(void) opStructException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -230,7 +225,7 @@
     [self called];
 }
 
--(void) opByteSException:(ICEException*)ex
+-(void) opByteSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -251,7 +246,7 @@
     [self called];
 }
 
--(void) opBoolSException:(ICEException*)ex
+-(void) opBoolSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -285,7 +280,7 @@
     [self called];
 }
 
--(void) opShortIntLongSException:(ICEException*)ex
+-(void) opShortIntLongSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -311,7 +306,7 @@
     [self called];
 }
 
--(void) opFloatDoubleSException:(ICEException*)ex
+-(void) opFloatDoubleSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -330,7 +325,7 @@
     [self called];
 }
 
--(void) opStringSException:(ICEException*)ex
+-(void) opStringSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -366,27 +361,27 @@
     [self called];
 }
 
--(void) opByteSSException:(ICEException*)ex
+-(void) opByteSSException:(ICEException*)__unused ex
 {
     test(NO);
 }
 
--(void) opBoolSSResponse:(TestOperationsBoolSS*)sso p3:(TestOperationsBoolSS*)bso
+-(void) opBoolSSResponse:(TestOperationsBoolSS*)__unused sso p3:(TestOperationsBoolSS*)__unused bso
 {
     [self called];
 }
 
--(void) opBoolSSException:(ICEException*)ex
+-(void) opBoolSSException:(ICEException*)__unused ex
 {
     test(NO);
 }
 
--(void) opShortIntLongSSResponse:(TestOperationsLongSS*)a p4:(TestOperationsShortSS*)p4 p5:(TestOperationsIntSS*)p5 p6:(TestOperationsLongSS*)p6
+-(void) opShortIntLongSSResponse:(TestOperationsLongSS*)__unused a p4:(TestOperationsShortSS*)__unused p4 p5:(TestOperationsIntSS*)__unused p5 p6:(TestOperationsLongSS*)__unused p6
 {
     [self called];
 }
 
--(void) opShortIntLongSSException:(ICEException*)ex
+-(void) opShortIntLongSSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -424,7 +419,7 @@
     [self called];
 }
 
--(void) opFloatDoubleSSException:(ICEException*)ex
+-(void) opFloatDoubleSSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -449,7 +444,7 @@
     [self called];
 }
 
--(void) opStringSSException:(ICEException*)ex
+-(void) opStringSSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -490,7 +485,7 @@
     test([[[[rsso objectAtIndex:2] objectAtIndex:1] objectAtIndex:0] isEqualToString:@"abcd"]);
     [self called];
 }
--(void) opStringSSSException:(ICEException*)ex
+-(void) opStringSSSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -506,7 +501,7 @@
     test([[ro objectForKey:[NSNumber numberWithUnsignedChar:101]] boolValue] == YES);
     [self called];
 }
--(void) opByteBoolDException:(ICEException*)ex
+-(void) opByteBoolDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -522,7 +517,7 @@
     test([[ro objectForKey:[NSNumber numberWithShort:1101]] intValue] == 0);
     [self called];
 }
--(void) opShortIntDException:(ICEException*)ex
+-(void) opShortIntDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -538,7 +533,7 @@
     test((ICEFloat)[[ro objectForKey:[NSNumber numberWithLong:999999130]] floatValue] == 0.5f);
     [self called];
 }
--(void) opLongFloatDException:(ICEException*)ex
+-(void) opLongFloatDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -554,7 +549,7 @@
     test([[ro objectForKey:@"BAR"] isEqualToString:@"abc 0.5"]);
     [self called];
 }
--(void) opStringStringDException:(ICEException*)ex
+-(void) opStringStringDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -570,7 +565,7 @@
     test([[ro objectForKey:@"Hello!!"] intValue] == TestOperationsenum2);
     [self called];
 }
--(void) opStringMyEnumDException:(ICEException*)ex
+-(void) opStringMyEnumDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -583,7 +578,7 @@
     test([[ro objectForKey:@(TestOperationsenum3)] isEqualToString:@"querty"]);
     [self called];
 }
--(void) opMyEnumStringDException:(ICEException*)ex
+-(void) opMyEnumStringDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -599,7 +594,7 @@
     test([[ro objectForKey:s23] isEqual:@(TestOperationsenum2)]);
     [self called];
 }
--(void) opMyStructMyEnumDException:(ICEException*)ex
+-(void) opMyStructMyEnumDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -626,7 +621,7 @@
     test([[[_do objectAtIndex:2] objectForKey:[NSNumber numberWithUnsignedChar:101]] boolValue] == YES);
     [self called];
 }
--(void) opByteBoolDSException:(ICEException*)ex
+-(void) opByteBoolDSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -652,7 +647,7 @@
     test([[[_do objectAtIndex:2] objectForKey:[NSNumber numberWithShort:1101]] intValue] == 0);
     [self called];
 }
--(void) opShortIntDSException:(ICEException*)ex
+-(void) opShortIntDSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -678,7 +673,7 @@
     test([[[_do objectAtIndex:2] objectForKey:[NSNumber numberWithLong:999999130]] floatValue] == 0.5f);
     [self called];
 }
--(void) opLongFloatDSException:(ICEException*)ex
+-(void) opLongFloatDSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -704,7 +699,7 @@
     test([[[_do objectAtIndex:2] objectForKey:@"BAR"] isEqualToString:@"abc 0.5"]);
     [self called];
 }
--(void) opStringStringDSException:(ICEException*)ex
+-(void) opStringStringDSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -730,7 +725,7 @@
     test([[[_do objectAtIndex:2] objectForKey:@"Hello!!"] intValue] == TestOperationsenum2);
     [self called];
 }
--(void) opStringMyEnumDSException:(ICEException*)ex
+-(void) opStringMyEnumDSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -752,7 +747,7 @@
     test([[[_do objectAtIndex:2] objectForKey:@(TestOperationsenum3)] isEqualToString:@"querty"]);
     [self called];
 }
--(void) opMyEnumStringDSException:(ICEException*)ex
+-(void) opMyEnumStringDSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -780,7 +775,7 @@
     test([[[_do objectAtIndex:2] objectForKey:s23] intValue] == TestOperationsenum2);
     [self called];
 }
--(void) opMyStructMyEnumDSException:(ICEException*)ex
+-(void) opMyStructMyEnumDSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -806,7 +801,7 @@
     test(p[1] == 0xf3);
     [self called];
 }
--(void) opByteByteSDException:(ICEException*)ex
+-(void) opByteByteSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -830,7 +825,7 @@
     test(p[2] == YES);
     [self called];
 }
--(void) opBoolBoolSDException:(ICEException*)ex
+-(void) opBoolBoolSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -858,7 +853,7 @@
     test(p[1] == 7);
     [self called];
 }
--(void) opShortShortSDException:(ICEException*)ex
+-(void) opShortShortSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -886,7 +881,7 @@
     test(p[1] == 700);
     [self called];
 }
--(void) opIntIntSDException:(ICEException*)ex
+-(void) opIntIntSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -914,7 +909,7 @@
     test(p[1] == 999999120);
     [self called];
 }
--(void) opLongLongSDException:(ICEException*)ex
+-(void) opLongLongSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -942,7 +937,7 @@
     test(p[1] == 3.14f);
     [self called];
 }
--(void) opStringFloatSDException:(ICEException*)ex
+-(void) opStringFloatSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -970,7 +965,7 @@
     test(p[1] == 1.7E10);
     [self called];
 }
--(void) opStringDoubleSDException:(ICEException*)ex
+-(void) opStringDoubleSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -992,7 +987,7 @@
     test([[[ro objectForKey:@"ghi"] objectAtIndex:1] isEqualToString:@"xor"]);
     [self called];
 }
--(void) opStringStringSDException:(ICEException*)ex
+-(void) opStringStringSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -1020,21 +1015,20 @@
     test(p[1] == TestOperationsenum3);
     [self called];
 }
--(void) opMyEnumMyEnumSDException:(ICEException*)ex
+-(void) opMyEnumMyEnumSDException:(ICEException*)__unused ex
 {
     test(NO);
 }
 -(void) opIntSResponse:(TestOperationsIntS*)r
 {
     const ICEInt *rp = [r bytes];
-    int j;
-    for(j = 0; j < [r length] / sizeof(ICEInt); ++j)
+    for(int j = 0; j < (int)([r length] / sizeof(ICEInt)); ++j)
     {
         test(rp[j] == -j);
     }
     [self called];
 }
--(void) opIntSException:(ICEException*)ex
+-(void) opIntSException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -1051,7 +1045,7 @@
     test([[ctx objectForKey:@"three"] isEqualToString:@"THREE"]);
     [self called];
 }
--(void) opContextException:(ICEException*)ex
+-(void) opContextException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -1059,7 +1053,7 @@
 {
     [self called];
 }
--(void) opDoubleMarshalingException:(ICEException*)ex
+-(void) opDoubleMarshalingException:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -1960,23 +1954,23 @@
         [ctx setObject:@"THREE" forKey:@"three"];
         {
                 TestAMIOperationsCallback* cb = [TestAMIOperationsCallback create];
-                [p begin_opContext:^(ICEMutableContext* ctx) { [cb opEmptyContextResponse:ctx]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
+                [p begin_opContext:^(ICEMutableContext* ctxP) { [cb opEmptyContextResponse:ctxP]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
                 test([cb check]);
         }
         {
             TestAMIOperationsCallback* cb = [TestAMIOperationsCallback create];
-            [p begin_opContext:ctx response:^(ICEMutableContext* ctx) { [cb opNonEmptyContextResponse:ctx]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
+            [p begin_opContext:ctx response:^(ICEMutableContext* ctxP) { [cb opNonEmptyContextResponse:ctxP]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
             test([cb check]);
         }
         {
             id<TestOperationsMyClassPrx> p2 = [TestOperationsMyClassPrx checkedCast:[p ice_context:ctx]];
             test([[p2 ice_getContext] isEqual:ctx]);
             TestAMIOperationsCallback* cb = [TestAMIOperationsCallback create];
-            [p2 begin_opContext:^(ICEMutableContext* ctx) { [cb opNonEmptyContextResponse:ctx]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
+            [p2 begin_opContext:^(ICEMutableContext* ctxP) { [cb opNonEmptyContextResponse:ctxP]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
             test([cb check]);
 
             cb = [TestAMIOperationsCallback create];
-            [p2 begin_opContext:ctx response:^(ICEMutableContext* ctx) { [cb opNonEmptyContextResponse:ctx]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
+            [p2 begin_opContext:ctx response:^(ICEMutableContext* ctxP) { [cb opNonEmptyContextResponse:ctxP]; } exception:^(ICEException* ex) { [cb opContextException:ex]; }];
             test([cb check]);
         }
     }
@@ -2001,14 +1995,14 @@
             [ctx setObject:@"TWO" forKey:@"two" ];
             [ctx setObject:@"THREE" forKey:@"three"];
 
-            id<TestOperationsMyClassPrx> p = [TestOperationsMyClassPrx uncheckedCast:
+            id<TestOperationsMyClassPrx> pc = [TestOperationsMyClassPrx uncheckedCast:
                                                                     [ic stringToProxy:@"test:default -p 12010"]];
 
             [[ic getImplicitContext] setContext:(ctx)];
             test([[[ic getImplicitContext] getContext] isEqualToDictionary:ctx]);
             {
-                id<ICEAsyncResult> r = [p begin_opContext];
-                ICEContext* c = [p end_opContext:r];
+                id<ICEAsyncResult> r = [pc begin_opContext];
+                ICEContext* c = [pc end_opContext:r];
                 test([c isEqualToDictionary:ctx]);
             }
 
@@ -2018,8 +2012,8 @@
 
             ctx = [[ic getImplicitContext] getContext];
             {
-                id<ICEAsyncResult> r = [p begin_opContext];
-                ICEContext* c = [p end_opContext:r];
+                id<ICEAsyncResult> r = [pc begin_opContext];
+                ICEContext* c = [pc end_opContext:r];
                 test([c isEqualToDictionary:ctx]);
             }
 
@@ -2030,19 +2024,19 @@
             ICEMutableContext *combined = [ICEMutableContext dictionaryWithDictionary:ctx];
             [combined addEntriesFromDictionary:prxContext];
 
-            p = [TestOperationsMyClassPrx uncheckedCast:[p ice_context:prxContext]];
+            pc = [TestOperationsMyClassPrx uncheckedCast:[pc ice_context:prxContext]];
 
             [[ic getImplicitContext] setContext:[ICEMutableContext dictionary]];
             {
-                id<ICEAsyncResult> r = [p begin_opContext];
-                ICEContext* c = [p end_opContext:r];
+                id<ICEAsyncResult> r = [pc begin_opContext];
+                ICEContext* c = [pc end_opContext:r];
                 test([c isEqualToDictionary:prxContext]);
             }
 
             [[ic getImplicitContext] setContext:ctx];
             {
-                id<ICEAsyncResult> r = [p begin_opContext];
-                ICEContext* c = [p end_opContext:r];
+                id<ICEAsyncResult> r = [pc begin_opContext];
+                ICEContext* c = [pc end_opContext:r];
                 test([c isEqualToDictionary:combined]);
             }
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/operations/Twoways.m zeroc-ice-3.7.2/objective-c/test/Ice/operations/Twoways.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/operations/Twoways.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/operations/Twoways.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -598,32 +593,32 @@
 
         rso = [p opByteSS:bsi1 p2:bsi2 p3:&bso];
 
-        const ICEByte *p;
+        const ICEByte *pb;
         test([bso count] == 2);
         test([[bso objectAtIndex:0] length] / sizeof(ICEByte) == 1);
-        p = [[bso objectAtIndex:0] bytes];
-        test(p[0] == (ICEByte)0x0ff);
+        pb = [[bso objectAtIndex:0] bytes];
+        test(pb[0] == (ICEByte)0x0ff);
         test([[bso objectAtIndex:1] length] / sizeof(ICEByte) == 3);
-        p = [[bso objectAtIndex:1] bytes];
-        test(p[0] == (ICEByte)0x01);
-        test(p[1] == (ICEByte)0x11);
-        test(p[2] == (ICEByte)0x12);
+        pb = [[bso objectAtIndex:1] bytes];
+        test(pb[0] == (ICEByte)0x01);
+        test(pb[1] == (ICEByte)0x11);
+        test(pb[2] == (ICEByte)0x12);
         test([rso count] == 4);
         test([[rso objectAtIndex:0] length] / sizeof(ICEByte) == 3);
-        p = [[rso objectAtIndex:0] bytes];
-        test(p[0] == (ICEByte)0x01);
-        test(p[1] == (ICEByte)0x11);
-        test(p[2] == (ICEByte)0x12);
+        pb = [[rso objectAtIndex:0] bytes];
+        test(pb[0] == (ICEByte)0x01);
+        test(pb[1] == (ICEByte)0x11);
+        test(pb[2] == (ICEByte)0x12);
         test([[rso objectAtIndex:1] length] / sizeof(ICEByte) == 1);
-        p = [[rso objectAtIndex:1] bytes];
-        test(p[0] == (ICEByte)0xff);
+        pb = [[rso objectAtIndex:1] bytes];
+        test(pb[0] == (ICEByte)0xff);
         test([[rso objectAtIndex:2] length] / sizeof(ICEByte) == 1);
-        p = [[rso objectAtIndex:2] bytes];
-        test(p[0] == (ICEByte)0x0e);
+        pb = [[rso objectAtIndex:2] bytes];
+        test(pb[0] == (ICEByte)0x0e);
         test([[rso objectAtIndex:3] length] / sizeof(ICEByte) == 2);
-        p = [[rso objectAtIndex:3] bytes];
-        test(p[0] == (ICEByte)0xf2);
-        test(p[1] == (ICEByte)0xf1);
+        pb = [[rso objectAtIndex:3] bytes];
+        test(pb[0] == (ICEByte)0xf2);
+        test(pb[1] == (ICEByte)0xf1);
     }
 
     {
@@ -1266,24 +1261,24 @@
         TestOperationsMutableByteByteSD *_do;
         TestOperationsByteByteSD *ro = [p opByteByteSD:sdi1 p2:sdi2 p3:&_do];
 
-        const ICEByte *p;
+        const ICEByte *pb;
         test([_do count] == 1);
         test([[_do objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0xf1]] length] / sizeof(ICEByte) == 2);
-        p = [[_do objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0xf1]] bytes];
-        test(p[0] == 0xf2);
-        test(p[1] == 0xf3);
+        pb = [[_do objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0xf1]] bytes];
+        test(pb[0] == 0xf2);
+        test(pb[1] == 0xf3);
         test([ro count] == 3);
         test([[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0x01]] length] / sizeof(ICEByte) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0x01]] bytes];
-        test(p[0] == 0x01);
-        test(p[1] == 0x11);
+        pb = [[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0x01]] bytes];
+        test(pb[0] == 0x01);
+        test(pb[1] == 0x11);
         test([[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0x22]] length] / sizeof(ICEByte) == 1);
-        p = [[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0x22]] bytes];
-        test(p[0] == 0x12);
+        pb = [[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0x22]] bytes];
+        test(pb[0] == 0x12);
         test([[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0xf1]] length] / sizeof(ICEByte) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0xf1]] bytes];
-        test(p[0] == 0xf2);
-        test(p[1] == 0xf3);
+        pb = [[ro objectForKey:[NSNumber numberWithUnsignedChar:(ICEByte)0xf1]] bytes];
+        test(pb[0] == 0xf2);
+        test(pb[1] == 0xf3);
     }
 
     {
@@ -1306,22 +1301,22 @@
         TestOperationsMutableBoolBoolSD *_do;
         TestOperationsBoolBoolSD *ro = [p opBoolBoolSD:sdi1 p2:sdi2 p3:&_do];
 
-        const BOOL *p;
+        const BOOL *pb;
         test([_do count] == 1);
         test([[_do objectForKey:[NSNumber numberWithBool:NO]] length] / sizeof(BOOL) == 2);
-        p = [[_do objectForKey:[NSNumber numberWithBool:NO]] bytes];
-        test(p[0] == YES);
-        test(p[1] == NO);
+        pb = [[_do objectForKey:[NSNumber numberWithBool:NO]] bytes];
+        test(pb[0] == YES);
+        test(pb[1] == NO);
         test([ro count] == 2);
         test([[ro objectForKey:[NSNumber numberWithBool:NO]] length] / sizeof(BOOL) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithBool:NO]] bytes];
-        test(p[0] == YES);
-        test(p[1] == NO);
+        pb = [[ro objectForKey:[NSNumber numberWithBool:NO]] bytes];
+        test(pb[0] == YES);
+        test(pb[1] == NO);
         test([[ro objectForKey:[NSNumber numberWithBool:YES]] length] / sizeof(BOOL) == 3);
-        p = [[ro objectForKey:[NSNumber numberWithBool:YES]] bytes];
-        test(p[0] == NO);
-        test(p[1] == YES);
-        test(p[2] == YES);
+        pb = [[ro objectForKey:[NSNumber numberWithBool:YES]] bytes];
+        test(pb[0] == NO);
+        test(pb[1] == YES);
+        test(pb[2] == YES);
     }
 
     {
@@ -1347,26 +1342,26 @@
         TestOperationsMutableShortShortSD *_do;
         TestOperationsShortShortSD *ro = [p opShortShortSD:sdi1 p2:sdi2 p3:&_do];
 
-        const ICEShort *p;
+        const ICEShort *ps;
         test([_do count] == 1);
         test([[_do objectForKey:[NSNumber numberWithShort:4]] length] / sizeof(ICEShort) == 2);
-        p = [[_do objectForKey:[NSNumber numberWithShort:4]] bytes];
-        test(p[0] == 6);
-        test(p[1] == 7);
+        ps = [[_do objectForKey:[NSNumber numberWithShort:4]] bytes];
+        test(ps[0] == 6);
+        test(ps[1] == 7);
         test([ro count] == 3);
         test([[ro objectForKey:[NSNumber numberWithShort:1]] length] / sizeof(ICEShort) == 3);
-        p = [[ro objectForKey:[NSNumber numberWithShort:1]] bytes];
-        test(p[0] == 1);
-        test(p[1] == 2);
-        test(p[2] == 3);
+        ps = [[ro objectForKey:[NSNumber numberWithShort:1]] bytes];
+        test(ps[0] == 1);
+        test(ps[1] == 2);
+        test(ps[2] == 3);
         test([[ro objectForKey:[NSNumber numberWithShort:2]] length] / sizeof(ICEShort) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithShort:2]] bytes];
-        test(p[0] == 4);
-        test(p[1] == 5);
+        ps = [[ro objectForKey:[NSNumber numberWithShort:2]] bytes];
+        test(ps[0] == 4);
+        test(ps[1] == 5);
         test([[ro objectForKey:[NSNumber numberWithShort:4]] length] / sizeof(ICEShort) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithShort:4]] bytes];
-        test(p[0] == 6);
-        test(p[1] == 7);
+        ps = [[ro objectForKey:[NSNumber numberWithShort:4]] bytes];
+        test(ps[0] == 6);
+        test(ps[1] == 7);
     }
 
     {
@@ -1392,26 +1387,26 @@
         TestOperationsMutableIntIntSD *_do;
         TestOperationsIntIntSD *ro = [p opIntIntSD:sdi1 p2:sdi2 p3:&_do];
 
-        const ICEInt *p;
+        const ICEInt *pint;
         test([_do count] == 1);
         test([[_do objectForKey:[NSNumber numberWithInt:400]] length] / sizeof(ICEInt) == 2);
-        p = [[_do objectForKey:[NSNumber numberWithInt:400]] bytes];
-        test(p[0] == 600);
-        test(p[1] == 700);
+        pint = [[_do objectForKey:[NSNumber numberWithInt:400]] bytes];
+        test(pint[0] == 600);
+        test(pint[1] == 700);
         test([ro count] == 3);
         test([[ro objectForKey:[NSNumber numberWithInt:100]] length] / sizeof(ICEInt) == 3);
-        p = [[ro objectForKey:[NSNumber numberWithInt:100]] bytes];
-        test(p[0] == 100);
-        test(p[1] == 200);
-        test(p[2] == 300);
+        pint = [[ro objectForKey:[NSNumber numberWithInt:100]] bytes];
+        test(pint[0] == 100);
+        test(pint[1] == 200);
+        test(pint[2] == 300);
         test([[ro objectForKey:[NSNumber numberWithInt:200]] length] / sizeof(ICEInt) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithInt:200]] bytes];
-        test(p[0] == 400);
-        test(p[1] == 500);
+        pint = [[ro objectForKey:[NSNumber numberWithInt:200]] bytes];
+        test(pint[0] == 400);
+        test(pint[1] == 500);
         test([[ro objectForKey:[NSNumber numberWithInt:400]] length] / sizeof(ICEInt) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithInt:400]] bytes];
-        test(p[0] == 600);
-        test(p[1] == 700);
+        pint = [[ro objectForKey:[NSNumber numberWithInt:400]] bytes];
+        test(pint[0] == 600);
+        test(pint[1] == 700);
     }
 
     {
@@ -1437,26 +1432,26 @@
         TestOperationsMutableLongLongSD *_do;
         TestOperationsLongLongSD *ro = [p opLongLongSD:sdi1 p2:sdi2 p3:&_do];
 
-        const ICELong *p;
+        const ICELong *pl;
         test([_do count] == 1);
         test([[_do objectForKey:[NSNumber numberWithLong:999999992]] length] / sizeof(ICELong) == 2);
-        p = [[_do objectForKey:[NSNumber numberWithLong:999999992]] bytes];
-        test(p[0] == 999999110);
-        test(p[1] == 999999120);
+        pl = [[_do objectForKey:[NSNumber numberWithLong:999999992]] bytes];
+        test(pl[0] == 999999110);
+        test(pl[1] == 999999120);
         test([ro count] == 3);
         test([[ro objectForKey:[NSNumber numberWithLong:999999990]] length] / sizeof(ICELong) == 3);
-        p = [[ro objectForKey:[NSNumber numberWithLong:999999990]] bytes];
-        test(p[0] == 999999110);
-        test(p[1] == 999999111);
-        test(p[2] == 999999110);
+        pl = [[ro objectForKey:[NSNumber numberWithLong:999999990]] bytes];
+        test(pl[0] == 999999110);
+        test(pl[1] == 999999111);
+        test(pl[2] == 999999110);
         test([[ro objectForKey:[NSNumber numberWithLong:999999991]] length] / sizeof(ICELong) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithLong:999999991]] bytes];
-        test(p[0] == 999999120);
-        test(p[1] == 999999130);
+        pl = [[ro objectForKey:[NSNumber numberWithLong:999999991]] bytes];
+        test(pl[0] == 999999120);
+        test(pl[1] == 999999130);
         test([[ro objectForKey:[NSNumber numberWithLong:999999992]] length] / sizeof(ICELong) == 2);
-        p = [[ro objectForKey:[NSNumber numberWithLong:999999992]] bytes];
-        test(p[0] == 999999110);
-        test(p[1] == 999999120);
+        pl = [[ro objectForKey:[NSNumber numberWithLong:999999992]] bytes];
+        test(pl[0] == 999999110);
+        test(pl[1] == 999999120);
     }
 
     {
@@ -1482,26 +1477,26 @@
         TestOperationsMutableStringFloatSD *_do;
         TestOperationsStringFloatSD *ro = [p opStringFloatSD:sdi1 p2:sdi2 p3:&_do];
 
-        const ICEFloat *p;
+        const ICEFloat *pf;
         test([_do count] == 1);
         test([[_do objectForKey:@"aBc"] length] / sizeof(ICEFloat) == 2);
-        p = [[_do objectForKey:@"aBc"] bytes];
-        test(p[0] == -3.14f);
-        test(p[1] == 3.14f);
+        pf = [[_do objectForKey:@"aBc"] bytes];
+        test(pf[0] == -3.14f);
+        test(pf[1] == 3.14f);
         test([ro count] == 3);
         test([[ro objectForKey:@"abc"] length] / sizeof(ICEFloat) == 3);
-        p = [[ro objectForKey:@"abc"] bytes];
-        test(p[0] == -1.1f);
-        test(p[1] == 123123.2f);
-        test(p[2] == 100.0f);
+        pf = [[ro objectForKey:@"abc"] bytes];
+        test(pf[0] == -1.1f);
+        test(pf[1] == 123123.2f);
+        test(pf[2] == 100.0f);
         test([[ro objectForKey:@"ABC"] length] / sizeof(ICEFloat) == 2);
-        p = [[ro objectForKey:@"ABC"] bytes];
-        test(p[0] == 42.24f);
-        test(p[1] == -1.61f);
+        pf = [[ro objectForKey:@"ABC"] bytes];
+        test(pf[0] == 42.24f);
+        test(pf[1] == -1.61f);
         test([[ro objectForKey:@"aBc"] length] / sizeof(ICEFloat) == 2);
-        p = [[ro objectForKey:@"aBc"] bytes];
-        test(p[0] == -3.14f);
-        test(p[1] == 3.14f);
+        pf = [[ro objectForKey:@"aBc"] bytes];
+        test(pf[0] == -3.14f);
+        test(pf[1] == 3.14f);
     }
 
     {
@@ -1527,26 +1522,26 @@
         TestOperationsMutableStringDoubleSD *_do;
         TestOperationsStringDoubleSD *ro = [p opStringDoubleSD:sdi1 p2:sdi2 p3:&_do];
 
-        const ICEDouble *p;
+        const ICEDouble *pd;
         test([_do count] == 1);
         test([[_do objectForKey:@""] length] / sizeof(ICEDouble) == 2);
-        p = [[_do objectForKey:@""] bytes];
-        test(p[0] == 1.6E10);
-        test(p[1] == 1.7E10);
+        pd = [[_do objectForKey:@""] bytes];
+        test(pd[0] == 1.6E10);
+        test(pd[1] == 1.7E10);
         test([ro count] == 3);
         test([[ro objectForKey:@"Hello!!"] length] / sizeof(ICEDouble) == 3);
-        p = [[ro objectForKey:@"Hello!!"] bytes];
-        test(p[0] == 1.1E10);
-        test(p[1] == 1.2E10);
-        test(p[2] == 1.3E10);
+        pd = [[ro objectForKey:@"Hello!!"] bytes];
+        test(pd[0] == 1.1E10);
+        test(pd[1] == 1.2E10);
+        test(pd[2] == 1.3E10);
         test([[ro objectForKey:@"Goodbye"] length] / sizeof(ICEDouble) == 2);
-        p = [[ro objectForKey:@"Goodbye"] bytes];
-        test(p[0] == 1.4E10);
-        test(p[1] == 1.5E10);
+        pd = [[ro objectForKey:@"Goodbye"] bytes];
+        test(pd[0] == 1.4E10);
+        test(pd[1] == 1.5E10);
         test([[ro objectForKey:@""] length] / sizeof(ICEDouble) == 2);
-        p = [[ro objectForKey:@""] bytes];
-        test(p[0] == 1.6E10);
-        test(p[1] == 1.7E10);
+        pd = [[ro objectForKey:@""] bytes];
+        test(pd[0] == 1.6E10);
+        test(pd[1] == 1.7E10);
     }
 
     {
@@ -1611,26 +1606,26 @@
         TestOperationsMutableMyEnumMyEnumSD *_do;
         TestOperationsMyEnumMyEnumSD *ro = [p opMyEnumMyEnumSD:sdi1 p2:sdi2 p3:&_do];
 
-        const TestOperationsMyEnum *p;
+        const TestOperationsMyEnum *pe;
         test([_do count] == 1);
         test([[_do objectForKey:@(TestOperationsenum1)] length] / sizeof(TestOperationsMyEnum) == 2);
-        p = [[_do objectForKey:@(TestOperationsenum1)] bytes];
-        test(p[0] == TestOperationsenum3);
-        test(p[1] == TestOperationsenum3);
+        pe = [[_do objectForKey:@(TestOperationsenum1)] bytes];
+        test(pe[0] == TestOperationsenum3);
+        test(pe[1] == TestOperationsenum3);
         test([ro count] == 3);
         test([[ro objectForKey:@(TestOperationsenum3)] length] / sizeof(TestOperationsMyEnum) == 3);
-        p = [[ro objectForKey:@(TestOperationsenum3)] bytes];
-        test(p[0] == TestOperationsenum1);
-        test(p[1] == TestOperationsenum1);
-        test(p[2] == TestOperationsenum2);
+        pe = [[ro objectForKey:@(TestOperationsenum3)] bytes];
+        test(pe[0] == TestOperationsenum1);
+        test(pe[1] == TestOperationsenum1);
+        test(pe[2] == TestOperationsenum2);
         test([[ro objectForKey:@(TestOperationsenum2)] length] / sizeof(TestOperationsMyEnum) == 2);
-        p = [[ro objectForKey:@(TestOperationsenum2)] bytes];
-        test(p[0] == TestOperationsenum1);
-        test(p[1] == TestOperationsenum2);
+        pe = [[ro objectForKey:@(TestOperationsenum2)] bytes];
+        test(pe[0] == TestOperationsenum1);
+        test(pe[1] == TestOperationsenum2);
         test([[ro objectForKey:@(TestOperationsenum1)] length] / sizeof(TestOperationsMyEnum) == 2);
-        p = [[ro objectForKey:@(TestOperationsenum1)] bytes];
-        test(p[0] == TestOperationsenum3);
-        test(p[1] == TestOperationsenum3);
+        pe = [[ro objectForKey:@(TestOperationsenum1)] bytes];
+        test(pe[0] == TestOperationsenum3);
+        test(pe[1] == TestOperationsenum3);
     }
 
     {
@@ -1649,8 +1644,7 @@
             TestOperationsIntS *r = [p opIntS:s];
             test([r length] == lengths[l] * sizeof(ICEInt));
             const ICEInt *rp = [r bytes];
-            int j;
-            for(j = 0; j < [r length] / sizeof(ICEInt); ++j)
+            for(int j = 0; j < (int)([r length] / sizeof(ICEInt)); ++j)
             {
                 test(rp[j] == -j);
             }
@@ -1702,18 +1696,18 @@
             [ctx setObject:@"TWO" forKey:@"two" ];
             [ctx setObject:@"THREE" forKey:@"three"];
 
-            id<TestOperationsMyClassPrx> p = [TestOperationsMyClassPrx uncheckedCast:[ic stringToProxy:@"test:default -p 12010"]];
+            id<TestOperationsMyClassPrx> pc = [TestOperationsMyClassPrx uncheckedCast:[ic stringToProxy:@"test:default -p 12010"]];
 
             [[ic getImplicitContext] setContext:ctx];
             test([[[ic getImplicitContext] getContext] isEqual:ctx]);
-            test([[p opContext] isEqual:ctx]);
+            test([[pc opContext] isEqual:ctx]);
 
             test([[ic getImplicitContext] get:@"zero"] == nil);
             [[ic getImplicitContext] put:@"zero" value:@"ZERO"];
             test([[[ic getImplicitContext] get:@"zero"] isEqualToString:@"ZERO"]);
 
             ctx = [[ic getImplicitContext] getContext];
-            test([[p opContext] isEqual:ctx]);
+            test([[pc opContext] isEqual:ctx]);
 
             ICEMutableContext *prxContext = [ICEMutableContext dictionary];
             [prxContext setObject:@"UN" forKey:@"one"];
@@ -1722,20 +1716,20 @@
             ICEMutableContext *combined = [ICEMutableContext dictionaryWithDictionary:ctx];
             [combined addEntriesFromDictionary:prxContext];
 
-            p = [TestOperationsMyClassPrx uncheckedCast:[p ice_context:prxContext]];
+            pc = [TestOperationsMyClassPrx uncheckedCast:[pc ice_context:prxContext]];
 
             [[ic getImplicitContext] setContext:[ICEContext dictionary]];
-            test([[p opContext] isEqualToDictionary:prxContext]);
+            test([[pc opContext] isEqualToDictionary:prxContext]);
 
             [[ic getImplicitContext] setContext:ctx];
-            test([[p opContext] isEqualToDictionary:combined]);
+            test([[pc opContext] isEqualToDictionary:combined]);
 
             test([[[ic getImplicitContext] get:@"one"] isEqualToString:@"ONE"]);
             [[ic getImplicitContext] remove:@"one"];
 
             if([impls[i] isEqualToString:@"PerThread"])
             {
-                PerThreadContextInvokeThread* thread = [PerThreadContextInvokeThread create:[p ice_context:[ICEMutableContext dictionary]]];
+                PerThreadContextInvokeThread* thread = [PerThreadContextInvokeThread create:[pc ice_context:[ICEMutableContext dictionary]]];
                 [thread start];
                 [thread join];
             }
@@ -1769,21 +1763,23 @@
     test([p opDouble1:1.0] == 1.0);
     test([[p opString1:@"opString1"] isEqualToString:@"opString1"]);
 
-    id<TestOperationsMyDerivedClassPrx> d = [TestOperationsMyDerivedClassPrx uncheckedCast:p];
+    id<TestOperationsMyDerivedClassPrx> derived = [TestOperationsMyDerivedClassPrx uncheckedCast:p];
 
-    TestOperationsMyStruct1* s =
-        [TestOperationsMyStruct1 myStruct1:@"Test::MyStruct1::s" myClass:nil myStruct1:@"Test::MyStruct1::myStruct1"];
-    s = [d opMyStruct1:s];
-    test([s.tesT isEqualToString:@"Test::MyStruct1::s"]);
-    test(s.myClass == 0);
-    test([s.myStruct1 isEqualToString:@"Test::MyStruct1::myStruct1"]);
-
-    TestOperationsMyClass1* c =
-        [TestOperationsMyClass1 myClass1:@"Test::MyClass1::testT" myClass:nil myClass1:@"Test::MyClass1::myClass1"];
-    c = [d opMyClass1:c];
-    test([c.tesT isEqualToString:@"Test::MyClass1::testT"]);
-    test(c.myClass == nil);
-    test([c.myClass1 isEqualToString:@"Test::MyClass1::myClass1"]);
+    {
+        TestOperationsMyStruct1* s =
+            [TestOperationsMyStruct1 myStruct1:@"Test::MyStruct1::s" myClass:nil myStruct1:@"Test::MyStruct1::myStruct1"];
+        s = [derived opMyStruct1:s];
+        test([s.tesT isEqualToString:@"Test::MyStruct1::s"]);
+        test(s.myClass == 0);
+        test([s.myStruct1 isEqualToString:@"Test::MyStruct1::myStruct1"]);
+
+        TestOperationsMyClass1* c =
+            [TestOperationsMyClass1 myClass1:@"Test::MyClass1::testT" myClass:nil myClass1:@"Test::MyClass1::myClass1"];
+        c = [derived opMyClass1:c];
+        test([c.tesT isEqualToString:@"Test::MyClass1::testT"]);
+        test(c.myClass == nil);
+        test([c.myClass1 isEqualToString:@"Test::MyClass1::myClass1"]);
+    }
 
     [p opStringS1:[TestOperationsStringS array]];
     [p opByteBoolD1:[TestOperationsByteBoolD dictionary]];
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/optional/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/optional/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/optional/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/optional/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -688,18 +683,18 @@
     tprintf("ok\n");
 
     tprintf("testing tag marshalling... ");
-    TestOptionalB* b = [TestOptionalB b];
-    TestOptionalB* b2 = (TestOptionalB*)[initial pingPong:b];
+    TestOptionalB* b1 = [TestOptionalB b];
+    TestOptionalB* b2 = (TestOptionalB*)[initial pingPong:b1];
     test(![b2 hasMa]);
     test(![b2 hasMb]);
     test(![b2 hasMc]);
 
-    b.ma = 10;
-    b.mb = 11;
-    b.mc = 12;
-    b.md = 13;
+    b1.ma = 10;
+    b1.mb = 11;
+    b1.mc = 12;
+    b1.md = 13;
 
-    b2 = (TestOptionalB*)[initial pingPong:b];
+    b2 = (TestOptionalB*)[initial pingPong:b1];
     test(b2.ma == 10);
     test(b2.mb == 11);
     test(b2.mc == 12);
@@ -708,7 +703,7 @@
     [factory setEnabled:YES];
     os = [ICEUtil createOutputStream:communicator];
     [os startEncapsulation];
-    [os writeValue:b];
+    [os writeValue:b1];
     [os endEncapsulation];
     inEncaps = [os finished];
     test([initial ice_invoke:@"pingPong" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps]);
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/optional/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/optional/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/optional/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/optional/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/optional/OptionalTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/optional/OptionalTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/optional/OptionalTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/optional/OptionalTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/optional/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/optional/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/optional/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/optional/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <optional/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/optional/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/optional/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/optional/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/optional/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <OptionalTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/optional/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/optional/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/optional/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/optional/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <optional/TestI.h>
 #import <objc/Ice.h>
@@ -17,19 +12,19 @@
 {
     [[current.adapter getCommunicator] shutdown];
 }
--(ICEObject*) pingPong:(ICEObject*)obj current:(ICECurrent*)current
+-(ICEObject*) pingPong:(ICEObject*)obj current:(ICECurrent*)__unused current
 {
     return obj;
 }
--(void) opOptionalException:(id)a b:(id)b o:(id)o current:(ICECurrent *)current
+-(void) opOptionalException:(id)a b:(id)b o:(id)o current:(ICECurrent *)__unused current
 {
     @throw [TestOptionalOptionalException optionalException:NO a:a b:b o:o];
 }
--(void) opDerivedException:(id)a b:(id)b o:(id)o current:(ICECurrent *)current
+-(void) opDerivedException:(id)a b:(id)b o:(id)o current:(ICECurrent *)__unused current
 {
     @throw [TestOptionalDerivedException derivedException:NO a:a b:b o:o ss:b o2:o];
 }
--(void) opRequiredException:(id)a b:(id)b o:(id)o current:(ICECurrent *)current
+-(void) opRequiredException:(id)a b:(id)b o:(id)o current:(ICECurrent *)__unused current
 {
     TestOptionalRequiredException* ex = [TestOptionalRequiredException requiredException];
     if(a != ICENone)
@@ -63,231 +58,231 @@
     }
     @throw ex;
 }
--(id) opByte:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opByte:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opBool:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opBool:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opShort:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opShort:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opInt:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opInt:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opLong:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opLong:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opFloat:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opFloat:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opDouble:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opDouble:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opString:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opString:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opMyEnum:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opMyEnum:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opSmallStruct:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opSmallStruct:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opFixedStruct:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opFixedStruct:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opVarStruct:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opVarStruct:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opOneOptional:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opOneOptional:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opOneOptionalProxy:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opOneOptionalProxy:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opByteSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opByteSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opBoolSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opBoolSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opShortSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opShortSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opIntSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opIntSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opLongSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opLongSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opFloatSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opFloatSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opDoubleSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opDoubleSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opStringSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opStringSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opSmallStructSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opSmallStructSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opSmallStructList:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opSmallStructList:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opFixedStructSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opFixedStructSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opFixedStructList:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opFixedStructList:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opVarStructSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opVarStructSeq:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opSerializable:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opSerializable:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opIntIntDict:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opIntIntDict:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opStringIntDict:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opStringIntDict:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(id) opIntOneOptionalDict:(id)p1 p3:(id *)p3 current:(ICECurrent *)current
+-(id) opIntOneOptionalDict:(id)p1 p3:(id *)p3 current:(ICECurrent *)__unused current
 {
     *p3 = p1;
     return p1;
 }
--(void) opClassAndUnknownOptional:(TestOptionalA *)p current:(ICECurrent *)current
+-(void) opClassAndUnknownOptional:(TestOptionalA *)__unused p current:(ICECurrent *)__unused current
 {
 }
--(void) sendOptionalClass:(BOOL)req o:(id)o current:(ICECurrent *)current
+-(void) sendOptionalClass:(BOOL)__unused req o:(id)__unused o current:(ICECurrent *)__unused current
 {
 }
--(void) returnOptionalClass:(BOOL)req o:(id *)o current:(ICECurrent *)current
+-(void) returnOptionalClass:(BOOL)__unused req o:(id *)o current:(ICECurrent *)__unused current
 {
     *o = [TestOptionalOneOptional oneOptional:@53];
 }
--(id) opG:(id)g current:(ICECurrent*)current
+-(id) opG:(id)g current:(ICECurrent*)__unused current
 {
     return g;
 }
--(void) opVoid:(ICECurrent*)current
+-(void) opVoid:(ICECurrent*)__unused current
 {
 }
--(id) opMStruct1:(ICECurrent *)current
+-(id) opMStruct1:(ICECurrent *)__unused current
 {
     return [TestOptionalSmallStruct smallStruct];
 }
--(id) opMStruct2:(id)p1 p2:(id*)p2 current:(ICECurrent *)current
+-(id) opMStruct2:(id)p1 p2:(id*)p2 current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return p1;
 }
--(id) opMSeq1:(ICECurrent *)current
+-(id) opMSeq1:(ICECurrent *)__unused current
 {
     return [TestOptionalStringSeq array];
 }
--(id) opMSeq2:(id)p1 p2:(id*)p2 current:(ICECurrent *)current
+-(id) opMSeq2:(id)p1 p2:(id*)p2 current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return p1;
 }
--(id) opMDict1:(ICECurrent *)current
+-(id) opMDict1:(ICECurrent *)__unused current
 {
     return [TestOptionalStringIntDict dictionary];
 }
--(id) opMDict2:(id)p1 p2:(id*)p2 current:(ICECurrent *)current
+-(id) opMDict2:(id)p1 p2:(id*)p2 current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return p1;
 }
--(id) opMG1:(ICECurrent *)current
+-(id) opMG1:(ICECurrent *)__unused current
 {
     return [TestOptionalG g];
 }
--(id) opMG2:(id)p1 p2:(id*)p2 current:(ICECurrent *)current
+-(id) opMG2:(id)p1 p2:(id*)p2 current:(ICECurrent *)__unused current
 {
     *p2 = p1;
     return p1;
 }
--(BOOL) supportsRequiredParams:(ICECurrent*)current
+-(BOOL) supportsRequiredParams:(ICECurrent*)__unused current
 {
     return NO;
 }
--(BOOL) supportsJavaSerializable:(ICECurrent*)current
+-(BOOL) supportsJavaSerializable:(ICECurrent*)__unused current
 {
     return NO;
 }
--(BOOL) supportsCsharpSerializable:(ICECurrent*)current
+-(BOOL) supportsCsharpSerializable:(ICECurrent*)__unused current
 {
     return NO;
 }
--(BOOL) supportsCppStringView:(ICECurrent*)current
+-(BOOL) supportsCppStringView:(ICECurrent*)__unused current
 {
     return NO;
 }
--(BOOL) supportsNullOptional:(ICECurrent*)current
+-(BOOL) supportsNullOptional:(ICECurrent*)__unused current
 {
     return YES;
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/proxy/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/proxy/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/proxy/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/proxy/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -1043,15 +1038,15 @@
 
     tprintf("testing communicator shutdown/destroy... ");
     {
-        id<ICECommunicator> c = [ICEUtil createCommunicator];
-        [c shutdown];
-        test([c isShutdown]);
-        [c waitForShutdown];
-        [c destroy];
-        [c shutdown];
-        test([c isShutdown]);
-        [c waitForShutdown];
-        [c destroy];
+        id<ICECommunicator> com = [ICEUtil createCommunicator];
+        [com shutdown];
+        test([com isShutdown]);
+        [com waitForShutdown];
+        [com destroy];
+        [com shutdown];
+        test([com isShutdown]);
+        [com waitForShutdown];
+        [com destroy];
     }
     tprintf("ok\n");
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/proxy/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/proxy/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/proxy/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/proxy/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/proxy/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/proxy/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/proxy/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/proxy/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <proxy/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/proxy/ProxyTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/proxy/ProxyTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/proxy/ProxyTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/proxy/ProxyTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/proxy/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/proxy/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/proxy/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/proxy/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <proxy/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/proxy/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/proxy/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/proxy/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/proxy/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ProxyTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/proxy/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/proxy/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/proxy/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/proxy/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <proxy/TestI.h>
@@ -20,17 +15,17 @@
 }
 #endif
 
--(id<ICEObjectPrx>) echo:(id<ICEObjectPrx>)obj current:(ICECurrent*)current
+-(id<ICEObjectPrx>) echo:(id<ICEObjectPrx>)obj current:(ICECurrent*)__unused current
 {
     return obj;
 }
 
--(void) shutdown:(ICECurrent*)c
+-(void) shutdown:(ICECurrent*)current
 {
-    [[[c adapter] getCommunicator] shutdown];
+    [[[current adapter] getCommunicator] shutdown];
 }
 
--(ICEContext*) getContext:(ICECurrent*)c
+-(ICEContext*) getContext:(ICECurrent*)__unused current
 {
     return ICE_AUTORELEASE(ICE_RETAIN(_ctx));
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/retry/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/retry/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/retry/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/retry/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -63,7 +58,7 @@
 {
     [self called];
 }
--(void) retryOpException:(ICEException*)ex
+-(void) retryOpException:(ICEException*)__unused ex
 {
     test(NO);
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/retry/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/retry/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/retry/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/retry/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/retry/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/retry/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/retry/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/retry/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <retry/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/retry/RetryTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/retry/RetryTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/retry/RetryTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/retry/RetryTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/retry/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/retry/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/retry/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/retry/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <retry/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/retry/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/retry/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/retry/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/retry/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <RetryTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/retry/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/retry/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/retry/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/retry/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <retry/TestI.h>
@@ -37,7 +32,7 @@
    }
 }
 
--(ICEInt) opIdempotent:(ICEInt)nRetry current:(ICECurrent*)current
+-(ICEInt) opIdempotent:(ICEInt)nRetry current:(ICECurrent*)__unused current
 {
     if(nRetry < 0)
     {
@@ -55,7 +50,7 @@
     return counter;
 }
 
--(void) opNotIdempotent:(ICECurrent*)current
+-(void) opNotIdempotent:(ICECurrent*)__unused current
 {
     @throw [ICEConnectionLostException connectionLostException:__FILE__ line:__LINE__];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Collocated.m zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Collocated.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Collocated.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Collocated.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <servantLocator/TestI.h>
@@ -28,7 +23,7 @@
     test([[co message] isEqual:@"blahblah"]);
 
 }
--(void) throwTestIntfUserException;
+-(void) throwTestIntfUserException
 {
     @throw [TestServantLocatorTestIntfUserException testIntfUserException];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_server_sources  = $(test-server-sources) ServantLocatorI.m
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/ServantLocatorI.h zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/ServantLocatorI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/ServantLocatorI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/ServantLocatorI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/ServantLocatorI.m zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/ServantLocatorI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/ServantLocatorI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/ServantLocatorI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <ServantLocatorTest.h>
 #import <servantLocator/ServantLocatorI.h>
@@ -55,7 +50,7 @@
 
     return [self newServantAndCookie:cookie];
 }
--(void) finished:(ICECurrent*)current servant:(ICEObject*)servant cookie:(id)cookie
+-(void) finished:(ICECurrent*)current servant:(ICEObject*)__unused servant cookie:(id)cookie
 {
     test(!_deactivated);
 
@@ -75,18 +70,18 @@
 
     [self checkCookie:cookie];
 }
--(void) deactivate:(NSString*)category
+-(void) deactivate:(NSString*)__unused category
 {
     test(!_deactivated);
 
     _deactivated = YES;
 }
--(ICEObject*) newServantAndCookie:(id*)cookie
+-(ICEObject*) newServantAndCookie:(id*)__unused cookie
 {
     NSAssert(NO, @"Subclasses need to overwrite this method");
     return nil; // To keep compiler happy
 }
--(void) checkCookie:(id)cookie
+-(void) checkCookie:(id)__unused cookie
 {
     NSAssert(NO, @"Subclasses need to overwrite this method");
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <servantLocator/TestI.h>
@@ -28,7 +23,7 @@
     test([[co message] isEqual:@"blahblah"]);
 
 }
--(void) throwTestIntfUserException;
+-(void) throwTestIntfUserException
 {
     @throw [TestServantLocatorTestIntfUserException testIntfUserException];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <ServantLocatorTest.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/servantLocator/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/servantLocator/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,38 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <servantLocator/TestI.h>
 
 @implementation TestServantLocatorTestIntfI
--(void) requestFailedException:(ICECurrent*)current
+-(void) requestFailedException:(ICECurrent*)__unused current
 {
 }
--(void) unknownUserException:(ICECurrent*)current
+-(void) unknownUserException:(ICECurrent*)__unused current
 {
 }
--(void) unknownLocalException:(ICECurrent*)current
+-(void) unknownLocalException:(ICECurrent*)__unused current
 {
 }
--(void) unknownException:(ICECurrent*)current
+-(void) unknownException:(ICECurrent*)__unused current
 {
 }
--(void) userException:(ICECurrent*)current
+-(void) userException:(ICECurrent*)__unused current
 {
 }
--(void) localException:(ICECurrent*)current
+-(void) localException:(ICECurrent*)__unused current
 {
 }
--(void) stdException:(ICECurrent*)current
+-(void) stdException:(ICECurrent*)__unused current
 {
 }
--(void) cppException:(ICECurrent*)current
+-(void) cppException:(ICECurrent*)__unused current
 {
 }
--(void) unknownExceptionWithServantException:(ICECurrent*)current
+-(void) unknownExceptionWithServantException:(ICECurrent*)__unused current
 {
 }
--(NSString*) impossibleException:(BOOL)throw current:(ICECurrent*)current
+-(NSString*) impossibleException:(BOOL)throw current:(ICECurrent*)__unused current
 {
     if(throw)
     {
@@ -49,7 +44,7 @@
     //
     return @"Hello";
 }
--(NSString*) intfUserException:(BOOL)throw current:(ICECurrent*)current
+-(NSString*) intfUserException:(BOOL)throw current:(ICECurrent*)__unused current
 {
     if(throw)
     {
@@ -61,10 +56,10 @@
     //
     return @"Hello";
 }
--(void) asyncResponse:(ICECurrent*)current
+-(void) asyncResponse:(ICECurrent*)__unused current
 {
 }
--(void) asyncException:(ICECurrent*)current
+-(void) asyncException:(ICECurrent*)__unused current
 {
 }
 -(void) shutdown:(ICECurrent*)current
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/services/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/services/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/services/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/services/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <objc/Glacier2.h>
@@ -27,7 +22,7 @@
     self = [super init];
     return self;
 }
--(void)tick:(NSString*)time current:(ICECurrent*)current
+-(void)tick:(NSString*)time current:(ICECurrent*)__unused current
 {
     NSLog(@"%@", time);
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/services/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/services/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/services/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/services/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/services/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/services/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/services/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/services/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_dependencies    = IceObjC IceGridObjC Glacier2ObjC IceStormObjC TestCommonObjC
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/services/ServicesTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/services/ServicesTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/services/ServicesTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/services/ServicesTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -18,21 +13,21 @@
 
 @implementation RelayI
 
--(void) knownPreservedAsBase:(ICECurrent*)current
+-(void) knownPreservedAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsClientKnownPreservedDerived knownPreservedDerived:@"base"
                                                                                 kp:@"preserved"
                                                                                kpd:@"derived"];
 }
 
--(void) knownPreservedAsKnownPreserved:(ICECurrent*)current
+-(void) knownPreservedAsKnownPreserved:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsClientKnownPreservedDerived knownPreservedDerived:@"base"
                                                                                 kp:@"preserved"
                                                                                kpd:@"derived"];
 }
 
--(void) unknownPreservedAsBase:(ICECurrent*)current
+-(void) unknownPreservedAsBase:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsClientPreserved2* ex = ICE_AUTORELEASE([TestSlicingExceptionsClientPreserved2 alloc]);
     ex.b = @"base";
@@ -43,7 +38,7 @@
     @throw ex;
 }
 
--(void) unknownPreservedAsKnownPreserved:(ICECurrent*)current
+-(void) unknownPreservedAsKnownPreserved:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsClientPreserved2* ex = ICE_AUTORELEASE([TestSlicingExceptionsClientPreserved2 alloc]);
     ex.b = @"base";
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = Client.m AllTests.m SlicingExceptionsTestClient.ice
 $(test)_server_sources  = Server.m TestI.m SlicingExceptionsTestServer.ice
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <slicing/exceptions/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <SlicingExceptionsTestServer.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/exceptions/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/exceptions/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,108 +1,103 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <slicing/exceptions/TestI.h>
 #import <TestCommon.h>
 #import <objc/Ice.h>
 
 @implementation TestSlicingExceptionsServerI
--(void) baseAsBase:(ICECurrent*)current
+-(void) baseAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerBase base:@"Base.b"];
 }
 
--(void) unknownDerivedAsBase:(ICECurrent*)current
+-(void) unknownDerivedAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerUnknownDerived unknownDerived:@"UnknownDerived.b" ud:@"UnknownDerived.ud"];
 }
 
--(void) knownDerivedAsBase:(ICECurrent*)current
+-(void) knownDerivedAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownDerived knownDerived:@"KnownDerived.b" kd:@"KnownDerived.kd"];
 }
 
--(void) knownDerivedAsKnownDerived:(ICECurrent*)current
+-(void) knownDerivedAsKnownDerived:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownDerived knownDerived:@"KnownDerived.b" kd:@"KnownDerived.kd"];
 }
 
--(void) unknownIntermediateAsBase:(ICECurrent*)current
+-(void) unknownIntermediateAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerUnknownIntermediate unknownIntermediate:@"UnknownIntermediate.b" ui:@"UnknownIntermediate.ui"];
 }
 
--(void) knownIntermediateAsBase:(ICECurrent*)current
+-(void) knownIntermediateAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownIntermediate knownIntermediate:@"KnownIntermediate.b" ki:@"KnownIntermediate.ki"];
 }
 
--(void) knownMostDerivedAsBase:(ICECurrent*)current
+-(void) knownMostDerivedAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownMostDerived knownMostDerived:@"KnownMostDerived.b" ki:@"KnownMostDerived.ki" kmd:@"KnownMostDerived.kmd"];
 }
 
--(void) knownIntermediateAsKnownIntermediate:(ICECurrent*)current
+-(void) knownIntermediateAsKnownIntermediate:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownIntermediate knownIntermediate:@"KnownIntermediate.b" ki:@"KnownIntermediate.ki"];
 }
 
--(void) knownMostDerivedAsKnownIntermediate:(ICECurrent*)current
+-(void) knownMostDerivedAsKnownIntermediate:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownMostDerived knownMostDerived:@"KnownMostDerived.b" ki:@"KnownMostDerived.ki" kmd:@"KnownMostDerived.kmd"];
 }
 
--(void) knownMostDerivedAsKnownMostDerived:(ICECurrent*)current
+-(void) knownMostDerivedAsKnownMostDerived:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownMostDerived knownMostDerived:@"KnownMostDerived.b" ki:@"KnownMostDerived.ki" kmd:@"KnownMostDerived.kmd"];
 }
 
--(void) unknownMostDerived1AsBase:(ICECurrent*)current
+-(void) unknownMostDerived1AsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerUnknownMostDerived1 unknownMostDerived1:@"UnknownMostDerived1.b" ki:@"UnknownMostDerived1.ki" umd1:@"UnknownMostDerived1.umd1"];
 }
 
--(void) unknownMostDerived1AsKnownIntermediate:(ICECurrent*)current
+-(void) unknownMostDerived1AsKnownIntermediate:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerUnknownMostDerived1 unknownMostDerived1:@"UnknownMostDerived1.b"
                                                                             ki:@"UnknownMostDerived1.ki"
                                                                           umd1:@"UnknownMostDerived1.umd1"];
 }
 
--(void) unknownMostDerived2AsBase:(ICECurrent*)current
+-(void) unknownMostDerived2AsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerUnknownMostDerived2 unknownMostDerived2:@"UnknownMostDerived2.b"
                                                                             ui:@"UnknownMostDerived2.ui"
                                                                           umd2:@"UnknownMostDerived2.umd2"];
 }
 
--(void) unknownMostDerived2AsBaseCompact:(ICECurrent*)current
+-(void) unknownMostDerived2AsBaseCompact:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerUnknownMostDerived2 unknownMostDerived2:@"UnknownMostDerived2.b"
                                                                             ui:@"UnknownMostDerived2.ui"
                                                                           umd2:@"UnknownMostDerived2.umd2"];
 }
 
--(void) knownPreservedAsBase:(ICECurrent*)current
+-(void) knownPreservedAsBase:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownPreservedDerived knownPreservedDerived:@"base"
                                                                                 kp:@"preserved"
                                                                                kpd:@"derived"];
 }
 
--(void) knownPreservedAsKnownPreserved:(ICECurrent*)current
+-(void) knownPreservedAsKnownPreserved:(ICECurrent*)__unused current
 {
     @throw [TestSlicingExceptionsServerKnownPreservedDerived knownPreservedDerived:@"base"
                                                                                 kp:@"preserved"
                                                                                kpd:@"derived"];
 }
 
--(void) relayKnownPreservedAsBase:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current
+-(void) relayKnownPreservedAsBase:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsServerRelayPrx* p =
         [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]];
@@ -110,7 +105,7 @@
     test(NO);
 }
 
--(void) relayKnownPreservedAsKnownPreserved:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current
+-(void) relayKnownPreservedAsKnownPreserved:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsServerRelayPrx* p =
         [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]];
@@ -118,7 +113,7 @@
     test(NO);
 }
 
--(void) unknownPreservedAsBase:(ICECurrent*)current
+-(void) unknownPreservedAsBase:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsServerSPreserved2* ex = [TestSlicingExceptionsServerSPreserved2 sPreserved2];
     ex.b = @"base";
@@ -129,7 +124,7 @@
     @throw ex;
 }
 
--(void) unknownPreservedAsKnownPreserved:(ICECurrent*)current
+-(void) unknownPreservedAsKnownPreserved:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsServerSPreserved2* ex = [TestSlicingExceptionsServerSPreserved2 sPreserved2];
     ex.b = @"base";
@@ -140,7 +135,7 @@
     @throw ex;
 }
 
--(void) relayUnknownPreservedAsBase:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current
+-(void) relayUnknownPreservedAsBase:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsServerRelayPrx* p =
         [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]];
@@ -148,7 +143,7 @@
     test(NO);
 }
 
--(void) relayUnknownPreservedAsKnownPreserved:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current
+-(void) relayUnknownPreservedAsKnownPreserved:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)__unused current
 {
     TestSlicingExceptionsServerRelayPrx* p =
         [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]];
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -202,7 +197,7 @@
     [self called];
 }
 
--(void) SBaseAsObjectException:(ICEException*)exc
+-(void) SBaseAsObjectException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -213,7 +208,7 @@
     [self called];
 }
 
--(void) SBaseAsSBaseException:(ICEException*)exc
+-(void) SBaseAsSBaseException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -226,7 +221,7 @@
     [self called];
 }
 
--(void) SBSKnownDerivedAsSBaseException:(ICEException*)exc
+-(void) SBSKnownDerivedAsSBaseException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -237,7 +232,7 @@
     [self called];
 }
 
--(void) SBSKnownDerivedAsSBSKnownDerivedException:(ICEException*)exc
+-(void) SBSKnownDerivedAsSBSKnownDerivedException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -248,28 +243,28 @@
     [self called];
 }
 
--(void) SBSUnknownDerivedAsSBaseException:(ICEException*)exc
+-(void) SBSUnknownDerivedAsSBaseException:(ICEException*)__unused exc
 {
     test(NO);
 }
 
--(void) SBSUnknownDerivedAsSBaseCompactResponse:(TestSlicingObjectsClientSBase*)sb
+-(void) SBSUnknownDerivedAsSBaseCompactResponse:(TestSlicingObjectsClientSBase*)__unused sb
 {
     test(NO);
 }
 
--(void) SBSUnknownDerivedAsSBaseCompactException:(ICEException*)exc
+-(void) SBSUnknownDerivedAsSBaseCompactException:(ICEException*)__unused exc
 {
     test([[exc ice_id] isEqualToString:@"::Ice::NoValueFactoryException"]);
     [self called];
 }
 
--(void) SUnknownAsObjectResponse10:(ICEObject*)o
+-(void) SUnknownAsObjectResponse10:(ICEObject*)__unused o
 {
     test(NO);
 }
 
--(void) SUnknownAsObjectException10:(ICEException*)exc
+-(void) SUnknownAsObjectException10:(ICEException*)__unused exc
 {
     test([[exc ice_id] isEqualToString:@"::Ice::NoValueFactoryException"]);
     [self called];
@@ -281,7 +276,7 @@
     [[o ice_getSlicedData] clear];
 }
 
--(void) SUnknownAsObjectException11:(ICEException*)exc
+-(void) SUnknownAsObjectException11:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -296,7 +291,7 @@
     [self called];
 }
 
--(void) oneElementCycleException:(ICEException*)exc
+-(void) oneElementCycleException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -317,7 +312,7 @@
     [self called];
 }
 
--(void) twoElementCycleException:(ICEException*)exc
+-(void) twoElementCycleException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -347,7 +342,7 @@
     [self called];
 }
 
--(void) D1AsBException:(ICEException*)exc
+-(void) D1AsBException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -371,7 +366,7 @@
     [self called];
 }
 
--(void) D1AsD1Exception:(ICEException*)exc
+-(void) D1AsD1Exception:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -399,7 +394,7 @@
     [self called];
 }
 
--(void) D2AsBException:(ICEException*)exc
+-(void) D2AsBException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -425,7 +420,7 @@
     [self called];
 }
 
--(void) paramTest1Exception:(ICEException*)exc
+-(void) paramTest1Exception:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -439,7 +434,7 @@
     breakCycles(p2);
 }
 
--(void) returnTest1Exception:(ICEException*)exc
+-(void) returnTest1Exception:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -453,7 +448,7 @@
     breakCycles(p2);
 }
 
--(void) returnTest2Exception:(ICEException*)exc
+-(void) returnTest2Exception:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -464,7 +459,7 @@
     [self called];
 }
 
--(void) returnTest3Exception:(ICEException*)exc
+-(void) returnTest3Exception:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -492,7 +487,7 @@
     breakCycles(p2);
 }
 
--(void) paramTest3Exception:(ICEException*)exc
+-(void) paramTest3Exception:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -514,7 +509,7 @@
     breakCycles(b);
 }
 
--(void) paramTest4Exception:(ICEException*)exc
+-(void) paramTest4Exception:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -525,7 +520,7 @@
     [self called];
 }
 
--(void) sequenceTestException:(ICEException*)exc
+-(void) sequenceTestException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -537,7 +532,7 @@
     [self called];
 }
 
--(void) dictionaryTestException:(ICEException*)exc
+-(void) dictionaryTestException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -631,7 +626,7 @@
     breakCycles(f);
 }
 
--(void) useForwardException:(ICEException*)exc
+-(void) useForwardException:(ICEException*)__unused exc
 {
     test(NO);
 }
@@ -1974,7 +1969,7 @@
             }
 
             TestSlicingObjectsClientCallback* cb = [TestSlicingObjectsClientCallback create];
-            [test begin_dictionaryTest:bin response:^(TestSlicingObjectsClientMutableBDict* o, TestSlicingObjectsClientMutableBDict* bout) { [cb dictionaryTestResponse:o bout:bout]; } exception:^(ICEException* e) { [cb dictionaryTestException:e]; }];
+            [test begin_dictionaryTest:bin response:^(TestSlicingObjectsClientMutableBDict* o, TestSlicingObjectsClientMutableBDict* boutP) { [cb dictionaryTestResponse:o bout:boutP]; } exception:^(ICEException* e) { [cb dictionaryTestException:e]; }];
             [cb check];
             bout = cb.bout;
             r = cb.r;
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = Client.m AllTests.m SlicingObjectsTestClient.ice SlicingObjectsForwardClient.ice
 $(test)_server_sources  = Server.m TestI.m SlicingObjectsTestServer.ice SlicingObjectsForwardServer.ice
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <slicing/objects/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <SlicingObjectsTestServer.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/slicing/objects/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/slicing/objects/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <slicing/objects/TestI.h>
@@ -159,41 +154,41 @@
     [super dealloc];
 #endif
 }
--(ICEObject*) SBaseAsObject:(ICECurrent*)current
+-(ICEObject*) SBaseAsObject:(ICECurrent*)__unused current
 {
     return [TestSlicingObjectsServerSBase sBase:@"SBase.sb"];
 }
 
--(TestSlicingObjectsServerSBase*) SBaseAsSBase:(ICECurrent*)current
+-(TestSlicingObjectsServerSBase*) SBaseAsSBase:(ICECurrent*)__unused current
 {
     return [TestSlicingObjectsServerSBase sBase:@"SBase.sb"];
 }
 
--(TestSlicingObjectsServerSBase*) SBSKnownDerivedAsSBase:(ICECurrent*)current
+-(TestSlicingObjectsServerSBase*) SBSKnownDerivedAsSBase:(ICECurrent*)__unused current
 {
     return [TestSlicingObjectsServerSBSKnownDerived sbsKnownDerived:@"SBSKnownDerived.sb"
                                                               sbskd:@"SBSKnownDerived.sbskd"];
 }
 
--(TestSlicingObjectsServerSBSKnownDerived*) SBSKnownDerivedAsSBSKnownDerived:(ICECurrent*)current
+-(TestSlicingObjectsServerSBSKnownDerived*) SBSKnownDerivedAsSBSKnownDerived:(ICECurrent*)__unused current
 {
     return [TestSlicingObjectsServerSBSKnownDerived sbsKnownDerived:@"SBSKnownDerived.sb"
                                                               sbskd:@"SBSKnownDerived.sbskd"];
 }
 
--(TestSlicingObjectsServerSBase*) SBSUnknownDerivedAsSBase:(ICECurrent*)current
+-(TestSlicingObjectsServerSBase*) SBSUnknownDerivedAsSBase:(ICECurrent*)__unused current
 {
     return [TestSlicingObjectsServerSBSUnknownDerived sbsUnknownDerived:@"SBSUnknownDerived.sb"
                                                                   sbsud:@"SBSUnknownDerived.sbsud"];
 }
 
--(TestSlicingObjectsServerSBase*) SBSUnknownDerivedAsSBaseCompact:(ICECurrent*)current
+-(TestSlicingObjectsServerSBase*) SBSUnknownDerivedAsSBaseCompact:(ICECurrent*)__unused current
 {
     return [TestSlicingObjectsServerSBSUnknownDerived sbsUnknownDerived:@"SBSUnknownDerived.sb"
                                                                   sbsud:@"SBSUnknownDerived.sbsud"];
 }
 
--(ICEObject*) SUnknownAsObject:(ICECurrent*)current
+-(ICEObject*) SUnknownAsObject:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerSUnknown* s = [TestSlicingObjectsServerSUnknown sUnknown:@"SUnknown.su" cycle:nil];
     s.cycle = s;
@@ -201,7 +196,7 @@
     return s;
 }
 
--(void) checkSUnknown:(ICEObject*)object current:(ICECurrent*)current
+-(void) checkSUnknown:(ICEObject*)object current:(ICECurrent*)__unused current
 {
     if([current encoding] == ICEEncoding_1_0)
     {
@@ -216,7 +211,7 @@
     [objects_ addObject:object];
 }
 
--(TestSlicingObjectsServerB*) oneElementCycle:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) oneElementCycle:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerB* b1 = [TestSlicingObjectsServerB b];
     b1.sb = @"B1.sb";
@@ -224,7 +219,7 @@
     [objects_ addObject:b1];
     return b1;
 }
--(TestSlicingObjectsServerB*) twoElementCycle:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) twoElementCycle:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerB* b1 = [TestSlicingObjectsServerB b];
     b1.sb = @"B1.sb";
@@ -235,7 +230,7 @@
     [objects_ addObject:b1];
     return b1;
 }
--(TestSlicingObjectsServerB*) D1AsB:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) D1AsB:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerD1* d1 = [TestSlicingObjectsServerD1 d1];
     d1.sb = @"D1.sb";
@@ -252,7 +247,7 @@
     [objects_ addObject:d1];
     return d1;
 }
--(TestSlicingObjectsServerD1*) D1AsD1:(ICECurrent*)current
+-(TestSlicingObjectsServerD1*) D1AsD1:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerD1* d1 = [TestSlicingObjectsServerD1 d1];
     d1.sb = @"D1.sb";
@@ -268,7 +263,7 @@
     [objects_ addObject:d1];
     return d1;
 }
--(TestSlicingObjectsServerB*) D2AsB:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) D2AsB:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerD2* d2 = [TestSlicingObjectsServerD2 d2];
     d2.sb = @"D2.sb";
@@ -284,7 +279,7 @@
     [objects_ addObject:d2];
     return d2;
 }
--(void) paramTest1:(TestSlicingObjectsServerB**)p1 p2:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)current
+-(void) paramTest1:(TestSlicingObjectsServerB**)p1 p2:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerD1* d1 = [TestSlicingObjectsServerD1 d1];
     d1.sb = @"D1.sb";
@@ -302,11 +297,11 @@
     [objects_ addObject:d1];
     [objects_ addObject:d2];
 }
--(void) paramTest2:(TestSlicingObjectsServerB**)p1 p1:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)current
+-(void) paramTest2:(TestSlicingObjectsServerB**)p1 p1:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)__unused current
 {
     [self paramTest1:p2 p2:p1 current:current];
 }
--(TestSlicingObjectsServerB*) paramTest3:(TestSlicingObjectsServerB**)p1 p2:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) paramTest3:(TestSlicingObjectsServerB**)p1 p2:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerD2* d2 = [TestSlicingObjectsServerD2 d2];
     d2.sb = @"D2.sb (p1 1)";
@@ -339,7 +334,7 @@
     [objects_ addObject:d4];
     return d3;
 }
--(TestSlicingObjectsServerB*) paramTest4:(TestSlicingObjectsServerB**)p1 current:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) paramTest4:(TestSlicingObjectsServerB**)p1 current:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerD4* d4 = [TestSlicingObjectsServerD4 d4];
     d4.sb = @"D4.sb (1)";
@@ -352,23 +347,23 @@
     [objects_ addObject:d4];
     return d4.p2;
 }
--(TestSlicingObjectsServerB*) returnTest1:(TestSlicingObjectsServerB**)p1 p2:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) returnTest1:(TestSlicingObjectsServerB**)p1 p2:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)__unused current
 {
     [self paramTest1:p1 p2:p2 current:current];
     return *p1;
 }
--(TestSlicingObjectsServerB*) returnTest2:(TestSlicingObjectsServerB**)p1 p1:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) returnTest2:(TestSlicingObjectsServerB**)p1 p1:(TestSlicingObjectsServerB**)p2 current:(ICECurrent*)__unused current
 {
     [self paramTest1:p2 p2:p1 current:current];
     return *p1;
 }
--(TestSlicingObjectsServerB*) returnTest3:(TestSlicingObjectsServerB*)p1 p2:(TestSlicingObjectsServerB*)p2 current:(ICECurrent*)current
+-(TestSlicingObjectsServerB*) returnTest3:(TestSlicingObjectsServerB*)p1 p2:(TestSlicingObjectsServerB*)p2 current:(ICECurrent*)__unused current
 {
     [objects_ addObject:p1];
     [objects_ addObject:p2];
     return p1;
 }
--(TestSlicingObjectsServerSS*) sequenceTest:(TestSlicingObjectsServerSS1*)p1 p2:(TestSlicingObjectsServerSS2*)p2 current:(ICECurrent*)current
+-(TestSlicingObjectsServerSS*) sequenceTest:(TestSlicingObjectsServerSS1*)p1 p2:(TestSlicingObjectsServerSS2*)p2 current:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerSS* ss = [TestSlicingObjectsServerSS ss];
     ss.c1 = p1;
@@ -379,7 +374,7 @@
     return ss;
 }
 -(TestSlicingObjectsServerBDict*) dictionaryTest:(TestSlicingObjectsServerMutableBDict*)bin
-                                            bout:(TestSlicingObjectsServerBDict**)bout current:(ICECurrent*)current
+                                            bout:(TestSlicingObjectsServerBDict**)bout current:(ICECurrent*)__unused current
 {
     int i;
     *bout = [TestSlicingObjectsServerMutableBDict dictionary];
@@ -409,13 +404,13 @@
 }
 
 -(TestSlicingObjectsServerPBase*) exchangePBase:(TestSlicingObjectsServerPBase*)pb
-                                        current:(ICECurrent*)current
+                                        current:(ICECurrent*)__unused current
 {
     [objects_ addObject:pb];
     return pb;
 }
 
--(TestSlicingObjectsServerPreserved*) PBSUnknownAsPreserved:(ICECurrent*)current
+-(TestSlicingObjectsServerPreserved*) PBSUnknownAsPreserved:(ICECurrent*)__unused current
 {
     if([current.encoding isEqual:ICEEncoding_1_0])
     {
@@ -439,7 +434,7 @@
     }
 }
 
--(void) checkPBSUnknown:(TestSlicingObjectsServerPreserved*)p current:(ICECurrent*)current
+-(void) checkPBSUnknown:(TestSlicingObjectsServerPreserved*)p current:(ICECurrent*)__unused current
 {
     if([current.encoding isEqual:ICEEncoding_1_0])
     {
@@ -459,7 +454,7 @@
     }
 }
 
--(TestSlicingObjectsServerPreserved*) PBSUnknownAsPreservedWithGraph:(ICECurrent*)current
+-(TestSlicingObjectsServerPreserved*) PBSUnknownAsPreservedWithGraph:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerPSUnknown* r = [TestSlicingObjectsServerPSUnknown alloc];
     r.pi = 5;
@@ -473,7 +468,7 @@
     return r;
 }
 
--(void) checkPBSUnknownWithGraph:(TestSlicingObjectsServerPreserved*) p current:(ICECurrent*)current
+-(void) checkPBSUnknownWithGraph:(TestSlicingObjectsServerPreserved*) p current:(ICECurrent*)__unused current
 {
     if([current.encoding isEqual:ICEEncoding_1_0])
     {
@@ -496,7 +491,7 @@
     [objects_ addObject:p];
 }
 
--(TestSlicingObjectsServerPreserved*) PBSUnknown2AsPreservedWithGraph:(ICECurrent*)current
+-(TestSlicingObjectsServerPreserved*) PBSUnknown2AsPreservedWithGraph:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerPSUnknown2* r = [TestSlicingObjectsServerPSUnknown2 alloc];
     r.pi = 5;
@@ -506,7 +501,7 @@
     return r;
 }
 
--(void) checkPBSUnknown2WithGraph:(TestSlicingObjectsServerPreserved*)p current:(ICECurrent*)current
+-(void) checkPBSUnknown2WithGraph:(TestSlicingObjectsServerPreserved*)p current:(ICECurrent*)__unused current
 {
     if([current.encoding isEqual:ICEEncoding_1_0])
     {
@@ -526,13 +521,13 @@
     [objects_ addObject:p];
 }
 
--(TestSlicingObjectsServerPNode*) exchangePNode:(TestSlicingObjectsServerPNode*)pn current:(ICECurrent*)current
+-(TestSlicingObjectsServerPNode*) exchangePNode:(TestSlicingObjectsServerPNode*)pn current:(ICECurrent*)__unused current
 {
     [objects_ addObject:pn];
     return pn;
 }
 
--(void) throwBaseAsBase:(ICECurrent*)current
+-(void) throwBaseAsBase:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerBaseException* be = [TestSlicingObjectsServerBaseException baseException];
     be.sbe = @"sbe";
@@ -542,7 +537,7 @@
     [objects_ addObject:be];
     @throw be;
 }
--(void) throwDerivedAsBase:(ICECurrent*)current
+-(void) throwDerivedAsBase:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerDerivedException* de = [TestSlicingObjectsServerDerivedException derivedException];
     de.sbe = @"sbe";
@@ -558,7 +553,7 @@
     [objects_ addObject:de];
     @throw de;
 }
--(void) throwDerivedAsDerived:(ICECurrent*)current
+-(void) throwDerivedAsDerived:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerDerivedException* de = [TestSlicingObjectsServerDerivedException derivedException];
     de.sbe = @"sbe";
@@ -574,7 +569,7 @@
     [objects_ addObject:de];
     @throw de;
 }
--(void) throwUnknownDerivedAsBase:(ICECurrent*)current
+-(void) throwUnknownDerivedAsBase:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerD2* d2 = [TestSlicingObjectsServerD2 d2];
     d2.sb = @"sb d2";
@@ -590,7 +585,7 @@
     [objects_ addObject:ude];
     @throw ude;
 }
--(void) throwPreservedException:(ICECurrent*)current
+-(void) throwPreservedException:(ICECurrent*)__unused current
 {
     TestSlicingObjectsServerPSUnknownException* ue = [TestSlicingObjectsServerPSUnknownException psUnknownException];
     ue.p = [TestSlicingObjectsServerPSUnknown2 psUnknown2];
@@ -600,7 +595,7 @@
     [objects_ addObject:ue];
     @throw ue;
 }
--(void) useForward:(TestSlicingObjectsServerForward**)f current:(ICECurrent*)current
+-(void) useForward:(TestSlicingObjectsServerForward**)f current:(ICECurrent*)__unused current
 {
     *f = [TestSlicingObjectsServerForward forward];
     (*f).h = [TestSlicingObjectsServerHidden hidden];
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/stream/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/stream/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/stream/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/stream/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -482,7 +477,7 @@
         TestStreamSmallStructS* arr2 = [TestStreamSmallStructSHelper read:in];
         [in readPendingValues];
         test([arr2 count] == [arr count]);
-        for(int j = 0; j < [arr2 count]; ++j)
+        for(int j = 0; j < (int)[arr2 count]; ++j)
         {
             test([[arr objectAtIndex:j] isEqual:[arr2 objectAtIndex:j]]);
         }
@@ -553,7 +548,7 @@
         [in readPendingValues];
         test([arr2 count] > 0);
         test([arr2 count] == [arr count]);
-        for(int j = 0; j < [arr2 count]; ++j)
+        for(int j = 0; j < (int)[arr2 count]; ++j)
         {
             TestStreamMyClass* e = [arr2 objectAtIndex:j];
             TestStreamMyClass* f = [arr objectAtIndex:j];
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/stream/StreamTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/stream/StreamTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/stream/StreamTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/stream/StreamTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/timeout/AllTests.m zeroc-ice-3.7.2/objective-c/test/Ice/timeout/AllTests.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/timeout/AllTests.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/timeout/AllTests.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -68,7 +63,7 @@
 {
     [self called];
 }
--(void) exception:(ICEException*)ex
+-(void) exception:(ICEException*)__unused ex
 {
     test(NO);
 }
@@ -184,8 +179,8 @@
         [controller holdAdapter:200];
         @try
         {
-            TestTimeoutByteSeq* seq = [TestTimeoutMutableByteSeq dataWithLength:1000000];
-            [to sendData:seq];
+            TestTimeoutByteSeq* seq2 = [TestTimeoutMutableByteSeq dataWithLength:1000000];
+            [to sendData:seq2];
         }
         @catch(ICETimeoutException*)
         {
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/timeout/Client.m zeroc-ice-3.7.2/objective-c/test/Ice/timeout/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/timeout/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/timeout/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/timeout/Server.m zeroc-ice-3.7.2/objective-c/test/Ice/timeout/Server.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/timeout/Server.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/timeout/Server.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <timeout/TestI.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/timeout/TestI.h zeroc-ice-3.7.2/objective-c/test/Ice/timeout/TestI.h
--- zeroc-ice-3.7.1/objective-c/test/Ice/timeout/TestI.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/timeout/TestI.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <TimeoutTest.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/timeout/TestI.m zeroc-ice-3.7.2/objective-c/test/Ice/timeout/TestI.m
--- zeroc-ice-3.7.1/objective-c/test/Ice/timeout/TestI.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/timeout/TestI.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <timeout/TestI.h>
 #import <objc/Ice.h>
@@ -59,15 +54,15 @@
 @end
 
 @implementation TimeoutI
--(void) op:(ICECurrent*)current
+-(void) op:(ICECurrent*)__unused current
 {
 }
 
--(void) sendData:(TestTimeoutMutableByteSeq*)seq current:(ICECurrent*)current
+-(void) sendData:(TestTimeoutMutableByteSeq*)__unused seq current:(ICECurrent*)__unused current
 {
 }
 
--(void) sleep:(ICEInt)to current:(ICECurrent*)current
+-(void) sleep:(ICEInt)to current:(ICECurrent*)__unused current
 {
     [NSThread sleepForTimeInterval:to / 1000.0];
 }
@@ -109,7 +104,7 @@
 }
 #endif
 
--(void) holdAdapter:(ICEInt)to current:(ICECurrent*)current
+-(void) holdAdapter:(ICEInt)to current:(ICECurrent*)__unused current
 {
     [adapter_ hold];
     if(to >= 0)
@@ -119,7 +114,7 @@
     }
 }
 
--(void) resumeAdapter:(ICECurrent*)current
+-(void) resumeAdapter:(ICECurrent*)__unused current
 {
     [adapter_ activate];
 }
diff -Nru zeroc-ice-3.7.1/objective-c/test/Ice/timeout/TimeoutTest.ice zeroc-ice-3.7.2/objective-c/test/Ice/timeout/TimeoutTest.ice
--- zeroc-ice-3.7.1/objective-c/test/Ice/timeout/TimeoutTest.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Ice/timeout/TimeoutTest.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/include/TestCommon.h zeroc-ice-3.7.2/objective-c/test/include/TestCommon.h
--- zeroc-ice-3.7.1/objective-c/test/include/TestCommon.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/include/TestCommon.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <Foundation/NSObject.h>
 #import <Foundation/NSException.h>
@@ -25,7 +20,7 @@
 @end
 
 #if TARGET_OS_IPHONE
-TEST_API void TestCommonInit(id, SEL);
+TEST_API void TestCommonSetOutput(id, SEL);
 TEST_API void TestCommonTestInit(id, SEL, NSString*, BOOL, BOOL);
 #endif
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/AppDelegate.h zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/AppDelegate.h
--- zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/AppDelegate.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/AppDelegate.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <UIKit/UIKit.h>
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/AppDelegate.m zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/AppDelegate.m
--- zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/AppDelegate.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/AppDelegate.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import "AppDelegate.h"
 
@@ -17,6 +12,10 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+
+    // Ensure device does not become idle
+    [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+
     return YES;
 }
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/main.m zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/main.m
--- zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/main.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/main.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
diff -Nru zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/ViewController.h zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/ViewController.h
--- zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/ViewController.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/ViewController.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <UIKit/UIKit.h>
 #import <objc/Ice/Ice.h>
diff -Nru zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/ViewController.m zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/ViewController.m
--- zeroc-ice-3.7.1/objective-c/test/ios/controller/Classes/ViewController.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/ios/controller/Classes/ViewController.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import "ViewController.h"
 #import <Controller.h>
@@ -20,6 +15,7 @@
 {
     id<ViewController> _controller;
     void* _func;
+    NSString* _exe;
     NSArray* _args;
     BOOL _ready;
     BOOL _completed;
@@ -58,7 +54,7 @@
 @end
 
 @implementation MainHelper
--(id) init:(id<ViewController>)controller func:(void*)func args:(NSArray*)args
+-(id) init:(id<ViewController>)controller func:(void*)func exe:(NSString*)exe args:(NSArray*)args
 {
     self = [super init];
     if(self == nil)
@@ -67,6 +63,7 @@
     }
     _controller = ICE_RETAIN(controller);
     _func = func;
+    _exe = ICE_RETAIN(exe);
     _args = ICE_RETAIN(args);
     _ready = FALSE;
     _completed = FALSE;
@@ -79,6 +76,7 @@
 -(void) dealloc
 {
     [_controller release];
+    [_exe release];
     [_args release];
     [_cond release];
     [_out release];
@@ -128,6 +126,14 @@
         argv[i++] = (char*)[arg UTF8String];
     }
     argv[_args.count] = 0;
+    if([_exe isEqualToString:@"client"] || [_exe isEqualToString:@"collocated"])
+    {
+        TestCommonSetOutput(self, @selector(print:));
+    }
+    else
+    {
+        TestCommonTestInit(self, @selector(serverReady), @"", NO, NO);
+    }
     @try
     {
         [self completed:mainEntryPoint((int)_args.count, argv)];
@@ -137,6 +143,10 @@
         [self print:[NSString stringWithFormat:@"unexpected exception while running `%s':%@\n", argv[0], ex]];
         [self completed:EXIT_FAILURE];
     }
+    if([_exe isEqualToString:@"client"] || [_exe isEqualToString:@"collocated"])
+    {
+        TestCommonSetOutput(nil, nil);
+    }
     free(argv);
 }
 -(void) completed:(int)status
@@ -289,16 +299,8 @@
         @throw [TestCommonProcessFailedException processFailedException:
                     [NSString stringWithFormat:@"couldn't find %@", func]];
     }
-    MainHelper* helper = ICE_AUTORELEASE([[MainHelper alloc] init:_controller func:sym args:args]);
-    if([exe isEqualToString:@"client"] || [exe isEqualToString:@"collocated"])
-    {
-        TestCommonInit(helper, @selector(print:));
-    }
-    else
-    {
-        TestCommonInit(helper, @selector(print:));
-        TestCommonTestInit(helper, @selector(serverReady), @"", NO, NO);
-    }
+    args = [@[[NSString stringWithFormat:@"%@ %@", testSuite, exe]] arrayByAddingObjectsFromArray:args];
+    MainHelper* helper = ICE_AUTORELEASE([[MainHelper alloc] init:_controller func:sym exe:exe args:args]);
 
     //
     // Use a 768KB thread stack size for the objects test. This is necessary when running the
diff -Nru zeroc-ice-3.7.1/objective-c/test/ios/controller/Makefile.mk zeroc-ice-3.7.2/objective-c/test/ios/controller/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/ios/controller/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/ios/controller/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_type                 = xcode
 $(project)_platforms            = iphonesimulator iphoneos
diff -Nru "/tmp/woxfVAWQuO/zeroc-ice-3.7.1/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj" "/tmp/8caLpp1yxR/zeroc-ice-3.7.2/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj"
--- "/tmp/woxfVAWQuO/zeroc-ice-3.7.1/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj"	2018-04-20 15:02:08.000000000 +0000
+++ "/tmp/8caLpp1yxR/zeroc-ice-3.7.2/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj"	2019-02-05 18:03:04.000000000 +0000
@@ -11,10 +11,6 @@
 		140C3C701E02FCE000142503 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B821E02FCE000142503 /* Client.m */; };
 		140C3C741E02FCE000142503 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B841E02FCE000142503 /* Server.m */; };
 		140C3C761E02FCE000142503 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B861E02FCE000142503 /* TestI.m */; };
-		140C3C781E02FCE000142503 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B881E02FCE000142503 /* AllTests.m */; };
-		140C3C7A1E02FCE000142503 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B891E02FCE000142503 /* Client.m */; };
-		140C3C821E02FCE000142503 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B8D1E02FCE000142503 /* Server.m */; };
-		140C3C841E02FCE000142503 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B8F1E02FCE000142503 /* TestI.m */; };
 		140C3C861E02FCE000142503 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B911E02FCE000142503 /* AllTests.m */; };
 		140C3C881E02FCE000142503 /* BatchOneways.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B921E02FCE000142503 /* BatchOneways.m */; };
 		140C3C8A1E02FCE000142503 /* BatchOnewaysAMI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B931E02FCE000142503 /* BatchOnewaysAMI.m */; };
@@ -122,7 +118,6 @@
 		140C3DC61E02FCE100142503 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C691E02FCE000142503 /* Server.m */; };
 		140C3DCC1E02FCE100142503 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C6D1E02FCE000142503 /* TestI.m */; };
 		140C3DED1E02FF0900142503 /* MetricsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B831E02FCE000142503 /* MetricsTest.ice */; };
-		140C3DEE1E02FF0900142503 /* ObjectsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B8C1E02FCE000142503 /* ObjectsTest.ice */; };
 		140C3DEF1E02FF0900142503 /* OperationsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B991E02FCE000142503 /* OperationsTest.ice */; };
 		140C3DF01E02FF0900142503 /* OptionalTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BA21E02FCE000142503 /* OptionalTest.ice */; };
 		140C3DF11E02FF0900142503 /* ProxyTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BAA1E02FCE000142503 /* ProxyTest.ice */; };
@@ -157,18 +152,9 @@
 		140C3E181E03E87D00142503 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E171E03E87D00142503 /* Collocated.m */; };
 		140C3E1A1E03EAAA00142503 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E191E03EAAA00142503 /* Collocated.m */; };
 		140C3E1C1E03EABE00142503 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E1B1E03EABE00142503 /* Collocated.m */; };
-		140C3E1E1E03EAD000142503 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E1D1E03EAD000142503 /* Collocated.m */; };
 		140C3E201E03EAF300142503 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E1F1E03EAF300142503 /* Collocated.m */; };
 		140C3E221E03EBE000142503 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E211E03EBE000142503 /* Collocated.m */; };
 		143A09AF1EB3895D00C8F91F /* cacert.pem in Resources */ = {isa = PBXBuildFile; fileRef = 143A09AE1EB3895D00C8F91F /* cacert.pem */; };
-		145C4BE61E36061900A855C7 /* TestIntfI.m in Sources */ = {isa = PBXBuildFile; fileRef = 145C4BE31E36061900A855C7 /* TestIntfI.m */; };
-		145C4BE71E36061900A855C7 /* ObjectsDerived.ice in Resources */ = {isa = PBXBuildFile; fileRef = 145C4BE41E36061900A855C7 /* ObjectsDerived.ice */; };
-		145C4BE81E36061900A855C7 /* ObjectsDerivedEx.ice in Resources */ = {isa = PBXBuildFile; fileRef = 145C4BE51E36061900A855C7 /* ObjectsDerivedEx.ice */; };
-		145C4BE91E36064B00A855C7 /* ObjectsDerived.ice in Sources */ = {isa = PBXBuildFile; fileRef = 145C4BE41E36061900A855C7 /* ObjectsDerived.ice */; };
-		145C4BEA1E36064B00A855C7 /* ObjectsDerivedEx.ice in Sources */ = {isa = PBXBuildFile; fileRef = 145C4BE51E36061900A855C7 /* ObjectsDerivedEx.ice */; };
-		145C4BEB1E36069B00A855C7 /* ObjectsDerived.ice in Sources */ = {isa = PBXBuildFile; fileRef = 145C4BE41E36061900A855C7 /* ObjectsDerived.ice */; };
-		145C4BEC1E36069B00A855C7 /* ObjectsDerivedEx.ice in Sources */ = {isa = PBXBuildFile; fileRef = 145C4BE51E36061900A855C7 /* ObjectsDerivedEx.ice */; };
-		145C4BED1E3606FF00A855C7 /* TestIntfI.m in Sources */ = {isa = PBXBuildFile; fileRef = 145C4BE31E36061900A855C7 /* TestIntfI.m */; };
 		146148791EE15DFE000ECDB3 /* OnewaysAMI.m in Sources */ = {isa = PBXBuildFile; fileRef = 146148771EE15DFE000ECDB3 /* OnewaysAMI.m */; };
 		1461487A1EE15DFE000ECDB3 /* TwowaysAMI.m in Sources */ = {isa = PBXBuildFile; fileRef = 146148781EE15DFE000ECDB3 /* TwowaysAMI.m */; };
 		14863D8D1EE7682500D3AA9B /* OnewaysAMI.m in Sources */ = {isa = PBXBuildFile; fileRef = 146148771EE15DFE000ECDB3 /* OnewaysAMI.m */; };
@@ -182,6 +168,10 @@
 		14905C611DF98FD8002AE61B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 14905C601DF98FD8002AE61B /* Assets.xcassets */; };
 		14905C641DF98FD8002AE61B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14905C621DF98FD8002AE61B /* LaunchScreen.storyboard */; };
 		14905C711DF9923D002AE61B /* Controller.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14905C6D1DF991F2002AE61B /* Controller.ice */; };
+		14A4CE0A215A4C31002AD8F7 /* ObjectsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14A4CE08215A4C06002AD8F7 /* ObjectsTest.ice */; };
+		14A4CE0B215A4C3E002AD8F7 /* ObjectsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14A4CE08215A4C06002AD8F7 /* ObjectsTest.ice */; };
+		14A4CE0C215A4C3E002AD8F7 /* ObjectsDerived.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14BE215A491100499968 /* ObjectsDerived.ice */; };
+		14A4CE0D215A4C3E002AD8F7 /* ObjectsDerivedEx.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14BC215A491100499968 /* ObjectsDerivedEx.ice */; };
 		14B7DEA21E04103F001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7DEA11E04103F001D0109 /* Collocated.m */; };
 		14B7DEA41E04113A001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7DEA31E04113A001D0109 /* Collocated.m */; };
 		14B7DEA61E041157001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7DEA51E041157001D0109 /* Collocated.m */; };
@@ -189,7 +179,6 @@
 		14B7DEAA1E04119D001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7DEA91E04119D001D0109 /* Collocated.m */; };
 		14B7DEAD1E043085001D0109 /* InheritanceTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E0C1E03004300142503 /* InheritanceTest.ice */; };
 		14B7DEAE1E043085001D0109 /* MetricsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B831E02FCE000142503 /* MetricsTest.ice */; };
-		14B7DEAF1E043085001D0109 /* ObjectsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B8C1E02FCE000142503 /* ObjectsTest.ice */; };
 		14B7DEB01E043085001D0109 /* OperationsTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B991E02FCE000142503 /* OperationsTest.ice */; };
 		14B7DEB11E043085001D0109 /* InterceptorTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E101E03007900142503 /* InterceptorTest.ice */; };
 		14B7DEB21E043085001D0109 /* OptionalTest.ice in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BA21E02FCE000142503 /* OptionalTest.ice */; };
@@ -260,9 +249,7 @@
 		14B7DEF41E043085001D0109 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C271E02FCE000142503 /* AllTests.m */; };
 		14B7DEF51E043085001D0109 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C3B1E02FCE000142503 /* Client.m */; };
 		14B7DEF61E043085001D0109 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BFD1E02FCE000142503 /* AllTests.m */; };
-		14B7DEF71E043085001D0109 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B8F1E02FCE000142503 /* TestI.m */; };
 		14B7DEF81E043085001D0109 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C2E1E02FCE000142503 /* Server.m */; };
-		14B7DEF91E043085001D0109 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B891E02FCE000142503 /* Client.m */; };
 		14B7DEFA1E043085001D0109 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C181E02FCE000142503 /* AllTests.m */; };
 		14B7DEFB1E043085001D0109 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BDC1E02FCE000142503 /* Server.m */; };
 		14B7DEFC1E043085001D0109 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C581DF98FD8002AE61B /* AppDelegate.m */; };
@@ -305,7 +292,6 @@
 		14B7DF221E043085001D0109 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BA31E02FCE000142503 /* Server.m */; };
 		14B7DF231E043085001D0109 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BA11E02FCE000142503 /* Client.m */; };
 		14B7DF241E043085001D0109 /* MyObjectI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C481E02FCE000142503 /* MyObjectI.m */; };
-		14B7DF251E043085001D0109 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B881E02FCE000142503 /* AllTests.m */; };
 		14B7DF261E043085001D0109 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C0A1E02FCE000142503 /* Client.m */; };
 		14B7DF271E043085001D0109 /* BatchOnewaysAMI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B931E02FCE000142503 /* BatchOnewaysAMI.m */; };
 		14B7DF281E043085001D0109 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C301E02FCE000142503 /* TestI.m */; };
@@ -317,7 +303,6 @@
 		14B7DF2E1E043085001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E1F1E03EAF300142503 /* Collocated.m */; };
 		14B7DF2F1E043085001D0109 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14905C551DF98FD8002AE61B /* main.m */; };
 		14B7DF301E043085001D0109 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BD61E02FCE000142503 /* TestI.m */; };
-		14B7DF311E043085001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3E1D1E03EAD000142503 /* Collocated.m */; };
 		14B7DF321E043085001D0109 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C691E02FCE000142503 /* Server.m */; };
 		14B7DF331E043085001D0109 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BB31E02FCE000142503 /* Server.m */; };
 		14B7DF341E043085001D0109 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C641E02FCE000142503 /* TestI.m */; };
@@ -330,7 +315,6 @@
 		14B7DF3B1E043085001D0109 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3C5E1E02FCE000142503 /* Client.m */; };
 		14B7DF3C1E043085001D0109 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3BAB1E02FCE000142503 /* Server.m */; };
 		14B7DF3D1E043085001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7DEA51E041157001D0109 /* Collocated.m */; };
-		14B7DF3E1E043085001D0109 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B8D1E02FCE000142503 /* Server.m */; };
 		14B7DF3F1E043085001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7DEA11E04103F001D0109 /* Collocated.m */; };
 		14B7DF401E043085001D0109 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7DEA31E04113A001D0109 /* Collocated.m */; };
 		14B7DF411E043085001D0109 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 140C3B9C1E02FCE000142503 /* TestI.m */; };
@@ -355,6 +339,20 @@
 		14B7DF681E043085001D0109 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 14905C601DF98FD8002AE61B /* Assets.xcassets */; };
 		14B7DF721E043085001D0109 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14905C5D1DF98FD8002AE61B /* Main.storyboard */; };
 		14C8F6201EB39722009B4CEC /* cacert.pem in Resources */ = {isa = PBXBuildFile; fileRef = 143A09AE1EB3895D00C8F91F /* cacert.pem */; };
+		14CF14A4215A485400499968 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF149B215A485300499968 /* Server.m */; };
+		14CF14A5215A485400499968 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF149B215A485300499968 /* Server.m */; };
+		14CF14A6215A485400499968 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF149C215A485300499968 /* Client.m */; };
+		14CF14A7215A485400499968 /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF149C215A485300499968 /* Client.m */; };
+		14CF14AE215A485400499968 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A0215A485300499968 /* AllTests.m */; };
+		14CF14AF215A485400499968 /* AllTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A0215A485300499968 /* AllTests.m */; };
+		14CF14B0215A485400499968 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A1215A485400499968 /* TestI.m */; };
+		14CF14B1215A485400499968 /* TestI.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A1215A485400499968 /* TestI.m */; };
+		14CF14B2215A485400499968 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A2215A485400499968 /* Collocated.m */; };
+		14CF14B3215A485400499968 /* Collocated.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A2215A485400499968 /* Collocated.m */; };
+		14CF14B4215A485400499968 /* TestIntfI.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A3215A485400499968 /* TestIntfI.m */; };
+		14CF14B5215A485400499968 /* TestIntfI.m in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14A3215A485400499968 /* TestIntfI.m */; };
+		14CF14CB215A4A7800499968 /* ObjectsDerived.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14BE215A491100499968 /* ObjectsDerived.ice */; };
+		14CF14CC215A4A7800499968 /* ObjectsDerivedEx.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14BC215A491100499968 /* ObjectsDerivedEx.ice */; };
 		14FFBAA01E29361A00EA55AF /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14FFBA9F1E29361A00EA55AF /* ExternalAccessory.framework */; };
 		14FFBAA11E29362900EA55AF /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14FFBA9F1E29361A00EA55AF /* ExternalAccessory.framework */; };
 /* End PBXBuildFile section */
@@ -370,7 +368,7 @@
 				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m",
 				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
 			);
-			script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper";
+			script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper\n";
 		};
 		14B7DF791E043085001D0109 /* PBXBuildRule */ = {
 			isa = PBXBuildRule;
@@ -382,7 +380,7 @@
 				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m",
 				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
 			);
-			script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper";
+			script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper\n";
 		};
 /* End PBXBuildRule section */
 
@@ -393,12 +391,6 @@
 		140C3B841E02FCE000142503 /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Server.m; sourceTree = "<group>"; };
 		140C3B851E02FCE000142503 /* TestI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestI.h; sourceTree = "<group>"; };
 		140C3B861E02FCE000142503 /* TestI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestI.m; sourceTree = "<group>"; };
-		140C3B881E02FCE000142503 /* AllTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTests.m; sourceTree = "<group>"; };
-		140C3B891E02FCE000142503 /* Client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Client.m; sourceTree = "<group>"; };
-		140C3B8C1E02FCE000142503 /* ObjectsTest.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ObjectsTest.ice; sourceTree = "<group>"; };
-		140C3B8D1E02FCE000142503 /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Server.m; sourceTree = "<group>"; };
-		140C3B8E1E02FCE000142503 /* TestI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestI.h; sourceTree = "<group>"; };
-		140C3B8F1E02FCE000142503 /* TestI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestI.m; sourceTree = "<group>"; };
 		140C3B911E02FCE000142503 /* AllTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTests.m; sourceTree = "<group>"; };
 		140C3B921E02FCE000142503 /* BatchOneways.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BatchOneways.m; sourceTree = "<group>"; };
 		140C3B931E02FCE000142503 /* BatchOnewaysAMI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BatchOnewaysAMI.m; sourceTree = "<group>"; };
@@ -566,13 +558,9 @@
 		140C3E171E03E87D00142503 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		140C3E191E03EAAA00142503 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		140C3E1B1E03EABE00142503 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
-		140C3E1D1E03EAD000142503 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		140C3E1F1E03EAF300142503 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		140C3E211E03EBE000142503 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		143A09AE1EB3895D00C8F91F /* cacert.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cacert.pem; path = ../../../../certs/cacert.pem; sourceTree = "<group>"; };
-		145C4BE31E36061900A855C7 /* TestIntfI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestIntfI.m; sourceTree = "<group>"; };
-		145C4BE41E36061900A855C7 /* ObjectsDerived.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ObjectsDerived.ice; sourceTree = "<group>"; };
-		145C4BE51E36061900A855C7 /* ObjectsDerivedEx.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ObjectsDerivedEx.ice; sourceTree = "<group>"; };
 		146148771EE15DFE000ECDB3 /* OnewaysAMI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnewaysAMI.m; sourceTree = "<group>"; };
 		146148781EE15DFE000ECDB3 /* TwowaysAMI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TwowaysAMI.m; sourceTree = "<group>"; };
 		148ABA171DFB12C800594F70 /* client.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; name = client.p12; path = ../../../../certs/client.p12; sourceTree = "<group>"; };
@@ -589,12 +577,22 @@
 		14905C631DF98FD8002AE61B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		14905C651DF98FD8002AE61B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		14905C6D1DF991F2002AE61B /* Controller.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Controller.ice; path = ../../../../../scripts/Controller.ice; sourceTree = "<group>"; };
+		14A4CE08215A4C06002AD8F7 /* ObjectsTest.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ObjectsTest.ice; path = ../../Ice/objects/ObjectsTest.ice; sourceTree = "<group>"; };
 		14B7DEA11E04103F001D0109 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		14B7DEA31E04113A001D0109 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		14B7DEA51E041157001D0109 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		14B7DEA71E041173001D0109 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		14B7DEA91E04119D001D0109 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Collocated.m; sourceTree = "<group>"; };
 		14B7DF7D1E043085001D0109 /* Objective-C ARC Test Controller.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Objective-C ARC Test Controller.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		14CF149A215A485300499968 /* TestI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestI.h; path = ../../Ice/objects/TestI.h; sourceTree = "<group>"; };
+		14CF149B215A485300499968 /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Server.m; path = ../../Ice/objects/Server.m; sourceTree = "<group>"; };
+		14CF149C215A485300499968 /* Client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Client.m; path = ../../Ice/objects/Client.m; sourceTree = "<group>"; };
+		14CF14A0215A485300499968 /* AllTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AllTests.m; path = ../../Ice/objects/AllTests.m; sourceTree = "<group>"; };
+		14CF14A1215A485400499968 /* TestI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestI.m; path = ../../Ice/objects/TestI.m; sourceTree = "<group>"; };
+		14CF14A2215A485400499968 /* Collocated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Collocated.m; path = ../../Ice/objects/Collocated.m; sourceTree = "<group>"; };
+		14CF14A3215A485400499968 /* TestIntfI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestIntfI.m; path = ../../Ice/objects/TestIntfI.m; sourceTree = "<group>"; };
+		14CF14BC215A491100499968 /* ObjectsDerivedEx.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ObjectsDerivedEx.ice; path = ../../Ice/objects/ObjectsDerivedEx.ice; sourceTree = "<group>"; };
+		14CF14BE215A491100499968 /* ObjectsDerived.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ObjectsDerived.ice; path = ../../Ice/objects/ObjectsDerived.ice; sourceTree = "<group>"; };
 		14FFBA9F1E29361A00EA55AF /* ExternalAccessory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExternalAccessory.framework; path = System/Library/Frameworks/ExternalAccessory.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -621,8 +619,8 @@
 		140C31281E02F7FF00142503 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				14CF1432215A47DF00499968 /* objects */,
 				140C3B801E02FCE000142503 /* metrics */,
-				140C3B871E02FCE000142503 /* objects */,
 				140C3B901E02FCE000142503 /* operations */,
 				140C3B9F1E02FCE000142503 /* optional */,
 				140C3BA61E02FCE000142503 /* proxy */,
@@ -668,24 +666,6 @@
 			path = ../../Ice/metrics;
 			sourceTree = "<group>";
 		};
-		140C3B871E02FCE000142503 /* objects */ = {
-			isa = PBXGroup;
-			children = (
-				145C4BE31E36061900A855C7 /* TestIntfI.m */,
-				145C4BE41E36061900A855C7 /* ObjectsDerived.ice */,
-				145C4BE51E36061900A855C7 /* ObjectsDerivedEx.ice */,
-				140C3E1D1E03EAD000142503 /* Collocated.m */,
-				140C3B881E02FCE000142503 /* AllTests.m */,
-				140C3B891E02FCE000142503 /* Client.m */,
-				140C3B8C1E02FCE000142503 /* ObjectsTest.ice */,
-				140C3B8D1E02FCE000142503 /* Server.m */,
-				140C3B8E1E02FCE000142503 /* TestI.h */,
-				140C3B8F1E02FCE000142503 /* TestI.m */,
-			);
-			name = objects;
-			path = ../../Ice/objects;
-			sourceTree = "<group>";
-		};
 		140C3B901E02FCE000142503 /* operations */ = {
 			isa = PBXGroup;
 			children = (
@@ -1150,6 +1130,23 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		14CF1432215A47DF00499968 /* objects */ = {
+			isa = PBXGroup;
+			children = (
+				14A4CE08215A4C06002AD8F7 /* ObjectsTest.ice */,
+				14CF14BE215A491100499968 /* ObjectsDerived.ice */,
+				14CF14BC215A491100499968 /* ObjectsDerivedEx.ice */,
+				14CF14A0215A485300499968 /* AllTests.m */,
+				14CF149C215A485300499968 /* Client.m */,
+				14CF14A2215A485400499968 /* Collocated.m */,
+				14CF149B215A485300499968 /* Server.m */,
+				14CF149A215A485300499968 /* TestI.h */,
+				14CF14A1215A485400499968 /* TestI.m */,
+				14CF14A3215A485400499968 /* TestIntfI.m */,
+			);
+			name = objects;
+			sourceTree = "<group>";
+		};
 		14FFBA9E1E29361A00EA55AF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -1255,8 +1252,6 @@
 				143A09AF1EB3895D00C8F91F /* cacert.pem in Resources */,
 				14905C611DF98FD8002AE61B /* Assets.xcassets in Resources */,
 				14905C5F1DF98FD8002AE61B /* Main.storyboard in Resources */,
-				145C4BE81E36061900A855C7 /* ObjectsDerivedEx.ice in Resources */,
-				145C4BE71E36061900A855C7 /* ObjectsDerived.ice in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1280,12 +1275,13 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				145C4BEB1E36069B00A855C7 /* ObjectsDerived.ice in Sources */,
-				145C4BEC1E36069B00A855C7 /* ObjectsDerivedEx.ice in Sources */,
+				14A4CE0A215A4C31002AD8F7 /* ObjectsTest.ice in Sources */,
+				14CF14CB215A4A7800499968 /* ObjectsDerived.ice in Sources */,
+				14CF14CC215A4A7800499968 /* ObjectsDerivedEx.ice in Sources */,
 				140C3E0F1E03005200142503 /* InheritanceTest.ice in Sources */,
 				140C3DED1E02FF0900142503 /* MetricsTest.ice in Sources */,
-				140C3DEE1E02FF0900142503 /* ObjectsTest.ice in Sources */,
 				140C3DEF1E02FF0900142503 /* OperationsTest.ice in Sources */,
+				14CF14B0215A485400499968 /* TestI.m in Sources */,
 				140C3E131E03007D00142503 /* InterceptorTest.ice in Sources */,
 				140C3DF01E02FF0900142503 /* OptionalTest.ice in Sources */,
 				140C3DF11E02FF0900142503 /* ProxyTest.ice in Sources */,
@@ -1297,7 +1293,6 @@
 				140C3DF71E02FF0900142503 /* ACMTest.ice in Sources */,
 				140C3DF81E02FF0900142503 /* AdapterDeactivationTest.ice in Sources */,
 				140C3DF91E02FF0900142503 /* AdminTest.ice in Sources */,
-				145C4BE61E36061900A855C7 /* TestIntfI.m in Sources */,
 				140C3DFA1E02FF0900142503 /* AMITest.ice in Sources */,
 				140C3DFB1E02FF0900142503 /* BindingTest.ice in Sources */,
 				140C3DFC1E02FF0900142503 /* DefaultServantTest.ice in Sources */,
@@ -1313,11 +1308,13 @@
 				140C3E071E02FF0900142503 /* LocationTest.ice in Sources */,
 				140C3E081E02FF0900142503 /* SlicingExceptionsTestClient.ice in Sources */,
 				140C3E091E02FF0900142503 /* SlicingExceptionsTestServer.ice in Sources */,
+				14CF14AE215A485400499968 /* AllTests.m in Sources */,
 				140C3E0A1E02FF0900142503 /* SlicingObjectsTestClient.ice in Sources */,
 				140C3E0B1E02FF0900142503 /* SlicingObjectsTestServer.ice in Sources */,
 				140C3D141E02FCE100142503 /* TestI.m in Sources */,
 				146148791EE15DFE000ECDB3 /* OnewaysAMI.m in Sources */,
 				140C3CCA1E02FCE000142503 /* ServantLocatorI.m in Sources */,
+				14CF14A6215A485400499968 /* Client.m in Sources */,
 				140C3DA61E02FCE100142503 /* Client.m in Sources */,
 				140C3D521E02FCE100142503 /* Client.m in Sources */,
 				140C3CF41E02FCE100142503 /* AllTests.m in Sources */,
@@ -1357,14 +1354,14 @@
 				140C3D661E02FCE100142503 /* AllTests.m in Sources */,
 				140C3D841E02FCE100142503 /* Client.m in Sources */,
 				140C3D281E02FCE100142503 /* AllTests.m in Sources */,
-				140C3C841E02FCE000142503 /* TestI.m in Sources */,
 				140C3D721E02FCE100142503 /* Server.m in Sources */,
-				140C3C7A1E02FCE000142503 /* Client.m in Sources */,
 				140C3D501E02FCE100142503 /* AllTests.m in Sources */,
 				140C3CFA1E02FCE100142503 /* Server.m in Sources */,
 				14905C591DF98FD8002AE61B /* AppDelegate.m in Sources */,
 				140C3D801E02FCE100142503 /* TestI.m in Sources */,
 				140C3D0E1E02FCE100142503 /* Client.m in Sources */,
+				14CF14A4215A485400499968 /* Server.m in Sources */,
+				14CF14B2215A485400499968 /* Collocated.m in Sources */,
 				140C3D8C1E02FCE100142503 /* TestI.m in Sources */,
 				140C3CE41E02FCE100142503 /* TestI.m in Sources */,
 				140C3CEE1E02FCE100142503 /* Server.m in Sources */,
@@ -1373,6 +1370,7 @@
 				140C3C9C1E02FCE000142503 /* Twoways.m in Sources */,
 				140C3D441E02FCE100142503 /* AllTests.m in Sources */,
 				140C3CDE1E02FCE100142503 /* AllTests.m in Sources */,
+				14CF14B4215A485400499968 /* TestIntfI.m in Sources */,
 				140C3D001E02FCE100142503 /* AllTests.m in Sources */,
 				140C3CD41E02FCE100142503 /* Client.m in Sources */,
 				140C3D7E1E02FCE100142503 /* Server.m in Sources */,
@@ -1403,7 +1401,6 @@
 				140C3CA61E02FCE000142503 /* Server.m in Sources */,
 				140C3CA21E02FCE000142503 /* Client.m in Sources */,
 				140C3D961E02FCE100142503 /* MyObjectI.m in Sources */,
-				140C3C781E02FCE000142503 /* AllTests.m in Sources */,
 				140C3D3C1E02FCE100142503 /* Client.m in Sources */,
 				140C3C8A1E02FCE000142503 /* BatchOnewaysAMI.m in Sources */,
 				140C3D741E02FCE100142503 /* TestI.m in Sources */,
@@ -1415,7 +1412,6 @@
 				140C3E201E03EAF300142503 /* Collocated.m in Sources */,
 				14905C561DF98FD8002AE61B /* main.m in Sources */,
 				140C3CF01E02FCE100142503 /* TestI.m in Sources */,
-				140C3E1E1E03EAD000142503 /* Collocated.m in Sources */,
 				140C3DC61E02FCE100142503 /* Server.m in Sources */,
 				140C3CBE1E02FCE000142503 /* Server.m in Sources */,
 				140C3DBE1E02FCE100142503 /* TestI.m in Sources */,
@@ -1428,7 +1424,6 @@
 				140C3DB41E02FCE100142503 /* Client.m in Sources */,
 				140C3CB21E02FCE000142503 /* Server.m in Sources */,
 				14B7DEA61E041157001D0109 /* Collocated.m in Sources */,
-				140C3C821E02FCE000142503 /* Server.m in Sources */,
 				14B7DEA21E04103F001D0109 /* Collocated.m in Sources */,
 				14B7DEA41E04113A001D0109 /* Collocated.m in Sources */,
 				140C3C9A1E02FCE000142503 /* TestI.m in Sources */,
@@ -1454,14 +1449,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				14A4CE0B215A4C3E002AD8F7 /* ObjectsTest.ice in Sources */,
+				14A4CE0C215A4C3E002AD8F7 /* ObjectsDerived.ice in Sources */,
+				14A4CE0D215A4C3E002AD8F7 /* ObjectsDerivedEx.ice in Sources */,
 				14863D8D1EE7682500D3AA9B /* OnewaysAMI.m in Sources */,
 				14863D8E1EE7682500D3AA9B /* TwowaysAMI.m in Sources */,
-				145C4BED1E3606FF00A855C7 /* TestIntfI.m in Sources */,
-				145C4BE91E36064B00A855C7 /* ObjectsDerived.ice in Sources */,
-				145C4BEA1E36064B00A855C7 /* ObjectsDerivedEx.ice in Sources */,
 				14B7DEAD1E043085001D0109 /* InheritanceTest.ice in Sources */,
+				14CF14B1215A485400499968 /* TestI.m in Sources */,
 				14B7DEAE1E043085001D0109 /* MetricsTest.ice in Sources */,
-				14B7DEAF1E043085001D0109 /* ObjectsTest.ice in Sources */,
 				14B7DEB01E043085001D0109 /* OperationsTest.ice in Sources */,
 				14B7DEB11E043085001D0109 /* InterceptorTest.ice in Sources */,
 				14B7DEB21E043085001D0109 /* OptionalTest.ice in Sources */,
@@ -1487,11 +1482,13 @@
 				14B7DEC61E043085001D0109 /* InfoTest.ice in Sources */,
 				14B7DEC71E043085001D0109 /* InvokeTest.ice in Sources */,
 				14B7DEC81E043085001D0109 /* LocationTest.ice in Sources */,
+				14CF14AF215A485400499968 /* AllTests.m in Sources */,
 				14B7DEC91E043085001D0109 /* SlicingExceptionsTestClient.ice in Sources */,
 				14B7DECA1E043085001D0109 /* SlicingExceptionsTestServer.ice in Sources */,
 				14B7DECB1E043085001D0109 /* SlicingObjectsTestClient.ice in Sources */,
 				14B7DECC1E043085001D0109 /* SlicingObjectsTestServer.ice in Sources */,
 				14B7DECD1E043085001D0109 /* TestI.m in Sources */,
+				14CF14A7215A485400499968 /* Client.m in Sources */,
 				14B7DECE1E043085001D0109 /* ServantLocatorI.m in Sources */,
 				14B7DECF1E043085001D0109 /* Client.m in Sources */,
 				14B7DED01E043085001D0109 /* Client.m in Sources */,
@@ -1532,13 +1529,13 @@
 				14B7DEF41E043085001D0109 /* AllTests.m in Sources */,
 				14B7DEF51E043085001D0109 /* Client.m in Sources */,
 				14B7DEF61E043085001D0109 /* AllTests.m in Sources */,
-				14B7DEF71E043085001D0109 /* TestI.m in Sources */,
 				14B7DEF81E043085001D0109 /* Server.m in Sources */,
-				14B7DEF91E043085001D0109 /* Client.m in Sources */,
 				14B7DEFA1E043085001D0109 /* AllTests.m in Sources */,
 				14B7DEFB1E043085001D0109 /* Server.m in Sources */,
 				14B7DEFC1E043085001D0109 /* AppDelegate.m in Sources */,
 				14B7DEFD1E043085001D0109 /* TestI.m in Sources */,
+				14CF14A5215A485400499968 /* Server.m in Sources */,
+				14CF14B3215A485400499968 /* Collocated.m in Sources */,
 				14B7DEFE1E043085001D0109 /* Client.m in Sources */,
 				14B7DEFF1E043085001D0109 /* TestI.m in Sources */,
 				14B7DF001E043085001D0109 /* TestI.m in Sources */,
@@ -1547,6 +1544,7 @@
 				14B7DF031E043085001D0109 /* Server.m in Sources */,
 				14B7DF041E043085001D0109 /* Twoways.m in Sources */,
 				14B7DF051E043085001D0109 /* AllTests.m in Sources */,
+				14CF14B5215A485400499968 /* TestIntfI.m in Sources */,
 				14B7DF071E043085001D0109 /* AllTests.m in Sources */,
 				14B7DF081E043085001D0109 /* AllTests.m in Sources */,
 				14B7DF091E043085001D0109 /* Client.m in Sources */,
@@ -1577,7 +1575,6 @@
 				14B7DF221E043085001D0109 /* Server.m in Sources */,
 				14B7DF231E043085001D0109 /* Client.m in Sources */,
 				14B7DF241E043085001D0109 /* MyObjectI.m in Sources */,
-				14B7DF251E043085001D0109 /* AllTests.m in Sources */,
 				14B7DF261E043085001D0109 /* Client.m in Sources */,
 				14B7DF271E043085001D0109 /* BatchOnewaysAMI.m in Sources */,
 				14B7DF281E043085001D0109 /* TestI.m in Sources */,
@@ -1589,7 +1586,6 @@
 				14B7DF2E1E043085001D0109 /* Collocated.m in Sources */,
 				14B7DF2F1E043085001D0109 /* main.m in Sources */,
 				14B7DF301E043085001D0109 /* TestI.m in Sources */,
-				14B7DF311E043085001D0109 /* Collocated.m in Sources */,
 				14B7DF321E043085001D0109 /* Server.m in Sources */,
 				14B7DF331E043085001D0109 /* Server.m in Sources */,
 				14B7DF341E043085001D0109 /* TestI.m in Sources */,
@@ -1602,7 +1598,6 @@
 				14B7DF3B1E043085001D0109 /* Client.m in Sources */,
 				14B7DF3C1E043085001D0109 /* Server.m in Sources */,
 				14B7DF3D1E043085001D0109 /* Collocated.m in Sources */,
-				14B7DF3E1E043085001D0109 /* Server.m in Sources */,
 				14B7DF3F1E043085001D0109 /* Collocated.m in Sources */,
 				14B7DF401E043085001D0109 /* Collocated.m in Sources */,
 				14B7DF411E043085001D0109 /* TestI.m in Sources */,
@@ -1649,7 +1644,6 @@
 		14905C661DF98FD8002AE61B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -1686,6 +1680,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					ICE_STATIC_LIBS,
 					"DEBUG=1",
 					"$(inherited)",
 				);
@@ -1705,7 +1700,6 @@
 		14905C671DF98FD8002AE61B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk";
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -1739,6 +1733,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = ICE_STATIC_LIBS;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1763,10 +1758,12 @@
 				HEADER_SEARCH_PATHS = (
 					../../Ice,
 					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
 				);
 				INFOPLIST_FILE = Classes/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_LDFLAGS = (
 					"-lIceGridObjC",
 					"-lGlacier2ObjC",
@@ -1801,10 +1798,12 @@
 				HEADER_SEARCH_PATHS = (
 					../../Ice,
 					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
 				);
 				INFOPLIST_FILE = Classes/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_LDFLAGS = (
 					"-lIceGridObjC",
 					"-lGlacier2ObjC",
@@ -1837,10 +1836,12 @@
 				HEADER_SEARCH_PATHS = (
 					../../Ice,
 					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
 				);
 				INFOPLIST_FILE = Classes/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions ";
 				OTHER_LDFLAGS = (
 					"-lIceGridObjC",
@@ -1874,10 +1875,12 @@
 				HEADER_SEARCH_PATHS = (
 					../../Ice,
 					../../include,
+					"../../../../sdk/$(PLATFORM_NAME).sdk/usr/include",
 				);
 				INFOPLIST_FILE = Classes/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
 				OTHER_CFLAGS = "-fobjc-arc-exceptions ";
 				OTHER_LDFLAGS = (
 					"-lIceGridObjC",
diff -Nru zeroc-ice-3.7.1/objective-c/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/objective-c/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/objective-c/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Slice/escape/Client.m zeroc-ice-3.7.2/objective-c/test/Slice/escape/Client.m
--- zeroc-ice-3.7.1/objective-c/test/Slice/escape/Client.m	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Slice/escape/Client.m	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #import <objc/Ice.h>
 #import <TestCommon.h>
@@ -164,7 +159,7 @@
 }
 
 static int
-run(id<ICECommunicator> communicator)
+run(id<ICECommunicator>__unused communicator)
 {
     if(0)
     {
diff -Nru zeroc-ice-3.7.1/objective-c/test/Slice/escape/Inherit.ice zeroc-ice-3.7.2/objective-c/test/Slice/escape/Inherit.ice
--- zeroc-ice-3.7.1/objective-c/test/Slice/escape/Inherit.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Slice/escape/Inherit.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 // Test overridding inherited names
 module Test
diff -Nru zeroc-ice-3.7.1/objective-c/test/Slice/escape/Key.ice zeroc-ice-3.7.2/objective-c/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/objective-c/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]] // For class that implements interface
 
diff -Nru zeroc-ice-3.7.1/objective-c/test/Slice/escape/Makefile.mk zeroc-ice-3.7.2/objective-c/test/Slice/escape/Makefile.mk
--- zeroc-ice-3.7.1/objective-c/test/Slice/escape/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/objective-c/test/Slice/escape/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_client_sources  = Client.m Clash.ice Key.ice Inherit.ice
 
diff -Nru zeroc-ice-3.7.1/php/allTests.py zeroc-ice-3.7.2/php/allTests.py
--- zeroc-ice-3.7.1/php/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/php/config/Make.rules zeroc-ice-3.7.2/php/config/Make.rules
--- zeroc-ice-3.7.1/php/config/Make.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/config/Make.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Use specific PHP version
@@ -79,10 +74,13 @@
 endif
 
 ifeq ($(os),Darwin)
+    php_cppflags        := $(php_cppflags) -Wno-unused-parameter -Wno-missing-field-initializers
     php_ldflags         := ${wl}-flat_namespace ${wl}-undefined ${wl}suppress
 endif
 
 ifeq ($(os),Linux)
+   cppflags             := $(filter-out -Wshadow,$(cppflags))
+   php_cppflags         := $(php_cppflags) -Wno-unused-parameter -Wno-missing-field-initializers
    allow-undefined-symbols    := yes
 endif
 
diff -Nru zeroc-ice-3.7.1/php/lib/Glacier2.php zeroc-ice-3.7.2/php/lib/Glacier2.php
--- zeroc-ice-3.7.1/php/lib/Glacier2.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/Glacier2.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 require_once 'Glacier2/Router.php';
 require_once 'Glacier2/PermissionsVerifier.php';
diff -Nru zeroc-ice-3.7.1/php/lib/IceBox.php zeroc-ice-3.7.2/php/lib/IceBox.php
--- zeroc-ice-3.7.1/php/lib/IceBox.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/IceBox.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 require_once 'IceBox/IceBox.php';
 ?>
diff -Nru zeroc-ice-3.7.1/php/lib/IceGrid.php zeroc-ice-3.7.2/php/lib/IceGrid.php
--- zeroc-ice-3.7.1/php/lib/IceGrid.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/IceGrid.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 require_once 'IceGrid/Admin.php';
 require_once 'IceGrid/Descriptor.php';
diff -Nru zeroc-ice-3.7.1/php/lib/Ice_no_ns.php zeroc-ice-3.7.2/php/lib/Ice_no_ns.php
--- zeroc-ice-3.7.1/php/lib/Ice_no_ns.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/Ice_no_ns.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Definitions for IcePHP with namespaces enabled
@@ -116,6 +111,12 @@
     }
 }
 
+global $Ice__t_Value;
+global $Ice__t_ObjectSeq;
+global $Ice__t_LocalObject;
+global $Ice__t_ObjectPrx;
+global $Ice__t_ObjectProxySeq;
+
 $Ice__t_Value = IcePHP_defineClass('::Ice::Object', "Ice_Value", -1, false, false, null, null);
 $Ice__t_ObjectSeq = IcePHP_defineSequence('::Ice::ObjectSeq', $Ice__t_Value);
 $Ice__t_LocalObject = IcePHP_defineClass('::Ice::LocalObject', "Ice_LocalObject", -1, false, false, null, null);
@@ -134,6 +135,7 @@
     }
 }
 
+global $Ice__t_UnknownSlicedValue;
 $Ice__t_UnknownSlicedValue = IcePHP_defineClass('::Ice::UnknownSlicedValue', 'Ice_UnknownSlicedValue', -1, true, false, $Ice__t_Value, null);
 
 interface Ice_ObjectFactory
@@ -181,6 +183,7 @@
     const SlicedFormat = 2;
 }
 
+global $Ice_sliceChecksums;
 $Ice_sliceChecksums = array();
 
 //
@@ -201,6 +204,10 @@
 require_once 'Ice/RemoteLogger.php';
 require_once 'Ice/Communicator.php';
 
+global $Ice_Protocol_1_0;
+global $Ice_Encoding_1_0;
+global $Ice_Encoding_1_1;
+
 $Ice_Protocol_1_0 = new Ice_ProtocolVersion(1, 0);
 $Ice_Encoding_1_0 = new Ice_EncodingVersion(1, 0);
 $Ice_Encoding_1_1 = new Ice_EncodingVersion(1, 1);
diff -Nru zeroc-ice-3.7.1/php/lib/Ice_ns.php zeroc-ice-3.7.2/php/lib/Ice_ns.php
--- zeroc-ice-3.7.1/php/lib/Ice_ns.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/Ice_ns.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // Definitions for IcePHP with namespaces enabled
@@ -226,6 +221,10 @@
     require_once 'Ice/RemoteLogger.php';
     require_once 'Ice/Communicator.php';
 
+    global $Ice_Protocol_1_0;
+    global $Ice_Encoding_1_0;
+    global $Ice_Encoding_1_1;
+
     $Ice_Protocol_1_0 = new Ice\ProtocolVersion(1, 0);
     $Ice_Encoding_1_0 = new Ice\EncodingVersion(1, 0);
     $Ice_Encoding_1_1 = new Ice\EncodingVersion(1, 1);
diff -Nru zeroc-ice-3.7.1/php/lib/IcePatch2.php zeroc-ice-3.7.2/php/lib/IcePatch2.php
--- zeroc-ice-3.7.1/php/lib/IcePatch2.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/IcePatch2.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 require_once 'IcePatch2/FileServer.php';
 ?>
diff -Nru zeroc-ice-3.7.1/php/lib/Ice.php zeroc-ice-3.7.2/php/lib/Ice.php
--- zeroc-ice-3.7.1/php/lib/Ice.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/Ice.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 require_once(function_exists("Ice\\initialize") ? "Ice_ns.php" : "Ice_no_ns.php");
 
diff -Nru zeroc-ice-3.7.1/php/lib/IceStorm.php zeroc-ice-3.7.2/php/lib/IceStorm.php
--- zeroc-ice-3.7.1/php/lib/IceStorm.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/lib/IceStorm.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 require_once 'IceStorm/IceStorm.php';
 require_once 'IceStorm/Metrics.php';
diff -Nru zeroc-ice-3.7.1/php/Makefile zeroc-ice-3.7.2/php/Makefile
--- zeroc-ice-3.7.1/php/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 top_srcdir      := ..
-lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
+lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST))))))
 
 include $(top_srcdir)/config/Make.rules
 
diff -Nru zeroc-ice-3.7.1/php/msbuild/ice.nugetpack.targets zeroc-ice-3.7.2/php/msbuild/ice.nugetpack.targets
--- zeroc-ice-3.7.1/php/msbuild/ice.nugetpack.targets	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/ice.nugetpack.targets	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,17 @@
+<Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="NuGetPack">
+        <RemoveDir Directories="$(PackageName)" />
+        <Copy SourceFiles="$(PackageName).nuspec" DestinationFolder="$(PackageName)" />
+
+        <MSBuild Projects="ice.nuget.targets"
+                 Properties="PackageName=$(PackageName);PhpVersion=$(PhpVersion);Platform=x64;Configuration=Release;PlatformToolset=$(DefaultPlatformToolset)"/>
+
+        <MSBuild Projects="ice.nuget.targets"
+                 Properties="PackageName=$(PackageName);Platform=Win32;Configuration=Release;PlatformToolset=$(DefaultPlatformToolset)"/>
+
+        <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\ICE_LICENSE" DestinationFiles="$(PackageName)\ICE_LICENSE.txt" />
+        <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\LICENSE" DestinationFiles="$(PackageName)\LICENSE.txt" />
+
+        <Exec Command="$(NuGetExe) pack -NoPackageAnalysis -NonInteractive" WorkingDirectory="$(PackageName)"/>
+    </Target>
+</Project>
diff -Nru zeroc-ice-3.7.1/php/msbuild/ice.nuget.targets zeroc-ice-3.7.2/php/msbuild/ice.nuget.targets
--- zeroc-ice-3.7.1/php/msbuild/ice.nuget.targets	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/ice.nuget.targets	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,35 @@
+<Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <IceSrcRootDir>$(MSBuildThisFileDirectory)..\</IceSrcRootDir>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Libraries Include="$(IceSrcRootDir)..\php\lib\php-$(PhpVersion)\$(Platform)\$(Configuration)\php_ice.dll;
+                            $(IceSrcRootDir)..\php\lib\php-$(PhpVersion)\$(Platform)\$(Configuration)\php_ice_nts.dll" />
+        <Libraries Include="$(IceSrcRootDir)..\cpp\bin\$(Platform)\$(Configuration)\ice37.dll;
+                            $(IceSrcRootDir)..\cpp\bin\$(Platform)\$(Configuration)\icessl37.dll;
+                            $(IceSrcRootDir)..\cpp\bin\$(Platform)\$(Configuration)\icediscovery37.dll;
+                            $(IceSrcRootDir)..\cpp\bin\$(Platform)\$(Configuration)\icelocatordiscovery37.dll;
+                            $(IceSrcRootDir)..\cpp\msbuild\packages\bzip2.$(PlatformToolset).1.0.6.10\build\native\bin\$(Platform)\$(Configuration)\bzip2.dll"/>
+    </ItemGroup>
+
+    <!-- For PHP we use Slice compiler from x64 Release builds -->
+    <ItemGroup Condition="'$(Platform)|$(Configuration)' == 'x64|Release'">
+        <SliceCompilers Include="$(IceSrcRootDir)..\cpp\bin\x64\Release\slice2php.exe;
+                                 $(IceSrcRootDir)..\cpp\bin\x64\Release\slice2html.exe" />
+
+        <PhpSources Include="$(IceSrcRootDir)..\php\lib\**\*.php" />
+
+        <Slices Include="$(IceSrcRootDir)..\slice\**\*.ice"
+                Exclude="$(IceSrcRootDir)..\slice\IceDiscovery\*.ice;
+                         $(IceSrcRootDir)..\slice\IceLocatorDiscovery\*.ice"/>
+    </ItemGroup>
+
+    <!-- Copy required files to the package specific directories -->
+    <Target Name="NugetPack">
+        <Copy SourceFiles="@(Libraries)" DestinationFolder="$(PackageName)\lib\$(Platform)\$(Configuration)"/>
+        <Copy SourceFiles="@(PhpSources)" DestinationFolder="$(PackageName)\lib\%(PhpSources.RecursiveDir)"/>
+        <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageName)\slice\%(Slices.RecursiveDir)"/>
+        <Copy SourceFiles="@(SliceCompilers)" DestinationFolder="$(PackageName)\tools"/>
+    </Target>
+</Project>
diff -Nru zeroc-ice-3.7.1/php/msbuild/ice.proj zeroc-ice-3.7.2/php/msbuild/ice.proj
--- zeroc-ice-3.7.1/php/msbuild/ice.proj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/ice.proj	2019-02-05 18:03:04.000000000 +0000
@@ -11,22 +11,25 @@
 
     <!-- Ice for PHP configurations -->
     <PropertyGroup>
-        <CppDistTargets>c++98\slice2php;c++98\icessl;c++98\icediscovery;c++98\icelocatordiscovery</CppDistTargets>
+        <CppDistTargets>c++98\slice2php;c++98\slice2html;c++98\icessl;c++98\icediscovery;c++98\icelocatordiscovery</CppDistTargets>
         <CppConfiguration Condition="'$(Configuration)' == 'NTS-Debug' or '$(Configuration)' == 'Debug'">Debug</CppConfiguration>
         <CppConfiguration Condition="'$(Configuration)' == 'NTS-Release' or '$(Configuration)' == 'Release'">Release</CppConfiguration>
+        <BuildWithPhpVersion Condition="'$(BuildWithPhpVersion)' == '' and '$(DefaultPlatformToolset)' == 'v141'">7.2</BuildWithPhpVersion>
+        <BuildWithPhpVersion Condition="'$(BuildWithPhpVersion)' == '' and '$(DefaultPlatformToolset)' == 'v140'">7.1</BuildWithPhpVersion>
+        <PackageDirectory>zeroc.ice.php$(BuildWithPhpVersion)</PackageDirectory>
     </PropertyGroup>
 
     <Target Name="NuGetRestore" DependsOnTargets="GetNuGet">
         <!-- Restore NuGet packages to build Ice for PHP distribution -->
         <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)ice.sln" Condition="'$(ICE_BIN_DIST)' != 'all'"/>
-        <Exec Command="$(NuGetExe) install zeroc.ice.v140 -OutputDirectory $(MSBuildThisFileDirectory)\packages -Version $(IceJSONVersion)"
+        <Exec Command="$(NuGetExe) install zeroc.ice.$(DefaultPlatformToolSet) -OutputDirectory $(MSBuildThisFileDirectory)\packages -Version $(IceJSONVersion)"
               Condition="'$(ICE_BIN_DIST)' == 'cpp'"/>
     </Target>
 
     <Choose>
         <When Condition="'$(ICE_BIN_DIST)' == 'cpp'">
             <PropertyGroup>
-                <IceHome>$(MSBuildThisFileDirectory)\packages\zeroc.ice.v140.$(IceJSONVersion)</IceHome>
+                <IceHome>$(MSBuildThisFileDirectory)\packages\zeroc.ice.$(DefaultPlatformToolSet).$(IceJSONVersion)</IceHome>
                 <IceToolsPath>$(IceHome)\tools</IceToolsPath>
             </PropertyGroup>
         </When>
@@ -43,12 +46,108 @@
         </Otherwise>
     </Choose>
 
+    <Choose>
+        <!--
+            If BuildAllConfigurations is set to yes we build all configurations that are
+            part of the binary distribution, otherwise we just build the given platform
+            and configuration.
+        -->
+        <When Condition="'$(BuildAllConfigurations)' == 'yes'">
+            <PropertyGroup>
+                <DefaultBuild>x64|Release</DefaultBuild>
+            </PropertyGroup>
+            <!-- Ice for C++ configurations -->
+            <ItemGroup>
+                <CppDistSolution Include="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln">
+                    <Properties>Configuration=Release;Platform=Win32</Properties>
+                </CppDistSolution>
+                <CppDistSolution Include="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln">
+                    <Properties>Configuration=Release;Platform=x64</Properties>
+                </CppDistSolution>
+            </ItemGroup>
+
+            <ItemGroup Condition="'$(DefaultPlatformToolset)' == 'v140'">
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=Release;Platform=Win32;BuildWithPhpVersion=7.1</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=NTS-Release;Platform=Win32;BuildWithPhpVersion=7.1</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=Release;Platform=x64;BuildWithPhpVersion=7.1</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=NTS-Release;Platform=x64;BuildWithPhpVersion=7.1</Properties>
+                </DistSolution>
+
+                <NugetPackage Include="zeroc.ice.php7.1">
+                    <Properties>PackageName=zeroc.ice.php7.1;PhpVersion=7.1</Properties>
+                </NugetPackage>
+            </ItemGroup>
+
+            <ItemGroup Condition="'$(DefaultPlatformToolset)' == 'v141'">
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=Release;Platform=Win32;BuildWithPhpVersion=7.2</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=NTS-Release;Platform=Win32;BuildWithPhpVersion=7.2</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=Release;Platform=x64;BuildWithPhpVersion=7.2</Properties>
+                </DistSolution>
+
+                <NugetPackage Include="zeroc.ice.php7.2">
+                    <Properties>PackageName=zeroc.ice.php7.2;PhpVersion=7.2</Properties>
+                </NugetPackage>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=NTS-Release;Platform=x64;BuildWithPhpVersion=7.2</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=Release;Platform=Win32;BuildWithPhpVersion=7.3</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=NTS-Release;Platform=Win32;BuildWithPhpVersion=7.3</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=Release;Platform=x64;BuildWithPhpVersion=7.3</Properties>
+                </DistSolution>
+
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=NTS-Release;Platform=x64;BuildWithPhpVersion=7.3</Properties>
+                </DistSolution>
+
+                <NugetPackage Include="zeroc.ice.php7.3">
+                    <Properties>PackageName=zeroc.ice.php7.3;PhpVersion=7.3</Properties>
+                </NugetPackage>
+            </ItemGroup>
+        </When>
+        <Otherwise>
+            <ItemGroup>
+                <CppDistSolution Include="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln">
+                    <Properties>Configuration=$(CppConfiguration);Platform=$(Platform)</Properties>
+                </CppDistSolution>
+                <DistSolution Include="ice.sln">
+                    <Properties>Configuration=$(Configuration);Platform=$(Platform);BuildWithPhpVersion=$(BuildWithPhpVersion)</Properties>
+                </DistSolution>
+            </ItemGroup>
+        </Otherwise>
+     </Choose>
+
     <Target Name="BuildCppDist" Condition="'$(ICE_BIN_DIST)' != 'cpp'">
         <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"/>
-        <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"
+        <MSBuild Projects="@(CppDistSolution)"
                  Targets="$(CppDistTargets)"
                  BuildInParallel="true"
-                 Properties="Platform=$(Platform);Configuration=$(CppConfiguration)" />
+                 Properties="%(Properties)" />
     </Target>
 
     <Target Name="BuildDist" DependsOnTargets="NuGetRestore;BuildCppDist" Condition="'$(ICE_BIN_DIST)' != 'all'">
@@ -56,8 +155,8 @@
                  Properties="IceHome=$(IceHome);IceToolsPath=$(IceToolsPath)"
                  Targets="SliceCompile"/>
 
-        <MSBuild Projects="ice.sln"
-                 Properties="Configuration=$(Configuration);Platform=$(Platform)" />
+        <MSBuild Projects="@(DistSolution)"
+                 Properties="%(Properties)" />
     </Target>
 
     <Target Name="CleanDist" Condition="'$(ICE_BIN_DIST)' != 'all'">
@@ -65,9 +164,9 @@
                  Properties="IceHome=$(IceHome);IceToolsPath=$(IceToolsPath)"
                  Targets="SliceCompileClean"/>
 
-        <MSBuild Projects="ice.sln"
+        <MSBuild Projects="@(DistSolution)"
                  BuildInParallel="true"
-                 Properties="Configuration=$(Configuration);Platform=$(Platform)"
+                 Properties="%(Properties)"
                  Targets="Clean" />
     </Target>
 
@@ -84,4 +183,9 @@
                  Properties="IceHome=$(IceHome);IceToolsPath=$(IceToolsPath)"
                  Targets="SliceCompileClean"/>
     </Target>
+
+    <Target Name="NuGetPack" DependsOnTargets="BuildDist">
+        <MSBuild Projects="ice.nugetpack.targets"
+                 Properties="%(NugetPackage.Properties);DefaultPlatformToolset=$(DefaultPlatformToolset);NuGetExe=$(NuGetExe)"/>
+    </Target>
 </Project>
diff -Nru zeroc-ice-3.7.1/php/msbuild/ice.props zeroc-ice-3.7.2/php/msbuild/ice.props
--- zeroc-ice-3.7.1/php/msbuild/ice.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/ice.props	2019-02-05 18:03:04.000000000 +0000
@@ -3,14 +3,15 @@
   <PropertyGroup>
     <IceLanguageMapping>php</IceLanguageMapping>
   </PropertyGroup>
-  <Import Project="..\..\cpp\msbuild\Ice.Cpp98.props" />
+  <Import Project="..\..\cpp\msbuild\ice.cpp98.props" />
 
   <PropertyGroup Label="UserMacros">
 
-    <!-- The PHP version used to build the extension. The only supported values are 7.0 and 7.1. -->
-    <BuildWithPhpVersion>7.1</BuildWithPhpVersion>
+    <!-- The PHP version used to build the extension. The supported values are 7.1, 7.2 and 7.3. -->
+    <BuildWithPhpVersion Condition="'$(DefaultPlatformToolset)' == 'v140'">7.1</BuildWithPhpVersion>
+    <BuildWithPhpVersion Condition="'$(DefaultPlatformToolset)' == 'v141'">7.2</BuildWithPhpVersion>
 
-    <!-- Determines whether the extension uses PHP namespaces (requires PHP 5.3 or later). -->
+    <!-- Determines whether the extension uses PHP namespaces -->
     <PhpUseNamespaces Condition="'$(PhpUseNamespaces)' == ''">yes</PhpUseNamespaces>
   </PropertyGroup>
 
@@ -18,7 +19,7 @@
       <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
       <IceBuilderPhpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.props</IceBuilderPhpProps>
       <IceBuilderPhpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.targets</IceBuilderPhpTargets>
-      <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.v140.3.7.1/tools</IceToolsPath>
+      <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.$(DefaultPlatformsToolSet).3.7.2/tools</IceToolsPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,6 +35,7 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4127;4244;4310;4456;4611</DisableSpecificWarnings>
       <PreprocessorDefinitions>_CONSOLE;_WIN32_WINNT=0x601;WIN32</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff -Nru zeroc-ice-3.7.1/php/msbuild/ice.tests.props zeroc-ice-3.7.2/php/msbuild/ice.tests.props
--- zeroc-ice-3.7.1/php/msbuild/ice.tests.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/ice.tests.props	2019-02-05 18:03:04.000000000 +0000
@@ -15,7 +15,7 @@
     <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
     <IceBuilderPhpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.props</IceBuilderPhpProps>
     <IceBuilderPhpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.targets</IceBuilderPhpTargets>
-    <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.v140.3.7.1/tools</IceToolsPath>
+    <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.v140.3.7.2/tools</IceToolsPath>
   </PropertyGroup>
   <Target Name="Build"/>
   <Target Name="Clean"/>
diff -Nru zeroc-ice-3.7.1/php/msbuild/zeroc.ice.php7.1.nuspec zeroc-ice-3.7.2/php/msbuild/zeroc.ice.php7.1.nuspec
--- zeroc-ice-3.7.1/php/msbuild/zeroc.ice.php7.1.nuspec	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/zeroc.ice.php7.1.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>zeroc.ice.php7.1</id>
+        <title>ZeroC Ice for PHP 7.1</title>
+        <version>3.7.2</version>
+        <authors>ZeroC</authors>
+        <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+        <license type="expression">GPL-2.0-only</license>
+        <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
+        <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
+        <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
+        <tags>ice</tags>
+    </metadata>
+</package>
diff -Nru zeroc-ice-3.7.1/php/msbuild/zeroc.ice.php7.2.nuspec zeroc-ice-3.7.2/php/msbuild/zeroc.ice.php7.2.nuspec
--- zeroc-ice-3.7.1/php/msbuild/zeroc.ice.php7.2.nuspec	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/zeroc.ice.php7.2.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>zeroc.ice.php7.2</id>
+        <title>ZeroC Ice for PHP 7.2</title>
+        <version>3.7.2</version>
+        <authors>ZeroC</authors>
+        <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+        <license type="expression">GPL-2.0-only</license>
+        <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
+        <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
+        <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
+        <tags>ice</tags>
+    </metadata>
+</package>
diff -Nru zeroc-ice-3.7.1/php/msbuild/zeroc.ice.php7.3.nuspec zeroc-ice-3.7.2/php/msbuild/zeroc.ice.php7.3.nuspec
--- zeroc-ice-3.7.1/php/msbuild/zeroc.ice.php7.3.nuspec	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/msbuild/zeroc.ice.php7.3.nuspec	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>zeroc.ice.php7.3</id>
+        <title>ZeroC Ice for PHP 7.3</title>
+        <version>3.7.2</version>
+        <authors>ZeroC</authors>
+        <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright>
+        <license type="expression">GPL-2.0-only</license>
+        <projectUrl>https://github.com/zeroc-ice/ice</projectUrl>
+        <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description>
+        <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes>
+        <tags>ice</tags>
+    </metadata>
+</package>
diff -Nru zeroc-ice-3.7.1/php/README.md zeroc-ice-3.7.2/php/README.md
--- zeroc-ice-3.7.1/php/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -94,6 +94,15 @@
 msbuild msbuild\ice.proj /p:PhpUseNamespaces=no
 ```
 
+The PHP extension is build by default using PHP 7.1, the extension can be build with
+PHP 7.1, 7.2 or 7.3 by setting MSBuildProperty `BuildWithPhpVersion` to the desired
+version for example you can use the following command to build the extension with PHP
+7.2:
+
+```
+msbuild msbuild\ice.proj /p:BuildWithPhpVersion=7.2
+```
+
 The PHP extension depends on Ice for C++ components from the `cpp` subdirectory,
 and those are built if required. It is also possible to build the PHP extension
 using the Ice for C++ NuGet packages by setting the`ICE_BIN_DIST` msbuild
@@ -326,5 +335,5 @@
 ```
 
 [1]: https://zeroc.com/distributions/ice
-[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.1
+[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2
 [3]: https://github.com/zeroc-ice/ice-builder-visualstudio
diff -Nru zeroc-ice-3.7.1/php/src/php5/Communicator.cpp zeroc-ice-3.7.2/php/src/php5/Communicator.cpp
--- zeroc-ice-3.7.1/php/src/php5/Communicator.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Communicator.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <Logger.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Communicator.h zeroc-ice-3.7.2/php/src/php5/Communicator.h
--- zeroc-ice-3.7.1/php/src/php5/Communicator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Communicator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_COMMUNICATOR_H
 #define ICEPHP_COMMUNICATOR_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Config.h zeroc-ice-3.7.2/php/src/php5/Config.h
--- zeroc-ice-3.7.1/php/src/php5/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PHP_CONFIG_H
 #define ICE_PHP_CONFIG_H
@@ -50,6 +45,25 @@
 #   pragma GCC diagnostic warning "-Wnarrowing"
 #endif
 
+//
+// Ignore redundant redeclarations from php 5.3 php-output.h header.
+//
+#if defined(__GNUC__) && PHP_VERSION_ID < 50400
+#   pragma GCC diagnostic ignored "-Wredundant-decls"
+#endif
+
+//
+// The php.h header defines/undefines NDEBUG based on how the PHP binary was built.
+// As a result, asserts are always disabled unless building against a php binary
+// built with --enable-debug. We want to enable asserts for the PHP Ice extension
+// when it's built without OPTIMIZE=yes. We save NDEBUG in a tmp macro here and
+// explicitly re-include the assert.h header with the saved NDEBUG macro after
+// including php.h
+//
+#ifndef NDEBUG
+#define TMPDEBUG
+#endif
+
 #include "php.h"
 
 #ifdef _WIN32
@@ -65,6 +79,16 @@
 }
 #endif
 
+//
+// Enable asserts if the extension is built with debug. It's fine to include several times
+// assert.h with a different NDEBUG setting.
+//
+#ifdef TMPDEBUG
+#undef TMPDEBUG
+#undef NDEBUG
+#include <assert.h>
+#endif
+
 extern zend_module_entry ice_module_entry;
 #define phpext_ice_ptr &ice_module_entry
 
diff -Nru zeroc-ice-3.7.1/php/src/php5/Connection.cpp zeroc-ice-3.7.2/php/src/php5/Connection.cpp
--- zeroc-ice-3.7.1/php/src/php5/Connection.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Connection.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Connection.h>
 #include <Endpoint.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Connection.h zeroc-ice-3.7.2/php/src/php5/Connection.h
--- zeroc-ice-3.7.1/php/src/php5/Connection.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Connection.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_CONNECTION_H
 #define ICEPHP_CONNECTION_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Endpoint.cpp zeroc-ice-3.7.2/php/src/php5/Endpoint.cpp
--- zeroc-ice-3.7.1/php/src/php5/Endpoint.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Endpoint.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Endpoint.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Endpoint.h zeroc-ice-3.7.2/php/src/php5/Endpoint.h
--- zeroc-ice-3.7.1/php/src/php5/Endpoint.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Endpoint.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_ENDPOINT_H
 #define ICEPHP_ENDPOINT_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Init.cpp zeroc-ice-3.7.2/php/src/php5/Init.cpp
--- zeroc-ice-3.7.1/php/src/php5/Init.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Init.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <Connection.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Logger.cpp zeroc-ice-3.7.2/php/src/php5/Logger.cpp
--- zeroc-ice-3.7.1/php/src/php5/Logger.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Logger.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Logger.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Logger.h zeroc-ice-3.7.2/php/src/php5/Logger.h
--- zeroc-ice-3.7.1/php/src/php5/Logger.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Logger.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_LOGGER_H
 #define ICEPHP_LOGGER_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Makefile.mk zeroc-ice-3.7.2/php/src/php5/Makefile.mk
--- zeroc-ice-3.7.1/php/src/php5/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries := IcePHP
 
diff -Nru zeroc-ice-3.7.1/php/src/php5/Operation.cpp zeroc-ice-3.7.2/php/src/php5/Operation.cpp
--- zeroc-ice-3.7.1/php/src/php5/Operation.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Operation.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Operation.h>
 #include <Communicator.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Operation.h zeroc-ice-3.7.2/php/src/php5/Operation.h
--- zeroc-ice-3.7.1/php/src/php5/Operation.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Operation.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_OPERATION_H
 #define ICEPHP_OPERATION_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Properties.cpp zeroc-ice-3.7.2/php/src/php5/Properties.cpp
--- zeroc-ice-3.7.1/php/src/php5/Properties.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Properties.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Properties.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Properties.h zeroc-ice-3.7.2/php/src/php5/Properties.h
--- zeroc-ice-3.7.1/php/src/php5/Properties.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Properties.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_PROPERTIES_H
 #define ICEPHP_PROPERTIES_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Proxy.cpp zeroc-ice-3.7.2/php/src/php5/Proxy.cpp
--- zeroc-ice-3.7.1/php/src/php5/Proxy.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Proxy.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Proxy.h>
 #include <Connection.h>
diff -Nru zeroc-ice-3.7.1/php/src/php5/Proxy.h zeroc-ice-3.7.2/php/src/php5/Proxy.h
--- zeroc-ice-3.7.1/php/src/php5/Proxy.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Proxy.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_PROXY_H
 #define ICEPHP_PROXY_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Types.cpp zeroc-ice-3.7.2/php/src/php5/Types.cpp
--- zeroc-ice-3.7.1/php/src/php5/Types.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Types.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Types.h>
 #include <Proxy.h>
@@ -534,15 +529,15 @@
 
                     Ice::ObjectPtr writer;
 
-                    ObjectMap::iterator i = objectMap->find(Z_OBJ_HANDLE_P(o));
-                    if(i == objectMap->end())
+                    ObjectMap::iterator j = objectMap->find(Z_OBJ_HANDLE_P(o));
+                    if(j == objectMap->end())
                     {
                         writer = new ObjectWriter(o, objectMap, 0 TSRMLS_CC);
                         objectMap->insert(ObjectMap::value_type(Z_OBJ_HANDLE_P(o), writer));
                     }
                     else
                     {
-                        writer = i->second;
+                        writer = j->second;
                     }
 
                     info->instances.push_back(writer);
@@ -1244,7 +1239,7 @@
 
         assert(Z_TYPE_PP(arr) == IS_ARRAY);
         HashTable* member = Z_ARRVAL_PP(arr);
-        assert(zend_hash_num_elements(member) == allowOptional ? 4 : 2);
+        assert(zend_hash_num_elements(member) == (allowOptional ? 4 : 2));
         zend_hash_index_find(member, 0, reinterpret_cast<void**>(&elem));
         assert(Z_TYPE_PP(elem) == IS_STRING);
         m->name = Z_STRVAL_PP(elem);
@@ -1681,6 +1676,11 @@
     Ice::Int sz = is->readSize();
     for(Ice::Int i = 0; i < sz; ++i)
     {
+        //
+        // Add a temporary null value so that the foreach order is the
+        // same as the index order.
+        //
+        add_index_null(zv, i);
         void* cl = reinterpret_cast<void*>(i);
         elementType->unmarshal(is, this, comm, zv, cl, false TSRMLS_CC);
     }
@@ -1774,11 +1774,7 @@
             seq[i++] = Z_BVAL_P(*val) ? true : false;
             zend_hash_move_forward_ex(arr, &pos);
         }
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-        os->writeBoolSeq(seq);
-#else
         os->write(seq);
-#endif
         break;
     }
     case PrimitiveInfo::KindByte:
@@ -3392,7 +3388,7 @@
             {
                 zval* un;
                 MAKE_STD_ZVAL(un);
-                AutoDestroy destroy(un);
+                AutoDestroy destroy2(un);
                 assignUnset(un TSRMLS_CC);
                 member->setMember(zv, un TSRMLS_CC);
             }
diff -Nru zeroc-ice-3.7.1/php/src/php5/Types.h zeroc-ice-3.7.2/php/src/php5/Types.h
--- zeroc-ice-3.7.1/php/src/php5/Types.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Types.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_TYPES_H
 #define ICEPHP_TYPES_H
diff -Nru zeroc-ice-3.7.1/php/src/php5/Util.cpp zeroc-ice-3.7.2/php/src/php5/Util.cpp
--- zeroc-ice-3.7.1/php/src/php5/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Util.h>
 #include <Ice/UUID.h>
@@ -13,6 +8,11 @@
 #include <algorithm>
 #include <ctype.h>
 
+#if defined(__GNUC__) && !defined(__clang__)
+// False warning with older GCC
+#   pragma GCC diagnostic ignored "-Wclobbered"
+#endif
+
 using namespace std;
 using namespace IcePHP;
 using namespace Slice::PHP;
diff -Nru zeroc-ice-3.7.1/php/src/php5/Util.h zeroc-ice-3.7.2/php/src/php5/Util.h
--- zeroc-ice-3.7.1/php/src/php5/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php5/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_UTIL_H
 #define ICEPHP_UTIL_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Communicator.cpp zeroc-ice-3.7.2/php/src/php7/Communicator.cpp
--- zeroc-ice-3.7.1/php/src/php7/Communicator.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Communicator.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <Logger.h>
@@ -1224,7 +1219,7 @@
 
         member = "properties";
         {
-            if((data = zend_hash_str_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), member.size())))
+            if((data = zend_hash_str_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), member.size())) != 0)
             {
                 assert(Z_TYPE_P(data) == IS_INDIRECT);
                 if(!fetchProperties(Z_INDIRECT_P(data), initData.properties))
@@ -1236,7 +1231,7 @@
 
         member = "logger";
         {
-            if((data = zend_hash_str_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), member.size())))
+            if((data = zend_hash_str_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), member.size())) != 0)
             {
                 assert(Z_TYPE_P(data) == IS_INDIRECT);
                 if(!fetchLogger(Z_INDIRECT_P(data), initData.logger))
@@ -1274,7 +1269,7 @@
     zval* comm;
     char* s;
     size_t sLen;
-    long expires = 0;
+    zend_long expires = 0;
     if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("Os|l"), &comm, communicatorClassEntry, &s,
                              &sLen, &expires) != SUCCESS)
     {
@@ -1449,7 +1444,7 @@
     assert(identityClass);
 
     zval* zv;
-    long mode = 0;
+    zend_long mode = 0;
 
     if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("O|l"), &zv, identityClass, &mode) != SUCCESS)
     {
diff -Nru zeroc-ice-3.7.1/php/src/php7/Communicator.h zeroc-ice-3.7.2/php/src/php7/Communicator.h
--- zeroc-ice-3.7.1/php/src/php7/Communicator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Communicator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_COMMUNICATOR_H
 #define ICEPHP_COMMUNICATOR_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Config.h zeroc-ice-3.7.2/php/src/php7/Config.h
--- zeroc-ice-3.7.1/php/src/php7/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_PHP_CONFIG_H
 #define ICE_PHP_CONFIG_H
@@ -50,6 +45,22 @@
 #   pragma GCC diagnostic warning "-Wnarrowing"
 #endif
 
+#if defined(__GNUC__) && ((__GNUC__ >= 8))
+#   pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#endif
+
+//
+// The php.h header defines/undefines NDEBUG based on how the PHP binary was built.
+// As a result, asserts are always disabled unless building against a php binary
+// built with --enable-debug. We want to enable asserts for the PHP Ice extension
+// when it's built without OPTIMIZE=yes. We save NDEBUG in a tmp macro here and
+// explicitly re-include the assert.h header with the saved NDEBUG macro after
+// including php.h
+//
+#ifndef NDEBUG
+#define TMPDEBUG
+#endif
+
 #include "php.h"
 
 #ifdef _WIN32
@@ -65,6 +76,16 @@
 }
 #endif
 
+//
+// Enable asserts if the extension is built with debug. It's fine to include several times
+// assert.h with a different NDEBUG setting.
+//
+#ifdef TMPDEBUG
+#undef TMPDEBUG
+#undef NDEBUG
+#include <assert.h>
+#endif
+
 extern zend_module_entry ice_module_entry;
 #define phpext_ice_ptr &ice_module_entry
 
diff -Nru zeroc-ice-3.7.1/php/src/php7/Connection.cpp zeroc-ice-3.7.2/php/src/php7/Connection.cpp
--- zeroc-ice-3.7.1/php/src/php7/Connection.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Connection.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Connection.h>
 #include <Endpoint.h>
diff -Nru zeroc-ice-3.7.1/php/src/php7/Connection.h zeroc-ice-3.7.2/php/src/php7/Connection.h
--- zeroc-ice-3.7.1/php/src/php7/Connection.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Connection.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_CONNECTION_H
 #define ICEPHP_CONNECTION_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Endpoint.cpp zeroc-ice-3.7.2/php/src/php7/Endpoint.cpp
--- zeroc-ice-3.7.1/php/src/php7/Endpoint.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Endpoint.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Endpoint.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/php/src/php7/Endpoint.h zeroc-ice-3.7.2/php/src/php7/Endpoint.h
--- zeroc-ice-3.7.1/php/src/php7/Endpoint.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Endpoint.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_ENDPOINT_H
 #define ICEPHP_ENDPOINT_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Init.cpp zeroc-ice-3.7.2/php/src/php7/Init.cpp
--- zeroc-ice-3.7.1/php/src/php7/Init.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Init.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <Connection.h>
diff -Nru zeroc-ice-3.7.1/php/src/php7/Logger.cpp zeroc-ice-3.7.2/php/src/php7/Logger.cpp
--- zeroc-ice-3.7.1/php/src/php7/Logger.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Logger.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Logger.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/php/src/php7/Logger.h zeroc-ice-3.7.2/php/src/php7/Logger.h
--- zeroc-ice-3.7.1/php/src/php7/Logger.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Logger.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_LOGGER_H
 #define ICEPHP_LOGGER_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Makefile.mk zeroc-ice-3.7.2/php/src/php7/Makefile.mk
--- zeroc-ice-3.7.1/php/src/php7/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries := IcePHP
 
diff -Nru zeroc-ice-3.7.1/php/src/php7/msbuild/packages.config zeroc-ice-3.7.2/php/src/php7/msbuild/packages.config
--- zeroc-ice-3.7.1/php/src/php7/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="php-7.0.v140" version="7.0.13" targetFramework="native" />
-  <package id="php-7.1.v140" version="7.1.4.1" targetFramework="native" />
+  <package id="php-7.1-nts" version="7.1.17" targetFramework="native" />
+  <package id="php-7.1-ts" version="7.1.17" targetFramework="native" />
+  <package id="php-7.2-nts" version="7.2.8" targetFramework="native" />
+  <package id="php-7.2-ts" version="7.2.8" targetFramework="native" />
+  <package id="php-7.3-nts" version="7.3.0" targetFramework="native" />
+  <package id="php-7.3-ts" version="7.3.0" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/php/src/php7/msbuild/php_ice.vcxproj zeroc-ice-3.7.2/php/src/php7/msbuild/php_ice.vcxproj
--- zeroc-ice-3.7.1/php/src/php7/msbuild/php_ice.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/msbuild/php_ice.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" />
-  <Import Project="..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props" Condition="Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props')" />
-  <Import Project="..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props" Condition="Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props')" />
+  <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -39,7 +37,6 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{18BF13D3-85D3-43A5-8C96-E52EB0672F72}</ProjectGuid>
-    <RootNamespace>IceGrid</RootNamespace>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -122,43 +119,51 @@
   </ImportGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</OutDir>
     <PhpThreadSafe>yes</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NTS-Debug|Win32'">
     <TargetName>$(ProjectName)_nts</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\Debug\</OutDir>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\Debug\</OutDir>
     <PhpThreadSafe>no</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
-    <PhpThreadSafe>no</PhpThreadSafe>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</OutDir>
+    <PhpThreadSafe>yes</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NTS-Debug|x64'">
     <TargetName>$(ProjectName)_nts</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\Debug\</OutDir>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\Debug\</OutDir>
     <PhpThreadSafe>no</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</OutDir>
     <PhpThreadSafe>yes</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NTS-Release|Win32'">
     <TargetName>$(ProjectName)_nts</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\Release\</OutDir>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\Release\</OutDir>
     <PhpThreadSafe>no</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</OutDir>
     <PhpThreadSafe>yes</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NTS-Release|x64'">
     <TargetName>$(ProjectName)_nts</TargetName>
-    <OutDir>..\..\..\lib\$(Platform)\Release\</OutDir>
+    <OutDir>..\..\..\lib\php-$(BuildWithPhpVersion)\$(Platform)\Release\</OutDir>
     <PhpThreadSafe>no</PhpThreadSafe>
+    <IntDir>php-$(BuildWithPhpVersion)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -238,19 +243,26 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets')" />
-    <Import Project="..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets')" />
-    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" />
+    <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" />
+    <Import Project="..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets')" />
+    <Import Project="..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets')" />
+    <Import Project="..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets')" />
+    <Import Project="..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets')" />
+    <Import Project="..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets')" />
+    <Import Project="..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets')" />
   </ImportGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\cpp\msbuild\ice.sign.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.1\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.2-ts.7.2.8\build\native\php-7.2-ts.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.3-nts.7.3.0\build\native\php-7.3-nts.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.3-ts.7.3.0\build\native\php-7.3-ts.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/php/src/php7/Operation.cpp zeroc-ice-3.7.2/php/src/php7/Operation.cpp
--- zeroc-ice-3.7.1/php/src/php7/Operation.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Operation.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Operation.h>
 #include <Communicator.h>
@@ -96,7 +91,7 @@
 //
 // The base class for client-side invocations.
 //
-class Invocation : public virtual IceUtil::Shared
+class Invocation : public IceUtil::Shared
 {
 public:
 
@@ -115,7 +110,7 @@
 // TypedInvocation uses the information in the given operation to validate, marshal, and unmarshal
 // parameters and exceptions.
 //
-class TypedInvocation : public virtual Invocation
+class TypedInvocation : public Invocation
 {
 public:
 
@@ -135,7 +130,7 @@
 //
 // A synchronous typed invocation.
 //
-class SyncTypedInvocation : public virtual TypedInvocation
+class SyncTypedInvocation : public TypedInvocation
 {
 public:
 
@@ -717,7 +712,7 @@
 //
 IcePHP::SyncTypedInvocation::SyncTypedInvocation(const Ice::ObjectPrx& prx, const CommunicatorInfoPtr& communicator,
                                                  const OperationIPtr& op) :
-    Invocation(prx, communicator), TypedInvocation(prx, communicator, op)
+    TypedInvocation(prx, communicator, op)
 {
 }
 
diff -Nru zeroc-ice-3.7.1/php/src/php7/Operation.h zeroc-ice-3.7.2/php/src/php7/Operation.h
--- zeroc-ice-3.7.1/php/src/php7/Operation.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Operation.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_OPERATION_H
 #define ICEPHP_OPERATION_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Properties.cpp zeroc-ice-3.7.2/php/src/php7/Properties.cpp
--- zeroc-ice-3.7.1/php/src/php7/Properties.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Properties.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Properties.h>
 #include <Util.h>
@@ -162,7 +157,7 @@
 {
     char* name;
     size_t nameLen;
-    long def;
+    zend_long def;
 
     if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("sl"), &name, &nameLen, &def) == FAILURE)
     {
@@ -175,8 +170,9 @@
     string propName(name, nameLen);
     try
     {
-        Ice::Int val = _this->getPropertyAsIntWithDefault(propName, def);
-        RETURN_LONG(static_cast<long>(val));
+        // TODO: Range check
+        Ice::Int val = _this->getPropertyAsIntWithDefault(propName, static_cast<Ice::Int>(def));
+        RETURN_LONG(val);
     }
     catch(const IceUtil::Exception& ex)
     {
diff -Nru zeroc-ice-3.7.1/php/src/php7/Properties.h zeroc-ice-3.7.2/php/src/php7/Properties.h
--- zeroc-ice-3.7.1/php/src/php7/Properties.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Properties.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_PROPERTIES_H
 #define ICEPHP_PROPERTIES_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Proxy.cpp zeroc-ice-3.7.2/php/src/php7/Proxy.cpp
--- zeroc-ice-3.7.1/php/src/php7/Proxy.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Proxy.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Proxy.h>
 #include <Connection.h>
@@ -462,7 +457,7 @@
     ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis());
     assert(_this);
 
-    long l;
+    zend_long l;
     if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
     {
         RETURN_NULL();
@@ -470,7 +465,7 @@
 
     try
     {
-        if(!_this->clone(return_value, _this->proxy->ice_locatorCacheTimeout(l)))
+        if(!_this->clone(return_value, _this->proxy->ice_locatorCacheTimeout(static_cast<Ice::Int>(l))))
         {
             RETURN_NULL();
         }
@@ -556,7 +551,7 @@
     ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis());
     assert(_this);
 
-    long l;
+    zend_long l;
     if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
     {
         RETURN_NULL();
@@ -1190,13 +1185,13 @@
 
     try
     {
-        long l;
+        zend_long l;
         if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
         {
             RETURN_NULL();
         }
         // TODO: range check?
-        if(!_this->clone(return_value, _this->proxy->ice_timeout(l)))
+        if(!_this->clone(return_value, _this->proxy->ice_timeout(static_cast<Ice::Int>(l))))
         {
             RETURN_NULL();
         }
@@ -1237,20 +1232,20 @@
     }
 }
 
-ZEND_METHOD(Ice_ObjectPrx, ice_invocationTimeout )
+ZEND_METHOD(Ice_ObjectPrx, ice_invocationTimeout)
 {
     ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis());
     assert(_this);
 
     try
     {
-        long l;
+        zend_long l;
         if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
         {
             RETURN_NULL();
         }
         // TODO: range check?
-        if(!_this->clone(return_value, _this->proxy->ice_invocationTimeout (l)))
+        if(!_this->clone(return_value, _this->proxy->ice_invocationTimeout(static_cast<Ice::Int>(l))))
         {
             RETURN_NULL();
         }
diff -Nru zeroc-ice-3.7.1/php/src/php7/Proxy.h zeroc-ice-3.7.2/php/src/php7/Proxy.h
--- zeroc-ice-3.7.1/php/src/php7/Proxy.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Proxy.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_PROXY_H
 #define ICEPHP_PROXY_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Types.cpp zeroc-ice-3.7.2/php/src/php7/Types.cpp
--- zeroc-ice-3.7.1/php/src/php7/Types.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Types.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Types.h>
 #include <Proxy.h>
@@ -485,6 +480,10 @@
                 zval* e;
                 info->bytes.resize(zend_hash_num_elements(barr));
 
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wshadow"
+#endif
                 vector<Ice::Byte>::size_type i = 0;
                 ZEND_HASH_FOREACH_VAL(barr, e)
                 {
@@ -493,6 +492,9 @@
                     info->bytes[i++] = static_cast<Ice::Byte>(l);
                 }
                 ZEND_HASH_FOREACH_END();
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#endif
 
                 zval* instances = zend_hash_str_find(Z_OBJPROP_P(s), STRCAST("instances"), sizeof("instances") - 1);
                 assert(Z_TYPE_P(instances) == IS_INDIRECT);
@@ -501,6 +503,10 @@
                 HashTable* oarr = Z_ARRVAL_P(instances);
                 zval* o;
 
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wshadow"
+#endif
                 ZEND_HASH_FOREACH_VAL(oarr, o)
                 {
                     assert(Z_TYPE_P(o) == IS_OBJECT);
@@ -521,6 +527,9 @@
                     info->instances.push_back(writer);
                 }
                 ZEND_HASH_FOREACH_END();
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#endif
 
                 zval* hasOptionalMembers =
                     zend_hash_str_find(Z_OBJPROP_P(s), STRCAST("hasOptionalMembers"), sizeof("hasOptionalMembers") - 1);
@@ -1044,7 +1053,7 @@
     zval* val;
 
     zend_hash_internal_pointer_reset_ex(arr, &pos);
-    while((val = zend_hash_get_current_data_ex(arr, &pos)))
+    while((val = zend_hash_get_current_data_ex(arr, &pos)) != 0)
     {
         assert(Z_TYPE_P(val) == IS_STRING);
         string name = Z_STRVAL_P(val);
@@ -1175,7 +1184,7 @@
 
         assert(Z_TYPE_P(arr) == IS_ARRAY);
         HashTable* member = Z_ARRVAL_P(arr);
-        assert(allowOptional ? zend_hash_num_elements(member) == 4 : zend_hash_num_elements(member) == 2);
+        assert(zend_hash_num_elements(member) == static_cast<uint32_t>(allowOptional ? 4 : 2));
 
         elem = zend_hash_index_find(member, 0);
         assert(Z_TYPE_P(elem) == IS_STRING);
@@ -1622,7 +1631,11 @@
 #    pragma warning(default:4311)
 #    pragma warning(default:4312)
 #endif
-
+        //
+        // Add a temporary null value so that the foreach order is the
+        // same as the index order.
+        //
+        add_index_null(&zv, i);
         elementType->unmarshal(is, this, comm, &zv, cl, false);
     }
 
@@ -1720,12 +1733,7 @@
             seq[i++] = Z_TYPE_P(val) == IS_TRUE;
         }
         ZEND_HASH_FOREACH_END();
-
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-        os->writeBoolSeq(seq);
-#else
         os->write(seq);
-#endif
         break;
     }
     case PrimitiveInfo::KindByte:
@@ -3706,7 +3714,7 @@
     size_t idLen;
     char* name;
     size_t nameLen;
-    long compactId;
+    zend_long compactId;
     zend_bool preserve;
     zend_bool interface;
     zval* base;
diff -Nru zeroc-ice-3.7.1/php/src/php7/Types.h zeroc-ice-3.7.2/php/src/php7/Types.h
--- zeroc-ice-3.7.1/php/src/php7/Types.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Types.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_TYPES_H
 #define ICEPHP_TYPES_H
diff -Nru zeroc-ice-3.7.1/php/src/php7/Util.cpp zeroc-ice-3.7.2/php/src/php7/Util.cpp
--- zeroc-ice-3.7.1/php/src/php7/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Util.h>
 #include <Ice/UUID.h>
@@ -265,9 +260,12 @@
     zval categoryVal;
     ZVAL_UNDEF(&categoryVal);
     zval nameVal;
+    ZVAL_UNDEF(&nameVal);
+
+    bool catOk = getMember(zv, "category", &categoryVal, IS_STRING, false);
+    bool nameOk = getMember(zv, "name", &nameVal, IS_STRING, true);
 
-    if(!getMember(zv, "category", &categoryVal, IS_STRING, false) ||
-       !getMember(zv, "name", &nameVal, IS_STRING, true))
+    if(!catOk || !nameOk)
     {
         return false;
     }
diff -Nru zeroc-ice-3.7.1/php/src/php7/Util.h zeroc-ice-3.7.2/php/src/php7/Util.h
--- zeroc-ice-3.7.1/php/src/php7/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/src/php7/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPHP_UTIL_H
 #define ICEPHP_UTIL_H
diff -Nru zeroc-ice-3.7.1/php/test/Ice/acm/Client.php zeroc-ice-3.7.2/php/test/Ice/acm/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/acm/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/acm/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,75 +1,53 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 error_reporting(E_ALL | E_STRICT);
 
-if(!extension_loaded("ice"))
+require_once("Test.php");
+
+function testSetACM($helper, $com)
 {
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
+    global $NS;
+    $CloseOnIdleForceful = constant($NS ? "Ice\\ACMClose::CloseOnIdleForceful" :
+                                          "Ice_ACMClose::CloseOnIdleForceful");
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
-require_once('Test.php');
+    $CloseOnInvocationAndIdle = constant($NS ? "Ice\\ACMClose::CloseOnInvocationAndIdle" :
+                                               "Ice_ACMClose::CloseOnInvocationAndIdle");
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
+    $HeartbeatOnIdle = constant($NS ? "Ice\\ACMHeartbeat::HeartbeatOnIdle" :
+                                      "Ice_ACMHeartbeat::HeartbeatOnIdle");
 
-function testSetACM($communicator, $com)
-{
-    global $NS;
+    $HeartbeatAlways = constant($NS ? "Ice\\ACMHeartbeat::HeartbeatAlways" :
+                                      "Ice_ACMHeartbeat::HeartbeatAlways");
+
+    $None = constant($NS ? "Ice\\None" : "Ice_Unset");
 
     echo "testing setACM/getACM... ";
     flush();
 
     $adapter = $com->createObjectAdapter(-1, -1, -1);
 
-    $initData = $NS ? eval("return new Ice\\InitializationData;") : new Ice_InitializationData;
-    $initData->properties = $communicator->getProperties()->clone();
-    $initData->properties->setProperty("Ice.ACM.Timeout", "1");
-    $initData->properties->setProperty("Ice.ACM.Client.Timeout", "15");
-    $initData->properties->setProperty("Ice.ACM.Client.Close", "4");
-    $initData->properties->setProperty("Ice.ACM.Client.Heartbeat", "2");
+    $communicator = $helper->communicator();
+    $properties = $communicator->getProperties()->clone();
+    $properties->setProperty("Ice.ACM.Timeout", "1");
+    $properties->setProperty("Ice.ACM.Client.Timeout", "15");
+    $properties->setProperty("Ice.ACM.Client.Close", "4");
+    $properties->setProperty("Ice.ACM.Client.Heartbeat", "2");
 
-    $testCommunicator = $NS ? eval("return Ice\\initialize(\$initData);") :
-                              eval("return Ice_initialize(\$initData);");
+    $communicator = $helper->initialize($properties);
 
-    $proxy = $testCommunicator->stringToProxy($adapter->getTestIntf()->ice_toString())->ice_uncheckedCast(
-        "::Test::TestIntf");
+    $proxy = $communicator->stringToProxy(
+        $adapter->getTestIntf()->ice_toString())->ice_uncheckedCast("::Test::TestIntf");
     $proxy->ice_getConnection();
 
-    $CloseOnIdleForceful =
-        $NS ? constant("Ice\\ACMClose::CloseOnIdleForceful") : constant("Ice_ACMClose::CloseOnIdleForceful");
-    $CloseOnInvocationAndIdle =
-        $NS ? constant("Ice\\ACMClose::CloseOnInvocationAndIdle") : constant("Ice_ACMClose::CloseOnInvocationAndIdle");
-    $HeartbeatOnIdle =
-        $NS ? constant("Ice\\ACMHeartbeat::HeartbeatOnIdle") : constant("Ice_ACMHeartbeat::HeartbeatOnIdle");
-    $HeartbeatAlways =
-        $NS ? constant("Ice\\ACMHeartbeat::HeartbeatAlways") : constant("Ice_ACMHeartbeat::HeartbeatAlways");
-
     $acm = $proxy->ice_getCachedConnection()->getACM();
     test($acm->timeout == 15);
     test($acm->close == $CloseOnIdleForceful);
     test($acm->heartbeat == $HeartbeatOnIdle);
 
-    $none = $NS ? constant("Ice\\None") : constant("Ice_Unset");
-
-    $proxy->ice_getCachedConnection()->setACM($none, $none, $none);
+    $proxy->ice_getCachedConnection()->setACM($None, $None, $None);
     $acm = $proxy->ice_getCachedConnection()->getACM();
     test($acm->timeout == 15);
     test($acm->close == $CloseOnIdleForceful);
@@ -85,28 +63,26 @@
     $proxy->waitForHeartbeatCount(2);
 
     $adapter->deactivate();
-    $testCommunicator->destroy();
+    $communicator->destroy();
     echo "ok\n";
 }
 
-function testHeartbeatManual($communicator, $com)
+function testHeartbeatManual($helper, $com)
 {
-    global $NS;
-
     echo "testing manual heartbeats... ";
     flush();
 
     $adapter = $com->createObjectAdapter(10, -1, 0);
 
-    $initData = $NS ? eval("return new Ice\\InitializationData;") : new Ice_InitializationData;
-    $initData->properties = $communicator->getProperties()->clone();
-    $initData->properties->setProperty("Ice.ACM.Timeout", "10");
-    $initData->properties->setProperty("Ice.ACM.Client.Timeout", "10");
-    $initData->properties->setProperty("Ice.ACM.Client.Close", "0");
-    $initData->properties->setProperty("Ice.ACM.Client.Heartbeat", "0");
-    $testCommunicator = $NS ? eval("return Ice\\initialize(\$initData);") : Ice_initialize($initData);
-    $proxy = $testCommunicator->stringToProxy($adapter->getTestIntf()->ice_toString())->ice_uncheckedCast(
-        "::Test::TestIntf");
+    $communicator = $helper->communicator();
+    $properties = $communicator->getProperties()->clone();
+    $properties->setProperty("Ice.ACM.Timeout", "10");
+    $properties->setProperty("Ice.ACM.Client.Timeout", "10");
+    $properties->setProperty("Ice.ACM.Client.Close", "0");
+    $properties->setProperty("Ice.ACM.Client.Heartbeat", "0");
+    $communicator = $helper->initialize($properties);
+    $proxy = $communicator->stringToProxy(
+        $adapter->getTestIntf()->ice_toString())->ice_uncheckedCast("::Test::TestIntf");
     $con = $proxy->ice_getConnection();
 
     $proxy->startHeartbeatCount();
@@ -118,25 +94,31 @@
     $proxy->waitForHeartbeatCount(5);
 
     $adapter->deactivate();
-    $testCommunicator->destroy();
+    $communicator->destroy();
     echo "ok\n";
 }
 
-function allTests($communicator)
+class Client extends TestHelper
 {
-    $ref = "communicator:default -p 12010";
-    $com = $communicator->stringToProxy($ref)->ice_uncheckedCast("::Test::RemoteCommunicator");
-
-    testSetACM($communicator, $com);
-    testHeartbeatManual($communicator, $com);
-
-    $com->shutdown();
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $ref = sprintf("communicator:%s", $this->getTestEndpoint());
+            $com = $communicator->stringToProxy($ref)->ice_uncheckedCast("::Test::RemoteCommunicator");
+
+            testSetACM($this, $com);
+            testHeartbeatManual($this, $com);
+
+            $com->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
 }
-
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-allTests($communicator);
-$communicator->destroy();
-
-exit();
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/acm/Test.ice zeroc-ice-3.7.2/php/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/binding/Client.php zeroc-ice-3.7.2/php/test/Ice/binding/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/binding/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/binding/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,12 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 error_reporting(E_ALL | E_STRICT);
 
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 function createTestIntfPrx($adapters)
 {
     $endpoints = array();
@@ -55,17 +32,18 @@
     }
 }
 
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
+    $communicator = $helper->communicator();
     $random = $NS ? constant("Ice\\EndpointSelectionType::Random") : constant("Ice_EndpointSelectionType::Random");
     $ordered = $NS ? constant("Ice\\EndpointSelectionType::Ordered") : constant("Ice_EndpointSelectionType::Ordered");
     $closeGracefullyAndWait =
         $NS ? constant("Ice\\ConnectionClose::GracefullyWithWait") :
               constant("Ice_ConnectionClose::GracefullyWithWait");
 
-    $ref = "communicator:default -p 12010";
+    $ref = sprintf("communicator:%s", $helper->getTestEndpoint());
     $com = $communicator->stringToProxy($ref)->ice_uncheckedCast("::Test::RemoteCommunicator");
 
     echo "testing binding with single endpoint... ";
@@ -534,10 +512,21 @@
     $com->shutdown();
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-
-allTests($communicator);
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            allTests($this);
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/binding/Test.ice zeroc-ice-3.7.2/php/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/checksum/Checksums_no_ns.php zeroc-ice-3.7.2/php/test/Ice/checksum/Checksums_no_ns.php
--- zeroc-ice-3.7.1/php/test/Ice/checksum/Checksums_no_ns.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/checksum/Checksums_no_ns.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,13 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-function allTests($communicator)
+function allTests($helper)
 {
     global $Ice_sliceChecksums;
-
-    $ref = "test:default -p 12010";
+    $communicator = $helper->communicator();
+    $ref = sprintf("test:%s", $helper->getTestEndpoint());
     $base = $communicator->stringToProxy($ref);
     test($base);
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/checksum/Checksums_ns.php zeroc-ice-3.7.2/php/test/Ice/checksum/Checksums_ns.php
--- zeroc-ice-3.7.1/php/test/Ice/checksum/Checksums_ns.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/checksum/Checksums_ns.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,12 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-function allTests($communicator)
+function allTests($helper)
 {
-    $ref = "test:default -p 12010";
+    $communicator = $helper->communicator();
+    $ref = sprintf("test:%s", $helper->getTestEndpoint());
     $base = $communicator->stringToProxy($ref);
     test($base);
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/checksum/Client.php zeroc-ice-3.7.2/php/test/Ice/checksum/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/checksum/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/checksum/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,29 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 require_once('CTypes.php');
+global $NS;
+require_once($NS ? "Checksums_ns.php" : "Checksums_no_ns.php");
 
-function test($b)
+class Client extends TestHelper
 {
-    if(!$b)
+    function run($args)
     {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
+        try
+        {
+            $communicator = $this->initialize($args);
+            $checksum = allTests($this);
+            $checksum->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
     }
 }
-
-require_once($NS ? "Checksums_ns.php" : "Checksums_no_ns.php");
-
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-
-$checksum = allTests($communicator);
-$checksum->shutdown();
-$communicator->destroy();
-exit();
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/checksum/CTypes.ice zeroc-ice-3.7.2/php/test/Ice/checksum/CTypes.ice
--- zeroc-ice-3.7.1/php/test/Ice/checksum/CTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/checksum/CTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/checksum/Makefile.mk zeroc-ice-3.7.2/php/test/Ice/checksum/Makefile.mk
--- zeroc-ice-3.7.1/php/test/Ice/checksum/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/checksum/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(test)_sliceflags = --checksum
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/checksum/Test.ice zeroc-ice-3.7.2/php/test/Ice/checksum/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/checksum/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/checksum/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/defaultValue/Client.php zeroc-ice-3.7.2/php/test/Ice/defaultValue/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/defaultValue/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/defaultValue/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,10 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 function allTests()
 {
     global $NS;
@@ -224,7 +199,11 @@
     echo "ok\n";
 }
 
-allTests();
-
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        allTests();
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/php/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/enums/Client.php zeroc-ice-3.7.2/php/test/Ice/enums/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/enums/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/enums/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,15 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
 $NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
+function allTests($helper)
 {
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
-{
-    $ref = "test:default -p 12010";
+    $ref = sprintf("test:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $obj = $communicator->stringToProxy($ref);
     test($obj != null);
     $proxy = $obj->ice_checkedCast("::Test::TestIntf");
@@ -246,11 +223,22 @@
     return $proxy;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-
-$t = allTests($communicator);
-$t->shutdown();
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy= allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/enums/Test.ice zeroc-ice-3.7.2/php/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/exceptions/Client.php zeroc-ice-3.7.2/php/test/Ice/exceptions/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/exceptions/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/exceptions/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,18 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
     echo "testing stringToProxy... ";
     flush();
-    $ref = "thrower:default -p 12010";
+    $ref = sprintf("thrower:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $base = $communicator->stringToProxy($ref);
     test($base != null);
     echo "ok\n";
@@ -430,18 +406,29 @@
     return $thrower;
 }
 
-$initData = $NS ? eval("return new Ice\\InitializationData;") : eval("return new Ice_InitializationData;");
-$initData->properties = $NS ? eval("return Ice\\getProperties();") : eval("return Ice_getProperties();");
-$initData->properties->setProperty("Ice.MessageSizeMax", "10");
-$communicator = $NS ? eval("return Ice\\initialize(\$argv, \$initData);") :
-                      eval("return Ice_initialize(\$argv, \$initData);");
-
-// This property is set by the test suite, howerver we need to override it for this test.
-// Unlike C++, we can not pass $argv into Ice::createProperties, so we just set it after.
-$communicator->getProperties()->setProperty("Ice.Warn.Connections", "0");
-
-$thrower = allTests($communicator);
-$thrower->shutdown();
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $properties = $this->createTestProperties($args);
+            $properties->setProperty("Ice.MessageSizeMax", "10");
+            //
+            // This property is set by the test suite, howerver we need to override it for this test.
+            // Unlike C++, we can not pass $argv into Ice::createProperties, so we just set it after.
+            //
+            $properties->setProperty("Ice.Warn.Connections", "0");
+            $communicator = $this->initialize($properties);
+            $proxy= allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/php/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/facets/Client.php zeroc-ice-3.7.2/php/test/Ice/facets/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/facets/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/facets/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,42 +1,18 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
 
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
     echo "testing stringToProxy... ";
     flush();
-    $ref = "d:default -p 12010";
+    $ref = sprintf("d:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $db = $communicator->stringToProxy($ref);
     test($db != null);
     echo "ok\n";
@@ -128,10 +104,22 @@
     return $gf;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-$g = allTests($communicator);
-$g->shutdown();
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy= allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/facets/Test.ice zeroc-ice-3.7.2/php/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/info/Client.php zeroc-ice-3.7.2/php/test/Ice/info/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/info/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/info/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,10 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 function getTCPEndpointInfo($i)
 {
     global $NS;
@@ -58,10 +33,12 @@
     }
 }
 
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
+    $communicator = $helper->communicator();
+
     $tcpEndpointType = $NS ? constant("Ice\\TCPEndpointType") : constant("Ice_TCPEndpointType");
     $tcpEndpointInfoClass = $NS ? "Ice\\TCPEndpointInfo" : "Ice_TCPEndpointInfo";
     $udpEndpointType = $NS ? constant("Ice\\UDPEndpointType") : constant("Ice_UDPEndpointType");
@@ -84,7 +61,7 @@
                 "opaque -e 1.8 -t 100 -v ABCD");
 
         $endps = $p1->ice_getEndpoints();
-
+        $port = $helper->getTestPort();
         $endpoint = $endps[0]->getInfo();
         $tcpEndpoint = getTCPEndpointInfo($endpoint);
         test($tcpEndpoint instanceof $tcpEndpointInfoClass);
@@ -122,15 +99,16 @@
     echo "ok\n";
 
     $defaultHost = $communicator->getProperties()->getProperty("Ice.Default.Host");
-    $base = $communicator->stringToProxy("test:default -p 12010:udp -p 12010");
+    $base = $communicator->stringToProxy(
+        sprintf("test:%s:%s", $helper->getTestEndpoint(), $helper->getTestEndpoint("udp")));
     $testIntf = $base->ice_checkedCast("::Test::TestIntf");
-
+    $testPort = $helper->getTestPort();
     echo "test connection endpoint information... ";
     flush();
     {
         $tcpinfo = getTCPEndpointInfo($base->ice_getConnection()->getEndpoint()->getInfo());
         test($tcpinfo instanceof $tcpEndpointInfoClass);
-        test($tcpinfo->port == 12010);
+        test($tcpinfo->port == $testPort);
         test(!$tcpinfo->compress);
         test($tcpinfo->host == $defaultHost);
 
@@ -141,7 +119,7 @@
 
         $udpinfo = $base->ice_datagram()->ice_getConnection()->getEndpoint()->getInfo();
         test($udpinfo instanceof $udpEndpointInfoClass);
-        test($udpinfo->port == 12010);
+        test($udpinfo->port == $testPort);
         test($udpinfo->host == $defaultHost);
     }
     echo "ok\n";
@@ -149,6 +127,7 @@
     echo "testing connection information... ";
     flush();
     {
+        $port = $helper->getTestPort();
         $ipConnectionInfoClass = $NS ? "Ice\\TCPConnectionInfo" : "Ice_TCPConnectionInfo";
         $wsConnectionInfoClass = $NS ? "Ice\\WSConnectionInfo" : "Ice_WSConnectionInfo";
 
@@ -160,7 +139,7 @@
         test($tcpinfo instanceof $ipConnectionInfoClass);
         test(!$info->incoming);
         test(strlen($info->adapterName) == 0);
-        test($tcpinfo->remotePort == 12010);
+        test($tcpinfo->remotePort == $port);
         if($defaultHost == "127.0.0.1")
         {
             test($tcpinfo->remoteAddress == $defaultHost);
@@ -198,11 +177,22 @@
     return $testIntf;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-$server = allTests($communicator);
-$server->shutdown();
-$communicator->destroy();
-
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy= allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/info/Test.ice zeroc-ice-3.7.2/php/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/inheritance/Client.php zeroc-ice-3.7.2/php/test/Ice/inheritance/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/inheritance/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/inheritance/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,16 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
 
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     echo "testing stringToProxy... ";
     flush();
-    $ref = "initial:default -p 12010";
+    $ref = sprintf("initial:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $base = $communicator->stringToProxy($ref);
     test($base != null);
     echo "ok\n";
@@ -237,10 +213,22 @@
     return $initial;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-$initial = allTests($communicator);
-$initial->shutdown();
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy= allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/php/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/ini/Client.php zeroc-ice-3.7.2/php/test/Ice/ini/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/ini/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/ini/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,19 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-function test($b)
+class Client extends TestHelper
 {
-    if(!$b)
+    function run($args)
     {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
+        global $NS;
+        $properties = call_user_func($NS ? "\\Ice\\getProperties" : "Ice_getProperties");
+        test($properties->getPropertyAsInt("Ice.Trace.Protocol") == 1);
+        test($properties->getPropertyAsInt("Ice.Trace.Network") == 1);
+        test($properties->getPropertyAsInt("Ice.Warn.Connections") == 1);
+        test($properties->getProperty("Hello.Proxy") == "hello:tcp -h localhost -p 10000");
     }
 }
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
-
-$communicator = null;
-
-if($NS)
-{
-    $initData = eval("return new Ice\\InitializationData;");
-    $initData->properties = eval("return Ice\\getProperties();");
-    $communicator = eval("return Ice\\initialize(\$initData);");
-}
-else
-{
-    $initData = new Ice_InitializationData;
-    $initData->properties = Ice_getProperties();
-    $communicator = Ice_initialize($initData);
-}
-
-test($communicator != null);
-
-$properties = $communicator->getProperties();
-test($properties != null);
-
-//test($properties->getPropertyAsInt("Ice.Trace.Protocol") == 1);
-test($properties->getPropertyAsInt("Ice.Trace.Network") == 1);
-test($properties->getPropertyAsInt("Ice.Warn.Connections") == 1);
-test($properties->getProperty("Hello.Proxy") == "hello:tcp -h localhost -p 10000");
-
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/ini/ClientWithProfile.php zeroc-ice-3.7.2/php/test/Ice/ini/ClientWithProfile.php
--- zeroc-ice-3.7.1/php/test/Ice/ini/ClientWithProfile.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/ini/ClientWithProfile.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,70 +1,19 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-function test($b)
+class ClientWithProfile extends TestHelper
 {
-    if(!$b)
+    function run($args)
     {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
+        global $NS;
+        $properties = call_user_func($NS ? "\\Ice\\getProperties" : "Ice_getProperties", "Test");
+        test($properties->getPropertyAsInt("Ice.Trace.Protocol") == 1);
+        test($properties->getPropertyAsInt("Ice.Trace.Network") == 1);
+        test($properties->getPropertyAsInt("Ice.Warn.Connections") == 1);
+        test($properties->getProperty("Hello.Proxy") == "hello:tcp -h localhost -p 10000");
     }
 }
 
-$NS = function_exists("Ice\\initialize");
-require_once ('Ice.php');
-
-//
-// Load the Demo profile.
-//
-
-$communicator = null;
-
-if($NS)
-{
-    $initData = eval("return new Ice\\InitializationData;");
-    $initData->properties = eval("return Ice\\getProperties();");
-    $communicator = eval("return Ice\\initialize(\$initData);");
-}
-else
-{
-    $initData = new Ice_InitializationData;
-    $initData->properties = Ice_getProperties();
-    $communicator = Ice_initialize($initData);
-}
-
-test($communicator != null);
-
-$properties = null;
-if($NS)
-{
-    $properties = eval("return Ice\\getProperties(\"Test\");");
-}
-else
-{
-    $properties = Ice_getProperties("Test");
-}
-
-test($properties != null);
-
-test($properties->getPropertyAsInt("Ice.Trace.Protocol") == 1);
-test($properties->getPropertyAsInt("Ice.Trace.Network") == 1);
-test($properties->getPropertyAsInt("Ice.Warn.Connections") == 1);
-test($properties->getProperty("Hello.Proxy") == "hello:tcp -h localhost -p 10000");
-
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/ini/test.py zeroc-ice-3.7.2/php/test/Ice/ini/test.py
--- zeroc-ice-3.7.1/php/test/Ice/ini/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/ini/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IniClient(Client):
 
@@ -39,5 +34,5 @@
     ClientTestCase("php INI settings with profiles",
                    client=IniClient("--Ice.Trace.Network=1 --Ice.Warn.Connections=1",
                                     "Test",
-                                    exe="ClientWithProfile.php"))
+                                    exe="ClientWithProfile"))
 ])
diff -Nru zeroc-ice-3.7.1/php/test/Ice/objects/Client.php zeroc-ice-3.7.2/php/test/Ice/objects/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/objects/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/objects/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,9 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
 $NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
 if($NS)
@@ -37,6 +23,7 @@
         class Ice_InterfaceByValue extends Ice\InterfaceByValue {}
         interface Ice_ObjectFactory extends Ice\ObjectFactory {}
         interface Ice_ValueFactory extends Ice\ValueFactory {}
+        class Test_L extends Test\L {}
 EOT;
     eval($code);
 }
@@ -181,23 +168,14 @@
     }
 }
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
     echo "testing stringToProxy... ";
     flush();
-    $ref = "initial:default -p 12010";
+    $ref = sprintf("initial:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $base = $communicator->stringToProxy($ref);
     test($base != null);
     echo "ok\n";
@@ -363,6 +341,37 @@
     test($h != null and $h instanceof HI);
     echo "ok\n";
 
+    echo "getting K... ";
+    flush();
+    $k = $initial->getK();
+    test($k->value->data == "l");
+    echo "ok\n";
+
+    echo "testing Value as parameter... ";
+    flush();
+    $v1 = new Test_L();
+    $v1->data = "l";
+    $v2 = null;
+    $v3 = $initial->opValue($v1, $v2);
+    test($v2->data == "l");
+    test($v3->data == "l");
+
+    $v1 = array(new Test_L());
+    $v1[0]->data = "l";
+    $v2 = null;
+    $v3 = $initial->opValueSeq($v1, $v2);
+    test($v2[0]->data == "l");
+    test($v3[0]->data == "l");
+
+    $v1 = array("l" => new Test_L());
+    $v1["l"]->data = "l";
+    $v2 = null;
+    $v3 = $initial->opValueMap($v1, $v2);
+    test($v2["l"]->data == "l");
+    test($v3["l"]->data == "l");
+
+    echo "ok\n";
+
     echo "getting D1... ";
     flush();
     $d1 = $initial->getD1(new Test_D1(new Test_A1("a1"), new Test_A1("a2"), new Test_A1("a3"), new Test_A1("a4")));
@@ -422,9 +431,29 @@
     $outS = null;
     $initial->opBaseSeq(array(), $outS);
 
-    $base = $NS ? eval("return new Test\\Base;") : eval("return new Test_Base;");
-    $retS = $initial->opBaseSeq(array($base), $outS);
-    test(count($retS) == 1 && count($outS) == 1);
+    $seq = array();
+    for($i = 0; $i < 120; $i++)
+    {
+        $b = $NS ? eval("return new Test\\Base;") : eval("return new Test_Base;");
+        $b->str = "b" . $i;
+        $b->theS = $NS ? eval("return new Test\\S;") : eval("return new Test_S;");
+        $b->theS->str = "b" . $i;
+        $seq[$i] = $b;
+    }
+
+    $retS = $initial->opBaseSeq($seq, $outS);
+    test($seq == $retS);
+    test($seq == $outS);
+    $i = 0;
+    foreach($retS as $obj)
+    {
+        test($obj == $seq[$i++]);
+    }
+    $i = 0;
+    foreach($outS as $obj)
+    {
+        test($obj == $seq[$i++]);
+    }
     echo "ok\n";
 
     echo "testing recursive type... ";
@@ -496,7 +525,7 @@
 
     echo "testing UnexpectedObjectException... ";
     flush();
-    $ref = "uoet:default -p 12010";
+    $ref = sprintf("uoet:%s", $helper->getTestEndpoint());
     $base = $communicator->stringToProxy($ref);
     test($base != null);
     $uoet = $base->ice_uncheckedCast("::Test::UnexpectedObjectExceptionTest");
@@ -541,20 +570,32 @@
     return $initial;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-$factory = new MyValueFactory();
-$communicator->getValueFactoryManager()->add($factory, "::Test::B");
-$communicator->getValueFactoryManager()->add($factory, "::Test::C");
-$communicator->getValueFactoryManager()->add($factory, "::Test::D");
-$communicator->getValueFactoryManager()->add($factory, "::Test::E");
-$communicator->getValueFactoryManager()->add($factory, "::Test::F");
-$communicator->getValueFactoryManager()->add($factory, "::Test::I");
-$communicator->getValueFactoryManager()->add($factory, "::Test::J");
-$communicator->getValueFactoryManager()->add($factory, "::Test::H");
-$communicator->addObjectFactory(new MyObjectFactory(), "TestOF");
-$initial = allTests($communicator);
-$initial->shutdown();
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $factory = new MyValueFactory();
+            $communicator->getValueFactoryManager()->add($factory, "::Test::B");
+            $communicator->getValueFactoryManager()->add($factory, "::Test::C");
+            $communicator->getValueFactoryManager()->add($factory, "::Test::D");
+            $communicator->getValueFactoryManager()->add($factory, "::Test::E");
+            $communicator->getValueFactoryManager()->add($factory, "::Test::F");
+            $communicator->getValueFactoryManager()->add($factory, "::Test::I");
+            $communicator->getValueFactoryManager()->add($factory, "::Test::J");
+            $communicator->getValueFactoryManager()->add($factory, "::Test::H");
+            $communicator->addObjectFactory(new MyObjectFactory(), "TestOF");
+            $initial = allTests($this);
+            $initial->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/objects/Test.ice zeroc-ice-3.7.2/php/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -142,6 +137,19 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
 interface Initial
 {
     void shutdown();
@@ -160,9 +168,14 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
diff -Nru zeroc-ice-3.7.1/php/test/Ice/operations/Client.php zeroc-ice-3.7.2/php/test/Ice/operations/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/operations/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/operations/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,10 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
 
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 function twoways($communicator, $p)
 {
     global $NS;
@@ -1085,11 +1060,12 @@
     }
 }
 
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
-    $ref = "test:default -p 12010";
+    $ref = sprintf("test:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $base = $communicator->stringToProxy($ref);
     $cl = $base->ice_checkedCast("::Test::MyClass");
     $derived = $cl->ice_checkedCast("::Test::MyDerivedClass");
@@ -1111,34 +1087,39 @@
     return $cl;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-
-$myClass = allTests($communicator);
-
-echo "testing server shutdown... ";
-flush();
-$myClass->shutdown();
-try
-{
-    $myClass->opVoid();
-    test(false);
-}
-catch(Exception $ex)
+class Client extends TestHelper
 {
-    $le = $NS ? "Ice\\LocalException" : "Ice_LocalException";
-    if(!($ex instanceof $le))
+    function run($args)
     {
-        throw $ex;
+        global $NS;
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy = allTests($this);
+            $proxy->shutdown();
+            try
+            {
+                $proxy->opVoid();
+                test(false);
+            }
+            catch(Exception $ex)
+            {
+                $le = $NS ? "Ice\\LocalException" : "Ice_LocalException";
+                if(!($ex instanceof $le))
+                {
+                    throw $ex;
+                }
+                echo "ok\n";
+            }
+            # Test multiple destroy calls
+            $communicator->destroy();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+        }
     }
-    echo "ok\n";
 }
 
-# Test multiple destroy calls
-$communicator->destroy();
-$communicator->destroy();
-
-$communicator->destroy();
-
-exit();
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/operations/Test.ice zeroc-ice-3.7.2/php/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/optional/Client.php zeroc-ice-3.7.2/php/test/Ice/optional/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/optional/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/optional/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,11 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('ClientPrivate.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
     global $Ice_Encoding_1_0;
@@ -40,7 +15,8 @@
 
     echo "testing stringToProxy... ";
     flush();
-    $ref = "initial:default -p 12010";
+    $ref = sprintf("initial:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $base = $communicator->stringToProxy($ref);
     echo "ok\n";
 
@@ -845,13 +821,22 @@
     return $initial;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-
-$initial = allTests($communicator);
-
-$initial->shutdown();
-$communicator->destroy();
-
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy = allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+       }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/optional/ClientPrivate.ice zeroc-ice-3.7.2/php/test/Ice/optional/ClientPrivate.ice
--- zeroc-ice-3.7.1/php/test/Ice/optional/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/optional/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/optional/Test.ice zeroc-ice-3.7.2/php/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/proxy/Client.php zeroc-ice-3.7.2/php/test/Ice/proxy/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/proxy/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/proxy/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,10 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
 
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 function currentEncodingToString()
 {
     global $NS;
@@ -37,7 +12,7 @@
                  eval("return Ice_encodingVersionToString(Ice_currentEncoding());");
 }
 
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
     global $Ice_Encoding_1_0;
@@ -56,7 +31,8 @@
 
     echo "testing stringToProxy... ";
     flush();
-    $ref = "test:default -p 12010";
+    $ref = sprintf("test:%s", $helper->getTestEndpoint());
+    $communicator = $helper->communicator();
     $base = $communicator->stringToProxy($ref);
     test($base != null);
 
@@ -346,7 +322,7 @@
     //test($b1->ice_getLocatorCacheTimeout() == 60);
     //$communicator->getProperties()->setProperty("Ice.Default.LocatorCacheTimeout", "");
 
-    $communicator->getProperties()->setProperty($propertyPrefix, "test:default -p 12010");
+    $communicator->getProperties()->setProperty($propertyPrefix, sprintf("test:%s", $helper->getTestEndpoint()));
 
     $property = $propertyPrefix . ".Router";
     test(!$b1->ice_getRouter());
@@ -581,7 +557,7 @@
 
     echo "testing encoding versioning... ";
     flush();
-    $ref20 = "test -e 2.0:default -p 12010";
+    $ref20 = sprintf("test -e 2.0:%s", $helper->getTestEndpoint());
     $cl20 = $communicator->stringToProxy($ref20)->ice_uncheckedCast("::Test::MyClass");
     try
     {
@@ -597,7 +573,7 @@
             throw $ex;
         }
     }
-    $ref10 = "test -e 1.0:default -p 12010";
+    $ref10 = sprintf("test -e 1.0:%s", $helper->getTestEndpoint());
     $cl10 = $communicator->stringToProxy($ref10)->ice_uncheckedCast("::Test::MyClass");
     $cl10->ice_ping();
     $cl10->ice_encodingVersion($Ice_Encoding_1_0)->ice_ping();
@@ -605,7 +581,7 @@
 
     // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
     // call will use the 1.1 encoding
-    $ref13 = "test -e 1.3:default -p 12010";
+    $ref13 = sprintf("test -e 1.3:%s", $helper->getTestEndpoint());
     $cl13 = $communicator->stringToProxy($ref13)->ice_uncheckedCast("::Test::MyClass");
     $cl13->ice_ping();
     echo "ok\n";
@@ -792,10 +768,6 @@
     {
         $ssl = $communicator->getProperties()->getProperty("Ice.Default.Protocol") == "ssl";
         $tcp = $communicator->getProperties()->getProperty("Ice.Default.Protocol") == "tcp";
-        if($tcp)
-        {
-            $p1->ice_encodingVersion($Ice_Encoding_1_0)->ice_ping();
-        }
 
         // Two legal TCP endpoints expressed as opaque endpoints
         $p1 = $communicator->stringToProxy("test -e 1.0:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAA==");
@@ -879,11 +851,22 @@
     return $cl;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-$myClass = allTests($communicator);
-$myClass->shutdown();
-$communicator->destroy();
-
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy= allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/php/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/scope/Client.php zeroc-ice-3.7.2/php/test/Ice/scope/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/scope/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/scope/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,137 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-error_reporting(E_ALL | E_STRICT);
+require_once('Test.php');
 
-if(!extension_loaded("ice"))
+function allTests($helper)
 {
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
+    global $NS;
+
+    $communicator = $helper->communicator();
+    {
+        $base = $communicator->stringToProxy(sprintf("i1:%s", $helper->getTestEndpoint()));
+        $i = $base->ice_checkedCast("::Test::I");
+
+        $s1 = $NS ? eval("return new Test\\S(0);") :
+                    eval("return new Test_S(0);");
+        $s2 = null;
+        $s3 = $i->opS($s1, $s2);
+        test($s1 == $s3);
+        test($s2 == $s3);
+
+        $sseq1 = array($s1);
+        $sseq2 = null;
+        $sseq3 = $i->opSSeq($sseq1, $sseq2);
+        test($sseq2[0] == $s1);
+        test($sseq3[0] == $s1);
+
+        $smap1 = array("a" => $s1);
+        $smap2 = null;
+        $smap3 = $i->opSMap($smap1, $smap2);
+        test($smap2["a"] == $s1);
+        test($smap3["a"] == $s1);
+    }
+
+    {
+        $base = $communicator->stringToProxy(sprintf("i2:%s", $helper->getTestEndpoint()));
+        $i = $base->ice_checkedCast("::Test::Inner::Inner2::I");
+
+        $s1 = $NS ? eval("return new Test\\Inner\\Inner2\\S(0);") :
+                    eval("return new Test_Inner_Inner2_S(0);");
+        $s2 = null;
+        $s3 = $i->opS($s1, $s2);
+        test($s1 == $s3);
+        test($s2 == $s3);
+
+        $sseq1 = array($s1);
+        $sseq2 = null;
+        $sseq3 = $i->opSSeq($sseq1, $sseq2);
+        test($sseq2[0] == $s1);
+        test($sseq3[0] == $s1);
+
+        $smap1 = array("a" => $s1);
+        $smap2 = null;
+        $smap3 = $i->opSMap($smap1, $smap2);
+        test($smap2["a"] == $s1);
+        test($smap3["a"] == $s1);
+    }
+
+    {
+        $base = $communicator->stringToProxy(sprintf("i3:%s", $helper->getTestEndpoint()));
+        $i = $base->ice_checkedCast("::Test::Inner::I");
+
+        $s1 = $NS ? eval("return new Test\\Inner\\Inner2\\S(0);") :
+                    eval("return new Test_Inner_Inner2_S(0);");
+        $s2 = null;
+        $s3 = $i->opS($s1, $s2);
+        test($s1 == $s3);
+        test($s2 == $s3);
+
+        $sseq1 = array($s1);
+        $sseq2 = null;
+        $sseq3 = $i->opSSeq($sseq1, $sseq2);
+        test($sseq2[0] == $s1);
+        test($sseq3[0] == $s1);
+
+        $smap1 = array("a" => $s1);
+        $smap2 = null;
+        $smap3 = $i->opSMap($smap1, $smap2);
+        test($smap2["a"] == $s1);
+        test($smap3["a"] == $s1);
+    }
+
+    {
+        $base = $communicator->stringToProxy(sprintf("i4:%s", $helper->getTestEndpoint()));
+        $i = $base->ice_checkedCast("::Inner::Test::Inner2::I");
+
+        $s1 = $NS ? eval("return new Test\\S(0);") :
+                    eval("return new Test_S(0);");
+        $s2 = null;
+        $s3 = $i->opS($s1, $s2);
+        test($s1 == $s3);
+        test($s2 == $s3);
+
+        $sseq1 = array($s1);
+        $sseq2 = null;
+        $sseq3 = $i->opSSeq($sseq1, $sseq2);
+        test($sseq2[0] == $s1);
+        test($sseq3[0] == $s1);
+
+        $smap1 = array("a" => $s1);
+        $smap2 = null;
+        $smap3 = $i->opSMap($smap1, $smap2);
+        test($smap2["a"] == $s1);
+        test($smap3["a"] == $s1);
+    }
+
+    {
+        $base = $communicator->stringToProxy(sprintf("i1:%s", $helper->getTestEndpoint()));
+        $i = $base->ice_checkedCast("::Test::I");
+        $i->shutdown();
+    }
 }
 
-function foo()
+class Client extends TestHelper
 {
-    require_once('Ice.php');
-    require_once('IceGrid.php');
+    function run($args)
+    {
+        try
+        {
+            echo "test same Slice type name in different scopes... ";
+            flush();
+            $communicator = $this->initialize($args);
+            allTests($this);
+            echo "ok\n";
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+       }
+    }
 }
 
-echo "testing generated code in a non-global scope... ";
-flush();
-
-foo();
-
-echo "ok\n";
-
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/scope/.gitignore zeroc-ice-3.7.2/php/test/Ice/scope/.gitignore
--- zeroc-ice-3.7.1/php/test/Ice/scope/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/scope/.gitignore	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1 @@
+Test.php
diff -Nru zeroc-ice-3.7.1/php/test/Ice/scope/Test.ice zeroc-ice-3.7.2/php/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,136 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq s1, out CSeq s2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/php/test/Ice/slicing/exceptions/Client.php zeroc-ice-3.7.2/php/test/Ice/slicing/exceptions/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/slicing/exceptions/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/slicing/exceptions/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,17 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
     global $Ice_Encoding_1_0;
 
-    $obj = $communicator->stringToProxy("Test:default -p 12010");
+    $communicator = $helper->communicator();
+    $obj = $communicator->stringToProxy(sprintf("Test:%s", $helper->getTestEndpoint()));
     $test = $obj->ice_checkedCast("::Test::TestIntf");
 
     echo "base... ";
@@ -434,11 +410,22 @@
     return $test;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-
-$test = allTests($communicator);
-$test->shutdown();
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy = allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+       }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/slicing/exceptions/Test.ice zeroc-ice-3.7.2/php/test/Ice/slicing/exceptions/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/slicing/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/slicing/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/slicing/objects/Client.php zeroc-ice-3.7.2/php/test/Ice/slicing/objects/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/slicing/objects/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/slicing/objects/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,19 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('ClientPrivate.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
     global $Ice_Encoding_1_0;
 
     $d1cls = $NS ? "Test\\D1" : "Test_D1";
     $d3cls = $NS ? "Test\\D3" : "Test_D3";
-
-    $obj = $communicator->stringToProxy("Test:default -p 12010");
+    $communicator = $helper->communicator();
+    $obj = $communicator->stringToProxy(sprintf("Test:%s", $helper->getTestEndpoint()));
     $test = $obj->ice_checkedCast("::Test::TestIntf");
 
     echo "base as Object... ";
@@ -1075,10 +1050,22 @@
     return $test;
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-$test = allTests($communicator);
-$test->shutdown();
-$communicator->destroy();
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            $proxy = allTests($this);
+            $proxy->shutdown();
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+       }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/php/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/php/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/slicing/objects/Test.ice zeroc-ice-3.7.2/php/test/Ice/slicing/objects/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/slicing/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/slicing/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Ice/timeout/Client.php zeroc-ice-3.7.2/php/test/Ice/timeout/Client.php
--- zeroc-ice-3.7.1/php/test/Ice/timeout/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/timeout/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
 
 //
 // We need to ensure that the memory limit is high enough
@@ -16,26 +9,8 @@
 //
 ini_set('memory_limit', '1024M');
 
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 function connect($prx)
 {
     global $NS;
@@ -60,7 +35,7 @@
     return $prx->ice_getConnection(); // Establish connection.
 }
 
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
     $ConnectTimeoutException = $NS ? "Ice\\ConnectTimeoutException" : "Ice_ConnectTimeoutException";
@@ -70,14 +45,16 @@
                                              "Ice_ConnectionClose::GracefullyWithWait");
     $InitializationData = $NS ? "Ice\\InitializationData" : "Ice_InitializationData";
 
-    $sref = "timeout:default -p 12010";
+    $communicator = $helper->communicator();
+    $sref = sprintf("timeout:%s", $helper->getTestEndpoint());
     $timeout = $communicator->stringToProxy($sref);
     test($timeout);
 
     $timeout = $timeout->ice_checkedCast("::Test::Timeout");
     test($timeout);
 
-    $controller = $communicator->stringToProxy("controller:default -p 12011")->ice_checkedCast("::Test::Controller");
+    $controller = $communicator->stringToProxy(sprintf("controller:%s", $helper->getTestEndpoint(1)));
+    $controller = $controller->ice_checkedCast("::Test::Controller");
     test($controller);
 
     echo("testing connect timeout... ");
@@ -109,7 +86,7 @@
         //
         // Expect success.
         //
-        $to =$timeout->ice_timeout(2000);
+        $to = $timeout->ice_timeout(-1);
         $controller->holdAdapter(100);
         try
         {
@@ -417,29 +394,38 @@
     $communicator->destroy();
 }
 
-$initData = eval($NS ? "return new Ice\\InitializationData();" : "return new Ice_InitializationData();");
-
-$initData->properties = eval($NS ? "return Ice\\createProperties(\$argv);" : "return Ice_createProperties(\$argv);");
-
-//
-// For this test, we want to disable retries.
-//
-$initData->properties->setProperty("Ice.RetryIntervals", "-1");
-
-//
-// This test kills connections, so we don't want warnings.
-//
-$initData->properties->setProperty("Ice.Warn.Connections", "0");
-
-//
-// Limit the send buffer size, this test relies on the socket
-// send() blocking after sending a given amount of data.
-//
-$initData->properties->setProperty("Ice.TCP.SndSize", "50000");
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $properties = $this->createTestProperties($args);
+            //
+            // For this test, we want to disable retries.
+            //
+            $properties->setProperty("Ice.RetryIntervals", "-1");
 
-$communicator = eval($NS ? "return Ice\\initialize(\$initData);" : "return Ice_initialize(\$initData);");
+            //
+            // This test kills connections, so we don't want warnings.
+            //
+            $properties->setProperty("Ice.Warn.Connections", "0");
 
-allTests($communicator);
+            //
+            // Limit the send buffer size, this test relies on the socket
+            // send() blocking after sending a given amount of data.
+            //
+            $properties->setProperty("Ice.TCP.SndSize", "50000");
 
-exit();
+            $communicator = $this->initialize($properties);
+            allTests($this);
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/php/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/php/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/php/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/php/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/php/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 
diff -Nru zeroc-ice-3.7.1/php/test/Slice/escape/Client.php zeroc-ice-3.7.2/php/test/Slice/escape/Client.php
--- zeroc-ice-3.7.1/php/test/Slice/escape/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/escape/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,7 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
 $NS = function_exists("Ice\\initialize");
 require_once('Ice.php');
@@ -29,16 +16,6 @@
     eval($code);
 }
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 class echoI extends and_echo
 {
     public function _else($a, $b)
@@ -46,7 +23,7 @@
     }
 }
 
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
@@ -63,6 +40,7 @@
     test($b->_throw == 0);
     test($b->_use == 0);
     test($b->_var == 0);
+    $communicator = $helper->communicator();
     $p = $communicator->stringToProxy("test:tcp -p 10000");
     $c = $NS ? eval("return _and\\functionPrxHelper::uncheckedCast(\$p);") :
                eval("return and_functionPrxHelper::uncheckedCast(\$p);");
@@ -79,10 +57,21 @@
     echo "ok\n";
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-allTests($communicator);
-$communicator->destroy();
-
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            allTests($this);
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Slice/escape/Key.ice zeroc-ice-3.7.2/php/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/php/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore", "suppress-warning:deprecated"]]
 
diff -Nru zeroc-ice-3.7.1/php/test/Slice/escape/Makefile.mk zeroc-ice-3.7.2/php/test/Slice/escape/Makefile.mk
--- zeroc-ice-3.7.1/php/test/Slice/escape/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/escape/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 tests += $(test)
diff -Nru zeroc-ice-3.7.1/php/test/Slice/macros/Client.php zeroc-ice-3.7.2/php/test/Slice/macros/Client.php
--- zeroc-ice-3.7.1/php/test/Slice/macros/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/macros/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,10 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
-
-$NS = function_exists("Ice\\initialize");
 
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
 function allTests()
 {
     global $NS;
@@ -69,7 +43,11 @@
     echo "ok\n";
 }
 
-allTests();
-
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        allTests();
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Slice/macros/Test.ice zeroc-ice-3.7.2/php/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/php/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This macro sets the default value only when compiling with slice2php.
diff -Nru zeroc-ice-3.7.1/php/test/Slice/structure/Client.php zeroc-ice-3.7.2/php/test/Slice/structure/Client.php
--- zeroc-ice-3.7.1/php/test/Slice/structure/Client.php	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/structure/Client.php	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,16 @@
 <?php
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-error_reporting(E_ALL | E_STRICT);
-
-if(!extension_loaded("ice"))
-{
-    echo "\nerror: Ice extension is not loaded.\n\n";
-    exit(1);
-}
 
-$NS = function_exists("Ice\\initialize");
-require_once('Ice.php');
 require_once('Test.php');
 
-function test($b)
-{
-    if(!$b)
-    {
-        $bt = debug_backtrace();
-        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
-        exit(1);
-    }
-}
-
-function allTests($communicator)
+function allTests($helper)
 {
     global $NS;
 
+    $communicator = $helper->communicator();
+
     echo "testing equals() for Slice structures... ";
     flush();
 
@@ -226,10 +203,21 @@
     echo "ok\n";
 }
 
-$communicator = $NS ? eval("return Ice\\initialize(\$argv);") :
-                      eval("return Ice_initialize(\$argv);");
-allTests($communicator);
-$communicator->destroy();
-
-exit();
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        try
+        {
+            $communicator = $this->initialize($args);
+            allTests($this);
+            $communicator->destroy();
+        }
+        catch(Exception $ex)
+        {
+            $communicator->destroy();
+            throw $ex;
+        }
+    }
+}
 ?>
diff -Nru zeroc-ice-3.7.1/php/test/Slice/structure/Test.ice zeroc-ice-3.7.2/php/test/Slice/structure/Test.ice
--- zeroc-ice-3.7.1/php/test/Slice/structure/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/Slice/structure/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["cpp:include:list"]]
 
diff -Nru zeroc-ice-3.7.1/php/test/TestHelper.php zeroc-ice-3.7.2/php/test/TestHelper.php
--- zeroc-ice-3.7.1/php/test/TestHelper.php	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/php/test/TestHelper.php	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,224 @@
+<?php
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+error_reporting(E_ALL | E_STRICT);
+
+if(!extension_loaded("ice"))
+{
+    echo "\nerror: Ice extension is not loaded.\n\n";
+    exit(1);
+}
+
+$NS = function_exists("\\Ice\\initialize");
+
+require_once('Ice.php');
+
+class TestHelper
+{
+    public function __construct()
+    {
+        $this->_communicator = NULL;
+    }
+
+    public function getTestEndpoint()
+    {
+        global $NS;
+        $propertiesCLS = $NS ? "\\Ice\\Properties" : "\\Ice_Properties";
+        $properties = NULL;
+        $num = 0;
+        $protocol = "";
+        $args = func_get_args();
+
+        if(func_num_args() > 0)
+        {
+            if($args[0] instanceof $propertiesCLS)
+            {
+                $properties = $args[0];
+                if(func_num_args() > 1)
+                {
+                    if(is_numeric($args[1]))
+                    {
+                        $num = $args[1];
+                        if(func_num_args() > 2)
+                        {
+                            $protocol = $args[2];
+                        }
+                    }
+                    else
+                    {
+                        $protocol = $args[1];
+                    }
+                }
+            }
+            else
+            {
+                $properties = $this->_communicator->getProperties();
+                if(is_numeric($args[0]))
+                {
+                    $num = $args[0];
+                    if(func_num_args() > 1)
+                    {
+                        $protocol = $args[1];
+                    }
+                }
+                else
+                {
+                    $protocol = $args[0];
+                }
+            }
+        }
+        else
+        {
+            $properties = $this->_communicator->getProperties();
+        }
+
+        if($protocol == "")
+        {
+            $protocol = $properties->getPropertyWithDefault("Ice.Default.Protocol", "default");
+        }
+
+        $port = $properties->getPropertyAsIntWithDefault("Test.BasePort", 12010) + $num;
+
+        return sprintf("%s -p %d", $protocol, $port);
+    }
+
+    public function getTestHost($properties=NULL)
+    {
+        if($properties == NULL)
+        {
+            $properties = $this->_communicator->getProperties();
+        }
+
+        return $properties->getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+    }
+
+    public function getTestProtocol($properties=NULL)
+    {
+        if($properties == NULL)
+        {
+            $properties = $this->_communicator->getProperties();
+        }
+
+        return $properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+    }
+
+    public function getTestPort()
+    {
+        global $NS;
+        $propertiesCLS = $NS ? "\\Ice\\Properties" : "\\Ice_Properties";
+        $properties = NULL;
+        $num = 0;
+        $args = func_get_args();
+
+        if(func_num_args() > 0)
+        {
+            if($args[0] instanceof $propertiesCLS)
+            {
+                $properties = $args[0];
+                if(func_num_args() > 1)
+                {
+                    $num = $args[1];
+                }
+            }
+            else
+            {
+                $properties = $this->_communicator->getProperties();
+                $num = $args[0];
+            }
+        }
+        else
+        {
+            $properties = $this->_communicator->getProperties();
+        }
+
+        return $properties->getPropertyAsIntWithDefault("Test.BasePort", 12010) + $num;
+    }
+
+    public function createTestProperties($args = array())
+    {
+        global $NS;
+        $properties = call_user_func_array($NS ? "\\Ice\\createProperties" : "\\Ice_createProperties", array(&$args));
+        $properties->parseCommandLineOptions("Test", $args);
+        return $properties;
+    }
+
+    public function initialize()
+    {
+        global $NS;
+        $initDataCLS = $NS ? "\\Ice\\InitializationData" : "\\Ice_InitializationData";
+        $propertiesCLS = $NS ? "\\Ice\\Properties" : "\\Ice_Properties";
+        $initData = NULL;
+        if(func_num_args() > 0)
+        {
+            $args = func_get_args();
+            if($args[0] instanceof $initDataCLS)
+            {
+                $initData = $arguments[0];
+            }
+            else
+            {
+                $initData = new $initDataCLS;
+                if($args[0] instanceof $propertiesCLS)
+                {
+                    $initData->properties = $args[0];
+                }
+                else
+                {
+                    $initData->properties = $this->createTestProperties($args[0]);
+                }
+            }
+        }
+
+        $communicator = call_user_func_array($NS ? "\\Ice\\initialize" : "\\Ice_initialize", array(&$initData));
+        if($this->_communicator == NULL)
+        {
+            $this->_communicator = $communicator;
+        }
+        return $communicator;
+    }
+
+    public function communicator()
+    {
+        return $this->_communicator;
+    }
+
+    public function shutdown()
+    {
+        if($this->_communicator != NULL)
+        {
+            $this->_communicator->shutdown();
+        }
+    }
+
+    public static function runTest($args)
+    {
+        try
+        {
+            $filename = $args[1];
+            require_once($filename . ".php");
+            $classname = pathinfo($filename);
+            $helper = new $classname["filename"];
+            $helper->run(array_slice($args, 1));
+            exit(0);
+        }
+        catch(Exception $ex)
+        {
+            echo $ex->getTraceAsString();
+            exit(1);
+        }
+    }
+}
+
+function test($b)
+{
+    if(!$b)
+    {
+        $bt = debug_backtrace();
+        echo "\ntest failed in ".$bt[0]["file"]." line ".$bt[0]["line"]."\n";
+        exit(1);
+    }
+}
+
+TestHelper::runTest($argv);
diff -Nru zeroc-ice-3.7.1/python/allTests.py zeroc-ice-3.7.2/python/allTests.py
--- zeroc-ice-3.7.1/python/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/python/config/install_dir zeroc-ice-3.7.2/python/config/install_dir
--- zeroc-ice-3.7.1/python/config/install_dir	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/config/install_dir	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 from setuptools.command.easy_install import easy_install
 class easy_install_default(easy_install):
diff -Nru zeroc-ice-3.7.1/python/config/Make.rules zeroc-ice-3.7.2/python/config/Make.rules
--- zeroc-ice-3.7.1/python/config/Make.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/config/Make.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # If multiple versions of Python are installed and you want a specific
@@ -20,9 +15,13 @@
 
 -include        $(lang_srcdir)/config/Make.rules.$(os)
 
-# Use pythonM.m-config rather than pythonMm-config because some platforms don't provide pythonMm-config
+# PYTHON must be set to a value that has a corresponding PYTHON-config
 python-version := $(shell $(PYTHON) -c "import sys; print(\"{0}.{1}\".format(sys.version_info[0], sys.version_info[1]))")
-python-config := python$(python-version)-config
+python-config := $(PYTHON)-config
+
+ifeq ($(os),Linux)
+   cppflags   := $(filter-out -Wredundant-decls,$(cppflags))
+endif
 
 python_cppflags         := $(shell $(python-config) --cflags)
 python_ldflags          := $(shell $(python-config) --ldflags)
@@ -41,7 +40,7 @@
 
 # Remove the -Wstrict-prototypes option which is not valid with C++ and
 # -Wunreachable-code which is causing a compilation error with Slice/Parser.cpp
-python_cppflags         := $(filter-out -Wunreachable-code -Wstrict-prototypes,$(python_cppflags))
+python_cppflags         := $(filter-out -Wunreachable-code -Wstrict-prototypes,$(python_cppflags)) -Wno-missing-field-initializers
 
 #
 # Python installation directory
diff -Nru zeroc-ice-3.7.1/python/config/Make.rules.AIX zeroc-ice-3.7.2/python/config/Make.rules.AIX
--- zeroc-ice-3.7.1/python/config/Make.rules.AIX	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/config/Make.rules.AIX	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # $(call mkshlib,$1=target,$2=objects,$3=libname,$4=version,$5=soversion,$6=ldflags,$7=platform)
 mkshlib        = $(or $($7_cxx),$(CXX)) -qmkshrobj -o $1 $2 $6
diff -Nru zeroc-ice-3.7.1/python/config/s2py.py zeroc-ice-3.7.2/python/config/s2py.py
--- zeroc-ice-3.7.1/python/config/s2py.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/config/s2py.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, os, platform
 
diff -Nru zeroc-ice-3.7.1/python/Makefile zeroc-ice-3.7.2/python/Makefile
--- zeroc-ice-3.7.1/python/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 top_srcdir      := ..
-lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
+lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST))))))
 
 ifeq ($(PYTHON),)
     PYTHON = python
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/BatchRequestInterceptor.cpp zeroc-ice-3.7.2/python/modules/IcePy/BatchRequestInterceptor.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/BatchRequestInterceptor.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/BatchRequestInterceptor.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <BatchRequestInterceptor.h>
 #include <Proxy.h>
 #include <Thread.h>
@@ -58,7 +50,7 @@
 extern "C"
 #endif
 static PyObject*
-batchRequestGetSize(BatchRequestObject* self)
+batchRequestGetSize(BatchRequestObject* self, PyObject* /*args*/)
 {
     assert(self->request);
     if(!self->size)
@@ -84,7 +76,7 @@
 extern "C"
 #endif
 static PyObject*
-batchRequestGetOperation(BatchRequestObject* self)
+batchRequestGetOperation(BatchRequestObject* self, PyObject* /*args*/)
 {
     assert(self->request);
     if(!self->operation)
@@ -110,7 +102,7 @@
 extern "C"
 #endif
 static PyObject*
-batchRequestGetProxy(BatchRequestObject* self)
+batchRequestGetProxy(BatchRequestObject* self, PyObject* /*args*/)
 {
     assert(self->request);
     if(!self->proxy)
@@ -136,7 +128,7 @@
 extern "C"
 #endif
 static PyObject*
-batchRequestEnqueue(BatchRequestObject* self)
+batchRequestEnqueue(BatchRequestObject* self, PyObject* /*args*/)
 {
     assert(self->request);
 
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/BatchRequestInterceptor.h zeroc-ice-3.7.2/python/modules/IcePy/BatchRequestInterceptor.h
--- zeroc-ice-3.7.1/python/modules/IcePy/BatchRequestInterceptor.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/BatchRequestInterceptor.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_BATCH_REQUEST_INTERCEPTOR_H
 #define ICEPY_BATCH_REQUEST_INTERCEPTOR_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Communicator.cpp zeroc-ice-3.7.2/python/modules/IcePy/Communicator.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Communicator.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Communicator.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <IceUtil/DisableWarnings.h>
 #include <Communicator.h>
 #include <BatchRequestInterceptor.h>
@@ -39,7 +31,15 @@
 using namespace std;
 using namespace IcePy;
 
+#if defined(__GNUC__) && ((__GNUC__ >= 8))
+#   pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
+#if PY_VERSION_HEX < 0x03070000
 static long _mainThreadId;
+#else
+static unsigned long _mainThreadId;
+#endif
 
 typedef map<Ice::CommunicatorPtr, PyObject*> CommunicatorMap;
 static CommunicatorMap _communicatorMap;
@@ -381,7 +381,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorDestroy(CommunicatorObject* self)
+communicatorDestroy(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
 
@@ -426,7 +426,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorShutdown(CommunicatorObject* self)
+communicatorShutdown(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     try
@@ -532,7 +532,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorIsShutdown(CommunicatorObject* self)
+communicatorIsShutdown(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     bool isShutdown;
@@ -932,9 +932,9 @@
             result = (*self->communicator)->begin_flushBatchRequests(cb);
         }
     }
-    catch(const Ice::Exception& ex)
+    catch(const Ice::Exception& e)
     {
-        setPythonException(ex);
+        setPythonException(e);
         return 0;
     }
 
@@ -1025,7 +1025,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetAdmin(CommunicatorObject* self)
+communicatorGetAdmin(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     Ice::ObjectPrx proxy;
@@ -1148,7 +1148,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorFindAllAdminFacets(CommunicatorObject* self)
+communicatorFindAllAdminFacets(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     Ice::FacetMap facetMap;
@@ -1267,7 +1267,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetWrapper(CommunicatorObject* self)
+communicatorGetWrapper(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->wrapper);
     Py_INCREF(self->wrapper);
@@ -1278,7 +1278,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetProperties(CommunicatorObject* self)
+communicatorGetProperties(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     Ice::PropertiesPtr properties;
@@ -1299,7 +1299,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetLogger(CommunicatorObject* self)
+communicatorGetLogger(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     Ice::LoggerPtr logger;
@@ -1403,7 +1403,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetValueFactoryManager(CommunicatorObject* self)
+communicatorGetValueFactoryManager(CommunicatorObject* self, PyObject* /*args*/)
 {
     ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast((*self->communicator)->getValueFactoryManager());
 
@@ -1414,7 +1414,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetImplicitContext(CommunicatorObject* self)
+communicatorGetImplicitContext(CommunicatorObject* self, PyObject* /*args*/)
 {
     Ice::ImplicitContextPtr implicitContext = (*self->communicator)->getImplicitContext();
 
@@ -1582,7 +1582,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetDefaultRouter(CommunicatorObject* self)
+communicatorGetDefaultRouter(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     Ice::RouterPrx router;
@@ -1646,7 +1646,7 @@
 extern "C"
 #endif
 static PyObject*
-communicatorGetDefaultLocator(CommunicatorObject* self)
+communicatorGetDefaultLocator(CommunicatorObject* self, PyObject* /*args*/)
 {
     assert(self->communicator);
     Ice::LocatorPrx locator;
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Communicator.h zeroc-ice-3.7.2/python/modules/IcePy/Communicator.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Communicator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Communicator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_COMMUNICATOR_H
 #define ICEPY_COMMUNICATOR_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Config.h zeroc-ice-3.7.2/python/modules/IcePy/Config.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_CONFIG_H
 #define ICEPY_CONFIG_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Connection.cpp zeroc-ice-3.7.2/python/modules/IcePy/Connection.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Connection.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Connection.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Connection.h>
 #include <Communicator.h>
 #include <ConnectionInfo.h>
@@ -25,6 +17,10 @@
 using namespace std;
 using namespace IcePy;
 
+#if defined(__GNUC__) && ((__GNUC__ >= 8))
+#   pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
 namespace
 {
 
@@ -107,20 +103,9 @@
         Py_DECREF(_con);
     }
 
-    virtual void closed(const Ice::ConnectionPtr& con)
-    {
-        invoke(con);
-    }
-
-private:
-
-    void invoke(const Ice::ConnectionPtr& con)
+    virtual void closed(const Ice::ConnectionPtr&)
     {
         AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
-#ifndef NDEBUG
-        ConnectionObject* c = reinterpret_cast<ConnectionObject*>(_con);
-        assert(con == *(c->connection));
-#endif
 
         PyObjectHandle args = Py_BuildValue(STRCAST("(O)"), _con);
         assert(_cb);
@@ -141,6 +126,8 @@
         }
     }
 
+private:
+
     PyObject* _cb;
     PyObject* _con;
 };
@@ -164,20 +151,9 @@
         Py_DECREF(_con);
     }
 
-    virtual void heartbeat(const Ice::ConnectionPtr& con)
-    {
-        invoke(con);
-    }
-
-private:
-
-    void invoke(const Ice::ConnectionPtr& con)
+    virtual void heartbeat(const Ice::ConnectionPtr&)
     {
         AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
-#ifndef NDEBUG
-        ConnectionObject* c = reinterpret_cast<ConnectionObject*>(_con);
-        assert(con == *(c->connection));
-#endif
 
         PyObjectHandle args = Py_BuildValue(STRCAST("(O)"), _con);
         assert(_cb);
@@ -198,6 +174,8 @@
         }
     }
 
+private:
+
     PyObject* _cb;
     PyObject* _con;
 };
@@ -460,7 +438,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionGetAdapter(ConnectionObject* self)
+connectionGetAdapter(ConnectionObject* self, PyObject* /*args*/)
 {
     Ice::ObjectAdapterPtr adapter;
 
@@ -524,7 +502,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionFlushBatchRequestsAsync(ConnectionObject* self, PyObject* args, PyObject* /*kwds*/)
+connectionFlushBatchRequestsAsync(ConnectionObject* self, PyObject* args)
 {
     PyObject* compressBatchType = lookupType("Ice.CompressBatch");
     PyObject* compressBatch;
@@ -642,9 +620,9 @@
             result = (*self->connection)->begin_flushBatchRequests(cb);
         }
     }
-    catch(const Ice::Exception& ex)
+    catch(const Ice::Exception& e)
     {
-        setPythonException(ex);
+        setPythonException(e);
         return 0;
     }
 
@@ -770,7 +748,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionHeartbeat(ConnectionObject* self)
+connectionHeartbeat(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
     try
@@ -845,9 +823,9 @@
             result = (*self->connection)->begin_heartbeat();
         }
     }
-    catch(const Ice::Exception& ex)
+    catch(const Ice::Exception& e)
     {
-        setPythonException(ex);
+        setPythonException(e);
         return 0;
     }
 
@@ -964,7 +942,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionGetACM(ConnectionObject* self)
+connectionGetACM(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
 
@@ -1037,7 +1015,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionType(ConnectionObject* self)
+connectionType(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
     string type;
@@ -1058,7 +1036,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionTimeout(ConnectionObject* self)
+connectionTimeout(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
     int timeout;
@@ -1079,7 +1057,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionToString(ConnectionObject* self)
+connectionToString(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
     string str;
@@ -1100,7 +1078,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionGetInfo(ConnectionObject* self)
+connectionGetInfo(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
     try
@@ -1119,7 +1097,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionGetEndpoint(ConnectionObject* self)
+connectionGetEndpoint(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
     try
@@ -1166,7 +1144,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionThrowException(ConnectionObject* self)
+connectionThrowException(ConnectionObject* self, PyObject* /*args*/)
 {
     assert(self->connection);
     try
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Connection.h zeroc-ice-3.7.2/python/modules/IcePy/Connection.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Connection.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Connection.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_CONNECTION_H
 #define ICEPY_CONNECTION_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ConnectionInfo.cpp zeroc-ice-3.7.2/python/modules/IcePy/ConnectionInfo.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/ConnectionInfo.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ConnectionInfo.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <ConnectionInfo.h>
 #include <EndpointInfo.h>
 #include <Util.h>
@@ -54,7 +46,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionInfoGetUnderlying(ConnectionInfoObject* self)
+connectionInfoGetUnderlying(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     return createConnectionInfo((*self->connectionInfo)->underlying);
 }
@@ -63,7 +55,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionInfoGetIncoming(ConnectionInfoObject* self)
+connectionInfoGetIncoming(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     return (*self->connectionInfo)->incoming ? incTrue() : incFalse();
 }
@@ -72,7 +64,7 @@
 extern "C"
 #endif
 static PyObject*
-connectionInfoGetAdapterName(ConnectionInfoObject* self)
+connectionInfoGetAdapterName(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     return createString((*self->connectionInfo)->adapterName);
 }
@@ -81,7 +73,7 @@
 extern "C"
 #endif
 static PyObject*
-ipConnectionInfoGetLocalAddress(ConnectionInfoObject* self)
+ipConnectionInfoGetLocalAddress(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -92,7 +84,7 @@
 extern "C"
 #endif
 static PyObject*
-ipConnectionInfoGetLocalPort(ConnectionInfoObject* self)
+ipConnectionInfoGetLocalPort(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -103,7 +95,7 @@
 extern "C"
 #endif
 static PyObject*
-ipConnectionInfoGetRemoteAddress(ConnectionInfoObject* self)
+ipConnectionInfoGetRemoteAddress(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -114,7 +106,7 @@
 extern "C"
 #endif
 static PyObject*
-ipConnectionInfoGetRemotePort(ConnectionInfoObject* self)
+ipConnectionInfoGetRemotePort(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -125,7 +117,7 @@
 extern "C"
 #endif
 static PyObject*
-tcpConnectionInfoGetRcvSize(ConnectionInfoObject* self)
+tcpConnectionInfoGetRcvSize(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::TCPConnectionInfoPtr info = Ice::TCPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -136,7 +128,7 @@
 extern "C"
 #endif
 static PyObject*
-tcpConnectionInfoGetSndSize(ConnectionInfoObject* self)
+tcpConnectionInfoGetSndSize(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::TCPConnectionInfoPtr info = Ice::TCPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -147,7 +139,7 @@
 extern "C"
 #endif
 static PyObject*
-udpConnectionInfoGetMcastAddress(ConnectionInfoObject* self)
+udpConnectionInfoGetMcastAddress(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::UDPConnectionInfoPtr info = Ice::UDPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -158,7 +150,7 @@
 extern "C"
 #endif
 static PyObject*
-udpConnectionInfoGetMcastPort(ConnectionInfoObject* self, void* member)
+udpConnectionInfoGetMcastPort(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::UDPConnectionInfoPtr info = Ice::UDPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -169,7 +161,7 @@
 extern "C"
 #endif
 static PyObject*
-udpConnectionInfoGetRcvSize(ConnectionInfoObject* self)
+udpConnectionInfoGetRcvSize(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::UDPConnectionInfoPtr info = Ice::UDPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -180,7 +172,7 @@
 extern "C"
 #endif
 static PyObject*
-udpConnectionInfoGetSndSize(ConnectionInfoObject* self)
+udpConnectionInfoGetSndSize(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::UDPConnectionInfoPtr info = Ice::UDPConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -191,7 +183,7 @@
 extern "C"
 #endif
 static PyObject*
-wsConnectionInfoGetHeaders(ConnectionInfoObject* self)
+wsConnectionInfoGetHeaders(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     Ice::WSConnectionInfoPtr info = Ice::WSConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -217,7 +209,7 @@
 extern "C"
 #endif
 static PyObject*
-sslConnectionInfoGetCipher(ConnectionInfoObject* self)
+sslConnectionInfoGetCipher(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     IceSSL::ConnectionInfoPtr info = IceSSL::ConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -228,7 +220,7 @@
 extern "C"
 #endif
 static PyObject*
-sslConnectionInfoGetCerts(ConnectionInfoObject* self)
+sslConnectionInfoGetCerts(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     IceSSL::ConnectionInfoPtr info = IceSSL::ConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
@@ -246,7 +238,7 @@
 extern "C"
 #endif
 static PyObject*
-sslConnectionInfoGetVerified(ConnectionInfoObject* self)
+sslConnectionInfoGetVerified(ConnectionInfoObject* self, PyObject* /*args*/)
 {
     IceSSL::ConnectionInfoPtr info = IceSSL::ConnectionInfoPtr::dynamicCast(*self->connectionInfo);
     assert(info);
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ConnectionInfo.h zeroc-ice-3.7.2/python/modules/IcePy/ConnectionInfo.h
--- zeroc-ice-3.7.1/python/modules/IcePy/ConnectionInfo.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ConnectionInfo.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_CONNECTION_INFO_H
 #define ICEPY_CONNECTION_INFO_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Current.cpp zeroc-ice-3.7.2/python/modules/IcePy/Current.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Current.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Current.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Current.h>
 #include <structmember.h>
 #include <Connection.h>
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Current.h zeroc-ice-3.7.2/python/modules/IcePy/Current.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Current.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Current.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_CURRENT_H
 #define ICEPY_CURRENT_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Dispatcher.cpp zeroc-ice-3.7.2/python/modules/IcePy/Dispatcher.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Dispatcher.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Dispatcher.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Dispatcher.h>
 #include <Connection.h>
 #include <Thread.h>
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Dispatcher.h zeroc-ice-3.7.2/python/modules/IcePy/Dispatcher.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Dispatcher.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Dispatcher.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_DISPATCHER_H
 #define ICEPY_DISPATCHER_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Endpoint.cpp zeroc-ice-3.7.2/python/modules/IcePy/Endpoint.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Endpoint.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Endpoint.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Endpoint.h>
 #include <EndpointInfo.h>
 #include <Util.h>
@@ -106,7 +98,7 @@
 extern "C"
 #endif
 static PyObject*
-endpointToString(EndpointObject* self)
+endpointToString(EndpointObject* self, PyObject* /*args*/)
 {
     assert(self->endpoint);
     try
@@ -127,14 +119,14 @@
 static PyObject*
 endpointRepr(EndpointObject* self)
 {
-    return endpointToString(self);
+    return endpointToString(self, 0);
 }
 
 #ifdef WIN32
 extern "C"
 #endif
 static PyObject*
-endpointGetInfo(EndpointObject* self)
+endpointGetInfo(EndpointObject* self, PyObject* /*args*/)
 {
     assert(self->endpoint);
     try
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Endpoint.h zeroc-ice-3.7.2/python/modules/IcePy/Endpoint.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Endpoint.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Endpoint.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_ENDPOINT_H
 #define ICEPY_ENDPOINT_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/EndpointInfo.cpp zeroc-ice-3.7.2/python/modules/IcePy/EndpointInfo.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/EndpointInfo.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/EndpointInfo.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <EndpointInfo.h>
 #include <Util.h>
 #include <IceSSL/IceSSL.h>
@@ -55,7 +47,7 @@
 extern "C"
 #endif
 static PyObject*
-endpointInfoType(EndpointInfoObject* self)
+endpointInfoType(EndpointInfoObject* self, PyObject* /*args*/)
 {
     assert(self->endpointInfo);
     try
@@ -77,7 +69,7 @@
 extern "C"
 #endif
 static PyObject*
-endpointInfoDatagram(EndpointInfoObject* self)
+endpointInfoDatagram(EndpointInfoObject* self, PyObject* /*args*/)
 {
     assert(self->endpointInfo);
     PyObject* b;
@@ -102,7 +94,7 @@
 extern "C"
 #endif
 static PyObject*
-endpointInfoSecure(EndpointInfoObject* self)
+endpointInfoSecure(EndpointInfoObject* self, PyObject* /*args*/)
 {
     assert(self->endpointInfo);
     PyObject* b;
@@ -124,7 +116,7 @@
 extern "C"
 #endif
 static PyObject*
-endpointInfoGetUnderlying(EndpointInfoObject* self)
+endpointInfoGetUnderlying(EndpointInfoObject* self, PyObject* /*args*/)
 {
     return createEndpointInfo((*self->endpointInfo)->underlying);
 }
@@ -133,7 +125,7 @@
 extern "C"
 #endif
 static PyObject*
-endpointInfoGetTimeout(EndpointInfoObject* self)
+endpointInfoGetTimeout(EndpointInfoObject* self, PyObject* /*args*/)
 {
     return PyLong_FromLong((*self->endpointInfo)->timeout);
 }
@@ -142,7 +134,7 @@
 extern "C"
 #endif
 static PyObject*
-endpointInfoGetCompress(EndpointInfoObject* self)
+endpointInfoGetCompress(EndpointInfoObject* self, PyObject* /*args*/)
 {
     return (*self->endpointInfo)->compress ? incTrue() : incFalse();
 }
@@ -151,7 +143,7 @@
 extern "C"
 #endif
 static PyObject*
-ipEndpointInfoGetHost(EndpointInfoObject* self)
+ipEndpointInfoGetHost(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::IPEndpointInfoPtr info = Ice::IPEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
@@ -162,7 +154,7 @@
 extern "C"
 #endif
 static PyObject*
-ipEndpointInfoGetSourceAddress(EndpointInfoObject* self)
+ipEndpointInfoGetSourceAddress(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::IPEndpointInfoPtr info = Ice::IPEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
@@ -173,7 +165,7 @@
 extern "C"
 #endif
 static PyObject*
-ipEndpointInfoGetPort(EndpointInfoObject* self)
+ipEndpointInfoGetPort(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::IPEndpointInfoPtr info = Ice::IPEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
@@ -184,7 +176,7 @@
 extern "C"
 #endif
 static PyObject*
-udpEndpointInfoGetMcastInterface(EndpointInfoObject* self)
+udpEndpointInfoGetMcastInterface(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::UDPEndpointInfoPtr info = Ice::UDPEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
@@ -195,7 +187,7 @@
 extern "C"
 #endif
 static PyObject*
-udpEndpointInfoGetMcastTtl(EndpointInfoObject* self)
+udpEndpointInfoGetMcastTtl(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::UDPEndpointInfoPtr info = Ice::UDPEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
@@ -206,7 +198,7 @@
 extern "C"
 #endif
 static PyObject*
-wsEndpointInfoGetResource(EndpointInfoObject* self)
+wsEndpointInfoGetResource(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::WSEndpointInfoPtr info = Ice::WSEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
@@ -217,7 +209,7 @@
 extern "C"
 #endif
 static PyObject*
-opaqueEndpointInfoGetRawBytes(EndpointInfoObject* self)
+opaqueEndpointInfoGetRawBytes(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::OpaqueEndpointInfoPtr info = Ice::OpaqueEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
@@ -234,7 +226,7 @@
 extern "C"
 #endif
 static PyObject*
-opaqueEndpointInfoGetRawEncoding(EndpointInfoObject* self)
+opaqueEndpointInfoGetRawEncoding(EndpointInfoObject* self, PyObject* /*args*/)
 {
     Ice::OpaqueEndpointInfoPtr info = Ice::OpaqueEndpointInfoPtr::dynamicCast(*self->endpointInfo);
     assert(info);
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/EndpointInfo.h zeroc-ice-3.7.2/python/modules/IcePy/EndpointInfo.h
--- zeroc-ice-3.7.1/python/modules/IcePy/EndpointInfo.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/EndpointInfo.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_ENDPOINT_INFO_H
 #define ICEPY_ENDPOINT_INFO_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ImplicitContext.cpp zeroc-ice-3.7.2/python/modules/IcePy/ImplicitContext.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/ImplicitContext.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ImplicitContext.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <ImplicitContext.h>
 #include <ObjectAdapter.h>
 #include <Proxy.h>
@@ -115,7 +107,7 @@
 extern "C"
 #endif
 static PyObject*
-implicitContextGetContext(ImplicitContextObject* self)
+implicitContextGetContext(ImplicitContextObject* self, PyObject* /*args*/)
 {
     Ice::Context ctx = (*self->implicitContext)->getContext();
 
@@ -290,7 +282,7 @@
 
 static PyMethodDef ImplicitContextMethods[] =
 {
-    { STRCAST("getContext"), reinterpret_cast<PyCFunction>(implicitContextGetContext), METH_VARARGS,
+    { STRCAST("getContext"), reinterpret_cast<PyCFunction>(implicitContextGetContext), METH_NOARGS,
       PyDoc_STR(STRCAST("getContext() -> Ice.Context")) },
     { STRCAST("setContext"), reinterpret_cast<PyCFunction>(implicitContextSetContext), METH_VARARGS,
       PyDoc_STR(STRCAST("setContext(ctx) -> string")) },
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ImplicitContext.h zeroc-ice-3.7.2/python/modules/IcePy/ImplicitContext.h
--- zeroc-ice-3.7.1/python/modules/IcePy/ImplicitContext.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ImplicitContext.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_IMPLICIT_CONTEXT_H
 #define ICEPY_IMPLICIT_CONTEXT_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Init.cpp zeroc-ice-3.7.2/python/modules/IcePy/Init.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Init.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Init.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <BatchRequestInterceptor.h>
 #include <Communicator.h>
 #include <Connection.h>
@@ -34,7 +26,7 @@
 using namespace std;
 using namespace IcePy;
 
-extern "C" PyObject* IcePy_cleanup(PyObject*);
+extern "C" PyObject* IcePy_cleanup(PyObject*, PyObject*);
 
 static PyMethodDef methods[] =
 {
@@ -245,7 +237,7 @@
 
 extern "C"
 PyObject*
-IcePy_cleanup(PyObject* /*self*/)
+IcePy_cleanup(PyObject* /*self*/, PyObject* /*args*/)
 {
     cleanupLogger();
 
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Logger.cpp zeroc-ice-3.7.2/python/modules/IcePy/Logger.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Logger.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Logger.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Logger.h>
 #include <Thread.h>
 #include <Ice/Initialize.h>
@@ -288,7 +280,7 @@
 extern "C"
 #endif
 static PyObject*
-loggerGetPrefix(LoggerObject* self)
+loggerGetPrefix(LoggerObject* self, PyObject* /*args*/)
 {
     string prefix;
 
@@ -462,7 +454,7 @@
 
 extern "C"
 PyObject*
-IcePy_getProcessLogger(PyObject* /*self*/)
+IcePy_getProcessLogger(PyObject* /*self*/, PyObject* /*args*/)
 {
     Ice::LoggerPtr logger;
     try
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Logger.h zeroc-ice-3.7.2/python/modules/IcePy/Logger.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Logger.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Logger.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_LOGGER_H
 #define ICEPY_LOGGER_H
@@ -51,7 +46,7 @@
 
 }
 
-extern "C" PyObject* IcePy_getProcessLogger(PyObject*);
+extern "C" PyObject* IcePy_getProcessLogger(PyObject*, PyObject*);
 extern "C" PyObject* IcePy_setProcessLogger(PyObject*, PyObject*);
 
 #endif
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Makefile.mk zeroc-ice-3.7.2/python/modules/IcePy/Makefile.mk
--- zeroc-ice-3.7.1/python/modules/IcePy/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries    := IcePy
 
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/msbuild/icepy.vcxproj zeroc-ice-3.7.2/python/modules/IcePy/msbuild/icepy.vcxproj
--- zeroc-ice-3.7.1/python/modules/IcePy/msbuild/icepy.vcxproj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/msbuild/icepy.vcxproj	2019-02-05 18:03:04.000000000 +0000
@@ -172,11 +172,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/msbuild/packages.config zeroc-ice-3.7.2/python/modules/IcePy/msbuild/packages.config
--- zeroc-ice-3.7.1/python/modules/IcePy/msbuild/packages.config	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/msbuild/packages.config	2019-02-05 18:03:04.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" />
+  <package id="mcpp.v141" version="2.7.2.17" targetFramework="native" />
 </packages>
\ No newline at end of file
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ObjectAdapter.cpp zeroc-ice-3.7.2/python/modules/IcePy/ObjectAdapter.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/ObjectAdapter.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ObjectAdapter.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <ObjectAdapter.h>
 #include <Communicator.h>
 #include <Current.h>
@@ -31,7 +23,11 @@
 using namespace std;
 using namespace IcePy;
 
+#if PY_VERSION_HEX < 0x03070000
 static long _mainThreadId;
+#else
+static unsigned long _mainThreadId;
+#endif
 
 namespace IcePy
 {
@@ -215,7 +211,7 @@
 }
 
 void
-IcePy::ServantLocatorWrapper::finished(const Ice::Current& current, const Ice::ObjectPtr&,
+IcePy::ServantLocatorWrapper::finished(const Ice::Current&, const Ice::ObjectPtr&,
                                        const Ice::LocalObjectPtr& cookie)
 {
     AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
@@ -328,7 +324,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterGetName(ObjectAdapterObject* self)
+adapterGetName(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     string name;
@@ -349,7 +345,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterGetCommunicator(ObjectAdapterObject* self)
+adapterGetCommunicator(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     Ice::CommunicatorPtr communicator;
@@ -370,7 +366,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterActivate(ObjectAdapterObject* self)
+adapterActivate(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     try
@@ -401,7 +397,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterHold(ObjectAdapterObject* self)
+adapterHold(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     try
@@ -503,7 +499,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterDeactivate(ObjectAdapterObject* self)
+adapterDeactivate(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     try
@@ -609,7 +605,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterIsDeactivated(ObjectAdapterObject* self)
+adapterIsDeactivated(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     try
@@ -630,7 +626,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterDestroy(ObjectAdapterObject* self)
+adapterDestroy(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     try
@@ -1517,7 +1513,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterGetLocator(ObjectAdapterObject* self)
+adapterGetLocator(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     Ice::LocatorPrx locator;
@@ -1546,7 +1542,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterGetEndpoints(ObjectAdapterObject* self)
+adapterGetEndpoints(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
 
@@ -1581,7 +1577,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterRefreshPublishedEndpoints(ObjectAdapterObject* self)
+adapterRefreshPublishedEndpoints(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
     try
@@ -1603,7 +1599,7 @@
 extern "C"
 #endif
 static PyObject*
-adapterGetPublishedEndpoints(ObjectAdapterObject* self)
+adapterGetPublishedEndpoints(ObjectAdapterObject* self, PyObject* /*args*/)
 {
     assert(self->adapter);
 
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ObjectAdapter.h zeroc-ice-3.7.2/python/modules/IcePy/ObjectAdapter.h
--- zeroc-ice-3.7.1/python/modules/IcePy/ObjectAdapter.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ObjectAdapter.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_OBJECT_ADAPTER_H
 #define ICEPY_OBJECT_ADAPTER_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Operation.cpp zeroc-ice-3.7.2/python/modules/IcePy/Operation.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Operation.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Operation.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Operation.h>
 #include <Communicator.h>
 #include <Current.h>
@@ -861,7 +853,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultGetCommunicator(AsyncResultObject* self)
+asyncResultGetCommunicator(AsyncResultObject* self, PyObject* /*args*/)
 {
     if(self->communicator)
     {
@@ -875,7 +867,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultCancel(AsyncResultObject* self)
+asyncResultCancel(AsyncResultObject* self, PyObject* /*args*/)
 {
     try
     {
@@ -893,7 +885,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultGetConnection(AsyncResultObject* self)
+asyncResultGetConnection(AsyncResultObject* self, PyObject* /*args*/)
 {
     if(self->connection)
     {
@@ -907,7 +899,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultGetProxy(AsyncResultObject* self)
+asyncResultGetProxy(AsyncResultObject* self, PyObject* /*args*/)
 {
     if(self->proxy)
     {
@@ -921,7 +913,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultIsCompleted(AsyncResultObject* self)
+asyncResultIsCompleted(AsyncResultObject* self, PyObject* /*args*/)
 {
     bool b = false;
 
@@ -942,7 +934,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultWaitForCompleted(AsyncResultObject* self)
+asyncResultWaitForCompleted(AsyncResultObject* self, PyObject* /*args*/)
 {
     AllowThreads allowThreads; // Release Python's global interpreter lock during remote invocations.
     try
@@ -962,7 +954,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultIsSent(AsyncResultObject* self)
+asyncResultIsSent(AsyncResultObject* self, PyObject* /*args*/)
 {
     bool b = false;
 
@@ -983,7 +975,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultWaitForSent(AsyncResultObject* self)
+asyncResultWaitForSent(AsyncResultObject* self, PyObject* /*args*/)
 {
     AllowThreads allowThreads; // Release Python's global interpreter lock during remote invocations.
     try
@@ -1003,7 +995,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultThrowLocalException(AsyncResultObject* self)
+asyncResultThrowLocalException(AsyncResultObject* self, PyObject* /*args*/)
 {
     try
     {
@@ -1027,7 +1019,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultSentSynchronously(AsyncResultObject* self)
+asyncResultSentSynchronously(AsyncResultObject* self, PyObject* /*args*/)
 {
     bool b = false;
 
@@ -1048,7 +1040,7 @@
 extern "C"
 #endif
 static PyObject*
-asyncResultGetOperation(AsyncResultObject* self)
+asyncResultGetOperation(AsyncResultObject* self, PyObject* /*args*/)
 {
     string op;
 
@@ -1172,11 +1164,12 @@
 static int
 marshaledResultInit(MarshaledResultObject* self, PyObject* args, PyObject* /*kwds*/)
 {
+    PyObject* versionType = IcePy::lookupType("Ice.EncodingVersion");
     PyObject* result;
     OperationObject* opObj;
     PyObject* communicatorObj;
     PyObject* encodingObj;
-    if(!PyArg_ParseTuple(args, STRCAST("OOOO"), &result, &opObj, &communicatorObj, &encodingObj))
+    if(!PyArg_ParseTuple(args, STRCAST("OOOO!"), &result, &opObj, &communicatorObj, versionType, &encodingObj))
     {
         return -1;
     }
@@ -3214,12 +3207,12 @@
         if(!out.empty())
         {
             void* buf;
-            Py_ssize_t sz;
-            if(PyObject_AsWriteBuffer(op.get(), &buf, &sz))
+            Py_ssize_t ssz;
+            if(PyObject_AsWriteBuffer(op.get(), &buf, &ssz))
             {
                 throwPythonException();
             }
-            memcpy(buf, &out[0], sz);
+            memcpy(buf, &out[0], ssz);
         }
 #endif
 
@@ -3403,12 +3396,12 @@
             }
         }
     }
-    catch(const Ice::CommunicatorDestroyedException& ex)
+    catch(const Ice::CommunicatorDestroyedException& e)
     {
         //
         // CommunicatorDestroyedException is the only exception that can propagate directly.
         //
-        setPythonException(ex);
+        setPythonException(e);
         return 0;
     }
     catch(const Ice::Exception&)
@@ -3825,7 +3818,7 @@
     //
     // Ignore the return value of _iceDispatch -- it will use the dispatch callback.
     //
-    PyObjectHandle ignore = PyObject_Call(dispatchMethod.get(), dispatchArgs.get(), 0);
+    PyObjectHandle ignored = PyObject_Call(dispatchMethod.get(), dispatchArgs.get(), 0);
 
     //
     // Check for exceptions.
@@ -4026,9 +4019,9 @@
             throwPythonException();
         }
     }
-    catch(const Ice::Exception& ex)
+    catch(const Ice::Exception& e)
     {
-        exception(ex);
+        exception(e);
     }
 }
 
@@ -4193,9 +4186,9 @@
 
         ex.raise();
     }
-    catch(const Ice::Exception& ex)
+    catch(const Ice::Exception& e)
     {
-        exception(ex);
+        exception(e);
     }
 }
 
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Operation.h zeroc-ice-3.7.2/python/modules/IcePy/Operation.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Operation.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Operation.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_OPERATION_H
 #define ICEPY_OPERATION_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/PropertiesAdmin.cpp zeroc-ice-3.7.2/python/modules/IcePy/PropertiesAdmin.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/PropertiesAdmin.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/PropertiesAdmin.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <IceUtil/DisableWarnings.h>
 #include <PropertiesAdmin.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/PropertiesAdmin.h zeroc-ice-3.7.2/python/modules/IcePy/PropertiesAdmin.h
--- zeroc-ice-3.7.1/python/modules/IcePy/PropertiesAdmin.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/PropertiesAdmin.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_PROPERTIES_ADMIN_H
 #define ICEPY_PROPERTIES_ADMIN_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Properties.cpp zeroc-ice-3.7.2/python/modules/IcePy/Properties.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Properties.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Properties.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Properties.h>
 #include <Util.h>
 #include <Ice/Initialize.h>
@@ -496,7 +488,7 @@
 extern "C"
 #endif
 static PyObject*
-propertiesGetCommandLineOptions(PropertiesObject* self)
+propertiesGetCommandLineOptions(PropertiesObject* self, PyObject* /*args*/)
 {
     Ice::StringSeq options;
     assert(self->properties);
@@ -653,7 +645,7 @@
 extern "C"
 #endif
 static PyObject*
-propertiesClone(PropertiesObject* self)
+propertiesClone(PropertiesObject* self, PyObject* /*args*/)
 {
     Ice::PropertiesPtr properties;
     assert(self->properties);
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Properties.h zeroc-ice-3.7.2/python/modules/IcePy/Properties.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Properties.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Properties.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_PROPERTIES_H
 #define ICEPY_PROPERTIES_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Proxy.cpp zeroc-ice-3.7.2/python/modules/IcePy/Proxy.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Proxy.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Proxy.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Proxy.h>
 #include <structmember.h>
 #include <Communicator.h>
@@ -29,6 +21,10 @@
 using namespace std;
 using namespace IcePy;
 
+#if defined(__GNUC__) && ((__GNUC__ >= 8))
+#   pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
 namespace IcePy
 {
 
@@ -153,7 +149,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyRepr(ProxyObject* self)
+proxyRepr(ProxyObject* self, PyObject* /*args*/)
 {
     string str = (*self->proxy)->ice_toString();
     return createString(str);
@@ -172,7 +168,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetCommunicator(ProxyObject* self)
+proxyIceGetCommunicator(ProxyObject* self, PyObject* /*args*/)
 {
     return getCommunicatorWrapper(*self->communicator);
 }
@@ -513,7 +509,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetIdentity(ProxyObject* self)
+proxyIceGetIdentity(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -571,7 +567,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetContext(ProxyObject* self)
+proxyIceGetContext(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -632,7 +628,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetFacet(ProxyObject* self)
+proxyIceGetFacet(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -688,7 +684,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetAdapterId(ProxyObject* self)
+proxyIceGetAdapterId(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -744,7 +740,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetEndpoints(ProxyObject* self)
+proxyIceGetEndpoints(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -819,7 +815,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetLocatorCacheTimeout(ProxyObject* self)
+proxyIceGetLocatorCacheTimeout(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -839,7 +835,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetInvocationTimeout(ProxyObject* self)
+proxyIceGetInvocationTimeout(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -859,7 +855,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetConnectionId(ProxyObject* self)
+proxyIceGetConnectionId(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -945,7 +941,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsConnectionCached(ProxyObject* self)
+proxyIceIsConnectionCached(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1002,7 +998,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetEndpointSelection(ProxyObject* self)
+proxyIceGetEndpointSelection(ProxyObject* self,  PyObject* /*args*/)
 {
     PyObject* cls = lookupType("Ice.EndpointSelectionType");
     assert(cls);
@@ -1090,7 +1086,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsSecure(ProxyObject* self)
+proxyIceIsSecure(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1147,7 +1143,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetEncodingVersion(ProxyObject* self)
+proxyIceGetEncodingVersion(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1206,7 +1202,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsPreferSecure(ProxyObject* self)
+proxyIceIsPreferSecure(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1263,7 +1259,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetRouter(ProxyObject* self)
+proxyIceGetRouter(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1329,7 +1325,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetLocator(ProxyObject* self)
+proxyIceGetLocator(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1395,7 +1391,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceTwoway(ProxyObject* self)
+proxyIceTwoway(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1417,7 +1413,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsTwoway(ProxyObject* self)
+proxyIceIsTwoway(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1440,7 +1436,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceOneway(ProxyObject* self)
+proxyIceOneway(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1462,7 +1458,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsOneway(ProxyObject* self)
+proxyIceIsOneway(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1485,7 +1481,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceBatchOneway(ProxyObject* self)
+proxyIceBatchOneway(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1507,7 +1503,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsBatchOneway(ProxyObject* self)
+proxyIceIsBatchOneway(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1530,7 +1526,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceDatagram(ProxyObject* self)
+proxyIceDatagram(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1552,7 +1548,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsDatagram(ProxyObject* self)
+proxyIceIsDatagram(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1575,7 +1571,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceBatchDatagram(ProxyObject* self)
+proxyIceBatchDatagram(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1597,7 +1593,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsBatchDatagram(ProxyObject* self)
+proxyIceIsBatchDatagram(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1654,7 +1650,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetCompress(ProxyObject* self)
+proxyIceGetCompress(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1717,7 +1713,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetTimeout(ProxyObject* self)
+proxyIceGetTimeout(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1745,7 +1741,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceIsCollocationOptimized(ProxyObject* self)
+proxyIceIsCollocationOptimized(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1870,7 +1866,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetConnection(ProxyObject* self)
+proxyIceGetConnection(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -1997,9 +1993,9 @@
             result = (*self->proxy)->begin_ice_getConnection();
         }
     }
-    catch(const Ice::Exception& ex)
+    catch(const Ice::Exception& e)
     {
-        setPythonException(ex);
+        setPythonException(e);
         return 0;
     }
 
@@ -2049,7 +2045,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceGetCachedConnection(ProxyObject* self)
+proxyIceGetCachedConnection(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -2079,7 +2075,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceFlushBatchRequests(ProxyObject* self)
+proxyIceFlushBatchRequests(ProxyObject* self, PyObject* /*args*/)
 {
     assert(self->proxy);
 
@@ -2196,9 +2192,9 @@
             result = (*self->proxy)->begin_ice_flushBatchRequests();
         }
     }
-    catch(const Ice::Exception& ex)
+    catch(const Ice::Exception& e)
     {
-        setPythonException(ex);
+        setPythonException(e);
         return 0;
     }
 
@@ -2630,7 +2626,7 @@
 extern "C"
 #endif
 static PyObject*
-proxyIceStaticId(PyObject* /*self*/)
+proxyIceStaticId(PyObject* /*self*/, PyObject* /*args*/)
 {
     return createString(Ice::Object::ice_staticId());
 }
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Proxy.h zeroc-ice-3.7.2/python/modules/IcePy/Proxy.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Proxy.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Proxy.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_PROXY_H
 #define ICEPY_PROXY_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Slice.cpp zeroc-ice-3.7.2/python/modules/IcePy/Slice.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Slice.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Slice.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Slice.h>
 #include <Util.h>
 #include <Slice/Preprocessor.h>
@@ -238,16 +230,6 @@
         consoleErr << argSeq[0] << ": error:" << ex.what() << endl;
         rc = EXIT_FAILURE;
     }
-    catch(const std::string& msg)
-    {
-        consoleErr << argSeq[0] << ": error:" << msg << endl;
-        rc = EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        consoleErr << argSeq[0] << ": error:" << msg << endl;
-        rc = EXIT_FAILURE;
-    }
     catch(...)
     {
         consoleErr << argSeq[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Slice.h zeroc-ice-3.7.2/python/modules/IcePy/Slice.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Slice.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Slice.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_SLICE_H
 #define ICEPY_SLICE_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Thread.cpp zeroc-ice-3.7.2/python/modules/IcePy/Thread.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Thread.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Thread.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Thread.h>
 
 using namespace std;
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Thread.h zeroc-ice-3.7.2/python/modules/IcePy/Thread.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Thread.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Thread.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_THREAD_H
 #define ICEPY_THREAD_H
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Types.cpp zeroc-ice-3.7.2/python/modules/IcePy/Types.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Types.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Types.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Types.h>
 #include <Current.h>
 #include <Proxy.h>
@@ -22,6 +14,8 @@
 #include <Ice/OutputStream.h>
 #include <Ice/SlicedData.h>
 
+#include <IceUtil/DisableWarnings.h>
+
 #include <list>
 #include <limits>
 
@@ -45,6 +39,19 @@
 typedef map<string, ExceptionInfoPtr> ExceptionInfoMap;
 static ExceptionInfoMap _exceptionInfoMap;
 
+namespace
+{
+
+//
+// This exception is raised if the factory specified in a sequence metadata
+// cannot be load or is not valid
+//
+class InvalidSequenceFactoryException
+{
+};
+
+}
+
 namespace IcePy
 {
 
@@ -60,6 +67,12 @@
     IcePy::ExceptionInfoPtr* info;
 };
 
+struct BufferObject
+{
+    PyObject_HEAD
+    IcePy::BufferPtr* buffer;
+};
+
 extern PyTypeObject TypeInfoType;
 extern PyTypeObject ExceptionInfoType;
 
@@ -210,6 +223,70 @@
 #endif
 }
 
+#ifdef WIN32
+extern "C"
+#endif
+static BufferObject*
+bufferNew(PyTypeObject* type, PyObject* /*args*/, PyObject* /*kwds*/)
+{
+    BufferObject* self = reinterpret_cast<BufferObject*>(type->tp_alloc(type, 0));
+    if(!self)
+    {
+        return 0;
+    }
+    self->buffer = 0;
+    return self;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static void
+bufferDealloc(BufferObject* self)
+{
+    if(self->buffer)
+    {
+        delete self->buffer;
+    }
+    Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
+}
+
+//
+// See https://docs.python.org/3/c-api/typeobj.html#buffer-object-structures
+//
+#ifdef WIN32
+extern "C"
+#endif
+static int
+bufferGetBuffer(BufferObject* self, Py_buffer* view, int flags)
+{
+    if(!self->buffer)
+    {
+        PyErr_SetString(PyExc_BufferError,"no data available");
+        view->obj = 0;
+        return -1;
+    }
+
+    if(flags & PyBUF_WRITABLE)
+    {
+        PyErr_SetString(PyExc_BufferError,"buffer object is read only");
+        view->obj = 0;
+        return -1;
+    }
+
+    BufferPtr buffer = *self->buffer;
+    if(PyBuffer_FillInfo(view, reinterpret_cast<PyObject*>(self), const_cast<char*>(buffer->data()),
+                         buffer->size(), 1, flags) != 0)
+    {
+        PyErr_SetString(PyExc_BufferError, "fill buffer info failed");
+        return -1;
+    }
+
+    view->obj = reinterpret_cast<PyObject*>(self);
+    Py_INCREF(view->obj);
+    return 0;
+}
+
 //
 // addClassInfo()
 //
@@ -481,10 +558,10 @@
             assert(*q);
             ObjectReaderPtr r = ObjectReaderPtr::dynamicCast(*q);
             assert(r);
-            PyObject* obj = r->getObject();
-            assert(obj != Py_None); // Should be non-nil.
-            PyTuple_SET_ITEM(instances.get(), j++, obj);
-            Py_INCREF(obj); // PyTuple_SET_ITEM steals a reference.
+            PyObject* pobj = r->getObject();
+            assert(pobj != Py_None); // Should be non-nil.
+            PyTuple_SET_ITEM(instances.get(), j++, pobj);
+            Py_INCREF(pobj); // PyTuple_SET_ITEM steals a reference.
         }
 
         //
@@ -580,15 +657,15 @@
 
                     Ice::ObjectPtr writer;
 
-                    ObjectMap::iterator i = objectMap->find(o);
-                    if(i == objectMap->end())
+                    ObjectMap::iterator k = objectMap->find(o);
+                    if(k == objectMap->end())
                     {
                         writer = new ObjectWriter(o, objectMap, 0);
                         objectMap->insert(ObjectMap::value_type(o, writer));
                     }
                     else
                     {
-                        writer = i->second;
+                        writer = k->second;
                     }
 
                     info->instances.push_back(writer);
@@ -1113,7 +1190,7 @@
 }
 
 void
-IcePy::EnumInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap*, bool optional, const Ice::StringSeq*)
+IcePy::EnumInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap*, bool /*optional*/, const Ice::StringSeq*)
 {
     //
     // Validate value.
@@ -1524,6 +1601,7 @@
     assert(b);
 
     const_cast<SequenceMappingPtr&>(mapping) = new SequenceMapping(metaData);
+    mapping->init(metaData);
     const_cast<TypeInfoPtr&>(elementType) = getType(t);
 }
 
@@ -1565,7 +1643,7 @@
 
 void
 IcePy::SequenceInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool optional,
-                             const Ice::StringSeq* metaData)
+                             const Ice::StringSeq* /*metaData*/)
 {
     PrimitiveInfoPtr pi = PrimitiveInfoPtr::dynamicCast(elementType);
 
@@ -1694,6 +1772,14 @@
         else
         {
             sm = new SequenceMapping(type);
+            try
+            {
+                sm->init(*metaData);
+            }
+            catch(const InvalidSequenceFactoryException&)
+            {
+                throw AbortMarshaling();
+            }
         }
     }
     else
@@ -1810,59 +1896,135 @@
     // For most types, we accept an object that implements the buffer protocol
     // (this includes the array.array type).
     //
-    const void* buf = 0;
-    Py_ssize_t sz;
-    if(PyObject_AsReadBuffer(p, &buf, &sz) == 0)
+    if(pi->kind != PrimitiveInfo::KindString)
     {
-        const Ice::Byte* b = reinterpret_cast<const Ice::Byte*>(buf);
-        switch(pi->kind)
-        {
-        case PrimitiveInfo::KindBool:
-        {
-            os->write(reinterpret_cast<const bool*>(b), reinterpret_cast<const bool*>(b + sz));
-            break;
-        }
-        case PrimitiveInfo::KindByte:
-        {
-            os->write(reinterpret_cast<const Ice::Byte*>(b), reinterpret_cast<const Ice::Byte*>(b + sz));
-            break;
-        }
-        case PrimitiveInfo::KindShort:
-        {
-            os->write(reinterpret_cast<const Ice::Short*>(b), reinterpret_cast<const Ice::Short*>(b + sz));
-            break;
-        }
-        case PrimitiveInfo::KindInt:
-        {
-            os->write(reinterpret_cast<const Ice::Int*>(b), reinterpret_cast<const Ice::Int*>(b + sz));
-            break;
-        }
-        case PrimitiveInfo::KindLong:
-        {
-            os->write(reinterpret_cast<const Ice::Long*>(b), reinterpret_cast<const Ice::Long*>(b + sz));
-            break;
-        }
-        case PrimitiveInfo::KindFloat:
+        //
+        // With Python 3 and greater we marshal sequences of pritive types using the new
+        // buffer protocol when possible, for older versions we use the old buffer protocol.
+        //
+#if PY_VERSION_HEX >= 0x03000000
+        Py_buffer pybuf;
+        if(PyObject_GetBuffer(p, &pybuf, PyBUF_SIMPLE | PyBUF_FORMAT) == 0)
         {
-            os->write(reinterpret_cast<const Ice::Float*>(b), reinterpret_cast<const Ice::Float*>(b + sz));
-            break;
-        }
-        case PrimitiveInfo::KindDouble:
+            static const int itemsize[] =
+            {
+                1, // KindBool,
+                1, // KindByte,
+                2, // KindShort,
+                4, // KindInt,
+                8, // KindLong,
+                4, // KindFloat,
+                8, // KindDouble
+            };
+
+            static const char* itemtype[] =
+            {
+                "bool",   // KindBool,
+                "byte",   // KindByte,
+                "short",  // KindShort,
+                "int",    // KindInt,
+                "long",   // KindLong,
+                "float",  // KindFloat,
+                "double", // KindDouble
+            };
+
+            if(pi->kind != PrimitiveInfo::KindByte)
+            {
+#   ifdef ICE_BIG_ENDIAN
+                if(pybuf.format != 0 && pybuf.format[0] == '<')
+                {
+                    PyErr_Format(PyExc_ValueError,
+                                 "sequence buffer byte order doesn't match the platform native byte-order "
+                                 "`big-endian'");
+                    PyBuffer_Release(&pybuf);
+                    throw AbortMarshaling();
+                }
+#   else
+                if(pybuf.format != 0 && (pybuf.format[0] == '>' || pybuf.format[0] == '!'))
+                {
+                    PyErr_Format(PyExc_ValueError,
+                                 "sequence buffer byte order doesn't match the platform native byte-order "
+                                 "`little-endian'");
+                    PyBuffer_Release(&pybuf);
+                    throw AbortMarshaling();
+                }
+#   endif
+                if(pybuf.itemsize != itemsize[pi->kind])
+                {
+                    PyErr_Format(PyExc_ValueError,
+                                 "sequence item size doesn't match the size of the sequence type `%s'",
+                                 itemtype[pi->kind]);
+                    PyBuffer_Release(&pybuf);
+                    throw AbortMarshaling();
+                }
+            }
+            const Ice::Byte* b = reinterpret_cast<const Ice::Byte*>(pybuf.buf);
+            Py_ssize_t sz = pybuf.len;
+#else
+        const void* buf = 0;
+        Py_ssize_t sz;
+        if(PyObject_AsReadBuffer(p, &buf, &sz) == 0)
         {
-            os->write(reinterpret_cast<const Ice::Double*>(b), reinterpret_cast<const Ice::Double*>(b + sz));
-            break;
+            const Ice::Byte* b = reinterpret_cast<const Ice::Byte*>(buf);
+#endif
+            switch(pi->kind)
+            {
+                case PrimitiveInfo::KindBool:
+                {
+                    os->write(reinterpret_cast<const bool*>(b),
+                              reinterpret_cast<const bool*>(b + sz));
+                    break;
+                }
+                case PrimitiveInfo::KindByte:
+                {
+                    os->write(reinterpret_cast<const Ice::Byte*>(b),
+                              reinterpret_cast<const Ice::Byte*>(b + sz));
+                    break;
+                }
+                case PrimitiveInfo::KindShort:
+                {
+                    os->write(reinterpret_cast<const Ice::Short*>(b),
+                              reinterpret_cast<const Ice::Short*>(b + sz));
+                    break;
+                }
+                case PrimitiveInfo::KindInt:
+                {
+                    os->write(reinterpret_cast<const Ice::Int*>(b),
+                              reinterpret_cast<const Ice::Int*>(b + sz));
+                    break;
+                }
+                case PrimitiveInfo::KindLong:
+                {
+                    os->write(reinterpret_cast<const Ice::Long*>(b),
+                              reinterpret_cast<const Ice::Long*>(b + sz));
+                    break;
+                }
+                case PrimitiveInfo::KindFloat:
+                {
+                    os->write(reinterpret_cast<const Ice::Float*>(b),
+                              reinterpret_cast<const Ice::Float*>(b + sz));
+                    break;
+                }
+                case PrimitiveInfo::KindDouble:
+                {
+                    os->write(reinterpret_cast<const Ice::Double*>(b),
+                              reinterpret_cast<const Ice::Double*>(b + sz));
+                    break;
+                }
+                default:
+                {
+                    assert(false);
+                }
+            }
+#if PY_VERSION_HEX >= 0x03000000
+            PyBuffer_Release(&pybuf);
+#endif
+            return;
         }
-        case PrimitiveInfo::KindString:
+        else
         {
-            PyErr_Format(PyExc_ValueError, STRCAST("expected sequence value"));
-            throw AbortMarshaling();
+            PyErr_Clear(); // PyObject_GetBuffer/PyObject_AsReadBuffer sets an exception on failure.
         }
-        }
-        return;
-    }
-    else
-    {
-        PyErr_Clear(); // PyObject_AsReadBuffer sets an exception on failure.
     }
 
     PyObjectHandle fs = getSequence(pi, p);
@@ -1872,6 +2034,7 @@
         return;
     }
 
+    Py_ssize_t sz = 0;
     switch(pi->kind)
     {
     case PrimitiveInfo::KindBool:
@@ -2106,6 +2269,79 @@
     }
 }
 
+PyObject*
+IcePy::SequenceInfo::createSequenceFromMemory(const SequenceMappingPtr& sm,
+                                              const char* buffer,
+                                              Py_ssize_t size,
+                                              BuiltinType type,
+                                              bool copy)
+{
+    PyObjectHandle memoryview;
+    if(copy)
+    {
+        PyObjectHandle bufferObject = createBuffer(new Buffer(buffer, size, type));
+        if(!bufferObject.get())
+        {
+            assert(PyErr_Occurred());
+            throw AbortMarshaling();
+        }
+        memoryview = PyMemoryView_FromObject(bufferObject.get());
+        Py_XDECREF(bufferObject.get());
+    }
+    else
+    {
+#if PY_VERSION_HEX >= 0x03030000
+        memoryview = PyMemoryView_FromMemory(const_cast<char*>(buffer), size, PyBUF_READ);
+#else
+        Py_buffer pybuffer;
+        if(PyBuffer_FillInfo(&pybuffer, 0, const_cast<char*>(buffer), size, 1, PyBUF_SIMPLE) != 0)
+        {
+            assert(PyErr_Occurred());
+            throw AbortMarshaling();
+        }
+
+        memoryview = PyMemoryView_FromBuffer(&pybuffer);
+#endif
+    }
+
+    if(!memoryview.get())
+    {
+        assert(PyErr_Occurred());
+        throw AbortMarshaling();
+    }
+
+    PyObjectHandle builtinType = PyLong_FromLong(static_cast<int>(type));
+    if(!builtinType.get())
+    {
+        assert(PyErr_Occurred());
+        throw AbortMarshaling();
+    }
+
+    AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
+
+    PyObjectHandle args = PyTuple_New(3);
+    PyTuple_SET_ITEM(args.get(), 0, incRef(memoryview.get()));
+    PyTuple_SET_ITEM(args.get(), 1, incRef(builtinType.get()));
+    //
+    // If we copy the data to a Buffer object we set the copy factory argument to false
+    // to avoid a second copy in the factory.
+    //
+    PyTuple_SET_ITEM(args.get(), 2, copy ? incFalse() : incTrue());
+    PyObjectHandle result = PyObject_Call(sm->factory.get(), args.get(), 0);
+
+    if(!result.get())
+    {
+        assert(PyErr_Occurred());
+        throw AbortMarshaling();
+    }
+    else if(result.get() == Py_None)
+    {
+        PyErr_Format(PyExc_ValueError, STRCAST("invalid container return from factory"));
+        throw AbortMarshaling();
+    }
+    return result.release();
+}
+
 void
 IcePy::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, Ice::InputStream* is,
                                                 const UnmarshalCallbackPtr& cb, PyObject* target, void* closure,
@@ -2121,16 +2357,27 @@
         IceUtil::ScopedArray<bool> arr;
         is->read(p, arr);
         int sz = static_cast<int>(p.second - p.first);
-        result = sm->createContainer(sz);
-        if(!result.get())
+        if(sm->factory.get())
         {
-            assert(PyErr_Occurred());
-            throw AbortMarshaling();
+            result = createSequenceFromMemory(sm,
+                                              reinterpret_cast<const char*>(arr.get() != 0 ? arr.release() : p.first),
+                                              sz,
+                                              BuiltinTypeBool,
+                                              arr.get() != 0);
         }
-
-        for(int i = 0; i < sz; ++i)
+        else
         {
-            sm->setItem(result.get(), i, p.first[i] ? getTrue() : getFalse());
+            result = sm->createContainer(sz);
+            if(!result.get())
+            {
+                assert(PyErr_Occurred());
+                throw AbortMarshaling();
+            }
+
+            for(int i = 0; i < sz; ++i)
+            {
+                sm->setItem(result.get(), i, p.first[i] ? getTrue() : getFalse());
+            }
         }
         break;
     }
@@ -2139,7 +2386,11 @@
         pair<const Ice::Byte*, const Ice::Byte*> p;
         is->read(p);
         int sz = static_cast<int>(p.second - p.first);
-        if(sm->type == SequenceMapping::SEQ_DEFAULT)
+        if(sm->factory.get())
+        {
+            result = createSequenceFromMemory(sm, reinterpret_cast<const char*>(p.first), sz, BuiltinTypeByte, false);
+        }
+        else if(sm->type == SequenceMapping::SEQ_DEFAULT)
         {
 #if PY_VERSION_HEX >= 0x03000000
             result = PyBytes_FromStringAndSize(reinterpret_cast<const char*>(p.first), sz);
@@ -2180,22 +2431,33 @@
         IceUtil::ScopedArray<Ice::Short> arr;
         is->read(p, arr);
         int sz = static_cast<int>(p.second - p.first);
-        result = sm->createContainer(sz);
-        if(!result.get())
+        if(sm->factory.get())
         {
-            assert(PyErr_Occurred());
-            throw AbortMarshaling();
+            result = createSequenceFromMemory(sm,
+                                              reinterpret_cast<const char*>(arr.get() != 0 ? arr.release() : p.first),
+                                              sz * 2,
+                                              BuiltinTypeShort,
+                                              arr.get() != 0);
         }
-
-        for(int i = 0; i < sz; ++i)
+        else
         {
-            PyObjectHandle item = PyLong_FromLong(p.first[i]);
-            if(!item.get())
+            result = sm->createContainer(sz);
+            if(!result.get())
             {
                 assert(PyErr_Occurred());
                 throw AbortMarshaling();
             }
-            sm->setItem(result.get(), i, item.get());
+
+            for(int i = 0; i < sz; ++i)
+            {
+                PyObjectHandle item = PyLong_FromLong(p.first[i]);
+                if(!item.get())
+                {
+                    assert(PyErr_Occurred());
+                    throw AbortMarshaling();
+                }
+                sm->setItem(result.get(), i, item.get());
+            }
         }
         break;
     }
@@ -2205,22 +2467,32 @@
         IceUtil::ScopedArray<Ice::Int> arr;
         is->read(p, arr);
         int sz = static_cast<int>(p.second - p.first);
-        result = sm->createContainer(sz);
-        if(!result.get())
+        if(sm->factory.get())
         {
-            assert(PyErr_Occurred());
-            throw AbortMarshaling();
+            result = createSequenceFromMemory(sm,
+                                              reinterpret_cast<const char*>(arr.get() != 0 ? arr.release() : p.first),
+                                              sz * 4,
+                                              BuiltinTypeInt,
+                                              arr.get() != 0);
         }
-
-        for(int i = 0; i < sz; ++i)
+        else
         {
-            PyObjectHandle item = PyLong_FromLong(p.first[i]);
-            if(!item.get())
+            result = sm->createContainer(sz);
+            if(!result.get())
             {
                 assert(PyErr_Occurred());
                 throw AbortMarshaling();
             }
-            sm->setItem(result.get(), i, item.get());
+            for(int i = 0; i < sz; ++i)
+            {
+                PyObjectHandle item = PyLong_FromLong(p.first[i]);
+                if(!item.get())
+                {
+                    assert(PyErr_Occurred());
+                    throw AbortMarshaling();
+                }
+                sm->setItem(result.get(), i, item.get());
+            }
         }
         break;
     }
@@ -2230,22 +2502,33 @@
         IceUtil::ScopedArray<Ice::Long> arr;
         is->read(p, arr);
         int sz = static_cast<int>(p.second - p.first);
-        result = sm->createContainer(sz);
-        if(!result.get())
+        if(sm->factory.get())
         {
-            assert(PyErr_Occurred());
-            throw AbortMarshaling();
+            result = createSequenceFromMemory(sm,
+                                              reinterpret_cast<const char*>(arr.get() != 0 ? arr.release() : p.first),
+                                              sz * 8,
+                                              BuiltinTypeLong,
+                                              arr.get() != 0);
         }
-
-        for(int i = 0; i < sz; ++i)
+        else
         {
-            PyObjectHandle item = PyLong_FromLongLong(p.first[i]);
-            if(!item.get())
+            result = sm->createContainer(sz);
+            if(!result.get())
             {
                 assert(PyErr_Occurred());
                 throw AbortMarshaling();
             }
-            sm->setItem(result.get(), i, item.get());
+
+            for(int i = 0; i < sz; ++i)
+            {
+                PyObjectHandle item = PyLong_FromLongLong(p.first[i]);
+                if(!item.get())
+                {
+                    assert(PyErr_Occurred());
+                    throw AbortMarshaling();
+                }
+                sm->setItem(result.get(), i, item.get());
+            }
         }
         break;
     }
@@ -2255,22 +2538,33 @@
         IceUtil::ScopedArray<Ice::Float> arr;
         is->read(p, arr);
         int sz = static_cast<int>(p.second - p.first);
-        result = sm->createContainer(sz);
-        if(!result.get())
+        if(sm->factory.get())
         {
-            assert(PyErr_Occurred());
-            throw AbortMarshaling();
+            result = createSequenceFromMemory(sm,
+                                              reinterpret_cast<const char*>(arr.get() != 0 ? arr.release() : p.first),
+                                              sz * 4,
+                                              BuiltinTypeFloat,
+                                              arr.get() != 0);
         }
-
-        for(int i = 0; i < sz; ++i)
+        else
         {
-            PyObjectHandle item = PyFloat_FromDouble(p.first[i]);
-            if(!item.get())
+            result = sm->createContainer(sz);
+            if(!result.get())
             {
                 assert(PyErr_Occurred());
                 throw AbortMarshaling();
             }
-            sm->setItem(result.get(), i, item.get());
+
+            for(int i = 0; i < sz; ++i)
+            {
+                PyObjectHandle item = PyFloat_FromDouble(p.first[i]);
+                if(!item.get())
+                {
+                    assert(PyErr_Occurred());
+                    throw AbortMarshaling();
+                }
+                sm->setItem(result.get(), i, item.get());
+            }
         }
         break;
     }
@@ -2280,22 +2574,33 @@
         IceUtil::ScopedArray<Ice::Double> arr;
         is->read(p, arr);
         int sz = static_cast<int>(p.second - p.first);
-        result = sm->createContainer(sz);
-        if(!result.get())
+        if(sm->factory.get())
         {
-            assert(PyErr_Occurred());
-            throw AbortMarshaling();
+            result = createSequenceFromMemory(sm,
+                                              reinterpret_cast<const char*>(arr.get() != 0 ? arr.release() : p.first),
+                                              sz * 8,
+                                              BuiltinTypeDouble,
+                                              arr.get() != 0);
         }
-
-        for(int i = 0; i < sz; ++i)
+        else
         {
-            PyObjectHandle item = PyFloat_FromDouble(p.first[i]);
-            if(!item.get())
+            result = sm->createContainer(sz);
+            if(!result.get())
             {
                 assert(PyErr_Occurred());
                 throw AbortMarshaling();
             }
-            sm->setItem(result.get(), i, item.get());
+
+            for(int i = 0; i < sz; ++i)
+            {
+                PyObjectHandle item = PyFloat_FromDouble(p.first[i]);
+                if(!item.get())
+                {
+                    assert(PyErr_Occurred());
+                    throw AbortMarshaling();
+                }
+                sm->setItem(result.get(), i, item.get());
+            }
         }
         break;
     }
@@ -2334,28 +2639,39 @@
 bool
 IcePy::SequenceInfo::SequenceMapping::getType(const Ice::StringSeq& metaData, Type& t)
 {
-    if(!metaData.empty())
+    for(Ice::StringSeq::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
     {
-        for(Ice::StringSeq::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
+        if((*p) == "python:seq:default" || (*p) == "python:default")
         {
-            if((*p) == "python:seq:default")
-            {
-                t = SEQ_DEFAULT;
-                return true;
-            }
-            else if((*p) == "python:seq:tuple")
-            {
-                t = SEQ_TUPLE;
-                return true;
-            }
-            else if((*p) == "python:seq:list")
-            {
-                t = SEQ_LIST;
-                return true;
-            }
+            t = SEQ_DEFAULT;
+            return true;
+        }
+        else if((*p) == "python:seq:tuple" || (*p) == "python:tuple")
+        {
+            t = SEQ_TUPLE;
+            return true;
+        }
+        else if((*p) == "python:seq:list" || (*p) == "python:list")
+        {
+            t = SEQ_LIST;
+            return true;
+        }
+        else if((*p) == "python:array.array")
+        {
+            t = SEQ_ARRAY;
+            return true;
+        }
+        else if((*p) == "python:numpy.ndarray")
+        {
+            t = SEQ_NUMPYARRAY;
+            return true;
+        }
+        else if(p->find("python:memoryview:") == 0)
+        {
+            t = SEQ_MEMORYVIEW;
+            return true;
         }
     }
-
     return false;
 }
 
@@ -2373,6 +2689,53 @@
 }
 
 void
+IcePy::SequenceInfo::SequenceMapping::init(const Ice::StringSeq& meta)
+{
+    if(type == SEQ_ARRAY)
+    {
+        factory = lookupType("Ice.createArray");
+        if(!factory.get())
+        {
+            PyErr_Format(PyExc_ImportError, STRCAST("factory type not found `Ice.createArray'"));
+            throw InvalidSequenceFactoryException();
+        }
+    }
+    else if(type == SEQ_NUMPYARRAY)
+    {
+        factory = lookupType("Ice.createNumPyArray");
+        if(!factory.get())
+        {
+            PyErr_Format(PyExc_ImportError, STRCAST("factory type not found `Ice.createNumPyArray'"));
+            throw InvalidSequenceFactoryException();
+        }
+    }
+    else if(type == SEQ_MEMORYVIEW)
+    {
+        const string prefix = "python:memoryview:";
+        for(Ice::StringSeq::const_iterator i = meta.begin(); i != meta.end(); ++i)
+        {
+            if(i->find(prefix) == 0)
+            {
+                const string typestr = i->substr(prefix.size());
+                factory = lookupType(typestr);
+                if(!factory.get())
+                {
+                    PyErr_Format(PyExc_ImportError, STRCAST("factory type not found `%s'"), typestr.c_str());
+                    throw InvalidSequenceFactoryException();
+                }
+                if(!PyCallable_Check(factory.get()))
+                {
+                    PyErr_Format(PyExc_RuntimeError, STRCAST("factory type `%s' is not callable"), typestr.c_str());
+                    throw InvalidSequenceFactoryException();
+                }
+                break;
+            }
+        }
+    }
+    Py_XINCREF(factory.get());
+}
+
+void
 IcePy::SequenceInfo::SequenceMapping::unmarshaled(PyObject* val, PyObject* target, void* closure)
 {
     Py_ssize_t i = reinterpret_cast<Py_ssize_t>(closure);
@@ -2396,11 +2759,19 @@
     {
         return PyList_New(sz);
     }
-    else
+    else if(type == SEQ_TUPLE)
     {
-        assert(type == SEQ_TUPLE);
         return PyTuple_New(sz);
     }
+    else
+    {
+        //
+        // Must never be called for SEQ_MEMORYVIEW, as the container
+        // is created by the use factory function.
+        //
+        assert(false);
+        return 0;
+    }
 }
 
 void
@@ -2420,6 +2791,78 @@
 }
 
 //
+// Buffer implementation
+//
+IcePy::Buffer::Buffer(const char* data, Py_ssize_t size, SequenceInfo::BuiltinType type) :
+    _data(data),
+    _size(size),
+    _type(type)
+{
+}
+
+IcePy::Buffer::~Buffer()
+{
+    assert(_data != 0);
+    switch(_type)
+    {
+        case SequenceInfo::BuiltinTypeBool:
+        {
+            delete [] reinterpret_cast<const bool*>(_data);
+            break;
+        }
+        case SequenceInfo::BuiltinTypeShort:
+        {
+            delete [] reinterpret_cast<const Ice::Short*>(_data);
+            break;
+        }
+        case SequenceInfo::BuiltinTypeInt:
+        {
+            delete [] reinterpret_cast<const Ice::Int*>(_data);
+            break;
+        }
+        case SequenceInfo::BuiltinTypeLong:
+        {
+            delete [] reinterpret_cast<const Ice::Long*>(_data);
+            break;
+        }
+        case SequenceInfo::BuiltinTypeFloat:
+        {
+            delete [] reinterpret_cast<const Ice::Float*>(_data);
+            break;
+        }
+        case SequenceInfo::BuiltinTypeDouble:
+        {
+            delete [] reinterpret_cast<const Ice::Double*>(_data);
+            break;
+        }
+        default:
+        {
+            assert(false);
+            break;
+        }
+    }
+    _data = 0;
+}
+
+const char*
+IcePy::Buffer::data() const
+{
+    return _data;
+}
+
+Py_ssize_t
+IcePy::Buffer::size() const
+{
+    return _size;
+}
+
+SequenceInfo::BuiltinType
+IcePy::Buffer::type()
+{
+    return _type;
+}
+
+//
 // CustomInfo implementation.
 //
 IcePy::CustomInfo::CustomInfo(const string& ident, PyObject* t) :
@@ -2465,8 +2908,8 @@
 }
 
 void
-IcePy::CustomInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool,
-                           const Ice::StringSeq* metaData)
+IcePy::CustomInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* /*objectMap*/, bool,
+                           const Ice::StringSeq* /*metaData*/)
 {
     assert(PyObject_IsInstance(p, pythonType) == 1); // validate() should have caught this.
 
@@ -2501,7 +2944,7 @@
 
 void
 IcePy::CustomInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target,
-                             void* closure, bool, const Ice::StringSeq* metaData)
+                             void* closure, bool, const Ice::StringSeq* /*metaData*/)
 {
     //
     // Unmarshal the raw byte sequence.
@@ -2565,7 +3008,7 @@
 }
 
 void
-IcePy::CustomInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history)
+IcePy::CustomInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory*)
 {
     if(!validate(value))
     {
@@ -2856,7 +3299,7 @@
 }
 
 bool
-IcePy::ClassInfo::validate(PyObject* val)
+IcePy::ClassInfo::validate(PyObject*)
 {
     assert(false);
     return true;
@@ -2888,7 +3331,7 @@
 }
 
 void
-IcePy::ClassInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool,
+IcePy::ClassInfo::marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool,
                           const Ice::StringSeq*)
 {
     assert(false);
@@ -2896,8 +3339,8 @@
 }
 
 void
-IcePy::ClassInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target,
-                            void* closure, bool, const Ice::StringSeq*)
+IcePy::ClassInfo::unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*,
+                            void*, bool, const Ice::StringSeq*)
 {
     assert(false);
     throw AbortMarshaling();
@@ -3677,10 +4120,10 @@
 }
 
 void
-IcePy::ExceptionInfo::writeMembers(PyObject* p, Ice::OutputStream* os, const DataMemberList& members,
+IcePy::ExceptionInfo::writeMembers(PyObject* p, Ice::OutputStream* os, const DataMemberList& membersP,
                                    ObjectMap* objectMap) const
 {
-    for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q)
+    for(DataMemberList::const_iterator q = membersP.begin(); q != membersP.end(); ++q)
     {
         DataMemberPtr member = *q;
 
@@ -3722,6 +4165,11 @@
 IcePy::ExceptionInfo::unmarshal(Ice::InputStream* is)
 {
     PyObjectHandle p = createExceptionInstance(pythonType);
+    if(!p.get())
+    {
+        assert(PyErr_Occurred());
+        throw AbortMarshaling();
+    }
 
     ExceptionInfoPtr info = this;
     while(info)
@@ -4185,6 +4633,69 @@
 
 PyObject* Unset = &UnsetValue;
 
+static PyBufferProcs BufferProcs =
+{
+#if PY_VERSION_HEX < 0x03000000
+     0,
+     0,
+     0,
+     0,
+#endif
+    (getbufferproc) bufferGetBuffer,
+    0
+};
+
+PyTypeObject BufferType =
+{
+    /* The ob_type field must be initialized in the module init function
+     * to be portable to Windows without using C++. */
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    STRCAST("IcePy.BufferType"),     /* tp_name */
+    sizeof(BufferObject),            /* tp_basicsize */
+    0,                               /* tp_itemsize */
+    /* methods */
+    reinterpret_cast<destructor>(bufferDealloc), /* tp_dealloc */
+    0,                               /* tp_print */
+    0,                               /* tp_getattr */
+    0,                               /* tp_setattr */
+    0,                               /* tp_reserved */
+    0,                               /* tp_repr */
+    0,                               /* tp_as_number */
+    0,                               /* tp_as_sequence */
+    0,                               /* tp_as_mapping */
+    0,                               /* tp_hash */
+    0,                               /* tp_call */
+    0,                               /* tp_str */
+    0,                               /* tp_getattro */
+    0,                               /* tp_setattro */
+    &BufferProcs,                    /* tp_as_buffer */
+#if PY_VERSION_HEX >= 0x03000000
+    Py_TPFLAGS_DEFAULT,              /* tp_flags */
+#else
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_NEWBUFFER, /* tp_flags */
+#endif
+    0,                               /* tp_doc */
+    0,                               /* tp_traverse */
+    0,                               /* tp_clear */
+    0,                               /* tp_richcompare */
+    0,                               /* tp_weaklistoffset */
+    0,                               /* tp_iter */
+    0,                               /* tp_iternext */
+    0,                               /* tp_methods */
+    0,                               /* tp_members */
+    0,                               /* tp_getset */
+    0,                               /* tp_base */
+    0,                               /* tp_dict */
+    0,                               /* tp_descr_get */
+    0,                               /* tp_descr_set */
+    0,                               /* tp_dictoffset */
+    0,                               /* tp_init */
+    0,                               /* tp_alloc */
+    reinterpret_cast<newfunc>(bufferNew), /* tp_new */
+    0,                               /* tp_free */
+    0,                               /* tp_is_gc */
+};
+
 }
 
 bool
@@ -4210,6 +4721,16 @@
         return false;
     }
 
+    if(PyType_Ready(&BufferType) < 0)
+    {
+        return false;
+    }
+    PyTypeObject* bufferType = &BufferType; // Necessary to prevent GCC's strict-alias warnings.
+    if(PyModule_AddObject(module, STRCAST("Buffer"), reinterpret_cast<PyObject*>(bufferType)) < 0)
+    {
+        return false;
+    }
+
     PrimitiveInfoPtr boolType = new PrimitiveInfo(PrimitiveInfo::KindBool);
     PyObjectHandle boolTypeObj = createType(boolType);
     if(PyModule_AddObject(module, STRCAST("_t_bool"), boolTypeObj.get()) < 0)
@@ -4321,6 +4842,17 @@
     return reinterpret_cast<PyObject*>(obj);
 }
 
+PyObject*
+IcePy::createBuffer(const BufferPtr& buffer)
+{
+    BufferObject* obj = bufferNew(&BufferType, 0, 0);
+    if(obj)
+    {
+        obj->buffer = new BufferPtr(buffer);
+    }
+    return reinterpret_cast<PyObject*>(obj);
+}
+
 extern "C"
 PyObject*
 IcePy_defineEnum(PyObject*, PyObject* args)
@@ -4375,9 +4907,16 @@
         return 0;
     }
 
-    SequenceInfoPtr info = new SequenceInfo(id, meta, elementType);
-
-    return createType(info);
+    try
+    {
+        SequenceInfoPtr info = new SequenceInfo(id, meta, elementType);
+        return createType(info);
+    }
+    catch(const InvalidSequenceFactoryException&)
+    {
+        assert(PyErr_Occurred());
+        return 0;
+    }
 }
 
 extern "C"
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Types.h zeroc-ice-3.7.2/python/modules/IcePy/Types.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Types.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Types.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_TYPES_H
 #define ICEPY_TYPES_H
@@ -22,6 +17,9 @@
 namespace IcePy
 {
 
+class Buffer;
+typedef IceUtil::Handle<Buffer> BufferPtr;
+
 class ExceptionInfo;
 typedef IceUtil::Handle<ExceptionInfo> ExceptionInfoPtr;
 typedef std::vector<ExceptionInfoPtr> ExceptionInfoList;
@@ -331,15 +329,28 @@
 
     virtual void destroy();
 
+    enum BuiltinType
+    {
+        BuiltinTypeBool = 0,
+        BuiltinTypeByte = 1,
+        BuiltinTypeShort = 2,
+        BuiltinTypeInt = 3,
+        BuiltinTypeLong = 4,
+        BuiltinTypeFloat = 5,
+        BuiltinTypeDouble = 6
+    };
+
 private:
 
     struct SequenceMapping : public UnmarshalCallback
     {
-        enum Type { SEQ_DEFAULT, SEQ_TUPLE, SEQ_LIST };
+        enum Type { SEQ_DEFAULT, SEQ_TUPLE, SEQ_LIST, SEQ_ARRAY, SEQ_NUMPYARRAY, SEQ_MEMORYVIEW };
 
         SequenceMapping(Type);
         SequenceMapping(const Ice::StringSeq&);
 
+        void init(const Ice::StringSeq&);
+
         static bool getType(const Ice::StringSeq&, Type&);
 
         virtual void unmarshaled(PyObject*, PyObject*, void*);
@@ -348,6 +359,7 @@
         void setItem(PyObject*, int, PyObject*) const;
 
         Type type;
+        PyObjectHandle factory;
     };
     typedef IceUtil::Handle<SequenceMapping> SequenceMappingPtr;
 
@@ -356,6 +368,8 @@
     void unmarshalPrimitiveSequence(const PrimitiveInfoPtr&, Ice::InputStream*, const UnmarshalCallbackPtr&,
                                     PyObject*, void*, const SequenceMappingPtr&);
 
+    PyObject* createSequenceFromMemory(const SequenceMappingPtr&, const char*, Py_ssize_t, BuiltinType, bool);
+
 public:
 
     const std::string id;
@@ -364,6 +378,23 @@
 };
 typedef IceUtil::Handle<SequenceInfo> SequenceInfoPtr;
 
+class Buffer : public IceUtil::Shared
+{
+public:
+
+    Buffer(const char*, Py_ssize_t, SequenceInfo::BuiltinType);
+    ~Buffer();
+    const char* data() const;
+    Py_ssize_t size() const;
+    SequenceInfo::BuiltinType type();
+
+private:
+
+    const char* _data;
+    const Py_ssize_t _size;
+    const SequenceInfo::BuiltinType _type;
+};
+
 //
 // Custom information.
 //
@@ -724,6 +755,8 @@
 PyObject* createException(const ExceptionInfoPtr&);
 ExceptionInfoPtr getException(PyObject*);
 
+PyObject* createBuffer(const BufferPtr&);
+
 }
 
 extern "C" PyObject* IcePy_defineEnum(PyObject*, PyObject*);
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Util.cpp zeroc-ice-3.7.2/python/modules/IcePy/Util.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <Util.h>
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/LocalException.h>
@@ -25,18 +17,9 @@
 namespace IcePy
 {
 
-bool
-checkIsInstance(PyObject* p, const char* type)
-{
-    PyObject* pyType = lookupType(type);
-    return PyObject_IsInstance(p, pyType) == 1;
-}
-
 template<typename T> bool
-setVersion(PyObject* p, const T& version, const char* type)
+setVersion(PyObject* p, const T& version)
 {
-    assert(checkIsInstance(p, type));
-
     PyObjectHandle major = PyLong_FromLong(version.major);
     PyObjectHandle minor = PyLong_FromLong(version.minor);
     if(!major.get() || !minor.get())
@@ -52,9 +35,8 @@
 }
 
 template<typename T> bool
-getVersion(PyObject* p, T& v, const char* type)
+getVersion(PyObject* p, T& v)
 {
-    assert(checkIsInstance(p, type));
     PyObjectHandle major = getAttr(p, "major", false);
     PyObjectHandle minor = getAttr(p, "minor", false);
     if(major.get())
@@ -73,6 +55,11 @@
         }
         v.major = static_cast<Ice::Byte>(m);
     }
+    else
+    {
+        v.major = 0;
+    }
+
     if(minor.get())
     {
         major = PyNumber_Long(minor.get());
@@ -89,6 +76,10 @@
         }
         v.minor = static_cast<Ice::Byte>(m);
     }
+    else
+    {
+        v.minor = 0;
+    }
     return true;
 }
 
@@ -103,7 +94,7 @@
         return 0;
     }
 
-    if(!setVersion<T>(obj.get(), version, type))
+    if(!setVersion<T>(obj.get(), version))
     {
         return 0;
     }
@@ -122,7 +113,7 @@
     }
 
     T v;
-    if(!getVersion<T>(p, v, type))
+    if(!getVersion<T>(p, v))
     {
         return ICE_NULLPTR;
     }
@@ -519,6 +510,35 @@
     return result;
 }
 
+PyObject*
+IcePy::byteSeqToList(const Ice::ByteSeq& seq)
+{
+    PyObject* l = PyList_New(0);
+    if(!l)
+    {
+        return 0;
+    }
+
+    for(Ice::ByteSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
+    {
+        PyObject* byte = PyLong_FromLong(*p);
+        if(!byte)
+        {
+            Py_DECREF(l);
+            return 0;
+        }
+        int status = PyList_Append(l, byte);
+        Py_DECREF(byte); // Give ownership to the list.
+        if(status < 0)
+        {
+            Py_DECREF(l);
+            return 0;
+        }
+    }
+
+    return l;
+}
+
 bool
 IcePy::listToStringSeq(PyObject* l, Ice::StringSeq& seq)
 {
@@ -778,6 +798,16 @@
         IcePy::PyObjectHandle m = IcePy::createString(e.str);
         PyObject_SetAttrString(p, STRCAST("str"), m.get());
     }
+    catch(const Ice::EndpointSelectionTypeParseException& e)
+    {
+        IcePy::PyObjectHandle m = IcePy::createString(e.str);
+        PyObject_SetAttrString(p, STRCAST("str"), m.get());
+    }
+    catch(const Ice::VersionParseException& e)
+    {
+        IcePy::PyObjectHandle m = IcePy::createString(e.str);
+        PyObject_SetAttrString(p, STRCAST("str"), m.get());
+    }
     catch(const Ice::IdentityParseException& e)
     {
         IcePy::PyObjectHandle m = IcePy::createString(e.str);
@@ -793,6 +823,11 @@
         IcePy::PyObjectHandle m = IcePy::createIdentity(e.id);
         PyObject_SetAttrString(p, STRCAST("id"), m.get());
     }
+    catch(const Ice::IllegalServantException& e)
+    {
+        IcePy::PyObjectHandle m = IcePy::createString(e.reason);
+        PyObject_SetAttrString(p, STRCAST("reason"), m.get());
+    }
     catch(const Ice::RequestFailedException& e)
     {
         IcePy::PyObjectHandle m;
@@ -823,6 +858,11 @@
         m = IcePy::createString(e.host);
         PyObject_SetAttrString(p, STRCAST("host"), m.get());
     }
+    catch(const Ice::BadMagicException& e)
+    {
+        IcePy::PyObjectHandle m = IcePy::byteSeqToList(e.badMagic);
+        PyObject_SetAttrString(p, STRCAST("badMagic"), m.get());
+    }
     catch(const Ice::UnsupportedProtocolException& e)
     {
         IcePy::PyObjectHandle m;
@@ -839,6 +879,10 @@
         m = IcePy::createEncodingVersion(e.supported);
         PyObject_SetAttrString(p, STRCAST("supported"), m.get());
     }
+    catch(const Ice::ConnectionManuallyClosedException& e)
+    {
+        PyObject_SetAttrString(p, STRCAST("graceful"), e.graceful ? IcePy::getTrue() : IcePy::getFalse());
+    }
     catch(const Ice::NoValueFactoryException& e)
     {
         IcePy::PyObjectHandle m;
@@ -872,15 +916,6 @@
         IcePy::PyObjectHandle m = IcePy::createString(e.reason);
         PyObject_SetAttrString(p, STRCAST("reason"), m.get());
     }
-    catch(const Ice::IllegalServantException& e)
-    {
-        IcePy::PyObjectHandle m = IcePy::createString(e.reason);
-        PyObject_SetAttrString(p, STRCAST("reason"), m.get());
-    }
-    catch(const Ice::ConnectionManuallyClosedException& e)
-    {
-        PyObject_SetAttrString(p, STRCAST("graceful"), e.graceful ? IcePy::getTrue() : IcePy::getFalse());
-    }
     catch(const Ice::LocalException&)
     {
         //
@@ -1100,7 +1135,7 @@
 bool
 IcePy::getEncodingVersion(PyObject* p, Ice::EncodingVersion& v)
 {
-    if(!getVersion<Ice::EncodingVersion>(p, v, Ice_EncodingVersion))
+    if(!getVersion<Ice::EncodingVersion>(p, v))
     {
         return false;
     }
@@ -1164,7 +1199,7 @@
 
 extern "C"
 PyObject*
-IcePy_stringVersion(PyObject* /*self*/)
+IcePy_stringVersion(PyObject* /*self*/, PyObject* /*args*/)
 {
     string s = ICE_STRING_VERSION;
     return IcePy::createString(s);
@@ -1172,28 +1207,28 @@
 
 extern "C"
 PyObject*
-IcePy_intVersion(PyObject* /*self*/)
+IcePy_intVersion(PyObject* /*self*/, PyObject* /*args*/)
 {
     return PyLong_FromLong(ICE_INT_VERSION);
 }
 
 extern "C"
 PyObject*
-IcePy_currentProtocol(PyObject* /*self*/)
+IcePy_currentProtocol(PyObject* /*self*/, PyObject* /*args*/)
 {
     return IcePy::createProtocolVersion(Ice::currentProtocol);
 }
 
 extern "C"
 PyObject*
-IcePy_currentProtocolEncoding(PyObject* /*self*/)
+IcePy_currentProtocolEncoding(PyObject* /*self*/, PyObject* /*args*/)
 {
     return IcePy::createEncodingVersion(Ice::currentProtocolEncoding);
 }
 
 extern "C"
 PyObject*
-IcePy_currentEncoding(PyObject* /*self*/)
+IcePy_currentEncoding(PyObject* /*self*/, PyObject* /*args*/)
 {
     return IcePy::createEncodingVersion(Ice::currentEncoding);
 }
@@ -1228,7 +1263,7 @@
 
 extern "C"
 PyObject*
-IcePy_generateUUID(PyObject* /*self*/)
+IcePy_generateUUID(PyObject* /*self*/, PyObject* /*args*/)
 {
     string uuid = Ice::generateUUID();
     return IcePy::createString(uuid);
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/Util.h zeroc-ice-3.7.2/python/modules/IcePy/Util.h
--- zeroc-ice-3.7.1/python/modules/IcePy/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_UTIL_H
 #define ICEPY_UTIL_H
@@ -183,6 +178,11 @@
 };
 
 //
+// Convert Ice::ByteSeq to a Python list.
+//
+PyObject* byteSeqToList(const Ice::ByteSeq&);
+
+//
 // Convert Ice::StringSeq to and from a Python list.
 //
 bool listToStringSeq(PyObject*, Ice::StringSeq&);
@@ -279,15 +279,15 @@
 
 }
 
-extern "C" PyObject* IcePy_stringVersion(PyObject*);
-extern "C" PyObject* IcePy_intVersion(PyObject*);
-extern "C" PyObject* IcePy_currentProtocol(PyObject*);
-extern "C" PyObject* IcePy_currentProtocolEncoding(PyObject*);
-extern "C" PyObject* IcePy_currentEncoding(PyObject*);
+extern "C" PyObject* IcePy_stringVersion(PyObject*, PyObject*);
+extern "C" PyObject* IcePy_intVersion(PyObject*, PyObject*);
+extern "C" PyObject* IcePy_currentProtocol(PyObject*, PyObject*);
+extern "C" PyObject* IcePy_currentProtocolEncoding(PyObject*, PyObject*);
+extern "C" PyObject* IcePy_currentEncoding(PyObject*, PyObject*);
 extern "C" PyObject* IcePy_protocolVersionToString(PyObject*, PyObject*);
 extern "C" PyObject* IcePy_stringToProtocolVersion(PyObject*, PyObject*);
 extern "C" PyObject* IcePy_encodingVersionToString(PyObject*, PyObject*);
 extern "C" PyObject* IcePy_stringToEncodingVersion(PyObject*, PyObject*);
-extern "C" PyObject* IcePy_generateUUID(PyObject*);
+extern "C" PyObject* IcePy_generateUUID(PyObject*, PyObject*);
 
 #endif
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ValueFactoryManager.cpp zeroc-ice-3.7.2/python/modules/IcePy/ValueFactoryManager.cpp
--- zeroc-ice-3.7.1/python/modules/IcePy/ValueFactoryManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ValueFactoryManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#ifdef _WIN32
-#   include <IceUtil/Config.h>
-#endif
 #include <ValueFactoryManager.h>
 #include <Thread.h>
 #include <Types.h>
diff -Nru zeroc-ice-3.7.1/python/modules/IcePy/ValueFactoryManager.h zeroc-ice-3.7.2/python/modules/IcePy/ValueFactoryManager.h
--- zeroc-ice-3.7.1/python/modules/IcePy/ValueFactoryManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/modules/IcePy/ValueFactoryManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICEPY_VALUE_FACTORY_MANAGER_H
 #define ICEPY_VALUE_FACTORY_MANAGER_H
diff -Nru zeroc-ice-3.7.1/python/msbuild/ice.proj zeroc-ice-3.7.2/python/msbuild/ice.proj
--- zeroc-ice-3.7.1/python/msbuild/ice.proj	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/msbuild/ice.proj	2019-02-05 18:03:04.000000000 +0000
@@ -13,6 +13,11 @@
         <IceToolsPath>$(IceHome)\cpp\bin\$(Platform)\$(Configuration)</IceToolsPath>
     </PropertyGroup>
 
+    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+    <PropertyGroup>
+        <CppDistTargets>c++98\slice2py;c++98\icessl;c++98\icediscovery;c++98\icelocatordiscovery;c++98\glacier2router;c++98\glacier2cryptpermissionsverifier</CppDistTargets>
+    </PropertyGroup>
+
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\ice.common.targets" />
 
     <!-- Restore NuGet packages -->
@@ -43,7 +48,15 @@
         <PythonGenerated Include="$(MSBuildThisFileDirectory)\..\python\**\*_ice.py"/>
     </ItemGroup>
 
-    <Target Name="Build" DependsOnTargets="NuGetRestore">
+    <Target Name="BuildCppDist" DependsOnTargets="NuGetRestore">
+        <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"/>
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"
+                 Targets="$(CppDistTargets)"
+                 BuildInParallel="true"
+                 Properties="Platform=$(Platform);Configuration=$(Configuration)" />
+    </Target>
+
+    <Target Name="Build" DependsOnTargets="BuildCppDist;NuGetRestore">
         <MSBuild Projects="ice.sln"
                  Properties="Configuration=$(Configuration);Platform=$(Platform)" />
     </Target>
diff -Nru zeroc-ice-3.7.1/python/msbuild/ice.props zeroc-ice-3.7.2/python/msbuild/ice.props
--- zeroc-ice-3.7.1/python/msbuild/ice.props	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/msbuild/ice.props	2019-02-05 18:03:04.000000000 +0000
@@ -5,10 +5,10 @@
   </PropertyGroup>
   <Import Project="..\..\cpp\msbuild\Ice.Cpp98.props" />
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'">
-    <PythonHome>C:\Program Files (x86)\Python36</PythonHome>
+    <PythonHome Condition="'$(PythonHome)' == ''">C:\Program Files (x86)\Python37-32</PythonHome>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='x64'">
-    <PythonHome>C:\Program Files\Python36</PythonHome>
+    <PythonHome Condition="'$(PythonHome)' == ''">C:\Program Files\Python37</PythonHome>
   </PropertyGroup>
   <ItemGroup>
     <BuildMacro Include="PythonHome">
diff -Nru zeroc-ice-3.7.1/python/python/Glacier2/__init__.py zeroc-ice-3.7.2/python/python/Glacier2/__init__.py
--- zeroc-ice-3.7.1/python/python/Glacier2/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/python/Glacier2/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 """
 Glacier2 module
diff -Nru zeroc-ice-3.7.1/python/python/Ice/__init__.py zeroc-ice-3.7.2/python/python/Ice/__init__.py
--- zeroc-ice-3.7.1/python/python/Ice/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/python/Ice/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 """
 Ice module
 """
 
-import sys, string, imp, os, threading, warnings, datetime, logging, time, inspect, traceback
+import sys, string, os, threading, warnings, datetime, logging, time, inspect, traceback, types, array
 
 #
 # RTTI problems can occur in C++ code unless we modify Python's dlopen flags.
@@ -376,7 +371,7 @@
 Arguments:
     id The Slice type id
 Returns:
-    True if the target object supports the interface, or false otherwise.
+    True if the target object supports the interface, or False otherwise.
 '''
         return id in self.ice_ids(current)
 
@@ -698,7 +693,7 @@
         elif curr in _pendingModules:
             mod = _pendingModules[curr]
         else:
-            nmod = imp.new_module(curr)
+            nmod = types.ModuleType(curr)
             _pendingModules[curr] = nmod
             mod = nmod
 
@@ -745,14 +740,6 @@
 IcePy._t_LocalObject = IcePy.declareValue('::Ice::LocalObject')
 
 #
-# Sequence mappings.
-#
-IcePy.SEQ_DEFAULT = 0
-IcePy.SEQ_TUPLE = 1
-IcePy.SEQ_LIST = 2
-#IcePy.SEQ_ARRAY = 3
-
-#
 # Slice checksum dictionary.
 #
 sliceChecksums = {}
@@ -1969,3 +1956,71 @@
 Protocol_1_0 = ProtocolVersion(1, 0)
 Encoding_1_0 = EncodingVersion(1, 0)
 Encoding_1_1 = EncodingVersion(1, 1)
+
+
+BuiltinBool = 0
+BuiltinByte = 1
+BuiltinShort = 2
+BuiltinInt = 3
+BuiltinLong = 4
+BuiltinFloat = 5
+BuiltinDouble = 6
+
+BuiltinTypes = [BuiltinBool, BuiltinByte, BuiltinShort, BuiltinInt, BuiltinLong, BuiltinFloat, BuiltinDouble]
+BuiltinArrayTypes = ["b", "b", "h", "i", "q", "f", "d"]
+
+#
+# The array "q" type specifier is new in Python 3.3
+#
+if sys.version_info[:2] >= (3, 3):
+    def createArray(view, t, copy):
+        if t not in BuiltinTypes:
+            raise ValueError("`{0}' is not an array builtin type".format(t))
+        a = array.array(BuiltinArrayTypes[t])
+        a.frombytes(view)
+        return a
+#
+# The array.frombytes method is new in Python 3.2
+#
+elif sys.version_info[:2] >= (3, 2):
+    def createArray(view, t, copy):
+        if t not in BuiltinTypes:
+            raise ValueError("`{0}' is not an array builtin type".format(t))
+        elif t == BuiltinLong:
+            raise ValueError("array.array 'q' specifier is only supported with Python >= 3.3")
+        a = array.array(BuiltinArrayTypes[t])
+        a.frombytes(view)
+        return a
+else:
+    def createArray(view, t, copy):
+        if t not in BuiltinTypes:
+            raise ValueError("`{0}' is not an array builtin type".format(t))
+        elif t == BuiltinLong:
+            raise ValueError("array.array 'q' specifier is only supported with Python >= 3.3")
+        a = array.array(BuiltinArrayTypes[t])
+        a.fromstring(str(view.tobytes()))
+        return a
+
+
+try:
+    import numpy
+
+    BuiltinNumpyTypes = [numpy.bool_, numpy.int8, numpy.int16, numpy.int32, numpy.int64, numpy.float32, numpy.float64]
+
+    #
+    # With Python2.7 we cannot initialize numpy array from memoryview
+    # See: https://github.com/numpy/numpy/issues/5935
+    #
+    if sys.version_info[0] >= 3:
+        def createNumPyArray(view, t, copy):
+            if t not in BuiltinTypes:
+                raise ValueError("`{0}' is not an array builtin type".format(t))
+            return numpy.frombuffer(view.tobytes() if copy else view, BuiltinNumpyTypes[t])
+    else:
+        def createNumPyArray(view, t, copy):
+            if t not in BuiltinTypes:
+                raise ValueError("`{0}' is not an array builtin type".format(t))
+            return numpy.frombuffer(view.tobytes(), BuiltinNumpyTypes[t])
+
+except ImportError:
+    pass
diff -Nru zeroc-ice-3.7.1/python/python/Ice/Py3/IceFuture.py zeroc-ice-3.7.2/python/python/Ice/Py3/IceFuture.py
--- zeroc-ice-3.7.1/python/python/Ice/Py3/IceFuture.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/python/Ice/Py3/IceFuture.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # This file should only be used in Python >= 3.5.
diff -Nru zeroc-ice-3.7.1/python/python/Ice/Py3/__init__.py zeroc-ice-3.7.2/python/python/Ice/Py3/__init__.py
--- zeroc-ice-3.7.1/python/python/Ice/Py3/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/python/Ice/Py3/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/python/python/Makefile zeroc-ice-3.7.2/python/python/Makefile
--- zeroc-ice-3.7.1/python/python/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/python/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 top_srcdir      := ../..
 lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))))))
diff -Nru zeroc-ice-3.7.1/python/README.md zeroc-ice-3.7.2/python/README.md
--- zeroc-ice-3.7.1/python/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -4,7 +4,7 @@
 You can also download and install a [binary distribution][1].
 
 * [Building with Pip](#building-with-pip)
-* [Building with Visual Studio 2015 and MSBuild (Python 3\.6 for Windows)](#building-with-visual-studio-2015-and-msbuild-python-36-for-windows)
+* [Building with Visual Studio 2015 and MSBuild (Python 3\.7 for Windows)](#building-with-visual-studio-2015-and-msbuild-python-37-for-windows)
 * [Building on Linux or macOS](#building-on-linux-or-macos)
 * [Configuring your Environment for Python](#configuring-your-environment-for-python)
 * [Running the Python Tests](#running-the-python-tests)
@@ -16,9 +16,9 @@
 pip install <URL of Ice source distribution for Python>
 ```
 
-## Building with Visual Studio 2015 and MSBuild (Python 3.6 for Windows)
+## Building with Visual Studio 2015 and MSBuild (Python 3.7 for Windows)
 
-You can  build an Ice for Python 3.6 extension that links with the Ice C++
+You can  build an Ice for Python 3.7 extension that links with the Ice C++
 DLLs using Visual Studio and MSBuild.
 
 First, open a Visual Studio 2015 command prompt:
@@ -84,7 +84,7 @@
 
 ## Building on Linux or macOS
 
-Ice for Python supports Python versions 2.6, 2.7, and 3.5. Note however that
+Ice for Python supports Python versions 2.7 and 3.7. Note however that
 your Python installation must have been built with a C++ compiler that is
 compatible with the compiler used to build Ice for C++.
 
diff -Nru zeroc-ice-3.7.1/python/scripts/slice2py.py zeroc-ice-3.7.2/python/scripts/slice2py.py
--- zeroc-ice-3.7.1/python/scripts/slice2py.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/scripts/slice2py.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, Ice, IcePy
 def main():
diff -Nru zeroc-ice-3.7.1/python/test/Glacier2/application/Callback.ice zeroc-ice-3.7.2/python/test/Glacier2/application/Callback.ice
--- zeroc-ice-3.7.1/python/test/Glacier2/application/Callback.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Glacier2/application/Callback.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Glacier2/application/Client.py zeroc-ice-3.7.2/python/test/Glacier2/application/Client.py
--- zeroc-ice-3.7.1/python/test/Glacier2/application/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Glacier2/application/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,23 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, threading, Ice, Glacier2
 
-Ice.loadSlice("Callback.ice")
+import sys
+import threading
+import Ice
+import Glacier2
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Callback.ice")
 import Test
 
+
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
+
 class CallbackReceiverI(Test.CallbackReceiver):
 
     def __init__(self):
@@ -35,13 +35,15 @@
                 self._cond.wait()
             self._received = False;
 
+
 class Application(Glacier2.Application):
 
-    def __init__(self):
+    def __init__(self, helper):
         Glacier2.Application.__init__(self)
         self._restart = 0
         self._destroyed = False
         self._receiver = CallbackReceiverI()
+        self._helper = helper
 
     def createSession(self):
         return Glacier2.SessionPrx.uncheckedCast(self.router().createSession("userid", "abc123"))
@@ -56,7 +58,8 @@
             sys.stdout.write("testing Glacier2::Application restart... ")
             sys.stdout.flush()
 
-        base = self.communicator().stringToProxy("callback:default -p 12010");
+        base = self.communicator().stringToProxy("callback:{0}".format(
+            self._helper.getTestEndpoint(properties=self.communicator().getProperties())));
         callback = Test.CallbackPrx.uncheckedCast(base)
         self._restart += 1
         if self._restart < 5:
@@ -76,37 +79,40 @@
     def sessionDestroyed(self):
         self._destroyed = True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:default -p 12060")
-
-    app = Application()
-    status = app.main(sys.argv, initData=initData)
-    test(app._restart == 5)
-    test(app._destroyed)
-    initData.properties.setProperty("Ice.Default.Router", "");
-    with Ice.initialize(initData) as communicator:
-        sys.stdout.write("testing stringToProxy for process object... ")
-        sys.stdout.flush()
-        processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -p 12061");
-        print("ok")
 
-        sys.stdout.write("testing checked cast for admin object... ")
-        sys.stdout.flush()
-        process = Ice.ProcessPrx.checkedCast(processBase)
-        test(process)
-        print("ok")
+class Client(TestHelper):
 
-        sys.stdout.write("testing Glacier2 shutdown... ")
-        sys.stdout.flush()
-        process.shutdown()
-        try:
-            process.ice_ping()
-            test(False)
-        except Ice.LocalException:
+    def run(self, args):
+        initData = Ice.InitializationData()
+        initData.properties = self.createTestProperties(args)
+        initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:{0}".format(
+            self.getTestEndpoint(properties=initData.properties, num=50)))
+
+        app = Application(self)
+        status = app.main(sys.argv, initData=initData)
+        test(status == 0)
+        test(app._restart == 5)
+        test(app._destroyed)
+
+        initData.properties.setProperty("Ice.Default.Router", "")
+        with self.initialize(initData=initData) as communicator:
+            sys.stdout.write("testing stringToProxy for process object... ")
+            sys.stdout.flush()
+            processBase = communicator.stringToProxy("Glacier2/admin -f Process:{0}".format(
+                self.getTestEndpoint(properties=initData.properties, num=51)))
             print("ok")
-except:
-    traceback.print_exc()
-    status = 1
-sys.exit(status)
+
+            sys.stdout.write("testing checked cast for admin object... ")
+            sys.stdout.flush()
+            process = Ice.ProcessPrx.checkedCast(processBase)
+            test(process)
+            print("ok")
+
+            sys.stdout.write("testing Glacier2 shutdown... ")
+            sys.stdout.flush()
+            process.shutdown()
+            try:
+                process.ice_ping()
+                test(False)
+            except Ice.LocalException:
+                print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Glacier2/application/Server.py zeroc-ice-3.7.2/python/test/Glacier2/application/Server.py
--- zeroc-ice-3.7.1/python/test/Glacier2/application/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Glacier2/application/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback, Ice
-Ice.loadSlice('Callback.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice('Callback.ice')
+import Ice
 import Test
 
+
 class CallbackI(Test.Callback):
 
     def initiateCallback(self, proxy, current):
@@ -20,19 +17,16 @@
     def shutdown(self, current):
         current.adapter.getCommunicator().shutdown()
 
-class Server(Ice.Application):
 
-    def run(self, args):
-        self.communicator().getProperties().setProperty("DeactivatedAdapter.Endpoints", "default -p 12011")
-        self.communicator().createObjectAdapter("DeactivatedAdapter")
+class Server(TestHelper):
 
-        self.communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "default -p 12010")
-        adapter = self.communicator().createObjectAdapter("CallbackAdapter")
-        adapter.add(CallbackI(), Ice.stringToIdentity("callback"))
-        adapter.activate()
-        self.communicator().waitForShutdown()
-        return 0
-
-app = Server()
-status = app.main(sys.argv)
-sys.exit(status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("DeactivatedAdapter.Endpoints", self.getTestEndpoint(num=1))
+            communicator.createObjectAdapter("DeactivatedAdapter")
+
+            communicator.getProperties().setProperty("CallbackAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("CallbackAdapter")
+            adapter.add(CallbackI(), Ice.stringToIdentity("callback"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/acm/AllTests.py zeroc-ice-3.7.2/python/test/Ice/acm/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/acm/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/acm/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, threading, time, traceback
 
@@ -150,8 +145,8 @@
         self._serverACMClose = close
         self._serverACMHeartbeat = heartbeat
 
-def allTests(communicator):
-    ref = "communicator:default -p 12010"
+def allTests(helper, communicator):
+    ref = "communicator:{0}".format(helper.getTestEndpoint(num=0))
     com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref))
 
     tests = []
diff -Nru zeroc-ice-3.7.1/python/test/Ice/acm/Client.py zeroc-ice-3.7.2/python/test/Ice/acm/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/acm/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/acm/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,17 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-import Ice
 
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty('Ice.Warn.Connections', '0')
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty('Ice.Warn.Connections', '0')
+        with self.initialize(properties=properties) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/acm/Server.py zeroc-ice-3.7.2/python/test/Ice/acm/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/acm/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/acm/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,46 +1,29 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    id = Ice.stringToIdentity("communicator")
-    adapter.add(TestI.RemoteCommunicatorI(), id)
-    adapter.activate()
-
-    # Disable ready print for further adapters.
-    communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0")
-
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-    initData.properties.setProperty("Ice.ACM.Timeout", "1");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+
+
+class Server(TestHelper):
+
+    def run(self, args):
+
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Connections", "0")
+        properties.setProperty("Ice.ACM.Timeout", "1")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0")
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.RemoteCommunicatorI(), Ice.stringToIdentity("communicator"))
+            adapter.activate()
+
+            # Disable ready print for further adapters.
+            communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0")
 
-sys.exit(not status)
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/acm/Test.ice zeroc-ice-3.7.2/python/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/acm/TestI.py zeroc-ice-3.7.2/python/test/Ice/acm/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/acm/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/acm/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, threading
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/AllTests.py zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, Ice, Test
 
@@ -13,10 +8,10 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
+def allTests(helper, communicator):
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    base = communicator.stringToProxy("test:default -p 12010")
+    base = communicator.stringToProxy("test:{0}".format(helper.getTestEndpoint()))
     test(base)
     print("ok")
 
@@ -52,7 +47,7 @@
         initData = Ice.InitializationData()
         initData.properties = communicator.getProperties().clone()
         comm = Ice.initialize(initData)
-        comm.stringToProxy("test:default -p 12010").ice_pingAsync()
+        comm.stringToProxy("test:{0}".format(helper.getTestEndpoint())).ice_pingAsync()
         comm.destroy()
     print("ok")
 
@@ -92,7 +87,7 @@
         adapter.deactivate()
         try:
             obj.ice_getConnection().setAdapter(adapter)
-            test(false)
+            test(False)
         except Ice.ObjectAdapterDeactivatedException:
             pass
         print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Client.py zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,15 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
 
-import Ice
-Ice.loadSlice('Test.ice')
-import Test, AllTests
 
-class TestClient(Ice.Application):
-    def run(self, args):
-        AllTests.allTests(self.communicator())
-        return 0
+class Client(TestHelper):
 
-app = TestClient()
-sys.exit(app.main(sys.argv))
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Collocated.py zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,32 +1,26 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback, time
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
+import TestI
+
 
-import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI, AllTests
+class Collocated(TestHelper):
 
-class TestServer(Ice.Application):
     def run(self, args):
-        self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-        adapter = self.communicator().createObjectAdapter("TestAdapter")
-        locator = TestI.ServantLocatorI()
 
-        adapter.addServantLocator(locator, "")
-        #adapter.activate() // Don't activate OA to ensure collocation is used.
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            locator = TestI.ServantLocatorI()
 
-        AllTests.allTests(self.communicator())
+            adapter.addServantLocator(locator, "")
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
 
-        adapter.waitForDeactivate()
-        return 0
+            AllTests.allTests(self, communicator)
 
-app = TestServer()
-sys.exit(app.main(sys.argv))
+            adapter.waitForDeactivate()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Server.py zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,19 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, time
 
-import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
 
-class TestServer(Ice.Application):
-    def run(self, args):
-        self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-        adapter = self.communicator().createObjectAdapter("TestAdapter")
-        locator = TestI.ServantLocatorI()
 
-        adapter.addServantLocator(locator, "")
-        adapter.activate()
-        adapter.waitForDeactivate()
-        return 0
+class Server(TestHelper):
 
-app = TestServer()
-sys.exit(app.main(sys.argv))
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            locator = TestI.ServantLocatorI()
+            adapter.addServantLocator(locator, "")
+            adapter.activate()
+            adapter.waitForDeactivate()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Test.ice zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/TestI.py zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/adapterDeactivation/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/adapterDeactivation/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, traceback, time
 import Ice, Test
diff -Nru zeroc-ice-3.7.1/python/test/Ice/admin/AllTests.py zeroc-ice-3.7.2/python/test/Ice/admin/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/admin/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/admin/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, TestI
 
@@ -71,7 +66,7 @@
     except Ice.NotRegisteredException:
         pass # Expected
 
-def allTests(communicator):
+def allTests(helper, communicator):
     sys.stdout.write("testing communicator operations... ")
     sys.stdout.flush()
 
@@ -144,7 +139,7 @@
     com.destroy()
     print("ok")
 
-    ref = "factory:default -p 12010 -t 10000"
+    ref = "factory:{0} -t 10000".format(helper.getTestEndpoint())
     factory = Test.RemoteCommunicatorFactoryPrx.uncheckedCast(communicator.stringToProxy(ref))
 
     sys.stdout.write("testing process facet... ")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/admin/Client.py zeroc-ice-3.7.2/python/test/Ice/admin/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/admin/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/admin/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,15 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-import Ice
 
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/admin/Server.py zeroc-ice-3.7.2/python/test/Ice/admin/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/admin/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/admin/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,21 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
 import Ice
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
 
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test, TestI
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-    adapter = communicator.createObjectAdapter("TestAdapter");
-    ident = Ice.stringToIdentity("factory");
-    adapter.add(TestI.RemoteCommunicatorFactoryI(), ident);
-    adapter.activate();
 
-    communicator.waitForShutdown();
-    return True;
+class Server(TestHelper):
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.RemoteCommunicatorFactoryI(), Ice.stringToIdentity("factory"))
+            adapter.activate()
 
-sys.exit(not status)
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/admin/Test.ice zeroc-ice-3.7.2/python/test/Ice/admin/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/admin/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/admin/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/python/test/Ice/admin/TestI.py zeroc-ice-3.7.2/python/test/Ice/admin/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/admin/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/admin/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, threading
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/ami/AllTests.py zeroc-ice-3.7.2/python/test/Ice/ami/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/ami/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/ami/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, threading, random
 
@@ -13,6 +8,17 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
+class PingReplyI(Test.PingReply):
+     def __init__(self):
+         self._received = False
+
+     def reply(self, current=None):
+         self._received = True
+
+     def checkReceived(self):
+         return self._received
+
+
 class CallbackBase:
     def __init__(self):
         self._called = False
@@ -376,14 +382,14 @@
         self.called()
         throwEx(self._t)
 
-def allTests(communicator, collocated):
-    sref = "test:default -p 12010"
+def allTests(helper, communicator, collocated):
+    sref = "test:{0}".format(helper.getTestEndpoint(num=0))
     obj = communicator.stringToProxy(sref)
     test(obj)
 
     p = Test.TestIntfPrx.uncheckedCast(obj)
 
-    sref = "testController:default -p 12011"
+    sref = "testController:{0}".format(helper.getTestEndpoint(num=1))
     obj = communicator.stringToProxy(sref)
     test(obj)
 
@@ -716,7 +722,7 @@
             try:
                 future.result()
             except:
-                test(false)
+                test(False)
             throwEx(t)
         f = p.opAsync()
         try:
@@ -739,7 +745,7 @@
         def throwerEx(future):
             try:
                 future.result()
-                test(false)
+                test(False)
             except:
                 throwEx(t)
         try:
@@ -1136,13 +1142,13 @@
         r2.cancel()
         try:
             p.end_ice_ping(r1)
-            test(false)
+            test(False)
         except(Ice.InvocationCanceledException):
             pass
 
         try:
             p.end_ice_id(r2)
-            test(false)
+            test(False)
         except(Ice.InvocationCanceledException):
             pass
 
@@ -1161,12 +1167,12 @@
         r2.cancel()
         try:
             p.end_op(r1)
-            test(false)
+            test(False)
         except:
             pass
         try:
             p.end_ice_id(r2)
-            test(false)
+            test(False)
         except:
             pass
         testController.resumeAdapter()
@@ -1266,7 +1272,7 @@
         try:
             f.result()
         except:
-            test(false)
+            test(False)
 
         print("ok")
 
@@ -1303,14 +1309,14 @@
 
         print("ok")
 
-def allTestsFuture(communicator, collocated):
-    sref = "test:default -p 12010"
+def allTestsFuture(helper, communicator, collocated):
+    sref = "test:{0}".format(helper.getTestEndpoint(num=0))
     obj = communicator.stringToProxy(sref)
     test(obj)
 
     p = Test.TestIntfPrx.uncheckedCast(obj)
 
-    sref = "testController:default -p 12011"
+    sref = "testController:{0}".format(helper.getTestEndpoint(num=1))
     obj = communicator.stringToProxy(sref)
     test(obj)
 
@@ -1399,6 +1405,21 @@
     p.opWithUEAsync(ctx).add_done_callback(cb.opWithUE)
     cb.check()
 
+    #
+    # TODO: test add_done_callback_async
+    #
+
+    if not collocated:
+        adapter = communicator.createObjectAdapter("")
+        replyI = PingReplyI()
+        reply = Test.PingReplyPrx.uncheckedCast(adapter.addWithUUID(replyI))
+        adapter.activate()
+
+        p.ice_getConnection().setAdapter(adapter)
+        p.pingBiDir(reply)
+        test(replyI.checkReceived())
+        adapter.destroy()
+
     print("ok")
 
     sys.stdout.write("testing local exceptions... ")
@@ -1842,13 +1863,13 @@
         f2.cancel()
         try:
             f1.result()
-            test(false)
+            test(False)
         except(Ice.InvocationCanceledException):
             pass
 
         try:
             f2.result()
-            test(false)
+            test(False)
         except(Ice.InvocationCanceledException):
             pass
 
@@ -1867,12 +1888,12 @@
         f2.cancel()
         try:
             f1.result()
-            test(false)
+            test(False)
         except:
             pass
         try:
             f2.result()
-            test(false)
+            test(False)
         except:
             pass
         testController.resumeAdapter()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/ami/Client.py zeroc-ice-3.7.2/python/test/Ice/ami/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/ami/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/ami/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,50 +1,26 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-import Ice
 
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator, False)
-    AllTests.allTestsFuture(communicator, False)
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty('Ice.Warn.AMICallback', '0')
-    initData.properties.setProperty('Ice.Warn.Connections', '0')
-
-    #
-    # Limit the send buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Client(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty('Ice.Warn.AMICallback', '0')
+        properties.setProperty('Ice.Warn.Connections', '0')
+
+        #
+        # Limit the send buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        properties.setProperty("Ice.TCP.SndSize", "50000")
+
+        with self.initialize(properties=properties) as communicator:
+            AllTests.allTests(self, communicator, False)
+            AllTests.allTestsFuture(self, communicator, False)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/ami/Collocated.py zeroc-ice-3.7.2/python/test/Ice/ami/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/ami/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/ami/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,42 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
+import TestI
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI, AllTests
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011")
-    communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
 
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter2 = communicator.createObjectAdapter("ControllerAdapter")
 
-    testController = TestI.TestIntfControllerI(adapter)
+class Collocated(TestHelper):
 
-    adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
-    adapter.add(TestI.TestIntfII(), Ice.stringToIdentity("test2"))
-    #adapter.activate() # Collocated test doesn't need to active the OA
+    def run(self, args):
 
-    adapter2.add(testController, Ice.stringToIdentity("testController"))
-    #adapter2.activate() # Collocated test doesn't need to active the OA
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.AMICallback", "0")
+        #
+        # This test kills connections, so we don't want warnings.
+        #
+        properties.setProperty("Ice.Warn.Connections", "0")
 
-    AllTests.allTests(communicator, True)
+        with self.initialize(properties=properties) as communicator:
 
-    return True
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", self.getTestEndpoint(num=1))
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter2 = communicator.createObjectAdapter("ControllerAdapter")
 
-    initData.properties.setProperty("Ice.Warn.AMICallback", "0");
+            testController = TestI.TestIntfControllerI(adapter)
 
-    #
-    # This test kills connections, so we don't want warnings.
-    #
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
+            adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
+            adapter.add(TestI.TestIntfII(), Ice.stringToIdentity("test2"))
+            # adapter.activate() # Collocated test doesn't need to active the OA
 
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+            adapter2.add(testController, Ice.stringToIdentity("testController"))
+            # adapter2.activate() # Collocated test doesn't need to active the OA
 
-sys.exit(not status)
+            AllTests.allTests(self, communicator, True)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/ami/Server.py zeroc-ice-3.7.2/python/test/Ice/ami/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/ami/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/ami/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,62 +1,46 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011")
-    communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
-
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter2 = communicator.createObjectAdapter("ControllerAdapter")
-
-    testController = TestI.TestIntfControllerI(adapter)
-
-    adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
-    adapter.add(TestI.TestIntfII(), Ice.stringToIdentity("test2"))
-    adapter.activate()
-
-    adapter2.add(testController, Ice.stringToIdentity("testController"))
-    adapter2.activate()
-
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-
-    #
-    # This test kills connections, so we don't want warnings.
-    #
-    initData.properties.setProperty("Ice.Warn.Connections", "0")
-
-    #
-    # Limit the recv buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.RcvSize", "50000")
-
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+
+
+class Server(TestHelper):
+
+    def run(self, args):
+
+        properties = self.createTestProperties(args)
+        #
+        # This test kills connections, so we don't want warnings.
+        #
+        properties.setProperty("Ice.Warn.Connections", "0")
+
+        #
+        # Limit the recv buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        properties.setProperty("Ice.TCP.RcvSize", "50000")
+
+        with self.initialize(properties=properties) as communicator:
+
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", self.getTestEndpoint(num=1))
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
+
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter2 = communicator.createObjectAdapter("ControllerAdapter")
+
+            testController = TestI.TestIntfControllerI(adapter)
+
+            adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
+            adapter.add(TestI.TestIntfII(), Ice.stringToIdentity("test2"))
+            adapter.activate()
+
+            adapter2.add(testController, Ice.stringToIdentity("testController"))
+            adapter2.activate()
 
-sys.exit(not status)
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/ami/Test.ice zeroc-ice-3.7.2/python/test/Ice/ami/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/ami/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/ami/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -50,7 +45,7 @@
     bool supportsAMD();
     bool supportsFunctionalTests();
 
-    void pingBiDir(Ice::Identity id);
+    void pingBiDir(PingReply* reply);
 }
 
 interface TestIntfController
diff -Nru zeroc-ice-3.7.1/python/test/Ice/ami/TestI.py zeroc-ice-3.7.2/python/test/Ice/ami/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/ami/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/ami/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, threading, time
 
@@ -86,8 +81,9 @@
     def supportsFunctionalTests(self, current=None):
         return False
 
-    def pingBiDir(self, id, current = None):
-        Test.PingReplyPrx.uncheckedCast(current.con.createProxy(id)).reply()
+    def pingBiDir(self, reply, current=None):
+        # TODO: verify correct thread with add_done_callback_async
+        reply.ice_fixed(current.con).replyAsync().result()
 
 class TestIntfII(Test.Outer.Inner.TestIntf):
     def op(self, i, current):
diff -Nru zeroc-ice-3.7.1/python/test/Ice/application/Client.py zeroc-ice-3.7.2/python/test/Ice/application/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/application/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/application/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, Ice, time
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/application/test.py zeroc-ice-3.7.2/python/test/Ice/application/test.py
--- zeroc-ice-3.7.1/python/test/Ice/application/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/application/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Dummy file to not run this test which is only ran manually.
diff -Nru zeroc-ice-3.7.1/python/test/Ice/binding/AllTests.py zeroc-ice-3.7.2/python/test/Ice/binding/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/binding/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/binding/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, random, threading
 
@@ -50,8 +45,8 @@
     for p in adapters:
         com.deactivateObjectAdapter(p)
 
-def allTests(communicator):
-    ref = "communicator:default -p 12010"
+def allTests(helper, communicator):
+    ref = "communicator:{0}".format(helper.getTestEndpoint())
     com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref))
 
     sys.stdout.write("testing binding with single endpoint... ")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/binding/Client.py zeroc-ice-3.7.2/python/test/Ice/binding/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/binding/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/binding/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-
-Ice.loadSlice('Test.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
+
+    def run(self, args):
 
-sys.exit(not status)
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/binding/Server.py zeroc-ice-3.7.2/python/test/Ice/binding/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/binding/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/binding/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,23 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+
+
+class Server(TestHelper):
+
+    def run(self, args):
+
+        with self.initialize(args=args) as communicator:
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    id = Ice.stringToIdentity("communicator")
-    adapter.add(TestI.RemoteCommunicatorI(), id)
-    adapter.activate()
-
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.RemoteCommunicatorI(), Ice.stringToIdentity("communicator"))
+            adapter.activate()
 
-sys.exit(not status)
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/binding/Test.ice zeroc-ice-3.7.2/python/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/binding/TestI.py zeroc-ice-3.7.2/python/test/Ice/binding/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/binding/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/binding/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/blobject/Client.py zeroc-ice-3.7.2/python/test/Ice/blobject/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/blobject/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/blobject/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,82 +1,65 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
+import sys
 import Ice
-Ice.loadSlice('Test.ice')
 import Test
 import RouterI
 
+
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-def run(args, communicator, sync):
-    hello = Test.HelloPrx.checkedCast(communicator.stringToProxy("test:default -p 12010"))
-    hello.sayHello(False)
-    hello.sayHello(False, { "_fwd":"o" } )
-    test(hello.add(10, 20) == 30)
-    try:
-        hello.raiseUE()
-        test(False)
-    except Test.UE:
-        pass
-
-    try:
-        Test.HelloPrx.checkedCast(communicator.stringToProxy("unknown:default -p 12010 -t 10000"))
-        test(False)
-    except Ice.ObjectNotExistException:
-        pass
-
-    # First try an object at a non-existent endpoint.
-    try:
-        Test.HelloPrx.checkedCast(communicator.stringToProxy("missing:default -p 12000 -t 10000"))
-        test(False)
-    except Ice.UnknownLocalException as e:
-        test(e.unknown.find('ConnectionRefusedException'))
-    if sync:
-        hello.shutdown()
-    return True
-
-argv = sys.argv[:]  # Clone the arguments to use again later
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(argv)
-    initData.properties.setProperty('Ice.Warn.Dispatch', '0')
-    with Ice.initialize(argv, initData) as communicator:
-        router = RouterI.RouterI(communicator, False)
-        sys.stdout.write("testing async blobject... ")
-        sys.stdout.flush()
-        status = run(sys.argv, communicator, False)
-        print("ok")
-        router.destroy()
-except:
-    traceback.print_exc()
-    status = False
-
-if status:
-    try:
-        initData = Ice.InitializationData()
-        initData.properties = Ice.createProperties(sys.argv)
-        initData.properties.setProperty('Ice.Warn.Dispatch', '0')
-        with Ice.initialize(sys.argv, initData) as communicator:
+
+class Client(TestHelper):
+
+    def allTests(self, communicator, sync):
+        hello = Test.HelloPrx.checkedCast(communicator.stringToProxy("test:{0}".format(self.getTestEndpoint())))
+        hello.sayHello(False)
+        hello.sayHello(False, {"_fwd": "o"})
+        test(hello.add(10, 20) == 30)
+        try:
+            hello.raiseUE()
+            test(False)
+        except Test.UE:
+            pass
+
+        try:
+            Test.HelloPrx.checkedCast(communicator.stringToProxy("unknown:{0} -t 10000".format(self.getTestEndpoint())))
+            test(False)
+        except Ice.ObjectNotExistException:
+            pass
+
+        # First try an object at a non-existent endpoint.
+        try:
+            Test.HelloPrx.checkedCast(communicator.stringToProxy("missing:default -p 12000 -t 10000"))
+            test(False)
+        except Ice.UnknownLocalException as e:
+            test(e.unknown.find('ConnectionRefusedException'))
+            if sync:
+                hello.shutdown()
+
+    def run(self, args):
+
+        properties = self.createTestProperties(args)
+        properties.setProperty('Ice.Warn.Dispatch', '0')
+        with self.initialize(properties=properties) as communicator:
+            router = RouterI.RouterI(communicator, False)
+            sys.stdout.write("testing async blobject... ")
+            sys.stdout.flush()
+            self.allTests(communicator, False)
+            print("ok")
+            router.destroy()
+
+        with self.initialize(properties=properties) as communicator:
             router = RouterI.RouterI(communicator, True)
             sys.stdout.write("testing sync blobject... ")
             sys.stdout.flush()
-            status = run(sys.argv, communicator, True)
+            self.allTests(communicator, True)
             print("ok")
             router.destroy()
-    except:
-        traceback.print_exc()
-        status = False
-
-sys.exit(not status)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/blobject/RouterI.py zeroc-ice-3.7.2/python/test/Ice/blobject/RouterI.py
--- zeroc-ice-3.7.1/python/test/Ice/blobject/RouterI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/blobject/RouterI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import threading, Ice
 
@@ -151,7 +146,7 @@
         return (self._blobjectProxy, True)
 
     def getServerProxy(self, current):
-        assert false
+        assert(False)
 
     def addProxies(self, proxies, current):
         for p in proxies:
diff -Nru zeroc-ice-3.7.1/python/test/Ice/blobject/Server.py zeroc-ice-3.7.2/python/test/Ice/blobject/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/blobject/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/blobject/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
 import Ice
-
-Ice.loadSlice('Test.ice')
 import Test
+import time
+
 
 class TestI(Test.Hello):
     def sayHello(self, delay, current=None):
@@ -29,27 +24,20 @@
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    #
-    # Its possible to have batch oneway requests dispatched after the
-    # adapter is deactivated due to thread scheduling so we supress
-    # this warning.
-    #
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        #
+        # Its possible to have batch oneway requests dispatched after the
+        # adapter is deactivated due to thread scheduling so we supress
+        # this warning.
+        #
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/blobject/Test.ice zeroc-ice-3.7.2/python/test/Ice/blobject/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/blobject/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/blobject/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/checksum/AllTests.py zeroc-ice-3.7.2/python/test/Ice/checksum/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/checksum/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/checksum/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, string, re, traceback, Ice, Test
 
@@ -13,8 +8,8 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
-    ref = "test:default -p 12010"
+def allTests(helper, communicator):
+    ref = "test:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
 
@@ -55,4 +50,4 @@
 
     print("ok")
 
-    return checksum
+    checksum.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/checksum/Client.py zeroc-ice-3.7.2/python/test/Ice/checksum/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/checksum/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/checksum/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,34 +1,15 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
 
-Ice.loadSlice("'-I" + slice_dir + "' --checksum Test.ice CTypes.ice")
-import Test, AllTests
+from TestHelper import TestHelper
+TestHelper.loadSlice("--checksum Test.ice CTypes.ice")
+import AllTests
 
-def run(args, communicator):
-    checksum = AllTests.allTests(communicator)
-    checksum.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/checksum/CTypes.ice zeroc-ice-3.7.2/python/test/Ice/checksum/CTypes.ice
--- zeroc-ice-3.7.1/python/test/Ice/checksum/CTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/checksum/CTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/checksum/Server.py zeroc-ice-3.7.2/python/test/Ice/checksum/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/checksum/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/checksum/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' --checksum Test.ice STypes.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("--checksum Test.ice STypes.ice")
 import Test
 
+
 class ChecksumI(Test.Checksum):
     def getSliceChecksums(self, current=None):
         return Ice.sliceChecksums
@@ -26,20 +16,15 @@
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = ChecksumI()
-    adapter.add(object, Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+
+        with self.initialize(args=args) as communicator:
+
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(ChecksumI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/checksum/STypes.ice zeroc-ice-3.7.2/python/test/Ice/checksum/STypes.ice
--- zeroc-ice-3.7.1/python/test/Ice/checksum/STypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/checksum/STypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/checksum/Test.ice zeroc-ice-3.7.2/python/test/Ice/checksum/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/checksum/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/checksum/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/custom/AllTests.py zeroc-ice-3.7.2/python/test/Ice/custom/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/custom/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/custom/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,17 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import sys, string, re, traceback, Ice, Test
+import sys, string, re, traceback, Ice, Test, array
+
 
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
-    ref = "test:default -p 12010"
+
+def allTests(helper, communicator):
+    ref = "test:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
 
@@ -115,4 +112,298 @@
 
     print("ok")
 
+    sys.stdout.write("testing python:array.array... ")
+    sys.stdout.flush()
+
+    v = [True, False, True, False, True]
+    v1, v2 = custom.opBoolSeq(array.array("b", v))
+    test(isinstance(v1, array.array))
+    test(isinstance(v2, array.array))
+    test(len(v1) == len(v))
+    test(len(v2) == len(v))
+    for i in range(len(v)):
+        test(v1[i] == v[i])
+        test(v2[i] == v[i])
+
+    v = [0, 2, 4, 8, 16, 32, 64, 127]
+    v1, v2 = custom.opByteSeq(array.array("b", v))
+    test(isinstance(v1, array.array))
+    test(isinstance(v2, array.array))
+    test(len(v1) == len(v))
+    test(len(v2) == len(v))
+    for i in range(len(v)):
+        test(v1[i] == v[i])
+        test(v2[i] == v[i])
+
+    v = [0, 2, 4, 8, 16, 32, 64, 128, 256]
+    v1, v2 = custom.opShortSeq(array.array("h", v))
+    test(isinstance(v1, array.array))
+    test(isinstance(v2, array.array))
+    test(len(v1) == len(v))
+    test(len(v2) == len(v))
+    for i in range(len(v)):
+        test(v1[i] == v[i])
+        test(v2[i] == v[i])
+
+    v = [0, 2, 4, 8, 16, 32, 64, 128, 256]
+    v1, v2 = custom.opIntSeq(array.array("i", v))
+    test(isinstance(v1, array.array))
+    test(isinstance(v2, array.array))
+    test(len(v1) == len(v))
+    test(len(v2) == len(v))
+    for i in range(len(v)):
+        test(v1[i] == v[i])
+        test(v2[i] == v[i])
+
+    #
+    # The array "q" type specifier is new in Python 3.3
+    #
+    if sys.version_info[:2] >= (3, 3):
+        v = [0, 2, 4, 8, 16, 32, 64, 128, 256]
+        v1, v2 = custom.opLongSeq(array.array("q", v))
+        test(isinstance(v1, array.array))
+        test(isinstance(v2, array.array))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(v1[i] == v[i])
+            test(v2[i] == v[i])
+
+    v = [0.1, 0.2, 0.4, 0.8, 0.16, 0.32, 0.64, 0.128, 0.256]
+    v1, v2 = custom.opFloatSeq(array.array("f", v))
+    test(isinstance(v1, array.array))
+    test(isinstance(v2, array.array))
+    test(len(v1) == len(v))
+    test(len(v2) == len(v))
+    for i in range(len(v)):
+        test(round(v1[i], 1) == round(v[i], 1))
+        test(round(v2[i], 1) == round(v[i], 1))
+
+    v = [0.1, 0.2, 0.4, 0.8, 0.16, 0.32, 0.64, 0.128, 0.256]
+    v1, v2 = custom.opDoubleSeq(array.array("d", v))
+    test(isinstance(v1, array.array))
+    test(isinstance(v2, array.array))
+    test(len(v1) == len(v))
+    test(len(v2) == len(v))
+    for i in range(len(v)):
+        test(round(v1[i], 1) == round(v[i], 1))
+        test(round(v2[i], 1) == round(v[i], 1))
+
+    #
+    # With python 3.3 we use the new buffer interface for marshaling
+    # sequences of types that implement the buffer protocol and this
+    # allow Ice to check that the container item size and endianness
+    #
+    if sys.version_info[0] >= 3:
+        try:
+            custom.opBoolSeq(array.array("h", [1, 2, 3, 4]))
+            test(False)
+        except ValueError:
+            pass
+
+        try:
+            custom.opShortSeq(array.array("i", [1, 2, 3, 4]))
+            test(False)
+        except ValueError:
+            pass
+
+        try:
+            custom.opIntSeq(array.array("h", [1, 2, 3, 4]))
+            test(False)
+        except ValueError:
+            pass
+
+        try:
+            custom.opLongSeq(array.array("h", [1, 2, 3, 4]))
+            test(False)
+        except ValueError:
+            pass
+
+        try:
+            custom.opFloatSeq(array.array("h", [1, 2, 3, 4]))
+            test(False)
+        except ValueError:
+            pass
+
+        try:
+            custom.opDoubleSeq(array.array("h", [1, 2, 3, 4]))
+            test(False)
+        except ValueError:
+            pass
+
+    try:
+        custom.opBogusArrayNotExistsFactory()
+        test(False)
+    except ImportError:
+        pass
+
+    try:
+        custom.opBogusArrayThrowFactory()
+        test(False)
+    except ValueError:
+        pass
+
+    try:
+        custom.opBogusArrayType()
+        test(False)
+    except ValueError:
+        pass
+
+    try:
+        custom.opBogusArrayNoneFactory()
+        test(False)
+    except ValueError:
+        pass
+
+    try:
+        custom.opBogusArraySignatureFactory()
+        test(False)
+    except TypeError:
+        pass
+
+    try:
+        custom.opBogusArrayNoCallableFactory()
+        test(False)
+    except RuntimeError:
+            pass
+
+    print("ok")
+
+    try:
+        import numpy
+        ref = "test.numpy:{0}".format(helper.getTestEndpoint())
+        base = communicator.stringToProxy(ref)
+        test(base)
+
+        custom = Test.NumPy.CustomPrx.checkedCast(base)
+        test(custom)
+        sys.stdout.write("testing python:numpy.ndarray... ")
+        sys.stdout.flush()
+
+        v = [True, False, True, False, True]
+        v1, v2 = custom.opBoolSeq(numpy.array(v, numpy.bool_))
+        test(isinstance(v1, numpy.ndarray))
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(v1[i] == v[i])
+            test(v2[i] == v[i])
+
+        v = [0, 2, 4, 8, 16, 32, 64, 127]
+        v1, v2 = custom.opByteSeq(numpy.array(v, numpy.int8))
+        test(isinstance(v1, numpy.ndarray))
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(v1[i] == v[i])
+            test(v2[i] == v[i])
+
+        v = [0, 2, 4, 8, 16, 32, 64, 128, 256]
+        v1, v2 = custom.opShortSeq(numpy.array(v, numpy.int16))
+        test(isinstance(v1, numpy.ndarray))
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(v1[i] == v[i])
+            test(v2[i] == v[i])
+
+        v = [0, 2, 4, 8, 16, 32, 64, 128, 256]
+        v1, v2 = custom.opIntSeq(numpy.array(v, numpy.int32))
+        test(isinstance(v1, numpy.ndarray))
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(v1[i] == v[i])
+            test(v2[i] == v[i])
+
+        v = [0, 2, 4, 8, 16, 32, 64, 128, 256]
+        v1, v2 = custom.opLongSeq(numpy.array(v, numpy.int64))
+        test(isinstance(v1, numpy.ndarray))
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(v1[i] == v[i])
+            test(v2[i] == v[i])
+
+        v = [0.1, 0.2, 0.4, 0.8, 0.16, 0.32, 0.64, 0.128, 0.256]
+        v1, v2 = custom.opFloatSeq(numpy.array(v, numpy.float32))
+        test(isinstance(v1, numpy.ndarray))
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(round(float(v1[i]), 1) == round(v[i], 1))
+            test(round(float(v2[i]), 1) == round(v[i], 1))
+
+        v = [0.1, 0.2, 0.4, 0.8, 0.16, 0.32, 0.64, 0.128, 0.256]
+        v1, v2 = custom.opDoubleSeq(numpy.array(v, numpy.float64))
+        test(isinstance(v1, numpy.ndarray))
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v))
+        test(len(v2) == len(v))
+        for i in range(len(v)):
+            test(round(float(v1[i]), 1) == round(v[i], 1))
+            test(round(float(v2[i]), 1) == round(v[i], 1))
+
+        v1 = numpy.array([numpy.complex128(1 + 1j),
+                          numpy.complex128(2 + 2j),
+                          numpy.complex128(3 + 3j),
+                          numpy.complex128(4 + 4j)], numpy.complex128)
+        v2 = custom.opComplex128Seq(v1)
+        test(isinstance(v2, numpy.ndarray))
+        test(len(v1) == len(v2))
+        for i in range(len(v1)):
+            test(v1[i] == v2[i])
+
+        v1 = custom.opBoolMatrix()
+        test(numpy.array_equal(v1, numpy.array([[True, False, True],
+                                                [True, False, True],
+                                                [True, False, True]], numpy.bool_)))
+
+        v1 = custom.opByteMatrix()
+        test(numpy.array_equal(v1, numpy.array([[1, 0, 1],
+                                                [1, 0, 1],
+                                                [1, 0, 1]], numpy.int8)))
+
+        v1 = custom.opShortMatrix()
+        test(numpy.array_equal(v1, numpy.array([[1, 0, 1],
+                                                [1, 0, 1],
+                                                [1, 0, 1]], numpy.int16)))
+
+        v1 = custom.opIntMatrix()
+        test(numpy.array_equal(v1, numpy.array([[1, 0, 1],
+                                                [1, 0, 1],
+                                                [1, 0, 1]], numpy.int32)))
+
+        v1 = custom.opLongMatrix()
+        test(numpy.array_equal(v1, numpy.array([[1, 0, 1],
+                                                [1, 0, 1],
+                                                [1, 0, 1]], numpy.int64)))
+
+        v1 = custom.opFloatMatrix()
+        test(numpy.array_equal(v1, numpy.array([[1.1, 0.1, 1.1],
+                                                [1.1, 0.1, 1.1],
+                                                [1.1, 0.1, 1.1]], numpy.float32)))
+
+        v1 = custom.opDoubleMatrix()
+        test(numpy.array_equal(v1, numpy.array([[1.1, 0.1, 1.1],
+                                                [1.1, 0.1, 1.1],
+                                                [1.1, 0.1, 1.1]], numpy.float64)))
+
+        try:
+            custom.opBogusNumpyArrayType()
+            test(False)
+        except ValueError:
+            pass
+
+        print("ok")
+    except ImportError:
+        print("numpy not installed skiping python:numpy.ndarray testing")
+        pass
+
     return custom
diff -Nru zeroc-ice-3.7.1/python/test/Ice/custom/Client.py zeroc-ice-3.7.2/python/test/Ice/custom/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/custom/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/custom/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,22 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-Ice.loadSlice('Test.ice')
-import Test, AllTests
-
-def run(args, communicator):
-    custom = AllTests.allTests(communicator)
-    custom.shutdown()
-    return True
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 
 try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    TestHelper.loadSlice("TestNumPy.ice")
+except ImportError:
+    pass
+
+import AllTests
+
+
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            custom = AllTests.allTests(self, communicator)
+            custom.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/custom/Custom.py zeroc-ice-3.7.2/python/test/Ice/custom/Custom.py
--- zeroc-ice-3.7.1/python/test/Ice/custom/Custom.py	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/custom/Custom.py	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,100 @@
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+import Ice
+
+try:
+    import numpy
+    hasNumPy = True
+except ImportError:
+    hasNumPy = False
+
+def myBoolSeq(buffer, type, copy):
+    return Ice.createArray(buffer, type, copy)
+
+
+def myByteSeq(buffer, type, copy):
+    return Ice.createArray(buffer, type, copy)
+
+
+def myShortSeq(buffer, type, copy):
+    return Ice.createArray(buffer, type, copy)
+
+
+def myIntSeq(buffer, type, copy):
+    return Ice.createArray(buffer, type, copy)
+
+
+def myLongSeq(buffer, type, copy):
+    return Ice.createArray(buffer, type, copy)
+
+
+def myFloatSeq(buffer, type, copy):
+    return Ice.createArray(buffer, type, copy)
+
+
+def myDoubleSeq(buffer, type, copy):
+    return Ice.createArray(buffer, type, copy)
+
+if hasNumPy:
+
+    def myNumPyBoolSeq(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, type, copy)
+
+
+    def myNumPyByteSeq(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, type, copy)
+
+
+    def myNumPyShortSeq(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, type, copy)
+
+
+    def myNumPyIntSeq(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, type, copy)
+
+
+    def myNumPyLongSeq(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, type, copy)
+
+
+    def myNumPyFloatSeq(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, type, copy)
+
+
+    def myNumPyDoubleSeq(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, type, copy)
+
+
+    def myNumPyComplex128Seq(buffer, type, copy):
+        import numpy
+        return numpy.frombuffer(buffer.tobytes() if copy else buffer, numpy.complex128)
+
+
+    def myNumPyMatrix3x3(buffer, type, copy):
+        a = Ice.createNumPyArray(buffer, type, copy)
+        a.shape = (3, 3)
+        return a
+
+    def myBogusNumpyArrayType(buffer, type, copy):
+        return Ice.createNumPyArray(buffer, 1024, copy)
+
+
+def myBogusArrayThrowFactory(buffer, type, copy):
+    raise ValueError()
+
+
+def myBogusArrayType(buffer, type, copy):
+    return Ice.createArray(buffer, 1024, copy)
+
+
+def myBogusArrayNoneFactory(buffer, type, copy):
+    return None
+
+
+def myBogusArraySignatureFactory():
+    return []
+
+
+myNoCallableFactory = 5
diff -Nru zeroc-ice-3.7.1/python/test/Ice/custom/Server.py zeroc-ice-3.7.2/python/test/Ice/custom/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/custom/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/custom/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,32 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 
-import Ice
-Ice.loadSlice('Test.ice')
+
+try:
+    import numpy
+    hasNumPy = True
+except ImportError:
+    hasNumPy = False
+    pass
+
+#
+# Use separate try/except to ensure loadSlice correctly report ImportError
+# in ausence of numpy.
+#
+try:
+    TestHelper.loadSlice("TestNumPy.ice")
+except ImportError:
+    pass
+
+import sys
 import Test
+import Ice
+import array
 
 def test(b):
     if not b:
@@ -86,23 +100,141 @@
         test(isinstance(val.s3, tuple))
         test(isinstance(val.s4, list))
 
+    def opBoolSeq(self, v1, current):
+        test(isinstance(v1, array.array))
+        return v1, v1
+
+    def opByteSeq(self, v1, current):
+        test(isinstance(v1, array.array))
+        return v1, v1
+
+    def opShortSeq(self, v1, current):
+        test(isinstance(v1, array.array))
+        return v1, v1
+
+    def opIntSeq(self, v1, current):
+        test(isinstance(v1, array.array))
+        return v1, v1
+
+    def opLongSeq(self, v1, current):
+        test(isinstance(v1, array.array))
+        return v1, v1
+
+    def opFloatSeq(self, v1, current):
+        test(isinstance(v1, array.array))
+        return v1, v1
+
+    def opDoubleSeq(self, v1, current):
+        test(isinstance(v1, array.array))
+        return v1, v1
+
+    def opBogusArrayNotExistsFactory(self, current):
+        return [True, False, True, False]
+
+    def opBogusArrayThrowFactory(self, current):
+        return [True, False, True, False]
+
+    def opBogusArrayType(self, current):
+        return [True, False, True, False]
+
+    def opBogusArrayNoneFactory(self, current):
+        return [True, False, True, False]
+
+    def opBogusArraySignatureFactory(self, current):
+        return [True, False, True, False]
+
+    def opBogusArrayNoCallableFactory(self, current):
+        return [True, False, True, False]
+
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = CustomI()
-    adapter.add(object, Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
+if hasNumPy:
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    class NumPyCustomI(Test.NumPy.Custom):
 
-sys.exit(not status)
+        def opBoolSeq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1, v1
+
+        def opByteSeq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1, v1
+
+        def opShortSeq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1, v1
+
+        def opIntSeq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1, v1
+
+        def opLongSeq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1, v1
+
+        def opFloatSeq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1, v1
+
+        def opDoubleSeq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1, v1
+
+        def opComplex128Seq(self, v1, current):
+            test(isinstance(v1, numpy.ndarray))
+            return v1
+
+        def opBoolMatrix(self, current):
+            return numpy.array([[True, False, True],
+                                [True, False, True],
+                                [True, False, True]], numpy.bool_)
+
+        def opByteMatrix(self, current):
+            return numpy.array([[1, 0, 1],
+                                [1, 0, 1],
+                                [1, 0, 1]], numpy.int8)
+
+        def opShortMatrix(self, current):
+            return numpy.array([[1, 0, 1],
+                                [1, 0, 1],
+                                [1, 0, 1]], numpy.int16)
+
+        def opIntMatrix(self, current):
+            return numpy.array([[1, 0, 1],
+                                [1, 0, 1],
+                                [1, 0, 1]], numpy.int32)
+
+        def opLongMatrix(self, current):
+            return numpy.array([[1, 0, 1],
+                                [1, 0, 1],
+                                [1, 0, 1]], numpy.int64)
+
+        def opFloatMatrix(self, current):
+            return numpy.array([[1.1, 0.1, 1.1],
+                                [1.1, 0.1, 1.1],
+                                [1.1, 0.1, 1.1]], numpy.float32)
+
+        def opDoubleMatrix(self, current):
+            return numpy.array([[1.1, 0.1, 1.1],
+                                [1.1, 0.1, 1.1],
+                                [1.1, 0.1, 1.1]], numpy.float64)
+
+        def opBogusNumpyArrayType(self, current):
+            return [True, False, True, False]
+
+        def shutdown(self, current=None):
+            current.adapter.getCommunicator().shutdown()
+
+
+class Server(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(CustomI(), Ice.stringToIdentity("test"))
+            if hasNumPy:
+                adapter.add(NumPyCustomI(), Ice.stringToIdentity("test.numpy"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/custom/Test.ice zeroc-ice-3.7.2/python/test/Ice/custom/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/custom/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/custom/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -17,6 +12,27 @@
     sequence<string> StringList; /* By default, a sequence is received as a list. */
     ["python:seq:tuple"] sequence<string> StringTuple;
 
+    ["python:array.array"] sequence<bool> BoolSeq1;
+    ["python:memoryview:Custom.myBoolSeq"] sequence<bool> BoolSeq2;
+
+    ["python:array.array"] sequence<byte> ByteSeq1;
+    ["python:memoryview:Custom.myByteSeq"] sequence<byte> ByteSeq2;
+
+    ["python:array.array"] sequence<short> ShortSeq1;
+    ["python:memoryview:Custom.myShortSeq"] sequence<short> ShortSeq2;
+
+    ["python:array.array"] sequence<int> IntSeq1;
+    ["python:memoryview:Custom.myIntSeq"] sequence<int> IntSeq2;
+
+    ["python:array.array"] sequence<long> LongSeq1;
+    ["python:memoryview:Custom.myLongSeq"] sequence<long> LongSeq2;
+
+    ["python:array.array"] sequence<float> FloatSeq1;
+    ["python:memoryview:Custom.myFloatSeq"] sequence<float> FloatSeq2;
+
+    ["python:array.array"] sequence<double> DoubleSeq1;
+    ["python:memoryview:Custom.myDoubleSeq"] sequence<double> DoubleSeq2;
+
     struct S
     {
         ByteString b1;
@@ -62,6 +78,21 @@
         void sendS(S val);
         void sendC(C val);
 
+        BoolSeq1 opBoolSeq(BoolSeq1 v1, out BoolSeq2 v2);
+        ByteSeq1 opByteSeq(ByteSeq1 v1, out ByteSeq2 v2);
+        ShortSeq1 opShortSeq(ShortSeq1 v1, out ShortSeq2 v2);
+        IntSeq1 opIntSeq(IntSeq1 v1, out IntSeq2 v2);
+        LongSeq1 opLongSeq(LongSeq1 v1, out LongSeq2 v2);
+        FloatSeq1 opFloatSeq(FloatSeq1 v1, out FloatSeq2 v2);
+        DoubleSeq1 opDoubleSeq(DoubleSeq1 v1, out DoubleSeq2 v2);
+
+        ["python:memoryview:Custom.myBogusArrayNotExistsFactory"] BoolSeq1 opBogusArrayNotExistsFactory();
+        ["python:memoryview:Custom.myBogusArrayThrowFactory"]BoolSeq1 opBogusArrayThrowFactory();
+        ["python:memoryview:Custom.myBogusArrayType"]BoolSeq1 opBogusArrayType();
+        ["python:memoryview:Custom.myBogusArrayNoneFactory"]BoolSeq1 opBogusArrayNoneFactory();
+        ["python:memoryview:Custom.myBogusArraySignatureFactory"]BoolSeq1 opBogusArraySignatureFactory();
+        ["python:memoryview:Custom.myNoCallableFactory"]BoolSeq1 opBogusArrayNoCallableFactory();
+
         void shutdown();
     }
 }
diff -Nru zeroc-ice-3.7.1/python/test/Ice/custom/TestNumPy.ice zeroc-ice-3.7.2/python/test/Ice/custom/TestNumPy.ice
--- zeroc-ice-3.7.1/python/test/Ice/custom/TestNumPy.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/custom/TestNumPy.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,58 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+module Test
+{
+    module NumPy
+    {
+        ["python:numpy.ndarray"] sequence<bool> BoolSeq1;
+        ["python:memoryview:Custom.myNumPyBoolSeq"] sequence<bool> BoolSeq2;
+
+        ["python:numpy.ndarray"] sequence<byte> ByteSeq1;
+        ["python:memoryview:Custom.myNumPyByteSeq"] sequence<byte> ByteSeq2;
+
+        ["python:numpy.ndarray"] sequence<short> ShortSeq1;
+        ["python:memoryview:Custom.myNumPyShortSeq"] sequence<short> ShortSeq2;
+
+        ["python:numpy.ndarray"] sequence<int> IntSeq1;
+        ["python:memoryview:Custom.myNumPyIntSeq"] sequence<int> IntSeq2;
+
+        ["python:numpy.ndarray"] sequence<long> LongSeq1;
+        ["python:memoryview:Custom.myNumPyLongSeq"] sequence<long> LongSeq2;
+
+        ["python:numpy.ndarray"] sequence<float> FloatSeq1;
+        ["python:memoryview:Custom.myNumPyFloatSeq"] sequence<float> FloatSeq2;
+
+        ["python:numpy.ndarray"] sequence<double> DoubleSeq1;
+        ["python:memoryview:Custom.myNumPyDoubleSeq"] sequence<double> DoubleSeq2;
+
+        ["python:memoryview:Custom.myNumPyComplex128Seq"] sequence<byte> Complex128Seq;
+
+        interface Custom
+        {
+            BoolSeq1 opBoolSeq(BoolSeq1 v1, out BoolSeq2 v2);
+            ByteSeq1 opByteSeq(ByteSeq1 v1, out ByteSeq2 v2);
+            ShortSeq1 opShortSeq(ShortSeq1 v1, out ShortSeq2 v2);
+            IntSeq1 opIntSeq(IntSeq1 v1, out IntSeq2 v2);
+            LongSeq1 opLongSeq(LongSeq1 v1, out LongSeq2 v2);
+            FloatSeq1 opFloatSeq(FloatSeq1 v1, out FloatSeq2 v2);
+            DoubleSeq1 opDoubleSeq(DoubleSeq1 v1, out DoubleSeq2 v2);
+            Complex128Seq opComplex128Seq(Complex128Seq v1);
+
+            ["python:memoryview:Custom.myNumPyMatrix3x3"] BoolSeq1 opBoolMatrix();
+            ["python:memoryview:Custom.myNumPyMatrix3x3"] ByteSeq1 opByteMatrix();
+            ["python:memoryview:Custom.myNumPyMatrix3x3"] ShortSeq1 opShortMatrix();
+            ["python:memoryview:Custom.myNumPyMatrix3x3"] IntSeq1 opIntMatrix();
+            ["python:memoryview:Custom.myNumPyMatrix3x3"] LongSeq1 opLongMatrix();
+            ["python:memoryview:Custom.myNumPyMatrix3x3"] FloatSeq1 opFloatMatrix();
+            ["python:memoryview:Custom.myNumPyMatrix3x3"] DoubleSeq1 opDoubleMatrix();
+
+            ["python:memoryview:Custom.myBogusNumpyArrayType"]BoolSeq1 opBogusNumpyArrayType();
+
+            void shutdown();
+        }
+    }
+}
diff -Nru zeroc-ice-3.7.1/python/test/Ice/defaultServant/AllTests.py zeroc-ice-3.7.2/python/test/Ice/defaultServant/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/defaultServant/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/defaultServant/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, MyObjectI, sys
 
@@ -13,7 +8,7 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
+def allTests(helper, communicator):
 
     oa = communicator.createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost")
     oa.activate()
@@ -48,14 +43,14 @@
     prx = Test.MyObjectPrx.uncheckedCast(oa.createProxy(identity))
     try:
         prx.ice_ping()
-        test(false)
+        test(False)
     except Ice.ObjectNotExistException:
         # Expected
         pass
 
     try:
         prx.getName()
-        test(false)
+        test(False)
     except Ice.ObjectNotExistException:
         # Expected
         pass
@@ -64,14 +59,14 @@
     prx = Test.MyObjectPrx.uncheckedCast(oa.createProxy(identity))
     try:
         prx.ice_ping()
-        test(false)
+        test(False)
     except Ice.FacetNotExistException:
         # Expected
         pass
 
     try:
         prx.getName()
-        test(false)
+        test(False)
     except Ice.FacetNotExistException:
         # Expected
         pass
@@ -83,14 +78,14 @@
 
         try:
             prx.ice_ping()
-            test(false)
+            test(False)
         except Ice.ObjectNotExistException:
             # Expected
             pass
 
         try:
             prx.getName()
-            test(false)
+            test(False)
         except Ice.ObjectNotExistException:
             # Expected
             pass
diff -Nru zeroc-ice-3.7.1/python/test/Ice/defaultServant/Client.py zeroc-ice-3.7.2/python/test/Ice/defaultServant/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/defaultServant/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/defaultServant/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,15 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-import Ice
 
-Ice.loadSlice('Test.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/defaultServant/MyObjectI.py zeroc-ice-3.7.2/python/test/Ice/defaultServant/MyObjectI.py
--- zeroc-ice-3.7.1/python/test/Ice/defaultServant/MyObjectI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/defaultServant/MyObjectI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/defaultServant/Test.ice zeroc-ice-3.7.2/python/test/Ice/defaultServant/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/defaultServant/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/defaultServant/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/defaultValue/AllTests.py zeroc-ice-3.7.2/python/test/Ice/defaultValue/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/defaultValue/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/defaultValue/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/defaultValue/Client.py zeroc-ice-3.7.2/python/test/Ice/defaultValue/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/defaultValue/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/defaultValue/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-import Ice
 
-Ice.loadSlice('Test.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def run(args):
-    AllTests.allTests()
-    return True
 
-try:
-    status = run(sys.argv)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        AllTests.allTests()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/python/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/dispatcher/AllTests.py zeroc-ice-3.7.2/python/test/Ice/dispatcher/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/dispatcher/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/dispatcher/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, Dispatcher, sys, threading, random
 
@@ -51,14 +46,14 @@
         else:
             test(Dispatcher.Dispatcher.isDispatcherThread())
 
-def allTests(communicator, collocated):
-    sref = "test:default -p 12010"
+def allTests(helper, communicator):
+    sref = "test:{0}".format(helper.getTestEndpoint())
     obj = communicator.stringToProxy(sref)
     test(obj)
 
     p = Test.TestIntfPrx.uncheckedCast(obj)
 
-    sref = "testController:default -p 12011"
+    sref = "testController:{0}".format(helper.getTestEndpoint(num=1))
     obj = communicator.stringToProxy(sref)
     test(obj)
 
@@ -84,7 +79,7 @@
     #
     # Expect InvocationTimeoutException.
     #
-    to = p.ice_invocationTimeout(250);
+    to = p.ice_invocationTimeout(10);
     to.sleepAsync(500).add_done_callback_async(cb.exceptionEx)
     cb.check()
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/dispatcher/Client.py zeroc-ice-3.7.2/python/test/Ice/dispatcher/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/dispatcher/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/dispatcher/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,30 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import AllTests, Dispatcher
-
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator, False)
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-
-    #
-    # Limit the send buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-    d = Dispatcher.Dispatcher()
-    initData.dispatcher = d.dispatch
-
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+import Dispatcher
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
+
+
+class Client(TestHelper):
+
+    def run(self, args):
+        initData = Ice.InitializationData()
+        initData.properties = self.createTestProperties(args)
+
+        #
+        # Limit the send buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        initData.properties.setProperty("Ice.TCP.SndSize", "50000")
+        d = Dispatcher.Dispatcher()
+        initData.dispatcher = d.dispatch
 
-Dispatcher.Dispatcher.terminate()
+        with self.initialize(initData=initData) as communicator:
+            AllTests.allTests(self, communicator)
 
-sys.exit(not status)
+        Dispatcher.Dispatcher.terminate()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/dispatcher/Dispatcher.py zeroc-ice-3.7.2/python/test/Ice/dispatcher/Dispatcher.py
--- zeroc-ice-3.7.1/python/test/Ice/dispatcher/Dispatcher.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/dispatcher/Dispatcher.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, os, sys, traceback, time, threading
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/dispatcher/Server.py zeroc-ice-3.7.2/python/test/Ice/dispatcher/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/dispatcher/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/dispatcher/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,66 +1,52 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+import Dispatcher
 
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI, Dispatcher
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011")
-    communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
+class Server(TestHelper):
 
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter2 = communicator.createObjectAdapter("ControllerAdapter")
+    def run(self, args):
 
-    testController = TestI.TestIntfControllerI(adapter)
+        initData = Ice.InitializationData()
+        initData.properties = self.createTestProperties(args)
 
-    adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
-    adapter.activate()
+        #
+        # This test kills connections, so we don't want warnings.
+        #
+        initData.properties.setProperty("Ice.Warn.Connections", "0")
 
-    adapter2.add(testController, Ice.stringToIdentity("testController"))
-    adapter2.activate()
+        #
+        # Limit the recv buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        initData.properties.setProperty("Ice.TCP.RcvSize", "50000")
 
-    communicator.waitForShutdown()
-    return True
+        d = Dispatcher.Dispatcher()
+        initData.dispatcher = d.dispatch
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
+        with self.initialize(initData=initData) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", self.getTestEndpoint(num=1))
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
 
-    #
-    # This test kills connections, so we don't want warnings.
-    #
-    initData.properties.setProperty("Ice.Warn.Connections", "0")
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter2 = communicator.createObjectAdapter("ControllerAdapter")
 
-    #
-    # Limit the recv buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.RcvSize", "50000")
+            testController = TestI.TestIntfControllerI(adapter)
 
-    d = Dispatcher.Dispatcher()
-    initData.dispatcher = d.dispatch
+            adapter.add(TestI.TestIntfI(), Ice.stringToIdentity("test"))
+            adapter.activate()
 
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+            adapter2.add(testController, Ice.stringToIdentity("testController"))
+            adapter2.activate()
 
-Dispatcher.Dispatcher.terminate()
+            communicator.waitForShutdown()
 
-sys.exit(not status)
+        Dispatcher.Dispatcher.terminate()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/dispatcher/Test.ice zeroc-ice-3.7.2/python/test/Ice/dispatcher/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/dispatcher/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/dispatcher/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/dispatcher/TestI.py zeroc-ice-3.7.2/python/test/Ice/dispatcher/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/dispatcher/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/dispatcher/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, Dispatcher, time
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/enums/AllTests.py zeroc-ice-3.7.2/python/test/Ice/enums/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/enums/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/enums/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, string, re, traceback, Ice, Test
 
@@ -13,8 +8,8 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
-    ref = "test:default -p 12010"
+def allTests(helper, communicator):
+    ref = "test:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/enums/Client.py zeroc-ice-3.7.2/python/test/Ice/enums/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/enums/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/enums/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-Ice.loadSlice('Test.ice')
-import Test, AllTests
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
 
-def run(args, communicator):
-    proxy = AllTests.allTests(communicator)
-    proxy.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            proxy = AllTests.allTests(self, communicator)
+            proxy.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/enums/Server.py zeroc-ice-3.7.2/python/test/Ice/enums/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/enums/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/enums/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,13 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-Ice.loadSlice('Test.ice')
 import Test
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
 
 class TestIntfI(Test.TestIntf):
     def opByte(self, b1, current=None):
@@ -46,20 +37,14 @@
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestIntfI()
-    adapter.add(object, Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestIntfI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/enums/Test.ice zeroc-ice-3.7.2/python/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/exceptions/AllTests.py zeroc-ice-3.7.2/python/test/Ice/exceptions/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/exceptions/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/exceptions/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, threading, sys, array
 
@@ -212,7 +207,7 @@
             test(False)
         self.called()
 
-def allTests(communicator):
+def allTests(helper, communicator):
     sys.stdout.write("testing servant registration exceptions... ")
     sys.stdout.flush()
     communicator.getProperties().setProperty("TestAdapter1.Endpoints", "tcp -h *")
@@ -221,26 +216,26 @@
     adapter.add(obj, Ice.stringToIdentity("x"))
     try:
         adapter.add(obj, Ice.stringToIdentity("x"))
-        test(false)
+        test(False)
     except Ice.AlreadyRegisteredException:
         pass
 
     try:
         adapter.add(obj, Ice.stringToIdentity(""))
-        test(false)
+        test(False)
     except Ice.IllegalIdentityException as ex:
         test(ex.id.name == "")
 
     try:
         adapter.add(None, Ice.stringToIdentity("x"))
-        test(false)
+        test(False)
     except Ice.IllegalServantException:
         pass
 
     adapter.remove(Ice.stringToIdentity("x"))
     try:
         adapter.remove(Ice.stringToIdentity("x"))
-        test(false)
+        test(False)
     except Ice.NotRegisteredException:
         pass
 
@@ -255,7 +250,7 @@
     adapter.addServantLocator(loc, "x")
     try:
         adapter.addServantLocator(loc, "x")
-        test(false)
+        test(False)
     except Ice.AlreadyRegisteredException:
         pass
 
@@ -268,14 +263,14 @@
     communicator.getValueFactoryManager().add(ValueFactory, "x")
     try:
         communicator.getValueFactoryManager().add(ValueFactory, "x")
-        test(false)
+        test(False)
     except Ice.AlreadyRegisteredException:
         pass
     print("ok")
 
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    ref = "thrower:default -p 12010"
+    ref = "thrower:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
     print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/exceptions/Client.py zeroc-ice-3.7.2/python/test/Ice/exceptions/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/exceptions/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/exceptions/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,19 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
 
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def run(args, communicator):
-    thrower = AllTests.allTests(communicator)
-    thrower.shutdown()
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.MessageSizeMax", "10")
+        properties.setProperty("Ice.Warn.Connections", "0")
+        with self.initialize(properties=properties) as communicator:
+            thrower = AllTests.allTests(self, communicator)
+            thrower.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/exceptions/Collocated.py zeroc-ice-3.7.2/python/test/Ice/exceptions/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/exceptions/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/exceptions/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,45 +1,25 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI, AllTests
-
-def run(args, communicator):
-    properties = communicator.getProperties()
-    properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI.ThrowerI()
-    adapter.add(object, Ice.stringToIdentity("thrower"))
-    #adapter.activate() // Don't activate OA to ensure collocation is used.
-
-    thrower = AllTests.allTests(communicator)
-
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
-
-sys.exit(not status)
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+import AllTests
+
+
+class Collocated(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.MessageSizeMax", "10")
+
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0")
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.ThrowerI(), Ice.stringToIdentity("thrower"))
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/exceptions/ServerAMD.py zeroc-ice-3.7.2/python/test/Ice/exceptions/ServerAMD.py
--- zeroc-ice-3.7.1/python/test/Ice/exceptions/ServerAMD.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/exceptions/ServerAMD.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,13 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, array
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
 import Test
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
 
 class ThrowerI(Test.Thrower):
     def shutdown(self, current=None):
@@ -150,35 +136,29 @@
         f.set_exception(Test.A())
         return f
 
-def run(args, communicator):
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter2 = communicator.createObjectAdapter("TestAdapter2")
-    adapter3 = communicator.createObjectAdapter("TestAdapter3")
-    object = ThrowerI()
-    adapter.add(object, Ice.stringToIdentity("thrower"))
-    adapter2.add(object, Ice.stringToIdentity("thrower"))
-    adapter3.add(object, Ice.stringToIdentity("thrower"))
-    adapter.activate()
-    adapter2.activate()
-    adapter3.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0")
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-    initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010")
-    initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011")
-    initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
-    initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
-    initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class ServerAMD(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        properties.setProperty("Ice.Warn.Connections", "0")
+        properties.setProperty("Ice.MessageSizeMax", "10")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", self.getTestEndpoint(num=1))
+            communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0")
+            communicator.getProperties().setProperty("TestAdapter3.Endpoints", self.getTestEndpoint(num=2))
+            communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1")
+
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter2 = communicator.createObjectAdapter("TestAdapter2")
+            adapter3 = communicator.createObjectAdapter("TestAdapter3")
+            object = ThrowerI()
+            adapter.add(object, Ice.stringToIdentity("thrower"))
+            adapter2.add(object, Ice.stringToIdentity("thrower"))
+            adapter3.add(object, Ice.stringToIdentity("thrower"))
+            adapter.activate()
+            adapter2.activate()
+            adapter3.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/exceptions/Server.py zeroc-ice-3.7.2/python/test/Ice/exceptions/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/exceptions/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/exceptions/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,53 +1,38 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI
-
-def run(args, communicator):
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter2 = communicator.createObjectAdapter("TestAdapter2")
-    adapter3 = communicator.createObjectAdapter("TestAdapter3")
-    object = TestI.ThrowerI()
-    adapter.add(object, Ice.stringToIdentity("thrower"))
-    adapter2.add(object, Ice.stringToIdentity("thrower"))
-    adapter3.add(object, Ice.stringToIdentity("thrower"))
-    adapter.activate()
-    adapter2.activate()
-    adapter3.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0")
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-    initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010")
-    initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011")
-    initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
-    initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
-    initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+import TestI
+
+
+class Server(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        properties.setProperty("Ice.Warn.Connections", "0")
+        properties.setProperty("Ice.MessageSizeMax", "10")
+
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint(num=0))
+            communicator.getProperties().setProperty("Ice.MessageSizeMax", "10")
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", self.getTestEndpoint(num=1))
+            communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0")
+            communicator.getProperties().setProperty("TestAdapter3.Endpoints", self.getTestEndpoint(num=2))
+            communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1")
+
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter2 = communicator.createObjectAdapter("TestAdapter2")
+            adapter3 = communicator.createObjectAdapter("TestAdapter3")
+            object = TestI.ThrowerI()
+            adapter.add(object, Ice.stringToIdentity("thrower"))
+            adapter2.add(object, Ice.stringToIdentity("thrower"))
+            adapter3.add(object, Ice.stringToIdentity("thrower"))
+            adapter.activate()
+            adapter2.activate()
+            adapter3.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/python/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/exceptions/TestI.py zeroc-ice-3.7.2/python/test/Ice/exceptions/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/exceptions/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/exceptions/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, array, sys
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/facets/AllTests.py zeroc-ice-3.7.2/python/test/Ice/facets/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/facets/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/facets/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys
 
@@ -16,7 +11,7 @@
 class EmptyI(Test.Empty):
     pass
 
-def allTests(communicator):
+def allTests(helper, communicator):
 
     sys.stdout.write("testing Ice.Admin.Facets property... ")
     sys.stdout.flush()
@@ -49,13 +44,13 @@
     adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD")
     try:
         adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD")
-        test(false)
+        test(False)
     except Ice.AlreadyRegisteredException:
         pass
     adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD")
     try:
         adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD")
-        test(false)
+        test(False)
     except Ice.NotRegisteredException:
         pass
     print("ok")
@@ -76,7 +71,7 @@
     test(fm["f2"] == obj2)
     try:
         adapter.removeAllFacets(Ice.stringToIdentity("id1"))
-        test(false)
+        test(False)
     except Ice.NotRegisteredException:
         pass
     fm = adapter.removeAllFacets(Ice.stringToIdentity("id2"))
@@ -90,7 +85,7 @@
 
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    ref = "d:default -p 12010"
+    ref = "d:{0}".format(helper.getTestEndpoint())
     db = communicator.stringToProxy(ref)
     test(db)
     print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/facets/Client.py zeroc-ice-3.7.2/python/test/Ice/facets/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/facets/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/facets/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-import Ice
 
-Ice.loadSlice('Test.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def run(args, communicator):
-    g = AllTests.allTests(communicator)
-    g.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            g = AllTests.allTests(self, communicator)
+            g.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/facets/Collocated.py zeroc-ice-3.7.2/python/test/Ice/facets/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/facets/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/facets/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,27 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI, AllTests
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+import AllTests
+
+
+class Collocated(TestHelper):
+
+    def run(self, args):
+
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.DI(), Ice.stringToIdentity("d"))
+            adapter.addFacet(TestI.DI(), Ice.stringToIdentity("d"), "facetABCD")
+            adapter.addFacet(TestI.FI(), Ice.stringToIdentity("d"), "facetEF")
+            adapter.addFacet(TestI.HI(communicator), Ice.stringToIdentity("d"), "facetGH")
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    d = TestI.DI()
-    adapter.add(d, Ice.stringToIdentity("d"))
-    adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
-    f = TestI.FI()
-    adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
-    h = TestI.HI(communicator)
-    adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
-
-    #adapter.activate() // Don't activate OA to ensure collocation is used.
-
-    AllTests.allTests(communicator)
-
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
 
-sys.exit(not status)
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/facets/Server.py zeroc-ice-3.7.2/python/test/Ice/facets/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/facets/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/facets/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,24 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    d = TestI.DI()
-    adapter.add(d, Ice.stringToIdentity("d"))
-    adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
-    f = TestI.FI()
-    adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
-    h = TestI.HI(communicator)
-    adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
-
-    adapter.activate()
-    communicator.waitForShutdown()
-
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+
+
+class Server(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.DI(), Ice.stringToIdentity("d"))
+            adapter.addFacet(TestI.DI(), Ice.stringToIdentity("d"), "facetABCD")
+            adapter.addFacet(TestI.FI(), Ice.stringToIdentity("d"), "facetEF")
+            adapter.addFacet(TestI.HI(communicator), Ice.stringToIdentity("d"), "facetGH")
 
-sys.exit(not status)
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/facets/Test.ice zeroc-ice-3.7.2/python/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/facets/TestI.py zeroc-ice-3.7.2/python/test/Ice/facets/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/facets/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/facets/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Test
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/faultTolerance/AllTests.py zeroc-ice-3.7.2/python/test/Ice/faultTolerance/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/faultTolerance/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/faultTolerance/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, sys, threading
 
@@ -60,12 +55,12 @@
     def pid(self):
         return self._pid
 
-def allTests(communicator, ports):
+def allTests(helper, communicator, ports):
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
     ref = "test"
-    for p in ports:
-        ref = ref + ":default -p " + str(p)
+    for i in range(len(ports)):
+        ref += ":{0}".format(helper.getTestEndpoint(num=i))
     base = communicator.stringToProxy(ref)
     test(base)
     print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/faultTolerance/Client.py zeroc-ice-3.7.2/python/test/Ice/faultTolerance/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/faultTolerance/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/faultTolerance/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,60 +1,32 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
 
-import Ice, AllTests
+from TestHelper import TestHelper
+import AllTests
+
+
+class Client(TestHelper):
+
+    def run(self, args):
+
+        properties = self.createTestProperties(args)
+
+        #
+        # This test aborts servers, so we don't want warnings.
+        #
+        properties.setProperty('Ice.Warn.Connections', '0')
+
+        ports = []
+        for arg in args:
+            if arg[0] == '-':
+                continue
+            ports.append(int(arg))
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def usage(n):
-    sys.stderr.write("Usage: " + n + " port...\n")
-
-def run(args, communicator):
-    ports = []
-    for arg in args[1:]:
-        if arg[0] == '-':
-            sys.stderr.write(args[0] + ": unknown option `" + arg + "'\n")
-            usage(args[0])
-            return False
-
-        ports.append(12010 + int(arg))
-
-    if len(ports) == 0:
-        sys.stderr.write(args[0] + ": no ports specified\n")
-        usage(args[0])
-        return False
-
-    try:
-        AllTests.allTests(communicator, ports)
-    except:
-        traceback.print_exc()
-        test(False)
-
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-
-    #
-    # This test aborts servers, so we don't want warnings.
-    #
-    initData.properties.setProperty('Ice.Warn.Connections', '0')
-
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+        if len(ports) == 0:
+            raise RuntimeError("no ports specified")
 
-sys.exit(not status)
+        with self.initialize(properties=properties) as communicator:
+            AllTests.allTests(self, communicator, ports)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/faultTolerance/Server.py zeroc-ice-3.7.2/python/test/Ice/faultTolerance/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/faultTolerance/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/faultTolerance/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,28 +1,22 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+import os
 import Ice
-Ice.loadSlice('Test.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Test
 
-def usage(n):
-    sys.stderr.write("Usage: " + n + " port\n")
 
 class TestI(Test.TestIntf):
+
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
     def abort(self, current=None):
-        sys.stdout.write("aborting...")
+        print("aborting...")
         os._exit(0)
 
     def idempotentAbort(self, current=None):
@@ -31,48 +25,35 @@
     def pid(self, current=None):
         return os.getpid()
 
-def run(args, communicator):
-    port = 0
-    for arg in args[1:]:
-        if arg[0] == '-':
-            sys.stderr.write(args[0] + ": unknown option `" + arg + "'\n")
-            usage(args[0])
-            return False
-        if port > 0:
-            sys.stderr.write(args[0] + ": only one port can be specified\n")
-            usage(args[0])
-            return False
-
-        port = 12010 + int(arg)
-
-    if port <= 0:
-        sys.stderr.write(args[0] + ": no port specified\n")
-        usage(args[0])
-        return False
-
-    endpts = "default -p " + str(port)
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", endpts)
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI()
-    adapter.add(object, Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    #
-    # In this test, we need a longer server idle time, otherwise
-    # our test servers may time out before they are used in the
-    # test.
-    #
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.ServerIdleTime", "120") # Two minutes.
-
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        #
+        # In this test, we need a longer server idle time, otherwise
+        # our test servers may time out before they are used in the
+        # test.
+        #
+        properties.setProperty("Ice.ServerIdleTime", "120")  # Two minutes.
+
+        port = 0
+        for arg in args:
+
+            if arg[0] == '-':
+                continue
+
+            if port > 0:
+                raise RuntimeError("only one port can be specified")
+
+            port = int(arg)
+
+        if port <= 0:
+            raise RuntimeError("no port specified\n")
+
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint(num=port))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/faultTolerance/Test.ice zeroc-ice-3.7.2/python/test/Ice/faultTolerance/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/faultTolerance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/faultTolerance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/info/AllTests.py zeroc-ice-3.7.2/python/test/Ice/info/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/info/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/info/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, threading
 
@@ -25,7 +20,7 @@
             return info
         info = info.underlying
 
-def allTests(communicator):
+def allTests(helper, communicator):
     sys.stdout.write("testing proxy endpoint information... ")
     sys.stdout.flush()
 
@@ -104,8 +99,8 @@
 
     adapter.destroy()
 
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -h * -p 12020")
-    communicator.getProperties().setProperty("TestAdapter.PublishedEndpoints", "default -h 127.0.0.1 -p 12020")
+    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -h * -p 15000")
+    communicator.getProperties().setProperty("TestAdapter.PublishedEndpoints", "default -h 127.0.0.1 -p 15000")
     adapter = communicator.createObjectAdapter("TestAdapter")
 
     endpoints = adapter.getEndpoints()
@@ -116,26 +111,28 @@
 
     for i in range(0, len(endpoints)):
         tcpEndpoint = getTCPEndpointInfo(endpoints[i].getInfo())
-        test(tcpEndpoint.port == 12020)
+        test(tcpEndpoint.port == 15000)
 
     tcpEndpoint = getTCPEndpointInfo(publishedEndpoints[0].getInfo())
     test(tcpEndpoint.host == "127.0.0.1")
-    test(tcpEndpoint.port == 12020)
+    test(tcpEndpoint.port == 15000)
 
     adapter.destroy()
 
     print("ok")
 
-    base = communicator.stringToProxy("test:default -p 12010:udp -p 12010")
+    base = communicator.stringToProxy("test:{0}:{1}".format(helper.getTestEndpoint(),
+                                                            helper.getTestEndpoint(protocol="udp")))
     testIntf = Test.TestIntfPrx.checkedCast(base)
 
     sys.stdout.write("test connection endpoint information... ")
     sys.stdout.flush()
 
     defaultHost = communicator.getProperties().getProperty("Ice.Default.Host")
+    port = helper.getTestPort()
 
     tcpinfo = getTCPEndpointInfo(base.ice_getConnection().getEndpoint().getInfo())
-    test(tcpinfo.port == 12010)
+    test(tcpinfo.port == port)
     test(not tcpinfo.compress)
     test(tcpinfo.host == defaultHost)
 
@@ -146,7 +143,7 @@
     test(port > 0)
 
     udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
-    test(udp.port == 12010)
+    test(udp.port == port)
     test(udp.host == defaultHost)
 
     print("ok")
@@ -161,7 +158,7 @@
     tcpinfo = getTCPConnectionInfo(info)
     test(not info.incoming)
     test(len(info.adapterName) == 0)
-    test(tcpinfo.remotePort == 12010)
+    test(tcpinfo.remotePort == port)
     if defaultHost == '127.0.0.1':
         test(tcpinfo.remoteAddress == defaultHost)
         test(tcpinfo.localAddress == defaultHost)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/info/Client.py zeroc-ice-3.7.2/python/test/Ice/info/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/info/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/info/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,15 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/info/Server.py zeroc-ice-3.7.2/python/test/Ice/info/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/info/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/info/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,23 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
+import TestI
 
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test, TestI
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
+class Server(TestHelper):
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    def run(self, args):
 
-sys.exit(not status)
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty(
+                "TestAdapter.Endpoints", "{0}:{1}".format(self.getTestEndpoint(),
+                                                          self.getTestEndpoint(protocol="udp")))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/info/Test.ice zeroc-ice-3.7.2/python/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/info/TestI.py zeroc-ice-3.7.2/python/test/Ice/info/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/info/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/info/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test
 import time
diff -Nru zeroc-ice-3.7.1/python/test/Ice/inheritance/AllTests.py zeroc-ice-3.7.2/python/test/Ice/inheritance/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/inheritance/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/inheritance/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys
 
@@ -13,10 +8,10 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
+def allTests(helper, communicator):
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    ref = "initial:default -p 12010"
+    ref = "initial:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
     print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/inheritance/Client.py zeroc-ice-3.7.2/python/test/Ice/inheritance/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/inheritance/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/inheritance/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,17 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-Ice.loadSlice('Test.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def run(args, communicator):
-    initial = AllTests.allTests(communicator)
-    initial.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
+
+    def run(self, args):
 
-sys.exit(not status)
+        with self.initialize(args=args) as communicator:
+            initial = AllTests.allTests(self, communicator)
+            initial.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/inheritance/Collocated.py zeroc-ice-3.7.2/python/test/Ice/inheritance/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/inheritance/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/inheritance/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,21 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI, AllTests
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI.InitialI(adapter)
-    adapter.add(object, Ice.stringToIdentity("initial"))
-    #adapter.activate() // Don't activate OA to ensure collocation is used.
-
-    AllTests.allTests(communicator)
+import TestI
+import AllTests
 
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Collocated(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.InitialI(adapter), Ice.stringToIdentity("initial"))
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/inheritance/Server.py zeroc-ice-3.7.2/python/test/Ice/inheritance/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/inheritance/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/inheritance/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,21 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI.InitialI(adapter)
-    adapter.add(object, Ice.stringToIdentity("initial"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Server(TestHelper):
+
+    def run(self, args):
 
-sys.exit(not status)
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.InitialI(adapter), Ice.stringToIdentity("initial"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/python/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/inheritance/TestI.py zeroc-ice-3.7.2/python/test/Ice/inheritance/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/inheritance/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/inheritance/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/location/AllTests.py zeroc-ice-3.7.2/python/test/Ice/location/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/location/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/location/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys
 
@@ -17,7 +12,8 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator, ref):
+def allTests(helper, communicator):
+    ref = "ServerManager:{0}".format(helper.getTestEndpoint())
     manager = Test.ServerManagerPrx.checkedCast(communicator.stringToProxy(ref))
     locator = communicator.getDefaultLocator()
     test(manager)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/location/Client.py zeroc-ice-3.7.2/python/test/Ice/location/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/location/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/location/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,40 +1,17 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test, AllTests
-
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
 
-def run(args, communicator):
-    AllTests.allTests(communicator, "ServerManager:default -p 12010")
-    return True
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
 
-try:
-    data = Ice.InitializationData()
-    data.properties = Ice.createProperties(sys.argv)
-    data.properties.setProperty("Ice.Default.Locator", "locator:default -p 12010")
-    with Ice.initialize(sys.argv, data) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Client(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Default.Locator", "locator:{0}".format(self.getTestEndpoint(properties=properties)))
+        with self.initialize(properties=properties) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/location/Server.py zeroc-ice-3.7.2/python/test/Ice/location/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/location/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/location/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Test
 
+
 class ServerLocatorRegistry(Test.TestLocatorRegistry):
     def __init__(self):
         self._adapters = {}
@@ -56,6 +46,7 @@
             raise Ice.ObjectNotFoundException()
         return self._objects[id]
 
+
 class ServerLocator(Test.TestLocator):
 
     def __init__(self, registry, registryPrx):
@@ -77,12 +68,14 @@
     def getRequestCount(self, current=None):
         return self._requestCount
 
+
 class ServerManagerI(Test.ServerManager):
-    def __init__(self, registry, initData):
+    def __init__(self, registry, initData, helper):
         self._registry = registry
         self._communicators = []
         self._initData = initData
         self._nextPort = 1
+        self._helper = helper;
         self._initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter")
         self._initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter")
         self._initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2")
@@ -97,25 +90,25 @@
         # its endpoints with the locator and create references containing
         # the adapter id instead of the endpoints.
         #
-        serverCommunicator = Ice.initialize(data=initData)
+        serverCommunicator = Ice.initialize(self._initData)
         self._communicators.append(serverCommunicator)
 
-        def getTestEndpoint():
-            self._nextPort += 1
-            return "default -p {}".format(12010 + self._nextPort)
-
         nRetry = 10
         while --nRetry > 0:
             adapter = None
             adapter2 = None
             try:
-                serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint())
-                serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint())
+                serverCommunicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                               self._helper.getTestEndpoint(num=self._nextPort))
+                self._nextPort += 1
+                serverCommunicator.getProperties().setProperty("TestAdapter2.Endpoints",
+                                                               self._helper.getTestEndpoint(num=self._nextPort))
+                self._nextPort += 1
 
                 adapter = serverCommunicator.createObjectAdapter("TestAdapter")
                 adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2")
 
-                locator = serverCommunicator.stringToProxy("locator:default -p 12010")
+                locator = serverCommunicator.stringToProxy("locator:{0}".format(self._helper.getTestEndpoint()))
                 adapter.setLocator(Ice.LocatorPrx.uncheckedCast(locator))
                 adapter2.setLocator(Ice.LocatorPrx.uncheckedCast(locator))
 
@@ -143,10 +136,12 @@
             i.destroy()
         current.adapter.getCommunicator().shutdown()
 
+
 class HelloI(Test.Hello):
     def sayHello(self, current=None):
         pass
 
+
 class TestI(Test.TestIntf):
     def __init__(self, adapter, adapter2, registry):
         self._adapter1 = adapter
@@ -170,45 +165,38 @@
         except Ice.NotRegisteredException:
             self._registry.addObject(self._adapter1.add(self._adapter2.remove(id), id))
 
-def run(args, communicator, initData):
-    #
-    # Register the server manager. The server manager creates a new
-    # 'server' (a server isn't a different process, it's just a new
-    # communicator and object adapter).
-    #
-    properties = communicator.getProperties()
-    properties.setProperty("Ice.ThreadPool.Server.Size", "2")
-    properties.setProperty("ServerManager.Endpoints", "default -p 12010")
-
-    adapter = communicator.createObjectAdapter("ServerManager")
-
-    #
-    # We also register a sample server locator which implements the
-    # locator interface, this locator is used by the clients and the
-    # 'servers' created with the server manager interface.
-    #
-    registry = ServerLocatorRegistry()
-    registry.addObject(adapter.createProxy(Ice.stringToIdentity("ServerManager")))
-    object = ServerManagerI(registry, initData)
-    adapter.add(object, Ice.stringToIdentity("ServerManager"))
-
-    registryPrx = Ice.LocatorRegistryPrx.uncheckedCast(adapter.add(registry, Ice.stringToIdentity("registry")))
-
-    locator = ServerLocator(registry, registryPrx)
-    adapter.add(locator, Ice.stringToIdentity("locator"))
-
-    adapter.activate()
-    communicator.waitForShutdown()
-
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator, initData)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+
+        initData = Ice.InitializationData()
+        initData.properties = self.createTestProperties(args)
+
+        with self.initialize(initData=initData) as communicator:
+            #
+            # Register the server manager. The server manager creates a new
+            # 'server' (a server isn't a different process, it's just a new
+            # communicator and object adapter).
+            #
+            communicator.getProperties().setProperty("Ice.ThreadPool.Server.Size", "2")
+            communicator.getProperties().setProperty("ServerManager.Endpoints", self.getTestEndpoint())
+
+            adapter = communicator.createObjectAdapter("ServerManager")
+
+            #
+            # We also register a sample server locator which implements the
+            # locator interface, this locator is used by the clients and the
+            # 'servers' created with the server manager interface.
+            #
+            registry = ServerLocatorRegistry()
+            registry.addObject(adapter.createProxy(Ice.stringToIdentity("ServerManager")))
+            adapter.add(ServerManagerI(registry, initData, self), Ice.stringToIdentity("ServerManager"))
+
+            registryPrx = Ice.LocatorRegistryPrx.uncheckedCast(adapter.add(registry, Ice.stringToIdentity("registry")))
+
+            locator = ServerLocator(registry, registryPrx)
+            adapter.add(locator, Ice.stringToIdentity("locator"))
+
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/location/Test.ice zeroc-ice-3.7.2/python/test/Ice/location/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/location/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/AllTests.py zeroc-ice-3.7.2/python/test/Ice/objects/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/objects/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, TestI, sys
 
@@ -39,7 +34,7 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
+def allTests(helper, communicator):
     communicator.getValueFactoryManager().add(MyValueFactory, '::Test::B')
     communicator.getValueFactoryManager().add(MyValueFactory, '::Test::C')
     communicator.getValueFactoryManager().add(MyValueFactory, '::Test::D')
@@ -53,7 +48,7 @@
 
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    ref = "initial:default -p 12010"
+    ref = "initial:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
     print("ok")
@@ -111,6 +106,28 @@
     test(isinstance(h, Test.H))
     print("ok")
 
+    sys.stdout.write("getting K... ")
+    sys.stdout.flush()
+    k = initial.getK()
+    test(isinstance(k.value, Test.L))
+    test(k.value.data == "l")
+    print("ok")
+
+    sys.stdout.write("testing Value as parameter... ")
+    sys.stdout.flush()
+    v1, v2 = initial.opValue(Test.L("l"))
+    test(v1.data == "l")
+    test(v2.data == "l")
+
+    v1, v2 = initial.opValueSeq([Test.L("l")])
+    test(v1[0].data == "l")
+    test(v2[0].data == "l")
+
+    v1, v2 = initial.opValueMap({"l":Test.L("l")})
+    test(v1["l"].data == "l")
+    test(v2["l"].data == "l")
+    print("ok")
+
     sys.stdout.write("getting D1... ")
     sys.stdout.flush()
     d1 = initial.getD1(Test.D1(Test.A1("a1"), Test.A1("a2"), Test.A1("a3"), Test.A1("a4")))
@@ -124,7 +141,7 @@
     sys.stdout.flush()
     try:
         initial.throwEDerived()
-        test(false)
+        test(False)
     except Test.EDerived as e:
         test(e.a1.name == "a1")
         test(e.a2.name == "a2")
@@ -269,7 +286,7 @@
     if initial.ice_getConnection():
         sys.stdout.write("testing UnexpectedObjectException... ")
         sys.stdout.flush()
-        ref = "uoet:default -p 12010"
+        ref = "uoet:{0}".format(helper.getTestEndpoint())
         base = communicator.stringToProxy(ref)
         test(base)
         uoet = Test.UnexpectedObjectExceptionTestPrx.uncheckedCast(base)
@@ -298,4 +315,24 @@
     test(communicator.getValueFactoryManager().find("TestOF") != None)
     print("ok")
 
+    sys.stdout.write("testing class containing complex dictionary... ")
+    sys.stdout.flush()
+    m = Test.M()
+    m.v = {}
+    k1 = Test.StructKey(1, "1")
+    m.v[k1] = Test.L("one")
+    k2 = Test.StructKey(2, "2")
+    m.v[k2] = Test.L("two")
+    m1, m2 = initial.opM(m)
+    test(len(m1.v) == 2)
+    test(len(m2.v) == 2)
+
+    test(m1.v[k1].data == "one")
+    test(m2.v[k1].data == "one")
+
+    test(m1.v[k2].data == "two")
+    test(m2.v[k2].data == "two")
+
+    print("ok")
+
     return initial
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/ClientPrivate.ice zeroc-ice-3.7.2/python/test/Ice/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/python/test/Ice/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/Client.py zeroc-ice-3.7.2/python/test/Ice/objects/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/objects/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,30 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-Ice.loadSlice('Test.ice')
-Ice.loadSlice('ClientPrivate.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice ClientPrivate.ice")
 import AllTests
 
-def run(args, communicator):
-    initial = AllTests.allTests(communicator)
-    initial.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            initial = AllTests.allTests(self, communicator)
+            initial.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/Collocated.py zeroc-ice-3.7.2/python/test/Ice/objects/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/objects/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,27 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice ClientPrivate.ice")
 import Ice
-Ice.loadSlice('Test.ice')
-Ice.loadSlice('ClientPrivate.ice')
-import Test, TestI, AllTests
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    initial = TestI.InitialI(adapter)
-    adapter.add(initial, Ice.stringToIdentity("initial"))
-    uoet = TestI.UnexpectedObjectExceptionTestI()
-    adapter.add(uoet, Ice.stringToIdentity("uoet"))
-    #adapter.activate() // Don't activate OA to ensure collocation is used.
-
-    AllTests.allTests(communicator)
-
-    # We must call shutdown even in the collocated case for cyclic dependency cleanup
-    initial.shutdown()
+import TestI
+import AllTests
 
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Collocated(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            initial = TestI.InitialI(adapter)
+            adapter.add(initial, Ice.stringToIdentity("initial"))
+            adapter.add(TestI.UnexpectedObjectExceptionTestI(), Ice.stringToIdentity("uoet"))
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
+            AllTests.allTests(self, communicator)
+            # We must call shutdown even in the collocated case for cyclic dependency cleanup
+            initial.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/ServerPrivate.ice zeroc-ice-3.7.2/python/test/Ice/objects/ServerPrivate.ice
--- zeroc-ice-3.7.1/python/test/Ice/objects/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/Server.py zeroc-ice-3.7.2/python/test/Ice/objects/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/objects/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,13 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice ServerPrivate.ice")
+import TestI
 import Ice
-Ice.loadSlice('Test.ice')
-Ice.loadSlice('ServerPrivate.ice')
-import Test, TestI
+
 
 def MyValueFactory(type):
     if type == '::Test::I':
@@ -22,31 +16,23 @@
         return TestI.JI()
     elif type == '::Test::H':
         return TestI.HI()
-    assert(False) # Should never be reached
+    assert(False)  # Should never be reached
+
 
-def run(args, communicator):
-    communicator.getValueFactoryManager().add(MyValueFactory, '::Test::I')
-    communicator.getValueFactoryManager().add(MyValueFactory, '::Test::J')
-    communicator.getValueFactoryManager().add(MyValueFactory, '::Test::H')
-
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    initial = TestI.InitialI(adapter)
-    adapter.add(initial, Ice.stringToIdentity("initial"))
-    uoet = TestI.UnexpectedObjectExceptionTestI()
-    adapter.add(uoet, Ice.stringToIdentity("uoet"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Server(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getValueFactoryManager().add(MyValueFactory, '::Test::I')
+            communicator.getValueFactoryManager().add(MyValueFactory, '::Test::J')
+            communicator.getValueFactoryManager().add(MyValueFactory, '::Test::H')
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            initial = TestI.InitialI(adapter)
+            adapter.add(initial, Ice.stringToIdentity("initial"))
+            uoet = TestI.UnexpectedObjectExceptionTestI()
+            adapter.add(uoet, Ice.stringToIdentity("uoet"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/Test.ice zeroc-ice-3.7.2/python/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -172,6 +167,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 interface Initial
 {
     void shutdown();
@@ -190,9 +211,15 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -209,6 +236,8 @@
 
     void throwInnerEx() throws Inner::Ex;
     void throwInnerSubEx() throws Inner::Sub::Ex;
+
+    M opM(M v1, out M v2);
 }
 
 }
diff -Nru zeroc-ice-3.7.1/python/test/Ice/objects/TestI.py zeroc-ice-3.7.2/python/test/Ice/objects/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/objects/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/objects/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test
 
@@ -153,6 +148,18 @@
     def getH(self, current=None):
         return HI()
 
+    def getK(self, current=None):
+        return Test.K(Test.L("l"))
+
+    def opValue(self, v1, current=None):
+        return v1, v1
+
+    def opValueSeq(self, v1, current=None):
+        return v1, v1
+
+    def opValueMap(self, v1, current=None):
+        return v1, v1
+
     def getD1(self, d1, current=None):
         return d1
 
@@ -183,6 +190,9 @@
     def throwInnerSubEx(self, current=None):
         raise Test.Inner.Sub.Ex("Inner::Sub::Ex")
 
+    def opM(self, m, current=None):
+        return (m, m)
+
 class UnexpectedObjectExceptionTestI(Test.UnexpectedObjectExceptionTest):
     def op(self, current=None):
         return Test.AlsoEmpty()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/AllTests.py zeroc-ice-3.7.2/python/test/Ice/operations/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, Twoways, TwowaysFuture, TwowaysAMI, Oneways, OnewaysFuture, OnewaysAMI, BatchOneways, sys
 import BatchOnewaysAMI, BatchOnewaysFuture
@@ -14,42 +9,42 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
-    ref = "test:default -p 12010"
+def allTests(helper, communicator):
+    ref = "test:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     cl = Test.MyClassPrx.checkedCast(base)
     derived = Test.MyDerivedClassPrx.checkedCast(cl)
 
     sys.stdout.write("testing twoway operations... ")
     sys.stdout.flush()
-    Twoways.twoways(communicator, cl)
-    Twoways.twoways(communicator, derived)
+    Twoways.twoways(helper, cl)
+    Twoways.twoways(helper, derived)
     derived.opDerived()
     print("ok")
 
     sys.stdout.write("testing oneway operations... ")
     sys.stdout.flush()
-    Oneways.oneways(communicator, cl)
+    Oneways.oneways(helper, cl)
     print("ok")
 
     sys.stdout.write("testing twoway operations with futures... ")
     sys.stdout.flush()
-    TwowaysFuture.twowaysFuture(communicator, cl)
+    TwowaysFuture.twowaysFuture(helper, cl)
     print("ok")
 
     sys.stdout.write("testing twoway operations with AMI... ")
     sys.stdout.flush()
-    TwowaysAMI.twowaysAMI(communicator, cl)
+    TwowaysAMI.twowaysAMI(helper, cl)
     print("ok")
 
     sys.stdout.write("testing oneway operations with futures... ")
     sys.stdout.flush()
-    OnewaysFuture.onewaysFuture(communicator, cl)
+    OnewaysFuture.onewaysFuture(helper, cl)
     print("ok")
 
     sys.stdout.write("testing oneway operations with AMI... ")
     sys.stdout.flush()
-    OnewaysAMI.onewaysAMI(communicator, cl)
+    OnewaysAMI.onewaysAMI(helper, cl)
     print("ok")
 
     sys.stdout.write("testing batch oneway operations...  ")
@@ -70,4 +65,11 @@
     BatchOnewaysAMI.batchOneways(derived)
     print("ok")
 
-    return cl
+    sys.stdout.write("testing server shutdown... ")
+    sys.stdout.flush()
+    cl.shutdown()
+    try:
+        cl.ice_timeout(100).ice_ping()  # Use timeout to speed up testing on Windows
+        test(False)
+    except Ice.LocalException:
+        print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/BatchOnewaysAMI.py zeroc-ice-3.7.2/python/test/Ice/operations/BatchOnewaysAMI.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/BatchOnewaysAMI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/BatchOnewaysAMI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, array, sys, threading, time
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/BatchOnewaysFuture.py zeroc-ice-3.7.2/python/test/Ice/operations/BatchOnewaysFuture.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/BatchOnewaysFuture.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/BatchOnewaysFuture.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, array, sys, threading, time
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/BatchOneways.py zeroc-ice-3.7.2/python/test/Ice/operations/BatchOneways.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/BatchOneways.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/BatchOneways.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, array, sys, time
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/Client.py zeroc-ice-3.7.2/python/test/Ice/operations/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,61 +1,23 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-import Ice
 
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    myClass = AllTests.allTests(communicator)
-
-    sys.stdout.write("testing server shutdown... ")
-    sys.stdout.flush()
-    myClass.shutdown()
-    try:
-        myClass.ice_timeout(100).ice_ping(); # Use timeout to speed up testing on Windows
-        test(False)
-    except Ice.LocalException:
-        print("ok")
-
-    return True
-
-try:
-    #
-    # In this test, we need at least two threads in the
-    # client side thread pool for nested AMI.
-    #
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty('Ice.ThreadPool.Client.Size', '2')
-    initData.properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
-    initData.properties.setProperty("Ice.BatchAutoFlushSize", "100")
 
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-        # Test multiple destroy calls
-        communicator.destroy()
-        communicator.destroy()
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty('Ice.ThreadPool.Client.Size', '2')
+        properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
+        properties.setProperty("Ice.BatchAutoFlushSize", "100")
+
+        with self.initialize(properties=properties) as communicator:
+            AllTests.allTests(self, communicator)
+            # Test multiple destroy calls
+            communicator.destroy()
+            communicator.destroy()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/Collocated.py zeroc-ice-3.7.2/python/test/Ice/operations/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,25 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI, AllTests
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    prx = adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
-    #adapter.activate() // Don't activate OA to ensure collocation is used.
-
-    if prx.ice_getConnection():
-        raise RuntimeError("collocation doesn't work")
-
-    cl = AllTests.allTests(communicator)
-
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
+import TestI
+import AllTests
 
-    initData.properties.setProperty("Ice.BatchAutoFlushSize", "100")
 
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Collocated(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.BatchAutoFlushSize", "100")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            prx = adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
+            if prx.ice_getConnection():
+                raise RuntimeError("collocation doesn't work")
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/OnewaysAMI.py zeroc-ice-3.7.2/python/test/Ice/operations/OnewaysAMI.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/OnewaysAMI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/OnewaysAMI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, threading
 
@@ -36,8 +31,8 @@
     def noException(self, ex):
         test(False)
 
-def onewaysAMI(communicator, proxy):
-
+def onewaysAMI(helper, proxy):
+    communicator = helper.communicator()
     p = Test.MyClassPrx.uncheckedCast(proxy.ice_oneway())
 
     cb = Callback()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/OnewaysFuture.py zeroc-ice-3.7.2/python/test/Ice/operations/OnewaysFuture.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/OnewaysFuture.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/OnewaysFuture.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test
 
@@ -13,8 +8,8 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def onewaysFuture(communicator, proxy):
-
+def onewaysFuture(helper, proxy):
+    communicator = helper.communicator()
     p = Test.MyClassPrx.uncheckedCast(proxy.ice_oneway())
 
     f = p.ice_pingAsync()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/Oneways.py zeroc-ice-3.7.2/python/test/Ice/operations/Oneways.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/Oneways.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/Oneways.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, math, Test, array
 
@@ -13,8 +8,8 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def oneways(communicator, p):
-
+def oneways(helper, p):
+    communicator = helper.communicator()
     p = Test.MyClassPrx.uncheckedCast(p.ice_oneway())
 
     #
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/ServerAMD.py zeroc-ice-3.7.2/python/test/Ice/operations/ServerAMD.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/ServerAMD.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/ServerAMD.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,39 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, threading, time
 
+import sys
 #
-# We want to test coroutines but older versions of Python cannot load a source file that uses the
-# async/await keywords, so we have two versions of MyDerivedClassI.
+# We want to test coroutines but older versions of Python cannot
+# load a source file that uses the async/await keywords, so we
+# have two versions of MyDerivedClassI.
 #
-if sys.version_info >= (3,5):
+if sys.version_info >= (3, 5):
     from TestAMDCoroI import MyDerivedClassI
 else:
     from TestAMDI import MyDerivedClassI
 
+
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+
+class ServerAMD(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        #
+        # Its possible to have batch oneway requests dispatched after the
+        # adapter is deactivated due to thread scheduling so we supress
+        # this warning.
+        #
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/Server.py zeroc-ice-3.7.2/python/test/Ice/operations/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,44 +1,28 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
+import TestI
 
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
+class Server(TestHelper):
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    #
-    # Its possible to have batch oneway requests dispatched after the
-    # adapter is deactivated due to thread scheduling so we supress
-    # this warning.
-    #
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        #
+        # Its possible to have batch oneway requests dispatched after the
+        # adapter is deactivated due to thread scheduling so we supress
+        # this warning.
+        #
+        properties.setProperty("Ice.Warn.Dispatch", "0")
 
-sys.exit(not status)
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/TestAMDCoroI.py zeroc-ice-3.7.2/python/test/Ice/operations/TestAMDCoroI.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/TestAMDCoroI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/TestAMDCoroI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, traceback, threading, time, concurrent.futures
 import Ice
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/TestAMDI.py zeroc-ice-3.7.2/python/test/Ice/operations/TestAMDI.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/TestAMDI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/TestAMDI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, traceback, threading, time
 import Ice
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/Test.ice zeroc-ice-3.7.2/python/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/TestI.py zeroc-ice-3.7.2/python/test/Ice/operations/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, threading
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/TwowaysAMI.py zeroc-ice-3.7.2/python/test/Ice/operations/TwowaysAMI.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/TwowaysAMI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/TwowaysAMI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, math, sys, threading
 
@@ -751,7 +746,8 @@
     def exCB(self, ex):
         test(False)
 
-def twowaysAMI(communicator, p):
+def twowaysAMI(helper, p):
+    communicator = helper.communicator()
     cb = Callback()
     p.begin_ice_ping(cb.ping, cb.exCB)
     cb.check()
@@ -1128,7 +1124,7 @@
 
             ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'}
 
-            p3 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010"))
+            p3 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:{0}".format(helper.getTestEndpoint())))
 
             ic.getImplicitContext().setContext(ctx)
             test(ic.getImplicitContext().getContext() == ctx)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/TwowaysFuture.py zeroc-ice-3.7.2/python/test/Ice/operations/TwowaysFuture.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/TwowaysFuture.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/TwowaysFuture.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, math, sys, threading
 
@@ -898,7 +893,8 @@
     def opDerived(self, f):
         self.called()
 
-def twowaysFuture(communicator, p):
+def twowaysFuture(helper, p):
+    communicator = helper.communicator()
     f = p.ice_pingAsync()
     test(f.result() is None)
 
@@ -1271,7 +1267,7 @@
 
             ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'}
 
-            p3 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010"))
+            p3 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:{0}".format(helper.getTestEndpoint())))
 
             ic.getImplicitContext().setContext(ctx)
             test(ic.getImplicitContext().getContext() == ctx)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/operations/Twoways.py zeroc-ice-3.7.2/python/test/Ice/operations/Twoways.py
--- zeroc-ice-3.7.1/python/test/Ice/operations/Twoways.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/operations/Twoways.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, math, Test, array, sys
 from sys import version_info
@@ -14,8 +9,9 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def twoways(communicator, p):
+def twoways(helper, p):
 
+    communicator = helper.communicator()
     literals = p.opStringLiterals()
 
     test(Test.s0 == "\\")
@@ -1341,7 +1337,7 @@
 
             ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'}
 
-            p1 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy('test:default -p 12010'))
+            p1 = Test.MyClassPrx.uncheckedCast(ic.stringToProxy('test:{0}'.format(helper.getTestEndpoint())))
 
             ic.getImplicitContext().setContext(ctx)
             test(ic.getImplicitContext().getContext() == ctx)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/optional/AllTests.py zeroc-ice-3.7.2/python/test/Ice/optional/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/optional/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/optional/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys
 
@@ -13,10 +8,10 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
+def allTests(helper, communicator):
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    ref = "initial:default -p 12010"
+    ref = "initial:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
     print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/optional/ClientPrivate.ice zeroc-ice-3.7.2/python/test/Ice/optional/ClientPrivate.ice
--- zeroc-ice-3.7.1/python/test/Ice/optional/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/optional/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/optional/Client.py zeroc-ice-3.7.2/python/test/Ice/optional/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/optional/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/optional/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,29 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-Ice.loadSlice('--all -I. ClientPrivate.ice')
+from TestHelper import TestHelper
+TestHelper.loadSlice("--all -I. ClientPrivate.ice")
 import AllTests
 
-def run(args, communicator):
-    initial = AllTests.allTests(communicator)
-    initial.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            initial = AllTests.allTests(self, communicator)
+            initial.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/optional/ServerAMD.py zeroc-ice-3.7.2/python/test/Ice/optional/ServerAMD.py
--- zeroc-ice-3.7.1/python/test/Ice/optional/ServerAMD.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/optional/ServerAMD.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-Ice.loadSlice('Test.ice')
 import Test
 
+
 class InitialI(Test.Initial):
 
     def shutdown(self, current=None):
@@ -192,21 +187,15 @@
     def supportsNullOptional(self, current=None):
         return Ice.Future.completed(True)
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    initial = InitialI()
-    adapter.add(initial, Ice.stringToIdentity("initial"))
-    adapter.activate()
-
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class ServerAMD(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            initial = InitialI()
+            adapter.add(initial, Ice.stringToIdentity("initial"))
+            adapter.activate()
+
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/optional/Server.py zeroc-ice-3.7.2/python/test/Ice/optional/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/optional/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/optional/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-Ice.loadSlice('Test.ice')
 import Test
 
+
 class InitialI(Test.Initial):
 
     def shutdown(self, current=None):
@@ -186,21 +181,15 @@
     def supportsNullOptional(self, current=None):
         return True
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    initial = InitialI()
-    adapter.add(initial, Ice.stringToIdentity("initial"))
-    adapter.activate()
-
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            initial = InitialI()
+            adapter.add(initial, Ice.stringToIdentity("initial"))
+            adapter.activate()
+
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/optional/Test.ice zeroc-ice-3.7.2/python/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/packagemd/AllTests.py zeroc-ice-3.7.2/python/test/Ice/packagemd/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/packagemd/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/packagemd/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, Test1, testpkg, modpkg, sys, threading, time, traceback
 
@@ -13,10 +8,11 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
+def allTests(helper, communicator):
+
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    ref = "initial:default -p 12010"
+    ref = "initial:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
     print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/packagemd/Client.py zeroc-ice-3.7.2/python/test/Ice/packagemd/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/packagemd/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/packagemd/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,38 +1,18 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-import Ice
 
-import Ice
-
-Ice.loadSlice("--all -I. Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("--all -I. Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    initial = AllTests.allTests(communicator)
-    initial.shutdown()
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty('Ice.Warn.Dispatch', '0')
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty('Ice.Warn.Dispatch', '0')
+        with self.initialize(properties=properties) as communicator:
+            initial = AllTests.allTests(self, communicator)
+            initial.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/packagemd/NoPackage.ice zeroc-ice-3.7.2/python/test/Ice/packagemd/NoPackage.ice
--- zeroc-ice-3.7.1/python/test/Ice/packagemd/NoPackage.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/packagemd/NoPackage.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/packagemd/Package.ice zeroc-ice-3.7.2/python/test/Ice/packagemd/Package.ice
--- zeroc-ice-3.7.1/python/test/Ice/packagemd/Package.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/packagemd/Package.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/packagemd/Server.py zeroc-ice-3.7.2/python/test/Ice/packagemd/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/packagemd/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/packagemd/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice('--all -I. Test.ice')
+import Test
+import Test1
+import testpkg
+import modpkg
 import Ice
-Ice.loadSlice('--all -I. Test.ice')
-import Test, Test1, testpkg, modpkg
+
 
 class InitialI(Test.Initial):
 
@@ -67,21 +65,14 @@
     def shutdown(self, current):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    initial = InitialI()
-    adapter.add(initial, Ice.stringToIdentity("initial"))
-    adapter.activate()
-
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(InitialI(), Ice.stringToIdentity("initial"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/packagemd/Test.ice zeroc-ice-3.7.2/python/test/Ice/packagemd/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/packagemd/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/packagemd/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/properties/Client.py zeroc-ice-3.7.2/python/test/Ice/properties/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/properties/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/properties/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,20 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
+import sys
 import Ice
+from TestHelper import TestHelper
+
 
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-class Client(Ice.Application):
+
+class App(Ice.Application):
     def run(self, args):
         properties = self.communicator().getProperties()
         test(properties.getProperty("Ice.Trace.Network") == "1")
@@ -25,58 +23,62 @@
         test(properties.getProperty("Ice.ProgramName") == "PropertiesClient")
         test(self.appName() == properties.getProperty("Ice.ProgramName"))
 
-sys.stdout.write("testing load properties from UTF-8 path... ")
-sys.stdout.flush()
-properties = Ice.createProperties()
-properties.load("./config/中国_client.config")
-test(properties.getProperty("Ice.Trace.Network") == "1")
-test(properties.getProperty("Ice.Trace.Protocol") == "1")
-test(properties.getProperty("Config.Path") == "./config/中国_client.config")
-test(properties.getProperty("Ice.ProgramName") == "PropertiesClient")
-print("ok")
-sys.stdout.write("testing load properties from UTF-8 path using Ice::Application... ")
-sys.stdout.flush()
-c  = Client()
-c.main(sys.argv, "./config/中国_client.config")
-print("ok")
-
-sys.stdout.write("testing using Ice.Config with multiple config files... ")
-sys.stdout.flush()
-properties = Ice.createProperties(["--Ice.Config=config/config.1, config/config.2, config/config.3"])
-test(properties.getProperty("Config1") == "Config1")
-test(properties.getProperty("Config2") == "Config2")
-test(properties.getProperty("Config3") == "Config3")
-print("ok")
-
-sys.stdout.write("testing configuration file escapes... ")
-sys.stdout.flush()
-properties = Ice.createProperties(["--Ice.Config=config/escapes.cfg"])
-
-props = { "Foo\tBar":"3",
-          "Foo\\tBar":"4",
-          "Escape\\ Space":"2",
-          "Prop1":"1",
-          "Prop2":"2",
-          "Prop3":"3",
-          "My Prop1":"1",
-          "My Prop2":"2",
-          "My.Prop1":"a property",
-          "My.Prop2":"a     property",
-          "My.Prop3":"  a     property  ",
-          "My.Prop4":"  a     property  ",
-          "My.Prop5":"a \\ property",
-          "foo=bar":"1",
-          "foo#bar":"2",
-          "foo bar":"3",
-          "A":"1",
-          "B":"2 3 4",
-          "C":"5=#6",
-          "AServer":"\\\\server\\dir",
-          "BServer":"\\server\\dir"};
 
-for k in props.keys():
-    test(properties.getProperty(k) == props[k])
+class Client(TestHelper):
 
-print("ok")
+    def run(sef, args):
+        sys.stdout.write("testing load properties from UTF-8 path... ")
+        sys.stdout.flush()
+        properties = Ice.createProperties()
+        properties.load("./config/中国_client.config")
+        test(properties.getProperty("Ice.Trace.Network") == "1")
+        test(properties.getProperty("Ice.Trace.Protocol") == "1")
+        test(properties.getProperty("Config.Path") == "./config/中国_client.config")
+        test(properties.getProperty("Ice.ProgramName") == "PropertiesClient")
+        print("ok")
 
-sys.exit(0)
+        sys.stdout.write("testing load properties from UTF-8 path using Ice::Application... ")
+        sys.stdout.flush()
+        app = App()
+        app.main(args, "./config/中国_client.config")
+        print("ok")
+
+        sys.stdout.write("testing using Ice.Config with multiple config files... ")
+        sys.stdout.flush()
+        properties = Ice.createProperties(["--Ice.Config=config/config.1, config/config.2, config/config.3"])
+        test(properties.getProperty("Config1") == "Config1")
+        test(properties.getProperty("Config2") == "Config2")
+        test(properties.getProperty("Config3") == "Config3")
+        print("ok")
+
+        sys.stdout.write("testing configuration file escapes... ")
+        sys.stdout.flush()
+        properties = Ice.createProperties(["--Ice.Config=config/escapes.cfg"])
+
+        props = {
+            "Foo\tBar": "3",
+            "Foo\\tBar": "4",
+            "Escape\\ Space": "2",
+            "Prop1": "1",
+            "Prop2": "2",
+            "Prop3": "3",
+            "My Prop1": "1",
+            "My Prop2": "2",
+            "My.Prop1": "a property",
+            "My.Prop2": "a     property",
+            "My.Prop3": "  a     property  ",
+            "My.Prop4": "  a     property  ",
+            "My.Prop5": "a \\ property",
+            "foo=bar": "1",
+            "foo#bar": "2",
+            "foo bar": "3",
+            "A": "1",
+            "B": "2 3 4",
+            "C": "5=#6",
+            "AServer": "\\\\server\\dir",
+            "BServer": "\\server\\dir"
+        }
+
+        for k in props.keys():
+            test(properties.getProperty(k) == props[k])
+        print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/proxy/AllTests.py zeroc-ice-3.7.2/python/test/Ice/proxy/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/proxy/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/proxy/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, threading
 
@@ -13,7 +8,7 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator, collocated):
+def allTests(helper, communicator, collocated):
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
 
@@ -25,7 +20,7 @@
     p = communicator.propertyToProxy('bogus')
     test(p == None)
 
-    ref = "test:default -p 12010"
+    ref = "test:{0}".format(helper.getTestEndpoint())
     base = communicator.stringToProxy(ref)
     test(base)
 
@@ -199,7 +194,7 @@
     sys.stdout.flush()
     prop = communicator.getProperties()
     propertyPrefix = "Foo.Proxy"
-    prop.setProperty(propertyPrefix, "test:default -p 12010")
+    prop.setProperty(propertyPrefix, "test:{0}".format(helper.getTestEndpoint()))
     b1 = communicator.propertyToProxy(propertyPrefix)
     test(b1.ice_getIdentity().name == "test" and len(b1.ice_getIdentity().category) == 0 and \
          len(b1.ice_getAdapterId()) == 0 and len(b1.ice_getFacet()) == 0)
@@ -241,7 +236,7 @@
     #test(b1.ice_getLocatorCacheTimeout() == 60)
     #prop.setProperty("Ice.Default.LocatorCacheTimeout", "")
 
-    prop.setProperty(propertyPrefix, "test:default -p 12010")
+    prop.setProperty(propertyPrefix, "test:{0}".format(helper.getTestEndpoint()))
 
     property = propertyPrefix + ".Router"
     test(not b1.ice_getRouter())
@@ -694,16 +689,16 @@
 
     sys.stdout.write("testing encoding versioning... ")
     sys.stdout.flush()
-    ref20 = "test -e 2.0:default -p 12010";
+    ref20 = "test -e 2.0:{0}".format(helper.getTestEndpoint())
     cl20 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref20));
     try:
-        cl20.ice_ping();
-        test(false);
+        cl20.ice_ping()
+        test(False)
     except Ice.UnsupportedEncodingException:
         # Server 2.0 endpoint doesn't support 1.1 version.
         pass
 
-    ref10 = "test -e 1.0:default -p 12010"
+    ref10 = "test -e 1.0:{0}".format(helper.getTestEndpoint())
     cl10 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref10))
     cl10.ice_ping()
     cl10.ice_encodingVersion(Ice.Encoding_1_0).ice_ping()
@@ -711,7 +706,7 @@
 
     # 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
     # call will use the 1.1 encoding
-    ref13 = "test -e 1.3:default -p 12010"
+    ref13 = "test -e 1.3:{0}".format(helper.getTestEndpoint())
     cl13 = Test.MyClassPrx.uncheckedCast(communicator.stringToProxy(ref13))
     cl13.ice_ping()
 
@@ -810,8 +805,6 @@
         # Working?
         ssl = communicator.getProperties().getProperty("Ice.Default.Protocol") == "ssl"
         tcp = communicator.getProperties().getProperty("Ice.Default.Protocol") == "tcp"
-        if tcp:
-            p1.ice_encodingVersion(Ice.Encoding_1_0).ice_ping()
 
         # Two legal TCP endpoints expressed as opaque endpoints
         p1 = communicator.stringToProxy("test -e 1.0:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAA==")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/proxy/Client.py zeroc-ice-3.7.2/python/test/Ice/proxy/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/proxy/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/proxy/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
 
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    myClass = AllTests.allTests(communicator, False)
-    myClass.shutdown()
-
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            myClass = AllTests.allTests(self, communicator, False)
+            myClass.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/proxy/Collocated.py zeroc-ice-3.7.2/python/test/Ice/proxy/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/proxy/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/proxy/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,22 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test, TestI, AllTests
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
-    #adapter.activate() // Don't activate OA to ensure collocation is used.
+import TestI
+import AllTests
 
-    AllTests.allTests(communicator, True)
 
-    return True
+class Collocated(TestHelper):
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    def run(self, args):
 
-sys.exit(not status)
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
+            AllTests.allTests(self, communicator, True)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/proxy/ServerAMD.py zeroc-ice-3.7.2/python/test/Ice/proxy/ServerAMD.py
--- zeroc-ice-3.7.1/python/test/Ice/proxy/ServerAMD.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/proxy/ServerAMD.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,13 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, time
 
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Test
+import TestI
 
 class MyDerivedClassI(Test.MyDerivedClass):
     def __init__(self):
@@ -36,23 +26,15 @@
         self.ctx = current.ctx
         return Test.MyDerivedClass.ice_isA(self, s, current)
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Connections", "0")
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0")
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class ServerAMD(TestHelper):
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Connections", "0")
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(MyDerivedClassI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/proxy/Server.py zeroc-ice-3.7.2/python/test/Ice/proxy/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/proxy/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/proxy/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,25 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
 
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test, TestI
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-
-    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0")
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
-
-sys.exit(not status)
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import Test
+import TestI
+
+class Server(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        properties.setProperty("Ice.Warn.Connections", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+
+            adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/python/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/proxy/TestI.py zeroc-ice-3.7.2/python/test/Ice/proxy/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/proxy/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/proxy/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test
 import time
diff -Nru zeroc-ice-3.7.1/python/test/Ice/scope/AllTests.py zeroc-ice-3.7.2/python/test/Ice/scope/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/scope/AllTests.py	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/scope/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,173 @@
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+import sys, string, re, traceback, Ice, Test, Inner
+
+
+def test(b):
+    if not b:
+        raise RuntimeError('test assertion failed')
+
+
+def allTests(helper, communicator):
+    sys.stdout.write("test same Slice type name in different scopes... ")
+    sys.stdout.flush()
+    i1 = Test.IPrx.checkedCast(communicator.stringToProxy("i1:{0}".format(helper.getTestEndpoint())))
+
+    s1 = Test.S(0)
+
+    s2, s3 = i1.opS(s1)
+
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+
+    sseq2, sseq3 = i1.opSSeq(sseq1)
+
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {"a": s1}
+    smap2, smap3 = i1.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test.C(s1)
+
+    c2, c3 = i1.opC(c1)
+
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i1.opCSeq(cseq1)
+
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {"a": c1}
+    cmap2, cmap3 = i1.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i2 = Test.Inner.Inner2.IPrx.checkedCast(communicator.stringToProxy("i2:{0}".format(helper.getTestEndpoint())))
+
+    s1 = Test.Inner.Inner2.S(0)
+
+    s2, s3 = i2.opS(s1)
+
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+
+    sseq2, sseq3 = i2.opSSeq(sseq1)
+
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {"a": s1}
+    smap2, smap3 = i2.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test.Inner.Inner2.C(s1)
+
+    c2, c3 = i2.opC(c1)
+
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i2.opCSeq(cseq1)
+
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {"a": c1}
+    cmap2, cmap3 = i2.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i3 = Test.Inner.IPrx.checkedCast(communicator.stringToProxy("i3:{0}".format(helper.getTestEndpoint())))
+
+    s1 = Test.Inner.Inner2.S(0)
+
+    s2, s3 = i3.opS(s1)
+
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+
+    sseq2, sseq3 = i3.opSSeq(sseq1)
+
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {"a": s1}
+    smap2, smap3 = i3.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test.Inner.Inner2.C(s1)
+
+    c2, c3 = i3.opC(c1)
+
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i3.opCSeq(cseq1)
+
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {"a": c1}
+    cmap2, cmap3 = i3.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i4 = Inner.Test.Inner2.IPrx.checkedCast(communicator.stringToProxy("i4:{0}".format(helper.getTestEndpoint())))
+
+    s1 = Test.S(0)
+
+    s2, s3 = i4.opS(s1)
+
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+
+    sseq2, sseq3 = i4.opSSeq(sseq1)
+
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {"a": s1}
+    smap2, smap3 = i4.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test.C(s1)
+
+    c2, c3 = i4.opC(c1)
+
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i4.opCSeq(cseq1)
+
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {"a": c1}
+    cmap2, cmap3 = i4.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i1.shutdown()
+    print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/scope/Client.py zeroc-ice-3.7.2/python/test/Ice/scope/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/scope/Client.py	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/scope/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
+
+
+class Client(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/scope/Server.py zeroc-ice-3.7.2/python/test/Ice/scope/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/scope/Server.py	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/scope/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,120 @@
+#!/usr/bin/env python
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
+import Test
+import Inner
+import Ice
+
+
+class I1(Test.I):
+
+    def opS(self, s1, current=None):
+        return (s1, s1)
+
+    def opSSeq(self, sseq1, current=None):
+        return (sseq1, sseq1)
+
+    def opSMap(self, smap1, current=None):
+        return (smap1, smap1)
+
+    def opC(self, c1, current=None):
+        return (c1, c1)
+
+    def opCSeq(self, cseq1, current=None):
+        return (cseq1, cseq1)
+
+    def opCMap(self, cmap1, current=None):
+        return (cmap1, cmap1)
+
+    def shutdown(self, current=None):
+        current.adapter.getCommunicator().shutdown()
+
+
+class I2(Test.Inner.Inner2.I):
+
+    def opS(self, s1, current=None):
+        return (s1, s1)
+
+    def opSSeq(self, sseq1, current=None):
+        return (sseq1, sseq1)
+
+    def opSMap(self, smap1, current=None):
+        return (smap1, smap1)
+
+    def opC(self, c1, current=None):
+        return (c1, c1)
+
+    def opCSeq(self, cseq1, current=None):
+        return (cseq1, cseq1)
+
+    def opCMap(self, cmap1, current=None):
+        return (cmap1, cmap1)
+
+    def shutdown(self, current=None):
+        current.adapter.getCommunicator().shutdown()
+
+
+class I3(Test.Inner.I):
+
+    def opS(self, s1, current=None):
+        return (s1, s1)
+
+    def opSSeq(self, sseq1, current=None):
+        return (sseq1, sseq1)
+
+    def opSMap(self, smap1, current=None):
+        return (smap1, smap1)
+
+    def opC(self, c1, current=None):
+        return (c1, c1)
+
+    def opCSeq(self, cseq1, current=None):
+        return (cseq1, cseq1)
+
+    def opCMap(self, cmap1, current=None):
+        return (cmap1, cmap1)
+
+    def shutdown(self, current=None):
+        current.adapter.getCommunicator().shutdown()
+
+
+class I4(Inner.Test.Inner2.I):
+
+    def opS(self, s1, current=None):
+        return (s1, s1)
+
+    def opSSeq(self, sseq1, current=None):
+        return (sseq1, sseq1)
+
+    def opSMap(self, smap1, current=None):
+        return (smap1, smap1)
+
+    def opC(self, c1, current=None):
+        return (c1, c1)
+
+    def opCSeq(self, cseq1, current=None):
+        return (cseq1, cseq1)
+
+    def opCMap(self, cmap1, current=None):
+        return (cmap1, cmap1)
+
+    def shutdown(self, current=None):
+        current.adapter.getCommunicator().shutdown()
+
+
+class Server(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(I1(), Ice.stringToIdentity("i1"))
+            adapter.add(I2(), Ice.stringToIdentity("i2"))
+            adapter.add(I3(), Ice.stringToIdentity("i3"))
+            adapter.add(I4(), Ice.stringToIdentity("i4"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/scope/Test.ice zeroc-ice-3.7.2/python/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,136 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq s1, out CSeq s2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/AllTests.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, Ice, Test
 
@@ -13,7 +8,7 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def testExceptions(obj, collocated):
+def testExceptions(obj):
 
     try:
         obj.requestFailedException()
@@ -64,10 +59,7 @@
         obj.localException()
         test(False)
     except Ice.UnknownLocalException as ex:
-        test(not collocated)
         test(ex.unknown.find("Ice.SocketException") >= 0 or ex.unknown.find("Ice::SocketException") >= 0)
-    except SocketException:
-        test(collocated)
     except:
         test(False)
 
@@ -127,10 +119,10 @@
     except:
         test(False)
 
-def allTests(communicator, collocated):
+def allTests(helper, communicator):
     sys.stdout.write("testing stringToProxy... ")
     sys.stdout.flush()
-    base = communicator.stringToProxy("asm:default -p 12010")
+    base = communicator.stringToProxy("asm:{0}".format(helper.getTestEndpoint()))
     test(base)
     print("ok")
 
@@ -144,7 +136,7 @@
     sys.stdout.write("testing ice_ids... ")
     sys.stdout.flush()
     try:
-        obj = communicator.stringToProxy("category/locate:default -p 12010")
+        obj = communicator.stringToProxy("category/locate:{0}".format(helper.getTestEndpoint()))
         obj.ice_ids()
         test(False)
     except Ice.UnknownUserException as ex:
@@ -153,7 +145,7 @@
         test(False)
 
     try:
-        obj = communicator.stringToProxy("category/finished:default -p 12010")
+        obj = communicator.stringToProxy("category/finished:{0}".format(helper.getTestEndpoint()))
         obj.ice_ids()
         test(False)
     except Ice.UnknownUserException as ex:
@@ -164,47 +156,49 @@
 
     sys.stdout.write("testing servant locator... ")
     sys.stdout.flush()
-    base = communicator.stringToProxy("category/locate:default -p 12010")
+    base = communicator.stringToProxy("category/locate:{0}".format(helper.getTestEndpoint()))
     obj = Test.TestIntfPrx.checkedCast(base)
     try:
-        Test.TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010"))
+        Test.TestIntfPrx.checkedCast(
+            communicator.stringToProxy("category/unknown:{0}".format(helper.getTestEndpoint())))
     except Ice.ObjectNotExistException:
         pass
     print("ok")
 
     sys.stdout.write("testing default servant locator... ")
     sys.stdout.flush()
-    base = communicator.stringToProxy("anothercat/locate:default -p 12010")
+    base = communicator.stringToProxy("anothercat/locate:{0}".format(helper.getTestEndpoint()))
     obj = Test.TestIntfPrx.checkedCast(base)
-    base = communicator.stringToProxy("locate:default -p 12010")
+    base = communicator.stringToProxy("locate:{0}".format(helper.getTestEndpoint()))
     obj = Test.TestIntfPrx.checkedCast(base)
     try:
-        Test.TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010"))
+        Test.TestIntfPrx.checkedCast(
+            communicator.stringToProxy("anothercat/unknown:{0}".format(helper.getTestEndpoint())))
     except Ice.ObjectNotExistException:
         pass
     try:
-        Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:default -p 12010"))
+        Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:{0}".format(helper.getTestEndpoint())))
     except Ice.ObjectNotExistException:
         pass
     print("ok")
 
     sys.stdout.write("testing locate exceptions... ")
     sys.stdout.flush()
-    base = communicator.stringToProxy("category/locate:default -p 12010")
+    base = communicator.stringToProxy("category/locate:{0}".format(helper.getTestEndpoint()))
     obj = Test.TestIntfPrx.checkedCast(base)
-    testExceptions(obj, collocated)
+    testExceptions(obj)
     print("ok")
 
     sys.stdout.write("testing finished exceptions... ")
     sys.stdout.flush()
-    base = communicator.stringToProxy("category/finished:default -p 12010")
+    base = communicator.stringToProxy("category/finished:{0}".format(helper.getTestEndpoint()))
     obj = Test.TestIntfPrx.checkedCast(base)
-    testExceptions(obj, collocated)
+    testExceptions(obj)
     print("ok")
 
     sys.stdout.write("testing servant locator removal... ")
     sys.stdout.flush()
-    base = communicator.stringToProxy("test/activation:default -p 12010")
+    base = communicator.stringToProxy("test/activation:{0}".format(helper.getTestEndpoint()))
     activation = Test.TestActivationPrx.checkedCast(base)
     activation.activateServantLocator(False)
     try:
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/Client.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
 
-import Ice
-Ice.loadSlice('Test.ice')
-import Test, AllTests
 
-class TestClient(Ice.Application):
-    def run(self, args):
-        obj = AllTests.allTests(self.communicator(), False)
-        obj.shutdown()
-        return 0
+class Client(TestHelper):
 
-app = TestClient()
-sys.exit(app.main(sys.argv))
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            obj = AllTests.allTests(self, communicator)
+            obj.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/Collocated.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/Collocated.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/Collocated.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/Collocated.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,31 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, time
 
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI, AllTests, TestActivationI
+import TestI
+import AllTests
+import TestActivationI
+
+
+class Collocated(TestHelper):
 
-class TestServer(Ice.Application):
     def run(self, args):
-        self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-        self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0")
+
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
+            adapter.addServantLocator(TestI.ServantLocatorI("category"), "category")
+            adapter.addServantLocator(TestI.ServantLocatorI(""), "")
+            adapter.add(TestI.TestI(), Ice.stringToIdentity("asm"))
+            adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation"))
 
-        adapter = self.communicator().createObjectAdapter("TestAdapter")
-        #adapter.activate() // Don't activate OA to ensure collocation is used.
-        adapter.addServantLocator(TestI.ServantLocatorI("category"), "category")
-        adapter.addServantLocator(TestI.ServantLocatorI(""), "")
-        adapter.add(TestI.TestI(), Ice.stringToIdentity("asm"))
-        adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation"))
-
-        AllTests.allTests(self.communicator(), False)
-
-        adapter.deactivate()
-        adapter.waitForDeactivate()
-        return 0
+            AllTests.allTests(self, communicator)
 
-app = TestServer()
-sys.exit(app.main(sys.argv))
+            adapter.deactivate()
+            adapter.waitForDeactivate()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/ServerAMD.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/ServerAMD.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/ServerAMD.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/ServerAMD.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,27 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, time
 
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestAMDI, TestActivationAMDI
+import TestAMDI
+import TestActivationAMDI
 
-class TestServer(Ice.Application):
-    def run(self, args):
-        self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-        self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0")
 
-        adapter = self.communicator().createObjectAdapter("TestAdapter")
-        adapter.addServantLocator(TestAMDI.ServantLocatorI("category"), "category")
-        adapter.addServantLocator(TestAMDI.ServantLocatorI(""), "")
-        adapter.add(TestAMDI.TestI(), Ice.stringToIdentity("asm"))
-        adapter.add(TestActivationAMDI.TestActivationAMDI(), Ice.stringToIdentity("test/activation"))
-
-        adapter.activate()
-        adapter.waitForDeactivate()
-        return 0
+class ServerAMD(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0")
+
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.addServantLocator(TestAMDI.ServantLocatorI("category"), "category")
+            adapter.addServantLocator(TestAMDI.ServantLocatorI(""), "")
+            adapter.add(TestAMDI.TestI(), Ice.stringToIdentity("asm"))
+            adapter.add(TestActivationAMDI.TestActivationAMDI(), Ice.stringToIdentity("test/activation"))
 
-app = TestServer()
-sys.exit(app.main(sys.argv))
+            adapter.activate()
+            adapter.waitForDeactivate()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/Server.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,27 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, time
 
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI, TestActivationI
+import TestI
+import TestActivationI
 
-class TestServer(Ice.Application):
-    def run(self, args):
-        self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-        self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0")
 
-        adapter = self.communicator().createObjectAdapter("TestAdapter")
-        adapter.addServantLocator(TestI.ServantLocatorI("category"), "category")
-        adapter.addServantLocator(TestI.ServantLocatorI(""), "")
-        adapter.add(TestI.TestI(), Ice.stringToIdentity("asm"))
-        adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation"))
-
-        adapter.activate()
-        adapter.waitForDeactivate()
-        return 0
+class Server(TestHelper):
+
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0")
+
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.addServantLocator(TestI.ServantLocatorI("category"), "category")
+            adapter.addServantLocator(TestI.ServantLocatorI(""), "")
+            adapter.add(TestI.TestI(), Ice.stringToIdentity("asm"))
+            adapter.add(TestActivationI.TestActivationI(), Ice.stringToIdentity("test/activation"))
 
-app = TestServer()
-sys.exit(app.main(sys.argv))
+            adapter.activate()
+            adapter.waitForDeactivate()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestActivationAMDI.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestActivationAMDI.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestActivationAMDI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestActivationAMDI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, traceback, time
 import Ice, Test, TestAMDI
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestActivationI.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestActivationI.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestActivationI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestActivationI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, traceback, time
 import Ice, Test, TestI
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestAMDI.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestAMDI.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestAMDI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestAMDI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, traceback, time
 import Ice, Test
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/Test.ice zeroc-ice-3.7.2/python/test/Ice/servantLocator/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestI.py zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/servantLocator/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/servantLocator/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys, traceback, time
 import Ice, Test
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/AllTests.py zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, threading, sys
 
@@ -222,15 +217,15 @@
         ex.p2 = ex.p1
         raise ex
 
-def allTests(communicator):
-    obj = communicator.stringToProxy("Test:default -p 12010")
+def allTests(helper, communicator):
+    obj = communicator.stringToProxy("Test:{0}".format(helper.getTestEndpoint()))
     t = Test.TestIntfPrx.checkedCast(obj)
 
     sys.stdout.write("base... ")
     sys.stdout.flush()
     try:
         t.baseAsBase()
-        test(false)
+        test(False)
     except Test.Base as b:
         test(b.b == "Base.b")
         test(b.ice_id() == "::Test::Base")
@@ -249,7 +244,7 @@
     sys.stdout.flush()
     try:
         t.unknownDerivedAsBase()
-        test(false)
+        test(False)
     except Test.Base as b:
         test(b.b == "UnknownDerived.b")
         test(b.ice_id() == "::Test::Base")
@@ -268,7 +263,7 @@
     sys.stdout.flush()
     try:
         t.knownDerivedAsBase()
-        test(false)
+        test(False)
     except Test.KnownDerived as k:
         test(k.b == "KnownDerived.b")
         test(k.kd == "KnownDerived.kd")
@@ -288,7 +283,7 @@
     sys.stdout.flush()
     try:
         t.knownDerivedAsKnownDerived()
-        test(false)
+        test(False)
     except Test.KnownDerived as k:
         test(k.b == "KnownDerived.b")
         test(k.kd == "KnownDerived.kd")
@@ -308,7 +303,7 @@
     sys.stdout.flush()
     try:
         t.unknownIntermediateAsBase()
-        test(false)
+        test(False)
     except Test.Base as b:
         test(b.b == "UnknownIntermediate.b")
         test(b.ice_id() == "::Test::Base")
@@ -327,7 +322,7 @@
     sys.stdout.flush()
     try:
         t.knownIntermediateAsBase()
-        test(false)
+        test(False)
     except Test.KnownIntermediate as ki:
         test(ki.b == "KnownIntermediate.b")
         test(ki.ki == "KnownIntermediate.ki")
@@ -347,7 +342,7 @@
     sys.stdout.flush()
     try:
         t.knownMostDerivedAsBase()
-        test(false)
+        test(False)
     except Test.KnownMostDerived as kmd:
         test(kmd.b == "KnownMostDerived.b")
         test(kmd.ki == "KnownMostDerived.ki")
@@ -368,7 +363,7 @@
     sys.stdout.flush()
     try:
         t.knownIntermediateAsKnownIntermediate()
-        test(false)
+        test(False)
     except Test.KnownIntermediate as ki:
         test(ki.b == "KnownIntermediate.b")
         test(ki.ki == "KnownIntermediate.ki")
@@ -388,7 +383,7 @@
     sys.stdout.flush()
     try:
         t.knownMostDerivedAsKnownIntermediate()
-        test(false)
+        test(False)
     except Test.KnownMostDerived as kmd:
         test(kmd.b == "KnownMostDerived.b")
         test(kmd.ki == "KnownMostDerived.ki")
@@ -409,7 +404,7 @@
     sys.stdout.flush()
     try:
         t.knownMostDerivedAsKnownMostDerived()
-        test(false)
+        test(False)
     except Test.KnownMostDerived as kmd:
         test(kmd.b == "KnownMostDerived.b")
         test(kmd.ki == "KnownMostDerived.ki")
@@ -430,7 +425,7 @@
     sys.stdout.flush()
     try:
         t.unknownMostDerived1AsBase()
-        test(false)
+        test(False)
     except Test.KnownIntermediate as ki:
         test(ki.b == "UnknownMostDerived1.b")
         test(ki.ki == "UnknownMostDerived1.ki")
@@ -450,7 +445,7 @@
     sys.stdout.flush()
     try:
         t.unknownMostDerived1AsKnownIntermediate()
-        test(false)
+        test(False)
     except Test.KnownIntermediate as ki:
         test(ki.b == "UnknownMostDerived1.b")
         test(ki.ki == "UnknownMostDerived1.ki")
@@ -471,7 +466,7 @@
     sys.stdout.flush()
     try:
         t.unknownMostDerived2AsBase()
-        test(false)
+        test(False)
     except Test.Base as b:
         test(b.b == "UnknownMostDerived2.b")
         test(b.ice_id() == "::Test::Base")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/ClientPrivate.ice zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/ClientPrivate.ice
--- zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/Client.py zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice, AllTests
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
 
-def run(args, communicator):
-    Test = AllTests.allTests(communicator)
-    Test.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            initial = AllTests.allTests(self, communicator)
+            initial.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/ServerAMD.py zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/ServerAMD.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/ServerAMD.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/ServerAMD.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,21 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("-I. --all ServerPrivate.ice")
 import Ice
-Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
 
+
+def test(b):
+    if not b:
+        raise RuntimeError('test assertion failed')
+
+
 class TestI(Test.TestIntf):
+
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
@@ -216,22 +217,16 @@
             f.set_exception(ex)
         return f
 
-def run(args, communicator):
-    properties = communicator.getProperties()
-    properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI()
-    adapter.add(object, Ice.stringToIdentity("Test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class ServerAMD(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                     "{0} -t 10000".format(self.getTestEndpoint()))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI(), Ice.stringToIdentity("Test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/ServerPrivate.ice zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/ServerPrivate.ice
--- zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/Server.py zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,18 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
+from TestHelper import TestHelper
+TestHelper.loadSlice("-I. --all ServerPrivate.ice")
 import Ice
-Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
 
+
 class TestI(Test.TestIntf):
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
@@ -155,22 +151,15 @@
         p = Test.RelayPrx.uncheckedCast(current.con.createProxy(r.ice_getIdentity()))
         p.unknownPreservedAsKnownPreserved()
 
-def run(args, communicator):
-    properties = communicator.getProperties()
-    properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI()
-    adapter.add(object, Ice.stringToIdentity("Test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                     "{0} -t 10000".format(self.getTestEndpoint()))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI(), Ice.stringToIdentity("Test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/Test.ice zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/slicing/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/objects/AllTests.py zeroc-ice-3.7.2/python/test/Ice/slicing/objects/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/objects/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/objects/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, gc, sys, threading
 
@@ -392,8 +387,8 @@
         return PreservedI()
     return None
 
-def allTests(communicator):
-    obj = communicator.stringToProxy("Test:default -p 12010")
+def allTests(helper, communicator):
+    obj = communicator.stringToProxy("Test:{0}".format(helper.getTestEndpoint()))
     t = Test.TestIntfPrx.checkedCast(obj)
 
     sys.stdout.write("base as Object... ")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/python/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/python/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/objects/Client.py zeroc-ice-3.7.2/python/test/Ice/slicing/objects/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/objects/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/objects/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,27 +1,15 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice, AllTests
+from TestHelper import TestHelper
+import AllTests
 
-def run(args, communicator):
-    Test = AllTests.allTests(communicator)
-    Test.shutdown()
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            initial = AllTests.allTests(self, communicator)
+            initial.shutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/objects/ServerAMD.py zeroc-ice-3.7.2/python/test/Ice/slicing/objects/ServerAMD.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/objects/ServerAMD.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/objects/ServerAMD.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,19 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("-I. --all ServerPrivate.ice")
 import Ice
-Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
 
+
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
+
 class TestI(Test.TestIntf):
     def SBaseAsObject(self, current=None):
         sb = Test.SBase()
@@ -400,22 +396,15 @@
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    properties = communicator.getProperties()
-    properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI()
-    adapter.add(object, Ice.stringToIdentity("Test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class ServerAMD(TestHelper):
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                     "{0} -t 10000".format(self.getTestEndpoint()))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI(), Ice.stringToIdentity("Test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/objects/ServerPrivate.ice zeroc-ice-3.7.2/python/test/Ice/slicing/objects/ServerPrivate.ice
--- zeroc-ice-3.7.1/python/test/Ice/slicing/objects/ServerPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/objects/ServerPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/objects/Server.py zeroc-ice-3.7.2/python/test/Ice/slicing/objects/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/slicing/objects/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/objects/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,14 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("-I. --all ServerPrivate.ice")
 import Ice
-Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
 
+
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
@@ -364,22 +359,16 @@
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    properties = communicator.getProperties()
-    properties.setProperty("Ice.Warn.Dispatch", "0")
-    properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    object = TestI()
-    adapter.add(object, Ice.stringToIdentity("Test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                     "{0} -t 10000".format(self.getTestEndpoint()))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI(), Ice.stringToIdentity("Test"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/slicing/objects/Test.ice zeroc-ice-3.7.2/python/test/Ice/slicing/objects/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/slicing/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/slicing/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/thread/AllTests.py zeroc-ice-3.7.2/python/test/Ice/thread/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/thread/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/thread/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, TestI
 
@@ -13,9 +8,9 @@
     if not b:
         raise RuntimeError('test assertion failed')
 
-def allTests(communicator):
+def allTests(helper, communicator):
 
-    ref = "factory:default -p 12010 -t 10000"
+    ref = "factory:{0} -t 10000".format(helper.getTestEndpoint())
     factory = Test.RemoteCommunicatorFactoryPrx.checkedCast(communicator.stringToProxy(ref))
 
     sys.stdout.write("testing thread hooks... ")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/thread/Client.py zeroc-ice-3.7.2/python/test/Ice/thread/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/thread/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/thread/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,37 +1,15 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-import Ice
 
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/thread/Server.py zeroc-ice-3.7.2/python/test/Ice/thread/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/thread/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/thread/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,39 +1,20 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-import os, sys, traceback
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
+import TestI
 
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test, TestI
-
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
-    adapter = communicator.createObjectAdapter("TestAdapter");
-    ident = Ice.stringToIdentity("factory");
-    adapter.add(TestI.RemoteCommunicatorFactoryI(), ident);
-    adapter.activate();
-
-    communicator.waitForShutdown();
-    return True;
-
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+    def run(self, args):
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints",
+                                                     "{0} -t 10000".format(self.getTestEndpoint()))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.RemoteCommunicatorFactoryI(), Ice.stringToIdentity("factory"))
+            adapter.activate()
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/thread/Test.ice zeroc-ice-3.7.2/python/test/Ice/thread/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/thread/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/thread/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef TEST_ICE
 #define TEST_ICE
diff -Nru zeroc-ice-3.7.1/python/test/Ice/thread/TestI.py zeroc-ice-3.7.2/python/test/Ice/thread/TestI.py
--- zeroc-ice-3.7.1/python/test/Ice/thread/TestI.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/thread/TestI.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, time, threading
 
diff -Nru zeroc-ice-3.7.1/python/test/Ice/timeout/AllTests.py zeroc-ice-3.7.2/python/test/Ice/timeout/AllTests.py
--- zeroc-ice-3.7.1/python/test/Ice/timeout/AllTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/timeout/AllTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import Ice, Test, sys, threading, time
 
@@ -59,16 +54,17 @@
             pass
     return prx.ice_getConnection(); # Establish connection
 
-def allTests(communicator):
+def allTests(helper, communicator):
 
-    sref = "timeout:default -p 12010"
+    sref = "timeout:{0}".format(helper.getTestEndpoint())
     obj = communicator.stringToProxy(sref)
     test(obj != None)
 
     timeout = Test.TimeoutPrx.checkedCast(obj)
     test(timeout != None)
 
-    controller = Test.ControllerPrx.checkedCast(communicator.stringToProxy("controller:default -p 12011"))
+    controller = Test.ControllerPrx.checkedCast(
+        communicator.stringToProxy("controller:{0}".format(helper.getTestEndpoint(num=1))))
     test(controller != None)
 
     sys.stdout.write("testing connect timeout... ")
@@ -89,7 +85,7 @@
     #
     # Expect success.
     #
-    to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(2000))
+    to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(-1))
     controller.holdAdapter(100)
     try:
         to.op()
@@ -284,9 +280,10 @@
     comm = Ice.initialize(initData)
     connection = comm.stringToProxy(sref).ice_getConnection()
     controller.holdAdapter(-1)
-    now = time.clock()
+    s = time.perf_counter() if sys.version_info[:2] >= (3, 3) else time.clock()
     comm.destroy()
-    test((time.clock() - now) < 0.7)
+    e = time.perf_counter() if sys.version_info[:2] >= (3, 3) else time.clock()
+    test((s - e) < 1.0)
     controller.resumeAdapter()
 
     print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Ice/timeout/Client.py zeroc-ice-3.7.2/python/test/Ice/timeout/Client.py
--- zeroc-ice-3.7.1/python/test/Ice/timeout/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/timeout/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,59 +1,37 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
-
-try:
-    #
-    # In this test, we need at least two threads in the
-    # client side thread pool for nested AMI.
-    #
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-
-    #
-    # For this test, we want to disable retries.
-    #
-    initData.properties.setProperty("Ice.RetryIntervals", "-1");
-
-    #
-    # This test kills connections, so we don't want warnings.
-    #
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-    #
-    # Limit the send buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Client(TestHelper):
+
+    def run(self, args):
+        #
+        # In this test, we need at least two threads in the
+        # client side thread pool for nested AMI.
+        #
+        properties = self.createTestProperties(args)
+
+        #
+        # For this test, we want to disable retries.
+        #
+        properties.setProperty("Ice.RetryIntervals", "-1")
+
+        #
+        # This test kills connections, so we don't want warnings.
+        #
+        properties.setProperty("Ice.Warn.Connections", "0")
+
+        #
+        # Limit the send buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        properties.setProperty("Ice.TCP.SndSize", "50000")
+
+        with self.initialize(properties=properties) as communicator:
+            AllTests.allTests(self, communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Ice/timeout/Server.py zeroc-ice-3.7.2/python/test/Ice/timeout/Server.py
--- zeroc-ice-3.7.1/python/test/Ice/timeout/Server.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/timeout/Server.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,16 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback, time, threading
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import threading
+import time
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
 import Test
 
+
 class ActivateAdapterThread(threading.Thread):
     def __init__(self, adapter, timeout):
         threading.Thread.__init__(self)
@@ -57,42 +49,36 @@
     def shutdown(self, current=None):
         current.adapter.getCommunicator().shutdown()
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011");
-    communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
-
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TimeoutI(), Ice.stringToIdentity("timeout"))
-    adapter.activate()
-
-    controllerAdapter = communicator.createObjectAdapter("ControllerAdapter")
-    controllerAdapter.add(ControllerI(adapter), Ice.stringToIdentity("controller"))
-    controllerAdapter.activate()
-
-    communicator.waitForShutdown()
-    return True
-
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-    #
-    # The client sends large messages to cause the transport
-    # buffers to fill up.
-    #
-    initData.properties.setProperty("Ice.MessageSizeMax", "10000");
-
-    #
-    # Limit the recv buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Server(TestHelper):
+
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Connections", "0")
+
+        #
+        # The client sends large messages to cause the transport
+        # buffers to fill up.
+        #
+        properties.setProperty("Ice.MessageSizeMax", "10000")
+
+        #
+        # Limit the recv buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        properties.setProperty("Ice.TCP.RcvSize", "50000")
+
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            communicator.getProperties().setProperty("ControllerAdapter.Endpoints", self.getTestEndpoint(num=1))
+            communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
+
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TimeoutI(), Ice.stringToIdentity("timeout"))
+            adapter.activate()
+
+            controllerAdapter = communicator.createObjectAdapter("ControllerAdapter")
+            controllerAdapter.add(ControllerI(adapter), Ice.stringToIdentity("controller"))
+            controllerAdapter.activate()
+
+            communicator.waitForShutdown()
diff -Nru zeroc-ice-3.7.1/python/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/python/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/python/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/python/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/python/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/python/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 
diff -Nru zeroc-ice-3.7.1/python/test/Slice/escape/Client.py zeroc-ice-3.7.2/python/test/Slice/escape/Client.py
--- zeroc-ice-3.7.1/python/test/Slice/escape/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/escape/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,41 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "python", "Ice", "__init__.py")):
-        break
-else:
-    raise RuntimeError("can't find toplevel directory!")
 
+from TestHelper import TestHelper
+TestHelper.loadSlice("Key.ice Clash.ice")
+import sys
 import Ice
-
-Ice.loadSlice('Key.ice')
-Ice.loadSlice('Clash.ice')
-
 import _and
 
+
 class delI(_and._del):
     def _elifAsync(self, _else, current=None):
         pass
 
+
 class execI(_and._exec):
     def _finally(self, current=None):
         assert current.operation == "finally"
 
+
 class ifI(_and._if):
     def _elifAsync(self, _else, current=None):
         pass
+
     def _finally(self, current=None):
         pass
+
     def foo(self, _from, current=None):
         pass
 
+
 class printI(_and._print):
     def _raise(self, _else, _return, _try, _while, _yield, _lambda, _or, _global):
         pass
 
+
 def testtypes():
     sys.stdout.write("Testing generated type names... ")
     sys.stdout.flush()
@@ -74,36 +66,27 @@
     en = _and.EnumNone._None
     print("ok")
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(execI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-
-    sys.stdout.write("Testing operation name... ")
-    sys.stdout.flush()
-    p = _and.execPrx.uncheckedCast(
-        adapter.createProxy(Ice.stringToIdentity("test")));
-    p._finally();
-    print("ok")
-
-    testtypes()
 
-    return True
+class Client(TestHelper):
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    #
-    # Its possible to have batch oneway requests dispatched after the
-    # adapter is deactivated due to thread scheduling so we supress
-    # this warning.
-    #
-    initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        #
+        # Its possible to have batch oneway requests dispatched after the
+        # adapter is deactivated due to thread scheduling so we supress
+        # this warning.
+        #
+        properties.setProperty("Ice.Warn.Dispatch", "0")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", "default")
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(execI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+
+            sys.stdout.write("Testing operation name... ")
+            sys.stdout.flush()
+            p = _and.execPrx.uncheckedCast(adapter.createProxy(Ice.stringToIdentity("test")))
+            p._finally()
+            print("ok")
 
-sys.exit(not status)
+            testtypes()
diff -Nru zeroc-ice-3.7.1/python/test/Slice/escape/Key.ice zeroc-ice-3.7.2/python/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/python/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["suppress-warning:deprecated"]]
 
diff -Nru zeroc-ice-3.7.1/python/test/Slice/import/Client.py zeroc-ice-3.7.2/python/test/Slice/import/Client.py
--- zeroc-ice-3.7.1/python/test/Slice/import/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/import/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,28 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "python", "Ice", "__init__.py")):
-        break
-else:
-    raise RuntimeError("can't find toplevel directory!")
 
+from TestHelper import TestHelper
+import sys
 import Test
 
-status = True
 
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-try:
-    sys.stdout.write("testing imports... ")
-    sys.stdout.flush()
-
-    test(Test.SubA.SubSubA1.Value1 == 10)
-    test(Test.SubA.SubSubA1.Value2 == 11)
-    test(Test.SubA.SubSubA2.Value1 == 30)
-    test(Test.SubB.SubSubB1.Value1 == 20)
-    test(Test.SubB.SubSubB1.Value2 == 21)
-
-    print("ok")
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Client(TestHelper):
+
+    def run(self, args):
+        sys.stdout.write("testing imports... ")
+        sys.stdout.flush()
+
+        test(Test.SubA.SubSubA1.Value1 == 10)
+        test(Test.SubA.SubSubA1.Value2 == 11)
+        test(Test.SubA.SubSubA2.Value1 == 30)
+        test(Test.SubB.SubSubB1.Value1 == 20)
+        test(Test.SubB.SubSubB1.Value2 == 21)
+
+        print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Slice/import/Test1.ice zeroc-ice-3.7.2/python/test/Slice/import/Test1.ice
--- zeroc-ice-3.7.1/python/test/Slice/import/Test1.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/import/Test1.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/python/test/Slice/import/Test2.ice zeroc-ice-3.7.2/python/test/Slice/import/Test2.ice
--- zeroc-ice-3.7.1/python/test/Slice/import/Test2.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/import/Test2.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
diff -Nru zeroc-ice-3.7.1/python/test/Slice/import/test.py zeroc-ice-3.7.2/python/test/Slice/import/test.py
--- zeroc-ice-3.7.1/python/test/Slice/import/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/import/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,12 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class SliceImportTestCase(ClientTestCase):
 
     def setupClientSide(self, current):
 
-        testdir = current.testcase.getPath()
+        testdir = current.testsuite.getPath()
         if os.path.exists(os.path.join(testdir, "Test1_ice.py")):
             os.remove(os.path.join(testdir, "Test1_ice.py"))
         if os.path.exists(os.path.join(testdir, "Test2_ice.py")):
diff -Nru zeroc-ice-3.7.1/python/test/Slice/macros/Client.py zeroc-ice-3.7.2/python/test/Slice/macros/Client.py
--- zeroc-ice-3.7.1/python/test/Slice/macros/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/macros/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,51 +1,35 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
-
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "python", "Ice", "__init__.py")):
-        break
-else:
-    raise RuntimeError("can't find toplevel directory!")
 
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
+import sys
 import Ice
+import Test
 
-Ice.loadSlice('Test.ice')
-import Test, copy
-
-status = True
 
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
-try:
-    sys.stdout.write("testing Slice predefined macros... ")
-    sys.stdout.flush()
-
-    d = Test.Default()
-    test(d.x == 10)
-    test(d.y == 10)
-
-    nd = Test.NoDefault()
-    test(nd.x != 10)
-    test(nd.y != 10)
-
-    c = Test.PythonOnly()
-    test(c.lang == "python")
-    test(c.version == Ice.intVersion())
-    print("ok")
-except:
-    traceback.print_exc()
-    status = False
 
-sys.exit(not status)
+class Client(TestHelper):
+
+    def run(self, args):
+        sys.stdout.write("testing Slice predefined macros... ")
+        sys.stdout.flush()
+
+        d = Test.Default()
+        test(d.x == 10)
+        test(d.y == 10)
+
+        nd = Test.NoDefault()
+        test(nd.x != 10)
+        test(nd.y != 10)
+
+        c = Test.PythonOnly()
+        test(c.lang == "python")
+        test(c.version == Ice.intVersion())
+        print("ok")
diff -Nru zeroc-ice-3.7.1/python/test/Slice/macros/Test.ice zeroc-ice-3.7.2/python/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/python/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This macro sets the default value only when compiling with slice2py.
diff -Nru zeroc-ice-3.7.1/python/test/Slice/structure/Client.py zeroc-ice-3.7.2/python/test/Slice/structure/Client.py
--- zeroc-ice-3.7.1/python/test/Slice/structure/Client.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/structure/Client.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,31 +1,20 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, traceback
 
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "python", "Ice", "__init__.py")):
-        break
-else:
-    raise RuntimeError("can't find toplevel directory!")
+from TestHelper import TestHelper
+TestHelper.loadSlice('Test.ice')
+import sys
+import copy
+import Test
 
-import Ice
-
-Ice.loadSlice('Test.ice')
-import Test, copy
 
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
+
 def allTests(communicator):
     sys.stdout.write("testing equals() for Slice structures... ")
     sys.stdout.flush()
@@ -187,18 +176,10 @@
 
     print("ok")
 
-def run(args, communicator):
-    allTests(communicator)
 
-    return True
+class Client(TestHelper):
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    def run(self, args):
 
-sys.exit(not status)
+        with self.initialize(args=args) as communicator:
+            allTests(communicator)
diff -Nru zeroc-ice-3.7.1/python/test/Slice/structure/Test.ice zeroc-ice-3.7.2/python/test/Slice/structure/Test.ice
--- zeroc-ice-3.7.1/python/test/Slice/structure/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/Slice/structure/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["cpp:include:list"]]
 
diff -Nru zeroc-ice-3.7.1/python/test/TestHelper.py zeroc-ice-3.7.2/python/test/TestHelper.py
--- zeroc-ice-3.7.1/python/test/TestHelper.py	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/python/test/TestHelper.py	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,102 @@
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+import Ice
+import sys
+import os
+import traceback
+import importlib
+
+
+class TestHelper:
+
+    def __init__(self):
+        self._communicator = None
+
+    def getTestEndpoint(self, properties=None, num=0, protocol=""):
+
+        if properties is None:
+            properties = self._communicator.getProperties()
+
+        if protocol == "":
+            protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default")
+
+        port = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num
+
+        return "{0} -p {1}".format(protocol, port)
+
+    def getTestHost(self, properties=None):
+
+        if properties is None:
+            properties = self._communicator.getProperties()
+
+        return properties.getPropertyWithDefaul("Ice.Default.Host", "127.0.0.1")
+
+    def getTestProtocol(self, properties=None):
+
+        if properties is None:
+            properties = self._communicator.getProperties()
+
+        return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp")
+
+    def getTestPort(self, properties=None, num=0):
+
+        if properties is None:
+            properties = self._communicator.getProperties()
+
+        return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num
+
+    def createTestProperties(self, args=[]):
+
+        properties = Ice.createProperties(args)
+        args = properties.parseCommandLineOptions("Test", args)
+        return properties
+
+    def initialize(self, initData=None, properties=None, args=[]):
+
+        if initData is None:
+            initData = Ice.InitializationData()
+            if properties:
+                initData.properties = properties
+            else:
+                initData.properties = self.createTestProperties(args)
+
+        communicator = Ice.initialize(initData)
+
+        if self._communicator is None:
+            self._communicator = communicator
+
+        return communicator
+
+    def communicator(self):
+        return self._communicator
+
+    def shutdown(self):
+        if self._communicator:
+            self._communicator.shutdown()
+
+    @classmethod
+    def loadSlice(self, args):
+        sliceDir = Ice.getSliceDir()
+        if not sliceDir:
+            print(sys.argv[0] + ': Slice directory not found.')
+            sys.exit(1)
+        Ice.loadSlice("'-I{0}' {1}".format(sliceDir, args))
+
+    @classmethod
+    def run(self):
+        try:
+            moduleName = os.path.splitext(sys.argv[1])[0]
+            module = importlib.import_module(moduleName)
+            cls = getattr(module, moduleName)
+            helper = cls()
+            helper.run(sys.argv[2:])
+            return 0
+        except Exception:
+            traceback.print_exc()
+            return 1
+
+
+if __name__ == '__main__':
+    sys.exit(TestHelper.run())
diff -Nru zeroc-ice-3.7.1/README.md zeroc-ice-3.7.2/README.md
--- zeroc-ice-3.7.1/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -26,6 +26,7 @@
 - PHP
 - Python
 - Ruby
+- TypeScript
 
 ## Platforms
 
@@ -62,8 +63,6 @@
     lightweight topic-based pub-sub service
     - [Glacier2](https://zeroc.com/products/ice/services/glacier2) - a
     sysadmin-friendly solution for routing Ice communications through firewalls
-    - [IcePatch2](https://zeroc.com/products/ice/services/icepatch2) - an
-    efficient software distribution and patching service
 
 ## Branches
 
@@ -108,5 +107,5 @@
 
 ## Documentation
 
-- [Ice Release Notes](https://doc.zeroc.com/display/Rel/Ice+3.7.1+Release+Notes)
+- [Ice Release Notes](https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes)
 - [Ice Manual](https://doc.zeroc.com/display/Ice37/Home)
diff -Nru zeroc-ice-3.7.1/ruby/allTests.py zeroc-ice-3.7.2/ruby/allTests.py
--- zeroc-ice-3.7.1/ruby/allTests.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/allTests.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff -Nru zeroc-ice-3.7.1/ruby/config/Make.rules zeroc-ice-3.7.2/ruby/config/Make.rules
--- zeroc-ice-3.7.1/ruby/config/Make.rules	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/config/Make.rules	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Override to use another ruby version
@@ -39,6 +34,10 @@
     endif
 endif
 
+ifeq ($(os),Linux)
+   cppflags   := $(filter-out -Wredundant-decls -Wshadow,$(cppflags))
+endif
+
 # Ruby linker flags
 ruby_ldflags    := $(call ruby-call,$$(LIBRUBYARG))
 ruby_libdir     := $(call ruby-call,$(if $(findstring MINGW,$(shell uname)),$$(bindir),$$(libdir)))
diff -Nru zeroc-ice-3.7.1/ruby/config/s2rb.rb zeroc-ice-3.7.2/ruby/config/s2rb.rb
--- zeroc-ice-3.7.1/ruby/config/s2rb.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/config/s2rb.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "ruby")
 
diff -Nru zeroc-ice-3.7.1/ruby/Makefile zeroc-ice-3.7.2/ruby/Makefile
--- zeroc-ice-3.7.1/ruby/Makefile	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/Makefile	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 top_srcdir      := ..
-lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
+lang_srcdir     := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST))))))
 
 include $(top_srcdir)/config/Make.rules
 
diff -Nru zeroc-ice-3.7.1/ruby/README.md zeroc-ice-3.7.2/ruby/README.md
--- zeroc-ice-3.7.1/ruby/README.md	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/README.md	2019-02-05 18:03:04.000000000 +0000
@@ -44,7 +44,7 @@
 export RUBY_HOME=/opt/ruby
 ````
 
-The build of Ice for Python requires that you first build Ice for C++ in the
+The build of Ice for Ruby requires that you first build Ice for C++ in the
 `cpp` subdirectory.
 
 From the top-level source directory, edit `config/Make.rules` to establish your
@@ -164,4 +164,4 @@
     ```
 
 [1]: https://zeroc.com/distributions/ice
-[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.1
+[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2
diff -Nru zeroc-ice-3.7.1/ruby/ruby/Glacier2.rb zeroc-ice-3.7.2/ruby/ruby/Glacier2.rb
--- zeroc-ice-3.7.1/ruby/ruby/Glacier2.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/ruby/Glacier2.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Glacier2/Router'
 require 'Glacier2/PermissionsVerifier'
diff -Nru zeroc-ice-3.7.1/ruby/ruby/IceBox.rb zeroc-ice-3.7.2/ruby/ruby/IceBox.rb
--- zeroc-ice-3.7.1/ruby/ruby/IceBox.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/ruby/IceBox.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'IceBox/IceBox'
diff -Nru zeroc-ice-3.7.1/ruby/ruby/IceGrid.rb zeroc-ice-3.7.2/ruby/ruby/IceGrid.rb
--- zeroc-ice-3.7.1/ruby/ruby/IceGrid.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/ruby/IceGrid.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'IceGrid/Admin.rb'
 require 'IceGrid/Descriptor.rb'
diff -Nru zeroc-ice-3.7.1/ruby/ruby/IcePatch2.rb zeroc-ice-3.7.2/ruby/ruby/IcePatch2.rb
--- zeroc-ice-3.7.1/ruby/ruby/IcePatch2.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/ruby/IcePatch2.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'IcePatch2/FileServer'
diff -Nru zeroc-ice-3.7.1/ruby/ruby/Ice.rb zeroc-ice-3.7.2/ruby/ruby/Ice.rb
--- zeroc-ice-3.7.1/ruby/ruby/Ice.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/ruby/Ice.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'IceRuby'
 require 'thread'
diff -Nru zeroc-ice-3.7.1/ruby/ruby/IceStorm.rb zeroc-ice-3.7.2/ruby/ruby/IceStorm.rb
--- zeroc-ice-3.7.1/ruby/ruby/IceStorm.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/ruby/IceStorm.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'IceStorm/IceStorm'
 require 'IceStorm/Metrics'
diff -Nru zeroc-ice-3.7.1/ruby/scripts/slice2rb zeroc-ice-3.7.2/ruby/scripts/slice2rb
--- zeroc-ice-3.7.1/ruby/scripts/slice2rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/scripts/slice2rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Ice'
 sliceDir = Ice.getSliceDir()
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Communicator.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Communicator.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Communicator.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Communicator.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <ImplicitContext.h>
@@ -79,7 +74,7 @@
 
 extern "C"
 VALUE
-IceRuby_initialize(int argc, VALUE* argv, VALUE self)
+IceRuby_initialize(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -333,7 +328,7 @@
 
 extern "C"
 VALUE
-IceRuby_stringToIdentity(VALUE self, VALUE str)
+IceRuby_stringToIdentity(VALUE /*self*/, VALUE str)
 {
     ICE_RUBY_TRY
     {
@@ -347,7 +342,7 @@
 
 extern "C"
 VALUE
-IceRuby_identityToString(int argc, VALUE* argv, VALUE self)
+IceRuby_identityToString(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Communicator.h zeroc-ice-3.7.2/ruby/src/IceRuby/Communicator.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Communicator.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Communicator.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_COMMUNICATOR_H
 #define ICE_RUBY_COMMUNICATOR_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Config.h zeroc-ice-3.7.2/ruby/src/IceRuby/Config.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Config.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Config.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_CONFIG_H
 #define ICE_RUBY_CONFIG_H
@@ -52,8 +47,25 @@
 #define HAVE_ISFINITE 1
 #endif
 
+//
+// BUGFIX: Workaround unused parameter in ruby.h header file
+//
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 #include <ruby.h>
 
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic pop
+#endif
+
 //
 // The Ruby header file win32/win32.h defines a number of macros for
 // functions like shutdown() and close() that wreak havoc.
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Connection.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Connection.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Connection.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Connection.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Connection.h>
 #include <Endpoint.h>
@@ -26,9 +21,7 @@
 static VALUE _wsConnectionInfoClass;
 static VALUE _sslConnectionInfoClass;
 
-// **********************************************************************
 // Connection
-// **********************************************************************
 
 extern "C"
 void
@@ -333,9 +326,7 @@
     return Qnil;
 }
 
-// **********************************************************************
 // ConnectionInfo
-// **********************************************************************
 
 extern "C"
 void
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Connection.h zeroc-ice-3.7.2/ruby/src/IceRuby/Connection.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Connection.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Connection.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_CONNECTION_H
 #define ICE_RUBY_CONNECTION_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Endpoint.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Endpoint.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Endpoint.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Endpoint.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Endpoint.h>
 #include <Util.h>
@@ -25,9 +20,7 @@
 static VALUE _opaqueEndpointInfoClass;
 static VALUE _sslEndpointInfoClass;
 
-// **********************************************************************
 // Endpoint
-// **********************************************************************
 
 extern "C"
 void
@@ -115,9 +108,7 @@
     return IceRuby_Endpoint_cmp(self, other) == INT2NUM(0) ? Qtrue : Qfalse;
 }
 
-// **********************************************************************
 // EndpointInfo
-// **********************************************************************
 
 extern "C"
 void
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Endpoint.h zeroc-ice-3.7.2/ruby/src/IceRuby/Endpoint.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Endpoint.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Endpoint.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_ENDPOINT_H
 #define ICE_RUBY_ENDPOINT_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/ImplicitContext.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/ImplicitContext.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/ImplicitContext.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/ImplicitContext.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <ImplicitContext.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/ImplicitContext.h zeroc-ice-3.7.2/ruby/src/IceRuby/ImplicitContext.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/ImplicitContext.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/ImplicitContext.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_IMPLICIT_CONTEXT_H
 #define ICE_RUBY_IMPLICIT_CONTEXT_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Init.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Init.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Init.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Init.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Communicator.h>
 #include <ImplicitContext.h>
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Logger.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Logger.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Logger.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Logger.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Logger.h>
 #include <Util.h>
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Logger.h zeroc-ice-3.7.2/ruby/src/IceRuby/Logger.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Logger.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Logger.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_LOGGER_H
 #define ICE_RUBY_LOGGER_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Makefile.mk zeroc-ice-3.7.2/ruby/src/IceRuby/Makefile.mk
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Makefile.mk	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Makefile.mk	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 $(project)_libraries := IceRuby
 
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Operation.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Operation.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Operation.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Operation.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Operation.h>
 #include <Proxy.h>
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Operation.h zeroc-ice-3.7.2/ruby/src/IceRuby/Operation.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Operation.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Operation.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_OPERATION_H
 #define ICE_RUBY_OPERATION_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Properties.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Properties.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Properties.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Properties.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Properties.h>
 #include <Util.h>
@@ -27,7 +22,7 @@
 
 extern "C"
 VALUE
-IceRuby_createProperties(int argc, VALUE* argv, VALUE self)
+IceRuby_createProperties(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Properties.h zeroc-ice-3.7.2/ruby/src/IceRuby/Properties.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Properties.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Properties.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_PROPERTIES_H
 #define ICE_RUBY_PROPERTIES_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Proxy.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Proxy.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Proxy.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Proxy.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Proxy.h>
@@ -24,9 +19,7 @@
 
 static VALUE _proxyClass;
 
-// **********************************************************************
 // ObjectPrx
-// **********************************************************************
 
 extern "C"
 void
@@ -1057,7 +1050,7 @@
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE self)
+IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE /*self*/)
 {
     //
     // ice_checkedCast is called from generated code, therefore we always expect
@@ -1123,7 +1116,7 @@
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_uncheckedCast(int argc, VALUE* args, VALUE self)
+IceRuby_ObjectPrx_uncheckedCast(int argc, VALUE* args, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -1249,7 +1242,7 @@
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_ice_staticId(VALUE self)
+IceRuby_ObjectPrx_ice_staticId(VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -1261,7 +1254,7 @@
 
 extern "C"
 VALUE
-IceRuby_ObjectPrx_new(int /*argc*/, VALUE* /*args*/, VALUE self)
+IceRuby_ObjectPrx_new(int /*argc*/, VALUE* /*args*/, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Proxy.h zeroc-ice-3.7.2/ruby/src/IceRuby/Proxy.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Proxy.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Proxy.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_PROXY_H
 #define ICE_RUBY_PROXY_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Slice.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Slice.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Slice.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Slice.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice.h>
 #include <Util.h>
@@ -21,7 +16,7 @@
 
 extern "C"
 VALUE
-IceRuby_loadSlice(int argc, VALUE* argv, VALUE self)
+IceRuby_loadSlice(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -163,7 +158,7 @@
 
 extern "C"
 VALUE
-IceRuby_compile(int argc, VALUE* argv, VALUE self)
+IceRuby_compile(int argc, VALUE* argv, VALUE /*self*/)
 {
     ICE_RUBY_TRY
     {
@@ -190,16 +185,6 @@
             cerr << argSeq[0] << ": error:" << ex.what() << endl;
             rc = EXIT_FAILURE;
         }
-        catch(const std::string& msg)
-        {
-            cerr << argSeq[0] << ": error:" << msg << endl;
-            rc = EXIT_FAILURE;
-        }
-        catch(const char* msg)
-        {
-            cerr << argSeq[0] << ": error:" << msg << endl;
-            rc = EXIT_FAILURE;
-        }
         catch(...)
         {
             cerr << argSeq[0] << ": error:" << "unknown exception" << endl;
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Slice.h zeroc-ice-3.7.2/ruby/src/IceRuby/Slice.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Slice.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Slice.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_SLICE_H
 #define ICE_RUBY_SLICE_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Types.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Types.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Types.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Types.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Types.h>
 #include <Proxy.h>
@@ -370,15 +365,15 @@
 
                     Ice::ObjectPtr writer;
 
-                    ObjectMap::iterator i = objectMap->find(o);
-                    if(i == objectMap->end())
+                    ObjectMap::iterator k = objectMap->find(o);
+                    if(k == objectMap->end())
                     {
                         writer = new ObjectWriter(o, objectMap, 0);
                         objectMap->insert(ObjectMap::value_type(o, writer));
                     }
                     else
                     {
-                        writer = i->second;
+                        writer = k->second;
                     }
 
                     info->instances.push_back(writer);
@@ -1157,8 +1152,8 @@
             return true;
         }
     }
-    ID id = rb_intern("to_ary");
-    return callRuby(rb_respond_to, val, id) != 0;
+    ID rbid = rb_intern("to_ary");
+    return callRuby(rb_respond_to, val, rbid) != 0;
 }
 
 bool
@@ -1705,8 +1700,8 @@
     {
         return true;
     }
-    ID id = rb_intern("to_hash");
-    return callRuby(rb_respond_to, val, id) != 0;
+    ID rbid = rb_intern("to_hash");
+    return callRuby(rb_respond_to, val, rbid) != 0;
 }
 
 bool
@@ -3174,17 +3169,17 @@
 
 extern "C"
 VALUE
-IceRuby_stringifyException(VALUE /*self*/, VALUE ex)
+IceRuby_stringifyException(VALUE /*self*/, VALUE exc)
 {
     ICE_RUBY_TRY
     {
-        volatile VALUE cls = CLASS_OF(ex);
+        volatile VALUE cls = CLASS_OF(exc);
         volatile VALUE type = callRuby(rb_const_get, cls, rb_intern("ICE_TYPE"));
         ExceptionInfoPtr info = getException(type);
 
         ostringstream ostr;
         IceUtilInternal::Output out(ostr);
-        info->print(ex, out);
+        info->print(exc, out);
 
         string str = ostr.str();
         return createString(str);
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Types.h zeroc-ice-3.7.2/ruby/src/IceRuby/Types.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Types.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Types.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_TYPES_H
 #define ICE_RUBY_TYPES_H
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Util.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/Util.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Util.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Util.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Util.h>
 #include <Ice/LocalException.h>
@@ -22,22 +17,10 @@
 namespace
 {
 
-#ifndef NDEBUG
-bool
-checkIsInstance(VALUE p, const char* type)
-{
-    volatile VALUE rbType = callRuby(rb_path2class, type);
-    assert(!NIL_P(rbType));
-    return callRuby(rb_obj_is_instance_of, p, rbType) == Qtrue;
-}
-#endif
-
 template<typename T>
 bool
-setVersion(VALUE p, const T& version, const char* type)
+setVersion(VALUE p, const T& version)
 {
-    assert(checkIsInstance(p, type));
-
     volatile VALUE major = callRuby(rb_int2inum, version.major);
     volatile VALUE minor = callRuby(rb_int2inum, version.minor);
     rb_ivar_set(p, rb_intern("@major"), major);
@@ -48,9 +31,8 @@
 
 template<typename T>
 bool
-getVersion(VALUE p, T& v, const char* type)
+getVersion(VALUE p, T& v)
 {
-    assert(checkIsInstance(p, type));
     volatile VALUE major = callRuby(rb_ivar_get, p, rb_intern("@major"));
     volatile VALUE minor = callRuby(rb_ivar_get, p, rb_intern("@minor"));
 
@@ -84,7 +66,7 @@
 
     volatile VALUE obj = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), rbType);
 
-    if(!setVersion<T>(obj, version, type))
+    if(!setVersion<T>(obj, version))
     {
         return Qnil;
     }
@@ -104,7 +86,7 @@
     }
 
     T v;
-    if(!getVersion<T>(p, v, type))
+    if(!getVersion<T>(p, v))
     {
         return Qnil;
     }
@@ -399,6 +381,21 @@
     return result;
 }
 
+VALUE
+IceRuby::createNumSeq(const vector<Ice::Byte>& v)
+{
+    volatile VALUE result = createArray(v.size());
+    long i = 0;
+    if(v.size() > 0)
+    {
+        for(vector<Ice::Byte>::const_iterator p = v.begin(); p != v.end(); ++p, ++i)
+        {
+            RARRAY_ASET(result, i, INT2FIX(*p));
+        }
+    }
+    return result;
+}
+
 namespace
 {
 
@@ -552,7 +549,7 @@
         throw RubyException(rb_eTypeError, "value is not an Ice::EncodingVersion");
     }
 
-    if(!getVersion<Ice::EncodingVersion>(p, v, Ice_EncodingVersion))
+    if(!getVersion<Ice::EncodingVersion>(p, v))
     {
         return false;
     }
@@ -638,6 +635,16 @@
         volatile VALUE v = createString(e.str);
         callRuby(rb_iv_set, p, "@str", v);
     }
+    catch(const Ice::EndpointSelectionTypeParseException& e)
+    {
+        volatile VALUE v = createString(e.str);
+        callRuby(rb_iv_set, p, "@str", v);
+    }
+    catch(const Ice::VersionParseException& e)
+    {
+        volatile VALUE v = createString(e.str);
+        callRuby(rb_iv_set, p, "@str", v);
+    }
     catch(const Ice::IdentityParseException& e)
     {
         volatile VALUE v = createString(e.str);
@@ -653,6 +660,11 @@
         volatile VALUE v = IceRuby::createIdentity(e.id);
         callRuby(rb_iv_set, p, "@id", v);
     }
+    catch(const Ice::IllegalServantException& e)
+    {
+        volatile VALUE v = createString(e.reason);
+        callRuby(rb_iv_set, p, "@reason", v);
+    }
     catch(const Ice::RequestFailedException& e)
     {
         volatile VALUE v;
@@ -683,6 +695,11 @@
         v = createString(e.host);
         callRuby(rb_iv_set, p, "@host", v);
     }
+    catch(const Ice::BadMagicException& e)
+    {
+        volatile VALUE v = createNumSeq(e.badMagic);
+        callRuby(rb_iv_set, p, "@badMagic", v);
+    }
     catch(const Ice::UnsupportedProtocolException& e)
     {
         VALUE m;
@@ -722,6 +739,10 @@
         volatile VALUE v = createString(e.reason);
         callRuby(rb_iv_set, p, "@reason", v);
     }
+    catch(const Ice::ConnectionManuallyClosedException& e)
+    {
+        callRuby(rb_iv_set, p, "@graceful", e.graceful ? Qtrue : Qfalse);
+    }
     catch(const Ice::FeatureNotSupportedException& e)
     {
         volatile VALUE v = createString(e.unsupportedFeature);
@@ -732,10 +753,6 @@
         volatile VALUE v = createString(e.reason);
         callRuby(rb_iv_set, p, "@reason", v);
     }
-    catch(const Ice::ConnectionManuallyClosedException& e)
-    {
-        callRuby(rb_iv_set, p, "@graceful", e.graceful ? Qtrue : Qfalse);
-    }
     catch(const Ice::LocalException&)
     {
         //
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/Util.h zeroc-ice-3.7.2/ruby/src/IceRuby/Util.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/Util.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/Util.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_UTIL_H
 #define ICE_RUBY_UTIL_H
@@ -91,6 +86,12 @@
 VALUE stringSeqToArray(const std::vector<std::string>&);
 
 //
+// Convert a vector of Ice::Byte into a Ruby array of numbers.
+// May raise RubyException.
+//
+VALUE createNumSeq(const std::vector<Ice::Byte>&);
+
+//
 // Convert a Ruby hash to Ice::Context. Returns true on success
 // and false if the value is not a hash. May raise RubyException.
 //
@@ -177,7 +178,10 @@
 
     RF_0(Fun f) : _f(f) {}
     inline VALUE operator()() { return _f(); }
-    static inline VALUE call(RF_0* f) { return (*f)(); }
+    static inline VALUE call(VALUE f)
+    {
+        return (*reinterpret_cast<RF_0*>(f))();
+    }
 
 private:
 
@@ -189,7 +193,7 @@
 {
     typedef RF_0<Fun> RF;
     RF f(fun);
-    return callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1>
@@ -199,7 +203,10 @@
 
     RF_1(Fun f, T1 t1) : _f(f), _t1(t1) {}
     inline VALUE operator()() { return _f(_t1); }
-    static inline VALUE call(RF_1* f) { return (*f)(); }
+    static inline VALUE call(VALUE f)
+    {
+        return (*reinterpret_cast<RF_1*>(f))();
+    }
 
 private:
 
@@ -212,7 +219,7 @@
 {
     typedef RF_1<Fun, T1> RF;
     RF f(fun, t1);
-    return callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1, typename T2>
@@ -222,7 +229,10 @@
 
     RF_2(Fun f, T1 t1, T2 t2) : _f(f), _t1(t1), _t2(t2) {}
     inline VALUE operator()() { return _f(_t1, _t2); }
-    static inline VALUE call(RF_2* f) { return (*f)(); }
+    static inline VALUE call(VALUE f)
+    {
+        return (*reinterpret_cast<RF_2*>(f))();
+    }
 
 private:
 
@@ -236,7 +246,7 @@
 {
     typedef RF_2<Fun, T1, T2> RF;
     RF f(fun, t1, t2);
-    return callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1, typename T2, typename T3>
@@ -246,7 +256,10 @@
 
     RF_3(Fun f, T1 t1, T2 t2, T3 t3) : _f(f), _t1(t1), _t2(t2), _t3(t3) {}
     inline VALUE operator()() { return _f(_t1, _t2, _t3); }
-    static inline VALUE call(RF_3* f) { return (*f)(); }
+    static inline VALUE call(VALUE f)
+    {
+        return (*reinterpret_cast<RF_3*>(f))();
+    }
 
 private:
 
@@ -261,7 +274,7 @@
 {
     typedef RF_3<Fun, T1, T2, T3> RF;
     RF f(fun, t1, t2, t3);
-    return callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1, typename T2, typename T3, typename T4>
@@ -271,7 +284,10 @@
 
     RF_4(Fun f, T1 t1, T2 t2, T3 t3, T4 t4) : _f(f), _t1(t1), _t2(t2), _t3(t3), _t4(t4) {}
     inline VALUE operator()() { return _f(_t1, _t2, _t3, _t4); }
-    static inline VALUE call(RF_4* f) { return (*f)(); }
+    static inline VALUE call(VALUE f)
+    {
+        return (*reinterpret_cast<RF_4*>(f))();
+    }
 
 private:
 
@@ -287,7 +303,7 @@
 {
     typedef RF_4<Fun, T1, T2, T3, T4> RF;
     RF f(fun, t1, t2, t3, t4);
-    return callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 //
@@ -318,7 +334,12 @@
 
     RFV_0(Fun f) : _f(f) {}
     inline void operator()() { _f(); }
-    static inline VALUE call(RFV_0* f) { (*f)(); return Qnil; }
+
+    static inline VALUE call(VALUE f)
+    {
+        (*reinterpret_cast<RFV_0*>(f))();
+        return Qnil;
+    }
 
 private:
 
@@ -330,7 +351,7 @@
 {
     typedef RFV_0<Fun> RF;
     RF f(fun);
-    callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1>
@@ -340,7 +361,11 @@
 
     RFV_1(Fun f, T1 t1) : _f(f), _t1(t1) {}
     inline void operator()() { _f(_t1); }
-    static inline VALUE call(RFV_1* f) { (*f)(); return Qnil; }
+    static inline VALUE call(VALUE f)
+    {
+        (*reinterpret_cast<RFV_1*>(f))();
+        return Qnil;
+    }
 
 private:
 
@@ -353,7 +378,7 @@
 {
     typedef RFV_1<Fun, T1> RF;
     RF f(fun, t1);
-    callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1, typename T2>
@@ -363,7 +388,11 @@
 
     RFV_2(Fun f, T1 t1, T2 t2) : _f(f), _t1(t1), _t2(t2) {}
     inline void operator()() { _f(_t1, _t2); }
-    static inline VALUE call(RFV_2* f) { (*f)(); return Qnil; }
+    static inline VALUE call(VALUE f)
+    {
+        (*reinterpret_cast<RFV_2*>(f))();
+        return Qnil;
+    }
 
 private:
 
@@ -377,7 +406,7 @@
 {
     typedef RFV_2<Fun, T1, T2> RF;
     RF f(fun, t1, t2);
-    callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1, typename T2, typename T3>
@@ -387,7 +416,11 @@
 
     RFV_3(Fun f, T1 t1, T2 t2, T3 t3) : _f(f), _t1(t1), _t2(t2), _t3(t3) {}
     inline void operator()() { _f(_t1, _t2, _t3); }
-    static inline VALUE call(RFV_3* f) { (*f)(); return Qnil; }
+    static inline VALUE call(VALUE f)
+    {
+        (*reinterpret_cast<RFV_3*>(f))();
+        return Qnil;
+    }
 
 private:
 
@@ -402,7 +435,7 @@
 {
     typedef RFV_3<Fun, T1, T2, T3> RF;
     RF f(fun, t1, t2, t3);
-    callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
+    callProtected(RF::call, reinterpret_cast<VALUE>(&f));
 }
 
 template<typename Fun, typename T1, typename T2, typename T3, typename T4>
@@ -412,7 +445,11 @@
 
     RFV_4(Fun f, T1 t1, T2 t2, T3 t3, T4 t4) : _f(f), _t1(t1), _t2(t2), _t3(t3), _t4(t4) {}
     inline void operator()() { _f(_t1, _t2, _t3, _t4); }
-    static inline VALUE call(RFV_4* f) { (*f)(); return Qnil; }
+    static inline VALUE call(VALUE f)
+    {
+        (*reinterpret_cast<RFV_4*>(f))();
+        return Qnil;
+    }
 
 private:
 
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/ValueFactoryManager.cpp zeroc-ice-3.7.2/ruby/src/IceRuby/ValueFactoryManager.cpp
--- zeroc-ice-3.7.1/ruby/src/IceRuby/ValueFactoryManager.cpp	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/ValueFactoryManager.cpp	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <ValueFactoryManager.h>
 #include <Types.h>
diff -Nru zeroc-ice-3.7.1/ruby/src/IceRuby/ValueFactoryManager.h zeroc-ice-3.7.2/ruby/src/IceRuby/ValueFactoryManager.h
--- zeroc-ice-3.7.1/ruby/src/IceRuby/ValueFactoryManager.h	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/src/IceRuby/ValueFactoryManager.h	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_RUBY_OBJECT_FACTORY_H
 #define ICE_RUBY_OBJECT_FACTORY_H
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/acm/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/acm/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/acm/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/acm/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def testSetACM(communicator, com)
     print "testing setACM/getACM... "
@@ -84,8 +79,8 @@
     puts "ok"
 end
 
-def allTests(communicator)
-    ref = "communicator:default -p 12010"
+def allTests(helper, communicator)
+    ref = "communicator:#{helper.getTestEndpoint()}"
     com = Test::RemoteCommunicatorPrx::uncheckedCast(communicator.stringToProxy(ref))
 
     testSetACM(communicator, com)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/acm/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/acm/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/acm/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/acm/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,48 +1,18 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-require 'Ice'
-slice_dir = Ice.getSliceDir
-if slice_dir.empty?
-    fail "Slice directory not found"
-end
 
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+require "Ice"
+Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        properties = self.createTestProperties(args:args)
+        properties.setProperty("Ice.Warn.Connections", "0")
+        self.init(properties:properties) do |communicator|
+            allTests(self, communicator)
+        end
     end
 end
-
-def run(args, communicator)
-    allTests(communicator)
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    initData.properties.setProperty("Ice.Warn.Connections", "0")
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/acm/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/acm/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/acm/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/acm/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/application/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/application/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/application/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/application/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Ice'
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/application/test.py zeroc-ice-3.7.2/ruby/test/Ice/application/test.py
--- zeroc-ice-3.7.1/ruby/test/Ice/application/test.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/application/test.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Run this test manually
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/binding/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/binding/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/binding/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/binding/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def test(b)
     if !b
@@ -30,8 +25,8 @@
     end
 end
 
-def allTests(communicator)
-    ref = "communicator:default -p 12010"
+def allTests(helper, communicator)
+    ref = "communicator:#{helper.getTestEndpoint()}"
     com = Test::RemoteCommunicatorPrx::uncheckedCast(communicator.stringToProxy(ref))
 
     print "testing binding with single endpoint... "
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/binding/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/binding/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/binding/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/binding/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,16 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-require 'Ice'
 
-Ice::loadSlice('Test.ice')
+require "Ice"
+Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def run(args, communicator)
-    allTests(communicator)
-    return true
-end
-
-begin
-    communicator = Ice::initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            allTests(self, communicator)
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/binding/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/binding/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/binding/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/binding/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/checksum/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/checksum/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/checksum/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/checksum/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def test(b)
     if !b
@@ -13,8 +8,8 @@
     end
 end
 
-def allTests(communicator)
-    ref = "test:default -p 12010"
+def allTests(helper, communicator)
+    ref = "test:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/checksum/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/checksum/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/checksum/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/checksum/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,17 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-require 'Ice'
 
-slice_dir = Ice.getSliceDir
-if slice_dir.empty?
-    fail "Slice directory not found"
-end
-
-Ice::loadSlice("'-I" + slice_dir + "' --checksum Test.ice CTypes.ice")
+require "Ice"
+Ice::loadSlice("'-I#{Ice.getSliceDir}' --checksum Test.ice CTypes.ice")
 require './AllTests'
 
-def run(args, communicator)
-    checksum = allTests(communicator)
-    checksum.shutdown()
-    return true
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            checksum = allTests(self, communicator)
+            checksum.shutdown()
+        end
+    end
 end
-
-begin
-    communicator = Ice.initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/checksum/CTypes.ice zeroc-ice-3.7.2/ruby/test/Ice/checksum/CTypes.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/checksum/CTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/checksum/CTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/checksum/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/checksum/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/checksum/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/checksum/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/defaultValue/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/defaultValue/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/defaultValue/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/defaultValue/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def allTests()
     print "testing default values... "
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/defaultValue/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/defaultValue/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/defaultValue/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/defaultValue/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,14 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-require 'Ice'
 
-Ice::loadSlice('Test.ice')
+require "Ice"
+Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        allTests()
     end
 end
-
-def run(args)
-    allTests()
-    return true
-end
-
-begin
-    status = run(ARGV)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/defaultValue/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/defaultValue/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/defaultValue/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/defaultValue/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/enums/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/enums/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/enums/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/enums/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,20 +1,9 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
-    end
-end
 
-def allTests(communicator)
-    ref = "test:default -p 12010"
+def allTests(helper, communicator)
+    ref = "test:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/enums/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/enums/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/enums/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/enums/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,17 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'Ice'
 
+require "Ice"
 Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def run(args, communicator)
-    proxy = allTests(communicator)
-    proxy.shutdown()
-    return true
-end
-
-begin
-    communicator = Ice.initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            proxy = allTests(self, communicator)
+            proxy.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/enums/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/enums/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/enums/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/enums/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/exceptions/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/exceptions/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/exceptions/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/exceptions/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def test(b)
     if !b
@@ -19,13 +14,7 @@
     end
 end
 
-def allTests(communicator)
-    platformInfo = RUBY_PLATFORM.split("-")
-    isWin32 = false
-    if platformInfo.length >= 2 && platformInfo[1] == "mswin32"
-        isWin32 = true
-    end
-
+def allTests(helper, communicator)
     print "testing value factory registration exception... "
     STDOUT.flush
     vf = ValueFactoryI.new
@@ -39,7 +28,7 @@
 
     print "testing stringToProxy... "
     STDOUT.flush
-    ref = "thrower:default -p 12010"
+    ref = "thrower:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
     puts "ok"
@@ -110,22 +99,20 @@
     #
     # We cannot invoke throwModA if the server was built with VC6.
     #
-    if !isWin32
-        begin
-            thrower.throwModA(1, 2)
-            test(false)
-        rescue Test::Mod::A => ex
-            test(ex.aMem == 1)
-            test(ex.a2Mem == 2)
-        rescue Ice::OperationNotExistException
-            #
-            # This operation is not supported in Java.
-            #
-        rescue
-            print $!
-            print $!.backtrace.join("\n")
-            test(false)
-        end
+    begin
+        thrower.throwModA(1, 2)
+        test(false)
+    rescue Test::Mod::A => ex
+        test(ex.aMem == 1)
+        test(ex.a2Mem == 2)
+    rescue Ice::OperationNotExistException
+        #
+        # This operation is not supported in Java.
+        #
+    rescue
+        print $!
+        print $!.backtrace.join("\n")
+        test(false)
     end
 
     puts "ok"
@@ -157,20 +144,18 @@
     #
     # We cannot invoke throwModA if the server was built with VC6.
     #
-    if !isWin32
-        begin
-            thrower.throwModA(1, 2)
-            test(false)
-        rescue Test::A => ex
-            test(ex.aMem == 1)
-        rescue Ice::OperationNotExistException
-            #
-            # This operation is not supported in Java.
-            #
-        rescue
-            print $!.backtrace.join("\n")
-            test(false)
-        end
+    begin
+        thrower.throwModA(1, 2)
+        test(false)
+    rescue Test::A => ex
+        test(ex.aMem == 1)
+    rescue Ice::OperationNotExistException
+        #
+        # This operation is not supported in Java.
+        #
+    rescue
+        print $!.backtrace.join("\n")
+        test(false)
     end
 
     puts "ok"
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/exceptions/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/exceptions/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/exceptions/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/exceptions/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,20 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-require 'Ice'
 
-slice_dir = Ice.getSliceDir
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+require "Ice"
+Ice::loadSlice("'-I#{Ice.getSliceDir()}' Test.ice")
 require './AllTests'
 
-def run(args, communicator)
-    thrower = allTests(communicator)
-    thrower.shutdown()
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    initData.properties.setProperty("Ice.Warn.Connections", "0")
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        properties = self.createTestProperties(args:args)
+        properties.setProperty("Ice.MessageSizeMax", "10")
+        properties.setProperty("Ice.Warn.Connections", "0")
+        self.init(properties:properties) do |communicator|
+            thrower = allTests(self, communicator)
+            thrower.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/exceptions/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/exceptions/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/facets/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/facets/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/facets/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/facets/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def test(b)
     if !b
@@ -13,7 +8,7 @@
     end
 end
 
-def allTests(communicator)
+def allTests(helper, communicator)
 
     print "testing Ice.Admin.Facets property... "
     STDOUT.flush
@@ -38,7 +33,7 @@
 
     print "testing stringToProxy... "
     STDOUT.flush
-    ref = "d:default -p 12010"
+    ref = "d:#{helper.getTestEndpoint()}"
     db = communicator.stringToProxy(ref)
     test(db)
     puts "ok"
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/facets/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/facets/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/facets/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/facets/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,17 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-require 'pathname'
-require 'Ice'
-Ice::loadSlice('Test.ice')
+require "Ice"
+Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def run(args, communicator)
-    g = allTests(communicator)
-    g.shutdown()
-    return true
-end
-
-begin
-    communicator = Ice::initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            proxy = allTests(self, communicator)
+            proxy.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/facets/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/facets/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/facets/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/facets/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/info/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/info/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/info/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/info/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def getTCPEndpointInfo(info)
     while info
@@ -25,7 +20,7 @@
     end
 end
 
-def allTests(communicator)
+def allTests(helper, communicator)
     print "testing proxy endpoint information..."
     STDOUT.flush
 
@@ -72,14 +67,16 @@
     puts "ok"
 
     defaultHost = communicator.getProperties().getProperty("Ice.Default.Host")
-    base = communicator.stringToProxy("test:default -p 12010:udp -p 12010")
+    tcpEndpoint = helper.getTestEndpoint()
+    udpEndpoint = helper.getTestEndpoint(protocol:"udp")
+    base = communicator.stringToProxy("test:#{tcpEndpoint}:#{udpEndpoint}")
     testIntf = Test::TestIntfPrx::checkedCast(base)
 
     print "test connection endpoint information..."
     STDOUT.flush
-
+    port = helper.getTestPort()
     tcpinfo = getTCPEndpointInfo(base.ice_getConnection().getEndpoint().getInfo())
-    test(tcpinfo.port == 12010)
+    test(tcpinfo.port == port)
     test(!tcpinfo.compress)
     test(tcpinfo.host == defaultHost)
 
@@ -90,7 +87,7 @@
     test(port > 0)
 
     udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
-    test(udp.port == 12010)
+    test(udp.port == port)
     test(udp.host == defaultHost)
 
     puts "ok"
@@ -106,7 +103,7 @@
 
     test(!info.incoming)
     test(info.adapterName.length == 0)
-    test(tcpinfo.remotePort == 12010)
+    test(tcpinfo.remotePort == port)
     if defaultHost == "127.0.0.1"
         test(tcpinfo.remoteAddress == defaultHost)
         test(tcpinfo.localAddress == defaultHost)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/info/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/info/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/info/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/info/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,16 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-require 'Ice'
-slice_dir = Ice.getSliceDir
-if slice_dir.empty?
-    fail "Slice directory not found"
-end
 
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+require "Ice"
+Ice::loadSlice("'-I#{Ice.getSliceDir()}' Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            allTests(self, communicator)
+        end
     end
 end
-
-def run(args, communicator)
-    allTests(communicator)
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/info/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/info/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/info/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/info/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/inheritance/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/inheritance/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/inheritance/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/inheritance/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def test(b)
     if !b
@@ -13,10 +8,10 @@
     end
 end
 
-def allTests(communicator)
+def allTests(helper, communicator)
     print "testing stringToProxy... "
     STDOUT.flush
-    ref = "initial:default -p 12010"
+    ref = "initial:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
     puts "ok"
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/inheritance/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/inheritance/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/inheritance/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/inheritance/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,17 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-require 'pathname'
-require 'Ice'
-Ice::loadSlice('Test.ice')
+require "Ice"
+Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def run(args, communicator)
-    initial = allTests(communicator)
-    initial.shutdown()
-    return true
-end
-
-begin
-    communicator = Ice.initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            initial = allTests(self, communicator)
+            initial.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/inheritance/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/inheritance/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/inheritance/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/inheritance/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/location/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/location/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/location/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/location/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def test(b)
     if !b
@@ -13,7 +8,8 @@
     end
 end
 
-def allTests(communicator, ref)
+def allTests(helper, communicator)
+    ref =  "ServerManager:#{helper.getTestEndpoint()}"
     manager = Test::ServerManagerPrx::checkedCast(communicator.stringToProxy(ref))
     locator = communicator.getDefaultLocator()
     test(manager)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/location/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/location/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/location/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/location/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,43 +1,18 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
 
-require 'Ice'
-slice_dir = Ice.getSliceDir
-if slice_dir.empty?
-    fail "Slice directory not found"
-end
-
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+require "Ice"
+Ice::loadSlice("'-I#{Ice.getSliceDir()}' Test.ice")
 require './AllTests'
 
-def run(args, communicator)
-    allTests(communicator, "ServerManager:default -p 12010")
-    return true
+class Client < ::TestHelper
+    def run(args)
+        properties = self.createTestProperties(args:args)
+        properties.setProperty("Ice.Default.Locator", "locator:#{self.getTestEndpoint(properties:properties)}")
+        self.init(properties:properties) do |communicator|
+            allTests(self, communicator)
+        end
+    end
 end
-
-begin
-    data = Ice::InitializationData.new
-    data.properties = Ice::createProperties(ARGV)
-    data.properties.setProperty("Ice.Default.Locator", "locator:default -p 12010")
-    communicator = Ice::initialize(ARGV, data)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/location/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/location/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/location/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/location/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/objects/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/objects/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/objects/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/objects/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require './TestI.rb'
 
@@ -68,7 +63,7 @@
     end
 end
 
-def allTests(communicator)
+def allTests(helper, communicator)
 
     factory = MyValueFactory.new
     communicator.getValueFactoryManager().add(factory, '::Test::B')
@@ -83,7 +78,7 @@
 
     print "testing stringToProxy... "
     STDOUT.flush
-    ref = "initial:default -p 12010"
+    ref = "initial:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
     puts "ok"
@@ -219,6 +214,31 @@
     test(i)
     puts "ok"
 
+    print "getting K... "
+    STDOUT.flush
+    k = initial.getK()
+    test(k.value.data == "l")
+    puts "ok"
+
+    print "testing Value as parameter... "
+    STDOUT.flush
+    v1 = Test::L.new("l")
+    v2, v3 = initial.opValue(v1)
+    test(v2.data == "l")
+    test(v3.data == "l")
+
+    v1 = [Test::L.new("l")]
+    v2, v3 = initial.opValueSeq(v1)
+    test(v2[0].data == "l")
+    test(v3[0].data == "l")
+
+    v1 = {}
+    v1["l"] = Test::L.new("l")
+    v2, v3 = initial.opValueMap(v1)
+    test(v2["l"].data == "l")
+    test(v3["l"].data == "l")
+    puts "ok"
+
     print "getting D1... "
     STDOUT.flush
     d1 = initial.getD1(Test::D1.new(Test::A1.new("a1"), Test::A1.new("a2"), Test::A1.new("a3"), Test::A1.new("a4")))
@@ -309,7 +329,7 @@
 
     print "testing UnexpectedObjectException... "
     STDOUT.flush
-    ref = "uoet:default -p 12010"
+    ref = "uoet:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
     uoet = Test::UnexpectedObjectExceptionTestPrx::uncheckedCast(base)
@@ -345,5 +365,24 @@
     test(communicator.getValueFactoryManager().find('TestOF') != nil)
     puts "ok"
 
+    print "testing class containing complex dictionary... "
+    STDOUT.flush
+    m = Test::M.new
+    m.v = {}
+    k1 = Test::StructKey.new(1, "1")
+    m.v[k1] = Test::L.new("one")
+    k2 = Test::StructKey.new(2, "2")
+    m.v[k2] = Test::L.new("two")
+    m1, m2 = initial.opM(m)
+    test(m1.v.length == 2)
+    test(m2.v.length == 2)
+
+    test(m1.v[k1].data == "one")
+    test(m2.v[k1].data == "one")
+
+    test(m1.v[k2].data == "two")
+    test(m2.v[k2].data == "two")
+    puts "ok"
+
     return initial
 end
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/objects/ClientPrivate.ice zeroc-ice-3.7.2/ruby/test/Ice/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/objects/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/objects/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/objects/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/objects/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,36 +1,18 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-require 'pathname'
 require 'Ice'
 Ice::loadSlice('Test.ice')
 Ice::loadSlice('ClientPrivate.ice')
 require './AllTests'
 
-def run(args, communicator)
-    initial = allTests(communicator)
-    initial.shutdown()
-    return true
-end
-
-begin
-    communicator = Ice.initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            initial = allTests(self, communicator)
+            initial.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/objects/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/objects/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
@@ -142,6 +137,32 @@
     Recursive v;
 }
 
+class K
+{
+    Value value;
+}
+
+class L
+{
+    string data;
+}
+
+sequence<Value> ValueSeq;
+dictionary<string, Value> ValueMap;
+
+struct StructKey
+{
+    int i;
+    string s;
+}
+
+dictionary<StructKey, L> LMap;
+
+class M
+{
+    LMap v;
+}
+
 class Initial
 {
     void shutdown();
@@ -160,9 +181,15 @@
 
     void getAll(out B b1, out B b2, out C theC, out D theD);
 
+    I getH();
     I getI();
     I getJ();
-    I getH();
+
+    K getK();
+
+    Value opValue(Value v1, out Value v2);
+    ValueSeq opValueSeq(ValueSeq v1, out ValueSeq v2);
+    ValueMap opValueMap(ValueMap v1, out ValueMap v2);
 
     D1 getD1(D1 d1);
     void throwEDerived() throws EDerived;
@@ -173,6 +200,8 @@
     BaseSeq opBaseSeq(BaseSeq inSeq, out BaseSeq outSeq);
 
     Compact getCompact();
+
+    M opM(M v1, out M v2);
 }
 
 }
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/objects/TestI.rb zeroc-ice-3.7.2/ruby/test/Ice/objects/TestI.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/objects/TestI.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/objects/TestI.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class BI < Test::B
     def initialize
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/operations/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/operations/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/operations/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/operations/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,20 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require './Twoways'
 require './BatchOneways'
 
-def allTests(communicator)
-    ref = "test:default -p 12010"
+def allTests(helper, communicator)
+    ref = "test:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     cl = Test::MyClassPrx::checkedCast(base)
     derived = Test::MyDerivedClassPrx::checkedCast(cl)
 
     print "testing twoway operations... "
     STDOUT.flush
-    twoways(communicator, cl)
-    twoways(communicator, derived)
+    twoways(helper, communicator, cl)
+    twoways(helper, communicator, derived)
     derived.opDerived()
     puts "ok"
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/operations/BatchOneways.rb zeroc-ice-3.7.2/ruby/test/Ice/operations/BatchOneways.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/operations/BatchOneways.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/operations/BatchOneways.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def batchOneways(p)
     bs1 = "\0" * (10 * 1024);
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/operations/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/operations/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/operations/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/operations/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,68 +1,35 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-require 'Ice'
 
-slice_dir = Ice.getSliceDir
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+require "Ice"
+Ice::loadSlice("'-I#{Ice.getSliceDir()}' Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
-    end
-end
-
-def run(args, communicator)
-    myClass = allTests(communicator)
-
-    print "testing server shutdown... "
-    STDOUT.flush
-    myClass.shutdown()
-    begin
-        myClass.ice_timeout(100).ice_ping(); # Use timeout to speed up testing on Windows
-        test(false)
-    rescue Ice::LocalException
-        puts "ok"
+class Client < ::TestHelper
+    def run(args)
+        properties = self.createTestProperties(args:args)
+        #
+        # This is not necessary since we don't have AMI support (yet).
+        #
+        #properties.setProperty('Ice.ThreadPool.Client.Size', '2')
+        #properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
+        properties.setProperty("Ice.BatchAutoFlushSize", "100")
+        self.init(properties:properties) do |communicator|
+            myClass = allTests(self, communicator)
+            print "testing server shutdown... "
+            STDOUT.flush
+            myClass.shutdown()
+            begin
+                myClass.ice_timeout(100).ice_ping(); # Use timeout to speed up testing on Windows
+                test(false)
+            rescue Ice::LocalException
+                puts "ok"
+            end
+            # Test multiple destroy calls
+            communicator.destroy()
+            communicator.destroy()
+        end
     end
-
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    #
-    # This is not necessary since we don't have AMI support (yet).
-    #
-    #initData.properties.setProperty('Ice.ThreadPool.Client.Size', '2')
-    #initData.properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
-
-    initData.properties.setProperty("Ice.BatchAutoFlushSize", "100")
-
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-
-    # Test multiple destroy calls
-    communicator.destroy()
-    communicator.destroy()
-
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
 end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/operations/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/operations/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/operations/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/operations/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/operations/Twoways.rb zeroc-ice-3.7.2/ruby/test/Ice/operations/Twoways.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/operations/Twoways.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/operations/Twoways.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-def twoways(communicator, p)
+def twoways(helper, communicator, p)
 
     literals = p.opStringLiterals();
 
@@ -1239,7 +1234,7 @@
 
         ctx = {'one'=>'ONE', 'two'=>'TWO', 'three'=>'THREE'}
 
-        p = Test::MyClassPrx::uncheckedCast(ic.stringToProxy('test:default -p 12010'))
+        p = Test::MyClassPrx::uncheckedCast(ic.stringToProxy("test:#{helper.getTestEndpoint()}"))
 
         ic.getImplicitContext().setContext(ctx)
         test(ic.getImplicitContext().getContext() == ctx)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/optional/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/optional/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/optional/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/optional/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,22 +1,11 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
-    end
-end
 
-def allTests(communicator)
+def allTests(helper, communicator)
     print "testing stringToProxy... "
     STDOUT.flush
-    ref = "initial:default -p 12010"
+    ref = "initial:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
     puts "ok"
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/optional/ClientPrivate.ice zeroc-ice-3.7.2/ruby/test/Ice/optional/ClientPrivate.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/optional/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/optional/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/optional/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/optional/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/optional/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/optional/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,41 +1,17 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Ice'
-
 Ice::loadSlice("--all -I. ClientPrivate.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            initial = allTests(self, communicator)
+            initial.shutdown()
+        end
     end
 end
-
-def run(args, communicator)
-    initial = allTests(communicator)
-    initial.shutdown()
-    return true
-end
-
-begin
-    communicator = Ice.initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/optional/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/optional/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/optional/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/optional/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/properties/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/properties/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/properties/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/properties/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,12 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
-# **********************************************************************
+# encoding: utf-8
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Ice'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
-    end
-end
-
-class Client < Ice::Application
+class App < Ice::Application
     def run(args)
         print "testing load properties from UTF-8 path using Ice::Application... "
         properties = Ice::Application::communicator().getProperties()
@@ -31,53 +20,56 @@
     end
 end
 
-print "testing load properties from UTF-8 path... "
-properties = Ice.createProperties(ARGV)
-properties.load("./config/中国_client.config")
-test(properties.getProperty("Ice.Trace.Network") == "1")
-test(properties.getProperty("Ice.Trace.Protocol") == "1")
-test(properties.getProperty("Config.Path").eql? "./config/中国_client.config")
-test(properties.getProperty("Ice.ProgramName") == "PropertiesClient")
-puts "ok"
-
-app = Client.new()
-app.main(ARGV, "./config/中国_client.config")
-
-print "testing using Ice.Config with multiple config files... "
-properties = Ice.createProperties(["--Ice.Config=config/config.1, config/config.2, config/config.3"]);
-test(properties.getProperty("Config1") == "Config1");
-test(properties.getProperty("Config2") == "Config2");
-test(properties.getProperty("Config3") == "Config3");
-puts "ok"
-
-print "testing configuration file escapes... "
-properties = Ice.createProperties(["--Ice.Config=config/escapes.cfg"])
-
-props = { "Foo\tBar" => "3",
-          "Foo\\tBar" => "4",
-          "Escape\\ Space" => "2",
-          "Prop1" => "1",
-          "Prop2" => "2",
-          "Prop3" => "3",
-          "My Prop1" => "1",
-          "My Prop2" => "2",
-          "My.Prop1" => "a property",
-          "My.Prop2" => "a     property",
-          "My.Prop3" => "  a     property  ",
-          "My.Prop4" => "  a     property  ",
-          "My.Prop5" => "a \\ property",
-          "foo=bar" => "1",
-          "foo#bar" => "2",
-          "foo bar" => "3",
-          "A" => "1",
-          "B" => "2 3 4",
-          "C" => "5=#6",
-          "AServer" => "\\\\server\\dir",
-          "BServer" => "\\server\\dir" }
+class Client < ::TestHelper
+    def run(args)
 
-props.each do |key, value|
-   test(properties.getProperty(key) == value)
-end
-puts "ok"
+        print "testing load properties from UTF-8 path... "
+        properties = Ice.createProperties(args)
+        properties.load("./config/中国_client.config")
+        test(properties.getProperty("Ice.Trace.Network") == "1")
+        test(properties.getProperty("Ice.Trace.Protocol") == "1")
+        test(properties.getProperty("Config.Path").eql? "./config/中国_client.config")
+        test(properties.getProperty("Ice.ProgramName") == "PropertiesClient")
+        puts "ok"
+
+        app = App.new()
+        app.main(args, "./config/中国_client.config")
+
+        print "testing using Ice.Config with multiple config files... "
+        properties = Ice.createProperties(["--Ice.Config=config/config.1, config/config.2, config/config.3"]);
+        test(properties.getProperty("Config1") == "Config1");
+        test(properties.getProperty("Config2") == "Config2");
+        test(properties.getProperty("Config3") == "Config3");
+        puts "ok"
 
-exit(0)
+        print "testing configuration file escapes... "
+        properties = Ice.createProperties(["--Ice.Config=config/escapes.cfg"])
+
+        props = { "Foo\tBar" => "3",
+                  "Foo\\tBar" => "4",
+                  "Escape\\ Space" => "2",
+                  "Prop1" => "1",
+                  "Prop2" => "2",
+                  "Prop3" => "3",
+                  "My Prop1" => "1",
+                  "My Prop2" => "2",
+                  "My.Prop1" => "a property",
+                  "My.Prop2" => "a     property",
+                  "My.Prop3" => "  a     property  ",
+                  "My.Prop4" => "  a     property  ",
+                  "My.Prop5" => "a \\ property",
+                  "foo=bar" => "1",
+                  "foo#bar" => "2",
+                  "foo bar" => "3",
+                  "A" => "1",
+                  "B" => "2 3 4",
+                  "C" => "5=#6",
+                  "AServer" => "\\\\server\\dir",
+                  "BServer" => "\\server\\dir" }
+
+        props.each do |key, value|
+            test(properties.getProperty(key) == value)
+        end
+        puts "ok"
+    end
+end
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/proxy/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/proxy/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/proxy/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/proxy/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-def allTests(communicator)
+def allTests(helper, communicator)
     print "testing stringToProxy... "
     STDOUT.flush
-    ref = "test:default -p 12010"
+    ref = "test:#{helper.getTestEndpoint()}"
     base = communicator.stringToProxy(ref)
     test(base)
 
@@ -192,7 +187,7 @@
     STDOUT.flush
     prop = communicator.getProperties()
     propertyPrefix = "Foo.Proxy"
-    prop.setProperty(propertyPrefix, "test:default -p 12010")
+    prop.setProperty(propertyPrefix, "test:#{helper.getTestEndpoint()}")
     b1 = communicator.propertyToProxy(propertyPrefix)
     test(b1.ice_getIdentity().name == "test" && b1.ice_getIdentity().category.empty? && \
          b1.ice_getAdapterId().empty? && b1.ice_getFacet().empty?)
@@ -234,7 +229,7 @@
     #test(b1.ice_getLocatorCacheTimeout() == 60)
     #prop.setProperty("Ice::Default.LocatorCacheTimeout", "")
 
-    prop.setProperty(propertyPrefix, "test:default -p 12010")
+    prop.setProperty(propertyPrefix, "test:#{helper.getTestEndpoint()}")
 
     property = propertyPrefix + ".Router"
     test(!b1.ice_getRouter())
@@ -692,7 +687,7 @@
 
     print "testing encoding versioning... "
     STDOUT.flush
-    ref20 = "test -e 2.0:default -p 12010";
+    ref20 = "test -e 2.0:#{helper.getTestEndpoint()}";
     cl20 = Test::MyClassPrx::uncheckedCast(communicator.stringToProxy(ref20));
     begin
         cl20.ice_ping();
@@ -701,7 +696,7 @@
         # Server 2.0 endpoint doesn't support 1.1 version.
     end
 
-    ref10 = "test -e 1.0:default -p 12010"
+    ref10 = "test -e 1.0:#{helper.getTestEndpoint()}"
     cl10 = Test::MyClassPrx::uncheckedCast(communicator.stringToProxy(ref10))
     cl10.ice_ping()
     cl10.ice_encodingVersion(Ice::Encoding_1_0).ice_ping()
@@ -709,7 +704,7 @@
 
     # 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
     # call will use the 1.1 encoding
-    ref13 = "test -e 1.3:default -p 12010"
+    ref13 = "test -e 1.3:#{helper.getTestEndpoint()}"
     cl13 = Test::MyClassPrx::uncheckedCast(communicator.stringToProxy(ref13))
     cl13.ice_ping()
 
@@ -808,9 +803,6 @@
     if communicator.getProperties().getPropertyAsInt("Ice.IPv6") == 0
         ssl = communicator.getProperties().getProperty("Ice.Default.Protocol") == "ssl"
         tcp = communicator.getProperties().getProperty("Ice.Default.Protocol") == "tcp"
-        if tcp
-            p1.ice_encodingVersion(Ice::Encoding_1_0).ice_ping()
-        end
 
         # Two legal TCP endpoints expressed as opaque endpoints
         p1 = communicator.stringToProxy("test -e 1.0:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAA==")
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/proxy/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/proxy/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/proxy/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/proxy/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,49 +1,17 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-require 'pathname'
 require 'Ice'
-slice_dir = Ice.getSliceDir
-if slice_dir.empty?
-    fail "Slice directory not found"
-end
-
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+Ice::loadSlice("'-I#{Ice.getSliceDir()}' Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            initial = allTests(self, communicator)
+            initial.shutdown()
+        end
     end
 end
-
-def run(args, communicator)
-    myClass = allTests(communicator)
-
-    myClass.shutdown()
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/proxy/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/proxy/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/proxy/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/proxy/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/scope/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/scope/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/scope/AllTests.rb	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/scope/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,149 @@
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+def allTests(helper, communicator)
+
+    print "test same Slice type name in different scopes... "
+    STDOUT.flush
+
+    i1 = Test::IPrx::checkedCast(communicator.stringToProxy("i1:#{helper.getTestEndpoint()}"))
+
+    s1 = Test::S.new(0)
+    s2, s3 = i1.opS(s1)
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+    sseq2, sseq3 = i1.opSSeq(sseq1)
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {}
+    smap1["a"] = s1
+    smap2, smap3 = i1.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test::C.new(s1)
+    c2, c3 = i1.opC(c1)
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i1.opCSeq(cseq1)
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {}
+    cmap1["a"] = c1
+    cmap2, cmap3 = i1.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i2 = Test::Inner::Inner2::IPrx::checkedCast(communicator.stringToProxy("i2:#{helper.getTestEndpoint()}"))
+
+    s1 = Test::Inner::Inner2::S.new(0)
+    s2, s3 = i2.opS(s1)
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+    sseq2, sseq3 = i2.opSSeq(sseq1)
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {}
+    smap1["a"] = s1
+    smap2, smap3 = i2.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test::Inner::Inner2::C.new(s1)
+    c2, c3 = i2.opC(c1)
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i2.opCSeq(cseq1)
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {}
+    cmap1["a"] = c1
+    cmap2, cmap3 = i2.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i3 = Test::Inner::IPrx::checkedCast(communicator.stringToProxy("i3:#{helper.getTestEndpoint()}"))
+
+    s1 = Test::Inner::Inner2::S.new(0)
+    s2, s3 = i3.opS(s1)
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+    sseq2, sseq3 = i3.opSSeq(sseq1)
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {}
+    smap1["a"] = s1
+    smap2, smap3 = i3.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test::Inner::Inner2::C.new(s1)
+    c2, c3 = i3.opC(c1)
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i3.opCSeq(cseq1)
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {}
+    cmap1["a"] = c1
+    cmap2, cmap3 = i3.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i4 = Inner::Test::Inner2::IPrx::checkedCast(communicator.stringToProxy("i4:#{helper.getTestEndpoint()}"))
+
+    s1 = Test::S.new(0)
+    s2, s3 = i4.opS(s1)
+    test(s2 == s1)
+    test(s3 == s1)
+
+    sseq1 = [s1]
+    sseq2, sseq3 = i4.opSSeq(sseq1)
+    test(sseq2[0] == s1)
+    test(sseq3[0] == s1)
+
+    smap1 = {}
+    smap1["a"] = s1
+    smap2, smap3 = i4.opSMap(smap1)
+    test(smap2["a"] == s1)
+    test(smap3["a"] == s1)
+
+    c1 = Test::C.new(s1)
+    c2, c3 = i4.opC(c1)
+    test(c2.s == s1)
+    test(c3.s == s1)
+
+    cseq1 = [c1]
+    cseq2, cseq3 = i4.opCSeq(cseq1)
+    test(cseq2[0].s == s1)
+    test(cseq3[0].s == s1)
+
+    cmap1 = {}
+    cmap1["a"] = c1
+    cmap2, cmap3 = i4.opCMap(cmap1)
+    test(cmap2["a"].s == s1)
+    test(cmap3["a"].s == s1)
+
+    i1.shutdown()
+    puts "ok"
+
+end
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/scope/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/scope/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/scope/Client.rb	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/scope/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+require 'Ice'
+Ice::loadSlice("Test.ice")
+require './AllTests'
+
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            allTests(self, communicator)
+        end
+    end
+end
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/scope/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/scope/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/scope/Test.ice	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/scope/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,136 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#pragma once
+
+module Test
+{
+    struct S
+    {
+        int v;
+    }
+
+    dictionary<string, S> SMap;
+    sequence<S> SSeq;
+
+    class C
+    {
+        S s;
+    }
+
+    dictionary<string, C> CMap;
+    sequence<C> CSeq;
+
+    interface I
+    {
+        S opS(S s1, out S s2);
+        SSeq opSSeq(SSeq s1, out SSeq s2);
+        SMap opSMap(SMap s1, out SMap s2);
+
+        C opC(C c1, out C c2);
+        CSeq opCSeq(CSeq s1, out CSeq s2);
+        CMap opCMap(CMap c1, out CMap c2);
+
+        void shutdown();
+    }
+
+    dictionary<string, I*> IMap;
+    sequence<I*> ISeq;
+
+    module Inner
+    {
+        struct S
+        {
+            int v;
+        }
+
+        module Inner2
+        {
+            struct S
+            {
+                int v;
+            }
+
+            dictionary<string, S> SMap;
+            sequence<S> SSeq;
+
+            class C
+            {
+                S s;
+            }
+
+            dictionary<string, C> CMap;
+            sequence<C> CSeq;
+
+            interface I
+            {
+                S opS(S s1, out S s2);
+                SSeq opSSeq(SSeq s1, out SSeq s2);
+                SMap opSMap(SMap s1, out SMap s2);
+
+                C opC(C c1, out C c2);
+                CSeq opCSeq(CSeq c1, out CSeq c2);
+                CMap opCMap(CMap c1, out CMap c2);
+
+                void shutdown();
+            }
+
+            dictionary<string, I*> IMap;
+            sequence<I*> ISeq;
+        }
+
+        class C
+        {
+            S s;
+        }
+
+        sequence<Inner2::S> SSeq;
+        dictionary<string, Inner2::S> SMap;
+
+        dictionary<string, Inner2::C> CMap;
+        sequence<Inner2::C> CSeq;
+
+        interface I
+        {
+            Inner2::S opS(Inner2::S s1, out Inner2::S s2);
+            Inner2::SSeq opSSeq(Inner2::SSeq s1, out Inner2::SSeq s2);
+            Inner2::SMap opSMap(Inner2::SMap s1, out Inner2::SMap s2);
+
+            Inner2::C opC(Inner2::C c1, out Inner2::C c2);
+            Inner2::CSeq opCSeq(Inner2::CSeq c1, out Inner2::CSeq c2);
+            Inner2::CMap opCMap(Inner2::CMap c1, out Inner2::CMap c2);
+
+            void shutdown();
+        }
+
+        dictionary<string, I*> IMap;
+        sequence<I*> ISeq;
+    }
+}
+
+module Inner
+{
+
+module Test
+{
+
+module Inner2
+{
+    interface I
+    {
+        Test::S opS(Test::S s1, out Test::S s2);
+        Test::SSeq opSSeq(Test::SSeq s1, out Test::SSeq s2);
+        Test::SMap opSMap(Test::SMap s1, out Test::SMap s2);
+
+        Test::C opC(Test::C c1, out Test::C c2);
+        Test::CSeq opCSeq(Test::CSeq c1, out Test::CSeq c2);
+        Test::CMap opCMap(Test::CMap c1, out Test::CMap c2);
+
+        void shutdown();
+    }
+}
+
+}
+
+}
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/slicing/exceptions/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/slicing/exceptions/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/slicing/exceptions/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/slicing/exceptions/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def test(b)
     if !b
@@ -13,8 +8,8 @@
     end
 end
 
-def allTests(communicator)
-    obj = communicator.stringToProxy("Test:default -p 12010")
+def allTests(helper, communicator)
+    obj = communicator.stringToProxy("Test:#{helper.getTestEndpoint()}")
     t = Test::TestIntfPrx::checkedCast(obj)
 
     print "base... "
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/slicing/exceptions/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/slicing/exceptions/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/slicing/exceptions/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/slicing/exceptions/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,35 +1,17 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-require 'pathname'
 require 'Ice'
 Ice::loadSlice('Test.ice')
 require './AllTests'
 
-def run(args, communicator)
-    t = allTests(communicator)
-    t.shutdown()
-    return true
-end
-
-begin
-    communicator = Ice.initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do | communicator|
+            t = allTests(self, communicator)
+            t.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/slicing/exceptions/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/slicing/exceptions/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/slicing/exceptions/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/slicing/exceptions/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,23 +1,12 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'Ice'
 Ice::loadSlice('-I. --all ClientPrivate.ice')
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
-    end
-end
-
-def allTests(communicator)
-    obj = communicator.stringToProxy("Test:default -p 12010")
+def allTests(helper, communicator)
+    obj = communicator.stringToProxy("Test:#{helper.getTestEndpoint()}")
     t = Test::TestIntfPrx::checkedCast(obj)
 
     print "base as Object... "
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/ClientPrivate.ice zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/ClientPrivate.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/ClientPrivate.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/ClientPrivate.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,15 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-require 'pathname'
 require './AllTests'
 
-def run(args, communicator)
-    t = allTests(communicator)
-    t.shutdown()
-    return true
-end
-
-begin
-    communicator = Ice.initialize(ARGV)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            t = allTests(self, communicator)
+            t.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/slicing/objects/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/slicing/objects/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/timeout/AllTests.rb zeroc-ice-3.7.2/ruby/test/Ice/timeout/AllTests.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/timeout/AllTests.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/timeout/AllTests.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def connect(prx)
     nRetry = 10
@@ -21,15 +16,16 @@
     return prx.ice_getConnection()
 end
 
-def allTests(communicator)
-    sref = "timeout:default -p 12010"
+def allTests(helper, communicator)
+    sref = "timeout:#{helper.getTestEndpoint()}"
     obj = communicator.stringToProxy(sref)
     test(obj)
 
     timeout = Test::TimeoutPrx::checkedCast(obj)
     test(timeout)
 
-    controller = Test::ControllerPrx::checkedCast(communicator.stringToProxy("controller:default -p 12011"))
+    controller = Test::ControllerPrx::checkedCast(
+        communicator.stringToProxy("controller:#{helper.getTestEndpoint(num:1)}"))
     test(controller)
 
     print "testing connect timeout... "
@@ -51,7 +47,7 @@
     #
     # Expect success.
     #
-    to = Test::TimeoutPrx::uncheckedCast(obj.ice_timeout(2000))
+    to = Test::TimeoutPrx::uncheckedCast(obj.ice_timeout(-1))
     controller.holdAdapter(100)
     begin
         to.op()
@@ -235,7 +231,7 @@
     controller.holdAdapter(-1);
     now = Time.now
     comm.destroy();
-    test((Time.now - now) < 0.7);
+    test((Time.now - now) < 1.0);
     controller.resumeAdapter()
 
     puts "ok"
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/timeout/Client.rb zeroc-ice-3.7.2/ruby/test/Ice/timeout/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Ice/timeout/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/timeout/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,68 +1,38 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
-require 'pathname'
 require 'Ice'
-slice_dir = Ice.getSliceDir
-if slice_dir.empty?
-    fail "Slice directory not found"
-end
-
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+Ice::loadSlice("'-I#{Ice.getSliceDir()}' Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        #
+        # In this test, we need at least two threads in the
+        # client side thread pool for nested AMI.
+        #
+        properties = self.createTestProperties(args:args)
+
+        #
+        # For this test, we want to disable retries.
+        #
+        properties.setProperty('Ice.RetryIntervals', '-1')
+
+        #
+        # This test kills connections, so we don't want warnings.
+        #
+        properties.setProperty('Ice.Warn.Connections', '0')
+
+        #
+        # Limit the send buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        properties.setProperty("Ice.TCP.SndSize", "50000");
+
+        self.init(properties:properties) do |communicator|
+            allTests(self, communicator)
+        end
     end
 end
-
-def run(args, communicator)
-    allTests(communicator)
-    return true
-end
-
-begin
-    #
-    # In this test, we need at least two threads in the
-    # client side thread pool for nested AMI.
-    #
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-
-    #
-    # For this test, we want to disable retries.
-    #
-    initData.properties.setProperty('Ice.RetryIntervals', '-1')
-
-    #
-    # This test kills connections, so we don't want warnings.
-    #
-    initData.properties.setProperty('Ice.Warn.Connections', '0')
-
-    #
-    # Limit the send buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Ice/timeout/Test.ice zeroc-ice-3.7.2/ruby/test/Ice/timeout/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Ice/timeout/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Ice/timeout/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Slice/escape/Clash.ice zeroc-ice-3.7.2/ruby/test/Slice/escape/Clash.ice
--- zeroc-ice-3.7.1/ruby/test/Slice/escape/Clash.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Slice/escape/Clash.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore"]]
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Slice/escape/Client.rb zeroc-ice-3.7.2/ruby/test/Slice/escape/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Slice/escape/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Slice/escape/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,82 +1,42 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-
-rubyDir = nil
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]
-    path = Pathname.new(toplevel).join("ruby", "Ice.rb")
-    if path.file?
-        rubyDir = Pathname.new(toplevel).join("ruby")
-        break
-    end
-end
-if not rubyDir
-    fail "can't find toplevel directory!"
-end
 
 require 'Ice'
 Ice::loadSlice('Key.ice')
 Ice::loadSlice('Clash.ice')
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            print "testing type names... "
+            STDOUT.flush
+            a = BEGIN_::END_::Alias
+            b = BEGIN_::And.new
+            b._begin = 0;
+            c = BEGIN_::BreakPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
+            test(c.method(:_case))
+            test(c.method(:_to_a))
+            test(c.method(:_instance_variable_set))
+            test(c.method(:_instance_variables))
+            d1 = BEGIN_::Display.new
+            d1._when = 0
+            d1._do = 0
+            d1._dup = communicator.stringToProxy("test:tcp")
+            d1._else = 0
+            e = BEGIN_::ElsifPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
+            test(e.method(:_case))
+            f = BEGIN_::Next.new
+            f._new = 0
+            g = BEGIN_::Nil.new
+            g._new = 0
+            g._not = 0
+            g._or = 0
+            # TODO: Test local interface
+            #h = BEGIN_::ExtendPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
+            i = BEGIN_::Redo
+            puts "ok"
+        end
     end
 end
-
-def run(args, communicator)
-    print "testing type names... "
-    STDOUT.flush
-    a = BEGIN_::END_::Alias
-    b = BEGIN_::And.new
-    b._begin = 0;
-    c = BEGIN_::BreakPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
-    test(c.method(:_case))
-    test(c.method(:_to_a))
-    test(c.method(:_instance_variable_set))
-    test(c.method(:_instance_variables))
-    d1 = BEGIN_::Display.new
-    d1._when = 0
-    d1._do = 0
-    d1._dup = communicator.stringToProxy("test:tcp")
-    d1._else = 0
-    e = BEGIN_::ElsifPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
-    test(e.method(:_case))
-    f = BEGIN_::Next.new
-    f._new = 0
-    g = BEGIN_::Nil.new
-    g._new = 0
-    g._not = 0
-    g._or = 0
-    # TODO: Test local interface
-    #h = BEGIN_::ExtendPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
-    i = BEGIN_::Redo
-    puts "ok"
-
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Slice/escape/Key.ice zeroc-ice-3.7.2/ruby/test/Slice/escape/Key.ice
--- zeroc-ice-3.7.1/ruby/test/Slice/escape/Key.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Slice/escape/Key.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["underscore", "suppress-warning:deprecated"]]
 
diff -Nru zeroc-ice-3.7.1/ruby/test/Slice/macros/Client.rb zeroc-ice-3.7.2/ruby/test/Slice/macros/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Slice/macros/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Slice/macros/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,57 +1,26 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-
-rubyDir = nil
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]
-    path = Pathname.new(toplevel).join("ruby", "Ice.rb")
-    if path.file?
-        rubyDir = Pathname.new(toplevel).join("ruby")
-        break
-    end
-end
-if not rubyDir
-    fail "can't find toplevel directory!"
-end
 
 require 'Ice'
 Ice::loadSlice('Test.ice')
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        print "testing Slice predefined macros... "
+        STDOUT.flush
+        d = Test::Default.new
+        test(d.x == 10)
+        test(d.y == 10)
+
+        nd = Test::NoDefault.new
+        test(nd.x != 10)
+        test(nd.y != 10)
+
+        c = Test::RubyOnly.new
+        test(c.lang.eql? "ruby")
+        test(c.version == Ice::intVersion())
+        puts "ok"
     end
 end
-
-status = true
-
-begin
-    print "testing Slice predefined macros... "
-    STDOUT.flush
-    d = Test::Default.new
-    test(d.x == 10)
-    test(d.y == 10)
-
-    nd = Test::NoDefault.new
-    test(nd.x != 10)
-    test(nd.y != 10)
-
-    c = Test::RubyOnly.new
-    test(c.lang.eql? "ruby")
-    test(c.version == Ice::intVersion())
-    puts "ok"
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Slice/macros/Test.ice zeroc-ice-3.7.2/ruby/test/Slice/macros/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Slice/macros/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Slice/macros/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 //
 // This macro sets the default value only when compiling with slice2rb.
diff -Nru zeroc-ice-3.7.1/ruby/test/Slice/structure/Client.rb zeroc-ice-3.7.2/ruby/test/Slice/structure/Client.rb
--- zeroc-ice-3.7.1/ruby/test/Slice/structure/Client.rb	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Slice/structure/Client.rb	2019-02-05 18:03:04.000000000 +0000
@@ -1,223 +1,179 @@
 #!/usr/bin/env ruby
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-require 'pathname'
-
-rubyDir = nil
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]
-    path = Pathname.new(toplevel).join("ruby", "Ice.rb")
-    if path.file?
-        rubyDir = Pathname.new(toplevel).join("ruby")
-        break
-    end
-end
-if not rubyDir
-    fail "can't find toplevel directory!"
-end
 
 require 'Ice'
 Ice::loadSlice('Test.ice')
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
-    end
-end
-
-def allTests(communicator)
-    print "testing equals() for Slice structures... "
-    STDOUT.flush
-
-    #
-    # Define some default values.
-    #
-    def_s2 = Test::S2.new(true, 98, 99, 100, 101, 1.0, 2.0, "string", ["one", "two", "three"], {"abc"=>"def"}, \
-                          Test::S1.new("name"), Test::C.new(5), communicator.stringToProxy("test"))
-
-    #
-    # Compare default-constructed structures.
-    #
-    test(Test::S2.new.eql?(Test::S2.new))
-
-    #
-    # Change one primitive member at a time.
-    #
-    v = def_s2.clone
-    test(v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.bo = false
-    test(!v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.by = v.by - 1
-    test(!v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.sh = v.sh - 1
-    test(!v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.i = v.i - 1
-    test(!v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.l = v.l - 1
-    test(!v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.f = v.f - 1
-    test(!v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.d = v.d - 1
-    test(!v.eql?(def_s2))
-
-    v = def_s2.clone
-    v.str = ""
-    test(!v.eql?(def_s2))
-
-    #
-    # String member
-    #
-    v1 = def_s2.clone
-    v1.str = "string"
-    test(v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v1.str = nil
-    test(!v1.eql?(v2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v2.str = nil
-    test(!v1.eql?(v2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v1.str = nil
-    v2.str = nil
-    test(v1.eql?(v2))
-
-    #
-    # Sequence member
-    #
-    v1 = def_s2.clone
-    v1.ss = def_s2.ss.clone
-    test(v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v1.ss = []
-    test(!v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v1.ss = ["one", "two", "three"]
-    test(v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v1.ss = nil
-    test(!v1.eql?(v2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v2.ss = nil
-    test(!v1.eql?(v2))
-
-    #
-    # Dictionary member
-    #
-    v1 = def_s2.clone
-    v1.sd = {"abc"=>"def"}
-    test(v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v1.sd = {}
-    test(!v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v1.sd = nil
-    test(!v1.eql?(v2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v2.sd = nil
-    test(!v1.eql?(v2))
-
-    #
-    # Struct member
-    #
-    v1 = def_s2.clone
-    v1.s = def_s2.s.clone
-    test(v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v1.s = Test::S1.new("name")
-    test(v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v1.s = Test::S1.new("noname")
-    test(!v1.eql?(def_s2))
-
-    #
-    # Class member
-    #
-    v1 = def_s2.clone
-    v1.cls = def_s2.cls.clone
-    test(!v1.eql?(def_s2))
-
-    #
-    # Proxy member
-    #
-    v1 = def_s2.clone
-    v1.prx = communicator.stringToProxy("test")
-    test(v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v1.prx = communicator.stringToProxy("test2")
-    test(!v1.eql?(def_s2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v1.prx = nil
-    test(!v1.eql?(v2))
-
-    v1 = def_s2.clone
-    v2 = def_s2.clone
-    v2.prx = nil
-    test(!v1.eql?(v2))
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            print "testing equals() for Slice structures... "
+            STDOUT.flush
+
+            #
+            # Define some default values.
+            #
+            def_s2 = Test::S2.new(true, 98, 99, 100, 101, 1.0, 2.0, "string", ["one", "two", "three"], {"abc"=>"def"}, \
+                                  Test::S1.new("name"), Test::C.new(5), communicator.stringToProxy("test"))
+
+            #
+            # Compare default-constructed structures.
+            #
+            test(Test::S2.new.eql?(Test::S2.new))
+
+            #
+            # Change one primitive member at a time.
+            #
+            v = def_s2.clone
+            test(v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.bo = false
+            test(!v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.by = v.by - 1
+            test(!v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.sh = v.sh - 1
+            test(!v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.i = v.i - 1
+            test(!v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.l = v.l - 1
+            test(!v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.f = v.f - 1
+            test(!v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.d = v.d - 1
+            test(!v.eql?(def_s2))
+
+            v = def_s2.clone
+            v.str = ""
+            test(!v.eql?(def_s2))
+
+            #
+            # String member
+            #
+            v1 = def_s2.clone
+            v1.str = "string"
+            test(v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v1.str = nil
+            test(!v1.eql?(v2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v2.str = nil
+            test(!v1.eql?(v2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v1.str = nil
+            v2.str = nil
+            test(v1.eql?(v2))
+
+            #
+            # Sequence member
+            #
+            v1 = def_s2.clone
+            v1.ss = def_s2.ss.clone
+            test(v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v1.ss = []
+            test(!v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v1.ss = ["one", "two", "three"]
+            test(v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v1.ss = nil
+            test(!v1.eql?(v2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v2.ss = nil
+            test(!v1.eql?(v2))
+
+            #
+            # Dictionary member
+            #
+            v1 = def_s2.clone
+            v1.sd = {"abc"=>"def"}
+            test(v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v1.sd = {}
+            test(!v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v1.sd = nil
+            test(!v1.eql?(v2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v2.sd = nil
+            test(!v1.eql?(v2))
+
+            #
+            # Struct member
+            #
+            v1 = def_s2.clone
+            v1.s = def_s2.s.clone
+            test(v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v1.s = Test::S1.new("name")
+            test(v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v1.s = Test::S1.new("noname")
+            test(!v1.eql?(def_s2))
+
+            #
+            # Class member
+            #
+            v1 = def_s2.clone
+            v1.cls = def_s2.cls.clone
+            test(!v1.eql?(def_s2))
+
+            #
+            # Proxy member
+            #
+            v1 = def_s2.clone
+            v1.prx = communicator.stringToProxy("test")
+            test(v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v1.prx = communicator.stringToProxy("test2")
+            test(!v1.eql?(def_s2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v1.prx = nil
+            test(!v1.eql?(v2))
+
+            v1 = def_s2.clone
+            v2 = def_s2.clone
+            v2.prx = nil
+            test(!v1.eql?(v2))
 
-    puts "ok"
-end
-
-def run(args, communicator)
-    allTests(communicator)
-
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
+            puts "ok"
+        end
+    end
 end
-
-exit(status ? 0 : 1)
diff -Nru zeroc-ice-3.7.1/ruby/test/Slice/structure/Test.ice zeroc-ice-3.7.2/ruby/test/Slice/structure/Test.ice
--- zeroc-ice-3.7.1/ruby/test/Slice/structure/Test.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/Slice/structure/Test.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 [["cpp:include:list"]]
 
diff -Nru zeroc-ice-3.7.1/ruby/test/TestHelper.rb zeroc-ice-3.7.2/ruby/test/TestHelper.rb
--- zeroc-ice-3.7.1/ruby/test/TestHelper.rb	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/ruby/test/TestHelper.rb	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,107 @@
+#!/usr/bin/env ruby
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+require "Ice"
+
+class TestHelper
+    def initialize
+        @communicator = nil
+    end
+
+    def getTestEndpoint(properties:nil, num:0, protocol:"")
+        if properties.nil?
+            properties = @communicator.getProperties()
+        end
+
+        if protocol.empty?
+            protocol = properties.getPropertyWithDefault("Ice.Default.Protocol", "default")
+        end
+
+        port = properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num
+
+        return "#{protocol} -p #{port}"
+    end
+
+    def getTestHost(properties:nil)
+        if properties.nil?
+            properties = @communicator.getProperties()
+        end
+        return properties.getPropertyWithDefault("Ice.Default.Host", "127.0.0.1")
+    end
+
+    def getTestProtocol(properties:nil)
+        if properties.nil?
+            properties = @communicator.getProperties()
+        end
+        return properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp")
+    end
+
+    def getTestPort(properties:nil, num:0)
+        if properties.nil?
+            properties = @communicator.getProperties()
+        end
+        return properties.getPropertyAsIntWithDefault("Test.BasePort", 12010) + num
+    end
+
+    def createTestProperties(args:[])
+        properties = Ice::createProperties(args)
+        properties.parseCommandLineOptions("Test", args)
+        return properties
+    end
+
+    def init(initData:nil, properties:nil, args:[])
+        if initData.nil?
+            initData = Ice::InitializationData.new
+            unless properties.nil?
+                initData.properties = properties
+            else
+                initData.properties = self.createTestProperties(args:args)
+            end
+        end
+
+        communicator = Ice.initialize(initData)
+        if @communicator.nil?
+            @communicator = communicator
+        end
+        begin
+            yield communicator
+        ensure
+            communicator.destroy()
+        end
+    end
+
+    def communicator
+        return @communicator
+    end
+
+    def shutdown
+        unless @communicator.nil?
+            @communicator.shutdown()
+        end
+    end
+
+    def self.run
+        begin
+            moduleName = File.basename(ARGV[0], ".rb")
+            require moduleName
+            cls = Object.const_get moduleName
+            helper = cls.new
+            helper.run(ARGV.drop(1))
+            exit(0)
+        rescue => ex
+            puts $!
+            print ex.backtrace.join("\n")
+            exit(1)
+        end
+    end
+end
+
+def test(b)
+    if !b
+        raise RuntimeError, 'test assertion failed'
+    end
+end
+
+TestHelper.run()
diff -Nru zeroc-ice-3.7.1/scripts/Component.py zeroc-ice-3.7.2/scripts/Component.py
--- zeroc-ice-3.7.1/scripts/Component.py	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/Component.py	2019-02-05 18:03:04.000000000 +0000
@@ -0,0 +1,258 @@
+#
+# Copyright (c) ZeroC, Inc. All rights reserved.
+#
+
+import os
+
+from Util import *
+
+class Ice(Component):
+
+    # All option values for Ice/IceBox tests.
+    coreOptions = {
+        "protocol" : ["tcp", "ssl", "wss", "ws"],
+        "compress" : [False, True],
+        "ipv6" : [False, True],
+        "serialize" : [False, True],
+        "mx" : [False, True],
+    }
+
+    # All option values for IceGrid/IceStorm/Glacier2/IceDiscovery tests.
+    serviceOptions = {
+        "protocol" : ["tcp", "wss"],
+        "compress" : [False, True],
+        "ipv6" : [False, True],
+        "serialize" : [False, True],
+        "mx" : [False, True],
+    }
+
+    def __init__(self):
+        self.nugetVersion = None
+
+    def useBinDist(self, mapping, current):
+        return Component._useBinDist(self, mapping, current, "ICE_BIN_DIST")
+
+    def getInstallDir(self, mapping, current):
+        # On Windows, the Ice MSI installation can only be used for C++
+        envHomeName = None if isinstance(platform, Windows) and not isinstance(mapping, CppMapping) else "ICE_HOME"
+        return Component._getInstallDir(self, mapping, current, envHomeName)
+
+    def getPhpExtension(self, mapping, current):
+        if isinstance(platform, Windows):
+            return "php_ice.dll" if current.driver.configs[mapping].buildConfig in ["Debug", "Release"] else "php_ice_nts.dll"
+        else:
+            return "ice.so"
+
+    def getNugetPackageVersionFile(self, mapping):
+        if isinstance(mapping, CSharpMapping):
+            return os.path.join(toplevel, "csharp", "msbuild", "zeroc.ice.net.nuspec")
+        else:
+            return os.path.join(toplevel, "cpp", "msbuild", "zeroc.ice.{0}.nuspec".format(platform.getPlatformToolset()))
+
+    def getFilters(self, mapping, config):
+        if "xcodesdk" in config.buildConfig:
+            return (["Ice/.*", "IceSSL/configuration"],
+                    ["Ice/background",
+                     "Ice/echo",
+                     "Ice/faultTolerance",
+                     "Ice/gc",
+                     "Ice/library",
+                     "Ice/logger",
+                     "Ice/properties",
+                     "Ice/plugin",
+                     "Ice/stringConverter",
+                     "Ice/threadPoolPriority",
+                     "Ice/udp"])
+        elif "static" in config.buildConfig:
+            return (["Ice/.*", "IceSSL/configuration", "IceDiscovery/simple", "IceGrid/simple", "Glacier2/application"],
+                    ["Ice/library", "Ice/plugin"])
+        elif isinstance(mapping, CppMapping) and config.uwp:
+            return (["Ice/.*", "IceSSL/configuration"],
+                    ["Ice/background",
+                     "Ice/echo",
+                     "Ice/faultTolerance",
+                     "Ice/gc",
+                     "Ice/library",
+                     "Ice/logger",
+                     "Ice/networkProxy",        # SOCKS proxy not supported with UWP
+                     "Ice/properties",          # Property files are not supported with UWP
+                     "Ice/plugin",
+                     "Ice/threadPoolPriority"])
+        elif isinstance(platform, Windows) and platform.getCompiler() in ["v100"]:
+            return (["Ice/.*", "IceSSL/.*", "IceBox/.*", "IceDiscovery/.*", "IceUtil/.*", "Slice/.*"], [])
+        elif isinstance(mapping, CSharpMapping) and config.xamarin:
+            return (["Ice/.*"],
+                    ["Ice/hash",
+                     "Ice/faultTolerance",
+                     "Ice/metrics",
+                     "Ice/assemblies",
+                     "Ice/background",
+                     "Ice/dispatcher",
+                     "Ice/networkProxy",
+                     "Ice/throughput",
+                     "Ice/plugin",
+                     "Ice/logger",
+                     "Ice/properties",
+                     "Ice/slicing/*"])
+        elif isinstance(mapping, JavaMapping) and config.android:
+            return (["Ice/.*"],
+                    ["Ice/hash",
+                     "Ice/faultTolerance",
+                     "Ice/metrics",
+                     "Ice/networkProxy",
+                     "Ice/throughput",
+                     "Ice/plugin",
+                     "Ice/logger",
+                     "Ice/properties"])
+        elif isinstance(mapping, JavaScriptMapping):
+            return ([], ["typescript/.*", "es5/*"])
+        return ([], [])
+
+    def canRun(self, testId, mapping, current):
+        parent = re.match(r'^([\w]*).*', testId).group(1)
+        if isinstance(platform, Linux):
+            if platform.getLinuxId() in ["centos", "rhel", "fedora"] and current.config.buildPlatform == "x86":
+                #
+                # Don't test Glacier2/IceStorm/IceGrid services with multilib platforms. We only
+                # build services for the native platform.
+                #
+                if parent in ["Glacier2", "IceStorm", "IceGrid"]:
+                    return False
+        elif isinstance(platform, Linux):
+            #
+            # On Windows, if testing with a binary distribution, don't test Glacier2/IceBridge services
+            # with the Debug configurations since we don't provide binaries for them.
+            #
+            if self.useBinDist(mapping, current):
+                if parent in ["Glacier2", "IceBridge"] and current.config.buildConfig.find("Debug") >= 0:
+                    return False
+
+        # No C++11 tests for IceStorm, IceGrid, etc
+        if isinstance(mapping, CppMapping) and current.config.cpp11:
+            if parent in ["IceStorm", "IceBridge"]:
+                return False
+            elif parent in ["IceGrid"] and testId not in ["IceGrid/simple"]:
+                return False
+            elif parent in ["Glacier2"] and testId not in ["Glacier2/application", "Glacier2/sessionHelper"]:
+                return False
+
+        if current.config.xamarin and not current.config.uwp:
+            #
+            # With Xamarin on Android and iOS Ice/udp is only supported with IPv4
+            #
+            if current.config.ipv6 and testId in ["Ice/udp"]:
+                return False
+
+
+        # IceSSL test doesn't work on macOS/.NET Core
+        if isinstance(mapping, CSharpMapping) and isinstance(platform, Darwin) and parent in ["IceSSL"]:
+            return False
+
+        return True
+
+    def isMainThreadOnly(self, testId):
+        #return testId.startswith("IceStorm") # TODO: WORKAROUND for ICE-8175
+        return False # By default, tests support being run concurrently
+
+    def getDefaultProcesses(self, mapping, processType, testId):
+        if testId.startswith("IceUtil") or testId.startswith("Slice"):
+            return [SimpleClient()]
+        elif testId.startswith("IceGrid"):
+            if processType in ["client", "collocated"]:
+                return [IceGridClient()]
+            if processType in ["server", "serveramd"]:
+                return [IceGridServer()]
+
+    def getOptions(self, testcase, current):
+        parent = re.match(r'^([\w]*).*', testcase.getTestSuite().getId()).group(1)
+        if isinstance(testcase, ClientServerTestCase) and parent in ["Ice", "IceBox"]:
+            return self.coreOptions
+        elif parent in ["IceGrid", "Glacier2", "IceStorm", "IceDiscovery", "IceBridge"]:
+            return self.serviceOptions
+
+    def getRunOrder(self):
+        return ["Slice", "IceUtil", "Ice", "IceSSL", "IceBox", "Glacier2", "IceGrid", "IceStorm"]
+
+    def isCross(self, testId):
+        return testId in [
+            "Ice/ami",
+            "Ice/info",
+            "Ice/exceptions",
+            "Ice/enums",
+            "Ice/facets",
+            "Ice/inheritance",
+            "Ice/invoke",
+            "Ice/objects",
+            "Ice/operations",
+            "Ice/proxy",
+            "Ice/servantLocator",
+            "Ice/slicing/exceptions",
+            "Ice/slicing/objects",
+            "Ice/optional",
+        ]
+
+    def getSoVersion(self):
+        with open(os.path.join(toplevel, "cpp", "include", "IceUtil", "Config.h"), "r") as config:
+            intVersion = int(re.search("ICE_INT_VERSION ([0-9]*)", config.read()).group(1))
+            majorVersion = int(intVersion / 10000)
+            minorVersion = int(intVersion / 100) - 100 * majorVersion
+            patchVersion = intVersion % 100
+            if patchVersion < 50:
+                return '%d' % (majorVersion * 10 + minorVersion)
+            elif patchVersion < 60:
+                return '%da%d' % (majorVersion * 10 + minorVersion, patchVersion - 50)
+            else:
+                return '%db%d' % (majorVersion * 10 + minorVersion, patchVersion - 60)
+
+component = Ice()
+
+from Glacier2Util import *
+from IceBoxUtil import *
+from IceBridgeUtil import *
+from IcePatch2Util import *
+from IceGridUtil import *
+from IceStormUtil import *
+
+#
+# Supported mappings
+#
+for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(toplevel)):
+    if m == "cpp" or re.match("cpp-.*", m):
+        Mapping.add(m, CppMapping(), component)
+    elif m == "java-compat" or re.match("java-compat-.*", m):
+        Mapping.add(m, JavaCompatMapping(), component)
+    elif m == "java" or re.match("java-.*", m):
+        Mapping.add(m, JavaMapping(), component)
+    elif m == "python" or re.match("python-.*", m):
+        Mapping.add(m, PythonMapping(), component)
+    elif m == "ruby" or re.match("ruby-.*", m):
+        Mapping.add(m, RubyMapping(), component)
+    elif m == "php" or re.match("php-.*", m):
+        Mapping.add(m, PhpMapping(), component)
+    elif m == "js" or re.match("js-.*", m):
+        Mapping.add(m, JavaScriptMapping(), component)
+        Mapping.add("typescript", TypeScriptMapping(), component, "js")
+    elif m == "objective-c" or re.match("objective-c-*", m):
+        Mapping.add(m, ObjCMapping(), component)
+    elif m == "csharp" or re.match("charp-.*", m):
+        Mapping.add("csharp", CSharpMapping(), component)
+
+if isinstance(platform, Windows):
+    # Windows doesn't support all the mappings, we take them out here.
+    Mapping.remove("ruby")
+    if platform.getCompiler() != "v140":
+        Mapping.remove("python")
+    if platform.getCompiler() not in ["v140", "v141"]:
+        Mapping.remove("php")
+elif not platform.hasDotNet():
+    # Remove C# if Dot Net Core isn't supported
+    Mapping.remove("csharp")
+
+#
+# Check if Matlab is installed and eventually add the Matlab mapping
+#
+try:
+    run("where matlab" if isinstance(platform, Windows) else "which matlab")
+    Mapping.add("matlab", MatlabMapping(), component)
+except:
+    pass
diff -Nru zeroc-ice-3.7.1/scripts/Controller.ice zeroc-ice-3.7.2/scripts/Controller.ice
--- zeroc-ice-3.7.1/scripts/Controller.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/Controller.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 module Test
 {
@@ -68,6 +63,8 @@
     OptionOverrides getOptionOverrides();
 
     StringSeq getTestSuites(string mapping);
+
+    string getHost(string protocol, bool ipv6);
 }
 
 exception ProcessFailedException
diff -Nru zeroc-ice-3.7.1/scripts/Controller.py zeroc-ice-3.7.2/scripts/Controller.py
--- zeroc-ice-3.7.1/scripts/Controller.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/Controller.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os, sys
 from Util import *
diff -Nru zeroc-ice-3.7.1/scripts/Expect.py zeroc-ice-3.7.2/scripts/Expect.py
--- zeroc-ice-3.7.1/scripts/Expect.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/Expect.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import atexit
 import os
diff -Nru zeroc-ice-3.7.1/scripts/Glacier2Util.py zeroc-ice-3.7.2/scripts/Glacier2Util.py
--- zeroc-ice-3.7.1/scripts/Glacier2Util.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/Glacier2Util.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,11 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, os
 from Util import *
 
-class Glacier2Router(ProcessFromBinDir, Server):
+class Glacier2Router(ProcessFromBinDir, ProcessIsReleaseOnly, Server):
 
     def __init__(self, portnum=50, passwords={"userid": "abc123"}, *args, **kargs):
         Server.__init__(self, "glacier2router", mapping=Mapping.getByName("cpp"), desc="Glacier2 router",
@@ -32,17 +27,7 @@
                     command += " --rounds 100000"
 
                 for user, password in self.passwords.items():
-                    p = subprocess.Popen(command,
-                                         shell=True,
-                                         stdout=subprocess.PIPE,
-                                         stderr=subprocess.STDOUT,
-                                         stdin=subprocess.PIPE)
-                    p.stdin.write(password.encode('UTF-8'))
-                    p.stdin.write('\r\n'.encode('UTF-8'))
-                    p.stdin.flush()
-                    if(p.wait() != 0):
-                        raise RuntimeError("icehashpassword.py failed:\n" + p.stdout.read().decode('UTF-8').strip())
-                    file.write("%s %s\n" % (user, p.stdout.readline().decode('UTF-8').strip()))
+                    file.write("%s %s\n" % (user, run(command, stdin=(password + '\r\n').encode('UTF-8'))))
             current.files.append(path)
 
     def getProps(self, current):
diff -Nru zeroc-ice-3.7.1/scripts/IceBoxUtil.py zeroc-ice-3.7.2/scripts/IceBoxUtil.py
--- zeroc-ice-3.7.1/scripts/IceBoxUtil.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/IceBoxUtil.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,56 +1,79 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, os
 from Util import *
 
 class IceBox(ProcessFromBinDir, Server):
 
-    processType = "icebox"
-
-    def __init__(self, *args, **kargs):
+    def __init__(self, configFile=None, *args, **kargs):
         Server.__init__(self, *args, **kargs)
-
-        # Find config file
-        if 'args' in kargs:
-            for v in kargs['args']:
-                if "--Ice.Config=" in v:
-                    self.config = v.replace("--Ice.Config=", "")
-                    break
+        self.configFile = configFile
 
     def setup(self, current):
-        mapping = self.mapping or current.testcase.getMapping()
+        mapping = self.getMapping(current)
+
         #
         # If running IceBox tests with .NET Core we need to generate a config
         # file that use the service for the .NET Framework used to build the
         # tests
         #
-        if isinstance(mapping, CSharpMapping) and current.config.netframework:
-
-            targetConfig = os.path.abspath(
-                self.config.strip('"').format(testdir=current.testsuite.getPath(),
-                                   iceboxconfigext=".{0}".format(current.config.netframework)))
-            baseConfig = targetConfig.rstrip(".{0}".format(current.config.netframework))
-            with open(baseConfig, 'r') as config:
-                with open(targetConfig, 'w') as target:
-                    for line in config.readlines():
-                        target.write(line.replace("\\net45\\", "\\netstandard2.0\\{0}\\".format(current.config.netframework)))
-                    current.files.append(targetConfig)
-
-class IceBoxAdmin(ProcessFromBinDir, Client):
+        if self.configFile:
+            if isinstance(mapping, CSharpMapping) and (current.config.dotnetcore or current.config.framework):
+                configFile = self.configFile.format(testdir=current.testsuite.getPath())
+                with open(configFile, 'r') as source:
+                    framework = mapping.getTargetFramework(current)
+                    libframework = mapping.getLibTargetFramework(current)
+                    newConfigFile = "{}.{}".format(configFile, framework)
+                    with open(newConfigFile, 'w') as target:
+                        for line in source.readlines():
+                            target.write(line.replace("\\net45\\", "\\netstandard2.0\\{0}\\".format(libframework)))
+                        current.files.append(newConfigFile)
+
+    def getExe(self, current):
+        mapping = self.getMapping(current)
+        if isinstance(mapping, JavaCompatMapping):
+            return "IceBox.Server"
+        elif isinstance(mapping, JavaMapping):
+            return "com.zeroc.IceBox.Server"
+        elif isinstance(mapping, CSharpMapping):
+            return "iceboxnet"
+        else:
+            name = "icebox"
+            if isinstance(platform, Linux) and \
+               platform.getLinuxId() in ["centos", "rhel", "fedora"] and \
+               current.config.buildPlatform == "x86":
+                name += "32" # Multilib platform
+            if current.config.cpp11:
+                name += "++11"
+            return name
+
+    def getEffectiveArgs(self, current, args):
+        args = Server.getEffectiveArgs(self, current, args)
+        if self.configFile:
+            mapping = self.getMapping(current)
+            if isinstance(mapping, CSharpMapping) and (current.config.dotnetcore or current.config.framework):
+                args.append("--Ice.Config={0}.{1}".format(self.configFile, mapping.getTargetFramework(current)))
+            else:
+                args.append("--Ice.Config={0}".format(self.configFile))
+        return args
 
-    processType = "iceboxadmin"
+class IceBoxAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, Client):
 
     def getMapping(self, current):
         # IceBox admin is only provided with the C++/Java, not C#
-        mapping = self.mapping or current.testcase.getMapping()
+        mapping = Client.getMapping(self, current)
         if isinstance(mapping, CppMapping) or isinstance(mapping, JavaMapping):
             return mapping
         else:
             return Mapping.getByName("cpp")
+
+    def getExe(self, current):
+        mapping = self.getMapping(current)
+        if isinstance(mapping, JavaCompatMapping):
+            return "IceBox.Admin"
+        elif isinstance(mapping, JavaMapping):
+            return "com.zeroc.IceBox.Admin"
+        else:
+            return "iceboxadmin"
diff -Nru zeroc-ice-3.7.1/scripts/IceBridgeUtil.py zeroc-ice-3.7.2/scripts/IceBridgeUtil.py
--- zeroc-ice-3.7.1/scripts/IceBridgeUtil.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/IceBridgeUtil.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,10 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 from Util import *
 
-class IceBridge(ProcessFromBinDir, Server):
+class IceBridge(ProcessFromBinDir, ProcessIsReleaseOnly, Server):
 
     def __init__(self, *args, **kargs):
         Server.__init__(self, "icebridge", mapping=Mapping.getByName("cpp"), desc="IceBridge", *args, **kargs)
diff -Nru zeroc-ice-3.7.1/scripts/ice-builder-xcode-wrapper zeroc-ice-3.7.2/scripts/ice-builder-xcode-wrapper
--- zeroc-ice-3.7.1/scripts/ice-builder-xcode-wrapper	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/ice-builder-xcode-wrapper	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env bash
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # This is a wrapper around Ice Builder for Xcode which is used by the
 # iOS C++ and Objective-C Xcode projects to help find binary and source
diff -Nru zeroc-ice-3.7.1/scripts/IceGridUtil.py zeroc-ice-3.7.2/scripts/IceGridUtil.py
--- zeroc-ice-3.7.1/scripts/IceGridUtil.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/IceGridUtil.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,12 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, os
 from Util import *
+from IceBoxUtil import *
+from Glacier2Util import *
+from IcePatch2Util import *
 
 class IceGridProcess:
 
@@ -45,7 +43,7 @@
 
     getParentProps = Client.getProps # Used by IceGridProcess to get the client properties
 
-class IceGridAdmin(ProcessFromBinDir, IceGridClient):
+class IceGridAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, IceGridClient):
 
     def __init__(self, replica=None, username="admin1", password="test1", *args, **kargs):
         IceGridClient.__init__(self, replica=replica, exe="icegridadmin", mapping=Mapping.getByName("cpp"),
@@ -109,7 +107,7 @@
     def getPropertiesOverride(self, current):
         # Add properties for servers based on the test case mapping.
         props = Server().getEffectiveProps(current, {})
-        return ' '.join(["{0}={1}".format(k, val(v, escapeQuotes=True)) for k, v in props.items()])
+        return ' '.join(["{0}={1}".format(k, val(v)) for k, v in props.items()])
 
     def shutdown(self, current):
         current.testcase.runadmin(current, "node shutdown {0}".format(self.name))
@@ -228,7 +226,7 @@
             javaHome = os.environ.get("JAVA_HOME", None)
             serverProps = Server().getProps(current)
             variables = {
-                "test.dir" : self.getPath(),
+                "test.dir" : self.getPath(current),
                 "java.exe" : os.path.join(javaHome, "bin", "java") if javaHome else "java",
                 "icebox.exe" : IceBox().getCommandLine(current),
                 "icegridnode.exe" : IceGridNode().getCommandLine(current),
@@ -238,19 +236,19 @@
                 "properties-override" : self.icegridnode[0].getPropertiesOverride(current),
             }
 
-            if platform.getDotnetExe():
-                variables["dotnet.exe"] = platform.getDotnetExe()
+            if platform.getDotNetExe():
+                variables["dotnet.exe"] = platform.getDotNetExe()
 
             # Add variables that point to the directories containing the built executables
             for (k, v) in self.exevars.items():
                 variables[k] = current.getBuildDir(v)
 
             variables.update(self.variables)
-            varStr = " ".join(["{0}={1}".format(k, val(v, True)) for k,v in variables.items()])
+            varStr = " ".join(["{0}={1}".format(k, val(v)) for k,v in variables.items()])
             targets = " ".join(self.targets)
             application = self.application
-            if current.config.netframework == "netcoreapp2.0":
-                application = application.replace(".xml", ".{0}.xml".format("netcoreapp2.0"))
+            if isinstance(self.mapping, CSharpMapping) and current.config.dotnetcore:
+                application = application.replace(".xml", ".netcoreapp.xml")
             self.runadmin(current, "application add -n {0} {1} {2}".format(application, varStr, targets))
 
     def teardownClientSide(self, current, success):
diff -Nru zeroc-ice-3.7.1/scripts/icehashpassword.py zeroc-ice-3.7.2/scripts/icehashpassword.py
--- zeroc-ice-3.7.1/scripts/icehashpassword.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/icehashpassword.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, getopt, passlib.hash, passlib.hosts, getpass
 
@@ -119,9 +114,6 @@
             usage()
             return 2
 
-    # passlib 1.7 renamed encrypt to hash
-    encryptfn = passScheme.hash if hasattr(passScheme, "hash") else passScheme.encrypt
-
     args = []
     if sys.stdout.isatty():
         args.append(getpass.getpass("Password: "))
@@ -135,7 +127,11 @@
     if rounds:
         opts["rounds"] = rounds
 
-    print(encryptfn(*args, **opts))
+    # passlib 1.7 renamed encrypt to hash
+    if hasattr(passScheme, "hash"):
+        print(passScheme.using(**opts).hash(*args))
+    else:
+        print(passScheme.encrypt(*args, **opts))
 
     return 0
 
diff -Nru zeroc-ice-3.7.1/scripts/IcePatch2Util.py zeroc-ice-3.7.2/scripts/IcePatch2Util.py
--- zeroc-ice-3.7.1/scripts/IcePatch2Util.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/IcePatch2Util.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,25 +1,20 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 from Util import *
 
-class IcePatch2Calc(ProcessFromBinDir, Process):
+class IcePatch2Calc(ProcessFromBinDir, ProcessIsReleaseOnly, Process):
 
     def __init__(self, *args, **kargs):
         Process.__init__(self, exe="icepatch2calc", mapping=Mapping.getByName("cpp"), *args, **kargs)
 
-class IcePatch2Client(ProcessFromBinDir, Process):
+class IcePatch2Client(ProcessFromBinDir, ProcessIsReleaseOnly, Process):
 
     def __init__(self, *args, **kargs):
         Process.__init__(self, exe="icepatch2client", mapping=Mapping.getByName("cpp"), *args, **kargs)
 
-class IcePatch2Server(ProcessFromBinDir, Process):
+class IcePatch2Server(ProcessFromBinDir, ProcessIsReleaseOnly, Process):
 
     def __init__(self, *args, **kargs):
         Process.__init__(self, exe="icepatch2server", mapping=Mapping.getByName("cpp"), *args, **kargs)
diff -Nru zeroc-ice-3.7.1/scripts/IceStormUtil.py zeroc-ice-3.7.2/scripts/IceStormUtil.py
--- zeroc-ice-3.7.1/scripts/IceStormUtil.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/IceStormUtil.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,47 +1,49 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, os
 from Util import *
+from Component import component
+from IceBoxUtil import *
 
 class IceStorm(ProcessFromBinDir, Server):
 
-    def __init__(self, instanceName="IceStorm", replica=0, nreplicas=0, transient=False, portnum=0, *args, **kargs):
+    def __init__(self, instanceName="IceStorm", replica=0, nreplicas=0, transient=False, portnum=0,
+                 createDb=True, cleanDb=True, *args, **kargs):
         Server.__init__(self, exe="icebox", ready="IceStorm", mapping=Mapping.getByName("cpp"), *args, **kargs)
         self.portnum = portnum
         self.replica = replica
         self.nreplicas = nreplicas
         self.transient = transient
         self.instanceName = instanceName
+        self.createDb = createDb
+        self.cleanDb = cleanDb
         self.desc = self.instanceName if self.nreplicas == 0 else "{0} replica #{1}".format(self.instanceName,
                                                                                             self.replica)
 
     def setup(self, current):
         # Create the database directory
-        self.dbdir = os.path.join(current.testsuite.getPath(), "{0}-{1}.db".format(self.instanceName, self.replica))
-        if os.path.exists(self.dbdir):
-            shutil.rmtree(self.dbdir)
-        os.mkdir(self.dbdir)
+        if self.createDb:
+            self.dbdir = os.path.join(current.testsuite.getPath(), "{0}-{1}.db".format(self.instanceName, self.replica))
+            if os.path.exists(self.dbdir):
+                shutil.rmtree(self.dbdir)
+            os.mkdir(self.dbdir)
 
     def teardown(self, current, success):
-        # Remove the database directory tree
-        try:
-            shutil.rmtree(self.dbdir)
-        except:
-            pass
+        if self.cleanDb:
+            # Remove the database directory tree
+            try:
+                shutil.rmtree(self.dbdir)
+            except:
+                pass
 
     def getProps(self, current):
         props = Server.getProps(self, current)
 
         # Default properties
         props.update({
-            'IceBox.Service.IceStorm' : 'IceStormService,' + getIceSoVersion() + ':createIceStorm',
+            'IceBox.Service.IceStorm' : 'IceStormService,' + component.getSoVersion() + ':createIceStorm',
             'IceBox.PrintServicesReady' : 'IceStorm',
             'IceBox.InheritProperties' : 1,
             'IceStorm.InstanceName' : self.instanceName,
@@ -141,7 +143,7 @@
                     props["IceStormAdmin.TopicManager.{0}".format(name)] = testcase.getTopicManager(current, name)
         return props
 
-class IceStormAdmin(ProcessFromBinDir, IceStormProcess, Client):
+class IceStormAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, IceStormProcess, Client):
 
     def __init__(self, instanceName=None, instance=None, *args, **kargs):
         Client.__init__(self, exe="icestormadmin", mapping=Mapping.getByName("cpp"), *args, **kargs)
diff -Nru zeroc-ice-3.7.1/scripts/__init__.py zeroc-ice-3.7.2/scripts/__init__.py
--- zeroc-ice-3.7.1/scripts/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/LocalDriver.py zeroc-ice-3.7.2/scripts/LocalDriver.py
--- zeroc-ice-3.7.1/scripts/LocalDriver.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/LocalDriver.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,10 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, os, time, threading
 from Util import *
+from Component import component
 
 isPython2 = sys.version_info[0] == 2
 
@@ -238,7 +234,15 @@
                 testSuiteIds = serverTestSuiteIds
         return mapping.getTestSuites(testSuiteIds)
 
+    def getHost(self, protocol, ipv6):
+        if self.clientController:
+            return self.clientController.getHost(protocol, ipv6)
+        else:
+            return self.serverController.getHost(protocol, ipv6)
+
     def filterOptions(self, options):
+        if options is None:
+            return None
         import Ice
         options = options.copy()
         for (key, values) in options.items():
@@ -407,7 +411,7 @@
                     #
                     # Sort the test suites to run tests in the following order.
                     #
-                    runOrder = mapping.getRunOrder()
+                    runOrder = self.component.getRunOrder()
                     def testsuiteKey(testsuite):
                         for k in runOrder:
                             if testsuite.getId().startswith(k + '/'):
@@ -415,15 +419,12 @@
                         return testsuite.getId()
                     testsuites = sorted(testsuites, key=testsuiteKey)
 
-                    #
-                    # Create the executor to run the test suites on multiple workers thread is requested.
-                    #
                     for testsuite in testsuites:
                         if mapping.filterTestSuite(testsuite.getId(), self.configs[mapping], self.filters, self.rfilters):
                             continue
                         if testsuite.getId() == "Ice/echo":
                             continue
-                        elif (self.cross or self.allCross) and not testsuite.isCross():
+                        elif (self.cross or self.allCross) and not self.component.isCross(testsuite.getId()):
                             continue
                         elif isinstance(self.runner, RemoteTestCaseRunner) and not testsuite.isMultiHost():
                             continue
@@ -533,6 +534,10 @@
             if self.allCross and cross == current.testcase.getMapping():
                 continue
 
+            # Skip if the cross test server mapping is another mapping than the cross mapping
+            if cross and cross != cross.getServerMapping():
+                continue
+
             # Skip if the mapping doesn't provide the test case
             server = current.testcase.getServerTestCase(cross)
             if not server:
@@ -550,7 +555,7 @@
             if cross:
                 current.writeln("- Mappings: {0},{1}".format(client.getMapping(), server.getMapping()))
                 current.desc += (" " if current.desc else "") + "cross={0}".format(server.getMapping())
-            if not current.config.canRun(current) or not current.testcase.canRun(current):
+            if not current.config.canRun(current.testsuite.getId(), current) or not current.testcase.canRun(current):
                 current.result.skipped(current, "not supported with this configuration")
                 return
 
@@ -565,11 +570,20 @@
                 # interrupted by potential KeyboardInterrupt exceptions which could leave some servers
                 # behind.
                 #
-                t=threading.Thread(target = lambda: self.runner.stopServerSide(server, current, success))
+                failure = []
+                def stopServerSide():
+                    try:
+                        self.runner.stopServerSide(server, current, success)
+                    except Exception as ex:
+                        failure.append(ex)
+
+                t=threading.Thread(target = stopServerSide)
                 t.start()
                 while True:
                     try:
                         t.join()
+                        if failure:
+                            raise failure[0]
                         break
                     except KeyboardInterrupt:
                         pass # Ignore keyboard interrupts
@@ -587,12 +601,18 @@
             if confStr:
                 current.writeln("- Config: {0}".format(confStr))
                 current.desc = confStr
-            if not current.config.canRun(current) or not current.testcase.canRun(current):
+            if not current.config.canRun(current.testsuite.getId(), current) or not current.testcase.canRun(current):
                 current.result.skipped(current, "not supported with this configuration")
                 return
 
         current.testcase._runClientSide(current)
 
+    def getHost(self, protocol, ipv6):
+        if isinstance(self.runner, RemoteTestCaseRunner):
+            return self.runner.getHost(protocol, ipv6)
+        else:
+            return Driver.getHost(self, protocol, ipv6)
+
     def isWorkerThread(self):
         return hasattr(self.threadlocal, "num")
 
@@ -622,7 +642,7 @@
     def getMappings(self):
         return Mapping.getAll(self) if self.allCross else [self.cross] if self.cross else []
 
-    def filterOptions(self, testcase, options):
+    def filterOptions(self, options):
         return self.runner.filterOptions(options)
 
 Driver.add("local", LocalDriver)
diff -Nru zeroc-ice-3.7.1/scripts/NetworkProxy.py zeroc-ice-3.7.2/scripts/NetworkProxy.py
--- zeroc-ice-3.7.1/scripts/NetworkProxy.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/NetworkProxy.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import sys, os, threading, socket, select
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/Glacier2/application.py zeroc-ice-3.7.2/scripts/tests/Glacier2/application.py
--- zeroc-ice-3.7.1/scripts/tests/Glacier2/application.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Glacier2/application.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 Glacier2TestSuite(__name__, routerProps = { "Glacier2.SessionTimeout" : 30 })
diff -Nru zeroc-ice-3.7.1/scripts/tests/Glacier2/__init__.py zeroc-ice-3.7.2/scripts/tests/Glacier2/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/Glacier2/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Glacier2/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/Glacier2/router.py zeroc-ice-3.7.2/scripts/tests/Glacier2/router.py
--- zeroc-ice-3.7.1/scripts/tests/Glacier2/router.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Glacier2/router.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 passwords = {
     "userid": "abc123",
diff -Nru zeroc-ice-3.7.1/scripts/tests/Glacier2/sessionHelper.py zeroc-ice-3.7.2/scripts/tests/Glacier2/sessionHelper.py
--- zeroc-ice-3.7.1/scripts/tests/Glacier2/sessionHelper.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Glacier2/sessionHelper.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 Glacier2TestSuite(__name__, routerProps = { "Glacier2.SessionTimeout" : 30 })
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/adapterDeactivation.py zeroc-ice-3.7.2/scripts/tests/Ice/adapterDeactivation.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/adapterDeactivation.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/adapterDeactivation.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, multihost=False)
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/admin.py zeroc-ice-3.7.2/scripts/tests/Ice/admin.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/admin.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/admin.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, options = { "ipv6" : [False] }, multihost=False)
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/ami.py zeroc-ice-3.7.2/scripts/tests/Ice/ami.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/ami.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/ami.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Enable some tracing to allow investigating test failures
 traceProps = {
@@ -16,7 +11,6 @@
 }
 
 testcases = [ ClientServerTestCase(traceProps=traceProps) ]
-
 if Mapping.getByPath(__name__).hasSource("Ice/ami", "collocated"):
     testcases += [ CollocatedTestCase() ]
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/background.py zeroc-ice-3.7.2/scripts/tests/Ice/background.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/background.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/background.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, libDirs=["testtransport"], options={ "mx": [False] })
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/binding.py zeroc-ice-3.7.2/scripts/tests/Ice/binding.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/binding.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/binding.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 def setlimits():
     if not isinstance(platform, Windows):
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/enums.py zeroc-ice-3.7.2/scripts/tests/Ice/enums.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/enums.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/enums.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, [
     ClientServerTestCase("client/server with default encoding"),
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/exceptions.py zeroc-ice-3.7.2/scripts/tests/Ice/exceptions.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/exceptions.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/exceptions.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 testcases = [
     ClientServerTestCase("client/server with compact format"),
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/faultTolerance.py zeroc-ice-3.7.2/scripts/tests/Ice/faultTolerance.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/faultTolerance.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/faultTolerance.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 from Util import *
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/hold.py zeroc-ice-3.7.2/scripts/tests/Ice/hold.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/hold.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/hold.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, [ClientServerTestCase(server=Server(readyCount=2))])
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/info.py zeroc-ice-3.7.2/scripts/tests/Ice/info.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/info.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/info.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, options = { "ipv6" : [False], "compress" : [False] }, multihost=False)
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/__init__.py zeroc-ice-3.7.2/scripts/tests/Ice/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/interceptor.py zeroc-ice-3.7.2/scripts/tests/Ice/interceptor.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/interceptor.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/interceptor.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, [ClientTestCase(client=Client(props={"Ice.Warn.Dispatch" : 0}))], libDirs=["interceptortest"])
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/interrupt.py zeroc-ice-3.7.2/scripts/tests/Ice/interrupt.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/interrupt.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/interrupt.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, options = { "compress" : [False] })
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/location.py zeroc-ice-3.7.2/scripts/tests/Ice/location.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/location.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/location.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Enable some tracing to allow investigating test failures
 traceProps = {
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/metrics.py zeroc-ice-3.7.2/scripts/tests/Ice/metrics.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/metrics.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/metrics.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Enable some tracing to allow investigating test failures
 traceProps = {
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/networkProxy.py zeroc-ice-3.7.2/scripts/tests/Ice/networkProxy.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/networkProxy.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/networkProxy.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import NetworkProxy
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/objects.py zeroc-ice-3.7.2/scripts/tests/Ice/objects.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/objects.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/objects.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 #
 # Use a server stack size of 512KB, this is in particular important for Java
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/optional.py zeroc-ice-3.7.2/scripts/tests/Ice/optional.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/optional.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/optional.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 testcases = [
     ClientServerTestCase("client/server with compact format"),
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/properties.py zeroc-ice-3.7.2/scripts/tests/Ice/properties.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/properties.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/properties.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class PropertiesTestSuite(TestSuite):
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/retry.py zeroc-ice-3.7.2/scripts/tests/Ice/retry.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/retry.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/retry.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Enable some tracing to allow investigating test failures
 traceProps = {
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/slicing/exceptions.py zeroc-ice-3.7.2/scripts/tests/Ice/slicing/exceptions.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/slicing/exceptions.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/slicing/exceptions.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 testcases = [
     ClientServerTestCase(),
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/slicing/__init__.py zeroc-ice-3.7.2/scripts/tests/Ice/slicing/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/slicing/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/slicing/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/slicing/objects.py zeroc-ice-3.7.2/scripts/tests/Ice/slicing/objects.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/slicing/objects.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/slicing/objects.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, [
     ClientServerTestCase(),
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/stream.py zeroc-ice-3.7.2/scripts/tests/Ice/stream.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/stream.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/stream.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, [
     ClientTestCase("client with default encoding"),
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/timeout.py zeroc-ice-3.7.2/scripts/tests/Ice/timeout.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/timeout.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/timeout.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 # Enable some tracing to allow investigating test failures
 traceProps = {
diff -Nru zeroc-ice-3.7.1/scripts/tests/Ice/udp.py zeroc-ice-3.7.2/scripts/tests/Ice/udp.py
--- zeroc-ice-3.7.1/scripts/tests/Ice/udp.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Ice/udp.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,33 +1,26 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 from Util import *
 
+class UdpTestCase(ClientServerTestCase):
+
+    def setupServerSide(self, current):
+        if current.config.android or current.config.xamarin:
+            self.servers = [Server(ready="McastTestAdapter")]
+        else:
+            self.servers = [Server(args=[i], ready="McastTestAdapter") for i in range(0, 5)]
+
+    def setupClientSide(self, current):
+        if current.config.android:
+            self.clients = [Client()]
+        else:
+            self.clients = [Client(args=[5])]
+
 #
 # With UWP, we can't run the UDP tests with the C++ servers (used when SSL is enabled).
 #
 options=lambda current: { "protocol": ["tcp", "ws"] } if current.config.uwp else {}
 
-class IceUdpTestSuite(TestSuite):
-
-    def setup(self, current):
-        TestSuite.setup(self, current)
-
-        n = 1 if (isinstance(self.getMapping(), AndroidMapping) or
-                  isinstance(self.getMapping(), AndroidCompatMapping)) else 5
-        #
-        # Start n servers
-        #
-        servers=range(0, n)
-
-        self.testcases = {} # Clear default test cases
-        self.addTestCase(ClientServerTestCase(client=Client(args=[n]),
-                                              servers=[Server(args=[i], ready="McastTestAdapter") for i in servers]))
-
-IceUdpTestSuite(__name__, multihost=False, options=options)
+TestSuite(__name__, [ UdpTestCase() ], multihost=False, options=options)
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceBox/admin.py zeroc-ice-3.7.2/scripts/tests/IceBox/admin.py
--- zeroc-ice-3.7.1/scripts/tests/IceBox/admin.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceBox/admin.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class IceBoxAdminTestCase(ClientServerTestCase):
 
@@ -24,8 +19,8 @@
         current.writeln("ok")
 
 TestSuite(__name__, [
-        ClientServerTestCase(server=IceBox(args=['--Ice.Config="{testdir}/config.icebox{iceboxconfigext}"'])),
-        IceBoxAdminTestCase("iceboxadmin", server=IceBox(args=['--Ice.Config="{testdir}/config.icebox{iceboxconfigext}"'])),
+        ClientServerTestCase(server=IceBox("{testdir}/config.icebox")),
+        IceBoxAdminTestCase("iceboxadmin", server=IceBox("{testdir}/config.icebox")),
     ],
     libDirs=["testservice"],
     runOnMainThread=True,
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceBox/configuration.py zeroc-ice-3.7.2/scripts/tests/IceBox/configuration.py
--- zeroc-ice-3.7.1/scripts/tests/IceBox/configuration.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceBox/configuration.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,9 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 TestSuite(__name__, [
-    ClientServerTestCase("client/server #1", server=IceBox(args=['--Ice.Config="{testdir}/config.icebox{iceboxconfigext}"'])),
-    ClientServerTestCase("client/server #2", server=IceBox(args=['--Ice.Config="{testdir}/config.icebox2{iceboxconfigext}"']))
+    ClientServerTestCase("client/server #1", server=IceBox("{testdir}/config.icebox")),
+    ClientServerTestCase("client/server #2", server=IceBox("{testdir}/config.icebox2"))
 ], libDirs=["testservice"], runOnMainThread=True, options={ "protocol" : ["tcp"], "ipv6" : [False], "mx" : [False] }, multihost=False)
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceBox/__init__.py zeroc-ice-3.7.2/scripts/tests/IceBox/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/IceBox/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceBox/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceDiscovery/__init__.py zeroc-ice-3.7.2/scripts/tests/IceDiscovery/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/IceDiscovery/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceDiscovery/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceDiscovery/simple.py zeroc-ice-3.7.2/scripts/tests/IceDiscovery/simple.py
--- zeroc-ice-3.7.1/scripts/tests/IceDiscovery/simple.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceDiscovery/simple.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import uuid
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceGrid/__init__.py zeroc-ice-3.7.2/scripts/tests/IceGrid/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/IceGrid/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceGrid/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceGrid/simple.py zeroc-ice-3.7.2/scripts/tests/IceGrid/simple.py
--- zeroc-ice-3.7.1/scripts/tests/IceGrid/simple.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceGrid/simple.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 serverProps = {
     "TestAdapter.Endpoints" : "default",
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceSSL/configuration.py zeroc-ice-3.7.2/scripts/tests/IceSSL/configuration.py
--- zeroc-ice-3.7.1/scripts/tests/IceSSL/configuration.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceSSL/configuration.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 import os
 
@@ -17,7 +12,7 @@
         if not isinstance(self.getMapping(), CppMapping):
             return
 
-        certsPath = os.path.abspath(os.path.join(self.getPath(), "..", "certs"))
+        certsPath = os.path.abspath(os.path.join(current.testsuite.getPath(), "..", "certs"))
         if isinstance(platform, Darwin) and current.config.buildPlatform == "macosx":
             keychainPath = os.path.join(certsPath, "Find.keychain")
             os.system("mkdir -p {0}".format(os.path.join(certsPath, "keychain")))
@@ -25,6 +20,12 @@
             for cert in ["s_rsa_ca1.p12", "c_rsa_ca1.p12"]:
                 os.system("security import %s -f pkcs12 -A -P password -k %s" % (os.path.join(certsPath, cert), keychainPath))
         elif current.config.openssl or platform.hasOpenSSL():
+            if isinstance(platform, Windows):
+                conf = os.path.join(current.testsuite.getPath(), "openssl.cnf")
+                os.environ["OPENSSL_CONF"] = conf
+                with open(conf, "w") as file:
+                    file.write("# Dummy openssl configuration file to avoid warnings with Windows testing")
+
             #
             # Create copies of the CA certificates named after the subject
             # hash. This is used by the tests to find the CA certificates in
@@ -32,7 +33,7 @@
             #
             for c in ["cacert1.pem", "cacert2.pem"]:
                 pem = os.path.join(certsPath, c)
-                out =  run("{openssl} x509 -subject_hash -noout -in {pem}".format(pem=pem, openssl=self.getOpenSSLCommand()))
+                out = run("{openssl} x509 -subject_hash -noout -in {pem}".format(pem=pem, openssl=self.getOpenSSLCommand(current)))
                 shutil.copyfile(pem, "{dir}/{out}.0".format(dir=certsPath, out=out))
 
     def teardownServerSide(self, current, success):
@@ -40,26 +41,23 @@
         if not isinstance(self.getMapping(), CppMapping):
             return
 
-        certsPath = os.path.abspath(os.path.join(self.getPath(), "..", "certs"))
+        certsPath = os.path.abspath(os.path.join(current.testsuite.getPath(), "..", "certs"))
         if isinstance(platform, Darwin) and current.config.buildPlatform == "macosx":
             os.system("rm -rf {0} {1}".format(os.path.join(certsPath, "keychain"), os.path.join(certsPath, "Find.keychain")))
         elif current.config.openssl or platform.hasOpenSSL():
             for c in ["cacert1.pem", "cacert2.pem"]:
                 pem = os.path.join(certsPath, c)
-                out =  run("{openssl} x509 -subject_hash -noout -in {pem}".format(pem=pem, openssl=self.getOpenSSLCommand()))
+                out = run("{openssl} x509 -subject_hash -noout -in {pem}".format(pem=pem, openssl=self.getOpenSSLCommand(current)))
                 os.remove("{dir}/{out}.0".format(out=out, dir=certsPath))
             if isinstance(platform, Windows):
-                os.remove(os.path.join(self.getPath(), "openssl.cnf"))
+                os.remove(os.path.join(current.testsuite.getPath(), "openssl.cnf"))
                 del os.environ["OPENSSL_CONF"]
 
-    def getOpenSSLCommand(self):
+    def getOpenSSLCommand(self, current):
         if isinstance(platform, Windows):
-            conf = os.path.join(self.getPath(), "openssl.cnf")
-            os.environ["OPENSSL_CONF"] = conf
-            with open(conf, "w") as file:
-                file.write("# Dummy openssl configuration file to avoid warnings with Windows testing")
-            return os.path.join(self.getPath(), "..", "..", "..", "msbuild", "packages", "zeroc.openssl.v140.1.0.2.5",
-                                "build", "native", "bin", "Win32", "Release", "openssl.exe")
+            return os.path.join(current.testsuite.getPath(), "..", "..", "..", "msbuild", "packages",
+                                "zeroc.openssl.v140.1.0.2.6", "build", "native", "bin", "Win32", "Release",
+                                "openssl.exe")
         else:
             return "openssl"
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/IceSSL/__init__.py zeroc-ice-3.7.2/scripts/tests/IceSSL/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/IceSSL/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/IceSSL/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/__init__.py zeroc-ice-3.7.2/scripts/tests/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/tests/Slice/generation.py zeroc-ice-3.7.2/scripts/tests/Slice/generation.py
--- zeroc-ice-3.7.1/scripts/tests/Slice/generation.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Slice/generation.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 class SliceGenerationTestCase(ClientTestCase):
 
@@ -17,10 +12,10 @@
 
         slice2java.run(current,
                        args=["--list-generated", "--output-dir", "classes", "File1.ice", "File2.ice"] +
-                       (["--compat"] if current.testcase.getPath().find("java-compat") >= 0 else []))
+                       (["--compat"] if current.testsuite.getPath().find("java-compat") >= 0 else []))
 
         lines1 = slice2java.getOutput(current).strip().split("\n")
-        lines2 = open(os.path.join(self.getPath(), "list-generated.out"), "r").readlines()
+        lines2 = open(os.path.join(current.testsuite.getPath(), "list-generated.out"), "r").readlines()
         if len(lines1) != len(lines2):
             raise RuntimeError("failed!")
 
diff -Nru zeroc-ice-3.7.1/scripts/tests/Slice/__init__.py zeroc-ice-3.7.2/scripts/tests/Slice/__init__.py
--- zeroc-ice-3.7.1/scripts/tests/Slice/__init__.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/tests/Slice/__init__.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,8 +1,3 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
diff -Nru zeroc-ice-3.7.1/scripts/Util.py zeroc-ice-3.7.2/scripts/Util.py
--- zeroc-ice-3.7.1/scripts/Util.py	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/scripts/Util.py	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,9 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys, runpy, getopt, traceback, types, threading, time, datetime, re, itertools, random, subprocess, shutil, copy, inspect
 
-import xml.sax.saxutils
+import os, sys, runpy, getopt, traceback, types, threading, time, datetime, re, itertools, random, subprocess, shutil
+import copy, inspect, xml.sax.saxutils
 
 isPython2 = sys.version_info[0] == 2
 if isPython2:
@@ -24,65 +18,221 @@
 
 toplevel = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 
-def run(cmd, cwd=None, err=False):
-    p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=cwd)
-    out = p.stdout.read().decode('UTF-8').strip()
-    if(not err and p.wait() != 0) or (err and p.wait() == 0) :
-        raise RuntimeError(cmd + " failed:\n" + out)
-    #
-    # Without this we get warnings when running with python_d on Windows
-    #
-    # ResourceWarning: unclosed file <_io.TextIOWrapper name=3 encoding='cp1252'>
-    #
-    p.stdout.close()
+def run(cmd, cwd=None, err=False, stdout=False, stdin=None, stdinRepeat=True):
+    p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stdout=None if stdout else subprocess.PIPE,
+                         stderr=subprocess.STDOUT, cwd=cwd)
+    try:
+        if stdin:
+            try:
+                while True:
+                    p.stdin.write(stdin)
+                    p.stdin.flush()
+                    if not stdinRepeat:
+                        break
+                    time.sleep(1)
+            except:
+                pass
+
+        out = (p.stderr if stdout else p.stdout).read().decode('UTF-8').strip()
+        if(not err and p.wait() != 0) or (err and p.wait() == 0) :
+            raise RuntimeError(cmd + " failed:\n" + out)
+    finally:
+        #
+        # Without this we get warnings when running with python_d on Windows
+        #
+        # ResourceWarning: unclosed file <_io.TextIOWrapper name=3 encoding='cp1252'>
+        #
+        (p.stderr if stdout else p.stdout).close()
+        try:
+            p.stdin.close()
+        except Exception:
+            pass
     return out
 
-def val(v, escapeQuotes=False, quoteValue=True):
+def val(v, quoteValue=True):
     if type(v) == bool:
         return "1" if v else "0"
     elif type(v) == str:
         if not quoteValue or v.find(" ") < 0:
             return v
-        elif escapeQuotes:
-            return "\\\"{0}\\\"".format(v.replace("\\\"", "\\\\\\\""))
-        else:
-            return "\"{0}\"".format(v)
+        v = v.replace("\\", "\\\\").replace("\"", "\\\"")
+        return "\"{0}\"".format(v)
     else:
         return str(v)
 
-def escapeXml(s):
+illegalXMLChars = re.compile(u'[\x00-\x08\x0b\x0c\x0e-\x1F\uD800-\uDFFF\uFFFE\uFFFF]')
+
+def escapeXml(s, attribute=False):
     # Remove backspace characters from the output (they aren't accepted by Jenkins XML parser)
     if isPython2:
-        return xml.sax.saxutils.escape("".join(ch for ch in unicode(s.decode("utf-8")) if ch != u"\u0008").encode("utf-8"))
+        s = "".join(ch for ch in unicode(s.decode("utf-8")) if ch != u"\u0008").encode("utf-8")
     else:
-        return xml.sax.saxutils.escape("".join(ch for ch in s if ch != u"\u0008"))
+        s = "".join(ch for ch in s if ch != u"\u0008")
+    s = illegalXMLChars.sub("?", s) # Strip invalid XML characters
+    return xml.sax.saxutils.quoteattr(s) if attribute else xml.sax.saxutils.escape(s)
+
+"""
+Component abstract class. The driver and mapping classes rely on the component
+class to provide component specific information.
+"""
+class Component(object):
 
-def getIceSoVersion():
-    config = open(os.path.join(toplevel, "cpp", "include", "IceUtil", "Config.h"), "r")
-    intVersion = int(re.search("ICE_INT_VERSION ([0-9]*)", config.read()).group(1))
-    majorVersion = int(intVersion / 10000)
-    minorVersion = int(intVersion / 100) - 100 * majorVersion
-    patchVersion = intVersion % 100
-    if patchVersion < 50:
-        return '%d' % (majorVersion * 10 + minorVersion)
-    elif patchVersion < 60:
-        return '%da%d' % (majorVersion * 10 + minorVersion, patchVersion - 50)
-    else:
-        return '%db%d' % (majorVersion * 10 + minorVersion, patchVersion - 60)
+    def __init__(self):
+        self.nugetVersion = None
+
+    """
+    Returns whether or not to use the binary distribution.
+    """
+    def useBinDist(self, mapping, current):
+        return True
+
+    """
+    Returns the component installation directory if using a binary distribution
+    or the mapping directory if using a source distribution.
+    """
+    def getInstallDir(self, mapping, current):
+        raise Error("must be overriden")
+
+    def getSourceDir(self):
+        return toplevel
+
+    def getTestDir(self, mapping):
+        if isinstance(mapping, JavaMapping):
+            return os.path.join(mapping.getPath(), "test", "src", "main", "java", "test")
+        elif isinstance(mapping, TypeScriptMapping):
+            return os.path.join(mapping.getPath(), "test", "typescript")
+        return os.path.join(mapping.getPath(), "test")
+
+    def getScriptDir(self):
+        return os.path.join(self.getSourceDir(), "scripts", "tests")
+
+    def getPhpExtension(self, mapping, current):
+        raise RuntimeError("must be overriden if component provides php mapping")
+
+    def getNugetPackage(self, mapping):
+        return "zeroc.{0}.{1}".format(self.__class__.__name__.lower(),
+                                      "net" if isinstance(mapping, CSharpMapping) else platform.getPlatformToolset())
+
+    def getNugetPackageVersion(self, mapping):
+        if not self.nugetVersion:
+            file = self.getNugetPackageVersionFile(mapping)
+            if file.endswith(".nuspec"):
+                expr = "<version>(.*)</version>"
+            elif file.endswith("packages.config"):
+                expr = "id=\"{0}\" version=\"(.*)\" target".format(self.getNugetPackage(mapping))
+            if expr:
+                with open(file, "r") as config:
+                    m = re.search(expr, config.read())
+                    if m:
+                        self.nugetVersion = m.group(1)
+        if not self.nugetVersion:
+            raise RuntimeError("couldn't figure out the nuget version from `{0}'".format(file))
+        return self.nugetVersion
+
+    def getNugetPackageVersionFile(self, mapping):
+        raise RuntimeError("must be overriden if component provides C++ or C# nuget packages")
+
+    def getFilters(self, mapping, config):
+        return ([], [])
+
+    def canRun(self, testId, mapping, current):
+        return True
 
-class Platform:
+    def isMainThreadOnly(self, testId):
+        return True
+
+    def getDefaultProcesses(self, mapping, processType, testId):
+        return None
+
+    def getDefaultExe(self, mapping, processType):
+        return None
+
+    def getDefaultSource(self, mapping, processType):
+        return None
+
+    def getOptions(self, testcase, current):
+        return None
+
+    def getRunOrder(self):
+        return []
+
+    def getEnv(self, process, current):
+        return {}
+
+    def getProps(self, process, current):
+        return {}
+
+    def isCross(self, testId):
+        return False
+
+    def getSliceDir(self, mapping, current):
+        installDir = self.getInstallDir(mapping, current)
+        if installDir.endswith(mapping.name):
+            installDir = installDir[0:len(installDir) - len(mapping.name) - 1]
+        if platform.getInstallDir() and installDir == platform.getInstallDir():
+            return os.path.join(installDir, "share", "ice", "slice")
+        else:
+            return os.path.join(installDir, "slice")
+
+    def getBinDir(self, process, mapping, current):
+        return platform._getBinDir(self, process, mapping, current)
+
+    def getLibDir(self, process, mapping, current):
+        return platform._getLibDir(self, process, mapping, current)
+
+    def getPhpIncludePath(self, mapping, current):
+        return "{0}/{1}".format(self.getInstallDir(mapping, current), "php" if self.useBinDist(mapping, current) else "lib")
+
+    def _useBinDist(self, mapping, current, envName):
+        env = os.environ.get(envName, "").split()
+        return 'all' in env or mapping.name in env
+
+    def _getInstallDir(self, mapping, current, envHomeName):
+        if self.useBinDist(mapping, current):
+            # On Windows or for the C# mapping we first look for Nuget packages rather than the binary installation
+            if isinstance(platform, Windows) or isinstance(mapping, CSharpMapping):
+                packageDir = platform.getNugetPackageDir(self, mapping, current)
+                if envHomeName and not os.path.exists(packageDir):
+                    home = os.environ.get(envHomeName, "")
+                    if not home or not os.path.exists(home):
+                        raise RuntimeError("Cannot detect a valid distribution in `" + envHomeName + "'")
+                    return home
+                else:
+                    return packageDir
+            else:
+                return os.environ.get(envHomeName, platform.getInstallDir())
+        elif mapping:
+            return mapping.getPath()
+        else:
+            return self.getSourceDir()
+
+class Platform(object):
 
     def __init__(self):
-        self.parseBuildVariables({
+        try:
+            run("dotnet --version")
+            self.nugetPackageCache = re.search("info : global-packages: (.*)",
+                                               run("dotnet nuget locals --list global-packages")).groups(1)[0]
+        except:
+            self.nugetPackageCache = None
+
+    def init(self, component):
+        self.parseBuildVariables(component, {
             "supported-platforms" : ("supportedPlatforms", lambda s : s.split(" ")),
             "supported-configs" : ("supportedConfigs", lambda s : s.split(" "))
         })
-        self.nugetPackageVersion = None
-        self.nugetPackageCache = None
 
-    def parseBuildVariables(self, variables):
+    def hasDotNet(self):
+        return self.nugetPackageCache != None
+
+    def parseBuildVariables(self, component, variables):
         # Run make to get the values of the given variables
-        output = run('make print V="{0}"'.format(" ".join(variables.keys())), cwd = toplevel)
+        if os.path.exists(os.path.join(component.getSourceDir(), "Makefile")): # Top level makefile
+            cwd = component.getSourceDir()
+        elif Mapping.getByName("cpp"):
+            cwd = Mapping.getByName("cpp").getPath()
+
+        output = run('make print V="{0}"'.format(" ".join(variables.keys())), cwd=cwd)
         for l in output.split("\n"):
             match = re.match(r'^.*:.*: (.*) = (.*)', l)
             if match and match.group(1):
@@ -91,108 +241,63 @@
                     value = match.group(2).strip() or ""
                     setattr(self, varname, valuefn(value) if valuefn else value)
 
-    def getFilters(self, config):
-        if config.buildConfig in ["static", "cpp11-static"]:
-            return (["Ice/.*", "IceSSL/configuration", "IceDiscovery/simple", "IceGrid/simple", "Glacier2/application"],
-                    ["Ice/library", "Ice/plugin"])
-        return ([], [])
-
     def getDefaultBuildPlatform(self):
         return self.supportedPlatforms[0]
 
     def getDefaultBuildConfig(self):
         return self.supportedConfigs[0]
 
-    def getBinSubDir(self, mapping, process, current):
-        # Return the bin sub-directory for the given mapping,platform,config,
-        # to be overriden by specializations
-        return "bin"
-
-    def getLibSubDir(self, mapping, process, current):
-        # Return the bin sub-directory for the given mapping,platform,config,
-        # to be overriden by specializations
-        return "lib"
+    def _getBinDir(self, component, process, mapping, current):
+        installDir = component.getInstallDir(mapping, current)
+        if isinstance(mapping, CSharpMapping):
+            if component.useBinDist(mapping, current):
+                return os.path.join(installDir, "tools", "netcoreapp2.1")
+            else:
+                return os.path.join(installDir, "bin", "netcoreapp2.1")
+        return os.path.join(installDir, "bin")
+
+    def _getLibDir(self, component, process, mapping, current):
+        installDir = component.getInstallDir(mapping, current)
+        if isinstance(mapping, CSharpMapping):
+            return os.path.join(installDir, "lib", "netstandard2.0")
+        return os.path.join(installDir, "lib")
 
-    def getBuildSubDir(self, name, current):
+    def getBuildSubDir(self, mapping, name, current):
         # Return the build sub-directory, to be overriden by specializations
-        return os.path.join("build", current.config.buildPlatform, current.config.buildConfig)
+        buildPlatform = current.driver.configs[mapping].buildPlatform
+        buildConfig = current.driver.configs[mapping].buildConfig
+        return os.path.join("build", buildPlatform, buildConfig)
 
     def getLdPathEnvName(self):
         return "LD_LIBRARY_PATH"
 
-    def getInstallDir(self, mapping, current, envName):
-        return os.environ.get(envName, "/usr")
-
-    def getIceInstallDir(self, mapping, current):
-        #
-        # For .NET Core with Ice binary distribution the NuGet packages is
-        # installed in the global packages package cache
-        #
-        if isinstance(mapping, CSharpMapping) and current.driver.useIceBinDist(mapping) and current.config.netframework:
-            if not self.nugetPackageCache:
-                self.nugetPackageCache = re.search("info : global-packages: (.*)",
-                                                   run("dotnet nuget locals --list global-packages")).groups(1)[0]
-            return os.path.join(self.nugetPackageCache, "zeroc.ice.net", self.getNugetPackageVersion(mapping))
-        else:
-            return self.getInstallDir(mapping, current, "ICE_HOME")
-
-    def getSliceDir(self, iceDir):
-        if iceDir.startswith("/usr"):
-            return os.path.join(iceDir, "share", "ice", "slice")
-        else:
-            return os.path.join(iceDir, "slice")
+    def getInstallDir(self):
+        return "/usr"
 
-    def getDefaultExe(self, name, config):
-        if name == "icebox" and config.cpp11:
-            name += "++11"
-        return name
+    def getNugetPackageDir(self, component, mapping, current):
+        if not self.nugetPackageCache:
+            return None
+        return os.path.join(self.nugetPackageCache,
+                            component.getNugetPackage(mapping),
+                            component.getNugetPackageVersion(mapping))
 
     def hasOpenSSL(self):
         # This is used by the IceSSL test suite to figure out how to setup certificates
         return False
 
-    def canRun(self, mapping, current):
-        return True
-
-    def getDotnetExe(self):
+    def getDotNetExe(self):
         return "dotnet"
 
-    def getNugetPackageVersion(self, mapping):
-        version = None
-        if isinstance(mapping, CSharpMapping):
-            with open(os.path.join(toplevel, "csharp", "msbuild", "zeroc.ice.net.nuspec"), "r") as configFile:
-                version = re.search("<version>(.*)</version>", configFile.read()).group(1)
-        else:
-            with open(os.path.join(toplevel, "config", "icebuilder.props"), "r") as configFile:
-                version = re.search("<IceJSONVersion>(.*)</IceJSONVersion>", configFile.read()).group(1)
-        return version
-
 class Darwin(Platform):
 
-    def getFilters(self, config):
-        if config.buildPlatform in ["iphoneos", "iphonesimulator", "macosx"] and "xcodesdk" in config.buildConfig:
-            return (["Ice/.*", "IceSSL/configuration"],
-                    ["Ice/background",
-                     "Ice/echo",
-                     "Ice/faultTolerance",
-                     "Ice/gc",
-                     "Ice/library",
-                     "Ice/logger",
-                     "Ice/properties",
-                     "Ice/plugin",
-                     "Ice/stringConverter",
-                     "Ice/threadPoolPriority",
-                     "Ice/udp"])
-        return Platform.getFilters(self, config)
-
     def getDefaultBuildPlatform(self):
         return "macosx"
 
     def getLdPathEnvName(self):
         return "DYLD_LIBRARY_PATH"
 
-    def getInstallDir(self, mapping, current, envName):
-        return os.environ.get(envName, "/usr/local")
+    def getInstallDir(self):
+        return "/usr/local"
 
 class AIX(Platform):
 
@@ -203,62 +308,61 @@
 
     def __init__(self):
         Platform.__init__(self)
-        self.parseBuildVariables({
+        self.multiArch = {}
+
+    def init(self, component):
+        Platform.init(self, component)
+        self.parseBuildVariables(component, {
             "linux_id" : ("linuxId", None),
             "build-platform" : ("buildPlatform", None),
             "foreign-platforms" : ("foreignPlatforms", lambda s : s.split(" ") if s else []),
         })
-        self.multiArch = {}
         if self.linuxId in ["ubuntu", "debian"]:
             for p in [self.buildPlatform] + self.foreignPlatforms:
                 self.multiArch[p] = run("dpkg-architecture -f -a{0} -qDEB_HOST_MULTIARCH 2> /dev/null".format(p))
 
+
     def hasOpenSSL(self):
         return True
 
-    def getBinSubDir(self, mapping, process, current):
-        buildPlatform = current.driver.configs[mapping].buildPlatform
-        if self.linuxId in ["ubuntu", "debian"] and buildPlatform in self.foreignPlatforms:
-            return os.path.join("bin", self.multiArch[buildPlatform])
-        return "bin"
+    def _getBinDir(self, component, process, mapping, current):
+        installDir = component.getInstallDir(mapping, current)
+        if isinstance(mapping, CSharpMapping):
+            return Platform._getBinDir(self, component, process, mapping, current)
+
+        if self.linuxId in ["ubuntu", "debian"]:
+            binDir = os.path.join(installDir, "bin", self.multiArch[current.driver.configs[mapping].buildPlatform])
+            if os.path.exists(binDir):
+                return binDir
+        return os.path.join(installDir, "bin")
+
+    def _getLibDir(self, component, process, mapping, current):
+        installDir = component.getInstallDir(mapping, current)
+        if isinstance(mapping, CSharpMapping):
+            return Platform._getLibDir(self, component, process, mapping, current)
 
-    def getLibSubDir(self, mapping, process, current):
         buildPlatform = current.driver.configs[mapping].buildPlatform
 
         # PHP module is always installed in the lib directory for the default build platform
         if isinstance(mapping, PhpMapping) and buildPlatform == self.getDefaultBuildPlatform():
-            return "lib"
+            return os.path.join(installDir, "lib")
 
         if self.linuxId in ["centos", "rhel", "fedora"]:
-            return "lib64" if buildPlatform == "x64" else "lib"
+            return os.path.join(installDir, "lib64" if buildPlatform == "x64" else "lib")
         elif self.linuxId in ["ubuntu", "debian"]:
-            return os.path.join("lib", self.multiArch[buildPlatform])
-        return "lib"
+            return os.path.join(installDir, "lib", self.multiArch[buildPlatform])
+        return os.path.join(installDir, "lib")
 
-    def getBuildSubDir(self, name, current):
+    def getBuildSubDir(self, mapping, name, current):
+        buildPlatform = current.driver.configs[mapping].buildPlatform
+        buildConfig = current.driver.configs[mapping].buildConfig
         if self.linuxId in ["ubuntu", "debian"]:
-            return os.path.join("build", self.multiArch[current.config.buildPlatform], current.config.buildConfig)
+            return os.path.join("build", self.multiArch[buildPlatform], buildConfig)
         else:
-            return os.path.join("build", current.config.buildPlatform, current.config.buildConfig)
+            return os.path.join("build", buildPlatform, buildConfig)
 
-    def getDefaultExe(self, name, config):
-        if name == "icebox":
-            if self.linuxId in ["centos", "rhel", "fedora"] and config.buildPlatform == "x86":
-                name += "32" # Multilib platform
-            if config.cpp11:
-                name += "++11"
-        return name
-
-    def canRun(self, mapping, current):
-        if self.linuxId in ["centos", "rhel", "fedora"] and current.config.buildPlatform == "x86":
-            #
-            # Don't test Glacier2/IceStorm/IceGrid services with multilib platforms. We only
-            # build services for the native platform.
-            #
-            parent = re.match(r'^([\w]*).*', current.testcase.getTestSuite().getId()).group(1)
-            if parent in ["Glacier2", "IceStorm", "IceGrid"]:
-                return False
-        return Platform.canRun(self, mapping, current)
+    def getLinuxId(self):
+        return self.linuxId
 
 class Windows(Platform):
 
@@ -266,37 +370,7 @@
         Platform.__init__(self)
         self.compiler = None
 
-    def getFilters(self, config):
-        if config.uwp:
-            return (["cpp/Ice/.*", "cpp/IceSSL/configuration"],
-                    ["Ice/background",
-                     "Ice/echo",
-                     "Ice/faultTolerance",
-                     "Ice/gc",
-                     "Ice/library",
-                     "Ice/logger",
-                     "Ice/networkProxy",        # SOCKS proxy not supported with UWP
-                     "Ice/properties",          # Property files are not supported with UWP
-                     "Ice/plugin",
-                     "Ice/threadPoolPriority"])
-        elif self.getCompiler() in ["VC100"]:
-            return (["cpp/Ice/.*",
-                     "cpp/IceSSL/.*",
-                     "cpp/IceBox/.*",
-                     "cpp/IceDiscovery/.*",
-                     "cpp/IceUtil/.*",
-                     "cpp/Slice/.*"], [])
-        else:
-            iceBinDist = os.environ.get("ICE_BIN_DIST", "").split()
-            exclude = ["ruby"]
-            if not 'all' in iceBinDist:
-                if not 'python' in iceBinDist and not self.getCompiler() in ["VC140"]:
-                    exclude.append("python")
-                if not 'php' in iceBinDist and not self.getCompiler() in ["VC140"]:
-                    exclude.append("php")
-            return ([], exclude)
-
-    def parseBuildVariables(self, variables):
+    def parseBuildVariables(self, component, variables):
         pass # Nothing to do, we don't support the make build system on Windows
 
     def getDefaultBuildPlatform(self):
@@ -314,15 +388,15 @@
             try:
                 out = run("cl")
                 if out.find("Version 16.") != -1:
-                    self.compiler = "VC100"
+                    self.compiler = "v100"
                 elif out.find("Version 17.") != -1:
-                    self.compiler = "VC110"
+                    self.compiler = "v110"
                 elif out.find("Version 18.") != -1:
-                    self.compiler = "VC120"
+                    self.compiler = "v120"
                 elif out.find("Version 19.00.") != -1:
-                    self.compiler = "VC140"
-                elif out.find("Version 19.1") != -1:
-                    self.compiler = "VC141"
+                    self.compiler = "v140"
+                elif out.find("Version 19.") != -1:
+                    self.compiler = "v141"
                 else:
                     raise RuntimeError("Unknown compiler version:\n{0}".format(out))
             except:
@@ -332,117 +406,77 @@
     def getPlatformToolset(self):
         return self.getCompiler().replace("VC", "v")
 
-    def getBinSubDir(self, mapping, process, current):
-        #
-        # Platform/Config taget bin directories.
-        #
+    def _getBinDir(self, component, process, mapping, current):
+        installDir = component.getInstallDir(mapping, current)
         platform = current.driver.configs[mapping].buildPlatform
-        buildConfig = current.driver.configs[mapping].buildConfig
-        config = "Debug" if buildConfig.find("Debug") >= 0 else "Release"
-
-        if current.config.uwp and not current.config.protocol in ["ssl", "wss"]:
-            return ""
-        elif current.driver.useIceBinDist(mapping):
-            version = self.getNugetPackageVersion(mapping)
-            packageSuffix = self.getPlatformToolset() if isinstance(mapping, CppMapping) else "net"
-            package = os.path.join(mapping.path, "msbuild", "packages", "{0}".format(
-                mapping.getNugetPackage(packageSuffix, version))) if hasattr(mapping, "getNugetPackage") else None
-            nuget = package and os.path.exists(package)
-            iceHome = os.environ.get("ICE_HOME", "")
-            if isinstance(mapping, CppMapping) and not nuget and not os.path.exists(iceHome):
-                raise RuntimeError("Cannot detect a valid C++ distribution")
-            if not nuget:
-                return "bin"
-            elif isinstance(mapping, CSharpMapping) or isinstance(process, SliceTranslator):
-                return os.path.join("tools")
+        config = "Debug" if current.driver.configs[mapping].buildConfig.find("Debug") >= 0 else "Release"
+        if component.useBinDist(mapping, current):
+            if installDir != self.getNugetPackageDir(component, mapping, current):
+                return os.path.join(installDir, "bin")
+            elif isinstance(process, SliceTranslator):
+                return os.path.join(installDir, "tools")
+            elif isinstance(mapping, CSharpMapping):
+                return os.path.join(installDir, "tools", mapping.getBinTargetFramework(current))
+            elif process.isReleaseOnly():
+                # Some services are only available in release mode in the Nuget package
+                return os.path.join(installDir, "build", "native", "bin", platform, "Release")
             else:
-
-                #
-                # With Windows binary distribution some binaries are only included for Release configuration.
-                #
-                binaries = [Glacier2Router, IcePatch2Calc, IcePatch2Client, IcePatch2Server, IceBoxAdmin, IceBridge,
-                            IceStormAdmin, IceGridAdmin]
-                config = next(("Release" for p in binaries if isinstance(process, p)), config)
-
-                return os.path.join("build", "native", "bin", platform, config)
+                return os.path.join(installDir, "build", "native", "bin", platform, config)
         else:
-            if isinstance(mapping, CppMapping):
-                return os.path.join("bin", platform, config)
+            if isinstance(mapping, CSharpMapping):
+                return os.path.join(installDir, "bin", mapping.getBinTargetFramework(current))
             elif isinstance(mapping, PhpMapping):
-                return os.path.join("msbuild", "packages", "zeroc.ice.v140.{0}".format(self.getNugetPackageVersion(mapping)),
+                return os.path.join(self.getNugetPackageDir(component, mapping, current),
                                     "build", "native", "bin", platform, config)
-            return "bin"
+            else:
+                return os.path.join(installDir, "bin", platform, config)
 
-    def getLibSubDir(self, mapping, process, current):
-        if isinstance(mapping, PhpMapping):
-            return "php" if current.driver.useIceBinDist(mapping) else "lib"
-        return self.getBinSubDir(mapping, process, current)
-
-    def getBuildSubDir(self, name, current):
-        if os.path.exists(os.path.join(current.testcase.getPath(), "msbuild", name)):
-            return os.path.join("msbuild", name, current.config.buildPlatform, current.config.buildConfig)
+    def _getLibDir(self, component, process, mapping, current):
+        installDir = component.getInstallDir(mapping, current)
+        if isinstance(mapping, CSharpMapping):
+            return os.path.join(installDir, "lib", mapping.getLibTargetFramework(current))
         else:
-            return os.path.join("msbuild", current.config.buildPlatform, current.config.buildConfig)
+            platform = current.driver.configs[mapping].buildPlatform
+            config = "Debug" if current.driver.configs[mapping].buildConfig.find("Debug") >= 0 else "Release"
+            if isinstance(mapping, PhpMapping):
+                return os.path.join(installDir, "lib", "php-{0}".format(current.config.phpVersion), platform, config)
+            elif component.useBinDist(mapping, current):
+                return os.path.join(installDir, "build", "native", "bin", platform, config)
+            else:
+                return os.path.join(installDir, "bin", platform, config)
+
+    def getBuildSubDir(self, mapping, name, current):
+        buildPlatform = current.driver.configs[mapping].buildPlatform
+        buildConfig = current.driver.configs[mapping].buildConfig
+        if os.path.exists(os.path.join(current.testcase.getPath(current), "msbuild", name)):
+            return os.path.join("msbuild", name, buildPlatform, buildConfig)
+        else:
+            return os.path.join("msbuild", buildPlatform, buildConfig)
 
     def getLdPathEnvName(self):
         return "PATH"
 
-    def getInstallDir(self, mapping, current, envName):
-
-        platform = current.config.buildPlatform
-        config = "Debug" if current.config.buildConfig.find("Debug") >= 0 else "Release"
-        version = self.getNugetPackageVersion(mapping)
-        packageSuffix = self.getPlatformToolset() if isinstance(mapping, CppMapping) else "net"
-        package = None
+    def getInstallDir(self):
+        return None # No default installation directory on Windows
 
-        if isinstance(mapping, CSharpMapping) and current.config.netframework:
-            #
-            # Use NuGet package from nuget locals
-            #
-            if not self.nugetPackageCache:
-                self.nugetPackageCache = re.search("info : global-packages: (.*)",
-                                                   run("dotnet nuget locals --list global-packages")).groups(1)[0]
-            package = os.path.join(self.nugetPackageCache, "zeroc.ice.net", version)
-        elif hasattr(mapping, "getNugetPackage"):
-            package = os.path.join(mapping.path, "msbuild", "packages", mapping.getNugetPackage(packageSuffix, version))
-
-        home = os.environ.get(envName, "")
-        if isinstance(mapping, CppMapping) and not package and not os.path.exists(home):
-            raise RuntimeError("Cannot detect a valid C++ distribution")
-
-        return package if package and os.path.exists(package) else home
-
-    def canRun(self, mapping, current):
-        #
-        # On Windows, if testing with a binary distribution, don't test Glacier2/IceBridge services
-        # with the Debug configurations since we don't provide binaries for them.
-        #
-        if current.driver.useIceBinDist(mapping):
-            parent = re.match(r'^([\w]*).*', current.testcase.getTestSuite().getId()).group(1)
-            if parent in ["Glacier2", "IceBridge"] and current.config.buildConfig.find("Debug") >= 0:
-                return False
-        return Platform.canRun(self, mapping, current)
+    def getNugetPackageDir(self, component, mapping, current):
+        if isinstance(mapping, CSharpMapping) and current.config.dotnetcore:
+            return Platform.getNugetPackageDir(self, component, mapping, current)
+        else:
+            package = "{0}.{1}".format(component.getNugetPackage(mapping), component.getNugetPackageVersion(mapping))
+            # The package directory is either under the msbuild directory or in the mapping directory depending
+            # on where the solution is located.
+            if os.path.exists(os.path.join(mapping.path, "msbuild", "packages")):
+                return os.path.join(mapping.path, "msbuild", "packages", package)
+            else:
+                return os.path.join(mapping.path, "packages", package)
 
-    def getDotnetExe(self):
+    def getDotNetExe(self):
         try:
             return run("where dotnet").strip()
         except:
             return None
 
-platform = None
-if sys.platform == "darwin":
-    platform = Darwin()
-elif sys.platform.startswith("aix"):
-    platform = AIX()
-elif sys.platform.startswith("linux") or sys.platform.startswith("gnukfreebsd"):
-    platform = Linux()
-elif sys.platform == "win32" or sys.platform[:6] == "cygwin":
-    platform = Windows()
-
-if not platform:
-    print("can't run on unknown platform `{0}'".format(sys.platform))
-    sys.exit(1)
-
 def parseOptions(obj, options, mapped={}):
     # Transform configuration options provided on the command line to
     # object data members. The data members must be already set on the
@@ -475,34 +509,21 @@
             remaining.append((o, a))
     options[:] = remaining
 
-class Mapping:
+"""
+Mapping abstract class. The mapping class provides mapping specific information.
+Multiple components can share the same mapping rules as long as the layout is
+similar.
+"""
+class Mapping(object):
 
     mappings = OrderedDict()
 
-    class Config:
-
-        # All option values for Ice/IceBox tests.
-        coreOptions = {
-            "protocol" : ["tcp", "ssl", "wss", "ws"],
-            "compress" : [False, True],
-            "ipv6" : [False, True],
-            "serialize" : [False, True],
-            "mx" : [False, True],
-        }
-
-        # All option values for IceGrid/IceStorm/Glacier2/IceDiscovery tests.
-        serviceOptions = {
-            "protocol" : ["tcp", "wss"],
-            "compress" : [False, True],
-            "ipv6" : [False, True],
-            "serialize" : [False, True],
-            "mx" : [False, True],
-        }
+    class Config(object):
 
         @classmethod
         def getSupportedArgs(self):
-            return ("", ["config=", "platform=", "protocol=", "compress", "ipv6", "no-ipv6", "serialize", "mx",
-                         "cprops=", "sprops="])
+            return ("", ["config=", "platform=", "protocol=", "target=", "compress", "ipv6", "no-ipv6", "serialize",
+                         "mx", "cprops=", "sprops="])
 
         @classmethod
         def usage(self):
@@ -537,6 +558,7 @@
             else:
                 self.buildPlatform = platform.getDefaultBuildPlatform()
 
+            self.pathOverride = ""
             self.protocol = "tcp"
             self.compress = False
             self.serialize = False
@@ -544,19 +566,23 @@
             self.mx = False
             self.cprops = []
             self.sprops = []
-            parseOptions(self, options, { "config" : "buildConfig",
-                                          "platform" : "buildPlatform" })
 
-            # Options bellow are not parsed by the base class by still
-            # initialized here for convenience (this avoid having to
-            # check the configuration type)
+            # Options bellow are not parsed by the base class by still initialized here for convenience (this
+            # avoid having to check the configuration type)
             self.uwp = False
             self.openssl = False
-
+            self.browser = ""
+            self.es5 = False
+            self.worker = False
+            self.dotnetcore = False
+            self.framework = ""
+            self.android = False
+            self.xamarin = False
             self.device = ""
             self.avd = ""
-            self.androidemulator = False
-            self.netframework = ""
+            self.phpVersion = "7.1"
+
+            parseOptions(self, options, { "config" : "buildConfig", "platform" : "buildPlatform" })
 
         def __str__(self):
             s = []
@@ -623,17 +649,10 @@
 
                     yield self.__class__(options)
 
-            options = None
-            parent = re.match(r'^([\w]*).*', testcase.getTestSuite().getId()).group(1)
-            if isinstance(testcase, ClientServerTestCase) and parent in ["Ice", "IceBox"]:
-                options = current.driver.filterOptions(testcase, self.coreOptions)
-            elif parent in ["IceGrid", "Glacier2", "IceStorm", "IceDiscovery", "IceBridge"]:
-                options = current.driver.filterOptions(testcase, self.serviceOptions)
-
-            return [c for c in gen(options)]
+            return [c for c in gen(current.driver.filterOptions(current.driver.getComponent().getOptions(testcase, current)))]
 
-        def canRun(self, current):
-            if not platform.canRun(current.testcase.getMapping(), current):
+        def canRun(self, testId, current):
+            if not current.driver.getComponent().canRun(testId, current.testcase.getMapping(), current):
                 return False
 
             options = {}
@@ -696,7 +715,7 @@
                 if self.ipv6:
                     props["Ice.PreferIPv6Address"] = True
                 if self.mx:
-                    props["Ice.Admin.Endpoints"] = "default -h localhost"
+                    props["Ice.Admin.Endpoints"] = "tcp -h \"::1\"" if self.ipv6 else "tcp -h 127.0.0.1"
                     props["Ice.Admin.InstanceName"] = "Server" if isinstance(process, Server) else "Client"
                     props["IceMX.Metrics.Debug.GroupBy"] ="id"
                     props["IceMX.Metrics.Parent.GroupBy"] = "parent"
@@ -741,101 +760,119 @@
 
     @classmethod
     def getByPath(self, path):
+        path = os.path.normpath(path)
+        for m in self.mappings.values():
+            if path.startswith(os.path.normpath(m.getTestDir())):
+                return m
+
+    @classmethod
+    def getAllByPath(self, path):
         path = os.path.abspath(path)
-        mapping = None
+        mappings = []
         for m in self.mappings.values():
-            if path.startswith(m.getPath() + os.sep) and (not mapping or len(mapping.getPath()) < len(m.getPath())):
-                mapping=m
-        return mapping
+            if path.startswith(m.getPath() + os.sep):
+                mappings.append(m)
+        return mappings
 
     @classmethod
-    def add(self, name, mapping):
+    def add(self, name, mapping, component, path=None):
         name = name.replace("\\", "/")
-        self.mappings[name] = mapping.init(name)
+        self.mappings[name] = mapping.init(name, component, path)
+
+    @classmethod
+    def remove(self, name):
+        del self.mappings[name]
 
     @classmethod
     def getAll(self, driver=None):
         return [m for m in self.mappings.values() if not driver or driver.matchLanguage(str(m))]
 
     def __init__(self, path=None):
-        self.platform = None
         self.name = None
         self.path = os.path.abspath(path) if path else None
         self.testsuites = {}
 
-    def init(self, name):
+    def init(self, name, component, path=None):
         self.name = name
+        self.component = component
         if not self.path:
-            self.path = os.path.normpath(os.path.join(toplevel, name))
+            self.path = os.path.normpath(os.path.join(self.component.getSourceDir(), path or name))
         return self
 
     def __str__(self):
         return self.name
 
+    def getTestDir(self):
+        return self.component.getTestDir(self)
+
     def createConfig(self, options):
         return self.Config(options)
 
     def filterTestSuite(self, testId, config, filters=[], rfilters=[]):
-        (pfilters, prfilters) = platform.getFilters(config)
-        for includes in [filters, [re.compile(pf) for pf in pfilters]]:
-            if len(includes) > 0:
-                for f in includes:
-                    if f.search(self.name + "/" + testId):
-                        break
-                else:
+        if len(filters) > 0:
+            for f in filters:
+                if f.search(self.name + "/" + testId):
+                    break
+            else:
+                return True
+
+        if len(rfilters) > 0:
+            for f in rfilters:
+                if f.search(self.name + "/" + testId):
                     return True
 
-        for excludes in [rfilters, [re.compile(pf) for pf in prfilters]]:
-            if len(excludes) > 0:
-                for f in excludes:
-                    if f.search(self.name + "/" + testId):
-                        return True
         return False
 
     def loadTestSuites(self, tests, config, filters=[], rfilters=[]):
         global currentMapping
         currentMapping = self
-        for test in tests or [""]:
-            for root, dirs, files in os.walk(os.path.join(self.getTestsPath(), test.replace('/', os.sep))):
-
-                testId = root[len(self.getTestsPath()) + 1:]
-                if os.sep != "/":
-                    testId = testId.replace(os.sep, "/")
+        try:
+            origsyspath = sys.path
+            prefix = os.path.commonprefix([toplevel, self.component.getScriptDir()])
+            moduleprefix = self.component.getScriptDir()[len(prefix) + 1:].replace(os.sep, ".") + "."
+            sys.path = [prefix] + sys.path
+            for test in tests or [""]:
+                testDir = self.component.getTestDir(self)
+                for root, dirs, files in os.walk(os.path.join(testDir, test.replace('/', os.sep))):
+                    testId = root[len(testDir) + 1:]
+                    if os.sep != "/":
+                        testId = testId.replace(os.sep, "/")
 
-                if self.filterTestSuite(testId, config, filters, rfilters):
-                    continue
+                    if self.filterTestSuite(testId, config, filters, rfilters):
+                        continue
 
-                #
-                # First check if there's a test.py file in the directory, if there's one use it.
-                #
-                if "test.py" in files:
                     #
-                    # WORKAROUND for Python issue 15230 (fixed in 3.2) where run_path doesn't work correctly.
+                    # First check if there's a test.py file in the test directory, if there's one use it.
                     #
-                    #runpy.run_path(os.path.join(root, "test.py"))
-                    origsyspath = sys.path
-                    sys.path = [root] + sys.path
-                    runpy.run_module("test", init_globals=globals(), run_name=root)
-                    origsyspath = sys.path
-                    continue
+                    if "test.py" in files :
+                        #
+                        # WORKAROUND for Python issue 15230 (fixed in 3.2) where run_path doesn't work correctly.
+                        #
+                        #runpy.run_path(os.path.join(root, "test.py"))
+                        origsyspath = sys.path
+                        sys.path = [root] + sys.path
+                        runpy.run_module("test", init_globals=globals(), run_name=root)
+                        origsyspath = sys.path
+                        continue
 
-                #
-                # If there's no test.py file in the test directory, we check if there's a common
-                # script for the test in scripts/tests. If there's on we use it.
-                #
-                script = os.path.join(self.getCommonTestsPath(), testId + ".py")
-                if os.path.isfile(script):
-                    runpy.run_module("tests." + testId.replace("/", "."), init_globals=globals(), run_name=root)
-                    continue
+                    #
+                    # If there's no test.py file in the test directory, we check if there's a common
+                    # script for the test in scripts/tests. If there's one we use it.
+                    #
+                    if os.path.isfile(os.path.join(self.component.getScriptDir(), testId + ".py")):
+                        runpy.run_module(moduleprefix + testId.replace("/", "."), init_globals=globals(), run_name=root)
+                        continue
 
-                #
-                # Finally, we try to "discover/compute" the test by looking up for well-known
-                # files.
-                #
-                testcases = self.computeTestCases(testId, files)
-                if testcases:
-                    TestSuite(root, testcases)
-        currentMapping = None
+                    #
+                    # Finally, we try to "discover/compute" the test by looking up for well-known
+                    # files.
+                    #
+                    testcases = self.computeTestCases(testId, files)
+                    if testcases:
+                        TestSuite(root, testcases)
+        finally:
+            currentMapping = None
+            sys.path = origsyspath
 
     def getTestSuites(self, ids=[]):
         if not ids:
@@ -843,8 +880,8 @@
         return [self.testsuites[testSuiteId] for testSuiteId in ids if testSuiteId in self.testsuites]
 
     def addTestSuite(self, testsuite):
-        assert len(testsuite.path) > len(self.getTestsPath()) + 1
-        testSuiteId = testsuite.path[len(self.getTestsPath()) + 1:].replace('\\', '/')
+        assert len(testsuite.path) > len(self.component.getTestDir(self)) + 1
+        testSuiteId = testsuite.path[len(self.component.getTestDir(self)) + 1:].replace('\\', '/')
         self.testsuites[testSuiteId] = testsuite
         return testSuiteId
 
@@ -854,7 +891,6 @@
     def computeTestCases(self, testId, files):
 
         # Instantiate a new test suite if the directory contains well-known source files.
-
         def checkFile(f, m):
             try:
                 # If given mapping is same as local mapping, just check the files set, otherwise check
@@ -872,6 +908,10 @@
             testcases.append(ClientServerTestCase())
         if checkClient("client") and checkServer("serveramd") and self.getServerMapping(testId) == self:
             testcases.append(ClientAMDServerTestCase())
+        if checkClient("client") and checkServer("servertie") and self.getServerMapping(testId) == self:
+            testcases.append(ClientTieServerTestCase())
+        if checkClient("client") and checkServer("serveramdtie") and self.getServerMapping(testId) == self:
+            testcases.append(ClientAMDTieServerTestCase())
         if checkClient("client") and len(testcases) == 0:
             testcases.append(ClientTestCase())
         if checkClient("collocated"):
@@ -881,45 +921,49 @@
 
     def hasSource(self, testId, processType):
         try:
-            return os.path.exists(os.path.join(self.getTestsPath(), testId, self.getDefaultSource(processType)))
+            return os.path.exists(os.path.join(self.component.getTestDir(self), testId, self.getDefaultSource(processType)))
         except KeyError:
             return False
 
     def getPath(self):
         return self.path
 
-    def getTestsPath(self):
-        return os.path.join(self.path, "test")
-
-    def getCommonTestsPath(self):
-        return os.path.join(self.path, "..", "scripts", "tests")
-
     def getTestCwd(self, process, current):
-        return current.testcase.getPath()
+        return current.testcase.getPath(current)
 
     def getDefaultSource(self, processType):
-        return processType
+        default = self.component.getDefaultSource(self, processType)
+        if default:
+            return default
+        return self._getDefaultSource(processType)
 
     def getDefaultProcesses(self, processType, testsuite):
+        default = self.component.getDefaultProcesses(self, processType, testsuite.getId())
+        if default:
+            return default
+        return self._getDefaultProcesses(processType)
+
+    def getDefaultExe(self, processType):
+        default = self.component.getDefaultExe(self, processType)
+        if default:
+            return default
+        return self._getDefaultExe(processType)
+
+    def _getDefaultSource(self, processType):
+        return processType
+
+    def _getDefaultProcesses(self, processType):
         #
         # If no server or client is explicitly set with a testcase, getDefaultProcess is called
-        # to figure out which process class to instantiate. Based on the processType and the testsuite
-        # we instantiate the right default process class.
+        # to figure out which process class to instantiate.
         #
-        if processType is None:
-            return []
-        elif testsuite.getId().startswith("IceUtil") or testsuite.getId().startswith("Slice"):
-            return [SimpleClient()]
-        elif testsuite.getId().startswith("IceGrid"):
-            if processType in ["client", "collocated"]:
-                return [IceGridClient()]
-            if processType in ["server", "serveramd"]:
-                return [IceGridServer()]
-        else:
-            return [Server()] if processType in ["server", "serveramd"] else [Client()]
+        name, ext = os.path.splitext(self.getDefaultSource(processType))
+        if name in globals():
+            return [globals()[name]()]
+        return [Server()] if processType.startswith("server") else [Client()] if processType else []
 
-    def getDefaultExe(self, processType, config):
-        return processType
+    def _getDefaultExe(self, processType):
+        return os.path.splitext(self.getDefaultSource(processType))[0]
 
     def getClientMapping(self, testId=None):
         # The client mapping is always the same as this mapping.
@@ -929,24 +973,18 @@
         # Can be overridden for client-only mapping that relies on another mapping for servers
         return self
 
-    def getBinDir(self, process, current):
-        return os.path.join(current.driver.getIceDir(self, current), platform.getBinSubDir(self, process, current))
-
-    def getLibDir(self, process, current):
-        return os.path.join(current.driver.getIceDir(self, current), platform.getLibSubDir(self, process, current))
-
     def getBuildDir(self, name, current):
-        return platform.getBuildSubDir(name, current)
+        return platform.getBuildSubDir(self, name, current)
 
     def getCommandLine(self, current, process, exe, args):
         cmd = ""
         if process.isFromBinDir():
             # If it's a process from the bin directory, the location is platform specific
             # so we check with the platform.
-            cmd = os.path.join(self.getBinDir(process, current), exe)
+            cmd = os.path.join(self.component.getBinDir(process, self, current), exe)
         elif current.testcase:
             # If it's a process from a testcase, the binary is in the test build directory.
-            cmd = os.path.join(current.testcase.getPath(), current.getBuildDir(exe), exe)
+            cmd = os.path.join(current.testcase.getPath(current), current.getBuildDir(exe), exe)
         else:
             cmd = exe
 
@@ -968,14 +1006,14 @@
         sslProps = {
             "Ice.Plugin.IceSSL" : self.getPluginEntryPoint("IceSSL", process, current),
             "IceSSL.Password": "password",
-            "IceSSL.DefaultDir": "" if current.config.buildPlatform == "iphoneos" else os.path.join(toplevel, "certs"),
+            "IceSSL.DefaultDir": "" if current.config.buildPlatform == "iphoneos" else os.path.join(self.component.getSourceDir(), "certs"),
         }
 
         #
         # If the client doesn't support client certificates, set IceSSL.VerifyPeer to 0
         #
         if isinstance(process, Server):
-            if isinstance(current.testsuite.getMapping(), JavaScriptMapping):
+            if isinstance(current.testsuite.getMapping(), JavaScriptMixin):
                 sslProps["IceSSL.VerifyPeer"] = 0
 
         return sslProps
@@ -989,32 +1027,11 @@
     def getOptions(self, current):
         return {}
 
-    def getRunOrder(self):
-        return ["Slice", "IceUtil", "Ice", "IceSSL", "IceBox", "Glacier2", "IceGrid", "IceStorm"]
-
-    def getCrossTestSuites(self):
-        return [
-            "Ice/ami",
-            "Ice/info",
-            "Ice/exceptions",
-            "Ice/enums",
-            "Ice/facets",
-            "Ice/inheritance",
-            "Ice/invoke",
-            "Ice/objects",
-            "Ice/operations",
-            "Ice/proxy",
-            "Ice/servantLocator",
-            "Ice/slicing/exceptions",
-            "Ice/slicing/objects",
-            "Ice/optional"
-        ]
-
 #
 # A Runnable can be used as a "client" for in test cases, it provides
 # implements run, setup and teardown methods.
 #
-class Runnable:
+class Runnable(object):
 
     def __init__(self, desc=None):
         self.desc = desc
@@ -1148,6 +1165,7 @@
     def getEffectiveProps(self, current, props):
         allProps = {}
         allProps.update(current.driver.getProps(self, current))
+        allProps.update(current.driver.getComponent().getProps(self, current))
         allProps.update(current.config.getProps(self, current))
         allProps.update(self.getMapping(current).getProps(self, current))
         allProps.update(current.testcase.getProps(self, current))
@@ -1157,11 +1175,18 @@
         return allProps
 
     def getEffectiveEnv(self, current):
+
+        def merge(envs, newEnvs):
+            if platform.getLdPathEnvName() in newEnvs and platform.getLdPathEnvName() in envs:
+                newEnvs[platform.getLdPathEnvName()] += os.pathsep + envs[platform.getLdPathEnvName()]
+            envs.update(newEnvs)
+
         allEnvs = {}
-        allEnvs.update(self.getMapping(current).getEnv(self, current))
-        allEnvs.update(current.testcase.getEnv(self, current))
-        allEnvs.update(self.getEnv(current))
-        allEnvs.update(self.envs(self, current) if callable(self.envs) else self.envs)
+        merge(allEnvs, current.driver.getComponent().getEnv(self, current))
+        merge(allEnvs, self.getMapping(current).getEnv(self, current))
+        merge(allEnvs, current.testcase.getEnv(self, current))
+        merge(allEnvs, self.getEnv(current))
+        merge(allEnvs, self.envs(self, current) if callable(self.envs) else self.envs)
         return allEnvs
 
     def getEffectiveTraceProps(self, current):
@@ -1218,6 +1243,10 @@
         assert(self in current.processes and isinstance(current.processes[self], Expect.Expect))
         return current.processes[self].expect(pattern, timeout)
 
+    def expectall(self, current, pattern, timeout=60):
+        assert(self in current.processes and isinstance(current.processes[self], Expect.Expect))
+        return current.processes[self].expectall(pattern, timeout)
+
     def sendline(self, current, data):
         assert(self in current.processes and isinstance(current.processes[self], Expect.Expect))
         return current.processes[self].sendline(data)
@@ -1232,6 +1261,9 @@
     def isFromBinDir(self):
         return False
 
+    def isReleaseOnly(self):
+        return False
+
     def getArgs(self, current):
         return []
 
@@ -1246,7 +1278,7 @@
 
     def getExe(self, current):
         processType = self.processType or current.testcase.getProcessType(self)
-        return self.exe or self.getMapping(current).getDefaultExe(processType, current.config)
+        return self.exe or self.getMapping(current).getDefaultExe(processType)
 
     def getCommandLine(self, current, args=""):
         return self.getMapping(current).getCommandLine(current, self, self.getExe(current), args).strip()
@@ -1272,7 +1304,7 @@
 #
 class Server(IceProcess):
 
-    def __init__(self, exe=None, waitForShutdown=True, readyCount=1, ready=None, startTimeout=120, *args, **kargs):
+    def __init__(self, exe=None, waitForShutdown=True, readyCount=1, ready=None, startTimeout=300, *args, **kargs):
         IceProcess.__init__(self, exe, *args, **kargs)
         self.waitForShutdown = waitForShutdown
         self.readyCount = readyCount
@@ -1318,7 +1350,17 @@
     def isFromBinDir(self):
         return True
 
-class SliceTranslator(ProcessFromBinDir, SimpleClient):
+#
+# Executables for processes inheriting this marker class are only provided
+# as a Release executble on Windows
+#
+class ProcessIsReleaseOnly:
+
+    def isReleaseOnly(self):
+        return True
+
+
+class SliceTranslator(ProcessFromBinDir, ProcessIsReleaseOnly, SimpleClient):
 
     def __init__(self, translator):
         SimpleClient.__init__(self, exe=translator, quiet=True, mapping=Mapping.getByName("cpp"))
@@ -1342,6 +1384,12 @@
         else:
             return Process.getCommandLine(self, current, args)
 
+class ServerAMD(Server):
+    pass
+
+class Collocated(Client):
+    pass
+
 class EchoServer(Server):
 
     def __init__(self):
@@ -1414,15 +1462,22 @@
         # If no clients are explicitly specified, we instantiate one if getClientType()
         # returns the type of client to instantiate (client, collocated, etc)
         #
+        testId = self.testsuite.getId()
         if not self.clients:
-            self.clients = self.mapping.getDefaultProcesses(self.getClientType(), testsuite)
+            if self.getClientType():
+                self.clients = self.mapping.getClientMapping(testId).getDefaultProcesses(self.getClientType(), testsuite)
+            else:
+                self.clients = []
 
         #
         # If no servers are explicitly specified, we instantiate one if getServerType()
         # returns the type of server to instantiate (server, serveramd, etc)
         #
         if not self.servers:
-            self.servers = self.mapping.getDefaultProcesses(self.getServerType(), testsuite)
+            if self.getServerType():
+                self.servers = self.mapping.getServerMapping(testId).getDefaultProcesses(self.getServerType(), testsuite)
+            else:
+                self.servers = []
 
     def getOptions(self, current):
         return self.options(current) if callable(self.options) else self.options
@@ -1468,8 +1523,12 @@
     def getName(self):
         return self.name
 
-    def getPath(self):
-        return self.testsuite.getPath()
+    def getPath(self, current):
+        path = self.testsuite.getPath()
+        if current.config.pathOverride:
+            return path.replace(toplevel, current.config.pathOverride)
+        else:
+            return path
 
     def getMapping(self):
         return self.mapping
@@ -1634,6 +1693,22 @@
     def getServerType(self):
         return "serveramd"
 
+class ClientTieServerTestCase(ClientServerTestCase):
+
+    def __init__(self, name="client/tie server", *args, **kargs):
+        ClientServerTestCase.__init__(self, name, *args, **kargs)
+
+    def getServerType(self):
+        return "servertie"
+
+class ClientAMDTieServerTestCase(ClientServerTestCase):
+
+    def __init__(self, name="client/amd tie server", *args, **kargs):
+        ClientServerTestCase.__init__(self, name, *args, **kargs)
+
+    def getServerType(self):
+        return "serveramdtie"
+
 class Result:
 
     getKey = lambda self, current: (current.testcase, current.config) if isinstance(current, Driver.Current) else current
@@ -1775,10 +1850,10 @@
                     last = last[len(last) - 1]
                 if hostname:
                     last = "Failed on {0}\n{1}".format(hostname, last)
-                out.write('      <failure message="{1}">{0}</failure>\n'.format(escapeXml(self._failed[k]),
-                                                                                escapeXml(last)))
+                out.write('      <failure message={1}>{0}</failure>\n'.format(escapeXml(self._failed[k]),
+                                                                              escapeXml(last, True)))
             # elif k in self._skipped:
-            #     out.write('      <skipped message="{0}"/>\n'.format(escapeXml(self._skipped[k])))
+            #     out.write('      <skipped message="{0}"/>\n'.format(escapeXml(self._skipped[k], True)))
             out.write('      <system-out>\n')
             if hostname:
                 out.write('Running on {0}\n'.format(hostname))
@@ -1788,7 +1863,7 @@
 
         out.write(  '</testsuite>\n')
 
-class TestSuite:
+class TestSuite(object):
 
     def __init__(self, path, testcases=None, options=None, libDirs=None, runOnMainThread=False, chdir=False,
                  multihost=True, mapping=None):
@@ -1834,15 +1909,14 @@
         return self.libDirs
 
     def isMainThreadOnly(self, driver):
-        for m in [CppMapping, JavaMapping, CSharpMapping]:
-            config = driver.configs[self.mapping]
-            # TODO: WORKAROUND for ICE-8175
-            if self.id.startswith("IceStorm"):
-                return True
-            elif isinstance(self.mapping, m):
-                if "iphone" in config.buildPlatform or config.uwp:
+        if self.runOnMainThread or driver.getComponent().isMainThreadOnly(self.id):
+            return True
+        for m in [CppMapping, JavaMapping, CSharpMapping, PythonMapping, PhpMapping, RubyMapping, JavaScriptMixin]:
+            if isinstance(self.mapping, m):
+                config = driver.configs[self.mapping]
+                if "iphone" in config.buildPlatform or config.uwp or config.browser or config.android:
                     return True # Not supported yet for tests that require a remote process controller
-                return self.runOnMainThread
+                return False
         else:
             return True
 
@@ -1879,10 +1953,6 @@
     def isMultiHost(self):
         return self.multihost
 
-    def isCross(self):
-        # Only run the tests that support cross testing --all-cross or --cross
-        return self.id in self.mapping.getCrossTestSuites()
-
 class ProcessController:
 
     def __init__(self, current):
@@ -1921,15 +1991,7 @@
                     current.writeln("saved {0}".format(self.traceFile))
 
     def getHost(self, current):
-        # Depending on the configuration, either use an IPv4, IPv6 or BT address for Ice.Default.Host
-        if current.config.protocol == "bt":
-            if not current.driver.hostBT:
-                raise Test.Common.TestCaseFailedException("no Bluetooth address set with --host-bt")
-            return current.driver.hostBT
-        elif current.config.ipv6:
-            return current.driver.hostIPv6 or "::1"
-        else:
-            return current.driver.host or "127.0.0.1"
+        return current.driver.getHost(current.config.protocol, current.config.ipv6)
 
     def start(self, process, current, args, props, envs, watchDog):
 
@@ -1942,12 +2004,10 @@
             "testcase": current.testcase,
             "testdir": current.testsuite.getPath(),
             "builddir": current.getBuildDir(process.getExe(current)),
-            "icedir" : current.driver.getIceDir(current.testcase.getMapping(), current),
-            "iceboxconfigext": "" if not current.config.netframework else ".{0}".format(current.config.netframework)
         }
 
         traceFile = ""
-        if not isinstance(process.getMapping(current), JavaScriptMapping):
+        if not isinstance(process.getMapping(current), JavaScriptMixin):
             traceProps = process.getEffectiveTraceProps(current)
             if traceProps:
                 if "Ice.ProgramName" in props:
@@ -1956,7 +2016,10 @@
                     programName = process.exe or current.testcase.getProcessType(process)
                 traceFile = os.path.join(current.testsuite.getPath(),
                                          "{0}-{1}.log".format(programName, time.strftime("%m%d%y-%H%M")))
-                traceProps["Ice.StdErr"] = traceFile
+                if isinstance(process.getMapping(current), ObjCMapping):
+                    traceProps["Ice.StdErr"] = traceFile
+                else:
+                    traceProps["Ice.LogFile"] = traceFile
             props.update(traceProps)
 
         args = ["--{0}={1}".format(k, val(v)) for k,v in props.items()] + [val(a) for a in args]
@@ -1966,7 +2029,7 @@
         cmd = ""
         if current.driver.valgrind:
             cmd += "valgrind -q --child-silent-after-fork=yes --leak-check=full --suppressions=\"{0}\" ".format(
-                                                                os.path.join(toplevel, "config", "valgrind.sup"))
+                                os.path.join(current.driver.getComponent().getSourceDir(), "config", "valgrind.sup"))
         exe = process.getCommandLine(current, " ".join(args))
         cmd += exe.format(**kargs)
 
@@ -2035,29 +2098,30 @@
         def teardown(self, current, success):
             pass
 
-    def __init__(self, current, endpoints=None):
+    def __init__(self, current, endpoints="tcp"):
         self.processControllerProxies = {}
         self.controllerApps = []
+        self.driver = current.driver
         self.cond = threading.Condition()
-        if endpoints:
-            comm = current.driver.getCommunicator()
-            import Test
 
-            class ProcessControllerRegistryI(Test.Common.ProcessControllerRegistry):
+        comm = current.driver.getCommunicator()
+        import Test
 
-                def __init__(self, remoteProcessController):
-                    self.remoteProcessController = remoteProcessController
+        class ProcessControllerRegistryI(Test.Common.ProcessControllerRegistry):
 
-                def setProcessController(self, proxy, current):
-                    import Test
-                    proxy = Test.Common.ProcessControllerPrx.uncheckedCast(current.con.createProxy(proxy.ice_getIdentity()))
-                    self.remoteProcessController.setProcessController(proxy)
+            def __init__(self, remoteProcessController):
+                self.remoteProcessController = remoteProcessController
 
-            self.adapter = comm.createObjectAdapterWithEndpoints("Adapter", endpoints)
-            self.adapter.add(ProcessControllerRegistryI(self), comm.stringToIdentity("Util/ProcessControllerRegistry"))
-            self.adapter.activate()
-        else:
-            self.adapter = None
+            def setProcessController(self, proxy, current):
+                import Test
+                proxy = Test.Common.ProcessControllerPrx.uncheckedCast(current.con.createProxy(proxy.ice_getIdentity()))
+                self.remoteProcessController.setProcessController(proxy)
+
+        import Ice
+        comm.getProperties().setProperty("Adapter.AdapterId", Ice.generateUUID())
+        self.adapter = comm.createObjectAdapterWithEndpoints("Adapter", endpoints)
+        self.adapter.add(ProcessControllerRegistryI(self), comm.stringToIdentity("Util/ProcessControllerRegistry"))
+        self.adapter.activate()
 
     def __str__(self):
         return "remote controller"
@@ -2093,25 +2157,24 @@
                 self.controllerApps.append(ident)
                 self.startControllerApp(current, ident)
 
-        if not self.adapter:
-            # Use well-known proxy and IceDiscovery to discover the process controller object from the app.
-            proxy = Test.Common.ProcessControllerPrx.uncheckedCast(comm.stringToProxy(comm.identityToString(ident)))
-            try:
-                proxy.ice_ping()
-            except Exception as ex:
-                raise RuntimeError("couldn't reach the remote controller `{0}'".format(proxy))
-
+        # Use well-known proxy and IceDiscovery to discover the process controller object from the app.
+        proxy = Test.Common.ProcessControllerPrx.uncheckedCast(comm.stringToProxy(comm.identityToString(ident)))
+        try:
+            proxy.ice_ping()
             with self.cond:
                 self.processControllerProxies[ident] = proxy
                 return self.processControllerProxies[ident]
-        else:
-            # Wait 10 seconds for a process controller to be registered with the ProcessControllerRegistry
-            with self.cond:
-                if not ident in self.processControllerProxies:
-                    self.cond.wait(10)
-                if ident in self.processControllerProxies:
-                    return self.processControllerProxies[ident]
-            raise RuntimeError("couldn't reach the remote controller `{0}'".format(ident))
+        except Exception:
+            pass
+
+        # Wait 30 seconds for a process controller to be registered with the ProcessControllerRegistry
+        with self.cond:
+            if not ident in self.processControllerProxies:
+                self.cond.wait(30)
+            if ident in self.processControllerProxies:
+                return self.processControllerProxies[ident]
+
+        raise RuntimeError("couldn't reach the remote controller `{0}'".format(ident))
 
     def setProcessController(self, proxy):
         with self.cond:
@@ -2182,8 +2245,12 @@
 class AndroidProcessController(RemoteProcessController):
 
     def __init__(self, current):
-        run("adb kill-server")
-        RemoteProcessController.__init__(self, current, "tcp -h 127.0.0.1 -p 15001" if current.config.androidemulator else None)
+        endpoint = None
+        if current.config.xamarin or current.config.device:
+            endpoint = "tcp -h 0.0.0.0 -p 15001"
+        elif current.config.avd or not current.config.device:
+            endpoint = "tcp -h 127.0.0.1 -p 15001"
+        RemoteProcessController.__init__(self, current, endpoint)
         self.device = current.config.device
         self.avd = current.config.avd
         self.emulator = None # Keep a reference to the android emulator process
@@ -2192,10 +2259,15 @@
         return "Android"
 
     def getControllerIdentity(self, current):
-        return "Android/ProcessController"
+        if isinstance(current.testcase.getMapping(), CSharpMapping):
+            return "AndroidXamarin/ProcessController"
+        elif isinstance(current.testcase.getMapping(), JavaCompatMapping):
+            return "AndroidCompat/ProcessController"
+        else:
+            return "Android/ProcessController"
 
     def adb(self):
-        return "adb -s {}".format(self.device) if self.device else "adb"
+        return "adb -d" if self.device == "usb" else "adb"
 
     def startEmulator(self, avd):
         #
@@ -2219,7 +2291,7 @@
             raise RuntimeError("cannot find free port in range 5554-5584, to run android emulator")
 
         self.device = "emulator-{}".format(port)
-        cmd = "emulator -avd {0} -port {1} -noaudio -no-window -no-snapshot".format(avd, port)
+        cmd = "emulator -avd {0} -port {1} -noaudio -partition-size 768 -no-snapshot".format(avd, port)
         self.emulator = subprocess.Popen(cmd, shell=True)
 
         if self.emulator.poll():
@@ -2239,31 +2311,38 @@
             except RuntimeError:
                 pass # expected if device is offline
             #
-            # If the emulator doesn't complete boot in 60 seconds give up
+            # If the emulator doesn't complete boot in 300 seconds give up
             #
-            if (time.time() - t) > 60:
+            if (time.time() - t) > 300:
                 raise RuntimeError("couldn't start the Android emulator `{}'".format(avd))
             time.sleep(2)
-        print(" ok")
 
     def startControllerApp(self, current, ident):
+
+        # Stop previous controller app before starting new one
+        for ident in self.controllerApps:
+            self.stopControllerApp(ident)
+
         if current.config.avd:
             self.startEmulator(current.config.avd)
-        elif current.config.androidemulator:
+        elif not current.config.device:
             # Create Android Virtual Device
             sdk = current.testcase.getMapping().getSDKPackage()
+            print("creating virtual device ({0})... ".format(sdk))
             try:
                 run("avdmanager delete avd -n IceTests") # Delete the created device
             except:
                 pass
-            run("sdkmanager \"{0}\"".format(sdk))
+            # The SDK is downloaded by test VMs instead of here.
+            #run("sdkmanager \"{0}\"".format(sdk), stdout=True, stdin="yes", stdinRepeat=True) # yes to accept licenses
             run("avdmanager create avd -k \"{0}\" -d \"Nexus 6\" -n IceTests".format(sdk))
             self.startEmulator("IceTests")
-        elif not self.device:
-            raise RuntimeError("no Android device specified to run the controller application")
+        elif current.config.device != "usb":
+            run("adb connect {}".format(current.config.device))
 
-        run("{} install -t -r {}".format(self.adb(), current.config.apk))
-        run("{} shell am start -n com.zeroc.testcontroller/.ControllerActivity".format(self.adb()))
+        run("{} install -t -r {}".format(self.adb(), current.testcase.getMapping().getApk(current)))
+        run("{} shell am start -n \"{}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER".format(
+            self.adb(), current.testcase.getMapping().getActivityName()))
 
     def stopControllerApp(self, ident):
         try:
@@ -2277,11 +2356,6 @@
             except:
                 pass
 
-            try:
-                run("adb kill-server")
-            except:
-                pass
-
             if self.avd == "IceTests":
                 try:
                     run("avdmanager delete avd -n IceTests") # Delete the created device
@@ -2302,48 +2376,40 @@
                 sys.stdout.flush()
                 time.sleep(0.5)
 
+        try:
+            run("adb kill-server")
+        except:
+            pass
+
 class iOSSimulatorProcessController(RemoteProcessController):
 
     device = "iOSSimulatorProcessController"
-    deviceID = "com.apple.CoreSimulator.SimDeviceType.iPhone-6"
-    appPath = "ios/controller/build"
+    deviceID = "com.apple.CoreSimulator.SimDeviceType.iPhone-X"
 
     def __init__(self, current):
-        RemoteProcessController.__init__(self, current)
+        RemoteProcessController.__init__(self, current, "tcp -h 0.0.0.0 -p 15001" if current.config.xamarin else None)
         self.simulatorID = None
         self.runtimeID = None
         # Pick the last iOS simulator runtime ID in the list of iOS simulators (assumed to be the latest).
-        for r in run("xcrun simctl list runtimes").split('\n'):
-            m = re.search("iOS .* \(.*\) - (.*)", r)
-            if m:
-                self.runtimeID = m.group(1)
+        try:
+            for r in run("xcrun simctl list runtimes").split('\n'):
+                m = re.search("iOS .* \\(.*\\) - (.*)", r)
+                if m:
+                    self.runtimeID = m.group(1)
+        except:
+            pass
         if not self.runtimeID:
-            self.runtimeID = "com.apple.CoreSimulator.SimRuntime.iOS-11-0" # Default value
+            self.runtimeID = "com.apple.CoreSimulator.SimRuntime.iOS-12-0" # Default value
 
     def __str__(self):
         return "iOS Simulator"
 
     def getControllerIdentity(self, current):
-        if isinstance(current.testcase.getMapping(), ObjCMapping):
-            if current.config.arc:
-                return "iPhoneSimulator/com.zeroc.ObjC-ARC-Test-Controller"
-            else:
-                return "iPhoneSimulator/com.zeroc.ObjC-Test-Controller"
-        elif isinstance(current.testcase.getMapping(), CppMapping):
-            if current.config.cpp11:
-                return "iPhoneSimulator/com.zeroc.Cpp11-Test-Controller"
-            else:
-                return "iPhoneSimulator/com.zeroc.Cpp98-Test-Controller"
-        else:
-            raise RuntimeError("can't run tests from the `{0}' mapping on iOS".format(current.testcase.getMapping()))
+        return current.testcase.getMapping().getIOSControllerIdentity(current)
 
     def startControllerApp(self, current, ident):
         mapping = current.testcase.getMapping()
-        if isinstance(mapping, ObjCMapping):
-            appName = "Objective-C ARC Test Controller.app" if current.config.arc else "Objective-C Test Controller.app"
-        else:
-            assert(isinstance(mapping, CppMapping))
-            appName = "C++11 Test Controller.app" if current.config.cpp11 else "C++98 Test Controller.app"
+        appFullPath = mapping.getIOSAppFullPath(current)
 
         sys.stdout.write("launching simulator... ")
         sys.stdout.flush()
@@ -2360,14 +2426,12 @@
                 raise
         print("ok")
 
-        sys.stdout.write("launching {0}... ".format(appName))
+        sys.stdout.write("launching {0}... ".format(os.path.basename(appFullPath)))
         sys.stdout.flush()
-        path = os.path.join(mapping.getTestsPath(), self.appPath, "Debug-iphonesimulator", appName)
-        if not os.path.exists(path):
-            path = os.path.join(mapping.getTestsPath(), self.appPath, "Release-iphonesimulator", appName)
-        if not os.path.exists(path):
+
+        if not os.path.exists(appFullPath):
             raise RuntimeError("couldn't find iOS simulator controller application, did you build it?")
-        run("xcrun simctl install \"{0}\" \"{1}\"".format(self.device, path))
+        run("xcrun simctl install \"{0}\" \"{1}\"".format(self.device, appFullPath))
         run("xcrun simctl launch \"{0}\" {1}".format(self.device, ident.name))
         print("ok")
 
@@ -2409,23 +2473,13 @@
     appPath = "cpp/test/ios/controller/build"
 
     def __init__(self, current):
-        RemoteProcessController.__init__(self, current)
+        RemoteProcessController.__init__(self, current, "tcp -h 0.0.0.0 -p 15001" if current.config.xamarin else None)
 
     def __str__(self):
         return "iOS Device"
 
     def getControllerIdentity(self, current):
-        if isinstance(current.testcase.getMapping(), ObjCMapping):
-            if current.config.arc:
-                return "iPhoneOS/com.zeroc.ObjC-ARC-Test-Controller"
-            else:
-                return "iPhoneOS/com.zeroc.ObjC-Test-Controller"
-        else:
-            assert(isinstance(current.testcase.getMapping(), CppMapping))
-            if current.config.cpp11:
-                return "iPhoneOS/com.zeroc.Cpp11-Test-Controller"
-            else:
-                return "iPhoneOS/com.zeroc.Cpp98-Test-Controller"
+        return current.testcase.getMapping().getIOSControllerIdentity(current)
 
     def startControllerApp(self, current, ident):
         # TODO: use ios-deploy to deploy and run the application on an attached device?
@@ -2438,26 +2492,25 @@
 
     def __init__(self, current):
         RemoteProcessController.__init__(self, current, "tcp -h 127.0.0.1 -p 15001")
-        self.name = "ice-uwp-controller"
-        self.appUserModelId = "ice-uwp-controller_3qjctahehqazm"
+        self.name = current.testcase.getMapping().getUWPPackageName()
+        self.appUserModelId = current.testcase.getMapping().getUWPUserModelId()
 
     def __str__(self):
         return "UWP"
 
     def getControllerIdentity(self, current):
-        return "UWP/ProcessController"
+        if isinstance(current.testcase.getMapping(), CSharpMapping):
+            return "UWPXamarin/ProcessController"
+        else:
+            return "UWP/ProcessController"
 
     def startControllerApp(self, current, ident):
         platform = current.config.buildPlatform
         config = current.config.buildConfig
-        layout = os.path.join(toplevel, "cpp", "test", platform, config, "AppX")
+        arch = "X86" if platform == "Win32" else "X64"
 
-        arch = "x86" if platform == "Win32" else platform
-        self.packageFullName = "{0}_1.0.0.0_{1}__3qjctahehqazm".format(self.name, arch)
-
-        prefix = "controller_1.0.0.0_{0}{1}".format(platform, "_{0}".format(config) if config == "Debug" else "")
-        package = os.path.join(toplevel, "cpp", "msbuild", "AppPackages", "controller",
-            "{0}_Test".format(prefix), "{0}.appx".format(prefix))
+        self.packageFullName = current.testcase.getMapping().getUWPPackageFullName(platform)
+        packageFullPath = current.testcase.getMapping().getUWPPackageFullPath(platform, config)
 
         #
         # If the application is already installed remove it, this will also take care
@@ -2470,19 +2523,19 @@
         # Remove any previous package we have extracted to ensure we use a
         # fresh build
         #
+        layout = os.path.join(current.testcase.getMapping().getPath(), "AppX")
         if os.path.exists(layout):
             shutil.rmtree(layout)
         os.makedirs(layout)
 
-        print("Unpacking package: {0} to {1}....".format(os.path.basename(package), layout))
-        run("MakeAppx.exe unpack /p \"{0}\" /d \"{1}\" /l".format(package, layout))
+        print("Unpacking package: {0} to {1}....".format(os.path.basename(packageFullPath), layout))
+        run("MakeAppx.exe unpack /p \"{0}\" /d \"{1}\" /l".format(packageFullPath, layout))
 
         print("Registering application to run from layout...")
-        vclibs = "Microsoft.VCLibs.140.00.Debug" if config == "Debug" else "Microsoft.VCLibs.140.00"
-        if vclibs not in run("powershell Get-AppxPackage -Name {0}".format(vclibs)):
-            dependenciesDir = os.path.join(os.path.dirname(package), "Dependencies", arch)
-            run("powershell Add-AppxPackage -Path \"{0}\" -ForceApplicationShutdown".format(
-                os.path.join(dependenciesDir, "Microsoft.VCLibs.{0}.14.00.appx".format(arch))))
+
+        for root, dirs, files in os.walk(os.path.join(os.path.dirname(packageFullPath), "Dependencies", arch)):
+            for f in files:
+                self.installPackage(os.path.join(root, f), arch)
 
         run("powershell Add-AppxPackage -Register \"{0}/AppxManifest.xml\" -ForceApplicationShutdown".format(layout))
         run("CheckNetIsolation LoopbackExempt -a -n={0}".format(self.appUserModelId))
@@ -2503,6 +2556,31 @@
         except:
             pass
 
+    def getPackageVersion(self, package):
+        import zipfile
+        import xml.etree.ElementTree as ElementTree
+        with zipfile.ZipFile(package) as zipfile:
+            with zipfile.open('AppxManifest.xml') as file:
+                xml = ElementTree.fromstring(file.read())
+                identity = xml.find("{http://schemas.microsoft.com/appx/manifest/foundation/windows10}Identity")
+                return tuple(map(int, identity.attrib['Version'].split(".")))
+
+    def installPackage(self, package, arch):
+        packages = {
+            "Microsoft.VCLibs.x64.14.00.appx" : "Microsoft.VCLibs.140.00",
+            "Microsoft.VCLibs.x86.14.00.appx" : "Microsoft.VCLibs.140.00",
+            "Microsoft.VCLibs.x64.Debug.14.00.appx" : "Microsoft.VCLibs.140.00.Debug",
+            "Microsoft.VCLibs.x86.Debug.14.00.appx" : "Microsoft.VCLibs.140.00.Debug",
+            "Microsoft.NET.CoreRuntime.2.1.appx" : "Microsoft.NET.CoreRuntime.2.1"
+        }
+        packageName = packages[os.path.basename(package)]
+        output = run("powershell Get-AppxPackage -Name {0}".format(packageName))
+        m = re.search("Architecture.*: {0}\\r\\nResourceId.*:.*\\r\\nVersion.*: (.*)\\r\\n".format(arch), output)
+        installedVersion = tuple(map(int, m.group(1).split("."))) if m else (0, 0, 0, 0)
+        version = self.getPackageVersion(package)
+        if installedVersion <= version:
+            run("powershell Add-AppxPackage -Path \"{0}\" -ForceApplicationShutdown".format(package))
+
 class BrowserProcessController(RemoteProcessController):
 
     def __init__(self, current):
@@ -2522,13 +2600,19 @@
                 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
                 (driver, capabilities, port) = current.config.browser.split(":")
                 self.driver = webdriver.Remote("http://localhost:{0}".format(port),
-                                               getattr(DesiredCapabilities, capabilities))
+                                               desired_capabilities=getattr(DesiredCapabilities, capabilities),
+                                               keep_alive=True)
             elif current.config.browser != "Manual":
                 from selenium import webdriver
-                if not hasattr(webdriver, current.config.browser):
-                    raise RuntimeError("unknown browser `{0}'".format(current.config.browser))
+                if current.config.browser.find(":") > 0:
+                    (driver, port) = current.config.browser.split(":")
+                else:
+                    (driver, port) = (current.config.browser, 0)
+
+                if not hasattr(webdriver, driver):
+                    raise RuntimeError("unknown browser `{0}'".format(driver))
 
-                if current.config.browser == "Firefox":
+                if driver == "Firefox":
                     if isinstance(platform, Linux) and os.environ.get("DISPLAY", "") != ":1" and os.environ.get("USER", "") == "ubuntu":
                         current.writeln("error: DISPLAY is unset, setting it to :1")
                         os.environ["DISPLAY"] = ":1"
@@ -2538,15 +2622,18 @@
                     # contains our Test CA cert. It should be possible to avoid this by setting the webdriver
                     # acceptInsecureCerts capability but it's only supported by latest Firefox releases.
                     #
-                    profile = webdriver.FirefoxProfile(os.path.join(toplevel, "scripts", "selenium", "firefox"))
+                    profilepath = os.path.join(current.driver.getComponent().getSourceDir(), "scripts", "selenium", "firefox")
+                    profile = webdriver.FirefoxProfile(profilepath)
                     self.driver = webdriver.Firefox(firefox_profile=profile)
-                elif current.config.browser == "Ie":
+                elif driver == "Ie":
                     # Make sure we start with a clean cache
                     capabilities = webdriver.DesiredCapabilities.INTERNETEXPLORER.copy()
                     capabilities["ie.ensureCleanSession"] = True
                     self.driver = webdriver.Ie(capabilities=capabilities)
+                elif driver == "Safari" and port > 0:
+                    self.driver = webdriver.Safari(port=int(port), reuse_service=True)
                 else:
-                    self.driver = getattr(webdriver, current.config.browser)()
+                    self.driver = getattr(webdriver, driver)()
         except:
             self.destroy(current.driver)
             raise
@@ -2604,6 +2691,27 @@
 
         return "Browser/ProcessController"
 
+    def getController(self, current):
+        try:
+            return RemoteProcessController.getController(self, current)
+        except RuntimeError as ex:
+            if self.driver:
+                # Print out the client & server console element values
+                for element in ["clientConsole", "serverConsole"]:
+                    try:
+                        console = self.driver.find_element_by_id(element).get_attribute('value')
+                        if len(console) > 0:
+                            print("controller {0} value:\n{1}".format(element, console))
+                    except Exception as exc:
+                        print("couldn't get controller {0} value:\n{1}".format(element, exc))
+                        pass
+                # Print out the browser log
+                try:
+                    print("browser log:\n{0}".format(self.driver.get_log("browser")))
+                except:
+                    pass # Not all browsers support retrieving the browser console log
+            raise ex
+
     def destroy(self, driver):
         if self.httpServer:
             self.httpServer.terminate()
@@ -2701,12 +2809,12 @@
         return list(self.drivers.values())
 
     @classmethod
-    def create(self, options):
+    def create(self, options, component):
         parseOptions(self, options)
         driver = self.drivers.get(self.driver)
         if not driver:
             raise RuntimeError("unknown driver `{0}'".format(self.driver))
-        return driver(options)
+        return driver(options, component)
 
     @classmethod
     def getSupportedArgs(self):
@@ -2734,7 +2842,8 @@
         print("--controller-app      Start the process controller application.")
         print("--valgrind            Start executables with valgrind.")
 
-    def __init__(self, options):
+    def __init__(self, options, component):
+        self.component = component
         self.debug = False
         self.filters = []
         self.rfilters = []
@@ -2746,8 +2855,8 @@
         self.languages = ",".join(os.environ.get("LANGUAGES", "").split(" "))
         self.languages = [self.languages] if self.languages else []
         self.rlanguages = []
-
         self.failures = []
+
         parseOptions(self, options, { "d": "debug",
                                       "r" : "filters",
                                       "R" : "rfilters",
@@ -2757,13 +2866,13 @@
                                       "host-bt" : "hostBT",
                                       "controller-app" : "controllerApp"})
 
-        self.filters = [re.compile(a) for a in self.filters]
-        self.rfilters = [re.compile(a) for a in self.rfilters]
         if self.languages:
             self.languages = [i for sublist in [l.split(",") for l in self.languages] for i in sublist]
         if self.rlanguages:
             self.rlanguages = [i for sublist in [l.split(",") for l in self.rlanguages] for i in sublist]
 
+        (self.filters, self.rfilters) = ([re.compile(a) for a in self.filters], [re.compile(a) for a in self.rfilters])
+
         self.communicator = None
         self.interface = ""
         self.processControllers = {}
@@ -2771,29 +2880,24 @@
     def setConfigs(self, configs):
         self.configs = configs
 
-    def useIceBinDist(self, mapping):
-        return self.useBinDist(mapping, "ICE_BIN_DIST")
-
-    def getIceDir(self, mapping, current):
-        return self.getInstallDir(mapping, current, "ICE_HOME", "ICE_BIN_DIST")
-
-    def useBinDist(self, mapping, envName):
-        env = os.environ.get(envName, "").split()
-        return 'all' in env or mapping.name in env
-
-    def getInstallDir(self, mapping, current, envHomeName, envBinDistName):
-        if self.useBinDist(mapping, envBinDistName):
-            if envHomeName == "ICE_HOME":
-                return platform.getIceInstallDir(mapping, current)
-            else:
-                return platform.getInstallDir(mapping, current, envHomeName)
-        elif mapping:
-            return mapping.getPath()
+    def getFilters(self, mapping, config):
+        # Return the driver and component filters
+        (filters, rfilters) = self.component.getFilters(mapping, config)
+        (filters, rfilters) = ([re.compile(a) for a in filters], [re.compile(a) for a in rfilters])
+        return (self.filters + filters, self.rfilters + rfilters)
+
+    def getHost(self, protocol, ipv6):
+        if protocol == "bt":
+            if not self.hostBT:
+                raise RuntimeError("no Bluetooth address set with --host-bt")
+            return self.hostBT
+        elif ipv6:
+            return self.hostIPv6 or "::1"
         else:
-            return toplevel
+            return self.host or "127.0.0.1"
 
-    def getSliceDir(self, mapping, current):
-        return platform.getSliceDir(self.getIceDir(mapping, current) if self.useIceBinDist(mapping) else toplevel)
+    def getComponent(self):
+        return self.component
 
     def isWorkerThread(self):
         return False
@@ -2840,20 +2944,23 @@
             import Ice
         except ImportError:
             # Try to add the local Python build to the sys.path
-            pythonMapping = Mapping.getByName("python")
-            if pythonMapping:
-                for p in pythonMapping.getPythonDirs(pythonMapping.getPath(), self.configs[pythonMapping]):
-                    sys.path.append(p)
+            try:
+                pythonMapping = Mapping.getByName("python")
+                if pythonMapping:
+                    for p in pythonMapping.getPythonDirs(pythonMapping.getPath(), self.configs[pythonMapping]):
+                        sys.path.append(p)
+            except RuntimeError:
+                print("couldn't find IcePy, running these tests require it to be installed or built")
 
         import Ice
-        Ice.loadSlice(os.path.join(toplevel, "scripts", "Controller.ice"))
+        Ice.loadSlice(os.path.join(self.component.getSourceDir(), "scripts", "Controller.ice"))
 
         initData = Ice.InitializationData()
         initData.properties = Ice.createProperties()
 
         # Load IceSSL, this is useful to talk with WSS for JavaScript
         initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL")
-        initData.properties.setProperty("IceSSL.DefaultDir", os.path.join(toplevel, "certs"))
+        initData.properties.setProperty("IceSSL.DefaultDir", os.path.join(self.component.getSourceDir(), "certs"))
         initData.properties.setProperty("IceSSL.CertFile", "server.p12")
         initData.properties.setProperty("IceSSL.Password", "password")
         initData.properties.setProperty("IceSSL.Keychain", "test.keychain")
@@ -2865,9 +2972,9 @@
         initData.properties.setProperty("IceDiscovery.Interface", self.interface)
         initData.properties.setProperty("Ice.Default.Host", self.interface)
         initData.properties.setProperty("Ice.ThreadPool.Server.Size", "10")
-        #initData.properties.setProperty("Ice.Trace.Protocol", "1")
-        #initData.properties.setProperty("Ice.Trace.Network", "3")
-        #initData.properties.setProperty("Ice.StdErr", "allTests.log")
+        # initData.properties.setProperty("Ice.Trace.Protocol", "1")
+        # initData.properties.setProperty("Ice.Trace.Network", "3")
+        # initData.properties.setProperty("Ice.StdErr", "allTests.log")
         initData.properties.setProperty("Ice.Override.Timeout", "10000")
         initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000")
         self.communicator = Ice.initialize(initData)
@@ -2884,10 +2991,9 @@
                 processController = LocalProcessController
             else:
                 processController = UWPProcessController
-        elif process and isinstance(process.getMapping(current), JavaScriptMapping) and current.config.browser:
+        elif process and current.config.browser and isinstance(process.getMapping(current), JavaScriptMixin):
             processController = BrowserProcessController
-        elif process and (isinstance(process.getMapping(current), AndroidMapping) or
-                          isinstance(process.getMapping(current), AndroidCompatMapping)):
+        elif process and current.config.android:
             processController = AndroidProcessController
         else:
             processController = LocalProcessController
@@ -2919,12 +3025,13 @@
 
         @classmethod
         def getSupportedArgs(self):
-            return ("", ["cpp-config=", "cpp-platform=", "uwp", "openssl"])
+            return ("", ["cpp-config=", "cpp-platform=", "cpp-path=", "uwp", "openssl"])
 
         @classmethod
         def usage(self):
             print("")
             print("C++ Mapping options:")
+            print("--cpp-path=<path>         Path of alternate source tree for the C++ mapping.")
             print("--cpp-config=<config>     C++ build configuration for native executables (overrides --config).")
             print("--cpp-platform=<platform> C++ build platform for native executables (overrides --platform).")
             print("--uwp                     Run UWP (Universal Windows Platform).")
@@ -2937,29 +3044,12 @@
             # tests on the cpp11 value in the testcase options specification
             self.cpp11 = self.buildConfig.lower().find("cpp11") >= 0
 
-            parseOptions(self, options, { "cpp-config" : "buildConfig", "cpp-platform" : "buildPlatform" })
-
-        def canRun(self, current):
-            if not Mapping.Config.canRun(self, current):
-                return False
-
-            # No C++11 tests for IceStorm, IceGrid, etc
-            if self.cpp11:
-                testId = current.testcase.getTestSuite().getId()
-                parent = re.match(r'^([\w]*).*', testId).group(1)
-                if parent in ["IceStorm", "IceBridge"]:
-                    return False
-                elif parent in ["IceGrid"] and testId not in ["IceGrid/simple"]:
-                    return False
-                elif parent in ["Glacier2"] and testId not in ["Glacier2/application", "Glacier2/sessionHelper"]:
-                    return False
-            return True
+            parseOptions(self, options, { "cpp-config" : "buildConfig",
+                                          "cpp-platform" : "buildPlatform",
+                                          "cpp-path" : "pathOverride" })
 
-    def getNugetPackage(self, compiler, version):
-        return "zeroc.ice.{0}.{1}".format(compiler, version)
-
-    def getDefaultExe(self, processType, config):
-        return platform.getDefaultExe(processType, config)
+            if self.pathOverride:
+                self.pathOverride = os.path.abspath(self.pathOverride)
 
     def getOptions(self, current):
         return { "compress" : [False] } if current.config.uwp else {}
@@ -2981,10 +3071,9 @@
             "IceSSL.CertFile": "server.p12" if server else "ms-appx:///client.p12" if uwp else "client.p12"
         })
         if isinstance(platform, Darwin):
-            keychainFile = "server.keychain" if server else "client.keychain"
             props.update({
                 "IceSSL.KeychainPassword" : "password",
-                "IceSSL.Keychain": keychainFile
+                "IceSSL.Keychain": "server.keychain" if server else "client.keychain"
              })
         return props
 
@@ -3010,7 +3099,7 @@
         # On most platforms, we also need to add the library directory to the library path environment variable.
         #
         if not isinstance(platform, Darwin):
-            libPaths.append(self.getLibDir(process, current))
+            libPaths.append(self.component.getLibDir(process, self, current))
 
         #
         # Add the test suite library directories to the platform library path environment variable.
@@ -3024,38 +3113,100 @@
             env[platform.getLdPathEnvName()] = os.pathsep.join(libPaths)
         return env
 
-    def getDefaultSource(self, processType):
+    def _getDefaultSource(self, processType):
         return {
             "client" : "Client.cpp",
             "server" : "Server.cpp",
             "serveramd" : "ServerAMD.cpp",
             "collocated" : "Collocated.cpp",
+            "subscriber" : "Subscriber.cpp",
+            "publisher" : "Publisher.cpp",
         }[processType]
 
+    def _getDefaultExe(self, processType):
+        return Mapping._getDefaultExe(self, processType).lower()
+
+    def getUWPPackageName(self):
+        return "ice-uwp-controller.cpp"
+
+    def getUWPUserModelId(self):
+        return "ice-uwp-controller.cpp_3qjctahehqazm"
+
+    def getUWPPackageFullName(self, platform):
+        return "{0}_1.0.0.0_{1}__3qjctahehqazm".format(self.getUWPPackageName(),
+                                                       "x86" if platform == "Win32" else platform)
+
+    def getUWPPackageFullPath(self, platform, config):
+        prefix = "controller_1.0.0.0_{0}{1}".format(platform, "_{0}".format(config) if config == "Debug" else "")
+        return os.path.join(self.component.getSourceDir(), "cpp", "msbuild", "AppPackages", "controller",
+                            "{0}_Test".format(prefix), "{0}.appx".format(prefix))
+
+    def getIOSControllerIdentity(self, current):
+        category = "iPhoneSimulator" if current.config.buildPlatform == "iphonesimulator" else "iPhoneOS"
+        mapping = "Cpp11" if current.config.cpp11 else "Cpp98"
+        return "{0}/com.zeroc.{1}-Test-Controller".format(category, mapping)
+
+    def getIOSAppFullPath(self, current):
+        appName = "C++11 Test Controller.app" if current.config.cpp11 else "C++98 Test Controller.app"
+        path = os.path.join(self.component.getTestDir(self), "ios", "controller")
+        path = os.path.join(path, "build-{0}-{1}".format(current.config.buildPlatform, current.config.buildConfig))
+        build = "Debug" if os.path.exists(os.path.join(path, "Debug-{0}".format(current.config.buildPlatform))) else "Release"
+        return os.path.join(path, "{0}-{1}".format(build, current.config.buildPlatform), appName)
+
 class JavaMapping(Mapping):
 
+    class Config(Mapping.Config):
+
+        @classmethod
+        def getSupportedArgs(self):
+            return ("", ["device=", "avd=", "android"])
+
+        @classmethod
+        def usage(self):
+            print("")
+            print("Java Mapping options:")
+            print("--android                 Run the Android tests.")
+            print("--device=<device-id>      ID of the Android emulator or device used to run the tests.")
+            print("--avd=<name>              Start specific Android Virtual Device.")
+
     def getCommandLine(self, current, process, exe, args):
         javaHome = os.getenv("JAVA_HOME", "")
         java = os.path.join(javaHome, "bin", "java") if javaHome else "java"
+        javaArgs = self.getJavaArgs(process, current)
         if process.isFromBinDir():
-            return "{0} {1} {2}".format(java, exe, args)
+            if javaArgs:
+                return "{0} -ea {1} {2} {3}".format(java, " ".join(javaArgs), exe, args)
+            else:
+                return "{0} -ea {1} {2}".format(java, exe, args)
 
-        assert(current.testcase.getPath().startswith(self.getTestsPath()))
-        package = "test." + current.testcase.getPath()[len(self.getTestsPath()) + 1:].replace(os.sep, ".")
+        testdir = self.component.getTestDir(self)
+        assert(current.testcase.getPath(current).startswith(testdir))
+        package = "test." + current.testcase.getPath(current)[len(testdir) + 1:].replace(os.sep, ".")
         javaArgs = self.getJavaArgs(process, current)
         if javaArgs:
-            return "{0} {1} {2}.{3} {4}".format(java, " ".join(javaArgs), package, exe, args)
+            return "{0} -ea {1} -Dtest.class={2}.{3} test.TestDriver {4}".format(java, " ".join(javaArgs), package, exe, args)
         else:
-            return "{0} {1}.{2} {3}".format(java, package, exe, args)
+            return "{0} -ea -Dtest.class={1}.{2} test.TestDriver {3}".format(java, package, exe, args)
 
     def getJavaArgs(self, process, current):
+        # TODO: WORKAROUND for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
+        if isinstance(platform, Linux) and platform.getLinuxId() in ["debian", "ubuntu"]:
+            return ["-Djdk.net.URLClassPath.disableClassPathURLCheck=true"]
         return []
 
     def getSSLProps(self, process, current):
         props = Mapping.getSSLProps(self, process, current)
-        props.update({
-            "IceSSL.Keystore": "server.jks" if isinstance(process, Server) else "client.jks",
-        })
+        if current.config.android:
+            props.update({
+                "IceSSL.KeystoreType" : "BKS",
+                "IceSSL.TruststoreType" : "BKS",
+                "Ice.InitPlugins" : "0",
+                "IceSSL.Keystore": "server.bks" if isinstance(process, Server) else "client.bks"
+            })
+        else:
+            props.update({
+                "IceSSL.Keystore": "server.jks" if isinstance(process, Server) else "client.jks",
+            })
         return props
 
     def getPluginEntryPoint(self, plugin, process, current):
@@ -3069,22 +3220,26 @@
     def getEnv(self, process, current):
         return { "CLASSPATH" : os.path.join(self.path, "lib", "test.jar") }
 
-    def getTestsPath(self):
-        return os.path.join(self.path, "test/src/main/java/test")
-
-    def getDefaultSource(self, processType):
-        return self.getDefaultExe(processType) + ".java"
-
-    def getDefaultExe(self, processType, config=None):
+    def _getDefaultSource(self, processType):
         return {
-            "client" : "Client",
-            "server" : "Server",
-            "serveramd" : "AMDServer",
-            "collocated" : "Collocated",
-            "icebox": "com.zeroc.IceBox.Server",
-            "iceboxadmin" : "com.zeroc.IceBox.Admin",
+            "client" : "Client.java",
+            "server" : "Server.java",
+            "serveramd" : "AMDServer.java",
+            "servertie" : "TieServer.java",
+            "serveramdtie" : "AMDTieServer.java",
+            "collocated" : "Collocated.java",
         }[processType]
 
+    def getSDKPackage(self):
+        return "system-images;android-27;google_apis;x86"
+
+    def getApk(self, current):
+        return os.path.join(self.getPath(), "test", "android", "controller", "build", "outputs", "apk", "debug",
+                            "controller-debug.apk")
+
+    def getActivityName(self):
+        return "com.zeroc.testcontroller/.ControllerActivity"
+
 class JavaCompatMapping(JavaMapping):
 
     def getPluginEntryPoint(self, plugin, process, current):
@@ -3095,284 +3250,191 @@
             "IceLocatorDiscovery" : "IceLocatorDiscovery.PluginFactory"
         }[plugin]
 
-    def getDefaultExe(self, processType, config=None):
-        return {
-            "client" : "Client",
-            "server" : "Server",
-            "serveramd" : "AMDServer",
-            "collocated" : "Collocated",
-            "icebox": "IceBox.Server",
-            "iceboxadmin" : "IceBox.Admin",
-        }[processType]
-
-class Android:
-
-    @classmethod
-    def getUnsuportedTests(self, protocol):
-        tests = [
-            "Ice/hash",
-            "Ice/faultTolerance",
-            "Ice/metrics",
-            "Ice/networkProxy",
-            "Ice/throughput",
-            "Ice/plugin",
-            "Ice/logger",
-            "Ice/properties"]
-        if protocol in ["ssl", "wss"]:
-            tests += [
-                "Ice/binding",
-                "Ice/timeout",
-                "Ice/udp"]
-        if protocol in ["bt", "bts"]:
-            tests += [
-                "Ice/info",
-                "Ice/udp"]
-        return tests
-
-class AndroidMapping(JavaMapping):
-
-    class Config(Mapping.Config):
-
-        @classmethod
-        def getSupportedArgs(self):
-            return ("", ["device=", "avd=", "androidemulator"])
-
-        @classmethod
-        def usage(self):
-            print("")
-            print("Android Mapping options:")
-            print("--device=<device-id>      ID of the emulator or device used to run the tests.")
-            print("--androidemulator         Run tests in emulator as opposed to a real device.")
-            print("--avd=<name>              Start specific Android Virtual Device")
-
-        def __init__(self, options=[]):
-            Mapping.Config.__init__(self, options)
-
-            parseOptions(self, options)
-            self.androidemulator = self.androidemulator or self.avd
-            self.apk = "controller/build/outputs/apk/debug/testController-debug.apk"
-
-    def getSSLProps(self, process, current):
-        props = JavaMapping.getSSLProps(self, process, current)
-        props.update({
-            "IceSSL.KeystoreType" : "BKS",
-            "IceSSL.TruststoreType" : "BKS",
-            "Ice.InitPlugins" : "0",
-            "IceSSL.Keystore": "server.bks" if isinstance(process, Server) else "client.bks"})
-        return props
-
-    def getTestsPath(self):
-        return os.path.join(self.path, "../test/src/main/java/test")
-
-    def getCommonTestsPath(self):
-        return os.path.join(self.path, "..", "..", "scripts", "tests")
-
-    def filterTestSuite(self, testId, config, filters=[], rfilters=[]):
-        if not testId.startswith("Ice/") or testId in Android.getUnsuportedTests(config.protocol):
-            return True
-        return JavaMapping.filterTestSuite(self, testId, config, filters, rfilters)
+    def getEnv(self, process, current):
+        classPath = [os.path.join(self.path, "lib", "test.jar")]
+        if os.path.exists(os.path.join(self.path, "lib", "IceTestLambda.jar")):
+            classPath += [os.path.join(self.path, "lib", "IceTestLambda.jar")]
+        return { "CLASSPATH" : os.pathsep.join(classPath) }
 
     def getSDKPackage(self):
-        return "system-images;android-25;google_apis;x86_64"
+        return "system-images;android-21;google_apis;x86_64"
 
-class AndroidCompatMapping(JavaCompatMapping):
+class CSharpMapping(Mapping):
 
     class Config(Mapping.Config):
 
         @classmethod
         def getSupportedArgs(self):
-            return ("", ["device=", "avd=", "androidemulator"])
+            return ("", ["dotnetcore", "framework="])
 
         @classmethod
         def usage(self):
             print("")
-            print("Android Mapping options:")
-            print("--device=<device-id>      Id of the emulator or device used to run the tests.")
-            print("--androidemulator         Run tests in emulator as opposed to a real device.")
-            print("--avd                     Start emulator image")
+            print("--dotnetcore                    Run C# tests using .NET Core")
+            print("--framework=<TargetFramework>   Choose the framework used to run .NET tests")
 
         def __init__(self, options=[]):
             Mapping.Config.__init__(self, options)
 
-            parseOptions(self, options)
-            self.androidemulator = self.androidemulator or self.avd
-            self.apk = "test/controller/build/outputs/apk/debug/testController-debug.apk"
+            if not self.dotnetcore and not isinstance(platform, Windows):
+                self.dotnetcore = True
 
-    def getSSLProps(self, process, current):
-        props = JavaCompatMapping.getSSLProps(self, process, current)
-        props.update({
-            "IceSSL.KeystoreType" : "BKS",
-            "IceSSL.TruststoreType" : "BKS",
-            "Ice.InitPlugins" : "0",
-            "IceSSL.Keystore": "server.bks" if isinstance(process, Server) else "client.bks"})
-        return props
+            if self.dotnetcore:
+                self.libTargetFramework = "netstandard2.0"
+                self.binTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework
+                self.testTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework
+            else:
+                self.libTargetFramework = "net45" if self.framework == "" else "netstandard2.0"
+                self.binTargetFramework = "net45" if self.framework == "" else self.framework
+                self.testTargetFramework = "net45" if self.framework == "" else self.framework
+
+            # Set Xamarin flag if UWP/iOS or Android testing flag is also specified
+            if self.uwp or self.android or "iphone" in self.buildPlatform:
+                self.xamarin = True
 
-    def getTestsPath(self):
-        return os.path.join(self.path, "../test/src/main/java/test")
+    def getBinTargetFramework(self, current):
+        return current.config.binTargetFramework
 
-    def getCommonTestsPath(self):
-        return os.path.join(self.path, "..", "..", "scripts", "tests")
+    def getLibTargetFramework(self, current):
+        return current.config.libTargetFramework
 
-    def filterTestSuite(self, testId, config, filters=[], rfilters=[]):
-        if not testId.startswith("Ice/") or testId in Android.getUnsuportedTests(config.protocol):
-            return True
-        return JavaCompatMapping.filterTestSuite(self, testId, config, filters, rfilters)
-
-    def getSDKPackage(self):
-        return "system-images;android-21;google_apis;x86_64"
-
-class CSharpMapping(Mapping):
-
-    class Config(Mapping.Config):
+    def getTargetFramework(self, current):
+        return current.config.testTargetFramework
 
-        @classmethod
-        def getSupportedArgs(self):
-            return ("", ["netframework="])
-
-        @classmethod
-        def usage(self):
-            print("")
-            print("--netframework           Run C# tests using Ice netstandard2.0 libraries and tests")
-            print("                         build with given .NET Framework [netcoreapp2.0|net4.6]")
+    def getBuildDir(self, name, current):
+        if current.config.dotnetcore or current.config.framework != "":
+            return os.path.join("msbuild", name, "netstandard2.0", self.getTargetFramework(current))
+        else:
+            return os.path.join("msbuild", name, self.getTargetFramework(current))
 
-        def __init__(self, options=[]):
-            Mapping.Config.__init__(self, options)
-            parseOptions(self, options, { "netframework" : "netframework" })
+    def getProps(self, process, current):
+        props = Mapping.getProps(self, process, current)
+        if current.config.xamarin:
             #
-            # For non Windows platforms the default is netcoreapp2.0 for windows empty
-            # means to run test agains .NET Framework 4.5 Ice build
+            # With SSL we need to delay the creation of the admin adapter until the plug-in has
+            # been initialized.
             #
-            supportedframeworks = ["netcoreapp2.0"]
-            if isinstance(platform, Windows):
-                supportedframeworks += ["net461", "net462", "net47", "net471"]
-
-            if self.netframework:
-                if not self.netframework in supportedframeworks:
-                    raise RuntimeError("Unssuported .NET Framework `{0}'".format(self.netframework))
-            else:
-                self.netframework = "" if isinstance(platform, Windows) else "netcoreapp2.0"
-
-        def canRun(self, current):
-            testId = current.testcase.getTestSuite().getId()
-            if not Mapping.Config.canRun(self, current):
-                return False
-
-            if self.netframework:
-                #
-                # The following tests require multicast, on Unix platforms it's currently only supported
-                # with IPv4 due to .NET Core bug https://github.com/dotnet/corefx/issues/25525
-                #
-                if not isinstance(platform, Windows) and self.ipv6 and testId in ["Ice/udp",
-                                                                                  "IceDiscovery/simple",
-                                                                                  "IceGrid/simple"]:
-                    return False
-
-                if isinstance(platform, Darwin):
-                    if "IceSSL" in testId or "IceDiscovery" in testId:
-                        return False
-
-                    # TODO: Remove once https://github.com/dotnet/corefx/issues/28759 is fixed
-                    if testId == "Ice/adapterDeactivation" and self.protocol in ["ssl", "wss"]:
-                        return False
-
-            return True
+            if current.config.protocol in ["ssl", "wss"] and current.config.mx:
+                props["Ice.Admin.DelayCreation"] = "1"
+        return props
 
-    def getBuildDir(self, name, current):
-        if current.config.netframework:
-            return os.path.join("msbuild", name, "netstandard2.0", current.config.netframework)
+    def getOptions(self, current):
+        if current.config.xamarin and current.config.uwp:
+            #
+            # Do not run MX tests with SSL it cause problems with Xamarin UWP implementation
+            #
+            return {"mx" : ["False"]} if current.config.protocol in ["ssl", "wss"] else {}
         else:
-            return os.path.join("msbuild", name, "net45")
+            return {}
 
     def getSSLProps(self, process, current):
         props = Mapping.getSSLProps(self, process, current)
         props.update({
             "IceSSL.Password": "password",
-            "IceSSL.DefaultDir": os.path.join(toplevel, "certs"),
+            "IceSSL.DefaultDir": os.path.join(self.component.getSourceDir(), "certs"),
             "IceSSL.CAs": "cacert.pem",
             "IceSSL.VerifyPeer": "0" if current.config.protocol == "wss" else "2",
             "IceSSL.CertFile": "server.p12" if isinstance(process, Server) else "client.p12",
         })
+        if current.config.xamarin:
+            props["Ice.InitPlugins"] = 0
+            props["IceSSL.CAs"] = "cacert.der";
         return props
 
     def getPluginEntryPoint(self, plugin, process, current):
-        plugindir = "{0}/{1}".format(current.driver.getIceDir(self, current), "lib")
-
-        if current.config.netframework:
-            plugindir = os.path.join(plugindir, "netstandard2.0")
+        if current.config.xamarin:
+            plugindir = ""
         else:
-            plugindir = os.path.join(plugindir, "net45")
+            plugindir = self.component.getLibDir(process, self, current)
 
-        #
-        # If the plug-in assemblie exists in the test directory, this is a good indication that the
-        # test include a reference to the plug-in, in this case we must use the test dir as the plug-in
-        # base directory to avoid loading two instances of the same assemblie.
-        #
-        proccessType = current.testcase.getProcessType(process)
-        if proccessType:
-            testdir = os.path.join(current.testcase.getPath(), self.getBuildDir(proccessType, current))
-            if os.path.isfile(os.path.join(testdir, plugin + ".dll")):
-                plugindir = testdir
+            #
+            # If the plug-in assembly exists in the test directory, this is a good indication that the
+            # test include a reference to the plug-in, in this case we must use the test dir as the
+            # plug-in base directory to avoid loading two instances of the same assembly.
+            #
+            proccessType = current.testcase.getProcessType(process)
+            if proccessType:
+                testdir = os.path.join(current.testcase.getPath(current), self.getBuildDir(proccessType, current))
+                if os.path.isfile(os.path.join(testdir, plugin + ".dll")):
+                    plugindir = testdir
+            plugindir += os.sep
 
         return {
-            "IceSSL" : plugindir + "/IceSSL.dll:IceSSL.PluginFactory",
-            "IceDiscovery" : plugindir + "/IceDiscovery.dll:IceDiscovery.PluginFactory",
-            "IceLocatorDiscovery" : plugindir + "/IceLocatorDiscovery.dll:IceLocatorDiscovery.PluginFactory"
+            "IceSSL" : plugindir + "IceSSL.dll:IceSSL.PluginFactory",
+            "IceDiscovery" : plugindir + "IceDiscovery.dll:IceDiscovery.PluginFactory",
+            "IceLocatorDiscovery" : plugindir + "IceLocatorDiscovery.dll:IceLocatorDiscovery.PluginFactory"
         }[plugin]
 
     def getEnv(self, process, current):
         env = {}
         if isinstance(platform, Windows):
-
-            if current.driver.useIceBinDist(self):
-                framework = "net45" if not current.config.netframework else current.config.netframework
-                env['PATH'] = os.path.join(platform.getIceInstallDir(self, current), "tools", framework)
-                if not current.config.netframework:
-                    env['DEVPATH'] = os.path.join(platform.getIceInstallDir(self, current), "lib", "net45")
+            if self.component.useBinDist(self, current):
+                env['PATH'] = self.component.getBinDir(process, self, current)
             else:
-                env['PATH'] = os.path.join(toplevel, "cpp", "msbuild", "packages",
+                env['PATH'] = os.path.join(self.component.getSourceDir(), "cpp", "msbuild", "packages",
                                            "bzip2.{0}.1.0.6.10".format(platform.getPlatformToolset()),
                                            "build", "native", "bin", "x64", "Release")
-                if not current.config.netframework:
-                    env['DEVPATH'] = os.path.join(current.driver.getIceDir(self, current), "lib", "net45")
+            if not current.config.dotnetcore:
+                env['DEVPATH'] = self.component.getLibDir(process, self, current)
         return env
 
-    def getDefaultSource(self, processType):
+    def _getDefaultSource(self, processType):
         return {
             "client" : "Client.cs",
             "server" : "Server.cs",
             "serveramd" : "ServerAMD.cs",
+            "servertie" : "ServerTie.cs",
+            "serveramdtie" : "ServerAMDTie.cs",
             "collocated" : "Collocated.cs",
         }[processType]
 
-    def getDefaultExe(self, processType, config):
-        return processType
-
-    def getNugetPackage(self, compiler, version):
-        return "zeroc.ice.net.{0}".format(version)
+    def _getDefaultExe(self, processType):
+        return Mapping._getDefaultExe(self, processType).lower()
 
     def getCommandLine(self, current, process, exe, args):
-        cmd = ""
-        if current.config.netframework:
-            cmd = "dotnet "
-            if exe  == "icebox":
-                if current.driver.useIceBinDist(self):
-                    cmd += os.path.join(platform.getIceInstallDir(self, current), "tools", "netcoreapp2.0", "iceboxnet.dll")
-                else:
-                    cmd += os.path.join(self.path, "bin", "netcoreapp2.0", "iceboxnet.dll")
-            else:
-                if current.config.netframework == "netcoreapp2.0":
-                    cmd += os.path.join(current.testcase.getPath(), self.getBuildDir(exe, current), "{0}.dll".format(exe))
-                else:
-                    cmd += os.path.join(current.testcase.getPath(), self.getBuildDir(exe, current), "{0}".format(exe))
+        if process.isFromBinDir():
+            path = self.component.getBinDir(process, self, current)
         else:
-            if exe == "icebox":
-                if current.driver.useIceBinDist(self):
-                    cmd = os.path.join(platform.getIceInstallDir(self, current), "tools", "net45", "iceboxnet.exe")
-                else:
-                    cmd = os.path.join(self.path, "bin", "net45", "iceboxnet.exe")
-            else:
-                cmd = os.path.join(current.testcase.getPath(), self.getBuildDir(exe, current), exe)
-        return cmd + " " + args
+            path = os.path.join(current.testcase.getPath(current), current.getBuildDir(exe))
+
+        if current.config.dotnetcore:
+            return "dotnet " + os.path.join(path, exe) + ".dll " + args
+        else:
+            return os.path.join(path, exe) + ".exe " + args
+
+    def getSDKPackage(self):
+        return "system-images;android-27;google_apis;x86"
+
+    def getApk(self, current):
+        return os.path.join(self.getPath(), "test", "xamarin", "controller.Android", "bin", current.config.buildConfig,
+                            "com.zeroc.testcontroller-Signed.apk")
+
+    def getActivityName(self):
+        return "com.zeroc.testcontroller/controller.MainActivity"
+
+    def getUWPPackageName(self):
+        return "ice-uwp-controller.xamarin"
+
+    def getUWPUserModelId(self):
+        return "ice-uwp-controller.xamarin_3qjctahehqazm"
+
+    def getUWPPackageFullName(self, platform):
+        return "{0}_1.0.0.0_{1}__3qjctahehqazm".format(self.getUWPPackageName(), platform)
+
+    def getUWPPackageFullPath(self, platform, config):
+        prefix = "controller.UWP_1.0.0.0_{0}{1}".format(platform, "_{0}".format(config) if config == "Debug" else "")
+        return os.path.join(self.getPath(), "test", "xamarin", "controller.UWP", "AppPackages",
+                            "{0}_Test".format(prefix), "{0}.appx".format(prefix))
+
+    def getIOSControllerIdentity(self, current):
+        if current.config.buildPlatform == "iphonesimulator":
+            return "iPhoneSimulator/com.zeroc.Xamarin-Test-Controller"
+        else:
+            return "iPhoneOS/com.zeroc.Xamarin-Test-Controller"
+
+    def getIOSAppFullPath(self, current):
+        return os.path.join(self.getPath(), "test", "xamarin", "controller.iOS", "bin", "iPhoneSimulator",
+                            current.config.buildConfig, "controller.iOS.app")
 
 class CppBasedMapping(Mapping):
 
@@ -3406,15 +3468,12 @@
 
     def getEnv(self, process, current):
         env = Mapping.getEnv(self, process, current)
-        if current.driver.getIceDir(self, current) != platform.getIceInstallDir(self, current):
+        if self.component.getInstallDir(self, current) != platform.getInstallDir():
             # If not installed in the default platform installation directory, add
-            # the Ice C++ library directory to the library path
-            env[platform.getLdPathEnvName()] = Mapping.getByName("cpp").getLibDir(process, current)
+            # the C++ library directory to the library path
+            env[platform.getLdPathEnvName()] = self.component.getLibDir(process, Mapping.getByName("cpp"), current)
         return env
 
-    def getNugetPackage(self, compiler, version):
-        return "zeroc.ice.{0}.{1}".format(compiler, version)
-
 class ObjCMapping(CppBasedMapping):
 
     def getTestSuites(self, ids=[]):
@@ -3431,13 +3490,28 @@
             Mapping.Config.__init__(self, options)
             self.arc = self.buildConfig.lower().find("arc") >= 0
 
-    def getDefaultSource(self, processType):
+    def _getDefaultSource(self, processType):
         return {
             "client" : "Client.m",
             "server" : "Server.m",
             "collocated" : "Collocated.m",
         }[processType]
 
+    def _getDefaultExe(self, processType):
+        return Mapping._getDefaultExe(self, processType).lower()
+
+    def getIOSControllerIdentity(self, current):
+        category = "iPhoneSimulator" if current.config.buildPlatform == "iphonesimulator" else "iPhoneOS"
+        mapping = "ObjC-ARC" if current.config.arc else "ObjC"
+        return "{0}/com.zeroc.{1}-Test-Controller".format(category, mapping)
+
+    def getIOSAppFullPath(self, current):
+        appName = "Objective-C ARC Test Controller.app" if current.config.arc else "Objective-C Test Controller.app"
+        path = os.path.join(self.component.getTestDir(self), "ios", "controller")
+        path = os.path.join(path, "build-{0}-{1}".format(current.config.buildPlatform, current.config.buildConfig))
+        build = "Debug" if os.path.exists(os.path.join(path, "Debug-{0}".format(current.config.buildPlatform))) else "Release"
+        return os.path.join(path, "{0}-{1}".format(build, current.config.buildPlatform), appName)
+
 class PythonMapping(CppBasedMapping):
 
     class Config(CppBasedMapping.Config):
@@ -3445,15 +3519,20 @@
         mappingDesc = "Python"
 
     def getCommandLine(self, current, process, exe, args):
-        return "\"{0}\" {1} {2}".format(sys.executable, exe, args)
+        return "\"{0}\"  {1} {2} {3}".format(sys.executable,
+                                             os.path.join(self.path, "test", "TestHelper.py"),
+                                             exe,
+                                             args)
 
     def getEnv(self, process, current):
         env = CppBasedMapping.getEnv(self, process, current)
-        if current.driver.getIceDir(self, current) != platform.getIceInstallDir(self, current):
+        dirs = []
+        if self.component.getInstallDir(self, current) != platform.getInstallDir():
             # If not installed in the default platform installation directory, add
             # the Ice python directory to PYTHONPATH
-            dirs = self.getPythonDirs(current.driver.getIceDir(self, current), current.config)
-            env["PYTHONPATH"] = os.pathsep.join(dirs)
+            dirs += self.getPythonDirs(self.component.getInstallDir(self, current), current.config)
+        dirs += [current.testcase.getPath(current)]
+        env["PYTHONPATH"] = os.pathsep.join(dirs)
         return env
 
     def getPythonDirs(self, iceDir, config):
@@ -3463,10 +3542,7 @@
         dirs.append(os.path.join(iceDir, "python"))
         return dirs
 
-    def getDefaultExe(self, processType, config):
-        return self.getDefaultSource(processType)
-
-    def getDefaultSource(self, processType):
+    def _getDefaultSource(self, processType):
         return {
             "client" : "Client.py",
             "server" : "Server.py",
@@ -3483,9 +3559,6 @@
     def getServerMapping(self, testId=None):
         return Mapping.getByName("cpp") # By default, run clients against C++ mapping executables
 
-    def getDefaultExe(self, processType, config):
-        return self.getDefaultSource(processType)
-
 class RubyMapping(CppBasedClientMapping):
 
     class Config(CppBasedClientMapping.Config):
@@ -3493,17 +3566,20 @@
         mappingDesc = "Ruby"
 
     def getCommandLine(self, current, process, exe, args):
-        return "ruby " + exe + " " + args
+        return "ruby  {0} {1} {2}".format(os.path.join(self.path, "test", "TestHelper.rb"), exe, args)
 
     def getEnv(self, process, current):
         env = CppBasedMapping.getEnv(self, process, current)
-        if current.driver.getIceDir(self, current) != platform.getIceInstallDir(self, current):
+        dirs = []
+        if self.component.getInstallDir(self, current) != platform.getInstallDir():
             # If not installed in the default platform installation directory, add
             # the Ice ruby directory to RUBYLIB
-            env["RUBYLIB"] = os.path.join(self.path, "ruby")
+            dirs += [os.path.join(self.path, "ruby")]
+        dirs += [current.testcase.getPath(current)]
+        env["RUBYLIB"] = os.pathsep.join(dirs)
         return env
 
-    def getDefaultSource(self, processType):
+    def _getDefaultSource(self, processType):
         return { "client" : "Client.rb" }[processType]
 
 class PhpMapping(CppBasedClientMapping):
@@ -3512,43 +3588,64 @@
         mappingName = "php"
         mappingDesc = "PHP"
 
-    def getEnv(self, process, current):
-        env = CppBasedMapping.getEnv(self, process, current)
-        if (isinstance(platform, Windows) and
-            (current.driver.useIceBinDist(self) or "cpp" in os.environ.get("ICE_BIN_DIST", "").split())):
-                env[platform.getLdPathEnvName()] = self.getBinDir(process, current)
-        return env
+        @classmethod
+        def getSupportedArgs(self):
+            return ("", ["php-version="])
+
+        @classmethod
+        def usage(self):
+            print("")
+            print("PHP Mapping options:")
+            print("--php-version=[7.1|7.2|7.3]    PHP Version used for Windows builds")
+
+
+        def __init__(self, options=[]):
+            CppBasedClientMapping.Config.__init__(self, options)
+            parseOptions(self, options, { "php-version" : "phpVersion" })
 
     def getCommandLine(self, current, process, exe, args):
         phpArgs = []
+        php = "php"
+
+        #
+        # On Windows, when using a source distribution use the php executable from
+        # the Nuget PHP dependency.
+        #
+        if isinstance(platform, Windows) and not self.component.useBinDist(self, current):
+            nugetVersions = {
+                "7.1": "7.1.17",
+                "7.2": "7.2.8",
+                "7.3": "7.3.0"
+            }
+            nugetVersion = nugetVersions[current.config.phpVersion]
+            threadSafe = current.driver.configs[self].buildConfig in ["Debug", "Release"]
+            buildPlatform = current.driver.configs[self].buildPlatform
+            buildConfig = "Debug" if current.driver.configs[self].buildConfig.find("Debug") >= 0 else "Release"
+            packageName = "php-{0}-{1}.{2}".format(current.config.phpVersion, "ts" if threadSafe else "nts", nugetVersion)
+            php = os.path.join(self.path, "msbuild", "packages", packageName, "build", "native", "bin",
+                               buildPlatform, buildConfig, "php.exe")
+
         #
         # If Ice is not installed in the system directory, specify its location with PHP
         # configuration arguments.
         #
-        if current.driver.getIceDir(self, current) != platform.getIceInstallDir(self, current):
-            useBinDist = current.driver.useIceBinDist(self)
-            if isinstance(platform, Windows):
-
-                buildPlatform = current.driver.configs[self].buildPlatform
-                config = "Debug" if current.driver.configs[self].buildConfig.find("Debug") >= 0 else "Release"
-
-                extension = "php_ice_nts.dll" if "NTS" in run("php -v") else "php_ice.dll"
-                extensionDir = os.path.join(self.path, "lib", buildPlatform, config)
-                includePath = self.getLibDir(process, current)
-            else:
-                extension = "ice.so"
-                extensionDir = self.getLibDir(process, current)
-                includePath = "{0}/{1}".format(current.driver.getIceDir(self, current), "php" if useBinDist else "lib")
-
+        if isinstance(platform, Windows) and not self.component.useBinDist(self, current) or \
+           platform.getInstallDir() and self.component.getInstallDir(self, current) != platform.getInstallDir():
             phpArgs += ["-n"] # Do not load any php.ini files
-            phpArgs += ["-d", "extension_dir='{0}'".format(extensionDir)]
-            phpArgs += ["-d", "extension='{0}'".format(extension)]
-            phpArgs += ["-d", "include_path='{0}'".format(includePath)]
+            phpArgs += ["-d", "extension_dir='{0}'".format(self.component.getLibDir(process, self, current))]
+            phpArgs += ["-d", "extension='{0}'".format(self.component.getPhpExtension(self, current))]
+            phpArgs += ["-d", "include_path='{0}'".format(self.component.getPhpIncludePath(self, current))]
+
         if hasattr(process, "getPhpArgs"):
             phpArgs += process.getPhpArgs(current)
-        return "php {0} -f {1} -- {2}".format(" ".join(phpArgs), exe, args)
 
-    def getDefaultSource(self, processType):
+        return "{0} {1} -f {2} -- {3} {4}".format(php,
+                                                  " ".join(phpArgs),
+                                                  os.path.join(self.path, "test", "TestHelper.php"),
+                                                  exe,
+                                                  args)
+
+    def _getDefaultSource(self, processType):
         return { "client" : "Client.php" }[processType]
 
 class MatlabMapping(CppBasedClientMapping):
@@ -3567,7 +3664,7 @@
     def getServerMapping(self, testId=None):
         return Mapping.getByName("python") # Run clients against Python mapping servers
 
-    def getDefaultSource(self, processType):
+    def _getDefaultSource(self, processType):
         return { "client" : "client.m" }[processType]
 
     def getOptions(self, current):
@@ -3578,7 +3675,50 @@
         options["mx"] = [ False ]
         return options
 
-class JavaScriptMapping(Mapping):
+
+class JavaScriptMixin():
+
+    def loadTestSuites(self, tests, config, filters, rfilters):
+        Mapping.loadTestSuites(self, tests, config, filters, rfilters)
+        self.getServerMapping().loadTestSuites(list(self.testsuites.keys()) + ["Ice/echo"], config)
+
+    def getServerMapping(self, testId=None):
+        if testId and self.hasSource(testId, "server"):
+            return self
+        else:
+            return Mapping.getByName("cpp") # Run clients against C++ mapping servers if no JS server provided
+
+    def _getDefaultProcesses(self, processType):
+        if processType.startswith("server"):
+            return [EchoServer(), Server()]
+        return Mapping._getDefaultProcesses(self, processType)
+
+    def getCommonDir(self, current):
+        return os.path.join(self.getPath(), "test", "Common")
+
+    def getCommandLine(self, current, process, exe, args):
+        return "node {0}/run.js {1} {2}".format(self.getCommonDir(current), exe, args)
+
+    def getEnv(self, process, current):
+        env = Mapping.getEnv(self, process, current)
+        env["NODE_PATH"] = os.pathsep.join([self.getCommonDir(current), self.getTestCwd(process, current)])
+        return env
+
+    def getSSLProps(self, process, current):
+        return {}
+
+    def getOptions(self, current):
+        options = {
+            "protocol" : ["ws", "wss"] if current.config.browser else ["tcp"],
+            "compress" : [False],
+            "ipv6" : [False],
+            "serialize" : [False],
+            "mx" : [False],
+        }
+        return options
+
+
+class JavaScriptMapping(JavaScriptMixin,Mapping):
 
     class Config(Mapping.Config):
 
@@ -3596,10 +3736,7 @@
 
         def __init__(self, options=[]):
             Mapping.Config.__init__(self, options)
-            self.es5 = False
-            self.browser = ""
-            self.worker = False
-            parseOptions(self, options)
+
             if self.browser and self.protocol == "tcp":
                 self.protocol = "ws"
 
@@ -3607,41 +3744,15 @@
             if self.browser in ["Ie"]:
                 self.es5 = True
 
-    def loadTestSuites(self, tests, config, filters, rfilters):
-        Mapping.loadTestSuites(self, tests, config, filters, rfilters)
-        self.getServerMapping().loadTestSuites(list(self.testsuites.keys()) + ["Ice/echo"], config, filters, rfilters)
-
-    def getServerMapping(self, testId=None):
-        if testId and self.hasSource(testId, "server"):
-            return self
-        else:
-            return Mapping.getByName("cpp") # Run clients against C++ mapping servers if no JS server provided
-
-    def getDefaultProcesses(self, processType, testsuite):
-        if processType in ["server", "serveramd"]:
-            return [EchoServer(), Server()]
-        return Mapping.getDefaultProcesses(self, processType, testsuite)
-
-    def getCommandLine(self, current, process, exe, args):
+    def getCommonDir(self, current):
         if current.config.es5:
-            return "node {0}/test/Common/run.js --es5 {1} {2}".format(self.path, exe, args)
+            return os.path.join(self.getPath(), "test", "es5", "Common")
         else:
-            return "node {0}/test/Common/run.js {1} {2}".format(self.path, exe, args)
+            return os.path.join(self.getPath(), "test", "Common")
 
-    def getDefaultSource(self, processType):
+    def _getDefaultSource(self, processType):
         return { "client" : "Client.js", "serveramd" : "ServerAMD.js", "server" : "Server.js" }[processType]
 
-    def getDefaultExe(self, processType, config=None):
-        return self.getDefaultSource(processType).replace(".js", "")
-
-    def getEnv(self, process, current):
-        env = Mapping.getEnv(self, process, current)
-        env["NODE_PATH"] = self.getTestCwd(process, current)
-        return env
-
-    def getSSLProps(self, process, current):
-        return {}
-
     def getTestCwd(self, process, current):
         if current.config.es5:
             # Change to the ES5 test directory if testing ES5
@@ -3649,87 +3760,61 @@
         else:
             return os.path.join(self.path, "test", current.testcase.getTestSuite().getId())
 
-    def computeTestCases(self, testId, files):
-        if testId.find("es5") > -1:
-            return # Ignore es5 directories
-        return Mapping.computeTestCases(self, testId, files)
-
     def getOptions(self, current):
-        options = {
-            "protocol" : ["ws", "wss"] if current.config.browser else ["tcp"],
-            "compress" : [False],
-            "ipv6" : [False],
-            "serialize" : [False],
-            "mx" : [False],
+        options = JavaScriptMixin.getOptions(self, current)
+        options.update({
             "es5" : [True] if current.config.es5 else [False, True],
             "worker" : [False, True] if current.config.browser and current.config.browser != "Ie" else [False],
-        }
+        })
         return options
 
-try:
-    from Glacier2Util import *
-    from IceBoxUtil import *
-    from IceBridgeUtil import *
-    from IcePatch2Util import *
-    from IceGridUtil import *
-    from IceStormUtil import *
-except ImportError:
-    pass
+class TypeScriptMapping(JavaScriptMixin,Mapping):
 
-from LocalDriver import *
+    class Config(Mapping.Config):
+
+        def canRun(self, testId, current):
+            return Mapping.Config.canRun(self, testId, current) and self.browser != "Ie" # IE doesn't support ES6
+
+    def _getDefaultSource(self, processType):
+        return { "client" : "Client.ts", "serveramd" : "ServerAMD.ts", "server" : "Server.ts" }[processType]
 
 #
-# Supported mappings
+# Instantiate platform global variable
 #
-for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(toplevel)):
-    if m == "cpp" or re.match("cpp-.*", m):
-        Mapping.add(m, CppMapping())
-    elif m == "java-compat" or re.match("java-compat-.*", m):
-        Mapping.add(m, JavaCompatMapping())
-    elif m == "java" or re.match("java-.*", m):
-        Mapping.add(m, JavaMapping())
-    elif m == "python" or re.match("python-.*", m):
-        Mapping.add(m, PythonMapping())
-    elif m == "ruby" or re.match("ruby-.*", m):
-        Mapping.add(m, RubyMapping())
-    elif m == "php" or re.match("php-.*", m):
-        Mapping.add(m, PhpMapping())
-    elif m == "js" or re.match("js-.*", m):
-        Mapping.add(m, JavaScriptMapping())
-    elif m == "objective-c" or re.match("objective-c-*", m):
-        Mapping.add(m, ObjCMapping())
-
-try:
-    if not isinstance(platform, Windows):
-        #
-        # Check if the .NET Core SDK is installed
-        #
-        run("dotnet --version")
-    Mapping.add("csharp", CSharpMapping())
-except:
-    pass
+platform = None
+if sys.platform == "darwin":
+    platform = Darwin()
+elif sys.platform.startswith("aix"):
+    platform = AIX()
+elif sys.platform.startswith("linux") or sys.platform.startswith("gnukfreebsd"):
+    platform = Linux()
+elif sys.platform == "win32" or sys.platform[:6] == "cygwin":
+    platform = Windows()
+if not platform:
+    print("can't run on unknown platform `{0}'".format(sys.platform))
+    sys.exit(1)
 
 #
-# Check if the Android SDK is installed and eventually add the Android mappings
+# Import component classes and instantiate the default component
 #
-try:
-    run("adb version")
-    Mapping.add(os.path.join("java-compat", "android"), AndroidCompatMapping())
-    Mapping.add(os.path.join("java", "android"), AndroidMapping())
-except:
-    pass
+from Component import *
 
 #
-# Check if Matlab is installed and eventually add the Matlab mapping
+# Initialize the platform with component
 #
-try:
-    run("where matlab" if isinstance(platform, Windows) else "which matlab")
-    Mapping.add("matlab", MatlabMapping())
-except:
-    pass
+platform.init(component)
+
+#
+# Import local driver
+#
+from LocalDriver import *
 
 def runTestsWithPath(path):
-    runTests([Mapping.getByPath(path)])
+    mappings = Mapping.getAllByPath(path)
+    if not mappings:
+        print("couldn't find mapping for `{0}' (is this mapping supported on this platform?)".format(path))
+        sys.exit(0)
+    runTests(mappings)
 
 def runTests(mappings=None, drivers=None):
     if not mappings:
@@ -3773,7 +3858,7 @@
         #
         # Create the driver
         #
-        driver = Driver.create(opts)
+        driver = Driver.create(opts, component)
 
         #
         # Create the configurations for each mapping.
@@ -3793,7 +3878,8 @@
         #
         driver.setConfigs(configs)
         for mapping in mappings + driver.getMappings():
-            mapping.loadTestSuites(args, configs[mapping], driver.filters, driver.rfilters)
+            (filters, rfilters) = driver.getFilters(mapping, configs[mapping])
+            mapping.loadTestSuites(args, configs[mapping], filters, rfilters)
 
         #
         # Finally, run the test suites with the driver.
diff -Nru zeroc-ice-3.7.1/slice/Glacier2/Metrics.ice zeroc-ice-3.7.2/slice/Glacier2/Metrics.ice
--- zeroc-ice-3.7.1/slice/Glacier2/Metrics.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Glacier2/Metrics.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/Metrics.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
diff -Nru zeroc-ice-3.7.1/slice/Glacier2/PermissionsVerifierF.ice zeroc-ice-3.7.2/slice/Glacier2/PermissionsVerifierF.ice
--- zeroc-ice-3.7.1/slice/Glacier2/PermissionsVerifierF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Glacier2/PermissionsVerifierF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Glacier2/PermissionsVerifier.ice zeroc-ice-3.7.2/slice/Glacier2/PermissionsVerifier.ice
--- zeroc-ice-3.7.1/slice/Glacier2/PermissionsVerifier.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Glacier2/PermissionsVerifier.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Glacier2/SSLInfo.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
diff -Nru zeroc-ice-3.7.1/slice/Glacier2/RouterF.ice zeroc-ice-3.7.2/slice/Glacier2/RouterF.ice
--- zeroc-ice-3.7.1/slice/Glacier2/RouterF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Glacier2/RouterF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Glacier2/Router.ice zeroc-ice-3.7.2/slice/Glacier2/Router.ice
--- zeroc-ice-3.7.1/slice/Glacier2/Router.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Glacier2/Router.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/Router.ice>
 #include <Glacier2/Session.ice>
 #include <Glacier2/PermissionsVerifier.ice>
@@ -46,7 +50,7 @@
 
 /**
  *
- * The Glacier2 specialization of the <tt>Ice::Router</tt> interface.
+ * The Glacier2 specialization of the <code>Ice::Router</code> interface.
  *
  **/
 interface Router extends Ice::Router
diff -Nru zeroc-ice-3.7.1/slice/Glacier2/Session.ice zeroc-ice-3.7.2/slice/Glacier2/Session.ice
--- zeroc-ice-3.7.1/slice/Glacier2/Session.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Glacier2/Session.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Identity.ice>
 #include <Glacier2/SSLInfo.ice>
diff -Nru zeroc-ice-3.7.1/slice/Glacier2/SSLInfo.ice zeroc-ice-3.7.2/slice/Glacier2/SSLInfo.ice
--- zeroc-ice-3.7.1/slice/Glacier2/SSLInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Glacier2/SSLInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/BuiltinSequences.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
diff -Nru zeroc-ice-3.7.1/slice/Ice/BuiltinSequences.ice zeroc-ice-3.7.2/slice/Ice/BuiltinSequences.ice
--- zeroc-ice-3.7.1/slice/Ice/BuiltinSequences.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/BuiltinSequences.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/CommunicatorF.ice zeroc-ice-3.7.2/slice/Ice/CommunicatorF.ice
--- zeroc-ice-3.7.1/slice/Ice/CommunicatorF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/CommunicatorF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Communicator.ice zeroc-ice-3.7.2/slice/Ice/Communicator.ice
--- zeroc-ice-3.7.1/slice/Ice/Communicator.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Communicator.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/InstrumentationF.ice>
@@ -54,7 +60,9 @@
  * @see ValueFactory
  *
  **/
-["clr:implements:_System.IDisposable", "java:implements:java.lang.AutoCloseable", "php:internal", "matlab:internal"]
+["clr:implements:global::System.IDisposable", "java:implements:java.lang.AutoCloseable"]
+
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 local interface Communicator
 {
 
@@ -81,7 +89,7 @@
      * @see ObjectAdapter#destroy
      *
      **/
-    ["cpp:noexcept"] void destroy();
+    ["cpp:noexcept", "js:async"] void destroy();
 
     /**
      *
@@ -100,7 +108,7 @@
      * @see ObjectAdapter#deactivate
      *
      **/
-    ["cpp:noexcept"] void shutdown();
+    ["cpp:noexcept", "js:async"] void shutdown();
 
     /**
      *
@@ -121,7 +129,7 @@
      * @see ObjectAdapter#waitForDeactivate
      *
      **/
-    ["cpp:noexcept"] void waitForShutdown();
+    ["cpp:noexcept", "js:async"] void waitForShutdown();
 
     /**
      *
@@ -137,8 +145,8 @@
     /**
      *
      * Convert a stringified proxy into a proxy. For example,
-     * <tt>MyCategory/MyObject:tcp -h some_host -p
-     * 10000</tt> creates a proxy that refers to the Ice object
+     * <code>MyCategory/MyObject:tcp -h some_host -p
+     * 10000</code> creates a proxy that refers to the Ice object
      * having an identity with a name "MyObject" and a category
      * "MyCategory", with the server running on host "some_host", port
      * 10000. If the stringified proxy does not parse correctly, the
@@ -148,7 +156,7 @@
      *
      * @param str The stringified proxy to convert into a proxy.
      *
-     * @return The proxy, or nil if <tt>str</tt> is an empty string.
+     * @return The proxy, or nil if <code>str</code> is an empty string.
      *
      * @see #proxyToString
      *
@@ -162,7 +170,7 @@
      * @param obj The proxy to convert into a stringified proxy.
      *
      * @return The stringified proxy, or an empty string if
-     * <tt>obj</tt> is nil.
+     * <code>obj</code> is nil.
      *
      * @see #stringToProxy
      *
@@ -172,11 +180,11 @@
     /**
      *
      * Convert a set of proxy properties into a proxy. The "base"
-     * name supplied in the <tt>property</tt> argument refers to a
+     * name supplied in the <code>property</code> argument refers to a
      * property containing a stringified proxy, such as
-     * <tt>MyProxy=id:tcp -h localhost -p 10000</tt>. Additional
+     * <code>MyProxy=id:tcp -h localhost -p 10000</code>. Additional
      * properties configure local settings for the proxy, such as
-     * <tt>MyProxy.PreferSecure=1</tt>. The "Properties"
+     * <code>MyProxy.PreferSecure=1</code>. The "Properties"
      * appendix in the Ice manual describes each of the supported
      * proxy properties.
      *
@@ -231,7 +239,7 @@
     /**
      *
      * Create a new object adapter. The endpoints for the object
-     * adapter are taken from the property <tt><em>name</em>.Endpoints</tt>.
+     * adapter are taken from the property <code><em>name</em>.Endpoints</code>.
      *
      * It is legal to create an object adapter with the empty string as
      * its name. Such an object adapter is accessible via bidirectional
@@ -250,12 +258,12 @@
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapter(string name);
+    ["js:async"] ObjectAdapter createObjectAdapter(string name);
 
     /**
      *
      * Create a new object adapter with endpoints. This operation sets
-     * the property <tt><em>name</em>.Endpoints</tt>, and then calls
+     * the property <code><em>name</em>.Endpoints</code>, and then calls
      * {@link #createObjectAdapter}. It is provided as a convenience
      * function.
      *
@@ -273,7 +281,7 @@
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints);
+    ["js:async"] ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints);
 
     /**
      *
@@ -294,7 +302,7 @@
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapterWithRouter(string name, ["objc:param:router"] Router* rtr);
+    ["js:async"] ObjectAdapter createObjectAdapterWithRouter(string name, ["objc:param:router"] Router* rtr);
 
     /**
      *
@@ -398,6 +406,7 @@
      **/
     ["cpp:const", "cpp:noexcept"] Logger getLogger();
 
+#ifndef __SLICE2JS__
     /**
      *
      * Get the observer resolver object for this communicator.
@@ -406,6 +415,7 @@
      *
      **/
     ["cpp:const", "cpp:noexcept"] Instrumentation::CommunicatorObserver getObserver();
+#endif
 
     /**
      *
@@ -427,7 +437,7 @@
      * operation has no effect on existing proxies.
      *
      * You can also set a router for an individual proxy
-     * by calling the operation <tt>ice_router</tt> on the proxy.
+     * by calling the operation <code>ice_router</code> on the proxy.
      *
      * @param rtr The default router to use for this communicator.
      *
@@ -459,7 +469,7 @@
      * object adapters.
      *
      * You can also set a locator for an individual proxy by calling the
-     * operation <tt>ice_locator</tt> on the proxy, or for an object adapter
+     * operation <code>ice_locator</code> on the proxy, or for an object adapter
      * by calling {@link ObjectAdapter#setLocator} on the object adapter.
      *
      * @param loc The default locator to use for this communicator.
@@ -471,6 +481,7 @@
      **/
     void setDefaultLocator(Locator* loc);
 
+#ifndef __SLICE2JS__
     /**
      *
      * Get the plug-in manager for this communicator.
@@ -481,6 +492,7 @@
      *
      **/
     ["cpp:const"] PluginManager getPluginManager();
+#endif
 
     /**
      *
@@ -506,6 +518,7 @@
      **/
     ["async-oneway"] void flushBatchRequests(CompressBatch compress);
 
+#ifndef __SLICE2JS__
     /**
      *
      * Add the Admin object with all its facets to the provided object adapter.
@@ -537,7 +550,7 @@
      *
      * If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called by the communicator
      * initialization, after initialization of all plugins.
-
+     *
      * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no
      * Admin object is configured.
      *
@@ -591,8 +604,11 @@
      *
      **/
     FacetMap findAllAdminFacets();
+#endif
 }
 
+#endif
+
 /**
  * The output mode for xxxToString method such as identityToString and proxyToString.
  * The actual encoding format for the string is the same for all modes: you
diff -Nru zeroc-ice-3.7.1/slice/Ice/ConnectionF.ice zeroc-ice-3.7.2/slice/Ice/ConnectionF.ice
--- zeroc-ice-3.7.1/slice/Ice/ConnectionF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ConnectionF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Connection.ice zeroc-ice-3.7.2/slice/Ice/Connection.ice
--- zeroc-ice-3.7.1/slice/Ice/Connection.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Connection.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Identity.ice>
@@ -47,11 +53,12 @@
     BasedOnProxy
 }
 
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 /**
  *
- * Base class providing access to the connection details. *
+ * Base class providing access to the connection details.
+ *
  **/
-["php:internal", "matlab:internal"]
 local class ConnectionInfo
 {
     /**
@@ -84,6 +91,7 @@
      **/
     string connectionId;
 }
+#endif
 
 local interface Connection;
 
@@ -203,12 +211,12 @@
     GracefullyWithWait
 }
 
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 /**
  *
  * The user-level interface to a connection.
  *
  **/
-["php:internal", "matlab:internal"]
 local interface Connection
 {
     /**
@@ -219,7 +227,7 @@
      *
      * @see ConnectionClose
      **/
-    ["cpp:noexcept"] void close(ConnectionClose mode);
+    ["cpp:noexcept", "js:async"] void close(ConnectionClose mode);
 
     /**
      *
@@ -415,7 +423,6 @@
  * Provides access to the connection details of an IP connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class IPConnectionInfo extends ConnectionInfo
 {
     /** The local address. */
@@ -436,7 +443,6 @@
  * Provides access to the connection details of a TCP connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class TCPConnectionInfo extends IPConnectionInfo
 {
     /**
@@ -459,7 +465,6 @@
  * Provides access to the connection details of a UDP connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class UDPConnectionInfo extends IPConnectionInfo
 {
     /**
@@ -499,11 +504,12 @@
  * Provides access to the connection details of a WebSocket connection
  *
  **/
-["php:internal", "matlab:internal"]
 local class WSConnectionInfo extends ConnectionInfo
 {
     /** The headers from the HTTP upgrade request. */
     HeaderDict headers;
 }
 
+#endif
+
 }
diff -Nru zeroc-ice-3.7.1/slice/Ice/Current.ice zeroc-ice-3.7.2/slice/Ice/Current.ice
--- zeroc-ice-3.7.1/slice/Ice/Current.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Current.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/ConnectionF.ice>
@@ -26,9 +32,9 @@
 
 /**
  *
- * A request context. <tt>Context</tt> is used to transmit metadata about a
+ * A request context. <code>Context</code> is used to transmit metadata about a
  * request from the server to the client, such as Quality-of-Service
- * (QoS) parameters. Each operation on the client has a <tt>Context</tt> as
+ * (QoS) parameters. Each operation on the client has a <code>Context</code> as
  * its implicit final parameter.
  *
  **/
@@ -46,37 +52,37 @@
 enum OperationMode
 {
     /**
-     * Ordinary operations have <tt>Normal</tt> mode.  These operations
+     * Ordinary operations have <code>Normal</code> mode.  These operations
      * modify object state; invoking such an operation twice in a row
      * has different semantics than invoking it once. The Ice run time
      * guarantees that it will not violate at-most-once semantics for
-     * <tt>Normal</tt> operations.
+     * <code>Normal</code> operations.
      */
     Normal,
 
     /**
-     * Operations that use the Slice <tt>nonmutating</tt> keyword must not
+     * Operations that use the Slice <code>nonmutating</code> keyword must not
      * modify object state. For C++, nonmutating operations generate
-     * <tt>const</tt> member functions in the skeleton. In addition, the Ice
+     * <code>const</code> member functions in the skeleton. In addition, the Ice
      * run time will attempt to transparently recover from certain
      * run-time errors by re-issuing a failed request and propagate
      * the failure to the application only if the second attempt
      * fails.
      *
-     * <p class="Deprecated"><tt>Nonmutating</tt> is deprecated; Use the
-     * <tt>idempotent</tt> keyword instead. For C++, to retain the mapping
-     * of <tt>nonmutating</tt> operations to C++ <tt>const</tt>
-     * member functions, use the <tt>\["cpp:const"]</tt> metadata
+     * <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
+     * <code>idempotent</code> keyword instead. For C++, to retain the mapping
+     * of <code>nonmutating</code> operations to C++ <code>const</code>
+     * member functions, use the <code>\["cpp:const"]</code> metadata
      * directive.
      */
     \Nonmutating,
 
     /**
-     * Operations that use the Slice <tt>idempotent</tt> keyword can modify
+     * Operations that use the Slice <code>idempotent</code> keyword can modify
      * object state, but invoking an operation twice in a row must
      * result in the same object state as invoking it once.  For
-     * example, <tt>x = 1</tt> is an idempotent statement,
-     * whereas <tt>x += 1</tt> is not. For idempotent
+     * example, <code>x = 1</code> is an idempotent statement,
+     * whereas <code>x += 1</code> is not. For idempotent
      * operations, the Ice run-time uses the same retry behavior
      * as for nonmutating operations in case of a potentially
      * recoverable error.
@@ -87,8 +93,8 @@
 /**
  *
  * Information about the current method invocation for servers. Each
- * operation on the server has a <tt>Current</tt> as its implicit final
- * parameter. <tt>Current</tt> is mostly used for Ice services. Most
+ * operation on the server has a <code>Current</code> as its implicit final
+ * parameter. <code>Current</code> is mostly used for Ice services. Most
  * applications ignore this parameter.
  *
  **/
diff -Nru zeroc-ice-3.7.1/slice/Ice/EndpointF.ice zeroc-ice-3.7.2/slice/Ice/EndpointF.ice
--- zeroc-ice-3.7.1/slice/Ice/EndpointF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/EndpointF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Endpoint.ice zeroc-ice-3.7.2/slice/Ice/Endpoint.ice
--- zeroc-ice-3.7.1/slice/Ice/Endpoint.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Endpoint.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/Version.ice>
 #include <Ice/BuiltinSequences.ice>
@@ -86,12 +92,12 @@
  **/
 const short iAPSEndpointType = 9;
 
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 /**
  *
  * Base class providing access to the endpoint details.
  *
  **/
-["php:internal", "matlab:internal"]
 local class EndpointInfo
 {
     /**
@@ -151,7 +157,7 @@
  * The user-level interface to an endpoint.
  *
  **/
-["cpp:comparable", "php:internal", "matlab:internal"]
+["cpp:comparable", "js:comparable"]
 local interface Endpoint
 {
     /**
@@ -180,7 +186,6 @@
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class IPEndpointInfo extends EndpointInfo
 {
     /**
@@ -212,7 +217,6 @@
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class TCPEndpointInfo extends IPEndpointInfo
 {
 }
@@ -224,7 +228,6 @@
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class UDPEndpointInfo extends IPEndpointInfo
 {
     /**
@@ -247,7 +250,6 @@
  * Provides access to a WebSocket endpoint information.
  *
  **/
-["php:internal", "matlab:internal"]
 local class WSEndpointInfo extends EndpointInfo
 {
     /**
@@ -265,7 +267,6 @@
  * @see Endpoint
  *
  **/
-["php:internal", "matlab:internal"]
 local class OpaqueEndpointInfo extends EndpointInfo
 {
     /**
@@ -284,4 +285,6 @@
     ByteSeq rawBytes;
 }
 
+#endif
+
 }
diff -Nru zeroc-ice-3.7.1/slice/Ice/EndpointTypes.ice zeroc-ice-3.7.2/slice/Ice/EndpointTypes.ice
--- zeroc-ice-3.7.1/slice/Ice/EndpointTypes.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/EndpointTypes.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
@@ -28,11 +34,11 @@
 local enum EndpointSelectionType
 {
     /**
-     * <tt>Random</tt> causes the endpoints to be arranged in a random order.
+     * <code>Random</code> causes the endpoints to be arranged in a random order.
      */
     Random,
     /**
-     * <tt>Ordered</tt> forces the Ice run time to use the endpoints in the
+     * <code>Ordered</code> forces the Ice run time to use the endpoints in the
      * order they appeared in the proxy.
      */
     Ordered
diff -Nru zeroc-ice-3.7.1/slice/Ice/FacetMap.ice zeroc-ice-3.7.2/slice/Ice/FacetMap.ice
--- zeroc-ice-3.7.1/slice/Ice/FacetMap.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/FacetMap.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Identity.ice zeroc-ice-3.7.2/slice/Ice/Identity.ice
--- zeroc-ice-3.7.1/slice/Ice/Identity.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Identity.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/ImplicitContextF.ice zeroc-ice-3.7.2/slice/Ice/ImplicitContextF.ice
--- zeroc-ice-3.7.1/slice/Ice/ImplicitContextF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ImplicitContextF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix"]]
+[["cpp:header-ext:h"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+
+[["objc:header-dir:objc"]]
+[["objc:dll-export:ICE_API"]]
+
+[["python:pkgdir:Ice"]]
+
+[["js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/ImplicitContext.ice zeroc-ice-3.7.2/slice/Ice/ImplicitContext.ice
--- zeroc-ice-3.7.1/slice/Ice/ImplicitContext.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ImplicitContext.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/LocalException.ice>
 #include <Ice/Current.ice>
@@ -27,24 +33,24 @@
  * An interface to associate implict contexts with communicators.
  *
  * When you make a remote invocation without an explicit context parameter,
- * Ice uses the per-proxy context (if any) combined with the <tt>ImplicitContext</tt>
+ * Ice uses the per-proxy context (if any) combined with the <code>ImplicitContext</code>
  * associated with the communicator.
  *
- * Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
- * used depends on the value of the <tt>Ice.ImplicitContext</tt> property.
+ * Ice provides several implementations of <code>ImplicitContext</code>. The implementation
+ * used depends on the value of the <code>Ice.ImplicitContext</code> property.
  * <dl>
- * <dt><tt>None</tt> (default)</dt>
+ * <dt><code>None</code> (default)</dt>
  * <dd>No implicit context at all.</dd>
- * <dt><tt>PerThread</tt></dt>
+ * <dt><code>PerThread</code></dt>
  * <dd>The implementation maintains a context per thread.</dd>
- * <dt><tt>Shared</tt></dt>
+ * <dt><code>Shared</code></dt>
  * <dd>The implementation maintains a single context shared by all threads.</dd>
  * </dl>
  *
- * <tt>ImplicitContext</tt> also provides a number of operations to create, update or retrieve
+ * <code>ImplicitContext</code> also provides a number of operations to create, update or retrieve
  * an entry in the underlying context without first retrieving a copy of the entire
- * context. These operations correspond to a subset of the <tt>java.util.Map</tt> methods,
- * with <tt>java.lang.Object</tt> replaced by <tt>string</tt> and null replaced by the empty-string.
+ * context. These operations correspond to a subset of the <code>java.util.Map</code> methods,
+ * with <code>java.lang.Object</code> replaced by <code>string</code> and null replaced by the empty-string.
  *
  **/
 local interface ImplicitContext
diff -Nru zeroc-ice-3.7.1/slice/Ice/InstrumentationF.ice zeroc-ice-3.7.2/slice/Ice/InstrumentationF.ice
--- zeroc-ice-3.7.1/slice/Ice/InstrumentationF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/InstrumentationF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Instrumentation.ice zeroc-ice-3.7.2/slice/Ice/Instrumentation.ice
--- zeroc-ice-3.7.1/slice/Ice/Instrumentation.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Instrumentation.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/EndpointF.ice>
 #include <Ice/ConnectionF.ice>
diff -Nru zeroc-ice-3.7.1/slice/Ice/LocalException.ice zeroc-ice-3.7.2/slice/Ice/LocalException.ice
--- zeroc-ice-3.7.1/slice/Ice/LocalException.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/LocalException.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
@@ -83,9 +89,9 @@
 {
     /**
      *
-     * The kind of object that is registered already: "servant",
-     * "servant locator", "value factory", "plug-in",
-     * "object adapter", "object", or "user exception factory".
+     * The kind of object that could not be removed: "servant", "facet",
+     * "object", "default servant", "servant locator", "value factory", "plugin",
+     * "object adapter", "object adapter with router", "replica group".
      *
      **/
     string kindOfObject;
@@ -117,9 +123,9 @@
 {
     /**
      *
-     * The kind of object that could not be removed: "servant",
-     * "servant locator", "value factory", "plug-in",
-     * "object adapter", "object", or "user exception factory".
+     * The kind of object that could not be removed: "servant", "facet",
+     * "object", "default servant", "servant locator", "value factory", "plugin",
+     * "object adapter", "object adapter with router", "replica group".
      *
      **/
     string kindOfObject;
@@ -137,8 +143,8 @@
  * The operation can only be invoked with a twoway request.
  *
  * This exception is raised if an attempt is made to invoke an
- * operation with <tt>ice_oneway</tt>, <tt>ice_batchOneway</tt>, <tt>ice_datagram</tt>,
- * or <tt>ice_batchDatagram</tt> and the operation has a return value,
+ * operation with <code>ice_oneway</code>, <code>ice_batchOneway</code>, <code>ice_datagram</code>,
+ * or <code>ice_batchDatagram</code> and the operation has a return value,
  * out-parameters, or an exception specification.
  *
  **/
@@ -158,10 +164,10 @@
  * An attempt was made to clone a class that does not support
  * cloning.
  *
- * This exception is raised if <tt>ice_clone</tt> is called on
+ * This exception is raised if <code>ice_clone</code> is called on
  * a class that is derived from an abstract Slice class (that is,
  * a class containing operations), and the derived class does not
- * provide an implementation of the <tt>ice_clone</tt> operation (C++ only).
+ * provide an implementation of the <code>ice_clone</code> operation (C++ only).
  *
  **/
 ["cpp:ice_print"]
@@ -174,8 +180,8 @@
  * This exception is raised if an operation call on a server raises an
  * unknown exception. For example, for C++, this exception is raised
  * if the server throws a C++ exception that is not directly or
- * indirectly derived from <tt>Ice::LocalException</tt> or
- * <tt>Ice::UserException</tt>.
+ * indirectly derived from <code>Ice::LocalException</code> or
+ * <code>Ice::UserException</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -198,7 +204,7 @@
  * by the server as {@link UnknownLocalException}. The only exception to this
  * rule are all exceptions derived from {@link RequestFailedException},
  * which are transmitted by the Ice protocol even though they are
- * declared <tt>local</tt>.
+ * declared <code>local</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -212,13 +218,13 @@
  *
  * This exception is raised if an operation raises a
  * user exception that is not declared in the exception's
- * <tt>throws</tt> clause. Such undeclared exceptions are
+ * <code>throws</code> clause. Such undeclared exceptions are
  * not transmitted from the server to the client by the Ice
  * protocol, but instead the client just gets an
  * {@link UnknownUserException}. This is necessary in order to not violate
  * the contract established by an operation's signature: Only local
  * exceptions and user exceptions declared in the
- * <tt>throws</tt> clause can be raised.
+ * <code>throws</code> clause can be raised.
  *
  **/
 ["cpp:ice_print"]
@@ -428,7 +434,7 @@
  * This exception is raised if a request failed. This exception, and
  * all exceptions derived from {@link RequestFailedException}, are
  * transmitted by the Ice protocol, even though they are declared
- * <tt>local</tt>.
+ * <code>local</code>.
  *
  **/
 ["cpp:ice_print"]
@@ -492,10 +498,10 @@
     /**
      *
      * The error number describing the system exception. For C++ and
-     * Unix, this is equivalent to <tt>errno</tt>. For C++
+     * Unix, this is equivalent to <code>errno</code>. For C++
      * and Windows, this is the value returned by
-     * <tt>GetLastError()</tt> or
-     * <tt>WSAGetLastError()</tt>.
+     * <code>GetLastError()</code> or
+     * <code>WSAGetLastError()</code>.
      *
      **/
     int error = 0; // Don't use errno, as errno is usually a macro.
@@ -582,9 +588,9 @@
     /**
      *
      * The error number describing the DNS problem. For C++ and Unix,
-     * this is equivalent to <tt>h_errno</tt>. For C++ and
+     * this is equivalent to <code>h_errno</code>. For C++ and
      * Windows, this is the value returned by
-     * <tt>WSAGetLastError()</tt>.
+     * <code>WSAGetLastError()</code>.
      *
      **/
     int error = 0; // Don't use h_errno, as h_errno is usually a macro.
@@ -944,7 +950,7 @@
  *
  * This exception is raised when Ice receives a request or reply
  * message whose size exceeds the limit specified by the
- * <tt>Ice.MessageSizeMax</tt> property.
+ * <code>Ice.MessageSizeMax</code> property.
  *
  **/
 ["cpp:ice_print"]
diff -Nru zeroc-ice-3.7.1/slice/Ice/LocatorF.ice zeroc-ice-3.7.2/slice/Ice/LocatorF.ice
--- zeroc-ice-3.7.1/slice/Ice/LocatorF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/LocatorF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Locator.ice zeroc-ice-3.7.2/slice/Ice/Locator.ice
--- zeroc-ice-3.7.1/slice/Ice/Locator.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Locator.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Process.ice>
diff -Nru zeroc-ice-3.7.1/slice/Ice/LoggerF.ice zeroc-ice-3.7.2/slice/Ice/LoggerF.ice
--- zeroc-ice-3.7.1/slice/Ice/LoggerF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/LoggerF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Logger.ice zeroc-ice-3.7.2/slice/Ice/Logger.ice
--- zeroc-ice-3.7.1/slice/Ice/Logger.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Logger.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Metrics.ice zeroc-ice-3.7.2/slice/Ice/Metrics.ice
--- zeroc-ice-3.7.1/slice/Ice/Metrics.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Metrics.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
@@ -352,8 +358,7 @@
 /**
  *
  * Provides information on invocations that are specifically sent over
- * Ice connections. Remote metrics are embedded within {@link
- * InvocationMetrics}.
+ * Ice connections. Remote metrics are embedded within {@link InvocationMetrics}.
  *
  **/
 class RemoteMetrics extends ChildInvocationMetrics
diff -Nru zeroc-ice-3.7.1/slice/Ice/ObjectAdapterF.ice zeroc-ice-3.7.2/slice/Ice/ObjectAdapterF.ice
--- zeroc-ice-3.7.1/slice/Ice/ObjectAdapterF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ObjectAdapterF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/ObjectAdapter.ice zeroc-ice-3.7.2/slice/Ice/ObjectAdapter.ice
--- zeroc-ice-3.7.1/slice/Ice/ObjectAdapter.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ObjectAdapter.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/CommunicatorF.ice>
 #include <Ice/ServantLocatorF.ice>
@@ -71,7 +77,7 @@
      * @see #deactivate
      *
      **/
-    void activate();
+    ["js:async"] void activate();
 
     /**
      *
@@ -101,7 +107,7 @@
      * @see Communicator#waitForShutdown
      *
      **/
-    void waitForHold();
+    ["js:async"] void waitForHold();
 
     /**
      *
@@ -128,7 +134,7 @@
      * @see Communicator#shutdown
      *
      **/
-    ["cpp:noexcept"] void deactivate();
+    ["cpp:noexcept", "js:async"] void deactivate();
 
     /**
      *
@@ -142,7 +148,7 @@
      * @see Communicator#waitForShutdown
      *
      **/
-    ["cpp:noexcept"] void waitForDeactivate();
+    ["cpp:noexcept", "js:async"] void waitForDeactivate();
 
     /**
      *
@@ -169,7 +175,7 @@
      * @see Communicator#destroy
      *
      **/
-    ["cpp:noexcept"] void destroy();
+    ["cpp:noexcept", "js:async"] void destroy();
 
     /**
      *
@@ -197,7 +203,7 @@
 
     /**
      *
-     * Like {@link #add}, but with a facet. Calling <tt>add(servant, id)</tt>
+     * Like {@link #add}, but with a facet. Calling <code>add(servant, id)</code>
      * is equivalent to calling {@link #addFacet} with an empty facet.
      *
      * @param servant The servant to add.
@@ -224,7 +230,7 @@
      * Add a servant to this object adapter's Active Servant Map,
      * using an automatically generated UUID as its identity. Note that
      * the generated UUID identity can be accessed using the proxy's
-     * <tt>ice_getIdentity</tt> operation.
+     * <code>ice_getIdentity</code> operation.
      *
      * @param servant The servant to add.
      *
@@ -243,7 +249,7 @@
     /**
      *
      * Like {@link #addWithUUID}, but with a facet. Calling
-     * <tt>addWithUUID(servant)</tt> is equivalent to calling
+     * <code>addWithUUID(servant)</code> is equivalent to calling
      * {@link #addFacetWithUUID} with an empty facet.
      *
      * @param servant The servant to add.
@@ -325,7 +331,7 @@
 
     /**
      *
-     * Like {@link #remove}, but with a facet. Calling <tt>remove(id)</tt>
+     * Like {@link #remove}, but with a facet. Calling <code>remove(id)</code>
      * is equivalent to calling {@link #removeFacet} with an empty facet.
      *
      * @param id The identity of the Ice object that is implemented by
@@ -400,7 +406,7 @@
 
     /**
      *
-     * Like {@link #find}, but with a facet. Calling <tt>find(id)</tt>
+     * Like {@link #find}, but with a facet. Calling <code>find(id)</code>
      * is equivalent to calling {@link #findFacet} with an empty
      * facet.
      *
@@ -659,7 +665,7 @@
      * an object adapter if the network interfaces used by a host changes.
      *
      **/
-    void refreshPublishedEndpoints();
+    ["js:async"] void refreshPublishedEndpoints();
 
     /**
      *
diff -Nru zeroc-ice-3.7.1/slice/Ice/ObjectFactory.ice zeroc-ice-3.7.2/slice/Ice/ObjectFactory.ice
--- zeroc-ice-3.7.1/slice/Ice/ObjectFactory.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ObjectFactory.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
@@ -19,6 +25,7 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
 /**
  *
  * A factory for objects. Object factories are used when receiving "objects by value".
@@ -26,8 +33,7 @@
  * with the communicator.
  *
  **/
-
-["deprecate:ObjectFactory has been deprecated, use ValueFactory instead.", "php:internal"]
+["deprecate:ObjectFactory has been deprecated, use ValueFactory instead."]
 local interface ObjectFactory
 {
     /**
@@ -35,10 +41,10 @@
      * Create a new object for a given object type. The type is the
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
-     * Slice type id for interfaces of type <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * Slice type id for interfaces of type <code>Bar</code> in the module
+     * <code>Foo</code> is <code>"::Foo::Bar"</code>.
      *
-     * <p class="Note">The leading "<tt>::</tt>" is required.
+     * <p class="Note">The leading "<code>::</code>" is required.
      *
      * @param type The object type.
      *
@@ -59,4 +65,6 @@
     void destroy();
 }
 
+#endif
+
 }
diff -Nru zeroc-ice-3.7.1/slice/Ice/PluginF.ice zeroc-ice-3.7.2/slice/Ice/PluginF.ice
--- zeroc-ice-3.7.1/slice/Ice/PluginF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/PluginF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
@@ -19,7 +25,11 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
+
 local interface Plugin;
 local interface PluginManager;
 
+#endif
+
 }
diff -Nru zeroc-ice-3.7.1/slice/Ice/Plugin.ice zeroc-ice-3.7.2/slice/Ice/Plugin.ice
--- zeroc-ice-3.7.1/slice/Ice/Plugin.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Plugin.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,16 +1,22 @@
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/BuiltinSequences.ice>
@@ -23,6 +29,7 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
 /**
  *
  * A communicator plug-in. A plug-in generally adds a feature to a
@@ -63,7 +70,7 @@
      * Initialize the configured plug-ins. The communicator automatically initializes
      * the plug-ins by default, but an application may need to interact directly with
      * a plug-in prior to initialization. In this case, the application must set
-     * <tt>Ice.InitPlugins=0</tt> and then invoke {@link #initializePlugins}
+     * <code>Ice.InitPlugins=0</code> and then invoke {@link #initializePlugins}
      * manually. The plug-ins are initialized in the order in which they are loaded.
      * If a plug-in raises an exception during initialization, the communicator
      * invokes destroy on the plug-ins that have already been initialized.
@@ -118,4 +125,6 @@
     ["cpp:noexcept"] void destroy();
 }
 
+#endif
+
 }
diff -Nru zeroc-ice-3.7.1/slice/Ice/ProcessF.ice zeroc-ice-3.7.2/slice/Ice/ProcessF.ice
--- zeroc-ice-3.7.1/slice/Ice/ProcessF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ProcessF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Process.ice zeroc-ice-3.7.2/slice/Ice/Process.ice
--- zeroc-ice-3.7.1/slice/Ice/Process.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Process.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/PropertiesAdmin.ice zeroc-ice-3.7.2/slice/Ice/PropertiesAdmin.ice
--- zeroc-ice-3.7.1/slice/Ice/PropertiesAdmin.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/PropertiesAdmin.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/Ice/PropertiesF.ice zeroc-ice-3.7.2/slice/Ice/PropertiesF.ice
--- zeroc-ice-3.7.1/slice/Ice/PropertiesF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/PropertiesF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Properties.ice zeroc-ice-3.7.2/slice/Ice/Properties.ice
--- zeroc-ice-3.7.1/slice/Ice/Properties.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Properties.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/PropertiesAdmin.ice>
 
@@ -21,6 +27,8 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
+
 /**
  *
  * A property set used to configure Ice and Ice applications.
@@ -29,7 +37,6 @@
  * <em>application-name</em>\[.<em>category</em>\[.<em>sub-category</em>]].<em>name</em>.
  *
  **/
-["php:internal"]
 local interface Properties
 {
     /**
@@ -169,7 +176,7 @@
      * Get a sequence of command-line options that is equivalent to
      * this property set. Each element of the returned sequence is
      * a command-line option of the form
-     * <tt>--<em>key</em>=<em>value</em></tt>.
+     * <code>--<em>key</em>=<em>value</em></code>.
      *
      * @return The command line options for this property set.
      *
@@ -180,12 +187,12 @@
      *
      * Convert a sequence of command-line options into properties.
      * All options that begin with
-     * <tt>--<em>prefix</em>.</tt> are
+     * <code>--<em>prefix</em>.</code> are
      * converted into properties. If the prefix is empty, all options
-     * that begin with <tt>--</tt> are converted to properties.
+     * that begin with <code>--</code> are converted to properties.
      *
      * @param prefix The property prefix, or an empty string to
-     * convert all options starting with <tt>--</tt>.
+     * convert all options starting with <code>--</code>.
      *
      * @param options The command-line options.
      *
@@ -199,8 +206,8 @@
      *
      * Convert a sequence of command-line options into properties.
      * All options that begin with one of the following prefixes
-     * are converted into properties: <tt>--Ice</tt>, <tt>--IceBox</tt>, <tt>--IceGrid</tt>,
-     * <tt>--IcePatch2</tt>, <tt>--IceSSL</tt>, <tt>--IceStorm</tt>, <tt>--Freeze</tt>, and <tt>--Glacier2</tt>.
+     * are converted into properties: <code>--Ice</code>, <code>--IceBox</code>, <code>--IceGrid</code>,
+     * <code>--IcePatch2</code>, <code>--IceSSL</code>, <code>--IceStorm</code>, <code>--Freeze</code>, and <code>--Glacier2</code>.
      *
      * @param options The command-line options.
      *
@@ -210,6 +217,7 @@
      **/
     StringSeq parseIceCommandLineOptions(StringSeq options);
 
+#ifndef __SLICE2JS__
     /**
      *
      * Load properties from a file.
@@ -218,6 +226,7 @@
      *
      **/
     void load(string file);
+#endif
 
     /**
      *
@@ -229,4 +238,6 @@
     ["cpp:noexcept"] Properties clone();
 }
 
+#endif
+
 }
diff -Nru zeroc-ice-3.7.1/slice/Ice/RemoteLogger.ice zeroc-ice-3.7.2/slice/Ice/RemoteLogger.ice
--- zeroc-ice-3.7.1/slice/Ice/RemoteLogger.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/RemoteLogger.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,19 +1,25 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
 #include <Ice/BuiltinSequences.ice>
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:list"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
+
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
diff -Nru zeroc-ice-3.7.1/slice/Ice/RouterF.ice zeroc-ice-3.7.2/slice/Ice/RouterF.ice
--- zeroc-ice-3.7.1/slice/Ice/RouterF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/RouterF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/Router.ice zeroc-ice-3.7.2/slice/Ice/Router.ice
--- zeroc-ice-3.7.1/slice/Ice/Router.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Router.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
@@ -24,7 +30,7 @@
 /**
  *
  * The Ice router interface. Routers can be set either globally with
- * {@link Communicator#setDefaultRouter}, or with <tt>ice_router</tt> on specific
+ * {@link Communicator#setDefaultRouter}, or with <code>ice_router</code> on specific
  * proxies.
  *
  **/
diff -Nru zeroc-ice-3.7.1/slice/Ice/ServantLocatorF.ice zeroc-ice-3.7.2/slice/Ice/ServantLocatorF.ice
--- zeroc-ice-3.7.1/slice/Ice/ServantLocatorF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ServantLocatorF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/ServantLocator.ice zeroc-ice-3.7.2/slice/Ice/ServantLocator.ice
--- zeroc-ice-3.7.1/slice/Ice/ServantLocator.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ServantLocator.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Current.ice>
@@ -42,25 +48,25 @@
      * the returned servant into its active servant map. This must be
      * done by the servant locator implementation, if this is desired.
      *
-     * <tt>locate</tt> can throw any user exception. If it does, that exception
+     * <code>locate</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If <tt>locate</tt> throws any exception, the Ice run time does <em>not</em>
-     * call <tt>finished</tt>.
+     * If <code>locate</code> throws any exception, the Ice run time does <em>not</em>
+     * call <code>finished</code>.
      *
-     * <p class="Note">If you call <tt>locate</tt> from your own code, you
-     * must also call <tt>finished</tt> when you have finished using the
-     * servant, provided that <tt>locate</tt> returned a non-null servant;
+     * <p class="Note">If you call <code>locate</code> from your own code, you
+     * must also call <code>finished</code> when you have finished using the
+     * servant, provided that <code>locate</code> returned a non-null servant;
      * otherwise, you will get undefined behavior if you use
      * servant locators such as the Freeze Evictor.
      *
      * @param curr Information about the current operation for which
      * a servant is required.
      *
-     * @param cookie A "cookie" that will be passed to <tt>finished</tt>.
+     * @param cookie A "cookie" that will be passed to <code>finished</code>.
      *
      * @return The located servant, or null if no suitable servant has
      * been found.
@@ -78,25 +84,25 @@
     /**
      *
      * Called by the object adapter after a request has been
-     * made. This operation is only called if <tt>locate</tt> was called
+     * made. This operation is only called if <code>locate</code> was called
      * prior to the request and returned a non-null servant. This
      * operation can be used for cleanup purposes after a request.
      *
-     * <tt>finished</tt> can throw any user exception. If it does, that exception
+     * <code>finished</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If both the operation and <tt>finished</tt> throw an exception, the
-     * exception thrown by <tt>finished</tt> is marshaled back to the client.
+     * If both the operation and <code>finished</code> throw an exception, the
+     * exception thrown by <code>finished</code> is marshaled back to the client.
      *
      * @param curr Information about the current operation call for
-     * which a servant was located by <tt>locate</tt>.
+     * which a servant was located by <code>locate</code>.
      *
-     * @param servant The servant that was returned by <tt>locate</tt>.
+     * @param servant The servant that was returned by <code>locate</code>.
      *
-     * @param cookie The cookie that was returned by <tt>locate</tt>.
+     * @param cookie The cookie that was returned by <code>locate</code>.
      *
      * @throws UserException The implementation can raise a UserException
      * and the run time will marshal it as the result of the invocation.
diff -Nru zeroc-ice-3.7.1/slice/Ice/SliceChecksumDict.ice zeroc-ice-3.7.2/slice/Ice/SliceChecksumDict.ice
--- zeroc-ice-3.7.1/slice/Ice/SliceChecksumDict.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/SliceChecksumDict.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/Ice/ValueFactory.ice zeroc-ice-3.7.2/slice/Ice/ValueFactory.ice
--- zeroc-ice-3.7.1/slice/Ice/ValueFactory.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/ValueFactory.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
@@ -19,6 +25,7 @@
 module Ice
 {
 
+#if !defined(__SLICE2PHP__)
 /**
  *
  * A factory for values. Value factories are used in several
@@ -28,7 +35,7 @@
  * with the communicator.
  *
  **/
-["delegate", "php:internal"]
+["delegate"]
 local interface ValueFactory
 {
     /**
@@ -36,10 +43,10 @@
      * Create a new value for a given value type. The type is the
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
-     * Slice type id for an interface <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * Slice type id for an interface <code>Bar</code> in the module
+     * <code>Foo</code> is <code>"::Foo::Bar"</code>.
      *
-     * Note that the leading "<tt>::</tt>" is required.
+     * Note that the leading "<code>::</code>" is required.
      *
      * @param type The value type.
      *
@@ -59,7 +66,6 @@
  * @see ValueFactory
  *
  **/
-["php:internal"]
 local interface ValueFactoryManager
 {
     /**
@@ -121,5 +127,6 @@
      **/
     ["cpp:const", "cpp:noexcept"] ValueFactory find(string id);
 }
+#endif
 
 }
diff -Nru zeroc-ice-3.7.1/slice/Ice/Version.ice zeroc-ice-3.7.2/slice/Ice/Version.ice
--- zeroc-ice-3.7.1/slice/Ice/Version.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/Ice/Version.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/IceBox/IceBox.ice zeroc-ice-3.7.2/slice/IceBox/IceBox.ice
--- zeroc-ice-3.7.1/slice/IceBox/IceBox.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceBox/IceBox.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBOX_API", "cpp:doxygen:include:IceBox/IceBox.h", "objc:header-dir:objc", "python:pkgdir:IceBox"]]
+[["cpp:dll-export:ICEBOX_API"]]
+[["cpp:doxygen:include:IceBox/IceBox.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceBox/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceBox"]]
+
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/CommunicatorF.ice>
 #include <Ice/PropertiesF.ice>
diff -Nru zeroc-ice-3.7.1/slice/IceBT/ConnectionInfo.ice zeroc-ice-3.7.2/slice/IceBT/ConnectionInfo.ice
--- zeroc-ice-3.7.1/slice/IceBT/ConnectionInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceBT/ConnectionInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
+[["cpp:dll-export:ICEBT_API"]]
+[["cpp:doxygen:include:IceBT/IceBT.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceBT"]]
 
 #include <Ice/Connection.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IceBT/EndpointInfo.ice zeroc-ice-3.7.2/slice/IceBT/EndpointInfo.ice
--- zeroc-ice-3.7.1/slice/IceBT/EndpointInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceBT/EndpointInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceBT"]]
+[["cpp:dll-export:ICEBT_API"]]
+[["cpp:doxygen:include:IceBT/IceBT.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceBT"]]
 
 #include <Ice/Endpoint.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IceBT/Types.ice zeroc-ice-3.7.2/slice/IceBT/Types.ice
--- zeroc-ice-3.7.1/slice/IceBT/Types.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceBT/Types.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,20 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
+[["cpp:dll-export:ICEBT_API"]]
+[["cpp:doxygen:include:IceBT/IceBT.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceBT"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/IceDiscovery/IceDiscovery.ice zeroc-ice-3.7.2/slice/IceDiscovery/IceDiscovery.ice
--- zeroc-ice-3.7.1/slice/IceDiscovery/IceDiscovery.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceDiscovery/IceDiscovery.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceDiscovery/IceDiscovery.h", "objc:header-dir:objc", "python:pkgdir:IceDiscovery"]]
+
+[["cpp:doxygen:include:IceDiscovery/IceDiscovery.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceDiscovery"]]
 
 #include <Ice/Identity.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/Admin.ice zeroc-ice-3.7.2/slice/IceGrid/Admin.ice
--- zeroc-ice-3.7.1/slice/IceGrid/Admin.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/Admin.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Properties.ice>
@@ -882,7 +888,7 @@
     /**
      *
      * Add an object to the object registry. IceGrid will get the
-     * object type by calling <tt>ice_id</tt> on the given proxy. The object
+     * object type by calling <code>ice_id</code> on the given proxy. The object
      * must be reachable.
      *
      * @param obj The object to be added to the registry.
@@ -991,7 +997,7 @@
      *
      * @param expr The expression to match against the stringified
      * identities of registered objects. The expression may contain
-     * a trailing wildcard (<tt>*</tt>) character.
+     * a trailing wildcard (<code>*</code>) character.
      *
      * @return All the object infos with a stringified identity
      * matching the given expression.
@@ -1364,7 +1370,7 @@
 {
     /**
      *
-     * The <tt>registryInit</tt> operation is called after registration of
+     * The <code>registryInit</code> operation is called after registration of
      * an observer to indicate the state of the registries.
      *
      * @param registries The current state of the registries.
@@ -1374,7 +1380,7 @@
 
     /**
      *
-     * The <tt>nodeUp</tt> operation is called to notify an observer that a node
+     * The <code>nodeUp</code> operation is called to notify an observer that a node
      * came up.
      *
      * @param node The node state.
@@ -1384,7 +1390,7 @@
 
     /**
      *
-     * The <tt>nodeDown</tt> operation is called to notify an observer that a node
+     * The <code>nodeDown</code> operation is called to notify an observer that a node
      * went down.
      *
      * @param name The node name.
@@ -1411,7 +1417,7 @@
 {
     /**
      *
-     * The <tt>nodeInit</tt> operation indicates the current state
+     * The <code>nodeInit</code> operation indicates the current state
      * of nodes. It is called after the registration of an observer.
      *
      * @param nodes The current state of the nodes.
@@ -1421,7 +1427,7 @@
 
     /**
      *
-     * The <tt>nodeUp</tt> operation is called to notify an observer that a node
+     * The <code>nodeUp</code> operation is called to notify an observer that a node
      * came up.
      *
      * @param node The node state.
@@ -1431,7 +1437,7 @@
 
     /**
      *
-     * The <tt>nodeDown</tt> operation is called to notify an observer that a node
+     * The <code>nodeDown</code> operation is called to notify an observer that a node
      * went down.
      *
      * @param name The node name.
@@ -1441,7 +1447,7 @@
 
     /**
      *
-     * The <tt>updateServer</tt> operation is called to notify an observer that
+     * The <code>updateServer</code> operation is called to notify an observer that
      * the state of a server changed.
      *
      * @param node The node hosting the server.
@@ -1453,7 +1459,7 @@
 
     /**
      *
-     * The <tt>updateAdapter</tt> operation is called to notify an observer that
+     * The <code>updateAdapter</code> operation is called to notify an observer that
      * the state of an adapter changed.
      *
      * @param node The node hosting the adapter.
@@ -1475,7 +1481,7 @@
 {
     /**
      *
-     * <tt>applicationInit</tt> is called after the registration
+     * <code>applicationInit</code> is called after the registration
      * of an observer to indicate the state of the registry.
      *
      * @param serial The current serial number of the registry
@@ -1490,7 +1496,7 @@
 
     /**
      *
-     * The <tt>applicationAdded</tt> operation is called to notify an observer
+     * The <code>applicationAdded</code> operation is called to notify an observer
      * that an application was added.
      *
      * @param serial The new serial number of the registry database.
@@ -1502,7 +1508,7 @@
 
     /**
      *
-     * The <tt>applicationRemoved</tt> operation is called to notify an observer
+     * The <code>applicationRemoved</code> operation is called to notify an observer
      * that an application was removed.
      *
      * @param serial The new serial number of the registry database.
@@ -1514,7 +1520,7 @@
 
     /**
      *
-     * The <tt>applicationUpdated</tt> operation is called to notify an observer
+     * The <code>applicationUpdated</code> operation is called to notify an observer
      * that an application was updated.
      *
      * @param serial The new serial number of the registry database.
@@ -1535,7 +1541,7 @@
 {
     /**
      *
-     * <tt>adapterInit</tt> is called after registration of
+     * <code>adapterInit</code> is called after registration of
      * an observer to indicate the state of the registry.
      *
      * @param adpts The adapters that were dynamically registered
@@ -1546,7 +1552,7 @@
 
     /**
      *
-     * The <tt>adapterAdded</tt> operation is called to notify an observer when
+     * The <code>adapterAdded</code> operation is called to notify an observer when
      * a dynamically-registered adapter was added.
      *
      * @param info The details of the new adapter.
@@ -1583,7 +1589,7 @@
 {
     /**
      *
-     * <tt>objectInit</tt> is called after the registration of
+     * <code>objectInit</code> is called after the registration of
      * an observer to indicate the state of the registry.
      *
      * @param objects The objects registered with the {@link Admin}
@@ -1594,7 +1600,7 @@
 
     /**
      *
-     * The <tt>objectAdded</tt> operation is called to notify an observer when an
+     * The <code>objectAdded</code> operation is called to notify an observer when an
      * object was added to the {@link Admin} interface.
      *
      * @param info The details of the added object.
@@ -1604,7 +1610,7 @@
 
     /**
      *
-     * <tt>objectUpdated</tt> is called to notify an observer when
+     * <code>objectUpdated</code> is called to notify an observer when
      * an object registered with the {@link Admin} interface was updated.
      *
      * @param info The details of the updated object.
@@ -1614,7 +1620,7 @@
 
     /**
      *
-     * <tt>objectRemoved</tt> is called to notify an observer when
+     * <code>objectRemoved</code> is called to notify an observer when
      * an object registered with the {@link Admin} interface was removed.
      *
      * @param id The identity of the removed object.
@@ -1628,7 +1634,7 @@
  * Used by administrative clients to view,
  * update, and receive observer updates from the IceGrid
  * registry. Admin sessions are created either via the {@link Registry}
- * object or via the registry admin <tt>SessionManager</tt> object.
+ * object or via the registry admin <code>SessionManager</code> object.
  *
  * @see Registry
  *
@@ -1765,7 +1771,7 @@
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1794,7 +1800,7 @@
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1823,7 +1829,7 @@
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1852,7 +1858,7 @@
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1877,7 +1883,7 @@
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1902,7 +1908,7 @@
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
@@ -1928,7 +1934,7 @@
      *
      * @param count Specifies where to start reading the file. If
      * negative, the file is read from the begining. If 0 or positive,
-     * the file is read from the last <tt>count</tt> lines.
+     * the file is read from the last <code>count</code> lines.
      *
      * @return An iterator to read the file.
      *
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/Descriptor.ice zeroc-ice-3.7.2/slice/IceGrid/Descriptor.ice
--- zeroc-ice-3.7.1/slice/IceGrid/Descriptor.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/Descriptor.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
+[["cpp:include:IceGrid/Config.h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
-[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
-#endif
+[["cpp:dll-export:ICEGRID_API"]]
 
-[["cpp:include:IceGrid/Config.h"]]
+[["objc:dll-export:ICEGRID_API"]]
+#endif
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/Exception.ice zeroc-ice-3.7.2/slice/IceGrid/Exception.ice
--- zeroc-ice-3.7.1/slice/IceGrid/Exception.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/Exception.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,21 +1,26 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
+[["cpp:include:IceGrid/Config.h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
-[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
-#endif
+[["cpp:dll-export:ICEGRID_API"]]
 
-[["cpp:include:IceGrid/Config.h"]]
+[["objc:dll-export:ICEGRID_API"]]
+#endif
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/FileParser.ice zeroc-ice-3.7.2/slice/IceGrid/FileParser.ice
--- zeroc-ice-3.7.1/slice/IceGrid/FileParser.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/FileParser.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <IceGrid/Admin.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
@@ -35,7 +41,7 @@
 
 /**
  *
- * <tt>icegridadmin</tt> provides a {@link FileParser}
+ * <code>icegridadmin</code> provides a {@link FileParser}
  * object to transform XML files into {@link ApplicationDescriptor}
  * objects.
  *
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/PluginFacade.ice zeroc-ice-3.7.2/slice/IceGrid/PluginFacade.ice
--- zeroc-ice-3.7.1/slice/IceGrid/PluginFacade.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/PluginFacade.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Current.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/Registry.ice zeroc-ice-3.7.2/slice/IceGrid/Registry.ice
--- zeroc-ice-3.7.1/slice/IceGrid/Registry.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/Registry.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <IceGrid/Exception.ice>
 #include <IceGrid/Session.ice>
 #include <IceGrid/Admin.ice>
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/Session.ice zeroc-ice-3.7.2/slice/IceGrid/Session.ice
--- zeroc-ice-3.7.1/slice/IceGrid/Session.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/Session.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #include <Glacier2/Session.ice>
 #include <IceGrid/Exception.ice>
 
@@ -27,7 +33,7 @@
  *
  * A session object is used by IceGrid clients to allocate and
  * release objects. Client sessions are created either via the
- * {@link Registry} object or via the registry client <tt>SessionManager</tt>
+ * {@link Registry} object or via the registry client <code>SessionManager</code>
  * object.
  *
  * @see Registry
@@ -89,8 +95,8 @@
 
     /**
      *
-     * Release an object that was allocated using <tt>allocateObjectById</tt> or
-     * <tt>allocateObjectByType</tt>.
+     * Release an object that was allocated using <code>allocateObjectById</code> or
+     * <code>allocateObjectByType</code>.
      *
      * @param id The identity of the object to release.
      *
@@ -108,8 +114,8 @@
     /**
      *
      * Set the allocation timeout. If no objects are available for an
-     * allocation request, a call to <tt>allocateObjectById</tt> or
-     * <tt>allocateObjectByType</tt> will block for the duration of this
+     * allocation request, a call to <code>allocateObjectById</code> or
+     * <code>allocateObjectByType</code> will block for the duration of this
      * timeout.
      *
      * @param timeout The timeout in milliseconds.
diff -Nru zeroc-ice-3.7.1/slice/IceGrid/UserAccountMapper.ice zeroc-ice-3.7.2/slice/IceGrid/UserAccountMapper.ice
--- zeroc-ice-3.7.1/slice/IceGrid/UserAccountMapper.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceGrid/UserAccountMapper.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
+[["cpp:dll-export:ICEGRID_API"]]
+[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICEGRID_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceGrid"]]
+
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
@@ -44,10 +50,10 @@
      * used by IceGrid nodes to figure out the user account to use
      * to run servers.
      *
-     * @param user The value of the server descriptor's <tt>user</tt>
+     * @param user The value of the server descriptor's <code>user</code>
      * attribute. If this attribute is not defined, and the server's
-     * activation mode is <tt>session</tt>, the default value of
-     * <tt>user</tt> is the session identifier.
+     * activation mode is <code>session</code>, the default value of
+     * <code>user</code> is the session identifier.
      *
      * @return The user account name.
      *
diff -Nru zeroc-ice-3.7.1/slice/IceIAP/ConnectionInfo.ice zeroc-ice-3.7.2/slice/IceIAP/ConnectionInfo.ice
--- zeroc-ice-3.7.1/slice/IceIAP/ConnectionInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceIAP/ConnectionInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "cpp:doxygen:include:IceIAP/IceIAP.h", "objc:header-dir:objc", "js:ice-build"]]
+[["cpp:dll-export:ICEIAP_API"]]
+[["cpp:doxygen:include:IceIAP/IceIAP.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
 
 #include <Ice/Connection.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IceIAP/EndpointInfo.ice zeroc-ice-3.7.2/slice/IceIAP/EndpointInfo.ice
--- zeroc-ice-3.7.1/slice/IceIAP/EndpointInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceIAP/EndpointInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,18 @@
-// **********************************************************************
 //
-// Copyright (c) 2018-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "cpp:doxygen:include:IceIAP/IceIAP.h", "objc:header-dir:objc", "js:ice-build"]]
+[["cpp:dll-export:ICEIAP_API"]]
+[["cpp:doxygen:include:IceIAP/IceIAP.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
 
 #include <Ice/Endpoint.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice zeroc-ice-3.7.2/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
--- zeroc-ice-3.7.1/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,14 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceLocatorDiscovery/IceLocatorDiscovery.h", "objc:header-dir:objc", "python:pkgdir:IceLocatorDiscovery"]]
+
+[["cpp:doxygen:include:IceLocatorDiscovery/IceLocatorDiscovery.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceLocatorDiscovery"]]
 
 #include <Ice/Locator.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IcePatch2/FileInfo.ice zeroc-ice-3.7.2/slice/IcePatch2/FileInfo.ice
--- zeroc-ice-3.7.1/slice/IcePatch2/FileInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IcePatch2/FileInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "cpp:doxygen:include:IcePatch2/IcePatch2.h", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
+[["cpp:dll-export:ICEPATCH2_API"]]
+[["cpp:doxygen:include:IcePatch2/IcePatch2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IcePatch2"]]
+
 #include <Ice/BuiltinSequences.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
diff -Nru zeroc-ice-3.7.1/slice/IcePatch2/FileServer.ice zeroc-ice-3.7.2/slice/IcePatch2/FileServer.ice
--- zeroc-ice-3.7.1/slice/IcePatch2/FileServer.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IcePatch2/FileServer.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,22 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "cpp:doxygen:include:IcePatch2/IcePatch2.h", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
+[["cpp:dll-export:ICEPATCH2_API"]]
+[["cpp:doxygen:include:IcePatch2/IcePatch2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IcePatch2"]]
+
 #include <IcePatch2/FileInfo.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
@@ -39,7 +44,7 @@
 
 /**
  *
- * A <tt>partition</tt> argument was not in the range 0-255.
+ * A <code>partition</code> argument was not in the range 0-255.
  *
  **/
 exception PartitionOutOfRangeException
diff -Nru zeroc-ice-3.7.1/slice/IceSSL/ConnectionInfoF.ice zeroc-ice-3.7.2/slice/IceSSL/ConnectionInfoF.ice
--- zeroc-ice-3.7.1/slice/IceSSL/ConnectionInfoF.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceSSL/ConnectionInfoF.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build", "python:pkgdir:IceSSL"]]
+[["cpp:dll-export:ICESSL_API"]]
+[["cpp:doxygen:include:IceSSL/IceSSL.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICESSL_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceSSL"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff -Nru zeroc-ice-3.7.1/slice/IceSSL/ConnectionInfo.ice zeroc-ice-3.7.2/slice/IceSSL/ConnectionInfo.ice
--- zeroc-ice-3.7.1/slice/IceSSL/ConnectionInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceSSL/ConnectionInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build", "python:pkgdir:IceSSL"]]
+[["cpp:dll-export:ICESSL_API"]]
+[["cpp:doxygen:include:IceSSL/IceSSL.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICESSL_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceSSL"]]
 
 [["cpp:include:IceSSL/Plugin.h"]]
 
diff -Nru zeroc-ice-3.7.1/slice/IceSSL/EndpointInfo.ice zeroc-ice-3.7.2/slice/IceSSL/EndpointInfo.ice
--- zeroc-ice-3.7.1/slice/IceSSL/EndpointInfo.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceSSL/EndpointInfo.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build", "python:pkgdir:IceSSL"]]
+[["cpp:dll-export:ICESSL_API"]]
+[["cpp:doxygen:include:IceSSL/IceSSL.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICESSL_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceSSL"]]
 
 #include <Ice/Endpoint.ice>
 
diff -Nru zeroc-ice-3.7.1/slice/IceStorm/IceStorm.ice zeroc-ice-3.7.2/slice/IceStorm/IceStorm.ice
--- zeroc-ice-3.7.1/slice/IceStorm/IceStorm.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceStorm/IceStorm.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,17 +1,23 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESTORM_API", "cpp:doxygen:include:IceStorm/IceStorm.h", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build", "python:pkgdir:IceStorm"]]
+[["cpp:dll-export:ICESTORM_API"]]
+[["cpp:doxygen:include:IceStorm/IceStorm.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceStorm/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICESTORM_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceStorm"]]
+
 #include <Ice/Identity.ice>
 #include <Ice/SliceChecksumDict.ice>
 
@@ -202,7 +208,7 @@
 
     /**
      *
-     * Subscribe with the given <tt>qos</tt> to this topic.  A
+     * Subscribe with the given <code>qos</code> to this topic.  A
      * per-subscriber publisher object is returned.
      *
      * @param theQoS The quality of service parameters for this
@@ -228,7 +234,7 @@
 
     /**
      *
-     * Unsubscribe the given <tt>subscriber</tt>.
+     * Unsubscribe the given <code>subscriber</code>.
      *
      * @param subscriber The proxy of an existing subscriber.
      *
@@ -240,7 +246,7 @@
     /**
      *
      * Create a link to the given topic. All events originating
-     * on this topic will also be sent to <tt>linkTo</tt>.
+     * on this topic will also be sent to <code>linkTo</code>.
      *
      * @param linkTo The topic to link to.
      *
@@ -254,7 +260,7 @@
 
     /**
      *
-     * Destroy the link from this topic to the given topic <tt>linkTo</tt>.
+     * Destroy the link from this topic to the given topic <code>linkTo</code>.
      *
      * @param linkTo The topic to destroy the link to.
      *
diff -Nru zeroc-ice-3.7.1/slice/IceStorm/Metrics.ice zeroc-ice-3.7.2/slice/IceStorm/Metrics.ice
--- zeroc-ice-3.7.1/slice/IceStorm/Metrics.ice	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/slice/IceStorm/Metrics.ice	2019-02-05 18:03:04.000000000 +0000
@@ -1,24 +1,28 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESTORM_API", "cpp:doxygen:include:IceStorm/IceStorm.h", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build", "python:pkgdir:IceStorm"]]
+[["cpp:dll-export:ICESTORM_API"]]
+[["cpp:doxygen:include:IceStorm/IceStorm.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:IceStorm/Config.h"]]
 
+[["ice-prefix"]]
+
+[["objc:dll-export:ICESTORM_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:IceStorm"]]
+
 #include <Ice/Metrics.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEMX"]
+["objc:prefix:ICEMX", "js:module:ice"]
 module IceMX
 {
 
diff -Nru zeroc-ice-3.7.1/.travis.yml zeroc-ice-3.7.2/.travis.yml
--- zeroc-ice-3.7.1/.travis.yml	2018-04-20 15:02:08.000000000 +0000
+++ zeroc-ice-3.7.2/.travis.yml	2019-02-05 18:03:04.000000000 +0000
@@ -5,7 +5,7 @@
 
 env:
   global:
-  - DOCKER_BASE_TAG=3.7-ubuntu-16.04
+  - DOCKER_BASE_TAG=3.7-ubuntu-18.04
   - DOCKER_BASE_IMAGE=zerocci/ice-base:${DOCKER_BASE_TAG}
   - DOCKER_BUILD_IMAGE=zerocci/ice-travis-build:${TRAVIS_BUILD_NUMBER}
   - DOCKER_BUILD_CPP11_IMAGE=zerocci/ice-travis-build:${TRAVIS_BUILD_NUMBER}-cpp11
@@ -18,8 +18,6 @@
   include:
     - stage: Build
       script:
-      # see https://github.com/travis-ci/travis-ci/issues/8920
-      - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
       - docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}"
       - |
         echo "FROM ${DOCKER_BASE_IMAGE}" >> Dockerfile
@@ -27,27 +25,22 @@
       - docker build --cache-from ${DOCKER_BASE_IMAGE} -t ${DOCKER_BUILD_IMAGE} .
       - docker push ${DOCKER_BUILD_IMAGE}
 
-    - stage: Build C++11
-      script:
-      # see https://github.com/travis-ci/travis-ci/issues/8920
-      - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
-      - docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}"
-      - |
-        echo "FROM ${DOCKER_BUILD_IMAGE}" >> Dockerfile
-        echo "RUN make -C cpp ${MAKEFLAGS} CONFIGS='cpp11-shared'" >> Dockerfile
-      - docker build --cache-from ${DOCKER_BUILD_IMAGE} -t ${DOCKER_BUILD_CPP11_IMAGE} .
-      - docker push ${DOCKER_BUILD_CPP11_IMAGE}
+    # - stage: Build C++11
+    #   script:
+    #   - docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}"
+    #   - |
+    #     echo "FROM ${DOCKER_BUILD_IMAGE}" >> Dockerfile
+    #     echo "RUN make -C cpp ${MAKEFLAGS} CONFIGS='cpp11-shared'" >> Dockerfile
+    #   - docker build --cache-from ${DOCKER_BUILD_IMAGE} -t ${DOCKER_BUILD_CPP11_IMAGE} .
+    #   - docker push ${DOCKER_BUILD_CPP11_IMAGE}
 
     - &test-staging
       stage: Test
-      before_script:
-      # see https://github.com/travis-ci/travis-ci/issues/8920
-      - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
       script: $DOCKER_RUN "${ALLTESTS} --language=cpp"
       env: comment=C++
-    - <<: *test-staging
-      script: $DOCKER_RUN_CPP11 "${ALLTESTS} --language=cpp --config=cpp11-shared"
-      env: comment=C++11
+    # - <<: *test-staging
+    #   script: $DOCKER_RUN_CPP11 "${ALLTESTS} --language=cpp --config=cpp11-shared"
+    #   env: comment=C++11
     - <<: *test-staging
       script: $DOCKER_RUN "${ALLTESTS} --language=csharp"
       env: comment=C#